diff --git a/Trigger/TrigEvent/TrigMuonEventTPCnv/CMakeLists.txt b/Trigger/TrigEvent/TrigMuonEventTPCnv/CMakeLists.txt
index 58df2681272c44528fb7f6ff3134a298bdca6df3..a305e2a78ac6373c777df60d986d01a2f742220d 100644
--- a/Trigger/TrigEvent/TrigMuonEventTPCnv/CMakeLists.txt
+++ b/Trigger/TrigEvent/TrigMuonEventTPCnv/CMakeLists.txt
@@ -7,7 +7,7 @@ atlas_subdir( TrigMuonEventTPCnv )
 
 # Declare the package's dependencies:
 atlas_depends_on_subdirs( PUBLIC
-                          Control/DataModel
+                          Control/AthLinks
                           Control/DataModelAthenaPool
                           Database/AthenaPOOL/AthenaPoolCnvSvc
                           Database/AthenaPOOL/AthenaPoolUtilities
@@ -31,173 +31,173 @@ atlas_add_tpcnv_library( TrigMuonEventTPCnv
                          src/*.cxx
                          PUBLIC_HEADERS TrigMuonEventTPCnv
                          PRIVATE_INCLUDE_DIRS ${ROOT_INCLUDE_DIRS}
-                         LINK_LIBRARIES ${ROOT_LIBRARIES} DataModel DataModelAthenaPoolLib AthenaPoolCnvSvcLib AthenaPoolUtilities EventCommonTPCnv FourMom Particle TrigInDetEventTPCnv TrigMuonEvent TestTools AthenaKernel CxxUtils SGTools GaudiKernel )
+                         LINK_LIBRARIES ${ROOT_LIBRARIES} AthLinks DataModelAthenaPoolLib AthenaPoolCnvSvcLib AthenaPoolUtilities EventCommonTPCnv FourMom Particle TrigInDetEventTPCnv TrigMuonEvent TestTools AthenaKernel CxxUtils SGTools GaudiKernel )
 
 atlas_add_dictionary( TrigMuonEventTPCnvDict
                       TrigMuonEventTPCnv/TrigMuonEventTPCnvDict.h
                       TrigMuonEventTPCnv/selection.xml
                       INCLUDE_DIRS ${ROOT_INCLUDE_DIRS}
-                      LINK_LIBRARIES ${ROOT_LIBRARIES} DataModel DataModelAthenaPoolLib AthenaPoolCnvSvcLib AthenaPoolUtilities EventCommonTPCnv FourMom Particle TrigInDetEventTPCnv TrigMuonEvent TestTools AthenaKernel CxxUtils SGTools GaudiKernel TrigMuonEventTPCnv )
+                      LINK_LIBRARIES ${ROOT_LIBRARIES} AthLinks DataModelAthenaPoolLib AthenaPoolCnvSvcLib AthenaPoolUtilities EventCommonTPCnv FourMom Particle TrigInDetEventTPCnv TrigMuonEvent TestTools AthenaKernel CxxUtils SGTools GaudiKernel TrigMuonEventTPCnv )
 
 atlas_add_dictionary( OLD_TrigMuonEventTPCnvDict
                       TrigMuonEventTPCnv/TrigMuonEventTPCnvDict.h
                       TrigMuonEventTPCnv/OLD_selection.xml
                       INCLUDE_DIRS ${ROOT_INCLUDE_DIRS}
-                      LINK_LIBRARIES ${ROOT_LIBRARIES} DataModel DataModelAthenaPoolLib AthenaPoolCnvSvcLib AthenaPoolUtilities EventCommonTPCnv FourMom Particle TrigInDetEventTPCnv TrigMuonEvent TestTools AthenaKernel CxxUtils SGTools GaudiKernel TrigMuonEventTPCnv )
+                      LINK_LIBRARIES ${ROOT_LIBRARIES} AthLinks DataModelAthenaPoolLib AthenaPoolCnvSvcLib AthenaPoolUtilities EventCommonTPCnv FourMom Particle TrigInDetEventTPCnv TrigMuonEvent TestTools AthenaKernel CxxUtils SGTools GaudiKernel TrigMuonEventTPCnv )
 
 atlas_add_test( CombinedMuonFeatureCnv_p2_test
                 SOURCES
                 test/CombinedMuonFeatureCnv_p2_test.cxx
                 INCLUDE_DIRS ${ROOT_INCLUDE_DIRS}
-                LINK_LIBRARIES ${ROOT_LIBRARIES} DataModel DataModelAthenaPoolLib AthenaPoolCnvSvcLib AthenaPoolUtilities EventCommonTPCnv FourMom Particle TrigInDetEventTPCnv TrigMuonEvent TestTools AthenaKernel CxxUtils SGTools GaudiKernel TrigMuonEventTPCnv )
+                LINK_LIBRARIES ${ROOT_LIBRARIES} AthLinks DataModelAthenaPoolLib AthenaPoolCnvSvcLib AthenaPoolUtilities EventCommonTPCnv FourMom Particle TrigInDetEventTPCnv TrigMuonEvent TestTools AthenaKernel CxxUtils SGTools GaudiKernel TrigMuonEventTPCnv )
 
 atlas_add_test( CombinedMuonFeatureCnv_p3_test
                 SOURCES
                 test/CombinedMuonFeatureCnv_p3_test.cxx
                 INCLUDE_DIRS ${ROOT_INCLUDE_DIRS}
-                LINK_LIBRARIES ${ROOT_LIBRARIES} DataModel DataModelAthenaPoolLib AthenaPoolCnvSvcLib AthenaPoolUtilities EventCommonTPCnv FourMom Particle TrigInDetEventTPCnv TrigMuonEvent TestTools AthenaKernel CxxUtils SGTools GaudiKernel TrigMuonEventTPCnv )
+                LINK_LIBRARIES ${ROOT_LIBRARIES} AthLinks DataModelAthenaPoolLib AthenaPoolCnvSvcLib AthenaPoolUtilities EventCommonTPCnv FourMom Particle TrigInDetEventTPCnv TrigMuonEvent TestTools AthenaKernel CxxUtils SGTools GaudiKernel TrigMuonEventTPCnv )
 
 atlas_add_test( CombinedMuonFeatureCnv_p4_test
                 SOURCES
                 test/CombinedMuonFeatureCnv_p4_test.cxx
                 INCLUDE_DIRS ${ROOT_INCLUDE_DIRS}
-                LINK_LIBRARIES ${ROOT_LIBRARIES} DataModel DataModelAthenaPoolLib AthenaPoolCnvSvcLib AthenaPoolUtilities EventCommonTPCnv FourMom Particle TrigInDetEventTPCnv TrigMuonEvent TestTools AthenaKernel CxxUtils SGTools GaudiKernel TrigMuonEventTPCnv )
+                LINK_LIBRARIES ${ROOT_LIBRARIES} AthLinks DataModelAthenaPoolLib AthenaPoolCnvSvcLib AthenaPoolUtilities EventCommonTPCnv FourMom Particle TrigInDetEventTPCnv TrigMuonEvent TestTools AthenaKernel CxxUtils SGTools GaudiKernel TrigMuonEventTPCnv )
 
 atlas_add_test( IsoMuonFeatureCnv_p3_test
                 SOURCES
                 test/IsoMuonFeatureCnv_p3_test.cxx
                 INCLUDE_DIRS ${ROOT_INCLUDE_DIRS}
-                LINK_LIBRARIES ${ROOT_LIBRARIES} DataModel DataModelAthenaPoolLib AthenaPoolCnvSvcLib AthenaPoolUtilities EventCommonTPCnv FourMom Particle TrigInDetEventTPCnv TrigMuonEvent TestTools AthenaKernel CxxUtils SGTools GaudiKernel TrigMuonEventTPCnv )
+                LINK_LIBRARIES ${ROOT_LIBRARIES} AthLinks DataModelAthenaPoolLib AthenaPoolCnvSvcLib AthenaPoolUtilities EventCommonTPCnv FourMom Particle TrigInDetEventTPCnv TrigMuonEvent TestTools AthenaKernel CxxUtils SGTools GaudiKernel TrigMuonEventTPCnv )
 
 atlas_add_test( MuonFeatureCnv_p1_test
                 SOURCES
                 test/MuonFeatureCnv_p1_test.cxx
                 INCLUDE_DIRS ${ROOT_INCLUDE_DIRS}
-                LINK_LIBRARIES ${ROOT_LIBRARIES} DataModel DataModelAthenaPoolLib AthenaPoolCnvSvcLib AthenaPoolUtilities EventCommonTPCnv FourMom Particle TrigInDetEventTPCnv TrigMuonEvent TestTools AthenaKernel CxxUtils SGTools GaudiKernel TrigMuonEventTPCnv )
+                LINK_LIBRARIES ${ROOT_LIBRARIES} AthLinks DataModelAthenaPoolLib AthenaPoolCnvSvcLib AthenaPoolUtilities EventCommonTPCnv FourMom Particle TrigInDetEventTPCnv TrigMuonEvent TestTools AthenaKernel CxxUtils SGTools GaudiKernel TrigMuonEventTPCnv )
 
 atlas_add_test( MuonFeatureCnv_p2_test
                 SOURCES
                 test/MuonFeatureCnv_p2_test.cxx
                 INCLUDE_DIRS ${ROOT_INCLUDE_DIRS}
-                LINK_LIBRARIES ${ROOT_LIBRARIES} DataModel DataModelAthenaPoolLib AthenaPoolCnvSvcLib AthenaPoolUtilities EventCommonTPCnv FourMom Particle TrigInDetEventTPCnv TrigMuonEvent TestTools AthenaKernel CxxUtils SGTools GaudiKernel TrigMuonEventTPCnv )
+                LINK_LIBRARIES ${ROOT_LIBRARIES} AthLinks DataModelAthenaPoolLib AthenaPoolCnvSvcLib AthenaPoolUtilities EventCommonTPCnv FourMom Particle TrigInDetEventTPCnv TrigMuonEvent TestTools AthenaKernel CxxUtils SGTools GaudiKernel TrigMuonEventTPCnv )
 
 atlas_add_test( MuonFeatureCnv_p3_test
                 SOURCES
                 test/MuonFeatureCnv_p3_test.cxx
                 INCLUDE_DIRS ${ROOT_INCLUDE_DIRS}
-                LINK_LIBRARIES ${ROOT_LIBRARIES} DataModel DataModelAthenaPoolLib AthenaPoolCnvSvcLib AthenaPoolUtilities EventCommonTPCnv FourMom Particle TrigInDetEventTPCnv TrigMuonEvent TestTools AthenaKernel CxxUtils SGTools GaudiKernel TrigMuonEventTPCnv )
+                LINK_LIBRARIES ${ROOT_LIBRARIES} AthLinks DataModelAthenaPoolLib AthenaPoolCnvSvcLib AthenaPoolUtilities EventCommonTPCnv FourMom Particle TrigInDetEventTPCnv TrigMuonEvent TestTools AthenaKernel CxxUtils SGTools GaudiKernel TrigMuonEventTPCnv )
 
 atlas_add_test( MuonFeatureDetailsCnv_p1_test
                 SOURCES
                 test/MuonFeatureDetailsCnv_p1_test.cxx
                 INCLUDE_DIRS ${ROOT_INCLUDE_DIRS}
-                LINK_LIBRARIES ${ROOT_LIBRARIES} DataModel DataModelAthenaPoolLib AthenaPoolCnvSvcLib AthenaPoolUtilities EventCommonTPCnv FourMom Particle TrigInDetEventTPCnv TrigMuonEvent TestTools AthenaKernel CxxUtils SGTools GaudiKernel TrigMuonEventTPCnv )
+                LINK_LIBRARIES ${ROOT_LIBRARIES} AthLinks DataModelAthenaPoolLib AthenaPoolCnvSvcLib AthenaPoolUtilities EventCommonTPCnv FourMom Particle TrigInDetEventTPCnv TrigMuonEvent TestTools AthenaKernel CxxUtils SGTools GaudiKernel TrigMuonEventTPCnv )
 
 atlas_add_test( MuonFeatureDetailsCnv_p2_test
                 SOURCES
                 test/MuonFeatureDetailsCnv_p2_test.cxx
                 INCLUDE_DIRS ${ROOT_INCLUDE_DIRS}
-                LINK_LIBRARIES ${ROOT_LIBRARIES} DataModel DataModelAthenaPoolLib AthenaPoolCnvSvcLib AthenaPoolUtilities EventCommonTPCnv FourMom Particle TrigInDetEventTPCnv TrigMuonEvent TestTools AthenaKernel CxxUtils SGTools GaudiKernel TrigMuonEventTPCnv )
+                LINK_LIBRARIES ${ROOT_LIBRARIES} AthLinks DataModelAthenaPoolLib AthenaPoolCnvSvcLib AthenaPoolUtilities EventCommonTPCnv FourMom Particle TrigInDetEventTPCnv TrigMuonEvent TestTools AthenaKernel CxxUtils SGTools GaudiKernel TrigMuonEventTPCnv )
 
 atlas_add_test( TileMuFeatureCnv_p1_test
                 SOURCES
                 test/TileMuFeatureCnv_p1_test.cxx
                 INCLUDE_DIRS ${ROOT_INCLUDE_DIRS}
-                LINK_LIBRARIES ${ROOT_LIBRARIES} DataModel DataModelAthenaPoolLib AthenaPoolCnvSvcLib AthenaPoolUtilities EventCommonTPCnv FourMom Particle TrigInDetEventTPCnv TrigMuonEvent TestTools AthenaKernel CxxUtils SGTools GaudiKernel TrigMuonEventTPCnv )
+                LINK_LIBRARIES ${ROOT_LIBRARIES} AthLinks DataModelAthenaPoolLib AthenaPoolCnvSvcLib AthenaPoolUtilities EventCommonTPCnv FourMom Particle TrigInDetEventTPCnv TrigMuonEvent TestTools AthenaKernel CxxUtils SGTools GaudiKernel TrigMuonEventTPCnv )
 
 atlas_add_test( TileMuFeatureCnv_p2_test
                 SOURCES
                 test/TileMuFeatureCnv_p2_test.cxx
                 INCLUDE_DIRS ${ROOT_INCLUDE_DIRS}
-                LINK_LIBRARIES ${ROOT_LIBRARIES} DataModel DataModelAthenaPoolLib AthenaPoolCnvSvcLib AthenaPoolUtilities EventCommonTPCnv FourMom Particle TrigInDetEventTPCnv TrigMuonEvent TestTools AthenaKernel CxxUtils SGTools GaudiKernel TrigMuonEventTPCnv )
+                LINK_LIBRARIES ${ROOT_LIBRARIES} AthLinks DataModelAthenaPoolLib AthenaPoolCnvSvcLib AthenaPoolUtilities EventCommonTPCnv FourMom Particle TrigInDetEventTPCnv TrigMuonEvent TestTools AthenaKernel CxxUtils SGTools GaudiKernel TrigMuonEventTPCnv )
 
 atlas_add_test( TileTrackMuFeatureCnv_p2_test
                 SOURCES
                 test/TileTrackMuFeatureCnv_p2_test.cxx
                 INCLUDE_DIRS ${ROOT_INCLUDE_DIRS}
-                LINK_LIBRARIES ${ROOT_LIBRARIES} DataModel DataModelAthenaPoolLib AthenaPoolCnvSvcLib AthenaPoolUtilities EventCommonTPCnv FourMom Particle TrigInDetEventTPCnv TrigMuonEvent TestTools AthenaKernel CxxUtils SGTools GaudiKernel TrigMuonEventTPCnv )
+                LINK_LIBRARIES ${ROOT_LIBRARIES} AthLinks DataModelAthenaPoolLib AthenaPoolCnvSvcLib AthenaPoolUtilities EventCommonTPCnv FourMom Particle TrigInDetEventTPCnv TrigMuonEvent TestTools AthenaKernel CxxUtils SGTools GaudiKernel TrigMuonEventTPCnv )
 
 atlas_add_test( TileTrackMuFeatureCnv_p3_test
                 SOURCES
                 test/TileTrackMuFeatureCnv_p3_test.cxx
                 INCLUDE_DIRS ${ROOT_INCLUDE_DIRS}
-                LINK_LIBRARIES ${ROOT_LIBRARIES} DataModel DataModelAthenaPoolLib AthenaPoolCnvSvcLib AthenaPoolUtilities EventCommonTPCnv FourMom Particle TrigInDetEventTPCnv TrigMuonEvent TestTools AthenaKernel CxxUtils SGTools GaudiKernel TrigMuonEventTPCnv )
+                LINK_LIBRARIES ${ROOT_LIBRARIES} AthLinks DataModelAthenaPoolLib AthenaPoolCnvSvcLib AthenaPoolUtilities EventCommonTPCnv FourMom Particle TrigInDetEventTPCnv TrigMuonEvent TestTools AthenaKernel CxxUtils SGTools GaudiKernel TrigMuonEventTPCnv )
 
 atlas_add_test( TrigMuonClusterFeatureCnv_p1_test
                 SOURCES
                 test/TrigMuonClusterFeatureCnv_p1_test.cxx
                 INCLUDE_DIRS ${ROOT_INCLUDE_DIRS}
-                LINK_LIBRARIES ${ROOT_LIBRARIES} DataModel DataModelAthenaPoolLib AthenaPoolCnvSvcLib AthenaPoolUtilities EventCommonTPCnv FourMom Particle TrigInDetEventTPCnv TrigMuonEvent TestTools AthenaKernel CxxUtils SGTools GaudiKernel TrigMuonEventTPCnv )
+                LINK_LIBRARIES ${ROOT_LIBRARIES} AthLinks DataModelAthenaPoolLib AthenaPoolCnvSvcLib AthenaPoolUtilities EventCommonTPCnv FourMom Particle TrigInDetEventTPCnv TrigMuonEvent TestTools AthenaKernel CxxUtils SGTools GaudiKernel TrigMuonEventTPCnv )
 
 atlas_add_test( TrigMuonEFCbTrackCnv_p5_test
                 SOURCES
                 test/TrigMuonEFCbTrackCnv_p5_test.cxx
                 INCLUDE_DIRS ${ROOT_INCLUDE_DIRS}
-                LINK_LIBRARIES ${ROOT_LIBRARIES} DataModel DataModelAthenaPoolLib AthenaPoolCnvSvcLib AthenaPoolUtilities EventCommonTPCnv FourMom Particle TrigInDetEventTPCnv TrigMuonEvent TestTools AthenaKernel CxxUtils SGTools GaudiKernel TrigMuonEventTPCnv )
+                LINK_LIBRARIES ${ROOT_LIBRARIES} AthLinks DataModelAthenaPoolLib AthenaPoolCnvSvcLib AthenaPoolUtilities EventCommonTPCnv FourMom Particle TrigInDetEventTPCnv TrigMuonEvent TestTools AthenaKernel CxxUtils SGTools GaudiKernel TrigMuonEventTPCnv )
 
 atlas_add_test( TrigMuonEFCbTrackCnv_p6_test
                 SOURCES
                 test/TrigMuonEFCbTrackCnv_p6_test.cxx
                 INCLUDE_DIRS ${ROOT_INCLUDE_DIRS}
-                LINK_LIBRARIES ${ROOT_LIBRARIES} DataModel DataModelAthenaPoolLib AthenaPoolCnvSvcLib AthenaPoolUtilities EventCommonTPCnv FourMom Particle TrigInDetEventTPCnv TrigMuonEvent TestTools AthenaKernel CxxUtils SGTools GaudiKernel TrigMuonEventTPCnv )
+                LINK_LIBRARIES ${ROOT_LIBRARIES} AthLinks DataModelAthenaPoolLib AthenaPoolCnvSvcLib AthenaPoolUtilities EventCommonTPCnv FourMom Particle TrigInDetEventTPCnv TrigMuonEvent TestTools AthenaKernel CxxUtils SGTools GaudiKernel TrigMuonEventTPCnv )
 
 atlas_add_test( TrigMuonEFCbTrackCnv_p7_test
                 SOURCES
                 test/TrigMuonEFCbTrackCnv_p7_test.cxx
                 INCLUDE_DIRS ${ROOT_INCLUDE_DIRS}
-                LINK_LIBRARIES ${ROOT_LIBRARIES} DataModel DataModelAthenaPoolLib AthenaPoolCnvSvcLib AthenaPoolUtilities EventCommonTPCnv FourMom Particle TrigInDetEventTPCnv TrigMuonEvent TestTools AthenaKernel CxxUtils SGTools GaudiKernel TrigMuonEventTPCnv )
+                LINK_LIBRARIES ${ROOT_LIBRARIES} AthLinks DataModelAthenaPoolLib AthenaPoolCnvSvcLib AthenaPoolUtilities EventCommonTPCnv FourMom Particle TrigInDetEventTPCnv TrigMuonEvent TestTools AthenaKernel CxxUtils SGTools GaudiKernel TrigMuonEventTPCnv )
 
 atlas_add_test( TrigMuonEFCnv_p1_test
                 SOURCES
                 test/TrigMuonEFCnv_p1_test.cxx
                 INCLUDE_DIRS ${ROOT_INCLUDE_DIRS}
-                LINK_LIBRARIES ${ROOT_LIBRARIES} DataModel DataModelAthenaPoolLib AthenaPoolCnvSvcLib AthenaPoolUtilities EventCommonTPCnv FourMom Particle TrigInDetEventTPCnv TrigMuonEvent TestTools AthenaKernel CxxUtils SGTools GaudiKernel TrigMuonEventTPCnv )
+                LINK_LIBRARIES ${ROOT_LIBRARIES} AthLinks DataModelAthenaPoolLib AthenaPoolCnvSvcLib AthenaPoolUtilities EventCommonTPCnv FourMom Particle TrigInDetEventTPCnv TrigMuonEvent TestTools AthenaKernel CxxUtils SGTools GaudiKernel TrigMuonEventTPCnv )
 
 atlas_add_test( TrigMuonEFCnv_p2_test
                 SOURCES
                 test/TrigMuonEFCnv_p2_test.cxx
                 INCLUDE_DIRS ${ROOT_INCLUDE_DIRS}
-                LINK_LIBRARIES ${ROOT_LIBRARIES} DataModel DataModelAthenaPoolLib AthenaPoolCnvSvcLib AthenaPoolUtilities EventCommonTPCnv FourMom Particle TrigInDetEventTPCnv TrigMuonEvent TestTools AthenaKernel CxxUtils SGTools GaudiKernel TrigMuonEventTPCnv )
+                LINK_LIBRARIES ${ROOT_LIBRARIES} AthLinks DataModelAthenaPoolLib AthenaPoolCnvSvcLib AthenaPoolUtilities EventCommonTPCnv FourMom Particle TrigInDetEventTPCnv TrigMuonEvent TestTools AthenaKernel CxxUtils SGTools GaudiKernel TrigMuonEventTPCnv )
 
 atlas_add_test( TrigMuonEFInfoCnv_p4_test
                 SOURCES
                 test/TrigMuonEFInfoCnv_p4_test.cxx
                 INCLUDE_DIRS ${ROOT_INCLUDE_DIRS}
-                LINK_LIBRARIES ${ROOT_LIBRARIES} DataModel DataModelAthenaPoolLib AthenaPoolCnvSvcLib AthenaPoolUtilities EventCommonTPCnv FourMom Particle TrigInDetEventTPCnv TrigMuonEvent TestTools AthenaKernel CxxUtils SGTools GaudiKernel TrigMuonEventTPCnv )
+                LINK_LIBRARIES ${ROOT_LIBRARIES} AthLinks DataModelAthenaPoolLib AthenaPoolCnvSvcLib AthenaPoolUtilities EventCommonTPCnv FourMom Particle TrigInDetEventTPCnv TrigMuonEvent TestTools AthenaKernel CxxUtils SGTools GaudiKernel TrigMuonEventTPCnv )
 
 atlas_add_test( TrigMuonEFInfoCnv_p5_test
                 SOURCES
                 test/TrigMuonEFInfoCnv_p5_test.cxx
                 INCLUDE_DIRS ${ROOT_INCLUDE_DIRS}
-                LINK_LIBRARIES ${ROOT_LIBRARIES} DataModel DataModelAthenaPoolLib AthenaPoolCnvSvcLib AthenaPoolUtilities EventCommonTPCnv FourMom Particle TrigInDetEventTPCnv TrigMuonEvent TestTools AthenaKernel CxxUtils SGTools GaudiKernel TrigMuonEventTPCnv )
+                LINK_LIBRARIES ${ROOT_LIBRARIES} AthLinks DataModelAthenaPoolLib AthenaPoolCnvSvcLib AthenaPoolUtilities EventCommonTPCnv FourMom Particle TrigInDetEventTPCnv TrigMuonEvent TestTools AthenaKernel CxxUtils SGTools GaudiKernel TrigMuonEventTPCnv )
 
 atlas_add_test( TrigMuonEFInfoTrackCnv_p1_test
                 SOURCES
                 test/TrigMuonEFInfoTrackCnv_p1_test.cxx
                 INCLUDE_DIRS ${ROOT_INCLUDE_DIRS}
-                LINK_LIBRARIES ${ROOT_LIBRARIES} DataModel DataModelAthenaPoolLib AthenaPoolCnvSvcLib AthenaPoolUtilities EventCommonTPCnv FourMom Particle TrigInDetEventTPCnv TrigMuonEvent TestTools AthenaKernel CxxUtils SGTools GaudiKernel TrigMuonEventTPCnv )
+                LINK_LIBRARIES ${ROOT_LIBRARIES} AthLinks DataModelAthenaPoolLib AthenaPoolCnvSvcLib AthenaPoolUtilities EventCommonTPCnv FourMom Particle TrigInDetEventTPCnv TrigMuonEvent TestTools AthenaKernel CxxUtils SGTools GaudiKernel TrigMuonEventTPCnv )
 
 atlas_add_test( TrigMuonEFIsolationCnv_p1_test
                 SOURCES
                 test/TrigMuonEFIsolationCnv_p1_test.cxx
                 INCLUDE_DIRS ${ROOT_INCLUDE_DIRS}
-                LINK_LIBRARIES ${ROOT_LIBRARIES} DataModel DataModelAthenaPoolLib AthenaPoolCnvSvcLib AthenaPoolUtilities EventCommonTPCnv FourMom Particle TrigInDetEventTPCnv TrigMuonEvent TestTools AthenaKernel CxxUtils SGTools GaudiKernel TrigMuonEventTPCnv )
+                LINK_LIBRARIES ${ROOT_LIBRARIES} AthLinks DataModelAthenaPoolLib AthenaPoolCnvSvcLib AthenaPoolUtilities EventCommonTPCnv FourMom Particle TrigInDetEventTPCnv TrigMuonEvent TestTools AthenaKernel CxxUtils SGTools GaudiKernel TrigMuonEventTPCnv )
 
 atlas_add_test( TrigMuonEFIsolationCnv_p2_test
                 SOURCES
                 test/TrigMuonEFIsolationCnv_p2_test.cxx
                 INCLUDE_DIRS ${ROOT_INCLUDE_DIRS}
-                LINK_LIBRARIES ${ROOT_LIBRARIES} DataModel DataModelAthenaPoolLib AthenaPoolCnvSvcLib AthenaPoolUtilities EventCommonTPCnv FourMom Particle TrigInDetEventTPCnv TrigMuonEvent TestTools AthenaKernel CxxUtils SGTools GaudiKernel TrigMuonEventTPCnv )
+                LINK_LIBRARIES ${ROOT_LIBRARIES} AthLinks DataModelAthenaPoolLib AthenaPoolCnvSvcLib AthenaPoolUtilities EventCommonTPCnv FourMom Particle TrigInDetEventTPCnv TrigMuonEvent TestTools AthenaKernel CxxUtils SGTools GaudiKernel TrigMuonEventTPCnv )
 
 atlas_add_test( TrigMuonEFTrackCnv_p5_test
                 SOURCES
                 test/TrigMuonEFTrackCnv_p5_test.cxx
                 INCLUDE_DIRS ${ROOT_INCLUDE_DIRS}
-                LINK_LIBRARIES ${ROOT_LIBRARIES} DataModel DataModelAthenaPoolLib AthenaPoolCnvSvcLib AthenaPoolUtilities EventCommonTPCnv FourMom Particle TrigInDetEventTPCnv TrigMuonEvent TestTools AthenaKernel CxxUtils SGTools GaudiKernel TrigMuonEventTPCnv )
+                LINK_LIBRARIES ${ROOT_LIBRARIES} AthLinks DataModelAthenaPoolLib AthenaPoolCnvSvcLib AthenaPoolUtilities EventCommonTPCnv FourMom Particle TrigInDetEventTPCnv TrigMuonEvent TestTools AthenaKernel CxxUtils SGTools GaudiKernel TrigMuonEventTPCnv )
 
 atlas_add_test( TrigMuonEFTrackCnv_p6_test
                 SOURCES
                 test/TrigMuonEFTrackCnv_p6_test.cxx
                 INCLUDE_DIRS ${ROOT_INCLUDE_DIRS}
-                LINK_LIBRARIES ${ROOT_LIBRARIES} DataModel DataModelAthenaPoolLib AthenaPoolCnvSvcLib AthenaPoolUtilities EventCommonTPCnv FourMom Particle TrigInDetEventTPCnv TrigMuonEvent TestTools AthenaKernel CxxUtils SGTools GaudiKernel TrigMuonEventTPCnv )
+                LINK_LIBRARIES ${ROOT_LIBRARIES} AthLinks DataModelAthenaPoolLib AthenaPoolCnvSvcLib AthenaPoolUtilities EventCommonTPCnv FourMom Particle TrigInDetEventTPCnv TrigMuonEvent TestTools AthenaKernel CxxUtils SGTools GaudiKernel TrigMuonEventTPCnv )
 
diff --git a/Trigger/TrigEvent/TrigMuonEventTPCnv/TrigMuonEventTPCnv/CombinedMuonFeatureCnv_p2.h b/Trigger/TrigEvent/TrigMuonEventTPCnv/TrigMuonEventTPCnv/CombinedMuonFeatureCnv_p2.h
index cdad0eb783de73a89c19043b5b0fc85c305fbc93..6d0064cc54d1944094d505b97deb36c45d2f4a5c 100644
--- a/Trigger/TrigEvent/TrigMuonEventTPCnv/TrigMuonEventTPCnv/CombinedMuonFeatureCnv_p2.h
+++ b/Trigger/TrigEvent/TrigMuonEventTPCnv/TrigMuonEventTPCnv/CombinedMuonFeatureCnv_p2.h
@@ -26,7 +26,7 @@
 #include "AthenaPoolCnvSvc/T_AthenaPoolTPConverter.h"
 #include "TrigMuonEvent/CombinedMuonFeatureContainer.h"
 #include "TrigMuonEvent/MuonFeatureContainer.h"
-#include "DataModel/ElementLink.h"
+#include "AthLinks/ElementLink.h"
 
 class MsgStream;
 
diff --git a/Trigger/TrigEvent/TrigMuonEventTPCnv/TrigMuonEventTPCnv/CombinedMuonFeatureCnv_p3.h b/Trigger/TrigEvent/TrigMuonEventTPCnv/TrigMuonEventTPCnv/CombinedMuonFeatureCnv_p3.h
index b6a7d38174d0a1f8b9d88d83f2d5965a157e1b4b..79051a3c82355ffa1f51c44c2ed5372e7e18449f 100644
--- a/Trigger/TrigEvent/TrigMuonEventTPCnv/TrigMuonEventTPCnv/CombinedMuonFeatureCnv_p3.h
+++ b/Trigger/TrigEvent/TrigMuonEventTPCnv/TrigMuonEventTPCnv/CombinedMuonFeatureCnv_p3.h
@@ -26,7 +26,7 @@
 #include "AthenaPoolCnvSvc/T_AthenaPoolTPConverter.h"
 #include "TrigMuonEvent/CombinedMuonFeatureContainer.h"
 #include "TrigMuonEvent/MuonFeatureContainer.h"
-#include "DataModel/ElementLink.h"
+#include "AthLinks/ElementLink.h"
 
 class MsgStream;
 
diff --git a/Trigger/TrigEvent/TrigMuonEventTPCnv/TrigMuonEventTPCnv/CombinedMuonFeatureCnv_p4.h b/Trigger/TrigEvent/TrigMuonEventTPCnv/TrigMuonEventTPCnv/CombinedMuonFeatureCnv_p4.h
index 7a1553fa88716b15f502a5ee42098fa6299d82f5..3d53ecc3308e94185c81d3db5d6de19a7328c25e 100644
--- a/Trigger/TrigEvent/TrigMuonEventTPCnv/TrigMuonEventTPCnv/CombinedMuonFeatureCnv_p4.h
+++ b/Trigger/TrigEvent/TrigMuonEventTPCnv/TrigMuonEventTPCnv/CombinedMuonFeatureCnv_p4.h
@@ -26,7 +26,7 @@
 #include "AthenaPoolCnvSvc/T_AthenaPoolTPConverter.h"
 #include "TrigMuonEvent/CombinedMuonFeatureContainer.h"
 #include "TrigMuonEvent/MuonFeatureContainer.h"
-#include "DataModel/ElementLink.h"
+#include "AthLinks/ElementLink.h"
 
 class MsgStream;
 
diff --git a/Trigger/TrigEvent/TrigMuonEventTPCnv/TrigMuonEventTPCnv/TileTrackMuFeatureCnv_p2.h b/Trigger/TrigEvent/TrigMuonEventTPCnv/TrigMuonEventTPCnv/TileTrackMuFeatureCnv_p2.h
index 7a74544982940c233c41985a1b926885d52cb852..6fe702e9a6ef61bc215b3311fe260bf31a6eb50a 100644
--- a/Trigger/TrigEvent/TrigMuonEventTPCnv/TrigMuonEventTPCnv/TileTrackMuFeatureCnv_p2.h
+++ b/Trigger/TrigEvent/TrigMuonEventTPCnv/TrigMuonEventTPCnv/TileTrackMuFeatureCnv_p2.h
@@ -25,7 +25,7 @@
 #include "TrigMuonEventTPCnv/TileTrackMuFeature_p2.h"
 
 #include "AthenaPoolCnvSvc/T_AthenaPoolTPConverter.h"
-#include "DataModel/ElementLink.h"
+#include "AthLinks/ElementLink.h"
 #include "DataModelAthenaPool/ElementLinkCnv_p1.h"
 #include "DataModelAthenaPool/ElementLinkCnv_p1.h"
 
diff --git a/Trigger/TrigEvent/TrigMuonEventTPCnv/TrigMuonEventTPCnv/TileTrackMuFeatureCnv_p3.h b/Trigger/TrigEvent/TrigMuonEventTPCnv/TrigMuonEventTPCnv/TileTrackMuFeatureCnv_p3.h
index a3b78895ba24de406a7422af05db92c86a1b85b4..526ec75bf09d6065b8195b71dfec631af3b04e4b 100644
--- a/Trigger/TrigEvent/TrigMuonEventTPCnv/TrigMuonEventTPCnv/TileTrackMuFeatureCnv_p3.h
+++ b/Trigger/TrigEvent/TrigMuonEventTPCnv/TrigMuonEventTPCnv/TileTrackMuFeatureCnv_p3.h
@@ -25,7 +25,7 @@
 #include "TrigMuonEventTPCnv/TileTrackMuFeature_p3.h"
 
 #include "AthenaPoolCnvSvc/T_AthenaPoolTPConverter.h"
-#include "DataModel/ElementLink.h"
+#include "AthLinks/ElementLink.h"
 #include "DataModelAthenaPool/ElementLinkCnv_p3.h"
 #include "DataModelAthenaPool/ElementLinkCnv_p3.h"