diff --git a/FullSimLight/include/FSLDetectorConstruction.hh b/FullSimLight/include/FSLDetectorConstruction.hh
index f470a69a23526168d0ca5f9eaba78ad1615c565c..f762ead94e8399677b95a1a962c5bb930b8c7da1 100644
--- a/FullSimLight/include/FSLDetectorConstruction.hh
+++ b/FullSimLight/include/FSLDetectorConstruction.hh
@@ -89,7 +89,7 @@ public:
   static G4double GetFieldValue() { return gFieldValue; }
   G4double GetTolerance (){return fTolerance;}
 
-  GeoVPhysVol* CreateTheWorld(GeoVPhysVol* world);
+  GeoPhysVol* CreateTheWorld(GeoPhysVol* world);
 
   /// Clean the geometry  from Unidentified volumes before dumping it in GDML format
   void PullUnidentifiedVolumes( G4LogicalVolume* v );
diff --git a/FullSimLight/src/FSLDetectorConstruction.cc b/FullSimLight/src/FSLDetectorConstruction.cc
index bcbd24fdea38fe2f97496dff8c34373c4c010836..54f037e7ecda0cc564b067dcfb2330af8abc29b5 100644
--- a/FullSimLight/src/FSLDetectorConstruction.cc
+++ b/FullSimLight/src/FSLDetectorConstruction.cc
@@ -112,7 +112,7 @@ FSLDetectorConstruction::~FSLDetectorConstruction()
   delete fDetectorMessenger;
 }
 
-GeoVPhysVol*  FSLDetectorConstruction::CreateTheWorld(GeoVPhysVol* world)
+GeoPhysVol*  FSLDetectorConstruction::CreateTheWorld(GeoPhysVol* world)
 {
     if (world == nullptr)
     {
@@ -156,7 +156,7 @@ G4VPhysicalVolume *FSLDetectorConstruction::Construct()
 
         }
 
-        GeoVPhysVol* worldTmp = CreateTheWorld(nullptr);
+        GeoPhysVol* worldTmp = CreateTheWorld(nullptr);
         factory->create(worldTmp);
         world = worldTmp;
 
diff --git a/GeoModelExamples/HelloGeoRead2G4/HelloGeoReadG4.cpp b/GeoModelExamples/HelloGeoRead2G4/HelloGeoReadG4.cpp
index b656e33e35f172eb3faeaec6bde5a9ee655b880e..41a81541636bd4afaad5c060d87830b12f3d9c02 100644
--- a/GeoModelExamples/HelloGeoRead2G4/HelloGeoReadG4.cpp
+++ b/GeoModelExamples/HelloGeoRead2G4/HelloGeoReadG4.cpp
@@ -97,7 +97,7 @@ int main(int argc, char* argv[]) {
     std::cout << "ReadGeoModel set.\n";
 
     /* build the GeoModel geometry */
-    GeoPhysVol* world =
+    const GeoVPhysVol* world =
         readInGeo.buildGeoModel();  // builds the whole GeoModel tree in memory
                                     // and get an handle to the 'world' volume
     std::cout << "ReadGeoModel::buildGeoModel() done.\n";