diff --git a/PhysicsAnalysis/JetTagging/JetTagAlgs/BTagging/python/BTagLightSecVertexingConfig.py b/PhysicsAnalysis/JetTagging/JetTagAlgs/BTagging/python/BTagLightSecVertexingConfig.py
index fc4ed4ff6e64c1adcb82d54a73d9f5f99693fae6..99c496d8d23baffe02277c5a90bd80f0b129c130 100644
--- a/PhysicsAnalysis/JetTagging/JetTagAlgs/BTagging/python/BTagLightSecVertexingConfig.py
+++ b/PhysicsAnalysis/JetTagging/JetTagAlgs/BTagging/python/BTagLightSecVertexingConfig.py
@@ -1,10 +1,12 @@
 # Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
 
 from AthenaConfiguration.ComponentAccumulator import ComponentAccumulator
+from AthenaConfiguration.ComponentFactory import CompFactory
 from JetTagTools.JetFitterVariablesFactoryConfig import JetFitterVariablesFactoryCfg
 #from BTagging.MSVVariablesFactoryConfig import MSVVariablesFactoryCfg
 
-from BTagging.BTaggingConf import Analysis__BTagLightSecVertexing
+Analysis__BTagLightSecVertexing=CompFactory.Analysis.BTagLightSecVertexing
+
 
 def BTagLightSecVtxToolCfg(flags, Name, JetCollection, PrimaryVertexCollectionName="", SVandAssoc = {""}, TimeStamp = "", **options):
     """Adds a SecVtxTool instance and registers it.
diff --git a/PhysicsAnalysis/JetTagging/JetTagAlgs/BTagging/python/JetBTaggingAlgConfig.py b/PhysicsAnalysis/JetTagging/JetTagAlgs/BTagging/python/JetBTaggingAlgConfig.py
index c61d75ca1e23e3771feed1d4e77276d224d96b8f..6b4a16990009e1ec741002c9820528936d7dd1c9 100644
--- a/PhysicsAnalysis/JetTagging/JetTagAlgs/BTagging/python/JetBTaggingAlgConfig.py
+++ b/PhysicsAnalysis/JetTagging/JetTagAlgs/BTagging/python/JetBTaggingAlgConfig.py
@@ -1,11 +1,14 @@
 # Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
 
 from AthenaConfiguration.ComponentAccumulator import ComponentAccumulator
+from AthenaConfiguration.ComponentFactory import CompFactory
 from BTagging.BTagToolConfig import BTagToolCfg
 from BTagging.BTagLightSecVertexingConfig import BTagLightSecVtxToolCfg
 
 # import the JetBTaggingAlg configurable
-from BTagging.BTaggingConf import Analysis__JetBTaggingAlg as JetBTaggingAlg
+#from BTagging.BTaggingConf import Analysis__JetBTaggingAlg as JetBTaggingAlg
+Analysis__JetBTaggingAlg=CompFactory.Analysis.JetBTaggingAlg
+
 
 def JetBTaggingAlgCfg(ConfigFlags, JetCollection="", PrimaryVertexCollectionName="", TaggerList=[], SetupScheme="", SVandAssoc={""}, TimeStamp = "", **options):
 
@@ -42,6 +45,6 @@ def JetBTaggingAlgCfg(ConfigFlags, JetCollection="", PrimaryVertexCollectionName
     options['name'] = (btagname + ConfigFlags.BTagging.GeneralToolSuffix).lower()
 
     # -- create main BTagging algorithm
-    acc.addEventAlgo(JetBTaggingAlg(**options))
+    acc.addEventAlgo(Analysis__JetBTaggingAlg(**options))
 
     return acc
diff --git a/PhysicsAnalysis/JetTagging/JetTagCalibration/python/JetTagCalibConfig.py b/PhysicsAnalysis/JetTagging/JetTagCalibration/python/JetTagCalibConfig.py
index 391e841fb3e99e40701a316bf4661a1ee51b69c8..1e9f544f0ceb1b305ddb80822e569b7c0789843c 100644
--- a/PhysicsAnalysis/JetTagging/JetTagCalibration/python/JetTagCalibConfig.py
+++ b/PhysicsAnalysis/JetTagging/JetTagCalibration/python/JetTagCalibConfig.py
@@ -39,10 +39,13 @@ def JetTagCalibCfg(ConfigFlags, scheme="", TaggerList = [], ChannelAlias = ""):
 
     CalibrationChannelAliases += ChannelAlias
 
-    JetTagCalibCondAlg,=CompFactory.getComps("Analysis__JetTagCalibCondAlg",)
-    jettagcalibcondalg = "JetTagCalibCondAlg"
+    #JetTagCalibCondAlg,=CompFactory.getComps("Analysis__JetTagCalibCondAlg",)
+    #JetTagCalibCondAlg = CompFactory.Analysis.JetTagCalibCondAlg
+    #jettagcalibcondalg = "JetTagCalibCondAlg"
 
     if scheme == "Trig":
+        JetTagCalibCondAlg,=CompFactory.getComps("Analysis__JetTagCalibCondAlg",)
+        jettagcalibcondalg = "JetTagCalibCondAlg"
         readkeycalibpath = "/GLOBAL/Onl/TrigBTagCalib/RUN12"
         histoskey = "JetTagTrigCalibHistosKey"
         from IOVDbSvc.CondDB import conddb
@@ -61,6 +64,8 @@ def JetTagCalibCfg(ConfigFlags, scheme="", TaggerList = [], ChannelAlias = ""):
     else:
         from AthenaConfiguration.ComponentAccumulator import ComponentAccumulator
         result=ComponentAccumulator()
+        JetTagCalibCondAlg = CompFactory.Analysis.JetTagCalibCondAlg
+        jettagcalibcondalg = "JetTagCalibCondAlg"
         readkeycalibpath = "/GLOBAL/BTagCalib/RUN12"
         histoskey = "JetTagCalibHistosKey"
         connSchema = "GLOBAL_OFL"
diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Bjet/BjetFlavourTaggingConfiguration.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Bjet/BjetFlavourTaggingConfiguration.py
index 441c92e4c813dbb73c10233d39b3c02f7bbbdd14..4d69e0d9559e5fd48f8f078a16839f0677e2d973 100644
--- a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Bjet/BjetFlavourTaggingConfiguration.py
+++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Bjet/BjetFlavourTaggingConfiguration.py
@@ -61,22 +61,23 @@ def getFlavourTagging( inputJets, inputVertex, inputTracks ):
     acc.merge(JetBTaggingAlg)
 
 
-    from TrigBjetHypo.TrigBjetHypoConf import TrigBtagFexMT
-    bTagFex = TrigBtagFexMT( "TrigBtagFexMT" )
-    bTagFex.JetKey = inputJets
-    bTagFex.PriVtxKey = inputVertex
-    bTagFex.TracksKey = inputTracks
-    bTagFex.d0Key = inputTracks + ".btagIp_d0"
-    bTagFex.z0SinThetaKey = inputTracks + ".btagIp_d0Uncertainty"
-    bTagFex.d0UncertaintyKey = inputTracks + ".btagIp_z0SinTheta"
-    bTagFex.z0SinThetaUncertaintyKey = inputTracks + ".btagIp_z0SinThetaUncertainty"
-    bTagFex.trackposKey = inputTracks + ".btagIp_trackDisplacement"
-    bTagFex.trackmomKey = inputTracks + ".btagIp_trackMomentum"
-    bTagFex.BTaggingKey = "HLT_BTagging_AntiKt4EMTopo"
+    #from TrigBjetHypo.TrigBjetHypoConf import TrigBtagFexMT
+    #Analysis__TrigBtagFexMT=CompFactory.Analysis.TrigBtagFexMT
+    #bTagFex = Analysis__TrigBtagFexMT( "TrigBtagFexMT" )
+    #bTagFex.JetKey = inputJets
+    #bTagFex.PriVtxKey = inputVertex
+    #bTagFex.TracksKey = inputTracks
+    #bTagFex.d0Key = inputTracks + ".btagIp_d0"
+    #bTagFex.z0SinThetaKey = inputTracks + ".btagIp_d0Uncertainty"
+    #bTagFex.d0UncertaintyKey = inputTracks + ".btagIp_z0SinTheta"
+    #bTagFex.z0SinThetaUncertaintyKey = inputTracks + ".btagIp_z0SinThetaUncertainty"
+    #bTagFex.trackposKey = inputTracks + ".btagIp_trackDisplacement"
+    #bTagFex.trackmomKey = inputTracks + ".btagIp_trackMomentum"
+    #bTagFex.BTaggingKey = "HLT_BTagging_AntiKt4EMTopo"
 
-    from TrigBjetHypo.TrigBtagFexMTConfig import TrigBtagFexMT_OnlineMonitoring
-    bTagFex.MonTool = TrigBtagFexMT_OnlineMonitoring()
-    acc.addEventAlgo(bTagFex)
+    #from TrigBjetHypo.TrigBtagFexMTConfig import TrigBtagFexMT_OnlineMonitoring
+    #bTagFex.MonTool = TrigBtagFexMT_OnlineMonitoring()
+    #acc.addEventAlgo(bTagFex)
 
 
     return acc
diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Bjet/BjetSequenceSetup.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Bjet/BjetSequenceSetup.py
index dc18eaf1c9d2098335e44eb0f984f741568c965f..9852003df489abdc1b8674502886bb84fa8f38dc 100644
--- a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Bjet/BjetSequenceSetup.py
+++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Bjet/BjetSequenceSetup.py
@@ -5,6 +5,8 @@
 from AthenaCommon.CFElements import seqAND
 from TriggerMenuMT.HLTMenuConfig.Menu.MenuComponents import MenuSequence, InViewReco
 from TrigEDMConfig.TriggerEDMRun3 import recordable
+from AthenaConfiguration.ComponentFactory import CompFactory
+#from AthenaConfiguration.ComponentAccumulator import conf2toConfigurable
 
 #from AthenaCommon.Constants import DEBUG
 
@@ -81,16 +83,17 @@ def bJetStep2Sequence():
     roisLink = "step1RoI"
     prmVtxKey = "HLT_EFHistoPrmVtx"
 
-    from ViewAlgs.ViewAlgsConf import EventViewCreatorAlgorithmWithJets, ViewCreatorInitialROITool
-    InputMakerAlg = EventViewCreatorAlgorithmWithJets( "IMBJet_step3",RoIsLink=roisLink )
+    #from ViewAlgs.ViewAlgsConf import EventViewCreatorAlgorithmWithJets, ViewCreatorInitialROITool
+    InputMakerAlg = CompFactory.EventViewCreatorAlgorithmWithJets( "IMBJet_step3",RoIsLink=roisLink )
     InputMakerAlg.ViewFallThrough = True
     InputMakerAlg.RequireParentView = True
-    InputMakerAlg.RoITool = ViewCreatorInitialROITool() # NOT USED! TO BE REPLACED WITH NEW TOOL ON CONVERTING EventViewCreatorAlgorithmWithJets -> EventViewCreatorAlgorithm
+    InputMakerAlg.RoITool = CompFactory.ViewCreatorInitialROITool() # NOT USED! TO BE REPLACED WITH NEW TOOL ON CONVERTING EventViewCreatorAlgorithmWithJets -> EventViewCreatorAlgorithm
     InputMakerAlg.Views = "BTagViews"
     InputMakerAlg.InViewRoIs = "InViewRoIs"
     InputMakerAlg.InViewJets = recordable ( "HLT_InViewJets" )
     InputMakerAlg.ViewNodeName = "bJetBtagSequenceInView" 
     
+    
     # Second stage of Fast Tracking and Precision Tracking
     from TriggerMenuMT.HLTMenuConfig.Bjet.BjetTrackingConfiguration import getSecondStageBjetTracking
     secondStageAlgs, PTTracks, PTTrackParticles = getSecondStageBjetTracking( inputRoI=InputMakerAlg.InViewRoIs )
@@ -109,7 +112,7 @@ def bJetStep2Sequence():
     inViewReco.wasMerged()
 
     Configurable.configurableRun3Behavior=0
-    
+
     from TrigBjetHypo.TrigBjetHypoConf import TrigBjetBtagHypoAlgMT
     hypo = TrigBjetBtagHypoAlgMT( "TrigBjetBtagHypoAlg" )
     hypo.Tracks = PTTrackParticles[0]