diff --git a/Detector/DetComponents/src/RedoSegmentation.h b/Detector/DetComponents/src/RedoSegmentation.h
index 1ac3c52..943f9ca 100644
--- a/Detector/DetComponents/src/RedoSegmentation.h
+++ b/Detector/DetComponents/src/RedoSegmentation.h
@@ -67,7 +67,7 @@ class RedoSegmentation : public GaudiAlgorithm {
       "hits/caloOutHits", Gaudi::DataHandle::Writer, this};
   /// Handle for the output hits cell id encoding.
   MetaDataHandle<std::string> m_outHitsCellIDEncoding{
-      m_outHits, edm4hep::CellIDEncoding, Gaudi::DataHandle::Writer};
+      m_outHits, edm4hep::labels::CellIDEncoding, Gaudi::DataHandle::Writer};
   /// New segmentation
   dd4hep::DDSegmentation::Segmentation* m_segmentation;
   int m_segmentationType; // use enum instead? defined in some namespace?
diff --git a/SimG4Components/src/SimG4SaveCalHits.h b/SimG4Components/src/SimG4SaveCalHits.h
index 95a236f..1d733b5 100644
--- a/SimG4Components/src/SimG4SaveCalHits.h
+++ b/SimG4Components/src/SimG4SaveCalHits.h
@@ -69,7 +69,7 @@ class SimG4SaveCalHits : public GaudiTool, virtual public ISimG4SaveOutputTool {
       "CaloHits", Gaudi::DataHandle::Writer, this};
   /// Output handle for cell ID encoding string
   MetaDataHandle<std::string> m_cellIDEncoding{
-      m_caloHits, edm4hep::CellIDEncoding, Gaudi::DataHandle::Writer};
+      m_caloHits, edm4hep::labels::CellIDEncoding, Gaudi::DataHandle::Writer};
   /// Name of the readouts (hits collections) to save, deprecated
   Gaudi::Property<std::vector<std::string>> m_readoutNames{
       this, "readoutNames", {}, "[Deprecated] Names of the readouts (hits collections) to save"};
diff --git a/SimG4Components/src/SimG4SaveTrackerHits.h b/SimG4Components/src/SimG4SaveTrackerHits.h
index d40d9d4..da3caf5 100644
--- a/SimG4Components/src/SimG4SaveTrackerHits.h
+++ b/SimG4Components/src/SimG4SaveTrackerHits.h
@@ -70,7 +70,7 @@ class SimG4SaveTrackerHits : public GaudiTool, virtual public ISimG4SaveOutputTo
       "TrackerHits", Gaudi::DataHandle::Writer, this};
   /// Output handle for cell ID encoding string
   MetaDataHandle<std::string> m_cellIDEncoding {
-      m_trackHits, edm4hep::CellIDEncoding, Gaudi::DataHandle::Writer};
+      m_trackHits, edm4hep::labels::CellIDEncoding, Gaudi::DataHandle::Writer};
   /// Names of the readouts (hits collections) to save, deprecated
   Gaudi::Property<std::vector<std::string>> m_readoutNames {
       this, "readoutNames", {}, "[Deprecated] Name of the readouts (hits collections) to save"};