diff --git a/DDCore/src/AlignmentsCalculator.cpp b/DDCore/src/AlignmentsCalculator.cpp
index 5f058888d12485d42aa7fa3db908e7a674afbec2..5d4325eccb7e6133e67b2aa1a9cf55d0b03d47ce 100644
--- a/DDCore/src/AlignmentsCalculator.cpp
+++ b/DDCore/src/AlignmentsCalculator.cpp
@@ -279,9 +279,9 @@ size_t AlignmentsCalculator::extract_deltas(DetElement start,
         : delta_conditions(d), extract_context(e), effective_iov(eff_iov) {}
       /// Conditions callback for object processing
       virtual int process(Condition c)  const override  {
-        ConditionKey::KeyMaker km(c->hash);
-        if ( km.values.item_key == align::Keys::deltaKey )   {
-          auto idd = extract_context.find(km.values.det_key);
+        ConditionKey::KeyMaker key_maker(c->hash);
+        if ( key_maker.values.item_key == align::Keys::deltaKey )   {
+          auto idd = extract_context.find(key_maker.values.det_key);
           if ( idd != extract_context.end() )   {
             const Delta& d  = c.get<Delta>();
             DetElement   de = idd->second;
diff --git a/DDCore/src/AlignmentsPrinter.cpp b/DDCore/src/AlignmentsPrinter.cpp
index 1aa84cdef781f78725c9cf47e4592f04bdd45d85..eb64e476260a1f591db6b886f9f1046b9b429376 100644
--- a/DDCore/src/AlignmentsPrinter.cpp
+++ b/DDCore/src/AlignmentsPrinter.cpp
@@ -27,8 +27,8 @@ using namespace dd4hep;
 using namespace dd4hep::align;
 
 /// Initializing constructor
-AlignmentsPrinter::AlignmentsPrinter(ConditionsMap* m, const string& pref, int flg)
-  : mapping(m), name("Alignment"), prefix(pref), printLevel(INFO), m_flag(flg)
+AlignmentsPrinter::AlignmentsPrinter(ConditionsMap* cond_map, const string& pref, int flg)
+  : mapping(cond_map), name("Alignment"), prefix(pref), printLevel(INFO), m_flag(flg)
 {
 }
 
@@ -55,8 +55,8 @@ int AlignmentsPrinter::operator()(DetElement de, int level)  const   {
 }
 
 /// Initializing constructor
-AlignedVolumePrinter::AlignedVolumePrinter(ConditionsMap* m, const string& pref,int flg)
-  : AlignmentsPrinter(m, pref, flg)
+AlignedVolumePrinter::AlignedVolumePrinter(ConditionsMap* cond_map, const string& pref,int flg)
+  : AlignmentsPrinter(cond_map, pref, flg)
 {
   name = "Alignment";
 }
diff --git a/cmake/DD4hepBuild.cmake b/cmake/DD4hepBuild.cmake
index 63034a8f58da56a2ffcb6c96e4c434b71e31abf8..fe2dd966f2c614d548352d7c0fdd697ea5347ffe 100644
--- a/cmake/DD4hepBuild.cmake
+++ b/cmake/DD4hepBuild.cmake
@@ -36,7 +36,7 @@ endmacro(dd4hep_to_parent_scope)
 macro(dd4hep_set_compiler_flags)
   include(CheckCXXCompilerFlag)
 
-  SET(COMPILER_FLAGS -Wall -Wextra -pedantic -Wshadow -Wformat-security -Wno-long-long -Wdeprecated -fdiagnostics-color=auto)
+  SET(COMPILER_FLAGS -Wall -Wextra -pedantic -Wshadow -Wformat-security -Wno-long-long -Wdeprecated -Wshadow -fdiagnostics-color=auto)
 
   # AppleClang/Clang specific warning flags
   if(CMAKE_CXX_COMPILER_ID MATCHES "^(Apple)?Clang$")