Update references to environment to instead reference current_environment