diff --git a/Trigger/TrigAlgorithms/TrigT2CaloEgamma/python/TrigT2CaloEgammaMTConfig.py b/Trigger/TrigAlgorithms/TrigT2CaloEgamma/python/TrigT2CaloEgammaMTConfig.py
index 8694c553e04c9e52bfcd48efd8924d9ac1f385c9..6563795d3a9319b29bffd3983e47cef3136d73fd 100644
--- a/Trigger/TrigAlgorithms/TrigT2CaloEgamma/python/TrigT2CaloEgammaMTConfig.py
+++ b/Trigger/TrigAlgorithms/TrigT2CaloEgamma/python/TrigT2CaloEgammaMTConfig.py
@@ -23,17 +23,17 @@ def fastL2EgammaClusteringAlg( flags, roisKey="EMCaloRoIs", doRinger=False):
     # configure tools (this can be simplified further,
     EgammaReEmEnFex, EgammaReHadEnFex, EgammaReSamp1Fex, EgammaReSamp2Fex=CompFactory.getComps("EgammaReEmEnFex","EgammaReHadEnFex","EgammaReSamp1Fex","EgammaReSamp2Fex",)
 
-    samp2 = EgammaReSamp2Fex(name='FaAlgoSamp2FexConfig', MaxDetaHotCell=0.15, MaxDphiHotCell=0.15)
+    samp2 = EgammaReSamp2Fex(name='ReFaAlgoSamp2FexConfig', MaxDetaHotCell=0.15, MaxDphiHotCell=0.15)
     acc.addPublicTool( samp2 )
 
-    samp1 = EgammaReSamp1Fex('FaAlgoSamp1FexConfig')
+    samp1 = EgammaReSamp1Fex('ReFaAlgoSamp1FexConfig')
     acc.addPublicTool( samp1 )
 
-    sampe = EgammaReEmEnFex('FaAlgoEmEnFexConfig')
+    sampe = EgammaReEmEnFex('ReFaAlgoEmEnFexConfig')
     sampe.ExtraInputs=[( 'LArOnOffIdMapping' , 'ConditionStore+LArOnOffIdMap' )]
     acc.addPublicTool( sampe )
 
-    samph = EgammaReHadEnFex('FaAlgoHadEnFexConfig')
+    samph = EgammaReHadEnFex('ReFaAlgoHadEnFexConfig')
     samph.ExtraInputs=[('TileEMScale','ConditionStore+TileEMScale'),('TileBadChannels','ConditionStore+TileBadChannels')]
     acc.addPublicTool( samph )
 
@@ -50,13 +50,18 @@ def fastL2EgammaClusteringAlg( flags, roisKey="EMCaloRoIs", doRinger=False):
     __fex_tools = [ samp2, samp1, sampe, samph] #, ring ]
 
     if doRinger:
-      from TrigT2CaloEgamma.TrigT2CaloEgammaConfig import RingerReFexConfig
-      ringer = RingerReFexConfig('FaAlgoRingerFexConfig')
+      from TrigT2CaloEgamma.TrigT2CaloEgammaConfig import RingerReFexConfig, AsymRingerReFexConfig
+      ringer = RingerReFexConfig('ReFaAlgoRingerFexConfig')
       ringer.RingerKey = recordable("HLT_FastCaloRinger")
       ringer.ClustersName = alg.ClustersName
       acc.addPublicTool( ringer )
       __fex_tools.append(ringer)
 
+      asymringer = AsymRingerReFexConfig('ReFaAlgoAsymRingerFexConfig')
+      asymringer.RingerKey= "HLT_FastCaloAsymRinger"
+      asymringer.trigDataAccessMT = cdaSvc
+      asymringer.ClustersName = alg.ClustersName
+      __fex_tools.append( asymringer )
     alg.IReAlgToolList = __fex_tools
 
     for t in __fex_tools:
diff --git a/Trigger/TrigHypothesis/TrigEgammaHypo/python/TrigEgammaFastCaloHypoTool.py b/Trigger/TrigHypothesis/TrigEgammaHypo/python/TrigEgammaFastCaloHypoTool.py
index 249c27f3ddddffadd693eb038e96037b96984227..3a5c369381edef18098902ed3dc52c491c16d421 100644
--- a/Trigger/TrigHypothesis/TrigEgammaHypo/python/TrigEgammaFastCaloHypoTool.py
+++ b/Trigger/TrigHypothesis/TrigEgammaHypo/python/TrigEgammaFastCaloHypoTool.py
@@ -16,8 +16,8 @@ def createTrigEgammaFastCaloHypoAlg(name, sequenceOut):
   
   # make the Hypo
   #from TriggerMenuMT.HLTMenuConfig.Egamma.EgammaDefs import createTrigEgammaFastCaloSelectors
-  from TrigEgammaHypo.TrigEgammaHypoConf import TrigEgammaFastCaloHypoAlg
-  theFastCaloHypo = TrigEgammaFastCaloHypoAlg(name)
+  from AthenaConfiguration.ComponentFactory import CompFactory
+  theFastCaloHypo = CompFactory.TrigEgammaFastCaloHypoAlg(name)
   theFastCaloHypo.CaloClusters = sequenceOut
 
   # Just for electrons
@@ -43,6 +43,12 @@ def createTrigEgammaFastCaloHypoAlg(name, sequenceOut):
 
   return theFastCaloHypo
 
+def TrigEgammaFastCaloHypoAlgCfg(flags, name, CaloClusters):
+  from AthenaConfiguration.ComponentAccumulator import ComponentAccumulator
+  acc = ComponentAccumulator()
+  acc.addEventAlgo(createTrigEgammaFastCaloHypoAlg(name=name, sequenceOut=CaloClusters))
+  return acc
+
 #
 # For photons only
 # NOTE: For future, ringer will be applied at the fast photon step
diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Electron/ElectronRecoSequences.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Electron/ElectronRecoSequences.py
index 65217cfd2772c929ba233aff56b00d4452a8db0f..8fd0755c79dcd63484764cc83e0314c8618cb34b 100644
--- a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Electron/ElectronRecoSequences.py
+++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Electron/ElectronRecoSequences.py
@@ -19,8 +19,4 @@ def l2CaloRecoCfg( flags ):
     reco.mergeReco( ca )
     return reco
 
-def l2CaloHypoCfg( flags, name='UNSPECIFIED', CaloClusters='UNSPECIFIED' ):
-    l2CaloHypo                     = CompFactory.TrigEgammaFastCaloHypoAlg( name )
-    l2CaloHypo.CaloClusters        = CaloClusters
-    return l2CaloHypo
 
diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Electron/generateElectron.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Electron/generateElectron.py
index 3385923f0a13b60db5af7ccead853094ec480e79..c372e9da7e4cdb4317dc6fc0b28f2db0ea6de310 100644
--- a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Electron/generateElectron.py
+++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Electron/generateElectron.py
@@ -1,6 +1,6 @@
 # Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
 
-from TriggerMenuMT.HLTMenuConfig.Electron.ElectronRecoSequences import l2CaloRecoCfg, l2CaloHypoCfg
+from TriggerMenuMT.HLTMenuConfig.Electron.ElectronRecoSequences import l2CaloRecoCfg
 from TriggerMenuMT.HLTMenuConfig.Menu.MenuComponents import MenuSequenceCA, \
     ChainStep, Chain, EmptyMenuSequence, InViewRecoCA, SelectionCA
 
@@ -20,11 +20,12 @@ def _fastCaloSeq(flags):
     from LumiBlockComps.LumiBlockMuWriterConfig import LumiBlockMuWriterCfg
     selAcc.merge(LumiBlockMuWriterCfg(flags))
 
-    l2CaloHypo = l2CaloHypoCfg(flags,
-                               name='L2ElectronCaloHypo',
-                               CaloClusters=recordable('HLT_FastCaloEMClusters'))
-
-    selAcc.addHypoAlgo(l2CaloHypo)
+    from TrigEgammaHypo.TrigEgammaFastCaloHypoTool import TrigEgammaFastCaloHypoAlgCfg
+    l2CaloHypo = TrigEgammaFastCaloHypoAlgCfg(flags,
+                                              name='ElectronEgammaFastCaloHypo',
+                                              CaloClusters=recordable('HLT_FastCaloEMClusters'))
+    
+    selAcc.mergeHypo(l2CaloHypo)
 
     fastCaloSequence = MenuSequenceCA(selAcc,
                                       HypoToolGen=TrigEgammaFastCaloHypoToolFromDict)
diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/LS2_v1_newJO.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/LS2_v1_newJO.py
index 8119a8f4345d4344cac277bd45c497e6a350ca19..a3db85a5c6a7a6b8486afebcff40389cd88cf74d 100644
--- a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/LS2_v1_newJO.py
+++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/LS2_v1_newJO.py
@@ -49,7 +49,7 @@ def setupMenu():
    #     ChainProp(name='HLT_e5_etcut_e3_etcut_L12EM3', groups=MultiElectronGroup),
         ChainProp(name='HLT_e5_etcut_L1EM3', groups=SingleElectronGroup),
         ChainProp(name='HLT_e7_etcut_L1EM7', groups=SingleElectronGroup),
-        ChainProp(name='HLT_e7_lhvloose_L1EM7', groups=SinglePhotonGroup)
+        ChainProp(name='HLT_e7_lhvloose_L1EM7', groups=SingleElectronGroup)
     ]
 
     chains["photon"] = [
diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Photon/generatePhoton.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Photon/generatePhoton.py
index ccc142f0af466767fc6ad2a291ba0d98dd739cfc..dae3104998894b97af2911682fda533fed2e0995 100644
--- a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Photon/generatePhoton.py
+++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Photon/generatePhoton.py
@@ -1,6 +1,6 @@
 # Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 
-from TriggerMenuMT.HLTMenuConfig.Electron.ElectronRecoSequences import l2CaloRecoCfg, l2CaloHypoCfg
+from TriggerMenuMT.HLTMenuConfig.Electron.ElectronRecoSequences import l2CaloRecoCfg
 from TriggerMenuMT.HLTMenuConfig.Photon.PhotonRecoSequences import l2PhotonRecoCfg, l2PhotonHypoCfg
 from TriggerMenuMT.HLTMenuConfig.Menu.MenuComponents import MenuSequenceCA, SelectionCA, ChainStep, Chain
 from TriggerMenuMT.HLTMenuConfig.Menu.DictFromChainName import getChainMultFromDict
@@ -21,11 +21,11 @@ def _fastCalo(flags, chainDict):
     from LumiBlockComps.LumiBlockMuWriterConfig import LumiBlockMuWriterCfg
     selAcc.merge(LumiBlockMuWriterCfg(flags))
 
-    l2CaloHypo = l2CaloHypoCfg(flags,
-                               name='L2PhotonCaloHypo',
-                               CaloClusters=recordable('HLT_FastCaloEMClusters'))
-
-    selAcc.addHypoAlgo(l2CaloHypo)
+    from TrigEgammaHypo.TrigEgammaFastCaloHypoTool import TrigEgammaFastCaloHypoAlgCfg
+    l2CaloHypo = TrigEgammaFastCaloHypoAlgCfg(flags,
+                                              name='ElectronEgammaFastCaloHypo',
+                                              CaloClusters=recordable('HLT_FastCaloEMClusters'))
+    selAcc.mergeHypo(l2CaloHypo)
 
     fastCaloSequence = MenuSequenceCA(selAcc,
                                       HypoToolGen=TrigEgammaFastCaloHypoToolFromDict)