diff --git a/DQM/HLTEvF/plugins/PSMonitor.cc b/DQM/HLTEvF/plugins/PSMonitor.cc
index a5733d3551a46..5a2e2bb919dc7 100644
--- a/DQM/HLTEvF/plugins/PSMonitor.cc
+++ b/DQM/HLTEvF/plugins/PSMonitor.cc
@@ -63,7 +63,7 @@ class PSMonitor : public DQMGlobalEDAnalyzer<Histograms> {
 // -----------------------------
 
 PSMonitor::PSMonitor(const edm::ParameterSet& config)
-    : folderName_(config.getParameter<std::string>("FolderName")),
+    : folderName_(config.getParameter<std::string>("folderName")),
       ugtBXToken_(consumes<GlobalAlgBlkBxCollection>(config.getParameter<edm::InputTag>("ugtBXInputTag"))) {
   edm::ParameterSet histoPSet = config.getParameter<edm::ParameterSet>("histoPSet");
   edm::ParameterSet psColumnPSet = histoPSet.getParameter<edm::ParameterSet>("psColumnPSet");
@@ -138,19 +138,19 @@ void PSMonitor::fillHistoPSetDescription(edm::ParameterSetDescription& pset, int
 void PSMonitor::fillDescriptions(edm::ConfigurationDescriptions& descriptions) {
   edm::ParameterSetDescription desc;
   desc.add<edm::InputTag>("ugtBXInputTag", edm::InputTag("hltGtStage2Digis"));
-  desc.add<std::string>("FolderName", "HLT/PSMonitoring");
+  desc.add<std::string>("folderName", "HLT/PSMonitoring");
 
   edm::ParameterSetDescription histoPSet;
 
   edm::ParameterSetDescription psColumnPSet;
   fillHistoPSetDescription(psColumnPSet, 8);
-  histoPSet.add<edm::ParameterSetDescription>("psColumnPSet", psColumnPSet);
+  histoPSet.add("psColumnPSet", psColumnPSet);
 
   edm::ParameterSetDescription lsPSet;
   fillHistoPSetDescription(lsPSet, 2500);
-  histoPSet.add<edm::ParameterSetDescription>("lsPSet", lsPSet);
+  histoPSet.add("lsPSet", lsPSet);
 
-  desc.add<edm::ParameterSetDescription>("histoPSet", histoPSet);
+  desc.add("histoPSet", histoPSet);
 
   descriptions.add("psMonitoring", desc);
 }
diff --git a/HLTrigger/Configuration/python/customizeHLTforCMSSW.py b/HLTrigger/Configuration/python/customizeHLTforCMSSW.py
index b9151d39259eb..2f0e84337cb70 100644
--- a/HLTrigger/Configuration/python/customizeHLTforCMSSW.py
+++ b/HLTrigger/Configuration/python/customizeHLTforCMSSW.py
@@ -248,6 +248,17 @@ def customizeHLTfor40264(process):
 
     return process
 
+def customizeHLTfor40334(process):
+
+  for producer in producers_by_type(process, 'PSMonitor'):
+    if hasattr(producer, 'FolderName'):
+      if not hasattr(producer, 'folderName'):
+        producer.folderName = producer.FolderName
+      del producer.FolderName
+
+  return process
+
+
 # CMSSW version specific customizations
 def customizeHLTforCMSSW(process, menuType="GRun"):
 
@@ -258,5 +269,6 @@ def customizeHLTforCMSSW(process, menuType="GRun"):
  
     process = customizeHLTfor38761(process)
     process = customizeHLTfor40264(process)
+    process = customizeHLTfor40334(process)
 
     return process