diff --git a/DDCore/python/dd4hep_base.py b/DDCore/python/dd4hep_base.py
index 73fa64fb07e749ff7b9e3a7cc487de075c116cc5..e2606b70951b169be1382266372f0bbad1b047b3 100644
--- a/DDCore/python/dd4hep_base.py
+++ b/DDCore/python/dd4hep_base.py
@@ -377,7 +377,7 @@ class CommandLine:
   \author  M.Frank
   \version 1.0
   """
-  def __init__(self, help=None):
+  def __init__(self, help=None):  # noqa: A002
     import sys
     self.data = {}
     help_call = help
diff --git a/DDG4/python/DDG4.py b/DDG4/python/DDG4.py
index 45192b2d092cca137d55bf0dc5fab19a6f8a7c73..a643d8dd6629a0d4df6c84e23661e1a773c30d89 100644
--- a/DDG4/python/DDG4.py
+++ b/DDG4/python/DDG4.py
@@ -127,7 +127,7 @@ def _registerGlobalAction(self, action):
   self.get().registerGlobalAction(Interface.toAction(action))
 
 
-def _registerGlobalFilter(self, filter):
+def _registerGlobalFilter(self, filter):  # noqa: A002
   self.get().registerGlobalFilter(Interface.toAction(filter))
 
 
@@ -667,29 +667,31 @@ class Geant4:
       return (seq, acts)
     return (seq, acts[0])
 
-  def setupCalorimeter(self, name, type=None, collections=None):
+  def setupCalorimeter(self, name, type=None, collections=None):  # noqa: A002
     """
     Setup subdetector of type 'calorimeter' and assign the proper sensitive action
 
     \author  M.Frank
     """
+    typ = type    # noqa: A002
     self.description.sensitiveDetector(str(name))
     # sd.setType('calorimeter')
-    if type is None:
-      type = self.sensitive_types['calorimeter']
-    return self.setupDetector(name, type, collections)
+    if typ is None:
+      typ = self.sensitive_types['calorimeter']
+    return self.setupDetector(name, typ, collections)
 
-  def setupTracker(self, name, type=None, collections=None):
+  def setupTracker(self, name, type=None, collections=None):  # noqa: A002
     """
     Setup subdetector of type 'tracker' and assign the proper sensitive action
 
     \author  M.Frank
     """
+    typ = type
     self.description.sensitiveDetector(str(name))
     # sd.setType('tracker')
-    if type is None:
-      type = self.sensitive_types['tracker']
-    return self.setupDetector(name, type, collections)
+    if typ is None:
+      typ = self.sensitive_types['tracker']
+    return self.setupDetector(name, typ, collections)
 
   def _private_setupField(self, field, stepper, equation, prt):
     import g4units