diff --git a/Simulation/ISF/ISF_Example/python/ISF_Output.py b/Simulation/ISF/ISF_Example/python/ISF_Output.py
index a656570b117fd261bac958e04904b533a6f2987c..fcb2bc118614cd3047c515a197939ddf9c07a462 100644
--- a/Simulation/ISF/ISF_Example/python/ISF_Output.py
+++ b/Simulation/ISF/ISF_Example/python/ISF_Output.py
@@ -71,7 +71,7 @@ def getHITSStreamItemList():
     hitsItemList +=["RecoTimingObj#EVNTtoHITS_timings"]
 
     if 'G4UA::FastCaloSimParamActionTool' in simFlags.OptionalUserActionList.get_Value()['Step']:
-        hitsItemList +=["ISF_FCS_Parametrization::FCS_StepInfoCollection#ZHMergedEventSteps"]
+        hitsItemList +=["ISF_FCS_Parametrization::FCS_StepInfoCollection#MergedEventSteps"]
 
     ## add xAOD::TrackParticles output collection Parametric Simulation
     if simFlags.SimulationFlavour == "ParametricSimulation":
diff --git a/Simulation/ISF/ISF_FastCaloSim/ISF_FastCaloSimParametrization/share/ISF_FastCaloSimParametrization_DigiPostInclude.py b/Simulation/ISF/ISF_FastCaloSim/ISF_FastCaloSimParametrization/share/ISF_FastCaloSimParametrization_DigiPostInclude.py
index 55cef205defc337f4b6c341b1e40c7175cc5fe51..3491c5354028b6eb42dd151458b011e8abc3ae2d 100644
--- a/Simulation/ISF/ISF_FastCaloSim/ISF_FastCaloSimParametrization/share/ISF_FastCaloSimParametrization_DigiPostInclude.py
+++ b/Simulation/ISF/ISF_FastCaloSim/ISF_FastCaloSimParametrization/share/ISF_FastCaloSimParametrization_DigiPostInclude.py
@@ -1,3 +1,3 @@
-streamRDO.ItemList+=["ISF_FCS_Parametrization::FCS_StepInfoCollection#ZHMergedEventSteps","LArHitContainer#*","TileHitVector#*"];
+streamRDO.ItemList+=["ISF_FCS_Parametrization::FCS_StepInfoCollection#MergedEventSteps","LArHitContainer#*","TileHitVector#*"];
 from AthenaCommon.CfgGetter import getPublicTool
 getPublicTool("LArPileUpTool").CrossTalk=False
diff --git a/Simulation/ISF/ISF_FastCaloSim/ISF_FastCaloSimParametrization/share/ISF_FastCaloSimParametrization_SimPostInclude.py b/Simulation/ISF/ISF_FastCaloSim/ISF_FastCaloSimParametrization/share/ISF_FastCaloSimParametrization_SimPostInclude.py
index 80b973f56f7a3f5a14d9077aa1c85739166a1bf7..67017a344bb85806b0cb4485b6529dbf93939eee 100644
--- a/Simulation/ISF/ISF_FastCaloSim/ISF_FastCaloSimParametrization/share/ISF_FastCaloSimParametrization_SimPostInclude.py
+++ b/Simulation/ISF/ISF_FastCaloSim/ISF_FastCaloSimParametrization/share/ISF_FastCaloSimParametrization_SimPostInclude.py
@@ -1,3 +1,3 @@
 from ISF_FastCaloSimParametrization.ISF_FastCaloSimParametrizationConf import FastCaloSimParamAlg
 topSeq += FastCaloSimParamAlg()
-ISF_HITSStream.stream1.ItemList += ["ISF_FCS_Parametrization::FCS_StepInfoCollection#ZHMergedEventSteps"]
+ISF_HITSStream.stream1.ItemList += ["ISF_FCS_Parametrization::FCS_StepInfoCollection#MergedEventSteps"]
diff --git a/Simulation/ISF/ISF_FastCaloSim/ISF_FastCaloSimParametrization/src/FastCaloSimParamAlg.cxx b/Simulation/ISF/ISF_FastCaloSim/ISF_FastCaloSimParametrization/src/FastCaloSimParamAlg.cxx
index 39331d5d3f74d9c127c297cf0c4ac1f6a8e92032..5b59891e38e96fa58ee19f1e3e9cd0a1a315176d 100755
--- a/Simulation/ISF/ISF_FastCaloSim/ISF_FastCaloSimParametrization/src/FastCaloSimParamAlg.cxx
+++ b/Simulation/ISF/ISF_FastCaloSim/ISF_FastCaloSimParametrization/src/FastCaloSimParamAlg.cxx
@@ -193,7 +193,7 @@ StatusCode FastCaloSimParamAlg::execute()
     }
   //clusterize(eventSteps);
   std::cout << "Size after clusterization: " << MergeeventSteps->size() << std::endl;
-  StatusCode sc = evtStore()->record(MergeeventSteps,"ZHMergedEventSteps");
+  StatusCode sc = evtStore()->record(MergeeventSteps,"MergedEventSteps");
   if (sc.isFailure()) 
     {
       std::cout<<"Coudn't resave merged collection "<<std::endl;
@@ -219,7 +219,7 @@ const HepMC::GenParticle* FastCaloSimParamAlg::getParticleFromMC()
 const ISF_FCS_Parametrization::FCS_StepInfoCollection* FastCaloSimParamAlg::getFCS_StepInfo()
 {
   const ISF_FCS_Parametrization::FCS_StepInfoCollection* eventStepsES;
-  StatusCode sc = evtStore()->retrieve(eventStepsES, "ZHEventSteps");
+  StatusCode sc = evtStore()->retrieve(eventStepsES, "EventSteps");
   if (sc.isFailure()) return NULL;
   
   return eventStepsES;
diff --git a/Simulation/ISF/ISF_FastCaloSim/ISF_FastCaloSimParametrization/src/ISF_HitAnalysis.cxx b/Simulation/ISF/ISF_FastCaloSim/ISF_FastCaloSimParametrization/src/ISF_HitAnalysis.cxx
index d5ef695fb5a4c1e01b57f4ab34cad757748fd99c..f4944caec48cb9e336178097345b7b5c142e3fc2 100755
--- a/Simulation/ISF/ISF_FastCaloSim/ISF_FastCaloSimParametrization/src/ISF_HitAnalysis.cxx
+++ b/Simulation/ISF/ISF_FastCaloSim/ISF_FastCaloSimParametrization/src/ISF_HitAnalysis.cxx
@@ -774,7 +774,7 @@ StatusCode ISF_HitAnalysis::execute()
   
  //Get the FastCaloSim step info collection from store
  const ISF_FCS_Parametrization::FCS_StepInfoCollection* eventStepsES;
- StatusCode sc = evtStore()->retrieve(eventStepsES, "ZHMergedEventSteps");
+ StatusCode sc = evtStore()->retrieve(eventStepsES, "MergedEventSteps");
  if (sc.isFailure())
  {
   ATH_MSG_WARNING( "No FastCaloSim steps read from StoreGate?" );
diff --git a/Simulation/ISF/ISF_Geant4/ISF_Geant4UserActions/ISF_Geant4UserActions/FastCaloSimParamAction.h b/Simulation/ISF/ISF_Geant4/ISF_Geant4UserActions/ISF_Geant4UserActions/FastCaloSimParamAction.h
index 314e616dbadf0eb47a2bc9edadd48ee9721e1351..bdf107b6c91b587d00dc2560beda3fd03c24dd0a 100755
--- a/Simulation/ISF/ISF_Geant4/ISF_Geant4UserActions/ISF_Geant4UserActions/FastCaloSimParamAction.h
+++ b/Simulation/ISF/ISF_Geant4/ISF_Geant4UserActions/ISF_Geant4UserActions/FastCaloSimParamAction.h
@@ -77,7 +77,7 @@ namespace G4UA{
     {
       bool shift_lar_subhit=true;
       bool shorten_lar_step=false;
-      std::string stepInfoCollName="ZHEventSteps";
+      std::string stepInfoCollName="EventSteps";
       // calculators
       ServiceHandle<ILArCalculatorSvc> calculator_EMECIW_pos=ServiceHandle<ILArCalculatorSvc>("EMECPosInnerWheelCalculator", "FastCaloSimParamAction");            //!< handle to EMEC positive inner wheel calculator
       ServiceHandle<ILArCalculatorSvc> calculator_EMECIW_neg=ServiceHandle<ILArCalculatorSvc>("EMECNegInnerWheelCalculator", "FastCaloSimParamAction");            //!< handle to EMEC negative inner wheel calculator
diff --git a/TileCalorimeter/TileFastCaloSim/src/TileFCSmStepToTileHitVec.cxx b/TileCalorimeter/TileFastCaloSim/src/TileFCSmStepToTileHitVec.cxx
index 69c1fe7c26e70b4ffb4be01bb7d9004e34f458cc..375b0c86391f4859c73541f4f29323b842991981 100644
--- a/TileCalorimeter/TileFastCaloSim/src/TileFCSmStepToTileHitVec.cxx
+++ b/TileCalorimeter/TileFastCaloSim/src/TileFCSmStepToTileHitVec.cxx
@@ -57,13 +57,13 @@ TileFCSmStepToTileHitVec::TileFCSmStepToTileHitVec(const std::string& name, ISvc
   , m_allHits(0)
   , m_Ushape(-1)
 {
-  m_FCS_StepInfo  = "ZHMergedEventSteps";
+  m_FCS_StepInfo  = "MergedEventSteps";
   m_hitVec        = "TileHitVec_FCS";
   m_infoName      = "TileInfo";
 
   declareProperty( "GeoModelSvc", m_geoModSvc );
   declareProperty( "TileCalculator", m_calc);
-  declareProperty("ZHMergedEventSteps",   m_FCS_StepInfo, "Name of input container (default=TileHitCnt)");
+  declareProperty("StepInfoCollection",   m_FCS_StepInfo, "Name of input container (default=TileHitCnt)");
   declareProperty("TileHitVector",        m_hitVec,       "Name of output hit vector (default=TileHitVec)");
   declareProperty("TileInfoName",         m_infoName,     "Name of TileInfo store (default=TileInfo");
   declareProperty("DeltaT",               m_deltaT,       "Minimal Time granularity in TileHit (default=0.5ns)");