diff --git a/DDAlign/CMakeLists.txt b/DDAlign/CMakeLists.txt
index a43b17c3e07c4cbe4a3b743b0eeaf52dd73b2631..d8dc97e932ff172850c93f2fd12b951a4ef4997c 100644
--- a/DDAlign/CMakeLists.txt
+++ b/DDAlign/CMakeLists.txt
@@ -1,4 +1,4 @@
-# $Id$
+# $Id: $
 #==========================================================================
 #  AIDA Detector description implementation for LCD
 #--------------------------------------------------------------------------
diff --git a/DDAlign/include/DDAlign/AlignmentCache.h b/DDAlign/include/DDAlign/AlignmentCache.h
index 2f182d2a299f875ccd60c061c362c0539cee0e78..a85d260e6f5451ba907c81ed8bc7e09e36e73475 100644
--- a/DDAlign/include/DDAlign/AlignmentCache.h
+++ b/DDAlign/include/DDAlign/AlignmentCache.h
@@ -1,4 +1,4 @@
-// $Id$
+// $Id: $
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
diff --git a/DDAlign/include/DDAlign/AlignmentOperators.h b/DDAlign/include/DDAlign/AlignmentOperators.h
index a38ae6e97ff46e75e12dac7b9085e0e9f5a2164c..89edb3dc96aa6f6b4197880ba1494a8a5a257908 100644
--- a/DDAlign/include/DDAlign/AlignmentOperators.h
+++ b/DDAlign/include/DDAlign/AlignmentOperators.h
@@ -1,4 +1,4 @@
-// $Id$
+// $Id: $
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
diff --git a/DDAlign/include/DDAlign/AlignmentStack.h b/DDAlign/include/DDAlign/AlignmentStack.h
index 883a7acfb89d5fc17fba9f9568d55cc46b6c6611..785cd6962542d517888a13e936ad58c0c7166b30 100644
--- a/DDAlign/include/DDAlign/AlignmentStack.h
+++ b/DDAlign/include/DDAlign/AlignmentStack.h
@@ -1,4 +1,4 @@
-// $Id$
+// $Id: $
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
diff --git a/DDAlign/include/DDAlign/AlignmentTags.h b/DDAlign/include/DDAlign/AlignmentTags.h
index 979e84e8ffd30527f29a47e110d0173fc4cb1e5e..78ce944f8c27f15a86b00cd147ff9ee034bdeaba 100644
--- a/DDAlign/include/DDAlign/AlignmentTags.h
+++ b/DDAlign/include/DDAlign/AlignmentTags.h
@@ -1,4 +1,4 @@
-// $Id$
+// $Id: $
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
diff --git a/DDAlign/include/DDAlign/AlignmentTransaction.h b/DDAlign/include/DDAlign/AlignmentTransaction.h
index acec73c6aa6efe79df7c4961aa032f6dffb5e463..515195eee089d7362ff1058780d006e9eaf2e603 100644
--- a/DDAlign/include/DDAlign/AlignmentTransaction.h
+++ b/DDAlign/include/DDAlign/AlignmentTransaction.h
@@ -1,4 +1,4 @@
-// $Id$
+// $Id: $
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
diff --git a/DDAlign/include/DDAlign/AlignmentWriter.h b/DDAlign/include/DDAlign/AlignmentWriter.h
index 85841bf2f88962d6dd6228662222933ba51aaef0..f8c1cd85a3e7e88000cac5c74878bc099ddf1f2c 100644
--- a/DDAlign/include/DDAlign/AlignmentWriter.h
+++ b/DDAlign/include/DDAlign/AlignmentWriter.h
@@ -1,4 +1,4 @@
-// $Id$
+// $Id: $
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
diff --git a/DDAlign/include/DDAlign/DetectorAlignment.h b/DDAlign/include/DDAlign/DetectorAlignment.h
index 3df31fb9a1f42ff23913d0e5ad4e086e7cc30bba..906c07771429491f0b46683688732baa013d9527 100644
--- a/DDAlign/include/DDAlign/DetectorAlignment.h
+++ b/DDAlign/include/DDAlign/DetectorAlignment.h
@@ -1,4 +1,4 @@
-// $Id$
+// $Id: $
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
diff --git a/DDAlign/src/AlignmentCache.cpp b/DDAlign/src/AlignmentCache.cpp
index f7ec2c2f6e7af7b519dce37a11e557a2c4005636..c711a26698f52df3a72c87f7ab7995f7bffa3aa5 100644
--- a/DDAlign/src/AlignmentCache.cpp
+++ b/DDAlign/src/AlignmentCache.cpp
@@ -1,4 +1,4 @@
-// $Id$
+// $Id: $
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
diff --git a/DDAlign/src/AlignmentOperators.cpp b/DDAlign/src/AlignmentOperators.cpp
index c8d1df23bf45216332402f39c63beeb1635a84b7..952bdf971ca007fe976d9552417a3648aaf98356 100644
--- a/DDAlign/src/AlignmentOperators.cpp
+++ b/DDAlign/src/AlignmentOperators.cpp
@@ -1,4 +1,4 @@
-// $Id$
+// $Id: $
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
diff --git a/DDAlign/src/AlignmentParser.cpp b/DDAlign/src/AlignmentParser.cpp
index b09e4150823ce5954e30e58a9c29c6783aa1d84a..0e0dc8e2db9cb0fbea118a45de10affe774fc819 100644
--- a/DDAlign/src/AlignmentParser.cpp
+++ b/DDAlign/src/AlignmentParser.cpp
@@ -1,4 +1,4 @@
-// $Id$
+// $Id: $
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
diff --git a/DDAlign/src/AlignmentStack.cpp b/DDAlign/src/AlignmentStack.cpp
index 1b01e926ad706e47356cf6d3cb38d1e8d1be9435..8ecf50f4c4ee690f03484168b41ab70f6a007741 100644
--- a/DDAlign/src/AlignmentStack.cpp
+++ b/DDAlign/src/AlignmentStack.cpp
@@ -1,4 +1,4 @@
-// $Id$
+// $Id: $
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
diff --git a/DDAlign/src/AlignmentTags.cpp b/DDAlign/src/AlignmentTags.cpp
index a1cf1aae9c0204ee5db7edbb5830c7ca3240bed8..c819d014689b08b32a55d4061637d8e9ef22ac96 100644
--- a/DDAlign/src/AlignmentTags.cpp
+++ b/DDAlign/src/AlignmentTags.cpp
@@ -1,4 +1,4 @@
-// $Id$
+// $Id: $
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
diff --git a/DDAlign/src/AlignmentTransaction.cpp b/DDAlign/src/AlignmentTransaction.cpp
index 8b4ae91fee39bfadd200dc418496262b4fd14ade..7bdddd43ba471db966d1efc4fe487594ec629edd 100644
--- a/DDAlign/src/AlignmentTransaction.cpp
+++ b/DDAlign/src/AlignmentTransaction.cpp
@@ -1,4 +1,4 @@
-// $Id$
+// $Id: $
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
diff --git a/DDAlign/src/AlignmentWriter.cpp b/DDAlign/src/AlignmentWriter.cpp
index 5ba48f70a3725040c8459199d768f15bf88e1205..26e9ec4aee48fdf29e1fcefc720d88d9b16135d9 100644
--- a/DDAlign/src/AlignmentWriter.cpp
+++ b/DDAlign/src/AlignmentWriter.cpp
@@ -1,4 +1,4 @@
-// $Id$
+// $Id: $
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
diff --git a/DDAlign/src/DetectorAlignment.cpp b/DDAlign/src/DetectorAlignment.cpp
index 39563ae8f17a406f7c799086ee4be34b160e0c63..1f8e3ce8d765911e8457fbe44b38e61c1c9af0f8 100644
--- a/DDAlign/src/DetectorAlignment.cpp
+++ b/DDAlign/src/DetectorAlignment.cpp
@@ -1,4 +1,4 @@
-// $Id$
+// $Id: $
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
diff --git a/DDCond/CMakeLists.txt b/DDCond/CMakeLists.txt
index 614f91b79d0317681555b11f58b3eacec197d184..30b5f560bb40fcea4a0543782dbe2839df6e4c30 100644
--- a/DDCond/CMakeLists.txt
+++ b/DDCond/CMakeLists.txt
@@ -1,4 +1,4 @@
-# $Id$
+# $Id: $
 #==========================================================================
 #  AIDA Detector description implementation for LCD
 #--------------------------------------------------------------------------
diff --git a/DDCond/include/DDCond/ConditionValidator.h b/DDCond/include/DDCond/ConditionValidator.h
index ad1f6cb050c510f88e24a181776a9eb38eb75d89..5b7410ea4b03ef93a5f6f95cb89dfa2c517de9e0 100644
--- a/DDCond/include/DDCond/ConditionValidator.h
+++ b/DDCond/include/DDCond/ConditionValidator.h
@@ -1,4 +1,4 @@
-// $Id$
+// $Id: $
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
diff --git a/DDCond/include/DDCond/ConditionsHandler.h b/DDCond/include/DDCond/ConditionsHandler.h
index 10622a217388bd62b37073833476ad783ec9d408..4fe6835cacac9e67b8abca7ee316bcfe2ea4b5e2 100644
--- a/DDCond/include/DDCond/ConditionsHandler.h
+++ b/DDCond/include/DDCond/ConditionsHandler.h
@@ -1,4 +1,4 @@
-// $Id$
+// $Id: $
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
diff --git a/DDCond/include/DDCond/ConditionsOperators.h b/DDCond/include/DDCond/ConditionsOperators.h
index 5de94cb5531f2e8614f5dc8833b969143588afbb..0cceccc717416ab21e9582e9406408b4e742b766 100644
--- a/DDCond/include/DDCond/ConditionsOperators.h
+++ b/DDCond/include/DDCond/ConditionsOperators.h
@@ -1,4 +1,4 @@
-// $Id$
+// $Id: $
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
diff --git a/DDCond/include/DDCond/ConditionsStack.h b/DDCond/include/DDCond/ConditionsStack.h
index 0da3cda20f6066e19db6f932ed96c1d47e5509b7..e9dc9ee4986d4aa996a5ce8a32bc76b6d6c3ef56 100644
--- a/DDCond/include/DDCond/ConditionsStack.h
+++ b/DDCond/include/DDCond/ConditionsStack.h
@@ -1,4 +1,4 @@
-// $Id$
+// $Id: $
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
diff --git a/DDCond/include/DDCond/ConditionsTags.h b/DDCond/include/DDCond/ConditionsTags.h
index 17ccefc6c054b909f724643683152749fc83f0c8..505db883c1081f45c3088ac4129cfdae303caf28 100644
--- a/DDCond/include/DDCond/ConditionsTags.h
+++ b/DDCond/include/DDCond/ConditionsTags.h
@@ -1,4 +1,4 @@
-// $Id$
+// $Id: $
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
diff --git a/DDCond/include/DDCond/ConditionsTransaction.h b/DDCond/include/DDCond/ConditionsTransaction.h
index e8267c717e8ebc2014d9ba0f50381d86195d5d1d..9cb211859ce1b31cb8a43b2f5e56e5b0c18311c2 100644
--- a/DDCond/include/DDCond/ConditionsTransaction.h
+++ b/DDCond/include/DDCond/ConditionsTransaction.h
@@ -1,4 +1,4 @@
-// $Id$
+// $Id: $
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
diff --git a/DDCond/src/ConditionTest.cpp b/DDCond/src/ConditionTest.cpp
index 5db6649a390bb0ab20555cb80b5fbad896d71e9d..903d243c55fb36c121ef79cb9e221d3a4ad56879 100644
--- a/DDCond/src/ConditionTest.cpp
+++ b/DDCond/src/ConditionTest.cpp
@@ -1,4 +1,4 @@
-// $Id$
+// $Id: $
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
diff --git a/DDCond/src/ConditionValidator.cpp b/DDCond/src/ConditionValidator.cpp
index 63a89888c94f79d70784f65e3db5223c73194c4a..23deff0093375ce2af5a51cacc91f0859d8f815c 100644
--- a/DDCond/src/ConditionValidator.cpp
+++ b/DDCond/src/ConditionValidator.cpp
@@ -1,4 +1,4 @@
-// $Id$
+// $Id: $
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
diff --git a/DDCond/src/ConditionsHandler.cpp b/DDCond/src/ConditionsHandler.cpp
index abb4544176b1acf91bc95305702f819553c48490..cb0b2acaf21cb56f91922ac28413eb700c6ae78f 100644
--- a/DDCond/src/ConditionsHandler.cpp
+++ b/DDCond/src/ConditionsHandler.cpp
@@ -1,4 +1,4 @@
-// $Id$
+// $Id: $
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
diff --git a/DDCond/src/ConditionsParser.cpp b/DDCond/src/ConditionsParser.cpp
index 481333599da36ee4452f5a7e71c48ceee3bf89e2..8da8c373c6f9984b676c042653c21de1cb779601 100644
--- a/DDCond/src/ConditionsParser.cpp
+++ b/DDCond/src/ConditionsParser.cpp
@@ -1,4 +1,4 @@
-// $Id$
+// $Id: $
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
diff --git a/DDCond/src/ConditionsStack.cpp b/DDCond/src/ConditionsStack.cpp
index fc2e21e39375dbc305e6c5467d14dc72df0e4685..d174b0f2926d95a15417527a5037374782f3ae82 100644
--- a/DDCond/src/ConditionsStack.cpp
+++ b/DDCond/src/ConditionsStack.cpp
@@ -1,4 +1,4 @@
-// $Id$
+// $Id: $
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
diff --git a/DDCond/src/ConditionsTags.cpp b/DDCond/src/ConditionsTags.cpp
index 6d12540ef7e8c79de88333e0c5336b28ef4bbaf3..50c5ab75cc62c6f223fecca4ccc51a2803154fbb 100644
--- a/DDCond/src/ConditionsTags.cpp
+++ b/DDCond/src/ConditionsTags.cpp
@@ -1,4 +1,4 @@
-// $Id$
+// $Id: $
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
diff --git a/DDCond/src/ConditionsTransaction.cpp b/DDCond/src/ConditionsTransaction.cpp
index c8328506931115f32a3614d221fbeabf219ff649..3247263c928600fdd6784862769b57ef5df6d120 100644
--- a/DDCond/src/ConditionsTransaction.cpp
+++ b/DDCond/src/ConditionsTransaction.cpp
@@ -1,4 +1,4 @@
-// $Id$
+// $Id: $
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
diff --git a/DDCore/CMakeLists.txt b/DDCore/CMakeLists.txt
index e28bdccf9ad67cf639028eb99a8a4668f9aef5da..8fcf570ae8dde9c3cd678752993e93a77718d410 100644
--- a/DDCore/CMakeLists.txt
+++ b/DDCore/CMakeLists.txt
@@ -1,4 +1,4 @@
-# $Id$
+# $Id: $
 #==========================================================================
 #  AIDA Detector description implementation for LCD
 #--------------------------------------------------------------------------
diff --git a/DDCore/include/DD4hep/Alignment.h b/DDCore/include/DD4hep/Alignment.h
index 56a96935a0fcf615b15ecc14d05b38e465458196..20b48c321467112e240fe3fd957101c190aa4ed2 100644
--- a/DDCore/include/DD4hep/Alignment.h
+++ b/DDCore/include/DD4hep/Alignment.h
@@ -1,4 +1,4 @@
-// $Id$
+// $Id: $
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
diff --git a/DDCore/include/DD4hep/BasicGrammar.h b/DDCore/include/DD4hep/BasicGrammar.h
index 7126f6a1b24ba732e41a9d3e164e9b0808d5b737..6a999a57d0c0251adb8941dcabdfc2291999201f 100644
--- a/DDCore/include/DD4hep/BasicGrammar.h
+++ b/DDCore/include/DD4hep/BasicGrammar.h
@@ -1,4 +1,4 @@
-// $Id$
+// $Id: $
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
diff --git a/DDCore/include/DD4hep/Callback.h b/DDCore/include/DD4hep/Callback.h
index 9672d249a861678e39f122c69636b3273e89805d..7b0bdc411d2a8f24dfbdd1905e6d8591a7b886d6 100644
--- a/DDCore/include/DD4hep/Callback.h
+++ b/DDCore/include/DD4hep/Callback.h
@@ -1,4 +1,4 @@
-// $Id$
+// $Id: $
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
diff --git a/DDCore/include/DD4hep/ConditionTypes.h b/DDCore/include/DD4hep/ConditionTypes.h
index 9da242660aaa76b4c86def031bb2c7338de409fd..e67a7a0f9fc7930547255dd5c3192b77f0b13fa3 100644
--- a/DDCore/include/DD4hep/ConditionTypes.h
+++ b/DDCore/include/DD4hep/ConditionTypes.h
@@ -1,4 +1,4 @@
-// $Id$
+// $Id: $
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
diff --git a/DDCore/include/DD4hep/Conditions.h b/DDCore/include/DD4hep/Conditions.h
index e09ba800c0146785ff959aa649370cab668577bd..70e0338a46b96a65f5c16be6d6c4099ced772444 100644
--- a/DDCore/include/DD4hep/Conditions.h
+++ b/DDCore/include/DD4hep/Conditions.h
@@ -1,4 +1,4 @@
-// $Id$
+// $Id: $
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
diff --git a/DDCore/include/DD4hep/DD4hepRootPersistency.h b/DDCore/include/DD4hep/DD4hepRootPersistency.h
index c73142adc21a2b97a2d8927ed015a8baf8b896c0..7467bcfa32a400bcd8202a44481bd5c39cda11bd 100644
--- a/DDCore/include/DD4hep/DD4hepRootPersistency.h
+++ b/DDCore/include/DD4hep/DD4hepRootPersistency.h
@@ -1,4 +1,4 @@
-// $Id$
+// $Id: $
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
diff --git a/DDCore/include/DD4hep/DD4hepUnits.h b/DDCore/include/DD4hep/DD4hepUnits.h
index 4b4f38006920aae7334aed01c03781e1716380bd..e78e70f51e8fe8d5d1e5ef256b46f344bd378926 100644
--- a/DDCore/include/DD4hep/DD4hepUnits.h
+++ b/DDCore/include/DD4hep/DD4hepUnits.h
@@ -1,4 +1,4 @@
-// $Id$
+// $Id: $
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
@@ -275,7 +275,7 @@ namespace dd4hep {
   static const double perMillion = 0.000001;
 
   // -*- C++ -*-
-  // $Id:$
+  // $Id: $
   // ----------------------------------------------------------------------
   // HEP coherent Physical Constants
   //
diff --git a/DDCore/include/DD4hep/DetectorTools.h b/DDCore/include/DD4hep/DetectorTools.h
index 6f5656a822ae2ed35544b97135bf836e33f1bff8..9de15fe7dfddd204a3ac2a1e6ee6aa8d3b42979b 100644
--- a/DDCore/include/DD4hep/DetectorTools.h
+++ b/DDCore/include/DD4hep/DetectorTools.h
@@ -1,4 +1,4 @@
-// $Id$
+// $Id: $
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
diff --git a/DDCore/include/DD4hep/Dictionary.h b/DDCore/include/DD4hep/Dictionary.h
index 7b45915190efe24845b8007813fbf30b273f0a92..2b8e6cfa89d82f6b75ab17b7a5f42aa0945f2cd9 100644
--- a/DDCore/include/DD4hep/Dictionary.h
+++ b/DDCore/include/DD4hep/Dictionary.h
@@ -1,4 +1,4 @@
-// $Id$
+// $Id: $
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
diff --git a/DDCore/include/DD4hep/Exceptions.h b/DDCore/include/DD4hep/Exceptions.h
index 42eb317b25df4f2e0a22d6040f22fad46e878e1d..c11b61d91c69afffaf836c57a96add8cd3965180 100644
--- a/DDCore/include/DD4hep/Exceptions.h
+++ b/DDCore/include/DD4hep/Exceptions.h
@@ -1,4 +1,4 @@
-// $Id$
+// $Id: $
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
diff --git a/DDCore/include/DD4hep/Handle.inl b/DDCore/include/DD4hep/Handle.inl
index 971e5bf74e0105696ed916d49dc8be77e6a4ee5d..56ed2146d042f1c5ec9b4829fcd2d3781ac1e657 100644
--- a/DDCore/include/DD4hep/Handle.inl
+++ b/DDCore/include/DD4hep/Handle.inl
@@ -1,4 +1,4 @@
-// $Id$
+// $Id: $
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
diff --git a/DDCore/include/DD4hep/InstanceCount.h b/DDCore/include/DD4hep/InstanceCount.h
index 0fe867739c211ad09b4d1f27497735b22485b860..3f74373e24f64b794a1eda8e3760ddd01a5c1b40 100644
--- a/DDCore/include/DD4hep/InstanceCount.h
+++ b/DDCore/include/DD4hep/InstanceCount.h
@@ -1,4 +1,4 @@
-// $Id$
+// $Id: $
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
diff --git a/DDCore/include/DD4hep/LCDDData.h b/DDCore/include/DD4hep/LCDDData.h
index fa38cb7c4fe6969c52cc119ef8099b46b4640f66..af6179ea04467dad060c249c88963e8b9f98746e 100644
--- a/DDCore/include/DD4hep/LCDDData.h
+++ b/DDCore/include/DD4hep/LCDDData.h
@@ -1,4 +1,4 @@
-// $Id$
+// $Id: $
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
diff --git a/DDCore/include/DD4hep/LCDDHelper.h b/DDCore/include/DD4hep/LCDDHelper.h
index a74e834c958573a9e8413faa367c050235780991..f150d2cca4e273054d1e93999e99e94874773362 100644
--- a/DDCore/include/DD4hep/LCDDHelper.h
+++ b/DDCore/include/DD4hep/LCDDHelper.h
@@ -1,4 +1,4 @@
-// $Id$
+// $Id: $
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
diff --git a/DDCore/include/DD4hep/LCDDLoad.h b/DDCore/include/DD4hep/LCDDLoad.h
index 88aade6d19360a906d294498e26ac60fb8396496..6621bb56841d637d690241558cd24647bb35765a 100644
--- a/DDCore/include/DD4hep/LCDDLoad.h
+++ b/DDCore/include/DD4hep/LCDDLoad.h
@@ -1,4 +1,4 @@
-// $Id$
+// $Id: $
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
diff --git a/DDCore/include/DD4hep/MatrixHelpers.h b/DDCore/include/DD4hep/MatrixHelpers.h
index 0c86f3f72f86f160e5449af44e3b8522e2fbf26e..dae1e97dec4aa3a13085193d7ea4b1007c03082a 100644
--- a/DDCore/include/DD4hep/MatrixHelpers.h
+++ b/DDCore/include/DD4hep/MatrixHelpers.h
@@ -1,4 +1,4 @@
-// $Id$
+// $Id: $
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
diff --git a/DDCore/include/DD4hep/Memory.h b/DDCore/include/DD4hep/Memory.h
index 129a7a2d3c720f429752db3575543a8e172c0b47..acded026a720c5b2caf949b049c6db337307ea70 100644
--- a/DDCore/include/DD4hep/Memory.h
+++ b/DDCore/include/DD4hep/Memory.h
@@ -1,4 +1,4 @@
-// $Id$
+// $Id: $
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
diff --git a/DDCore/include/DD4hep/NamedObject.h b/DDCore/include/DD4hep/NamedObject.h
index fdf6c8a7c97fd870c246776b581926e0f9ee78cd..43e88d4735280ffed8802a08616841a423662f34 100644
--- a/DDCore/include/DD4hep/NamedObject.h
+++ b/DDCore/include/DD4hep/NamedObject.h
@@ -1,4 +1,4 @@
-// $Id$
+// $Id: $
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
diff --git a/DDCore/include/DD4hep/ObjectExtensions.h b/DDCore/include/DD4hep/ObjectExtensions.h
index 3fa6f2e157276e5ea292627f6b30996de47892b3..e7bbc1c13825c906f9969ac51e4339927e435a84 100644
--- a/DDCore/include/DD4hep/ObjectExtensions.h
+++ b/DDCore/include/DD4hep/ObjectExtensions.h
@@ -1,4 +1,4 @@
-// $Id$
+// $Id: $
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
diff --git a/DDCore/include/DD4hep/Parsers.h b/DDCore/include/DD4hep/Parsers.h
index 1eb68a5264426275a863de0781c39ca32293cba2..3aa5069879163c2f26af6bad33085716aee1de93 100644
--- a/DDCore/include/DD4hep/Parsers.h
+++ b/DDCore/include/DD4hep/Parsers.h
@@ -1,4 +1,4 @@
-// $Id$
+// $Id: $
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
diff --git a/DDCore/include/DD4hep/Plugins.h b/DDCore/include/DD4hep/Plugins.h
index 176b888138cdc1c2ffb0da1918dea58b924fb8d6..adec0e8472e3f7b0e2bdba33df8ac6c143bd79ac 100644
--- a/DDCore/include/DD4hep/Plugins.h
+++ b/DDCore/include/DD4hep/Plugins.h
@@ -1,4 +1,4 @@
-// $Id$
+// $Id: $
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
diff --git a/DDCore/include/DD4hep/Plugins.inl b/DDCore/include/DD4hep/Plugins.inl
index 5841e0c2dfb49befc990b310a223e98c5e76fadf..6e2b944505b25d394037679300b5ff0014f46f2a 100644
--- a/DDCore/include/DD4hep/Plugins.inl
+++ b/DDCore/include/DD4hep/Plugins.inl
@@ -1,4 +1,4 @@
-// $Id$
+// $Id: $
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
diff --git a/DDCore/include/DD4hep/Primitives.h b/DDCore/include/DD4hep/Primitives.h
index 056aad51cc9684f34f8acf6aa1555a69e7478b98..ab62b50961c3f6d5fad9e1d7c0fdc667cf79ec5b 100644
--- a/DDCore/include/DD4hep/Primitives.h
+++ b/DDCore/include/DD4hep/Primitives.h
@@ -1,4 +1,4 @@
-// $Id$
+// $Id: $
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
diff --git a/DDCore/include/DD4hep/Printout.h b/DDCore/include/DD4hep/Printout.h
index 6c59062cd561a2bf73213fe961c63cf9ff151f53..247646e2ad0bc56eed61a2918bb15f6e95f2fbbf 100644
--- a/DDCore/include/DD4hep/Printout.h
+++ b/DDCore/include/DD4hep/Printout.h
@@ -1,4 +1,4 @@
-// $Id$
+// $Id: $
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
diff --git a/DDCore/include/DD4hep/SurfaceInstaller.h b/DDCore/include/DD4hep/SurfaceInstaller.h
index b8845960981f0e06f1b3049ac545bc8fa86d2103..25fe31d266b5f49ecd2d1962f7e23a4381e38e89 100644
--- a/DDCore/include/DD4hep/SurfaceInstaller.h
+++ b/DDCore/include/DD4hep/SurfaceInstaller.h
@@ -1,4 +1,4 @@
-// $Id$
+// $Id: $
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
diff --git a/DDCore/include/DD4hep/ToStream.h b/DDCore/include/DD4hep/ToStream.h
index 3c771c7cb5bed67ba5edcd2de6b061cfb87c42b8..34d087e1995b9fcc4f09f8283f9248797ef3efdc 100644
--- a/DDCore/include/DD4hep/ToStream.h
+++ b/DDCore/include/DD4hep/ToStream.h
@@ -1,4 +1,4 @@
-// $Id$
+// $Id: $
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
diff --git a/DDCore/include/DD4hep/VolumeManager.h b/DDCore/include/DD4hep/VolumeManager.h
index 4ed5fe4871118284e5b8d7ab4fa70e2983293500..a1b9c187e1ce289b3ee4475b35326cdd17fdc8cd 100644
--- a/DDCore/include/DD4hep/VolumeManager.h
+++ b/DDCore/include/DD4hep/VolumeManager.h
@@ -1,4 +1,4 @@
-// $Id$
+// $Id: $
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
diff --git a/DDCore/include/DD4hep/config.h b/DDCore/include/DD4hep/config.h
index 7fc707c8fd983a6a703cd9795060634e733fc109..9c26f44ac51306c0cf952607b564a8abe79fc995 100644
--- a/DDCore/include/DD4hep/config.h
+++ b/DDCore/include/DD4hep/config.h
@@ -1,4 +1,4 @@
-// $Id$
+// $Id: $
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
diff --git a/DDCore/include/DD4hep/objects/BasicGrammar_inl.h b/DDCore/include/DD4hep/objects/BasicGrammar_inl.h
index 1a2746e5c1dff11195f4b4ccf3aa128e7c49663e..a2406a4bd2c156ad9e098b06358964ecc2e59d37 100644
--- a/DDCore/include/DD4hep/objects/BasicGrammar_inl.h
+++ b/DDCore/include/DD4hep/objects/BasicGrammar_inl.h
@@ -1,4 +1,4 @@
-// $Id$
+// $Id: $
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
diff --git a/DDCore/include/DD4hep/objects/ConditionsInterna.h b/DDCore/include/DD4hep/objects/ConditionsInterna.h
index 3e273683be61044bbc90a9026605f7b896d28b1e..5f46f354baaad6ac2d8ec6e9e1baf037ec1d39f6 100644
--- a/DDCore/include/DD4hep/objects/ConditionsInterna.h
+++ b/DDCore/include/DD4hep/objects/ConditionsInterna.h
@@ -1,4 +1,4 @@
-// $Id$
+// $Id: $
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
diff --git a/DDCore/include/DD4hep/objects/DetectorInterna.h b/DDCore/include/DD4hep/objects/DetectorInterna.h
index 169a55c27eed27d3fe98b70fe255a4c1e40ea26a..e913ae95b387c231e95932f068739e82cc8808b8 100644
--- a/DDCore/include/DD4hep/objects/DetectorInterna.h
+++ b/DDCore/include/DD4hep/objects/DetectorInterna.h
@@ -1,4 +1,4 @@
-// $Id$
+// $Id: $
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
diff --git a/DDCore/include/DD4hep/objects/ObjectsInterna.h b/DDCore/include/DD4hep/objects/ObjectsInterna.h
index 3a7cdcf6e4a66c227818a625989f2a205dda15ad..5cd8a4583a15de61bca2aa696f802b23aac7103c 100644
--- a/DDCore/include/DD4hep/objects/ObjectsInterna.h
+++ b/DDCore/include/DD4hep/objects/ObjectsInterna.h
@@ -1,4 +1,4 @@
-// $Id$
+// $Id: $
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
diff --git a/DDCore/include/DD4hep/objects/VolumeManagerInterna.h b/DDCore/include/DD4hep/objects/VolumeManagerInterna.h
index 5484be697274a1e0dda21bec2ba00f6e2fcd1be9..92fa27edd46fe89bbbc4ecce75a1e64473ad3ec8 100644
--- a/DDCore/include/DD4hep/objects/VolumeManagerInterna.h
+++ b/DDCore/include/DD4hep/objects/VolumeManagerInterna.h
@@ -1,4 +1,4 @@
-// $Id$
+// $Id: $
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
diff --git a/DDCore/include/XML/Utilities.h b/DDCore/include/XML/Utilities.h
index d86152cc3956cad92db2ba272ee7fef395ac1af4..010e0c7fcafc8c8387a018faf9ae203b35db2121 100644
--- a/DDCore/include/XML/Utilities.h
+++ b/DDCore/include/XML/Utilities.h
@@ -1,4 +1,4 @@
-// $Id$
+// $Id: $
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
@@ -42,7 +42,7 @@ namespace DD4hep {
      </envelope>
      @endverbatim
      *  @author S.Lu DESY, F. Gaede CERN/DESY 
-     *  @version $Id:$
+     *  @version $Id: $
      */
     Geometry::Volume createPlacedEnvelope( DD4hep::Geometry::LCDD& lcdd, DD4hep::XML::Handle_t e , 
                                            DD4hep::Geometry::DetElement sdet ) ;
diff --git a/DDCore/include/XML/XMLChildValue.h b/DDCore/include/XML/XMLChildValue.h
index 4d4dfc3a21bf393109f65cee93f940db3ddab3a4..bdd233bbba813acd571f32619e7523f96c3a9ba2 100644
--- a/DDCore/include/XML/XMLChildValue.h
+++ b/DDCore/include/XML/XMLChildValue.h
@@ -1,4 +1,4 @@
-// $Id$
+// $Id: $
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
diff --git a/DDCore/include/XML/XMLDimension.h b/DDCore/include/XML/XMLDimension.h
index 25eb8a37fe3b902b21fa771e047fc538d1f5136f..4a200aa5b3da6da69dee7a81e56a602c14c7ca54 100644
--- a/DDCore/include/XML/XMLDimension.h
+++ b/DDCore/include/XML/XMLDimension.h
@@ -1,4 +1,4 @@
-// $Id$
+// $Id: $
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
diff --git a/DDCore/python/lcdd.py b/DDCore/python/lcdd.py
index 08baace767f225df90b4ccda946052d1bdcd4f7d..6c62ef0cd557c0d36af84366f2ca38e4c0d785d8 100644
--- a/DDCore/python/lcdd.py
+++ b/DDCore/python/lcdd.py
@@ -1,4 +1,4 @@
-# $Id$
+# $Id: $
 #==========================================================================
 #  AIDA Detector description implementation for LCD
 #--------------------------------------------------------------------------
diff --git a/DDCore/src/Alignment.cpp b/DDCore/src/Alignment.cpp
index 02ec2f3c0f5230ef46fc9ffeefe6f19c78f73185..bee529ca99238400f2889669cdf9aa034fa3c12a 100644
--- a/DDCore/src/Alignment.cpp
+++ b/DDCore/src/Alignment.cpp
@@ -1,4 +1,4 @@
-// $Id$
+// $Id: $
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
diff --git a/DDCore/src/BasicGrammar.cpp b/DDCore/src/BasicGrammar.cpp
index d81bfe1c7a0cd5a5567f81b081db1a205c9eed36..9506cda6eb77a3a63f7833808cdd6581267fc3c1 100644
--- a/DDCore/src/BasicGrammar.cpp
+++ b/DDCore/src/BasicGrammar.cpp
@@ -1,4 +1,4 @@
-// $Id$
+// $Id: $
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
diff --git a/DDCore/src/BasicGrammarTypes.cpp b/DDCore/src/BasicGrammarTypes.cpp
index 0cce29d22c6c5a810e970b04bab59dd6d99a19f9..a9bd36ce56ea6096b73d9ed7a2ab234ab12f2192 100644
--- a/DDCore/src/BasicGrammarTypes.cpp
+++ b/DDCore/src/BasicGrammarTypes.cpp
@@ -1,4 +1,4 @@
-// $Id$
+// $Id: $
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
diff --git a/DDCore/src/Callback.cpp b/DDCore/src/Callback.cpp
index 61801abcbf73751f32795f5b0e211ac9260f13c4..ec08ff678782689e6dbbb749da60c440f709d7c7 100644
--- a/DDCore/src/Callback.cpp
+++ b/DDCore/src/Callback.cpp
@@ -1,4 +1,4 @@
-// $Id$
+// $Id: $
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
diff --git a/DDCore/src/Conditions.cpp b/DDCore/src/Conditions.cpp
index 7e6377ee7907741cdeb07ab2e7438f507e231439..b7964ed3a04caa72ca679494eed896ba53169ba1 100644
--- a/DDCore/src/Conditions.cpp
+++ b/DDCore/src/Conditions.cpp
@@ -1,4 +1,4 @@
-// $Id$
+// $Id: $
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
diff --git a/DDCore/src/ConditionsInterna.cpp b/DDCore/src/ConditionsInterna.cpp
index 869a203ba5a229670a5e787045b5b528da99d74a..b54d50356bb31be448e098cd92d9d71a399b30ab 100644
--- a/DDCore/src/ConditionsInterna.cpp
+++ b/DDCore/src/ConditionsInterna.cpp
@@ -1,4 +1,4 @@
-// $Id$
+// $Id: $
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
diff --git a/DDCore/src/ConditonsTypes.cpp b/DDCore/src/ConditonsTypes.cpp
index 7ac14f135b94bd7e9d2340e0040e1005b978690f..e09cba97bf7b6265881e79499d221e6e5c58a5db 100644
--- a/DDCore/src/ConditonsTypes.cpp
+++ b/DDCore/src/ConditonsTypes.cpp
@@ -1,4 +1,4 @@
-// $Id$
+// $Id: $
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
diff --git a/DDCore/src/DD4hepRootPersistency.cpp b/DDCore/src/DD4hepRootPersistency.cpp
index 25093f1899f9a8a02c49351b34c44980d3a87ee0..f1398382ae8c8f11b72d794fa076c6fdfe85f2ba 100644
--- a/DDCore/src/DD4hepRootPersistency.cpp
+++ b/DDCore/src/DD4hepRootPersistency.cpp
@@ -1,4 +1,4 @@
-// $Id$
+// $Id: $
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
diff --git a/DDCore/src/DetectorInterna.cpp b/DDCore/src/DetectorInterna.cpp
index 5d64cf5d5f604d55cf0ccf3b494c2401720f6a1e..6eb172600e0d6632e93b833cb21a99dad7a5adfc 100644
--- a/DDCore/src/DetectorInterna.cpp
+++ b/DDCore/src/DetectorInterna.cpp
@@ -1,4 +1,4 @@
-// $Id$
+// $Id: $
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
diff --git a/DDCore/src/DetectorTools.cpp b/DDCore/src/DetectorTools.cpp
index 0a10a7f6efe2db9be29d49689929314caedddd61..ca4819179ae20b573645bf4192d23b2831750cf4 100644
--- a/DDCore/src/DetectorTools.cpp
+++ b/DDCore/src/DetectorTools.cpp
@@ -1,4 +1,4 @@
-// $Id$
+// $Id: $
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
diff --git a/DDCore/src/Exceptions.cpp b/DDCore/src/Exceptions.cpp
index 49fd40835b5cb6b9b7bbe666a3b4ac716bd309b7..90acc12a8d167e026c3dd23462ae3095a1f3b4f2 100644
--- a/DDCore/src/Exceptions.cpp
+++ b/DDCore/src/Exceptions.cpp
@@ -1,4 +1,4 @@
-// $Id$
+// $Id: $
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
diff --git a/DDCore/src/InstanceCount.cpp b/DDCore/src/InstanceCount.cpp
index 3fd7244b4ad4fe5b6f60a8d92040f05f1235378f..61ace8d068c9211cd870ceb7d8087aa240e2aadb 100644
--- a/DDCore/src/InstanceCount.cpp
+++ b/DDCore/src/InstanceCount.cpp
@@ -1,4 +1,4 @@
-// $Id$
+// $Id: $
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
diff --git a/DDCore/src/LCDDData.cpp b/DDCore/src/LCDDData.cpp
index bc6d389f13d1b53852fc5af9f843d2765ab2c082..c3f04fd221367b6b061edf77bae5edaabb2fe774 100644
--- a/DDCore/src/LCDDData.cpp
+++ b/DDCore/src/LCDDData.cpp
@@ -1,4 +1,4 @@
-// $Id$
+// $Id: $
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
diff --git a/DDCore/src/LCDDHelper.cpp b/DDCore/src/LCDDHelper.cpp
index c483e829075bf787c1e89f8f78c654f652e1d022..6cc1f730d2ba5fe6bc604397b6c2b68d3b1c6684 100644
--- a/DDCore/src/LCDDHelper.cpp
+++ b/DDCore/src/LCDDHelper.cpp
@@ -1,4 +1,4 @@
-// $Id$
+// $Id: $
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
diff --git a/DDCore/src/LCDDLoad.cpp b/DDCore/src/LCDDLoad.cpp
index af9795420c7ebab57b059a557207b958b96d76a0..63f4a051daca6b1366d6883e90f3f80a9bf49358 100644
--- a/DDCore/src/LCDDLoad.cpp
+++ b/DDCore/src/LCDDLoad.cpp
@@ -1,4 +1,4 @@
-// $Id$
+// $Id: $
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
diff --git a/DDCore/src/MatrixHelpers.cpp b/DDCore/src/MatrixHelpers.cpp
index a18e04f5050ca3a726c628f42c099ab14a9d3c25..cd4c9c90da5cfda69df0c7a3d12b4aaf292e1fa9 100644
--- a/DDCore/src/MatrixHelpers.cpp
+++ b/DDCore/src/MatrixHelpers.cpp
@@ -1,4 +1,4 @@
-// $Id$
+// $Id: $
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
diff --git a/DDCore/src/NamedObject.cpp b/DDCore/src/NamedObject.cpp
index 9464ccddd54b232501aae149771a5a2e522f1fd2..51d3e1dd0c344df4ecd7d80ff0398ba11c615896 100644
--- a/DDCore/src/NamedObject.cpp
+++ b/DDCore/src/NamedObject.cpp
@@ -1,4 +1,4 @@
-// $Id$
+// $Id: $
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
diff --git a/DDCore/src/ObjectExtensions.cpp b/DDCore/src/ObjectExtensions.cpp
index d6ce863fcd8bcd8115829e3d8f0af94ea845cc59..c364b519e89d208b1eec0bdce88870c52b4b72ba 100644
--- a/DDCore/src/ObjectExtensions.cpp
+++ b/DDCore/src/ObjectExtensions.cpp
@@ -1,4 +1,4 @@
-// $Id$
+// $Id: $
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
diff --git a/DDCore/src/ObjectsInterna.cpp b/DDCore/src/ObjectsInterna.cpp
index 371cd97eda3510acacb7b9c8d8a8610d84a91b6c..dc2d3ff2f9a22850ad1798483d135c2e92585205 100644
--- a/DDCore/src/ObjectsInterna.cpp
+++ b/DDCore/src/ObjectsInterna.cpp
@@ -1,4 +1,4 @@
-// $Id$
+// $Id: $
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
diff --git a/DDCore/src/Plugins.cpp b/DDCore/src/Plugins.cpp
index 05560c7377f51c825e60584a02604182645089a9..8f8dcf495a14fef627ab8d836a5622d7c34bec52 100644
--- a/DDCore/src/Plugins.cpp
+++ b/DDCore/src/Plugins.cpp
@@ -1,4 +1,4 @@
-// $Id$
+// $Id: $
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
diff --git a/DDCore/src/Primitives.cpp b/DDCore/src/Primitives.cpp
index 2dc267d8c8a996e7be4f5cdbf9197057694bdb5e..b8577ae9214f8a87e51378b94c0c440b32c5b2b3 100644
--- a/DDCore/src/Primitives.cpp
+++ b/DDCore/src/Primitives.cpp
@@ -1,4 +1,4 @@
-// $Id$
+// $Id: $
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
diff --git a/DDCore/src/Printout.cpp b/DDCore/src/Printout.cpp
index 153c188c534834652510dd548331689809e2262d..ab19e52634e619db7af07f718aa743cc2692e8a7 100644
--- a/DDCore/src/Printout.cpp
+++ b/DDCore/src/Printout.cpp
@@ -1,4 +1,4 @@
-// $Id$
+// $Id: $
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
diff --git a/DDCore/src/SurfaceInstaller.cpp b/DDCore/src/SurfaceInstaller.cpp
index 3a4bafadf39543ff6eab93fdc18147ce253e00de..2bb57836701e73d033119e2ff8b478b080ee7e63 100644
--- a/DDCore/src/SurfaceInstaller.cpp
+++ b/DDCore/src/SurfaceInstaller.cpp
@@ -1,4 +1,4 @@
-// $Id$
+// $Id: $
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
diff --git a/DDCore/src/ToStream.cpp b/DDCore/src/ToStream.cpp
index 7f81cd68c63ca7cffa8cc0982034f856e33196ee..f809e25054487b4e7fb47b5e9b82a5230e59f4bc 100644
--- a/DDCore/src/ToStream.cpp
+++ b/DDCore/src/ToStream.cpp
@@ -1,4 +1,4 @@
-// $Id$
+// $Id: $
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
diff --git a/DDCore/src/VolumeManager.cpp b/DDCore/src/VolumeManager.cpp
index 5a26732a93768730f63edeabc1eb502fddb2ef02..fcfa9bc3a1c00ea51a98efad8a7e1022ecfffe54 100644
--- a/DDCore/src/VolumeManager.cpp
+++ b/DDCore/src/VolumeManager.cpp
@@ -1,4 +1,4 @@
-// $Id$
+// $Id: $
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
diff --git a/DDCore/src/VolumeManagerInterna.cpp b/DDCore/src/VolumeManagerInterna.cpp
index cbb50403c6dbc06e1783a25739bccedea374730e..9b2f12c394b9934ec9d7b5f2c2bb845a949b0bd1 100644
--- a/DDCore/src/VolumeManagerInterna.cpp
+++ b/DDCore/src/VolumeManagerInterna.cpp
@@ -1,4 +1,4 @@
-// $Id$
+// $Id: $
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
diff --git a/DDCore/src/XML/Utilities.cpp b/DDCore/src/XML/Utilities.cpp
index 8902e35cbf4097ca4fb373e0233a6af2e96b05d3..df6cd5a888e4ad59cc26d2d7bda12cb63ca5b7ca 100644
--- a/DDCore/src/XML/Utilities.cpp
+++ b/DDCore/src/XML/Utilities.cpp
@@ -1,4 +1,4 @@
-// $Id$
+// $Id: $
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
diff --git a/DDCore/src/XML/XMLChildValue.cpp b/DDCore/src/XML/XMLChildValue.cpp
index e52435b67549d85f376be1f9de90810ade503504..a4f032309b8be8486475b46402ed09d9ca7d5635 100644
--- a/DDCore/src/XML/XMLChildValue.cpp
+++ b/DDCore/src/XML/XMLChildValue.cpp
@@ -1,4 +1,4 @@
-// $Id$
+// $Id: $
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
diff --git a/DDCore/src/XML/XMLDimension.cpp b/DDCore/src/XML/XMLDimension.cpp
index fbd9779043e5455b9e5072480fccec51038d4a82..d5d5948cc2026f1253e7510d24215668f7178d31 100644
--- a/DDCore/src/XML/XMLDimension.cpp
+++ b/DDCore/src/XML/XMLDimension.cpp
@@ -1,4 +1,4 @@
-// $Id$
+// $Id: $
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
diff --git a/DDCore/src/parsers/Grammars.h b/DDCore/src/parsers/Grammars.h
index 7aa0d12a97cf51afa8f3d1ab88e0d803a21fc8f8..1bccc8653d713ea44d32dcf1aaafd84e7c358a09 100644
--- a/DDCore/src/parsers/Grammars.h
+++ b/DDCore/src/parsers/Grammars.h
@@ -1,4 +1,4 @@
-// $Id$
+// $Id: $
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
diff --git a/DDCore/src/parsers/GrammarsV2.h b/DDCore/src/parsers/GrammarsV2.h
index 75d6e6a25d43322cadd121994695dcf02bd13c3b..1b80b6e6ada7556c741cfc030a8fc7904c3ec05e 100644
--- a/DDCore/src/parsers/GrammarsV2.h
+++ b/DDCore/src/parsers/GrammarsV2.h
@@ -1,4 +1,4 @@
-// $Id$
+// $Id: $
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
diff --git a/DDCore/src/parsers/Parsers.icpp b/DDCore/src/parsers/Parsers.icpp
index c0889fd323bc9c81e9e5aab5af5fa4c9663bbb11..55eaf8bf3122ea4f2fe7bad32ec480aaec6b8f70 100644
--- a/DDCore/src/parsers/Parsers.icpp
+++ b/DDCore/src/parsers/Parsers.icpp
@@ -1,4 +1,4 @@
-// $Id$
+// $Id: $
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
diff --git a/DDCore/src/parsers/ParsersFactory.h b/DDCore/src/parsers/ParsersFactory.h
index b575a008508ef1fca97bc20dd714a041ab4a7a2b..84815d46d6697a069dab5f2c2c4a6343caa3459b 100644
--- a/DDCore/src/parsers/ParsersFactory.h
+++ b/DDCore/src/parsers/ParsersFactory.h
@@ -1,4 +1,4 @@
-// $Id$
+// $Id: $
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
diff --git a/DDCore/src/parsers/ParsersObjects.cpp b/DDCore/src/parsers/ParsersObjects.cpp
index 1c2a047bede80c535c6dfef55d81ca64ba900760..9114a035a26636427abe223b4cd2fb003505b62d 100644
--- a/DDCore/src/parsers/ParsersObjects.cpp
+++ b/DDCore/src/parsers/ParsersObjects.cpp
@@ -1,4 +1,4 @@
-// $Id$
+// $Id: $
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
diff --git a/DDCore/src/parsers/ParsersStandardList1.cpp b/DDCore/src/parsers/ParsersStandardList1.cpp
index 48568e7b2f98c52d2d710ba9bd892ab5931f0cfb..e2d15fd18d0f7ef7121af3b8f447fedfd90cb669 100644
--- a/DDCore/src/parsers/ParsersStandardList1.cpp
+++ b/DDCore/src/parsers/ParsersStandardList1.cpp
@@ -1,4 +1,4 @@
-// $Id$
+// $Id: $
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
diff --git a/DDCore/src/parsers/ParsersStandardList2.cpp b/DDCore/src/parsers/ParsersStandardList2.cpp
index 45c34d750494cab56ca18272042b7719d00e1615..b4efd54bdc9e3d188059913a8588efe981ee741d 100644
--- a/DDCore/src/parsers/ParsersStandardList2.cpp
+++ b/DDCore/src/parsers/ParsersStandardList2.cpp
@@ -1,4 +1,4 @@
-// $Id$
+// $Id: $
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
diff --git a/DDCore/src/parsers/ParsersStandardList3.cpp b/DDCore/src/parsers/ParsersStandardList3.cpp
index b97a649adfc0e3ad60d71c5c08a1155eed6bd734..ca60ff573f53f5fb3bdd2b2c8bc9704954e33349 100644
--- a/DDCore/src/parsers/ParsersStandardList3.cpp
+++ b/DDCore/src/parsers/ParsersStandardList3.cpp
@@ -1,4 +1,4 @@
-// $Id$
+// $Id: $
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
diff --git a/DDCore/src/parsers/ParsersStandardList4.cpp b/DDCore/src/parsers/ParsersStandardList4.cpp
index 000bb5bf5441399bb8457c3aabc769185c15f271..582156cef4d3b45d73b5379e5103b38e961d267a 100644
--- a/DDCore/src/parsers/ParsersStandardList4.cpp
+++ b/DDCore/src/parsers/ParsersStandardList4.cpp
@@ -1,4 +1,4 @@
-// $Id$
+// $Id: $
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
diff --git a/DDCore/src/parsers/ParsersStandardListCommon.h b/DDCore/src/parsers/ParsersStandardListCommon.h
index f60e45272c060d2648db94abe2a3c2ceece67d56..d5f15c1ebae224c73a7fee6f3d14d82ad4457bd0 100644
--- a/DDCore/src/parsers/ParsersStandardListCommon.h
+++ b/DDCore/src/parsers/ParsersStandardListCommon.h
@@ -1,4 +1,4 @@
-// $Id$
+// $Id: $
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
diff --git a/DDCore/src/parsers/ParsersStandardMisc1.cpp b/DDCore/src/parsers/ParsersStandardMisc1.cpp
index 36258a20de6693e908b9afe0db35c6327983b09d..288894e9447ae4f239a7c65b3625c5c6b6bb098d 100644
--- a/DDCore/src/parsers/ParsersStandardMisc1.cpp
+++ b/DDCore/src/parsers/ParsersStandardMisc1.cpp
@@ -1,4 +1,4 @@
-// $Id$
+// $Id: $
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
diff --git a/DDCore/src/parsers/ParsersStandardMisc2.cpp b/DDCore/src/parsers/ParsersStandardMisc2.cpp
index 186ec615b9e0a5c5dfdae47363c109897a500042..01fc42f96ff9cde1b5e9fee4f917813a1df228c0 100644
--- a/DDCore/src/parsers/ParsersStandardMisc2.cpp
+++ b/DDCore/src/parsers/ParsersStandardMisc2.cpp
@@ -1,4 +1,4 @@
-// $Id$
+// $Id: $
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
diff --git a/DDCore/src/parsers/ParsersStandardMisc3.cpp b/DDCore/src/parsers/ParsersStandardMisc3.cpp
index e3d472dea55b2e3513e0ddbf81745b9cc0932573..f56a87a167c506742610c77ed24883590ad130cf 100644
--- a/DDCore/src/parsers/ParsersStandardMisc3.cpp
+++ b/DDCore/src/parsers/ParsersStandardMisc3.cpp
@@ -1,4 +1,4 @@
-// $Id$
+// $Id: $
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
diff --git a/DDCore/src/parsers/ParsersStandardMisc4.cpp b/DDCore/src/parsers/ParsersStandardMisc4.cpp
index a9b4b4e78be54fd2853245fe6427ddda63836d80..be09c833af88e3bcc012d20692369fd919c60455 100644
--- a/DDCore/src/parsers/ParsersStandardMisc4.cpp
+++ b/DDCore/src/parsers/ParsersStandardMisc4.cpp
@@ -1,4 +1,4 @@
-// $Id$
+// $Id: $
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
diff --git a/DDCore/src/parsers/ParsersStandardMisc5.cpp b/DDCore/src/parsers/ParsersStandardMisc5.cpp
index 8dc9a66593f497f18e2fda3481f134c475b3ca8f..bde6cff38b5f90470f0d1603bada31fd692917d2 100644
--- a/DDCore/src/parsers/ParsersStandardMisc5.cpp
+++ b/DDCore/src/parsers/ParsersStandardMisc5.cpp
@@ -1,4 +1,4 @@
-// $Id$
+// $Id: $
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
diff --git a/DDCore/src/parsers/ParsersStandardMiscCommon.h b/DDCore/src/parsers/ParsersStandardMiscCommon.h
index 4eeb28d4a4cf45e0211a65470f555a223229e870..6e8bf4d5a82625cd29b80f26d13855cb394144c7 100644
--- a/DDCore/src/parsers/ParsersStandardMiscCommon.h
+++ b/DDCore/src/parsers/ParsersStandardMiscCommon.h
@@ -1,4 +1,4 @@
-// $Id$
+// $Id: $
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
diff --git a/DDCore/src/parsers/ParsersStandardSingle.cpp b/DDCore/src/parsers/ParsersStandardSingle.cpp
index 2a494b43749a7eafa99c3c1af626ec2a4e2081f9..63cc8be3ee6f304205d2f7a341443d75c6cfe3d4 100644
--- a/DDCore/src/parsers/ParsersStandardSingle.cpp
+++ b/DDCore/src/parsers/ParsersStandardSingle.cpp
@@ -1,4 +1,4 @@
-// $Id$
+// $Id: $
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
diff --git a/DDCore/src/plugins/GeometryWalk.cpp b/DDCore/src/plugins/GeometryWalk.cpp
index 4f54a17df0210eafd5b9456c6c1cd5e5a2fd5582..ffffcabe13f64974d15331e6ae17b60aa504d7be 100644
--- a/DDCore/src/plugins/GeometryWalk.cpp
+++ b/DDCore/src/plugins/GeometryWalk.cpp
@@ -1,4 +1,4 @@
-// $Id$
+// $Id: $
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
diff --git a/DDCore/src/plugins/LCDDHelperTest.cpp b/DDCore/src/plugins/LCDDHelperTest.cpp
index 5d13f14b2c6950ae5c76295410a56d8d2921217d..c45adbfb1e4b66a46d11d01940caf7c2e68812d2 100644
--- a/DDCore/src/plugins/LCDDHelperTest.cpp
+++ b/DDCore/src/plugins/LCDDHelperTest.cpp
@@ -1,4 +1,4 @@
-// $Id$
+// $Id: $
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
diff --git a/DDCore/src/plugins/PluginInvoker.cpp b/DDCore/src/plugins/PluginInvoker.cpp
index 7fee06a58c858f78be3eaedab2cf27e7c835fb03..9047300bce29b517c00208526be5a64006d6d597 100644
--- a/DDCore/src/plugins/PluginInvoker.cpp
+++ b/DDCore/src/plugins/PluginInvoker.cpp
@@ -1,4 +1,4 @@
-// $Id$
+// $Id: $
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
diff --git a/DDCore/src/plugins/ShapePlugins.cpp b/DDCore/src/plugins/ShapePlugins.cpp
index bd0a6b77b4796ca9800b0f49f75816c6a3432aaa..e2a1ee58cdfbe007246570783196156a3c955a4b 100644
--- a/DDCore/src/plugins/ShapePlugins.cpp
+++ b/DDCore/src/plugins/ShapePlugins.cpp
@@ -1,4 +1,4 @@
-// $Id$
+// $Id: $
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
diff --git a/DDCore/src/plugins/VolumeMgrTest.cpp b/DDCore/src/plugins/VolumeMgrTest.cpp
index fec5457c38a5564234614646283578bd3a2cb6e3..5ab668974d24f317fcf400a23ad71d60b4a46e12 100644
--- a/DDCore/src/plugins/VolumeMgrTest.cpp
+++ b/DDCore/src/plugins/VolumeMgrTest.cpp
@@ -1,4 +1,4 @@
-// $Id$
+// $Id: $
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
diff --git a/DDDetectors/CMakeLists.txt b/DDDetectors/CMakeLists.txt
index dfe21b4a504f702679975bc68479ec17766690d8..b9be1e243989198ee1c70b943f390ce9eaaca2c2 100644
--- a/DDDetectors/CMakeLists.txt
+++ b/DDDetectors/CMakeLists.txt
@@ -1,4 +1,4 @@
-# $Id$
+# $Id: $
 #==========================================================================
 #  AIDA Detector description implementation for LCD
 #--------------------------------------------------------------------------
diff --git a/DDDetectors/src/BoxSegment_geo.cpp b/DDDetectors/src/BoxSegment_geo.cpp
index 1024b4c3fcd28027a0b24f72758b68c001fd76f1..33c9fcbc9ccb6301a92362deac12790d4d91ce54 100644
--- a/DDDetectors/src/BoxSegment_geo.cpp
+++ b/DDDetectors/src/BoxSegment_geo.cpp
@@ -1,4 +1,4 @@
-// $Id$
+// $Id: $
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
diff --git a/DDDetectors/src/CylindricalBarrelCalorimeter_geo.cpp b/DDDetectors/src/CylindricalBarrelCalorimeter_geo.cpp
index e865de693e30f9e0b07cbc3acd7c134e18f3ee42..2327e874cccfbd613b8cc6adced0f0b1f74715f9 100644
--- a/DDDetectors/src/CylindricalBarrelCalorimeter_geo.cpp
+++ b/DDDetectors/src/CylindricalBarrelCalorimeter_geo.cpp
@@ -1,4 +1,4 @@
-// $Id$
+// $Id: $
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
diff --git a/DDDetectors/src/CylindricalEndcapCalorimeter_geo.cpp b/DDDetectors/src/CylindricalEndcapCalorimeter_geo.cpp
index 6fddd3302e6154fc677644d92a5b19ba0fd0cfa3..8ceb3201a48ddd23f9cd266c6bb54552a6c48e34 100644
--- a/DDDetectors/src/CylindricalEndcapCalorimeter_geo.cpp
+++ b/DDDetectors/src/CylindricalEndcapCalorimeter_geo.cpp
@@ -1,4 +1,4 @@
-// $Id$
+// $Id: $
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
diff --git a/DDDetectors/src/DiskTracker_geo.cpp b/DDDetectors/src/DiskTracker_geo.cpp
index 7a093ae2b75706bdef17d9dac9305946c51d3644..f1e9a2d0a1c6d91028f8503ca976e0df006320d2 100644
--- a/DDDetectors/src/DiskTracker_geo.cpp
+++ b/DDDetectors/src/DiskTracker_geo.cpp
@@ -1,4 +1,4 @@
-// $Id$
+// $Id: $
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
diff --git a/DDDetectors/src/EcalBarrel_geo.cpp b/DDDetectors/src/EcalBarrel_geo.cpp
index 86dc9ad29a65bf85eb0f81e3e12c0423db6a60df..27e621f7ef326d4d4c1d63c938d42487076b00a2 100644
--- a/DDDetectors/src/EcalBarrel_geo.cpp
+++ b/DDDetectors/src/EcalBarrel_geo.cpp
@@ -1,4 +1,4 @@
-// $Id$
+// $Id: $
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
diff --git a/DDDetectors/src/ForwardDetector_geo.cpp b/DDDetectors/src/ForwardDetector_geo.cpp
index 79937c611654a3c7c07097b559fb05a5ee80059e..540a28260800d9212c000e829cf625889b5fb082 100644
--- a/DDDetectors/src/ForwardDetector_geo.cpp
+++ b/DDDetectors/src/ForwardDetector_geo.cpp
@@ -1,4 +1,4 @@
-// $Id$
+// $Id: $
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
diff --git a/DDDetectors/src/LayeringExtensionPlugin.cpp b/DDDetectors/src/LayeringExtensionPlugin.cpp
index 68d0aaf040287569a9ecc72a345f51e3471639b3..deb50e63411b38f157212e9cc00440f9be3e206a 100644
--- a/DDDetectors/src/LayeringExtensionPlugin.cpp
+++ b/DDDetectors/src/LayeringExtensionPlugin.cpp
@@ -1,4 +1,4 @@
-// $Id$
+// $Id: $
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
diff --git a/DDDetectors/src/MultiLayerTracker_geo.cpp b/DDDetectors/src/MultiLayerTracker_geo.cpp
index 708b9f0fefe1e7a8eca83f07c3c00c160ad8aa7c..c4028601ad53e6fd2bfb41e5a043351945b2752d 100644
--- a/DDDetectors/src/MultiLayerTracker_geo.cpp
+++ b/DDDetectors/src/MultiLayerTracker_geo.cpp
@@ -1,4 +1,4 @@
-// $Id$
+// $Id: $
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
diff --git a/DDDetectors/src/PolyconeSupport_geo.cpp b/DDDetectors/src/PolyconeSupport_geo.cpp
index cbb0a35f0627664891b3a16f3fe6413ce2605470..2cf3b5f9423878a3337bdfc50c5446bc24a7d4cf 100644
--- a/DDDetectors/src/PolyconeSupport_geo.cpp
+++ b/DDDetectors/src/PolyconeSupport_geo.cpp
@@ -1,4 +1,4 @@
-// $Id$
+// $Id: $
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
diff --git a/DDDetectors/src/PolyhedraBarrelCalorimeter2_geo.cpp b/DDDetectors/src/PolyhedraBarrelCalorimeter2_geo.cpp
index ff2197599e5155a80976a4e78ef89ffa0d2cecde..9c4a61f87c8fa8610b1939c502a0d4b6c80ff802 100644
--- a/DDDetectors/src/PolyhedraBarrelCalorimeter2_geo.cpp
+++ b/DDDetectors/src/PolyhedraBarrelCalorimeter2_geo.cpp
@@ -1,4 +1,4 @@
-// $Id$
+// $Id: $
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
diff --git a/DDDetectors/src/PolyhedraEndcapCalorimeter2_geo.cpp b/DDDetectors/src/PolyhedraEndcapCalorimeter2_geo.cpp
index 94a797ab9fc647e35893d44163dc8cac92d34213..1c942ceb62bf616168271b7480885db43fa16ba4 100644
--- a/DDDetectors/src/PolyhedraEndcapCalorimeter2_geo.cpp
+++ b/DDDetectors/src/PolyhedraEndcapCalorimeter2_geo.cpp
@@ -1,4 +1,4 @@
-// $Id$
+// $Id: $
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
diff --git a/DDDetectors/src/PolyhedraEndcapCalorimeter2_surfaces.cpp b/DDDetectors/src/PolyhedraEndcapCalorimeter2_surfaces.cpp
index 50d1dc8e63b0234cddf79ff8e56e7433f23266d5..f7351c2a10f0b7d366feeb8c1d6e7970b4f7daf0 100644
--- a/DDDetectors/src/PolyhedraEndcapCalorimeter2_surfaces.cpp
+++ b/DDDetectors/src/PolyhedraEndcapCalorimeter2_surfaces.cpp
@@ -1,4 +1,4 @@
-// $Id$
+// $Id: $
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
diff --git a/DDDetectors/src/SiTrackerBarrel_geo.cpp b/DDDetectors/src/SiTrackerBarrel_geo.cpp
index 856d15f1af034e99ec89759e53da7dd53eabf556..b951ceaee0931baedc70ee6736cb21c0053123cd 100644
--- a/DDDetectors/src/SiTrackerBarrel_geo.cpp
+++ b/DDDetectors/src/SiTrackerBarrel_geo.cpp
@@ -1,4 +1,4 @@
-// $Id$
+// $Id: $
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
diff --git a/DDDetectors/src/SiTrackerBarrel_surfaces.cpp b/DDDetectors/src/SiTrackerBarrel_surfaces.cpp
index af7baccc8ab57920eee70891438335cef2bd4375..5d2366c18a0c8356e6550c14426eafc32ccde7aa 100644
--- a/DDDetectors/src/SiTrackerBarrel_surfaces.cpp
+++ b/DDDetectors/src/SiTrackerBarrel_surfaces.cpp
@@ -1,4 +1,4 @@
-// $Id$
+// $Id: $
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
diff --git a/DDDetectors/src/SiTrackerEndcap2_geo.cpp b/DDDetectors/src/SiTrackerEndcap2_geo.cpp
index 5c64732aa071b9306e4f72383f351738e4a152a7..25123ab4c1ffdd5caf0d0e8fe485be4421261c0e 100644
--- a/DDDetectors/src/SiTrackerEndcap2_geo.cpp
+++ b/DDDetectors/src/SiTrackerEndcap2_geo.cpp
@@ -1,4 +1,4 @@
-// $Id$
+// $Id: $
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
diff --git a/DDDetectors/src/SiTrackerEndcap_surfaces.cpp b/DDDetectors/src/SiTrackerEndcap_surfaces.cpp
index 39b19519c62b9d8c7c1e0e4ff6ba516443b70eb6..60fda77eea032fe7818e1ff01d53a5b86ae9e928 100644
--- a/DDDetectors/src/SiTrackerEndcap_surfaces.cpp
+++ b/DDDetectors/src/SiTrackerEndcap_surfaces.cpp
@@ -1,4 +1,4 @@
-// $Id$
+// $Id: $
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
diff --git a/DDDetectors/src/SubdetectorAssembly_geo.cpp b/DDDetectors/src/SubdetectorAssembly_geo.cpp
index 1054b1617ba787bffa9b78b717a8eb1ac265449c..f72ff8a95691b5ec38ad93228fdccc5e336494ba 100644
--- a/DDDetectors/src/SubdetectorAssembly_geo.cpp
+++ b/DDDetectors/src/SubdetectorAssembly_geo.cpp
@@ -1,4 +1,4 @@
-// $Id$
+// $Id: $
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
diff --git a/DDDetectors/src/SubdetectorExtensionPlugin.cpp b/DDDetectors/src/SubdetectorExtensionPlugin.cpp
index f3dfbc41f78ceb82f361c17800439ff3a560f12f..3348ec299a36d772bf6e6f232f100ad6615b64ce 100644
--- a/DDDetectors/src/SubdetectorExtensionPlugin.cpp
+++ b/DDDetectors/src/SubdetectorExtensionPlugin.cpp
@@ -1,4 +1,4 @@
-// $Id$
+// $Id: $
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
diff --git a/DDDetectors/src/SurfaceExamplePlugin.cpp b/DDDetectors/src/SurfaceExamplePlugin.cpp
index bd000a5d42ba991d37ec9d22820c56eb547dbdb6..00c5494cb76c4918e61929812913f4ed4e3bf691 100644
--- a/DDDetectors/src/SurfaceExamplePlugin.cpp
+++ b/DDDetectors/src/SurfaceExamplePlugin.cpp
@@ -1,4 +1,4 @@
-// $Id$
+// $Id: $
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
diff --git a/DDDetectors/src/TubeSegment_geo.cpp b/DDDetectors/src/TubeSegment_geo.cpp
index 9f0caa4fa87e0f8ef4b6a67601044eb42bab7c61..8ad502d6e1c54015e373d038e3c6472aae33f897 100644
--- a/DDDetectors/src/TubeSegment_geo.cpp
+++ b/DDDetectors/src/TubeSegment_geo.cpp
@@ -1,4 +1,4 @@
-// $Id$
+// $Id: $
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
diff --git a/DDEve/CMakeLists.txt b/DDEve/CMakeLists.txt
index ce283e13222af11a0d7ea283995419ad9accc817..cf95262ef264e8b6cd40ece095319e968af211d3 100644
--- a/DDEve/CMakeLists.txt
+++ b/DDEve/CMakeLists.txt
@@ -1,4 +1,4 @@
-# $Id$
+# $Id: $
 #==========================================================================
 #  AIDA Detector description implementation for LCD
 #--------------------------------------------------------------------------
diff --git a/DDEve/DDEve/DDEve.C b/DDEve/DDEve/DDEve.C
index cfdd6d84583e0b99c4c5d860299c527dbe97f4ff..9acec4cc1cd2c9b4aa4be5c1dc4492350ac9f658 100644
--- a/DDEve/DDEve/DDEve.C
+++ b/DDEve/DDEve/DDEve.C
@@ -1,4 +1,4 @@
-// $Id$
+// $Id: $
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
diff --git a/DDEve/DDEve/DDG4IO.C b/DDEve/DDEve/DDG4IO.C
index de890426646726430819124dacadd121ea461495..fbed3af2a5ccbb65d8196161c1dcf63b25676da2 100644
--- a/DDEve/DDEve/DDG4IO.C
+++ b/DDEve/DDEve/DDG4IO.C
@@ -1,4 +1,4 @@
-// $Id$
+// $Id: $
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
diff --git a/DDEve/include/DDEve/Annotation.h b/DDEve/include/DDEve/Annotation.h
index b1fd8de7422bafe3645edd61113210daeecade78..7c1d45a7510e15f69505f2fbc658c699a67b1541 100644
--- a/DDEve/include/DDEve/Annotation.h
+++ b/DDEve/include/DDEve/Annotation.h
@@ -1,4 +1,4 @@
-// $Id$
+// $Id: $
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
diff --git a/DDEve/include/DDEve/Calo2DProjection.h b/DDEve/include/DDEve/Calo2DProjection.h
index c01977410ec9bfab081bafc0c2d56cdca0bfd31a..86a6aab15a6e1685032cbb7fd0e98ae93d99cfea 100644
--- a/DDEve/include/DDEve/Calo2DProjection.h
+++ b/DDEve/include/DDEve/Calo2DProjection.h
@@ -1,4 +1,4 @@
-// $Id$
+// $Id: $
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
diff --git a/DDEve/include/DDEve/Calo3DProjection.h b/DDEve/include/DDEve/Calo3DProjection.h
index 3cbc40a5a692e7a1c1e83fddaf79e047821275d6..a4660cbf220f58dfaef9503390411cbb838b9b84 100644
--- a/DDEve/include/DDEve/Calo3DProjection.h
+++ b/DDEve/include/DDEve/Calo3DProjection.h
@@ -1,4 +1,4 @@
-// $Id$
+// $Id: $
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
diff --git a/DDEve/include/DDEve/CaloLego.h b/DDEve/include/DDEve/CaloLego.h
index cd56b25265870d5b078bd1f5457e4da46712407b..c8e706a5ba844f49c130ab36e27a0cc0cfd52320 100644
--- a/DDEve/include/DDEve/CaloLego.h
+++ b/DDEve/include/DDEve/CaloLego.h
@@ -1,4 +1,4 @@
-// $Id$
+// $Id: $
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
diff --git a/DDEve/include/DDEve/ContextMenu.h b/DDEve/include/DDEve/ContextMenu.h
index da7dbb896b387dc284b94fc8b1b1ce8953a103f8..09e9920e3b794c5daa48aeeee3b732cbaa5f3bc7 100644
--- a/DDEve/include/DDEve/ContextMenu.h
+++ b/DDEve/include/DDEve/ContextMenu.h
@@ -1,4 +1,4 @@
-// $Id$
+// $Id: $
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
diff --git a/DDEve/include/DDEve/DD4hepMenu.h b/DDEve/include/DDEve/DD4hepMenu.h
index b5c527bd99e34d2d1eaaae74f483b3a7de096e8e..66ee660cbd9e9107b3559d4f480623a9e0a7297a 100644
--- a/DDEve/include/DDEve/DD4hepMenu.h
+++ b/DDEve/include/DDEve/DD4hepMenu.h
@@ -1,4 +1,4 @@
-// $Id$
+// $Id: $
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
diff --git a/DDEve/include/DDEve/DDEveEventData.h b/DDEve/include/DDEve/DDEveEventData.h
index 55691f4ff76d8e714e51573db69f3fb9176bab29..99ed15c5720863c105cf562c099fa02bbac96ab7 100644
--- a/DDEve/include/DDEve/DDEveEventData.h
+++ b/DDEve/include/DDEve/DDEveEventData.h
@@ -1,4 +1,4 @@
-// $Id$
+// $Id: $
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
diff --git a/DDEve/include/DDEve/DDG4EventHandler.h b/DDEve/include/DDEve/DDG4EventHandler.h
index 07b0f2973a3296e6ae7f037bf5b45e5fd8619cfa..2b46e8f442b7b13d39363704b23ac7a7006a9def 100644
--- a/DDEve/include/DDEve/DDG4EventHandler.h
+++ b/DDEve/include/DDEve/DDG4EventHandler.h
@@ -1,4 +1,4 @@
-// $Id$
+// $Id: $
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
diff --git a/DDEve/include/DDEve/Dictionary.h b/DDEve/include/DDEve/Dictionary.h
index e46a2dd4a0a42f63d161612faaa056b6c89b2c26..c9b8630b77613b1096f809e1ad0a1d09f28703e2 100644
--- a/DDEve/include/DDEve/Dictionary.h
+++ b/DDEve/include/DDEve/Dictionary.h
@@ -1,4 +1,4 @@
-// $Id$
+// $Id: $
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
diff --git a/DDEve/include/DDEve/Display.h b/DDEve/include/DDEve/Display.h
index 50ef915795c2b14136ec9cff531cb305f0de3927..6442f74cefb9ecf8aedd0881b9c5de24e46adcbd 100644
--- a/DDEve/include/DDEve/Display.h
+++ b/DDEve/include/DDEve/Display.h
@@ -1,4 +1,4 @@
-// $Id$
+// $Id: $
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
diff --git a/DDEve/include/DDEve/DisplayConfiguration.h b/DDEve/include/DDEve/DisplayConfiguration.h
index 408962fbbbc57893dafeb0a06cbc7714f28c86f7..5fde5f9a858899ab81054e50c3b67ba9db247fe5 100644
--- a/DDEve/include/DDEve/DisplayConfiguration.h
+++ b/DDEve/include/DDEve/DisplayConfiguration.h
@@ -1,4 +1,4 @@
-// $Id$
+// $Id: $
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
diff --git a/DDEve/include/DDEve/ElementList.h b/DDEve/include/DDEve/ElementList.h
index a9b694ba6d4f3ce12bacc4aad11c85855534bfb2..626277859bd422956711aa3ff9675371a02feb76 100644
--- a/DDEve/include/DDEve/ElementList.h
+++ b/DDEve/include/DDEve/ElementList.h
@@ -1,4 +1,4 @@
-// $Id$
+// $Id: $
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
diff --git a/DDEve/include/DDEve/EvePgonSetProjectedContextMenu.h b/DDEve/include/DDEve/EvePgonSetProjectedContextMenu.h
index b5ad27802faaa6557e887fd96c49f4004b7c0a97..965afe6209d484e55a45a33f1a7c1a1567023678 100644
--- a/DDEve/include/DDEve/EvePgonSetProjectedContextMenu.h
+++ b/DDEve/include/DDEve/EvePgonSetProjectedContextMenu.h
@@ -1,4 +1,4 @@
-// $Id$
+// $Id: $
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
diff --git a/DDEve/include/DDEve/EveShapeContextMenu.h b/DDEve/include/DDEve/EveShapeContextMenu.h
index b25960e170d18fc6c4c1d1f08afd77e6ec72d499..b31c361ea82285a2672b654fbc8d3c0e00d9d724 100644
--- a/DDEve/include/DDEve/EveShapeContextMenu.h
+++ b/DDEve/include/DDEve/EveShapeContextMenu.h
@@ -1,4 +1,4 @@
-// $Id$
+// $Id: $
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
diff --git a/DDEve/include/DDEve/EveUserContextMenu.h b/DDEve/include/DDEve/EveUserContextMenu.h
index 132b84e2543aca4f95f3e777dff044b1f00cdb28..1cef1a7a2383f11190b763cb5e575f1704c1a0de 100644
--- a/DDEve/include/DDEve/EveUserContextMenu.h
+++ b/DDEve/include/DDEve/EveUserContextMenu.h
@@ -1,4 +1,4 @@
-// $Id$
+// $Id: $
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
diff --git a/DDEve/include/DDEve/EventControl.h b/DDEve/include/DDEve/EventControl.h
index 3d44d26e1cd18eed796f4fe55fa47426fa110bae..a636e93dff25f9339e50fcd9efc445d4adc3e20e 100644
--- a/DDEve/include/DDEve/EventControl.h
+++ b/DDEve/include/DDEve/EventControl.h
@@ -1,4 +1,4 @@
-// $Id$
+// $Id: $
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
diff --git a/DDEve/include/DDEve/EventHandler.h b/DDEve/include/DDEve/EventHandler.h
index a8d42ed78e95ad73f22fe89c856961b87d0f59f1..026172171a718f35f73bf64236b2c51faf3018a4 100644
--- a/DDEve/include/DDEve/EventHandler.h
+++ b/DDEve/include/DDEve/EventHandler.h
@@ -1,4 +1,4 @@
-// $Id$
+// $Id: $
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
diff --git a/DDEve/include/DDEve/Factories.h b/DDEve/include/DDEve/Factories.h
index be53a792317d00543dfc7cb93d7a9ca41e1da310..409a7f07a1a0aa81a4b8e493a4dd7fbe3d54e41a 100644
--- a/DDEve/include/DDEve/Factories.h
+++ b/DDEve/include/DDEve/Factories.h
@@ -1,4 +1,4 @@
-// $Id$
+// $Id: $
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
diff --git a/DDEve/include/DDEve/FrameControl.h b/DDEve/include/DDEve/FrameControl.h
index ec9a3d65679dbde103a5488638e0481df819dc5b..33a0c778cf3a19a3fc81c58efc2bc5cf3b05915d 100644
--- a/DDEve/include/DDEve/FrameControl.h
+++ b/DDEve/include/DDEve/FrameControl.h
@@ -1,4 +1,4 @@
-// $Id$
+// $Id: $
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
diff --git a/DDEve/include/DDEve/GenericEventHandler.h b/DDEve/include/DDEve/GenericEventHandler.h
index 0bc375422ffa4b453541391822474d840bec986b..c995558b0c378b249d3f0c8e80c8c9d0b5e61937 100644
--- a/DDEve/include/DDEve/GenericEventHandler.h
+++ b/DDEve/include/DDEve/GenericEventHandler.h
@@ -1,4 +1,4 @@
-// $Id$
+// $Id: $
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
diff --git a/DDEve/include/DDEve/HitActors.h b/DDEve/include/DDEve/HitActors.h
index 9c78ad1c9364c67935f20b465988ba4c931e17e4..b080caca28ae7c1eee127cd1461afbd044ad99f5 100644
--- a/DDEve/include/DDEve/HitActors.h
+++ b/DDEve/include/DDEve/HitActors.h
@@ -1,4 +1,4 @@
-// $Id$
+// $Id: $
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
diff --git a/DDEve/include/DDEve/MultiView.h b/DDEve/include/DDEve/MultiView.h
index 61db13f6d0627c52b751d4eb6f96fdf583e9f332..ede90e14b6ce6796e5204f0a49235cdb1ed6f271 100644
--- a/DDEve/include/DDEve/MultiView.h
+++ b/DDEve/include/DDEve/MultiView.h
@@ -1,4 +1,4 @@
-// $Id$
+// $Id: $
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
diff --git a/DDEve/include/DDEve/ParticleActors.h b/DDEve/include/DDEve/ParticleActors.h
index 3f0e2feb3ec453c76cdfc8feca92e36ae43fcd2c..8ee6e9b127366872556306979d831a50bcb6c48e 100644
--- a/DDEve/include/DDEve/ParticleActors.h
+++ b/DDEve/include/DDEve/ParticleActors.h
@@ -1,4 +1,4 @@
-// $Id$
+// $Id: $
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
diff --git a/DDEve/include/DDEve/PopupMenu.h b/DDEve/include/DDEve/PopupMenu.h
index 5f4b49af421bcabef1475b502fc8a6d5c075e7bd..975be50823b4add806ce561c6fed496ccf2f9081 100644
--- a/DDEve/include/DDEve/PopupMenu.h
+++ b/DDEve/include/DDEve/PopupMenu.h
@@ -1,4 +1,4 @@
-// $Id$
+// $Id: $
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
diff --git a/DDEve/include/DDEve/Projection.h b/DDEve/include/DDEve/Projection.h
index d599e8032e7e888dc5d6412e5be1aa7030369978..c2301c6c1feaca9b8738af02c284b74c43f6dfc0 100644
--- a/DDEve/include/DDEve/Projection.h
+++ b/DDEve/include/DDEve/Projection.h
@@ -1,4 +1,4 @@
-// $Id$
+// $Id: $
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
diff --git a/DDEve/include/DDEve/RhoPhiProjection.h b/DDEve/include/DDEve/RhoPhiProjection.h
index a10b89452a54cc5b62210399bf4a8bf656f44aa0..d1b611938fb5e963819fcfe362b6750c89f40c66 100644
--- a/DDEve/include/DDEve/RhoPhiProjection.h
+++ b/DDEve/include/DDEve/RhoPhiProjection.h
@@ -1,4 +1,4 @@
-// $Id$
+// $Id: $
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
diff --git a/DDEve/include/DDEve/RhoZProjection.h b/DDEve/include/DDEve/RhoZProjection.h
index bfd193dfb1f4f9a11abdd67cc422aa5774a927d8..e217fa6e2056f4d2623289fc937d6bd4b0145f23 100644
--- a/DDEve/include/DDEve/RhoZProjection.h
+++ b/DDEve/include/DDEve/RhoZProjection.h
@@ -1,4 +1,4 @@
-// $Id$
+// $Id: $
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
diff --git a/DDEve/include/DDEve/Utilities.h b/DDEve/include/DDEve/Utilities.h
index a09f7e15b9f4c37bc06b3cc6307cc7bc1a6732d6..834febc71342a69aedd5652a668327ebecc7ee49 100644
--- a/DDEve/include/DDEve/Utilities.h
+++ b/DDEve/include/DDEve/Utilities.h
@@ -1,4 +1,4 @@
-// $Id$
+// $Id: $
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
diff --git a/DDEve/include/DDEve/View.h b/DDEve/include/DDEve/View.h
index 96985e8a59047432fc62306a53ebe341ee2f01eb..374fd321cb19be11a38aaada0b3cbfcb68ddfd8a 100644
--- a/DDEve/include/DDEve/View.h
+++ b/DDEve/include/DDEve/View.h
@@ -1,4 +1,4 @@
-// $Id$
+// $Id: $
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
diff --git a/DDEve/include/DDEve/View3D.h b/DDEve/include/DDEve/View3D.h
index ae1d38f9e24d43ce9be58e6e8a0f77d80b389139..bf4a466716e9aaf1dc0876d0e4cdc1bb9395d556 100644
--- a/DDEve/include/DDEve/View3D.h
+++ b/DDEve/include/DDEve/View3D.h
@@ -1,4 +1,4 @@
-// $Id$
+// $Id: $
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
diff --git a/DDEve/include/DDEve/ViewMenu.h b/DDEve/include/DDEve/ViewMenu.h
index b7d750088e06fcbf34735b7d69adcb35b2d47d2a..4c7a7181b902b9562efd83201bf563bdb09f68ac 100644
--- a/DDEve/include/DDEve/ViewMenu.h
+++ b/DDEve/include/DDEve/ViewMenu.h
@@ -1,4 +1,4 @@
-// $Id$
+// $Id: $
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
diff --git a/DDEve/lcio/LCIOEventHandler.cpp b/DDEve/lcio/LCIOEventHandler.cpp
index 2554915c4f50a19a92526de0a92304accf679342..176ba2b9c5342add8e12529d4e7031a565bb167c 100644
--- a/DDEve/lcio/LCIOEventHandler.cpp
+++ b/DDEve/lcio/LCIOEventHandler.cpp
@@ -1,4 +1,4 @@
-// $Id$
+// $Id: $
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
diff --git a/DDEve/lcio/LCIOEventHandler.h b/DDEve/lcio/LCIOEventHandler.h
index 010cc17e1e4ce3ef952ad38392c7b8a13529d812..1ec941fb69292fc6cd1f334603d14f67c9c6979b 100644
--- a/DDEve/lcio/LCIOEventHandler.h
+++ b/DDEve/lcio/LCIOEventHandler.h
@@ -1,4 +1,4 @@
-// $Id$
+// $Id: $
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
diff --git a/DDEve/src/Annotation.cpp b/DDEve/src/Annotation.cpp
index 2cc57d8f23a719f9ab1c568a0a7632d948170dcb..8781249b61be8290216ef9b2973067154dae1d6f 100644
--- a/DDEve/src/Annotation.cpp
+++ b/DDEve/src/Annotation.cpp
@@ -1,4 +1,4 @@
-// $Id$
+// $Id: $
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
diff --git a/DDEve/src/Calo2DProjection.cpp b/DDEve/src/Calo2DProjection.cpp
index 421743a877bb1299bdacbc1aab4032b6d499a801..568694387b079c1f1c37026f25c6e34547146d32 100644
--- a/DDEve/src/Calo2DProjection.cpp
+++ b/DDEve/src/Calo2DProjection.cpp
@@ -1,4 +1,4 @@
-// $Id$
+// $Id: $
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
diff --git a/DDEve/src/Calo3DProjection.cpp b/DDEve/src/Calo3DProjection.cpp
index 427cf387fe595f896cff761a5ba9ccafb2906fec..23400f17951558205ab401972534f0591bb10b35 100644
--- a/DDEve/src/Calo3DProjection.cpp
+++ b/DDEve/src/Calo3DProjection.cpp
@@ -1,4 +1,4 @@
-// $Id$
+// $Id: $
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
diff --git a/DDEve/src/CaloLego.cpp b/DDEve/src/CaloLego.cpp
index 17c6c73054836601c25c0aff8b60f2aa256692ad..ba1f4f01d79f05d6fdebacb94c5a1268e11fea85 100644
--- a/DDEve/src/CaloLego.cpp
+++ b/DDEve/src/CaloLego.cpp
@@ -1,4 +1,4 @@
-// $Id$
+// $Id: $
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
diff --git a/DDEve/src/ContextMenu.cpp b/DDEve/src/ContextMenu.cpp
index 69834e6475ef6abe0b70949cc0c1479515a78166..4596e6d073be4dd36f893d76fc003bf7e8eadffd 100644
--- a/DDEve/src/ContextMenu.cpp
+++ b/DDEve/src/ContextMenu.cpp
@@ -1,4 +1,4 @@
-// $Id$
+// $Id: $
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
diff --git a/DDEve/src/DD4hepMenu.cpp b/DDEve/src/DD4hepMenu.cpp
index 8701f0af1ddb03d269c17fff0259cbab9b3675b9..ad5279a5892f9075b818920f2c34a92834fa9a2a 100644
--- a/DDEve/src/DD4hepMenu.cpp
+++ b/DDEve/src/DD4hepMenu.cpp
@@ -1,4 +1,4 @@
-// $Id$
+// $Id: $
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
diff --git a/DDEve/src/DDEveEventData.cpp b/DDEve/src/DDEveEventData.cpp
index 45ab9044d83c924519525388476368498fc3cc9e..00f075ef084241460acd9dd6572e636f3e26b6e2 100644
--- a/DDEve/src/DDEveEventData.cpp
+++ b/DDEve/src/DDEveEventData.cpp
@@ -1,4 +1,4 @@
-// $Id$
+// $Id: $
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
diff --git a/DDEve/src/DDEvePlugins.cpp b/DDEve/src/DDEvePlugins.cpp
index 05c83a4ac54049bbfbefa6cb692083a334ecc97b..f35bf2cd3082b5c339f224ac766c8962551e6224 100644
--- a/DDEve/src/DDEvePlugins.cpp
+++ b/DDEve/src/DDEvePlugins.cpp
@@ -1,4 +1,4 @@
-// $Id$
+// $Id: $
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
diff --git a/DDEve/src/DDG4EventHandler.cpp b/DDEve/src/DDG4EventHandler.cpp
index 61ac94c63d577563eead0d509703e6acb4015e80..29170f9d69615e14f0d61dd5fce400568ef4a19b 100644
--- a/DDEve/src/DDG4EventHandler.cpp
+++ b/DDEve/src/DDG4EventHandler.cpp
@@ -1,4 +1,4 @@
-// $Id$
+// $Id: $
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
diff --git a/DDEve/src/Display.cpp b/DDEve/src/Display.cpp
index 64166395c9281f0e508db1f5d71ed61eb9eaab47..9114fc14ee74367fc7450a243263cc8a74efc95a 100644
--- a/DDEve/src/Display.cpp
+++ b/DDEve/src/Display.cpp
@@ -1,4 +1,4 @@
-// $Id$
+// $Id: $
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
diff --git a/DDEve/src/DisplayConfiguration.cpp b/DDEve/src/DisplayConfiguration.cpp
index 59c895a4c722290e878390f9d3308cf660552a3b..9765d66140645376bc4acba0a8778cf823e8980a 100644
--- a/DDEve/src/DisplayConfiguration.cpp
+++ b/DDEve/src/DisplayConfiguration.cpp
@@ -1,4 +1,4 @@
-// $Id$
+// $Id: $
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
diff --git a/DDEve/src/DisplayConfigurationParser.cpp b/DDEve/src/DisplayConfigurationParser.cpp
index b6ad1f8658e1abf6c84521a230c1b1421df8823c..5f4117533346c9ea7922f043f0066dba2af9a521 100644
--- a/DDEve/src/DisplayConfigurationParser.cpp
+++ b/DDEve/src/DisplayConfigurationParser.cpp
@@ -1,4 +1,4 @@
-// $Id$
+// $Id: $
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
diff --git a/DDEve/src/ElementList.cpp b/DDEve/src/ElementList.cpp
index c422debca72798937ec2e7d9a502419afd970632..a9925bcf76b36db974962cc39b738d0071fc57bd 100644
--- a/DDEve/src/ElementList.cpp
+++ b/DDEve/src/ElementList.cpp
@@ -1,4 +1,4 @@
-// $Id$
+// $Id: $
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
diff --git a/DDEve/src/EvePgonSetProjectedContextMenu.cpp b/DDEve/src/EvePgonSetProjectedContextMenu.cpp
index b31e4e087f50bed9416c15e4b0544cae48177c15..7f7244ace812cd813baa58f96f72cbc92fabe58e 100644
--- a/DDEve/src/EvePgonSetProjectedContextMenu.cpp
+++ b/DDEve/src/EvePgonSetProjectedContextMenu.cpp
@@ -1,4 +1,4 @@
-// $Id$
+// $Id: $
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
diff --git a/DDEve/src/EveShapeContextMenu.cpp b/DDEve/src/EveShapeContextMenu.cpp
index 132cdb2573efd98f5cb5f89426eeb91048d2dc6e..f01c2af572dd1c05b43a2c5a71eb9f516ef41000 100644
--- a/DDEve/src/EveShapeContextMenu.cpp
+++ b/DDEve/src/EveShapeContextMenu.cpp
@@ -1,4 +1,4 @@
-// $Id$
+// $Id: $
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
diff --git a/DDEve/src/EveUserContextMenu.cpp b/DDEve/src/EveUserContextMenu.cpp
index 8c12dade9464efa7a08462d99f4988f32aa96748..23c516e957b74b970fca66c1d9a50a379197e59b 100644
--- a/DDEve/src/EveUserContextMenu.cpp
+++ b/DDEve/src/EveUserContextMenu.cpp
@@ -1,4 +1,4 @@
-// $Id$
+// $Id: $
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
diff --git a/DDEve/src/EventControl.cpp b/DDEve/src/EventControl.cpp
index 82d754e34ecf34d28dc6d9d6fab739d1615336e3..950df9b078f3bad2172bee244839eb8bddc96ddf 100644
--- a/DDEve/src/EventControl.cpp
+++ b/DDEve/src/EventControl.cpp
@@ -1,4 +1,4 @@
-// $Id$
+// $Id: $
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
diff --git a/DDEve/src/EventHandler.cpp b/DDEve/src/EventHandler.cpp
index daeeb55ea53681cac242fc6eaee4ce2df5b35805..63c46eddb3b7ecbf5b94372d4e7c8c66e729dc2f 100644
--- a/DDEve/src/EventHandler.cpp
+++ b/DDEve/src/EventHandler.cpp
@@ -1,4 +1,4 @@
-// $Id$
+// $Id: $
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
diff --git a/DDEve/src/FrameControl.cpp b/DDEve/src/FrameControl.cpp
index cb17a6d47ade06651cc693e2f0b0defd685d2c88..7846da6bb519492cebc9db62bc3c21a3c7d42d1f 100644
--- a/DDEve/src/FrameControl.cpp
+++ b/DDEve/src/FrameControl.cpp
@@ -1,4 +1,4 @@
-// $Id$
+// $Id: $
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
diff --git a/DDEve/src/GenericEventHandler.cpp b/DDEve/src/GenericEventHandler.cpp
index 11d6cccf580ed9771e6eb5cf288096e2d0febca9..acd63390e73e355c77a8660289cb40aab39913a9 100644
--- a/DDEve/src/GenericEventHandler.cpp
+++ b/DDEve/src/GenericEventHandler.cpp
@@ -1,4 +1,4 @@
-// $Id$
+// $Id: $
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
diff --git a/DDEve/src/HitActors.cpp b/DDEve/src/HitActors.cpp
index 094c8bd3a659cfc4908052a67ea9d3b94e6be755..8dcbe6f73ca48139cfd883f692805de4604d4c9b 100644
--- a/DDEve/src/HitActors.cpp
+++ b/DDEve/src/HitActors.cpp
@@ -1,4 +1,4 @@
-// $Id$
+// $Id: $
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
diff --git a/DDEve/src/MultiView.cpp b/DDEve/src/MultiView.cpp
index d26849b2df896498421e8f86f1673197e30e1ea3..33e845f714a108654e08574b6d3344237018e4cc 100644
--- a/DDEve/src/MultiView.cpp
+++ b/DDEve/src/MultiView.cpp
@@ -1,4 +1,4 @@
-// $Id$
+// $Id: $
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
diff --git a/DDEve/src/ParticleActors.cpp b/DDEve/src/ParticleActors.cpp
index a9a78efee248297806f5785649725485eb9bf7b6..67a11fb30fd5ea33f8674c4e8e0ab14e5532c5d7 100644
--- a/DDEve/src/ParticleActors.cpp
+++ b/DDEve/src/ParticleActors.cpp
@@ -1,4 +1,4 @@
-// $Id$
+// $Id: $
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
diff --git a/DDEve/src/PopupMenu.cpp b/DDEve/src/PopupMenu.cpp
index 4cb799dbba8d07b5223e410d862587adc1e7f627..c9f19b8e5f41f6d1d6a89c60b73b34df2c8eb679 100644
--- a/DDEve/src/PopupMenu.cpp
+++ b/DDEve/src/PopupMenu.cpp
@@ -1,4 +1,4 @@
-// $Id$
+// $Id: $
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
diff --git a/DDEve/src/Projection.cpp b/DDEve/src/Projection.cpp
index 4a8c78ea978559e6ad69c0c55ff145d91149b7f2..31a6dd4275ef603a5deae09eacc221d4b578ade0 100644
--- a/DDEve/src/Projection.cpp
+++ b/DDEve/src/Projection.cpp
@@ -1,4 +1,4 @@
-// $Id$
+// $Id: $
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
diff --git a/DDEve/src/RhoPhiProjection.cpp b/DDEve/src/RhoPhiProjection.cpp
index 6aabed3bbe61658fbe89393524e1a94d3fc92af5..c26d2e8db7cfe959eb7ae5059d04505b92624f0c 100644
--- a/DDEve/src/RhoPhiProjection.cpp
+++ b/DDEve/src/RhoPhiProjection.cpp
@@ -1,4 +1,4 @@
-// $Id$
+// $Id: $
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
diff --git a/DDEve/src/RhoZProjection.cpp b/DDEve/src/RhoZProjection.cpp
index c7d2936091f97ed10b123df21ca02e305a9850e2..aadec6d5266de5d0a9e2b11b599b1d333741c623 100644
--- a/DDEve/src/RhoZProjection.cpp
+++ b/DDEve/src/RhoZProjection.cpp
@@ -1,4 +1,4 @@
-// $Id$
+// $Id: $
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
diff --git a/DDEve/src/Utilities.cpp b/DDEve/src/Utilities.cpp
index ffa5d927b16dff1dc4d1ae166fc6d7bf022d486d..89cdfbcd3a722581aea834b2d69aeb6698a921e8 100644
--- a/DDEve/src/Utilities.cpp
+++ b/DDEve/src/Utilities.cpp
@@ -1,4 +1,4 @@
-// $Id$
+// $Id: $
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
diff --git a/DDEve/src/View.cpp b/DDEve/src/View.cpp
index 52bfef9781846aed01e87dd52eaf848f9c895948..a129293d0300e07ca2d7a42c4670e6f815f88d3f 100644
--- a/DDEve/src/View.cpp
+++ b/DDEve/src/View.cpp
@@ -1,4 +1,4 @@
-// $Id$
+// $Id: $
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
diff --git a/DDEve/src/View3D.cpp b/DDEve/src/View3D.cpp
index a362c42ad0224112aa61a3e5222973c53e9d94d4..0296719fe060c524361ddb0d018da6e4218ebcd6 100644
--- a/DDEve/src/View3D.cpp
+++ b/DDEve/src/View3D.cpp
@@ -1,4 +1,4 @@
-// $Id$
+// $Id: $
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
diff --git a/DDEve/src/ViewMenu.cpp b/DDEve/src/ViewMenu.cpp
index e54a7ad11505a704b7a2a6ffd15453a4a770b988..1e28493193a395e8b775b5b066cf920da987eabc 100644
--- a/DDEve/src/ViewMenu.cpp
+++ b/DDEve/src/ViewMenu.cpp
@@ -1,4 +1,4 @@
-// $Id$
+// $Id: $
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
diff --git a/DDG4/CMakeLists.txt b/DDG4/CMakeLists.txt
index c91e1cf246518ef176d8b9ba1891b0a3b5010d2c..4b130e9ace6400cebf82c5282696b47f80ffeec3 100644
--- a/DDG4/CMakeLists.txt
+++ b/DDG4/CMakeLists.txt
@@ -1,4 +1,4 @@
-# $Id$
+# $Id: $
 #==========================================================================
 #  AIDA Detector description implementation for LCD
 #--------------------------------------------------------------------------
diff --git a/DDG4/g4FromXML.cpp b/DDG4/g4FromXML.cpp
index a4e1bc147bd8833a2a6b22f6dac26d7542ee4b87..f21bec1b94c0a91a8c19afac1318584dbaa88407 100644
--- a/DDG4/g4FromXML.cpp
+++ b/DDG4/g4FromXML.cpp
@@ -1,4 +1,4 @@
-// $Id$
+// $Id: $
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
diff --git a/DDG4/g4gdmlDisplay.cpp b/DDG4/g4gdmlDisplay.cpp
index 05f18cd447d24faa6a06d6ba0ee1c7858928ad83..9aa3d9157c0fe69743a6c661d8c27978c0bb7b00 100644
--- a/DDG4/g4gdmlDisplay.cpp
+++ b/DDG4/g4gdmlDisplay.cpp
@@ -1,4 +1,4 @@
-// $Id$
+// $Id: $
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
diff --git a/DDG4/include/DDG4/ComponentProperties.h b/DDG4/include/DDG4/ComponentProperties.h
index 50ed4bff6276befcf30f48fe241210a6f52282e3..a595d967874cf739908fe99a3ec6ce2fcdc45ab0 100644
--- a/DDG4/include/DDG4/ComponentProperties.h
+++ b/DDG4/include/DDG4/ComponentProperties.h
@@ -1,4 +1,4 @@
-// $Id$
+// $Id: $
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
diff --git a/DDG4/include/DDG4/ComponentProperties_inl.h b/DDG4/include/DDG4/ComponentProperties_inl.h
index 11453bba7ec9d15ad808ba25b7ff4aded6a8efbf..f75708de6f6313478c1605f1640268bb3d37cdb9 100644
--- a/DDG4/include/DDG4/ComponentProperties_inl.h
+++ b/DDG4/include/DDG4/ComponentProperties_inl.h
@@ -1,4 +1,4 @@
-// $Id$
+// $Id: $
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
diff --git a/DDG4/include/DDG4/ComponentUtils.h b/DDG4/include/DDG4/ComponentUtils.h
index 9d5f47a86c636e865672f32cc36a8582003436c6..f1a03358e29b1a0b35926ff900693b929a936626 100644
--- a/DDG4/include/DDG4/ComponentUtils.h
+++ b/DDG4/include/DDG4/ComponentUtils.h
@@ -1,4 +1,4 @@
-// $Id$
+// $Id: $
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
diff --git a/DDG4/include/DDG4/DDG4Dict.h b/DDG4/include/DDG4/DDG4Dict.h
index 4644f5c5c99c2139a0cd81f8fed5f530af433d8b..7c23939b556f70f636903e233143353a1a36e864 100644
--- a/DDG4/include/DDG4/DDG4Dict.h
+++ b/DDG4/include/DDG4/DDG4Dict.h
@@ -1,4 +1,4 @@
-// $Id$
+// $Id: $
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
diff --git a/DDG4/include/DDG4/Geant4Action.h b/DDG4/include/DDG4/Geant4Action.h
index 1b9433899bdaffe06064294ad7b36d8d5b9f7dc2..5e3db52c46fb653cf1b3ca9ce77df2830e491b60 100644
--- a/DDG4/include/DDG4/Geant4Action.h
+++ b/DDG4/include/DDG4/Geant4Action.h
@@ -3,7 +3,7 @@
 #define DD4HEP_DDG4_GEANT4ACTION_H
 
 // Framework include files
-// $Id$
+// $Id: $
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
diff --git a/DDG4/include/DDG4/Geant4ActionPhase.h b/DDG4/include/DDG4/Geant4ActionPhase.h
index 55788f3024489ac943af4775bd96f48084b71af3..fe03723e2da4c4896ab0577bcc467753a6b81651 100644
--- a/DDG4/include/DDG4/Geant4ActionPhase.h
+++ b/DDG4/include/DDG4/Geant4ActionPhase.h
@@ -1,4 +1,4 @@
-// $Id$
+// $Id: $
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
diff --git a/DDG4/include/DDG4/Geant4AssemblyVolume.h b/DDG4/include/DDG4/Geant4AssemblyVolume.h
index 8fefc07339ce75a6ff4449b962e428ad25f59648..03280f3489531caf1e05a57fa6ed36f1a1e1eeee 100644
--- a/DDG4/include/DDG4/Geant4AssemblyVolume.h
+++ b/DDG4/include/DDG4/Geant4AssemblyVolume.h
@@ -1,4 +1,4 @@
-// $Id$
+// $Id: $
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
diff --git a/DDG4/include/DDG4/Geant4Call.h b/DDG4/include/DDG4/Geant4Call.h
index 9d7f7778b96df6c8a96a50d88bb8408f7f4f37fe..199990682de9c74b56ef077a467f783936c450bc 100644
--- a/DDG4/include/DDG4/Geant4Call.h
+++ b/DDG4/include/DDG4/Geant4Call.h
@@ -1,4 +1,4 @@
-// $Id$
+// $Id: $
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
diff --git a/DDG4/include/DDG4/Geant4Callback.h b/DDG4/include/DDG4/Geant4Callback.h
index d04b60a4df1b5204dcbf102aa9a687c70c280f9d..39003810a2dd73fa52a2fa51f6ca0e5e801241f1 100644
--- a/DDG4/include/DDG4/Geant4Callback.h
+++ b/DDG4/include/DDG4/Geant4Callback.h
@@ -1,4 +1,4 @@
-// $Id$
+// $Id: $
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
diff --git a/DDG4/include/DDG4/Geant4Config.h b/DDG4/include/DDG4/Geant4Config.h
index f68f6d7338546afd2a3238b1173e0e546ef474a5..b8520a291c8b2faa93fa852c42288d6cd862bf25 100644
--- a/DDG4/include/DDG4/Geant4Config.h
+++ b/DDG4/include/DDG4/Geant4Config.h
@@ -1,4 +1,4 @@
-// $Id$
+// $Id: $
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
diff --git a/DDG4/include/DDG4/Geant4Context.h b/DDG4/include/DDG4/Geant4Context.h
index 67a01384825e548503b92f8041f8cbb1d9632787..e84471a22b34bd2774898e5d1b72864b68af9f83 100644
--- a/DDG4/include/DDG4/Geant4Context.h
+++ b/DDG4/include/DDG4/Geant4Context.h
@@ -1,4 +1,4 @@
-// $Id$
+// $Id: $
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
diff --git a/DDG4/include/DDG4/Geant4Data.h b/DDG4/include/DDG4/Geant4Data.h
index b6abcd2a2a12c9ba8ad67e29fba32de49d33d1f6..4ef2994a032d659404a77efe13a381de62f7a3f5 100644
--- a/DDG4/include/DDG4/Geant4Data.h
+++ b/DDG4/include/DDG4/Geant4Data.h
@@ -1,4 +1,4 @@
-// $Id$
+// $Id: $
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
diff --git a/DDG4/include/DDG4/Geant4DataConversion.h b/DDG4/include/DDG4/Geant4DataConversion.h
index 0f6948e14fc494f5b96c1cb018d2e37ac2593da1..3daa1a5157974dbe470088d389be8f31ac0f3c7d 100644
--- a/DDG4/include/DDG4/Geant4DataConversion.h
+++ b/DDG4/include/DDG4/Geant4DataConversion.h
@@ -1,4 +1,4 @@
-// $Id$
+// $Id: $
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
diff --git a/DDG4/include/DDG4/Geant4DataDump.h b/DDG4/include/DDG4/Geant4DataDump.h
index 1e14dc8a4f120cab0c209c035815cff0ba475f9a..06860665bcdb835fde12e148e1b1275e2156551e 100644
--- a/DDG4/include/DDG4/Geant4DataDump.h
+++ b/DDG4/include/DDG4/Geant4DataDump.h
@@ -1,4 +1,4 @@
-// $Id$
+// $Id: $
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
diff --git a/DDG4/include/DDG4/Geant4EventAction.h b/DDG4/include/DDG4/Geant4EventAction.h
index 66554db49817e50021e369121bc3f1231c2a17b0..4cb74040ee4a5939290aae4f834c926a3ff0f48e 100644
--- a/DDG4/include/DDG4/Geant4EventAction.h
+++ b/DDG4/include/DDG4/Geant4EventAction.h
@@ -1,4 +1,4 @@
-// $Id$
+// $Id: $
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
diff --git a/DDG4/include/DDG4/Geant4GDMLDetector.h b/DDG4/include/DDG4/Geant4GDMLDetector.h
index f6c4b0b592c75e0213fa2b9d773152088d6b1d1f..15426f2ee45509a4ea7ad51aa7885e70d3b4653f 100644
--- a/DDG4/include/DDG4/Geant4GDMLDetector.h
+++ b/DDG4/include/DDG4/Geant4GDMLDetector.h
@@ -1,4 +1,4 @@
-// $Id$
+// $Id: $
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
diff --git a/DDG4/include/DDG4/Geant4GeneratorAction.h b/DDG4/include/DDG4/Geant4GeneratorAction.h
index daa7ca818b639d5fb2039700b6818721f50f6a72..dc44809a1aefdac2d0ca606041ee160b7650f1fe 100644
--- a/DDG4/include/DDG4/Geant4GeneratorAction.h
+++ b/DDG4/include/DDG4/Geant4GeneratorAction.h
@@ -1,4 +1,4 @@
-// $Id$
+// $Id: $
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
diff --git a/DDG4/include/DDG4/Geant4GeneratorActionInit.h b/DDG4/include/DDG4/Geant4GeneratorActionInit.h
index 1ace9c85611a8b638a65e614a471aca5fe9c63c6..ac9b4c2c5cb1953d20489648b95b94ffe9caa127 100644
--- a/DDG4/include/DDG4/Geant4GeneratorActionInit.h
+++ b/DDG4/include/DDG4/Geant4GeneratorActionInit.h
@@ -1,4 +1,4 @@
-// $Id$
+// $Id: $
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
diff --git a/DDG4/include/DDG4/Geant4GeometryInfo.h b/DDG4/include/DDG4/Geant4GeometryInfo.h
index e9f11474fa2e89b48b8202cb4829f288f4cc770b..860b5f1d78fecf4e9d003c5f7448e54ec894ef3e 100644
--- a/DDG4/include/DDG4/Geant4GeometryInfo.h
+++ b/DDG4/include/DDG4/Geant4GeometryInfo.h
@@ -1,4 +1,4 @@
-// $Id$
+// $Id: $
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
diff --git a/DDG4/include/DDG4/Geant4Handle.h b/DDG4/include/DDG4/Geant4Handle.h
index b2787f3898091342aaa34cd9f0568cc6178f10c6..53ec8d8135465ccacd7b379a1ef5e8fac507dfb2 100644
--- a/DDG4/include/DDG4/Geant4Handle.h
+++ b/DDG4/include/DDG4/Geant4Handle.h
@@ -1,4 +1,4 @@
-// $Id$
+// $Id: $
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
diff --git a/DDG4/include/DDG4/Geant4HierarchyDump.h b/DDG4/include/DDG4/Geant4HierarchyDump.h
index 924924b1e745cab7ff402fb62df59d0dd20a94dc..dac42d0df4665962558555fb3257766ce6dfb565 100644
--- a/DDG4/include/DDG4/Geant4HierarchyDump.h
+++ b/DDG4/include/DDG4/Geant4HierarchyDump.h
@@ -1,4 +1,4 @@
-// $Id$
+// $Id: $
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
diff --git a/DDG4/include/DDG4/Geant4HitCollection.h b/DDG4/include/DDG4/Geant4HitCollection.h
index 6f4e21486a9354fcfacdb22e9429b7313d05e53c..06d9dc07825d98972c98385600ceac545ff91be1 100644
--- a/DDG4/include/DDG4/Geant4HitCollection.h
+++ b/DDG4/include/DDG4/Geant4HitCollection.h
@@ -1,4 +1,4 @@
-// $Id$
+// $Id: $
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
diff --git a/DDG4/include/DDG4/Geant4InputAction.h b/DDG4/include/DDG4/Geant4InputAction.h
index ce3a5043701ab3c4a49aa5ce32aaab8b0740b535..cb367992ab47964f9eae39ab9b7a186c5aec247d 100644
--- a/DDG4/include/DDG4/Geant4InputAction.h
+++ b/DDG4/include/DDG4/Geant4InputAction.h
@@ -1,4 +1,4 @@
-// $Id$
+// $Id: $
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
diff --git a/DDG4/include/DDG4/Geant4InputHandling.h b/DDG4/include/DDG4/Geant4InputHandling.h
index 4dc807700f98e2e40fcf11bf810d87130ddc3446..90a238e559e8a9c584fcf2deeca7100b26d47d1a 100644
--- a/DDG4/include/DDG4/Geant4InputHandling.h
+++ b/DDG4/include/DDG4/Geant4InputHandling.h
@@ -1,4 +1,4 @@
-// $Id$
+// $Id: $
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
diff --git a/DDG4/include/DDG4/Geant4InteractionMerger.h b/DDG4/include/DDG4/Geant4InteractionMerger.h
index 1dc691390b7d1941c074ffe4264a5856e8d52de4..17866e2fb40af15ea3cbd1d87038faae17fd22f5 100644
--- a/DDG4/include/DDG4/Geant4InteractionMerger.h
+++ b/DDG4/include/DDG4/Geant4InteractionMerger.h
@@ -1,4 +1,4 @@
-// $Id$
+// $Id: $
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
diff --git a/DDG4/include/DDG4/Geant4InteractionVertexBoost.h b/DDG4/include/DDG4/Geant4InteractionVertexBoost.h
index 59a6f7a19bcff73fe00ccd6ab3458478e232c395..f7f8e5faf3e114436b3f0aac2584d1cd1dbcb54f 100644
--- a/DDG4/include/DDG4/Geant4InteractionVertexBoost.h
+++ b/DDG4/include/DDG4/Geant4InteractionVertexBoost.h
@@ -1,4 +1,4 @@
-// $Id$
+// $Id: $
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
diff --git a/DDG4/include/DDG4/Geant4InteractionVertexSmear.h b/DDG4/include/DDG4/Geant4InteractionVertexSmear.h
index 26665db0cb2dca4a951197005375664910466647..e42f6978fb1931cea500bd92753fc0fe929b49bb 100644
--- a/DDG4/include/DDG4/Geant4InteractionVertexSmear.h
+++ b/DDG4/include/DDG4/Geant4InteractionVertexSmear.h
@@ -1,4 +1,4 @@
-// $Id$
+// $Id: $
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
diff --git a/DDG4/include/DDG4/Geant4IsotropeGenerator.h b/DDG4/include/DDG4/Geant4IsotropeGenerator.h
index 604c247ed9f525eaaad95dabbe0f0ef597a56bc3..e6a67e679e3d164c0feb441100c5e86e997d414c 100644
--- a/DDG4/include/DDG4/Geant4IsotropeGenerator.h
+++ b/DDG4/include/DDG4/Geant4IsotropeGenerator.h
@@ -1,4 +1,4 @@
-// $Id$
+// $Id: $
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
diff --git a/DDG4/include/DDG4/Geant4Kernel.h b/DDG4/include/DDG4/Geant4Kernel.h
index ff4ad7f320b1e70a786593633fc35ef939c68640..b2e7832edb176679908afd2fd34130bb0eba4976 100644
--- a/DDG4/include/DDG4/Geant4Kernel.h
+++ b/DDG4/include/DDG4/Geant4Kernel.h
@@ -1,4 +1,4 @@
-// $Id$
+// $Id: $
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
diff --git a/DDG4/include/DDG4/Geant4Mapping.h b/DDG4/include/DDG4/Geant4Mapping.h
index de4e3cd75df4960b1112cdf19d0a7bffe8a43d0f..10355984b6448f656dd9168a097084630571f97b 100644
--- a/DDG4/include/DDG4/Geant4Mapping.h
+++ b/DDG4/include/DDG4/Geant4Mapping.h
@@ -1,4 +1,4 @@
-// $Id$
+// $Id: $
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
diff --git a/DDG4/include/DDG4/Geant4Output2ROOT.h b/DDG4/include/DDG4/Geant4Output2ROOT.h
index 84a0d1710e64695f7368c9f3ac147c55e8a20602..cba8bc437ae9e0c45fe137c9f49fa3aee487f763 100644
--- a/DDG4/include/DDG4/Geant4Output2ROOT.h
+++ b/DDG4/include/DDG4/Geant4Output2ROOT.h
@@ -1,4 +1,4 @@
-// $Id$
+// $Id: $
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
diff --git a/DDG4/include/DDG4/Geant4OutputAction.h b/DDG4/include/DDG4/Geant4OutputAction.h
index b7e26cf70a6d1904c3eea71d314eadd4624745e3..4d19c8f30e89ce25e663ff43409931692aea8c18 100644
--- a/DDG4/include/DDG4/Geant4OutputAction.h
+++ b/DDG4/include/DDG4/Geant4OutputAction.h
@@ -1,4 +1,4 @@
-// $Id$
+// $Id: $
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
diff --git a/DDG4/include/DDG4/Geant4Particle.h b/DDG4/include/DDG4/Geant4Particle.h
index cf92e2ae48017dcd063766a89e680b2f9782897e..ac258a35bd7bc723cfc90ac51b9dc2945cb71bdb 100644
--- a/DDG4/include/DDG4/Geant4Particle.h
+++ b/DDG4/include/DDG4/Geant4Particle.h
@@ -1,4 +1,4 @@
-// $Id$
+// $Id: $
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
diff --git a/DDG4/include/DDG4/Geant4ParticleGenerator.h b/DDG4/include/DDG4/Geant4ParticleGenerator.h
index 5331f5c15579b48c7ece4641ce63915198c9056a..06d6e30335117d4f37eeebf6328ae4822371a897 100644
--- a/DDG4/include/DDG4/Geant4ParticleGenerator.h
+++ b/DDG4/include/DDG4/Geant4ParticleGenerator.h
@@ -1,4 +1,4 @@
-// $Id$
+// $Id: $
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
diff --git a/DDG4/include/DDG4/Geant4ParticleGun.h b/DDG4/include/DDG4/Geant4ParticleGun.h
index bbd8dfc6b02399eaba7978812c04820831369fb8..71dd77c886490751a7ed1a21ce0dc2d82a57d2e1 100644
--- a/DDG4/include/DDG4/Geant4ParticleGun.h
+++ b/DDG4/include/DDG4/Geant4ParticleGun.h
@@ -1,4 +1,4 @@
-// $Id$
+// $Id: $
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
diff --git a/DDG4/include/DDG4/Geant4ParticleHandler.h b/DDG4/include/DDG4/Geant4ParticleHandler.h
index 8ef5ee4ed141a4e9dcbb579326e4f141a1816419..a129a7f4d28a432509a90df1f2bcb61ec10920d4 100644
--- a/DDG4/include/DDG4/Geant4ParticleHandler.h
+++ b/DDG4/include/DDG4/Geant4ParticleHandler.h
@@ -1,4 +1,4 @@
-// $Id$
+// $Id: $
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
diff --git a/DDG4/include/DDG4/Geant4ParticlePrint.h b/DDG4/include/DDG4/Geant4ParticlePrint.h
index 2df4ba5013a6d8a01d97028f66651befe00ebe88..c74ef5beeba48d8f7616d4ebbd97a2dd6f76cca7 100644
--- a/DDG4/include/DDG4/Geant4ParticlePrint.h
+++ b/DDG4/include/DDG4/Geant4ParticlePrint.h
@@ -1,4 +1,4 @@
-// $Id$
+// $Id: $
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
diff --git a/DDG4/include/DDG4/Geant4PhysicsList.h b/DDG4/include/DDG4/Geant4PhysicsList.h
index d2cc4de6673e068b0c940632b0b02c54975932da..7d5adb0703d1fe3e4c26687d5c2694b47704b6c4 100644
--- a/DDG4/include/DDG4/Geant4PhysicsList.h
+++ b/DDG4/include/DDG4/Geant4PhysicsList.h
@@ -1,4 +1,4 @@
-// $Id$
+// $Id: $
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
diff --git a/DDG4/include/DDG4/Geant4Primary.h b/DDG4/include/DDG4/Geant4Primary.h
index 73c4fb6a2ed1875596af21e8ac38ea75d5a4a80a..ac49f09eb0e18186b9b543759664e8b4da182c04 100644
--- a/DDG4/include/DDG4/Geant4Primary.h
+++ b/DDG4/include/DDG4/Geant4Primary.h
@@ -1,4 +1,4 @@
-// $Id$
+// $Id: $
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
diff --git a/DDG4/include/DDG4/Geant4PrimaryHandler.h b/DDG4/include/DDG4/Geant4PrimaryHandler.h
index 3066fbf5ffed58e05171f726a4d3369807f19fa3..4cb4b7f45ca1d3832c8b2b03b1c846b312b27bbd 100644
--- a/DDG4/include/DDG4/Geant4PrimaryHandler.h
+++ b/DDG4/include/DDG4/Geant4PrimaryHandler.h
@@ -1,4 +1,4 @@
-// $Id$
+// $Id: $
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
diff --git a/DDG4/include/DDG4/Geant4Primitives.h b/DDG4/include/DDG4/Geant4Primitives.h
index 501aee00c4207094a301191e7edf39bee4642d71..917309a5c7ef4f8053e00a482ff9d5baf0b84431 100644
--- a/DDG4/include/DDG4/Geant4Primitives.h
+++ b/DDG4/include/DDG4/Geant4Primitives.h
@@ -1,4 +1,4 @@
-// $Id$
+// $Id: $
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
diff --git a/DDG4/include/DDG4/Geant4Random.h b/DDG4/include/DDG4/Geant4Random.h
index ca67a631276f84a43e111cc82267e3a7df0ef53f..d7cea8aafefb134eef56de2ab8a50b15ab209af2 100644
--- a/DDG4/include/DDG4/Geant4Random.h
+++ b/DDG4/include/DDG4/Geant4Random.h
@@ -1,4 +1,4 @@
-// $Id$
+// $Id: $
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
diff --git a/DDG4/include/DDG4/Geant4RunAction.h b/DDG4/include/DDG4/Geant4RunAction.h
index 210890b4681ef9de56b8a8bcb4923359b279e98b..ed065e532b53b5284bdb2fc3d5a2530014e47e58 100644
--- a/DDG4/include/DDG4/Geant4RunAction.h
+++ b/DDG4/include/DDG4/Geant4RunAction.h
@@ -1,4 +1,4 @@
-// $Id$
+// $Id: $
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
diff --git a/DDG4/include/DDG4/Geant4SensDetAction.h b/DDG4/include/DDG4/Geant4SensDetAction.h
index 2e77fe9e27cb817acafde367843ce0a10b46fe8b..b607c336de1e92e3fcdae89ab37e7213572cd39e 100644
--- a/DDG4/include/DDG4/Geant4SensDetAction.h
+++ b/DDG4/include/DDG4/Geant4SensDetAction.h
@@ -1,4 +1,4 @@
-// $Id$
+// $Id: $
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
diff --git a/DDG4/include/DDG4/Geant4SensDetAction.inl b/DDG4/include/DDG4/Geant4SensDetAction.inl
index 74a2935b92ea9e400e1369b9baed8399a957744f..bdf3e6aa0a3842283ca17e231776163bb1e7e531 100644
--- a/DDG4/include/DDG4/Geant4SensDetAction.inl
+++ b/DDG4/include/DDG4/Geant4SensDetAction.inl
@@ -1,4 +1,4 @@
-// $Id$
+// $Id: $
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
diff --git a/DDG4/include/DDG4/Geant4StackingAction.h b/DDG4/include/DDG4/Geant4StackingAction.h
index 70da879caf1932f9fb7493655230c02998e781ee..4c05ffe5d102cd716a9553b57074203c6e5b764c 100644
--- a/DDG4/include/DDG4/Geant4StackingAction.h
+++ b/DDG4/include/DDG4/Geant4StackingAction.h
@@ -1,4 +1,4 @@
-// $Id$
+// $Id: $
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
diff --git a/DDG4/include/DDG4/Geant4SteppingAction.h b/DDG4/include/DDG4/Geant4SteppingAction.h
index f3f239a2fb84658ddf41a08b2939ab7298d21f7d..39a8fcc1381029575431476e10c7db217c34138b 100644
--- a/DDG4/include/DDG4/Geant4SteppingAction.h
+++ b/DDG4/include/DDG4/Geant4SteppingAction.h
@@ -1,4 +1,4 @@
-// $Id$
+// $Id: $
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
diff --git a/DDG4/include/DDG4/Geant4TestActions.h b/DDG4/include/DDG4/Geant4TestActions.h
index 3b9a16e18a5d3d717666092572d7ea911fe1ccb2..93784c8a3cb29ad0e2818335fc5a5688df31fc05 100644
--- a/DDG4/include/DDG4/Geant4TestActions.h
+++ b/DDG4/include/DDG4/Geant4TestActions.h
@@ -1,4 +1,4 @@
-// $Id$
+// $Id: $
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
diff --git a/DDG4/include/DDG4/Geant4TouchableHandler.h b/DDG4/include/DDG4/Geant4TouchableHandler.h
index 9f687221fbdbd7fe3f7fa13802349960b153b849..466d0b5c91aac8331c3326adc526232cd7a4cb73 100644
--- a/DDG4/include/DDG4/Geant4TouchableHandler.h
+++ b/DDG4/include/DDG4/Geant4TouchableHandler.h
@@ -1,4 +1,4 @@
-// $Id$
+// $Id: $
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
diff --git a/DDG4/include/DDG4/Geant4TrackHandler.h b/DDG4/include/DDG4/Geant4TrackHandler.h
index d64088528d3412472f4de8844e4e5d2f27010f12..b8997c2f20c7a6eb13fa1adfb5a5ecf4ddd9d91d 100644
--- a/DDG4/include/DDG4/Geant4TrackHandler.h
+++ b/DDG4/include/DDG4/Geant4TrackHandler.h
@@ -1,4 +1,4 @@
-// $Id$
+// $Id: $
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
diff --git a/DDG4/include/DDG4/Geant4TrackInformation.h b/DDG4/include/DDG4/Geant4TrackInformation.h
index 0ca826ba0a86a9460ff23dc1240c9b20c5f58705..97362729d6087841d27318897a0eb5d19cd53920 100644
--- a/DDG4/include/DDG4/Geant4TrackInformation.h
+++ b/DDG4/include/DDG4/Geant4TrackInformation.h
@@ -1,4 +1,4 @@
-// $Id$
+// $Id: $
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
diff --git a/DDG4/include/DDG4/Geant4TrackingAction.h b/DDG4/include/DDG4/Geant4TrackingAction.h
index 3fd9666ac4888945d9d96446c89d27b2ee26358c..23390de42df6dcab1358db2be8ec80cf3e85f1c1 100644
--- a/DDG4/include/DDG4/Geant4TrackingAction.h
+++ b/DDG4/include/DDG4/Geant4TrackingAction.h
@@ -1,4 +1,4 @@
-// $Id$
+// $Id: $
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
diff --git a/DDG4/include/DDG4/Geant4TrackingPostAction.h b/DDG4/include/DDG4/Geant4TrackingPostAction.h
index f33d238371c027986a95b794df9ccc709800e9fa..3ee803922dfc6072a02bb9eab36a0f9471bbb15d 100644
--- a/DDG4/include/DDG4/Geant4TrackingPostAction.h
+++ b/DDG4/include/DDG4/Geant4TrackingPostAction.h
@@ -1,4 +1,4 @@
-// $Id$
+// $Id: $
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
diff --git a/DDG4/include/DDG4/Geant4TrackingPreAction.h b/DDG4/include/DDG4/Geant4TrackingPreAction.h
index e18a672d58cc7fed15c7c06e4cdba3a62dbe589c..671a395ee70c42b417b9cd35f07a08df3fc79971 100644
--- a/DDG4/include/DDG4/Geant4TrackingPreAction.h
+++ b/DDG4/include/DDG4/Geant4TrackingPreAction.h
@@ -1,4 +1,4 @@
-// $Id$
+// $Id: $
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
diff --git a/DDG4/include/DDG4/Geant4UIManager.h b/DDG4/include/DDG4/Geant4UIManager.h
index 0566660deb76b814ec7c14b082323fff9f3431bb..0eab53558dfa48ac6fae201f0199457f8efb0676 100644
--- a/DDG4/include/DDG4/Geant4UIManager.h
+++ b/DDG4/include/DDG4/Geant4UIManager.h
@@ -1,4 +1,4 @@
-// $Id$
+// $Id: $
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
diff --git a/DDG4/include/DDG4/Geant4UIMessenger.h b/DDG4/include/DDG4/Geant4UIMessenger.h
index a9453979857fae3769cd5e2b8d1c27394115466c..1a997f4560d39234ec3c07b6fd9f78698b9272d0 100644
--- a/DDG4/include/DDG4/Geant4UIMessenger.h
+++ b/DDG4/include/DDG4/Geant4UIMessenger.h
@@ -1,4 +1,4 @@
-// $Id$
+// $Id: $
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
diff --git a/DDG4/include/DDG4/Geant4UserParticleHandler.h b/DDG4/include/DDG4/Geant4UserParticleHandler.h
index a22e91321f36f8ee2d3430d1fe8f33dd6f7aa412..7d9b11109f21802400bdf5392963b6facb920970 100644
--- a/DDG4/include/DDG4/Geant4UserParticleHandler.h
+++ b/DDG4/include/DDG4/Geant4UserParticleHandler.h
@@ -1,4 +1,4 @@
-// $Id$
+// $Id: $
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
diff --git a/DDG4/include/DDG4/Geant4UserPhysicsList.h b/DDG4/include/DDG4/Geant4UserPhysicsList.h
index 96f02e02bd1304d5d9d4e220011fff32a9f0f151..b1495eb06ee0c14408c5839f11a5d96d355e5352 100644
--- a/DDG4/include/DDG4/Geant4UserPhysicsList.h
+++ b/DDG4/include/DDG4/Geant4UserPhysicsList.h
@@ -1,4 +1,4 @@
-// $Id$
+// $Id: $
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
diff --git a/DDG4/include/DDG4/Geant4Vertex.h b/DDG4/include/DDG4/Geant4Vertex.h
index fd6215175943fb1c91215e7b0ba6ac5ce30eaafb..2d3a772d876db34b1a378eaffdde9a953a5365fa 100644
--- a/DDG4/include/DDG4/Geant4Vertex.h
+++ b/DDG4/include/DDG4/Geant4Vertex.h
@@ -1,4 +1,4 @@
-// $Id$
+// $Id: $
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
diff --git a/DDG4/include/DDG4/Geant4VolumeManager.h b/DDG4/include/DDG4/Geant4VolumeManager.h
index e85ff0c01c569740c119ec3c96a8c3e872fa4b87..4b1b5f20ab002e251d514a8b44f8cafad6212891 100644
--- a/DDG4/include/DDG4/Geant4VolumeManager.h
+++ b/DDG4/include/DDG4/Geant4VolumeManager.h
@@ -1,4 +1,4 @@
-// $Id$
+// $Id: $
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
diff --git a/DDG4/include/DDG4/IoStreams.h b/DDG4/include/DDG4/IoStreams.h
index fd0ee08604f44db6f5f1e316a8626843e5adb72e..716dadee85aad77ded721115681d02b92a0a7d47 100644
--- a/DDG4/include/DDG4/IoStreams.h
+++ b/DDG4/include/DDG4/IoStreams.h
@@ -1,4 +1,4 @@
-// $Id$
+// $Id: $
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
diff --git a/DDG4/lcio/Geant4Output2LCIO.cpp b/DDG4/lcio/Geant4Output2LCIO.cpp
index 8fa36913d69882f871e442c76f8ae984dd062452..df2eae6de3d67cd70c7ef7b048436fe597f6f674 100644
--- a/DDG4/lcio/Geant4Output2LCIO.cpp
+++ b/DDG4/lcio/Geant4Output2LCIO.cpp
@@ -1,4 +1,4 @@
-// $Id$
+// $Id: $
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
@@ -75,7 +75,7 @@ namespace DD4hep {
 }      // End namespace DD4hep
 #endif // DD4HEP_DDG4_GEANT4OUTPUT2LCIO_H
 
-// $Id$
+// $Id: $
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
diff --git a/DDG4/lcio/LCIOConversions.cpp b/DDG4/lcio/LCIOConversions.cpp
index ff59579c55fb0f26dd5000c71827edff0b11d36a..8e1772b78770f6aa2ea076c9982e7663659512d8 100644
--- a/DDG4/lcio/LCIOConversions.cpp
+++ b/DDG4/lcio/LCIOConversions.cpp
@@ -1,4 +1,4 @@
-// $Id$
+// $Id: $
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
diff --git a/DDG4/lcio/LCIOEventReader.cpp b/DDG4/lcio/LCIOEventReader.cpp
index 7d5da86a4c9c95a441708aec93abe3a92e55beb3..a79badf86ff0a8fb40a2430634d0c9612647757c 100644
--- a/DDG4/lcio/LCIOEventReader.cpp
+++ b/DDG4/lcio/LCIOEventReader.cpp
@@ -1,4 +1,4 @@
-// $Id$
+// $Id: $
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
diff --git a/DDG4/lcio/LCIOEventReader.h b/DDG4/lcio/LCIOEventReader.h
index df3b6cd4cb1b0a46a2601951a5e688e15927718b..03bc1e0bf7e50fcc37258b036bb006938fda893c 100644
--- a/DDG4/lcio/LCIOEventReader.h
+++ b/DDG4/lcio/LCIOEventReader.h
@@ -1,4 +1,4 @@
-// $Id$
+// $Id: $
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
diff --git a/DDG4/lcio/LCIOFileReader.cpp b/DDG4/lcio/LCIOFileReader.cpp
index 91a43159cabc7cfc69eee07adde8e1560ca63d80..0a8cf0eda534bf85a094b43c439958707753f800 100644
--- a/DDG4/lcio/LCIOFileReader.cpp
+++ b/DDG4/lcio/LCIOFileReader.cpp
@@ -1,4 +1,4 @@
-// $Id$
+// $Id: $
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
diff --git a/DDG4/lcio/LCIOSDTestActions.cpp b/DDG4/lcio/LCIOSDTestActions.cpp
index e8ae0139afaeb7fcbe76c23fa73e2887e426dc40..510e803738cdeab02a4ba32112fdec9132bbb556 100644
--- a/DDG4/lcio/LCIOSDTestActions.cpp
+++ b/DDG4/lcio/LCIOSDTestActions.cpp
@@ -1,4 +1,4 @@
-// $Id$
+// $Id: $
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
diff --git a/DDG4/lcio/LCIOStdHepReader.cpp b/DDG4/lcio/LCIOStdHepReader.cpp
index 55242a885aa556b21b3b2b9fbbe7aa3e98cf3e6d..003cfe6340b612a572a5eea2613dcacb5a36951f 100644
--- a/DDG4/lcio/LCIOStdHepReader.cpp
+++ b/DDG4/lcio/LCIOStdHepReader.cpp
@@ -1,4 +1,4 @@
-// $Id$
+// $Id: $
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
@@ -49,7 +49,7 @@ namespace DD4hep  {
 }       /* End namespace DD4hep */
 #endif  /* DD4HEP_DDG4_LCIOSTDHEPREADER_H */
 
-// $Id$
+// $Id: $
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
diff --git a/DDG4/legacy/Geant4CalorimeterSD.cpp b/DDG4/legacy/Geant4CalorimeterSD.cpp
index bfa928cfb989603c6835969a91de8d4c6fdfc2ac..7ebef11c4b327a5f74ee1b04a865c031bba8c4d3 100644
--- a/DDG4/legacy/Geant4CalorimeterSD.cpp
+++ b/DDG4/legacy/Geant4CalorimeterSD.cpp
@@ -1,4 +1,4 @@
-// $Id$
+// $Id: $
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
diff --git a/DDG4/legacy/Geant4TrackerCombineSD.cpp b/DDG4/legacy/Geant4TrackerCombineSD.cpp
index ed7ecd3da595e462fbb7a67ef17a4c278ebf9f07..1a9221a7153bb0cbebbac7cb53cfbbb4052e2c0a 100644
--- a/DDG4/legacy/Geant4TrackerCombineSD.cpp
+++ b/DDG4/legacy/Geant4TrackerCombineSD.cpp
@@ -1,4 +1,4 @@
-// $Id$
+// $Id: $
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
diff --git a/DDG4/legacy/Geant4TrackerSD.cpp b/DDG4/legacy/Geant4TrackerSD.cpp
index c5a8d0941ddff3d8ab44444cdff693ee89039836..231cecc059a699a1e0fabe6886b6023714342838 100644
--- a/DDG4/legacy/Geant4TrackerSD.cpp
+++ b/DDG4/legacy/Geant4TrackerSD.cpp
@@ -1,4 +1,4 @@
-// $Id$
+// $Id: $
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
diff --git a/DDG4/plugins/Geant4.10.PhysicsConstructors.h b/DDG4/plugins/Geant4.10.PhysicsConstructors.h
index e705b944f57ec732accd25e46e69d90e66ab7f98..4a4acc5a20c4e705e8323420de256eed806609b3 100644
--- a/DDG4/plugins/Geant4.10.PhysicsConstructors.h
+++ b/DDG4/plugins/Geant4.10.PhysicsConstructors.h
@@ -1,4 +1,4 @@
-// $Id$
+// $Id: $
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
diff --git a/DDG4/plugins/Geant4.9.PhysicsConstructors.h b/DDG4/plugins/Geant4.9.PhysicsConstructors.h
index 94b0be6bcdccb96b38122112189fc2d52bb5855b..79f1d78aba258c8f4a43b77495b31450461b6373 100644
--- a/DDG4/plugins/Geant4.9.PhysicsConstructors.h
+++ b/DDG4/plugins/Geant4.9.PhysicsConstructors.h
@@ -1,4 +1,4 @@
-// $Id$
+// $Id: $
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
diff --git a/DDG4/plugins/Geant4EscapeCounter.cpp b/DDG4/plugins/Geant4EscapeCounter.cpp
index b5037601ec9609d721f08c288cea51d92a0e87e0..9090cfe469135ecda3d7799b70be3aa091c6e652 100644
--- a/DDG4/plugins/Geant4EscapeCounter.cpp
+++ b/DDG4/plugins/Geant4EscapeCounter.cpp
@@ -1,4 +1,4 @@
-// $Id$
+// $Id: $
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
diff --git a/DDG4/plugins/Geant4EventReaderHepEvt.cpp b/DDG4/plugins/Geant4EventReaderHepEvt.cpp
index 68f7f6b8dc216007a8e87b0d1612b76eea7ccfa2..2369ca88b9c08a2cb67ba47f2a1d6daf2d904577 100644
--- a/DDG4/plugins/Geant4EventReaderHepEvt.cpp
+++ b/DDG4/plugins/Geant4EventReaderHepEvt.cpp
@@ -1,4 +1,4 @@
-// $Id$
+// $Id: $
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
diff --git a/DDG4/plugins/Geant4EventReaderHepMC.cpp b/DDG4/plugins/Geant4EventReaderHepMC.cpp
index a03824901fd2988c74a061b250407e68d612ede6..0d8cf4f0ea4329b44b4d0dd2a71983bf794fdd04 100644
--- a/DDG4/plugins/Geant4EventReaderHepMC.cpp
+++ b/DDG4/plugins/Geant4EventReaderHepMC.cpp
@@ -1,4 +1,4 @@
-// $Id$
+// $Id: $
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
diff --git a/DDG4/plugins/Geant4Factories.cpp b/DDG4/plugins/Geant4Factories.cpp
index 1de6cefca8af0b9a8c001a239b18037554add9b4..9ddc2f7f25acf00bc04ff2b5316da1547f98a4a4 100644
--- a/DDG4/plugins/Geant4Factories.cpp
+++ b/DDG4/plugins/Geant4Factories.cpp
@@ -1,4 +1,4 @@
-// $Id$
+// $Id: $
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
diff --git a/DDG4/plugins/Geant4FieldTrackingSetup.cpp b/DDG4/plugins/Geant4FieldTrackingSetup.cpp
index 9a67364ad591db925900dd89c5f6407bf0d1d15d..56fa11ea9e6cfef346eb25b4959b85ca61f123ff 100644
--- a/DDG4/plugins/Geant4FieldTrackingSetup.cpp
+++ b/DDG4/plugins/Geant4FieldTrackingSetup.cpp
@@ -1,4 +1,4 @@
-// $Id$
+// $Id: $
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
@@ -94,7 +94,7 @@ namespace DD4hep {
 #endif // DD4HEP_DDG4_GEANT4FIELDTRACKINGSETUP_H
 
 
-// $Id$
+// $Id: $
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
diff --git a/DDG4/plugins/Geant4HitExtractor.cpp b/DDG4/plugins/Geant4HitExtractor.cpp
index 3e24b2f21f249395bc570900ee95a67792fe2a81..8c897a660e9d26c7bcf1bbead1972750cf8153c7 100644
--- a/DDG4/plugins/Geant4HitExtractor.cpp
+++ b/DDG4/plugins/Geant4HitExtractor.cpp
@@ -1,4 +1,4 @@
-// $Id$
+// $Id: $
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
diff --git a/DDG4/plugins/Geant4MaterialScanner.cpp b/DDG4/plugins/Geant4MaterialScanner.cpp
index d535deffbe76a4a08450e38ee135a810fa0b5c76..700a6e0f3f27bedca828298419d4aba5ad2147bb 100644
--- a/DDG4/plugins/Geant4MaterialScanner.cpp
+++ b/DDG4/plugins/Geant4MaterialScanner.cpp
@@ -1,4 +1,4 @@
-// $Id$
+// $Id: $
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
@@ -76,7 +76,7 @@ namespace DD4hep {
   }
 }
 
-// $Id:$
+// $Id: $
 //====================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------
diff --git a/DDG4/plugins/Geant4Particles.cpp b/DDG4/plugins/Geant4Particles.cpp
index a5189606afb669d2a5d94a89cce9c99e2cb4a377..66e4891c228b8ed7b9d4cbe6e1ef0420de749c17 100644
--- a/DDG4/plugins/Geant4Particles.cpp
+++ b/DDG4/plugins/Geant4Particles.cpp
@@ -1,4 +1,4 @@
-// $Id$
+// $Id: $
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
diff --git a/DDG4/plugins/Geant4PhysicsConstructors.cpp b/DDG4/plugins/Geant4PhysicsConstructors.cpp
index f557200477042a9938844fb7bb70317eb93a75f3..2577b638054e379cc10cac6ce2ba58f47a14a2a9 100644
--- a/DDG4/plugins/Geant4PhysicsConstructors.cpp
+++ b/DDG4/plugins/Geant4PhysicsConstructors.cpp
@@ -1,4 +1,4 @@
-// $Id$
+// $Id: $
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
diff --git a/DDG4/plugins/Geant4PhysicsLists.cpp b/DDG4/plugins/Geant4PhysicsLists.cpp
index d43849e42565b30f7963717e30d7f23acfdc7ab3..5ee3af210f00010c561c6f300addf47fee582266 100644
--- a/DDG4/plugins/Geant4PhysicsLists.cpp
+++ b/DDG4/plugins/Geant4PhysicsLists.cpp
@@ -1,4 +1,4 @@
-// $Id$
+// $Id: $
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
diff --git a/DDG4/plugins/Geant4Processes.cpp b/DDG4/plugins/Geant4Processes.cpp
index 2706c6199606d1040d79fcbac2f514dd5bdae12c..acb54b661d0692e42ecb10c63dabf54f33d1ea2f 100644
--- a/DDG4/plugins/Geant4Processes.cpp
+++ b/DDG4/plugins/Geant4Processes.cpp
@@ -1,4 +1,4 @@
-// $Id$
+// $Id: $
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
diff --git a/DDG4/plugins/Geant4SDActions.cpp b/DDG4/plugins/Geant4SDActions.cpp
index aa4488c2b8574d7b28193db9066a37c0adb8e914..fcb427b2f0d07bd0876dba85d0b1f6ad0b6ce166 100644
--- a/DDG4/plugins/Geant4SDActions.cpp
+++ b/DDG4/plugins/Geant4SDActions.cpp
@@ -1,4 +1,4 @@
-// $Id$
+// $Id: $
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
diff --git a/DDG4/plugins/Geant4SensDet.cpp b/DDG4/plugins/Geant4SensDet.cpp
index 262477e08511299915cf4ec1e9ce695420707339..b0d72aebb2e48ae1f2c9fd78ef9058ee448db678 100644
--- a/DDG4/plugins/Geant4SensDet.cpp
+++ b/DDG4/plugins/Geant4SensDet.cpp
@@ -1,4 +1,4 @@
-// $Id$
+// $Id: $
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
diff --git a/DDG4/plugins/Geant4SensDetFilters.cpp b/DDG4/plugins/Geant4SensDetFilters.cpp
index 4f155b4e10285f84fb102e914cad165c81d71016..12047d9b66804b17cddd341c4d7ae2231ef851cf 100644
--- a/DDG4/plugins/Geant4SensDetFilters.cpp
+++ b/DDG4/plugins/Geant4SensDetFilters.cpp
@@ -1,4 +1,4 @@
-// $Id$
+// $Id: $
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
diff --git a/DDG4/plugins/Geant4Steppers.cpp b/DDG4/plugins/Geant4Steppers.cpp
index c2f80ec9b6e2cfecb3c3d621d4ac78869477e9b9..09be6c08b5262bb9cb783b44555fdef89786a421 100644
--- a/DDG4/plugins/Geant4Steppers.cpp
+++ b/DDG4/plugins/Geant4Steppers.cpp
@@ -1,4 +1,4 @@
-// $Id$
+// $Id: $
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
diff --git a/DDG4/plugins/Geant4TCUserParticleHandler.cpp b/DDG4/plugins/Geant4TCUserParticleHandler.cpp
index 2cae3bb6fa55d63f98c7034db67041bfa9c54519..c7e3400ad5b83fe864aea694e403403d4ed50d0c 100644
--- a/DDG4/plugins/Geant4TCUserParticleHandler.cpp
+++ b/DDG4/plugins/Geant4TCUserParticleHandler.cpp
@@ -1,4 +1,4 @@
-// $Id$
+// $Id: $
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
diff --git a/DDG4/plugins/Geant4XMLSetup.cpp b/DDG4/plugins/Geant4XMLSetup.cpp
index 99e0b883736020531b35e3942157513b075aea37..6f7a8b380b4a6522190933e091ee445ca5aba2ba 100644
--- a/DDG4/plugins/Geant4XMLSetup.cpp
+++ b/DDG4/plugins/Geant4XMLSetup.cpp
@@ -1,4 +1,4 @@
-// $Id$
+// $Id: $
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
diff --git a/DDG4/python/DD4hep.py b/DDG4/python/DD4hep.py
index d41a9cfe7d76fe144f97324e546192a0d7f5162d..aaf6c3848d899c4c989df1dbb7ba889746c0e6de 100644
--- a/DDG4/python/DD4hep.py
+++ b/DDG4/python/DD4hep.py
@@ -1,4 +1,4 @@
-# $Id$
+# $Id: $
 #==========================================================================
 #  AIDA Detector description implementation for LCD
 #--------------------------------------------------------------------------
diff --git a/DDG4/python/DDG4.py b/DDG4/python/DDG4.py
index 008ef63c66759256c327d31c068537550fb329af..4bdddce30a686a26b3be072f55bc3f7e1bb02260 100644
--- a/DDG4/python/DDG4.py
+++ b/DDG4/python/DDG4.py
@@ -1,4 +1,4 @@
-# $Id$
+# $Id: $
 #==========================================================================
 #  AIDA Detector description implementation for LCD
 #--------------------------------------------------------------------------
diff --git a/DDG4/python/DDG4Dict.C b/DDG4/python/DDG4Dict.C
index 71cd90c9bd53117e27b1a1c4d0f4a588410f082b..b51c633b8ee7ec576a53ca056d88509f39fb1118 100644
--- a/DDG4/python/DDG4Dict.C
+++ b/DDG4/python/DDG4Dict.C
@@ -1,4 +1,4 @@
-// $Id$
+// $Id: $
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
diff --git a/DDG4/python/checkGeometry.py b/DDG4/python/checkGeometry.py
index 1e857492ba982514e2bf2df8b8d743a17d459253..15c4fa03614c1797f56421dc95054c7431c71e69 100755
--- a/DDG4/python/checkGeometry.py
+++ b/DDG4/python/checkGeometry.py
@@ -1,5 +1,5 @@
 #!/bin/python
-# $Id$
+# $Id: $
 #==========================================================================
 #  AIDA Detector description implementation for LCD
 #--------------------------------------------------------------------------
diff --git a/DDG4/python/checkOverlaps.py b/DDG4/python/checkOverlaps.py
index 7f41ed02d02b9f251f5e013b716df59d5ad06bc9..959580a6537cf5ae196bb44d1599d914876470e2 100755
--- a/DDG4/python/checkOverlaps.py
+++ b/DDG4/python/checkOverlaps.py
@@ -1,5 +1,5 @@
 #!/bin/python
-# $Id$
+# $Id: $
 #==========================================================================
 #  AIDA Detector description implementation for LCD
 #--------------------------------------------------------------------------
diff --git a/DDG4/scripts/dumpDDG4.C b/DDG4/scripts/dumpDDG4.C
index d8e56164ba12062d433f9219806c12d60984f572..aaf7e1fa629d7c5c7ac5da263bcf4638712fd08e 100644
--- a/DDG4/scripts/dumpDDG4.C
+++ b/DDG4/scripts/dumpDDG4.C
@@ -1,4 +1,4 @@
-// $Id$
+// $Id: $
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
diff --git a/DDG4/src/ComponentProperties.cpp b/DDG4/src/ComponentProperties.cpp
index d13f9aeee703f8f56198c6eabba0905b5c915673..fd4995cc99f93352ad92200eb209344f2df57dab 100644
--- a/DDG4/src/ComponentProperties.cpp
+++ b/DDG4/src/ComponentProperties.cpp
@@ -1,4 +1,4 @@
-// $Id$
+// $Id: $
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
diff --git a/DDG4/src/Geant4Action.cpp b/DDG4/src/Geant4Action.cpp
index e5d96f62835dfacec8d13dbc627ffe9415c047ab..cc982f47f81732cbe12fc999d4d7ecd5c95bf7e4 100644
--- a/DDG4/src/Geant4Action.cpp
+++ b/DDG4/src/Geant4Action.cpp
@@ -1,4 +1,4 @@
-// $Id$
+// $Id: $
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
diff --git a/DDG4/src/Geant4ActionPhase.cpp b/DDG4/src/Geant4ActionPhase.cpp
index da60e9f2443f7c84179a96de279b4f2353efe8b4..d6683ffb46ffc4e20e7c8db6be499c26f8019c49 100644
--- a/DDG4/src/Geant4ActionPhase.cpp
+++ b/DDG4/src/Geant4ActionPhase.cpp
@@ -1,4 +1,4 @@
-// $Id$
+// $Id: $
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
diff --git a/DDG4/src/Geant4Call.cpp b/DDG4/src/Geant4Call.cpp
index ac3f57d7e6ff66ce01d15cf60ef8d5f108570b10..2504e5a928fd86f344b6e731c1c8059eb44ffa93 100644
--- a/DDG4/src/Geant4Call.cpp
+++ b/DDG4/src/Geant4Call.cpp
@@ -1,4 +1,4 @@
-// $Id$
+// $Id: $
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
diff --git a/DDG4/src/Geant4Context.cpp b/DDG4/src/Geant4Context.cpp
index b0add8c414db76ce6062ba2a4c3f5bbe4bf55807..6a68706d913253183bee6d33e59977b886d4d3bf 100644
--- a/DDG4/src/Geant4Context.cpp
+++ b/DDG4/src/Geant4Context.cpp
@@ -1,4 +1,4 @@
-// $Id$
+// $Id: $
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
diff --git a/DDG4/src/Geant4Data.cpp b/DDG4/src/Geant4Data.cpp
index 8e59a01417defcafcc0ab405997f16529db8e5f3..7e6d877a1b77cbf41ace7c5fe48afd722e128cb4 100644
--- a/DDG4/src/Geant4Data.cpp
+++ b/DDG4/src/Geant4Data.cpp
@@ -1,4 +1,4 @@
-// $Id$
+// $Id: $
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
diff --git a/DDG4/src/Geant4DataConversion.cpp b/DDG4/src/Geant4DataConversion.cpp
index 684f7752e42880bbe1dd1a8a931678c84e712c4a..c6944865afef6a0eab3130a51b3e8e716b9170e1 100644
--- a/DDG4/src/Geant4DataConversion.cpp
+++ b/DDG4/src/Geant4DataConversion.cpp
@@ -1,4 +1,4 @@
-// $Id$
+// $Id: $
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
diff --git a/DDG4/src/Geant4DataDump.cpp b/DDG4/src/Geant4DataDump.cpp
index 5378eeab938edb9d589144fbef6c32ab5dd22b39..539d43ee1a264bff9415b9e46dbf9e0a7a236f93 100644
--- a/DDG4/src/Geant4DataDump.cpp
+++ b/DDG4/src/Geant4DataDump.cpp
@@ -1,4 +1,4 @@
-// $Id$
+// $Id: $
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
diff --git a/DDG4/src/Geant4EventAction.cpp b/DDG4/src/Geant4EventAction.cpp
index 0394f343cf423e3849083659276c38867576ed3a..01e3c763cf7bf59ac1a25fc6c822e6b77cad10e7 100644
--- a/DDG4/src/Geant4EventAction.cpp
+++ b/DDG4/src/Geant4EventAction.cpp
@@ -1,4 +1,4 @@
-// $Id$
+// $Id: $
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
diff --git a/DDG4/src/Geant4Exec.cpp b/DDG4/src/Geant4Exec.cpp
index 8f068d4998eeeabd773d9dec95fd7780c8859128..d4d72c1160bb3e6def6eb2f590650806f7407c93 100644
--- a/DDG4/src/Geant4Exec.cpp
+++ b/DDG4/src/Geant4Exec.cpp
@@ -1,4 +1,4 @@
-// $Id$
+// $Id: $
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
diff --git a/DDG4/src/Geant4GDMLDetector.cpp b/DDG4/src/Geant4GDMLDetector.cpp
index aa045fbaf31a382c7572859d2a7dfbf916184c1c..18816057ee8be1aef132c5fc6b08b1913c264312 100644
--- a/DDG4/src/Geant4GDMLDetector.cpp
+++ b/DDG4/src/Geant4GDMLDetector.cpp
@@ -1,4 +1,4 @@
-// $Id$
+// $Id: $
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
diff --git a/DDG4/src/Geant4GeneratorAction.cpp b/DDG4/src/Geant4GeneratorAction.cpp
index 593d352c347b6d69296d164c47b0f55ef8ebf0ec..f6a1d6feaca7eb12807b16e7055034daf9afce5a 100644
--- a/DDG4/src/Geant4GeneratorAction.cpp
+++ b/DDG4/src/Geant4GeneratorAction.cpp
@@ -1,4 +1,4 @@
-// $Id$
+// $Id: $
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
diff --git a/DDG4/src/Geant4GeneratorActionInit.cpp b/DDG4/src/Geant4GeneratorActionInit.cpp
index cf94c519505d99b990029cf4960e1cb734236ad9..05ccf9c680ddd54913f0bf49e5b5a76ce3343cf4 100644
--- a/DDG4/src/Geant4GeneratorActionInit.cpp
+++ b/DDG4/src/Geant4GeneratorActionInit.cpp
@@ -1,4 +1,4 @@
-// $Id$
+// $Id: $
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
diff --git a/DDG4/src/Geant4GeometryInfo.cpp b/DDG4/src/Geant4GeometryInfo.cpp
index 1a1ac0cd9069e0c6c533250b94bdb10cc70d991f..ab4bfb6861bda96f1b0cd3392039e7280909050c 100644
--- a/DDG4/src/Geant4GeometryInfo.cpp
+++ b/DDG4/src/Geant4GeometryInfo.cpp
@@ -1,4 +1,4 @@
-// $Id$
+// $Id: $
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
diff --git a/DDG4/src/Geant4Handle.cpp b/DDG4/src/Geant4Handle.cpp
index a8e1ce298885ae3ad05ce18fc6c3b6764ba5af62..38e9091a5938b10f0ad1974e87a988b67f4f67e2 100644
--- a/DDG4/src/Geant4Handle.cpp
+++ b/DDG4/src/Geant4Handle.cpp
@@ -1,4 +1,4 @@
-// $Id$
+// $Id: $
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
diff --git a/DDG4/src/Geant4HierarchyDump.cpp b/DDG4/src/Geant4HierarchyDump.cpp
index fbe4cbd9e0fdd8f7cb24e97735d0249afbc8bc20..9f5d9c72d836e4ac017163851aa5f01b3d64ac3c 100644
--- a/DDG4/src/Geant4HierarchyDump.cpp
+++ b/DDG4/src/Geant4HierarchyDump.cpp
@@ -1,4 +1,4 @@
-// $Id$
+// $Id: $
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
diff --git a/DDG4/src/Geant4HitCollection.cpp b/DDG4/src/Geant4HitCollection.cpp
index 3ff42e01609abe2df2e2bd29aefd16b77cc4c8f8..1b1a2f28b608c24c9c853af7412c7b4765ba4ba7 100644
--- a/DDG4/src/Geant4HitCollection.cpp
+++ b/DDG4/src/Geant4HitCollection.cpp
@@ -1,4 +1,4 @@
-// $Id$
+// $Id: $
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
diff --git a/DDG4/src/Geant4InputAction.cpp b/DDG4/src/Geant4InputAction.cpp
index 0f8aadfd1a012b9bd86948ae4f5b4468ec714ba9..6ba2f36d286f3732c0ecb04c057a08b6d217af7c 100644
--- a/DDG4/src/Geant4InputAction.cpp
+++ b/DDG4/src/Geant4InputAction.cpp
@@ -1,4 +1,4 @@
-// $Id$
+// $Id: $
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
diff --git a/DDG4/src/Geant4InputHandling.cpp b/DDG4/src/Geant4InputHandling.cpp
index b14926080a063d7b79c9dd4d5f5ffdb0a518cbab..280b66d8cdc11c2aa97522f13a3da42720b95dcd 100644
--- a/DDG4/src/Geant4InputHandling.cpp
+++ b/DDG4/src/Geant4InputHandling.cpp
@@ -1,4 +1,4 @@
-// $Id$
+// $Id: $
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
diff --git a/DDG4/src/Geant4InteractionMerger.cpp b/DDG4/src/Geant4InteractionMerger.cpp
index 1fd4dfb850bd34c2f606ca27c7accf0e6db45632..ea47479f4719ee80d142ad0be7c7663765b08e9c 100644
--- a/DDG4/src/Geant4InteractionMerger.cpp
+++ b/DDG4/src/Geant4InteractionMerger.cpp
@@ -1,4 +1,4 @@
-// $Id$
+// $Id: $
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
diff --git a/DDG4/src/Geant4InteractionVertexBoost.cpp b/DDG4/src/Geant4InteractionVertexBoost.cpp
index 2af167fbd002367eda907ebddfa20d29ef7d2dd7..9b3e6b112bb481dca672c4b2c01b96122d425179 100644
--- a/DDG4/src/Geant4InteractionVertexBoost.cpp
+++ b/DDG4/src/Geant4InteractionVertexBoost.cpp
@@ -1,4 +1,4 @@
-// $Id$
+// $Id: $
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
diff --git a/DDG4/src/Geant4InteractionVertexSmear.cpp b/DDG4/src/Geant4InteractionVertexSmear.cpp
index 3e87684e1f0f50415b0b0f160414f6d0f8559ab6..00254a5d784481f9255f3160a79bf6b86be69344 100644
--- a/DDG4/src/Geant4InteractionVertexSmear.cpp
+++ b/DDG4/src/Geant4InteractionVertexSmear.cpp
@@ -1,4 +1,4 @@
-// $Id$
+// $Id: $
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
diff --git a/DDG4/src/Geant4IsotropeGenerator.cpp b/DDG4/src/Geant4IsotropeGenerator.cpp
index c08c372c3cd0da289cec9f7b09990e2cc1c1910f..b98a3df6dcfef8c1afcabd73e6c40013f7da8d1a 100644
--- a/DDG4/src/Geant4IsotropeGenerator.cpp
+++ b/DDG4/src/Geant4IsotropeGenerator.cpp
@@ -1,4 +1,4 @@
-// $Id$
+// $Id: $
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
diff --git a/DDG4/src/Geant4Kernel.cpp b/DDG4/src/Geant4Kernel.cpp
index d583e7219733e987fb0cb746083a11186d73fd9d..6dccbc048d7e7edd7e95c3d8b59af68ea10bdeec 100644
--- a/DDG4/src/Geant4Kernel.cpp
+++ b/DDG4/src/Geant4Kernel.cpp
@@ -1,4 +1,4 @@
-// $Id$
+// $Id: $
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
diff --git a/DDG4/src/Geant4Mapping.cpp b/DDG4/src/Geant4Mapping.cpp
index cb71c83245a2c7d594fbffdc81048732735a8558..77ec145a18ae6817a67261edd3302c1ec6aac6c4 100644
--- a/DDG4/src/Geant4Mapping.cpp
+++ b/DDG4/src/Geant4Mapping.cpp
@@ -1,4 +1,4 @@
-// $Id$
+// $Id: $
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
diff --git a/DDG4/src/Geant4MonteCarloTruth.cpp b/DDG4/src/Geant4MonteCarloTruth.cpp
index 5e1d7c2b641aa04672c3af8aae9bb0ec874e674e..a5e80e997271a4f1fe8f8508d45888acd168241f 100644
--- a/DDG4/src/Geant4MonteCarloTruth.cpp
+++ b/DDG4/src/Geant4MonteCarloTruth.cpp
@@ -1,4 +1,4 @@
-// $Id$
+// $Id: $
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
diff --git a/DDG4/src/Geant4Output2ROOT.cpp b/DDG4/src/Geant4Output2ROOT.cpp
index 1d409303fa35f444fd06575a6ba5d0a1d33339eb..b78710f266ca4267b3093b6fbba74f2f6c468823 100644
--- a/DDG4/src/Geant4Output2ROOT.cpp
+++ b/DDG4/src/Geant4Output2ROOT.cpp
@@ -1,4 +1,4 @@
-// $Id$
+// $Id: $
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
diff --git a/DDG4/src/Geant4OutputAction.cpp b/DDG4/src/Geant4OutputAction.cpp
index 97e2dc11363cdbd50e4c2e005650a413f9f5e95f..7bad4ffe14bedca23a709852e21963f7f0c87da2 100644
--- a/DDG4/src/Geant4OutputAction.cpp
+++ b/DDG4/src/Geant4OutputAction.cpp
@@ -1,4 +1,4 @@
-// $Id$
+// $Id: $
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
diff --git a/DDG4/src/Geant4Particle.cpp b/DDG4/src/Geant4Particle.cpp
index d7567c266960eb023608278c6d42c540f07142ec..f2a82824c462fcbb52480e55fa5e507b9298a98b 100644
--- a/DDG4/src/Geant4Particle.cpp
+++ b/DDG4/src/Geant4Particle.cpp
@@ -1,4 +1,4 @@
-// $Id$
+// $Id: $
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
diff --git a/DDG4/src/Geant4ParticleGun.cpp b/DDG4/src/Geant4ParticleGun.cpp
index 20df50325c484f8507e52b9161426e5f20700089..e4d0be7b626c53058ceb9e9fcedf5c048ede1f0c 100644
--- a/DDG4/src/Geant4ParticleGun.cpp
+++ b/DDG4/src/Geant4ParticleGun.cpp
@@ -1,4 +1,4 @@
-// $Id$
+// $Id: $
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
diff --git a/DDG4/src/Geant4ParticleHandler.cpp b/DDG4/src/Geant4ParticleHandler.cpp
index d122868d3b4abaaca9721daeb5cd6f043d7b9a8c..d15bca5dbc5808b8576ea5afe1081ea207e4e7a9 100644
--- a/DDG4/src/Geant4ParticleHandler.cpp
+++ b/DDG4/src/Geant4ParticleHandler.cpp
@@ -1,4 +1,4 @@
-// $Id$
+// $Id: $
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
diff --git a/DDG4/src/Geant4ParticlePrint.cpp b/DDG4/src/Geant4ParticlePrint.cpp
index caf6e618435a9996ea115149cca24e43655087eb..25dc0b9e38cf1473f4153082c8fd4283dccf03b9 100644
--- a/DDG4/src/Geant4ParticlePrint.cpp
+++ b/DDG4/src/Geant4ParticlePrint.cpp
@@ -1,4 +1,4 @@
-// $Id$
+// $Id: $
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
diff --git a/DDG4/src/Geant4PhysicsList.cpp b/DDG4/src/Geant4PhysicsList.cpp
index ec19378163aff3670031a23801d59fe0d465bd35..daef909241d93ee954504833f55d30b667ac0833 100644
--- a/DDG4/src/Geant4PhysicsList.cpp
+++ b/DDG4/src/Geant4PhysicsList.cpp
@@ -1,4 +1,4 @@
-// $Id$
+// $Id: $
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
diff --git a/DDG4/src/Geant4Plugins.cpp b/DDG4/src/Geant4Plugins.cpp
index 4af274e5695b56c419d99d407cb1e8e36d42e72d..ec4513de11dbdbe6d6fce2106aa2ec87ede1ac20 100644
--- a/DDG4/src/Geant4Plugins.cpp
+++ b/DDG4/src/Geant4Plugins.cpp
@@ -1,4 +1,4 @@
-// $Id$
+// $Id: $
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
diff --git a/DDG4/src/Geant4Primary.cpp b/DDG4/src/Geant4Primary.cpp
index 72d4272709e478bdbf1a3de0a01c7c1edd3531d2..1f4773bfbf822ee030feb5fbb05057bb38282598 100644
--- a/DDG4/src/Geant4Primary.cpp
+++ b/DDG4/src/Geant4Primary.cpp
@@ -1,4 +1,4 @@
-// $Id$
+// $Id: $
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
diff --git a/DDG4/src/Geant4PrimaryHandler.cpp b/DDG4/src/Geant4PrimaryHandler.cpp
index 095f4d9e88cb42f7cbff77bc22c6e1a262aa8cbc..ba65062bea191fca49c8cf579a2afe3f76f27f01 100644
--- a/DDG4/src/Geant4PrimaryHandler.cpp
+++ b/DDG4/src/Geant4PrimaryHandler.cpp
@@ -1,4 +1,4 @@
-// $Id$
+// $Id: $
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
diff --git a/DDG4/src/Geant4ROOTDump.cpp b/DDG4/src/Geant4ROOTDump.cpp
index e997b2dea0366208d913f27da9ee5ccd9f600d3b..0fefa91ba0ac519546dc46bf3cf5d1d75a65e244 100644
--- a/DDG4/src/Geant4ROOTDump.cpp
+++ b/DDG4/src/Geant4ROOTDump.cpp
@@ -1,4 +1,4 @@
-// $Id$
+// $Id: $
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
diff --git a/DDG4/src/Geant4Random.cpp b/DDG4/src/Geant4Random.cpp
index e6b94c5a8b86e99548d2d074863e23908f6adc71..da0306366ac0c7968d71488f099e2265c8fcdd73 100644
--- a/DDG4/src/Geant4Random.cpp
+++ b/DDG4/src/Geant4Random.cpp
@@ -1,4 +1,4 @@
-// $Id$
+// $Id: $
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
diff --git a/DDG4/src/Geant4RunAction.cpp b/DDG4/src/Geant4RunAction.cpp
index c44b229aeafaedbf1cb9a14e4b6fbf4039dbd678..cb2045c7cffb48a7ba24e217d5522a98eba9c37e 100644
--- a/DDG4/src/Geant4RunAction.cpp
+++ b/DDG4/src/Geant4RunAction.cpp
@@ -1,4 +1,4 @@
-// $Id$
+// $Id: $
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
diff --git a/DDG4/src/Geant4SensDetAction.cpp b/DDG4/src/Geant4SensDetAction.cpp
index 88240c7fcf9aebff460dc949e2f2af5bb2063dca..b75d9b7da9e0307226996d6d1274ead481e0edbd 100644
--- a/DDG4/src/Geant4SensDetAction.cpp
+++ b/DDG4/src/Geant4SensDetAction.cpp
@@ -1,4 +1,4 @@
-// $Id$
+// $Id: $
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
diff --git a/DDG4/src/Geant4StackingAction.cpp b/DDG4/src/Geant4StackingAction.cpp
index b00a6589d428b7f4763191047f45aec268bf2427..839509afdaca9b92057623d300627c32b4707154 100644
--- a/DDG4/src/Geant4StackingAction.cpp
+++ b/DDG4/src/Geant4StackingAction.cpp
@@ -1,4 +1,4 @@
-// $Id$
+// $Id: $
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
diff --git a/DDG4/src/Geant4SteppingAction.cpp b/DDG4/src/Geant4SteppingAction.cpp
index ba1339d0b49cc48d4884c3a066d55bc445755bd6..289d8668c771755d20366c6369fd33209712f3db 100644
--- a/DDG4/src/Geant4SteppingAction.cpp
+++ b/DDG4/src/Geant4SteppingAction.cpp
@@ -1,4 +1,4 @@
-// $Id$
+// $Id: $
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
diff --git a/DDG4/src/Geant4TestActions.cpp b/DDG4/src/Geant4TestActions.cpp
index e41edc80997d17c7dc73df84073bd753a35f06d0..4254503c629afb3c5523c97857044272ba1eb910 100644
--- a/DDG4/src/Geant4TestActions.cpp
+++ b/DDG4/src/Geant4TestActions.cpp
@@ -1,4 +1,4 @@
-// $Id$
+// $Id: $
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
diff --git a/DDG4/src/Geant4TouchableHandler.cpp b/DDG4/src/Geant4TouchableHandler.cpp
index 656c1d1dde391d5a4b3ca0cd7e5a9b42a354a85e..9b9d51df1756e807d70dd0d13d046beaacddb438 100644
--- a/DDG4/src/Geant4TouchableHandler.cpp
+++ b/DDG4/src/Geant4TouchableHandler.cpp
@@ -1,4 +1,4 @@
-// $Id$
+// $Id: $
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
diff --git a/DDG4/src/Geant4TrackInformation.cpp b/DDG4/src/Geant4TrackInformation.cpp
index 450daeb344ff395d5bceee9a3c3b6ff786d9cf08..15afa5ba5ee13e2d36dca61e593caf93fff68551 100644
--- a/DDG4/src/Geant4TrackInformation.cpp
+++ b/DDG4/src/Geant4TrackInformation.cpp
@@ -1,4 +1,4 @@
-// $Id$
+// $Id: $
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
diff --git a/DDG4/src/Geant4TrackingAction.cpp b/DDG4/src/Geant4TrackingAction.cpp
index 556652771cd14434309da097f27c25f3babc8fe1..1ea3c6d898668a10d23711d003f7e4818a7b27f1 100644
--- a/DDG4/src/Geant4TrackingAction.cpp
+++ b/DDG4/src/Geant4TrackingAction.cpp
@@ -1,4 +1,4 @@
-// $Id$
+// $Id: $
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
diff --git a/DDG4/src/Geant4TrackingPostAction.cpp b/DDG4/src/Geant4TrackingPostAction.cpp
index 5e4552061aea5889e4861d1a212f2c59ca4909e0..696a5b7d57806f5f868c739e7595698ba60532b8 100644
--- a/DDG4/src/Geant4TrackingPostAction.cpp
+++ b/DDG4/src/Geant4TrackingPostAction.cpp
@@ -1,4 +1,4 @@
-// $Id$
+// $Id: $
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
diff --git a/DDG4/src/Geant4TrackingPreAction.cpp b/DDG4/src/Geant4TrackingPreAction.cpp
index fcce3efbb2c1826af46178316b15727446c9fbc0..dbde0836675dd5c331fd8bf21465a832da28067d 100644
--- a/DDG4/src/Geant4TrackingPreAction.cpp
+++ b/DDG4/src/Geant4TrackingPreAction.cpp
@@ -1,4 +1,4 @@
-// $Id$
+// $Id: $
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
diff --git a/DDG4/src/Geant4UIManager.cpp b/DDG4/src/Geant4UIManager.cpp
index b4e5b2fe9ca2d2b65ae94a72a4b7200e38cb9092..9c435af7ff3a7cf55a726ecb97e254f7564a160d 100644
--- a/DDG4/src/Geant4UIManager.cpp
+++ b/DDG4/src/Geant4UIManager.cpp
@@ -1,4 +1,4 @@
-// $Id$
+// $Id: $
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
diff --git a/DDG4/src/Geant4UIMessenger.cpp b/DDG4/src/Geant4UIMessenger.cpp
index c4ed5c3c5a4b82a557b6ac8034165c3fac021767..44b872b44a6910404a9b9d4500715c699efa7721 100644
--- a/DDG4/src/Geant4UIMessenger.cpp
+++ b/DDG4/src/Geant4UIMessenger.cpp
@@ -1,4 +1,4 @@
-// $Id$
+// $Id: $
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
diff --git a/DDG4/src/Geant4UserParticleHandler.cpp b/DDG4/src/Geant4UserParticleHandler.cpp
index 454f76a68b335c1454935359300c063572859888..6f1dc7017dfa1b705bc8c3266ef34f7eb6fe965b 100644
--- a/DDG4/src/Geant4UserParticleHandler.cpp
+++ b/DDG4/src/Geant4UserParticleHandler.cpp
@@ -1,4 +1,4 @@
-// $Id$
+// $Id: $
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
diff --git a/DDG4/src/Geant4Vertex.cpp b/DDG4/src/Geant4Vertex.cpp
index 8f96088e0030710adf2da1214cd78544324968b3..3648e50b676a278c7a3011ee47ce49f88b0b125e 100644
--- a/DDG4/src/Geant4Vertex.cpp
+++ b/DDG4/src/Geant4Vertex.cpp
@@ -1,4 +1,4 @@
-// $Id$
+// $Id: $
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
diff --git a/DDG4/src/Geant4VolumeManager.cpp b/DDG4/src/Geant4VolumeManager.cpp
index 0bdaf5ab6c04a83e53a6886793b35d93aec0c5ab..a9c2c1e095648634ce5ab5325c8caf39a052ac4d 100644
--- a/DDG4/src/Geant4VolumeManager.cpp
+++ b/DDG4/src/Geant4VolumeManager.cpp
@@ -1,4 +1,4 @@
-// $Id$
+// $Id: $
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
diff --git a/DDG4/src/IoStreams.cpp b/DDG4/src/IoStreams.cpp
index 04d61a5c809633eec2982e4f8502111a1cd7672c..d963cb1e4b9a1824bdeb87c7ec11b3a5fe6ec614 100644
--- a/DDG4/src/IoStreams.cpp
+++ b/DDG4/src/IoStreams.cpp
@@ -1,4 +1,4 @@
-// $Id$
+// $Id: $
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
diff --git a/DDSegmentation/include/DDSegmentation/CartesianGridYZ.h b/DDSegmentation/include/DDSegmentation/CartesianGridYZ.h
index a9f3fba8e74a07c93e5aded899919c78162aeee7..9060b60a1ee2f5c3960b75f93dd4ca3e9f3e888d 100644
--- a/DDSegmentation/include/DDSegmentation/CartesianGridYZ.h
+++ b/DDSegmentation/include/DDSegmentation/CartesianGridYZ.h
@@ -11,7 +11,7 @@ namespace DDSegmentation {
  *
  *  @date: Sep 03, 2014
  *  @author: F.Gaede CERN/Desy
- *  @version: $Id$
+ *  @version: $Id: $
  *     direkt copy of CartesianGridXY
  *     by Christian Grefe, CERN
  */
diff --git a/DDSegmentation/src/CartesianGridYZ.cpp b/DDSegmentation/src/CartesianGridYZ.cpp
index 66be1861dbfcc687f151d04e1fe68152ad137d7e..82db02bbda28dd0b796f66e2c646ef7c6a648ac8 100644
--- a/DDSegmentation/src/CartesianGridYZ.cpp
+++ b/DDSegmentation/src/CartesianGridYZ.cpp
@@ -2,7 +2,7 @@
  *
  *  @date: Sep 03, 2014
  *  @author: F.Gaede CERN/Desy
- *  @version: $Id$
+ *  @version: $Id: $
  *     direkt copy of CartesianGridXY
  *     by Christian Grefe, CERN
  */
diff --git a/UtilityApps/CMakeLists.txt b/UtilityApps/CMakeLists.txt
index de5c2be5022a9a8254f945c5e002a87ff2f658c5..4f2e162ae2510493d48b8024f1bc6a4e7e668f27 100644
--- a/UtilityApps/CMakeLists.txt
+++ b/UtilityApps/CMakeLists.txt
@@ -1,4 +1,4 @@
-# $Id$
+# $Id: $
 #==========================================================================
 #  AIDA Detector description implementation for LCD
 #--------------------------------------------------------------------------
diff --git a/UtilityApps/src/EvNavHandler.h b/UtilityApps/src/EvNavHandler.h
index 43bcfd50e0f3c78055d7c07b61af2447adf0fd1c..e348e53848ac5109c46ef81d87a83db2ecb42239 100644
--- a/UtilityApps/src/EvNavHandler.h
+++ b/UtilityApps/src/EvNavHandler.h
@@ -1,4 +1,4 @@
-// $Id$
+// $Id: $
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
diff --git a/UtilityApps/src/LinkDef.h b/UtilityApps/src/LinkDef.h
index 3a576a1896db4eecae630ee322ab0530721c5fde..c843552a741e1c8a18425141f1618494f17068d2 100644
--- a/UtilityApps/src/LinkDef.h
+++ b/UtilityApps/src/LinkDef.h
@@ -1,4 +1,4 @@
-// $Id$
+// $Id: $
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
diff --git a/UtilityApps/src/MultiView.h b/UtilityApps/src/MultiView.h
index f2f3b5404d7d6f2b93c40e4d4446db845e539145..3a6c9776c39f7e1bf2c3f0936d663535a0dcae10 100644
--- a/UtilityApps/src/MultiView.h
+++ b/UtilityApps/src/MultiView.h
@@ -1,4 +1,4 @@
-// $Id$
+// $Id: $
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
@@ -35,7 +35,7 @@
  * Should be used in compiled mode.
  * 
  * @author F.Gaede, DESY (modified original version from Matevz Tadel)
- * @version "$Id:$"
+ * @version "$Id: $"
  */
 
 class MultiView {
diff --git a/UtilityApps/src/dumpdetector.cpp b/UtilityApps/src/dumpdetector.cpp
index 8180b018c18249c0f483e47adf31c88122c077f3..f1c485d3746608697b9c1efec86b192a8dde9bcd 100644
--- a/UtilityApps/src/dumpdetector.cpp
+++ b/UtilityApps/src/dumpdetector.cpp
@@ -1,4 +1,4 @@
-// $Id$
+// $Id: $
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
diff --git a/UtilityApps/src/materialScan.cpp b/UtilityApps/src/materialScan.cpp
index 006b32d592e8bd20fcd47a6e4068d80552e90956..db7841085d5069226d9ff4017486c1711035707f 100644
--- a/UtilityApps/src/materialScan.cpp
+++ b/UtilityApps/src/materialScan.cpp
@@ -1,4 +1,4 @@
-// $Id$
+// $Id: $
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
diff --git a/UtilityApps/src/next_event_dummy.cpp b/UtilityApps/src/next_event_dummy.cpp
index 01f142037d161091535b58d134878cff525b3a2a..ae4c0da07b986e5313e8f38eaf767a836a171d1c 100644
--- a/UtilityApps/src/next_event_dummy.cpp
+++ b/UtilityApps/src/next_event_dummy.cpp
@@ -1,4 +1,4 @@
-// $Id$
+// $Id: $
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
diff --git a/UtilityApps/src/next_event_lcio.cpp b/UtilityApps/src/next_event_lcio.cpp
index 3e114ef20652a02323b2cb6c0a311bdfd0364137..27413628d6d3782833acacdd92bfac54f152bb13 100644
--- a/UtilityApps/src/next_event_lcio.cpp
+++ b/UtilityApps/src/next_event_lcio.cpp
@@ -1,4 +1,4 @@
-// $Id$
+// $Id: $
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
diff --git a/UtilityApps/src/print_materials.cpp b/UtilityApps/src/print_materials.cpp
index e834f1c82a8bb318d46e457edc835daa431f728e..9a424ad6562461afe935b601622a38955be0aed4 100644
--- a/UtilityApps/src/print_materials.cpp
+++ b/UtilityApps/src/print_materials.cpp
@@ -1,4 +1,4 @@
-// $Id$
+// $Id: $
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
diff --git a/UtilityApps/src/test_surfaces.cpp b/UtilityApps/src/test_surfaces.cpp
index 9c1a2a669e1a46ad57d383298c881a778c81f129..1c619bcf2a33138278d63cc8132a077d87e73a8e 100644
--- a/UtilityApps/src/test_surfaces.cpp
+++ b/UtilityApps/src/test_surfaces.cpp
@@ -1,4 +1,4 @@
-// $Id$
+// $Id: $
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
diff --git a/UtilityApps/src/teve_display.cpp b/UtilityApps/src/teve_display.cpp
index dc492eefdb622d15309ef00379f402e4882a2560..5a1982b8b9f3b81677ef2e89c23b492ec664a83d 100644
--- a/UtilityApps/src/teve_display.cpp
+++ b/UtilityApps/src/teve_display.cpp
@@ -1,4 +1,4 @@
-// $Id$
+// $Id: $
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------