diff --git a/MuonSpectrometer/MuonCnv/MuonByteStreamCnvTest/python/MuonByteStreamCnvTestConfigDb.py b/MuonSpectrometer/MuonCnv/MuonByteStreamCnvTest/python/MuonByteStreamCnvTestConfigDb.py
index c476c606a753a4dd4b07737f26d738d2011c4974..488abec63fda2021eb6e980321d99b3b5f7e634a 100644
--- a/MuonSpectrometer/MuonCnv/MuonByteStreamCnvTest/python/MuonByteStreamCnvTestConfigDb.py
+++ b/MuonSpectrometer/MuonCnv/MuonByteStreamCnvTest/python/MuonByteStreamCnvTestConfigDb.py
@@ -3,22 +3,22 @@
 from AthenaCommon.CfgGetter import addAlgorithm, addTool
 
 
-addAlgorithm("MuonByteStreamCnvTest.MuonByteStreamCnvTestConfig.getMdtRdoToMdtDigitAlg", "MdtRdoToMdtDigitAlg")
-addAlgorithm("MuonByteStreamCnvTest.MuonByteStreamCnvTestConfig.getRpcRdoToRpcDigitAlg", "RpcRdoToRpcDigitAlg")
-addAlgorithm("MuonByteStreamCnvTest.MuonByteStreamCnvTestConfig.getTgcRdoToTgcDigitAlg", "TgcRdoToTgcDigitAlg")
-addAlgorithm("MuonByteStreamCnvTest.MuonByteStreamCnvTestConfig.getSTGC_RdoToDigitAlg", "STGC_RdoToDigitAlg")
-addAlgorithm("MuonByteStreamCnvTest.MuonByteStreamCnvTestConfig.getMM_RdoToDigitAlg", "MM_RdoToDigitAlg")
+addAlgorithm("MuonByteStreamCnvTest.MuonByteStreamCnvTestConfigLegacy.getMdtRdoToMdtDigitAlg", "MdtRdoToMdtDigitAlg")
+addAlgorithm("MuonByteStreamCnvTest.MuonByteStreamCnvTestConfigLegacy.getRpcRdoToRpcDigitAlg", "RpcRdoToRpcDigitAlg")
+addAlgorithm("MuonByteStreamCnvTest.MuonByteStreamCnvTestConfigLegacy.getTgcRdoToTgcDigitAlg", "TgcRdoToTgcDigitAlg")
+addAlgorithm("MuonByteStreamCnvTest.MuonByteStreamCnvTestConfigLegacy.getSTGC_RdoToDigitAlg", "STGC_RdoToDigitAlg")
+addAlgorithm("MuonByteStreamCnvTest.MuonByteStreamCnvTestConfigLegacy.getMM_RdoToDigitAlg", "MM_RdoToDigitAlg")
 
-addAlgorithm("MuonByteStreamCnvTest.MuonByteStreamCnvTestConfig.getMdtDigitToMdtRDO" , "MdtDigitToMdtRDO")
-addAlgorithm("MuonByteStreamCnvTest.MuonByteStreamCnvTestConfig.getRpcDigitToRpcRDO" , "RpcDigitToRpcRDO")
-addAlgorithm("MuonByteStreamCnvTest.MuonByteStreamCnvTestConfig.getTgcDigitToTgcRDO" , "TgcDigitToTgcRDO")
-addAlgorithm("MuonByteStreamCnvTest.MuonByteStreamCnvTestConfig.getSTGC_DigitToRDO" , "STGC_DigitToRDO")
-addAlgorithm("MuonByteStreamCnvTest.MuonByteStreamCnvTestConfig.getMM_DigitToRDO" , "MM_DigitToRDO")
+addAlgorithm("MuonByteStreamCnvTest.MuonByteStreamCnvTestConfigLegacy.getMdtDigitToMdtRDO" , "MdtDigitToMdtRDO")
+addAlgorithm("MuonByteStreamCnvTest.MuonByteStreamCnvTestConfigLegacy.getRpcDigitToRpcRDO" , "RpcDigitToRpcRDO")
+addAlgorithm("MuonByteStreamCnvTest.MuonByteStreamCnvTestConfigLegacy.getTgcDigitToTgcRDO" , "TgcDigitToTgcRDO")
+addAlgorithm("MuonByteStreamCnvTest.MuonByteStreamCnvTestConfigLegacy.getSTGC_DigitToRDO" , "STGC_DigitToRDO")
+addAlgorithm("MuonByteStreamCnvTest.MuonByteStreamCnvTestConfigLegacy.getMM_DigitToRDO" , "MM_DigitToRDO")
 
-addAlgorithm("MuonByteStreamCnvTest.MuonByteStreamCnvTestConfig.getSigMdtDigitToMdtRDO" , "SigMdtDigitToMdtRDO")
-addAlgorithm("MuonByteStreamCnvTest.MuonByteStreamCnvTestConfig.getSigRpcDigitToRpcRDO" , "SigRpcDigitToRpcRDO")
-addAlgorithm("MuonByteStreamCnvTest.MuonByteStreamCnvTestConfig.getSigTgcDigitToTgcRDO" , "SigTgcDigitToTgcRDO")
+addAlgorithm("MuonByteStreamCnvTest.MuonByteStreamCnvTestConfigLegacy.getSigMdtDigitToMdtRDO" , "SigMdtDigitToMdtRDO")
+addAlgorithm("MuonByteStreamCnvTest.MuonByteStreamCnvTestConfigLegacy.getSigRpcDigitToRpcRDO" , "SigRpcDigitToRpcRDO")
+addAlgorithm("MuonByteStreamCnvTest.MuonByteStreamCnvTestConfigLegacy.getSigTgcDigitToTgcRDO" , "SigTgcDigitToTgcRDO")
 
-addTool("MuonByteStreamCnvTest.MuonByteStreamCnvTestConfig.getCscRdoDecoder", "CscRDO_Decoder")
-addTool("MuonByteStreamCnvTest.MuonByteStreamCnvTestConfig.getsTgcRdoDecoder", "STGC_RDO_Decoder")
-addTool("MuonByteStreamCnvTest.MuonByteStreamCnvTestConfig.getMmRdoDecoder", "MM_RDO_Decoder")
+addTool("MuonByteStreamCnvTest.MuonByteStreamCnvTestConfigLegacy.getCscRdoDecoder", "CscRDO_Decoder")
+addTool("MuonByteStreamCnvTest.MuonByteStreamCnvTestConfigLegacy.getsTgcRdoDecoder", "STGC_RDO_Decoder")
+addTool("MuonByteStreamCnvTest.MuonByteStreamCnvTestConfigLegacy.getMmRdoDecoder", "MM_RDO_Decoder")
diff --git a/MuonSpectrometer/MuonCnv/MuonByteStreamCnvTest/python/MuonByteStreamCnvTestConfig.py b/MuonSpectrometer/MuonCnv/MuonByteStreamCnvTest/python/MuonByteStreamCnvTestConfigLegacy.py
similarity index 100%
rename from MuonSpectrometer/MuonCnv/MuonByteStreamCnvTest/python/MuonByteStreamCnvTestConfig.py
rename to MuonSpectrometer/MuonCnv/MuonByteStreamCnvTest/python/MuonByteStreamCnvTestConfigLegacy.py
diff --git a/MuonSpectrometer/MuonDigitization/CSC_Digitization/python/CSC_DigitizationConfigDb.py b/MuonSpectrometer/MuonDigitization/CSC_Digitization/python/CSC_DigitizationConfigDb.py
index 5c655be0badfbb79fd2cfa7fb9a89496b8e58aab..0290ec960b7fe3ba344290031c306b4121603b13 100644
--- a/MuonSpectrometer/MuonDigitization/CSC_Digitization/python/CSC_DigitizationConfigDb.py
+++ b/MuonSpectrometer/MuonDigitization/CSC_Digitization/python/CSC_DigitizationConfigDb.py
@@ -2,7 +2,7 @@
 
 from AthenaCommon.CfgGetter import addTool
 
-addTool("CSC_Digitization.CSC_DigitizationConfig.getCscDigitizationTool" , "CscDigitizationTool")
-addTool("CSC_Digitization.CSC_DigitizationConfig.getCscOverlayDigitizationTool" , "CscOverlayDigitizationTool")
-addTool("CSC_Digitization.CSC_DigitizationConfig.getCscOverlayDigitBuilder" , "CscOverlayDigitBuilder")
-addTool("CSC_Digitization.CSC_DigitizationConfig.getCscRange"         , "CscRange")
+addTool("CSC_Digitization.CSC_DigitizationConfigLegacy.getCscDigitizationTool" , "CscDigitizationTool")
+addTool("CSC_Digitization.CSC_DigitizationConfigLegacy.getCscOverlayDigitizationTool" , "CscOverlayDigitizationTool")
+addTool("CSC_Digitization.CSC_DigitizationConfigLegacy.getCscOverlayDigitBuilder" , "CscOverlayDigitBuilder")
+addTool("CSC_Digitization.CSC_DigitizationConfigLegacy.getCscRange"         , "CscRange")
diff --git a/MuonSpectrometer/MuonDigitization/CSC_Digitization/python/CSC_DigitizationConfig.py b/MuonSpectrometer/MuonDigitization/CSC_Digitization/python/CSC_DigitizationConfigLegacy.py
similarity index 100%
rename from MuonSpectrometer/MuonDigitization/CSC_Digitization/python/CSC_DigitizationConfig.py
rename to MuonSpectrometer/MuonDigitization/CSC_Digitization/python/CSC_DigitizationConfigLegacy.py
diff --git a/MuonSpectrometer/MuonDigitization/MDT_Digitization/python/MDT_DigitizationConfigDb.py b/MuonSpectrometer/MuonDigitization/MDT_Digitization/python/MDT_DigitizationConfigDb.py
index 8df8ca54fed057d79fc828c2e45d668fc501926e..bbbb39fa8e868490ac5ff5d4157663c604856361 100644
--- a/MuonSpectrometer/MuonDigitization/MDT_Digitization/python/MDT_DigitizationConfigDb.py
+++ b/MuonSpectrometer/MuonDigitization/MDT_Digitization/python/MDT_DigitizationConfigDb.py
@@ -2,10 +2,10 @@
 
 from AthenaCommon.CfgGetter import addTool, addAlgorithm
 
-addTool("MDT_Digitization.MdtDigitizationConfig.MdtDigitizationTool"     , "MdtDigitizationTool")
-addTool("MDT_Digitization.MdtDigitizationConfig.RT_Relation_DB_DigiTool" , "RT_Relation_DB_DigiTool")
-addTool("MDT_Digitization.MdtDigitizationConfig.MDT_Response_DigiTool"   , "MDT_Response_DigiTool")
-addTool("MDT_Digitization.MdtDigitizationConfig.getMdtRange"             , "MdtRange")
-addTool("MDT_Digitization.MdtDigitizationConfig.Mdt_OverlayDigitizationTool", "Mdt_OverlayDigitizationTool")
-addAlgorithm("MDT_Digitization.MdtDigitizationConfig.getMDT_OverlayDigitizer", "MDT_OverlayDigitizer")
+addTool("MDT_Digitization.MdtDigitizationConfigLegacy.MdtDigitizationTool"     , "MdtDigitizationTool")
+addTool("MDT_Digitization.MdtDigitizationConfigLegacy.RT_Relation_DB_DigiTool" , "RT_Relation_DB_DigiTool")
+addTool("MDT_Digitization.MdtDigitizationConfigLegacy.MDT_Response_DigiTool"   , "MDT_Response_DigiTool")
+addTool("MDT_Digitization.MdtDigitizationConfigLegacy.getMdtRange"             , "MdtRange")
+addTool("MDT_Digitization.MdtDigitizationConfigLegacy.Mdt_OverlayDigitizationTool", "Mdt_OverlayDigitizationTool")
+addAlgorithm("MDT_Digitization.MdtDigitizationConfigLegacy.getMDT_OverlayDigitizer", "MDT_OverlayDigitizer")
 
diff --git a/MuonSpectrometer/MuonDigitization/MDT_Digitization/python/MdtDigitizationConfig.py b/MuonSpectrometer/MuonDigitization/MDT_Digitization/python/MdtDigitizationConfigLegacy.py
similarity index 100%
rename from MuonSpectrometer/MuonDigitization/MDT_Digitization/python/MdtDigitizationConfig.py
rename to MuonSpectrometer/MuonDigitization/MDT_Digitization/python/MdtDigitizationConfigLegacy.py
diff --git a/MuonSpectrometer/MuonDigitization/MM_Digitization/python/MM_DigitizationConfigDb.py b/MuonSpectrometer/MuonDigitization/MM_Digitization/python/MM_DigitizationConfigDb.py
index 37e7b9847a9901cb597f3649c91fbe543cac45fa..4609cd9f627dc7108aa42d8835653ae2739c76c9 100644
--- a/MuonSpectrometer/MuonDigitization/MM_Digitization/python/MM_DigitizationConfigDb.py
+++ b/MuonSpectrometer/MuonDigitization/MM_Digitization/python/MM_DigitizationConfigDb.py
@@ -1,7 +1,7 @@
 # Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
 
 from AthenaCommon.CfgGetter import addTool,addAlgorithm
-addTool("MM_Digitization.MM_DigitizationConfig.MM_DigitizationTool","MM_DigitizationTool")
-addTool("MM_Digitization.MM_DigitizationConfig.getMMRange", "MMRange")
-addTool("MM_Digitization.MM_DigitizationConfig.MM_OverlayDigitizationTool", "MM_OverlayDigitizationTool")
-addAlgorithm("MM_Digitization.MM_DigitizationConfig.getMM_OverlayDigitizer", "MM_OverlayDigitizer")
+addTool("MM_Digitization.MM_DigitizationConfigLegacy.MM_DigitizationTool","MM_DigitizationTool")
+addTool("MM_Digitization.MM_DigitizationConfigLegacy.getMMRange", "MMRange")
+addTool("MM_Digitization.MM_DigitizationConfigLegacy.MM_OverlayDigitizationTool", "MM_OverlayDigitizationTool")
+addAlgorithm("MM_Digitization.MM_DigitizationConfigLegacy.getMM_OverlayDigitizer", "MM_OverlayDigitizer")
diff --git a/MuonSpectrometer/MuonDigitization/MM_Digitization/python/MM_DigitizationConfig.py b/MuonSpectrometer/MuonDigitization/MM_Digitization/python/MM_DigitizationConfigLegacy.py
similarity index 100%
rename from MuonSpectrometer/MuonDigitization/MM_Digitization/python/MM_DigitizationConfig.py
rename to MuonSpectrometer/MuonDigitization/MM_Digitization/python/MM_DigitizationConfigLegacy.py
diff --git a/MuonSpectrometer/MuonDigitization/RPC_Digitization/python/RPC_DigitizationConfigDb.py b/MuonSpectrometer/MuonDigitization/RPC_Digitization/python/RPC_DigitizationConfigDb.py
index 051c85e257b33c3c14af7342fd8fa850ff0a9961..56fd3c7831a86f42f64afabf594a86c8c22a1d29 100644
--- a/MuonSpectrometer/MuonDigitization/RPC_Digitization/python/RPC_DigitizationConfigDb.py
+++ b/MuonSpectrometer/MuonDigitization/RPC_Digitization/python/RPC_DigitizationConfigDb.py
@@ -2,7 +2,7 @@
 
 from AthenaCommon.CfgGetter import addTool, addAlgorithm
 
-addTool("RPC_Digitization.RPC_DigitizationConfig.RpcDigitizationTool" , "RpcDigitizationTool")
-addTool("RPC_Digitization.RPC_DigitizationConfig.getRpcRange"         , "RpcRange")
-addTool("RPC_Digitization.RPC_DigitizationConfig.Rpc_OverlayDigitizationTool" , "Rpc_OverlayDigitizationTool")
-addAlgorithm("RPC_Digitization.RPC_DigitizationConfig.getRPC_OverlayDigitizer" , "RPC_OverlayDigitizer")
+addTool("RPC_Digitization.RPC_DigitizationConfigLegacy.RpcDigitizationTool" , "RpcDigitizationTool")
+addTool("RPC_Digitization.RPC_DigitizationConfigLegacy.getRpcRange"         , "RpcRange")
+addTool("RPC_Digitization.RPC_DigitizationConfigLegacy.Rpc_OverlayDigitizationTool" , "Rpc_OverlayDigitizationTool")
+addAlgorithm("RPC_Digitization.RPC_DigitizationConfigLegacy.getRPC_OverlayDigitizer" , "RPC_OverlayDigitizer")
diff --git a/MuonSpectrometer/MuonDigitization/RPC_Digitization/python/RPC_DigitizationConfig.py b/MuonSpectrometer/MuonDigitization/RPC_Digitization/python/RPC_DigitizationConfigLegacy.py
similarity index 100%
rename from MuonSpectrometer/MuonDigitization/RPC_Digitization/python/RPC_DigitizationConfig.py
rename to MuonSpectrometer/MuonDigitization/RPC_Digitization/python/RPC_DigitizationConfigLegacy.py
diff --git a/MuonSpectrometer/MuonDigitization/TGC_Digitization/python/TGC_DigitizationConfigDb.py b/MuonSpectrometer/MuonDigitization/TGC_Digitization/python/TGC_DigitizationConfigDb.py
index f82cf846cd338918493c3c4779c890fb46edaa54..c13fce561a5770556fcfb0f67361e5fceac74d77 100644
--- a/MuonSpectrometer/MuonDigitization/TGC_Digitization/python/TGC_DigitizationConfigDb.py
+++ b/MuonSpectrometer/MuonDigitization/TGC_Digitization/python/TGC_DigitizationConfigDb.py
@@ -2,7 +2,7 @@
 
 from AthenaCommon.CfgGetter import addTool, addAlgorithm
 
-addTool("TGC_Digitization.TGC_DigitizationConfig.TgcDigitizationTool" , "TgcDigitizationTool")
-addTool("TGC_Digitization.TGC_DigitizationConfig.getTgcRange"         , "TgcRange")
-addTool("TGC_Digitization.TGC_DigitizationConfig.Tgc_OverlayDigitizationTool" , "Tgc_OverlayDigitizationTool")
-addAlgorithm("TGC_Digitization.TGC_DigitizationConfig.getTGC_OverlayDigitizer" , "TGC_OverlayDigitizer")
+addTool("TGC_Digitization.TGC_DigitizationConfigLegacy.TgcDigitizationTool" , "TgcDigitizationTool")
+addTool("TGC_Digitization.TGC_DigitizationConfigLegacy.getTgcRange"         , "TgcRange")
+addTool("TGC_Digitization.TGC_DigitizationConfigLegacy.Tgc_OverlayDigitizationTool" , "Tgc_OverlayDigitizationTool")
+addAlgorithm("TGC_Digitization.TGC_DigitizationConfigLegacy.getTGC_OverlayDigitizer" , "TGC_OverlayDigitizer")
diff --git a/MuonSpectrometer/MuonDigitization/TGC_Digitization/python/TGC_DigitizationConfig.py b/MuonSpectrometer/MuonDigitization/TGC_Digitization/python/TGC_DigitizationConfigLegacy.py
similarity index 100%
rename from MuonSpectrometer/MuonDigitization/TGC_Digitization/python/TGC_DigitizationConfig.py
rename to MuonSpectrometer/MuonDigitization/TGC_Digitization/python/TGC_DigitizationConfigLegacy.py
diff --git a/MuonSpectrometer/MuonDigitization/sTGC_Digitization/python/sTGC_DigitizationConfigDb.py b/MuonSpectrometer/MuonDigitization/sTGC_Digitization/python/sTGC_DigitizationConfigDb.py
index 9f9b5aa01dabbe221de538b544042f7859c7f925..535eeff629d08524bea170638edf34d788592555 100644
--- a/MuonSpectrometer/MuonDigitization/sTGC_Digitization/python/sTGC_DigitizationConfigDb.py
+++ b/MuonSpectrometer/MuonDigitization/sTGC_Digitization/python/sTGC_DigitizationConfigDb.py
@@ -1,7 +1,7 @@
 # Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
 
 from AthenaCommon.CfgGetter import addTool,addAlgorithm
-addTool("sTGC_Digitization.sTGC_DigitizationConfig.sTgcDigitizationTool","sTgcDigitizationTool")
-addTool("sTGC_Digitization.sTGC_DigitizationConfig.getSTGCRange","sTgcRange")
-addTool("sTGC_Digitization.sTGC_DigitizationConfig.STGC_OverlayDigitizationTool", "STGC_OverlayDigitizationTool")
-addAlgorithm("sTGC_Digitization.sTGC_DigitizationConfig.getSTGC_OverlayDigitizer", "STGC_OverlayDigitizer")
+addTool("sTGC_Digitization.sTGC_DigitizationConfigLegacy.sTgcDigitizationTool","sTgcDigitizationTool")
+addTool("sTGC_Digitization.sTGC_DigitizationConfigLegacy.getSTGCRange","sTgcRange")
+addTool("sTGC_Digitization.sTGC_DigitizationConfigLegacy.STGC_OverlayDigitizationTool", "STGC_OverlayDigitizationTool")
+addAlgorithm("sTGC_Digitization.sTGC_DigitizationConfigLegacy.getSTGC_OverlayDigitizer", "STGC_OverlayDigitizer")
diff --git a/MuonSpectrometer/MuonDigitization/sTGC_Digitization/python/sTGC_DigitizationConfig.py b/MuonSpectrometer/MuonDigitization/sTGC_Digitization/python/sTGC_DigitizationConfigLegacy.py
similarity index 100%
rename from MuonSpectrometer/MuonDigitization/sTGC_Digitization/python/sTGC_DigitizationConfig.py
rename to MuonSpectrometer/MuonDigitization/sTGC_Digitization/python/sTGC_DigitizationConfigLegacy.py
diff --git a/MuonSpectrometer/MuonOverlay/CscOverlay/python/CscOverlayConfigDb.py b/MuonSpectrometer/MuonOverlay/CscOverlay/python/CscOverlayConfigDb.py
index f56feb1fd4a20b6920ededdcaa71f1d1ebe700a9..4465868a628aa4fefc8884331f37a5ac635cb14e 100644
--- a/MuonSpectrometer/MuonOverlay/CscOverlay/python/CscOverlayConfigDb.py
+++ b/MuonSpectrometer/MuonOverlay/CscOverlay/python/CscOverlayConfigDb.py
@@ -1,4 +1,4 @@
 # Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
 
 from AthenaCommon.CfgGetter import addAlgorithm
-addAlgorithm("CscOverlay.CscOverlayConfig.getCscOverlay", "CscOverlay")
+addAlgorithm("CscOverlay.CscOverlayConfigLegacy.getCscOverlay", "CscOverlay")
diff --git a/MuonSpectrometer/MuonOverlay/CscOverlay/python/CscOverlayConfig.py b/MuonSpectrometer/MuonOverlay/CscOverlay/python/CscOverlayConfigLegacy.py
similarity index 100%
rename from MuonSpectrometer/MuonOverlay/CscOverlay/python/CscOverlayConfig.py
rename to MuonSpectrometer/MuonOverlay/CscOverlay/python/CscOverlayConfigLegacy.py
diff --git a/MuonSpectrometer/MuonOverlay/MM_Overlay/python/MM_OverlayConfigDb.py b/MuonSpectrometer/MuonOverlay/MM_Overlay/python/MM_OverlayConfigDb.py
index 7aae38c9ee96953ca11c82fbd83b61dcef5cb12a..5a4190b8e4a4b34285e971744341a89c31c0db3e 100644
--- a/MuonSpectrometer/MuonOverlay/MM_Overlay/python/MM_OverlayConfigDb.py
+++ b/MuonSpectrometer/MuonOverlay/MM_Overlay/python/MM_OverlayConfigDb.py
@@ -2,4 +2,4 @@
 
 from AthenaCommon.CfgGetter import addAlgorithm
 
-addAlgorithm("MM_Overlay.MM_OverlayConfig.getMM_Overlay", "MM_Overlay")
+addAlgorithm("MM_Overlay.MM_OverlayConfigLegacy.getMM_Overlay", "MM_Overlay")
diff --git a/MuonSpectrometer/MuonOverlay/MM_Overlay/python/MM_OverlayConfig.py b/MuonSpectrometer/MuonOverlay/MM_Overlay/python/MM_OverlayConfigLegacy.py
similarity index 100%
rename from MuonSpectrometer/MuonOverlay/MM_Overlay/python/MM_OverlayConfig.py
rename to MuonSpectrometer/MuonOverlay/MM_Overlay/python/MM_OverlayConfigLegacy.py
diff --git a/MuonSpectrometer/MuonOverlay/MdtOverlay/python/MdtOverlayConfigDb.py b/MuonSpectrometer/MuonOverlay/MdtOverlay/python/MdtOverlayConfigDb.py
index af1042f4874614e5a12f789fb5876d929d61b5b8..84605f27658920dc01cc90619c6bbfba8c321ffa 100644
--- a/MuonSpectrometer/MuonOverlay/MdtOverlay/python/MdtOverlayConfigDb.py
+++ b/MuonSpectrometer/MuonOverlay/MdtOverlay/python/MdtOverlayConfigDb.py
@@ -2,4 +2,4 @@
 
 from AthenaCommon.CfgGetter import addAlgorithm
 
-addAlgorithm("MdtOverlay.MdtOverlayConfig.getMdtOverlay", "MdtOverlay")
+addAlgorithm("MdtOverlay.MdtOverlayConfigLegacy.getMdtOverlay", "MdtOverlay")
diff --git a/MuonSpectrometer/MuonOverlay/MdtOverlay/python/MdtOverlayConfig.py b/MuonSpectrometer/MuonOverlay/MdtOverlay/python/MdtOverlayConfigLegacy.py
similarity index 100%
rename from MuonSpectrometer/MuonOverlay/MdtOverlay/python/MdtOverlayConfig.py
rename to MuonSpectrometer/MuonOverlay/MdtOverlay/python/MdtOverlayConfigLegacy.py
diff --git a/MuonSpectrometer/MuonOverlay/MuonTruthOverlay/python/MuonTruthOverlayConfigDb.py b/MuonSpectrometer/MuonOverlay/MuonTruthOverlay/python/MuonTruthOverlayConfigDb.py
index dc0fcd354526b3932807a408756819ad75186499..00bf5c4d566d3b75ee78a66df16c36f0e6c29451 100644
--- a/MuonSpectrometer/MuonOverlay/MuonTruthOverlay/python/MuonTruthOverlayConfigDb.py
+++ b/MuonSpectrometer/MuonOverlay/MuonTruthOverlay/python/MuonTruthOverlayConfigDb.py
@@ -1,9 +1,9 @@
 # Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
 
 from AthenaCommon.CfgGetter import addAlgorithm
-addAlgorithm("MuonTruthOverlay.MuonTruthOverlayConfig.getCscTruthOverlay", "CscTruthOverlay")
-addAlgorithm("MuonTruthOverlay.MuonTruthOverlayConfig.getMdtTruthOverlay", "MdtTruthOverlay")
-addAlgorithm("MuonTruthOverlay.MuonTruthOverlayConfig.getRpcTruthOverlay", "RpcTruthOverlay")
-addAlgorithm("MuonTruthOverlay.MuonTruthOverlayConfig.getTgcTruthOverlay", "TgcTruthOverlay")
-addAlgorithm("MuonTruthOverlay.MuonTruthOverlayConfig.getSTGC_TruthOverlay", "STGC_TruthOverlay")
-addAlgorithm("MuonTruthOverlay.MuonTruthOverlayConfig.getMM_TruthOverlay", "MM_TruthOverlay")
+addAlgorithm("MuonTruthOverlay.MuonTruthOverlayConfigLegacy.getCscTruthOverlay", "CscTruthOverlay")
+addAlgorithm("MuonTruthOverlay.MuonTruthOverlayConfigLegacy.getMdtTruthOverlay", "MdtTruthOverlay")
+addAlgorithm("MuonTruthOverlay.MuonTruthOverlayConfigLegacy.getRpcTruthOverlay", "RpcTruthOverlay")
+addAlgorithm("MuonTruthOverlay.MuonTruthOverlayConfigLegacy.getTgcTruthOverlay", "TgcTruthOverlay")
+addAlgorithm("MuonTruthOverlay.MuonTruthOverlayConfigLegacy.getSTGC_TruthOverlay", "STGC_TruthOverlay")
+addAlgorithm("MuonTruthOverlay.MuonTruthOverlayConfigLegacy.getMM_TruthOverlay", "MM_TruthOverlay")
diff --git a/MuonSpectrometer/MuonOverlay/MuonTruthOverlay/python/MuonTruthOverlayConfig.py b/MuonSpectrometer/MuonOverlay/MuonTruthOverlay/python/MuonTruthOverlayConfigLegacy.py
similarity index 100%
rename from MuonSpectrometer/MuonOverlay/MuonTruthOverlay/python/MuonTruthOverlayConfig.py
rename to MuonSpectrometer/MuonOverlay/MuonTruthOverlay/python/MuonTruthOverlayConfigLegacy.py
diff --git a/MuonSpectrometer/MuonOverlay/RpcOverlay/python/RpcOverlayConfigDb.py b/MuonSpectrometer/MuonOverlay/RpcOverlay/python/RpcOverlayConfigDb.py
index d2864b09b078a5c9e53d336abf6cb9ef19ba65f2..b0d988abdd2fe2c28122a57525bfa6814dd87f2d 100644
--- a/MuonSpectrometer/MuonOverlay/RpcOverlay/python/RpcOverlayConfigDb.py
+++ b/MuonSpectrometer/MuonOverlay/RpcOverlay/python/RpcOverlayConfigDb.py
@@ -2,4 +2,4 @@
 
 from AthenaCommon.CfgGetter import addAlgorithm
 
-addAlgorithm("RpcOverlay.RpcOverlayConfig.getRpcOverlay", "RpcOverlay")
+addAlgorithm("RpcOverlay.RpcOverlayConfigLegacy.getRpcOverlay", "RpcOverlay")
diff --git a/MuonSpectrometer/MuonOverlay/RpcOverlay/python/RpcOverlayConfig.py b/MuonSpectrometer/MuonOverlay/RpcOverlay/python/RpcOverlayConfigLegacy.py
similarity index 100%
rename from MuonSpectrometer/MuonOverlay/RpcOverlay/python/RpcOverlayConfig.py
rename to MuonSpectrometer/MuonOverlay/RpcOverlay/python/RpcOverlayConfigLegacy.py
diff --git a/MuonSpectrometer/MuonOverlay/STGC_Overlay/python/STGC_OverlayConfigDb.py b/MuonSpectrometer/MuonOverlay/STGC_Overlay/python/STGC_OverlayConfigDb.py
index d53ae89746fd84d1be1ec12d92775e80a2705337..c310aecaee7bccdc0ca7c8221125ee4ba69c39a1 100644
--- a/MuonSpectrometer/MuonOverlay/STGC_Overlay/python/STGC_OverlayConfigDb.py
+++ b/MuonSpectrometer/MuonOverlay/STGC_Overlay/python/STGC_OverlayConfigDb.py
@@ -2,4 +2,4 @@
 
 from AthenaCommon.CfgGetter import addAlgorithm
 
-addAlgorithm("STGC_Overlay.STGC_OverlayConfig.getSTGC_Overlay", "STGC_Overlay")
+addAlgorithm("STGC_Overlay.STGC_OverlayConfigLegacy.getSTGC_Overlay", "STGC_Overlay")
diff --git a/MuonSpectrometer/MuonOverlay/STGC_Overlay/python/STGC_OverlayConfig.py b/MuonSpectrometer/MuonOverlay/STGC_Overlay/python/STGC_OverlayConfigLegacy.py
similarity index 100%
rename from MuonSpectrometer/MuonOverlay/STGC_Overlay/python/STGC_OverlayConfig.py
rename to MuonSpectrometer/MuonOverlay/STGC_Overlay/python/STGC_OverlayConfigLegacy.py
diff --git a/MuonSpectrometer/MuonOverlay/TgcOverlay/python/TgcOverlayConfigDb.py b/MuonSpectrometer/MuonOverlay/TgcOverlay/python/TgcOverlayConfigDb.py
index ff5b93461c1aafeffda474cf57a0b7295c78519d..3c3afc2ee20d36f749e7ec881251fbc867c4e1f0 100644
--- a/MuonSpectrometer/MuonOverlay/TgcOverlay/python/TgcOverlayConfigDb.py
+++ b/MuonSpectrometer/MuonOverlay/TgcOverlay/python/TgcOverlayConfigDb.py
@@ -2,4 +2,4 @@
 
 from AthenaCommon.CfgGetter import addAlgorithm
 
-addAlgorithm("TgcOverlay.TgcOverlayConfig.getTgcOverlay", "TgcOverlay")
+addAlgorithm("TgcOverlay.TgcOverlayConfigLegacy.getTgcOverlay", "TgcOverlay")
diff --git a/MuonSpectrometer/MuonOverlay/TgcOverlay/python/TgcOverlayConfig.py b/MuonSpectrometer/MuonOverlay/TgcOverlay/python/TgcOverlayConfigLegacy.py
similarity index 100%
rename from MuonSpectrometer/MuonOverlay/TgcOverlay/python/TgcOverlayConfig.py
rename to MuonSpectrometer/MuonOverlay/TgcOverlay/python/TgcOverlayConfigLegacy.py