diff --git a/CalibTracker/SiStripChannelGain/python/SiStripGainsPCLWorker_cfi.py b/CalibTracker/SiStripChannelGain/python/SiStripGainsPCLWorker_cfi.py
index 915d7a1b46446..b715ae6081dbb 100644
--- a/CalibTracker/SiStripChannelGain/python/SiStripGainsPCLWorker_cfi.py
+++ b/CalibTracker/SiStripChannelGain/python/SiStripGainsPCLWorker_cfi.py
@@ -1,6 +1,7 @@
 import FWCore.ParameterSet.Config as cms
 
-SiStripGainsPCLWorker = cms.EDAnalyzer( 
+from DQMServices.Core.DQMEDAnalyzer import DQMEDAnalyzer
+SiStripGainsPCLWorker = DQMEDAnalyzer( 
     "SiStripGainsPCLWorker",
     minTrackMomentum    = cms.untracked.double(2),
     maxNrStrips         = cms.untracked.uint32(8),
diff --git a/DQM/HLTEvF/python/trigObjTnPSource_cfi.py b/DQM/HLTEvF/python/trigObjTnPSource_cfi.py
index b20f5891607d5..e0a63262d1edf 100644
--- a/DQM/HLTEvF/python/trigObjTnPSource_cfi.py
+++ b/DQM/HLTEvF/python/trigObjTnPSource_cfi.py
@@ -45,7 +45,8 @@
     filler = cms.PSet(var = cms.string("eta"),localCuts = cms.VPSet())
     )
 
-trigObjTnPSource = cms.EDAnalyzer('TrigObjTnPSource',
+from DQMServices.Core.DQMEDAnalyzer import DQMEDAnalyzer
+trigObjTnPSource = DQMEDAnalyzer('TrigObjTnPSource',
   triggerEvent = cms.InputTag('hltTriggerSummaryAOD','','HLT'),
   triggerResults = cms.InputTag('TriggerResults','','HLT'),
   histColls = cms.VPSet(cms.PSet(
diff --git a/DQMServices/Components/python/DQMLumiMonitor_cfi.py b/DQMServices/Components/python/DQMLumiMonitor_cfi.py
index ba1cdc10b799d..877205b12e5e8 100644
--- a/DQMServices/Components/python/DQMLumiMonitor_cfi.py
+++ b/DQMServices/Components/python/DQMLumiMonitor_cfi.py
@@ -1,6 +1,7 @@
 import FWCore.ParameterSet.Config as cms
 
-dqmLumiMonitor = cms.EDAnalyzer("DQMLumiMonitor",
+from DQMServices.Core.DQMEDAnalyzer import DQMEDAnalyzer
+dqmLumiMonitor = DQMEDAnalyzer("DQMLumiMonitor",
     ModuleName          = cms.string('Info'),
     FolderName          = cms.string('Lumi'),
     PixelClusterInputTag = cms.InputTag('siPixelClusters'),
diff --git a/Validation/DTRecHits/python/DTRecHitQualityAll_cfi.py b/Validation/DTRecHits/python/DTRecHitQualityAll_cfi.py
index 42d07b0d5fccf..d96c345cc75d4 100644
--- a/Validation/DTRecHits/python/DTRecHitQualityAll_cfi.py
+++ b/Validation/DTRecHits/python/DTRecHitQualityAll_cfi.py
@@ -1,6 +1,7 @@
 import FWCore.ParameterSet.Config as cms
 
-rechivalidation = cms.EDAnalyzer("DTRecHitQuality",
+from DQMServices.Core.DQMEDAnalyzer import DQMEDAnalyzer
+rechivalidation = DQMEDAnalyzer("DTRecHitQuality",
     doStep2 = cms.untracked.bool(False),
     # Switches for analysis at various steps
     doStep1 = cms.untracked.bool(True),
@@ -16,7 +17,7 @@
 
 )
 
-seg2dvalidation = cms.EDAnalyzer("DTSegment2DQuality",
+seg2dvalidation = DQMEDAnalyzer("DTSegment2DQuality",
     sigmaResPos = cms.double(0.013),
     simHitLabel = cms.untracked.InputTag('g4SimHits',"MuonDTHits"),
     segment2DLabel = cms.untracked.InputTag('dt2DSegments'),
@@ -24,7 +25,7 @@
     sigmaResAngle = cms.double(0.008)
 )
 
-seg2dsuperphivalidation = cms.EDAnalyzer("DTSegment2DSLPhiQuality",
+seg2dsuperphivalidation = DQMEDAnalyzer("DTSegment2DSLPhiQuality",
     sigmaResPos = cms.double(0.013),
     simHitLabel = cms.untracked.InputTag('g4SimHits',"MuonDTHits"),
     sigmaResAngle = cms.double(0.008),
@@ -34,7 +35,7 @@
     local = cms.untracked.bool(False)
  )
 
-seg4dvalidation = cms.EDAnalyzer("DTSegment4DQuality",
+seg4dvalidation = DQMEDAnalyzer("DTSegment4DQuality",
     #resolution on angle
     sigmaResAlpha = cms.double(0.001),
     sigmaResBeta = cms.double(0.007),
diff --git a/Validation/DTRecHits/python/DTRecHitQuality_cfi.py b/Validation/DTRecHits/python/DTRecHitQuality_cfi.py
index 76eca86d2b7f4..fbbcb760fb5e7 100644
--- a/Validation/DTRecHits/python/DTRecHitQuality_cfi.py
+++ b/Validation/DTRecHits/python/DTRecHitQuality_cfi.py
@@ -1,6 +1,7 @@
 import FWCore.ParameterSet.Config as cms
 
-rechivalidation = cms.EDAnalyzer("DTRecHitQuality",
+from DQMServices.Core.DQMEDAnalyzer import DQMEDAnalyzer
+rechivalidation = DQMEDAnalyzer("DTRecHitQuality",
     doStep2 = cms.untracked.bool(False),
     # Switches for analysis at various steps
     doStep1 = cms.untracked.bool(False),
@@ -15,7 +16,7 @@
     local = cms.untracked.bool(False)
 )
 
-seg2dvalidation = cms.EDAnalyzer("DTSegment2DQuality",
+seg2dvalidation = DQMEDAnalyzer("DTSegment2DQuality",
     sigmaResPos = cms.double(0.013),
     simHitLabel = cms.untracked.InputTag('g4SimHits',"MuonDTHits"),
     segment2DLabel = cms.untracked.InputTag('dt2DSegments'),
@@ -23,7 +24,7 @@
     sigmaResAngle = cms.double(0.008)
 )
 
-seg2dsuperphivalidation = cms.EDAnalyzer("DTSegment2DSLPhiQuality",
+seg2dsuperphivalidation = DQMEDAnalyzer("DTSegment2DSLPhiQuality",
     sigmaResPos = cms.double(0.013),
     simHitLabel = cms.untracked.InputTag('g4SimHits',"MuonDTHits"),
     sigmaResAngle = cms.double(0.008),
@@ -33,7 +34,7 @@
     local = cms.untracked.bool(False)
 )
 
-seg4dvalidation = cms.EDAnalyzer("DTSegment4DQuality",
+seg4dvalidation = DQMEDAnalyzer("DTSegment4DQuality",
     #resolution on angle
     sigmaResAlpha = cms.double(0.001),
     sigmaResBeta = cms.double(0.007),
diff --git a/Validation/HGCalValidation/python/HGCalValidator_cfi.py b/Validation/HGCalValidation/python/HGCalValidator_cfi.py
index 51a056fc02fa0..6a879b527eb97 100644
--- a/Validation/HGCalValidation/python/HGCalValidator_cfi.py
+++ b/Validation/HGCalValidation/python/HGCalValidator_cfi.py
@@ -3,7 +3,8 @@
 from Validation.HGCalValidation.CaloParticleSelectionForEfficiency_cfi import *
 from Validation.HGCalValidation.HGVHistoProducerAlgoBlock_cfi import *
 
-hgcalValidator = cms.EDAnalyzer(
+from DQMServices.Core.DQMEDAnalyzer import DQMEDAnalyzer
+hgcalValidator = DQMEDAnalyzer(
     "HGCalValidator",
 
     ### general settings ###
diff --git a/Validation/RecoTrack/python/MultiTrackValidator_cfi.py b/Validation/RecoTrack/python/MultiTrackValidator_cfi.py
index f66b4466f631d..1b452537c835f 100644
--- a/Validation/RecoTrack/python/MultiTrackValidator_cfi.py
+++ b/Validation/RecoTrack/python/MultiTrackValidator_cfi.py
@@ -5,7 +5,8 @@
 from SimTracker.TrackAssociation.CosmicParametersDefinerForTP_cfi import *
 from Validation.RecoTrack.MTVHistoProducerAlgoForTrackerBlock_cfi import *
 
-multiTrackValidator = cms.EDAnalyzer(
+from DQMServices.Core.DQMEDAnalyzer import DQMEDAnalyzer
+multiTrackValidator = DQMEDAnalyzer(
     "MultiTrackValidator",
 
     ### general settings ###