diff --git a/LArCalorimeter/LArGeoModel/LArReadoutGeometry/LArReadoutGeometry/EMBCellConstLink.h b/LArCalorimeter/LArGeoModel/LArReadoutGeometry/LArReadoutGeometry/EMBCellConstLink.h
index 3945cd2167b36f9aa8298fca232a3d99b468c056..309ed097dd56e9188d89018111ae3ef95ed947cc 100755
--- a/LArCalorimeter/LArGeoModel/LArReadoutGeometry/LArReadoutGeometry/EMBCellConstLink.h
+++ b/LArCalorimeter/LArGeoModel/LArReadoutGeometry/LArReadoutGeometry/EMBCellConstLink.h
@@ -1,12 +1,12 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2024 CERN for the benefit of the ATLAS collaboration
 */
 
 #ifndef LARREADOUTGEOMETRY_EMBCELLCONSTLINK_H
 #define LARREADOUTGEOMETRY_EMBCELLCONSTLINK_H
-#include "GeoModelKernel/ConstLink.h"
+#include "GeoModelKernel/GeoIntrusivePtr.h"
 #include "LArReadoutGeometry/EMBCell.h"
 
-typedef ConstLink< EMBCell  > EMBCellConstLink;
+using EMBCellConstLink=GeoIntrusivePtr<const EMBCell>;
 
 #endif
diff --git a/LArCalorimeter/LArGeoModel/LArReadoutGeometry/LArReadoutGeometry/EMBHVPathologies.h b/LArCalorimeter/LArGeoModel/LArReadoutGeometry/LArReadoutGeometry/EMBHVPathologies.h
index bda7875fba2202788d19c5e7c93831dd72a29a4f..507d3e6d1e05a29708c5902343df20065b90794b 100644
--- a/LArCalorimeter/LArGeoModel/LArReadoutGeometry/LArReadoutGeometry/EMBHVPathologies.h
+++ b/LArCalorimeter/LArGeoModel/LArReadoutGeometry/LArReadoutGeometry/EMBHVPathologies.h
@@ -1,11 +1,11 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2024 CERN for the benefit of the ATLAS collaboration
 */
 
 #ifndef LARREADOUTGEOMETRY_EMBHVPATHOLOGIES_H
 #define LARREADOUTGEOMETRY_EMBHVPATHOLOGIES_H
 #include "GeoModelKernel/RCBase.h"
-#include "GeoModelKernel/ConstLink.h"
+#include "GeoModelKernel/GeoIntrusivePtr.h"
 // --------------------------------------------------------
 // This class describes ugly things that can happen to an
 // EMB Electrode. We foresee extending it as we learn of
@@ -46,9 +46,6 @@ class EMBHVPathologies: public RCBase {
 
 };
 
-
-typedef ConstLink< EMBHVPathologies  > EMBHVPathologiesConstLink;
-
-
+using EMBHVPathologiesConstLink=GeoIntrusivePtr<const EMBHVPathologies>;
 
 #endif
diff --git a/LArCalorimeter/LArGeoModel/LArReadoutGeometry/LArReadoutGeometry/EMECCellConstLink.h b/LArCalorimeter/LArGeoModel/LArReadoutGeometry/LArReadoutGeometry/EMECCellConstLink.h
index 3b8865fc7c600dbb987d3c5860556a18237ccd5d..1bcc6fd40d9b2d9194c8887297cf6177220f7bcd 100755
--- a/LArCalorimeter/LArGeoModel/LArReadoutGeometry/LArReadoutGeometry/EMECCellConstLink.h
+++ b/LArCalorimeter/LArGeoModel/LArReadoutGeometry/LArReadoutGeometry/EMECCellConstLink.h
@@ -1,12 +1,12 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2024 CERN for the benefit of the ATLAS collaboration
 */
 
 #ifndef LARREADOUTGEOMETRY_EMECCELLCONSTLINK_H
 #define LARREADOUTGEOMETRY_EMECCELLCONSTLINK_H
 
 #include "LArReadoutGeometry/EMECCell.h"
-#include "GeoModelKernel/ConstLink.h"
+#include "GeoModelKernel/GeoIntrusivePtr.h"
 
 /**
  * @class EMECCellConstLink
@@ -16,6 +16,6 @@
  *	count and collects the garbage when nobody's looking.
  */
 
-typedef ConstLink<EMECCell> EMECCellConstLink;
+using EMECCellConstLink=GeoIntrusivePtr<const EMECCell>;
 
 #endif
diff --git a/LArCalorimeter/LArGeoModel/LArReadoutGeometry/LArReadoutGeometry/FCALTubeConstLink.h b/LArCalorimeter/LArGeoModel/LArReadoutGeometry/LArReadoutGeometry/FCALTubeConstLink.h
index d5f74eb68a9c10529dccbe740e506b4b66935697..26152d24195b000778304768524ce705da2aab6c 100644
--- a/LArCalorimeter/LArGeoModel/LArReadoutGeometry/LArReadoutGeometry/FCALTubeConstLink.h
+++ b/LArCalorimeter/LArGeoModel/LArReadoutGeometry/LArReadoutGeometry/FCALTubeConstLink.h
@@ -1,10 +1,10 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2024 CERN for the benefit of the ATLAS collaboration
 */
 
 #ifndef LARREADOUTGEOMETRY_FCALTUBECONSTLINK_H
 #define LARREADOUTGEOMETRY_FCALTUBECONSTLINK_H
 #include "LArReadoutGeometry/FCALTube.h"
-#include "GeoModelKernel/ConstLink.h"
-typedef ConstLink<FCALTube> FCALTubeConstLink;
+#include "GeoModelKernel/GeoIntrusivePtr.h"
+using FCALTubeConstLink=GeoIntrusivePtr<const FCALTube>;
 #endif
diff --git a/LArCalorimeter/LArGeoModel/LArReadoutGeometry/LArReadoutGeometry/HECCellConstLink.h b/LArCalorimeter/LArGeoModel/LArReadoutGeometry/LArReadoutGeometry/HECCellConstLink.h
index ead96ae5a6f260804564d0c86dd4a2ec21e220b9..48960b825932422b27ea8e14a2f15e46d5ea1538 100755
--- a/LArCalorimeter/LArGeoModel/LArReadoutGeometry/LArReadoutGeometry/HECCellConstLink.h
+++ b/LArCalorimeter/LArGeoModel/LArReadoutGeometry/LArReadoutGeometry/HECCellConstLink.h
@@ -1,12 +1,12 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2024 CERN for the benefit of the ATLAS collaboration
 */
 
 #ifndef LARREADOUTGEOMETRY_HECCELLCONSTLINK_H
 #define LARREADOUTGEOMETRY_HECCELLCONSTLINK_H
 
 #include "LArReadoutGeometry/HECCell.h"
-#include "GeoModelKernel/ConstLink.h"
+#include "GeoModelKernel/GeoIntrusivePtr.h"
 
 /**
  * @Class: HECCellConstLink 
@@ -16,6 +16,6 @@
  *	and collects the garbage when nobody's looking.
  */
 
-typedef ConstLink<HECCell> HECCellConstLink;
+using HECCellConstLink=GeoIntrusivePtr<const HECCell>;
 
 #endif