diff --git a/L1Trigger/Configuration/python/L1Trigger_EventContent_cff.py b/L1Trigger/Configuration/python/L1Trigger_EventContent_cff.py
index f9db6edffafed..6cfe507a38dff 100644
--- a/L1Trigger/Configuration/python/L1Trigger_EventContent_cff.py
+++ b/L1Trigger/Configuration/python/L1Trigger_EventContent_cff.py
@@ -187,10 +187,10 @@ def _appendPhase2Digis(obj):
         'keep *_pfClustersFromHGC3DClusters_*_*',
         'keep *_pfTracksFromL1TracksBarrel_*_*',
         'keep *_pfTracksFromL1TracksHGCal_*_*',
-        'keep *_scPFL1PF_*_*',
-        'keep *_scPFL1Puppi_*_*',
-        'keep *_scPFL1PuppiCorrectedEmulator_*_*',
-        'keep *_scPFL1PuppiCorrectedEmulatorMHT_*_*',
+        'keep *_l1tSCPFL1PF_*_*',
+        'keep *_l1tSCPFL1Puppi_*_*',
+        'keep *_l1tSCPFL1PuppiCorrectedEmulator_*_*',
+        'keep *_l1tSCPFL1PuppiCorrectedEmulatorMHT_*_*',
         'keep *_l1tPhase1JetProducer_*_*', 
         'keep *_l1tPhase1JetCalibrator_*_*',
         'keep *_l1tPhase1JetSumsProducer_*_*',
diff --git a/L1Trigger/Phase2L1ParticleFlow/python/L1MhtPfProducer_cfi.py b/L1Trigger/Phase2L1ParticleFlow/python/L1MhtPfProducer_cfi.py
index b294a6a5d3350..31e3f57591c9e 100644
--- a/L1Trigger/Phase2L1ParticleFlow/python/L1MhtPfProducer_cfi.py
+++ b/L1Trigger/Phase2L1ParticleFlow/python/L1MhtPfProducer_cfi.py
@@ -1,7 +1,7 @@
 import FWCore.ParameterSet.Config as cms
 
 l1tMHTPFProducer = cms.EDProducer("L1MhtPfProducer",
-                                 jets = cms.InputTag("scPFL1PuppiEmulator"),
+                                 jets = cms.InputTag("l1tSCPFL1PuppiEmulator"),
                                  minJetPt = cms.double(30.0),
                                  maxJetEta = cms.double(2.4)
 )
diff --git a/L1Trigger/Phase2L1ParticleFlow/python/l1ctJetFileWriter_cfi.py b/L1Trigger/Phase2L1ParticleFlow/python/l1ctJetFileWriter_cfi.py
index d61afb204b328..3d1dbe877ebaf 100644
--- a/L1Trigger/Phase2L1ParticleFlow/python/l1ctJetFileWriter_cfi.py
+++ b/L1Trigger/Phase2L1ParticleFlow/python/l1ctJetFileWriter_cfi.py
@@ -1,7 +1,7 @@
 import FWCore.ParameterSet.Config as cms
 
 l1tSeededConeJetFileWriter = cms.EDAnalyzer('L1CTJetFileWriter',
-  jets = cms.InputTag("scPFL1PuppiEmulator"),
+  jets = cms.InputTag("l1tSCPFL1PuppiEmulator"),
   nJets = cms.uint32(12),
   nFramesPerBX = cms.uint32(9), # 360 MHz clock or 25 Gb/s link
   TMUX = cms.uint32(6),
diff --git a/L1Trigger/Phase2L1ParticleFlow/python/l1pfJetMet_cff.py b/L1Trigger/Phase2L1ParticleFlow/python/l1pfJetMet_cff.py
index 1e43098edf8cc..dbc8b35b125fd 100644
--- a/L1Trigger/Phase2L1ParticleFlow/python/l1pfJetMet_cff.py
+++ b/L1Trigger/Phase2L1ParticleFlow/python/l1pfJetMet_cff.py
@@ -2,28 +2,28 @@
 
 from L1Trigger.Phase2L1ParticleFlow.L1SeedConePFJetProducer_cfi import l1tSeedConePFJetProducer, l1tSeedConePFJetEmulatorProducer
 from L1Trigger.Phase2L1ParticleFlow.DeregionizerProducer_cfi import l1tDeregionizerProducer as l1tLayer2Deregionizer
-scPFL1PF            = l1tSeedConePFJetProducer.clone(L1PFObjects = 'l1tLayer1:PF')
-scPFL1Puppi         = l1tSeedConePFJetProducer.clone()
-scPFL1PuppiEmulator = l1tSeedConePFJetEmulatorProducer.clone(L1PFObject = cms.InputTag('l1tLayer2Deregionizer:Puppi'))
+l1tSCPFL1PF            = l1tSeedConePFJetProducer.clone(L1PFObjects = 'l1tLayer1:PF')
+l1tSCPFL1Puppi         = l1tSeedConePFJetProducer.clone()
+l1tSCPFL1PuppiEmulator = l1tSeedConePFJetEmulatorProducer.clone(L1PFObject = cms.InputTag('l1tLayer2Deregionizer:Puppi'))
 
-correctedJets = cms.EDProducer("L1TCorrectedPFJetProducer", 
+_correctedJets = cms.EDProducer("L1TCorrectedPFJetProducer", 
     jets = cms.InputTag("_tag_"),
     correctorFile = cms.string("L1Trigger/Phase2L1ParticleFlow/data/jecs/jecs.PU200_110X.root"),
     correctorDir = cms.string("_dir_")
 )
 # Using phase2_hgcalV10 to customize the config for all 106X samples, since there's no other modifier for it
 from Configuration.Eras.Modifier_phase2_hgcalV10_cff import phase2_hgcalV10
-phase2_hgcalV10.toModify(correctedJets, correctorFile = "L1Trigger/Phase2L1ParticleFlow/data/jecs/jecs.PU200_106X.root")
+phase2_hgcalV10.toModify(_correctedJets, correctorFile = "L1Trigger/Phase2L1ParticleFlow/data/jecs/jecs.PU200_106X.root")
 from Configuration.Eras.Modifier_phase2_hgcalV11_cff import phase2_hgcalV11
-phase2_hgcalV11.toModify(correctedJets, correctorFile = "L1Trigger/Phase2L1ParticleFlow/data/jecs/jecs.PU200_110X.root")
+phase2_hgcalV11.toModify(_correctedJets, correctorFile = "L1Trigger/Phase2L1ParticleFlow/data/jecs/jecs.PU200_110X.root")
 
-scPFL1PuppiCorrectedEmulator = correctedJets.clone(jets = 'scPFL1PuppiEmulator', correctorDir = 'L1PuppiSC4EmuDeregJets')
+l1tSCPFL1PuppiCorrectedEmulator = _correctedJets.clone(jets = 'l1tSCPFL1PuppiEmulator', correctorDir = 'L1PuppiSC4EmuDeregJets')
 
 from L1Trigger.Phase2L1ParticleFlow.L1MhtPfProducer_cfi import l1tMHTPFProducer
-scPFL1PuppiCorrectedEmulatorMHT = l1tMHTPFProducer.clone() 
+l1tSCPFL1PuppiCorrectedEmulatorMHT = l1tMHTPFProducer.clone() 
 
 L1TPFJetsTask = cms.Task(
-    l1tLayer2Deregionizer, scPFL1PF, scPFL1Puppi, scPFL1PuppiEmulator, scPFL1PuppiCorrectedEmulator, scPFL1PuppiCorrectedEmulatorMHT
+    l1tLayer2Deregionizer, l1tSCPFL1PF, l1tSCPFL1Puppi, l1tSCPFL1PuppiEmulator, l1tSCPFL1PuppiCorrectedEmulator, l1tSCPFL1PuppiCorrectedEmulatorMHT
 )