diff --git a/Documentation/Examples/vertical_EAS.cc b/Documentation/Examples/vertical_EAS.cc
index b5bb8ca2a11eb22c8a889e837a7945ed0235fc2d..ca27eac3d43e6f37cac296af3e7523de6ac7fa6b 100644
--- a/Documentation/Examples/vertical_EAS.cc
+++ b/Documentation/Examples/vertical_EAS.cc
@@ -20,7 +20,7 @@
 #include <corsika/setup/SetupStack.h>
 #include <corsika/setup/SetupTrajectory.h>
 
-#include <corsika/environment/Convenience.h>
+#include <corsika/environment/LayeredSphericalAtmosphereBuilder.h>
 #include <corsika/environment/Environment.h>
 #include <corsika/environment/FlatExponential.h>
 #include <corsika/environment/NuclearComposition.h>
diff --git a/Environment/CMakeLists.txt b/Environment/CMakeLists.txt
index cb3ea5bc14bc8d33d1074620c56b2a5277182936..f4b93c759a2f32128d98406b8e4130dd851b8c45 100644
--- a/Environment/CMakeLists.txt
+++ b/Environment/CMakeLists.txt
@@ -1,6 +1,6 @@
 set (
   ENVIRONMENT_SOURCES
-  Convenience.cpp
+  LayeredSphericalAtmosphereBuilder.cc
 )
 
 set (
@@ -18,7 +18,7 @@ set (
   BaseExponential.h
   FlatExponential.h
   SlidingPlanarExponential.h
-  Convenience.h
+  LayeredSphericalAtmosphereBuilder.h
   )
 
 set (
diff --git a/Environment/Convenience.cpp b/Environment/LayeredSphericalAtmosphereBuilder.cc
similarity index 97%
rename from Environment/Convenience.cpp
rename to Environment/LayeredSphericalAtmosphereBuilder.cc
index f3b052d6d1101a7fbb2284dda15e78ac94a2e347..4d1631d54e42431cd1b36299af9083c643bce0e7 100644
--- a/Environment/Convenience.cpp
+++ b/Environment/LayeredSphericalAtmosphereBuilder.cc
@@ -8,7 +8,7 @@
  * the license.
  */
 
-#include <corsika/environment/Convenience.h>
+#include <corsika/environment/LayeredSphericalAtmosphereBuilder.h>
 #include <corsika/environment/FlatExponential.h>
 #include <corsika/environment/HomogeneousMedium.h>
 #include <corsika/environment/SlidingPlanarExponential.h>
diff --git a/Environment/Convenience.h b/Environment/LayeredSphericalAtmosphereBuilder.h
similarity index 100%
rename from Environment/Convenience.h
rename to Environment/LayeredSphericalAtmosphereBuilder.h
diff --git a/Environment/testEnvironment.cc b/Environment/testEnvironment.cc
index 5262303ce3b7bb8282ce19a16cd9127a5427cbc0..5c314d1d07b5b9a5faad15ea2345114a5fb8f3f1 100644
--- a/Environment/testEnvironment.cc
+++ b/Environment/testEnvironment.cc
@@ -8,7 +8,7 @@
  * the license.
  */
 
-#include <corsika/environment/Convenience.h>
+#include <corsika/environment/LayeredSphericalAtmosphereBuilder.h>
 #include <corsika/environment/DensityFunction.h>
 #include <corsika/environment/FlatExponential.h>
 #include <corsika/environment/HomogeneousMedium.h>