diff --git a/Examples/src/PlcioTest/PlcioReadAlg.h b/Examples/src/PlcioTest/PlcioReadAlg.h
index 5b9ec8152abd5d3808d9158cd3930bd9ad240a6f..4b66b143f4247487d14133aa1153ec106ff346ac 100644
--- a/Examples/src/PlcioTest/PlcioReadAlg.h
+++ b/Examples/src/PlcioTest/PlcioReadAlg.h
@@ -23,8 +23,8 @@ class PlcioReadAlg : public GaudiAlgorithm
 
     private :
 
-        DataHandle<plcio::EventHeaderCollection> m_headerCol{"EventHeaderCol", Gaudi::DataHandle::Reader, this};
-        DataHandle<plcio::MCParticleCollection> m_mcParCol{"MCParticleCol", Gaudi::DataHandle::Reader, this};
+        DataHandle<plcio::EventHeaderCollection> m_headerCol{"EventHeader", Gaudi::DataHandle::Reader, this};
+        DataHandle<plcio::MCParticleCollection> m_mcParCol{"MCParticle", Gaudi::DataHandle::Reader, this};
 
 };
 
diff --git a/Examples/src/PlcioTest/PlcioWriteAlg.h b/Examples/src/PlcioTest/PlcioWriteAlg.h
index 4ecb770ca0a23705f63c7ca0df34b20ebf0b54d3..c34aa29edc45bf4760775cec7ecab37c9abf69f1 100644
--- a/Examples/src/PlcioTest/PlcioWriteAlg.h
+++ b/Examples/src/PlcioTest/PlcioWriteAlg.h
@@ -23,8 +23,8 @@ class PlcioWriteAlg : public GaudiAlgorithm
 
     private :
 
-        DataHandle<plcio::EventHeaderCollection> m_headerCol{"EventHeaderCol", Gaudi::DataHandle::Writer, this};
-        DataHandle<plcio::MCParticleCollection> m_mcParCol{"MCParticleCol", Gaudi::DataHandle::Writer, this};
+        DataHandle<plcio::EventHeaderCollection> m_headerCol{"EventHeader", Gaudi::DataHandle::Writer, this};
+        DataHandle<plcio::MCParticleCollection> m_mcParCol{"MCParticle", Gaudi::DataHandle::Writer, this};
 
 };
 
diff --git a/Generator/src/GenAlgo.cpp b/Generator/src/GenAlgo.cpp
index 0d8c4698a1fe5a619d41bd88b084adeaafbc0c27..902a43dc961c2c66b5cab10dd188183f2c0653db 100644
--- a/Generator/src/GenAlgo.cpp
+++ b/Generator/src/GenAlgo.cpp
@@ -25,7 +25,7 @@ using namespace std;
 DECLARE_COMPONENT(GenAlgo)
 
 GenAlgo::GenAlgo(const std::string& name, ISvcLocator* pSvcLocator): GaudiAlgorithm(name, pSvcLocator) {
-    declareProperty("MCParticleCol", m_hdl, "MCParticle collection (output)");
+    declareProperty("MCParticle", m_hdl, "MCParticle collection (output)");
     m_evtid = 0;
 
 }
diff --git a/Generator/src/GenAlgo.h b/Generator/src/GenAlgo.h
index 43b4339b71eed42a04dc862bc0cf539956b26b60..499449e16538d5ee4ff89111241065e907dc2ab6 100644
--- a/Generator/src/GenAlgo.h
+++ b/Generator/src/GenAlgo.h
@@ -40,7 +40,7 @@ private:
     int m_evtid;                               
     int m_evtMax;
     //MyHepMC::GenEvent m_event;
-    DataHandle<plcio::MCParticleCollection> m_hdl{"MCParticleCol", Gaudi::DataHandle::Writer, this};
+    DataHandle<plcio::MCParticleCollection> m_hdl{"MCParticle", Gaudi::DataHandle::Writer, this};
 
 
 };
diff --git a/Simulation/DetSimCore/src/G4PrimaryCnvTool.h b/Simulation/DetSimCore/src/G4PrimaryCnvTool.h
index eee528b0763bbe47116dde415e884514a3695094..3aaf2997ceccd780f3b477809db33ba093d791b0 100644
--- a/Simulation/DetSimCore/src/G4PrimaryCnvTool.h
+++ b/Simulation/DetSimCore/src/G4PrimaryCnvTool.h
@@ -16,7 +16,7 @@ public:
     bool mutate(G4Event* anEvent) override;
 
 private:
-    DataHandle<plcio::MCParticleCollection> m_mcParCol{"MCParticleCol", Gaudi::DataHandle::Reader, this};
+    DataHandle<plcio::MCParticleCollection> m_mcParCol{"MCParticle", Gaudi::DataHandle::Reader, this};
 
 };