diff --git a/GeoModelCore/GeoModelKernel/GeoModelKernel/GeoVDetectorFactory.h b/GeoModelCore/GeoModelKernel/GeoModelKernel/GeoVDetectorFactory.h
index 55e508910360b24f67c7bf3af8a1930c4c5a8608..836f82a80b503d5202d6aa99707c536f8631712c 100644
--- a/GeoModelCore/GeoModelKernel/GeoModelKernel/GeoVDetectorFactory.h
+++ b/GeoModelCore/GeoModelKernel/GeoModelKernel/GeoVDetectorFactory.h
@@ -16,7 +16,7 @@
 
 #include "GeoModelKernel/GeoVPhysVol.h"
 
-class GeoPhysVol;
+class GeoVPhysVol;
 class GeoVDetectorManager;
 
 class GeoVDetectorFactory 
@@ -26,7 +26,7 @@ class GeoVDetectorFactory
   virtual ~GeoVDetectorFactory();
 
   //	Create the system.
-  virtual void create (GeoPhysVol* world) = 0;
+  virtual void create (GeoVPhysVol* world) = 0;
 
   //	Access to the Detector Manager.  When implementing this
   //	method, please use the covariant return type mechanism.
diff --git a/GeoModelCore/GeoModelKernel/GeoModelKernel/GeoVGeometryPlugin.h b/GeoModelCore/GeoModelKernel/GeoModelKernel/GeoVGeometryPlugin.h
index b2c29a63682f7df1fff2227f72bf9a247da90716..b8ed64306315b8819f9bbc1fca047ec6b331a1aa 100644
--- a/GeoModelCore/GeoModelKernel/GeoModelKernel/GeoVGeometryPlugin.h
+++ b/GeoModelCore/GeoModelKernel/GeoModelKernel/GeoVGeometryPlugin.h
@@ -33,7 +33,7 @@ class GeoVGeometryPlugin
 
   //! Create the system geometry.
   /// Note: this is a pure virtual method, so you need to implement it in your derived plugin class
-  virtual void create ( GeoPhysVol* world, bool publish = false ) = 0;
+  virtual void create ( GeoVPhysVol* world, bool publish = false ) = 0;
 
   //! Returns the plugin's name
   std::string getName() { return m_pluginName; }
diff --git a/GeoModelExamples/KitchenSinkPlugin/src/KitchenSinkPlugin.cxx b/GeoModelExamples/KitchenSinkPlugin/src/KitchenSinkPlugin.cxx
index c7cb428b1dc2aa26d531cebd6b79d70c2590f8fe..6edac522b98ce5afb10b35c4a685dc75bbd6dc35 100644
--- a/GeoModelExamples/KitchenSinkPlugin/src/KitchenSinkPlugin.cxx
+++ b/GeoModelExamples/KitchenSinkPlugin/src/KitchenSinkPlugin.cxx
@@ -51,7 +51,7 @@ class KitchenSinkPlugin : public GeoVGeometryPlugin  {
   ~KitchenSinkPlugin();
 
   // Creation of geometry:
-  virtual void create(GeoPhysVol *world, bool publish=false);
+  virtual void create(GeoVPhysVol *world, bool publish=false);
 
  private:
 
@@ -79,7 +79,7 @@ KitchenSinkPlugin::~KitchenSinkPlugin()
 // example (normally one may "publish" a list of FullPhysVol's and Alignable
 // transforms, but this example has none such).
 //
-void KitchenSinkPlugin::create(GeoPhysVol *world, bool /*publish*/)
+void KitchenSinkPlugin::create(GeoVPhysVol *world, bool /*publish*/)
 {
   const double degree=M_PI/180.0;
 
diff --git a/GeoModelExamples/MinimalPlugin/src/MinimalPlugin.cxx b/GeoModelExamples/MinimalPlugin/src/MinimalPlugin.cxx
index 41a3c4ef4de4331787ae1cedabcc55ca8c701e0f..df940fb98947a75f65ae3f228e6d3e6b5e3e04ed 100644
--- a/GeoModelExamples/MinimalPlugin/src/MinimalPlugin.cxx
+++ b/GeoModelExamples/MinimalPlugin/src/MinimalPlugin.cxx
@@ -18,7 +18,7 @@ class MinimalPlugin : public GeoVGeometryPlugin  {
   ~MinimalPlugin();
 
   // Creation of geometry:
-  virtual void create(GeoPhysVol *world, bool publish=false);
+  virtual void create(GeoVPhysVol *world, bool publish=false);
 
  private:
 
@@ -46,7 +46,7 @@ MinimalPlugin::~MinimalPlugin()
 // example (normally one may "publish" a list of FullPhysVol's and Alignable
 // transforms, but this example has none such).
 //
-void MinimalPlugin::create(GeoPhysVol *world, bool /*publish*/)
+void MinimalPlugin::create(GeoVPhysVol *world, bool /*publish*/)
 {
   const double degree=M_PI/180.0;
 
diff --git a/GeoModelTools/GDMLtoGM/src/GDMLtoGM.cxx b/GeoModelTools/GDMLtoGM/src/GDMLtoGM.cxx
index 4530b696d4113a92841a03f1b5e0fc90762737fb..e27c4ff5e68bddd59a1c11621b0058ecc454bc2f 100644
--- a/GeoModelTools/GDMLtoGM/src/GDMLtoGM.cxx
+++ b/GeoModelTools/GDMLtoGM/src/GDMLtoGM.cxx
@@ -31,7 +31,7 @@ class GDMLtoGM : public GeoVGeometryPlugin  {
   ~GDMLtoGM();
 
   // Creation of geometry:
-  virtual void create(GeoPhysVol *world, bool publish = false ) override;
+  virtual void create(GeoVPhysVol *world, bool publish = false ) override;
 
  private:
 
@@ -48,7 +48,7 @@ GDMLtoGM::~GDMLtoGM()
 
 
 //## Other Operations (implementation)
-void GDMLtoGM::create(GeoPhysVol *world, bool /* 'publish' is not used here */)
+void GDMLtoGM::create(GeoVPhysVol *world, bool /* 'publish' is not used here */)
 {
 	char* fPath=getenv("GDML_FILE_NAME");
 	std::string fileName;
diff --git a/GeoModelTools/GeoModelXML/GMXPlugin/src/GMXPlugin.cxx b/GeoModelTools/GeoModelXML/GMXPlugin/src/GMXPlugin.cxx
index f04800be9a091cc7e2a896a43390220d8231c8a8..071a93b9d84895020f2ed7f2019341e896a73663 100644
--- a/GeoModelTools/GeoModelXML/GMXPlugin/src/GMXPlugin.cxx
+++ b/GeoModelTools/GeoModelXML/GMXPlugin/src/GMXPlugin.cxx
@@ -32,7 +32,7 @@ class GMXPlugin : public GeoVGeometryPlugin  {
   ~GMXPlugin();
 
   // Creation of geometry:
-  virtual void create(GeoPhysVol *world, bool publish) override;
+  virtual void create(GeoVPhysVol *world, bool publish) override;
 
  private:
 
@@ -79,7 +79,7 @@ GMXPlugin::~GMXPlugin()
 
 
 //## Other Operations (implementation)
-void GMXPlugin::create(GeoPhysVol *world, bool publish)
+void GMXPlugin::create(GeoVPhysVol *world, bool publish)
 {  
   std::cout<< "This is GMXPlugin: creating a GeoModelXml detector "<<std::endl;
   std::vector<std::string> filesToParse;