Updated env naming to make it more uniform