diff --git a/DDG4/src/Geant4SensitiveDetector.cpp b/DDG4/src/Geant4SensitiveDetector.cpp
index 669a06a06938cdd754a3f183505334d1230d6df0..ca29a5a168794c384a4ce1179d0769016eb20b95 100644
--- a/DDG4/src/Geant4SensitiveDetector.cpp
+++ b/DDG4/src/Geant4SensitiveDetector.cpp
@@ -218,8 +218,8 @@ long long Geant4SensitiveDetector::getVolumeID(G4Step* aStep) {
 }
 
 
-long long Geant4SensitiveDetector::getCellID(G4Step* s) {
-  StepHandler h(s);
+long long Geant4SensitiveDetector::getCellID(G4Step* step) {
+  StepHandler h(step);
   Geant4VolumeManager volMgr = Geant4Mapping::instance().volumeManager();
   VolumeID            volID  = volMgr.volumeID(h.preTouchable());
   Segmentation        seg    = m_readout.segmentation();
diff --git a/DDRec/src/MaterialScan.cpp b/DDRec/src/MaterialScan.cpp
index 84647c7cb7461bb64cd4db9f4eecf8b172da3bad..5a4130e74820c24f6f8fa2a6c8eab2c6071af4fa 100644
--- a/DDRec/src/MaterialScan.cpp
+++ b/DDRec/src/MaterialScan.cpp
@@ -141,11 +141,11 @@ void MaterialScan::setMaterial(Material material)   {
   struct PvCollector  {
     Material material;
     std::set<const TGeoNode*>& cont;
-    PvCollector(Material m, std::set<const TGeoNode*>& c) : material(m), cont(c) {}
+    PvCollector(Material mat, std::set<const TGeoNode*>& c) : material(mat), cont(c) {}
     void operator()(TGeoNode* pv)    {
-      Volume   v = pv->GetVolume();
-      Material m = v.material();
-      if ( m.ptr() == material.ptr() )  {
+      Volume   vol = pv->GetVolume();
+      Material mat = vol.material();
+      if ( mat.ptr() == material.ptr() )  {
         cont.insert(pv);
       }
       for (Int_t idau = 0, ndau = pv->GetNdaughters(); idau < ndau; ++idau)