diff --git a/Trigger/TrigEvent/TrigCaloEventTPCnv/CMakeLists.txt b/Trigger/TrigEvent/TrigCaloEventTPCnv/CMakeLists.txt
index 3c9b52ae63c2617d6d1601850cd568c7348d44c7..23bfc361fe9449b369d05a907fe5fdf91622ca7a 100644
--- a/Trigger/TrigEvent/TrigCaloEventTPCnv/CMakeLists.txt
+++ b/Trigger/TrigEvent/TrigCaloEventTPCnv/CMakeLists.txt
@@ -7,7 +7,7 @@ atlas_subdir( TrigCaloEventTPCnv )
 
 # Declare the package's dependencies:
 atlas_depends_on_subdirs( PUBLIC
-                          Control/DataModel
+                          Control/AthLinks
                           Control/DataModelAthenaPool
                           Database/AthenaPOOL/AthenaPoolCnvSvc
                           Database/AthenaPOOL/AthenaPoolUtilities
@@ -29,143 +29,143 @@ atlas_add_tpcnv_library( TrigCaloEventTPCnv
                          PUBLIC_HEADERS TrigCaloEventTPCnv
                          PRIVATE_INCLUDE_DIRS ${ROOT_INCLUDE_DIRS} ${CLHEP_INCLUDE_DIRS}
                          PRIVATE_DEFINITIONS ${CLHEP_DEFINITIONS}
-                         LINK_LIBRARIES ${ROOT_LIBRARIES} ${CLHEP_LIBRARIES} DataModel DataModelAthenaPoolLib AthenaPoolCnvSvcLib AthenaPoolUtilities TrigCaloEvent TestTools AthenaKernel CxxUtils SGTools GaudiKernel )
+                         LINK_LIBRARIES ${ROOT_LIBRARIES} ${CLHEP_LIBRARIES} AthLinks DataModelAthenaPoolLib AthenaPoolCnvSvcLib AthenaPoolUtilities TrigCaloEvent TestTools AthenaKernel CxxUtils SGTools GaudiKernel )
 
 atlas_add_dictionary( TrigCaloEventTPCnvDict
                       TrigCaloEventTPCnv/TrigCaloEventTPCnvDict.h
                       TrigCaloEventTPCnv/selection.xml
                       INCLUDE_DIRS ${ROOT_INCLUDE_DIRS} ${CLHEP_INCLUDE_DIRS}
-                      LINK_LIBRARIES ${ROOT_LIBRARIES} ${CLHEP_LIBRARIES} DataModel DataModelAthenaPoolLib AthenaPoolCnvSvcLib AthenaPoolUtilities TrigCaloEvent TestTools AthenaKernel CxxUtils SGTools GaudiKernel TrigCaloEventTPCnv )
+                      LINK_LIBRARIES ${ROOT_LIBRARIES} ${CLHEP_LIBRARIES} AthLinks DataModelAthenaPoolLib AthenaPoolCnvSvcLib AthenaPoolUtilities TrigCaloEvent TestTools AthenaKernel CxxUtils SGTools GaudiKernel TrigCaloEventTPCnv )
 
 atlas_add_test( TrigCaloClusterCnv_p1_test
                 SOURCES
                 test/TrigCaloClusterCnv_p1_test.cxx
                 INCLUDE_DIRS ${ROOT_INCLUDE_DIRS} ${CLHEP_INCLUDE_DIRS}
-                LINK_LIBRARIES ${ROOT_LIBRARIES} ${CLHEP_LIBRARIES} DataModel DataModelAthenaPoolLib AthenaPoolCnvSvcLib AthenaPoolUtilities TrigCaloEvent TestTools AthenaKernel CxxUtils SGTools GaudiKernel TrigCaloEventTPCnv )
+                LINK_LIBRARIES ${ROOT_LIBRARIES} ${CLHEP_LIBRARIES} AthLinks DataModelAthenaPoolLib AthenaPoolCnvSvcLib AthenaPoolUtilities TrigCaloEvent TestTools AthenaKernel CxxUtils SGTools GaudiKernel TrigCaloEventTPCnv )
 
 atlas_add_test( TrigCaloClusterCnv_p2_test
                 SOURCES
                 test/TrigCaloClusterCnv_p2_test.cxx
                 INCLUDE_DIRS ${ROOT_INCLUDE_DIRS} ${CLHEP_INCLUDE_DIRS}
-                LINK_LIBRARIES ${ROOT_LIBRARIES} ${CLHEP_LIBRARIES} DataModel DataModelAthenaPoolLib AthenaPoolCnvSvcLib AthenaPoolUtilities TrigCaloEvent TestTools AthenaKernel CxxUtils SGTools GaudiKernel TrigCaloEventTPCnv )
+                LINK_LIBRARIES ${ROOT_LIBRARIES} ${CLHEP_LIBRARIES} AthLinks DataModelAthenaPoolLib AthenaPoolCnvSvcLib AthenaPoolUtilities TrigCaloEvent TestTools AthenaKernel CxxUtils SGTools GaudiKernel TrigCaloEventTPCnv )
 
 atlas_add_test( TrigCaloClusterCnv_p3_test
                 SOURCES
                 test/TrigCaloClusterCnv_p3_test.cxx
                 INCLUDE_DIRS ${ROOT_INCLUDE_DIRS} ${CLHEP_INCLUDE_DIRS}
-                LINK_LIBRARIES ${ROOT_LIBRARIES} ${CLHEP_LIBRARIES} DataModel DataModelAthenaPoolLib AthenaPoolCnvSvcLib AthenaPoolUtilities TrigCaloEvent TestTools AthenaKernel CxxUtils SGTools GaudiKernel TrigCaloEventTPCnv )
+                LINK_LIBRARIES ${ROOT_LIBRARIES} ${CLHEP_LIBRARIES} AthLinks DataModelAthenaPoolLib AthenaPoolCnvSvcLib AthenaPoolUtilities TrigCaloEvent TestTools AthenaKernel CxxUtils SGTools GaudiKernel TrigCaloEventTPCnv )
 
 atlas_add_test( RingerRingsCnv_p1_test
                 SOURCES
                 test/RingerRingsCnv_p1_test.cxx
                 INCLUDE_DIRS ${ROOT_INCLUDE_DIRS} ${CLHEP_INCLUDE_DIRS}
-                LINK_LIBRARIES ${ROOT_LIBRARIES} ${CLHEP_LIBRARIES} DataModel DataModelAthenaPoolLib AthenaPoolCnvSvcLib AthenaPoolUtilities TrigCaloEvent TestTools AthenaKernel CxxUtils SGTools GaudiKernel TrigCaloEventTPCnv )
+                LINK_LIBRARIES ${ROOT_LIBRARIES} ${CLHEP_LIBRARIES} AthLinks DataModelAthenaPoolLib AthenaPoolCnvSvcLib AthenaPoolUtilities TrigCaloEvent TestTools AthenaKernel CxxUtils SGTools GaudiKernel TrigCaloEventTPCnv )
 
 atlas_add_test( RingerRingsCnv_p2_test
                 SOURCES
                 test/RingerRingsCnv_p2_test.cxx
                 INCLUDE_DIRS ${ROOT_INCLUDE_DIRS} ${CLHEP_INCLUDE_DIRS}
-                LINK_LIBRARIES ${ROOT_LIBRARIES} ${CLHEP_LIBRARIES} DataModel DataModelAthenaPoolLib AthenaPoolCnvSvcLib AthenaPoolUtilities TrigCaloEvent TestTools AthenaKernel CxxUtils SGTools GaudiKernel TrigCaloEventTPCnv )
+                LINK_LIBRARIES ${ROOT_LIBRARIES} ${CLHEP_LIBRARIES} AthLinks DataModelAthenaPoolLib AthenaPoolCnvSvcLib AthenaPoolUtilities TrigCaloEvent TestTools AthenaKernel CxxUtils SGTools GaudiKernel TrigCaloEventTPCnv )
 
 atlas_add_test( TrigEMClusterCnv_p2_test
                 SOURCES
                 test/TrigEMClusterCnv_p2_test.cxx
                 INCLUDE_DIRS ${ROOT_INCLUDE_DIRS} ${CLHEP_INCLUDE_DIRS}
-                LINK_LIBRARIES ${ROOT_LIBRARIES} ${CLHEP_LIBRARIES} DataModel DataModelAthenaPoolLib AthenaPoolCnvSvcLib AthenaPoolUtilities TrigCaloEvent TestTools AthenaKernel CxxUtils SGTools GaudiKernel TrigCaloEventTPCnv )
+                LINK_LIBRARIES ${ROOT_LIBRARIES} ${CLHEP_LIBRARIES} AthLinks DataModelAthenaPoolLib AthenaPoolCnvSvcLib AthenaPoolUtilities TrigCaloEvent TestTools AthenaKernel CxxUtils SGTools GaudiKernel TrigCaloEventTPCnv )
 
 atlas_add_test( TrigEMClusterCnv_p3_test
                 SOURCES
                 test/TrigEMClusterCnv_p3_test.cxx
                 INCLUDE_DIRS ${ROOT_INCLUDE_DIRS} ${CLHEP_INCLUDE_DIRS}
-                LINK_LIBRARIES ${ROOT_LIBRARIES} ${CLHEP_LIBRARIES} DataModel DataModelAthenaPoolLib AthenaPoolCnvSvcLib AthenaPoolUtilities TrigCaloEvent TestTools AthenaKernel CxxUtils SGTools GaudiKernel TrigCaloEventTPCnv )
+                LINK_LIBRARIES ${ROOT_LIBRARIES} ${CLHEP_LIBRARIES} AthLinks DataModelAthenaPoolLib AthenaPoolCnvSvcLib AthenaPoolUtilities TrigCaloEvent TestTools AthenaKernel CxxUtils SGTools GaudiKernel TrigCaloEventTPCnv )
 
 atlas_add_test( TrigEMClusterCnv_p4_test
                 SOURCES
                 test/TrigEMClusterCnv_p4_test.cxx
                 INCLUDE_DIRS ${ROOT_INCLUDE_DIRS} ${CLHEP_INCLUDE_DIRS}
-                LINK_LIBRARIES ${ROOT_LIBRARIES} ${CLHEP_LIBRARIES} DataModel DataModelAthenaPoolLib AthenaPoolCnvSvcLib AthenaPoolUtilities TrigCaloEvent TestTools AthenaKernel CxxUtils SGTools GaudiKernel TrigCaloEventTPCnv )
+                LINK_LIBRARIES ${ROOT_LIBRARIES} ${CLHEP_LIBRARIES} AthLinks DataModelAthenaPoolLib AthenaPoolCnvSvcLib AthenaPoolUtilities TrigCaloEvent TestTools AthenaKernel CxxUtils SGTools GaudiKernel TrigCaloEventTPCnv )
 
 atlas_add_test( TrigRNNOutputCnv_p1_test
                 SOURCES
                 test/TrigRNNOutputCnv_p1_test.cxx
                 INCLUDE_DIRS ${ROOT_INCLUDE_DIRS} ${CLHEP_INCLUDE_DIRS}
-                LINK_LIBRARIES ${ROOT_LIBRARIES} ${CLHEP_LIBRARIES} DataModel DataModelAthenaPoolLib AthenaPoolCnvSvcLib AthenaPoolUtilities TrigCaloEvent TestTools AthenaKernel CxxUtils SGTools GaudiKernel TrigCaloEventTPCnv )
+                LINK_LIBRARIES ${ROOT_LIBRARIES} ${CLHEP_LIBRARIES} AthLinks DataModelAthenaPoolLib AthenaPoolCnvSvcLib AthenaPoolUtilities TrigCaloEvent TestTools AthenaKernel CxxUtils SGTools GaudiKernel TrigCaloEventTPCnv )
 
 atlas_add_test( TrigRNNOutputCnv_p2_test
                 SOURCES
                 test/TrigRNNOutputCnv_p2_test.cxx
                 INCLUDE_DIRS ${ROOT_INCLUDE_DIRS} ${CLHEP_INCLUDE_DIRS}
-                LINK_LIBRARIES ${ROOT_LIBRARIES} ${CLHEP_LIBRARIES} DataModel DataModelAthenaPoolLib AthenaPoolCnvSvcLib AthenaPoolUtilities TrigCaloEvent TestTools AthenaKernel CxxUtils SGTools GaudiKernel TrigCaloEventTPCnv )
+                LINK_LIBRARIES ${ROOT_LIBRARIES} ${CLHEP_LIBRARIES} AthLinks DataModelAthenaPoolLib AthenaPoolCnvSvcLib AthenaPoolUtilities TrigCaloEvent TestTools AthenaKernel CxxUtils SGTools GaudiKernel TrigCaloEventTPCnv )
 
 atlas_add_test( TrigT2JetCnv_p2_test
                 SOURCES
                 test/TrigT2JetCnv_p2_test.cxx
                 INCLUDE_DIRS ${ROOT_INCLUDE_DIRS} ${CLHEP_INCLUDE_DIRS}
-                LINK_LIBRARIES ${ROOT_LIBRARIES} ${CLHEP_LIBRARIES} DataModel DataModelAthenaPoolLib AthenaPoolCnvSvcLib AthenaPoolUtilities TrigCaloEvent TestTools AthenaKernel CxxUtils SGTools GaudiKernel TrigCaloEventTPCnv )
+                LINK_LIBRARIES ${ROOT_LIBRARIES} ${CLHEP_LIBRARIES} AthLinks DataModelAthenaPoolLib AthenaPoolCnvSvcLib AthenaPoolUtilities TrigCaloEvent TestTools AthenaKernel CxxUtils SGTools GaudiKernel TrigCaloEventTPCnv )
 
 atlas_add_test( TrigT2JetCnv_p3_test
                 SOURCES
                 test/TrigT2JetCnv_p3_test.cxx
                 INCLUDE_DIRS ${ROOT_INCLUDE_DIRS} ${CLHEP_INCLUDE_DIRS}
-                LINK_LIBRARIES ${ROOT_LIBRARIES} ${CLHEP_LIBRARIES} DataModel DataModelAthenaPoolLib AthenaPoolCnvSvcLib AthenaPoolUtilities TrigCaloEvent TestTools AthenaKernel CxxUtils SGTools GaudiKernel TrigCaloEventTPCnv )
+                LINK_LIBRARIES ${ROOT_LIBRARIES} ${CLHEP_LIBRARIES} AthLinks DataModelAthenaPoolLib AthenaPoolCnvSvcLib AthenaPoolUtilities TrigCaloEvent TestTools AthenaKernel CxxUtils SGTools GaudiKernel TrigCaloEventTPCnv )
 
 atlas_add_test( TrigT2MbtsBitsCnv_p1_test
                 SOURCES
                 test/TrigT2MbtsBitsCnv_p1_test.cxx
                 INCLUDE_DIRS ${ROOT_INCLUDE_DIRS} ${CLHEP_INCLUDE_DIRS}
-                LINK_LIBRARIES ${ROOT_LIBRARIES} ${CLHEP_LIBRARIES} DataModel DataModelAthenaPoolLib AthenaPoolCnvSvcLib AthenaPoolUtilities TrigCaloEvent TestTools AthenaKernel CxxUtils SGTools GaudiKernel TrigCaloEventTPCnv )
+                LINK_LIBRARIES ${ROOT_LIBRARIES} ${CLHEP_LIBRARIES} AthLinks DataModelAthenaPoolLib AthenaPoolCnvSvcLib AthenaPoolUtilities TrigCaloEvent TestTools AthenaKernel CxxUtils SGTools GaudiKernel TrigCaloEventTPCnv )
 
 atlas_add_test( TrigT2MbtsBitsCnv_p2_test
                 SOURCES
                 test/TrigT2MbtsBitsCnv_p2_test.cxx
                 INCLUDE_DIRS ${ROOT_INCLUDE_DIRS} ${CLHEP_INCLUDE_DIRS}
-                LINK_LIBRARIES ${ROOT_LIBRARIES} ${CLHEP_LIBRARIES} DataModel DataModelAthenaPoolLib AthenaPoolCnvSvcLib AthenaPoolUtilities TrigCaloEvent TestTools AthenaKernel CxxUtils SGTools GaudiKernel TrigCaloEventTPCnv )
+                LINK_LIBRARIES ${ROOT_LIBRARIES} ${CLHEP_LIBRARIES} AthLinks DataModelAthenaPoolLib AthenaPoolCnvSvcLib AthenaPoolUtilities TrigCaloEvent TestTools AthenaKernel CxxUtils SGTools GaudiKernel TrigCaloEventTPCnv )
 
 atlas_add_test( TrigT2MbtsBitsCnv_p3_test
                 SOURCES
                 test/TrigT2MbtsBitsCnv_p3_test.cxx
                 INCLUDE_DIRS ${ROOT_INCLUDE_DIRS} ${CLHEP_INCLUDE_DIRS}
-                LINK_LIBRARIES ${ROOT_LIBRARIES} ${CLHEP_LIBRARIES} DataModel DataModelAthenaPoolLib AthenaPoolCnvSvcLib AthenaPoolUtilities TrigCaloEvent TestTools AthenaKernel CxxUtils SGTools GaudiKernel TrigCaloEventTPCnv )
+                LINK_LIBRARIES ${ROOT_LIBRARIES} ${CLHEP_LIBRARIES} AthLinks DataModelAthenaPoolLib AthenaPoolCnvSvcLib AthenaPoolUtilities TrigCaloEvent TestTools AthenaKernel CxxUtils SGTools GaudiKernel TrigCaloEventTPCnv )
 
 atlas_add_test( TrigT2ZdcSignalsCnv_p1_test
                 SOURCES
                 test/TrigT2ZdcSignalsCnv_p1_test.cxx
                 INCLUDE_DIRS ${ROOT_INCLUDE_DIRS} ${CLHEP_INCLUDE_DIRS}
-                LINK_LIBRARIES ${ROOT_LIBRARIES} ${CLHEP_LIBRARIES} DataModel DataModelAthenaPoolLib AthenaPoolCnvSvcLib AthenaPoolUtilities TrigCaloEvent TestTools AthenaKernel CxxUtils SGTools GaudiKernel TrigCaloEventTPCnv )
+                LINK_LIBRARIES ${ROOT_LIBRARIES} ${CLHEP_LIBRARIES} AthLinks DataModelAthenaPoolLib AthenaPoolCnvSvcLib AthenaPoolUtilities TrigCaloEvent TestTools AthenaKernel CxxUtils SGTools GaudiKernel TrigCaloEventTPCnv )
 
 atlas_add_test( TrigTauClusterCnv_p2_test
                 SOURCES
                 test/TrigTauClusterCnv_p2_test.cxx
                 INCLUDE_DIRS ${ROOT_INCLUDE_DIRS} ${CLHEP_INCLUDE_DIRS}
-                LINK_LIBRARIES ${ROOT_LIBRARIES} ${CLHEP_LIBRARIES} DataModel DataModelAthenaPoolLib AthenaPoolCnvSvcLib AthenaPoolUtilities TrigCaloEvent TestTools AthenaKernel CxxUtils SGTools GaudiKernel TrigCaloEventTPCnv )
+                LINK_LIBRARIES ${ROOT_LIBRARIES} ${CLHEP_LIBRARIES} AthLinks DataModelAthenaPoolLib AthenaPoolCnvSvcLib AthenaPoolUtilities TrigCaloEvent TestTools AthenaKernel CxxUtils SGTools GaudiKernel TrigCaloEventTPCnv )
 
 atlas_add_test( TrigTauClusterCnv_p3_test
                 SOURCES
                 test/TrigTauClusterCnv_p3_test.cxx
                 INCLUDE_DIRS ${ROOT_INCLUDE_DIRS} ${CLHEP_INCLUDE_DIRS}
-                LINK_LIBRARIES ${ROOT_LIBRARIES} ${CLHEP_LIBRARIES} DataModel DataModelAthenaPoolLib AthenaPoolCnvSvcLib AthenaPoolUtilities TrigCaloEvent TestTools AthenaKernel CxxUtils SGTools GaudiKernel TrigCaloEventTPCnv )
+                LINK_LIBRARIES ${ROOT_LIBRARIES} ${CLHEP_LIBRARIES} AthLinks DataModelAthenaPoolLib AthenaPoolCnvSvcLib AthenaPoolUtilities TrigCaloEvent TestTools AthenaKernel CxxUtils SGTools GaudiKernel TrigCaloEventTPCnv )
 
 atlas_add_test( TrigTauClusterCnv_p4_test
                 SOURCES
                 test/TrigTauClusterCnv_p4_test.cxx
                 INCLUDE_DIRS ${ROOT_INCLUDE_DIRS} ${CLHEP_INCLUDE_DIRS}
-                LINK_LIBRARIES ${ROOT_LIBRARIES} ${CLHEP_LIBRARIES} DataModel DataModelAthenaPoolLib AthenaPoolCnvSvcLib AthenaPoolUtilities TrigCaloEvent TestTools AthenaKernel CxxUtils SGTools GaudiKernel TrigCaloEventTPCnv )
+                LINK_LIBRARIES ${ROOT_LIBRARIES} ${CLHEP_LIBRARIES} AthLinks DataModelAthenaPoolLib AthenaPoolCnvSvcLib AthenaPoolUtilities TrigCaloEvent TestTools AthenaKernel CxxUtils SGTools GaudiKernel TrigCaloEventTPCnv )
 
 atlas_add_test( TrigTauClusterCnv_p5_test
                 SOURCES
                 test/TrigTauClusterCnv_p5_test.cxx
                 INCLUDE_DIRS ${ROOT_INCLUDE_DIRS} ${CLHEP_INCLUDE_DIRS}
-                LINK_LIBRARIES ${ROOT_LIBRARIES} ${CLHEP_LIBRARIES} DataModel DataModelAthenaPoolLib AthenaPoolCnvSvcLib AthenaPoolUtilities TrigCaloEvent TestTools AthenaKernel CxxUtils SGTools GaudiKernel TrigCaloEventTPCnv )
+                LINK_LIBRARIES ${ROOT_LIBRARIES} ${CLHEP_LIBRARIES} AthLinks DataModelAthenaPoolLib AthenaPoolCnvSvcLib AthenaPoolUtilities TrigCaloEvent TestTools AthenaKernel CxxUtils SGTools GaudiKernel TrigCaloEventTPCnv )
 
 atlas_add_test( TrigTauClusterDetailsCnv_p1_test
                 SOURCES
                 test/TrigTauClusterDetailsCnv_p1_test.cxx
                 INCLUDE_DIRS ${ROOT_INCLUDE_DIRS} ${CLHEP_INCLUDE_DIRS}
-                LINK_LIBRARIES ${ROOT_LIBRARIES} ${CLHEP_LIBRARIES} DataModel DataModelAthenaPoolLib AthenaPoolCnvSvcLib AthenaPoolUtilities TrigCaloEvent TestTools AthenaKernel CxxUtils SGTools GaudiKernel TrigCaloEventTPCnv )
+                LINK_LIBRARIES ${ROOT_LIBRARIES} ${CLHEP_LIBRARIES} AthLinks DataModelAthenaPoolLib AthenaPoolCnvSvcLib AthenaPoolUtilities TrigCaloEvent TestTools AthenaKernel CxxUtils SGTools GaudiKernel TrigCaloEventTPCnv )
 
 atlas_add_test( TrigTauClusterDetailsCnv_p2_test
                 SOURCES
                 test/TrigTauClusterDetailsCnv_p2_test.cxx
                 INCLUDE_DIRS ${ROOT_INCLUDE_DIRS} ${CLHEP_INCLUDE_DIRS}
-                LINK_LIBRARIES ${ROOT_LIBRARIES} ${CLHEP_LIBRARIES} DataModel DataModelAthenaPoolLib AthenaPoolCnvSvcLib AthenaPoolUtilities TrigCaloEvent TestTools AthenaKernel CxxUtils SGTools GaudiKernel TrigCaloEventTPCnv )
+                LINK_LIBRARIES ${ROOT_LIBRARIES} ${CLHEP_LIBRARIES} AthLinks DataModelAthenaPoolLib AthenaPoolCnvSvcLib AthenaPoolUtilities TrigCaloEvent TestTools AthenaKernel CxxUtils SGTools GaudiKernel TrigCaloEventTPCnv )
 
diff --git a/Trigger/TrigEvent/TrigCaloEventTPCnv/TrigCaloEventTPCnv/TrigEMClusterCnv_p2.h b/Trigger/TrigEvent/TrigCaloEventTPCnv/TrigCaloEventTPCnv/TrigEMClusterCnv_p2.h
index 45a1a7658604c506415eed4f1602e908c5a224b3..1e242d65d94c94277a303656d58247350b8a82a3 100644
--- a/Trigger/TrigEvent/TrigCaloEventTPCnv/TrigCaloEventTPCnv/TrigEMClusterCnv_p2.h
+++ b/Trigger/TrigEvent/TrigCaloEventTPCnv/TrigCaloEventTPCnv/TrigEMClusterCnv_p2.h
@@ -24,7 +24,7 @@
 #include "TrigCaloEventTPCnv/TrigEMCluster_p2.h"
 #include "TrigCaloEventTPCnv/TrigCaloClusterCnv_p1.h"
 #include "TrigCaloEvent/RingerRingsContainer.h"
-#include "DataModel/ElementLink.h"
+#include "AthLinks/ElementLink.h"
 #include "DataModelAthenaPool/ElementLinkCnv_p1.h"
 
 #include "TrigCaloEventTPCnv/TrigEMClusterConverterBase.h"
diff --git a/Trigger/TrigEvent/TrigCaloEventTPCnv/TrigCaloEventTPCnv/TrigEMClusterCnv_p3.h b/Trigger/TrigEvent/TrigCaloEventTPCnv/TrigCaloEventTPCnv/TrigEMClusterCnv_p3.h
index f2a6c2d2a882a54954127db1831bb0883a897249..8c611a7f86b63520dbd511799cec801fc3a15788 100644
--- a/Trigger/TrigEvent/TrigCaloEventTPCnv/TrigCaloEventTPCnv/TrigEMClusterCnv_p3.h
+++ b/Trigger/TrigEvent/TrigCaloEventTPCnv/TrigCaloEventTPCnv/TrigEMClusterCnv_p3.h
@@ -24,7 +24,7 @@
 #include "TrigCaloEventTPCnv/TrigEMCluster_p3.h"
 #include "TrigCaloEventTPCnv/TrigCaloClusterCnv_p2.h"
 #include "TrigCaloEvent/RingerRingsContainer.h"
-#include "DataModel/ElementLink.h"
+#include "AthLinks/ElementLink.h"
 #include "DataModelAthenaPool/ElementLinkCnv_p3.h"
 
 //#include "TrigCaloEventTPCnv/TrigEMClusterConverterBase.h"
diff --git a/Trigger/TrigEvent/TrigCaloEventTPCnv/TrigCaloEventTPCnv/TrigEMClusterCnv_p4.h b/Trigger/TrigEvent/TrigCaloEventTPCnv/TrigCaloEventTPCnv/TrigEMClusterCnv_p4.h
index 60fa35b03e44697575e3c18b49c05dbf4c517a6f..649a88b645b6eaffac43afe188d4a7dcc5ca9dae 100644
--- a/Trigger/TrigEvent/TrigCaloEventTPCnv/TrigCaloEventTPCnv/TrigEMClusterCnv_p4.h
+++ b/Trigger/TrigEvent/TrigCaloEventTPCnv/TrigCaloEventTPCnv/TrigEMClusterCnv_p4.h
@@ -24,7 +24,7 @@
 #include "TrigCaloEventTPCnv/TrigEMCluster_p4.h"
 #include "TrigCaloEventTPCnv/TrigCaloClusterCnv_p2.h"
 #include "TrigCaloEvent/RingerRingsContainer.h"
-#include "DataModel/ElementLink.h"
+#include "AthLinks/ElementLink.h"
 #include "DataModelAthenaPool/ElementLinkCnv_p3.h"
 
 //#include "TrigCaloEventTPCnv/TrigEMClusterConverterBase.h"
diff --git a/Trigger/TrigEvent/TrigCaloEventTPCnv/TrigCaloEventTPCnv/TrigRNNOutputCnv_p1.h b/Trigger/TrigEvent/TrigCaloEventTPCnv/TrigCaloEventTPCnv/TrigRNNOutputCnv_p1.h
index 877f7b2e004589fee07233339f7565e4170fa2fe..ddf3476512d849b11dc38242730bf8c67be8aab8 100644
--- a/Trigger/TrigEvent/TrigCaloEventTPCnv/TrigCaloEventTPCnv/TrigRNNOutputCnv_p1.h
+++ b/Trigger/TrigEvent/TrigCaloEventTPCnv/TrigCaloEventTPCnv/TrigRNNOutputCnv_p1.h
@@ -24,7 +24,7 @@
 
 #include "TrigCaloEventTPCnv/TrigRNNOutputConverterBase.h"
 
-#include "DataModel/ElementLink.h"
+#include "AthLinks/ElementLink.h"
 #include "DataModelAthenaPool/ElementLinkCnv_p1.h"
 #include "TrigCaloEvent/TrigEMCluster.h"
 #include "TrigCaloEvent/TrigEMClusterContainer.h"
diff --git a/Trigger/TrigEvent/TrigCaloEventTPCnv/TrigCaloEventTPCnv/TrigRNNOutputCnv_p2.h b/Trigger/TrigEvent/TrigCaloEventTPCnv/TrigCaloEventTPCnv/TrigRNNOutputCnv_p2.h
index b3ee09965c1bea0fdd5bb9a75b4fdf2d14f54c1c..22d5ea11150d8a6b0b4f28f17491d4b6707bc432 100644
--- a/Trigger/TrigEvent/TrigCaloEventTPCnv/TrigCaloEventTPCnv/TrigRNNOutputCnv_p2.h
+++ b/Trigger/TrigEvent/TrigCaloEventTPCnv/TrigCaloEventTPCnv/TrigRNNOutputCnv_p2.h
@@ -22,7 +22,7 @@
 #include "TrigCaloEvent/TrigRNNOutput.h"
 #include "TrigCaloEventTPCnv/TrigRNNOutput_p2.h"
 
-#include "DataModel/ElementLink.h"
+#include "AthLinks/ElementLink.h"
 #include "DataModelAthenaPool/ElementLinkCnv_p3.h"
 #include "TrigCaloEvent/TrigEMCluster.h"
 #include "TrigCaloEvent/TrigEMClusterContainer.h"
diff --git a/Trigger/TrigEvent/TrigCaloEventTPCnv/src/TrigEMClusterCnv_p2.cxx b/Trigger/TrigEvent/TrigCaloEventTPCnv/src/TrigEMClusterCnv_p2.cxx
index d101f2db30dbb62963f05ff7d44af79fe12cc6db..cbe420272021f06c8c3b7d5d7dccbaea4236b97e 100644
--- a/Trigger/TrigEvent/TrigCaloEventTPCnv/src/TrigEMClusterCnv_p2.cxx
+++ b/Trigger/TrigEvent/TrigCaloEventTPCnv/src/TrigEMClusterCnv_p2.cxx
@@ -6,7 +6,7 @@
 
 #include "TrigCaloEventTPCnv/TrigEMCluster_p2.h"
 #include "TrigCaloEventTPCnv/TrigEMClusterCnv_p2.h"
-#include "DataModel/ElementLink.h"
+#include "AthLinks/ElementLink.h"
 #include "TrigCaloEvent/RingerRingsContainer.h"
 #include "DataModelAthenaPool/ElementLinkCnv_p1.h"
 
diff --git a/Trigger/TrigEvent/TrigCaloEventTPCnv/src/TrigEMClusterCnv_p3.cxx b/Trigger/TrigEvent/TrigCaloEventTPCnv/src/TrigEMClusterCnv_p3.cxx
index a4825e66bc6cacd1ce17582794fb28a356cdbd2b..e138607c87fea9bc31bf2e3fede6a0e73d6fef84 100644
--- a/Trigger/TrigEvent/TrigCaloEventTPCnv/src/TrigEMClusterCnv_p3.cxx
+++ b/Trigger/TrigEvent/TrigCaloEventTPCnv/src/TrigEMClusterCnv_p3.cxx
@@ -6,7 +6,7 @@
 
 #include "TrigCaloEventTPCnv/TrigEMCluster_p3.h"
 #include "TrigCaloEventTPCnv/TrigEMClusterCnv_p3.h"
-#include "DataModel/ElementLink.h"
+#include "AthLinks/ElementLink.h"
 #include "TrigCaloEvent/RingerRingsContainer.h"
 #include "DataModelAthenaPool/ElementLinkCnv_p3.h"
 #include "TrigCaloEventTPCnv/TrigCaloClusterCnv_p2.h"
diff --git a/Trigger/TrigEvent/TrigCaloEventTPCnv/src/TrigEMClusterCnv_p4.cxx b/Trigger/TrigEvent/TrigCaloEventTPCnv/src/TrigEMClusterCnv_p4.cxx
index 76ef04e9be2a9e64f64f6502b6cfca5288b1060f..9867229d9f30cd141c202cd9c0e101c65d016cb6 100644
--- a/Trigger/TrigEvent/TrigCaloEventTPCnv/src/TrigEMClusterCnv_p4.cxx
+++ b/Trigger/TrigEvent/TrigCaloEventTPCnv/src/TrigEMClusterCnv_p4.cxx
@@ -5,7 +5,7 @@
 #include "TrigCaloEvent/TrigEMCluster.h"
 #include "TrigCaloEventTPCnv/TrigEMCluster_p4.h"
 #include "TrigCaloEventTPCnv/TrigEMClusterCnv_p4.h"
-#include "DataModel/ElementLink.h"
+#include "AthLinks/ElementLink.h"
 #include "TrigCaloEvent/RingerRingsContainer.h"
 #include "DataModelAthenaPool/ElementLinkCnv_p3.h"
 #include "TrigCaloEventTPCnv/TrigCaloClusterCnv_p2.h"
diff --git a/Trigger/TrigEvent/TrigCaloEventTPCnv/src/TrigRNNOutputCnv_p1.cxx b/Trigger/TrigEvent/TrigCaloEventTPCnv/src/TrigRNNOutputCnv_p1.cxx
index 88387a473ff9eaa0e5669dea77cddc586485e19d..295cbee6c5a502fd2e1480e6bad75a9a66eb48be 100644
--- a/Trigger/TrigEvent/TrigCaloEventTPCnv/src/TrigRNNOutputCnv_p1.cxx
+++ b/Trigger/TrigEvent/TrigCaloEventTPCnv/src/TrigRNNOutputCnv_p1.cxx
@@ -8,7 +8,7 @@
 #include "TrigCaloEventTPCnv/TrigRNNOutput_p1.h"
 #include "TrigCaloEventTPCnv/TrigRNNOutputCnv_p1.h"
 
-#include "DataModel/ElementLink.h"
+#include "AthLinks/ElementLink.h"
 #include "DataModelAthenaPool/ElementLinkCnv_p1.h"
 
 void TrigRNNOutputCnv_p1::transToPers(const TrigRNNOutput *trans, 
diff --git a/Trigger/TrigEvent/TrigCaloEventTPCnv/src/TrigRNNOutputCnv_p2.cxx b/Trigger/TrigEvent/TrigCaloEventTPCnv/src/TrigRNNOutputCnv_p2.cxx
index 05039b2cf80cf1bd3b557c18d67c3830c2d79b7c..2faa68cb2967ef9bd1b902f9a9146dc0f6b6c7b2 100644
--- a/Trigger/TrigEvent/TrigCaloEventTPCnv/src/TrigRNNOutputCnv_p2.cxx
+++ b/Trigger/TrigEvent/TrigCaloEventTPCnv/src/TrigRNNOutputCnv_p2.cxx
@@ -9,7 +9,7 @@
 #include "TrigCaloEventTPCnv/TrigRNNOutput_p2.h"
 #include "TrigCaloEventTPCnv/TrigRNNOutputCnv_p2.h"
 
-#include "DataModel/ElementLink.h"
+#include "AthLinks/ElementLink.h"
 #include "DataModelAthenaPool/ElementLinkCnv_p3.h"
 
 void TrigRNNOutputCnv_p2::transToPers(const TrigRNNOutput *trans,