Make the environment names make more sense and match hostnames