Fixed scripts and config to correct EnvironmentName naming issue.

Fixes #894
Merge branch 'anurse-894' into preview