diff --git a/L1Trigger/Configuration/python/SimL1Emulator_cff.py b/L1Trigger/Configuration/python/SimL1Emulator_cff.py
index dc501e8ee3c99..e2474fe8a7304 100644
--- a/L1Trigger/Configuration/python/SimL1Emulator_cff.py
+++ b/L1Trigger/Configuration/python/SimL1Emulator_cff.py
@@ -89,25 +89,25 @@
 # Barrel and EndCap EGamma
 # ########################################################################
 
-from L1Trigger.L1CaloTrigger.L1EGammaCrystalsEmulatorProducer_cfi import *
+from L1Trigger.L1CaloTrigger.l1tEGammaCrystalsEmulatorProducer_cfi import *
 _phase2_siml1emulator.add(l1tEGammaClusterEmuProducer)
 
 # Barrel and EndCap CaloJet/HT
 # ########################################################################
 # ----    Produce the calibrated tower collection combining Barrel, HGCal, HF
-from L1Trigger.L1CaloTrigger.L1TowerCalibrationProducer_cfi import *
+from L1Trigger.L1CaloTrigger.l1tTowerCalibrationProducer_cfi import *
 l1tTowerCalibration = l1tTowerCalibrationProducer.clone(
   L1HgcalTowersInputTag = ("l1tHGCalTowerProducer","HGCalTowerProcessor",""),
   l1CaloTowers = ("l1tEGammaClusterEmuProducer","L1CaloTowerCollection","")
 )
 # ----    Produce the L1CaloJets
-from L1Trigger.L1CaloTrigger.L1CaloJetProducer_cfi import *
+from L1Trigger.L1CaloTrigger.l1tCaloJetProducer_cfi import *
 l1tCaloJet = l1tCaloJetProducer.clone (
     l1CaloTowers = ("l1tTowerCalibration","L1CaloTowerCalibratedCollection",""),
     L1CrystalClustersInputTag = ("l1tEGammaClusterEmuProducer", "","")
 )
 # ----    Produce the CaloJet HTT Sums
-from L1Trigger.L1CaloTrigger.L1CaloJetHTTProducer_cfi import *
+from L1Trigger.L1CaloTrigger.l1tCaloJetHTTProducer_cfi import *
 l1tCaloJetHTT = l1tCaloJetHTTProducer.clone(
     BXVCaloJetsInputTag = ("L1CaloJet", "CaloJets") 
 )
@@ -120,8 +120,8 @@
 # ########################################################################
 # Phase-2 L1T - TrackTrigger dependent modules
 # ########################################################################
-from L1Trigger.L1TTrackMatch.L1GTTInputProducer_cfi import *
-from L1Trigger.VertexFinder.VertexProducer_cfi import *
+from L1Trigger.L1TTrackMatch.l1tGTTInputProducer_cfi import *
+from L1Trigger.VertexFinder.l1tVertexProducer_cfi import *
 l1tVertexFinder = l1tVertexProducer.clone()
 l1tVertexFinderEmulator = l1tVertexProducer.clone()
 l1tVertexFinderEmulator.VertexReconstruction.Algorithm = "fastHistoEmulation"
@@ -145,10 +145,10 @@
 
 # Tracker Objects
 # ########################################################################
-from L1Trigger.L1TTrackMatch.L1TrackJetProducer_cfi import *
-from L1Trigger.L1TTrackMatch.L1TrackFastJetProducer_cfi import *
-from L1Trigger.L1TTrackMatch.L1TrackerEtMissProducer_cfi import *
-from L1Trigger.L1TTrackMatch.L1TkHTMissProducer_cfi import *
+from L1Trigger.L1TTrackMatch.l1tTrackJets_cfi import *
+from L1Trigger.L1TTrackMatch.l1tTrackFastJets_cfi import *
+from L1Trigger.L1TTrackMatch.l1tTrackerEtMiss_cfi import *
+from L1Trigger.L1TTrackMatch.l1tTrackerHTMiss_cfi import *
 # make the input tags consistent with the choice L1VertexFinder above
 l1tTrackJets.L1PVertexCollection  = ("L1VertexFinder", "l1vertices")
 l1tTrackJetsExtended.L1PVertexCollection  = ("L1VertexFinder", "l1vertices")
@@ -162,15 +162,15 @@
 _phase2_siml1emulator.add(l1tTrackerHTMiss)
 
 #Emulated tracker objects
-from L1Trigger.L1TTrackMatch.L1TrackJetEmulationProducer_cfi import *
+from L1Trigger.L1TTrackMatch.l1tTrackJetsEmulation_cfi import *
 _phase2_siml1emulator.add(l1tTrackJetsEmulation)
 _phase2_siml1emulator.add(l1tTrackJetsExtendedEmulation)
 
-from L1Trigger.L1TTrackMatch.L1TrackerEtMissEmulatorProducer_cfi import *
+from L1Trigger.L1TTrackMatch.l1tTrackerEmuEtMiss_cfi import *
 l1tTrackerEmuEtMiss.L1VertexInputTag = ("L1VertexFinderEmulator","l1verticesEmulation")
 _phase2_siml1emulator.add(l1tTrackerEmuEtMiss)
 
-from L1Trigger.L1TTrackMatch.L1TkHTMissEmulatorProducer_cfi import *
+from L1Trigger.L1TTrackMatch.l1tTrackerEmuHTMiss_cfi import *
 _phase2_siml1emulator.add(l1tTrackerEmuHTMiss)
 _phase2_siml1emulator.add(l1tTrackerEmuHTMissExtended)
 
@@ -204,7 +204,7 @@
 from L1Trigger.Phase2L1ParticleFlow.l1pfJetMet_cff import *
 _phase2_siml1emulator.add(L1TPFJetsTask)
 
-from L1Trigger.Phase2L1ParticleFlow.L1MetPfProducer_cfi import *
+from L1Trigger.Phase2L1ParticleFlow.l1tMETPFProducer_cfi import *
 _phase2_siml1emulator.add(l1tMETPFProducer)
 
 
diff --git a/L1Trigger/DemonstratorTools/test/gtt/createFirmwareInputFiles_cfg.py b/L1Trigger/DemonstratorTools/test/gtt/createFirmwareInputFiles_cfg.py
index 664c9d5ebc410..ca1169a0e213c 100644
--- a/L1Trigger/DemonstratorTools/test/gtt/createFirmwareInputFiles_cfg.py
+++ b/L1Trigger/DemonstratorTools/test/gtt/createFirmwareInputFiles_cfg.py
@@ -60,7 +60,7 @@
 )
 
 process.load("L1Trigger.TrackFindingTracklet.L1HybridEmulationTracks_cff")
-process.load('L1Trigger.L1TTrackMatch.L1GTTInputProducer_cfi')
+process.load('L1Trigger.L1TTrackMatch.l1tGTTInputProducer_cfi')
 process.load('L1Trigger.VertexFinder.VertexProducer_cff')
 process.load('L1Trigger.DemonstratorTools.GTTFileWriter_cff')
 
diff --git a/L1Trigger/L1CaloTrigger/python/L1CaloJets_cff.py b/L1Trigger/L1CaloTrigger/python/L1CaloJets_cff.py
index d0647b0a36188..bfd0802564924 100644
--- a/L1Trigger/L1CaloTrigger/python/L1CaloJets_cff.py
+++ b/L1Trigger/L1CaloTrigger/python/L1CaloJets_cff.py
@@ -8,7 +8,7 @@
 #
 # ----    Produce the L1EGCrystal clusters using Emulator
 
-from L1Trigger.L1CaloTrigger.L1EGammaCrystalsEmulatorProducer_cfi import *
+from L1Trigger.L1CaloTrigger.l1tEGammaCrystalsEmulatorProducer_cfi import *
 l1tEGammaClusterEmuProducer.ecalTPEB = cms.InputTag("simEcalEBTriggerPrimitiveDigis","","")
 
 
@@ -16,7 +16,7 @@
 #
 # ----    Produce the calibrated tower collection combining Barrel, HGCal, HF
 
-from L1Trigger.L1CaloTrigger.L1TowerCalibrationProducer_cfi import *
+from L1Trigger.L1CaloTrigger.l1tTowerCalibrationProducer_cfi import *
 l1tTowerCalibrationProducer.L1HgcalTowersInputTag = cms.InputTag("l1tHGCalTowerProducer","HGCalTowerProcessor","")
 l1tTowerCalibrationProducer.l1CaloTowers = cms.InputTag("l1tEGammaClusterEmuProducer","L1CaloTowerCollection","")
 
@@ -26,7 +26,7 @@
 #
 # ----    Produce the L1CaloJets
 
-from L1Trigger.L1CaloTrigger.L1CaloJetProducer_cfi import *
+from L1Trigger.L1CaloTrigger.l1tCaloJetProducer_cfi import *
 l1tCaloJetProducer.l1CaloTowers = cms.InputTag("l1tTowerCalibrationProducer","L1CaloTowerCalibratedCollection","")
 l1tCaloJetProducer.L1CrystalClustersInputTag = cms.InputTag("l1tEGammaClusterEmuProducer", "L1EGXtalClusterEmulator","")
 
@@ -36,7 +36,7 @@
 #
 # ----    Produce the CaloJet HTT Sums
 
-from L1Trigger.L1CaloTrigger.L1CaloJetHTTProducer_cfi import *
+from L1Trigger.L1CaloTrigger.l1tCaloJetHTTProducer_cfi import *
 
 
 
diff --git a/L1Trigger/L1CaloTrigger/python/Phase1L1TJets_9x9_cff.py b/L1Trigger/L1CaloTrigger/python/Phase1L1TJets_9x9_cff.py
index e09084fd75b17..b63d3217f6262 100644
--- a/L1Trigger/L1CaloTrigger/python/Phase1L1TJets_9x9_cff.py
+++ b/L1Trigger/L1CaloTrigger/python/Phase1L1TJets_9x9_cff.py
@@ -1,8 +1,8 @@
 import FWCore.ParameterSet.Config as cms
 
-from L1Trigger.L1CaloTrigger.Phase1L1TJetProducer_cfi import l1tPhase1JetProducer
-from L1Trigger.L1CaloTrigger.Phase1L1TJetCalibrator_9x9Jets_cfi import l1tPhase1JetCalibrator9
-from L1Trigger.L1CaloTrigger.Phase1L1TJetSumsProducer_cfi import l1tPhase1JetSumsProducer
+from L1Trigger.L1CaloTrigger.l1tPhase1JetProducer_cfi import l1tPhase1JetProducer
+from L1Trigger.L1CaloTrigger.l1tPhase1JetCalibrator9_cfi import l1tPhase1JetCalibrator9
+from L1Trigger.L1CaloTrigger.l1tPhase1JetSumsProducer_cfi import l1tPhase1JetSumsProducer
 
 l1tPhase1JetProducer9x9 = l1tPhase1JetProducer.clone(
 	  jetIEtaSize = 9,
diff --git a/L1Trigger/L1CaloTrigger/python/Phase1L1TJets_9x9trimmed_cff.py b/L1Trigger/L1CaloTrigger/python/Phase1L1TJets_9x9trimmed_cff.py
index 91bf65b1996de..da7fc33991b51 100644
--- a/L1Trigger/L1CaloTrigger/python/Phase1L1TJets_9x9trimmed_cff.py
+++ b/L1Trigger/L1CaloTrigger/python/Phase1L1TJets_9x9trimmed_cff.py
@@ -1,8 +1,8 @@
 import FWCore.ParameterSet.Config as cms
 
-from L1Trigger.L1CaloTrigger.Phase1L1TJetProducer_cfi import l1tPhase1JetProducer
-from L1Trigger.L1CaloTrigger.Phase1L1TJetCalibrator_9x9trimmedJets_cfi import l1tPhase1JetCalibrator
-from L1Trigger.L1CaloTrigger.Phase1L1TJetSumsProducer_cfi import l1tPhase1JetSumsProducer
+from L1Trigger.L1CaloTrigger.l1tPhase1JetProducer_cfi import l1tPhase1JetProducer
+from L1Trigger.L1CaloTrigger.l1tPhase1JetCalibrator_9x9trimmed_cfi import l1tPhase1JetCalibrator_9x9trimmed
+from L1Trigger.L1CaloTrigger.l1tPhase1JetSumsProducer_cfi import l1tPhase1JetSumsProducer
 
 l1tPhase1JetProducer9x9trimmed = l1tPhase1JetProducer.clone(
 	  jetIEtaSize = 9,
@@ -11,7 +11,7 @@
 	  outputCollectionName = "UncalibratedPhase1L1TJetFromPfCandidates"
 )
 
-l1tPhase1JetCalibrator9x9trimmed = l1tPhase1JetCalibrator.clone(
+l1tPhase1JetCalibrator9x9trimmed = l1tPhase1JetCalibrator_9x9trimmed.clone(
 	  inputCollectionTag = ("l1tPhase1JetProducer9x9trimmed", "UncalibratedPhase1L1TJetFromPfCandidates", ""),
 	  outputCollectionName = "Phase1L1TJetFromPfCandidates"
 )
diff --git a/L1Trigger/L1CaloTrigger/python/Phase1L1TJets_cff.py b/L1Trigger/L1CaloTrigger/python/Phase1L1TJets_cff.py
index 45f93a48601e8..220b3a7541bad 100644
--- a/L1Trigger/L1CaloTrigger/python/Phase1L1TJets_cff.py
+++ b/L1Trigger/L1CaloTrigger/python/Phase1L1TJets_cff.py
@@ -1,8 +1,8 @@
 import FWCore.ParameterSet.Config as cms
 
-from L1Trigger.L1CaloTrigger.Phase1L1TJetProducer_cfi import l1tPhase1JetProducer
-from L1Trigger.L1CaloTrigger.Phase1L1TJetCalibrator_cfi import l1tPhase1JetCalibrator
-from L1Trigger.L1CaloTrigger.Phase1L1TJetSumsProducer_cfi import l1tPhase1JetSumsProducer
+from L1Trigger.L1CaloTrigger.l1tPhase1JetProducer_cfi import l1tPhase1JetProducer
+from L1Trigger.L1CaloTrigger.l1tPhase1JetCalibrator_cfi import l1tPhase1JetCalibrator
+from L1Trigger.L1CaloTrigger.l1tPhase1JetSumsProducer_cfi import l1tPhase1JetSumsProducer
 
 L1TPhase1JetsSequence = cms.Sequence(
   l1tPhase1JetProducer +
diff --git a/L1Trigger/L1CaloTrigger/python/l1EgammaStaProducers_cff.py b/L1Trigger/L1CaloTrigger/python/l1EgammaStaProducers_cff.py
index 9da1269b8242a..c6c3a5f539280 100644
--- a/L1Trigger/L1CaloTrigger/python/l1EgammaStaProducers_cff.py
+++ b/L1Trigger/L1CaloTrigger/python/l1EgammaStaProducers_cff.py
@@ -1,6 +1,6 @@
 import FWCore.ParameterSet.Config as cms
 
-from L1Trigger.L1CaloTrigger.L1EGammaCrystalsEmulatorProducer_cfi import *
+from L1Trigger.L1CaloTrigger.l1tEGammaCrystalsEmulatorProducer_cfi import *
 
 L1TEgammaStaProducers = cms.Sequence(l1tEGammaClusterEmuProducer)
 
diff --git a/L1Trigger/L1CaloTrigger/python/L1CaloJetHTTProducer_cfi.py b/L1Trigger/L1CaloTrigger/python/l1tCaloJetHTTProducer_cfi.py
similarity index 100%
rename from L1Trigger/L1CaloTrigger/python/L1CaloJetHTTProducer_cfi.py
rename to L1Trigger/L1CaloTrigger/python/l1tCaloJetHTTProducer_cfi.py
diff --git a/L1Trigger/L1CaloTrigger/python/L1CaloJetProducer_cfi.py b/L1Trigger/L1CaloTrigger/python/l1tCaloJetProducer_cfi.py
similarity index 100%
rename from L1Trigger/L1CaloTrigger/python/L1CaloJetProducer_cfi.py
rename to L1Trigger/L1CaloTrigger/python/l1tCaloJetProducer_cfi.py
diff --git a/L1Trigger/L1CaloTrigger/python/L1EGammaCrystalsEmulatorProducer_cfi.py b/L1Trigger/L1CaloTrigger/python/l1tEGammaCrystalsEmulatorProducer_cfi.py
similarity index 100%
rename from L1Trigger/L1CaloTrigger/python/L1EGammaCrystalsEmulatorProducer_cfi.py
rename to L1Trigger/L1CaloTrigger/python/l1tEGammaCrystalsEmulatorProducer_cfi.py
diff --git a/L1Trigger/L1CaloTrigger/python/Phase1L1TJetCalibrator_9x9Jets_cfi.py b/L1Trigger/L1CaloTrigger/python/l1tPhase1JetCalibrator9_cfi.py
similarity index 100%
rename from L1Trigger/L1CaloTrigger/python/Phase1L1TJetCalibrator_9x9Jets_cfi.py
rename to L1Trigger/L1CaloTrigger/python/l1tPhase1JetCalibrator9_cfi.py
diff --git a/L1Trigger/L1CaloTrigger/python/Phase1L1TJetCalibrator_9x9trimmedJets_cfi.py b/L1Trigger/L1CaloTrigger/python/l1tPhase1JetCalibrator_9x9trimmed_cfi.py
similarity index 99%
rename from L1Trigger/L1CaloTrigger/python/Phase1L1TJetCalibrator_9x9trimmedJets_cfi.py
rename to L1Trigger/L1CaloTrigger/python/l1tPhase1JetCalibrator_9x9trimmed_cfi.py
index 921b79f7480ef..080df51103a53 100644
--- a/L1Trigger/L1CaloTrigger/python/Phase1L1TJetCalibrator_9x9trimmedJets_cfi.py
+++ b/L1Trigger/L1CaloTrigger/python/l1tPhase1JetCalibrator_9x9trimmed_cfi.py
@@ -182,7 +182,7 @@
     )
 )
 
-l1tPhase1JetCalibrator = cms.EDProducer('Phase1L1TJetCalibrator',
+l1tPhase1JetCalibrator_9x9trimmed = cms.EDProducer('Phase1L1TJetCalibrator',
   inputCollectionTag = cms.InputTag("l1tPhase1JetProducer", "UncalibratedPhase1L1TJetFromPfCandidates", ""),
   absEtaBinning = cms.vdouble([p.etaMin.value() for p in calibration] + [calibration[-1].etaMax.value()]),
   calibration = calibration,
diff --git a/L1Trigger/L1CaloTrigger/python/Phase1L1TJetCalibrator_cfi.py b/L1Trigger/L1CaloTrigger/python/l1tPhase1JetCalibrator_cfi.py
similarity index 100%
rename from L1Trigger/L1CaloTrigger/python/Phase1L1TJetCalibrator_cfi.py
rename to L1Trigger/L1CaloTrigger/python/l1tPhase1JetCalibrator_cfi.py
diff --git a/L1Trigger/L1CaloTrigger/python/Phase1L1TJetProducer_cfi.py b/L1Trigger/L1CaloTrigger/python/l1tPhase1JetProducer_cfi.py
similarity index 100%
rename from L1Trigger/L1CaloTrigger/python/Phase1L1TJetProducer_cfi.py
rename to L1Trigger/L1CaloTrigger/python/l1tPhase1JetProducer_cfi.py
diff --git a/L1Trigger/L1CaloTrigger/python/Phase1L1TJetSumsProducer_cfi.py b/L1Trigger/L1CaloTrigger/python/l1tPhase1JetSumsProducer_cfi.py
similarity index 100%
rename from L1Trigger/L1CaloTrigger/python/Phase1L1TJetSumsProducer_cfi.py
rename to L1Trigger/L1CaloTrigger/python/l1tPhase1JetSumsProducer_cfi.py
diff --git a/L1Trigger/L1CaloTrigger/python/L1TowerCalibrationProducer_cfi.py b/L1Trigger/L1CaloTrigger/python/l1tTowerCalibrationProducer_cfi.py
similarity index 100%
rename from L1Trigger/L1CaloTrigger/python/L1TowerCalibrationProducer_cfi.py
rename to L1Trigger/L1CaloTrigger/python/l1tTowerCalibrationProducer_cfi.py
diff --git a/L1Trigger/L1CaloTrigger/python/test_L1EGCrystalClusterEmulator_cfg.py b/L1Trigger/L1CaloTrigger/python/test_L1EGCrystalClusterEmulator_cfg.py
index 01d4daee06824..8d7c00df0769d 100644
--- a/L1Trigger/L1CaloTrigger/python/test_L1EGCrystalClusterEmulator_cfg.py
+++ b/L1Trigger/L1CaloTrigger/python/test_L1EGCrystalClusterEmulator_cfg.py
@@ -48,7 +48,7 @@
 # ----    Produce the L1EGCrystal clusters using Emulator
 
 
-process.load('L1Trigger.L1CaloTrigger.L1EGammaCrystalsEmulatorProducer_cfi')
+process.load('L1Trigger.L1CaloTrigger.l1tEGammaCrystalsEmulatorProducer_cfi')
 
 process.pL1EG = cms.Path( process.l1tEGammaClusterEmuProducer )
 
diff --git a/L1Trigger/L1THGCal/python/customClustering.py b/L1Trigger/L1THGCal/python/customClustering.py
index 5734e2f0b509d..40c9a742bc297 100644
--- a/L1Trigger/L1THGCal/python/customClustering.py
+++ b/L1Trigger/L1THGCal/python/customClustering.py
@@ -1,9 +1,9 @@
 import FWCore.ParameterSet.Config as cms
-from L1Trigger.L1THGCal.hgcalBackEndLayer1Producer_cfi import dummy_C2d_params, \
+from L1Trigger.L1THGCal.l1tHGCalBackEndLayer1Producer_cfi import dummy_C2d_params, \
                                                               distance_C2d_params, \
                                                               topological_C2d_params, \
                                                               constrTopological_C2d_params
-from L1Trigger.L1THGCal.hgcalBackEndLayer2Producer_cfi import distance_C3d_params, \
+from L1Trigger.L1THGCal.l1tHGCalBackEndLayer2Producer_cfi import distance_C3d_params, \
                                                               dbscan_C3d_params, \
                                                               histoMax_C3d_clustering_params, \
                                                               histoMaxVariableDR_C3d_params, \
diff --git a/L1Trigger/L1THGCal/python/customHistoSeeding.py b/L1Trigger/L1THGCal/python/customHistoSeeding.py
index d1c59ae781e79..82377aa16ef29 100644
--- a/L1Trigger/L1THGCal/python/customHistoSeeding.py
+++ b/L1Trigger/L1THGCal/python/customHistoSeeding.py
@@ -1,5 +1,5 @@
 import FWCore.ParameterSet.Config as cms
-from L1Trigger.L1THGCal.hgcalBackEndLayer2Producer_cfi import histoMax_C3d_seeding_params, \
+from L1Trigger.L1THGCal.l1tHGCalBackEndLayer2Producer_cfi import histoMax_C3d_seeding_params, \
                                                               histoSecondaryMax_C3d_params, \
                                                               histoInterpolatedMax_C3d_params, \
                                                               histoThreshold_C3d_params, \
diff --git a/L1Trigger/L1THGCal/python/customNewProcessors.py b/L1Trigger/L1THGCal/python/customNewProcessors.py
index de6e3408ef379..d31c147e1f68a 100644
--- a/L1Trigger/L1THGCal/python/customNewProcessors.py
+++ b/L1Trigger/L1THGCal/python/customNewProcessors.py
@@ -1,7 +1,7 @@
 import FWCore.ParameterSet.Config as cms
-from L1Trigger.L1THGCal.hgcalBackEndLayer1Producer_cfi import layer1truncation_proc
-from L1Trigger.L1THGCal.hgcalBackEndLayer1Producer_cfi import stage1truncation_proc
-from L1Trigger.L1THGCal.hgcalBackEndLayer1Producer_cfi import truncation_params
+from L1Trigger.L1THGCal.l1tHGCalBackEndLayer1Producer_cfi import layer1truncation_proc
+from L1Trigger.L1THGCal.l1tHGCalBackEndLayer1Producer_cfi import stage1truncation_proc
+from L1Trigger.L1THGCal.l1tHGCalBackEndLayer1Producer_cfi import truncation_params
 
 def custom_layer1_truncation(process):
     parameters = layer1truncation_proc.clone()
diff --git a/L1Trigger/L1THGCal/python/customTriggerCellSelect.py b/L1Trigger/L1THGCal/python/customTriggerCellSelect.py
index 65b766b6b4e47..6c477d3f7cb24 100644
--- a/L1Trigger/L1THGCal/python/customTriggerCellSelect.py
+++ b/L1Trigger/L1THGCal/python/customTriggerCellSelect.py
@@ -1,6 +1,6 @@
 import FWCore.ParameterSet.Config as cms
 import SimCalorimetry.HGCalSimProducers.hgcalDigitizer_cfi as digiparam
-from L1Trigger.L1THGCal.hgcalConcentratorProducer_cfi import threshold_conc_proc, best_conc_proc, supertc_conc_proc, coarsetc_onebitfraction_proc, coarsetc_equalshare_proc, bestchoice_ndata_decentralized, custom_conc_proc, autoEncoder_conc_proc
+from L1Trigger.L1THGCal.l1tHGCalConcentratorProducer_cfi import threshold_conc_proc, best_conc_proc, supertc_conc_proc, coarsetc_onebitfraction_proc, coarsetc_equalshare_proc, bestchoice_ndata_decentralized, custom_conc_proc, autoEncoder_conc_proc
 
 def custom_triggercellselect_supertriggercell(process,
                                               stcSize=supertc_conc_proc.stcSize,
diff --git a/L1Trigger/L1THGCal/python/customVFE.py b/L1Trigger/L1THGCal/python/customVFE.py
index e513c682d8f2f..d10a9fc1e1fda 100644
--- a/L1Trigger/L1THGCal/python/customVFE.py
+++ b/L1Trigger/L1THGCal/python/customVFE.py
@@ -1,4 +1,4 @@
-from L1Trigger.L1THGCal.hgcalVFEProducer_cfi import vfe_proc
+from L1Trigger.L1THGCal.l1tHGCalVFEProducer_cfi import vfe_proc
 
 def custom_hgcroc_oot(process,
                       oot_coefficients=vfe_proc.linearizationCfg_si.oot_coefficients
diff --git a/L1Trigger/L1THGCal/python/hgcalBackEndLayer1_cff.py b/L1Trigger/L1THGCal/python/hgcalBackEndLayer1_cff.py
index bb8c7e67345aa..e6b07179c3a21 100644
--- a/L1Trigger/L1THGCal/python/hgcalBackEndLayer1_cff.py
+++ b/L1Trigger/L1THGCal/python/hgcalBackEndLayer1_cff.py
@@ -1,7 +1,7 @@
 import FWCore.ParameterSet.Config as cms
 
-from L1Trigger.L1THGCal.hgcalTriggerGeometryESProducer_cfi import *
-from L1Trigger.L1THGCal.hgcalBackEndLayer1Producer_cfi import *
+from L1Trigger.L1THGCal.l1tHGCalTriggerGeometryESProducer_cfi import *
+from L1Trigger.L1THGCal.l1tHGCalBackEndLayer1Producer_cfi import *
 
 
 L1THGCalBackEndLayer1 = cms.Task(l1tHGCalBackEndLayer1Producer)
diff --git a/L1Trigger/L1THGCal/python/hgcalBackEndLayer2_cff.py b/L1Trigger/L1THGCal/python/hgcalBackEndLayer2_cff.py
index a268a09d6c080..39376706ea420 100644
--- a/L1Trigger/L1THGCal/python/hgcalBackEndLayer2_cff.py
+++ b/L1Trigger/L1THGCal/python/hgcalBackEndLayer2_cff.py
@@ -1,7 +1,7 @@
 import FWCore.ParameterSet.Config as cms
 
-from L1Trigger.L1THGCal.hgcalTriggerGeometryESProducer_cfi import *
-from L1Trigger.L1THGCal.hgcalBackEndLayer2Producer_cfi import *
+from L1Trigger.L1THGCal.l1tHGCalTriggerGeometryESProducer_cfi import *
+from L1Trigger.L1THGCal.l1tHGCalBackEndLayer2Producer_cfi import *
 
 
 L1THGCalBackEndLayer2 = cms.Task(l1tHGCalBackEndLayer2Producer)
diff --git a/L1Trigger/L1THGCal/python/hgcalConcentrator_cff.py b/L1Trigger/L1THGCal/python/hgcalConcentrator_cff.py
index 38cb407a15230..0492f779ce568 100644
--- a/L1Trigger/L1THGCal/python/hgcalConcentrator_cff.py
+++ b/L1Trigger/L1THGCal/python/hgcalConcentrator_cff.py
@@ -1,7 +1,7 @@
 import FWCore.ParameterSet.Config as cms
 
-from L1Trigger.L1THGCal.hgcalTriggerGeometryESProducer_cfi import *
-from L1Trigger.L1THGCal.hgcalConcentratorProducer_cfi import *
+from L1Trigger.L1THGCal.l1tHGCalTriggerGeometryESProducer_cfi import *
+from L1Trigger.L1THGCal.l1tHGCalConcentratorProducer_cfi import *
 
 
 L1THGCalConcentrator = cms.Task(l1tHGCalConcentratorProducer)
diff --git a/L1Trigger/L1THGCal/python/hgcalTowerMap_cff.py b/L1Trigger/L1THGCal/python/hgcalTowerMap_cff.py
index c0675abd54f65..449a9e7bd7693 100644
--- a/L1Trigger/L1THGCal/python/hgcalTowerMap_cff.py
+++ b/L1Trigger/L1THGCal/python/hgcalTowerMap_cff.py
@@ -1,7 +1,7 @@
 import FWCore.ParameterSet.Config as cms
 
-from L1Trigger.L1THGCal.hgcalTriggerGeometryESProducer_cfi import *
-from L1Trigger.L1THGCal.hgcalTowerMapProducer_cfi import *
+from L1Trigger.L1THGCal.l1tHGCalTriggerGeometryESProducer_cfi import *
+from L1Trigger.L1THGCal.l1tHGCalTowerMapProducer_cfi import *
 
 
 L1THGCalTowerMap = cms.Task(l1tHGCalTowerMapProducer)
diff --git a/L1Trigger/L1THGCal/python/hgcalTower_cff.py b/L1Trigger/L1THGCal/python/hgcalTower_cff.py
index c33312121ce0a..de42425b293b1 100644
--- a/L1Trigger/L1THGCal/python/hgcalTower_cff.py
+++ b/L1Trigger/L1THGCal/python/hgcalTower_cff.py
@@ -1,7 +1,7 @@
 import FWCore.ParameterSet.Config as cms
 
-from L1Trigger.L1THGCal.hgcalTriggerGeometryESProducer_cfi import *
-from L1Trigger.L1THGCal.hgcalTowerProducer_cfi import *
+from L1Trigger.L1THGCal.l1tHGCalTriggerGeometryESProducer_cfi import *
+from L1Trigger.L1THGCal.l1tHGCalTowerProducer_cfi import *
 
 
 L1THGCalTower = cms.Task(l1tHGCalTowerProducer)
diff --git a/L1Trigger/L1THGCal/python/hgcalTriggerPrimitivesNew_cff.py b/L1Trigger/L1THGCal/python/hgcalTriggerPrimitivesNew_cff.py
index 49de86d4aa1ee..4f69ed4d22d27 100644
--- a/L1Trigger/L1THGCal/python/hgcalTriggerPrimitivesNew_cff.py
+++ b/L1Trigger/L1THGCal/python/hgcalTriggerPrimitivesNew_cff.py
@@ -1,6 +1,6 @@
 import FWCore.ParameterSet.Config as cms
 
-from L1Trigger.L1THGCal.hgcalTriggerGeometryESProducer_cfi import *
+from L1Trigger.L1THGCal.l1tHGCalTriggerGeometryESProducer_cfi import *
 from L1Trigger.L1THGCal.hgcalVFE_cff import *
 from L1Trigger.L1THGCal.hgcalConcentrator_cff import *
 from L1Trigger.L1THGCal.hgcalBackEndLayer1_cff import *
diff --git a/L1Trigger/L1THGCal/python/hgcalTriggerPrimitives_cff.py b/L1Trigger/L1THGCal/python/hgcalTriggerPrimitives_cff.py
index 1ca77d64565d3..61f2e52b05d63 100644
--- a/L1Trigger/L1THGCal/python/hgcalTriggerPrimitives_cff.py
+++ b/L1Trigger/L1THGCal/python/hgcalTriggerPrimitives_cff.py
@@ -1,6 +1,6 @@
 import FWCore.ParameterSet.Config as cms
 
-from L1Trigger.L1THGCal.hgcalTriggerGeometryESProducer_cfi import *
+from L1Trigger.L1THGCal.l1tHGCalTriggerGeometryESProducer_cfi import *
 from L1Trigger.L1THGCal.hgcalVFE_cff import *
 from L1Trigger.L1THGCal.hgcalConcentrator_cff import *
 from L1Trigger.L1THGCal.hgcalBackEndLayer1_cff import *
diff --git a/L1Trigger/L1THGCal/python/hgcalVFE_cff.py b/L1Trigger/L1THGCal/python/hgcalVFE_cff.py
index 4ac45659da6cc..6ab0686fd6557 100644
--- a/L1Trigger/L1THGCal/python/hgcalVFE_cff.py
+++ b/L1Trigger/L1THGCal/python/hgcalVFE_cff.py
@@ -1,7 +1,7 @@
 import FWCore.ParameterSet.Config as cms
 
-from L1Trigger.L1THGCal.hgcalTriggerGeometryESProducer_cfi import *
-from L1Trigger.L1THGCal.hgcalVFEProducer_cfi import *
+from L1Trigger.L1THGCal.l1tHGCalTriggerGeometryESProducer_cfi import *
+from L1Trigger.L1THGCal.l1tHGCalVFEProducer_cfi import *
 
 L1THGCalVFE = cms.Task(l1tHGCalVFEProducer)
 L1THFnoseVFE = cms.Task(l1tHFnoseVFEProducer)
diff --git a/L1Trigger/L1THGCal/python/hgcalBackEndLayer1Producer_cfi.py b/L1Trigger/L1THGCal/python/l1tHGCalBackEndLayer1Producer_cfi.py
similarity index 100%
rename from L1Trigger/L1THGCal/python/hgcalBackEndLayer1Producer_cfi.py
rename to L1Trigger/L1THGCal/python/l1tHGCalBackEndLayer1Producer_cfi.py
diff --git a/L1Trigger/L1THGCal/python/hgcalBackEndLayer2Producer_cfi.py b/L1Trigger/L1THGCal/python/l1tHGCalBackEndLayer2Producer_cfi.py
similarity index 100%
rename from L1Trigger/L1THGCal/python/hgcalBackEndLayer2Producer_cfi.py
rename to L1Trigger/L1THGCal/python/l1tHGCalBackEndLayer2Producer_cfi.py
diff --git a/L1Trigger/L1THGCal/python/hgcalConcentratorProducer_cfi.py b/L1Trigger/L1THGCal/python/l1tHGCalConcentratorProducer_cfi.py
similarity index 99%
rename from L1Trigger/L1THGCal/python/hgcalConcentratorProducer_cfi.py
rename to L1Trigger/L1THGCal/python/l1tHGCalConcentratorProducer_cfi.py
index 58c85c70af1c6..5220528262b6b 100644
--- a/L1Trigger/L1THGCal/python/hgcalConcentratorProducer_cfi.py
+++ b/L1Trigger/L1THGCal/python/l1tHGCalConcentratorProducer_cfi.py
@@ -76,7 +76,7 @@
                                     rounding = cms.bool(True),
 )
 
-from L1Trigger.L1THGCal.hgcalVFEProducer_cfi import vfe_proc
+from L1Trigger.L1THGCal.l1tHGCalVFEProducer_cfi import vfe_proc
 best_conc_proc = cms.PSet(ProcessorName  = cms.string('HGCalConcentratorProcessorSelection'),
                           Method = cms.vstring(['bestChoiceSelect']*3),
                           NData = cms.vuint32(bestchoice_ndata_decentralized),
diff --git a/L1Trigger/L1THGCal/python/hgcalTowerMapProducer_cfi.py b/L1Trigger/L1THGCal/python/l1tHGCalTowerMapProducer_cfi.py
similarity index 100%
rename from L1Trigger/L1THGCal/python/hgcalTowerMapProducer_cfi.py
rename to L1Trigger/L1THGCal/python/l1tHGCalTowerMapProducer_cfi.py
diff --git a/L1Trigger/L1THGCal/python/hgcalTowerProducer_cfi.py b/L1Trigger/L1THGCal/python/l1tHGCalTowerProducer_cfi.py
similarity index 92%
rename from L1Trigger/L1THGCal/python/hgcalTowerProducer_cfi.py
rename to L1Trigger/L1THGCal/python/l1tHGCalTowerProducer_cfi.py
index 17291264dd6d2..97f4dbbc145fc 100644
--- a/L1Trigger/L1THGCal/python/hgcalTowerProducer_cfi.py
+++ b/L1Trigger/L1THGCal/python/l1tHGCalTowerProducer_cfi.py
@@ -1,5 +1,5 @@
 import FWCore.ParameterSet.Config as cms
-import L1Trigger.L1THGCal.hgcalTowerMapProducer_cfi as hgcalTowerMapProducer_cfi
+import L1Trigger.L1THGCal.l1tHGCalTowerMapProducer_cfi as hgcalTowerMapProducer_cfi
 
 tower = cms.PSet( ProcessorName  = cms.string('HGCalTowerProcessor'),
       includeTrigCells = cms.bool(False),
diff --git a/L1Trigger/L1THGCal/python/hgcalTriggerGeometryESProducer_cfi.py b/L1Trigger/L1THGCal/python/l1tHGCalTriggerGeometryESProducer_cfi.py
similarity index 100%
rename from L1Trigger/L1THGCal/python/hgcalTriggerGeometryESProducer_cfi.py
rename to L1Trigger/L1THGCal/python/l1tHGCalTriggerGeometryESProducer_cfi.py
diff --git a/L1Trigger/L1THGCal/python/hgcalVFEProducer_cfi.py b/L1Trigger/L1THGCal/python/l1tHGCalVFEProducer_cfi.py
similarity index 98%
rename from L1Trigger/L1THGCal/python/hgcalVFEProducer_cfi.py
rename to L1Trigger/L1THGCal/python/l1tHGCalVFEProducer_cfi.py
index a7bb01713c2ad..6f0a31b2e9f3a 100644
--- a/L1Trigger/L1THGCal/python/hgcalVFEProducer_cfi.py
+++ b/L1Trigger/L1THGCal/python/l1tHGCalVFEProducer_cfi.py
@@ -1,7 +1,7 @@
 from __future__ import absolute_import
 import FWCore.ParameterSet.Config as cms
 
-from L1Trigger.L1THGCal.hgcalTriggerGeometryESProducer_cfi import *
+from L1Trigger.L1THGCal.l1tHGCalTriggerGeometryESProducer_cfi import *
 
 import SimCalorimetry.HGCalSimProducers.hgcalDigitizer_cfi as digiparam
 import RecoLocalCalo.HGCalRecProducers.HGCalUncalibRecHit_cfi as recoparam
diff --git a/L1Trigger/L1THGCalUtilities/python/caloTruthCellsProducer_cfi.py b/L1Trigger/L1THGCalUtilities/python/caloTruthCellsProducer_cfi.py
index 03f410291700c..b728b101e5a54 100644
--- a/L1Trigger/L1THGCalUtilities/python/caloTruthCellsProducer_cfi.py
+++ b/L1Trigger/L1THGCalUtilities/python/caloTruthCellsProducer_cfi.py
@@ -1,6 +1,6 @@
 import FWCore.ParameterSet.Config as cms
 
-from L1Trigger.L1THGCal.hgcalBackEndLayer1Producer_cfi import dummy_C2d_params
+from L1Trigger.L1THGCal.l1tHGCalBackEndLayer1Producer_cfi import dummy_C2d_params
 
 l1tCaloTruthCellsProducer = cms.EDProducer('CaloTruthCellsProducer',
     caloParticles = cms.InputTag('mix', 'MergedCaloTruth'),
diff --git a/L1Trigger/L1THGCalUtilities/python/caloTruthCells_cff.py b/L1Trigger/L1THGCalUtilities/python/caloTruthCells_cff.py
index 3c355008569bc..405b9c4bf06c5 100644
--- a/L1Trigger/L1THGCalUtilities/python/caloTruthCells_cff.py
+++ b/L1Trigger/L1THGCalUtilities/python/caloTruthCells_cff.py
@@ -7,11 +7,11 @@
 if l1tCaloTruthCellsProducer.makeCellsCollection:
     ## cluster and tower sequence
 
-    from L1Trigger.L1THGCal.hgcalConcentratorProducer_cfi import l1tHGCalConcentratorProducer
-    from L1Trigger.L1THGCal.hgcalBackEndLayer1Producer_cfi import l1tHGCalBackEndLayer1Producer
-    from L1Trigger.L1THGCal.hgcalBackEndLayer2Producer_cfi import l1tHGCalBackEndLayer2Producer
-    from L1Trigger.L1THGCal.hgcalTowerMapProducer_cfi import l1tHGCalTowerMapProducer
-    from L1Trigger.L1THGCal.hgcalTowerProducer_cfi import l1tHGCalTowerProducer
+    from L1Trigger.L1THGCal.l1tHGCalConcentratorProducer_cfi import l1tHGCalConcentratorProducer
+    from L1Trigger.L1THGCal.l1tHGCalBackEndLayer1Producer_cfi import l1tHGCalBackEndLayer1Producer
+    from L1Trigger.L1THGCal.l1tHGCalBackEndLayer2Producer_cfi import l1tHGCalBackEndLayer2Producer
+    from L1Trigger.L1THGCal.l1tHGCalTowerMapProducer_cfi import l1tHGCalTowerMapProducer
+    from L1Trigger.L1THGCal.l1tHGCalTowerProducer_cfi import l1tHGCalTowerProducer
     
     l1tHGCalTruthConcentratorProducer = l1tHGCalConcentratorProducer.clone(
         InputTriggerCells = cms.InputTag('l1tCaloTruthCellsProducer')
diff --git a/L1Trigger/L1THGCalUtilities/python/clustering2d.py b/L1Trigger/L1THGCalUtilities/python/clustering2d.py
index df279230316d6..374b51c132c38 100644
--- a/L1Trigger/L1THGCalUtilities/python/clustering2d.py
+++ b/L1Trigger/L1THGCalUtilities/python/clustering2d.py
@@ -1,5 +1,5 @@
 import FWCore.ParameterSet.Config as cms
-from L1Trigger.L1THGCal.hgcalBackEndLayer1Producer_cfi import dummy_C2d_params, \
+from L1Trigger.L1THGCal.l1tHGCalBackEndLayer1Producer_cfi import dummy_C2d_params, \
                                                               distance_C2d_params, \
                                                               topological_C2d_params, \
                                                               constrTopological_C2d_params, \
diff --git a/L1Trigger/L1THGCalUtilities/python/clustering2d_v2.py b/L1Trigger/L1THGCalUtilities/python/clustering2d_v2.py
index 94c4b71be0aa7..2f38bed6308be 100644
--- a/L1Trigger/L1THGCalUtilities/python/clustering2d_v2.py
+++ b/L1Trigger/L1THGCalUtilities/python/clustering2d_v2.py
@@ -1,5 +1,5 @@
 import FWCore.ParameterSet.Config as cms
-from L1Trigger.L1THGCal.hgcalBackEndLayer1Producer_cfi import dummy_C2d_params, \
+from L1Trigger.L1THGCal.l1tHGCalBackEndLayer1Producer_cfi import dummy_C2d_params, \
                                                               stage1truncation_proc, \
                                                               truncation_params
 
diff --git a/L1Trigger/L1THGCalUtilities/python/clustering3d.py b/L1Trigger/L1THGCalUtilities/python/clustering3d.py
index ccb3261beb22b..0fdf302cc5f2f 100644
--- a/L1Trigger/L1THGCalUtilities/python/clustering3d.py
+++ b/L1Trigger/L1THGCalUtilities/python/clustering3d.py
@@ -1,5 +1,5 @@
 import FWCore.ParameterSet.Config as cms
-from L1Trigger.L1THGCal.hgcalBackEndLayer2Producer_cfi import distance_C3d_params, \
+from L1Trigger.L1THGCal.l1tHGCalBackEndLayer2Producer_cfi import distance_C3d_params, \
                                                               dbscan_C3d_params, \
                                                               histoMax_C3d_clustering_params, \
                                                               histoMax_C3d_seeding_params, \
diff --git a/L1Trigger/L1THGCalUtilities/python/concentrator.py b/L1Trigger/L1THGCalUtilities/python/concentrator.py
index a6905a13b7fd3..6a7ef10049320 100644
--- a/L1Trigger/L1THGCalUtilities/python/concentrator.py
+++ b/L1Trigger/L1THGCalUtilities/python/concentrator.py
@@ -1,7 +1,7 @@
 
 import FWCore.ParameterSet.Config as cms
 import SimCalorimetry.HGCalSimProducers.hgcalDigitizer_cfi as digiparam
-from L1Trigger.L1THGCal.hgcalConcentratorProducer_cfi import threshold_conc_proc, best_conc_proc, supertc_conc_proc, coarsetc_onebitfraction_proc, custom_conc_proc, autoEncoder_conc_proc
+from L1Trigger.L1THGCal.l1tHGCalConcentratorProducer_cfi import threshold_conc_proc, best_conc_proc, supertc_conc_proc, coarsetc_onebitfraction_proc, custom_conc_proc, autoEncoder_conc_proc
 
 
 class CreateSuperTriggerCell(object):
diff --git a/L1Trigger/L1THGCalUtilities/python/vfe.py b/L1Trigger/L1THGCalUtilities/python/vfe.py
index 5689423458fd3..2fabdb4ece93b 100644
--- a/L1Trigger/L1THGCalUtilities/python/vfe.py
+++ b/L1Trigger/L1THGCalUtilities/python/vfe.py
@@ -1,6 +1,6 @@
 import FWCore.ParameterSet.Config as cms
 
-from L1Trigger.L1THGCal.hgcalVFEProducer_cfi import vfe_proc
+from L1Trigger.L1THGCal.l1tHGCalVFEProducer_cfi import vfe_proc
 
 class CreateVfe(object):
     def __init__(self,
diff --git a/L1Trigger/L1TTrackMatch/python/L1TkObjectProducers_cff.py b/L1Trigger/L1TTrackMatch/python/L1TkObjectProducers_cff.py
index e136acb5a6b76..3ca0ab90d2387 100644
--- a/L1Trigger/L1TTrackMatch/python/L1TkObjectProducers_cff.py
+++ b/L1Trigger/L1TTrackMatch/python/L1TkObjectProducers_cff.py
@@ -50,15 +50,15 @@
 # from L1Trigger.L1TTrackMatch.L1TkCaloJetProducer_cfi import L1TkCaloJets
 # pL1TkCaloJets = cms.Path( L1TkCaloJets)
 
-from L1Trigger.VertexFinder.VertexProducer_cfi import l1tVertexProducer
+from L1Trigger.VertexFinder.l1tVertexProducer_cfi import l1tVertexProducer
 pVertexProducer = cms.Path( l1tVertexProducer )
 
-# from L1Trigger.L1TTrackMatch.L1TrackerEtMissProducer_cfi import L1TrackerEtMiss
-# pL1TrkMET = cms.Path( L1TrackerEtMiss )
+# from L1Trigger.L1TTrackMatch.l1tTrackerEtMiss_cfi import l1tTrackerEtMiss
+# pL1TrkMET = cms.Path( l1tTrackerEtMiss )
 
-# from L1Trigger.L1TTrackMatch.L1TkHTMissProducer_cfi import L1TkCaloHTMissVtx, L1TrackerHTMiss
-# pL1TkCaloHTMissVtx = cms.Path( L1TkCaloHTMissVtx )
-# pL1TrackerHTMiss = cms.Path( L1TrackerHTMiss )
+# from L1Trigger.L1TTrackMatch.l1tTrackerHTMiss_cfi import l1tTkCaloHTMissVtx, l1tTrackerHTMiss
+# pL1TkCaloHTMissVtx = cms.Path( l1tTkCaloHTMissVtx )
+# pL1TrackerHTMiss = cms.Path( l1tTrackerHTMiss )
 
 from L1Trigger.L1TTrackMatch.L1TkMuonProducer_cfi import L1TkMuons, L1TkMuonsTP
 pL1TkMuon = cms.Path( L1TkMuons * L1TkMuonsTP )
diff --git a/L1Trigger/L1TTrackMatch/python/L1FastTrackingJetProducer_cfi.py b/L1Trigger/L1TTrackMatch/python/l1tFastTrackingJetProducer_cfi.py
similarity index 100%
rename from L1Trigger/L1TTrackMatch/python/L1FastTrackingJetProducer_cfi.py
rename to L1Trigger/L1TTrackMatch/python/l1tFastTrackingJetProducer_cfi.py
diff --git a/L1Trigger/L1TTrackMatch/python/L1GTTInputProducer_cfi.py b/L1Trigger/L1TTrackMatch/python/l1tGTTInputProducer_cfi.py
similarity index 100%
rename from L1Trigger/L1TTrackMatch/python/L1GTTInputProducer_cfi.py
rename to L1Trigger/L1TTrackMatch/python/l1tGTTInputProducer_cfi.py
diff --git a/L1Trigger/L1TTrackMatch/python/L1TrackFastJetProducer_cfi.py b/L1Trigger/L1TTrackMatch/python/l1tTrackFastJets_cfi.py
similarity index 100%
rename from L1Trigger/L1TTrackMatch/python/L1TrackFastJetProducer_cfi.py
rename to L1Trigger/L1TTrackMatch/python/l1tTrackFastJets_cfi.py
diff --git a/L1Trigger/L1TTrackMatch/python/L1TrackJetEmulationProducer_cfi.py b/L1Trigger/L1TTrackMatch/python/l1tTrackJetsEmulation_cfi.py
similarity index 100%
rename from L1Trigger/L1TTrackMatch/python/L1TrackJetEmulationProducer_cfi.py
rename to L1Trigger/L1TTrackMatch/python/l1tTrackJetsEmulation_cfi.py
diff --git a/L1Trigger/L1TTrackMatch/python/L1TrackJetProducer_cfi.py b/L1Trigger/L1TTrackMatch/python/l1tTrackJets_cfi.py
similarity index 100%
rename from L1Trigger/L1TTrackMatch/python/L1TrackJetProducer_cfi.py
rename to L1Trigger/L1TTrackMatch/python/l1tTrackJets_cfi.py
diff --git a/L1Trigger/L1TTrackMatch/python/L1TrackSelectionProducer_cfi.py b/L1Trigger/L1TTrackMatch/python/l1tTrackSelectionProducer_cfi.py
similarity index 100%
rename from L1Trigger/L1TTrackMatch/python/L1TrackSelectionProducer_cfi.py
rename to L1Trigger/L1TTrackMatch/python/l1tTrackSelectionProducer_cfi.py
diff --git a/L1Trigger/L1TTrackMatch/python/L1TrackerEtMissEmulatorProducer_cfi.py b/L1Trigger/L1TTrackMatch/python/l1tTrackerEmuEtMiss_cfi.py
similarity index 89%
rename from L1Trigger/L1TTrackMatch/python/L1TrackerEtMissEmulatorProducer_cfi.py
rename to L1Trigger/L1TTrackMatch/python/l1tTrackerEmuEtMiss_cfi.py
index b0cac9847ead0..665a3aa8f8d72 100644
--- a/L1Trigger/L1TTrackMatch/python/L1TrackerEtMissEmulatorProducer_cfi.py
+++ b/L1Trigger/L1TTrackMatch/python/l1tTrackerEmuEtMiss_cfi.py
@@ -6,7 +6,7 @@
     # To bypass GTT input module use  cms.InputTag("TTTracksFromTrackletEmulation", "Level1TTTracks")
     # and set useGTTinput to false
     L1VertexInputTag = cms.InputTag("l1tVertexProducer", "l1vertices"),
-    # This will use the vertex algorithm as specified in VertexProducer_cfi, if using emulated vertex
+    # This will use the vertex algorithm as specified in l1tVertexProducer_cfi, if using emulated vertex
     # set useVertexEmulator to true
     L1MetCollectionName = cms.string("L1TrackerEmuEtMiss"),
     
diff --git a/L1Trigger/L1TTrackMatch/python/L1TkHTMissEmulatorProducer_cfi.py b/L1Trigger/L1TTrackMatch/python/l1tTrackerEmuHTMiss_cfi.py
similarity index 100%
rename from L1Trigger/L1TTrackMatch/python/L1TkHTMissEmulatorProducer_cfi.py
rename to L1Trigger/L1TTrackMatch/python/l1tTrackerEmuHTMiss_cfi.py
diff --git a/L1Trigger/L1TTrackMatch/python/L1TrackerEtMissProducer_cfi.py b/L1Trigger/L1TTrackMatch/python/l1tTrackerEtMiss_cfi.py
similarity index 100%
rename from L1Trigger/L1TTrackMatch/python/L1TrackerEtMissProducer_cfi.py
rename to L1Trigger/L1TTrackMatch/python/l1tTrackerEtMiss_cfi.py
diff --git a/L1Trigger/L1TTrackMatch/python/L1TkHTMissProducer_cfi.py b/L1Trigger/L1TTrackMatch/python/l1tTrackerHTMiss_cfi.py
similarity index 100%
rename from L1Trigger/L1TTrackMatch/python/L1TkHTMissProducer_cfi.py
rename to L1Trigger/L1TTrackMatch/python/l1tTrackerHTMiss_cfi.py
diff --git a/L1Trigger/L1TTrackMatch/test/L1TrackMET_cfg.py b/L1Trigger/L1TTrackMatch/test/L1TrackMET_cfg.py
index 97b631f00d08e..c8ebed5fd351f 100644
--- a/L1Trigger/L1TTrackMatch/test/L1TrackMET_cfg.py
+++ b/L1Trigger/L1TTrackMatch/test/L1TrackMET_cfg.py
@@ -58,20 +58,20 @@
   producerSum = None
 
 if GTTInput:
-  process.load('L1Trigger.L1TTrackMatch.L1GTTInputProducer_cfi')
+  process.load('L1Trigger.L1TTrackMatch.l1tGTTInputProducer_cfi')
   producerSum = producerSum + process.L1GTTInputProducer
 
 
 
-process.load("L1Trigger.L1TTrackMatch.L1TrackerEtMissProducer_cfi")
-process.load("L1Trigger.L1TTrackMatch.L1TrackerEtMissEmulatorProducer_cfi")
+process.load("L1Trigger.L1TTrackMatch.l1tTrackerEtMiss_cfi")
+process.load("L1Trigger.L1TTrackMatch.l1tTrackerEmuEtMiss_cfi")
 process.load("L1Trigger.L1TTrackMatch.L1TkMETAnalyser_cfi")
 
 ############################################################
 # Primary vertex
 ############################################################
 
-process.load('L1Trigger.VertexFinder.VertexProducer_cfi')
+process.load('L1Trigger.VertexFinder.l1tVertexProducer_cfi')
 process.l1tVertexProducer.l1TracksInputTag = cms.InputTag("l1tTTTracksFromTrackletEmulation", "Level1TTTracks")  
 
 
diff --git a/L1Trigger/L1TTrackMatch/test/L1TrackObjectNtupleMaker_cfg.py b/L1Trigger/L1TTrackMatch/test/L1TrackObjectNtupleMaker_cfg.py
index b7dcb8f65fbb8..1f06f25f3b0b8 100644
--- a/L1Trigger/L1TTrackMatch/test/L1TrackObjectNtupleMaker_cfg.py
+++ b/L1Trigger/L1TTrackMatch/test/L1TrackObjectNtupleMaker_cfg.py
@@ -87,16 +87,16 @@
 process.dtc = cms.Path(process.TrackerDTCProducer)#*process.TrackerDTCAnalyzer)
 
 process.load("L1Trigger.TrackFindingTracklet.L1HybridEmulationTracks_cff")
-process.load("L1Trigger.L1TTrackMatch.L1TrackSelectionProducer_cfi")
-process.load("L1Trigger.L1TTrackMatch.L1TrackJetProducer_cfi")
-process.load("L1Trigger.L1TTrackMatch.L1GTTInputProducer_cfi")
-process.load("L1Trigger.L1TTrackMatch.L1TrackJetEmulationProducer_cfi")
-process.load("L1Trigger.L1TTrackMatch.L1TrackFastJetProducer_cfi")
-process.load("L1Trigger.L1TTrackMatch.L1TrackerEtMissProducer_cfi")
-process.load("L1Trigger.L1TTrackMatch.L1TrackerEtMissEmulatorProducer_cfi")
-process.load("L1Trigger.L1TTrackMatch.L1TkHTMissProducer_cfi")
-process.load("L1Trigger.L1TTrackMatch.L1TkHTMissEmulatorProducer_cfi")
-process.load('L1Trigger.VertexFinder.VertexProducer_cfi')
+process.load("L1Trigger.L1TTrackMatch.l1tTrackSelectionProducer_cfi")
+process.load("L1Trigger.L1TTrackMatch.l1tTrackJets_cfi")
+process.load("L1Trigger.L1TTrackMatch.l1tGTTInputProducer_cfi")
+process.load("L1Trigger.L1TTrackMatch.l1tTrackJetsEmulation_cfi")
+process.load("L1Trigger.L1TTrackMatch.l1tTrackFastJets_cfi")
+process.load("L1Trigger.L1TTrackMatch.l1tTrackerEtMiss_cfi")
+process.load("L1Trigger.L1TTrackMatch.l1tTrackerEmuEtMiss_cfi")
+process.load("L1Trigger.L1TTrackMatch.l1tTrackerHTMiss_cfi")
+process.load("L1Trigger.L1TTrackMatch.l1tTrackerEmuHTMiss_cfi")
+process.load('L1Trigger.VertexFinder.l1tVertexProducer_cfi')
 
 
 ############################################################
diff --git a/L1Trigger/Phase2L1ParticleFlow/python/l1ctLayer1_cff.py b/L1Trigger/Phase2L1ParticleFlow/python/l1ctLayer1_cff.py
index 878b74fc1466f..355f9517fa8fd 100644
--- a/L1Trigger/Phase2L1ParticleFlow/python/l1ctLayer1_cff.py
+++ b/L1Trigger/Phase2L1ParticleFlow/python/l1ctLayer1_cff.py
@@ -2,10 +2,10 @@
 
 import math
 
-from L1Trigger.Phase2L1ParticleFlow.pfTracksFromL1Tracks_cfi import l1tPFTracksFromL1Tracks
-from L1Trigger.Phase2L1ParticleFlow.pfClustersFromL1EGClusters_cfi import l1tPFClustersFromL1EGClusters
+from L1Trigger.Phase2L1ParticleFlow.l1tPFTracksFromL1Tracks_cfi import l1tPFTracksFromL1Tracks
+from L1Trigger.Phase2L1ParticleFlow.l1tPFClustersFromL1EGClusters_cfi import l1tPFClustersFromL1EGClusters
 from L1Trigger.Phase2L1ParticleFlow.pfClustersFromCombinedCalo_cff import l1tPFClustersFromCombinedCaloHCal, l1tPFClustersFromCombinedCaloHF
-from L1Trigger.Phase2L1ParticleFlow.pfClustersFromHGC3DClusters_cfi import l1tPFClustersFromHGC3DClusters
+from L1Trigger.Phase2L1ParticleFlow.l1tPFClustersFromHGC3DClusters_cfi import l1tPFClustersFromHGC3DClusters
 
 from L1Trigger.Phase2L1ParticleFlow.l1TkEgAlgoEmulator_cfi import tkEgAlgoParameters,tkEgSorterParameters
 
diff --git a/L1Trigger/Phase2L1ParticleFlow/python/l1pfJetMet_cff.py b/L1Trigger/Phase2L1ParticleFlow/python/l1pfJetMet_cff.py
index d35ff7a709ae0..0bca4124f50e7 100644
--- a/L1Trigger/Phase2L1ParticleFlow/python/l1pfJetMet_cff.py
+++ b/L1Trigger/Phase2L1ParticleFlow/python/l1pfJetMet_cff.py
@@ -1,7 +1,7 @@
 import FWCore.ParameterSet.Config as cms
 
-from L1Trigger.Phase2L1ParticleFlow.L1SeedConePFJetProducer_cfi import l1tSeedConePFJetProducer, l1tSeedConePFJetEmulatorProducer
-from L1Trigger.Phase2L1ParticleFlow.DeregionizerProducer_cfi import l1tDeregionizerProducer as l1tLayer2Deregionizer
+from L1Trigger.Phase2L1ParticleFlow.l1tSeedConePFJetProducer_cfi import l1tSeedConePFJetProducer, l1tSeedConePFJetEmulatorProducer
+from L1Trigger.Phase2L1ParticleFlow.l1tDeregionizerProducer_cfi import l1tDeregionizerProducer as l1tLayer2Deregionizer
 l1tSCPFL1PF            = l1tSeedConePFJetProducer.clone(L1PFObjects = 'l1tLayer1:PF')
 l1tSCPFL1Puppi         = l1tSeedConePFJetProducer.clone()
 l1tSCPFL1PuppiEmulator = l1tSeedConePFJetEmulatorProducer.clone(L1PFObjects = 'l1tLayer2Deregionizer:Puppi')
@@ -19,7 +19,7 @@
 
 l1tSCPFL1PuppiCorrectedEmulator = _correctedJets.clone(jets = 'l1tSCPFL1PuppiEmulator', correctorDir = 'L1PuppiSC4EmuDeregJets')
 
-from L1Trigger.Phase2L1ParticleFlow.L1MhtPfProducer_cfi import l1tMHTPFProducer
+from L1Trigger.Phase2L1ParticleFlow.l1tMHTPFProducer_cfi import l1tMHTPFProducer
 l1tSCPFL1PuppiCorrectedEmulatorMHT = l1tMHTPFProducer.clone() 
 
 L1TPFJetsTask = cms.Task(
diff --git a/L1Trigger/Phase2L1ParticleFlow/python/DeregionizerProducer_cfi.py b/L1Trigger/Phase2L1ParticleFlow/python/l1tDeregionizerProducer_cfi.py
similarity index 100%
rename from L1Trigger/Phase2L1ParticleFlow/python/DeregionizerProducer_cfi.py
rename to L1Trigger/Phase2L1ParticleFlow/python/l1tDeregionizerProducer_cfi.py
diff --git a/L1Trigger/Phase2L1ParticleFlow/python/L1MetPfProducer_cfi.py b/L1Trigger/Phase2L1ParticleFlow/python/l1tMETPFProducer_cfi.py
similarity index 100%
rename from L1Trigger/Phase2L1ParticleFlow/python/L1MetPfProducer_cfi.py
rename to L1Trigger/Phase2L1ParticleFlow/python/l1tMETPFProducer_cfi.py
diff --git a/L1Trigger/Phase2L1ParticleFlow/python/L1MhtPfProducer_cfi.py b/L1Trigger/Phase2L1ParticleFlow/python/l1tMHTPFProducer_cfi.py
similarity index 100%
rename from L1Trigger/Phase2L1ParticleFlow/python/L1MhtPfProducer_cfi.py
rename to L1Trigger/Phase2L1ParticleFlow/python/l1tMHTPFProducer_cfi.py
diff --git a/L1Trigger/Phase2L1ParticleFlow/python/pfClustersFromCombinedCalo_cfi.py b/L1Trigger/Phase2L1ParticleFlow/python/l1tPFClustersFromCombinedCalo_cfi.py
similarity index 100%
rename from L1Trigger/Phase2L1ParticleFlow/python/pfClustersFromCombinedCalo_cfi.py
rename to L1Trigger/Phase2L1ParticleFlow/python/l1tPFClustersFromCombinedCalo_cfi.py
diff --git a/L1Trigger/Phase2L1ParticleFlow/python/pfClustersFromHGC3DClustersEM_cfi.py b/L1Trigger/Phase2L1ParticleFlow/python/l1tPFClustersFromHGC3DClustersEM_cfi.py
similarity index 82%
rename from L1Trigger/Phase2L1ParticleFlow/python/pfClustersFromHGC3DClustersEM_cfi.py
rename to L1Trigger/Phase2L1ParticleFlow/python/l1tPFClustersFromHGC3DClustersEM_cfi.py
index 1d30550aab519..d63f7892435e3 100644
--- a/L1Trigger/Phase2L1ParticleFlow/python/pfClustersFromHGC3DClustersEM_cfi.py
+++ b/L1Trigger/Phase2L1ParticleFlow/python/l1tPFClustersFromHGC3DClustersEM_cfi.py
@@ -1,8 +1,8 @@
 import FWCore.ParameterSet.Config as cms
 
-import L1Trigger.Phase2L1ParticleFlow.pfClustersFromHGC3DClusters_cfi
+import L1Trigger.Phase2L1ParticleFlow.l1tPFClustersFromHGC3DClusters_cfi
 
-pfClustersFromHGC3DClustersEM = L1Trigger.Phase2L1ParticleFlow.pfClustersFromHGC3DClusters_cfi.pfClustersFromHGC3DClusters.clone(
+l1tPFClustersFromHGC3DClustersEM = L1Trigger.Phase2L1ParticleFlow.l1tPFClustersFromHGC3DClusters_cfi.l1tPFClustersFromHGC3DClusters.clone(
     emOnly = cms.bool(True),
     useEMInterpretation = cms.string("emOnly"), # use EM intepretation to redefine the energy
     etMin = cms.double(0.0), 
@@ -19,7 +19,7 @@
 
 from Configuration.Eras.Modifier_phase2_hgcalV10_cff import phase2_hgcalV10
 from Configuration.Eras.Modifier_phase2_hgcalV11_cff import phase2_hgcalV11
-phase2_hgcalV10.toModify(pfClustersFromHGC3DClustersEM,
+phase2_hgcalV10.toModify(l1tPFClustersFromHGC3DClustersEM,
     corrector = "L1Trigger/Phase2L1ParticleFlow/data/emcorr_hgc_106X.root",
     resol = cms.PSet(
         etaBins = cms.vdouble( 1.700,  1.900,  2.200,  2.500,  2.800,  2.900),
@@ -28,7 +28,7 @@
         kind    = cms.string('calo')
     ),
 ) 
-phase2_hgcalV11.toModify(pfClustersFromHGC3DClustersEM,
+phase2_hgcalV11.toModify(l1tPFClustersFromHGC3DClustersEM,
     corrector = "L1Trigger/Phase2L1ParticleFlow/data/emcorr_hgc_110X.root",
     resol = cms.PSet(
         etaBins = cms.vdouble( 1.700,  1.900,  2.200,  2.500,  2.800,  2.900),
diff --git a/L1Trigger/Phase2L1ParticleFlow/python/pfClustersFromHGC3DClusters_cfi.py b/L1Trigger/Phase2L1ParticleFlow/python/l1tPFClustersFromHGC3DClusters_cfi.py
similarity index 100%
rename from L1Trigger/Phase2L1ParticleFlow/python/pfClustersFromHGC3DClusters_cfi.py
rename to L1Trigger/Phase2L1ParticleFlow/python/l1tPFClustersFromHGC3DClusters_cfi.py
diff --git a/L1Trigger/Phase2L1ParticleFlow/python/pfClustersFromL1EGClusters_cfi.py b/L1Trigger/Phase2L1ParticleFlow/python/l1tPFClustersFromL1EGClusters_cfi.py
similarity index 100%
rename from L1Trigger/Phase2L1ParticleFlow/python/pfClustersFromL1EGClusters_cfi.py
rename to L1Trigger/Phase2L1ParticleFlow/python/l1tPFClustersFromL1EGClusters_cfi.py
diff --git a/L1Trigger/Phase2L1ParticleFlow/python/pfTracksFromL1Tracks_cfi.py b/L1Trigger/Phase2L1ParticleFlow/python/l1tPFTracksFromL1Tracks_cfi.py
similarity index 100%
rename from L1Trigger/Phase2L1ParticleFlow/python/pfTracksFromL1Tracks_cfi.py
rename to L1Trigger/Phase2L1ParticleFlow/python/l1tPFTracksFromL1Tracks_cfi.py
diff --git a/L1Trigger/Phase2L1ParticleFlow/python/L1SeedConePFJetProducer_cfi.py b/L1Trigger/Phase2L1ParticleFlow/python/l1tSeedConePFJetProducer_cfi.py
similarity index 100%
rename from L1Trigger/Phase2L1ParticleFlow/python/L1SeedConePFJetProducer_cfi.py
rename to L1Trigger/Phase2L1ParticleFlow/python/l1tSeedConePFJetProducer_cfi.py
diff --git a/L1Trigger/Phase2L1ParticleFlow/python/pfClustersFromCombinedCalo_cff.py b/L1Trigger/Phase2L1ParticleFlow/python/pfClustersFromCombinedCalo_cff.py
index b1ce9fccf1614..648fae8b9832a 100644
--- a/L1Trigger/Phase2L1ParticleFlow/python/pfClustersFromCombinedCalo_cff.py
+++ b/L1Trigger/Phase2L1ParticleFlow/python/pfClustersFromCombinedCalo_cff.py
@@ -1,6 +1,6 @@
 import FWCore.ParameterSet.Config as cms
 
-from L1Trigger.Phase2L1ParticleFlow.pfClustersFromCombinedCalo_cfi import l1tPFClustersFromCombinedCalo
+from L1Trigger.Phase2L1ParticleFlow.l1tPFClustersFromCombinedCalo_cfi import l1tPFClustersFromCombinedCalo
 
 # 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
diff --git a/L1Trigger/Phase2L1ParticleFlow/test/make_l1ctLayer1_dumpFiles_cfg.py b/L1Trigger/Phase2L1ParticleFlow/test/make_l1ctLayer1_dumpFiles_cfg.py
index 38dd684c2b7a6..924c8d01a6bd0 100644
--- a/L1Trigger/Phase2L1ParticleFlow/test/make_l1ctLayer1_dumpFiles_cfg.py
+++ b/L1Trigger/Phase2L1ParticleFlow/test/make_l1ctLayer1_dumpFiles_cfg.py
@@ -32,8 +32,8 @@
 process.load("L1Trigger.Phase2L1ParticleFlow.l1ParticleFlow_cff")
 process.load('L1Trigger.Phase2L1ParticleFlow.l1ctLayer1_cff')
 process.load('L1Trigger.Phase2L1ParticleFlow.l1ctLayer2EG_cff')
-process.load('L1Trigger.L1TTrackMatch.L1GTTInputProducer_cfi')
-process.load('L1Trigger.VertexFinder.VertexProducer_cfi')
+process.load('L1Trigger.L1TTrackMatch.l1tGTTInputProducer_cfi')
+process.load('L1Trigger.VertexFinder.l1tVertexProducer_cfi')
 process.l1tVertexFinderEmulator = process.l1tVertexProducer.clone()
 process.l1tVertexFinderEmulator.VertexReconstruction.Algorithm = "fastHistoEmulation"
 process.l1tVertexFinderEmulator.l1TracksInputTag = cms.InputTag("l1tGTTInputProducer", "Level1TTTracksConverted")
diff --git a/L1Trigger/Phase2L1Taus/python/l1emulator_cff.py b/L1Trigger/Phase2L1Taus/python/l1emulator_cff.py
index 525cb149a7632..40d3022377c6a 100644
--- a/L1Trigger/Phase2L1Taus/python/l1emulator_cff.py
+++ b/L1Trigger/Phase2L1Taus/python/l1emulator_cff.py
@@ -11,7 +11,7 @@
 from SimCalorimetry.EcalEBTrigPrimProducers.ecalEBTriggerPrimitiveDigis_cff import *
 l1emulator += simEcalEBTriggerPrimitiveDigis
 
-from L1Trigger.TrackFindingTracklet.Tracklet_cfi import *
+from L1Trigger.TrackFindingTracklet.l1tTTTracksFromTrackletEmulation_cfi import *
 L1TRK_NAME  = "l1tTTTracksFromTrackletEmulation"
 L1TRK_LABEL = "Level1TTTracks"
 
@@ -24,13 +24,13 @@
 TTTrackAssociatorFromPixelDigis.TTTracks = cms.VInputTag( cms.InputTag(L1TRK_NAME, L1TRK_LABEL) )
 l1emulator += TrackTriggerAssociatorTracks
 
-from L1Trigger.VertexFinder.VertexProducer_cfi import *
+from L1Trigger.VertexFinder.l1tVertexProducer_cfi import *
 l1emulator += l1tVertexProducer
 
 from Configuration.StandardSequences.SimL1Emulator_cff import *
 l1emulator += SimL1Emulator
 
-from L1Trigger.Phase2L1ParticleFlow.pfTracksFromL1Tracks_cfi import *
+from L1Trigger.Phase2L1ParticleFlow.l1tPFTracksFromL1Tracks_cfi import *
 l1emulator += l1tPFTracksFromL1Tracks
 
 from L1Trigger.Phase2L1ParticleFlow.l1ParticleFlow_cff import *
diff --git a/L1Trigger/TrackFindingTracklet/python/L1HybridEmulationTracks_cff.py b/L1Trigger/TrackFindingTracklet/python/L1HybridEmulationTracks_cff.py
index fdde59710461f..3ac44e808ef26 100644
--- a/L1Trigger/TrackFindingTracklet/python/L1HybridEmulationTracks_cff.py
+++ b/L1Trigger/TrackFindingTracklet/python/L1HybridEmulationTracks_cff.py
@@ -2,7 +2,7 @@
 
 from RecoVertex.BeamSpotProducer.BeamSpot_cfi import *
 
-from L1Trigger.TrackFindingTracklet.Tracklet_cfi import *
+from L1Trigger.TrackFindingTracklet.l1tTTTracksFromTrackletEmulation_cfi import *
 
 from SimTracker.TrackTriggerAssociation.TrackTriggerAssociator_cff import *
 
diff --git a/L1Trigger/TrackFindingTracklet/python/Tracklet_cfi.py b/L1Trigger/TrackFindingTracklet/python/l1tTTTracksFromTrackletEmulation_cfi.py
similarity index 100%
rename from L1Trigger/TrackFindingTracklet/python/Tracklet_cfi.py
rename to L1Trigger/TrackFindingTracklet/python/l1tTTTracksFromTrackletEmulation_cfi.py
diff --git a/L1Trigger/VertexFinder/python/InputDataProducer_cff.py b/L1Trigger/VertexFinder/python/l1tInputDataProducer_cfi.py
similarity index 78%
rename from L1Trigger/VertexFinder/python/InputDataProducer_cff.py
rename to L1Trigger/VertexFinder/python/l1tInputDataProducer_cfi.py
index 63f589ec2751e..f16560701af2f 100644
--- a/L1Trigger/VertexFinder/python/InputDataProducer_cff.py
+++ b/L1Trigger/VertexFinder/python/l1tInputDataProducer_cfi.py
@@ -1,8 +1,8 @@
 import FWCore.ParameterSet.Config as cms
-from L1Trigger.VertexFinder.VertexNTupler_cfi import l1tVertexNTupler
-from L1Trigger.VertexFinder.VertexProducer_cfi import l1tVertexProducer
+from L1Trigger.VertexFinder.l1tVertexNTupler_cfi import l1tVertexNTupler
+from L1Trigger.VertexFinder.l1tVertexProducer_cfi import l1tVertexProducer
 
-InputDataProducer = cms.EDProducer('InputDataProducer',
+l1tInputDataProducer = cms.EDProducer('InputDataProducer',
   #=== The name of the output collection
   outputCollectionName = cms.string("InputData"),
   
@@ -22,7 +22,7 @@
   hepMCInputTag = cms.InputTag("generatorSmeared","","SIM"),
   genParticleInputTag = cms.InputTag("genParticles",""),
   tpInputTag = cms.InputTag("mix", "MergedTrackTruth"),
-  tpValueMapInputTag = cms.InputTag("TPStubValueMapProducer:TPs"),
+  tpValueMapInputTag = cms.InputTag("l1tTPStubValueMapProducer:TPs"),
   stubInputTag = cms.InputTag("TTStubsFromPhase2TrackerDigis", "StubAccepted"),
 
   #=== Debug printout
diff --git a/L1Trigger/VertexFinder/python/TPStubValueMapProducer_cff.py b/L1Trigger/VertexFinder/python/l1tTPStubValueMapProducer_cfi.py
similarity index 84%
rename from L1Trigger/VertexFinder/python/TPStubValueMapProducer_cff.py
rename to L1Trigger/VertexFinder/python/l1tTPStubValueMapProducer_cfi.py
index 495c5b3fa6f1d..fc560b6f684f5 100644
--- a/L1Trigger/VertexFinder/python/TPStubValueMapProducer_cff.py
+++ b/L1Trigger/VertexFinder/python/l1tTPStubValueMapProducer_cfi.py
@@ -1,8 +1,8 @@
 import FWCore.ParameterSet.Config as cms
-from L1Trigger.VertexFinder.VertexNTupler_cfi import l1tVertexNTupler
-from L1Trigger.VertexFinder.VertexProducer_cfi import l1tVertexProducer
+from L1Trigger.VertexFinder.l1tVertexNTupler_cfi import l1tVertexNTupler
+from L1Trigger.VertexFinder.l1tVertexProducer_cfi import l1tVertexProducer
 
-TPStubValueMapProducer = cms.EDProducer('TPStubValueMapProducer',
+l1tTPStubValueMapProducer = cms.EDProducer('TPStubValueMapProducer',
   #=== The name of the output collection
   outputCollectionNames = cms.vstring("TPs","TPsUse","allMatchedTPs"),
   
diff --git a/L1Trigger/VertexFinder/python/VertexNTupler_cfi.py b/L1Trigger/VertexFinder/python/l1tVertexNTupler_cfi.py
similarity index 96%
rename from L1Trigger/VertexFinder/python/VertexNTupler_cfi.py
rename to L1Trigger/VertexFinder/python/l1tVertexNTupler_cfi.py
index 590e1c38058a9..1710cbed7ec96 100644
--- a/L1Trigger/VertexFinder/python/VertexNTupler_cfi.py
+++ b/L1Trigger/VertexFinder/python/l1tVertexNTupler_cfi.py
@@ -1,12 +1,12 @@
 import FWCore.ParameterSet.Config as cms
 
 l1tVertexNTupler = cms.EDAnalyzer('VertexNTupler',
-  inputDataInputTag = cms.InputTag("InputDataProducer","InputData"),
+  inputDataInputTag = cms.InputTag("l1tInputDataProducer","InputData"),
   genParticleInputTag = cms.InputTag("genParticles",""),
   l1TracksInputTags    = cms.VInputTag( cms.InputTag("l1tTTTracksFromTrackletEmulation", "Level1TTTracks") ),
   l1TracksTruthMapInputTags = cms.VInputTag( cms.InputTag("TTTrackAssociatorFromPixelDigis", "Level1TTTracks") ),
-  l1TracksTPInputTags = cms.InputTag("TPStubValueMapProducer:allMatchedTPs"),
-  l1TracksTPValueMapInputTags = cms.InputTag("TPStubValueMapProducer:TPs"),
+  l1TracksTPInputTags = cms.InputTag("l1tTPStubValueMapProducer:allMatchedTPs"),
+  l1TracksTPValueMapInputTags = cms.InputTag("l1tTPStubValueMapProducer:TPs"),
   l1TracksBranchNames  = cms.vstring('hybrid'),
   l1VertexInputTags   = cms.VInputTag( cms.InputTag("l1tVertexProducer", "l1vertices") ),
   l1VertexTrackInputs = cms.vstring('hybrid'),
diff --git a/L1Trigger/VertexFinder/python/VertexProducer_cfi.py b/L1Trigger/VertexFinder/python/l1tVertexProducer_cfi.py
similarity index 100%
rename from L1Trigger/VertexFinder/python/VertexProducer_cfi.py
rename to L1Trigger/VertexFinder/python/l1tVertexProducer_cfi.py
diff --git a/L1Trigger/VertexFinder/test/vertexFinder_cfg.py b/L1Trigger/VertexFinder/test/vertexFinder_cfg.py
index 5cd22cbf047fa..e7bcf972d3a7c 100644
--- a/L1Trigger/VertexFinder/test/vertexFinder_cfg.py
+++ b/L1Trigger/VertexFinder/test/vertexFinder_cfg.py
@@ -70,7 +70,7 @@
 
 
 #--- Load config fragment that configures vertex producer
-process.load('L1Trigger.VertexFinder.VertexProducer_cfi')
+process.load('L1Trigger.VertexFinder.l1tVertexProducer_cfi')
 process.l1tVertexProducer.l1TracksInputTag = l1TracksTag
 
 #--- Load config fragment that configures vertex analyzer
diff --git a/L1Trigger/VertexFinder/test/vertexNTupler_cfg.py b/L1Trigger/VertexFinder/test/vertexNTupler_cfg.py
index ec2de4cce74eb..8212c07d3b82b 100644
--- a/L1Trigger/VertexFinder/test/vertexNTupler_cfg.py
+++ b/L1Trigger/VertexFinder/test/vertexNTupler_cfg.py
@@ -79,16 +79,16 @@
     numberOfStreams = cms.untracked.uint32(options.streams if options.streams>0 else 0)
 )
 
-process.load('L1Trigger.VertexFinder.VertexProducer_cfi')
+process.load('L1Trigger.VertexFinder.l1tVertexProducer_cfi')
 process.l1tVertexProducer.l1TracksInputTag = l1TracksTag
 
-process.load('L1Trigger.VertexFinder.TPStubValueMapProducer_cff')
-process.load('L1Trigger.VertexFinder.InputDataProducer_cff')
+process.load('L1Trigger.VertexFinder.l1tTPStubValueMapProducer_cfi')
+process.load('L1Trigger.VertexFinder.l1tInputDataProducer_cfi')
 
-process.load('L1Trigger.VertexFinder.VertexNTupler_cfi')
-process.L1TVertexNTupler.l1TracksInputTag = l1TracksTag
+process.load('L1Trigger.VertexFinder.l1tVertexNTupler_cfi')
+process.l1tVertexNTupler.l1TracksInputTag = l1TracksTag
 
-if process.L1TVertexNTupler.debug == 0:
+if process.l1tVertexNTupler.debug == 0:
     process.MessageLogger.cerr.FwkReport.reportEvery = 50
 process.Timing = cms.Service("Timing", summaryOnly = cms.untracked.bool(True))
 
@@ -103,16 +103,16 @@
 
     if "Emulation" in algo:
         if "L1GTTInputProducer" not in process.producerNames():
-            process.load('L1Trigger.L1TTrackMatch.L1GTTInputProducer_cfi')
+            process.load('L1Trigger.L1TTrackMatch.l1tGTTInputProducer_cfi')
             producer.l1TracksInputTag = cms.InputTag("l1tGTTInputProducer","Level1TTTracksConverted")
             producerSum = process.L1GTTInputProducer + producerSum
 
-        process.L1TVertexNTupler.emulationVertexInputTags.append( cms.InputTag(producerName, 'l1verticesEmulation') )
-        process.L1TVertexNTupler.emulationVertexBranchNames.append(algo)
+        process.l1tVertexNTupler.emulationVertexInputTags.append( cms.InputTag(producerName, 'l1verticesEmulation') )
+        process.l1tVertexNTupler.emulationVertexBranchNames.append(algo)
     else:
-        process.L1TVertexNTupler.l1VertexInputTags.append( cms.InputTag(producerName, 'l1vertices') )
-        process.L1TVertexNTupler.l1VertexBranchNames.append(algo)
-        process.L1TVertexNTupler.l1VertexTrackInputs.append('hybrid')
+        process.l1tVertexNTupler.l1VertexInputTags.append( cms.InputTag(producerName, 'l1vertices') )
+        process.l1tVertexNTupler.l1VertexBranchNames.append(algo)
+        process.l1tVertexNTupler.l1VertexTrackInputs.append('hybrid')
 
     setattr(process, producerName, producer)
     producerSum += producer
@@ -145,8 +145,8 @@
                     print "producer name =", producerName
                     setattr(process, producerName, producer)
                     producerNames += [producerName]
-                    process.L1TVertexNTupler.extraVertexDescriptions += ['DBSCAN(dist={0},minPt={1},minDensity={2},seedTrackPt{3})'.format(dist, minPt, minDensity, seedTrackPt)]
-                    process.L1TVertexNTupler.extraVertexInputTags.append( cms.InputTag(producerName, 'l1vertices'))
+                    process.l1tVertexNTupler.extraVertexDescriptions += ['DBSCAN(dist={0},minPt={1},minDensity={2},seedTrackPt{3})'.format(dist, minPt, minDensity, seedTrackPt)]
+                    process.l1tVertexNTupler.extraVertexInputTags.append( cms.InputTag(producerName, 'l1vertices'))
                     producerSum += producer
 
 print "Total number of producers =", len(additionalProducerAlgorithms)+1
@@ -173,7 +173,7 @@
     process.add_(cms.Service("Tracer", dumpPathsAndConsumes = cms.untracked.bool(True)))
 
 # SETUP THE PATH
-process.p = cms.Path(producerSum + process.TPStubValueMapProducer + process.InputDataProducer + process.L1TVertexNTupler)
+process.p = cms.Path(producerSum + process.l1tTPStubValueMapProducer + process.l1tInputDataProducer + process.l1tVertexNTupler)
 
 # DUMP AND EXIT
 if options.dump:
diff --git a/Validation/HGCalValidation/python/hgcalRunEmulatorValidationTPG_cff.py b/Validation/HGCalValidation/python/hgcalRunEmulatorValidationTPG_cff.py
index 62c53e67fb472..7952acefbd492 100644
--- a/Validation/HGCalValidation/python/hgcalRunEmulatorValidationTPG_cff.py
+++ b/Validation/HGCalValidation/python/hgcalRunEmulatorValidationTPG_cff.py
@@ -1,12 +1,12 @@
 import FWCore.ParameterSet.Config as cms
 
-from L1Trigger.L1THGCal.hgcalTriggerGeometryESProducer_cfi import *
-from L1Trigger.L1THGCal.hgcalVFEProducer_cfi import *
-from L1Trigger.L1THGCal.hgcalConcentratorProducer_cfi import *
-from L1Trigger.L1THGCal.hgcalBackEndLayer1Producer_cfi import *
-from L1Trigger.L1THGCal.hgcalBackEndLayer2Producer_cfi import *
-from L1Trigger.L1THGCal.hgcalTowerMapProducer_cfi import *
-from L1Trigger.L1THGCal.hgcalTowerProducer_cfi import *
+from L1Trigger.L1THGCal.l1tHGCalTriggerGeometryESProducer_cfi import *
+from L1Trigger.L1THGCal.l1tHGCalVFEProducer_cfi import *
+from L1Trigger.L1THGCal.l1tHGCalConcentratorProducer_cfi import *
+from L1Trigger.L1THGCal.l1tHGCalBackEndLayer1Producer_cfi import *
+from L1Trigger.L1THGCal.l1tHGCalBackEndLayer2Producer_cfi import *
+from L1Trigger.L1THGCal.l1tHGCalTowerMapProducer_cfi import *
+from L1Trigger.L1THGCal.l1tHGCalTowerProducer_cfi import *
 from L1Trigger.L1THGCal.hgcalTriggerPrimitives_cff import *
 from Validation.HGCalValidation.hgcalValidationTPG_cfi import *
 
diff --git a/Validation/HGCalValidation/python/hgcalValidationTPG_cff.py b/Validation/HGCalValidation/python/hgcalValidationTPG_cff.py
index 15f5423b8582b..5258dfbc8a16c 100644
--- a/Validation/HGCalValidation/python/hgcalValidationTPG_cff.py
+++ b/Validation/HGCalValidation/python/hgcalValidationTPG_cff.py
@@ -1,6 +1,6 @@
 import FWCore.ParameterSet.Config as cms
 
-from L1Trigger.L1THGCal.hgcalTriggerGeometryESProducer_cfi import *
+from L1Trigger.L1THGCal.l1tHGCalTriggerGeometryESProducer_cfi import *
 from Validation.HGCalValidation.hgcalValidationTPG_cfi import *
 
 runHGCALValidationTPG = cms.Sequence(hgcalTrigPrimValidation)