Rename cloud envs
Fix unit test
Merge pull request #1485 from ogail/1263

Rename cloud envs