diff --git a/NtupleProducer/python/runPerformanceNTuple.py b/NtupleProducer/python/runPerformanceNTuple.py
index 9ee8fed..49bb539 100644
--- a/NtupleProducer/python/runPerformanceNTuple.py
+++ b/NtupleProducer/python/runPerformanceNTuple.py
@@ -318,7 +318,7 @@ def addTkPtCut(ptCut):
 
 
 def addGen(pdgs):
-    genLepTable = cms.EDProducer("SimpleCandidateFlatTableProducer",
+    genLepTable = cms.EDProducer("SimpleGenParticleFlatTableProducer",
                 src = cms.InputTag("genParticles"),
                 doc = cms.string("gen leptons"),
                 singleton = cms.bool(False), # the number of entries is variable
diff --git a/NtupleProducer/python/scouting/runJetStudyNTuple.py b/NtupleProducer/python/scouting/runJetStudyNTuple.py
index de97a35..948f08d 100644
--- a/NtupleProducer/python/scouting/runJetStudyNTuple.py
+++ b/NtupleProducer/python/scouting/runJetStudyNTuple.py
@@ -97,7 +97,7 @@
         )
 )
 
-process.genParticleTable = cms.EDProducer("SimpleCandidateFlatTableProducer",
+process.genParticleTable = cms.EDProducer("SimpleGenParticleFlatTableProducer",
         name = cms.string("GenParticles"),
         cut  = cms.string("abs(eta) < 5"),
         src = cms.InputTag("genParticlesForMETAllVisible"),
@@ -115,7 +115,7 @@
         )
 )
 
-process.genVertexTable = cms.EDProducer("SimpleXYZPointFlatTableProducer",
+process.genVertexTable = cms.EDProducer("SimpleGenParticleFlatTableProducer",
     src = cms.InputTag("genParticles:xyz0"),
     cut = cms.string(""),
     name= cms.string("GenVtx"),
@@ -189,7 +189,7 @@
     cut = cms.string("abs(pdgId) = 13 && status == 1 && pt > 0.5 && abs(eta) < 2.7"),
 )
 
-process.genMuTable = cms.EDProducer("SimpleCandidateFlatTableProducer",
+process.genMuTable = cms.EDProducer("SimpleGenParticleFlatTableProducer",
     src = cms.InputTag("genMu"),
     cut = cms.string(""),
     name = cms.string("GenMu"),
@@ -291,7 +291,7 @@ def isSignal():
             "keep+ 9900001 <= abs(pdgId) <= 9900008",
         )
     )
-    process.genHardParticleTable = cms.EDProducer("SimpleCandidateFlatTableProducer",
+    process.genHardParticleTable = cms.EDProducer("SimpleGenParticleFlatTableProducer",
             name = cms.string("GenHard"),
             cut  = cms.string(""),
             src = cms.InputTag("genHard"),
diff --git a/NtupleProducer/python/scouting/runL1BinaryDumpers_cfg.py b/NtupleProducer/python/scouting/runL1BinaryDumpers_cfg.py
index 5b820d2..6f24d8d 100644
--- a/NtupleProducer/python/scouting/runL1BinaryDumpers_cfg.py
+++ b/NtupleProducer/python/scouting/runL1BinaryDumpers_cfg.py
@@ -105,7 +105,7 @@
     cut = cms.string("abs(pdgId) = 13 && status == 1 && pt > 0.5 && abs(eta) < 2.7"),
 )
 
-process.genMuTable = cms.EDProducer("SimpleCandidateFlatTableProducer",
+process.genMuTable = cms.EDProducer("SimpleGenParticleFlatTableProducer",
     src = cms.InputTag("genMu"),
     cut = cms.string(""),
     name = cms.string("GenMu"),
@@ -175,7 +175,7 @@
         src = cms.InputTag("genParticles"),
         cut = cms.string("abs(pdgId) = 211 && numberOfMothers > 0 && abs(motherRef.pdgId) = 24"),
 )
-process.genWTable = cms.EDProducer("SimpleCandidateFlatTableProducer",
+process.genWTable = cms.EDProducer("SimpleGenParticleFlatTableProducer",
                 src = cms.InputTag("genW"),
                 cut = cms.string(""),
                 name = cms.string("GenW"),
@@ -192,7 +192,7 @@
                     pdgId  = Var("pdgId", int, doc="PDG id"),
                 )
             )
-process.genPiTable = cms.EDProducer("SimpleCandidateFlatTableProducer",
+process.genPiTable = cms.EDProducer("SimpleGenParticleFlatTableProducer",
                 src = cms.InputTag("genPiFromW"),
                 cut = cms.string(""),
                 name = cms.string("GenPi"),
@@ -337,7 +337,7 @@
 process.genEle = process.genPho.clone(
     cut = "pdgId == 11 && status == 1",
 )
-process.genPhoTable = cms.EDProducer("SimpleCandidateFlatTableProducer",
+process.genPhoTable = cms.EDProducer("SimpleGenParticleFlatTableProducer",
     src = cms.InputTag("genPho"),
     cut = cms.string(""),
     name = cms.string("GenPho"),
diff --git a/NtupleProducer/python/scouting/runMuNTuple_cfg.py b/NtupleProducer/python/scouting/runMuNTuple_cfg.py
index 4f6e081..d670eb5 100644
--- a/NtupleProducer/python/scouting/runMuNTuple_cfg.py
+++ b/NtupleProducer/python/scouting/runMuNTuple_cfg.py
@@ -72,7 +72,7 @@
     cut = cms.string("abs(pdgId) = 13 && status == 1 && pt > 0.5 && abs(eta) < 2.7"),
 )
 
-process.genMuTable = cms.EDProducer("SimpleCandidateFlatTableProducer",
+process.genMuTable = cms.EDProducer("SimpleGenParticleFlatTableProducer",
     src = cms.InputTag("genMu"),
     cut = cms.string(""),
     name = cms.string("GenMu"),
diff --git a/NtupleProducer/python/scouting/runW3PiNtuples_cfg.py b/NtupleProducer/python/scouting/runW3PiNtuples_cfg.py
index 63d03ad..5c1bf5a 100644
--- a/NtupleProducer/python/scouting/runW3PiNtuples_cfg.py
+++ b/NtupleProducer/python/scouting/runW3PiNtuples_cfg.py
@@ -79,7 +79,7 @@ def goSignal():
             src = cms.InputTag("genParticles"),
             cut = cms.string("abs(pdgId) = 211 && numberOfMothers > 0 && abs(motherRef.pdgId) = 24"),
     )
-    process.genWTable = cms.EDProducer("SimpleCandidateFlatTableProducer",
+    process.genWTable = cms.EDProducer("SimpleGenParticleFlatTableProducer",
                     src = cms.InputTag("genW"),
                     cut = cms.string(""),
                     name = cms.string("GenW"),
@@ -96,7 +96,7 @@ def goSignal():
                         pdgId  = Var("pdgId", int, doc="PDG id"),
                     )
                 )
-    process.genPiTable = cms.EDProducer("SimpleCandidateFlatTableProducer",
+    process.genPiTable = cms.EDProducer("SimpleGenParticleFlatTableProducer",
                     src = cms.InputTag("genPiFromW"),
                     cut = cms.string(""),
                     name = cms.string("GenPi"),