Environment renaming fix

Change-Id: I1220605f55c06f4d3cf131196d08c4795a91740d
Merge "Environment renaming fix"