diff --git a/TileCalorimeter/TileCalib/TileCalibAlgs/TileCalibAlgs/TileCisDefaultCalibTool.h b/TileCalorimeter/TileCalib/TileCalibAlgs/TileCalibAlgs/TileCisDefaultCalibTool.h
index 8991ef4f47bb2f54470ce9c97586007f2f0ed805..e5f115e6cae489186aa19e69bb07ecdff6234114 100644
--- a/TileCalorimeter/TileCalib/TileCalibAlgs/TileCalibAlgs/TileCisDefaultCalibTool.h
+++ b/TileCalorimeter/TileCalib/TileCalibAlgs/TileCalibAlgs/TileCisDefaultCalibTool.h
@@ -91,9 +91,9 @@ class TileCisDefaultCalibTool: public AthAlgTool
     ToolHandle<ITileStuckBitsProbsTool> m_stuckBitsProbs;
     SG::ReadHandleKey<TileDQstatus> m_dqStatusKey;
 
-    SG::ReadHandleKey<TileDigitsContainer> m_DigitsContainerKey{this,
+    SG::ReadHandleKey<TileDigitsContainer> m_digitsContainerKey{this,
       "TileDigitsContainer", "TileDigitsContainer", "Input Tile digits container"};
-    SG::ReadHandleKey<TileRawChannelContainer> m_RawChannelContainerKey{this,
+    SG::ReadHandleKey<TileRawChannelContainer> m_rawChannelContainerKey{this,
       "TileRawChannelContainer", "TileRawChannelContainer", "Input Tile raw channel container"};
     // jobOptions
     std::string m_rawChannelContainerName;
diff --git a/TileCalorimeter/TileCalib/TileCalibAlgs/TileCalibAlgs/TileDigiNoiseCalibAlg.h b/TileCalorimeter/TileCalib/TileCalibAlgs/TileCalibAlgs/TileDigiNoiseCalibAlg.h
index 23978ed5e0961cd24a4407757a0aabe099eaafba..370c92e432cc0d9d188f00df316e6f8eb7d374e9 100644
--- a/TileCalorimeter/TileCalib/TileCalibAlgs/TileCalibAlgs/TileDigiNoiseCalibAlg.h
+++ b/TileCalorimeter/TileCalib/TileCalibAlgs/TileCalibAlgs/TileDigiNoiseCalibAlg.h
@@ -84,7 +84,7 @@ class TileDigiNoiseCalibAlg: public AthAlgorithm {
     bool m_doRobustCov;
 
     SG::ReadHandleKey<TileDQstatus> m_dqStatusKey;
-    SG::ReadHandleKey<TileDigitsContainer> m_DigitsContainerKey{this,
+    SG::ReadHandleKey<TileDigitsContainer> m_digitsContainerKey{this,
       "TileDigitsContainer", "TileDigitsContainer", "Input Tile digits container"};
 
   // Tools / storegate info
diff --git a/TileCalorimeter/TileCalib/TileCalibAlgs/TileCalibAlgs/TileExpertDump.h b/TileCalorimeter/TileCalib/TileCalibAlgs/TileCalibAlgs/TileExpertDump.h
index 4c7ebd68cee0f6348224851c68c6dd94d40da640..e517aa3e91c5ba1cb59570c1c1c4bcca56edda0b 100755
--- a/TileCalorimeter/TileCalib/TileCalibAlgs/TileCalibAlgs/TileExpertDump.h
+++ b/TileCalorimeter/TileCalib/TileCalibAlgs/TileCalibAlgs/TileExpertDump.h
@@ -20,6 +20,8 @@
 
 // Athena includes
 #include "AthenaBaseComps/AthAlgorithm.h"
+#include "xAODEventInfo/EventInfo.h"
+#include "StoreGate/ReadHandleKey.h"
 
 #include "TileIdentifier/TileEmscaleCalibOptions.h"
 
@@ -63,6 +65,9 @@ class TileExpertDump: public AthAlgorithm {
     bool m_printExpertEmscale;
     bool m_printExpertEmscaleOnl;
 
+    SG::ReadHandleKey<xAOD::EventInfo> m_eventInfoKey{this,
+      "EventInfo", "EventInfo", "EventInfo key"};
+
     //=== non-property members
     ToolHandle<TileExpertToolEmscale> m_tileExpertToolEmscale;
 
diff --git a/TileCalorimeter/TileCalib/TileCalibAlgs/TileCalibAlgs/TileInfoDump.h b/TileCalorimeter/TileCalib/TileCalibAlgs/TileCalibAlgs/TileInfoDump.h
index 8d4c04c0b22b470fdfff03a2a99aac22e1391a7d..e1f1ae5f978b1af36c8ba49087903390e439cc42 100755
--- a/TileCalorimeter/TileCalib/TileCalibAlgs/TileCalibAlgs/TileInfoDump.h
+++ b/TileCalorimeter/TileCalib/TileCalibAlgs/TileCalibAlgs/TileInfoDump.h
@@ -20,6 +20,8 @@
 
 // Athena includes
 #include "AthenaBaseComps/AthAlgorithm.h"
+#include "xAODEventInfo/EventInfo.h"
+#include "StoreGate/ReadHandleKey.h"
 
 class ITileBadChanTool;
 class TileCondToolEmscale;
@@ -91,6 +93,9 @@ class TileInfoDump: public AthAlgorithm {
     void print1gNoise();
     bool m_print1gNoise;
 
+    SG::ReadHandleKey<xAOD::EventInfo> m_eventInfoKey{this,
+      "EventInfo", "EventInfo", "EventInfo key"};
+
     //=== Non-property members
     ToolHandle<ITileBadChanTool> m_tileBadChanTool;
     ToolHandle<TileCondToolEmscale> m_tileToolEmscale;
diff --git a/TileCalorimeter/TileCalib/TileCalibAlgs/TileCalibAlgs/TileLaserDefaultCalibTool.h b/TileCalorimeter/TileCalib/TileCalibAlgs/TileCalibAlgs/TileLaserDefaultCalibTool.h
index 3204d60f4d850c4681243688051f4e1bea761519..f5a26d59c521f48fb89debba2bbb9884f01f00ba 100644
--- a/TileCalorimeter/TileCalib/TileCalibAlgs/TileCalibAlgs/TileLaserDefaultCalibTool.h
+++ b/TileCalorimeter/TileCalib/TileCalibAlgs/TileCalibAlgs/TileLaserDefaultCalibTool.h
@@ -78,9 +78,9 @@ class TileLaserDefaultCalibTool : public AthAlgTool, virtual public ITileCalibTo
   ToolHandle<ITileStuckBitsProbsTool> m_stuckBitsProbs;
   SG::ReadHandleKey<TileDQstatus> m_dqStatusKey;
 
-  SG::ReadHandleKey<TileRawChannelContainer> m_RawChannelContainerKey{this,
+  SG::ReadHandleKey<TileRawChannelContainer> m_rawChannelContainerKey{this,
       "TileRawChannelContainer", "TileRawChannelContainer", "Input Tile raw channel container"};
-  SG::ReadHandleKey<TileLaserObject> m_LaserContainerKey{this,
+  SG::ReadHandleKey<TileLaserObject> m_laserContainerKey{this,
       "TileLaserObject", "TileLaserObject", "Input Tile laser object"};
 
   ToolHandle<ITileDCSTool> m_tileDCS{this, "TileDCSTool", "TileDCSTool", "Tile DCS tool"};
diff --git a/TileCalorimeter/TileCalib/TileCalibAlgs/TileCalibAlgs/TileLaserLinearityCalibTool.h b/TileCalorimeter/TileCalib/TileCalibAlgs/TileCalibAlgs/TileLaserLinearityCalibTool.h
index 471c6d431919c01597029d48ee6e7c70fe217a49..44c826eb60ec07df315c1448f642feec7bfd2f2d 100644
--- a/TileCalorimeter/TileCalib/TileCalibAlgs/TileCalibAlgs/TileLaserLinearityCalibTool.h
+++ b/TileCalorimeter/TileCalib/TileCalibAlgs/TileCalibAlgs/TileLaserLinearityCalibTool.h
@@ -47,9 +47,9 @@ class TileLaserLinearityCalibTool : public AthAlgTool, virtual public ITileCalib
   std::string m_laserContainerName;
   SG::ReadHandleKey<TileDQstatus> m_dqStatusKey;
 
-  SG::ReadHandleKey<TileRawChannelContainer> m_RawChannelContainerKey{this,
+  SG::ReadHandleKey<TileRawChannelContainer> m_rawChannelContainerKey{this,
       "TileRawChannelContainer", "TileRawChannelContainer", "Input Tile raw channel container"};
-  SG::ReadHandleKey<TileLaserObject> m_LaserContainerKey{this,
+  SG::ReadHandleKey<TileLaserObject> m_laserContainerKey{this,
       "TileLaserObject", "TileLaserObject", "Input Tile laser object"};
 
   const TileHWID* m_tileHWID;    
diff --git a/TileCalorimeter/TileCalib/TileCalibAlgs/TileCalibAlgs/TileLaserTimingTool.h b/TileCalorimeter/TileCalib/TileCalibAlgs/TileCalibAlgs/TileLaserTimingTool.h
index 5115b8132e9a7bdf4ca73bd2f21d69ec8e45b77a..52deb269a8a9d8e0929764cf07c4d1f2cba069ce 100644
--- a/TileCalorimeter/TileCalib/TileCalibAlgs/TileCalibAlgs/TileLaserTimingTool.h
+++ b/TileCalorimeter/TileCalib/TileCalibAlgs/TileCalibAlgs/TileLaserTimingTool.h
@@ -36,6 +36,7 @@
 // Athena includes
 #include "AthenaBaseComps/AthAlgTool.h"
 #include "Identifier/HWIdentifier.h"
+#include "xAODEventInfo/EventInfo.h"
 #include "StoreGate/ReadHandleKey.h"
 
 // Tile includes
@@ -234,9 +235,11 @@ class TileLaserTimingTool: public AthAlgTool, virtual public ITileCalibTool {
     }
 
     //StoreGate
-    SG::ReadHandleKey<TileRawChannelContainer> m_RawChannelContainerKey{this,
+    SG::ReadHandleKey<xAOD::EventInfo> m_eventInfoKey{this,
+      "EventInfo", "EventInfo", "EventInfo key"};
+    SG::ReadHandleKey<TileRawChannelContainer> m_rawChannelContainerKey{this,
       "TileRawChannelContainer", "TileRawChannelContainer", "Input Tile raw channel container"};
-    SG::ReadHandleKey<TileDigitsContainer> m_DigitsContainerKey{this,
+    SG::ReadHandleKey<TileDigitsContainer> m_digitsContainerKey{this,
       "TileDigitsContainer", "TileDigitsContainer", "Input Tile digits container"};
 
     // Tools info
diff --git a/TileCalorimeter/TileCalib/TileCalibAlgs/TileCalibAlgs/TileOFC2DBAlg.h b/TileCalorimeter/TileCalib/TileCalibAlgs/TileCalibAlgs/TileOFC2DBAlg.h
index 903ac0bc76ca68612f6115e9ffc1bb0ce3136477..3b42b7aefd150fecfee4b31b439b7cc626c64b4b 100755
--- a/TileCalorimeter/TileCalib/TileCalibAlgs/TileCalibAlgs/TileOFC2DBAlg.h
+++ b/TileCalorimeter/TileCalib/TileCalibAlgs/TileCalibAlgs/TileOFC2DBAlg.h
@@ -21,6 +21,8 @@
 
 // Athena includes
 #include "AthenaBaseComps/AthAlgorithm.h"
+#include "xAODEventInfo/EventInfo.h"
+#include "StoreGate/ReadHandleKey.h"
 
 // Tile includes
 #include "TileConditions/ITileCondToolOfc.h"
@@ -46,6 +48,10 @@ class TileOFC2DBAlg: public AthAlgorithm {
     StatusCode registerCondObjects();
     StatusCode printCondObjects();
 
+    //===  storegate
+    SG::ReadHandleKey<xAOD::EventInfo> m_eventInfoKey{this,
+      "EventInfo", "EventInfo", "EventInfo key"};
+
     //===  properties
     UnsignedIntegerProperty m_runIOVSince;
     UnsignedIntegerProperty m_runIOVUntil;
diff --git a/TileCalorimeter/TileCalib/TileCalibAlgs/TileCalibAlgs/TileTOFTool.h b/TileCalorimeter/TileCalib/TileCalibAlgs/TileCalibAlgs/TileTOFTool.h
index 3c77d4a0977b76839e499df502178a0c5d1ce3ab..2e4a18aa144c74d4431e8b5f221dad355f8c3fcf 100755
--- a/TileCalorimeter/TileCalib/TileCalibAlgs/TileCalibAlgs/TileTOFTool.h
+++ b/TileCalorimeter/TileCalib/TileCalibAlgs/TileCalibAlgs/TileTOFTool.h
@@ -38,7 +38,7 @@ class TileTOFTool : public AthAlgTool, virtual public ITileCalibTool
 
  private:
 
-  SG::ReadHandleKey<CaloCellContainer> m_CaloCellContainerKey{this,
+  SG::ReadHandleKey<CaloCellContainer> m_caloCellContainerKey{this,
       "CaloCellContainer", "CaloCellContainer", "Calo cell container"};
 
   float timeCor(int mod_ref1, int mod_ref2, int part_ref1, int part_ref2);
diff --git a/TileCalorimeter/TileCalib/TileCalibAlgs/TileCalibAlgs/TileTriggerDefaultCalibTool.h b/TileCalorimeter/TileCalib/TileCalibAlgs/TileCalibAlgs/TileTriggerDefaultCalibTool.h
index ecedb377fbb3ad8e52701e495bb2f6a3a273862a..c7d7b874064774d57c2d6dd1da8d95d60bfdcad7 100644
--- a/TileCalorimeter/TileCalib/TileCalibAlgs/TileCalibAlgs/TileTriggerDefaultCalibTool.h
+++ b/TileCalorimeter/TileCalib/TileCalibAlgs/TileCalibAlgs/TileTriggerDefaultCalibTool.h
@@ -60,9 +60,9 @@ class TileTriggerDefaultCalibTool : public AthAlgTool, virtual public ITileCalib
   const TileCablingService* m_tileCablingService;
   ToolHandle<TileCondToolEmscale> m_tileToolEmscale; //!< main Tile Calibration tool
   SG::ReadHandleKey<TileDQstatus> m_dqStatusKey;
-  SG::ReadHandleKey<TileRawChannelContainer> m_RawChannelContainerKey{this,
+  SG::ReadHandleKey<TileRawChannelContainer> m_rawChannelContainerKey{this,
       "TileRawChannelContainer", "TileRawChannelContainer", "Input Tile raw channel container"};
-  SG::ReadHandleKey<xAOD::TriggerTowerContainer> m_TriggerTowerContainerKey{this,
+  SG::ReadHandleKey<xAOD::TriggerTowerContainer> m_triggerTowerContainerKey{this,
       "TriggerTowerContainer", "TriggerTowerContainer", "Trigger Tower container"};
  
   // Results Tile
diff --git a/TileCalorimeter/TileCalib/TileCalibAlgs/src/TileCisDefaultCalibTool.cxx b/TileCalorimeter/TileCalib/TileCalibAlgs/src/TileCisDefaultCalibTool.cxx
index 6f89baa931a81338d43b95d0dad74214f434ff6c..a136b6fb1612b282eec4f4c12d74c12a1116bfae 100644
--- a/TileCalorimeter/TileCalib/TileCalibAlgs/src/TileCisDefaultCalibTool.cxx
+++ b/TileCalorimeter/TileCalib/TileCalibAlgs/src/TileCisDefaultCalibTool.cxx
@@ -49,7 +49,6 @@ TileCisDefaultCalibTool::TileCisDefaultCalibTool(const std::string& type, const
 {
   declareInterface<ITileCalibTool>(this);
 
-  //declareProperty("rawChannelContainer", m_rawChannelContainerName = "TileRawChannelFit");
   declareProperty("NtupleID", m_ntupleID = "h3000");
 
   declareProperty("removePed", m_removePed = false);
@@ -65,7 +64,6 @@ TileCisDefaultCalibTool::TileCisDefaultCalibTool(const std::string& type, const
   declareProperty("linfitMinLo", m_linfitMinLo = 300.0);
 
   declareProperty("doSampleChecking", m_doSampleChecking = true); // do sample checking by default
-  //declareProperty("DigitsContainer", m_DigitsContainerName = "TileDigitsCnt");
   declareProperty("StuckBitsProbsTool", m_stuckBitsProbs);
   declareProperty("TileDQstatus", m_dqStatusKey = "TileDQstatus");
 }
@@ -100,8 +98,8 @@ StatusCode TileCisDefaultCalibTool::initialize() {
 
   CHECK( m_dqStatusKey.initialize() );
 
-  ATH_CHECK( m_RawChannelContainerKey.initialize() );
-  ATH_CHECK( m_DigitsContainerKey.initialize() );
+  ATH_CHECK( m_rawChannelContainerKey.initialize() );
+  ATH_CHECK( m_digitsContainerKey.initialize() );
 
   return StatusCode::SUCCESS;
 }
@@ -142,7 +140,7 @@ StatusCode TileCisDefaultCalibTool::execute() {
                                    : (double) dac * c_dac2ChargeSmall;
 
   // Get TileRawChannelContainer
-  SG::ReadHandle<TileRawChannelContainer> container(m_RawChannelContainerKey);
+  SG::ReadHandle<TileRawChannelContainer> container(m_rawChannelContainerKey);
   ATH_CHECK( container.isValid() );
 
   // Create iterator over RawChannelContainer
@@ -230,7 +228,7 @@ StatusCode TileCisDefaultCalibTool::execute() {
 
   if (m_doSampleChecking) {
     // Get TileDigitsContainer
-    SG::ReadHandle<TileDigitsContainer> digContainer(m_DigitsContainerKey);
+    SG::ReadHandle<TileDigitsContainer> digContainer(m_digitsContainerKey);
     ATH_CHECK( digContainer.isValid() );
 
     // Create iterator over RawDigitsContainer
diff --git a/TileCalorimeter/TileCalib/TileCalibAlgs/src/TileDigiNoiseCalibAlg.cxx b/TileCalorimeter/TileCalib/TileCalibAlgs/src/TileDigiNoiseCalibAlg.cxx
index 131b7e6d91a65afab8156d2c2f97ab276b449bdc..9d7f8cf0bea892c39063893be1ac3026e324b71b 100644
--- a/TileCalorimeter/TileCalib/TileCalibAlgs/src/TileDigiNoiseCalibAlg.cxx
+++ b/TileCalorimeter/TileCalib/TileCalibAlgs/src/TileDigiNoiseCalibAlg.cxx
@@ -121,7 +121,7 @@ StatusCode TileDigiNoiseCalibAlg::FirstEvt_initialize() {
   m_cabling = TileCablingService::getInstance();
 
   // TileDigitsContainer initialization
-  ATH_CHECK( m_DigitsContainerKey.initialize() );
+  ATH_CHECK( m_digitsContainerKey.initialize() );
 
   // retrieve TileID helper from det store
   CHECK( detStore()->retrieve(m_tileID) );
@@ -349,11 +349,11 @@ void TileDigiNoiseCalibAlg::StoreRunInfo (const TileDQstatus* dqStatus) {
 StatusCode TileDigiNoiseCalibAlg::fillDigits (const TileDQstatus* theDQstatus) {
 /*---------------------------------------------------------*/
 
-  SG::ReadHandle<TileDigitsContainer> DigitsCnt(m_DigitsContainerKey);
-  ATH_CHECK( DigitsCnt.isValid() );
+  SG::ReadHandle<TileDigitsContainer> digitsCnt(m_digitsContainerKey);
+  ATH_CHECK( digitsCnt.isValid() );
 
-  TileDigitsContainer::const_iterator collItr = DigitsCnt->begin();
-  TileDigitsContainer::const_iterator lastColl = DigitsCnt->end();
+  TileDigitsContainer::const_iterator collItr = digitsCnt->begin();
+  TileDigitsContainer::const_iterator lastColl = digitsCnt->end();
 
   for (; collItr != lastColl; ++collItr) {
 
diff --git a/TileCalorimeter/TileCalib/TileCalibAlgs/src/TileExpertDump.cxx b/TileCalorimeter/TileCalib/TileCalibAlgs/src/TileExpertDump.cxx
index 3b8ed61024a7fd34b52b8855ed6bc1da7da8a427..2fc3aa94bcddc8ca0d471fa747053c16477dc05d 100755
--- a/TileCalorimeter/TileCalib/TileCalibAlgs/src/TileExpertDump.cxx
+++ b/TileCalorimeter/TileCalib/TileCalibAlgs/src/TileExpertDump.cxx
@@ -5,6 +5,7 @@
 // Athena includes
 #include "AthenaKernel/errorcheck.h"
 #include "xAODEventInfo/EventInfo.h"
+#include "StoreGate/ReadHandle.h"
 
 // Tile includes
 #include "TileCalibAlgs/TileExpertDump.h"
@@ -59,6 +60,9 @@ StatusCode TileExpertDump::initialize() {
 
   ATH_MSG_DEBUG( "in initialize()" );
 
+  //=== EventInfo key
+  ATH_CHECK( m_eventInfoKey.initialize() );
+  
   //=== Get TileHWID
   CHECK( detStore()->retrieve(m_tileHWID, "TileHWID") );
 
@@ -102,8 +106,8 @@ StatusCode TileExpertDump::execute() {
 
   ATH_MSG_DEBUG( " in execute()" );
 
-  const xAOD::EventInfo* eventInfo(0);
-  CHECK( evtStore()->retrieve(eventInfo) );
+  SG::ReadHandle<xAOD::EventInfo> eventInfo(m_eventInfoKey);
+  ATH_CHECK( eventInfo.isValid() );
 
   ATH_MSG_DEBUG( "Event: ["
                 << eventInfo->runNumber() << ", "
diff --git a/TileCalorimeter/TileCalib/TileCalibAlgs/src/TileInfoDump.cxx b/TileCalorimeter/TileCalib/TileCalibAlgs/src/TileInfoDump.cxx
index 5b0d0f69b1c54f589b8a87f428848d54c778a8a3..75261961424d1ff36ee382ea5e35a44f2a87f5f5 100755
--- a/TileCalorimeter/TileCalib/TileCalibAlgs/src/TileInfoDump.cxx
+++ b/TileCalorimeter/TileCalib/TileCalibAlgs/src/TileInfoDump.cxx
@@ -9,6 +9,7 @@
 #include "xAODEventInfo/EventInfo.h"
 #include "Identifier/IdentifierHash.h"
 #include "AthenaKernel/errorcheck.h"
+#include "StoreGate/ReadHandle.h"
 
 // Calo includes
 #include "CaloIdentifier/TileID.h"
@@ -102,6 +103,9 @@ StatusCode TileInfoDump::initialize() {
 
   ATH_MSG_DEBUG( "in initialize()" );
 
+  //=== EventInfo key
+  ATH_CHECK( m_eventInfoKey.initialize() );
+
   //=== Get TileHWID
   CHECK( detStore()->retrieve(m_tileHWID, "TileHWID") );
 
@@ -168,8 +172,8 @@ StatusCode TileInfoDump::execute() {
 
   ATH_MSG_DEBUG( " in execute()" );
 
-  const xAOD::EventInfo* eventInfo(0);
-  CHECK( evtStore()->retrieve(eventInfo) );
+  SG::ReadHandle<xAOD::EventInfo> eventInfo(m_eventInfoKey);
+  ATH_CHECK( eventInfo.isValid() );
 
   ATH_MSG_DEBUG( "Event: ["
                 << eventInfo->runNumber() << ", "
diff --git a/TileCalorimeter/TileCalib/TileCalibAlgs/src/TileLaserDefaultCalibTool.cxx b/TileCalorimeter/TileCalib/TileCalibAlgs/src/TileLaserDefaultCalibTool.cxx
index e07bf98b611131b56391c2dea90230091853ea01..c56ad6c048b86f0527f8b71df98ddec3e92bcc0a 100644
--- a/TileCalorimeter/TileCalib/TileCalibAlgs/src/TileLaserDefaultCalibTool.cxx
+++ b/TileCalorimeter/TileCalib/TileCalibAlgs/src/TileLaserDefaultCalibTool.cxx
@@ -268,8 +268,8 @@ StatusCode TileLaserDefaultCalibTool::initialize(){
   ATH_CHECK( m_tileToolEmscale.retrieve() );
   ATH_CHECK( m_tileBadChanTool.retrieve() );
   
-  ATH_CHECK( m_RawChannelContainerKey.initialize() );
-  ATH_CHECK( m_LaserContainerKey.initialize() );
+  ATH_CHECK( m_rawChannelContainerKey.initialize() );
+  ATH_CHECK( m_laserContainerKey.initialize() );
 
   ATH_CHECK( m_tileDCS.retrieve() );
 
@@ -296,8 +296,8 @@ StatusCode TileLaserDefaultCalibTool::execute(){
   // Store laser object and rawchannel information into maps
   ATH_MSG_DEBUG ( "execute() TileLaserDefaultCalibTool" );
   
-  SG::ReadHandle<TileRawChannelContainer> rawCnt(m_RawChannelContainerKey);
-  SG::ReadHandle<TileLaserObject> laserObj(m_LaserContainerKey);
+  SG::ReadHandle<TileRawChannelContainer> rawCnt(m_rawChannelContainerKey);
+  SG::ReadHandle<TileLaserObject> laserObj(m_laserContainerKey);
   
   ATH_CHECK( rawCnt.isValid() );
   ATH_CHECK( laserObj.isValid() );
diff --git a/TileCalorimeter/TileCalib/TileCalibAlgs/src/TileLaserLinearityCalibTool.cxx b/TileCalorimeter/TileCalib/TileCalibAlgs/src/TileLaserLinearityCalibTool.cxx
index 34c6154aa9e769845c4dcf991e0fabc074cdfbcc..23f8bb7d9c5398b19841dbd45fa1f1b437665026 100644
--- a/TileCalorimeter/TileCalib/TileCalibAlgs/src/TileLaserLinearityCalibTool.cxx
+++ b/TileCalorimeter/TileCalib/TileCalibAlgs/src/TileLaserLinearityCalibTool.cxx
@@ -189,8 +189,8 @@ StatusCode TileLaserLinearityCalibTool::initialize()
   ATH_CHECK( detStore()->retrieve(m_tileHWID) );
   ATH_CHECK( m_tileToolEmscale.retrieve() );
 
-  ATH_CHECK( m_RawChannelContainerKey.initialize() );
-  ATH_CHECK( m_LaserContainerKey.initialize() );
+  ATH_CHECK( m_rawChannelContainerKey.initialize() );
+  ATH_CHECK( m_laserContainerKey.initialize() );
 
   m_cabling = TileCablingService::getInstance();
 
@@ -237,8 +237,8 @@ StatusCode TileLaserLinearityCalibTool::execute()
 
   ATH_MSG_DEBUG ( "Retrieving the LASER object and RawChannel" );
 
-  SG::ReadHandle<TileRawChannelContainer> rawCnt(m_RawChannelContainerKey);
-  SG::ReadHandle<TileLaserObject> laserObj(m_LaserContainerKey);
+  SG::ReadHandle<TileRawChannelContainer> rawCnt(m_rawChannelContainerKey);
+  SG::ReadHandle<TileLaserObject> laserObj(m_laserContainerKey);
   
   ATH_CHECK( rawCnt.isValid() );
   ATH_CHECK( laserObj.isValid() );
diff --git a/TileCalorimeter/TileCalib/TileCalibAlgs/src/TileLaserTimingTool.cxx b/TileCalorimeter/TileCalib/TileCalibAlgs/src/TileLaserTimingTool.cxx
index 51fd239250628b1bda8375dab7a989c4f9b3b9b3..6f02a6afcbf87619bf1f7d057ac3a979e99ceec1 100644
--- a/TileCalorimeter/TileCalib/TileCalibAlgs/src/TileLaserTimingTool.cxx
+++ b/TileCalorimeter/TileCalib/TileCalibAlgs/src/TileLaserTimingTool.cxx
@@ -238,8 +238,9 @@ StatusCode TileLaserTimingTool::initialize() {
     }
   }
 
-  ATH_CHECK( m_RawChannelContainerKey.initialize() );
-  ATH_CHECK( m_DigitsContainerKey.initialize() );
+  ATH_CHECK( m_eventInfoKey.initialize() );
+  ATH_CHECK( m_rawChannelContainerKey.initialize() );
+  ATH_CHECK( m_digitsContainerKey.initialize() );
 
   // gauss fit function
   m_gaussf = new TF1("GainGauss", "[0]*exp(- (x-[1])*(x-[1])/(2*[2]*[2]))", -60, 60);
@@ -286,9 +287,9 @@ StatusCode TileLaserTimingTool::execute() {
   // QQQ: const uint32_t cap = cispar[7];
 
   // Get EventInfo
-  const xAOD::EventInfo* eventInfo(0);
+  SG::ReadHandle<xAOD::EventInfo> eventInfo(m_eventInfoKey);
+  ATH_CHECK( eventInfo.isValid() );
 
-  CHECK(evtStore()->retrieve(eventInfo) );
 
   // QQQ: const unsigned runNumber = eventInfo->runNumber();
   // QQQ: const unsigned eventNumber = eventInfo->eventNumber();
@@ -297,11 +298,11 @@ StatusCode TileLaserTimingTool::execute() {
   bool pass = true;
 
   // Get TileRawChannelContainer
-  SG::ReadHandle<TileRawChannelContainer> container(m_RawChannelContainerKey);
+  SG::ReadHandle<TileRawChannelContainer> container(m_rawChannelContainerKey);
   ATH_CHECK( container.isValid() );
 
   // Get TileDigitsContainer
-  SG::ReadHandle<TileDigitsContainer> digitsCnt(m_DigitsContainerKey);
+  SG::ReadHandle<TileDigitsContainer> digitsCnt(m_digitsContainerKey);
   ATH_CHECK( digitsCnt.isValid() );
 
   // Create iterator over RawChannelContainer
diff --git a/TileCalorimeter/TileCalib/TileCalibAlgs/src/TileOFC2DBAlg.cxx b/TileCalorimeter/TileCalib/TileCalibAlgs/src/TileOFC2DBAlg.cxx
index 18beaec22dff5b879a8e7e78a0a43894ca9ecd70..5b75f30427d7d689bda40c674ca4e80ebce87e10 100755
--- a/TileCalorimeter/TileCalib/TileCalibAlgs/src/TileOFC2DBAlg.cxx
+++ b/TileCalorimeter/TileCalib/TileCalibAlgs/src/TileOFC2DBAlg.cxx
@@ -55,6 +55,9 @@ StatusCode TileOFC2DBAlg::initialize() {
 
   ATH_MSG_INFO( "Initializing for " << m_runType );
 
+  //=== EventInfo key
+  ATH_CHECK( m_eventInfoKey.initialize() );
+
   //=== get TileToolTiming
   CHECK( m_tileToolTiming.retrieve() );
 
@@ -86,8 +89,9 @@ StatusCode TileOFC2DBAlg::initialize() {
 StatusCode TileOFC2DBAlg::execute() {
 
   //=== print run/evt/lbn/time info for each event
-  const xAOD::EventInfo* eventInfo(0);
-  CHECK( evtStore()->retrieve(eventInfo) );
+  SG::ReadHandle<xAOD::EventInfo> eventInfo(m_eventInfoKey);
+  ATH_CHECK( eventInfo.isValid() );
+
   ATH_MSG_DEBUG( "Event: ["
                  << eventInfo->runNumber() << ","
                  << eventInfo->eventNumber() << ":"
diff --git a/TileCalorimeter/TileCalib/TileCalibAlgs/src/TileTOFTool.cxx b/TileCalorimeter/TileCalib/TileCalibAlgs/src/TileTOFTool.cxx
index 8e7b427691ce0286deab2b09841cfee402d9b38a..7ee8a4568328a9e978d88adabd5e8d1a63fb95f3 100755
--- a/TileCalorimeter/TileCalib/TileCalibAlgs/src/TileTOFTool.cxx
+++ b/TileCalorimeter/TileCalib/TileCalibAlgs/src/TileTOFTool.cxx
@@ -46,7 +46,7 @@ StatusCode TileTOFTool::initialize()
 {
   ATH_MSG_INFO ( "initialize()" );
 
-  ATH_CHECK( m_CaloCellContainerKey.initialize() );
+  ATH_CHECK( m_caloCellContainerKey.initialize() );
 
   return StatusCode::SUCCESS;  
 } 
@@ -61,7 +61,7 @@ StatusCode TileTOFTool::execute()
 {
   ATH_MSG_INFO ( "execute()" );
 
-  SG::ReadHandle<CaloCellContainer> cellCONT(m_CaloCellContainerKey);
+  SG::ReadHandle<CaloCellContainer> cellCONT(m_caloCellContainerKey);
   ATH_CHECK( cellCONT.isValid() );
   ATH_MSG_DEBUG ( "Cell container found" );
 
diff --git a/TileCalorimeter/TileCalib/TileCalibAlgs/src/TileTriggerDefaultCalibTool.cxx b/TileCalorimeter/TileCalib/TileCalibAlgs/src/TileTriggerDefaultCalibTool.cxx
index 663f1873058df754f4f043a978f35cf786b2bcad..9ee14b0bd7ec2b2c2085c0cd850b9dce2371073b 100644
--- a/TileCalorimeter/TileCalib/TileCalibAlgs/src/TileTriggerDefaultCalibTool.cxx
+++ b/TileCalorimeter/TileCalib/TileCalibAlgs/src/TileTriggerDefaultCalibTool.cxx
@@ -110,8 +110,8 @@ StatusCode TileTriggerDefaultCalibTool::initialize()
   m_ipmtOld = 0;
   m_ipmtCount = 0;
 
-  ATH_CHECK( m_RawChannelContainerKey.initialize() );
-  ATH_CHECK( m_TriggerTowerContainerKey.initialize() );
+  ATH_CHECK( m_rawChannelContainerKey.initialize() );
+  ATH_CHECK( m_triggerTowerContainerKey.initialize() );
 
   ATH_CHECK( m_l1CaloTTIdTools.retrieve() );
   ATH_MSG_DEBUG("L1CaloTTIdTools retrieved");
@@ -144,7 +144,7 @@ StatusCode TileTriggerDefaultCalibTool::execute()
   const TileDQstatus* dqStatus = SG::makeHandle (m_dqStatusKey, ctx).get();
 
   // Get TileRawChannelContainer
-  SG::ReadHandle<TileRawChannelContainer> container(m_RawChannelContainerKey);
+  SG::ReadHandle<TileRawChannelContainer> container(m_rawChannelContainerKey);
          ATH_CHECK( container.isValid() );
 
   ATH_MSG_DEBUG ( "second executeTrigger()" );
@@ -279,7 +279,7 @@ StatusCode TileTriggerDefaultCalibTool::execute()
   } // end of loop over raw channels for Tile
   
   // loop over all L1Calo trigger channels, calculate the average and RMS
-  SG::ReadHandle<xAOD::TriggerTowerContainer> triggerTowers(m_TriggerTowerContainerKey);
+  SG::ReadHandle<xAOD::TriggerTowerContainer> triggerTowers(m_triggerTowerContainerKey);
   ATH_CHECK( triggerTowers.isValid() );
 
   int ntt = 0;