diff --git a/MuonSpectrometer/MuonCalib/NSWCalib/NSWCalibTools/python/NSWCalibToolsConfig.py b/MuonSpectrometer/MuonCalib/NSWCalib/NSWCalibTools/python/NSWCalibToolsConfig.py
index 1a39e95de5308b720e7387ce8d6a0c42433360c6..b9f8d0ac95a5e9533c7f758510f6a44f5c4ec810 100644
--- a/MuonSpectrometer/MuonCalib/NSWCalib/NSWCalibTools/python/NSWCalibToolsConfig.py
+++ b/MuonSpectrometer/MuonCalib/NSWCalib/NSWCalibTools/python/NSWCalibToolsConfig.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration 
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration 
 #
 # Import NSWCalibTools job properties
 #
@@ -11,4 +11,6 @@ def STgcCalibSmearingTool(name="STgcCalibSmearingTool",extraFlags=None,**kwargs)
     return CfgMgr.Muon__NSWCalibSmearingTool(name,**kwargs)
 
 def NSWCalibTool(name="NSWCalibTool",extraFlags=None,**kwargs):
+    from MuonRecExample.MuonRecTools import MuonIdHelperTool
+    kwargs.setdefault("MuonIdHelperTool", MuonIdHelperTool())
     return CfgMgr.Muon__NSWCalibTool(name,**kwargs)
diff --git a/MuonSpectrometer/MuonCalib/NSWCalib/NSWCalibTools/python/NSWCalibToolsConfigDb.py b/MuonSpectrometer/MuonCalib/NSWCalib/NSWCalibTools/python/NSWCalibToolsConfigDb.py
deleted file mode 100644
index f7c601c3d11140da758d61e6ad1d8e5e0051df6a..0000000000000000000000000000000000000000
--- a/MuonSpectrometer/MuonCalib/NSWCalib/NSWCalibTools/python/NSWCalibToolsConfigDb.py
+++ /dev/null
@@ -1,3 +0,0 @@
-from AthenaCommon.CfgGetter import addTool
-addTool("NSWCalibTools.NSWCalibToolsConfig.MMCalibSmearingTool","MMCalibSmearingTool")
-addTool("NSWCalibTools.NSWCalibToolsConfig.STgcCalibSmearingTool","STgcCalibSmearingTool")
diff --git a/MuonSpectrometer/MuonCalib/NSWCalib/NSWCalibTools/src/NSWCalibTool.cxx b/MuonSpectrometer/MuonCalib/NSWCalib/NSWCalibTools/src/NSWCalibTool.cxx
index eccaa712e8f00c3cf2dd72069bbb621a3ddb0663..b61b4f74dc8e09c77a56b27fc409ae85da96574d 100644
--- a/MuonSpectrometer/MuonCalib/NSWCalib/NSWCalibTools/src/NSWCalibTool.cxx
+++ b/MuonSpectrometer/MuonCalib/NSWCalib/NSWCalibTools/src/NSWCalibTool.cxx
@@ -17,6 +17,7 @@ Muon::NSWCalibTool::NSWCalibTool(const std::string& t,
   declareProperty("MagFieldSvc",   m_magFieldSvc, "Magnetic Field Service");
   declareProperty("DriftVelocity", m_vDrift = 47., "Drift Velocity");
   declareProperty("TimeResolution", m_timeRes = 25., "Time Resolution");
+  declareProperty("MuonIdHelperTool", m_idHelperTool);
 
 }
 
diff --git a/MuonSpectrometer/MuonDigitization/MM_Digitization/python/MM_DigitizationConfig.py b/MuonSpectrometer/MuonDigitization/MM_Digitization/python/MM_DigitizationConfig.py
index afe19a1785b25d25243d5d09cd9cb7d02999b17f..103b7d919b9f03612cbd898f01679157c9d8d994 100644
--- a/MuonSpectrometer/MuonDigitization/MM_Digitization/python/MM_DigitizationConfig.py
+++ b/MuonSpectrometer/MuonDigitization/MM_Digitization/python/MM_DigitizationConfig.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
 
 #
 # Import MM_Digitization job properties
@@ -30,7 +30,7 @@ def MM_DigitizationTool(name="MM_DigitizationTool",**kwargs):
     kwargs.setdefault("InputObjectName", "MicromegasSensitiveDetector")
     kwargs.setdefault("OutputObjectName", "MM_DIGITS")
     kwargs.setdefault("OutputSDOName", "MM_SDO")
-    kwargs.setdefault("SmearingTool","Muon::NSWCalibSmearingTool/MMCalibSmearingTool")
+    kwargs.setdefault("SmearingTool","MMCalibSmearingTool")
     if 'NewMerge' in jobproperties.Digitization.experimentalDigi():
         kwargs.setdefault("UseMcEventCollectionHelper",True)
     else:
diff --git a/MuonSpectrometer/MuonDigitization/sTGC_Digitization/python/sTGC_DigitizationConfig.py b/MuonSpectrometer/MuonDigitization/sTGC_Digitization/python/sTGC_DigitizationConfig.py
index f53a66217fb5d6e26ca23f1076473078ba0f5a53..551f9fe427832b7870462431241bcddcc0ce66e2 100644
--- a/MuonSpectrometer/MuonDigitization/sTGC_Digitization/python/sTGC_DigitizationConfig.py
+++ b/MuonSpectrometer/MuonDigitization/sTGC_Digitization/python/sTGC_DigitizationConfig.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
 
 #
 # Import sTGC_Digitization job properties
@@ -30,7 +30,7 @@ def sTgcDigitizationTool(name="sTgcDigitizationTool",**kwargs):
     kwargs.setdefault("OutputObjectName", "sTGC_DIGITS")
     kwargs.setdefault("OutputSDOName", "sTGC_SDO")
     kwargs.setdefault("doToFCorrection", True)
-    kwargs.setdefault("SmearingTool","Muon::NSWCalibSmearingTool/STgcCalibSmearingTool")
+    kwargs.setdefault("SmearingTool","STgcCalibSmearingTool")
     if 'NewMerge' in jobproperties.Digitization.experimentalDigi():
         kwargs.setdefault("UseMcEventCollectionHelper",True)
     else:
diff --git a/MuonSpectrometer/MuonReconstruction/MuonRecExample/python/MuonPrdProviderToolsConfig.py b/MuonSpectrometer/MuonReconstruction/MuonRecExample/python/MuonPrdProviderToolsConfig.py
index 18ef841502d798f661a9fb360f937a19cf5ce0b6..f0c2f0536970523339cbfa176035af4470372df5 100644
--- a/MuonSpectrometer/MuonReconstruction/MuonRecExample/python/MuonPrdProviderToolsConfig.py
+++ b/MuonSpectrometer/MuonReconstruction/MuonRecExample/python/MuonPrdProviderToolsConfig.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
 
 from AthenaCommon.Include import include
 
@@ -109,7 +109,7 @@ def CscRdoToCscPrepData(name="CscRdoToCscPrepData", **kwargs):
 #############################################################################
 def MM_PrepDataProviderTool(name="MM_PrepDataProviderTool", **kwargs): 
   kwargs.setdefault("ClusterBuilderTool","SimpleMMClusterBuilderTool")
-  kwargs.setdefault("NSWCalibTool","Muon::NSWCalibTool/NSWCalibTool")
+  kwargs.setdefault("NSWCalibTool","NSWCalibTool")
   from MuonMM_CnvTools.MuonMM_CnvToolsConf import Muon__MmRdoToPrepDataTool
   return Muon__MmRdoToPrepDataTool(name,**kwargs)
 
diff --git a/MuonSpectrometer/MuonReconstruction/MuonRecExample/python/MuonRecExampleConfigDb.py b/MuonSpectrometer/MuonReconstruction/MuonRecExample/python/MuonRecExampleConfigDb.py
index 271f1efead1dd63c18b33e198a45a47bbb3b2d4e..84fe9b4c54ef612b8e8ca08b8263e1a95f9885c0 100644
--- a/MuonSpectrometer/MuonReconstruction/MuonRecExample/python/MuonRecExampleConfigDb.py
+++ b/MuonSpectrometer/MuonReconstruction/MuonRecExample/python/MuonRecExampleConfigDb.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
 
 from AthenaCommon.CfgGetter import addTool, addToolClone, addService, addAlgorithm, \
      addTypesToExcludeIfDefaultValue, addNamesToExcludeIfDefaultValue, addFullNamesToExcludeIfDefaultValue, \
@@ -17,10 +17,9 @@ addTypesOnlyToSkip( "ICaloNoiseTool" )
 # Tools from other packages
 ################################################################################
 
-# put this here until it is set in the appropriate package
+# put this here until it is set in the appropriate package (needed for Trigger_topOptions_standalone.py", line 141)
 addTool("TrkExTools.AtlasExtrapolator.AtlasExtrapolator","AtlasExtrapolator")
 
-
 ################################################################################
 # Tools from MuonRecExample.MuonRecTools
 ################################################################################
@@ -104,8 +103,6 @@ addTool( "Muon::MuonTruthSummaryTool","MuonTruthSummaryTool")
 
 addTool( "Muon::MuonClusterizationTool","MuonClusterizationTool" )
 
-addTool( "NSWCalibTools.NSWCalibToolsConfig.NSWCalibTool","NSWCalibTool" )
-
 # Set some Muon Properties in the global ResidualPullCalculator
 # Those values should be in the C++ defaults really
 addTool("Trk::ResidualPullCalculator","ResidualPullCalculator",
@@ -232,6 +229,10 @@ addTool("MuonRecExample.NSWTools.ProjectionMMClusterBuilderTool","ProjectionMMCl
 addTool("MuonRecExample.NSWTools.ConstraintAngleMMClusterBuilderTool","ConstraintAngleMMClusterBuilderTool")
 addTool("MuonRecExample.NSWTools.SimpleSTgcClusterBuilderTool","SimpleSTgcClusterBuilderTool")
 
+addTool("NSWCalibTools.NSWCalibToolsConfig.MMCalibSmearingTool","MMCalibSmearingTool")
+addTool("NSWCalibTools.NSWCalibToolsConfig.STgcCalibSmearingTool","STgcCalibSmearingTool")
+addTool("NSWCalibTools.NSWCalibToolsConfig.NSWCalibTool","NSWCalibTool")
+
 ################################################################################
 # Tools from MuonRecExample.MuPatTools
 ################################################################################
diff --git a/MuonSpectrometer/MuonReconstruction/MuonRecExample/share/MuonRec_jobOptions.py b/MuonSpectrometer/MuonReconstruction/MuonRecExample/share/MuonRec_jobOptions.py
index 792402dcf7aac661d707b32a85cb66781e5888ec..786d40553a9d23f55da905be5a0c113aa219689d 100644
--- a/MuonSpectrometer/MuonReconstruction/MuonRecExample/share/MuonRec_jobOptions.py
+++ b/MuonSpectrometer/MuonReconstruction/MuonRecExample/share/MuonRec_jobOptions.py
@@ -1,3 +1,5 @@
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+#
 ## @file MuonRec_jobOptions.py
 #
 # @brief Main jobOptions to setup muon reconstruction. Main muon entry point for RecExCommon.
@@ -24,7 +26,6 @@ from AtlasGeoModel.MuonGMJobProperties import MuonGeometryFlags
 from RecExConfig.RecFlags import rec
 from RecExConfig.RecAlgsFlags import recAlgs
 from MuonRecExample.MuonAlignFlags import muonAlignFlags
-from MuonRecExample.MuonRecTools import MuonIdHelperTool
 
 muonRecFlags.setDefaults()
 
@@ -34,11 +35,11 @@ if muonRecFlags.doCSCs() and not MuonGeometryFlags.hasCSC(): muonRecFlags.doCSCs
 if muonRecFlags.dosTGCs() and not MuonGeometryFlags.hasSTGC(): muonRecFlags.dosTGCs = False
 if muonRecFlags.doMicromegas() and not MuonGeometryFlags.hasMM(): muonRecFlags.doMicromegas = False
 
-
 # ESDtoAOD and AODtoTAG need a configured MuonIdHelperTool (e.g. for the RPC_ResidualPullCalculator)
 # Since it is not automatically created by the job configuration (as for RDOtoESD),
 # do it here manually (hope this will be fixed with the movement to the new configuration for release 22)
 if rec.readESD() or rec.readAOD():
+    from MuonRecExample.MuonRecTools import MuonIdHelperTool
     MuonIdHelperTool()
 
 if muonRecFlags.doDigitization():