diff --git a/TimeDet/CMakeLists.txt b/TimeDet/CMakeLists.txt
index 35bc70f1aa..40a87255d6 100644
--- a/TimeDet/CMakeLists.txt
+++ b/TimeDet/CMakeLists.txt
@@ -26,7 +26,7 @@ TimeDetHit.cxx
 TimeDet.cxx
 )
 
-Set(LINKDEF TimeDetLinkDef.h)
+Set(LINKDEF LinkDef.h)
 Set(LIBRARY_NAME TimeDet)
 Set(DEPENDENCIES
     Base ShipData FairLogger::FairLogger
diff --git a/TimeDet/TimeDetLinkDef.h b/TimeDet/LinkDef.h
similarity index 100%
rename from TimeDet/TimeDetLinkDef.h
rename to TimeDet/LinkDef.h
diff --git a/UpstreamTagger/CMakeLists.txt b/UpstreamTagger/CMakeLists.txt
index c4f0cfd912..5dbc7ce9d6 100644
--- a/UpstreamTagger/CMakeLists.txt
+++ b/UpstreamTagger/CMakeLists.txt
@@ -26,7 +26,7 @@ UpstreamTaggerHit.cxx
 )
 
 Set(HEADERS )
-Set(LINKDEF UpstreamTaggerLinkDef.h)
+Set(LINKDEF LinkDef.h)
 Set(LIBRARY_NAME UpstreamTagger)
 Set(DEPENDENCIES
   Base ShipData FairLogger::FairLogger
diff --git a/UpstreamTagger/UpstreamTaggerLinkDef.h b/UpstreamTagger/LinkDef.h
similarity index 100%
rename from UpstreamTagger/UpstreamTaggerLinkDef.h
rename to UpstreamTagger/LinkDef.h
diff --git a/ecal/CMakeLists.txt b/ecal/CMakeLists.txt
index f024f3f322..0ef45a9e6d 100644
--- a/ecal/CMakeLists.txt
+++ b/ecal/CMakeLists.txt
@@ -47,7 +47,7 @@ ecalReco.cxx
 ecalMatch.cxx
 )
 
-Set(LINKDEF ecalLinkDef.h)
+Set(LINKDEF LinkDef.h)
 Set(LIBRARY_NAME ecal)
 Set(DEPENDENCIES
     Base ShipData FairLogger::FairLogger
diff --git a/ecal/ecalLinkDef.h b/ecal/LinkDef.h
similarity index 100%
rename from ecal/ecalLinkDef.h
rename to ecal/LinkDef.h
diff --git a/field/CMakeLists.txt b/field/CMakeLists.txt
index f65668742e..2716bf9504 100644
--- a/field/CMakeLists.txt
+++ b/field/CMakeLists.txt
@@ -38,7 +38,7 @@ ShipGoliathField.cxx
 FairShipFields.cxx
 )
 
-set(LINKDEF FieldLinkDef.h)
+set(LINKDEF LinkDef.h)
 Set(LIBRARY_NAME ShipField)
 Set(DEPENDENCIES
     Base
diff --git a/field/FieldLinkDef.h b/field/LinkDef.h
similarity index 100%
rename from field/FieldLinkDef.h
rename to field/LinkDef.h
diff --git a/hcal/CMakeLists.txt b/hcal/CMakeLists.txt
index 1be1203a65..60dac1eb77 100644
--- a/hcal/CMakeLists.txt
+++ b/hcal/CMakeLists.txt
@@ -33,7 +33,7 @@ hcalStructureFiller.cxx
 hcalAnalysisSimple.cxx
 )
 
-Set(LINKDEF hcalLinkDef.h)
+Set(LINKDEF LinkDef.h)
 Set(LIBRARY_NAME hcal)
 Set(DEPENDENCIES
     Base ShipData FairLogger::FairLogger
diff --git a/hcal/hcalLinkDef.h b/hcal/LinkDef.h
similarity index 100%
rename from hcal/hcalLinkDef.h
rename to hcal/LinkDef.h
diff --git a/muon/CMakeLists.txt b/muon/CMakeLists.txt
index 139f151e2a..ea6bf09ae0 100644
--- a/muon/CMakeLists.txt
+++ b/muon/CMakeLists.txt
@@ -28,7 +28,7 @@ muonPoint.cxx
 muonHit.cxx
 )
 
-Set(LINKDEF muonLinkDef.h)
+Set(LINKDEF LinkDef.h)
 Set(LIBRARY_NAME muon)
 Set(DEPENDENCIES
     Base ShipData FairLogger::FairLogger
diff --git a/muon/muonLinkDef.h b/muon/LinkDef.h
similarity index 100%
rename from muon/muonLinkDef.h
rename to muon/LinkDef.h
diff --git a/muonShieldOptimization/CMakeLists.txt b/muonShieldOptimization/CMakeLists.txt
index 4e008b633f..b3056829b4 100644
--- a/muonShieldOptimization/CMakeLists.txt
+++ b/muonShieldOptimization/CMakeLists.txt
@@ -29,7 +29,7 @@ simpleTarget.cxx
 )
 
 Set(HEADERS )
-Set(LINKDEF muonShieldBackgroundLinkDef.h)
+Set(LINKDEF LinkDef.h)
 Set(LIBRARY_NAME ShipMuonShieldBackground)
 set(DEPENDENCIES Base GeoBase ParBase Geom Core FairLogger::FairLogger)
 
diff --git a/muonShieldOptimization/muonShieldBackgroundLinkDef.h b/muonShieldOptimization/LinkDef.h
similarity index 100%
rename from muonShieldOptimization/muonShieldBackgroundLinkDef.h
rename to muonShieldOptimization/LinkDef.h
diff --git a/nutaudet/CMakeLists.txt b/nutaudet/CMakeLists.txt
index 9389bf0ad7..ea218da6ec 100644
--- a/nutaudet/CMakeLists.txt
+++ b/nutaudet/CMakeLists.txt
@@ -36,7 +36,7 @@ TTPoint.cxx
 )
 
 Set(HEADERS )
-Set(LINKDEF nutaudetLinkDef.h)
+Set(LINKDEF LinkDef.h)
 Set(LIBRARY_NAME nutaudet)
 set(DEPENDENCIES Base ShipData GeoBase ParBase Geom Core FairLogger::FairLogger)
 
diff --git a/nutaudet/nutaudetLinkDef.h b/nutaudet/LinkDef.h
similarity index 100%
rename from nutaudet/nutaudetLinkDef.h
rename to nutaudet/LinkDef.h
diff --git a/passive/CMakeLists.txt b/passive/CMakeLists.txt
index 025f58df26..f964985729 100644
--- a/passive/CMakeLists.txt
+++ b/passive/CMakeLists.txt
@@ -30,7 +30,7 @@ ShipGoliath.cxx
 )
 
 Set(HEADERS )
-Set(LINKDEF PassiveLinkDef.h)
+Set(LINKDEF LinkDef.h)
 Set(LIBRARY_NAME ShipPassive)
 set(DEPENDENCIES Base GeoBase ParBase Geom Core FairLogger::FairLogger)
 
diff --git a/passive/PassiveLinkDef.h b/passive/LinkDef.h
similarity index 100%
rename from passive/PassiveLinkDef.h
rename to passive/LinkDef.h
diff --git a/pid/CMakeLists.txt b/pid/CMakeLists.txt
index 9d03c8c7cd..a71cdd9514 100644
--- a/pid/CMakeLists.txt
+++ b/pid/CMakeLists.txt
@@ -24,7 +24,7 @@ set(SRCS
 pid.cxx
 )
 
-Set(LINKDEF pidLinkDef.h)
+Set(LINKDEF LinkDef.h)
 Set(LIBRARY_NAME pid)
 Set(DEPENDENCIES
     Base ShipData
diff --git a/pid/pidLinkDef.h b/pid/LinkDef.h
similarity index 100%
rename from pid/pidLinkDef.h
rename to pid/LinkDef.h
diff --git a/shipdata/CMakeLists.txt b/shipdata/CMakeLists.txt
index efe46d02fb..009dd876e0 100644
--- a/shipdata/CMakeLists.txt
+++ b/shipdata/CMakeLists.txt
@@ -29,7 +29,7 @@ TrackInfo.cxx
 )
 
 Set(HEADERS )
-Set(LINKDEF MCStackLinkDef.h)
+Set(LINKDEF LinkDef.h)
 Set(LIBRARY_NAME ShipData)
 set(DEPENDENCIES Base EG Physics Core genfit2 FairLogger::FairLogger)
 
diff --git a/shipdata/MCStackLinkDef.h b/shipdata/LinkDef.h
similarity index 100%
rename from shipdata/MCStackLinkDef.h
rename to shipdata/LinkDef.h
diff --git a/shipgen/CMakeLists.txt b/shipgen/CMakeLists.txt
index f3caa80d79..04fad18816 100644
--- a/shipgen/CMakeLists.txt
+++ b/shipgen/CMakeLists.txt
@@ -50,7 +50,7 @@ FixedTargetGenerator.cxx
 EvtCalcGenerator.cxx
 )
 
-set(LINKDEF GenLinkDef.h)
+set(LINKDEF LinkDef.h)
 set(LIBRARY_NAME ShipGen)
 
 set(DEPENDENCIES Base ShipData EvtGen EvtGenExternal FairLogger::FairLogger)
diff --git a/shipgen/GenLinkDef.h b/shipgen/LinkDef.h
similarity index 100%
rename from shipgen/GenLinkDef.h
rename to shipgen/LinkDef.h
diff --git a/splitcal/CMakeLists.txt b/splitcal/CMakeLists.txt
index 018642a714..65137c88b4 100644
--- a/splitcal/CMakeLists.txt
+++ b/splitcal/CMakeLists.txt
@@ -28,7 +28,7 @@ splitcalHit.cxx
 splitcalCluster.cxx
 )
 
-Set(LINKDEF splitcalLinkDef.h)
+Set(LINKDEF LinkDef.h)
 Set(LIBRARY_NAME splitcal)
 Set(DEPENDENCIES
     Base ShipData FairLogger::FairLogger
diff --git a/splitcal/splitcalLinkDef.h b/splitcal/LinkDef.h
similarity index 100%
rename from splitcal/splitcalLinkDef.h
rename to splitcal/LinkDef.h
diff --git a/strawtubes/CMakeLists.txt b/strawtubes/CMakeLists.txt
index 38ca99b1a5..bddfa40414 100644
--- a/strawtubes/CMakeLists.txt
+++ b/strawtubes/CMakeLists.txt
@@ -28,7 +28,7 @@ strawtubesHit.cxx
 Tracklet.cxx
 )
 
-Set(LINKDEF strawtubesLinkDef.h)
+Set(LINKDEF LinkDef.h)
 Set(LIBRARY_NAME strawtubes)
 Set(DEPENDENCIES
     Base ShipData FairLogger::FairLogger
diff --git a/strawtubes/strawtubesLinkDef.h b/strawtubes/LinkDef.h
similarity index 100%
rename from strawtubes/strawtubesLinkDef.h
rename to strawtubes/LinkDef.h
diff --git a/veto/CMakeLists.txt b/veto/CMakeLists.txt
index 62b0270a6d..2f97e0c72c 100644
--- a/veto/CMakeLists.txt
+++ b/veto/CMakeLists.txt
@@ -28,7 +28,7 @@ vetoHit.cxx
 vetoHitOnTrack.cxx
 )
 
-Set(LINKDEF vetoLinkDef.h)
+Set(LINKDEF LinkDef.h)
 Set(LIBRARY_NAME veto)
 Set(DEPENDENCIES
     Base ShipData FairLogger::FairLogger
diff --git a/veto/vetoLinkDef.h b/veto/LinkDef.h
similarity index 100%
rename from veto/vetoLinkDef.h
rename to veto/LinkDef.h