diff --git a/AtlasGeometryCommon/CavernInfraGeoModel/src/CavernInfraDetectorFactory.cxx b/AtlasGeometryCommon/CavernInfraGeoModel/src/CavernInfraDetectorFactory.cxx
index 296943cd1ccda1703fb39ee0f48c0893d41cc6f2..0baf848ca2efb9a555734b4bbd9e0628075dc261 100755
--- a/AtlasGeometryCommon/CavernInfraGeoModel/src/CavernInfraDetectorFactory.cxx
+++ b/AtlasGeometryCommon/CavernInfraGeoModel/src/CavernInfraDetectorFactory.cxx
@@ -30,9 +30,9 @@
 
 CavernInfraDetectorFactory::CavernInfraDetectorFactory(StoreGateSvc *detStore,
 						       IRDBAccessSvc *pAccess)
-  :detectorManager(NULL),
-   detectorStore(detStore),
-   access(pAccess)
+  :m_detectorManager(NULL),
+   m_detectorStore(detStore),
+   m_access(pAccess)
 {
 }
 
@@ -42,10 +42,10 @@ CavernInfraDetectorFactory::~CavernInfraDetectorFactory()
 
 void CavernInfraDetectorFactory::create(GeoPhysVol *world)
 { 
-  detectorManager=new CavernInfraDetectorManager();
+  m_detectorManager=new CavernInfraDetectorManager();
 
   const DataHandle<StoredMaterialManager> materialManager;
-  if (StatusCode::SUCCESS != detectorStore->retrieve(materialManager, std::string("MATERIALS"))) {
+  if (StatusCode::SUCCESS != m_detectorStore->retrieve(materialManager, std::string("MATERIALS"))) {
     return; 
   } 
 
@@ -56,7 +56,7 @@ void CavernInfraDetectorFactory::create(GeoPhysVol *world)
   const GeoMaterial *shieldSteel      = materialManager->getMaterial("shield::ShieldSteel");
 
   // Get Recordset CavernElements.
-  IRDBRecordset_ptr cavernElements = access->getRecordsetPtr("CavernElements",m_versionTag,m_versionNode);
+  IRDBRecordset_ptr cavernElements = m_access->getRecordsetPtr("CavernElements",m_versionTag,m_versionNode);
  
   std::map<std::string, unsigned int> elementMap;
  
@@ -436,14 +436,14 @@ void CavernInfraDetectorFactory::create(GeoPhysVol *world)
   
 
   //// NOW INSERT ALL OF THIS INTO THE WORLD.
-  detectorManager->addTreeTop(sx1);
-  detectorManager->addTreeTop(bedrock);  
+  m_detectorManager->addTreeTop(sx1);
+  m_detectorManager->addTreeTop(bedrock);  
   
 }
 
 const CavernInfraDetectorManager * CavernInfraDetectorFactory::getDetectorManager() const
 {
-  return detectorManager;
+  return m_detectorManager;
 }
 
 void CavernInfraDetectorFactory::setTagNode(std::string tag, std::string node)
diff --git a/AtlasGeometryCommon/CavernInfraGeoModel/src/CavernInfraDetectorFactory.h b/AtlasGeometryCommon/CavernInfraGeoModel/src/CavernInfraDetectorFactory.h
index e316564417c38a9d3bbb603340b71f29d651c3ef..3bb555a89f7d773d60ba3d56588ac1966fd0c9eb 100755
--- a/AtlasGeometryCommon/CavernInfraGeoModel/src/CavernInfraDetectorFactory.h
+++ b/AtlasGeometryCommon/CavernInfraGeoModel/src/CavernInfraDetectorFactory.h
@@ -38,10 +38,10 @@ class CavernInfraDetectorFactory : public GeoVDetectorFactory
   CavernInfraDetectorFactory(const CavernInfraDetectorFactory &right);
   
   // The manager:
-  CavernInfraDetectorManager       *detectorManager;
+  CavernInfraDetectorManager       *m_detectorManager;
   
-  StoreGateSvc             *detectorStore;
-  IRDBAccessSvc            *access;
+  StoreGateSvc             *m_detectorStore;
+  IRDBAccessSvc            *m_access;
   std::string              m_versionTag;
   std::string              m_versionNode;
 };
diff --git a/AtlasGeometryCommon/CavernInfraGeoModel/src/CavernInfraDetectorFactory01.cxx b/AtlasGeometryCommon/CavernInfraGeoModel/src/CavernInfraDetectorFactory01.cxx
index 0869847dcdb3bf8c93b0b93f63b7f5dbbf4dd451..6e95b48272264e84b47884125baf8f3350a22669 100755
--- a/AtlasGeometryCommon/CavernInfraGeoModel/src/CavernInfraDetectorFactory01.cxx
+++ b/AtlasGeometryCommon/CavernInfraGeoModel/src/CavernInfraDetectorFactory01.cxx
@@ -44,9 +44,9 @@ using namespace GeoXF;
 
 CavernInfraDetectorFactory01::CavernInfraDetectorFactory01(StoreGateSvc *detStore,
 				       IRDBAccessSvc *pAccess)
-  :detectorManager(NULL),
-   detectorStore(detStore),
-   access(pAccess)
+  :m_detectorManager(NULL),
+   m_detectorStore(detStore),
+   m_access(pAccess)
  
 {
 }
@@ -57,10 +57,10 @@ CavernInfraDetectorFactory01::~CavernInfraDetectorFactory01()
 
 void CavernInfraDetectorFactory01::create(GeoPhysVol *world)
 { 
-  detectorManager=new CavernInfraDetectorManager();
+  m_detectorManager=new CavernInfraDetectorManager();
 
   const DataHandle<StoredMaterialManager> materialManager;
-  if (StatusCode::SUCCESS != detectorStore->retrieve(materialManager, std::string("MATERIALS"))) {
+  if (StatusCode::SUCCESS != m_detectorStore->retrieve(materialManager, std::string("MATERIALS"))) {
     return; 
   } 
 
@@ -71,7 +71,7 @@ void CavernInfraDetectorFactory01::create(GeoPhysVol *world)
   const GeoMaterial *shieldSteel      = materialManager->getMaterial("shield::ShieldSteel");
  
   // Get Recordset CavernElements.
-  IRDBRecordset_ptr cavernElements = access->getRecordsetPtr("CavernElements", "CavernElements-02");  
+  IRDBRecordset_ptr cavernElements = m_access->getRecordsetPtr("CavernElements", "CavernElements-02");  
  
   std::map<std::string, unsigned int> elementMap;
  
@@ -377,15 +377,15 @@ void CavernInfraDetectorFactory01::create(GeoPhysVol *world)
   
 
   //// NOW INSERT ALL OF THIS INTO THE WORLD.
-  detectorManager->addTreeTop(sx1);
-  detectorManager->addTreeTop(bedrock);  
+  m_detectorManager->addTreeTop(sx1);
+  m_detectorManager->addTreeTop(bedrock);  
 
   
 }
 
 const CavernInfraDetectorManager * CavernInfraDetectorFactory01::getDetectorManager() const
 {
-  return detectorManager;
+  return m_detectorManager;
 }
 
 void CavernInfraDetectorFactory01::setTagNode(std::string tag, std::string node)
diff --git a/AtlasGeometryCommon/CavernInfraGeoModel/src/CavernInfraDetectorFactory01.h b/AtlasGeometryCommon/CavernInfraGeoModel/src/CavernInfraDetectorFactory01.h
index cc3d217eac0862ea5636302ee03078bf7cb6c055..96c5446b175d00c417e99db5ff5d5338bca06bf7 100755
--- a/AtlasGeometryCommon/CavernInfraGeoModel/src/CavernInfraDetectorFactory01.h
+++ b/AtlasGeometryCommon/CavernInfraGeoModel/src/CavernInfraDetectorFactory01.h
@@ -40,10 +40,10 @@ class CavernInfraDetectorFactory01 : public GeoVDetectorFactory
   CavernInfraDetectorFactory01(const CavernInfraDetectorFactory01 &right);
   
   // The manager:
-  CavernInfraDetectorManager       *detectorManager;
+  CavernInfraDetectorManager       *m_detectorManager;
   
-  StoreGateSvc             *detectorStore;
-  IRDBAccessSvc            *access;
+  StoreGateSvc             *m_detectorStore;
+  IRDBAccessSvc            *m_access;
   std::string              m_versionTag;
   std::string              m_versionNode;
 };
diff --git a/AtlasGeometryCommon/CavernInfraGeoModel/src/CavernInfraDetectorTool.cxx b/AtlasGeometryCommon/CavernInfraGeoModel/src/CavernInfraDetectorTool.cxx
index 6050f9d731a500c1c73f0a93b65bd7706df9f927..db2970fbae256020bd30d2d71035cc0146ce95bd 100755
--- a/AtlasGeometryCommon/CavernInfraGeoModel/src/CavernInfraDetectorTool.cxx
+++ b/AtlasGeometryCommon/CavernInfraGeoModel/src/CavernInfraDetectorTool.cxx
@@ -98,9 +98,9 @@ StatusCode CavernInfraDetectorTool::create()
 
 StatusCode CavernInfraDetectorTool::clear()
 {
-  SG::DataProxy* _proxy = detStore()->proxy(ClassID_traits<CavernInfraDetectorManager>::ID(),m_manager->getName());
-  if(_proxy) {
-    _proxy->reset();
+  SG::DataProxy* proxy = detStore()->proxy(ClassID_traits<CavernInfraDetectorManager>::ID(),m_manager->getName());
+  if(proxy) {
+    proxy->reset();
     m_manager = 0;
   }
   return StatusCode::SUCCESS;