diff --git a/edm4hep.yaml b/edm4hep.yaml
index cb930a968..c718d48c0 100644
--- a/edm4hep.yaml
+++ b/edm4hep.yaml
@@ -337,7 +337,7 @@ datatypes:
       - edm4hep::ParticleID     particleIDs  //particle IDs (sorted by their likelihood)
 
   #-------------  TrackerHit
-  edm4hep::TrackerHit:
+  edm4hep::TrackerHit3D:
     Description: "Tracker hit"
     Author: "F.Gaede, DESY"
     Members:
@@ -403,7 +403,7 @@ datatypes:
       - edm4hep::TrackState trackStates  //track states
       - edm4hep::Quantity dxQuantities // different measurements of dx quantities
     OneToManyRelations:
-      - edm4hep::TrackerHit trackerHits  //hits that have been used to create this track
+      - edm4hep::TrackerHit3D trackerHits  //hits that have been used to create this track
       - edm4hep::Track tracks            //tracks (segments) that have been combined to create this track
 
  #---------- Vertex
@@ -478,7 +478,7 @@ datatypes:
     Members:
       - float weight              // weight of this association
     OneToOneRelations:
-     - edm4hep::TrackerHit rec    // reference to the reconstructed hit
+     - edm4hep::TrackerHit3D rec    // reference to the reconstructed hit
      - edm4hep::SimTrackerHit sim // reference to the simulated hit
 
   edm4hep::MCRecoTrackerHitPlaneAssociation:
diff --git a/tools/include/edm4hep2json.hxx b/tools/include/edm4hep2json.hxx
index 50dbe0f3f..0849453de 100644
--- a/tools/include/edm4hep2json.hxx
+++ b/tools/include/edm4hep2json.hxx
@@ -18,7 +18,7 @@
 #include "edm4hep/SimTrackerHitCollection.h"
 #include "edm4hep/TimeSeriesCollection.h"
 #include "edm4hep/TrackCollection.h"
-#include "edm4hep/TrackerHitCollection.h"
+#include "edm4hep/TrackerHit3DCollection.h"
 #include "edm4hep/TrackerHitPlaneCollection.h"
 #include "edm4hep/TrackerPulseCollection.h"
 #include "edm4hep/VertexCollection.h"
@@ -92,8 +92,8 @@ nlohmann::json processEvent(const podio::Frame& frame, std::vector<std::string>&
       insertIntoJson<edm4hep::ParticleIDCollection>(jsonDict, coll, collList[i]);
     } else if (coll->getTypeName() == "edm4hep::ClusterCollection") {
       insertIntoJson<edm4hep::ClusterCollection>(jsonDict, coll, collList[i]);
-    } else if (coll->getTypeName() == "edm4hep::TrackerHitCollection") {
-      insertIntoJson<edm4hep::TrackerHitCollection>(jsonDict, coll, collList[i]);
+    } else if (coll->getTypeName() == "edm4hep::TrackerHit3DCollection") {
+      insertIntoJson<edm4hep::TrackerHit3DCollection>(jsonDict, coll, collList[i]);
     } else if (coll->getTypeName() == "edm4hep::TrackerHitPlaneCollection") {
       insertIntoJson<edm4hep::TrackerHitPlaneCollection>(jsonDict, coll, collList[i]);
     } else if (coll->getTypeName() == "edm4hep::RawTimeSeriesCollection") {