diff --git a/CondTools/Ecal/plugins/SealModule.cc b/CondTools/Ecal/plugins/SealModule.cc
index 50fc64b002856..407af4f9cdc52 100644
--- a/CondTools/Ecal/plugins/SealModule.cc
+++ b/CondTools/Ecal/plugins/SealModule.cc
@@ -1,6 +1,7 @@
 #include "FWCore/PluginManager/interface/ModuleDef.h"
 #include "FWCore/Framework/interface/MakerMacros.h"
 #include "CondTools/Ecal/plugins/StoreEcalCondition.h"
+#include "CondTools/Ecal/plugins/StoreESCondition.h"
 #include "CondTools/Ecal/interface/EcalDBCopy.h"
 #include "CondTools/Ecal/interface/ESDBCopy.h"
 #include "CondTools/Ecal/interface/EcalTestDevDB.h"
@@ -10,6 +11,7 @@
 
 
 DEFINE_FWK_MODULE(StoreEcalCondition);
+DEFINE_FWK_MODULE(StoreESCondition);
 DEFINE_FWK_MODULE(EcalDBCopy);
 DEFINE_FWK_MODULE(ESDBCopy);
 DEFINE_FWK_MODULE(EcalTestDevDB);
diff --git a/CondTools/Ecal/python/EcalTPGFineGrainStripfromFile_cfg.py b/CondTools/Ecal/python/EcalTPGFineGrainStripfromFile_cfg.py
index 44715511305f0..6d49fc7a89aab 100644
--- a/CondTools/Ecal/python/EcalTPGFineGrainStripfromFile_cfg.py
+++ b/CondTools/Ecal/python/EcalTPGFineGrainStripfromFile_cfg.py
@@ -1,12 +1,13 @@
 import FWCore.ParameterSet.Config as cms
 
 process = cms.Process("ProcessOne")
-process.load("CondCore.DBCommon.CondDBCommon_cfi")
-process.CondDBCommon.DBParameters.authenticationPath = '/afs/cern.ch/cms/DB/conddb/'
+process.load("CondCore.CondDB.CondDB_cfi")
+#process.load("CondCore.DBCommon.CondDBCommon_cfi")
+process.CondDB.DBParameters.authenticationPath = '/afs/cern.ch/cms/DB/conddb/'
 #
 # Choose the output database
 #
-process.CondDBCommon.connect = 'sqlite_file:EcalTPGFineGrainStrip.db'
+process.CondDB.connect = 'sqlite_file:EcalTPGFineGrainStrip.db'
 
 process.MessageLogger = cms.Service("MessageLogger",
   debugModules = cms.untracked.vstring('*'),
@@ -21,7 +22,7 @@
 )
 
 process.PoolDBESSource = cms.ESSource("PoolDBESSource",
-  process.CondDBCommon,
+  process.CondDB,
   timetype = cms.untracked.string('runnumber'),
   toGet = cms.VPSet(
     cms.PSet(
@@ -32,7 +33,7 @@
  )
 
 process.PoolDBOutputService = cms.Service("PoolDBOutputService",
-  process.CondDBCommon,
+  process.CondDB,
   logconnect = cms.untracked.string('sqlite_file:DBLog.db'),
   timetype = cms.untracked.string('runnumber'),
   toPut = cms.VPSet(
diff --git a/CondTools/Ecal/python/EcalTPGSpikeThresholdfromFile_cfg.py b/CondTools/Ecal/python/EcalTPGSpikeThresholdfromFile_cfg.py
index 86d3b693f7fa9..d19487306ffb3 100644
--- a/CondTools/Ecal/python/EcalTPGSpikeThresholdfromFile_cfg.py
+++ b/CondTools/Ecal/python/EcalTPGSpikeThresholdfromFile_cfg.py
@@ -1,12 +1,13 @@
 import FWCore.ParameterSet.Config as cms
 
 process = cms.Process("ProcessOne")
-process.load("CondCore.DBCommon.CondDBCommon_cfi")
-process.CondDBCommon.DBParameters.authenticationPath = '/afs/cern.ch/cms/DB/conddb/'
+process.load("CondCore.CondDB.CondDB_cfi")
+#process.load("CondCore.DBCommon.CondDBCommon_cfi")
+process.CondDB.DBParameters.authenticationPath = '/afs/cern.ch/cms/DB/conddb/'
 #
 # Choose the output database
 #
-process.CondDBCommon.connect = 'sqlite_file:EcalTPGSpike.db'
+process.CondDB.connect = 'sqlite_file:EcalTPGSpike.db'
 
 process.MessageLogger = cms.Service("MessageLogger",
   debugModules = cms.untracked.vstring('*'),
@@ -21,7 +22,7 @@
 )
 
 process.PoolDBESSource = cms.ESSource("PoolDBESSource",
-  process.CondDBCommon,
+  process.CondDB,
   timetype = cms.untracked.string('runnumber'),
   toGet = cms.VPSet(
     cms.PSet(
@@ -32,7 +33,7 @@
  )
 
 process.PoolDBOutputService = cms.Service("PoolDBOutputService",
-  process.CondDBCommon,
+  process.CondDB,
   logconnect = cms.untracked.string('sqlite_file:DBLog.db'),
   timetype = cms.untracked.string('runnumber'),
   toPut = cms.VPSet(
diff --git a/CondTools/Ecal/python/Ecal_Laser_weekly_Linearization_Check_cfg.py b/CondTools/Ecal/python/Ecal_Laser_weekly_Linearization_Check_cfg.py
index a16d22432dc4d..9ad2d26b81563 100644
--- a/CondTools/Ecal/python/Ecal_Laser_weekly_Linearization_Check_cfg.py
+++ b/CondTools/Ecal/python/Ecal_Laser_weekly_Linearization_Check_cfg.py
@@ -1,13 +1,14 @@
 import FWCore.ParameterSet.Config as cms
 
 process = cms.Process("ProcessOne")
-process.load("CondCore.DBCommon.CondDBCommon_cfi")
-process.CondDBCommon.DBParameters.authenticationPath = '/afs/cern.ch/cms/DB/conddb/'
+#process.load("CondCore.DBCommon.CondDBCommon_cfi")
+process.load("CondCore.CondDB.CondDB_cfi")
+process.CondDB.DBParameters.authenticationPath = '/afs/cern.ch/cms/DB/conddb/'
 #
 # Choose the output database
 #
 #process.CondDBCommon.connect = 'oracle://cms_orcon_prod/CMS_COND_311X_ECAL_LAS'
-process.CondDBCommon.connect = 'sqlite_file:EcalLin.db'
+process.CondDB.connect = 'sqlite_file:EcalLin.db'
 
 process.MessageLogger = cms.Service("MessageLogger",
   debugModules = cms.untracked.vstring('*'),
@@ -22,7 +23,7 @@
 )
 
 process.PoolDBESSource = cms.ESSource("PoolDBESSource",
-  process.CondDBCommon,
+  process.CondDB,
   timetype = cms.untracked.string('runnumber'),
   toGet = cms.VPSet(
     cms.PSet(
@@ -33,7 +34,7 @@
  )
 
 process.PoolDBOutputService = cms.Service("PoolDBOutputService",
-  process.CondDBCommon,
+  process.CondDB,
   logconnect = cms.untracked.string('sqlite_file:DBLog.db'),
   timetype = cms.untracked.string('runnumber'),
   toPut = cms.VPSet(