Rename env-names