diff --git a/PhysicsTools/NanoAOD/plugins/GenWeightsTableProducer.cc b/PhysicsTools/NanoAOD/plugins/GenWeightsTableProducer.cc
index 7e25fe71db49a..08e812ee4447b 100644
--- a/PhysicsTools/NanoAOD/plugins/GenWeightsTableProducer.cc
+++ b/PhysicsTools/NanoAOD/plugins/GenWeightsTableProducer.cc
@@ -120,7 +120,7 @@ class GenWeightsTableProducer : public edm::global::EDProducer<edm::StreamCache<
             produces<nanoaod::FlatTable>("LHEScale");
             produces<nanoaod::FlatTable>("LHEPdf");
             produces<nanoaod::FlatTable>("LHENamed");
-            produces<nanoaod::MergeableCounterTable,edm::InRun>();
+            produces<nanoaod::MergeableCounterTable,edm::Transition::EndRun>();
             if (namedWeightIDs_.size() != namedWeightLabels_.size()) {
                 throw cms::Exception("Configuration", "Size mismatch between namedWeightIDs & namedWeightLabels");
             }
diff --git a/PhysicsTools/NanoAOD/plugins/NanoAODOutputModule.cc b/PhysicsTools/NanoAOD/plugins/NanoAODOutputModule.cc
index 2b74f0f36f837..79df422028930 100644
--- a/PhysicsTools/NanoAOD/plugins/NanoAODOutputModule.cc
+++ b/PhysicsTools/NanoAOD/plugins/NanoAODOutputModule.cc
@@ -320,7 +320,7 @@ NanoAODOutputModule::fillDescriptions(edm::ConfigurationDescriptions& descriptio
         ->setComment("Change the OutputModule name in the fwk job report to fake PoolOutputModule. This is needed to run on cran (and publish) till crab is fixed");
 
   //replace with whatever you want to get from the EDM by default
-  const std::vector<std::string> keep = {"drop *", "keep FlatTable_*Table_*_*", "keep edmTriggerResults_*_*_*", "keep MergeableCounterTable_*Table_*_*", "keep UniqueString_nanoMetadata_*_*"};
+  const std::vector<std::string> keep = {"drop *", "keep nanoaodFlatTable_*Table_*_*", "keep edmTriggerResults_*_*_*", "keep nanoaodMergeableCounterTable_*Table_*_*", "keep nanoaodUniqueString_nanoMetadata_*_*"};
   edm::OutputModule::fillDescription(desc, keep);
   
   //Used by Workflow management for their own meta data
diff --git a/PhysicsTools/NanoAOD/python/NanoAODEDMEventContent_cff.py b/PhysicsTools/NanoAOD/python/NanoAODEDMEventContent_cff.py
index c059641b07e48..e72edd9cfec73 100644
--- a/PhysicsTools/NanoAOD/python/NanoAODEDMEventContent_cff.py
+++ b/PhysicsTools/NanoAOD/python/NanoAODEDMEventContent_cff.py
@@ -3,10 +3,10 @@
 NanoAODEDMEventContent = cms.PSet(
     outputCommands = cms.untracked.vstring(
         'drop *',
-        "keep FlatTable_*Table_*_*",     # event data
+        "keep nanoaodFlatTable_*Table_*_*",     # event data
         "keep edmTriggerResults_*_*_*",  # event data
-        "keep MergeableCounterTable_*Table_*_*", # accumulated per/run or per/lumi data
-        "keep UniqueString_nanoMetadata_*_*",   # basic metadata
+        "keep nanoaodMergeableCounterTable_*Table_*_*", # accumulated per/run or per/lumi data
+        "keep nanoaodUniqueString_nanoMetadata_*_*",   # basic metadata
     )
 )