diff --git a/edm4eic.yaml b/edm4eic.yaml
index c4d30b3..4c822dd 100644
--- a/edm4eic.yaml
+++ b/edm4eic.yaml
@@ -260,7 +260,7 @@ datatypes:
       - int32_t           layer             // Layer that the hit occurred in
       - edm4hep::Vector3f local             // The local coordinates of the hit in the detector segment [mm]. 
     OneToOneRelations:
-      - edm4eic::RawCalorimeterHit rawCalorimeterHit       // Related raw calorimeter hit
+      - edm4eic::RawCalorimeterHit rawHit       // Related raw calorimeter hit
 
   ## ==========================================================================
   ## Clustering
@@ -370,7 +370,7 @@ datatypes:
       - float             edep              // Energy deposit in this hit [GeV]
       - float             edepError         // Error on the energy deposit [GeV]
     OneToOneRelations:
-      - edm4eic::RawTrackerHit rawTrackerHit       // Related raw tracker hit
+      - edm4eic::RawTrackerHit rawHit       // Related raw tracker hit
       
   edm4eic::Measurement2D:
     Description: "2D measurement (on an arbitrary surface)"
@@ -569,5 +569,5 @@ datatypes:
     Members:
       - float                 weight        // weight of this association
     OneToOneRelations:
-     - edm4eic::RawCalorimeterHit rawCalorimeterHit        // reference to the digitized calorimeter hit
-     - edm4hep::SimCalorimeterHit simCalorimeterHit        // reference to the simulated calorimeter hit
+     - edm4eic::RawCalorimeterHit rawHit        // reference to the digitized calorimeter hit
+     - edm4hep::SimCalorimeterHit simHit        // reference to the simulated calorimeter hit