diff --git a/doc/edm4hep_diagram.svg b/doc/edm4hep_diagram.svg
index 354145f97..31215bf05 100644
--- a/doc/edm4hep_diagram.svg
+++ b/doc/edm4hep_diagram.svg
@@ -24,14 +24,14 @@
      inkscape:pageopacity="0"
      inkscape:pageshadow="2"
      inkscape:window-width="1920"
-     inkscape:window-height="1043"
+     inkscape:window-height="1136"
      id="namedview332"
      showgrid="true"
      inkscape:zoom="0.86342179"
-     inkscape:cx="565.77215"
-     inkscape:cy="265.22379"
-     inkscape:window-x="0"
-     inkscape:window-y="0"
+     inkscape:cx="526.39394"
+     inkscape:cy="270.43561"
+     inkscape:window-x="1920"
+     inkscape:window-y="27"
      inkscape:window-maximized="1"
      inkscape:current-layer="svg8"
      inkscape:pagecheckerboard="0"
@@ -2202,17 +2202,17 @@
   <text
      xml:space="preserve"
      style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:7.54824px;line-height:1.25;font-family:'Liberation Sans';-inkscape-font-specification:'Liberation Sans';letter-spacing:0px;word-spacing:0px;opacity:0.474;fill:#0000ff;fill-opacity:1;stroke:none;stroke-width:0.188706"
-     x="115.43224"
+     x="116.34422"
      y="72.894707"
      id="text2558"><tspan
-       x="115.43224"
+       x="116.34422"
        y="72.894707"
        id="tspan2556"
        style="stroke-width:0.188706"><tspan
-         x="115.43224"
+         x="116.34422"
          y="72.894707"
          style="font-size:4.93889px;fill:#0000ff;stroke-width:0.188706"
-         id="tspan2554">MCRecoParticleAssociation</tspan></tspan></text>
+         id="tspan2554">RecoMCParticleLink</tspan></tspan></text>
   <path
      inkscape:connector-curvature="0"
      style="opacity:0.59600004;fill:none;stroke:#00007e;stroke-width:0.43807417;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;marker-start:url(#marker13910);marker-end:url(#marker3596)"
@@ -2233,18 +2233,18 @@
   <text
      xml:space="preserve"
      style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:6.44371px;line-height:1.25;font-family:'Liberation Sans';-inkscape-font-specification:'Liberation Sans';letter-spacing:0px;word-spacing:0px;opacity:0.474;fill:#0000ff;fill-opacity:1;stroke:none;stroke-width:0.161093"
-     x="85.249176"
-     y="119.41744"
+     x="73.008713"
+     y="119.42908"
      id="text2558-5"
      transform="rotate(-5.2955702)"><tspan
-       x="85.249176"
-       y="119.41744"
+       x="73.008713"
+       y="119.42908"
        id="tspan2556-5"
        style="stroke-width:0.161093"><tspan
-         x="85.249176"
-         y="119.41744"
+         x="73.008713"
+         y="119.42908"
          style="font-size:4.21618px;fill:#0000ff;stroke-width:0.161093"
-         id="tspan2554-1">MCRecoTrackerAssociation</tspan></tspan></text>
+         id="tspan2554-1">TrackerHitSimTrackerHitLink</tspan></tspan></text>
   <text
      xml:space="preserve"
      style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:6.44371px;line-height:1.25;font-family:'Liberation Sans';-inkscape-font-specification:'Liberation Sans';letter-spacing:0px;word-spacing:0px;opacity:0.474;fill:#0000ff;fill-opacity:1;stroke:none;stroke-width:0.161093"
@@ -2259,7 +2259,7 @@
          x="98.873039"
          y="32.237076"
          style="font-size:4.21618px;fill:#0000ff;stroke-width:0.161093"
-         id="tspan2554-1-9">MCRecoCaloAssociation</tspan></tspan></text>
+         id="tspan2554-1-9">CaloHitSimCaloHitLink</tspan></tspan></text>
   <text
      xml:space="preserve"
      style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:6.2235px;line-height:1.25;font-family:'Liberation Sans';-inkscape-font-specification:'Liberation Sans';letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.155587;filter:url(#filter6544-3)"
@@ -2297,14 +2297,14 @@
   <text
      xml:space="preserve"
      style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:6.44371px;line-height:1.25;font-family:'Liberation Sans';-inkscape-font-specification:'Liberation Sans';letter-spacing:0px;word-spacing:0px;opacity:0.474;fill:#0000ff;fill-opacity:1;stroke:none;stroke-width:0.161093"
-     x="59.388889"
-     y="81.125305"
+     x="71.440002"
+     y="81.691574"
      id="text2558-5-6-7"
      transform="rotate(-14.995011)"><tspan
-       x="59.388889"
-       y="81.125305"
+       x="71.440002"
+       y="81.691574"
        id="tspan2556-5-3-0"
-       style="font-size:3.88056px;stroke-width:0.161093">MCRecoCaloParticleAssociation</tspan></text>
+       style="font-size:3.88056px;stroke-width:0.161093">CaloHitMCParticleLink</tspan></text>
   <path
      inkscape:connector-curvature="0"
      style="opacity:0.59600004;fill:none;stroke:#00007e;stroke-width:0.43807417;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;marker-start:url(#marker13910-8-8);marker-end:url(#marker3596-2-9)"