diff --git a/DDAlign/CMakeLists.txt b/DDAlign/CMakeLists.txt
index 20a3b52e3e04b11551bad828a658efac8f3a6d8e..a43b17c3e07c4cbe4a3b743b0eeaf52dd73b2631 100644
--- a/DDAlign/CMakeLists.txt
+++ b/DDAlign/CMakeLists.txt
@@ -1,8 +1,8 @@
-# $Id: Handle.h 570 2013-05-17 07:47:11Z markus.frank $
+# $Id$
 #==========================================================================
 #  AIDA Detector description implementation for LCD
 #--------------------------------------------------------------------------
-# Copyright (C) Organisation europ茅enne pour la Recherche nucl茅aire (CERN)
+# Copyright (C) Organisation europeenne pour la Recherche nucleaire (CERN)
 # All rights reserved.
 #
 # For the licensing terms see $DD4hepINSTALL/LICENSE.
diff --git a/DDAlign/include/DDAlign/AlignmentCache.h b/DDAlign/include/DDAlign/AlignmentCache.h
index d816c62ede15bc7ca23d4b065fd539ff0c4c390e..2f182d2a299f875ccd60c061c362c0539cee0e78 100644
--- a/DDAlign/include/DDAlign/AlignmentCache.h
+++ b/DDAlign/include/DDAlign/AlignmentCache.h
@@ -1,8 +1,8 @@
-// $Id: run_plugin.h 1663 2015-03-20 13:54:53Z gaede $
+// $Id$
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
-// Copyright (C) Organisation europ茅enne pour la Recherche nucl茅aire (CERN)
+// Copyright (C) Organisation europeenne pour la Recherche nucleaire (CERN)
 // All rights reserved.
 //
 // For the licensing terms see $DD4hepINSTALL/LICENSE.
diff --git a/DDAlign/include/DDAlign/AlignmentOperators.h b/DDAlign/include/DDAlign/AlignmentOperators.h
index ca0f52e0e45d4eb0e9a2606133c49313bb60c103..a38ae6e97ff46e75e12dac7b9085e0e9f5a2164c 100644
--- a/DDAlign/include/DDAlign/AlignmentOperators.h
+++ b/DDAlign/include/DDAlign/AlignmentOperators.h
@@ -1,8 +1,8 @@
-// $Id: run_plugin.h 1663 2015-03-20 13:54:53Z gaede $
+// $Id$
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
-// Copyright (C) Organisation europ茅enne pour la Recherche nucl茅aire (CERN)
+// Copyright (C) Organisation europeenne pour la Recherche nucleaire (CERN)
 // All rights reserved.
 //
 // For the licensing terms see $DD4hepINSTALL/LICENSE.
diff --git a/DDAlign/include/DDAlign/AlignmentStack.h b/DDAlign/include/DDAlign/AlignmentStack.h
index d7b6db2d215b7ee6e78eedb4ea3d1091ab193fd7..883a7acfb89d5fc17fba9f9568d55cc46b6c6611 100644
--- a/DDAlign/include/DDAlign/AlignmentStack.h
+++ b/DDAlign/include/DDAlign/AlignmentStack.h
@@ -1,8 +1,8 @@
-// $Id: run_plugin.h 1663 2015-03-20 13:54:53Z gaede $
+// $Id$
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
-// Copyright (C) Organisation europ茅enne pour la Recherche nucl茅aire (CERN)
+// Copyright (C) Organisation europeenne pour la Recherche nucleaire (CERN)
 // All rights reserved.
 //
 // For the licensing terms see $DD4hepINSTALL/LICENSE.
diff --git a/DDAlign/include/DDAlign/AlignmentTags.h b/DDAlign/include/DDAlign/AlignmentTags.h
index 62415d9753b60dae74f6bb807f7612b371115b4b..979e84e8ffd30527f29a47e110d0173fc4cb1e5e 100644
--- a/DDAlign/include/DDAlign/AlignmentTags.h
+++ b/DDAlign/include/DDAlign/AlignmentTags.h
@@ -1,8 +1,8 @@
-// $Id: run_plugin.h 1663 2015-03-20 13:54:53Z gaede $
+// $Id$
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
-// Copyright (C) Organisation europ茅enne pour la Recherche nucl茅aire (CERN)
+// Copyright (C) Organisation europeenne pour la Recherche nucleaire (CERN)
 // All rights reserved.
 //
 // For the licensing terms see $DD4hepINSTALL/LICENSE.
diff --git a/DDAlign/include/DDAlign/AlignmentTransaction.h b/DDAlign/include/DDAlign/AlignmentTransaction.h
index 61a270b9288517a825df8801c4ccf97c1dbab0c7..acec73c6aa6efe79df7c4961aa032f6dffb5e463 100644
--- a/DDAlign/include/DDAlign/AlignmentTransaction.h
+++ b/DDAlign/include/DDAlign/AlignmentTransaction.h
@@ -1,8 +1,8 @@
-// $Id: run_plugin.h 1663 2015-03-20 13:54:53Z gaede $
+// $Id$
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
-// Copyright (C) Organisation europ茅enne pour la Recherche nucl茅aire (CERN)
+// Copyright (C) Organisation europeenne pour la Recherche nucleaire (CERN)
 // All rights reserved.
 //
 // For the licensing terms see $DD4hepINSTALL/LICENSE.
diff --git a/DDAlign/include/DDAlign/AlignmentWriter.h b/DDAlign/include/DDAlign/AlignmentWriter.h
index d0dbe35aa4271d29b12c8c978a23dd21401ecc7f..85841bf2f88962d6dd6228662222933ba51aaef0 100644
--- a/DDAlign/include/DDAlign/AlignmentWriter.h
+++ b/DDAlign/include/DDAlign/AlignmentWriter.h
@@ -1,8 +1,8 @@
-// $Id: run_plugin.h 1663 2015-03-20 13:54:53Z gaede $
+// $Id$
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
-// Copyright (C) Organisation europ茅enne pour la Recherche nucl茅aire (CERN)
+// Copyright (C) Organisation europeenne pour la Recherche nucleaire (CERN)
 // All rights reserved.
 //
 // For the licensing terms see $DD4hepINSTALL/LICENSE.
diff --git a/DDAlign/include/DDAlign/DetectorAlignment.h b/DDAlign/include/DDAlign/DetectorAlignment.h
index 9efb03d0f8a3362fd2409f34a7a0d6b2c120b35e..3df31fb9a1f42ff23913d0e5ad4e086e7cc30bba 100644
--- a/DDAlign/include/DDAlign/DetectorAlignment.h
+++ b/DDAlign/include/DDAlign/DetectorAlignment.h
@@ -1,8 +1,8 @@
-// $Id: run_plugin.h 1663 2015-03-20 13:54:53Z gaede $
+// $Id$
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
-// Copyright (C) Organisation europ茅enne pour la Recherche nucl茅aire (CERN)
+// Copyright (C) Organisation europeenne pour la Recherche nucleaire (CERN)
 // All rights reserved.
 //
 // For the licensing terms see $DD4hepINSTALL/LICENSE.
diff --git a/DDAlign/src/AlignmentCache.cpp b/DDAlign/src/AlignmentCache.cpp
index 972b06b47e2055e396dc98693e72cd169de03082..f7ec2c2f6e7af7b519dce37a11e557a2c4005636 100644
--- a/DDAlign/src/AlignmentCache.cpp
+++ b/DDAlign/src/AlignmentCache.cpp
@@ -1,8 +1,8 @@
-// $Id: run_plugin.h 1663 2015-03-20 13:54:53Z gaede $
+// $Id$
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
-// Copyright (C) Organisation europ茅enne pour la Recherche nucl茅aire (CERN)
+// Copyright (C) Organisation europeenne pour la Recherche nucleaire (CERN)
 // All rights reserved.
 //
 // For the licensing terms see $DD4hepINSTALL/LICENSE.
diff --git a/DDAlign/src/AlignmentOperators.cpp b/DDAlign/src/AlignmentOperators.cpp
index 78670ff4cb28a197c00779fc59e62716147cebd8..c8d1df23bf45216332402f39c63beeb1635a84b7 100644
--- a/DDAlign/src/AlignmentOperators.cpp
+++ b/DDAlign/src/AlignmentOperators.cpp
@@ -1,8 +1,8 @@
-// $Id: run_plugin.h 1663 2015-03-20 13:54:53Z gaede $
+// $Id$
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
-// Copyright (C) Organisation europ茅enne pour la Recherche nucl茅aire (CERN)
+// Copyright (C) Organisation europeenne pour la Recherche nucleaire (CERN)
 // All rights reserved.
 //
 // For the licensing terms see $DD4hepINSTALL/LICENSE.
diff --git a/DDAlign/src/AlignmentParser.cpp b/DDAlign/src/AlignmentParser.cpp
index 2a5682b8c0bc7ff195a2fcdc2700488d15b243a9..b09e4150823ce5954e30e58a9c29c6783aa1d84a 100644
--- a/DDAlign/src/AlignmentParser.cpp
+++ b/DDAlign/src/AlignmentParser.cpp
@@ -1,8 +1,8 @@
-// $Id: run_plugin.h 1663 2015-03-20 13:54:53Z gaede $
+// $Id$
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
-// Copyright (C) Organisation europ茅enne pour la Recherche nucl茅aire (CERN)
+// Copyright (C) Organisation europeenne pour la Recherche nucleaire (CERN)
 // All rights reserved.
 //
 // For the licensing terms see $DD4hepINSTALL/LICENSE.
diff --git a/DDAlign/src/AlignmentStack.cpp b/DDAlign/src/AlignmentStack.cpp
index e93d8c20c14f77f5d584e6288e0e684ec20845c5..1b01e926ad706e47356cf6d3cb38d1e8d1be9435 100644
--- a/DDAlign/src/AlignmentStack.cpp
+++ b/DDAlign/src/AlignmentStack.cpp
@@ -1,8 +1,8 @@
-// $Id: run_plugin.h 1663 2015-03-20 13:54:53Z gaede $
+// $Id$
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
-// Copyright (C) Organisation europ茅enne pour la Recherche nucl茅aire (CERN)
+// Copyright (C) Organisation europeenne pour la Recherche nucleaire (CERN)
 // All rights reserved.
 //
 // For the licensing terms see $DD4hepINSTALL/LICENSE.
diff --git a/DDAlign/src/AlignmentTags.cpp b/DDAlign/src/AlignmentTags.cpp
index b7d3426780a35c0bb501039d534a843f2b8291f9..a1cf1aae9c0204ee5db7edbb5830c7ca3240bed8 100644
--- a/DDAlign/src/AlignmentTags.cpp
+++ b/DDAlign/src/AlignmentTags.cpp
@@ -1,8 +1,8 @@
-// $Id: run_plugin.h 1663 2015-03-20 13:54:53Z gaede $
+// $Id$
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
-// Copyright (C) Organisation europ茅enne pour la Recherche nucl茅aire (CERN)
+// Copyright (C) Organisation europeenne pour la Recherche nucleaire (CERN)
 // All rights reserved.
 //
 // For the licensing terms see $DD4hepINSTALL/LICENSE.
diff --git a/DDAlign/src/AlignmentTransaction.cpp b/DDAlign/src/AlignmentTransaction.cpp
index db1a19edfcd9d79960c34338f20aa1c7a0350a2d..8b4ae91fee39bfadd200dc418496262b4fd14ade 100644
--- a/DDAlign/src/AlignmentTransaction.cpp
+++ b/DDAlign/src/AlignmentTransaction.cpp
@@ -1,8 +1,8 @@
-// $Id: run_plugin.h 1663 2015-03-20 13:54:53Z gaede $
+// $Id$
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
-// Copyright (C) Organisation europ茅enne pour la Recherche nucl茅aire (CERN)
+// Copyright (C) Organisation europeenne pour la Recherche nucleaire (CERN)
 // All rights reserved.
 //
 // For the licensing terms see $DD4hepINSTALL/LICENSE.
diff --git a/DDAlign/src/AlignmentWriter.cpp b/DDAlign/src/AlignmentWriter.cpp
index 67ff0bb35745f9bc2f906795c14d1fe8db94691d..5ba48f70a3725040c8459199d768f15bf88e1205 100644
--- a/DDAlign/src/AlignmentWriter.cpp
+++ b/DDAlign/src/AlignmentWriter.cpp
@@ -1,8 +1,8 @@
-// $Id: run_plugin.h 1663 2015-03-20 13:54:53Z gaede $
+// $Id$
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
-// Copyright (C) Organisation europ茅enne pour la Recherche nucl茅aire (CERN)
+// Copyright (C) Organisation europeenne pour la Recherche nucleaire (CERN)
 // All rights reserved.
 //
 // For the licensing terms see $DD4hepINSTALL/LICENSE.
diff --git a/DDAlign/src/DetectorAlignment.cpp b/DDAlign/src/DetectorAlignment.cpp
index 4c69d95eb895b174b84db21d0f44dd3df114ab43..39563ae8f17a406f7c799086ee4be34b160e0c63 100644
--- a/DDAlign/src/DetectorAlignment.cpp
+++ b/DDAlign/src/DetectorAlignment.cpp
@@ -1,8 +1,8 @@
-// $Id: run_plugin.h 1663 2015-03-20 13:54:53Z gaede $
+// $Id$
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
-// Copyright (C) Organisation europ茅enne pour la Recherche nucl茅aire (CERN)
+// Copyright (C) Organisation europeenne pour la Recherche nucleaire (CERN)
 // All rights reserved.
 //
 // For the licensing terms see $DD4hepINSTALL/LICENSE.
diff --git a/DDCond/CMakeLists.txt b/DDCond/CMakeLists.txt
index 216c7df57083d619cb0bfb959c2a0d8651c314a2..614f91b79d0317681555b11f58b3eacec197d184 100644
--- a/DDCond/CMakeLists.txt
+++ b/DDCond/CMakeLists.txt
@@ -1,8 +1,8 @@
-# $Id: Handle.h 570 2013-05-17 07:47:11Z markus.frank $
+# $Id$
 #==========================================================================
 #  AIDA Detector description implementation for LCD
 #--------------------------------------------------------------------------
-# Copyright (C) Organisation europ茅enne pour la Recherche nucl茅aire (CERN)
+# Copyright (C) Organisation europeenne pour la Recherche nucleaire (CERN)
 # All rights reserved.
 #
 # For the licensing terms see $DD4hepINSTALL/LICENSE.
diff --git a/DDCond/include/DDCond/ConditionValidator.h b/DDCond/include/DDCond/ConditionValidator.h
index bb496551f835aa283262cdb8321b2188b0a90720..ad1f6cb050c510f88e24a181776a9eb38eb75d89 100644
--- a/DDCond/include/DDCond/ConditionValidator.h
+++ b/DDCond/include/DDCond/ConditionValidator.h
@@ -1,8 +1,8 @@
-// $Id: run_plugin.h 1663 2015-03-20 13:54:53Z gaede $
+// $Id$
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
-// Copyright (C) Organisation europ茅enne pour la Recherche nucl茅aire (CERN)
+// Copyright (C) Organisation europeenne pour la Recherche nucleaire (CERN)
 // All rights reserved.
 //
 // For the licensing terms see $DD4hepINSTALL/LICENSE.
diff --git a/DDCond/include/DDCond/ConditionsHandler.h b/DDCond/include/DDCond/ConditionsHandler.h
index 2fee1c8d3194268a1afd7e6dc455c685e752eba6..10622a217388bd62b37073833476ad783ec9d408 100644
--- a/DDCond/include/DDCond/ConditionsHandler.h
+++ b/DDCond/include/DDCond/ConditionsHandler.h
@@ -1,8 +1,8 @@
-// $Id: run_plugin.h 1663 2015-03-20 13:54:53Z gaede $
+// $Id$
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
-// Copyright (C) Organisation europ茅enne pour la Recherche nucl茅aire (CERN)
+// Copyright (C) Organisation europeenne pour la Recherche nucleaire (CERN)
 // All rights reserved.
 //
 // For the licensing terms see $DD4hepINSTALL/LICENSE.
diff --git a/DDCond/include/DDCond/ConditionsOperators.h b/DDCond/include/DDCond/ConditionsOperators.h
index 6ff70d542a99f462506cc72b41d58928c389c0d1..5de94cb5531f2e8614f5dc8833b969143588afbb 100644
--- a/DDCond/include/DDCond/ConditionsOperators.h
+++ b/DDCond/include/DDCond/ConditionsOperators.h
@@ -1,8 +1,8 @@
-// $Id: run_plugin.h 1663 2015-03-20 13:54:53Z gaede $
+// $Id$
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
-// Copyright (C) Organisation europ茅enne pour la Recherche nucl茅aire (CERN)
+// Copyright (C) Organisation europeenne pour la Recherche nucleaire (CERN)
 // All rights reserved.
 //
 // For the licensing terms see $DD4hepINSTALL/LICENSE.
diff --git a/DDCond/include/DDCond/ConditionsStack.h b/DDCond/include/DDCond/ConditionsStack.h
index 343a82298f054e50bdafd445b9e7a25a16b5c49f..0da3cda20f6066e19db6f932ed96c1d47e5509b7 100644
--- a/DDCond/include/DDCond/ConditionsStack.h
+++ b/DDCond/include/DDCond/ConditionsStack.h
@@ -1,8 +1,8 @@
-// $Id: run_plugin.h 1663 2015-03-20 13:54:53Z gaede $
+// $Id$
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
-// Copyright (C) Organisation europ茅enne pour la Recherche nucl茅aire (CERN)
+// Copyright (C) Organisation europeenne pour la Recherche nucleaire (CERN)
 // All rights reserved.
 //
 // For the licensing terms see $DD4hepINSTALL/LICENSE.
diff --git a/DDCond/include/DDCond/ConditionsTags.h b/DDCond/include/DDCond/ConditionsTags.h
index 52176ce76d326aa86f9a14e8878b5bfea38082a5..17ccefc6c054b909f724643683152749fc83f0c8 100644
--- a/DDCond/include/DDCond/ConditionsTags.h
+++ b/DDCond/include/DDCond/ConditionsTags.h
@@ -1,8 +1,8 @@
-// $Id: run_plugin.h 1663 2015-03-20 13:54:53Z gaede $
+// $Id$
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
-// Copyright (C) Organisation europ茅enne pour la Recherche nucl茅aire (CERN)
+// Copyright (C) Organisation europeenne pour la Recherche nucleaire (CERN)
 // All rights reserved.
 //
 // For the licensing terms see $DD4hepINSTALL/LICENSE.
diff --git a/DDCond/include/DDCond/ConditionsTransaction.h b/DDCond/include/DDCond/ConditionsTransaction.h
index 1ee2468a281a1193489661d45fcf31e1dd840b56..e8267c717e8ebc2014d9ba0f50381d86195d5d1d 100644
--- a/DDCond/include/DDCond/ConditionsTransaction.h
+++ b/DDCond/include/DDCond/ConditionsTransaction.h
@@ -1,8 +1,8 @@
-// $Id: run_plugin.h 1663 2015-03-20 13:54:53Z gaede $
+// $Id$
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
-// Copyright (C) Organisation europ茅enne pour la Recherche nucl茅aire (CERN)
+// Copyright (C) Organisation europeenne pour la Recherche nucleaire (CERN)
 // All rights reserved.
 //
 // For the licensing terms see $DD4hepINSTALL/LICENSE.
diff --git a/DDCond/src/ConditionTest.cpp b/DDCond/src/ConditionTest.cpp
index 8b922df3effcb95e42087ab15ac6c6d813c86933..5db6649a390bb0ab20555cb80b5fbad896d71e9d 100644
--- a/DDCond/src/ConditionTest.cpp
+++ b/DDCond/src/ConditionTest.cpp
@@ -1,8 +1,8 @@
-// $Id: run_plugin.h 1663 2015-03-20 13:54:53Z gaede $
+// $Id$
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
-// Copyright (C) Organisation europ茅enne pour la Recherche nucl茅aire (CERN)
+// Copyright (C) Organisation europeenne pour la Recherche nucleaire (CERN)
 // All rights reserved.
 //
 // For the licensing terms see $DD4hepINSTALL/LICENSE.
diff --git a/DDCond/src/ConditionValidator.cpp b/DDCond/src/ConditionValidator.cpp
index df4f8c5c6cbe8274c8a10a43baad3fa658eba59b..63a89888c94f79d70784f65e3db5223c73194c4a 100644
--- a/DDCond/src/ConditionValidator.cpp
+++ b/DDCond/src/ConditionValidator.cpp
@@ -1,8 +1,8 @@
-// $Id: run_plugin.h 1663 2015-03-20 13:54:53Z gaede $
+// $Id$
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
-// Copyright (C) Organisation europ茅enne pour la Recherche nucl茅aire (CERN)
+// Copyright (C) Organisation europeenne pour la Recherche nucleaire (CERN)
 // All rights reserved.
 //
 // For the licensing terms see $DD4hepINSTALL/LICENSE.
diff --git a/DDCond/src/ConditionsHandler.cpp b/DDCond/src/ConditionsHandler.cpp
index a7fa9e51378127faab2a179f8d4b225670f89ede..abb4544176b1acf91bc95305702f819553c48490 100644
--- a/DDCond/src/ConditionsHandler.cpp
+++ b/DDCond/src/ConditionsHandler.cpp
@@ -1,8 +1,8 @@
-// $Id: run_plugin.h 1663 2015-03-20 13:54:53Z gaede $
+// $Id$
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
-// Copyright (C) Organisation europ茅enne pour la Recherche nucl茅aire (CERN)
+// Copyright (C) Organisation europeenne pour la Recherche nucleaire (CERN)
 // All rights reserved.
 //
 // For the licensing terms see $DD4hepINSTALL/LICENSE.
diff --git a/DDCond/src/ConditionsParser.cpp b/DDCond/src/ConditionsParser.cpp
index 3067ecb0597b34aed12a614d8f6699dffe190d9f..481333599da36ee4452f5a7e71c48ceee3bf89e2 100644
--- a/DDCond/src/ConditionsParser.cpp
+++ b/DDCond/src/ConditionsParser.cpp
@@ -1,8 +1,8 @@
-// $Id: run_plugin.h 1663 2015-03-20 13:54:53Z gaede $
+// $Id$
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
-// Copyright (C) Organisation europ茅enne pour la Recherche nucl茅aire (CERN)
+// Copyright (C) Organisation europeenne pour la Recherche nucleaire (CERN)
 // All rights reserved.
 //
 // For the licensing terms see $DD4hepINSTALL/LICENSE.
diff --git a/DDCond/src/ConditionsStack.cpp b/DDCond/src/ConditionsStack.cpp
index 5628914e49d92a00f1e8f9d71dbbd38b0ffbd4a7..fc2e21e39375dbc305e6c5467d14dc72df0e4685 100644
--- a/DDCond/src/ConditionsStack.cpp
+++ b/DDCond/src/ConditionsStack.cpp
@@ -1,8 +1,8 @@
-// $Id: run_plugin.h 1663 2015-03-20 13:54:53Z gaede $
+// $Id$
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
-// Copyright (C) Organisation europ茅enne pour la Recherche nucl茅aire (CERN)
+// Copyright (C) Organisation europeenne pour la Recherche nucleaire (CERN)
 // All rights reserved.
 //
 // For the licensing terms see $DD4hepINSTALL/LICENSE.
diff --git a/DDCond/src/ConditionsTags.cpp b/DDCond/src/ConditionsTags.cpp
index b42448478e34f260722e302f2d2b148835b8a966..6d12540ef7e8c79de88333e0c5336b28ef4bbaf3 100644
--- a/DDCond/src/ConditionsTags.cpp
+++ b/DDCond/src/ConditionsTags.cpp
@@ -1,8 +1,8 @@
-// $Id: run_plugin.h 1663 2015-03-20 13:54:53Z gaede $
+// $Id$
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
-// Copyright (C) Organisation europ茅enne pour la Recherche nucl茅aire (CERN)
+// Copyright (C) Organisation europeenne pour la Recherche nucleaire (CERN)
 // All rights reserved.
 //
 // For the licensing terms see $DD4hepINSTALL/LICENSE.
diff --git a/DDCond/src/ConditionsTransaction.cpp b/DDCond/src/ConditionsTransaction.cpp
index 1f671f5dbda84c41b8363a2330769791959700eb..c8328506931115f32a3614d221fbeabf219ff649 100644
--- a/DDCond/src/ConditionsTransaction.cpp
+++ b/DDCond/src/ConditionsTransaction.cpp
@@ -1,8 +1,8 @@
-// $Id: run_plugin.h 1663 2015-03-20 13:54:53Z gaede $
+// $Id$
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
-// Copyright (C) Organisation europ茅enne pour la Recherche nucl茅aire (CERN)
+// Copyright (C) Organisation europeenne pour la Recherche nucleaire (CERN)
 // All rights reserved.
 //
 // For the licensing terms see $DD4hepINSTALL/LICENSE.
diff --git a/DDCore/CMakeLists.txt b/DDCore/CMakeLists.txt
index 6a7b39e9f4f3ec3949b8c47b906a2be93aef14ea..e28bdccf9ad67cf639028eb99a8a4668f9aef5da 100644
--- a/DDCore/CMakeLists.txt
+++ b/DDCore/CMakeLists.txt
@@ -1,8 +1,8 @@
-# $Id: Handle.h 570 2013-05-17 07:47:11Z markus.frank $
+# $Id$
 #==========================================================================
 #  AIDA Detector description implementation for LCD
 #--------------------------------------------------------------------------
-# Copyright (C) Organisation europ茅enne pour la Recherche nucl茅aire (CERN)
+# Copyright (C) Organisation europeenne pour la Recherche nucleaire (CERN)
 # All rights reserved.
 #
 # For the licensing terms see $DD4hepINSTALL/LICENSE.
diff --git a/DDCore/include/DD4hep/Alignment.h b/DDCore/include/DD4hep/Alignment.h
index 0b6a36f610ad78eb3e6bf4f90bbfe290deaa2bb9..56a96935a0fcf615b15ecc14d05b38e465458196 100644
--- a/DDCore/include/DD4hep/Alignment.h
+++ b/DDCore/include/DD4hep/Alignment.h
@@ -1,8 +1,8 @@
-// $Id: Handle.h 570 2013-05-17 07:47:11Z markus.frank $
+// $Id$
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
-// Copyright (C) Organisation europ茅enne pour la Recherche nucl茅aire (CERN)
+// Copyright (C) Organisation europeenne pour la Recherche nucleaire (CERN)
 // All rights reserved.
 //
 // For the licensing terms see $DD4hepINSTALL/LICENSE.
diff --git a/DDCore/include/DD4hep/BasicGrammar.h b/DDCore/include/DD4hep/BasicGrammar.h
index 322f910b440274380e46a30a2030bee4ad7829e0..7126f6a1b24ba732e41a9d3e164e9b0808d5b737 100644
--- a/DDCore/include/DD4hep/BasicGrammar.h
+++ b/DDCore/include/DD4hep/BasicGrammar.h
@@ -1,8 +1,8 @@
-// $Id: Handle.h 570 2013-05-17 07:47:11Z markus.frank $
+// $Id$
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
-// Copyright (C) Organisation europ茅enne pour la Recherche nucl茅aire (CERN)
+// Copyright (C) Organisation europeenne pour la Recherche nucleaire (CERN)
 // All rights reserved.
 //
 // For the licensing terms see $DD4hepINSTALL/LICENSE.
diff --git a/DDCore/include/DD4hep/Callback.h b/DDCore/include/DD4hep/Callback.h
index 099c7a1bf84e53ee6304d36dfb67733220123274..9672d249a861678e39f122c69636b3273e89805d 100644
--- a/DDCore/include/DD4hep/Callback.h
+++ b/DDCore/include/DD4hep/Callback.h
@@ -1,8 +1,8 @@
-// $Id: Handle.h 570 2013-05-17 07:47:11Z markus.frank $
+// $Id$
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
-// Copyright (C) Organisation europ茅enne pour la Recherche nucl茅aire (CERN)
+// Copyright (C) Organisation europeenne pour la Recherche nucleaire (CERN)
 // All rights reserved.
 //
 // For the licensing terms see $DD4hepINSTALL/LICENSE.
diff --git a/DDCore/include/DD4hep/ConditionTypes.h b/DDCore/include/DD4hep/ConditionTypes.h
index 45de0fff0d23e829b522f0d0c77ae2df711f18ed..9da242660aaa76b4c86def031bb2c7338de409fd 100644
--- a/DDCore/include/DD4hep/ConditionTypes.h
+++ b/DDCore/include/DD4hep/ConditionTypes.h
@@ -1,8 +1,8 @@
-// $Id: Handle.h 570 2013-05-17 07:47:11Z markus.frank $
+// $Id$
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
-// Copyright (C) Organisation europ茅enne pour la Recherche nucl茅aire (CERN)
+// Copyright (C) Organisation europeenne pour la Recherche nucleaire (CERN)
 // All rights reserved.
 //
 // For the licensing terms see $DD4hepINSTALL/LICENSE.
diff --git a/DDCore/include/DD4hep/Conditions.h b/DDCore/include/DD4hep/Conditions.h
index 5df198dbdbe66193a9f756ef4fba80be52ec8416..e09ba800c0146785ff959aa649370cab668577bd 100644
--- a/DDCore/include/DD4hep/Conditions.h
+++ b/DDCore/include/DD4hep/Conditions.h
@@ -1,8 +1,8 @@
-// $Id: Handle.h 570 2013-05-17 07:47:11Z markus.frank $
+// $Id$
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
-// Copyright (C) Organisation europ茅enne pour la Recherche nucl茅aire (CERN)
+// Copyright (C) Organisation europeenne pour la Recherche nucleaire (CERN)
 // All rights reserved.
 //
 // For the licensing terms see $DD4hepINSTALL/LICENSE.
diff --git a/DDCore/include/DD4hep/DD4hepRootPersistency.h b/DDCore/include/DD4hep/DD4hepRootPersistency.h
index 2b4d01e1dbd5c818e2ee03b254b8e2fdd98c8247..c73142adc21a2b97a2d8927ed015a8baf8b896c0 100644
--- a/DDCore/include/DD4hep/DD4hepRootPersistency.h
+++ b/DDCore/include/DD4hep/DD4hepRootPersistency.h
@@ -1,8 +1,8 @@
-// $Id: Handle.h 570 2013-05-17 07:47:11Z markus.frank $
+// $Id$
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
-// Copyright (C) Organisation europ茅enne pour la Recherche nucl茅aire (CERN)
+// Copyright (C) Organisation europeenne pour la Recherche nucleaire (CERN)
 // All rights reserved.
 //
 // For the licensing terms see $DD4hepINSTALL/LICENSE.
diff --git a/DDCore/include/DD4hep/DD4hepUnits.h b/DDCore/include/DD4hep/DD4hepUnits.h
index d87e962b7d2dbdbfd62da09b3bb08972e34d01db..4b4f38006920aae7334aed01c03781e1716380bd 100644
--- a/DDCore/include/DD4hep/DD4hepUnits.h
+++ b/DDCore/include/DD4hep/DD4hepUnits.h
@@ -1,8 +1,8 @@
-// $Id: Handle.h 570 2013-05-17 07:47:11Z markus.frank $
+// $Id$
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
-// Copyright (C) Organisation europ茅enne pour la Recherche nucl茅aire (CERN)
+// Copyright (C) Organisation europeenne pour la Recherche nucleaire (CERN)
 // All rights reserved.
 //
 // For the licensing terms see $DD4hepINSTALL/LICENSE.
diff --git a/DDCore/include/DD4hep/DetFactoryHelper.h b/DDCore/include/DD4hep/DetFactoryHelper.h
index e7cd3f90e2b84424d59013a7e06ac9d1d0970810..16d867c7ad498cf7ab875dc9ccf644927e41ffc5 100644
--- a/DDCore/include/DD4hep/DetFactoryHelper.h
+++ b/DDCore/include/DD4hep/DetFactoryHelper.h
@@ -2,7 +2,7 @@
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
-// Copyright (C) Organisation europ茅enne pour la Recherche nucl茅aire (CERN)
+// Copyright (C) Organisation europeenne pour la Recherche nucleaire (CERN)
 // All rights reserved.
 //
 // For the licensing terms see $DD4hepINSTALL/LICENSE.
diff --git a/DDCore/include/DD4hep/Detector.h b/DDCore/include/DD4hep/Detector.h
index 1a4d6aa1e496e97c8d8065c11c880578b289834a..1c51f5f8aad81a4fcfa20e7da417013b76fe46db 100644
--- a/DDCore/include/DD4hep/Detector.h
+++ b/DDCore/include/DD4hep/Detector.h
@@ -2,7 +2,7 @@
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
-// Copyright (C) Organisation europ茅enne pour la Recherche nucl茅aire (CERN)
+// Copyright (C) Organisation europeenne pour la Recherche nucleaire (CERN)
 // All rights reserved.
 //
 // For the licensing terms see $DD4hepINSTALL/LICENSE.
diff --git a/DDCore/include/DD4hep/DetectorTools.h b/DDCore/include/DD4hep/DetectorTools.h
index 9fe9b0534f5176e8443b117f24ec49e911fb1486..6f5656a822ae2ed35544b97135bf836e33f1bff8 100644
--- a/DDCore/include/DD4hep/DetectorTools.h
+++ b/DDCore/include/DD4hep/DetectorTools.h
@@ -1,8 +1,8 @@
-// $Id: Handle.h 570 2013-05-17 07:47:11Z markus.frank $
+// $Id$
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
-// Copyright (C) Organisation europ茅enne pour la Recherche nucl茅aire (CERN)
+// Copyright (C) Organisation europeenne pour la Recherche nucleaire (CERN)
 // All rights reserved.
 //
 // For the licensing terms see $DD4hepINSTALL/LICENSE.
diff --git a/DDCore/include/DD4hep/Dictionary.h b/DDCore/include/DD4hep/Dictionary.h
index 82761a173c4d8cc7ea6a2f6a67ddd8d2a8daef55..7b45915190efe24845b8007813fbf30b273f0a92 100644
--- a/DDCore/include/DD4hep/Dictionary.h
+++ b/DDCore/include/DD4hep/Dictionary.h
@@ -1,8 +1,8 @@
-// $Id: Handle.h 570 2013-05-17 07:47:11Z markus.frank $
+// $Id$
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
-// Copyright (C) Organisation europ茅enne pour la Recherche nucl茅aire (CERN)
+// Copyright (C) Organisation europeenne pour la Recherche nucleaire (CERN)
 // All rights reserved.
 //
 // For the licensing terms see $DD4hepINSTALL/LICENSE.
diff --git a/DDCore/include/DD4hep/Exceptions.h b/DDCore/include/DD4hep/Exceptions.h
index a1e9464cbf1d846d87bce4926106b8afd222a907..42eb317b25df4f2e0a22d6040f22fad46e878e1d 100644
--- a/DDCore/include/DD4hep/Exceptions.h
+++ b/DDCore/include/DD4hep/Exceptions.h
@@ -1,8 +1,8 @@
-// $Id: Handle.h 570 2013-05-17 07:47:11Z markus.frank $
+// $Id$
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
-// Copyright (C) Organisation europ茅enne pour la Recherche nucl茅aire (CERN)
+// Copyright (C) Organisation europeenne pour la Recherche nucleaire (CERN)
 // All rights reserved.
 //
 // For the licensing terms see $DD4hepINSTALL/LICENSE.
diff --git a/DDCore/include/DD4hep/Factories.h b/DDCore/include/DD4hep/Factories.h
index 6b9ec9b84b29c0644aba43362925a4b7aad9846d..5f55e5f7ac8ed105c965399fa634221b848824c0 100644
--- a/DDCore/include/DD4hep/Factories.h
+++ b/DDCore/include/DD4hep/Factories.h
@@ -2,7 +2,7 @@
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
-// Copyright (C) Organisation europ茅enne pour la Recherche nucl茅aire (CERN)
+// Copyright (C) Organisation europeenne pour la Recherche nucleaire (CERN)
 // All rights reserved.
 //
 // For the licensing terms see $DD4hepINSTALL/LICENSE.
diff --git a/DDCore/include/DD4hep/FieldTypes.h b/DDCore/include/DD4hep/FieldTypes.h
index 0439f7272cbf507a18d0b0efe7ab2c93c146c5cf..5dfd65be3172eb452d401163c2d152838a930061 100644
--- a/DDCore/include/DD4hep/FieldTypes.h
+++ b/DDCore/include/DD4hep/FieldTypes.h
@@ -2,7 +2,7 @@
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
-// Copyright (C) Organisation europ茅enne pour la Recherche nucl茅aire (CERN)
+// Copyright (C) Organisation europeenne pour la Recherche nucleaire (CERN)
 // All rights reserved.
 //
 // For the licensing terms see $DD4hepINSTALL/LICENSE.
diff --git a/DDCore/include/DD4hep/Fields.h b/DDCore/include/DD4hep/Fields.h
index 5a0962462c190c449e2bc6efc404f578262b8b47..da485721564e77750702912219e7e85083dfa2f8 100644
--- a/DDCore/include/DD4hep/Fields.h
+++ b/DDCore/include/DD4hep/Fields.h
@@ -2,7 +2,7 @@
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
-// Copyright (C) Organisation europ茅enne pour la Recherche nucl茅aire (CERN)
+// Copyright (C) Organisation europeenne pour la Recherche nucleaire (CERN)
 // All rights reserved.
 //
 // For the licensing terms see $DD4hepINSTALL/LICENSE.
diff --git a/DDCore/include/DD4hep/GeoHandler.h b/DDCore/include/DD4hep/GeoHandler.h
index 4dcbd01a83461a49040299bc3e4fd9d3f169d3c2..41b1578325872efedbbd56ce867fda05480c280d 100644
--- a/DDCore/include/DD4hep/GeoHandler.h
+++ b/DDCore/include/DD4hep/GeoHandler.h
@@ -2,7 +2,7 @@
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
-// Copyright (C) Organisation europ茅enne pour la Recherche nucl茅aire (CERN)
+// Copyright (C) Organisation europeenne pour la Recherche nucleaire (CERN)
 // All rights reserved.
 //
 // For the licensing terms see $DD4hepINSTALL/LICENSE.
diff --git a/DDCore/include/DD4hep/Handle.h b/DDCore/include/DD4hep/Handle.h
index 7f0015e7ccbf411e5f65f36368f5a53589505044..467f21c2593ef1ad7fe73b7cbda30b7b3ba2ebbd 100644
--- a/DDCore/include/DD4hep/Handle.h
+++ b/DDCore/include/DD4hep/Handle.h
@@ -2,7 +2,7 @@
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
-// Copyright (C) Organisation europ茅enne pour la Recherche nucl茅aire (CERN)
+// Copyright (C) Organisation europeenne pour la Recherche nucleaire (CERN)
 // All rights reserved.
 //
 // For the licensing terms see $DD4hepINSTALL/LICENSE.
diff --git a/DDCore/include/DD4hep/Handle.inl b/DDCore/include/DD4hep/Handle.inl
index 1d9ef3c7023116a66919777a65d9aef361665610..971e5bf74e0105696ed916d49dc8be77e6a4ee5d 100644
--- a/DDCore/include/DD4hep/Handle.inl
+++ b/DDCore/include/DD4hep/Handle.inl
@@ -1,8 +1,8 @@
-// $Id: Handle.h 570 2013-05-17 07:47:11Z markus.frank $
+// $Id$
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
-// Copyright (C) Organisation europ茅enne pour la Recherche nucl茅aire (CERN)
+// Copyright (C) Organisation europeenne pour la Recherche nucleaire (CERN)
 // All rights reserved.
 //
 // For the licensing terms see $DD4hepINSTALL/LICENSE.
diff --git a/DDCore/include/DD4hep/IDDescriptor.h b/DDCore/include/DD4hep/IDDescriptor.h
index d1b5e42b710b7736d51dec19cbf50132e0c30d6f..0930f8a7879b850cc0da5f0313447dd5ef85e66c 100644
--- a/DDCore/include/DD4hep/IDDescriptor.h
+++ b/DDCore/include/DD4hep/IDDescriptor.h
@@ -2,7 +2,7 @@
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
-// Copyright (C) Organisation europ茅enne pour la Recherche nucl茅aire (CERN)
+// Copyright (C) Organisation europeenne pour la Recherche nucleaire (CERN)
 // All rights reserved.
 //
 // For the licensing terms see $DD4hepINSTALL/LICENSE.
diff --git a/DDCore/include/DD4hep/InstanceCount.h b/DDCore/include/DD4hep/InstanceCount.h
index 970898557e881d14a835ef90484e4f2cbf33eb9e..0fe867739c211ad09b4d1f27497735b22485b860 100644
--- a/DDCore/include/DD4hep/InstanceCount.h
+++ b/DDCore/include/DD4hep/InstanceCount.h
@@ -1,8 +1,8 @@
-// $Id: Handle.h 570 2013-05-17 07:47:11Z markus.frank $
+// $Id$
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
-// Copyright (C) Organisation europ茅enne pour la Recherche nucl茅aire (CERN)
+// Copyright (C) Organisation europeenne pour la Recherche nucleaire (CERN)
 // All rights reserved.
 //
 // For the licensing terms see $DD4hepINSTALL/LICENSE.
diff --git a/DDCore/include/DD4hep/LCDD.h b/DDCore/include/DD4hep/LCDD.h
index 7ab6a0a61d43723ae6967c30f790f3cb1adc1244..e9ff0719191d18bb07efad68e44a120d145e8d25 100644
--- a/DDCore/include/DD4hep/LCDD.h
+++ b/DDCore/include/DD4hep/LCDD.h
@@ -2,7 +2,7 @@
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
-// Copyright (C) Organisation europ茅enne pour la Recherche nucl茅aire (CERN)
+// Copyright (C) Organisation europeenne pour la Recherche nucleaire (CERN)
 // All rights reserved.
 //
 // For the licensing terms see $DD4hepINSTALL/LICENSE.
diff --git a/DDCore/include/DD4hep/LCDDData.h b/DDCore/include/DD4hep/LCDDData.h
index 24b1766e325a3ba8102254e0a399dcb7ed25f786..fa38cb7c4fe6969c52cc119ef8099b46b4640f66 100644
--- a/DDCore/include/DD4hep/LCDDData.h
+++ b/DDCore/include/DD4hep/LCDDData.h
@@ -1,8 +1,8 @@
-// $Id: Handle.h 570 2013-05-17 07:47:11Z markus.frank $
+// $Id$
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
-// Copyright (C) Organisation europ茅enne pour la Recherche nucl茅aire (CERN)
+// Copyright (C) Organisation europeenne pour la Recherche nucleaire (CERN)
 // All rights reserved.
 //
 // For the licensing terms see $DD4hepINSTALL/LICENSE.
diff --git a/DDCore/include/DD4hep/LCDDHelper.h b/DDCore/include/DD4hep/LCDDHelper.h
index ad1d2de4c1da68154ca94c9203e0ed871b6143c6..a74e834c958573a9e8413faa367c050235780991 100644
--- a/DDCore/include/DD4hep/LCDDHelper.h
+++ b/DDCore/include/DD4hep/LCDDHelper.h
@@ -1,8 +1,8 @@
-// $Id: Handle.h 570 2013-05-17 07:47:11Z markus.frank $
+// $Id$
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
-// Copyright (C) Organisation europ茅enne pour la Recherche nucl茅aire (CERN)
+// Copyright (C) Organisation europeenne pour la Recherche nucleaire (CERN)
 // All rights reserved.
 //
 // For the licensing terms see $DD4hepINSTALL/LICENSE.
diff --git a/DDCore/include/DD4hep/LCDDLoad.h b/DDCore/include/DD4hep/LCDDLoad.h
index d229168265d43561b9b26f1badd61ebb4d53fcbd..88aade6d19360a906d294498e26ac60fb8396496 100644
--- a/DDCore/include/DD4hep/LCDDLoad.h
+++ b/DDCore/include/DD4hep/LCDDLoad.h
@@ -1,8 +1,8 @@
-// $Id: Handle.h 570 2013-05-17 07:47:11Z markus.frank $
+// $Id$
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
-// Copyright (C) Organisation europ茅enne pour la Recherche nucl茅aire (CERN)
+// Copyright (C) Organisation europeenne pour la Recherche nucleaire (CERN)
 // All rights reserved.
 //
 // For the licensing terms see $DD4hepINSTALL/LICENSE.
diff --git a/DDCore/include/DD4hep/MatrixHelpers.h b/DDCore/include/DD4hep/MatrixHelpers.h
index efe916b9719e46016dd79014c92c3437e39b7f20..0c86f3f72f86f160e5449af44e3b8522e2fbf26e 100644
--- a/DDCore/include/DD4hep/MatrixHelpers.h
+++ b/DDCore/include/DD4hep/MatrixHelpers.h
@@ -1,8 +1,8 @@
-// $Id: Handle.h 570 2013-05-17 07:47:11Z markus.frank $
+// $Id$
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
-// Copyright (C) Organisation europ茅enne pour la Recherche nucl茅aire (CERN)
+// Copyright (C) Organisation europeenne pour la Recherche nucleaire (CERN)
 // All rights reserved.
 //
 // For the licensing terms see $DD4hepINSTALL/LICENSE.
diff --git a/DDCore/include/DD4hep/Memory.h b/DDCore/include/DD4hep/Memory.h
index f26da6727de91e7130c4a55730bc466f4b22e1a0..129a7a2d3c720f429752db3575543a8e172c0b47 100644
--- a/DDCore/include/DD4hep/Memory.h
+++ b/DDCore/include/DD4hep/Memory.h
@@ -1,8 +1,8 @@
-// $Id: Handle.h 570 2013-05-17 07:47:11Z markus.frank $
+// $Id$
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
-// Copyright (C) Organisation europ茅enne pour la Recherche nucl茅aire (CERN)
+// Copyright (C) Organisation europeenne pour la Recherche nucleaire (CERN)
 // All rights reserved.
 //
 // For the licensing terms see $DD4hepINSTALL/LICENSE.
diff --git a/DDCore/include/DD4hep/NamedObject.h b/DDCore/include/DD4hep/NamedObject.h
index 22e525c07cd96f4a13826d3814e8c217718ecffe..fdf6c8a7c97fd870c246776b581926e0f9ee78cd 100644
--- a/DDCore/include/DD4hep/NamedObject.h
+++ b/DDCore/include/DD4hep/NamedObject.h
@@ -1,8 +1,8 @@
-// $Id: Handle.h 570 2013-05-17 07:47:11Z markus.frank $
+// $Id$
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
-// Copyright (C) Organisation europ茅enne pour la Recherche nucl茅aire (CERN)
+// Copyright (C) Organisation europeenne pour la Recherche nucleaire (CERN)
 // All rights reserved.
 //
 // For the licensing terms see $DD4hepINSTALL/LICENSE.
diff --git a/DDCore/include/DD4hep/ObjectExtensions.h b/DDCore/include/DD4hep/ObjectExtensions.h
index 0f24fbd05f20500d996a5a835c1f238b28512867..3fa6f2e157276e5ea292627f6b30996de47892b3 100644
--- a/DDCore/include/DD4hep/ObjectExtensions.h
+++ b/DDCore/include/DD4hep/ObjectExtensions.h
@@ -1,8 +1,8 @@
-// $Id: Handle.h 570 2013-05-17 07:47:11Z markus.frank $
+// $Id$
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
-// Copyright (C) Organisation europ茅enne pour la Recherche nucl茅aire (CERN)
+// Copyright (C) Organisation europeenne pour la Recherche nucleaire (CERN)
 // All rights reserved.
 //
 // For the licensing terms see $DD4hepINSTALL/LICENSE.
diff --git a/DDCore/include/DD4hep/Objects.h b/DDCore/include/DD4hep/Objects.h
index 4bd2ae6ae8c6ddd4266f0948bb404e9406bfa732..aae936eb0d5bbe5b8911c51559701f1961b6f273 100644
--- a/DDCore/include/DD4hep/Objects.h
+++ b/DDCore/include/DD4hep/Objects.h
@@ -2,7 +2,7 @@
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
-// Copyright (C) Organisation europ茅enne pour la Recherche nucl茅aire (CERN)
+// Copyright (C) Organisation europeenne pour la Recherche nucleaire (CERN)
 // All rights reserved.
 //
 // For the licensing terms see $DD4hepINSTALL/LICENSE.
diff --git a/DDCore/include/DD4hep/Parsers.h b/DDCore/include/DD4hep/Parsers.h
index 6e031813be4bf8ec45cb42be39875178acc2e8ce..1eb68a5264426275a863de0781c39ca32293cba2 100644
--- a/DDCore/include/DD4hep/Parsers.h
+++ b/DDCore/include/DD4hep/Parsers.h
@@ -1,8 +1,8 @@
-// $Id: Handle.h 570 2013-05-17 07:47:11Z markus.frank $
+// $Id$
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
-// Copyright (C) Organisation europ茅enne pour la Recherche nucl茅aire (CERN)
+// Copyright (C) Organisation europeenne pour la Recherche nucleaire (CERN)
 // All rights reserved.
 //
 // For the licensing terms see $DD4hepINSTALL/LICENSE.
diff --git a/DDCore/include/DD4hep/Plugins.h b/DDCore/include/DD4hep/Plugins.h
index 0ba91b1627a7914243fe8da930d8357d9faf08b8..176b888138cdc1c2ffb0da1918dea58b924fb8d6 100644
--- a/DDCore/include/DD4hep/Plugins.h
+++ b/DDCore/include/DD4hep/Plugins.h
@@ -1,8 +1,8 @@
-// $Id: Handle.h 570 2013-05-17 07:47:11Z markus.frank $
+// $Id$
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
-// Copyright (C) Organisation europ茅enne pour la Recherche nucl茅aire (CERN)
+// Copyright (C) Organisation europeenne pour la Recherche nucleaire (CERN)
 // All rights reserved.
 //
 // For the licensing terms see $DD4hepINSTALL/LICENSE.
diff --git a/DDCore/include/DD4hep/Plugins.inl b/DDCore/include/DD4hep/Plugins.inl
index b389af524a1a034872194915c4a3463b2727931c..5841e0c2dfb49befc990b310a223e98c5e76fadf 100644
--- a/DDCore/include/DD4hep/Plugins.inl
+++ b/DDCore/include/DD4hep/Plugins.inl
@@ -1,8 +1,8 @@
-// $Id: Handle.h 570 2013-05-17 07:47:11Z markus.frank $
+// $Id$
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
-// Copyright (C) Organisation europ茅enne pour la Recherche nucl茅aire (CERN)
+// Copyright (C) Organisation europeenne pour la Recherche nucleaire (CERN)
 // All rights reserved.
 //
 // For the licensing terms see $DD4hepINSTALL/LICENSE.
diff --git a/DDCore/include/DD4hep/Primitives.h b/DDCore/include/DD4hep/Primitives.h
index 3ab23162860fc9fa4a9469dfcfde42358b027910..056aad51cc9684f34f8acf6aa1555a69e7478b98 100644
--- a/DDCore/include/DD4hep/Primitives.h
+++ b/DDCore/include/DD4hep/Primitives.h
@@ -1,8 +1,8 @@
-// $Id: Handle.h 570 2013-05-17 07:47:11Z markus.frank $
+// $Id$
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
-// Copyright (C) Organisation europ茅enne pour la Recherche nucl茅aire (CERN)
+// Copyright (C) Organisation europeenne pour la Recherche nucleaire (CERN)
 // All rights reserved.
 //
 // For the licensing terms see $DD4hepINSTALL/LICENSE.
diff --git a/DDCore/include/DD4hep/Printout.h b/DDCore/include/DD4hep/Printout.h
index 40e07a4039d1c6eb0d584652e356bba44440162a..6c59062cd561a2bf73213fe961c63cf9ff151f53 100644
--- a/DDCore/include/DD4hep/Printout.h
+++ b/DDCore/include/DD4hep/Printout.h
@@ -1,8 +1,8 @@
-// $Id: Handle.h 570 2013-05-17 07:47:11Z markus.frank $
+// $Id$
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
-// Copyright (C) Organisation europ茅enne pour la Recherche nucl茅aire (CERN)
+// Copyright (C) Organisation europeenne pour la Recherche nucleaire (CERN)
 // All rights reserved.
 //
 // For the licensing terms see $DD4hepINSTALL/LICENSE.
diff --git a/DDCore/include/DD4hep/Readout.h b/DDCore/include/DD4hep/Readout.h
index 88b8a66b560b076c35c65e239246674ed3c7ce52..3998ee6aa6e52ee46c11f9995db09f154cd18635 100644
--- a/DDCore/include/DD4hep/Readout.h
+++ b/DDCore/include/DD4hep/Readout.h
@@ -2,7 +2,7 @@
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
-// Copyright (C) Organisation europ茅enne pour la Recherche nucl茅aire (CERN)
+// Copyright (C) Organisation europeenne pour la Recherche nucleaire (CERN)
 // All rights reserved.
 //
 // For the licensing terms see $DD4hepINSTALL/LICENSE.
diff --git a/DDCore/include/DD4hep/Segmentations.h b/DDCore/include/DD4hep/Segmentations.h
index 39e93b0ccb072d9d1e56a7ad11887b2a39f8c3dc..9553f94a93f43dd2ed08d0d7657cefc6643f45cb 100644
--- a/DDCore/include/DD4hep/Segmentations.h
+++ b/DDCore/include/DD4hep/Segmentations.h
@@ -2,7 +2,7 @@
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
-// Copyright (C) Organisation europ茅enne pour la Recherche nucl茅aire (CERN)
+// Copyright (C) Organisation europeenne pour la Recherche nucleaire (CERN)
 // All rights reserved.
 //
 // For the licensing terms see $DD4hepINSTALL/LICENSE.
diff --git a/DDCore/include/DD4hep/Shapes.h b/DDCore/include/DD4hep/Shapes.h
index 612f48ca2d15bb63e422640cd09ff0b0e3ad206f..e02e4656ae555efadd99a7daf36c824ae24c78d7 100644
--- a/DDCore/include/DD4hep/Shapes.h
+++ b/DDCore/include/DD4hep/Shapes.h
@@ -2,7 +2,7 @@
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
-// Copyright (C) Organisation europ茅enne pour la Recherche nucl茅aire (CERN)
+// Copyright (C) Organisation europeenne pour la Recherche nucleaire (CERN)
 // All rights reserved.
 //
 // For the licensing terms see $DD4hepINSTALL/LICENSE.
diff --git a/DDCore/include/DD4hep/SurfaceInstaller.h b/DDCore/include/DD4hep/SurfaceInstaller.h
index cf3b8d292ece60e9374dea23432e8cb9caa7ab2e..b8845960981f0e06f1b3049ac545bc8fa86d2103 100644
--- a/DDCore/include/DD4hep/SurfaceInstaller.h
+++ b/DDCore/include/DD4hep/SurfaceInstaller.h
@@ -1,8 +1,8 @@
-// $Id: Handle.h 570 2013-05-17 07:47:11Z markus.frank $
+// $Id$
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
-// Copyright (C) Organisation europ茅enne pour la Recherche nucl茅aire (CERN)
+// Copyright (C) Organisation europeenne pour la Recherche nucleaire (CERN)
 // All rights reserved.
 //
 // For the licensing terms see $DD4hepINSTALL/LICENSE.
diff --git a/DDCore/include/DD4hep/ToStream.h b/DDCore/include/DD4hep/ToStream.h
index 63743a4c16adf2d7283bf13a4c0a808428522c8d..3c771c7cb5bed67ba5edcd2de6b061cfb87c42b8 100644
--- a/DDCore/include/DD4hep/ToStream.h
+++ b/DDCore/include/DD4hep/ToStream.h
@@ -1,8 +1,8 @@
-// $Id: Handle.h 570 2013-05-17 07:47:11Z markus.frank $
+// $Id$
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
-// Copyright (C) Organisation europ茅enne pour la Recherche nucl茅aire (CERN)
+// Copyright (C) Organisation europeenne pour la Recherche nucleaire (CERN)
 // All rights reserved.
 //
 // For the licensing terms see $DD4hepINSTALL/LICENSE.
diff --git a/DDCore/include/DD4hep/VolumeManager.h b/DDCore/include/DD4hep/VolumeManager.h
index a63be26f56d83fa2ce842c385cf542e77ed4425c..4ed5fe4871118284e5b8d7ab4fa70e2983293500 100644
--- a/DDCore/include/DD4hep/VolumeManager.h
+++ b/DDCore/include/DD4hep/VolumeManager.h
@@ -1,8 +1,8 @@
-// $Id: Handle.h 570 2013-05-17 07:47:11Z markus.frank $
+// $Id$
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
-// Copyright (C) Organisation europ茅enne pour la Recherche nucl茅aire (CERN)
+// Copyright (C) Organisation europeenne pour la Recherche nucleaire (CERN)
 // All rights reserved.
 //
 // For the licensing terms see $DD4hepINSTALL/LICENSE.
diff --git a/DDCore/include/DD4hep/Volumes.h b/DDCore/include/DD4hep/Volumes.h
index 1975f13c270ad952f9c8215a47fdf481d81db1e6..6fdad02dfe19df1b906c1d89ca8d6dd8cb920b3a 100644
--- a/DDCore/include/DD4hep/Volumes.h
+++ b/DDCore/include/DD4hep/Volumes.h
@@ -2,7 +2,7 @@
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
-// Copyright (C) Organisation europ茅enne pour la Recherche nucl茅aire (CERN)
+// Copyright (C) Organisation europeenne pour la Recherche nucleaire (CERN)
 // All rights reserved.
 //
 // For the licensing terms see $DD4hepINSTALL/LICENSE.
diff --git a/DDCore/include/DD4hep/config.h b/DDCore/include/DD4hep/config.h
index c8b451275732e633d54b80646b279e4a3bb471ba..7fc707c8fd983a6a703cd9795060634e733fc109 100644
--- a/DDCore/include/DD4hep/config.h
+++ b/DDCore/include/DD4hep/config.h
@@ -1,8 +1,8 @@
-// $Id: Handle.h 570 2013-05-17 07:47:11Z markus.frank $
+// $Id$
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
-// Copyright (C) Organisation europ茅enne pour la Recherche nucl茅aire (CERN)
+// Copyright (C) Organisation europeenne pour la Recherche nucleaire (CERN)
 // All rights reserved.
 //
 // For the licensing terms see $DD4hepINSTALL/LICENSE.
diff --git a/DDCore/include/DD4hep/objects/BasicGrammar_inl.h b/DDCore/include/DD4hep/objects/BasicGrammar_inl.h
index e7aeb72040e20889efe4949b731b97ac63803db7..1a2746e5c1dff11195f4b4ccf3aa128e7c49663e 100644
--- a/DDCore/include/DD4hep/objects/BasicGrammar_inl.h
+++ b/DDCore/include/DD4hep/objects/BasicGrammar_inl.h
@@ -1,8 +1,8 @@
-// $Id: Handle.h 570 2013-05-17 07:47:11Z markus.frank $
+// $Id$
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
-// Copyright (C) Organisation europ茅enne pour la Recherche nucl茅aire (CERN)
+// Copyright (C) Organisation europeenne pour la Recherche nucleaire (CERN)
 // All rights reserved.
 //
 // For the licensing terms see $DD4hepINSTALL/LICENSE.
diff --git a/DDCore/include/DD4hep/objects/ConditionsInterna.h b/DDCore/include/DD4hep/objects/ConditionsInterna.h
index 41bf3fed4b69dd425b6792e881d775d510f67e6a..3e273683be61044bbc90a9026605f7b896d28b1e 100644
--- a/DDCore/include/DD4hep/objects/ConditionsInterna.h
+++ b/DDCore/include/DD4hep/objects/ConditionsInterna.h
@@ -1,8 +1,8 @@
-// $Id: Handle.h 570 2013-05-17 07:47:11Z markus.frank $
+// $Id$
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
-// Copyright (C) Organisation europ茅enne pour la Recherche nucl茅aire (CERN)
+// Copyright (C) Organisation europeenne pour la Recherche nucleaire (CERN)
 // All rights reserved.
 //
 // For the licensing terms see $DD4hepINSTALL/LICENSE.
diff --git a/DDCore/include/DD4hep/objects/DetectorInterna.h b/DDCore/include/DD4hep/objects/DetectorInterna.h
index 9a77cc2b3631f3213fde8193da423b90f08d9915..169a55c27eed27d3fe98b70fe255a4c1e40ea26a 100644
--- a/DDCore/include/DD4hep/objects/DetectorInterna.h
+++ b/DDCore/include/DD4hep/objects/DetectorInterna.h
@@ -1,8 +1,8 @@
-// $Id: Handle.h 570 2013-05-17 07:47:11Z markus.frank $
+// $Id$
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
-// Copyright (C) Organisation europ茅enne pour la Recherche nucl茅aire (CERN)
+// Copyright (C) Organisation europeenne pour la Recherche nucleaire (CERN)
 // All rights reserved.
 //
 // For the licensing terms see $DD4hepINSTALL/LICENSE.
diff --git a/DDCore/include/DD4hep/objects/ObjectsInterna.h b/DDCore/include/DD4hep/objects/ObjectsInterna.h
index a2ed62884a828ab68bf0c5ad317eec343f93fba6..3a7cdcf6e4a66c227818a625989f2a205dda15ad 100644
--- a/DDCore/include/DD4hep/objects/ObjectsInterna.h
+++ b/DDCore/include/DD4hep/objects/ObjectsInterna.h
@@ -1,8 +1,8 @@
-// $Id: Handle.h 570 2013-05-17 07:47:11Z markus.frank $
+// $Id$
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
-// Copyright (C) Organisation europ茅enne pour la Recherche nucl茅aire (CERN)
+// Copyright (C) Organisation europeenne pour la Recherche nucleaire (CERN)
 // All rights reserved.
 //
 // For the licensing terms see $DD4hepINSTALL/LICENSE.
diff --git a/DDCore/include/DD4hep/objects/VolumeManagerInterna.h b/DDCore/include/DD4hep/objects/VolumeManagerInterna.h
index e8e8f826d0f2e35ffcd9c135ae5af560639fe473..5484be697274a1e0dda21bec2ba00f6e2fcd1be9 100644
--- a/DDCore/include/DD4hep/objects/VolumeManagerInterna.h
+++ b/DDCore/include/DD4hep/objects/VolumeManagerInterna.h
@@ -1,8 +1,8 @@
-// $Id: Handle.h 570 2013-05-17 07:47:11Z markus.frank $
+// $Id$
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
-// Copyright (C) Organisation europ茅enne pour la Recherche nucl茅aire (CERN)
+// Copyright (C) Organisation europeenne pour la Recherche nucleaire (CERN)
 // All rights reserved.
 //
 // For the licensing terms see $DD4hepINSTALL/LICENSE.
diff --git a/DDCore/include/ROOT/LinkDef.h b/DDCore/include/ROOT/LinkDef.h
index ab9e1001635b38a4f7c4840fffe1cdf649a34b0b..6ed673c06fe38bffe5a2d8c4640f5af96fecdd74 100644
--- a/DDCore/include/ROOT/LinkDef.h
+++ b/DDCore/include/ROOT/LinkDef.h
@@ -2,7 +2,7 @@
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
-// Copyright (C) Organisation europ茅enne pour la Recherche nucl茅aire (CERN)
+// Copyright (C) Organisation europeenne pour la Recherche nucleaire (CERN)
 // All rights reserved.
 //
 // For the licensing terms see $DD4hepINSTALL/LICENSE.
diff --git a/DDCore/include/XML/Conversions.h b/DDCore/include/XML/Conversions.h
index 119e7f1b09ead3437fc3e1f6fce2c070c100af73..e35cc3c001d74aa537de4f60d2f30035ffbe5b90 100644
--- a/DDCore/include/XML/Conversions.h
+++ b/DDCore/include/XML/Conversions.h
@@ -2,7 +2,7 @@
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
-// Copyright (C) Organisation europ茅enne pour la Recherche nucl茅aire (CERN)
+// Copyright (C) Organisation europeenne pour la Recherche nucleaire (CERN)
 // All rights reserved.
 //
 // For the licensing terms see $DD4hepINSTALL/LICENSE.
diff --git a/DDCore/include/XML/DocumentHandler.h b/DDCore/include/XML/DocumentHandler.h
index ac1dd7f7dccfaf5afa0ccb2024f2db7226b57ef3..a2e236e528d0919d0c58b3a6ed5f9f9b82ded4ab 100644
--- a/DDCore/include/XML/DocumentHandler.h
+++ b/DDCore/include/XML/DocumentHandler.h
@@ -2,7 +2,7 @@
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
-// Copyright (C) Organisation europ茅enne pour la Recherche nucl茅aire (CERN)
+// Copyright (C) Organisation europeenne pour la Recherche nucleaire (CERN)
 // All rights reserved.
 //
 // For the licensing terms see $DD4hepINSTALL/LICENSE.
diff --git a/DDCore/include/XML/Evaluator.h b/DDCore/include/XML/Evaluator.h
index c542ddf42c1362fee0b1b9a11d7cebaffcacb189..f564539b8257c2b2493bf625e100a0f179b124fd 100644
--- a/DDCore/include/XML/Evaluator.h
+++ b/DDCore/include/XML/Evaluator.h
@@ -2,7 +2,7 @@
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
-// Copyright (C) Organisation europ茅enne pour la Recherche nucl茅aire (CERN)
+// Copyright (C) Organisation europeenne pour la Recherche nucleaire (CERN)
 // All rights reserved.
 //
 // For the licensing terms see $DD4hepINSTALL/LICENSE.
diff --git a/DDCore/include/XML/Layering.h b/DDCore/include/XML/Layering.h
index 1ba9231f2c6d52f64af15ebe2300ad2a804f6427..7a482c32ea310e314e9078bb6b8eb0f8f7baeaaf 100644
--- a/DDCore/include/XML/Layering.h
+++ b/DDCore/include/XML/Layering.h
@@ -2,7 +2,7 @@
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
-// Copyright (C) Organisation europ茅enne pour la Recherche nucl茅aire (CERN)
+// Copyright (C) Organisation europeenne pour la Recherche nucleaire (CERN)
 // All rights reserved.
 //
 // For the licensing terms see $DD4hepINSTALL/LICENSE.
diff --git a/DDCore/include/XML/UnicodeValues.h b/DDCore/include/XML/UnicodeValues.h
index 8b3a93a3bc6edf864d89ff2bae234a94fb4d6afe..1a3e7de5bb0a5d4919b0df9c9a9a32b74a15867d 100644
--- a/DDCore/include/XML/UnicodeValues.h
+++ b/DDCore/include/XML/UnicodeValues.h
@@ -2,7 +2,7 @@
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
-// Copyright (C) Organisation europ茅enne pour la Recherche nucl茅aire (CERN)
+// Copyright (C) Organisation europeenne pour la Recherche nucleaire (CERN)
 // All rights reserved.
 //
 // For the licensing terms see $DD4hepINSTALL/LICENSE.
diff --git a/DDCore/include/XML/Utilities.h b/DDCore/include/XML/Utilities.h
index f74284f6c06db2c489617ef79fb13c36156366d2..d86152cc3956cad92db2ba272ee7fef395ac1af4 100644
--- a/DDCore/include/XML/Utilities.h
+++ b/DDCore/include/XML/Utilities.h
@@ -1,8 +1,8 @@
-// $Id: Handle.h 570 2013-05-17 07:47:11Z markus.frank $
+// $Id$
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
-// Copyright (C) Organisation europ茅enne pour la Recherche nucl茅aire (CERN)
+// Copyright (C) Organisation europeenne pour la Recherche nucleaire (CERN)
 // All rights reserved.
 //
 // For the licensing terms see $DD4hepINSTALL/LICENSE.
diff --git a/DDCore/include/XML/XMLChildValue.h b/DDCore/include/XML/XMLChildValue.h
index 8f8c635d8298b27d2c37fa2c532e3d66f4162179..4d4dfc3a21bf393109f65cee93f940db3ddab3a4 100644
--- a/DDCore/include/XML/XMLChildValue.h
+++ b/DDCore/include/XML/XMLChildValue.h
@@ -1,8 +1,8 @@
-// $Id: Handle.h 570 2013-05-17 07:47:11Z markus.frank $
+// $Id$
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
-// Copyright (C) Organisation europ茅enne pour la Recherche nucl茅aire (CERN)
+// Copyright (C) Organisation europeenne pour la Recherche nucleaire (CERN)
 // All rights reserved.
 //
 // For the licensing terms see $DD4hepINSTALL/LICENSE.
diff --git a/DDCore/include/XML/XMLDetector.h b/DDCore/include/XML/XMLDetector.h
index f19b1b25ca28be6d4d1ba1002e66a247b7476a62..eaf605139cdb20ed7b29c4bfcec34fe5a96865c2 100644
--- a/DDCore/include/XML/XMLDetector.h
+++ b/DDCore/include/XML/XMLDetector.h
@@ -2,7 +2,7 @@
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
-// Copyright (C) Organisation europ茅enne pour la Recherche nucl茅aire (CERN)
+// Copyright (C) Organisation europeenne pour la Recherche nucleaire (CERN)
 // All rights reserved.
 //
 // For the licensing terms see $DD4hepINSTALL/LICENSE.
diff --git a/DDCore/include/XML/XMLDimension.h b/DDCore/include/XML/XMLDimension.h
index 0f9869baee337062dd7abd7a13472ef4c69a3409..25eb8a37fe3b902b21fa771e047fc538d1f5136f 100644
--- a/DDCore/include/XML/XMLDimension.h
+++ b/DDCore/include/XML/XMLDimension.h
@@ -1,8 +1,8 @@
-// $Id: Handle.h 570 2013-05-17 07:47:11Z markus.frank $
+// $Id$
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
-// Copyright (C) Organisation europ茅enne pour la Recherche nucl茅aire (CERN)
+// Copyright (C) Organisation europeenne pour la Recherche nucleaire (CERN)
 // All rights reserved.
 //
 // For the licensing terms see $DD4hepINSTALL/LICENSE.
diff --git a/DDCore/include/XML/XMLElements.h b/DDCore/include/XML/XMLElements.h
index 956bb74120a269782723e3c29744076675c4e1bc..2eb6fb4bc5731d28284fb7100db45e93df6623c8 100644
--- a/DDCore/include/XML/XMLElements.h
+++ b/DDCore/include/XML/XMLElements.h
@@ -2,7 +2,7 @@
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
-// Copyright (C) Organisation europ茅enne pour la Recherche nucl茅aire (CERN)
+// Copyright (C) Organisation europeenne pour la Recherche nucleaire (CERN)
 // All rights reserved.
 //
 // For the licensing terms see $DD4hepINSTALL/LICENSE.
diff --git a/DDCore/include/XML/XMLTags.h b/DDCore/include/XML/XMLTags.h
index 5732956c694d33990c9aa3ebf07ca4edf0815f0b..9b75b6fb304178a74f3da1e6e609670d16e3e0c0 100644
--- a/DDCore/include/XML/XMLTags.h
+++ b/DDCore/include/XML/XMLTags.h
@@ -2,7 +2,7 @@
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
-// Copyright (C) Organisation europ茅enne pour la Recherche nucl茅aire (CERN)
+// Copyright (C) Organisation europeenne pour la Recherche nucleaire (CERN)
 // All rights reserved.
 //
 // For the licensing terms see $DD4hepINSTALL/LICENSE.
diff --git a/DDCore/include/XML/config.h b/DDCore/include/XML/config.h
index 472ef8473d678e34a2548372201c44c12a00b2aa..084d2f4122930ecea0d8bc100734dc5397ca8dfd 100644
--- a/DDCore/include/XML/config.h
+++ b/DDCore/include/XML/config.h
@@ -2,7 +2,7 @@
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
-// Copyright (C) Organisation europ茅enne pour la Recherche nucl茅aire (CERN)
+// Copyright (C) Organisation europeenne pour la Recherche nucleaire (CERN)
 // All rights reserved.
 //
 // For the licensing terms see $DD4hepINSTALL/LICENSE.
diff --git a/DDCore/python/lcdd.py b/DDCore/python/lcdd.py
index b9546c758847030484e7eb10b21d7e1f0d848114..08baace767f225df90b4ccda946052d1bdcd4f7d 100644
--- a/DDCore/python/lcdd.py
+++ b/DDCore/python/lcdd.py
@@ -1,8 +1,8 @@
-# $Id: Handle.h 570 2013-05-17 07:47:11Z markus.frank $
+# $Id$
 #==========================================================================
 #  AIDA Detector description implementation for LCD
 #--------------------------------------------------------------------------
-# Copyright (C) Organisation europ茅enne pour la Recherche nucl茅aire (CERN)
+# Copyright (C) Organisation europeenne pour la Recherche nucleaire (CERN)
 # All rights reserved.
 #
 # For the licensing terms see $DD4hepINSTALL/LICENSE.
diff --git a/DDCore/src/Alignment.cpp b/DDCore/src/Alignment.cpp
index fba675f2d2c0b0658498343562479c5d7c84644e..02ec2f3c0f5230ef46fc9ffeefe6f19c78f73185 100644
--- a/DDCore/src/Alignment.cpp
+++ b/DDCore/src/Alignment.cpp
@@ -1,8 +1,8 @@
-// $Id: Handle.h 570 2013-05-17 07:47:11Z markus.frank $
+// $Id$
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
-// Copyright (C) Organisation europ茅enne pour la Recherche nucl茅aire (CERN)
+// Copyright (C) Organisation europeenne pour la Recherche nucleaire (CERN)
 // All rights reserved.
 //
 // For the licensing terms see $DD4hepINSTALL/LICENSE.
diff --git a/DDCore/src/BasicGrammar.cpp b/DDCore/src/BasicGrammar.cpp
index 2e6602afd2fbe7e92f49c6d5e0ba6c1a9499455d..d81bfe1c7a0cd5a5567f81b081db1a205c9eed36 100644
--- a/DDCore/src/BasicGrammar.cpp
+++ b/DDCore/src/BasicGrammar.cpp
@@ -1,8 +1,8 @@
-// $Id: Handle.h 570 2013-05-17 07:47:11Z markus.frank $
+// $Id$
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
-// Copyright (C) Organisation europ茅enne pour la Recherche nucl茅aire (CERN)
+// Copyright (C) Organisation europeenne pour la Recherche nucleaire (CERN)
 // All rights reserved.
 //
 // For the licensing terms see $DD4hepINSTALL/LICENSE.
diff --git a/DDCore/src/BasicGrammarTypes.cpp b/DDCore/src/BasicGrammarTypes.cpp
index f4d8a9b1d41f3edd65341b8fff5f164e10de94cc..0cce29d22c6c5a810e970b04bab59dd6d99a19f9 100644
--- a/DDCore/src/BasicGrammarTypes.cpp
+++ b/DDCore/src/BasicGrammarTypes.cpp
@@ -1,8 +1,8 @@
-// $Id: Handle.h 570 2013-05-17 07:47:11Z markus.frank $
+// $Id$
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
-// Copyright (C) Organisation europ茅enne pour la Recherche nucl茅aire (CERN)
+// Copyright (C) Organisation europeenne pour la Recherche nucleaire (CERN)
 // All rights reserved.
 //
 // For the licensing terms see $DD4hepINSTALL/LICENSE.
diff --git a/DDCore/src/Callback.cpp b/DDCore/src/Callback.cpp
index 67b4abb951df6424cd721107d86d34d0d8f66098..61801abcbf73751f32795f5b0e211ac9260f13c4 100644
--- a/DDCore/src/Callback.cpp
+++ b/DDCore/src/Callback.cpp
@@ -1,8 +1,8 @@
-// $Id: Handle.h 570 2013-05-17 07:47:11Z markus.frank $
+// $Id$
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
-// Copyright (C) Organisation europ茅enne pour la Recherche nucl茅aire (CERN)
+// Copyright (C) Organisation europeenne pour la Recherche nucleaire (CERN)
 // All rights reserved.
 //
 // For the licensing terms see $DD4hepINSTALL/LICENSE.
diff --git a/DDCore/src/Conditions.cpp b/DDCore/src/Conditions.cpp
index d1082c8eb37828ee38564baddd9dfa6565e30dce..7e6377ee7907741cdeb07ab2e7438f507e231439 100644
--- a/DDCore/src/Conditions.cpp
+++ b/DDCore/src/Conditions.cpp
@@ -1,8 +1,8 @@
-// $Id: Handle.h 570 2013-05-17 07:47:11Z markus.frank $
+// $Id$
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
-// Copyright (C) Organisation europ茅enne pour la Recherche nucl茅aire (CERN)
+// Copyright (C) Organisation europeenne pour la Recherche nucleaire (CERN)
 // All rights reserved.
 //
 // For the licensing terms see $DD4hepINSTALL/LICENSE.
diff --git a/DDCore/src/ConditionsInterna.cpp b/DDCore/src/ConditionsInterna.cpp
index f4d397e56829a8c611b0b7a3603978631829d52f..869a203ba5a229670a5e787045b5b528da99d74a 100644
--- a/DDCore/src/ConditionsInterna.cpp
+++ b/DDCore/src/ConditionsInterna.cpp
@@ -1,8 +1,8 @@
-// $Id: Handle.h 570 2013-05-17 07:47:11Z markus.frank $
+// $Id$
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
-// Copyright (C) Organisation europ茅enne pour la Recherche nucl茅aire (CERN)
+// Copyright (C) Organisation europeenne pour la Recherche nucleaire (CERN)
 // All rights reserved.
 //
 // For the licensing terms see $DD4hepINSTALL/LICENSE.
diff --git a/DDCore/src/ConditonsTypes.cpp b/DDCore/src/ConditonsTypes.cpp
index c07197e264212f35c80e1f3d09424c3fb874b6b5..7ac14f135b94bd7e9d2340e0040e1005b978690f 100644
--- a/DDCore/src/ConditonsTypes.cpp
+++ b/DDCore/src/ConditonsTypes.cpp
@@ -1,8 +1,8 @@
-// $Id: Handle.h 570 2013-05-17 07:47:11Z markus.frank $
+// $Id$
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
-// Copyright (C) Organisation europ茅enne pour la Recherche nucl茅aire (CERN)
+// Copyright (C) Organisation europeenne pour la Recherche nucleaire (CERN)
 // All rights reserved.
 //
 // For the licensing terms see $DD4hepINSTALL/LICENSE.
diff --git a/DDCore/src/DD4hepRootPersistency.cpp b/DDCore/src/DD4hepRootPersistency.cpp
index a482524d170b446349b4a15f8db361db865e694f..25093f1899f9a8a02c49351b34c44980d3a87ee0 100644
--- a/DDCore/src/DD4hepRootPersistency.cpp
+++ b/DDCore/src/DD4hepRootPersistency.cpp
@@ -1,8 +1,8 @@
-// $Id: Handle.h 570 2013-05-17 07:47:11Z markus.frank $
+// $Id$
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
-// Copyright (C) Organisation europ茅enne pour la Recherche nucl茅aire (CERN)
+// Copyright (C) Organisation europeenne pour la Recherche nucleaire (CERN)
 // All rights reserved.
 //
 // For the licensing terms see $DD4hepINSTALL/LICENSE.
diff --git a/DDCore/src/Detector.cpp b/DDCore/src/Detector.cpp
index d8d84e8a0819b540f1a6543fdab632408a5be181..5b1aeb1ed5bd83e15ca92ee493a09e2793e2da3c 100644
--- a/DDCore/src/Detector.cpp
+++ b/DDCore/src/Detector.cpp
@@ -2,7 +2,7 @@
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
-// Copyright (C) Organisation europ茅enne pour la Recherche nucl茅aire (CERN)
+// Copyright (C) Organisation europeenne pour la Recherche nucleaire (CERN)
 // All rights reserved.
 //
 // For the licensing terms see $DD4hepINSTALL/LICENSE.
diff --git a/DDCore/src/DetectorInterna.cpp b/DDCore/src/DetectorInterna.cpp
index af26f4062af045b4b75c268de5e5dd898b905657..5d64cf5d5f604d55cf0ccf3b494c2401720f6a1e 100644
--- a/DDCore/src/DetectorInterna.cpp
+++ b/DDCore/src/DetectorInterna.cpp
@@ -1,8 +1,8 @@
-// $Id: Handle.h 570 2013-05-17 07:47:11Z markus.frank $
+// $Id$
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
-// Copyright (C) Organisation europ茅enne pour la Recherche nucl茅aire (CERN)
+// Copyright (C) Organisation europeenne pour la Recherche nucleaire (CERN)
 // All rights reserved.
 //
 // For the licensing terms see $DD4hepINSTALL/LICENSE.
diff --git a/DDCore/src/DetectorTools.cpp b/DDCore/src/DetectorTools.cpp
index bd40129968098897e3fcf3ce9eb9d48923783040..0a10a7f6efe2db9be29d49689929314caedddd61 100644
--- a/DDCore/src/DetectorTools.cpp
+++ b/DDCore/src/DetectorTools.cpp
@@ -1,8 +1,8 @@
-// $Id: Handle.h 570 2013-05-17 07:47:11Z markus.frank $
+// $Id$
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
-// Copyright (C) Organisation europ茅enne pour la Recherche nucl茅aire (CERN)
+// Copyright (C) Organisation europeenne pour la Recherche nucleaire (CERN)
 // All rights reserved.
 //
 // For the licensing terms see $DD4hepINSTALL/LICENSE.
diff --git a/DDCore/src/Exceptions.cpp b/DDCore/src/Exceptions.cpp
index 0d51d8fc9ee5e2844a8096cb96ebd1416d2888c5..49fd40835b5cb6b9b7bbe666a3b4ac716bd309b7 100644
--- a/DDCore/src/Exceptions.cpp
+++ b/DDCore/src/Exceptions.cpp
@@ -1,8 +1,8 @@
-// $Id: Handle.h 570 2013-05-17 07:47:11Z markus.frank $
+// $Id$
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
-// Copyright (C) Organisation europ茅enne pour la Recherche nucl茅aire (CERN)
+// Copyright (C) Organisation europeenne pour la Recherche nucleaire (CERN)
 // All rights reserved.
 //
 // For the licensing terms see $DD4hepINSTALL/LICENSE.
diff --git a/DDCore/src/ExpressionEvaluator.cpp b/DDCore/src/ExpressionEvaluator.cpp
index 7b01f446991476ed9ad9363688fb3e103368ff27..67e3966fd000c7e6b8eb3bf06da64c216d67314f 100644
--- a/DDCore/src/ExpressionEvaluator.cpp
+++ b/DDCore/src/ExpressionEvaluator.cpp
@@ -2,7 +2,7 @@
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
-// Copyright (C) Organisation europ茅enne pour la Recherche nucl茅aire (CERN)
+// Copyright (C) Organisation europeenne pour la Recherche nucleaire (CERN)
 // All rights reserved.
 //
 // For the licensing terms see $DD4hepINSTALL/LICENSE.
diff --git a/DDCore/src/FieldTypes.cpp b/DDCore/src/FieldTypes.cpp
index 88199ee003fadb9ab0afb27802248bab308601eb..99f933bfb66659e8463d6153482f1977bb6a6db6 100644
--- a/DDCore/src/FieldTypes.cpp
+++ b/DDCore/src/FieldTypes.cpp
@@ -2,7 +2,7 @@
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
-// Copyright (C) Organisation europ茅enne pour la Recherche nucl茅aire (CERN)
+// Copyright (C) Organisation europeenne pour la Recherche nucleaire (CERN)
 // All rights reserved.
 //
 // For the licensing terms see $DD4hepINSTALL/LICENSE.
diff --git a/DDCore/src/Fields.cpp b/DDCore/src/Fields.cpp
index af48581645eb29bbeb7fa61563aae59918f0d6c7..0b727c73ac8bdff12a7b66c1da6e40e167f4c0bf 100644
--- a/DDCore/src/Fields.cpp
+++ b/DDCore/src/Fields.cpp
@@ -2,7 +2,7 @@
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
-// Copyright (C) Organisation europ茅enne pour la Recherche nucl茅aire (CERN)
+// Copyright (C) Organisation europeenne pour la Recherche nucleaire (CERN)
 // All rights reserved.
 //
 // For the licensing terms see $DD4hepINSTALL/LICENSE.
diff --git a/DDCore/src/GeoHandler.cpp b/DDCore/src/GeoHandler.cpp
index 43f4325bc128026340e5fe9db623c66cce27dab3..625614957ded154bf4a73774e993bc4d3045e721 100644
--- a/DDCore/src/GeoHandler.cpp
+++ b/DDCore/src/GeoHandler.cpp
@@ -2,7 +2,7 @@
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
-// Copyright (C) Organisation europ茅enne pour la Recherche nucl茅aire (CERN)
+// Copyright (C) Organisation europeenne pour la Recherche nucleaire (CERN)
 // All rights reserved.
 //
 // For the licensing terms see $DD4hepINSTALL/LICENSE.
diff --git a/DDCore/src/GeometryTreeDump.cpp b/DDCore/src/GeometryTreeDump.cpp
index 82632e295e1f57870f347ee3fe63ad06df12f1e0..ce5a8b5789137a8d75028e22e9f8f4abe097633b 100644
--- a/DDCore/src/GeometryTreeDump.cpp
+++ b/DDCore/src/GeometryTreeDump.cpp
@@ -2,7 +2,7 @@
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
-// Copyright (C) Organisation europ茅enne pour la Recherche nucl茅aire (CERN)
+// Copyright (C) Organisation europeenne pour la Recherche nucleaire (CERN)
 // All rights reserved.
 //
 // For the licensing terms see $DD4hepINSTALL/LICENSE.
diff --git a/DDCore/src/GeometryTreeDump.h b/DDCore/src/GeometryTreeDump.h
index d899845b045b240a5d15ad024a87ddfa13f4d8d7..ed1730ee28c7f8ee7f8ab5c74f51ef83b050aae1 100644
--- a/DDCore/src/GeometryTreeDump.h
+++ b/DDCore/src/GeometryTreeDump.h
@@ -2,7 +2,7 @@
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
-// Copyright (C) Organisation europ茅enne pour la Recherche nucl茅aire (CERN)
+// Copyright (C) Organisation europeenne pour la Recherche nucleaire (CERN)
 // All rights reserved.
 //
 // For the licensing terms see $DD4hepINSTALL/LICENSE.
diff --git a/DDCore/src/Handle.cpp b/DDCore/src/Handle.cpp
index 8e0f1de44f152c47d10c9137e7466af2823c3911..33e520f5575f994192e452d55340e8dc9029371a 100644
--- a/DDCore/src/Handle.cpp
+++ b/DDCore/src/Handle.cpp
@@ -2,7 +2,7 @@
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
-// Copyright (C) Organisation europ茅enne pour la Recherche nucl茅aire (CERN)
+// Copyright (C) Organisation europeenne pour la Recherche nucleaire (CERN)
 // All rights reserved.
 //
 // For the licensing terms see $DD4hepINSTALL/LICENSE.
diff --git a/DDCore/src/IDDescriptor.cpp b/DDCore/src/IDDescriptor.cpp
index f3d94641eaad2c864d419623adc54b1dc12bc7d9..3d579b4debe1e078a92aee079259fbca072b99af 100644
--- a/DDCore/src/IDDescriptor.cpp
+++ b/DDCore/src/IDDescriptor.cpp
@@ -2,7 +2,7 @@
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
-// Copyright (C) Organisation europ茅enne pour la Recherche nucl茅aire (CERN)
+// Copyright (C) Organisation europeenne pour la Recherche nucleaire (CERN)
 // All rights reserved.
 //
 // For the licensing terms see $DD4hepINSTALL/LICENSE.
diff --git a/DDCore/src/InstanceCount.cpp b/DDCore/src/InstanceCount.cpp
index 97502ec4ce0f2cffc65f8778dab6884dd6bd8dd7..3fd7244b4ad4fe5b6f60a8d92040f05f1235378f 100644
--- a/DDCore/src/InstanceCount.cpp
+++ b/DDCore/src/InstanceCount.cpp
@@ -1,8 +1,8 @@
-// $Id: Handle.h 570 2013-05-17 07:47:11Z markus.frank $
+// $Id$
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
-// Copyright (C) Organisation europ茅enne pour la Recherche nucl茅aire (CERN)
+// Copyright (C) Organisation europeenne pour la Recherche nucleaire (CERN)
 // All rights reserved.
 //
 // For the licensing terms see $DD4hepINSTALL/LICENSE.
diff --git a/DDCore/src/LCDDData.cpp b/DDCore/src/LCDDData.cpp
index 98cda856d97ab64fe1d045f26f8b6259900e2e44..bc6d389f13d1b53852fc5af9f843d2765ab2c082 100644
--- a/DDCore/src/LCDDData.cpp
+++ b/DDCore/src/LCDDData.cpp
@@ -1,8 +1,8 @@
-// $Id: Handle.h 570 2013-05-17 07:47:11Z markus.frank $
+// $Id$
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
-// Copyright (C) Organisation europ茅enne pour la Recherche nucl茅aire (CERN)
+// Copyright (C) Organisation europeenne pour la Recherche nucleaire (CERN)
 // All rights reserved.
 //
 // For the licensing terms see $DD4hepINSTALL/LICENSE.
diff --git a/DDCore/src/LCDDHelper.cpp b/DDCore/src/LCDDHelper.cpp
index f20b9d70fb67df80203d09461af1fadd47f87885..c483e829075bf787c1e89f8f78c654f652e1d022 100644
--- a/DDCore/src/LCDDHelper.cpp
+++ b/DDCore/src/LCDDHelper.cpp
@@ -1,8 +1,8 @@
-// $Id: Handle.h 570 2013-05-17 07:47:11Z markus.frank $
+// $Id$
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
-// Copyright (C) Organisation europ茅enne pour la Recherche nucl茅aire (CERN)
+// Copyright (C) Organisation europeenne pour la Recherche nucleaire (CERN)
 // All rights reserved.
 //
 // For the licensing terms see $DD4hepINSTALL/LICENSE.
diff --git a/DDCore/src/LCDDImp.cpp b/DDCore/src/LCDDImp.cpp
index 65ccc0bcc2b3d0197b6e1ddf0897acecbfc51976..080043b165200489dc94b47f5d81dd273e462600 100644
--- a/DDCore/src/LCDDImp.cpp
+++ b/DDCore/src/LCDDImp.cpp
@@ -2,7 +2,7 @@
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
-// Copyright (C) Organisation europ茅enne pour la Recherche nucl茅aire (CERN)
+// Copyright (C) Organisation europeenne pour la Recherche nucleaire (CERN)
 // All rights reserved.
 //
 // For the licensing terms see $DD4hepINSTALL/LICENSE.
diff --git a/DDCore/src/LCDDImp.h b/DDCore/src/LCDDImp.h
index 0277651fd08de66c06657a3e52e628f1583cc18c..5dd269977ca1d59dc170c54bc2889d0704d0e96d 100644
--- a/DDCore/src/LCDDImp.h
+++ b/DDCore/src/LCDDImp.h
@@ -2,7 +2,7 @@
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
-// Copyright (C) Organisation europ茅enne pour la Recherche nucl茅aire (CERN)
+// Copyright (C) Organisation europeenne pour la Recherche nucleaire (CERN)
 // All rights reserved.
 //
 // For the licensing terms see $DD4hepINSTALL/LICENSE.
diff --git a/DDCore/src/LCDDLoad.cpp b/DDCore/src/LCDDLoad.cpp
index 394781a457d1a84c889737bb244378accf935aad..af9795420c7ebab57b059a557207b958b96d76a0 100644
--- a/DDCore/src/LCDDLoad.cpp
+++ b/DDCore/src/LCDDLoad.cpp
@@ -1,8 +1,8 @@
-// $Id: Handle.h 570 2013-05-17 07:47:11Z markus.frank $
+// $Id$
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
-// Copyright (C) Organisation europ茅enne pour la Recherche nucl茅aire (CERN)
+// Copyright (C) Organisation europeenne pour la Recherche nucleaire (CERN)
 // All rights reserved.
 //
 // For the licensing terms see $DD4hepINSTALL/LICENSE.
diff --git a/DDCore/src/MatrixHelpers.cpp b/DDCore/src/MatrixHelpers.cpp
index d222939f5c88bb902e406707bac0e7159a3cbabe..a18e04f5050ca3a726c628f42c099ab14a9d3c25 100644
--- a/DDCore/src/MatrixHelpers.cpp
+++ b/DDCore/src/MatrixHelpers.cpp
@@ -1,8 +1,8 @@
-// $Id: Handle.h 570 2013-05-17 07:47:11Z markus.frank $
+// $Id$
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
-// Copyright (C) Organisation europ茅enne pour la Recherche nucl茅aire (CERN)
+// Copyright (C) Organisation europeenne pour la Recherche nucleaire (CERN)
 // All rights reserved.
 //
 // For the licensing terms see $DD4hepINSTALL/LICENSE.
diff --git a/DDCore/src/NamedObject.cpp b/DDCore/src/NamedObject.cpp
index bdaee9de3d73a92e0fa984fd79452a0fec6bfd85..9464ccddd54b232501aae149771a5a2e522f1fd2 100644
--- a/DDCore/src/NamedObject.cpp
+++ b/DDCore/src/NamedObject.cpp
@@ -1,8 +1,8 @@
-// $Id: Handle.h 570 2013-05-17 07:47:11Z markus.frank $
+// $Id$
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
-// Copyright (C) Organisation europ茅enne pour la Recherche nucl茅aire (CERN)
+// Copyright (C) Organisation europeenne pour la Recherche nucleaire (CERN)
 // All rights reserved.
 //
 // For the licensing terms see $DD4hepINSTALL/LICENSE.
diff --git a/DDCore/src/ObjectExtensions.cpp b/DDCore/src/ObjectExtensions.cpp
index c57c84e5c0b46ba1de72acf9020819f1f1d47169..d6ce863fcd8bcd8115829e3d8f0af94ea845cc59 100644
--- a/DDCore/src/ObjectExtensions.cpp
+++ b/DDCore/src/ObjectExtensions.cpp
@@ -1,8 +1,8 @@
-// $Id: Handle.h 570 2013-05-17 07:47:11Z markus.frank $
+// $Id$
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
-// Copyright (C) Organisation europ茅enne pour la Recherche nucl茅aire (CERN)
+// Copyright (C) Organisation europeenne pour la Recherche nucleaire (CERN)
 // All rights reserved.
 //
 // For the licensing terms see $DD4hepINSTALL/LICENSE.
diff --git a/DDCore/src/Objects.cpp b/DDCore/src/Objects.cpp
index 454a4e2f5610f53f9d7422ae936cbddede1db388..2113e97514bc9fa84caae78cb6fe25e8459f44d8 100644
--- a/DDCore/src/Objects.cpp
+++ b/DDCore/src/Objects.cpp
@@ -2,7 +2,7 @@
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
-// Copyright (C) Organisation europ茅enne pour la Recherche nucl茅aire (CERN)
+// Copyright (C) Organisation europeenne pour la Recherche nucleaire (CERN)
 // All rights reserved.
 //
 // For the licensing terms see $DD4hepINSTALL/LICENSE.
diff --git a/DDCore/src/ObjectsInterna.cpp b/DDCore/src/ObjectsInterna.cpp
index a7afec8c4585331435046b071b401eee6545810c..371cd97eda3510acacb7b9c8d8a8610d84a91b6c 100644
--- a/DDCore/src/ObjectsInterna.cpp
+++ b/DDCore/src/ObjectsInterna.cpp
@@ -1,8 +1,8 @@
-// $Id: Handle.h 570 2013-05-17 07:47:11Z markus.frank $
+// $Id$
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
-// Copyright (C) Organisation europ茅enne pour la Recherche nucl茅aire (CERN)
+// Copyright (C) Organisation europeenne pour la Recherche nucleaire (CERN)
 // All rights reserved.
 //
 // For the licensing terms see $DD4hepINSTALL/LICENSE.
diff --git a/DDCore/src/Plugins.cpp b/DDCore/src/Plugins.cpp
index cb6e2c6d0abd93e3240e7ebecae8c733b14f1c0b..05560c7377f51c825e60584a02604182645089a9 100644
--- a/DDCore/src/Plugins.cpp
+++ b/DDCore/src/Plugins.cpp
@@ -1,8 +1,8 @@
-// $Id: Handle.h 570 2013-05-17 07:47:11Z markus.frank $
+// $Id$
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
-// Copyright (C) Organisation europ茅enne pour la Recherche nucl茅aire (CERN)
+// Copyright (C) Organisation europeenne pour la Recherche nucleaire (CERN)
 // All rights reserved.
 //
 // For the licensing terms see $DD4hepINSTALL/LICENSE.
diff --git a/DDCore/src/Primitives.cpp b/DDCore/src/Primitives.cpp
index be08efca67abb76eaccf5718982168bf61c249b1..2dc267d8c8a996e7be4f5cdbf9197057694bdb5e 100644
--- a/DDCore/src/Primitives.cpp
+++ b/DDCore/src/Primitives.cpp
@@ -1,8 +1,8 @@
-// $Id: Handle.h 570 2013-05-17 07:47:11Z markus.frank $
+// $Id$
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
-// Copyright (C) Organisation europ茅enne pour la Recherche nucl茅aire (CERN)
+// Copyright (C) Organisation europeenne pour la Recherche nucleaire (CERN)
 // All rights reserved.
 //
 // For the licensing terms see $DD4hepINSTALL/LICENSE.
diff --git a/DDCore/src/Printout.cpp b/DDCore/src/Printout.cpp
index 175e29f3c73c821643a6fcde7bc26bbc6aaab4c1..153c188c534834652510dd548331689809e2262d 100644
--- a/DDCore/src/Printout.cpp
+++ b/DDCore/src/Printout.cpp
@@ -1,8 +1,8 @@
-// $Id: Handle.h 570 2013-05-17 07:47:11Z markus.frank $
+// $Id$
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
-// Copyright (C) Organisation europ茅enne pour la Recherche nucl茅aire (CERN)
+// Copyright (C) Organisation europeenne pour la Recherche nucleaire (CERN)
 // All rights reserved.
 //
 // For the licensing terms see $DD4hepINSTALL/LICENSE.
diff --git a/DDCore/src/Readout.cpp b/DDCore/src/Readout.cpp
index 4cd819eb0fa799212ad9c4e6465fe370f113ef31..23705c8d38fa3e1a87fb949af58c169d5a0055b7 100644
--- a/DDCore/src/Readout.cpp
+++ b/DDCore/src/Readout.cpp
@@ -2,7 +2,7 @@
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
-// Copyright (C) Organisation europ茅enne pour la Recherche nucl茅aire (CERN)
+// Copyright (C) Organisation europeenne pour la Recherche nucleaire (CERN)
 // All rights reserved.
 //
 // For the licensing terms see $DD4hepINSTALL/LICENSE.
diff --git a/DDCore/src/Segmentations.cpp b/DDCore/src/Segmentations.cpp
index 129c8528748576359fce44a74d4acb24050c02cb..99f8aa77f17f7ca8f8830ba5c08bd4188b0257f8 100644
--- a/DDCore/src/Segmentations.cpp
+++ b/DDCore/src/Segmentations.cpp
@@ -2,7 +2,7 @@
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
-// Copyright (C) Organisation europ茅enne pour la Recherche nucl茅aire (CERN)
+// Copyright (C) Organisation europeenne pour la Recherche nucleaire (CERN)
 // All rights reserved.
 //
 // For the licensing terms see $DD4hepINSTALL/LICENSE.
diff --git a/DDCore/src/Shapes.cpp b/DDCore/src/Shapes.cpp
index 3c97aaa30af5ac009409ff1020d2c7e0b3948108..0a7987a7b1029843578a44bf3569dd039d0f9655 100644
--- a/DDCore/src/Shapes.cpp
+++ b/DDCore/src/Shapes.cpp
@@ -2,7 +2,7 @@
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
-// Copyright (C) Organisation europ茅enne pour la Recherche nucl茅aire (CERN)
+// Copyright (C) Organisation europeenne pour la Recherche nucleaire (CERN)
 // All rights reserved.
 //
 // For the licensing terms see $DD4hepINSTALL/LICENSE.
diff --git a/DDCore/src/SimpleGDMLWriter.cpp b/DDCore/src/SimpleGDMLWriter.cpp
index e2b9aa9ff33e3d7acd6a4b6b34fbb24b79a9bfed..510857621bd1b0c8f5b068e1e32b49b29fc2836e 100644
--- a/DDCore/src/SimpleGDMLWriter.cpp
+++ b/DDCore/src/SimpleGDMLWriter.cpp
@@ -2,7 +2,7 @@
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
-// Copyright (C) Organisation europ茅enne pour la Recherche nucl茅aire (CERN)
+// Copyright (C) Organisation europeenne pour la Recherche nucleaire (CERN)
 // All rights reserved.
 //
 // For the licensing terms see $DD4hepINSTALL/LICENSE.
diff --git a/DDCore/src/SimpleGDMLWriter.h b/DDCore/src/SimpleGDMLWriter.h
index a1ec405d4d8c9b3974f750c694059751790fdbd7..75e01d6a7e24eef3f884efd9b00dd9cc4ff4bc11 100644
--- a/DDCore/src/SimpleGDMLWriter.h
+++ b/DDCore/src/SimpleGDMLWriter.h
@@ -2,7 +2,7 @@
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
-// Copyright (C) Organisation europ茅enne pour la Recherche nucl茅aire (CERN)
+// Copyright (C) Organisation europeenne pour la Recherche nucleaire (CERN)
 // All rights reserved.
 //
 // For the licensing terms see $DD4hepINSTALL/LICENSE.
diff --git a/DDCore/src/SurfaceInstaller.cpp b/DDCore/src/SurfaceInstaller.cpp
index f14f75f33c73f816308cf89fc0b43c567583be6d..3a4bafadf39543ff6eab93fdc18147ce253e00de 100644
--- a/DDCore/src/SurfaceInstaller.cpp
+++ b/DDCore/src/SurfaceInstaller.cpp
@@ -1,8 +1,8 @@
-// $Id: Handle.h 570 2013-05-17 07:47:11Z markus.frank $
+// $Id$
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
-// Copyright (C) Organisation europ茅enne pour la Recherche nucl茅aire (CERN)
+// Copyright (C) Organisation europeenne pour la Recherche nucleaire (CERN)
 // All rights reserved.
 //
 // For the licensing terms see $DD4hepINSTALL/LICENSE.
diff --git a/DDCore/src/ToStream.cpp b/DDCore/src/ToStream.cpp
index ab5c1738e93e65e38605a404c9d68dbd37fec818..7f81cd68c63ca7cffa8cc0982034f856e33196ee 100644
--- a/DDCore/src/ToStream.cpp
+++ b/DDCore/src/ToStream.cpp
@@ -1,8 +1,8 @@
-// $Id: Handle.h 570 2013-05-17 07:47:11Z markus.frank $
+// $Id$
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
-// Copyright (C) Organisation europ茅enne pour la Recherche nucl茅aire (CERN)
+// Copyright (C) Organisation europeenne pour la Recherche nucleaire (CERN)
 // All rights reserved.
 //
 // For the licensing terms see $DD4hepINSTALL/LICENSE.
diff --git a/DDCore/src/VolumeManager.cpp b/DDCore/src/VolumeManager.cpp
index bd0a98168db5af42f48dc027f7a309eb02c902a7..5a26732a93768730f63edeabc1eb502fddb2ef02 100644
--- a/DDCore/src/VolumeManager.cpp
+++ b/DDCore/src/VolumeManager.cpp
@@ -1,8 +1,8 @@
-// $Id: Handle.h 570 2013-05-17 07:47:11Z markus.frank $
+// $Id$
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
-// Copyright (C) Organisation europ茅enne pour la Recherche nucl茅aire (CERN)
+// Copyright (C) Organisation europeenne pour la Recherche nucleaire (CERN)
 // All rights reserved.
 //
 // For the licensing terms see $DD4hepINSTALL/LICENSE.
diff --git a/DDCore/src/VolumeManagerInterna.cpp b/DDCore/src/VolumeManagerInterna.cpp
index 4e1d8b77f8ab7f0cdd68b1d4bce19b9f4494436b..cbb50403c6dbc06e1783a25739bccedea374730e 100644
--- a/DDCore/src/VolumeManagerInterna.cpp
+++ b/DDCore/src/VolumeManagerInterna.cpp
@@ -1,8 +1,8 @@
-// $Id: Handle.h 570 2013-05-17 07:47:11Z markus.frank $
+// $Id$
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
-// Copyright (C) Organisation europ茅enne pour la Recherche nucl茅aire (CERN)
+// Copyright (C) Organisation europeenne pour la Recherche nucleaire (CERN)
 // All rights reserved.
 //
 // For the licensing terms see $DD4hepINSTALL/LICENSE.
diff --git a/DDCore/src/Volumes.cpp b/DDCore/src/Volumes.cpp
index 9c673dadb1e8998c7a321911a1225ab36e4cf5af..4e954ec35cc2eb0ff4e2eac4d5fe9d2a40ba365f 100644
--- a/DDCore/src/Volumes.cpp
+++ b/DDCore/src/Volumes.cpp
@@ -2,7 +2,7 @@
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
-// Copyright (C) Organisation europ茅enne pour la Recherche nucl茅aire (CERN)
+// Copyright (C) Organisation europeenne pour la Recherche nucleaire (CERN)
 // All rights reserved.
 //
 // For the licensing terms see $DD4hepINSTALL/LICENSE.
diff --git a/DDCore/src/XML/DocumentHandler.cpp b/DDCore/src/XML/DocumentHandler.cpp
index 27de2f6bb2a1d86f969f2f6d92e12972fed500bb..61882d57f81c487f24d7ddc7d114b025f17fee29 100644
--- a/DDCore/src/XML/DocumentHandler.cpp
+++ b/DDCore/src/XML/DocumentHandler.cpp
@@ -2,7 +2,7 @@
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
-// Copyright (C) Organisation europ茅enne pour la Recherche nucl茅aire (CERN)
+// Copyright (C) Organisation europeenne pour la Recherche nucleaire (CERN)
 // All rights reserved.
 //
 // For the licensing terms see $DD4hepINSTALL/LICENSE.
diff --git a/DDCore/src/XML/Layering.cpp b/DDCore/src/XML/Layering.cpp
index 8659a16ff3edf5134ad12a14da892e53f53a014a..ca2c7e8735d0a229636650887a6d4cff80e6fd8a 100644
--- a/DDCore/src/XML/Layering.cpp
+++ b/DDCore/src/XML/Layering.cpp
@@ -2,7 +2,7 @@
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
-// Copyright (C) Organisation europ茅enne pour la Recherche nucl茅aire (CERN)
+// Copyright (C) Organisation europeenne pour la Recherche nucleaire (CERN)
 // All rights reserved.
 //
 // For the licensing terms see $DD4hepINSTALL/LICENSE.
diff --git a/DDCore/src/XML/Utilities.cpp b/DDCore/src/XML/Utilities.cpp
index b5f390af25347dd17aa586096c5882172c90aba1..8902e35cbf4097ca4fb373e0233a6af2e96b05d3 100644
--- a/DDCore/src/XML/Utilities.cpp
+++ b/DDCore/src/XML/Utilities.cpp
@@ -1,8 +1,8 @@
-// $Id: Handle.h 570 2013-05-17 07:47:11Z markus.frank $
+// $Id$
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
-// Copyright (C) Organisation europ茅enne pour la Recherche nucl茅aire (CERN)
+// Copyright (C) Organisation europeenne pour la Recherche nucleaire (CERN)
 // All rights reserved.
 //
 // For the licensing terms see $DD4hepINSTALL/LICENSE.
diff --git a/DDCore/src/XML/XMLChildValue.cpp b/DDCore/src/XML/XMLChildValue.cpp
index e4d297ce23f2b59e431d98a9761a6da6bf7c7699..e52435b67549d85f376be1f9de90810ade503504 100644
--- a/DDCore/src/XML/XMLChildValue.cpp
+++ b/DDCore/src/XML/XMLChildValue.cpp
@@ -1,8 +1,8 @@
-// $Id: Handle.h 570 2013-05-17 07:47:11Z markus.frank $
+// $Id$
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
-// Copyright (C) Organisation europ茅enne pour la Recherche nucl茅aire (CERN)
+// Copyright (C) Organisation europeenne pour la Recherche nucleaire (CERN)
 // All rights reserved.
 //
 // For the licensing terms see $DD4hepINSTALL/LICENSE.
diff --git a/DDCore/src/XML/XMLDetector.cpp b/DDCore/src/XML/XMLDetector.cpp
index ab40d3a9fdc9819a0da7ffcd53d65b9020404295..d336c3043ffbcdc4d117f64128d5006c3bf907c1 100644
--- a/DDCore/src/XML/XMLDetector.cpp
+++ b/DDCore/src/XML/XMLDetector.cpp
@@ -2,7 +2,7 @@
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
-// Copyright (C) Organisation europ茅enne pour la Recherche nucl茅aire (CERN)
+// Copyright (C) Organisation europeenne pour la Recherche nucleaire (CERN)
 // All rights reserved.
 //
 // For the licensing terms see $DD4hepINSTALL/LICENSE.
diff --git a/DDCore/src/XML/XMLDimension.cpp b/DDCore/src/XML/XMLDimension.cpp
index 42ed258272d486080659f5ee34d562e0f54879f1..fbd9779043e5455b9e5072480fccec51038d4a82 100644
--- a/DDCore/src/XML/XMLDimension.cpp
+++ b/DDCore/src/XML/XMLDimension.cpp
@@ -1,8 +1,8 @@
-// $Id: Handle.h 570 2013-05-17 07:47:11Z markus.frank $
+// $Id$
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
-// Copyright (C) Organisation europ茅enne pour la Recherche nucl茅aire (CERN)
+// Copyright (C) Organisation europeenne pour la Recherche nucleaire (CERN)
 // All rights reserved.
 //
 // For the licensing terms see $DD4hepINSTALL/LICENSE.
diff --git a/DDCore/src/XML/XMLElements.cpp b/DDCore/src/XML/XMLElements.cpp
index 58c164c0a5ed0c0c34810cb952901cf12f3cb744..2ff7fe7df7ddb1f6ac4b46d4e1dac3682898f081 100644
--- a/DDCore/src/XML/XMLElements.cpp
+++ b/DDCore/src/XML/XMLElements.cpp
@@ -2,7 +2,7 @@
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
-// Copyright (C) Organisation europ茅enne pour la Recherche nucl茅aire (CERN)
+// Copyright (C) Organisation europeenne pour la Recherche nucleaire (CERN)
 // All rights reserved.
 //
 // For the licensing terms see $DD4hepINSTALL/LICENSE.
diff --git a/DDCore/src/XML/XMLTags.cpp b/DDCore/src/XML/XMLTags.cpp
index af827319eb4f7e00f421eaf701027b9cc0e2119b..e0427db297e0b9d513d431b6d27d316b93efd2bd 100644
--- a/DDCore/src/XML/XMLTags.cpp
+++ b/DDCore/src/XML/XMLTags.cpp
@@ -2,7 +2,7 @@
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
-// Copyright (C) Organisation europ茅enne pour la Recherche nucl茅aire (CERN)
+// Copyright (C) Organisation europeenne pour la Recherche nucleaire (CERN)
 // All rights reserved.
 //
 // For the licensing terms see $DD4hepINSTALL/LICENSE.
diff --git a/DDCore/src/parsers/Grammars.h b/DDCore/src/parsers/Grammars.h
index ef8e0a8af76b944ae021ea07df2112f2291d6283..7aa0d12a97cf51afa8f3d1ab88e0d803a21fc8f8 100644
--- a/DDCore/src/parsers/Grammars.h
+++ b/DDCore/src/parsers/Grammars.h
@@ -1,8 +1,8 @@
-// $Id: Handle.h 570 2013-05-17 07:47:11Z markus.frank $
+// $Id$
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
-// Copyright (C) Organisation europ茅enne pour la Recherche nucl茅aire (CERN)
+// Copyright (C) Organisation europeenne pour la Recherche nucleaire (CERN)
 // All rights reserved.
 //
 // For the licensing terms see $DD4hepINSTALL/LICENSE.
diff --git a/DDCore/src/parsers/GrammarsV2.h b/DDCore/src/parsers/GrammarsV2.h
index a7fcc6c1e1ddc9c6f7abf81ad3715b808a580511..75d6e6a25d43322cadd121994695dcf02bd13c3b 100644
--- a/DDCore/src/parsers/GrammarsV2.h
+++ b/DDCore/src/parsers/GrammarsV2.h
@@ -1,8 +1,8 @@
-// $Id: Handle.h 570 2013-05-17 07:47:11Z markus.frank $
+// $Id$
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
-// Copyright (C) Organisation europ茅enne pour la Recherche nucl茅aire (CERN)
+// Copyright (C) Organisation europeenne pour la Recherche nucleaire (CERN)
 // All rights reserved.
 //
 // For the licensing terms see $DD4hepINSTALL/LICENSE.
diff --git a/DDCore/src/parsers/Parsers.icpp b/DDCore/src/parsers/Parsers.icpp
index 3353b30817f956bf8cc49ce8f971959c8be1c0d8..c0889fd323bc9c81e9e5aab5af5fa4c9663bbb11 100644
--- a/DDCore/src/parsers/Parsers.icpp
+++ b/DDCore/src/parsers/Parsers.icpp
@@ -1,8 +1,8 @@
-// $Id: Handle.h 570 2013-05-17 07:47:11Z markus.frank $
+// $Id$
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
-// Copyright (C) Organisation europ茅enne pour la Recherche nucl茅aire (CERN)
+// Copyright (C) Organisation europeenne pour la Recherche nucleaire (CERN)
 // All rights reserved.
 //
 // For the licensing terms see $DD4hepINSTALL/LICENSE.
diff --git a/DDCore/src/parsers/ParsersFactory.h b/DDCore/src/parsers/ParsersFactory.h
index b07b464c1cf1323e900a06db14204f458dafb32f..b575a008508ef1fca97bc20dd714a041ab4a7a2b 100644
--- a/DDCore/src/parsers/ParsersFactory.h
+++ b/DDCore/src/parsers/ParsersFactory.h
@@ -1,8 +1,8 @@
-// $Id: Handle.h 570 2013-05-17 07:47:11Z markus.frank $
+// $Id$
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
-// Copyright (C) Organisation europ茅enne pour la Recherche nucl茅aire (CERN)
+// Copyright (C) Organisation europeenne pour la Recherche nucleaire (CERN)
 // All rights reserved.
 //
 // For the licensing terms see $DD4hepINSTALL/LICENSE.
diff --git a/DDCore/src/parsers/ParsersObjects.cpp b/DDCore/src/parsers/ParsersObjects.cpp
index 6a2c02251b1c115721249cf6cea63808a422daca..1c2a047bede80c535c6dfef55d81ca64ba900760 100644
--- a/DDCore/src/parsers/ParsersObjects.cpp
+++ b/DDCore/src/parsers/ParsersObjects.cpp
@@ -1,8 +1,8 @@
-// $Id: Handle.h 570 2013-05-17 07:47:11Z markus.frank $
+// $Id$
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
-// Copyright (C) Organisation europ茅enne pour la Recherche nucl茅aire (CERN)
+// Copyright (C) Organisation europeenne pour la Recherche nucleaire (CERN)
 // All rights reserved.
 //
 // For the licensing terms see $DD4hepINSTALL/LICENSE.
diff --git a/DDCore/src/parsers/ParsersStandardList1.cpp b/DDCore/src/parsers/ParsersStandardList1.cpp
index 381b3d6f700f91a599a3757943b25b76b55d1a1a..48568e7b2f98c52d2d710ba9bd892ab5931f0cfb 100644
--- a/DDCore/src/parsers/ParsersStandardList1.cpp
+++ b/DDCore/src/parsers/ParsersStandardList1.cpp
@@ -1,8 +1,8 @@
-// $Id: Handle.h 570 2013-05-17 07:47:11Z markus.frank $
+// $Id$
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
-// Copyright (C) Organisation europ茅enne pour la Recherche nucl茅aire (CERN)
+// Copyright (C) Organisation europeenne pour la Recherche nucleaire (CERN)
 // All rights reserved.
 //
 // For the licensing terms see $DD4hepINSTALL/LICENSE.
diff --git a/DDCore/src/parsers/ParsersStandardList2.cpp b/DDCore/src/parsers/ParsersStandardList2.cpp
index 09d46c48754408c15293228a8af04aa9a65ce753..45c34d750494cab56ca18272042b7719d00e1615 100644
--- a/DDCore/src/parsers/ParsersStandardList2.cpp
+++ b/DDCore/src/parsers/ParsersStandardList2.cpp
@@ -1,8 +1,8 @@
-// $Id: Handle.h 570 2013-05-17 07:47:11Z markus.frank $
+// $Id$
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
-// Copyright (C) Organisation europ茅enne pour la Recherche nucl茅aire (CERN)
+// Copyright (C) Organisation europeenne pour la Recherche nucleaire (CERN)
 // All rights reserved.
 //
 // For the licensing terms see $DD4hepINSTALL/LICENSE.
diff --git a/DDCore/src/parsers/ParsersStandardList3.cpp b/DDCore/src/parsers/ParsersStandardList3.cpp
index 1e6c359052a3c43fc89843c8ade0eef9249402b8..b97a649adfc0e3ad60d71c5c08a1155eed6bd734 100644
--- a/DDCore/src/parsers/ParsersStandardList3.cpp
+++ b/DDCore/src/parsers/ParsersStandardList3.cpp
@@ -1,8 +1,8 @@
-// $Id: Handle.h 570 2013-05-17 07:47:11Z markus.frank $
+// $Id$
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
-// Copyright (C) Organisation europ茅enne pour la Recherche nucl茅aire (CERN)
+// Copyright (C) Organisation europeenne pour la Recherche nucleaire (CERN)
 // All rights reserved.
 //
 // For the licensing terms see $DD4hepINSTALL/LICENSE.
diff --git a/DDCore/src/parsers/ParsersStandardList4.cpp b/DDCore/src/parsers/ParsersStandardList4.cpp
index 6df92a204fa6f3fdbc395afcd9fbb5783db25eef..000bb5bf5441399bb8457c3aabc769185c15f271 100644
--- a/DDCore/src/parsers/ParsersStandardList4.cpp
+++ b/DDCore/src/parsers/ParsersStandardList4.cpp
@@ -1,8 +1,8 @@
-// $Id: Handle.h 570 2013-05-17 07:47:11Z markus.frank $
+// $Id$
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
-// Copyright (C) Organisation europ茅enne pour la Recherche nucl茅aire (CERN)
+// Copyright (C) Organisation europeenne pour la Recherche nucleaire (CERN)
 // All rights reserved.
 //
 // For the licensing terms see $DD4hepINSTALL/LICENSE.
diff --git a/DDCore/src/parsers/ParsersStandardListCommon.h b/DDCore/src/parsers/ParsersStandardListCommon.h
index 976daf014f99aa92dc2a76e8963fac8930aa44be..f60e45272c060d2648db94abe2a3c2ceece67d56 100644
--- a/DDCore/src/parsers/ParsersStandardListCommon.h
+++ b/DDCore/src/parsers/ParsersStandardListCommon.h
@@ -1,8 +1,8 @@
-// $Id: Handle.h 570 2013-05-17 07:47:11Z markus.frank $
+// $Id$
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
-// Copyright (C) Organisation europ茅enne pour la Recherche nucl茅aire (CERN)
+// Copyright (C) Organisation europeenne pour la Recherche nucleaire (CERN)
 // All rights reserved.
 //
 // For the licensing terms see $DD4hepINSTALL/LICENSE.
diff --git a/DDCore/src/parsers/ParsersStandardMisc1.cpp b/DDCore/src/parsers/ParsersStandardMisc1.cpp
index 15ce1db24e580865002dfbb9f48740c51071c729..36258a20de6693e908b9afe0db35c6327983b09d 100644
--- a/DDCore/src/parsers/ParsersStandardMisc1.cpp
+++ b/DDCore/src/parsers/ParsersStandardMisc1.cpp
@@ -1,8 +1,8 @@
-// $Id: Handle.h 570 2013-05-17 07:47:11Z markus.frank $
+// $Id$
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
-// Copyright (C) Organisation europ茅enne pour la Recherche nucl茅aire (CERN)
+// Copyright (C) Organisation europeenne pour la Recherche nucleaire (CERN)
 // All rights reserved.
 //
 // For the licensing terms see $DD4hepINSTALL/LICENSE.
diff --git a/DDCore/src/parsers/ParsersStandardMisc2.cpp b/DDCore/src/parsers/ParsersStandardMisc2.cpp
index 92960e318c8f3d37a46e0f8a20b6efcb4dd9cf03..186ec615b9e0a5c5dfdae47363c109897a500042 100644
--- a/DDCore/src/parsers/ParsersStandardMisc2.cpp
+++ b/DDCore/src/parsers/ParsersStandardMisc2.cpp
@@ -1,8 +1,8 @@
-// $Id: Handle.h 570 2013-05-17 07:47:11Z markus.frank $
+// $Id$
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
-// Copyright (C) Organisation europ茅enne pour la Recherche nucl茅aire (CERN)
+// Copyright (C) Organisation europeenne pour la Recherche nucleaire (CERN)
 // All rights reserved.
 //
 // For the licensing terms see $DD4hepINSTALL/LICENSE.
diff --git a/DDCore/src/parsers/ParsersStandardMisc3.cpp b/DDCore/src/parsers/ParsersStandardMisc3.cpp
index 05dd2f01ee8df69f88fea5c40b3e9d74c931468e..e3d472dea55b2e3513e0ddbf81745b9cc0932573 100644
--- a/DDCore/src/parsers/ParsersStandardMisc3.cpp
+++ b/DDCore/src/parsers/ParsersStandardMisc3.cpp
@@ -1,8 +1,8 @@
-// $Id: Handle.h 570 2013-05-17 07:47:11Z markus.frank $
+// $Id$
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
-// Copyright (C) Organisation europ茅enne pour la Recherche nucl茅aire (CERN)
+// Copyright (C) Organisation europeenne pour la Recherche nucleaire (CERN)
 // All rights reserved.
 //
 // For the licensing terms see $DD4hepINSTALL/LICENSE.
diff --git a/DDCore/src/parsers/ParsersStandardMisc4.cpp b/DDCore/src/parsers/ParsersStandardMisc4.cpp
index 610206a743521d08f32bc6b0ae99505adad95e88..a9b4b4e78be54fd2853245fe6427ddda63836d80 100644
--- a/DDCore/src/parsers/ParsersStandardMisc4.cpp
+++ b/DDCore/src/parsers/ParsersStandardMisc4.cpp
@@ -1,8 +1,8 @@
-// $Id: Handle.h 570 2013-05-17 07:47:11Z markus.frank $
+// $Id$
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
-// Copyright (C) Organisation europ茅enne pour la Recherche nucl茅aire (CERN)
+// Copyright (C) Organisation europeenne pour la Recherche nucleaire (CERN)
 // All rights reserved.
 //
 // For the licensing terms see $DD4hepINSTALL/LICENSE.
diff --git a/DDCore/src/parsers/ParsersStandardMisc5.cpp b/DDCore/src/parsers/ParsersStandardMisc5.cpp
index cbc8b0ef188288b2bba1e1d2bd069bb8c7cb1eeb..8dc9a66593f497f18e2fda3481f134c475b3ca8f 100644
--- a/DDCore/src/parsers/ParsersStandardMisc5.cpp
+++ b/DDCore/src/parsers/ParsersStandardMisc5.cpp
@@ -1,8 +1,8 @@
-// $Id: Handle.h 570 2013-05-17 07:47:11Z markus.frank $
+// $Id$
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
-// Copyright (C) Organisation europ茅enne pour la Recherche nucl茅aire (CERN)
+// Copyright (C) Organisation europeenne pour la Recherche nucleaire (CERN)
 // All rights reserved.
 //
 // For the licensing terms see $DD4hepINSTALL/LICENSE.
diff --git a/DDCore/src/parsers/ParsersStandardMiscCommon.h b/DDCore/src/parsers/ParsersStandardMiscCommon.h
index 71ce7555ae9549840e1eb20fd6eb0d7a31f3b1fb..4eeb28d4a4cf45e0211a65470f555a223229e870 100644
--- a/DDCore/src/parsers/ParsersStandardMiscCommon.h
+++ b/DDCore/src/parsers/ParsersStandardMiscCommon.h
@@ -1,8 +1,8 @@
-// $Id: Handle.h 570 2013-05-17 07:47:11Z markus.frank $
+// $Id$
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
-// Copyright (C) Organisation europ茅enne pour la Recherche nucl茅aire (CERN)
+// Copyright (C) Organisation europeenne pour la Recherche nucleaire (CERN)
 // All rights reserved.
 //
 // For the licensing terms see $DD4hepINSTALL/LICENSE.
diff --git a/DDCore/src/parsers/ParsersStandardSingle.cpp b/DDCore/src/parsers/ParsersStandardSingle.cpp
index ccd35b8c0efd51f6a05800b4b74db4102d3001a6..2a494b43749a7eafa99c3c1af626ec2a4e2081f9 100644
--- a/DDCore/src/parsers/ParsersStandardSingle.cpp
+++ b/DDCore/src/parsers/ParsersStandardSingle.cpp
@@ -1,8 +1,8 @@
-// $Id: Handle.h 570 2013-05-17 07:47:11Z markus.frank $
+// $Id$
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
-// Copyright (C) Organisation europ茅enne pour la Recherche nucl茅aire (CERN)
+// Copyright (C) Organisation europeenne pour la Recherche nucleaire (CERN)
 // All rights reserved.
 //
 // For the licensing terms see $DD4hepINSTALL/LICENSE.
diff --git a/DDCore/src/plugins/Compact2Objects.cpp b/DDCore/src/plugins/Compact2Objects.cpp
index 7006ae6b547701c2d6a53a65bb9fd0231febda46..34a0f57e18fc5aec8343d4b5db198f0534ab914d 100644
--- a/DDCore/src/plugins/Compact2Objects.cpp
+++ b/DDCore/src/plugins/Compact2Objects.cpp
@@ -2,7 +2,7 @@
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
-// Copyright (C) Organisation europ茅enne pour la Recherche nucl茅aire (CERN)
+// Copyright (C) Organisation europeenne pour la Recherche nucleaire (CERN)
 // All rights reserved.
 //
 // For the licensing terms see $DD4hepINSTALL/LICENSE.
diff --git a/DDCore/src/plugins/Geant4XML.cpp b/DDCore/src/plugins/Geant4XML.cpp
index aa3b01feeaa29c0b8da79f22da657906dcc31278..2060098cebdc608bb1e6342d50db8f97acbe93f3 100644
--- a/DDCore/src/plugins/Geant4XML.cpp
+++ b/DDCore/src/plugins/Geant4XML.cpp
@@ -2,7 +2,7 @@
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
-// Copyright (C) Organisation europ茅enne pour la Recherche nucl茅aire (CERN)
+// Copyright (C) Organisation europeenne pour la Recherche nucleaire (CERN)
 // All rights reserved.
 //
 // For the licensing terms see $DD4hepINSTALL/LICENSE.
diff --git a/DDCore/src/plugins/GeometryWalk.cpp b/DDCore/src/plugins/GeometryWalk.cpp
index de5b3097aa7fa9a48f40d47c41bf2b5ca07a85b8..4f54a17df0210eafd5b9456c6c1cd5e5a2fd5582 100644
--- a/DDCore/src/plugins/GeometryWalk.cpp
+++ b/DDCore/src/plugins/GeometryWalk.cpp
@@ -1,8 +1,8 @@
-// $Id: Handle.h 570 2013-05-17 07:47:11Z markus.frank $
+// $Id$
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
-// Copyright (C) Organisation europ茅enne pour la Recherche nucl茅aire (CERN)
+// Copyright (C) Organisation europeenne pour la Recherche nucleaire (CERN)
 // All rights reserved.
 //
 // For the licensing terms see $DD4hepINSTALL/LICENSE.
diff --git a/DDCore/src/plugins/LCDD2Output.cpp b/DDCore/src/plugins/LCDD2Output.cpp
index 9e18f807624d49b7c55eb94b83d2e3e416e66a46..a691c6bac8e6577a0cb10626962aa0ffd704accc 100644
--- a/DDCore/src/plugins/LCDD2Output.cpp
+++ b/DDCore/src/plugins/LCDD2Output.cpp
@@ -2,7 +2,7 @@
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
-// Copyright (C) Organisation europ茅enne pour la Recherche nucl茅aire (CERN)
+// Copyright (C) Organisation europeenne pour la Recherche nucleaire (CERN)
 // All rights reserved.
 //
 // For the licensing terms see $DD4hepINSTALL/LICENSE.
diff --git a/DDCore/src/plugins/LCDDConverter.cpp b/DDCore/src/plugins/LCDDConverter.cpp
index f802bb3d7cacdaea447c1b2b4199fd8566dacde5..a7eea5d651a01b2c4ad2a0af1cd4c70529e5ec1e 100644
--- a/DDCore/src/plugins/LCDDConverter.cpp
+++ b/DDCore/src/plugins/LCDDConverter.cpp
@@ -2,7 +2,7 @@
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
-// Copyright (C) Organisation europ茅enne pour la Recherche nucl茅aire (CERN)
+// Copyright (C) Organisation europeenne pour la Recherche nucleaire (CERN)
 // All rights reserved.
 //
 // For the licensing terms see $DD4hepINSTALL/LICENSE.
diff --git a/DDCore/src/plugins/LCDDConverter.h b/DDCore/src/plugins/LCDDConverter.h
index f115208d01055cd7958b91ed1ee7fd9dbbda8e48..c56f08be3944c1a53ae60eec5737ffe2221262f5 100644
--- a/DDCore/src/plugins/LCDDConverter.h
+++ b/DDCore/src/plugins/LCDDConverter.h
@@ -2,7 +2,7 @@
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
-// Copyright (C) Organisation europ茅enne pour la Recherche nucl茅aire (CERN)
+// Copyright (C) Organisation europeenne pour la Recherche nucleaire (CERN)
 // All rights reserved.
 //
 // For the licensing terms see $DD4hepINSTALL/LICENSE.
diff --git a/DDCore/src/plugins/LCDDFields.cpp b/DDCore/src/plugins/LCDDFields.cpp
index 291dad36c3e320a54995198ae8e5ae1362a9518f..dcb135780b52b1735a80ae7ed4f2309cf8207c9a 100644
--- a/DDCore/src/plugins/LCDDFields.cpp
+++ b/DDCore/src/plugins/LCDDFields.cpp
@@ -2,7 +2,7 @@
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
-// Copyright (C) Organisation europ茅enne pour la Recherche nucl茅aire (CERN)
+// Copyright (C) Organisation europeenne pour la Recherche nucleaire (CERN)
 // All rights reserved.
 //
 // For the licensing terms see $DD4hepINSTALL/LICENSE.
diff --git a/DDCore/src/plugins/LCDDHelperTest.cpp b/DDCore/src/plugins/LCDDHelperTest.cpp
index b6af50269aa5de9c2cf7a2e51d706c827406cda2..5d13f14b2c6950ae5c76295410a56d8d2921217d 100644
--- a/DDCore/src/plugins/LCDDHelperTest.cpp
+++ b/DDCore/src/plugins/LCDDHelperTest.cpp
@@ -1,8 +1,8 @@
-// $Id: Handle.h 570 2013-05-17 07:47:11Z markus.frank $
+// $Id$
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
-// Copyright (C) Organisation europ茅enne pour la Recherche nucl茅aire (CERN)
+// Copyright (C) Organisation europeenne pour la Recherche nucleaire (CERN)
 // All rights reserved.
 //
 // For the licensing terms see $DD4hepINSTALL/LICENSE.
diff --git a/DDCore/src/plugins/PandoraConverter.cpp b/DDCore/src/plugins/PandoraConverter.cpp
index fe11589f5cafd32ab84a0a995dd75c4123971391..3250b570f0a13feeed3f1420b729a152933a268a 100644
--- a/DDCore/src/plugins/PandoraConverter.cpp
+++ b/DDCore/src/plugins/PandoraConverter.cpp
@@ -2,7 +2,7 @@
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
-// Copyright (C) Organisation europ茅enne pour la Recherche nucl茅aire (CERN)
+// Copyright (C) Organisation europeenne pour la Recherche nucleaire (CERN)
 // All rights reserved.
 //
 // For the licensing terms see $DD4hepINSTALL/LICENSE.
diff --git a/DDCore/src/plugins/PluginInvoker.cpp b/DDCore/src/plugins/PluginInvoker.cpp
index 2f702ca7dda44ff5a09a18e72e34f3c66ed9b498..7fee06a58c858f78be3eaedab2cf27e7c835fb03 100644
--- a/DDCore/src/plugins/PluginInvoker.cpp
+++ b/DDCore/src/plugins/PluginInvoker.cpp
@@ -1,8 +1,8 @@
-// $Id: Handle.h 570 2013-05-17 07:47:11Z markus.frank $
+// $Id$
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
-// Copyright (C) Organisation europ茅enne pour la Recherche nucl茅aire (CERN)
+// Copyright (C) Organisation europeenne pour la Recherche nucleaire (CERN)
 // All rights reserved.
 //
 // For the licensing terms see $DD4hepINSTALL/LICENSE.
diff --git a/DDCore/src/plugins/ShapePlugins.cpp b/DDCore/src/plugins/ShapePlugins.cpp
index c3c0a726577202b460104087576ffbff9a1f312b..bd0a6b77b4796ca9800b0f49f75816c6a3432aaa 100644
--- a/DDCore/src/plugins/ShapePlugins.cpp
+++ b/DDCore/src/plugins/ShapePlugins.cpp
@@ -1,8 +1,8 @@
-// $Id: Handle.h 570 2013-05-17 07:47:11Z markus.frank $
+// $Id$
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
-// Copyright (C) Organisation europ茅enne pour la Recherche nucl茅aire (CERN)
+// Copyright (C) Organisation europeenne pour la Recherche nucleaire (CERN)
 // All rights reserved.
 //
 // For the licensing terms see $DD4hepINSTALL/LICENSE.
diff --git a/DDCore/src/plugins/StandardPlugins.cpp b/DDCore/src/plugins/StandardPlugins.cpp
index d5392d9f84bab5daf5256d21be83267d11be3cb2..8e471de9b1f220832cf696e0e22ed78c90b9d50a 100644
--- a/DDCore/src/plugins/StandardPlugins.cpp
+++ b/DDCore/src/plugins/StandardPlugins.cpp
@@ -2,7 +2,7 @@
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
-// Copyright (C) Organisation europ茅enne pour la Recherche nucl茅aire (CERN)
+// Copyright (C) Organisation europeenne pour la Recherche nucleaire (CERN)
 // All rights reserved.
 //
 // For the licensing terms see $DD4hepINSTALL/LICENSE.
diff --git a/DDCore/src/plugins/VolumeMgrTest.cpp b/DDCore/src/plugins/VolumeMgrTest.cpp
index 05328174ffef4f732426742171d8135e3525fc75..fec5457c38a5564234614646283578bd3a2cb6e3 100644
--- a/DDCore/src/plugins/VolumeMgrTest.cpp
+++ b/DDCore/src/plugins/VolumeMgrTest.cpp
@@ -1,8 +1,8 @@
-// $Id: Handle.h 570 2013-05-17 07:47:11Z markus.frank $
+// $Id$
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
-// Copyright (C) Organisation europ茅enne pour la Recherche nucl茅aire (CERN)
+// Copyright (C) Organisation europeenne pour la Recherche nucleaire (CERN)
 // All rights reserved.
 //
 // For the licensing terms see $DD4hepINSTALL/LICENSE.
diff --git a/DDDetectors/CMakeLists.txt b/DDDetectors/CMakeLists.txt
index d156d1dc852a762e9b94cf6889b4f8410b418885..dfe21b4a504f702679975bc68479ec17766690d8 100644
--- a/DDDetectors/CMakeLists.txt
+++ b/DDDetectors/CMakeLists.txt
@@ -1,8 +1,8 @@
-# $Id: Handle.h 570 2013-05-17 07:47:11Z markus.frank $
+# $Id$
 #==========================================================================
 #  AIDA Detector description implementation for LCD
 #--------------------------------------------------------------------------
-# Copyright (C) Organisation europ茅enne pour la Recherche nucl茅aire (CERN)
+# Copyright (C) Organisation europeenne pour la Recherche nucleaire (CERN)
 # All rights reserved.
 #
 # For the licensing terms see $DD4hepINSTALL/LICENSE.
diff --git a/DDDetectors/src/BoxSegment_geo.cpp b/DDDetectors/src/BoxSegment_geo.cpp
index 78dad4e246ad4ad894d92c218b958883571f8863..1024b4c3fcd28027a0b24f72758b68c001fd76f1 100644
--- a/DDDetectors/src/BoxSegment_geo.cpp
+++ b/DDDetectors/src/BoxSegment_geo.cpp
@@ -1,8 +1,8 @@
-// $Id: run_plugin.h 1663 2015-03-20 13:54:53Z gaede $
+// $Id$
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
-// Copyright (C) Organisation europ茅enne pour la Recherche nucl茅aire (CERN)
+// Copyright (C) Organisation europeenne pour la Recherche nucleaire (CERN)
 // All rights reserved.
 //
 // For the licensing terms see $DD4hepINSTALL/LICENSE.
diff --git a/DDDetectors/src/CylindricalBarrelCalorimeter_geo.cpp b/DDDetectors/src/CylindricalBarrelCalorimeter_geo.cpp
index 2f89637fb15079dd17b3b278b41a17b9c5118231..e865de693e30f9e0b07cbc3acd7c134e18f3ee42 100644
--- a/DDDetectors/src/CylindricalBarrelCalorimeter_geo.cpp
+++ b/DDDetectors/src/CylindricalBarrelCalorimeter_geo.cpp
@@ -1,8 +1,8 @@
-// $Id: run_plugin.h 1663 2015-03-20 13:54:53Z gaede $
+// $Id$
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
-// Copyright (C) Organisation europ茅enne pour la Recherche nucl茅aire (CERN)
+// Copyright (C) Organisation europeenne pour la Recherche nucleaire (CERN)
 // All rights reserved.
 //
 // For the licensing terms see $DD4hepINSTALL/LICENSE.
diff --git a/DDDetectors/src/CylindricalEndcapCalorimeter_geo.cpp b/DDDetectors/src/CylindricalEndcapCalorimeter_geo.cpp
index e6b9b23ecaa855173f0acaa8be79d3408d45b006..6fddd3302e6154fc677644d92a5b19ba0fd0cfa3 100644
--- a/DDDetectors/src/CylindricalEndcapCalorimeter_geo.cpp
+++ b/DDDetectors/src/CylindricalEndcapCalorimeter_geo.cpp
@@ -1,8 +1,8 @@
-// $Id: run_plugin.h 1663 2015-03-20 13:54:53Z gaede $
+// $Id$
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
-// Copyright (C) Organisation europ茅enne pour la Recherche nucl茅aire (CERN)
+// Copyright (C) Organisation europeenne pour la Recherche nucleaire (CERN)
 // All rights reserved.
 //
 // For the licensing terms see $DD4hepINSTALL/LICENSE.
diff --git a/DDDetectors/src/DiskTracker_geo.cpp b/DDDetectors/src/DiskTracker_geo.cpp
index 6dbe6aed4e91338af72a92ae2680ad59b0e16e13..7a093ae2b75706bdef17d9dac9305946c51d3644 100644
--- a/DDDetectors/src/DiskTracker_geo.cpp
+++ b/DDDetectors/src/DiskTracker_geo.cpp
@@ -1,8 +1,8 @@
-// $Id: run_plugin.h 1663 2015-03-20 13:54:53Z gaede $
+// $Id$
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
-// Copyright (C) Organisation europ茅enne pour la Recherche nucl茅aire (CERN)
+// Copyright (C) Organisation europeenne pour la Recherche nucleaire (CERN)
 // All rights reserved.
 //
 // For the licensing terms see $DD4hepINSTALL/LICENSE.
diff --git a/DDDetectors/src/EcalBarrel_geo.cpp b/DDDetectors/src/EcalBarrel_geo.cpp
index cc7c8c1f500ccc9733178fb724579d12c98b4512..86dc9ad29a65bf85eb0f81e3e12c0423db6a60df 100644
--- a/DDDetectors/src/EcalBarrel_geo.cpp
+++ b/DDDetectors/src/EcalBarrel_geo.cpp
@@ -2,7 +2,7 @@
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
-// Copyright (C) Organisation europ茅enne pour la Recherche nucl茅aire (CERN)
+// Copyright (C) Organisation europeenne pour la Recherche nucleaire (CERN)
 // All rights reserved.
 //
 // For the licensing terms see $DD4hepINSTALL/LICENSE.
diff --git a/DDDetectors/src/ForwardDetector_geo.cpp b/DDDetectors/src/ForwardDetector_geo.cpp
index c1ba5162aa8465a3730535e5ebc0bf1e3b9a8277..79937c611654a3c7c07097b559fb05a5ee80059e 100644
--- a/DDDetectors/src/ForwardDetector_geo.cpp
+++ b/DDDetectors/src/ForwardDetector_geo.cpp
@@ -1,8 +1,8 @@
-// $Id: run_plugin.h 1663 2015-03-20 13:54:53Z gaede $
+// $Id$
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
-// Copyright (C) Organisation europ茅enne pour la Recherche nucl茅aire (CERN)
+// Copyright (C) Organisation europeenne pour la Recherche nucleaire (CERN)
 // All rights reserved.
 //
 // For the licensing terms see $DD4hepINSTALL/LICENSE.
diff --git a/DDDetectors/src/LayeringExtensionPlugin.cpp b/DDDetectors/src/LayeringExtensionPlugin.cpp
index 23aa6f3ae88828764f938785f706c34850f4401e..68d0aaf040287569a9ecc72a345f51e3471639b3 100644
--- a/DDDetectors/src/LayeringExtensionPlugin.cpp
+++ b/DDDetectors/src/LayeringExtensionPlugin.cpp
@@ -1,8 +1,8 @@
-// $Id: run_plugin.h 1663 2015-03-20 13:54:53Z gaede $
+// $Id$
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
-// Copyright (C) Organisation europ茅enne pour la Recherche nucl茅aire (CERN)
+// Copyright (C) Organisation europeenne pour la Recherche nucleaire (CERN)
 // All rights reserved.
 //
 // For the licensing terms see $DD4hepINSTALL/LICENSE.
diff --git a/DDDetectors/src/MultiLayerTracker_geo.cpp b/DDDetectors/src/MultiLayerTracker_geo.cpp
index 726ed1603309983b41cf179cef02317b38682c20..708b9f0fefe1e7a8eca83f07c3c00c160ad8aa7c 100644
--- a/DDDetectors/src/MultiLayerTracker_geo.cpp
+++ b/DDDetectors/src/MultiLayerTracker_geo.cpp
@@ -1,8 +1,8 @@
-// $Id: run_plugin.h 1663 2015-03-20 13:54:53Z gaede $
+// $Id$
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
-// Copyright (C) Organisation europ茅enne pour la Recherche nucl茅aire (CERN)
+// Copyright (C) Organisation europeenne pour la Recherche nucleaire (CERN)
 // All rights reserved.
 //
 // For the licensing terms see $DD4hepINSTALL/LICENSE.
diff --git a/DDDetectors/src/PolyconeSupport_geo.cpp b/DDDetectors/src/PolyconeSupport_geo.cpp
index 0e09b8fb938bf34f1214bb126dc368357c893964..cbb0a35f0627664891b3a16f3fe6413ce2605470 100644
--- a/DDDetectors/src/PolyconeSupport_geo.cpp
+++ b/DDDetectors/src/PolyconeSupport_geo.cpp
@@ -1,8 +1,8 @@
-// $Id: run_plugin.h 1663 2015-03-20 13:54:53Z gaede $
+// $Id$
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
-// Copyright (C) Organisation europ茅enne pour la Recherche nucl茅aire (CERN)
+// Copyright (C) Organisation europeenne pour la Recherche nucleaire (CERN)
 // All rights reserved.
 //
 // For the licensing terms see $DD4hepINSTALL/LICENSE.
diff --git a/DDDetectors/src/PolyhedraBarrelCalorimeter2_geo.cpp b/DDDetectors/src/PolyhedraBarrelCalorimeter2_geo.cpp
index 1a3c69a0dad53ee44368071cccd84edac6fbf158..ff2197599e5155a80976a4e78ef89ffa0d2cecde 100644
--- a/DDDetectors/src/PolyhedraBarrelCalorimeter2_geo.cpp
+++ b/DDDetectors/src/PolyhedraBarrelCalorimeter2_geo.cpp
@@ -1,8 +1,8 @@
-// $Id: run_plugin.h 1663 2015-03-20 13:54:53Z gaede $
+// $Id$
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
-// Copyright (C) Organisation europ茅enne pour la Recherche nucl茅aire (CERN)
+// Copyright (C) Organisation europeenne pour la Recherche nucleaire (CERN)
 // All rights reserved.
 //
 // For the licensing terms see $DD4hepINSTALL/LICENSE.
diff --git a/DDDetectors/src/PolyhedraEndcapCalorimeter2_geo.cpp b/DDDetectors/src/PolyhedraEndcapCalorimeter2_geo.cpp
index 814a6e4e4ef8017210ffcc5d420bef7cc62251db..94a797ab9fc647e35893d44163dc8cac92d34213 100644
--- a/DDDetectors/src/PolyhedraEndcapCalorimeter2_geo.cpp
+++ b/DDDetectors/src/PolyhedraEndcapCalorimeter2_geo.cpp
@@ -1,8 +1,8 @@
-// $Id: run_plugin.h 1663 2015-03-20 13:54:53Z gaede $
+// $Id$
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
-// Copyright (C) Organisation europ茅enne pour la Recherche nucl茅aire (CERN)
+// Copyright (C) Organisation europeenne pour la Recherche nucleaire (CERN)
 // All rights reserved.
 //
 // For the licensing terms see $DD4hepINSTALL/LICENSE.
diff --git a/DDDetectors/src/PolyhedraEndcapCalorimeter2_surfaces.cpp b/DDDetectors/src/PolyhedraEndcapCalorimeter2_surfaces.cpp
index ff10f05186d51d33212e45229452bb19243516dc..50d1dc8e63b0234cddf79ff8e56e7433f23266d5 100644
--- a/DDDetectors/src/PolyhedraEndcapCalorimeter2_surfaces.cpp
+++ b/DDDetectors/src/PolyhedraEndcapCalorimeter2_surfaces.cpp
@@ -1,8 +1,8 @@
-// $Id: run_plugin.h 1663 2015-03-20 13:54:53Z gaede $
+// $Id$
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
-// Copyright (C) Organisation europ茅enne pour la Recherche nucl茅aire (CERN)
+// Copyright (C) Organisation europeenne pour la Recherche nucleaire (CERN)
 // All rights reserved.
 //
 // For the licensing terms see $DD4hepINSTALL/LICENSE.
diff --git a/DDDetectors/src/SiTrackerBarrel_geo.cpp b/DDDetectors/src/SiTrackerBarrel_geo.cpp
index 3dd201e260429c6c3fd81b662a7acc0bc41b936b..856d15f1af034e99ec89759e53da7dd53eabf556 100644
--- a/DDDetectors/src/SiTrackerBarrel_geo.cpp
+++ b/DDDetectors/src/SiTrackerBarrel_geo.cpp
@@ -1,8 +1,8 @@
-// $Id: run_plugin.h 1663 2015-03-20 13:54:53Z gaede $
+// $Id$
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
-// Copyright (C) Organisation europ茅enne pour la Recherche nucl茅aire (CERN)
+// Copyright (C) Organisation europeenne pour la Recherche nucleaire (CERN)
 // All rights reserved.
 //
 // For the licensing terms see $DD4hepINSTALL/LICENSE.
diff --git a/DDDetectors/src/SiTrackerBarrel_surfaces.cpp b/DDDetectors/src/SiTrackerBarrel_surfaces.cpp
index 59d599aaadec824b65ebff2c3c49b2a12a218821..af7baccc8ab57920eee70891438335cef2bd4375 100644
--- a/DDDetectors/src/SiTrackerBarrel_surfaces.cpp
+++ b/DDDetectors/src/SiTrackerBarrel_surfaces.cpp
@@ -1,8 +1,8 @@
-// $Id: run_plugin.h 1663 2015-03-20 13:54:53Z gaede $
+// $Id$
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
-// Copyright (C) Organisation europ茅enne pour la Recherche nucl茅aire (CERN)
+// Copyright (C) Organisation europeenne pour la Recherche nucleaire (CERN)
 // All rights reserved.
 //
 // For the licensing terms see $DD4hepINSTALL/LICENSE.
diff --git a/DDDetectors/src/SiTrackerEndcap2_geo.cpp b/DDDetectors/src/SiTrackerEndcap2_geo.cpp
index b393147fed24b9c3898736ff220a9fd41e8716d0..5c64732aa071b9306e4f72383f351738e4a152a7 100644
--- a/DDDetectors/src/SiTrackerEndcap2_geo.cpp
+++ b/DDDetectors/src/SiTrackerEndcap2_geo.cpp
@@ -1,8 +1,8 @@
-// $Id: run_plugin.h 1663 2015-03-20 13:54:53Z gaede $
+// $Id$
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
-// Copyright (C) Organisation europ茅enne pour la Recherche nucl茅aire (CERN)
+// Copyright (C) Organisation europeenne pour la Recherche nucleaire (CERN)
 // All rights reserved.
 //
 // For the licensing terms see $DD4hepINSTALL/LICENSE.
diff --git a/DDDetectors/src/SiTrackerEndcap_surfaces.cpp b/DDDetectors/src/SiTrackerEndcap_surfaces.cpp
index 54dab20f1f475f41e496504586ba6cac943fdca2..39b19519c62b9d8c7c1e0e4ff6ba516443b70eb6 100644
--- a/DDDetectors/src/SiTrackerEndcap_surfaces.cpp
+++ b/DDDetectors/src/SiTrackerEndcap_surfaces.cpp
@@ -1,8 +1,8 @@
-// $Id: run_plugin.h 1663 2015-03-20 13:54:53Z gaede $
+// $Id$
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
-// Copyright (C) Organisation europ茅enne pour la Recherche nucl茅aire (CERN)
+// Copyright (C) Organisation europeenne pour la Recherche nucleaire (CERN)
 // All rights reserved.
 //
 // For the licensing terms see $DD4hepINSTALL/LICENSE.
diff --git a/DDDetectors/src/SubdetectorAssembly_geo.cpp b/DDDetectors/src/SubdetectorAssembly_geo.cpp
index 594dd7e859c8ceb85dec8a0f26c9e199dac47856..1054b1617ba787bffa9b78b717a8eb1ac265449c 100644
--- a/DDDetectors/src/SubdetectorAssembly_geo.cpp
+++ b/DDDetectors/src/SubdetectorAssembly_geo.cpp
@@ -1,8 +1,8 @@
-// $Id: run_plugin.h 1663 2015-03-20 13:54:53Z gaede $
+// $Id$
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
-// Copyright (C) Organisation europ茅enne pour la Recherche nucl茅aire (CERN)
+// Copyright (C) Organisation europeenne pour la Recherche nucleaire (CERN)
 // All rights reserved.
 //
 // For the licensing terms see $DD4hepINSTALL/LICENSE.
diff --git a/DDDetectors/src/SubdetectorExtensionPlugin.cpp b/DDDetectors/src/SubdetectorExtensionPlugin.cpp
index 316c32d40599fea58c52cff5765741faa49208dd..f3dfbc41f78ceb82f361c17800439ff3a560f12f 100644
--- a/DDDetectors/src/SubdetectorExtensionPlugin.cpp
+++ b/DDDetectors/src/SubdetectorExtensionPlugin.cpp
@@ -1,8 +1,8 @@
-// $Id: run_plugin.h 1663 2015-03-20 13:54:53Z gaede $
+// $Id$
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
-// Copyright (C) Organisation europ茅enne pour la Recherche nucl茅aire (CERN)
+// Copyright (C) Organisation europeenne pour la Recherche nucleaire (CERN)
 // All rights reserved.
 //
 // For the licensing terms see $DD4hepINSTALL/LICENSE.
diff --git a/DDDetectors/src/SurfaceExamplePlugin.cpp b/DDDetectors/src/SurfaceExamplePlugin.cpp
index 45561c5f1d784ca516099a819742f03e64a695d8..bd000a5d42ba991d37ec9d22820c56eb547dbdb6 100644
--- a/DDDetectors/src/SurfaceExamplePlugin.cpp
+++ b/DDDetectors/src/SurfaceExamplePlugin.cpp
@@ -1,8 +1,8 @@
-// $Id: run_plugin.h 1663 2015-03-20 13:54:53Z gaede $
+// $Id$
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
-// Copyright (C) Organisation europ茅enne pour la Recherche nucl茅aire (CERN)
+// Copyright (C) Organisation europeenne pour la Recherche nucleaire (CERN)
 // All rights reserved.
 //
 // For the licensing terms see $DD4hepINSTALL/LICENSE.
diff --git a/DDDetectors/src/TubeSegment_geo.cpp b/DDDetectors/src/TubeSegment_geo.cpp
index 3bba3b0ab79d64edf4a08f7eb4a69fbcc537f0f7..9f0caa4fa87e0f8ef4b6a67601044eb42bab7c61 100644
--- a/DDDetectors/src/TubeSegment_geo.cpp
+++ b/DDDetectors/src/TubeSegment_geo.cpp
@@ -1,8 +1,8 @@
-// $Id: run_plugin.h 1663 2015-03-20 13:54:53Z gaede $
+// $Id$
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
-// Copyright (C) Organisation europ茅enne pour la Recherche nucl茅aire (CERN)
+// Copyright (C) Organisation europeenne pour la Recherche nucleaire (CERN)
 // All rights reserved.
 //
 // For the licensing terms see $DD4hepINSTALL/LICENSE.
diff --git a/DDEve/CMakeLists.txt b/DDEve/CMakeLists.txt
index dc6e60a92a71a9df452906eae82f35f793ee489d..ce283e13222af11a0d7ea283995419ad9accc817 100644
--- a/DDEve/CMakeLists.txt
+++ b/DDEve/CMakeLists.txt
@@ -1,8 +1,8 @@
-# $Id: Handle.h 570 2013-05-17 07:47:11Z markus.frank $
+# $Id$
 #==========================================================================
 #  AIDA Detector description implementation for LCD
 #--------------------------------------------------------------------------
-# Copyright (C) Organisation europ茅enne pour la Recherche nucl茅aire (CERN)
+# Copyright (C) Organisation europeenne pour la Recherche nucleaire (CERN)
 # All rights reserved.
 #
 # For the licensing terms see $DD4hepINSTALL/LICENSE.
diff --git a/DDEve/DDEve/DDEve.C b/DDEve/DDEve/DDEve.C
index 5a047274fc11767dfb988bbb9cee99c613bf767b..cfdd6d84583e0b99c4c5d860299c527dbe97f4ff 100644
--- a/DDEve/DDEve/DDEve.C
+++ b/DDEve/DDEve/DDEve.C
@@ -1,8 +1,8 @@
-// $Id: run_plugin.h 1663 2015-03-20 13:54:53Z gaede $
+// $Id$
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
-// Copyright (C) Organisation europ茅enne pour la Recherche nucl茅aire (CERN)
+// Copyright (C) Organisation europeenne pour la Recherche nucleaire (CERN)
 // All rights reserved.
 //
 // For the licensing terms see $DD4hepINSTALL/LICENSE.
diff --git a/DDEve/DDEve/DDG4IO.C b/DDEve/DDEve/DDG4IO.C
index e5b82293f10438c3f5bb013b7aeebd4e73d9d295..de890426646726430819124dacadd121ea461495 100644
--- a/DDEve/DDEve/DDG4IO.C
+++ b/DDEve/DDEve/DDG4IO.C
@@ -1,8 +1,8 @@
-// $Id: run_plugin.h 1663 2015-03-20 13:54:53Z gaede $
+// $Id$
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
-// Copyright (C) Organisation europ茅enne pour la Recherche nucl茅aire (CERN)
+// Copyright (C) Organisation europeenne pour la Recherche nucleaire (CERN)
 // All rights reserved.
 //
 // For the licensing terms see $DD4hepINSTALL/LICENSE.
diff --git a/DDEve/include/DDEve/Annotation.h b/DDEve/include/DDEve/Annotation.h
index 9673b1fb543a7c0d28f80f9c44d2de3b8d2cd94c..b1fd8de7422bafe3645edd61113210daeecade78 100644
--- a/DDEve/include/DDEve/Annotation.h
+++ b/DDEve/include/DDEve/Annotation.h
@@ -1,8 +1,8 @@
-// $Id: run_plugin.h 1663 2015-03-20 13:54:53Z gaede $
+// $Id$
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
-// Copyright (C) Organisation europ茅enne pour la Recherche nucl茅aire (CERN)
+// Copyright (C) Organisation europeenne pour la Recherche nucleaire (CERN)
 // All rights reserved.
 //
 // For the licensing terms see $DD4hepINSTALL/LICENSE.
diff --git a/DDEve/include/DDEve/Calo2DProjection.h b/DDEve/include/DDEve/Calo2DProjection.h
index 1ab748d2a7207456410b6970e9442da5af7c87c6..c01977410ec9bfab081bafc0c2d56cdca0bfd31a 100644
--- a/DDEve/include/DDEve/Calo2DProjection.h
+++ b/DDEve/include/DDEve/Calo2DProjection.h
@@ -1,8 +1,8 @@
-// $Id: run_plugin.h 1663 2015-03-20 13:54:53Z gaede $
+// $Id$
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
-// Copyright (C) Organisation europ茅enne pour la Recherche nucl茅aire (CERN)
+// Copyright (C) Organisation europeenne pour la Recherche nucleaire (CERN)
 // All rights reserved.
 //
 // For the licensing terms see $DD4hepINSTALL/LICENSE.
diff --git a/DDEve/include/DDEve/Calo3DProjection.h b/DDEve/include/DDEve/Calo3DProjection.h
index 90aae36e10133cdcd92dccefedc3914b3f58296b..3cbc40a5a692e7a1c1e83fddaf79e047821275d6 100644
--- a/DDEve/include/DDEve/Calo3DProjection.h
+++ b/DDEve/include/DDEve/Calo3DProjection.h
@@ -1,8 +1,8 @@
-// $Id: run_plugin.h 1663 2015-03-20 13:54:53Z gaede $
+// $Id$
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
-// Copyright (C) Organisation europ茅enne pour la Recherche nucl茅aire (CERN)
+// Copyright (C) Organisation europeenne pour la Recherche nucleaire (CERN)
 // All rights reserved.
 //
 // For the licensing terms see $DD4hepINSTALL/LICENSE.
diff --git a/DDEve/include/DDEve/CaloLego.h b/DDEve/include/DDEve/CaloLego.h
index 38102de04a350d7ad9d20f5fc31047f7bc67f75e..cd56b25265870d5b078bd1f5457e4da46712407b 100644
--- a/DDEve/include/DDEve/CaloLego.h
+++ b/DDEve/include/DDEve/CaloLego.h
@@ -1,8 +1,8 @@
-// $Id: run_plugin.h 1663 2015-03-20 13:54:53Z gaede $
+// $Id$
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
-// Copyright (C) Organisation europ茅enne pour la Recherche nucl茅aire (CERN)
+// Copyright (C) Organisation europeenne pour la Recherche nucleaire (CERN)
 // All rights reserved.
 //
 // For the licensing terms see $DD4hepINSTALL/LICENSE.
diff --git a/DDEve/include/DDEve/ContextMenu.h b/DDEve/include/DDEve/ContextMenu.h
index 69f3871f0427036842f493fac2f9e8582c0d6708..da7dbb896b387dc284b94fc8b1b1ce8953a103f8 100644
--- a/DDEve/include/DDEve/ContextMenu.h
+++ b/DDEve/include/DDEve/ContextMenu.h
@@ -1,8 +1,8 @@
-// $Id: run_plugin.h 1663 2015-03-20 13:54:53Z gaede $
+// $Id$
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
-// Copyright (C) Organisation europ茅enne pour la Recherche nucl茅aire (CERN)
+// Copyright (C) Organisation europeenne pour la Recherche nucleaire (CERN)
 // All rights reserved.
 //
 // For the licensing terms see $DD4hepINSTALL/LICENSE.
diff --git a/DDEve/include/DDEve/DD4hepMenu.h b/DDEve/include/DDEve/DD4hepMenu.h
index 311b7e95df13dc0dbc5bffe8d464f9f3f6e89365..b5c527bd99e34d2d1eaaae74f483b3a7de096e8e 100644
--- a/DDEve/include/DDEve/DD4hepMenu.h
+++ b/DDEve/include/DDEve/DD4hepMenu.h
@@ -1,8 +1,8 @@
-// $Id: run_plugin.h 1663 2015-03-20 13:54:53Z gaede $
+// $Id$
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
-// Copyright (C) Organisation europ茅enne pour la Recherche nucl茅aire (CERN)
+// Copyright (C) Organisation europeenne pour la Recherche nucleaire (CERN)
 // All rights reserved.
 //
 // For the licensing terms see $DD4hepINSTALL/LICENSE.
diff --git a/DDEve/include/DDEve/DDEveEventData.h b/DDEve/include/DDEve/DDEveEventData.h
index 5abb27fcbb96424752c41517e018e841d42742ea..55691f4ff76d8e714e51573db69f3fb9176bab29 100644
--- a/DDEve/include/DDEve/DDEveEventData.h
+++ b/DDEve/include/DDEve/DDEveEventData.h
@@ -1,8 +1,8 @@
-// $Id: run_plugin.h 1663 2015-03-20 13:54:53Z gaede $
+// $Id$
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
-// Copyright (C) Organisation europ茅enne pour la Recherche nucl茅aire (CERN)
+// Copyright (C) Organisation europeenne pour la Recherche nucleaire (CERN)
 // All rights reserved.
 //
 // For the licensing terms see $DD4hepINSTALL/LICENSE.
diff --git a/DDEve/include/DDEve/DDG4EventHandler.h b/DDEve/include/DDEve/DDG4EventHandler.h
index a877137fca80943d825239f8f90f63d5fcf674f0..07b0f2973a3296e6ae7f037bf5b45e5fd8619cfa 100644
--- a/DDEve/include/DDEve/DDG4EventHandler.h
+++ b/DDEve/include/DDEve/DDG4EventHandler.h
@@ -1,8 +1,8 @@
-// $Id: run_plugin.h 1663 2015-03-20 13:54:53Z gaede $
+// $Id$
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
-// Copyright (C) Organisation europ茅enne pour la Recherche nucl茅aire (CERN)
+// Copyright (C) Organisation europeenne pour la Recherche nucleaire (CERN)
 // All rights reserved.
 //
 // For the licensing terms see $DD4hepINSTALL/LICENSE.
diff --git a/DDEve/include/DDEve/Dictionary.h b/DDEve/include/DDEve/Dictionary.h
index d5686f131a7849c535975d9923760f0f7bfbcb25..e46a2dd4a0a42f63d161612faaa056b6c89b2c26 100644
--- a/DDEve/include/DDEve/Dictionary.h
+++ b/DDEve/include/DDEve/Dictionary.h
@@ -1,8 +1,8 @@
-// $Id: run_plugin.h 1663 2015-03-20 13:54:53Z gaede $
+// $Id$
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
-// Copyright (C) Organisation europ茅enne pour la Recherche nucl茅aire (CERN)
+// Copyright (C) Organisation europeenne pour la Recherche nucleaire (CERN)
 // All rights reserved.
 //
 // For the licensing terms see $DD4hepINSTALL/LICENSE.
diff --git a/DDEve/include/DDEve/Display.h b/DDEve/include/DDEve/Display.h
index 1ba1bcabe6b409f8764b3d25ba683e526adec358..50ef915795c2b14136ec9cff531cb305f0de3927 100644
--- a/DDEve/include/DDEve/Display.h
+++ b/DDEve/include/DDEve/Display.h
@@ -1,8 +1,8 @@
-// $Id: run_plugin.h 1663 2015-03-20 13:54:53Z gaede $
+// $Id$
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
-// Copyright (C) Organisation europ茅enne pour la Recherche nucl茅aire (CERN)
+// Copyright (C) Organisation europeenne pour la Recherche nucleaire (CERN)
 // All rights reserved.
 //
 // For the licensing terms see $DD4hepINSTALL/LICENSE.
diff --git a/DDEve/include/DDEve/DisplayConfiguration.h b/DDEve/include/DDEve/DisplayConfiguration.h
index 07e55d0e01fd47cb8caaf6674d43892a6fce5158..408962fbbbc57893dafeb0a06cbc7714f28c86f7 100644
--- a/DDEve/include/DDEve/DisplayConfiguration.h
+++ b/DDEve/include/DDEve/DisplayConfiguration.h
@@ -1,8 +1,8 @@
-// $Id: run_plugin.h 1663 2015-03-20 13:54:53Z gaede $
+// $Id$
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
-// Copyright (C) Organisation europ茅enne pour la Recherche nucl茅aire (CERN)
+// Copyright (C) Organisation europeenne pour la Recherche nucleaire (CERN)
 // All rights reserved.
 //
 // For the licensing terms see $DD4hepINSTALL/LICENSE.
diff --git a/DDEve/include/DDEve/ElementList.h b/DDEve/include/DDEve/ElementList.h
index 32db5dab290f8a89153483a2f89d9ec82a6de7f9..a9b694ba6d4f3ce12bacc4aad11c85855534bfb2 100644
--- a/DDEve/include/DDEve/ElementList.h
+++ b/DDEve/include/DDEve/ElementList.h
@@ -1,8 +1,8 @@
-// $Id: run_plugin.h 1663 2015-03-20 13:54:53Z gaede $
+// $Id$
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
-// Copyright (C) Organisation europ茅enne pour la Recherche nucl茅aire (CERN)
+// Copyright (C) Organisation europeenne pour la Recherche nucleaire (CERN)
 // All rights reserved.
 //
 // For the licensing terms see $DD4hepINSTALL/LICENSE.
diff --git a/DDEve/include/DDEve/EvePgonSetProjectedContextMenu.h b/DDEve/include/DDEve/EvePgonSetProjectedContextMenu.h
index 6724e5d037546e7d338cb3566bc2dc9688fb0e51..b5ad27802faaa6557e887fd96c49f4004b7c0a97 100644
--- a/DDEve/include/DDEve/EvePgonSetProjectedContextMenu.h
+++ b/DDEve/include/DDEve/EvePgonSetProjectedContextMenu.h
@@ -1,8 +1,8 @@
-// $Id: run_plugin.h 1663 2015-03-20 13:54:53Z gaede $
+// $Id$
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
-// Copyright (C) Organisation europ茅enne pour la Recherche nucl茅aire (CERN)
+// Copyright (C) Organisation europeenne pour la Recherche nucleaire (CERN)
 // All rights reserved.
 //
 // For the licensing terms see $DD4hepINSTALL/LICENSE.
diff --git a/DDEve/include/DDEve/EveShapeContextMenu.h b/DDEve/include/DDEve/EveShapeContextMenu.h
index dc4c929ff5c037072043bef3d1fb1b1fd6ee1a9b..b25960e170d18fc6c4c1d1f08afd77e6ec72d499 100644
--- a/DDEve/include/DDEve/EveShapeContextMenu.h
+++ b/DDEve/include/DDEve/EveShapeContextMenu.h
@@ -1,8 +1,8 @@
-// $Id: run_plugin.h 1663 2015-03-20 13:54:53Z gaede $
+// $Id$
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
-// Copyright (C) Organisation europ茅enne pour la Recherche nucl茅aire (CERN)
+// Copyright (C) Organisation europeenne pour la Recherche nucleaire (CERN)
 // All rights reserved.
 //
 // For the licensing terms see $DD4hepINSTALL/LICENSE.
diff --git a/DDEve/include/DDEve/EveUserContextMenu.h b/DDEve/include/DDEve/EveUserContextMenu.h
index 2a6f863b97222b83f2855930a15eab7dc8bb470c..132b84e2543aca4f95f3e777dff044b1f00cdb28 100644
--- a/DDEve/include/DDEve/EveUserContextMenu.h
+++ b/DDEve/include/DDEve/EveUserContextMenu.h
@@ -1,8 +1,8 @@
-// $Id: run_plugin.h 1663 2015-03-20 13:54:53Z gaede $
+// $Id$
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
-// Copyright (C) Organisation europ茅enne pour la Recherche nucl茅aire (CERN)
+// Copyright (C) Organisation europeenne pour la Recherche nucleaire (CERN)
 // All rights reserved.
 //
 // For the licensing terms see $DD4hepINSTALL/LICENSE.
diff --git a/DDEve/include/DDEve/EventControl.h b/DDEve/include/DDEve/EventControl.h
index e39df0b84d994e0767d4d63e1fcc669fba2bf9b1..3d44d26e1cd18eed796f4fe55fa47426fa110bae 100644
--- a/DDEve/include/DDEve/EventControl.h
+++ b/DDEve/include/DDEve/EventControl.h
@@ -1,8 +1,8 @@
-// $Id: run_plugin.h 1663 2015-03-20 13:54:53Z gaede $
+// $Id$
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
-// Copyright (C) Organisation europ茅enne pour la Recherche nucl茅aire (CERN)
+// Copyright (C) Organisation europeenne pour la Recherche nucleaire (CERN)
 // All rights reserved.
 //
 // For the licensing terms see $DD4hepINSTALL/LICENSE.
diff --git a/DDEve/include/DDEve/EventHandler.h b/DDEve/include/DDEve/EventHandler.h
index d1153b644519dfe5720cc231c9ff386f77aa59ee..a8d42ed78e95ad73f22fe89c856961b87d0f59f1 100644
--- a/DDEve/include/DDEve/EventHandler.h
+++ b/DDEve/include/DDEve/EventHandler.h
@@ -1,8 +1,8 @@
-// $Id: run_plugin.h 1663 2015-03-20 13:54:53Z gaede $
+// $Id$
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
-// Copyright (C) Organisation europ茅enne pour la Recherche nucl茅aire (CERN)
+// Copyright (C) Organisation europeenne pour la Recherche nucleaire (CERN)
 // All rights reserved.
 //
 // For the licensing terms see $DD4hepINSTALL/LICENSE.
diff --git a/DDEve/include/DDEve/Factories.h b/DDEve/include/DDEve/Factories.h
index 9aac8050633b604acab19b773b4d29692879cf99..be53a792317d00543dfc7cb93d7a9ca41e1da310 100644
--- a/DDEve/include/DDEve/Factories.h
+++ b/DDEve/include/DDEve/Factories.h
@@ -1,8 +1,8 @@
-// $Id: run_plugin.h 1663 2015-03-20 13:54:53Z gaede $
+// $Id$
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
-// Copyright (C) Organisation europ茅enne pour la Recherche nucl茅aire (CERN)
+// Copyright (C) Organisation europeenne pour la Recherche nucleaire (CERN)
 // All rights reserved.
 //
 // For the licensing terms see $DD4hepINSTALL/LICENSE.
diff --git a/DDEve/include/DDEve/FrameControl.h b/DDEve/include/DDEve/FrameControl.h
index c3015451bbcb28acb658c50706329a8742287ab5..ec9a3d65679dbde103a5488638e0481df819dc5b 100644
--- a/DDEve/include/DDEve/FrameControl.h
+++ b/DDEve/include/DDEve/FrameControl.h
@@ -1,8 +1,8 @@
-// $Id: run_plugin.h 1663 2015-03-20 13:54:53Z gaede $
+// $Id$
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
-// Copyright (C) Organisation europ茅enne pour la Recherche nucl茅aire (CERN)
+// Copyright (C) Organisation europeenne pour la Recherche nucleaire (CERN)
 // All rights reserved.
 //
 // For the licensing terms see $DD4hepINSTALL/LICENSE.
diff --git a/DDEve/include/DDEve/GenericEventHandler.h b/DDEve/include/DDEve/GenericEventHandler.h
index a50344923296efe1021c74ec248017efbc1a1815..0bc375422ffa4b453541391822474d840bec986b 100644
--- a/DDEve/include/DDEve/GenericEventHandler.h
+++ b/DDEve/include/DDEve/GenericEventHandler.h
@@ -1,8 +1,8 @@
-// $Id: run_plugin.h 1663 2015-03-20 13:54:53Z gaede $
+// $Id$
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
-// Copyright (C) Organisation europ茅enne pour la Recherche nucl茅aire (CERN)
+// Copyright (C) Organisation europeenne pour la Recherche nucleaire (CERN)
 // All rights reserved.
 //
 // For the licensing terms see $DD4hepINSTALL/LICENSE.
diff --git a/DDEve/include/DDEve/HitActors.h b/DDEve/include/DDEve/HitActors.h
index 78f7d7790d8c000618ad2945469436790f50b46f..9c78ad1c9364c67935f20b465988ba4c931e17e4 100644
--- a/DDEve/include/DDEve/HitActors.h
+++ b/DDEve/include/DDEve/HitActors.h
@@ -1,8 +1,8 @@
-// $Id: run_plugin.h 1663 2015-03-20 13:54:53Z gaede $
+// $Id$
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
-// Copyright (C) Organisation europ茅enne pour la Recherche nucl茅aire (CERN)
+// Copyright (C) Organisation europeenne pour la Recherche nucleaire (CERN)
 // All rights reserved.
 //
 // For the licensing terms see $DD4hepINSTALL/LICENSE.
diff --git a/DDEve/include/DDEve/MultiView.h b/DDEve/include/DDEve/MultiView.h
index f1b01d06f0f7030dc8e9073393b4b4bc8ac3a981..61db13f6d0627c52b751d4eb6f96fdf583e9f332 100644
--- a/DDEve/include/DDEve/MultiView.h
+++ b/DDEve/include/DDEve/MultiView.h
@@ -1,8 +1,8 @@
-// $Id: run_plugin.h 1663 2015-03-20 13:54:53Z gaede $
+// $Id$
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
-// Copyright (C) Organisation europ茅enne pour la Recherche nucl茅aire (CERN)
+// Copyright (C) Organisation europeenne pour la Recherche nucleaire (CERN)
 // All rights reserved.
 //
 // For the licensing terms see $DD4hepINSTALL/LICENSE.
diff --git a/DDEve/include/DDEve/ParticleActors.h b/DDEve/include/DDEve/ParticleActors.h
index ab88bceb8396d8dc04b0a6543e132a2332dc1eaa..3f0e2feb3ec453c76cdfc8feca92e36ae43fcd2c 100644
--- a/DDEve/include/DDEve/ParticleActors.h
+++ b/DDEve/include/DDEve/ParticleActors.h
@@ -1,8 +1,8 @@
-// $Id: run_plugin.h 1663 2015-03-20 13:54:53Z gaede $
+// $Id$
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
-// Copyright (C) Organisation europ茅enne pour la Recherche nucl茅aire (CERN)
+// Copyright (C) Organisation europeenne pour la Recherche nucleaire (CERN)
 // All rights reserved.
 //
 // For the licensing terms see $DD4hepINSTALL/LICENSE.
diff --git a/DDEve/include/DDEve/PopupMenu.h b/DDEve/include/DDEve/PopupMenu.h
index 8a0e9f64181149fc183eac01e001f6a72840b927..5f4b49af421bcabef1475b502fc8a6d5c075e7bd 100644
--- a/DDEve/include/DDEve/PopupMenu.h
+++ b/DDEve/include/DDEve/PopupMenu.h
@@ -1,8 +1,8 @@
-// $Id: run_plugin.h 1663 2015-03-20 13:54:53Z gaede $
+// $Id$
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
-// Copyright (C) Organisation europ茅enne pour la Recherche nucl茅aire (CERN)
+// Copyright (C) Organisation europeenne pour la Recherche nucleaire (CERN)
 // All rights reserved.
 //
 // For the licensing terms see $DD4hepINSTALL/LICENSE.
diff --git a/DDEve/include/DDEve/Projection.h b/DDEve/include/DDEve/Projection.h
index 5dcb7057fee84fc3bc367ed34719acd0bf317e47..d599e8032e7e888dc5d6412e5be1aa7030369978 100644
--- a/DDEve/include/DDEve/Projection.h
+++ b/DDEve/include/DDEve/Projection.h
@@ -1,8 +1,8 @@
-// $Id: run_plugin.h 1663 2015-03-20 13:54:53Z gaede $
+// $Id$
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
-// Copyright (C) Organisation europ茅enne pour la Recherche nucl茅aire (CERN)
+// Copyright (C) Organisation europeenne pour la Recherche nucleaire (CERN)
 // All rights reserved.
 //
 // For the licensing terms see $DD4hepINSTALL/LICENSE.
diff --git a/DDEve/include/DDEve/RhoPhiProjection.h b/DDEve/include/DDEve/RhoPhiProjection.h
index 5322443ca88205a9c9d9dafd711c6e722a6fcefa..a10b89452a54cc5b62210399bf4a8bf656f44aa0 100644
--- a/DDEve/include/DDEve/RhoPhiProjection.h
+++ b/DDEve/include/DDEve/RhoPhiProjection.h
@@ -1,8 +1,8 @@
-// $Id: run_plugin.h 1663 2015-03-20 13:54:53Z gaede $
+// $Id$
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
-// Copyright (C) Organisation europ茅enne pour la Recherche nucl茅aire (CERN)
+// Copyright (C) Organisation europeenne pour la Recherche nucleaire (CERN)
 // All rights reserved.
 //
 // For the licensing terms see $DD4hepINSTALL/LICENSE.
diff --git a/DDEve/include/DDEve/RhoZProjection.h b/DDEve/include/DDEve/RhoZProjection.h
index 7400f9d07bdc9dc78b924ed912a6e758a2870378..bfd193dfb1f4f9a11abdd67cc422aa5774a927d8 100644
--- a/DDEve/include/DDEve/RhoZProjection.h
+++ b/DDEve/include/DDEve/RhoZProjection.h
@@ -1,8 +1,8 @@
-// $Id: run_plugin.h 1663 2015-03-20 13:54:53Z gaede $
+// $Id$
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
-// Copyright (C) Organisation europ茅enne pour la Recherche nucl茅aire (CERN)
+// Copyright (C) Organisation europeenne pour la Recherche nucleaire (CERN)
 // All rights reserved.
 //
 // For the licensing terms see $DD4hepINSTALL/LICENSE.
diff --git a/DDEve/include/DDEve/Utilities.h b/DDEve/include/DDEve/Utilities.h
index 70cd338eb6842fce5f0d68802e77b25ff071109a..a09f7e15b9f4c37bc06b3cc6307cc7bc1a6732d6 100644
--- a/DDEve/include/DDEve/Utilities.h
+++ b/DDEve/include/DDEve/Utilities.h
@@ -1,8 +1,8 @@
-// $Id: run_plugin.h 1663 2015-03-20 13:54:53Z gaede $
+// $Id$
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
-// Copyright (C) Organisation europ茅enne pour la Recherche nucl茅aire (CERN)
+// Copyright (C) Organisation europeenne pour la Recherche nucleaire (CERN)
 // All rights reserved.
 //
 // For the licensing terms see $DD4hepINSTALL/LICENSE.
diff --git a/DDEve/include/DDEve/View.h b/DDEve/include/DDEve/View.h
index 56c8e04dc1c462842d94379f3dbc3f0a407028fa..96985e8a59047432fc62306a53ebe341ee2f01eb 100644
--- a/DDEve/include/DDEve/View.h
+++ b/DDEve/include/DDEve/View.h
@@ -1,8 +1,8 @@
-// $Id: run_plugin.h 1663 2015-03-20 13:54:53Z gaede $
+// $Id$
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
-// Copyright (C) Organisation europ茅enne pour la Recherche nucl茅aire (CERN)
+// Copyright (C) Organisation europeenne pour la Recherche nucleaire (CERN)
 // All rights reserved.
 //
 // For the licensing terms see $DD4hepINSTALL/LICENSE.
diff --git a/DDEve/include/DDEve/View3D.h b/DDEve/include/DDEve/View3D.h
index 4814e5e0e0dc342957a42e71455366c7729708ff..ae1d38f9e24d43ce9be58e6e8a0f77d80b389139 100644
--- a/DDEve/include/DDEve/View3D.h
+++ b/DDEve/include/DDEve/View3D.h
@@ -1,8 +1,8 @@
-// $Id: run_plugin.h 1663 2015-03-20 13:54:53Z gaede $
+// $Id$
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
-// Copyright (C) Organisation europ茅enne pour la Recherche nucl茅aire (CERN)
+// Copyright (C) Organisation europeenne pour la Recherche nucleaire (CERN)
 // All rights reserved.
 //
 // For the licensing terms see $DD4hepINSTALL/LICENSE.
diff --git a/DDEve/include/DDEve/ViewMenu.h b/DDEve/include/DDEve/ViewMenu.h
index 707540c37d410be35283c656c5613708a8803042..b7d750088e06fcbf34735b7d69adcb35b2d47d2a 100644
--- a/DDEve/include/DDEve/ViewMenu.h
+++ b/DDEve/include/DDEve/ViewMenu.h
@@ -1,8 +1,8 @@
-// $Id: run_plugin.h 1663 2015-03-20 13:54:53Z gaede $
+// $Id$
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
-// Copyright (C) Organisation europ茅enne pour la Recherche nucl茅aire (CERN)
+// Copyright (C) Organisation europeenne pour la Recherche nucleaire (CERN)
 // All rights reserved.
 //
 // For the licensing terms see $DD4hepINSTALL/LICENSE.
diff --git a/DDEve/lcio/LCIOEventHandler.cpp b/DDEve/lcio/LCIOEventHandler.cpp
index bfbb14c66368c27294ab96b384fdf9a317df7bbc..2554915c4f50a19a92526de0a92304accf679342 100644
--- a/DDEve/lcio/LCIOEventHandler.cpp
+++ b/DDEve/lcio/LCIOEventHandler.cpp
@@ -1,8 +1,8 @@
-// $Id: run_plugin.h 1663 2015-03-20 13:54:53Z gaede $
+// $Id$
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
-// Copyright (C) Organisation europ茅enne pour la Recherche nucl茅aire (CERN)
+// Copyright (C) Organisation europeenne pour la Recherche nucleaire (CERN)
 // All rights reserved.
 //
 // For the licensing terms see $DD4hepINSTALL/LICENSE.
diff --git a/DDEve/lcio/LCIOEventHandler.h b/DDEve/lcio/LCIOEventHandler.h
index f98ae2f8172d31cf57221991bb4d7c42792ba939..010cc17e1e4ce3ef952ad38392c7b8a13529d812 100644
--- a/DDEve/lcio/LCIOEventHandler.h
+++ b/DDEve/lcio/LCIOEventHandler.h
@@ -1,8 +1,8 @@
-// $Id: run_plugin.h 1663 2015-03-20 13:54:53Z gaede $
+// $Id$
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
-// Copyright (C) Organisation europ茅enne pour la Recherche nucl茅aire (CERN)
+// Copyright (C) Organisation europeenne pour la Recherche nucleaire (CERN)
 // All rights reserved.
 //
 // For the licensing terms see $DD4hepINSTALL/LICENSE.
diff --git a/DDEve/src/Annotation.cpp b/DDEve/src/Annotation.cpp
index 244dee0605b6bc686bb6a6bd317589c5a3119a01..2cc57d8f23a719f9ab1c568a0a7632d948170dcb 100644
--- a/DDEve/src/Annotation.cpp
+++ b/DDEve/src/Annotation.cpp
@@ -1,8 +1,8 @@
-// $Id: run_plugin.h 1663 2015-03-20 13:54:53Z gaede $
+// $Id$
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
-// Copyright (C) Organisation europ茅enne pour la Recherche nucl茅aire (CERN)
+// Copyright (C) Organisation europeenne pour la Recherche nucleaire (CERN)
 // All rights reserved.
 //
 // For the licensing terms see $DD4hepINSTALL/LICENSE.
diff --git a/DDEve/src/Calo2DProjection.cpp b/DDEve/src/Calo2DProjection.cpp
index daeb73897f1aff594543d41d052901cc34cfb28e..421743a877bb1299bdacbc1aab4032b6d499a801 100644
--- a/DDEve/src/Calo2DProjection.cpp
+++ b/DDEve/src/Calo2DProjection.cpp
@@ -1,8 +1,8 @@
-// $Id: run_plugin.h 1663 2015-03-20 13:54:53Z gaede $
+// $Id$
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
-// Copyright (C) Organisation europ茅enne pour la Recherche nucl茅aire (CERN)
+// Copyright (C) Organisation europeenne pour la Recherche nucleaire (CERN)
 // All rights reserved.
 //
 // For the licensing terms see $DD4hepINSTALL/LICENSE.
diff --git a/DDEve/src/Calo3DProjection.cpp b/DDEve/src/Calo3DProjection.cpp
index 3f271c52a50ec7a302752ba4a4c80e6ef0f610a5..427cf387fe595f896cff761a5ba9ccafb2906fec 100644
--- a/DDEve/src/Calo3DProjection.cpp
+++ b/DDEve/src/Calo3DProjection.cpp
@@ -1,8 +1,8 @@
-// $Id: run_plugin.h 1663 2015-03-20 13:54:53Z gaede $
+// $Id$
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
-// Copyright (C) Organisation europ茅enne pour la Recherche nucl茅aire (CERN)
+// Copyright (C) Organisation europeenne pour la Recherche nucleaire (CERN)
 // All rights reserved.
 //
 // For the licensing terms see $DD4hepINSTALL/LICENSE.
diff --git a/DDEve/src/CaloLego.cpp b/DDEve/src/CaloLego.cpp
index d9055d66138952f8d578ac0c80ccb4b0f8b82bfc..17c6c73054836601c25c0aff8b60f2aa256692ad 100644
--- a/DDEve/src/CaloLego.cpp
+++ b/DDEve/src/CaloLego.cpp
@@ -1,8 +1,8 @@
-// $Id: run_plugin.h 1663 2015-03-20 13:54:53Z gaede $
+// $Id$
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
-// Copyright (C) Organisation europ茅enne pour la Recherche nucl茅aire (CERN)
+// Copyright (C) Organisation europeenne pour la Recherche nucleaire (CERN)
 // All rights reserved.
 //
 // For the licensing terms see $DD4hepINSTALL/LICENSE.
diff --git a/DDEve/src/ContextMenu.cpp b/DDEve/src/ContextMenu.cpp
index 8f2f4e318d7d862bdb2623c3b4747d89e7dc76f3..69834e6475ef6abe0b70949cc0c1479515a78166 100644
--- a/DDEve/src/ContextMenu.cpp
+++ b/DDEve/src/ContextMenu.cpp
@@ -1,8 +1,8 @@
-// $Id: run_plugin.h 1663 2015-03-20 13:54:53Z gaede $
+// $Id$
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
-// Copyright (C) Organisation europ茅enne pour la Recherche nucl茅aire (CERN)
+// Copyright (C) Organisation europeenne pour la Recherche nucleaire (CERN)
 // All rights reserved.
 //
 // For the licensing terms see $DD4hepINSTALL/LICENSE.
diff --git a/DDEve/src/DD4hepMenu.cpp b/DDEve/src/DD4hepMenu.cpp
index c140b1061167f901c705e3e4ac9abac6f850d5ec..8701f0af1ddb03d269c17fff0259cbab9b3675b9 100644
--- a/DDEve/src/DD4hepMenu.cpp
+++ b/DDEve/src/DD4hepMenu.cpp
@@ -1,8 +1,8 @@
-// $Id: run_plugin.h 1663 2015-03-20 13:54:53Z gaede $
+// $Id$
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
-// Copyright (C) Organisation europ茅enne pour la Recherche nucl茅aire (CERN)
+// Copyright (C) Organisation europeenne pour la Recherche nucleaire (CERN)
 // All rights reserved.
 //
 // For the licensing terms see $DD4hepINSTALL/LICENSE.
diff --git a/DDEve/src/DDEveEventData.cpp b/DDEve/src/DDEveEventData.cpp
index 37e1f46ea0ba7c214fb59f59e8fcb2962dda9369..45ab9044d83c924519525388476368498fc3cc9e 100644
--- a/DDEve/src/DDEveEventData.cpp
+++ b/DDEve/src/DDEveEventData.cpp
@@ -1,8 +1,8 @@
-// $Id: run_plugin.h 1663 2015-03-20 13:54:53Z gaede $
+// $Id$
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
-// Copyright (C) Organisation europ茅enne pour la Recherche nucl茅aire (CERN)
+// Copyright (C) Organisation europeenne pour la Recherche nucleaire (CERN)
 // All rights reserved.
 //
 // For the licensing terms see $DD4hepINSTALL/LICENSE.
diff --git a/DDEve/src/DDEvePlugins.cpp b/DDEve/src/DDEvePlugins.cpp
index 17af9eca4b690ddb1b5e78ca5c82709737ebdf4d..05c83a4ac54049bbfbefa6cb692083a334ecc97b 100644
--- a/DDEve/src/DDEvePlugins.cpp
+++ b/DDEve/src/DDEvePlugins.cpp
@@ -1,8 +1,8 @@
-// $Id: run_plugin.h 1663 2015-03-20 13:54:53Z gaede $
+// $Id$
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
-// Copyright (C) Organisation europ茅enne pour la Recherche nucl茅aire (CERN)
+// Copyright (C) Organisation europeenne pour la Recherche nucleaire (CERN)
 // All rights reserved.
 //
 // For the licensing terms see $DD4hepINSTALL/LICENSE.
diff --git a/DDEve/src/DDG4EventHandler.cpp b/DDEve/src/DDG4EventHandler.cpp
index d138f7e8e0256712fc7ecead08733138bc80ee86..61ac94c63d577563eead0d509703e6acb4015e80 100644
--- a/DDEve/src/DDG4EventHandler.cpp
+++ b/DDEve/src/DDG4EventHandler.cpp
@@ -1,8 +1,8 @@
-// $Id: run_plugin.h 1663 2015-03-20 13:54:53Z gaede $
+// $Id$
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
-// Copyright (C) Organisation europ茅enne pour la Recherche nucl茅aire (CERN)
+// Copyright (C) Organisation europeenne pour la Recherche nucleaire (CERN)
 // All rights reserved.
 //
 // For the licensing terms see $DD4hepINSTALL/LICENSE.
diff --git a/DDEve/src/Display.cpp b/DDEve/src/Display.cpp
index bfb3ffb01afec476ef86d8a9828d2200cf8d67d3..64166395c9281f0e508db1f5d71ed61eb9eaab47 100644
--- a/DDEve/src/Display.cpp
+++ b/DDEve/src/Display.cpp
@@ -1,8 +1,8 @@
-// $Id: run_plugin.h 1663 2015-03-20 13:54:53Z gaede $
+// $Id$
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
-// Copyright (C) Organisation europ茅enne pour la Recherche nucl茅aire (CERN)
+// Copyright (C) Organisation europeenne pour la Recherche nucleaire (CERN)
 // All rights reserved.
 //
 // For the licensing terms see $DD4hepINSTALL/LICENSE.
diff --git a/DDEve/src/DisplayConfiguration.cpp b/DDEve/src/DisplayConfiguration.cpp
index 3e02132330a178315836abcdc15fb033efef8289..59c895a4c722290e878390f9d3308cf660552a3b 100644
--- a/DDEve/src/DisplayConfiguration.cpp
+++ b/DDEve/src/DisplayConfiguration.cpp
@@ -1,8 +1,8 @@
-// $Id: run_plugin.h 1663 2015-03-20 13:54:53Z gaede $
+// $Id$
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
-// Copyright (C) Organisation europ茅enne pour la Recherche nucl茅aire (CERN)
+// Copyright (C) Organisation europeenne pour la Recherche nucleaire (CERN)
 // All rights reserved.
 //
 // For the licensing terms see $DD4hepINSTALL/LICENSE.
diff --git a/DDEve/src/DisplayConfigurationParser.cpp b/DDEve/src/DisplayConfigurationParser.cpp
index b7a6593ee40b62cf352fbbd2c1264c28edaa0466..b6ad1f8658e1abf6c84521a230c1b1421df8823c 100644
--- a/DDEve/src/DisplayConfigurationParser.cpp
+++ b/DDEve/src/DisplayConfigurationParser.cpp
@@ -1,8 +1,8 @@
-// $Id: run_plugin.h 1663 2015-03-20 13:54:53Z gaede $
+// $Id$
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
-// Copyright (C) Organisation europ茅enne pour la Recherche nucl茅aire (CERN)
+// Copyright (C) Organisation europeenne pour la Recherche nucleaire (CERN)
 // All rights reserved.
 //
 // For the licensing terms see $DD4hepINSTALL/LICENSE.
diff --git a/DDEve/src/ElementList.cpp b/DDEve/src/ElementList.cpp
index c4b335904edde906b29d2bb0ecb322c3da8c9de4..c422debca72798937ec2e7d9a502419afd970632 100644
--- a/DDEve/src/ElementList.cpp
+++ b/DDEve/src/ElementList.cpp
@@ -1,8 +1,8 @@
-// $Id: run_plugin.h 1663 2015-03-20 13:54:53Z gaede $
+// $Id$
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
-// Copyright (C) Organisation europ茅enne pour la Recherche nucl茅aire (CERN)
+// Copyright (C) Organisation europeenne pour la Recherche nucleaire (CERN)
 // All rights reserved.
 //
 // For the licensing terms see $DD4hepINSTALL/LICENSE.
diff --git a/DDEve/src/EvePgonSetProjectedContextMenu.cpp b/DDEve/src/EvePgonSetProjectedContextMenu.cpp
index 17c12db25c44bad124f2d77be6cbc044a0231705..b31e4e087f50bed9416c15e4b0544cae48177c15 100644
--- a/DDEve/src/EvePgonSetProjectedContextMenu.cpp
+++ b/DDEve/src/EvePgonSetProjectedContextMenu.cpp
@@ -1,8 +1,8 @@
-// $Id: run_plugin.h 1663 2015-03-20 13:54:53Z gaede $
+// $Id$
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
-// Copyright (C) Organisation europ茅enne pour la Recherche nucl茅aire (CERN)
+// Copyright (C) Organisation europeenne pour la Recherche nucleaire (CERN)
 // All rights reserved.
 //
 // For the licensing terms see $DD4hepINSTALL/LICENSE.
diff --git a/DDEve/src/EveShapeContextMenu.cpp b/DDEve/src/EveShapeContextMenu.cpp
index 51606c53e3fd20569116545f26bd56aec5c31fc8..132cdb2573efd98f5cb5f89426eeb91048d2dc6e 100644
--- a/DDEve/src/EveShapeContextMenu.cpp
+++ b/DDEve/src/EveShapeContextMenu.cpp
@@ -1,8 +1,8 @@
-// $Id: run_plugin.h 1663 2015-03-20 13:54:53Z gaede $
+// $Id$
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
-// Copyright (C) Organisation europ茅enne pour la Recherche nucl茅aire (CERN)
+// Copyright (C) Organisation europeenne pour la Recherche nucleaire (CERN)
 // All rights reserved.
 //
 // For the licensing terms see $DD4hepINSTALL/LICENSE.
diff --git a/DDEve/src/EveUserContextMenu.cpp b/DDEve/src/EveUserContextMenu.cpp
index a78ade7e4eea59c08af104fd02f3b793593c09e6..8c12dade9464efa7a08462d99f4988f32aa96748 100644
--- a/DDEve/src/EveUserContextMenu.cpp
+++ b/DDEve/src/EveUserContextMenu.cpp
@@ -1,8 +1,8 @@
-// $Id: run_plugin.h 1663 2015-03-20 13:54:53Z gaede $
+// $Id$
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
-// Copyright (C) Organisation europ茅enne pour la Recherche nucl茅aire (CERN)
+// Copyright (C) Organisation europeenne pour la Recherche nucleaire (CERN)
 // All rights reserved.
 //
 // For the licensing terms see $DD4hepINSTALL/LICENSE.
diff --git a/DDEve/src/EventControl.cpp b/DDEve/src/EventControl.cpp
index f79f8fbd3227ae3611580dea7d92ffc05301e627..82d754e34ecf34d28dc6d9d6fab739d1615336e3 100644
--- a/DDEve/src/EventControl.cpp
+++ b/DDEve/src/EventControl.cpp
@@ -1,8 +1,8 @@
-// $Id: run_plugin.h 1663 2015-03-20 13:54:53Z gaede $
+// $Id$
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
-// Copyright (C) Organisation europ茅enne pour la Recherche nucl茅aire (CERN)
+// Copyright (C) Organisation europeenne pour la Recherche nucleaire (CERN)
 // All rights reserved.
 //
 // For the licensing terms see $DD4hepINSTALL/LICENSE.
diff --git a/DDEve/src/EventHandler.cpp b/DDEve/src/EventHandler.cpp
index aa350afb115941862330481252b3e1da0d35451e..daeeb55ea53681cac242fc6eaee4ce2df5b35805 100644
--- a/DDEve/src/EventHandler.cpp
+++ b/DDEve/src/EventHandler.cpp
@@ -1,8 +1,8 @@
-// $Id: run_plugin.h 1663 2015-03-20 13:54:53Z gaede $
+// $Id$
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
-// Copyright (C) Organisation europ茅enne pour la Recherche nucl茅aire (CERN)
+// Copyright (C) Organisation europeenne pour la Recherche nucleaire (CERN)
 // All rights reserved.
 //
 // For the licensing terms see $DD4hepINSTALL/LICENSE.
diff --git a/DDEve/src/FrameControl.cpp b/DDEve/src/FrameControl.cpp
index 6437c329724e974c8c0122c4ffd602de748f8355..cb17a6d47ade06651cc693e2f0b0defd685d2c88 100644
--- a/DDEve/src/FrameControl.cpp
+++ b/DDEve/src/FrameControl.cpp
@@ -1,8 +1,8 @@
-// $Id: run_plugin.h 1663 2015-03-20 13:54:53Z gaede $
+// $Id$
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
-// Copyright (C) Organisation europ茅enne pour la Recherche nucl茅aire (CERN)
+// Copyright (C) Organisation europeenne pour la Recherche nucleaire (CERN)
 // All rights reserved.
 //
 // For the licensing terms see $DD4hepINSTALL/LICENSE.
diff --git a/DDEve/src/GenericEventHandler.cpp b/DDEve/src/GenericEventHandler.cpp
index 45d701ea1f5ca47a8f17e0e6d61fde8be1cd8e53..11d6cccf580ed9771e6eb5cf288096e2d0febca9 100644
--- a/DDEve/src/GenericEventHandler.cpp
+++ b/DDEve/src/GenericEventHandler.cpp
@@ -1,8 +1,8 @@
-// $Id: run_plugin.h 1663 2015-03-20 13:54:53Z gaede $
+// $Id$
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
-// Copyright (C) Organisation europ茅enne pour la Recherche nucl茅aire (CERN)
+// Copyright (C) Organisation europeenne pour la Recherche nucleaire (CERN)
 // All rights reserved.
 //
 // For the licensing terms see $DD4hepINSTALL/LICENSE.
diff --git a/DDEve/src/HitActors.cpp b/DDEve/src/HitActors.cpp
index b02503cb701385ee0eb894c078d4dec45b08c22c..094c8bd3a659cfc4908052a67ea9d3b94e6be755 100644
--- a/DDEve/src/HitActors.cpp
+++ b/DDEve/src/HitActors.cpp
@@ -1,8 +1,8 @@
-// $Id: run_plugin.h 1663 2015-03-20 13:54:53Z gaede $
+// $Id$
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
-// Copyright (C) Organisation europ茅enne pour la Recherche nucl茅aire (CERN)
+// Copyright (C) Organisation europeenne pour la Recherche nucleaire (CERN)
 // All rights reserved.
 //
 // For the licensing terms see $DD4hepINSTALL/LICENSE.
diff --git a/DDEve/src/MultiView.cpp b/DDEve/src/MultiView.cpp
index aa3e19d8d2b393adc92450346edf3bdbca6efb29..d26849b2df896498421e8f86f1673197e30e1ea3 100644
--- a/DDEve/src/MultiView.cpp
+++ b/DDEve/src/MultiView.cpp
@@ -1,8 +1,8 @@
-// $Id: run_plugin.h 1663 2015-03-20 13:54:53Z gaede $
+// $Id$
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
-// Copyright (C) Organisation europ茅enne pour la Recherche nucl茅aire (CERN)
+// Copyright (C) Organisation europeenne pour la Recherche nucleaire (CERN)
 // All rights reserved.
 //
 // For the licensing terms see $DD4hepINSTALL/LICENSE.
diff --git a/DDEve/src/ParticleActors.cpp b/DDEve/src/ParticleActors.cpp
index 53c29300bf08d04c991a96b756110e79afc6f16b..a9a78efee248297806f5785649725485eb9bf7b6 100644
--- a/DDEve/src/ParticleActors.cpp
+++ b/DDEve/src/ParticleActors.cpp
@@ -1,8 +1,8 @@
-// $Id: run_plugin.h 1663 2015-03-20 13:54:53Z gaede $
+// $Id$
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
-// Copyright (C) Organisation europ茅enne pour la Recherche nucl茅aire (CERN)
+// Copyright (C) Organisation europeenne pour la Recherche nucleaire (CERN)
 // All rights reserved.
 //
 // For the licensing terms see $DD4hepINSTALL/LICENSE.
diff --git a/DDEve/src/PopupMenu.cpp b/DDEve/src/PopupMenu.cpp
index 0480143eebe13e6ce50fb0c5e427a81a23440d3b..4cb799dbba8d07b5223e410d862587adc1e7f627 100644
--- a/DDEve/src/PopupMenu.cpp
+++ b/DDEve/src/PopupMenu.cpp
@@ -1,8 +1,8 @@
-// $Id: run_plugin.h 1663 2015-03-20 13:54:53Z gaede $
+// $Id$
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
-// Copyright (C) Organisation europ茅enne pour la Recherche nucl茅aire (CERN)
+// Copyright (C) Organisation europeenne pour la Recherche nucleaire (CERN)
 // All rights reserved.
 //
 // For the licensing terms see $DD4hepINSTALL/LICENSE.
diff --git a/DDEve/src/Projection.cpp b/DDEve/src/Projection.cpp
index 068a011b7a2012df2a60d425882a637caca065bc..4a8c78ea978559e6ad69c0c55ff145d91149b7f2 100644
--- a/DDEve/src/Projection.cpp
+++ b/DDEve/src/Projection.cpp
@@ -1,8 +1,8 @@
-// $Id: run_plugin.h 1663 2015-03-20 13:54:53Z gaede $
+// $Id$
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
-// Copyright (C) Organisation europ茅enne pour la Recherche nucl茅aire (CERN)
+// Copyright (C) Organisation europeenne pour la Recherche nucleaire (CERN)
 // All rights reserved.
 //
 // For the licensing terms see $DD4hepINSTALL/LICENSE.
diff --git a/DDEve/src/RhoPhiProjection.cpp b/DDEve/src/RhoPhiProjection.cpp
index e65d2aaba8bd5e1d55c89a24e6df49257c3414fa..6aabed3bbe61658fbe89393524e1a94d3fc92af5 100644
--- a/DDEve/src/RhoPhiProjection.cpp
+++ b/DDEve/src/RhoPhiProjection.cpp
@@ -1,8 +1,8 @@
-// $Id: run_plugin.h 1663 2015-03-20 13:54:53Z gaede $
+// $Id$
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
-// Copyright (C) Organisation europ茅enne pour la Recherche nucl茅aire (CERN)
+// Copyright (C) Organisation europeenne pour la Recherche nucleaire (CERN)
 // All rights reserved.
 //
 // For the licensing terms see $DD4hepINSTALL/LICENSE.
diff --git a/DDEve/src/RhoZProjection.cpp b/DDEve/src/RhoZProjection.cpp
index 2c8b70e38d1188354499cce0899ec7f8f52bcc68..c7d2936091f97ed10b123df21ca02e305a9850e2 100644
--- a/DDEve/src/RhoZProjection.cpp
+++ b/DDEve/src/RhoZProjection.cpp
@@ -1,8 +1,8 @@
-// $Id: run_plugin.h 1663 2015-03-20 13:54:53Z gaede $
+// $Id$
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
-// Copyright (C) Organisation europ茅enne pour la Recherche nucl茅aire (CERN)
+// Copyright (C) Organisation europeenne pour la Recherche nucleaire (CERN)
 // All rights reserved.
 //
 // For the licensing terms see $DD4hepINSTALL/LICENSE.
diff --git a/DDEve/src/Utilities.cpp b/DDEve/src/Utilities.cpp
index 170cb79c25ee3cfa56fdd7859923fe6ce4d98293..ffa5d927b16dff1dc4d1ae166fc6d7bf022d486d 100644
--- a/DDEve/src/Utilities.cpp
+++ b/DDEve/src/Utilities.cpp
@@ -1,8 +1,8 @@
-// $Id: run_plugin.h 1663 2015-03-20 13:54:53Z gaede $
+// $Id$
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
-// Copyright (C) Organisation europ茅enne pour la Recherche nucl茅aire (CERN)
+// Copyright (C) Organisation europeenne pour la Recherche nucleaire (CERN)
 // All rights reserved.
 //
 // For the licensing terms see $DD4hepINSTALL/LICENSE.
diff --git a/DDEve/src/View.cpp b/DDEve/src/View.cpp
index 1a15f07a5e739f75fa7fbfecb21a816c090c75f4..52bfef9781846aed01e87dd52eaf848f9c895948 100644
--- a/DDEve/src/View.cpp
+++ b/DDEve/src/View.cpp
@@ -1,8 +1,8 @@
-// $Id: run_plugin.h 1663 2015-03-20 13:54:53Z gaede $
+// $Id$
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
-// Copyright (C) Organisation europ茅enne pour la Recherche nucl茅aire (CERN)
+// Copyright (C) Organisation europeenne pour la Recherche nucleaire (CERN)
 // All rights reserved.
 //
 // For the licensing terms see $DD4hepINSTALL/LICENSE.
diff --git a/DDEve/src/View3D.cpp b/DDEve/src/View3D.cpp
index 163b3c99d567dc2277ea1386ee5d4d63740a1624..a362c42ad0224112aa61a3e5222973c53e9d94d4 100644
--- a/DDEve/src/View3D.cpp
+++ b/DDEve/src/View3D.cpp
@@ -1,8 +1,8 @@
-// $Id: run_plugin.h 1663 2015-03-20 13:54:53Z gaede $
+// $Id$
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
-// Copyright (C) Organisation europ茅enne pour la Recherche nucl茅aire (CERN)
+// Copyright (C) Organisation europeenne pour la Recherche nucleaire (CERN)
 // All rights reserved.
 //
 // For the licensing terms see $DD4hepINSTALL/LICENSE.
diff --git a/DDEve/src/ViewMenu.cpp b/DDEve/src/ViewMenu.cpp
index 5c34fcb5930d478783711479ebbab94117434b24..e54a7ad11505a704b7a2a6ffd15453a4a770b988 100644
--- a/DDEve/src/ViewMenu.cpp
+++ b/DDEve/src/ViewMenu.cpp
@@ -1,8 +1,8 @@
-// $Id: run_plugin.h 1663 2015-03-20 13:54:53Z gaede $
+// $Id$
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
-// Copyright (C) Organisation europ茅enne pour la Recherche nucl茅aire (CERN)
+// Copyright (C) Organisation europeenne pour la Recherche nucleaire (CERN)
 // All rights reserved.
 //
 // For the licensing terms see $DD4hepINSTALL/LICENSE.
diff --git a/DDG4/CMakeLists.txt b/DDG4/CMakeLists.txt
index ba6ea7ef64822ccb1de01f45a75a9097261f26b1..c91e1cf246518ef176d8b9ba1891b0a3b5010d2c 100644
--- a/DDG4/CMakeLists.txt
+++ b/DDG4/CMakeLists.txt
@@ -1,8 +1,8 @@
-# $Id: Handle.h 570 2013-05-17 07:47:11Z markus.frank $
+# $Id$
 #==========================================================================
 #  AIDA Detector description implementation for LCD
 #--------------------------------------------------------------------------
-# Copyright (C) Organisation europ茅enne pour la Recherche nucl茅aire (CERN)
+# Copyright (C) Organisation europeenne pour la Recherche nucleaire (CERN)
 # All rights reserved.
 #
 # For the licensing terms see $DD4hepINSTALL/LICENSE.
diff --git a/DDG4/g4FromXML.cpp b/DDG4/g4FromXML.cpp
index 674cf4d49041aa4a59bf84e1fe3e38bd6f265cd5..a4e1bc147bd8833a2a6b22f6dac26d7542ee4b87 100644
--- a/DDG4/g4FromXML.cpp
+++ b/DDG4/g4FromXML.cpp
@@ -1,8 +1,8 @@
-// $Id: Handle.h 570 2013-05-17 07:47:11Z markus.frank $
+// $Id$
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
-// Copyright (C) Organisation europ茅enne pour la Recherche nucl茅aire (CERN)
+// Copyright (C) Organisation europeenne pour la Recherche nucleaire (CERN)
 // All rights reserved.
 //
 // For the licensing terms see $DD4hepINSTALL/LICENSE.
diff --git a/DDG4/g4gdmlDisplay.cpp b/DDG4/g4gdmlDisplay.cpp
index 86fee601831215bad0221f21b95cc5fdb3aa92b7..05f18cd447d24faa6a06d6ba0ee1c7858928ad83 100644
--- a/DDG4/g4gdmlDisplay.cpp
+++ b/DDG4/g4gdmlDisplay.cpp
@@ -1,8 +1,8 @@
-// $Id: Handle.h 570 2013-05-17 07:47:11Z markus.frank $
+// $Id$
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
-// Copyright (C) Organisation europ茅enne pour la Recherche nucl茅aire (CERN)
+// Copyright (C) Organisation europeenne pour la Recherche nucleaire (CERN)
 // All rights reserved.
 //
 // For the licensing terms see $DD4hepINSTALL/LICENSE.
diff --git a/DDG4/include/DDG4/ComponentProperties.h b/DDG4/include/DDG4/ComponentProperties.h
index 5a4bd9c15106bf1bac1b644044787140cbdeb699..50ed4bff6276befcf30f48fe241210a6f52282e3 100644
--- a/DDG4/include/DDG4/ComponentProperties.h
+++ b/DDG4/include/DDG4/ComponentProperties.h
@@ -1,8 +1,8 @@
-// $Id: Handle.h 570 2013-05-17 07:47:11Z markus.frank $
+// $Id$
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
-// Copyright (C) Organisation europ茅enne pour la Recherche nucl茅aire (CERN)
+// Copyright (C) Organisation europeenne pour la Recherche nucleaire (CERN)
 // All rights reserved.
 //
 // For the licensing terms see $DD4hepINSTALL/LICENSE.
diff --git a/DDG4/include/DDG4/ComponentProperties_inl.h b/DDG4/include/DDG4/ComponentProperties_inl.h
index 0027fd1e3799f145e5583143064808e7878bbddc..11453bba7ec9d15ad808ba25b7ff4aded6a8efbf 100644
--- a/DDG4/include/DDG4/ComponentProperties_inl.h
+++ b/DDG4/include/DDG4/ComponentProperties_inl.h
@@ -1,8 +1,8 @@
-// $Id: Handle.h 570 2013-05-17 07:47:11Z markus.frank $
+// $Id$
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
-// Copyright (C) Organisation europ茅enne pour la Recherche nucl茅aire (CERN)
+// Copyright (C) Organisation europeenne pour la Recherche nucleaire (CERN)
 // All rights reserved.
 //
 // For the licensing terms see $DD4hepINSTALL/LICENSE.
diff --git a/DDG4/include/DDG4/ComponentUtils.h b/DDG4/include/DDG4/ComponentUtils.h
index c99d6f86226e4c22ce8a59a175be2c13d3e49821..9d5f47a86c636e865672f32cc36a8582003436c6 100644
--- a/DDG4/include/DDG4/ComponentUtils.h
+++ b/DDG4/include/DDG4/ComponentUtils.h
@@ -1,8 +1,8 @@
-// $Id: Handle.h 570 2013-05-17 07:47:11Z markus.frank $
+// $Id$
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
-// Copyright (C) Organisation europ茅enne pour la Recherche nucl茅aire (CERN)
+// Copyright (C) Organisation europeenne pour la Recherche nucleaire (CERN)
 // All rights reserved.
 //
 // For the licensing terms see $DD4hepINSTALL/LICENSE.
diff --git a/DDG4/include/DDG4/DDG4Dict.h b/DDG4/include/DDG4/DDG4Dict.h
index 7c24ee584b44bca5e7ef321755868fc58e4e6605..4644f5c5c99c2139a0cd81f8fed5f530af433d8b 100644
--- a/DDG4/include/DDG4/DDG4Dict.h
+++ b/DDG4/include/DDG4/DDG4Dict.h
@@ -1,8 +1,8 @@
-// $Id: Handle.h 570 2013-05-17 07:47:11Z markus.frank $
+// $Id$
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
-// Copyright (C) Organisation europ茅enne pour la Recherche nucl茅aire (CERN)
+// Copyright (C) Organisation europeenne pour la Recherche nucleaire (CERN)
 // All rights reserved.
 //
 // For the licensing terms see $DD4hepINSTALL/LICENSE.
diff --git a/DDG4/include/DDG4/Defs.h b/DDG4/include/DDG4/Defs.h
index 0e29784dcec02a7f01397a2d3dfabd53542afcd4..cb845ce52a29e0db73b630c8b003271270287172 100644
--- a/DDG4/include/DDG4/Defs.h
+++ b/DDG4/include/DDG4/Defs.h
@@ -2,7 +2,7 @@
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
-// Copyright (C) Organisation europ茅enne pour la Recherche nucl茅aire (CERN)
+// Copyright (C) Organisation europeenne pour la Recherche nucleaire (CERN)
 // All rights reserved.
 //
 // For the licensing terms see $DD4hepINSTALL/LICENSE.
diff --git a/DDG4/include/DDG4/Factories.h b/DDG4/include/DDG4/Factories.h
index 81c8b2d3493aebe7c18f7a9de5921ed5485fd0d6..a8b7bb13836f263779e55997235836f2d847a153 100644
--- a/DDG4/include/DDG4/Factories.h
+++ b/DDG4/include/DDG4/Factories.h
@@ -2,7 +2,7 @@
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
-// Copyright (C) Organisation europ茅enne pour la Recherche nucl茅aire (CERN)
+// Copyright (C) Organisation europeenne pour la Recherche nucleaire (CERN)
 // All rights reserved.
 //
 // For the licensing terms see $DD4hepINSTALL/LICENSE.
diff --git a/DDG4/include/DDG4/Geant4Action.h b/DDG4/include/DDG4/Geant4Action.h
index e571c37c16620d1779e77289ec8eeb5de8bc37b5..1b9433899bdaffe06064294ad7b36d8d5b9f7dc2 100644
--- a/DDG4/include/DDG4/Geant4Action.h
+++ b/DDG4/include/DDG4/Geant4Action.h
@@ -3,11 +3,11 @@
 #define DD4HEP_DDG4_GEANT4ACTION_H
 
 // Framework include files
-// $Id: Handle.h 570 2013-05-17 07:47:11Z markus.frank $
+// $Id$
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
-// Copyright (C) Organisation europ茅enne pour la Recherche nucl茅aire (CERN)
+// Copyright (C) Organisation europeenne pour la Recherche nucleaire (CERN)
 // All rights reserved.
 //
 // For the licensing terms see $DD4hepINSTALL/LICENSE.
diff --git a/DDG4/include/DDG4/Geant4ActionPhase.h b/DDG4/include/DDG4/Geant4ActionPhase.h
index b4f2de603e91375cf9e859a2c84e29954e2edd6b..55788f3024489ac943af4775bd96f48084b71af3 100644
--- a/DDG4/include/DDG4/Geant4ActionPhase.h
+++ b/DDG4/include/DDG4/Geant4ActionPhase.h
@@ -1,8 +1,8 @@
-// $Id: Handle.h 570 2013-05-17 07:47:11Z markus.frank $
+// $Id$
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
-// Copyright (C) Organisation europ茅enne pour la Recherche nucl茅aire (CERN)
+// Copyright (C) Organisation europeenne pour la Recherche nucleaire (CERN)
 // All rights reserved.
 //
 // For the licensing terms see $DD4hepINSTALL/LICENSE.
diff --git a/DDG4/include/DDG4/Geant4AssemblyVolume.h b/DDG4/include/DDG4/Geant4AssemblyVolume.h
index 324b3a1129af4de38cf2e84a83b291c4b76b62bd..8fefc07339ce75a6ff4449b962e428ad25f59648 100644
--- a/DDG4/include/DDG4/Geant4AssemblyVolume.h
+++ b/DDG4/include/DDG4/Geant4AssemblyVolume.h
@@ -1,8 +1,8 @@
-// $Id: Handle.h 570 2013-05-17 07:47:11Z markus.frank $
+// $Id$
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
-// Copyright (C) Organisation europ茅enne pour la Recherche nucl茅aire (CERN)
+// Copyright (C) Organisation europeenne pour la Recherche nucleaire (CERN)
 // All rights reserved.
 //
 // For the licensing terms see $DD4hepINSTALL/LICENSE.
diff --git a/DDG4/include/DDG4/Geant4Call.h b/DDG4/include/DDG4/Geant4Call.h
index 5869767c165cf684c93555239c2b18204c85eec4..9d7f7778b96df6c8a96a50d88bb8408f7f4f37fe 100644
--- a/DDG4/include/DDG4/Geant4Call.h
+++ b/DDG4/include/DDG4/Geant4Call.h
@@ -1,8 +1,8 @@
-// $Id: Handle.h 570 2013-05-17 07:47:11Z markus.frank $
+// $Id$
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
-// Copyright (C) Organisation europ茅enne pour la Recherche nucl茅aire (CERN)
+// Copyright (C) Organisation europeenne pour la Recherche nucleaire (CERN)
 // All rights reserved.
 //
 // For the licensing terms see $DD4hepINSTALL/LICENSE.
diff --git a/DDG4/include/DDG4/Geant4Callback.h b/DDG4/include/DDG4/Geant4Callback.h
index d5f6b208ad4df122bfaa0e3036d0d8c5d453bf54..d04b60a4df1b5204dcbf102aa9a687c70c280f9d 100644
--- a/DDG4/include/DDG4/Geant4Callback.h
+++ b/DDG4/include/DDG4/Geant4Callback.h
@@ -1,8 +1,8 @@
-// $Id: Handle.h 570 2013-05-17 07:47:11Z markus.frank $
+// $Id$
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
-// Copyright (C) Organisation europ茅enne pour la Recherche nucl茅aire (CERN)
+// Copyright (C) Organisation europeenne pour la Recherche nucleaire (CERN)
 // All rights reserved.
 //
 // For the licensing terms see $DD4hepINSTALL/LICENSE.
diff --git a/DDG4/include/DDG4/Geant4Config.h b/DDG4/include/DDG4/Geant4Config.h
index 96c82be1ba04cacaa5c5282b9b1768ad135f62dc..f68f6d7338546afd2a3238b1173e0e546ef474a5 100644
--- a/DDG4/include/DDG4/Geant4Config.h
+++ b/DDG4/include/DDG4/Geant4Config.h
@@ -1,8 +1,8 @@
-// $Id: Handle.h 570 2013-05-17 07:47:11Z markus.frank $
+// $Id$
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
-// Copyright (C) Organisation europ茅enne pour la Recherche nucl茅aire (CERN)
+// Copyright (C) Organisation europeenne pour la Recherche nucleaire (CERN)
 // All rights reserved.
 //
 // For the licensing terms see $DD4hepINSTALL/LICENSE.
diff --git a/DDG4/include/DDG4/Geant4Context.h b/DDG4/include/DDG4/Geant4Context.h
index 5dc9ca381793fa1a311a775590605a7fddaba95b..67a01384825e548503b92f8041f8cbb1d9632787 100644
--- a/DDG4/include/DDG4/Geant4Context.h
+++ b/DDG4/include/DDG4/Geant4Context.h
@@ -1,8 +1,8 @@
-// $Id: Handle.h 570 2013-05-17 07:47:11Z markus.frank $
+// $Id$
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
-// Copyright (C) Organisation europ茅enne pour la Recherche nucl茅aire (CERN)
+// Copyright (C) Organisation europeenne pour la Recherche nucleaire (CERN)
 // All rights reserved.
 //
 // For the licensing terms see $DD4hepINSTALL/LICENSE.
diff --git a/DDG4/include/DDG4/Geant4Converter.h b/DDG4/include/DDG4/Geant4Converter.h
index 4b96fa63b3c8cf2ef98a14fb1a72dd16db1c1f47..06c261ee26584785d32eb0cd52e9afd8618e7555 100644
--- a/DDG4/include/DDG4/Geant4Converter.h
+++ b/DDG4/include/DDG4/Geant4Converter.h
@@ -2,7 +2,7 @@
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
-// Copyright (C) Organisation europ茅enne pour la Recherche nucl茅aire (CERN)
+// Copyright (C) Organisation europeenne pour la Recherche nucleaire (CERN)
 // All rights reserved.
 //
 // For the licensing terms see $DD4hepINSTALL/LICENSE.
diff --git a/DDG4/include/DDG4/Geant4Data.h b/DDG4/include/DDG4/Geant4Data.h
index cc7ee3378fd42f44ada6658e2fe75366276a1451..b6abcd2a2a12c9ba8ad67e29fba32de49d33d1f6 100644
--- a/DDG4/include/DDG4/Geant4Data.h
+++ b/DDG4/include/DDG4/Geant4Data.h
@@ -1,8 +1,8 @@
-// $Id: Handle.h 570 2013-05-17 07:47:11Z markus.frank $
+// $Id$
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
-// Copyright (C) Organisation europ茅enne pour la Recherche nucl茅aire (CERN)
+// Copyright (C) Organisation europeenne pour la Recherche nucleaire (CERN)
 // All rights reserved.
 //
 // For the licensing terms see $DD4hepINSTALL/LICENSE.
diff --git a/DDG4/include/DDG4/Geant4DataConversion.h b/DDG4/include/DDG4/Geant4DataConversion.h
index 7d492cb72cc8ce60c2f00490a7c368ff6154b359..0f6948e14fc494f5b96c1cb018d2e37ac2593da1 100644
--- a/DDG4/include/DDG4/Geant4DataConversion.h
+++ b/DDG4/include/DDG4/Geant4DataConversion.h
@@ -1,8 +1,8 @@
-// $Id: Handle.h 570 2013-05-17 07:47:11Z markus.frank $
+// $Id$
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
-// Copyright (C) Organisation europ茅enne pour la Recherche nucl茅aire (CERN)
+// Copyright (C) Organisation europeenne pour la Recherche nucleaire (CERN)
 // All rights reserved.
 //
 // For the licensing terms see $DD4hepINSTALL/LICENSE.
diff --git a/DDG4/include/DDG4/Geant4DataDump.h b/DDG4/include/DDG4/Geant4DataDump.h
index 65c9d14426fec730122f09aaf2b8653522dffefe..1e14dc8a4f120cab0c209c035815cff0ba475f9a 100644
--- a/DDG4/include/DDG4/Geant4DataDump.h
+++ b/DDG4/include/DDG4/Geant4DataDump.h
@@ -1,8 +1,8 @@
-// $Id: Handle.h 570 2013-05-17 07:47:11Z markus.frank $
+// $Id$
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
-// Copyright (C) Organisation europ茅enne pour la Recherche nucl茅aire (CERN)
+// Copyright (C) Organisation europeenne pour la Recherche nucleaire (CERN)
 // All rights reserved.
 //
 // For the licensing terms see $DD4hepINSTALL/LICENSE.
diff --git a/DDG4/include/DDG4/Geant4DetectorConstruction.h b/DDG4/include/DDG4/Geant4DetectorConstruction.h
index 32dbab73f25498cdbc5b2e1c8bcde2d8d1b2dbb6..8e52a7e694224e54a3381bf4b78794506cd7e03f 100644
--- a/DDG4/include/DDG4/Geant4DetectorConstruction.h
+++ b/DDG4/include/DDG4/Geant4DetectorConstruction.h
@@ -2,7 +2,7 @@
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
-// Copyright (C) Organisation europ茅enne pour la Recherche nucl茅aire (CERN)
+// Copyright (C) Organisation europeenne pour la Recherche nucleaire (CERN)
 // All rights reserved.
 //
 // For the licensing terms see $DD4hepINSTALL/LICENSE.
diff --git a/DDG4/include/DDG4/Geant4EventAction.h b/DDG4/include/DDG4/Geant4EventAction.h
index c816930a391c637aa6465d8a173ffba02cd1e514..66554db49817e50021e369121bc3f1231c2a17b0 100644
--- a/DDG4/include/DDG4/Geant4EventAction.h
+++ b/DDG4/include/DDG4/Geant4EventAction.h
@@ -1,8 +1,8 @@
-// $Id: Handle.h 570 2013-05-17 07:47:11Z markus.frank $
+// $Id$
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
-// Copyright (C) Organisation europ茅enne pour la Recherche nucl茅aire (CERN)
+// Copyright (C) Organisation europeenne pour la Recherche nucleaire (CERN)
 // All rights reserved.
 //
 // For the licensing terms see $DD4hepINSTALL/LICENSE.
diff --git a/DDG4/include/DDG4/Geant4Field.h b/DDG4/include/DDG4/Geant4Field.h
index 33eff2890c4c4e4f0758a0348f5816fa232967c9..ebced70ee44e9e942995872c3fd4a87749109b1d 100644
--- a/DDG4/include/DDG4/Geant4Field.h
+++ b/DDG4/include/DDG4/Geant4Field.h
@@ -2,7 +2,7 @@
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
-// Copyright (C) Organisation europ茅enne pour la Recherche nucl茅aire (CERN)
+// Copyright (C) Organisation europeenne pour la Recherche nucleaire (CERN)
 // All rights reserved.
 //
 // For the licensing terms see $DD4hepINSTALL/LICENSE.
diff --git a/DDG4/include/DDG4/Geant4GDMLDetector.h b/DDG4/include/DDG4/Geant4GDMLDetector.h
index 16b23df4ea6811600952f6a18caa892d41642cfd..f6c4b0b592c75e0213fa2b9d773152088d6b1d1f 100644
--- a/DDG4/include/DDG4/Geant4GDMLDetector.h
+++ b/DDG4/include/DDG4/Geant4GDMLDetector.h
@@ -1,8 +1,8 @@
-// $Id: Handle.h 570 2013-05-17 07:47:11Z markus.frank $
+// $Id$
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
-// Copyright (C) Organisation europ茅enne pour la Recherche nucl茅aire (CERN)
+// Copyright (C) Organisation europeenne pour la Recherche nucleaire (CERN)
 // All rights reserved.
 //
 // For the licensing terms see $DD4hepINSTALL/LICENSE.
diff --git a/DDG4/include/DDG4/Geant4GeneratorAction.h b/DDG4/include/DDG4/Geant4GeneratorAction.h
index 14e597b702f58c392956b0586d87b309d405e703..daa7ca818b639d5fb2039700b6818721f50f6a72 100644
--- a/DDG4/include/DDG4/Geant4GeneratorAction.h
+++ b/DDG4/include/DDG4/Geant4GeneratorAction.h
@@ -1,8 +1,8 @@
-// $Id: Handle.h 570 2013-05-17 07:47:11Z markus.frank $
+// $Id$
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
-// Copyright (C) Organisation europ茅enne pour la Recherche nucl茅aire (CERN)
+// Copyright (C) Organisation europeenne pour la Recherche nucleaire (CERN)
 // All rights reserved.
 //
 // For the licensing terms see $DD4hepINSTALL/LICENSE.
diff --git a/DDG4/include/DDG4/Geant4GeneratorActionInit.h b/DDG4/include/DDG4/Geant4GeneratorActionInit.h
index 265f102c155314576267a279df76a317f642f28a..1ace9c85611a8b638a65e614a471aca5fe9c63c6 100644
--- a/DDG4/include/DDG4/Geant4GeneratorActionInit.h
+++ b/DDG4/include/DDG4/Geant4GeneratorActionInit.h
@@ -1,8 +1,8 @@
-// $Id: Handle.h 570 2013-05-17 07:47:11Z markus.frank $
+// $Id$
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
-// Copyright (C) Organisation europ茅enne pour la Recherche nucl茅aire (CERN)
+// Copyright (C) Organisation europeenne pour la Recherche nucleaire (CERN)
 // All rights reserved.
 //
 // For the licensing terms see $DD4hepINSTALL/LICENSE.
diff --git a/DDG4/include/DDG4/Geant4GeometryInfo.h b/DDG4/include/DDG4/Geant4GeometryInfo.h
index febae86b495b311b59a86e68ba0a6f602cc27084..e9f11474fa2e89b48b8202cb4829f288f4cc770b 100644
--- a/DDG4/include/DDG4/Geant4GeometryInfo.h
+++ b/DDG4/include/DDG4/Geant4GeometryInfo.h
@@ -1,8 +1,8 @@
-// $Id: Handle.h 570 2013-05-17 07:47:11Z markus.frank $
+// $Id$
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
-// Copyright (C) Organisation europ茅enne pour la Recherche nucl茅aire (CERN)
+// Copyright (C) Organisation europeenne pour la Recherche nucleaire (CERN)
 // All rights reserved.
 //
 // For the licensing terms see $DD4hepINSTALL/LICENSE.
diff --git a/DDG4/include/DDG4/Geant4Handle.h b/DDG4/include/DDG4/Geant4Handle.h
index d682ac984619ec7568716e838c032f68f464dfcb..b2787f3898091342aaa34cd9f0568cc6178f10c6 100644
--- a/DDG4/include/DDG4/Geant4Handle.h
+++ b/DDG4/include/DDG4/Geant4Handle.h
@@ -1,8 +1,8 @@
-// $Id: Handle.h 570 2013-05-17 07:47:11Z markus.frank $
+// $Id$
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
-// Copyright (C) Organisation europ茅enne pour la Recherche nucl茅aire (CERN)
+// Copyright (C) Organisation europeenne pour la Recherche nucleaire (CERN)
 // All rights reserved.
 //
 // For the licensing terms see $DD4hepINSTALL/LICENSE.
diff --git a/DDG4/include/DDG4/Geant4HierarchyDump.h b/DDG4/include/DDG4/Geant4HierarchyDump.h
index ee3d891b60277021937803c9ada26557981a0cd3..924924b1e745cab7ff402fb62df59d0dd20a94dc 100644
--- a/DDG4/include/DDG4/Geant4HierarchyDump.h
+++ b/DDG4/include/DDG4/Geant4HierarchyDump.h
@@ -1,8 +1,8 @@
-// $Id: Handle.h 570 2013-05-17 07:47:11Z markus.frank $
+// $Id$
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
-// Copyright (C) Organisation europ茅enne pour la Recherche nucl茅aire (CERN)
+// Copyright (C) Organisation europeenne pour la Recherche nucleaire (CERN)
 // All rights reserved.
 //
 // For the licensing terms see $DD4hepINSTALL/LICENSE.
diff --git a/DDG4/include/DDG4/Geant4HitCollection.h b/DDG4/include/DDG4/Geant4HitCollection.h
index 4f6a28da2ed3dc173ac305b00ca8ab20745d98fe..6f4e21486a9354fcfacdb22e9429b7313d05e53c 100644
--- a/DDG4/include/DDG4/Geant4HitCollection.h
+++ b/DDG4/include/DDG4/Geant4HitCollection.h
@@ -1,8 +1,8 @@
-// $Id: Handle.h 570 2013-05-17 07:47:11Z markus.frank $
+// $Id$
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
-// Copyright (C) Organisation europ茅enne pour la Recherche nucl茅aire (CERN)
+// Copyright (C) Organisation europeenne pour la Recherche nucleaire (CERN)
 // All rights reserved.
 //
 // For the licensing terms see $DD4hepINSTALL/LICENSE.
diff --git a/DDG4/include/DDG4/Geant4Hits.h b/DDG4/include/DDG4/Geant4Hits.h
index c3a7844c46c34685a0491b9c7b75fd246b7b3c59..556a0e7b058ad27bb2218ae9571ae70813bb285d 100644
--- a/DDG4/include/DDG4/Geant4Hits.h
+++ b/DDG4/include/DDG4/Geant4Hits.h
@@ -2,7 +2,7 @@
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
-// Copyright (C) Organisation europ茅enne pour la Recherche nucl茅aire (CERN)
+// Copyright (C) Organisation europeenne pour la Recherche nucleaire (CERN)
 // All rights reserved.
 //
 // For the licensing terms see $DD4hepINSTALL/LICENSE.
diff --git a/DDG4/include/DDG4/Geant4InputAction.h b/DDG4/include/DDG4/Geant4InputAction.h
index 32eda4baf6e8851ac575b39d7c1ccc95d81989cc..ce3a5043701ab3c4a49aa5ce32aaab8b0740b535 100644
--- a/DDG4/include/DDG4/Geant4InputAction.h
+++ b/DDG4/include/DDG4/Geant4InputAction.h
@@ -1,8 +1,8 @@
-// $Id: Handle.h 570 2013-05-17 07:47:11Z markus.frank $
+// $Id$
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
-// Copyright (C) Organisation europ茅enne pour la Recherche nucl茅aire (CERN)
+// Copyright (C) Organisation europeenne pour la Recherche nucleaire (CERN)
 // All rights reserved.
 //
 // For the licensing terms see $DD4hepINSTALL/LICENSE.
diff --git a/DDG4/include/DDG4/Geant4InputHandling.h b/DDG4/include/DDG4/Geant4InputHandling.h
index c94db3aa52189b895f7f4daf71fddb90aba73d02..4dc807700f98e2e40fcf11bf810d87130ddc3446 100644
--- a/DDG4/include/DDG4/Geant4InputHandling.h
+++ b/DDG4/include/DDG4/Geant4InputHandling.h
@@ -1,8 +1,8 @@
-// $Id: Handle.h 570 2013-05-17 07:47:11Z markus.frank $
+// $Id$
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
-// Copyright (C) Organisation europ茅enne pour la Recherche nucl茅aire (CERN)
+// Copyright (C) Organisation europeenne pour la Recherche nucleaire (CERN)
 // All rights reserved.
 //
 // For the licensing terms see $DD4hepINSTALL/LICENSE.
diff --git a/DDG4/include/DDG4/Geant4InteractionMerger.h b/DDG4/include/DDG4/Geant4InteractionMerger.h
index 33bd53c0b9d53627cc449c56ca25b2344c43c702..1dc691390b7d1941c074ffe4264a5856e8d52de4 100644
--- a/DDG4/include/DDG4/Geant4InteractionMerger.h
+++ b/DDG4/include/DDG4/Geant4InteractionMerger.h
@@ -1,8 +1,8 @@
-// $Id: Handle.h 570 2013-05-17 07:47:11Z markus.frank $
+// $Id$
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
-// Copyright (C) Organisation europ茅enne pour la Recherche nucl茅aire (CERN)
+// Copyright (C) Organisation europeenne pour la Recherche nucleaire (CERN)
 // All rights reserved.
 //
 // For the licensing terms see $DD4hepINSTALL/LICENSE.
diff --git a/DDG4/include/DDG4/Geant4InteractionVertexBoost.h b/DDG4/include/DDG4/Geant4InteractionVertexBoost.h
index b83b77840021d6123ef3e0ae04df5add3d666e66..59a6f7a19bcff73fe00ccd6ab3458478e232c395 100644
--- a/DDG4/include/DDG4/Geant4InteractionVertexBoost.h
+++ b/DDG4/include/DDG4/Geant4InteractionVertexBoost.h
@@ -1,8 +1,8 @@
-// $Id: Handle.h 570 2013-05-17 07:47:11Z markus.frank $
+// $Id$
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
-// Copyright (C) Organisation europ茅enne pour la Recherche nucl茅aire (CERN)
+// Copyright (C) Organisation europeenne pour la Recherche nucleaire (CERN)
 // All rights reserved.
 //
 // For the licensing terms see $DD4hepINSTALL/LICENSE.
diff --git a/DDG4/include/DDG4/Geant4InteractionVertexSmear.h b/DDG4/include/DDG4/Geant4InteractionVertexSmear.h
index 301cedb818ea36e31b5cd1b1e05a901c13394664..26665db0cb2dca4a951197005375664910466647 100644
--- a/DDG4/include/DDG4/Geant4InteractionVertexSmear.h
+++ b/DDG4/include/DDG4/Geant4InteractionVertexSmear.h
@@ -1,8 +1,8 @@
-// $Id: Handle.h 570 2013-05-17 07:47:11Z markus.frank $
+// $Id$
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
-// Copyright (C) Organisation europ茅enne pour la Recherche nucl茅aire (CERN)
+// Copyright (C) Organisation europeenne pour la Recherche nucleaire (CERN)
 // All rights reserved.
 //
 // For the licensing terms see $DD4hepINSTALL/LICENSE.
diff --git a/DDG4/include/DDG4/Geant4IsotropeGenerator.h b/DDG4/include/DDG4/Geant4IsotropeGenerator.h
index 9b39ec88e8407e9c392c9649fb0304beff9ed3e9..604c247ed9f525eaaad95dabbe0f0ef597a56bc3 100644
--- a/DDG4/include/DDG4/Geant4IsotropeGenerator.h
+++ b/DDG4/include/DDG4/Geant4IsotropeGenerator.h
@@ -1,8 +1,8 @@
-// $Id: Handle.h 570 2013-05-17 07:47:11Z markus.frank $
+// $Id$
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
-// Copyright (C) Organisation europ茅enne pour la Recherche nucl茅aire (CERN)
+// Copyright (C) Organisation europeenne pour la Recherche nucleaire (CERN)
 // All rights reserved.
 //
 // For the licensing terms see $DD4hepINSTALL/LICENSE.
diff --git a/DDG4/include/DDG4/Geant4Kernel.h b/DDG4/include/DDG4/Geant4Kernel.h
index 544dd6ca200a8fe3f825c41745e0063dbe8027e4..ff4ad7f320b1e70a786593633fc35ef939c68640 100644
--- a/DDG4/include/DDG4/Geant4Kernel.h
+++ b/DDG4/include/DDG4/Geant4Kernel.h
@@ -1,8 +1,8 @@
-// $Id: Handle.h 570 2013-05-17 07:47:11Z markus.frank $
+// $Id$
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
-// Copyright (C) Organisation europ茅enne pour la Recherche nucl茅aire (CERN)
+// Copyright (C) Organisation europeenne pour la Recherche nucleaire (CERN)
 // All rights reserved.
 //
 // For the licensing terms see $DD4hepINSTALL/LICENSE.
diff --git a/DDG4/include/DDG4/Geant4Mapping.h b/DDG4/include/DDG4/Geant4Mapping.h
index 16ce142b84907111b1de43250dccba997f00221d..de4e3cd75df4960b1112cdf19d0a7bffe8a43d0f 100644
--- a/DDG4/include/DDG4/Geant4Mapping.h
+++ b/DDG4/include/DDG4/Geant4Mapping.h
@@ -1,8 +1,8 @@
-// $Id: Handle.h 570 2013-05-17 07:47:11Z markus.frank $
+// $Id$
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
-// Copyright (C) Organisation europ茅enne pour la Recherche nucl茅aire (CERN)
+// Copyright (C) Organisation europeenne pour la Recherche nucleaire (CERN)
 // All rights reserved.
 //
 // For the licensing terms see $DD4hepINSTALL/LICENSE.
diff --git a/DDG4/include/DDG4/Geant4MonteCarloTruth.h b/DDG4/include/DDG4/Geant4MonteCarloTruth.h
index 0fde37435c10246cf8de3ce06151863f3699f18a..4037a2615d94174bec07172858771d7649bb90ba 100644
--- a/DDG4/include/DDG4/Geant4MonteCarloTruth.h
+++ b/DDG4/include/DDG4/Geant4MonteCarloTruth.h
@@ -1,8 +1,8 @@
-// $Id: Handle.h 570 2013-05-17 07:47:11Z markus.frank $
+// $Id$
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
-// Copyright (C) Organisation europ茅enne pour la Recherche nucl茅aire (CERN)
+// Copyright (C) Organisation europeenne pour la Recherche nucleaire (CERN)
 // All rights reserved.
 //
 // For the licensing terms see $DD4hepINSTALL/LICENSE.
diff --git a/DDG4/include/DDG4/Geant4Output2ROOT.h b/DDG4/include/DDG4/Geant4Output2ROOT.h
index d0f0c623408c302685c41c22c78bcdbe617d16dc..84a0d1710e64695f7368c9f3ac147c55e8a20602 100644
--- a/DDG4/include/DDG4/Geant4Output2ROOT.h
+++ b/DDG4/include/DDG4/Geant4Output2ROOT.h
@@ -1,8 +1,8 @@
-// $Id: Handle.h 570 2013-05-17 07:47:11Z markus.frank $
+// $Id$
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
-// Copyright (C) Organisation europ茅enne pour la Recherche nucl茅aire (CERN)
+// Copyright (C) Organisation europeenne pour la Recherche nucleaire (CERN)
 // All rights reserved.
 //
 // For the licensing terms see $DD4hepINSTALL/LICENSE.
diff --git a/DDG4/include/DDG4/Geant4OutputAction.h b/DDG4/include/DDG4/Geant4OutputAction.h
index c05f1d864be28463a7737bfb88e50502d8e5a209..b7e26cf70a6d1904c3eea71d314eadd4624745e3 100644
--- a/DDG4/include/DDG4/Geant4OutputAction.h
+++ b/DDG4/include/DDG4/Geant4OutputAction.h
@@ -1,8 +1,8 @@
-// $Id: Handle.h 570 2013-05-17 07:47:11Z markus.frank $
+// $Id$
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
-// Copyright (C) Organisation europ茅enne pour la Recherche nucl茅aire (CERN)
+// Copyright (C) Organisation europeenne pour la Recherche nucleaire (CERN)
 // All rights reserved.
 //
 // For the licensing terms see $DD4hepINSTALL/LICENSE.
diff --git a/DDG4/include/DDG4/Geant4Particle.h b/DDG4/include/DDG4/Geant4Particle.h
index 7e3a0982e170ad5ed1dfb3f23b3ede2c3bc24b49..cf92e2ae48017dcd063766a89e680b2f9782897e 100644
--- a/DDG4/include/DDG4/Geant4Particle.h
+++ b/DDG4/include/DDG4/Geant4Particle.h
@@ -1,8 +1,8 @@
-// $Id: Handle.h 570 2013-05-17 07:47:11Z markus.frank $
+// $Id$
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
-// Copyright (C) Organisation europ茅enne pour la Recherche nucl茅aire (CERN)
+// Copyright (C) Organisation europeenne pour la Recherche nucleaire (CERN)
 // All rights reserved.
 //
 // For the licensing terms see $DD4hepINSTALL/LICENSE.
diff --git a/DDG4/include/DDG4/Geant4ParticleGenerator.h b/DDG4/include/DDG4/Geant4ParticleGenerator.h
index 9c5f56aefdfaa667dc156919a7a8fdbb4e5a09d1..5331f5c15579b48c7ece4641ce63915198c9056a 100644
--- a/DDG4/include/DDG4/Geant4ParticleGenerator.h
+++ b/DDG4/include/DDG4/Geant4ParticleGenerator.h
@@ -1,8 +1,8 @@
-// $Id: Handle.h 570 2013-05-17 07:47:11Z markus.frank $
+// $Id$
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
-// Copyright (C) Organisation europ茅enne pour la Recherche nucl茅aire (CERN)
+// Copyright (C) Organisation europeenne pour la Recherche nucleaire (CERN)
 // All rights reserved.
 //
 // For the licensing terms see $DD4hepINSTALL/LICENSE.
diff --git a/DDG4/include/DDG4/Geant4ParticleGun.h b/DDG4/include/DDG4/Geant4ParticleGun.h
index d804f5282b84febbb91b3819114b83a253baf84c..bbd8dfc6b02399eaba7978812c04820831369fb8 100644
--- a/DDG4/include/DDG4/Geant4ParticleGun.h
+++ b/DDG4/include/DDG4/Geant4ParticleGun.h
@@ -1,8 +1,8 @@
-// $Id: Handle.h 570 2013-05-17 07:47:11Z markus.frank $
+// $Id$
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
-// Copyright (C) Organisation europ茅enne pour la Recherche nucl茅aire (CERN)
+// Copyright (C) Organisation europeenne pour la Recherche nucleaire (CERN)
 // All rights reserved.
 //
 // For the licensing terms see $DD4hepINSTALL/LICENSE.
diff --git a/DDG4/include/DDG4/Geant4ParticleHandler.h b/DDG4/include/DDG4/Geant4ParticleHandler.h
index bd9b6029e8ae7c2e1168729e7a2a7984670026d3..8ef5ee4ed141a4e9dcbb579326e4f141a1816419 100644
--- a/DDG4/include/DDG4/Geant4ParticleHandler.h
+++ b/DDG4/include/DDG4/Geant4ParticleHandler.h
@@ -1,8 +1,8 @@
-// $Id: Handle.h 570 2013-05-17 07:47:11Z markus.frank $
+// $Id$
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
-// Copyright (C) Organisation europ茅enne pour la Recherche nucl茅aire (CERN)
+// Copyright (C) Organisation europeenne pour la Recherche nucleaire (CERN)
 // All rights reserved.
 //
 // For the licensing terms see $DD4hepINSTALL/LICENSE.
diff --git a/DDG4/include/DDG4/Geant4ParticlePrint.h b/DDG4/include/DDG4/Geant4ParticlePrint.h
index 7b75e30593d1af08c8c603e0c6a3fd117324bb25..2df4ba5013a6d8a01d97028f66651befe00ebe88 100644
--- a/DDG4/include/DDG4/Geant4ParticlePrint.h
+++ b/DDG4/include/DDG4/Geant4ParticlePrint.h
@@ -1,8 +1,8 @@
-// $Id: Handle.h 570 2013-05-17 07:47:11Z markus.frank $
+// $Id$
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
-// Copyright (C) Organisation europ茅enne pour la Recherche nucl茅aire (CERN)
+// Copyright (C) Organisation europeenne pour la Recherche nucleaire (CERN)
 // All rights reserved.
 //
 // For the licensing terms see $DD4hepINSTALL/LICENSE.
diff --git a/DDG4/include/DDG4/Geant4PhysicsList.h b/DDG4/include/DDG4/Geant4PhysicsList.h
index 4e6f119054b75abb82fccf8b4b5f6f0094af8664..d2cc4de6673e068b0c940632b0b02c54975932da 100644
--- a/DDG4/include/DDG4/Geant4PhysicsList.h
+++ b/DDG4/include/DDG4/Geant4PhysicsList.h
@@ -1,8 +1,8 @@
-// $Id: Handle.h 570 2013-05-17 07:47:11Z markus.frank $
+// $Id$
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
-// Copyright (C) Organisation europ茅enne pour la Recherche nucl茅aire (CERN)
+// Copyright (C) Organisation europeenne pour la Recherche nucleaire (CERN)
 // All rights reserved.
 //
 // For the licensing terms see $DD4hepINSTALL/LICENSE.
diff --git a/DDG4/include/DDG4/Geant4Primary.h b/DDG4/include/DDG4/Geant4Primary.h
index b90a5b0dde090876ce949d59ca25f78c299ae2e9..73c4fb6a2ed1875596af21e8ac38ea75d5a4a80a 100644
--- a/DDG4/include/DDG4/Geant4Primary.h
+++ b/DDG4/include/DDG4/Geant4Primary.h
@@ -1,8 +1,8 @@
-// $Id: Handle.h 570 2013-05-17 07:47:11Z markus.frank $
+// $Id$
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
-// Copyright (C) Organisation europ茅enne pour la Recherche nucl茅aire (CERN)
+// Copyright (C) Organisation europeenne pour la Recherche nucleaire (CERN)
 // All rights reserved.
 //
 // For the licensing terms see $DD4hepINSTALL/LICENSE.
diff --git a/DDG4/include/DDG4/Geant4PrimaryHandler.h b/DDG4/include/DDG4/Geant4PrimaryHandler.h
index c433632f7a5026b5c93de6fa0598792d070ad3fc..3066fbf5ffed58e05171f726a4d3369807f19fa3 100644
--- a/DDG4/include/DDG4/Geant4PrimaryHandler.h
+++ b/DDG4/include/DDG4/Geant4PrimaryHandler.h
@@ -1,8 +1,8 @@
-// $Id: Handle.h 570 2013-05-17 07:47:11Z markus.frank $
+// $Id$
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
-// Copyright (C) Organisation europ茅enne pour la Recherche nucl茅aire (CERN)
+// Copyright (C) Organisation europeenne pour la Recherche nucleaire (CERN)
 // All rights reserved.
 //
 // For the licensing terms see $DD4hepINSTALL/LICENSE.
diff --git a/DDG4/include/DDG4/Geant4Primitives.h b/DDG4/include/DDG4/Geant4Primitives.h
index 26627eb0e8a3a8d26891b6e503f9894a5678d6ac..501aee00c4207094a301191e7edf39bee4642d71 100644
--- a/DDG4/include/DDG4/Geant4Primitives.h
+++ b/DDG4/include/DDG4/Geant4Primitives.h
@@ -1,8 +1,8 @@
-// $Id: Handle.h 570 2013-05-17 07:47:11Z markus.frank $
+// $Id$
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
-// Copyright (C) Organisation europ茅enne pour la Recherche nucl茅aire (CERN)
+// Copyright (C) Organisation europeenne pour la Recherche nucleaire (CERN)
 // All rights reserved.
 //
 // For the licensing terms see $DD4hepINSTALL/LICENSE.
diff --git a/DDG4/include/DDG4/Geant4Random.h b/DDG4/include/DDG4/Geant4Random.h
index 248145ed4172aac2ce39ad592b4e70b682bf9de4..ca67a631276f84a43e111cc82267e3a7df0ef53f 100644
--- a/DDG4/include/DDG4/Geant4Random.h
+++ b/DDG4/include/DDG4/Geant4Random.h
@@ -1,8 +1,8 @@
-// $Id: Handle.h 570 2013-05-17 07:47:11Z markus.frank $
+// $Id$
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
-// Copyright (C) Organisation europ茅enne pour la Recherche nucl茅aire (CERN)
+// Copyright (C) Organisation europeenne pour la Recherche nucleaire (CERN)
 // All rights reserved.
 //
 // For the licensing terms see $DD4hepINSTALL/LICENSE.
diff --git a/DDG4/include/DDG4/Geant4RunAction.h b/DDG4/include/DDG4/Geant4RunAction.h
index 307d5c3c54ec45c70d8e99af8d69d243f33febac..210890b4681ef9de56b8a8bcb4923359b279e98b 100644
--- a/DDG4/include/DDG4/Geant4RunAction.h
+++ b/DDG4/include/DDG4/Geant4RunAction.h
@@ -1,8 +1,8 @@
-// $Id: Handle.h 570 2013-05-17 07:47:11Z markus.frank $
+// $Id$
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
-// Copyright (C) Organisation europ茅enne pour la Recherche nucl茅aire (CERN)
+// Copyright (C) Organisation europeenne pour la Recherche nucleaire (CERN)
 // All rights reserved.
 //
 // For the licensing terms see $DD4hepINSTALL/LICENSE.
diff --git a/DDG4/include/DDG4/Geant4SensDetAction.h b/DDG4/include/DDG4/Geant4SensDetAction.h
index 8638585c07bfffca7a504a7cf62c05f48f79a7dc..2e77fe9e27cb817acafde367843ce0a10b46fe8b 100644
--- a/DDG4/include/DDG4/Geant4SensDetAction.h
+++ b/DDG4/include/DDG4/Geant4SensDetAction.h
@@ -1,8 +1,8 @@
-// $Id: Handle.h 570 2013-05-17 07:47:11Z markus.frank $
+// $Id$
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
-// Copyright (C) Organisation europ茅enne pour la Recherche nucl茅aire (CERN)
+// Copyright (C) Organisation europeenne pour la Recherche nucleaire (CERN)
 // All rights reserved.
 //
 // For the licensing terms see $DD4hepINSTALL/LICENSE.
diff --git a/DDG4/include/DDG4/Geant4SensDetAction.inl b/DDG4/include/DDG4/Geant4SensDetAction.inl
index 148494b29653093e914cba572d3a2350bf68f521..74a2935b92ea9e400e1369b9baed8399a957744f 100644
--- a/DDG4/include/DDG4/Geant4SensDetAction.inl
+++ b/DDG4/include/DDG4/Geant4SensDetAction.inl
@@ -1,8 +1,8 @@
-// $Id: Handle.h 570 2013-05-17 07:47:11Z markus.frank $
+// $Id$
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
-// Copyright (C) Organisation europ茅enne pour la Recherche nucl茅aire (CERN)
+// Copyright (C) Organisation europeenne pour la Recherche nucleaire (CERN)
 // All rights reserved.
 //
 // For the licensing terms see $DD4hepINSTALL/LICENSE.
diff --git a/DDG4/include/DDG4/Geant4SensitiveDetector.h b/DDG4/include/DDG4/Geant4SensitiveDetector.h
index ef9fcce759a49cb45498c82529de7f28b6495ca8..c80ee4743928e8390a05f1901dd40cfe3cf8ab26 100644
--- a/DDG4/include/DDG4/Geant4SensitiveDetector.h
+++ b/DDG4/include/DDG4/Geant4SensitiveDetector.h
@@ -2,7 +2,7 @@
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
-// Copyright (C) Organisation europ茅enne pour la Recherche nucl茅aire (CERN)
+// Copyright (C) Organisation europeenne pour la Recherche nucleaire (CERN)
 // All rights reserved.
 //
 // For the licensing terms see $DD4hepINSTALL/LICENSE.
diff --git a/DDG4/include/DDG4/Geant4SensitiveDetector_inline.h b/DDG4/include/DDG4/Geant4SensitiveDetector_inline.h
index 0dc5cbb339e4e422e9840e7cc71f7903f8d252ae..516f174e87fbad18a4c356f17e52d17bed325e25 100644
--- a/DDG4/include/DDG4/Geant4SensitiveDetector_inline.h
+++ b/DDG4/include/DDG4/Geant4SensitiveDetector_inline.h
@@ -2,7 +2,7 @@
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
-// Copyright (C) Organisation europ茅enne pour la Recherche nucl茅aire (CERN)
+// Copyright (C) Organisation europeenne pour la Recherche nucleaire (CERN)
 // All rights reserved.
 //
 // For the licensing terms see $DD4hepINSTALL/LICENSE.
diff --git a/DDG4/include/DDG4/Geant4StackingAction.h b/DDG4/include/DDG4/Geant4StackingAction.h
index 779adcd8c0347fc2e44707c93465cacb6fd8fc29..70da879caf1932f9fb7493655230c02998e781ee 100644
--- a/DDG4/include/DDG4/Geant4StackingAction.h
+++ b/DDG4/include/DDG4/Geant4StackingAction.h
@@ -1,8 +1,8 @@
-// $Id: Handle.h 570 2013-05-17 07:47:11Z markus.frank $
+// $Id$
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
-// Copyright (C) Organisation europ茅enne pour la Recherche nucl茅aire (CERN)
+// Copyright (C) Organisation europeenne pour la Recherche nucleaire (CERN)
 // All rights reserved.
 //
 // For the licensing terms see $DD4hepINSTALL/LICENSE.
diff --git a/DDG4/include/DDG4/Geant4StepHandler.h b/DDG4/include/DDG4/Geant4StepHandler.h
index 204034f77d2a981f569b519859077fda72e7230b..40b6e080b1f70f47deb345cab5227067e12f647c 100644
--- a/DDG4/include/DDG4/Geant4StepHandler.h
+++ b/DDG4/include/DDG4/Geant4StepHandler.h
@@ -2,7 +2,7 @@
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
-// Copyright (C) Organisation europ茅enne pour la Recherche nucl茅aire (CERN)
+// Copyright (C) Organisation europeenne pour la Recherche nucleaire (CERN)
 // All rights reserved.
 //
 // For the licensing terms see $DD4hepINSTALL/LICENSE.
diff --git a/DDG4/include/DDG4/Geant4SteppingAction.h b/DDG4/include/DDG4/Geant4SteppingAction.h
index b2d7eb985ef573c2861bb3fc6c2644b810911d95..f3f239a2fb84658ddf41a08b2939ab7298d21f7d 100644
--- a/DDG4/include/DDG4/Geant4SteppingAction.h
+++ b/DDG4/include/DDG4/Geant4SteppingAction.h
@@ -1,8 +1,8 @@
-// $Id: Handle.h 570 2013-05-17 07:47:11Z markus.frank $
+// $Id$
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
-// Copyright (C) Organisation europ茅enne pour la Recherche nucl茅aire (CERN)
+// Copyright (C) Organisation europeenne pour la Recherche nucleaire (CERN)
 // All rights reserved.
 //
 // For the licensing terms see $DD4hepINSTALL/LICENSE.
diff --git a/DDG4/include/DDG4/Geant4TestActions.h b/DDG4/include/DDG4/Geant4TestActions.h
index 38074298e14f76af5c754dec61ca4b03d154cb50..3b9a16e18a5d3d717666092572d7ea911fe1ccb2 100644
--- a/DDG4/include/DDG4/Geant4TestActions.h
+++ b/DDG4/include/DDG4/Geant4TestActions.h
@@ -1,8 +1,8 @@
-// $Id: Handle.h 570 2013-05-17 07:47:11Z markus.frank $
+// $Id$
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
-// Copyright (C) Organisation europ茅enne pour la Recherche nucl茅aire (CERN)
+// Copyright (C) Organisation europeenne pour la Recherche nucleaire (CERN)
 // All rights reserved.
 //
 // For the licensing terms see $DD4hepINSTALL/LICENSE.
diff --git a/DDG4/include/DDG4/Geant4TouchableHandler.h b/DDG4/include/DDG4/Geant4TouchableHandler.h
index 628694e3ea3a132f16462baeea9b5ff643af64d0..9f687221fbdbd7fe3f7fa13802349960b153b849 100644
--- a/DDG4/include/DDG4/Geant4TouchableHandler.h
+++ b/DDG4/include/DDG4/Geant4TouchableHandler.h
@@ -1,8 +1,8 @@
-// $Id: Handle.h 570 2013-05-17 07:47:11Z markus.frank $
+// $Id$
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
-// Copyright (C) Organisation europ茅enne pour la Recherche nucl茅aire (CERN)
+// Copyright (C) Organisation europeenne pour la Recherche nucleaire (CERN)
 // All rights reserved.
 //
 // For the licensing terms see $DD4hepINSTALL/LICENSE.
diff --git a/DDG4/include/DDG4/Geant4TrackHandler.h b/DDG4/include/DDG4/Geant4TrackHandler.h
index 176afa8d42feea65d396049ed1aa5008566c71d9..d64088528d3412472f4de8844e4e5d2f27010f12 100644
--- a/DDG4/include/DDG4/Geant4TrackHandler.h
+++ b/DDG4/include/DDG4/Geant4TrackHandler.h
@@ -1,8 +1,8 @@
-// $Id: Handle.h 570 2013-05-17 07:47:11Z markus.frank $
+// $Id$
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
-// Copyright (C) Organisation europ茅enne pour la Recherche nucl茅aire (CERN)
+// Copyright (C) Organisation europeenne pour la Recherche nucleaire (CERN)
 // All rights reserved.
 //
 // For the licensing terms see $DD4hepINSTALL/LICENSE.
diff --git a/DDG4/include/DDG4/Geant4TrackInformation.h b/DDG4/include/DDG4/Geant4TrackInformation.h
index f4bfadcae813ef0fe24d2ed3c6e5e58fdcd24140..0ca826ba0a86a9460ff23dc1240c9b20c5f58705 100644
--- a/DDG4/include/DDG4/Geant4TrackInformation.h
+++ b/DDG4/include/DDG4/Geant4TrackInformation.h
@@ -1,8 +1,8 @@
-// $Id: Handle.h 570 2013-05-17 07:47:11Z markus.frank $
+// $Id$
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
-// Copyright (C) Organisation europ茅enne pour la Recherche nucl茅aire (CERN)
+// Copyright (C) Organisation europeenne pour la Recherche nucleaire (CERN)
 // All rights reserved.
 //
 // For the licensing terms see $DD4hepINSTALL/LICENSE.
diff --git a/DDG4/include/DDG4/Geant4TrackingAction.h b/DDG4/include/DDG4/Geant4TrackingAction.h
index 0404911efd7a7e8dfc6875d1a636c8f2a010197b..3fd9666ac4888945d9d96446c89d27b2ee26358c 100644
--- a/DDG4/include/DDG4/Geant4TrackingAction.h
+++ b/DDG4/include/DDG4/Geant4TrackingAction.h
@@ -1,8 +1,8 @@
-// $Id: Handle.h 570 2013-05-17 07:47:11Z markus.frank $
+// $Id$
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
-// Copyright (C) Organisation europ茅enne pour la Recherche nucl茅aire (CERN)
+// Copyright (C) Organisation europeenne pour la Recherche nucleaire (CERN)
 // All rights reserved.
 //
 // For the licensing terms see $DD4hepINSTALL/LICENSE.
diff --git a/DDG4/include/DDG4/Geant4TrackingPostAction.h b/DDG4/include/DDG4/Geant4TrackingPostAction.h
index 54e730ef66d11d4aae2ddd235a982fbb74a72ad4..f33d238371c027986a95b794df9ccc709800e9fa 100644
--- a/DDG4/include/DDG4/Geant4TrackingPostAction.h
+++ b/DDG4/include/DDG4/Geant4TrackingPostAction.h
@@ -1,8 +1,8 @@
-// $Id: Handle.h 570 2013-05-17 07:47:11Z markus.frank $
+// $Id$
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
-// Copyright (C) Organisation europ茅enne pour la Recherche nucl茅aire (CERN)
+// Copyright (C) Organisation europeenne pour la Recherche nucleaire (CERN)
 // All rights reserved.
 //
 // For the licensing terms see $DD4hepINSTALL/LICENSE.
diff --git a/DDG4/include/DDG4/Geant4TrackingPreAction.h b/DDG4/include/DDG4/Geant4TrackingPreAction.h
index d4b67fdf651d3c33b497a14b0b6bc4bc39504380..e18a672d58cc7fed15c7c06e4cdba3a62dbe589c 100644
--- a/DDG4/include/DDG4/Geant4TrackingPreAction.h
+++ b/DDG4/include/DDG4/Geant4TrackingPreAction.h
@@ -1,8 +1,8 @@
-// $Id: Handle.h 570 2013-05-17 07:47:11Z markus.frank $
+// $Id$
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
-// Copyright (C) Organisation europ茅enne pour la Recherche nucl茅aire (CERN)
+// Copyright (C) Organisation europeenne pour la Recherche nucleaire (CERN)
 // All rights reserved.
 //
 // For the licensing terms see $DD4hepINSTALL/LICENSE.
diff --git a/DDG4/include/DDG4/Geant4UIManager.h b/DDG4/include/DDG4/Geant4UIManager.h
index f0ff13392913c41dfcbdd9806032ae0bfdcfd4c8..0566660deb76b814ec7c14b082323fff9f3431bb 100644
--- a/DDG4/include/DDG4/Geant4UIManager.h
+++ b/DDG4/include/DDG4/Geant4UIManager.h
@@ -1,8 +1,8 @@
-// $Id: Handle.h 570 2013-05-17 07:47:11Z markus.frank $
+// $Id$
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
-// Copyright (C) Organisation europ茅enne pour la Recherche nucl茅aire (CERN)
+// Copyright (C) Organisation europeenne pour la Recherche nucleaire (CERN)
 // All rights reserved.
 //
 // For the licensing terms see $DD4hepINSTALL/LICENSE.
diff --git a/DDG4/include/DDG4/Geant4UIMessenger.h b/DDG4/include/DDG4/Geant4UIMessenger.h
index b752df17c714fc8588145ef936abbbd166b864f0..a9453979857fae3769cd5e2b8d1c27394115466c 100644
--- a/DDG4/include/DDG4/Geant4UIMessenger.h
+++ b/DDG4/include/DDG4/Geant4UIMessenger.h
@@ -1,8 +1,8 @@
-// $Id: Handle.h 570 2013-05-17 07:47:11Z markus.frank $
+// $Id$
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
-// Copyright (C) Organisation europ茅enne pour la Recherche nucl茅aire (CERN)
+// Copyright (C) Organisation europeenne pour la Recherche nucleaire (CERN)
 // All rights reserved.
 //
 // For the licensing terms see $DD4hepINSTALL/LICENSE.
diff --git a/DDG4/include/DDG4/Geant4UserParticleHandler.h b/DDG4/include/DDG4/Geant4UserParticleHandler.h
index 4cff239bc1ee7986c293e5cf7bfb692b972f3719..a22e91321f36f8ee2d3430d1fe8f33dd6f7aa412 100644
--- a/DDG4/include/DDG4/Geant4UserParticleHandler.h
+++ b/DDG4/include/DDG4/Geant4UserParticleHandler.h
@@ -1,8 +1,8 @@
-// $Id: Handle.h 570 2013-05-17 07:47:11Z markus.frank $
+// $Id$
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
-// Copyright (C) Organisation europ茅enne pour la Recherche nucl茅aire (CERN)
+// Copyright (C) Organisation europeenne pour la Recherche nucleaire (CERN)
 // All rights reserved.
 //
 // For the licensing terms see $DD4hepINSTALL/LICENSE.
diff --git a/DDG4/include/DDG4/Geant4UserPhysicsList.h b/DDG4/include/DDG4/Geant4UserPhysicsList.h
index ef4c8c844ad0a0f2ecb1c718f471d34ff3ee33e6..96f02e02bd1304d5d9d4e220011fff32a9f0f151 100644
--- a/DDG4/include/DDG4/Geant4UserPhysicsList.h
+++ b/DDG4/include/DDG4/Geant4UserPhysicsList.h
@@ -1,8 +1,8 @@
-// $Id: Handle.h 570 2013-05-17 07:47:11Z markus.frank $
+// $Id$
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
-// Copyright (C) Organisation europ茅enne pour la Recherche nucl茅aire (CERN)
+// Copyright (C) Organisation europeenne pour la Recherche nucleaire (CERN)
 // All rights reserved.
 //
 // For the licensing terms see $DD4hepINSTALL/LICENSE.
diff --git a/DDG4/include/DDG4/Geant4Vertex.h b/DDG4/include/DDG4/Geant4Vertex.h
index 7f53b3ce531eb8eb3cdd881334f2bf9d9fc4a0b7..fd6215175943fb1c91215e7b0ba6ac5ce30eaafb 100644
--- a/DDG4/include/DDG4/Geant4Vertex.h
+++ b/DDG4/include/DDG4/Geant4Vertex.h
@@ -1,8 +1,8 @@
-// $Id: Handle.h 570 2013-05-17 07:47:11Z markus.frank $
+// $Id$
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
-// Copyright (C) Organisation europ茅enne pour la Recherche nucl茅aire (CERN)
+// Copyright (C) Organisation europeenne pour la Recherche nucleaire (CERN)
 // All rights reserved.
 //
 // For the licensing terms see $DD4hepINSTALL/LICENSE.
diff --git a/DDG4/include/DDG4/Geant4VolumeManager.h b/DDG4/include/DDG4/Geant4VolumeManager.h
index 9171db788701802afff367572ad2ba8062ec7f5b..e85ff0c01c569740c119ec3c96a8c3e872fa4b87 100644
--- a/DDG4/include/DDG4/Geant4VolumeManager.h
+++ b/DDG4/include/DDG4/Geant4VolumeManager.h
@@ -1,8 +1,8 @@
-// $Id: Handle.h 570 2013-05-17 07:47:11Z markus.frank $
+// $Id$
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
-// Copyright (C) Organisation europ茅enne pour la Recherche nucl茅aire (CERN)
+// Copyright (C) Organisation europeenne pour la Recherche nucleaire (CERN)
 // All rights reserved.
 //
 // For the licensing terms see $DD4hepINSTALL/LICENSE.
diff --git a/DDG4/include/DDG4/IoStreams.h b/DDG4/include/DDG4/IoStreams.h
index 18837de3d43f6df7cfc9407cce73e0220a67aaa7..fd0ee08604f44db6f5f1e316a8626843e5adb72e 100644
--- a/DDG4/include/DDG4/IoStreams.h
+++ b/DDG4/include/DDG4/IoStreams.h
@@ -1,8 +1,8 @@
-// $Id: Handle.h 570 2013-05-17 07:47:11Z markus.frank $
+// $Id$
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
-// Copyright (C) Organisation europ茅enne pour la Recherche nucl茅aire (CERN)
+// Copyright (C) Organisation europeenne pour la Recherche nucleaire (CERN)
 // All rights reserved.
 //
 // For the licensing terms see $DD4hepINSTALL/LICENSE.
diff --git a/DDG4/lcio/Geant4Output2LCIO.cpp b/DDG4/lcio/Geant4Output2LCIO.cpp
index 7591d81e17202fd2616e05f02ea61180f399d21f..8fa36913d69882f871e442c76f8ae984dd062452 100644
--- a/DDG4/lcio/Geant4Output2LCIO.cpp
+++ b/DDG4/lcio/Geant4Output2LCIO.cpp
@@ -1,8 +1,8 @@
-// $Id: Handle.h 570 2013-05-17 07:47:11Z markus.frank $
+// $Id$
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
-// Copyright (C) Organisation europ茅enne pour la Recherche nucl茅aire (CERN)
+// Copyright (C) Organisation europeenne pour la Recherche nucleaire (CERN)
 // All rights reserved.
 //
 // For the licensing terms see $DD4hepINSTALL/LICENSE.
@@ -75,11 +75,11 @@ namespace DD4hep {
 }      // End namespace DD4hep
 #endif // DD4HEP_DDG4_GEANT4OUTPUT2LCIO_H
 
-// $Id: Handle.h 570 2013-05-17 07:47:11Z markus.frank $
+// $Id$
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
-// Copyright (C) Organisation europ茅enne pour la Recherche nucl茅aire (CERN)
+// Copyright (C) Organisation europeenne pour la Recherche nucleaire (CERN)
 // All rights reserved.
 //
 // For the licensing terms see $DD4hepINSTALL/LICENSE.
diff --git a/DDG4/lcio/LCIOConversions.cpp b/DDG4/lcio/LCIOConversions.cpp
index eb0130b6527db6637dc2e3974bbc4a1b8c998511..ff59579c55fb0f26dd5000c71827edff0b11d36a 100644
--- a/DDG4/lcio/LCIOConversions.cpp
+++ b/DDG4/lcio/LCIOConversions.cpp
@@ -1,8 +1,8 @@
-// $Id: Handle.h 570 2013-05-17 07:47:11Z markus.frank $
+// $Id$
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
-// Copyright (C) Organisation europ茅enne pour la Recherche nucl茅aire (CERN)
+// Copyright (C) Organisation europeenne pour la Recherche nucleaire (CERN)
 // All rights reserved.
 //
 // For the licensing terms see $DD4hepINSTALL/LICENSE.
diff --git a/DDG4/lcio/LCIOEventReader.cpp b/DDG4/lcio/LCIOEventReader.cpp
index 268611f9bd193486cd07bbf132332ce64d8166a6..7d5da86a4c9c95a441708aec93abe3a92e55beb3 100644
--- a/DDG4/lcio/LCIOEventReader.cpp
+++ b/DDG4/lcio/LCIOEventReader.cpp
@@ -1,8 +1,8 @@
-// $Id: Handle.h 570 2013-05-17 07:47:11Z markus.frank $
+// $Id$
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
-// Copyright (C) Organisation europ茅enne pour la Recherche nucl茅aire (CERN)
+// Copyright (C) Organisation europeenne pour la Recherche nucleaire (CERN)
 // All rights reserved.
 //
 // For the licensing terms see $DD4hepINSTALL/LICENSE.
diff --git a/DDG4/lcio/LCIOEventReader.h b/DDG4/lcio/LCIOEventReader.h
index 289d80d454faca569215095fb11d483329eb4320..df3b6cd4cb1b0a46a2601951a5e688e15927718b 100644
--- a/DDG4/lcio/LCIOEventReader.h
+++ b/DDG4/lcio/LCIOEventReader.h
@@ -1,8 +1,8 @@
-// $Id: Handle.h 570 2013-05-17 07:47:11Z markus.frank $
+// $Id$
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
-// Copyright (C) Organisation europ茅enne pour la Recherche nucl茅aire (CERN)
+// Copyright (C) Organisation europeenne pour la Recherche nucleaire (CERN)
 // All rights reserved.
 //
 // For the licensing terms see $DD4hepINSTALL/LICENSE.
diff --git a/DDG4/lcio/LCIOFileReader.cpp b/DDG4/lcio/LCIOFileReader.cpp
index 7b60b49b6342c7b5934ec4b4a11c814f30c09779..91a43159cabc7cfc69eee07adde8e1560ca63d80 100644
--- a/DDG4/lcio/LCIOFileReader.cpp
+++ b/DDG4/lcio/LCIOFileReader.cpp
@@ -1,8 +1,8 @@
-// $Id: Handle.h 570 2013-05-17 07:47:11Z markus.frank $
+// $Id$
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
-// Copyright (C) Organisation europ茅enne pour la Recherche nucl茅aire (CERN)
+// Copyright (C) Organisation europeenne pour la Recherche nucleaire (CERN)
 // All rights reserved.
 //
 // For the licensing terms see $DD4hepINSTALL/LICENSE.
diff --git a/DDG4/lcio/LCIOSDTestActions.cpp b/DDG4/lcio/LCIOSDTestActions.cpp
index 0879174425d7d41f4097981501db2f9fa05fa013..e8ae0139afaeb7fcbe76c23fa73e2887e426dc40 100644
--- a/DDG4/lcio/LCIOSDTestActions.cpp
+++ b/DDG4/lcio/LCIOSDTestActions.cpp
@@ -1,8 +1,8 @@
-// $Id: Handle.h 570 2013-05-17 07:47:11Z markus.frank $
+// $Id$
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
-// Copyright (C) Organisation europ茅enne pour la Recherche nucl茅aire (CERN)
+// Copyright (C) Organisation europeenne pour la Recherche nucleaire (CERN)
 // All rights reserved.
 //
 // For the licensing terms see $DD4hepINSTALL/LICENSE.
diff --git a/DDG4/lcio/LCIOStdHepReader.cpp b/DDG4/lcio/LCIOStdHepReader.cpp
index 43f1da530a1bb219b18c12fd4d52c1d939df947a..55242a885aa556b21b3b2b9fbbe7aa3e98cf3e6d 100644
--- a/DDG4/lcio/LCIOStdHepReader.cpp
+++ b/DDG4/lcio/LCIOStdHepReader.cpp
@@ -1,8 +1,8 @@
-// $Id: Handle.h 570 2013-05-17 07:47:11Z markus.frank $
+// $Id$
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
-// Copyright (C) Organisation europ茅enne pour la Recherche nucl茅aire (CERN)
+// Copyright (C) Organisation europeenne pour la Recherche nucleaire (CERN)
 // All rights reserved.
 //
 // For the licensing terms see $DD4hepINSTALL/LICENSE.
@@ -49,11 +49,11 @@ namespace DD4hep  {
 }       /* End namespace DD4hep */
 #endif  /* DD4HEP_DDG4_LCIOSTDHEPREADER_H */
 
-// $Id: Handle.h 570 2013-05-17 07:47:11Z markus.frank $
+// $Id$
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
-// Copyright (C) Organisation europ茅enne pour la Recherche nucl茅aire (CERN)
+// Copyright (C) Organisation europeenne pour la Recherche nucleaire (CERN)
 // All rights reserved.
 //
 // For the licensing terms see $DD4hepINSTALL/LICENSE.
diff --git a/DDG4/legacy/Geant4CalorimeterSD.cpp b/DDG4/legacy/Geant4CalorimeterSD.cpp
index 7658e5576225f5544fd2ab1c143f2a563186cfb7..bfa928cfb989603c6835969a91de8d4c6fdfc2ac 100644
--- a/DDG4/legacy/Geant4CalorimeterSD.cpp
+++ b/DDG4/legacy/Geant4CalorimeterSD.cpp
@@ -1,8 +1,8 @@
-// $Id: Handle.h 570 2013-05-17 07:47:11Z markus.frank $
+// $Id$
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
-// Copyright (C) Organisation europ茅enne pour la Recherche nucl茅aire (CERN)
+// Copyright (C) Organisation europeenne pour la Recherche nucleaire (CERN)
 // All rights reserved.
 //
 // For the licensing terms see $DD4hepINSTALL/LICENSE.
diff --git a/DDG4/legacy/Geant4TrackerCombineSD.cpp b/DDG4/legacy/Geant4TrackerCombineSD.cpp
index a8d22b5846585140149d181073837e8c5f698979..ed7ecd3da595e462fbb7a67ef17a4c278ebf9f07 100644
--- a/DDG4/legacy/Geant4TrackerCombineSD.cpp
+++ b/DDG4/legacy/Geant4TrackerCombineSD.cpp
@@ -1,8 +1,8 @@
-// $Id: Handle.h 570 2013-05-17 07:47:11Z markus.frank $
+// $Id$
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
-// Copyright (C) Organisation europ茅enne pour la Recherche nucl茅aire (CERN)
+// Copyright (C) Organisation europeenne pour la Recherche nucleaire (CERN)
 // All rights reserved.
 //
 // For the licensing terms see $DD4hepINSTALL/LICENSE.
diff --git a/DDG4/legacy/Geant4TrackerSD.cpp b/DDG4/legacy/Geant4TrackerSD.cpp
index 242016f2a23a1d9381d48726798cc0c94af3b407..c5a8d0941ddff3d8ab44444cdff693ee89039836 100644
--- a/DDG4/legacy/Geant4TrackerSD.cpp
+++ b/DDG4/legacy/Geant4TrackerSD.cpp
@@ -1,8 +1,8 @@
-// $Id: Handle.h 570 2013-05-17 07:47:11Z markus.frank $
+// $Id$
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
-// Copyright (C) Organisation europ茅enne pour la Recherche nucl茅aire (CERN)
+// Copyright (C) Organisation europeenne pour la Recherche nucleaire (CERN)
 // All rights reserved.
 //
 // For the licensing terms see $DD4hepINSTALL/LICENSE.
diff --git a/DDG4/plugins/Geant4.10.PhysicsConstructors.h b/DDG4/plugins/Geant4.10.PhysicsConstructors.h
index 94ccc8793dcb739c377f6172adffd9c1a0d2e5c3..e705b944f57ec732accd25e46e69d90e66ab7f98 100644
--- a/DDG4/plugins/Geant4.10.PhysicsConstructors.h
+++ b/DDG4/plugins/Geant4.10.PhysicsConstructors.h
@@ -1,8 +1,8 @@
-// $Id: Handle.h 570 2013-05-17 07:47:11Z markus.frank $
+// $Id$
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
-// Copyright (C) Organisation europ茅enne pour la Recherche nucl茅aire (CERN)
+// Copyright (C) Organisation europeenne pour la Recherche nucleaire (CERN)
 // All rights reserved.
 //
 // For the licensing terms see $DD4hepINSTALL/LICENSE.
diff --git a/DDG4/plugins/Geant4.9.PhysicsConstructors.h b/DDG4/plugins/Geant4.9.PhysicsConstructors.h
index f445df1d60c25b0c142a28c8caa09a18f18bf81e..94b0be6bcdccb96b38122112189fc2d52bb5855b 100644
--- a/DDG4/plugins/Geant4.9.PhysicsConstructors.h
+++ b/DDG4/plugins/Geant4.9.PhysicsConstructors.h
@@ -1,8 +1,8 @@
-// $Id: Handle.h 570 2013-05-17 07:47:11Z markus.frank $
+// $Id$
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
-// Copyright (C) Organisation europ茅enne pour la Recherche nucl茅aire (CERN)
+// Copyright (C) Organisation europeenne pour la Recherche nucleaire (CERN)
 // All rights reserved.
 //
 // For the licensing terms see $DD4hepINSTALL/LICENSE.
diff --git a/DDG4/plugins/Geant4EscapeCounter.cpp b/DDG4/plugins/Geant4EscapeCounter.cpp
index 5c544e9eee865f1153ee03fe27b0b37e9ddafbdc..b5037601ec9609d721f08c288cea51d92a0e87e0 100644
--- a/DDG4/plugins/Geant4EscapeCounter.cpp
+++ b/DDG4/plugins/Geant4EscapeCounter.cpp
@@ -1,8 +1,8 @@
-// $Id: Handle.h 570 2013-05-17 07:47:11Z markus.frank $
+// $Id$
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
-// Copyright (C) Organisation europ茅enne pour la Recherche nucl茅aire (CERN)
+// Copyright (C) Organisation europeenne pour la Recherche nucleaire (CERN)
 // All rights reserved.
 //
 // For the licensing terms see $DD4hepINSTALL/LICENSE.
diff --git a/DDG4/plugins/Geant4EventReaderHepEvt.cpp b/DDG4/plugins/Geant4EventReaderHepEvt.cpp
index 207bfe4ec50c3981605c7253514f254aed0c66f3..68f7f6b8dc216007a8e87b0d1612b76eea7ccfa2 100644
--- a/DDG4/plugins/Geant4EventReaderHepEvt.cpp
+++ b/DDG4/plugins/Geant4EventReaderHepEvt.cpp
@@ -1,8 +1,8 @@
-// $Id: Handle.h 570 2013-05-17 07:47:11Z markus.frank $
+// $Id$
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
-// Copyright (C) Organisation europ茅enne pour la Recherche nucl茅aire (CERN)
+// Copyright (C) Organisation europeenne pour la Recherche nucleaire (CERN)
 // All rights reserved.
 //
 // For the licensing terms see $DD4hepINSTALL/LICENSE.
diff --git a/DDG4/plugins/Geant4EventReaderHepMC.cpp b/DDG4/plugins/Geant4EventReaderHepMC.cpp
index a083c6bb1c836ff72f1a87b8677306e0f24bee64..a03824901fd2988c74a061b250407e68d612ede6 100644
--- a/DDG4/plugins/Geant4EventReaderHepMC.cpp
+++ b/DDG4/plugins/Geant4EventReaderHepMC.cpp
@@ -1,8 +1,8 @@
-// $Id: Handle.h 570 2013-05-17 07:47:11Z markus.frank $
+// $Id$
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
-// Copyright (C) Organisation europ茅enne pour la Recherche nucl茅aire (CERN)
+// Copyright (C) Organisation europeenne pour la Recherche nucleaire (CERN)
 // All rights reserved.
 //
 // For the licensing terms see $DD4hepINSTALL/LICENSE.
diff --git a/DDG4/plugins/Geant4Factories.cpp b/DDG4/plugins/Geant4Factories.cpp
index 9566ca6cfaf90fce2c39306ddb8b9d0ad271096b..1de6cefca8af0b9a8c001a239b18037554add9b4 100644
--- a/DDG4/plugins/Geant4Factories.cpp
+++ b/DDG4/plugins/Geant4Factories.cpp
@@ -1,8 +1,8 @@
-// $Id: Handle.h 570 2013-05-17 07:47:11Z markus.frank $
+// $Id$
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
-// Copyright (C) Organisation europ茅enne pour la Recherche nucl茅aire (CERN)
+// Copyright (C) Organisation europeenne pour la Recherche nucleaire (CERN)
 // All rights reserved.
 //
 // For the licensing terms see $DD4hepINSTALL/LICENSE.
diff --git a/DDG4/plugins/Geant4FieldTrackingSetup.cpp b/DDG4/plugins/Geant4FieldTrackingSetup.cpp
index 8fd4919af0155efd2c5aae753dc04a5735842620..9a67364ad591db925900dd89c5f6407bf0d1d15d 100644
--- a/DDG4/plugins/Geant4FieldTrackingSetup.cpp
+++ b/DDG4/plugins/Geant4FieldTrackingSetup.cpp
@@ -1,8 +1,8 @@
-// $Id: Handle.h 570 2013-05-17 07:47:11Z markus.frank $
+// $Id$
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
-// Copyright (C) Organisation europ茅enne pour la Recherche nucl茅aire (CERN)
+// Copyright (C) Organisation europeenne pour la Recherche nucleaire (CERN)
 // All rights reserved.
 //
 // For the licensing terms see $DD4hepINSTALL/LICENSE.
@@ -94,11 +94,11 @@ namespace DD4hep {
 #endif // DD4HEP_DDG4_GEANT4FIELDTRACKINGSETUP_H
 
 
-// $Id: Handle.h 570 2013-05-17 07:47:11Z markus.frank $
+// $Id$
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
-// Copyright (C) Organisation europ茅enne pour la Recherche nucl茅aire (CERN)
+// Copyright (C) Organisation europeenne pour la Recherche nucleaire (CERN)
 // All rights reserved.
 //
 // For the licensing terms see $DD4hepINSTALL/LICENSE.
diff --git a/DDG4/plugins/Geant4HitExtractor.cpp b/DDG4/plugins/Geant4HitExtractor.cpp
index 4e782308d0b9372819b82f1381291e84ef4ca281..3e24b2f21f249395bc570900ee95a67792fe2a81 100644
--- a/DDG4/plugins/Geant4HitExtractor.cpp
+++ b/DDG4/plugins/Geant4HitExtractor.cpp
@@ -1,8 +1,8 @@
-// $Id: Handle.h 570 2013-05-17 07:47:11Z markus.frank $
+// $Id$
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
-// Copyright (C) Organisation europ茅enne pour la Recherche nucl茅aire (CERN)
+// Copyright (C) Organisation europeenne pour la Recherche nucleaire (CERN)
 // All rights reserved.
 //
 // For the licensing terms see $DD4hepINSTALL/LICENSE.
diff --git a/DDG4/plugins/Geant4MaterialScanner.cpp b/DDG4/plugins/Geant4MaterialScanner.cpp
index cf6631d1338e167d646db529d92d30199dd4ce6a..d535deffbe76a4a08450e38ee135a810fa0b5c76 100644
--- a/DDG4/plugins/Geant4MaterialScanner.cpp
+++ b/DDG4/plugins/Geant4MaterialScanner.cpp
@@ -1,8 +1,8 @@
-// $Id: Handle.h 570 2013-05-17 07:47:11Z markus.frank $
+// $Id$
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
-// Copyright (C) Organisation europ茅enne pour la Recherche nucl茅aire (CERN)
+// Copyright (C) Organisation europeenne pour la Recherche nucleaire (CERN)
 // All rights reserved.
 //
 // For the licensing terms see $DD4hepINSTALL/LICENSE.
diff --git a/DDG4/plugins/Geant4Particles.cpp b/DDG4/plugins/Geant4Particles.cpp
index cfe550cd92b62a005a2e930271b700655a01cc5a..a5189606afb669d2a5d94a89cce9c99e2cb4a377 100644
--- a/DDG4/plugins/Geant4Particles.cpp
+++ b/DDG4/plugins/Geant4Particles.cpp
@@ -1,8 +1,8 @@
-// $Id: Handle.h 570 2013-05-17 07:47:11Z markus.frank $
+// $Id$
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
-// Copyright (C) Organisation europ茅enne pour la Recherche nucl茅aire (CERN)
+// Copyright (C) Organisation europeenne pour la Recherche nucleaire (CERN)
 // All rights reserved.
 //
 // For the licensing terms see $DD4hepINSTALL/LICENSE.
diff --git a/DDG4/plugins/Geant4PhysicsConstructors.cpp b/DDG4/plugins/Geant4PhysicsConstructors.cpp
index ef94a6787e1144f69ee4b1f6345d465121cc70ec..f557200477042a9938844fb7bb70317eb93a75f3 100644
--- a/DDG4/plugins/Geant4PhysicsConstructors.cpp
+++ b/DDG4/plugins/Geant4PhysicsConstructors.cpp
@@ -1,8 +1,8 @@
-// $Id: Handle.h 570 2013-05-17 07:47:11Z markus.frank $
+// $Id$
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
-// Copyright (C) Organisation europ茅enne pour la Recherche nucl茅aire (CERN)
+// Copyright (C) Organisation europeenne pour la Recherche nucleaire (CERN)
 // All rights reserved.
 //
 // For the licensing terms see $DD4hepINSTALL/LICENSE.
diff --git a/DDG4/plugins/Geant4PhysicsLists.cpp b/DDG4/plugins/Geant4PhysicsLists.cpp
index fb72b0b7b0fa2885cec0c6936677023c3bb6028a..d43849e42565b30f7963717e30d7f23acfdc7ab3 100644
--- a/DDG4/plugins/Geant4PhysicsLists.cpp
+++ b/DDG4/plugins/Geant4PhysicsLists.cpp
@@ -1,8 +1,8 @@
-// $Id: Handle.h 570 2013-05-17 07:47:11Z markus.frank $
+// $Id$
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
-// Copyright (C) Organisation europ茅enne pour la Recherche nucl茅aire (CERN)
+// Copyright (C) Organisation europeenne pour la Recherche nucleaire (CERN)
 // All rights reserved.
 //
 // For the licensing terms see $DD4hepINSTALL/LICENSE.
diff --git a/DDG4/plugins/Geant4Processes.cpp b/DDG4/plugins/Geant4Processes.cpp
index edcae19d3fb44efb37e0b12b6981c5135e3987cd..2706c6199606d1040d79fcbac2f514dd5bdae12c 100644
--- a/DDG4/plugins/Geant4Processes.cpp
+++ b/DDG4/plugins/Geant4Processes.cpp
@@ -1,8 +1,8 @@
-// $Id: Handle.h 570 2013-05-17 07:47:11Z markus.frank $
+// $Id$
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
-// Copyright (C) Organisation europ茅enne pour la Recherche nucl茅aire (CERN)
+// Copyright (C) Organisation europeenne pour la Recherche nucleaire (CERN)
 // All rights reserved.
 //
 // For the licensing terms see $DD4hepINSTALL/LICENSE.
diff --git a/DDG4/plugins/Geant4SDActions.cpp b/DDG4/plugins/Geant4SDActions.cpp
index 64f32772ee1c4a0dc2ffe29e7ae6aca95717cefa..aa4488c2b8574d7b28193db9066a37c0adb8e914 100644
--- a/DDG4/plugins/Geant4SDActions.cpp
+++ b/DDG4/plugins/Geant4SDActions.cpp
@@ -1,8 +1,8 @@
-// $Id: Handle.h 570 2013-05-17 07:47:11Z markus.frank $
+// $Id$
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
-// Copyright (C) Organisation europ茅enne pour la Recherche nucl茅aire (CERN)
+// Copyright (C) Organisation europeenne pour la Recherche nucleaire (CERN)
 // All rights reserved.
 //
 // For the licensing terms see $DD4hepINSTALL/LICENSE.
diff --git a/DDG4/plugins/Geant4SensDet.cpp b/DDG4/plugins/Geant4SensDet.cpp
index 0ec48a4af56d090a8c63f32a4e3bf44ff12c2ed8..262477e08511299915cf4ec1e9ce695420707339 100644
--- a/DDG4/plugins/Geant4SensDet.cpp
+++ b/DDG4/plugins/Geant4SensDet.cpp
@@ -1,8 +1,8 @@
-// $Id: Handle.h 570 2013-05-17 07:47:11Z markus.frank $
+// $Id$
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
-// Copyright (C) Organisation europ茅enne pour la Recherche nucl茅aire (CERN)
+// Copyright (C) Organisation europeenne pour la Recherche nucleaire (CERN)
 // All rights reserved.
 //
 // For the licensing terms see $DD4hepINSTALL/LICENSE.
diff --git a/DDG4/plugins/Geant4SensDetFilters.cpp b/DDG4/plugins/Geant4SensDetFilters.cpp
index 0f1d652457dbaba2cfeaaceb28f2f3748bdfc364..4f155b4e10285f84fb102e914cad165c81d71016 100644
--- a/DDG4/plugins/Geant4SensDetFilters.cpp
+++ b/DDG4/plugins/Geant4SensDetFilters.cpp
@@ -1,8 +1,8 @@
-// $Id: Handle.h 570 2013-05-17 07:47:11Z markus.frank $
+// $Id$
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
-// Copyright (C) Organisation europ茅enne pour la Recherche nucl茅aire (CERN)
+// Copyright (C) Organisation europeenne pour la Recherche nucleaire (CERN)
 // All rights reserved.
 //
 // For the licensing terms see $DD4hepINSTALL/LICENSE.
diff --git a/DDG4/plugins/Geant4Steppers.cpp b/DDG4/plugins/Geant4Steppers.cpp
index e6348ff23a442fb3dc9738dac664d6cb31a67ba3..c2f80ec9b6e2cfecb3c3d621d4ac78869477e9b9 100644
--- a/DDG4/plugins/Geant4Steppers.cpp
+++ b/DDG4/plugins/Geant4Steppers.cpp
@@ -1,8 +1,8 @@
-// $Id: Handle.h 570 2013-05-17 07:47:11Z markus.frank $
+// $Id$
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
-// Copyright (C) Organisation europ茅enne pour la Recherche nucl茅aire (CERN)
+// Copyright (C) Organisation europeenne pour la Recherche nucleaire (CERN)
 // All rights reserved.
 //
 // For the licensing terms see $DD4hepINSTALL/LICENSE.
diff --git a/DDG4/plugins/Geant4TCUserParticleHandler.cpp b/DDG4/plugins/Geant4TCUserParticleHandler.cpp
index 4a52df435b6b8ab19a07cbb0756f61e41ca4938b..2cae3bb6fa55d63f98c7034db67041bfa9c54519 100644
--- a/DDG4/plugins/Geant4TCUserParticleHandler.cpp
+++ b/DDG4/plugins/Geant4TCUserParticleHandler.cpp
@@ -1,8 +1,8 @@
-// $Id: Handle.h 570 2013-05-17 07:47:11Z markus.frank $
+// $Id$
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
-// Copyright (C) Organisation europ茅enne pour la Recherche nucl茅aire (CERN)
+// Copyright (C) Organisation europeenne pour la Recherche nucleaire (CERN)
 // All rights reserved.
 //
 // For the licensing terms see $DD4hepINSTALL/LICENSE.
diff --git a/DDG4/plugins/Geant4XMLSetup.cpp b/DDG4/plugins/Geant4XMLSetup.cpp
index 336a2ddde738200b8ba0c94613a6f8900c3f3a65..99e0b883736020531b35e3942157513b075aea37 100644
--- a/DDG4/plugins/Geant4XMLSetup.cpp
+++ b/DDG4/plugins/Geant4XMLSetup.cpp
@@ -1,8 +1,8 @@
-// $Id: Handle.h 570 2013-05-17 07:47:11Z markus.frank $
+// $Id$
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
-// Copyright (C) Organisation europ茅enne pour la Recherche nucl茅aire (CERN)
+// Copyright (C) Organisation europeenne pour la Recherche nucleaire (CERN)
 // All rights reserved.
 //
 // For the licensing terms see $DD4hepINSTALL/LICENSE.
diff --git a/DDG4/python/DD4hep.py b/DDG4/python/DD4hep.py
index b393d3d794db7105b7debe21ff3e8764be2963d5..d41a9cfe7d76fe144f97324e546192a0d7f5162d 100644
--- a/DDG4/python/DD4hep.py
+++ b/DDG4/python/DD4hep.py
@@ -1,8 +1,8 @@
-# $Id: Handle.h 570 2013-05-17 07:47:11Z markus.frank $
+# $Id$
 #==========================================================================
 #  AIDA Detector description implementation for LCD
 #--------------------------------------------------------------------------
-# Copyright (C) Organisation europ茅enne pour la Recherche nucl茅aire (CERN)
+# Copyright (C) Organisation europeenne pour la Recherche nucleaire (CERN)
 # All rights reserved.
 #
 # For the licensing terms see $DD4hepINSTALL/LICENSE.
diff --git a/DDG4/python/DDG4.py b/DDG4/python/DDG4.py
index 132b3162984af45eea5d3478eefc4c39a6f24915..008ef63c66759256c327d31c068537550fb329af 100644
--- a/DDG4/python/DDG4.py
+++ b/DDG4/python/DDG4.py
@@ -1,8 +1,8 @@
-# $Id: Handle.h 570 2013-05-17 07:47:11Z markus.frank $
+# $Id$
 #==========================================================================
 #  AIDA Detector description implementation for LCD
 #--------------------------------------------------------------------------
-# Copyright (C) Organisation europ茅enne pour la Recherche nucl茅aire (CERN)
+# Copyright (C) Organisation europeenne pour la Recherche nucleaire (CERN)
 # All rights reserved.
 #
 # For the licensing terms see $DD4hepINSTALL/LICENSE.
diff --git a/DDG4/python/DDG4Dict.C b/DDG4/python/DDG4Dict.C
index 73a1801e68132948f60668cdd9a680a8d1b094f5..71cd90c9bd53117e27b1a1c4d0f4a588410f082b 100644
--- a/DDG4/python/DDG4Dict.C
+++ b/DDG4/python/DDG4Dict.C
@@ -1,8 +1,8 @@
-// $Id: Handle.h 570 2013-05-17 07:47:11Z markus.frank $
+// $Id$
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
-// Copyright (C) Organisation europ茅enne pour la Recherche nucl茅aire (CERN)
+// Copyright (C) Organisation europeenne pour la Recherche nucleaire (CERN)
 // All rights reserved.
 //
 // For the licensing terms see $DD4hepINSTALL/LICENSE.
diff --git a/DDG4/python/checkGeometry.py b/DDG4/python/checkGeometry.py
index ba44a7ab26e8dc81c7bbd77c36a0862f4fbc2609..1e857492ba982514e2bf2df8b8d743a17d459253 100755
--- a/DDG4/python/checkGeometry.py
+++ b/DDG4/python/checkGeometry.py
@@ -1,9 +1,9 @@
 #!/bin/python
-# $Id: Handle.h 570 2013-05-17 07:47:11Z markus.frank $
+# $Id$
 #==========================================================================
 #  AIDA Detector description implementation for LCD
 #--------------------------------------------------------------------------
-# Copyright (C) Organisation europ茅enne pour la Recherche nucl茅aire (CERN)
+# Copyright (C) Organisation europeenne pour la Recherche nucleaire (CERN)
 # All rights reserved.
 #
 # For the licensing terms see $DD4hepINSTALL/LICENSE.
diff --git a/DDG4/python/checkOverlaps.py b/DDG4/python/checkOverlaps.py
index 0e1d1ac11a24b515f65f65cb318ae16f8bf24946..7f41ed02d02b9f251f5e013b716df59d5ad06bc9 100755
--- a/DDG4/python/checkOverlaps.py
+++ b/DDG4/python/checkOverlaps.py
@@ -1,9 +1,9 @@
 #!/bin/python
-# $Id: Handle.h 570 2013-05-17 07:47:11Z markus.frank $
+# $Id$
 #==========================================================================
 #  AIDA Detector description implementation for LCD
 #--------------------------------------------------------------------------
-# Copyright (C) Organisation europ茅enne pour la Recherche nucl茅aire (CERN)
+# Copyright (C) Organisation europeenne pour la Recherche nucleaire (CERN)
 # All rights reserved.
 #
 # For the licensing terms see $DD4hepINSTALL/LICENSE.
diff --git a/DDG4/scripts/dumpDDG4.C b/DDG4/scripts/dumpDDG4.C
index a7d62efdb777080b4e5f23b941616b9eb15117b7..d8e56164ba12062d433f9219806c12d60984f572 100644
--- a/DDG4/scripts/dumpDDG4.C
+++ b/DDG4/scripts/dumpDDG4.C
@@ -1,8 +1,8 @@
-// $Id: Handle.h 570 2013-05-17 07:47:11Z markus.frank $
+// $Id$
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
-// Copyright (C) Organisation europ茅enne pour la Recherche nucl茅aire (CERN)
+// Copyright (C) Organisation europeenne pour la Recherche nucleaire (CERN)
 // All rights reserved.
 //
 // For the licensing terms see $DD4hepINSTALL/LICENSE.
diff --git a/DDG4/src/ComponentProperties.cpp b/DDG4/src/ComponentProperties.cpp
index fa0f179cbf55d6423e714744c63c8667525c5ec7..d13f9aeee703f8f56198c6eabba0905b5c915673 100644
--- a/DDG4/src/ComponentProperties.cpp
+++ b/DDG4/src/ComponentProperties.cpp
@@ -1,8 +1,8 @@
-// $Id: Handle.h 570 2013-05-17 07:47:11Z markus.frank $
+// $Id$
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
-// Copyright (C) Organisation europ茅enne pour la Recherche nucl茅aire (CERN)
+// Copyright (C) Organisation europeenne pour la Recherche nucleaire (CERN)
 // All rights reserved.
 //
 // For the licensing terms see $DD4hepINSTALL/LICENSE.
diff --git a/DDG4/src/Geant4Action.cpp b/DDG4/src/Geant4Action.cpp
index 2bb0224897eccb8bc7397775e5aac2ef8a8fec63..e5d96f62835dfacec8d13dbc627ffe9415c047ab 100644
--- a/DDG4/src/Geant4Action.cpp
+++ b/DDG4/src/Geant4Action.cpp
@@ -1,8 +1,8 @@
-// $Id: Handle.h 570 2013-05-17 07:47:11Z markus.frank $
+// $Id$
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
-// Copyright (C) Organisation europ茅enne pour la Recherche nucl茅aire (CERN)
+// Copyright (C) Organisation europeenne pour la Recherche nucleaire (CERN)
 // All rights reserved.
 //
 // For the licensing terms see $DD4hepINSTALL/LICENSE.
diff --git a/DDG4/src/Geant4ActionPhase.cpp b/DDG4/src/Geant4ActionPhase.cpp
index 7698750c82f12a561f6d4431c0c9fedd7b6155ee..da60e9f2443f7c84179a96de279b4f2353efe8b4 100644
--- a/DDG4/src/Geant4ActionPhase.cpp
+++ b/DDG4/src/Geant4ActionPhase.cpp
@@ -1,8 +1,8 @@
-// $Id: Handle.h 570 2013-05-17 07:47:11Z markus.frank $
+// $Id$
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
-// Copyright (C) Organisation europ茅enne pour la Recherche nucl茅aire (CERN)
+// Copyright (C) Organisation europeenne pour la Recherche nucleaire (CERN)
 // All rights reserved.
 //
 // For the licensing terms see $DD4hepINSTALL/LICENSE.
diff --git a/DDG4/src/Geant4Call.cpp b/DDG4/src/Geant4Call.cpp
index 223914aa5c0cd2897519103d470ecd062763bc38..ac3f57d7e6ff66ce01d15cf60ef8d5f108570b10 100644
--- a/DDG4/src/Geant4Call.cpp
+++ b/DDG4/src/Geant4Call.cpp
@@ -1,8 +1,8 @@
-// $Id: Handle.h 570 2013-05-17 07:47:11Z markus.frank $
+// $Id$
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
-// Copyright (C) Organisation europ茅enne pour la Recherche nucl茅aire (CERN)
+// Copyright (C) Organisation europeenne pour la Recherche nucleaire (CERN)
 // All rights reserved.
 //
 // For the licensing terms see $DD4hepINSTALL/LICENSE.
diff --git a/DDG4/src/Geant4Context.cpp b/DDG4/src/Geant4Context.cpp
index 25e14ef155e5405a00685ee7f79b6eb07209e5d3..b0add8c414db76ce6062ba2a4c3f5bbe4bf55807 100644
--- a/DDG4/src/Geant4Context.cpp
+++ b/DDG4/src/Geant4Context.cpp
@@ -1,8 +1,8 @@
-// $Id: Handle.h 570 2013-05-17 07:47:11Z markus.frank $
+// $Id$
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
-// Copyright (C) Organisation europ茅enne pour la Recherche nucl茅aire (CERN)
+// Copyright (C) Organisation europeenne pour la Recherche nucleaire (CERN)
 // All rights reserved.
 //
 // For the licensing terms see $DD4hepINSTALL/LICENSE.
diff --git a/DDG4/src/Geant4Converter.cpp b/DDG4/src/Geant4Converter.cpp
index b45e594c147218dacd591a5feb452c4e048a3cc9..7e6b0cdec79cd12f7c5e795704b74c185e7bb349 100644
--- a/DDG4/src/Geant4Converter.cpp
+++ b/DDG4/src/Geant4Converter.cpp
@@ -2,7 +2,7 @@
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
-// Copyright (C) Organisation europ茅enne pour la Recherche nucl茅aire (CERN)
+// Copyright (C) Organisation europeenne pour la Recherche nucleaire (CERN)
 // All rights reserved.
 //
 // For the licensing terms see $DD4hepINSTALL/LICENSE.
diff --git a/DDG4/src/Geant4Data.cpp b/DDG4/src/Geant4Data.cpp
index f68f34b8236cfda2c3dfdc143dd73937ac909ec0..8e59a01417defcafcc0ab405997f16529db8e5f3 100644
--- a/DDG4/src/Geant4Data.cpp
+++ b/DDG4/src/Geant4Data.cpp
@@ -1,8 +1,8 @@
-// $Id: Handle.h 570 2013-05-17 07:47:11Z markus.frank $
+// $Id$
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
-// Copyright (C) Organisation europ茅enne pour la Recherche nucl茅aire (CERN)
+// Copyright (C) Organisation europeenne pour la Recherche nucleaire (CERN)
 // All rights reserved.
 //
 // For the licensing terms see $DD4hepINSTALL/LICENSE.
diff --git a/DDG4/src/Geant4DataConversion.cpp b/DDG4/src/Geant4DataConversion.cpp
index 347a14c893417aeafd4bd72cb5289e45a2c279fe..684f7752e42880bbe1dd1a8a931678c84e712c4a 100644
--- a/DDG4/src/Geant4DataConversion.cpp
+++ b/DDG4/src/Geant4DataConversion.cpp
@@ -1,8 +1,8 @@
-// $Id: Handle.h 570 2013-05-17 07:47:11Z markus.frank $
+// $Id$
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
-// Copyright (C) Organisation europ茅enne pour la Recherche nucl茅aire (CERN)
+// Copyright (C) Organisation europeenne pour la Recherche nucleaire (CERN)
 // All rights reserved.
 //
 // For the licensing terms see $DD4hepINSTALL/LICENSE.
diff --git a/DDG4/src/Geant4DataDump.cpp b/DDG4/src/Geant4DataDump.cpp
index 14fc7e3984df105c7ae488dad6051597496a7c2e..5378eeab938edb9d589144fbef6c32ab5dd22b39 100644
--- a/DDG4/src/Geant4DataDump.cpp
+++ b/DDG4/src/Geant4DataDump.cpp
@@ -1,8 +1,8 @@
-// $Id: Handle.h 570 2013-05-17 07:47:11Z markus.frank $
+// $Id$
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
-// Copyright (C) Organisation europ茅enne pour la Recherche nucl茅aire (CERN)
+// Copyright (C) Organisation europeenne pour la Recherche nucleaire (CERN)
 // All rights reserved.
 //
 // For the licensing terms see $DD4hepINSTALL/LICENSE.
diff --git a/DDG4/src/Geant4DetectorConstruction.cpp b/DDG4/src/Geant4DetectorConstruction.cpp
index 85b9797cebf5bad15d1395bef55e82da0be5af83..bd5bbea5fc353b2a9617b71ba00f15a79742b79b 100644
--- a/DDG4/src/Geant4DetectorConstruction.cpp
+++ b/DDG4/src/Geant4DetectorConstruction.cpp
@@ -2,7 +2,7 @@
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
-// Copyright (C) Organisation europ茅enne pour la Recherche nucl茅aire (CERN)
+// Copyright (C) Organisation europeenne pour la Recherche nucleaire (CERN)
 // All rights reserved.
 //
 // For the licensing terms see $DD4hepINSTALL/LICENSE.
diff --git a/DDG4/src/Geant4EventAction.cpp b/DDG4/src/Geant4EventAction.cpp
index e3109b844d82c4c1be78887de3f6e69e2c69efa7..0394f343cf423e3849083659276c38867576ed3a 100644
--- a/DDG4/src/Geant4EventAction.cpp
+++ b/DDG4/src/Geant4EventAction.cpp
@@ -1,8 +1,8 @@
-// $Id: Handle.h 570 2013-05-17 07:47:11Z markus.frank $
+// $Id$
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
-// Copyright (C) Organisation europ茅enne pour la Recherche nucl茅aire (CERN)
+// Copyright (C) Organisation europeenne pour la Recherche nucleaire (CERN)
 // All rights reserved.
 //
 // For the licensing terms see $DD4hepINSTALL/LICENSE.
diff --git a/DDG4/src/Geant4Exec.cpp b/DDG4/src/Geant4Exec.cpp
index b268e6588687755ba6fa96763e7c3b65be705168..8f068d4998eeeabd773d9dec95fd7780c8859128 100644
--- a/DDG4/src/Geant4Exec.cpp
+++ b/DDG4/src/Geant4Exec.cpp
@@ -1,8 +1,8 @@
-// $Id: Handle.h 570 2013-05-17 07:47:11Z markus.frank $
+// $Id$
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
-// Copyright (C) Organisation europ茅enne pour la Recherche nucl茅aire (CERN)
+// Copyright (C) Organisation europeenne pour la Recherche nucleaire (CERN)
 // All rights reserved.
 //
 // For the licensing terms see $DD4hepINSTALL/LICENSE.
diff --git a/DDG4/src/Geant4Field.cpp b/DDG4/src/Geant4Field.cpp
index 68007569bbb57735546247b2859d711e31bfec99..3033736d4335d4da39546d799a7d3ad2958c21af 100644
--- a/DDG4/src/Geant4Field.cpp
+++ b/DDG4/src/Geant4Field.cpp
@@ -2,7 +2,7 @@
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
-// Copyright (C) Organisation europ茅enne pour la Recherche nucl茅aire (CERN)
+// Copyright (C) Organisation europeenne pour la Recherche nucleaire (CERN)
 // All rights reserved.
 //
 // For the licensing terms see $DD4hepINSTALL/LICENSE.
diff --git a/DDG4/src/Geant4GDMLDetector.cpp b/DDG4/src/Geant4GDMLDetector.cpp
index c2dcff4ccd41f445afb40f39aef34cf12aa57e90..aa045fbaf31a382c7572859d2a7dfbf916184c1c 100644
--- a/DDG4/src/Geant4GDMLDetector.cpp
+++ b/DDG4/src/Geant4GDMLDetector.cpp
@@ -1,8 +1,8 @@
-// $Id: Handle.h 570 2013-05-17 07:47:11Z markus.frank $
+// $Id$
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
-// Copyright (C) Organisation europ茅enne pour la Recherche nucl茅aire (CERN)
+// Copyright (C) Organisation europeenne pour la Recherche nucleaire (CERN)
 // All rights reserved.
 //
 // For the licensing terms see $DD4hepINSTALL/LICENSE.
diff --git a/DDG4/src/Geant4GeneratorAction.cpp b/DDG4/src/Geant4GeneratorAction.cpp
index b8cb71e46fdda972a667f410d63eddfc01357be3..593d352c347b6d69296d164c47b0f55ef8ebf0ec 100644
--- a/DDG4/src/Geant4GeneratorAction.cpp
+++ b/DDG4/src/Geant4GeneratorAction.cpp
@@ -1,8 +1,8 @@
-// $Id: Handle.h 570 2013-05-17 07:47:11Z markus.frank $
+// $Id$
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
-// Copyright (C) Organisation europ茅enne pour la Recherche nucl茅aire (CERN)
+// Copyright (C) Organisation europeenne pour la Recherche nucleaire (CERN)
 // All rights reserved.
 //
 // For the licensing terms see $DD4hepINSTALL/LICENSE.
diff --git a/DDG4/src/Geant4GeneratorActionInit.cpp b/DDG4/src/Geant4GeneratorActionInit.cpp
index d701044c24cc7ac5c72924d2e4dbdf87ec9c120c..cf94c519505d99b990029cf4960e1cb734236ad9 100644
--- a/DDG4/src/Geant4GeneratorActionInit.cpp
+++ b/DDG4/src/Geant4GeneratorActionInit.cpp
@@ -1,8 +1,8 @@
-// $Id: Handle.h 570 2013-05-17 07:47:11Z markus.frank $
+// $Id$
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
-// Copyright (C) Organisation europ茅enne pour la Recherche nucl茅aire (CERN)
+// Copyright (C) Organisation europeenne pour la Recherche nucleaire (CERN)
 // All rights reserved.
 //
 // For the licensing terms see $DD4hepINSTALL/LICENSE.
diff --git a/DDG4/src/Geant4GeometryInfo.cpp b/DDG4/src/Geant4GeometryInfo.cpp
index aa13b37c7c25bfe91a9a9b708bf78c4261a22018..1a1ac0cd9069e0c6c533250b94bdb10cc70d991f 100644
--- a/DDG4/src/Geant4GeometryInfo.cpp
+++ b/DDG4/src/Geant4GeometryInfo.cpp
@@ -1,8 +1,8 @@
-// $Id: Handle.h 570 2013-05-17 07:47:11Z markus.frank $
+// $Id$
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
-// Copyright (C) Organisation europ茅enne pour la Recherche nucl茅aire (CERN)
+// Copyright (C) Organisation europeenne pour la Recherche nucleaire (CERN)
 // All rights reserved.
 //
 // For the licensing terms see $DD4hepINSTALL/LICENSE.
diff --git a/DDG4/src/Geant4Handle.cpp b/DDG4/src/Geant4Handle.cpp
index b450fe1437d85dab0703728e192a39762ff090ab..a8e1ce298885ae3ad05ce18fc6c3b6764ba5af62 100644
--- a/DDG4/src/Geant4Handle.cpp
+++ b/DDG4/src/Geant4Handle.cpp
@@ -1,8 +1,8 @@
-// $Id: Handle.h 570 2013-05-17 07:47:11Z markus.frank $
+// $Id$
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
-// Copyright (C) Organisation europ茅enne pour la Recherche nucl茅aire (CERN)
+// Copyright (C) Organisation europeenne pour la Recherche nucleaire (CERN)
 // All rights reserved.
 //
 // For the licensing terms see $DD4hepINSTALL/LICENSE.
diff --git a/DDG4/src/Geant4HierarchyDump.cpp b/DDG4/src/Geant4HierarchyDump.cpp
index 757c2b9f86502f9486ae8fe85e820b1e1be1a3c5..fbe4cbd9e0fdd8f7cb24e97735d0249afbc8bc20 100644
--- a/DDG4/src/Geant4HierarchyDump.cpp
+++ b/DDG4/src/Geant4HierarchyDump.cpp
@@ -1,8 +1,8 @@
-// $Id: Handle.h 570 2013-05-17 07:47:11Z markus.frank $
+// $Id$
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
-// Copyright (C) Organisation europ茅enne pour la Recherche nucl茅aire (CERN)
+// Copyright (C) Organisation europeenne pour la Recherche nucleaire (CERN)
 // All rights reserved.
 //
 // For the licensing terms see $DD4hepINSTALL/LICENSE.
diff --git a/DDG4/src/Geant4HitCollection.cpp b/DDG4/src/Geant4HitCollection.cpp
index 74fa0e45e54d52f244882739125ecab22979d77a..3ff42e01609abe2df2e2bd29aefd16b77cc4c8f8 100644
--- a/DDG4/src/Geant4HitCollection.cpp
+++ b/DDG4/src/Geant4HitCollection.cpp
@@ -1,8 +1,8 @@
-// $Id: Handle.h 570 2013-05-17 07:47:11Z markus.frank $
+// $Id$
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
-// Copyright (C) Organisation europ茅enne pour la Recherche nucl茅aire (CERN)
+// Copyright (C) Organisation europeenne pour la Recherche nucleaire (CERN)
 // All rights reserved.
 //
 // For the licensing terms see $DD4hepINSTALL/LICENSE.
diff --git a/DDG4/src/Geant4Hits.cpp b/DDG4/src/Geant4Hits.cpp
index f280f4a52174a3d8b69361d3fb6030fa7f420e81..86a96f1ec627a0257348df250d82968351a87737 100644
--- a/DDG4/src/Geant4Hits.cpp
+++ b/DDG4/src/Geant4Hits.cpp
@@ -2,7 +2,7 @@
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
-// Copyright (C) Organisation europ茅enne pour la Recherche nucl茅aire (CERN)
+// Copyright (C) Organisation europeenne pour la Recherche nucleaire (CERN)
 // All rights reserved.
 //
 // For the licensing terms see $DD4hepINSTALL/LICENSE.
diff --git a/DDG4/src/Geant4InputAction.cpp b/DDG4/src/Geant4InputAction.cpp
index 1564bde6235c1b7ed24bcfe27fbcaa37b3ad76b3..0f8aadfd1a012b9bd86948ae4f5b4468ec714ba9 100644
--- a/DDG4/src/Geant4InputAction.cpp
+++ b/DDG4/src/Geant4InputAction.cpp
@@ -1,8 +1,8 @@
-// $Id: Handle.h 570 2013-05-17 07:47:11Z markus.frank $
+// $Id$
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
-// Copyright (C) Organisation europ茅enne pour la Recherche nucl茅aire (CERN)
+// Copyright (C) Organisation europeenne pour la Recherche nucleaire (CERN)
 // All rights reserved.
 //
 // For the licensing terms see $DD4hepINSTALL/LICENSE.
diff --git a/DDG4/src/Geant4InputHandling.cpp b/DDG4/src/Geant4InputHandling.cpp
index 11444b9bb1e6bc27308c130593da7919b313f522..b14926080a063d7b79c9dd4d5f5ffdb0a518cbab 100644
--- a/DDG4/src/Geant4InputHandling.cpp
+++ b/DDG4/src/Geant4InputHandling.cpp
@@ -1,8 +1,8 @@
-// $Id: Handle.h 570 2013-05-17 07:47:11Z markus.frank $
+// $Id$
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
-// Copyright (C) Organisation europ茅enne pour la Recherche nucl茅aire (CERN)
+// Copyright (C) Organisation europeenne pour la Recherche nucleaire (CERN)
 // All rights reserved.
 //
 // For the licensing terms see $DD4hepINSTALL/LICENSE.
diff --git a/DDG4/src/Geant4InteractionMerger.cpp b/DDG4/src/Geant4InteractionMerger.cpp
index 600a396733068057b3f0a8f1795606c22b30a5c3..1fd4dfb850bd34c2f606ca27c7accf0e6db45632 100644
--- a/DDG4/src/Geant4InteractionMerger.cpp
+++ b/DDG4/src/Geant4InteractionMerger.cpp
@@ -1,8 +1,8 @@
-// $Id: Handle.h 570 2013-05-17 07:47:11Z markus.frank $
+// $Id$
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
-// Copyright (C) Organisation europ茅enne pour la Recherche nucl茅aire (CERN)
+// Copyright (C) Organisation europeenne pour la Recherche nucleaire (CERN)
 // All rights reserved.
 //
 // For the licensing terms see $DD4hepINSTALL/LICENSE.
diff --git a/DDG4/src/Geant4InteractionVertexBoost.cpp b/DDG4/src/Geant4InteractionVertexBoost.cpp
index 326f442b546d0c4c3b9f51828d4f570444694d5e..2af167fbd002367eda907ebddfa20d29ef7d2dd7 100644
--- a/DDG4/src/Geant4InteractionVertexBoost.cpp
+++ b/DDG4/src/Geant4InteractionVertexBoost.cpp
@@ -1,8 +1,8 @@
-// $Id: Handle.h 570 2013-05-17 07:47:11Z markus.frank $
+// $Id$
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
-// Copyright (C) Organisation europ茅enne pour la Recherche nucl茅aire (CERN)
+// Copyright (C) Organisation europeenne pour la Recherche nucleaire (CERN)
 // All rights reserved.
 //
 // For the licensing terms see $DD4hepINSTALL/LICENSE.
diff --git a/DDG4/src/Geant4InteractionVertexSmear.cpp b/DDG4/src/Geant4InteractionVertexSmear.cpp
index 0b2e491535185d5ffedb1a138de21c2a84495097..3e87684e1f0f50415b0b0f160414f6d0f8559ab6 100644
--- a/DDG4/src/Geant4InteractionVertexSmear.cpp
+++ b/DDG4/src/Geant4InteractionVertexSmear.cpp
@@ -1,8 +1,8 @@
-// $Id: Handle.h 570 2013-05-17 07:47:11Z markus.frank $
+// $Id$
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
-// Copyright (C) Organisation europ茅enne pour la Recherche nucl茅aire (CERN)
+// Copyright (C) Organisation europeenne pour la Recherche nucleaire (CERN)
 // All rights reserved.
 //
 // For the licensing terms see $DD4hepINSTALL/LICENSE.
diff --git a/DDG4/src/Geant4IsotropeGenerator.cpp b/DDG4/src/Geant4IsotropeGenerator.cpp
index 625b3cf5820e0f8fd113509e30bceaf9f747da3c..c08c372c3cd0da289cec9f7b09990e2cc1c1910f 100644
--- a/DDG4/src/Geant4IsotropeGenerator.cpp
+++ b/DDG4/src/Geant4IsotropeGenerator.cpp
@@ -1,8 +1,8 @@
-// $Id: Handle.h 570 2013-05-17 07:47:11Z markus.frank $
+// $Id$
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
-// Copyright (C) Organisation europ茅enne pour la Recherche nucl茅aire (CERN)
+// Copyright (C) Organisation europeenne pour la Recherche nucleaire (CERN)
 // All rights reserved.
 //
 // For the licensing terms see $DD4hepINSTALL/LICENSE.
diff --git a/DDG4/src/Geant4Kernel.cpp b/DDG4/src/Geant4Kernel.cpp
index cf470b70e5c5bd2b50df78db1b1b51974a1c95e1..d583e7219733e987fb0cb746083a11186d73fd9d 100644
--- a/DDG4/src/Geant4Kernel.cpp
+++ b/DDG4/src/Geant4Kernel.cpp
@@ -1,8 +1,8 @@
-// $Id: Handle.h 570 2013-05-17 07:47:11Z markus.frank $
+// $Id$
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
-// Copyright (C) Organisation europ茅enne pour la Recherche nucl茅aire (CERN)
+// Copyright (C) Organisation europeenne pour la Recherche nucleaire (CERN)
 // All rights reserved.
 //
 // For the licensing terms see $DD4hepINSTALL/LICENSE.
diff --git a/DDG4/src/Geant4Mapping.cpp b/DDG4/src/Geant4Mapping.cpp
index 3c5bd005c7c8972e0c744c62460e3176ce27795d..cb71c83245a2c7d594fbffdc81048732735a8558 100644
--- a/DDG4/src/Geant4Mapping.cpp
+++ b/DDG4/src/Geant4Mapping.cpp
@@ -1,8 +1,8 @@
-// $Id: Handle.h 570 2013-05-17 07:47:11Z markus.frank $
+// $Id$
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
-// Copyright (C) Organisation europ茅enne pour la Recherche nucl茅aire (CERN)
+// Copyright (C) Organisation europeenne pour la Recherche nucleaire (CERN)
 // All rights reserved.
 //
 // For the licensing terms see $DD4hepINSTALL/LICENSE.
diff --git a/DDG4/src/Geant4MonteCarloTruth.cpp b/DDG4/src/Geant4MonteCarloTruth.cpp
index f8862cbc00cee644e434dbcb4b8ca4b155448f6e..5e1d7c2b641aa04672c3af8aae9bb0ec874e674e 100644
--- a/DDG4/src/Geant4MonteCarloTruth.cpp
+++ b/DDG4/src/Geant4MonteCarloTruth.cpp
@@ -1,8 +1,8 @@
-// $Id: Handle.h 570 2013-05-17 07:47:11Z markus.frank $
+// $Id$
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
-// Copyright (C) Organisation europ茅enne pour la Recherche nucl茅aire (CERN)
+// Copyright (C) Organisation europeenne pour la Recherche nucleaire (CERN)
 // All rights reserved.
 //
 // For the licensing terms see $DD4hepINSTALL/LICENSE.
diff --git a/DDG4/src/Geant4Output2ROOT.cpp b/DDG4/src/Geant4Output2ROOT.cpp
index 9c77f0152b5d1d4875f0d49272f3cd10b7d411da..1d409303fa35f444fd06575a6ba5d0a1d33339eb 100644
--- a/DDG4/src/Geant4Output2ROOT.cpp
+++ b/DDG4/src/Geant4Output2ROOT.cpp
@@ -1,8 +1,8 @@
-// $Id: Handle.h 570 2013-05-17 07:47:11Z markus.frank $
+// $Id$
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
-// Copyright (C) Organisation europ茅enne pour la Recherche nucl茅aire (CERN)
+// Copyright (C) Organisation europeenne pour la Recherche nucleaire (CERN)
 // All rights reserved.
 //
 // For the licensing terms see $DD4hepINSTALL/LICENSE.
diff --git a/DDG4/src/Geant4OutputAction.cpp b/DDG4/src/Geant4OutputAction.cpp
index 9fa61e0187e3822495274fe2dfbc487166ba1d0b..97e2dc11363cdbd50e4c2e005650a413f9f5e95f 100644
--- a/DDG4/src/Geant4OutputAction.cpp
+++ b/DDG4/src/Geant4OutputAction.cpp
@@ -1,8 +1,8 @@
-// $Id: Handle.h 570 2013-05-17 07:47:11Z markus.frank $
+// $Id$
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
-// Copyright (C) Organisation europ茅enne pour la Recherche nucl茅aire (CERN)
+// Copyright (C) Organisation europeenne pour la Recherche nucleaire (CERN)
 // All rights reserved.
 //
 // For the licensing terms see $DD4hepINSTALL/LICENSE.
diff --git a/DDG4/src/Geant4Particle.cpp b/DDG4/src/Geant4Particle.cpp
index 5171ae0d66d14e423ff7db4b19d4752da3a27626..d7567c266960eb023608278c6d42c540f07142ec 100644
--- a/DDG4/src/Geant4Particle.cpp
+++ b/DDG4/src/Geant4Particle.cpp
@@ -1,8 +1,8 @@
-// $Id: Handle.h 570 2013-05-17 07:47:11Z markus.frank $
+// $Id$
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
-// Copyright (C) Organisation europ茅enne pour la Recherche nucl茅aire (CERN)
+// Copyright (C) Organisation europeenne pour la Recherche nucleaire (CERN)
 // All rights reserved.
 //
 // For the licensing terms see $DD4hepINSTALL/LICENSE.
diff --git a/DDG4/src/Geant4ParticleGun.cpp b/DDG4/src/Geant4ParticleGun.cpp
index ccda0a356e6821dcbad512b613b2530114475140..20df50325c484f8507e52b9161426e5f20700089 100644
--- a/DDG4/src/Geant4ParticleGun.cpp
+++ b/DDG4/src/Geant4ParticleGun.cpp
@@ -1,8 +1,8 @@
-// $Id: Handle.h 570 2013-05-17 07:47:11Z markus.frank $
+// $Id$
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
-// Copyright (C) Organisation europ茅enne pour la Recherche nucl茅aire (CERN)
+// Copyright (C) Organisation europeenne pour la Recherche nucleaire (CERN)
 // All rights reserved.
 //
 // For the licensing terms see $DD4hepINSTALL/LICENSE.
diff --git a/DDG4/src/Geant4ParticleHandler.cpp b/DDG4/src/Geant4ParticleHandler.cpp
index c9b1b3e9d996fad0a473daea4dafa28b8b5a8275..d122868d3b4abaaca9721daeb5cd6f043d7b9a8c 100644
--- a/DDG4/src/Geant4ParticleHandler.cpp
+++ b/DDG4/src/Geant4ParticleHandler.cpp
@@ -1,8 +1,8 @@
-// $Id: Handle.h 570 2013-05-17 07:47:11Z markus.frank $
+// $Id$
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
-// Copyright (C) Organisation europ茅enne pour la Recherche nucl茅aire (CERN)
+// Copyright (C) Organisation europeenne pour la Recherche nucleaire (CERN)
 // All rights reserved.
 //
 // For the licensing terms see $DD4hepINSTALL/LICENSE.
diff --git a/DDG4/src/Geant4ParticlePrint.cpp b/DDG4/src/Geant4ParticlePrint.cpp
index 48e830caca3fceac3bed1ee9227e9dea955ca5f4..caf6e618435a9996ea115149cca24e43655087eb 100644
--- a/DDG4/src/Geant4ParticlePrint.cpp
+++ b/DDG4/src/Geant4ParticlePrint.cpp
@@ -1,8 +1,8 @@
-// $Id: Handle.h 570 2013-05-17 07:47:11Z markus.frank $
+// $Id$
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
-// Copyright (C) Organisation europ茅enne pour la Recherche nucl茅aire (CERN)
+// Copyright (C) Organisation europeenne pour la Recherche nucleaire (CERN)
 // All rights reserved.
 //
 // For the licensing terms see $DD4hepINSTALL/LICENSE.
diff --git a/DDG4/src/Geant4PhysicsList.cpp b/DDG4/src/Geant4PhysicsList.cpp
index 0803c9d27caebb250726f3b802393ebdb2d80c11..ec19378163aff3670031a23801d59fe0d465bd35 100644
--- a/DDG4/src/Geant4PhysicsList.cpp
+++ b/DDG4/src/Geant4PhysicsList.cpp
@@ -1,8 +1,8 @@
-// $Id: Handle.h 570 2013-05-17 07:47:11Z markus.frank $
+// $Id$
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
-// Copyright (C) Organisation europ茅enne pour la Recherche nucl茅aire (CERN)
+// Copyright (C) Organisation europeenne pour la Recherche nucleaire (CERN)
 // All rights reserved.
 //
 // For the licensing terms see $DD4hepINSTALL/LICENSE.
diff --git a/DDG4/src/Geant4Plugins.cpp b/DDG4/src/Geant4Plugins.cpp
index 0f505f4f76db702f897391211b783132c8a109c5..4af274e5695b56c419d99d407cb1e8e36d42e72d 100644
--- a/DDG4/src/Geant4Plugins.cpp
+++ b/DDG4/src/Geant4Plugins.cpp
@@ -1,8 +1,8 @@
-// $Id: Handle.h 570 2013-05-17 07:47:11Z markus.frank $
+// $Id$
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
-// Copyright (C) Organisation europ茅enne pour la Recherche nucl茅aire (CERN)
+// Copyright (C) Organisation europeenne pour la Recherche nucleaire (CERN)
 // All rights reserved.
 //
 // For the licensing terms see $DD4hepINSTALL/LICENSE.
diff --git a/DDG4/src/Geant4Primary.cpp b/DDG4/src/Geant4Primary.cpp
index 80a8ac633487bcaa07af22a0b19ee5e4e2b03093..72d4272709e478bdbf1a3de0a01c7c1edd3531d2 100644
--- a/DDG4/src/Geant4Primary.cpp
+++ b/DDG4/src/Geant4Primary.cpp
@@ -1,8 +1,8 @@
-// $Id: Handle.h 570 2013-05-17 07:47:11Z markus.frank $
+// $Id$
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
-// Copyright (C) Organisation europ茅enne pour la Recherche nucl茅aire (CERN)
+// Copyright (C) Organisation europeenne pour la Recherche nucleaire (CERN)
 // All rights reserved.
 //
 // For the licensing terms see $DD4hepINSTALL/LICENSE.
diff --git a/DDG4/src/Geant4PrimaryHandler.cpp b/DDG4/src/Geant4PrimaryHandler.cpp
index bf22db1ccca8976fdf3732489826bab32ba67cd1..095f4d9e88cb42f7cbff77bc22c6e1a262aa8cbc 100644
--- a/DDG4/src/Geant4PrimaryHandler.cpp
+++ b/DDG4/src/Geant4PrimaryHandler.cpp
@@ -1,8 +1,8 @@
-// $Id: Handle.h 570 2013-05-17 07:47:11Z markus.frank $
+// $Id$
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
-// Copyright (C) Organisation europ茅enne pour la Recherche nucl茅aire (CERN)
+// Copyright (C) Organisation europeenne pour la Recherche nucleaire (CERN)
 // All rights reserved.
 //
 // For the licensing terms see $DD4hepINSTALL/LICENSE.
diff --git a/DDG4/src/Geant4ROOTDump.cpp b/DDG4/src/Geant4ROOTDump.cpp
index ba857780cd0fd2a8970e79aea9330eec342133fa..e997b2dea0366208d913f27da9ee5ccd9f600d3b 100644
--- a/DDG4/src/Geant4ROOTDump.cpp
+++ b/DDG4/src/Geant4ROOTDump.cpp
@@ -1,8 +1,8 @@
-// $Id: Handle.h 570 2013-05-17 07:47:11Z markus.frank $
+// $Id$
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
-// Copyright (C) Organisation europ茅enne pour la Recherche nucl茅aire (CERN)
+// Copyright (C) Organisation europeenne pour la Recherche nucleaire (CERN)
 // All rights reserved.
 //
 // For the licensing terms see $DD4hepINSTALL/LICENSE.
diff --git a/DDG4/src/Geant4Random.cpp b/DDG4/src/Geant4Random.cpp
index aa587edf69ece7984d98b8443ad8db7da2336331..e6b94c5a8b86e99548d2d074863e23908f6adc71 100644
--- a/DDG4/src/Geant4Random.cpp
+++ b/DDG4/src/Geant4Random.cpp
@@ -1,8 +1,8 @@
-// $Id: Handle.h 570 2013-05-17 07:47:11Z markus.frank $
+// $Id$
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
-// Copyright (C) Organisation europ茅enne pour la Recherche nucl茅aire (CERN)
+// Copyright (C) Organisation europeenne pour la Recherche nucleaire (CERN)
 // All rights reserved.
 //
 // For the licensing terms see $DD4hepINSTALL/LICENSE.
diff --git a/DDG4/src/Geant4RunAction.cpp b/DDG4/src/Geant4RunAction.cpp
index b8e221bca2580188dd8e7956288ecefbe63ebabb..c44b229aeafaedbf1cb9a14e4b6fbf4039dbd678 100644
--- a/DDG4/src/Geant4RunAction.cpp
+++ b/DDG4/src/Geant4RunAction.cpp
@@ -1,8 +1,8 @@
-// $Id: Handle.h 570 2013-05-17 07:47:11Z markus.frank $
+// $Id$
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
-// Copyright (C) Organisation europ茅enne pour la Recherche nucl茅aire (CERN)
+// Copyright (C) Organisation europeenne pour la Recherche nucleaire (CERN)
 // All rights reserved.
 //
 // For the licensing terms see $DD4hepINSTALL/LICENSE.
diff --git a/DDG4/src/Geant4SensDetAction.cpp b/DDG4/src/Geant4SensDetAction.cpp
index 32aa63a9cb3e7e6d274c68d9f428f58d38deb184..88240c7fcf9aebff460dc949e2f2af5bb2063dca 100644
--- a/DDG4/src/Geant4SensDetAction.cpp
+++ b/DDG4/src/Geant4SensDetAction.cpp
@@ -1,8 +1,8 @@
-// $Id: Handle.h 570 2013-05-17 07:47:11Z markus.frank $
+// $Id$
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
-// Copyright (C) Organisation europ茅enne pour la Recherche nucl茅aire (CERN)
+// Copyright (C) Organisation europeenne pour la Recherche nucleaire (CERN)
 // All rights reserved.
 //
 // For the licensing terms see $DD4hepINSTALL/LICENSE.
diff --git a/DDG4/src/Geant4SensitiveDetector.cpp b/DDG4/src/Geant4SensitiveDetector.cpp
index e06536f9c898375567df0e891d6f1b4fa4da4b65..bbf4e3042f90cdf93299917eab7aa49d7a6af517 100644
--- a/DDG4/src/Geant4SensitiveDetector.cpp
+++ b/DDG4/src/Geant4SensitiveDetector.cpp
@@ -2,7 +2,7 @@
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
-// Copyright (C) Organisation europ茅enne pour la Recherche nucl茅aire (CERN)
+// Copyright (C) Organisation europeenne pour la Recherche nucleaire (CERN)
 // All rights reserved.
 //
 // For the licensing terms see $DD4hepINSTALL/LICENSE.
diff --git a/DDG4/src/Geant4StackingAction.cpp b/DDG4/src/Geant4StackingAction.cpp
index 3f9211ed0b585f689537ea609d2f12bbbe5e8e70..b00a6589d428b7f4763191047f45aec268bf2427 100644
--- a/DDG4/src/Geant4StackingAction.cpp
+++ b/DDG4/src/Geant4StackingAction.cpp
@@ -1,8 +1,8 @@
-// $Id: Handle.h 570 2013-05-17 07:47:11Z markus.frank $
+// $Id$
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
-// Copyright (C) Organisation europ茅enne pour la Recherche nucl茅aire (CERN)
+// Copyright (C) Organisation europeenne pour la Recherche nucleaire (CERN)
 // All rights reserved.
 //
 // For the licensing terms see $DD4hepINSTALL/LICENSE.
diff --git a/DDG4/src/Geant4StepHandler.cpp b/DDG4/src/Geant4StepHandler.cpp
index 6567894f88041daff3f7f2efe1e1b31f6321ad96..c5886dcbf07648a92dd62bb3994569e5db28fd51 100644
--- a/DDG4/src/Geant4StepHandler.cpp
+++ b/DDG4/src/Geant4StepHandler.cpp
@@ -2,7 +2,7 @@
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
-// Copyright (C) Organisation europ茅enne pour la Recherche nucl茅aire (CERN)
+// Copyright (C) Organisation europeenne pour la Recherche nucleaire (CERN)
 // All rights reserved.
 //
 // For the licensing terms see $DD4hepINSTALL/LICENSE.
diff --git a/DDG4/src/Geant4SteppingAction.cpp b/DDG4/src/Geant4SteppingAction.cpp
index 574db51d2e97549b549b7aa7d0bf6e00d8d77b4e..ba1339d0b49cc48d4884c3a066d55bc445755bd6 100644
--- a/DDG4/src/Geant4SteppingAction.cpp
+++ b/DDG4/src/Geant4SteppingAction.cpp
@@ -1,8 +1,8 @@
-// $Id: Handle.h 570 2013-05-17 07:47:11Z markus.frank $
+// $Id$
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
-// Copyright (C) Organisation europ茅enne pour la Recherche nucl茅aire (CERN)
+// Copyright (C) Organisation europeenne pour la Recherche nucleaire (CERN)
 // All rights reserved.
 //
 // For the licensing terms see $DD4hepINSTALL/LICENSE.
diff --git a/DDG4/src/Geant4TestActions.cpp b/DDG4/src/Geant4TestActions.cpp
index 6a1720d2ab4ba95e8607d36bea1167ecc027afda..e41edc80997d17c7dc73df84073bd753a35f06d0 100644
--- a/DDG4/src/Geant4TestActions.cpp
+++ b/DDG4/src/Geant4TestActions.cpp
@@ -1,8 +1,8 @@
-// $Id: Handle.h 570 2013-05-17 07:47:11Z markus.frank $
+// $Id$
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
-// Copyright (C) Organisation europ茅enne pour la Recherche nucl茅aire (CERN)
+// Copyright (C) Organisation europeenne pour la Recherche nucleaire (CERN)
 // All rights reserved.
 //
 // For the licensing terms see $DD4hepINSTALL/LICENSE.
diff --git a/DDG4/src/Geant4TouchableHandler.cpp b/DDG4/src/Geant4TouchableHandler.cpp
index a1489e51d71fb70ae5871a6ef7f586894286dd49..656c1d1dde391d5a4b3ca0cd7e5a9b42a354a85e 100644
--- a/DDG4/src/Geant4TouchableHandler.cpp
+++ b/DDG4/src/Geant4TouchableHandler.cpp
@@ -1,8 +1,8 @@
-// $Id: Handle.h 570 2013-05-17 07:47:11Z markus.frank $
+// $Id$
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
-// Copyright (C) Organisation europ茅enne pour la Recherche nucl茅aire (CERN)
+// Copyright (C) Organisation europeenne pour la Recherche nucleaire (CERN)
 // All rights reserved.
 //
 // For the licensing terms see $DD4hepINSTALL/LICENSE.
diff --git a/DDG4/src/Geant4TrackInformation.cpp b/DDG4/src/Geant4TrackInformation.cpp
index 525085b81dbd5c1adf3d09ee5656522a4254c69b..450daeb344ff395d5bceee9a3c3b6ff786d9cf08 100644
--- a/DDG4/src/Geant4TrackInformation.cpp
+++ b/DDG4/src/Geant4TrackInformation.cpp
@@ -1,8 +1,8 @@
-// $Id: Handle.h 570 2013-05-17 07:47:11Z markus.frank $
+// $Id$
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
-// Copyright (C) Organisation europ茅enne pour la Recherche nucl茅aire (CERN)
+// Copyright (C) Organisation europeenne pour la Recherche nucleaire (CERN)
 // All rights reserved.
 //
 // For the licensing terms see $DD4hepINSTALL/LICENSE.
diff --git a/DDG4/src/Geant4TrackingAction.cpp b/DDG4/src/Geant4TrackingAction.cpp
index b8958b7f2b6b00b5e9408429fc2071124d3bda06..556652771cd14434309da097f27c25f3babc8fe1 100644
--- a/DDG4/src/Geant4TrackingAction.cpp
+++ b/DDG4/src/Geant4TrackingAction.cpp
@@ -1,8 +1,8 @@
-// $Id: Handle.h 570 2013-05-17 07:47:11Z markus.frank $
+// $Id$
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
-// Copyright (C) Organisation europ茅enne pour la Recherche nucl茅aire (CERN)
+// Copyright (C) Organisation europeenne pour la Recherche nucleaire (CERN)
 // All rights reserved.
 //
 // For the licensing terms see $DD4hepINSTALL/LICENSE.
diff --git a/DDG4/src/Geant4TrackingPostAction.cpp b/DDG4/src/Geant4TrackingPostAction.cpp
index cba85e9649f62cd1a6f372e9d8a0d851091cc223..5e4552061aea5889e4861d1a212f2c59ca4909e0 100644
--- a/DDG4/src/Geant4TrackingPostAction.cpp
+++ b/DDG4/src/Geant4TrackingPostAction.cpp
@@ -1,8 +1,8 @@
-// $Id: Handle.h 570 2013-05-17 07:47:11Z markus.frank $
+// $Id$
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
-// Copyright (C) Organisation europ茅enne pour la Recherche nucl茅aire (CERN)
+// Copyright (C) Organisation europeenne pour la Recherche nucleaire (CERN)
 // All rights reserved.
 //
 // For the licensing terms see $DD4hepINSTALL/LICENSE.
diff --git a/DDG4/src/Geant4TrackingPreAction.cpp b/DDG4/src/Geant4TrackingPreAction.cpp
index f676f94581ae7847571682018feab3af23e21d2e..fcce3efbb2c1826af46178316b15727446c9fbc0 100644
--- a/DDG4/src/Geant4TrackingPreAction.cpp
+++ b/DDG4/src/Geant4TrackingPreAction.cpp
@@ -1,8 +1,8 @@
-// $Id: Handle.h 570 2013-05-17 07:47:11Z markus.frank $
+// $Id$
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
-// Copyright (C) Organisation europ茅enne pour la Recherche nucl茅aire (CERN)
+// Copyright (C) Organisation europeenne pour la Recherche nucleaire (CERN)
 // All rights reserved.
 //
 // For the licensing terms see $DD4hepINSTALL/LICENSE.
diff --git a/DDG4/src/Geant4UIManager.cpp b/DDG4/src/Geant4UIManager.cpp
index 716db5c7f2907063b088251b66d723be40935d64..b4e5b2fe9ca2d2b65ae94a72a4b7200e38cb9092 100644
--- a/DDG4/src/Geant4UIManager.cpp
+++ b/DDG4/src/Geant4UIManager.cpp
@@ -1,8 +1,8 @@
-// $Id: Handle.h 570 2013-05-17 07:47:11Z markus.frank $
+// $Id$
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
-// Copyright (C) Organisation europ茅enne pour la Recherche nucl茅aire (CERN)
+// Copyright (C) Organisation europeenne pour la Recherche nucleaire (CERN)
 // All rights reserved.
 //
 // For the licensing terms see $DD4hepINSTALL/LICENSE.
diff --git a/DDG4/src/Geant4UIMessenger.cpp b/DDG4/src/Geant4UIMessenger.cpp
index ee5366f593a41b3065e65a263f4ca6e14c271a33..c4ed5c3c5a4b82a557b6ac8034165c3fac021767 100644
--- a/DDG4/src/Geant4UIMessenger.cpp
+++ b/DDG4/src/Geant4UIMessenger.cpp
@@ -1,8 +1,8 @@
-// $Id: Handle.h 570 2013-05-17 07:47:11Z markus.frank $
+// $Id$
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
-// Copyright (C) Organisation europ茅enne pour la Recherche nucl茅aire (CERN)
+// Copyright (C) Organisation europeenne pour la Recherche nucleaire (CERN)
 // All rights reserved.
 //
 // For the licensing terms see $DD4hepINSTALL/LICENSE.
diff --git a/DDG4/src/Geant4UserParticleHandler.cpp b/DDG4/src/Geant4UserParticleHandler.cpp
index 2d25d06095aa8884e1a521d2682c1cd34b0b0505..454f76a68b335c1454935359300c063572859888 100644
--- a/DDG4/src/Geant4UserParticleHandler.cpp
+++ b/DDG4/src/Geant4UserParticleHandler.cpp
@@ -1,8 +1,8 @@
-// $Id: Handle.h 570 2013-05-17 07:47:11Z markus.frank $
+// $Id$
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
-// Copyright (C) Organisation europ茅enne pour la Recherche nucl茅aire (CERN)
+// Copyright (C) Organisation europeenne pour la Recherche nucleaire (CERN)
 // All rights reserved.
 //
 // For the licensing terms see $DD4hepINSTALL/LICENSE.
diff --git a/DDG4/src/Geant4Vertex.cpp b/DDG4/src/Geant4Vertex.cpp
index f0ab89425d0c59c34dc369090244bc09949816eb..8f96088e0030710adf2da1214cd78544324968b3 100644
--- a/DDG4/src/Geant4Vertex.cpp
+++ b/DDG4/src/Geant4Vertex.cpp
@@ -1,8 +1,8 @@
-// $Id: Handle.h 570 2013-05-17 07:47:11Z markus.frank $
+// $Id$
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
-// Copyright (C) Organisation europ茅enne pour la Recherche nucl茅aire (CERN)
+// Copyright (C) Organisation europeenne pour la Recherche nucleaire (CERN)
 // All rights reserved.
 //
 // For the licensing terms see $DD4hepINSTALL/LICENSE.
diff --git a/DDG4/src/Geant4VolumeManager.cpp b/DDG4/src/Geant4VolumeManager.cpp
index 6a8dfc1afd7ae90048da4cba31cae05f64a598fb..0bdaf5ab6c04a83e53a6886793b35d93aec0c5ab 100644
--- a/DDG4/src/Geant4VolumeManager.cpp
+++ b/DDG4/src/Geant4VolumeManager.cpp
@@ -1,8 +1,8 @@
-// $Id: Handle.h 570 2013-05-17 07:47:11Z markus.frank $
+// $Id$
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
-// Copyright (C) Organisation europ茅enne pour la Recherche nucl茅aire (CERN)
+// Copyright (C) Organisation europeenne pour la Recherche nucleaire (CERN)
 // All rights reserved.
 //
 // For the licensing terms see $DD4hepINSTALL/LICENSE.
diff --git a/DDG4/src/IoStreams.cpp b/DDG4/src/IoStreams.cpp
index f4bd2fc5b84005153ca531ac54d6b9eee43e3798..04d61a5c809633eec2982e4f8502111a1cd7672c 100644
--- a/DDG4/src/IoStreams.cpp
+++ b/DDG4/src/IoStreams.cpp
@@ -1,8 +1,8 @@
-// $Id: Handle.h 570 2013-05-17 07:47:11Z markus.frank $
+// $Id$
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
-// Copyright (C) Organisation europ茅enne pour la Recherche nucl茅aire (CERN)
+// Copyright (C) Organisation europeenne pour la Recherche nucleaire (CERN)
 // All rights reserved.
 //
 // For the licensing terms see $DD4hepINSTALL/LICENSE.
diff --git a/UtilityApps/CMakeLists.txt b/UtilityApps/CMakeLists.txt
index d85fd6bff2d8edf515f9aafc8c31a4f60489126f..de5c2be5022a9a8254f945c5e002a87ff2f658c5 100644
--- a/UtilityApps/CMakeLists.txt
+++ b/UtilityApps/CMakeLists.txt
@@ -1,8 +1,8 @@
-# $Id: Handle.h 570 2013-05-17 07:47:11Z markus.frank $
+# $Id$
 #==========================================================================
 #  AIDA Detector description implementation for LCD
 #--------------------------------------------------------------------------
-# Copyright (C) Organisation europ茅enne pour la Recherche nucl茅aire (CERN)
+# Copyright (C) Organisation europeenne pour la Recherche nucleaire (CERN)
 # All rights reserved.
 #
 # For the licensing terms see $DD4hepINSTALL/LICENSE.
diff --git a/UtilityApps/src/EvNavHandler.h b/UtilityApps/src/EvNavHandler.h
index 939ebf19bc1c706cd726775b824abb933257edd3..43bcfd50e0f3c78055d7c07b61af2447adf0fd1c 100644
--- a/UtilityApps/src/EvNavHandler.h
+++ b/UtilityApps/src/EvNavHandler.h
@@ -1,8 +1,8 @@
-// $Id: Handle.h 570 2013-05-17 07:47:11Z markus.frank $
+// $Id$
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
-// Copyright (C) Organisation europ茅enne pour la Recherche nucl茅aire (CERN)
+// Copyright (C) Organisation europeenne pour la Recherche nucleaire (CERN)
 // All rights reserved.
 //
 // For the licensing terms see $DD4hepINSTALL/LICENSE.
diff --git a/UtilityApps/src/LinkDef.h b/UtilityApps/src/LinkDef.h
index ed84a61c20c9714988ac86c73a53192f9a15209e..3a576a1896db4eecae630ee322ab0530721c5fde 100644
--- a/UtilityApps/src/LinkDef.h
+++ b/UtilityApps/src/LinkDef.h
@@ -1,8 +1,8 @@
-// $Id: Handle.h 570 2013-05-17 07:47:11Z markus.frank $
+// $Id$
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
-// Copyright (C) Organisation europ茅enne pour la Recherche nucl茅aire (CERN)
+// Copyright (C) Organisation europeenne pour la Recherche nucleaire (CERN)
 // All rights reserved.
 //
 // For the licensing terms see $DD4hepINSTALL/LICENSE.
diff --git a/UtilityApps/src/MultiView.h b/UtilityApps/src/MultiView.h
index fea42ec4678fad7bb0cb7c5ba91d63e75499efdd..f2f3b5404d7d6f2b93c40e4d4446db845e539145 100644
--- a/UtilityApps/src/MultiView.h
+++ b/UtilityApps/src/MultiView.h
@@ -1,8 +1,8 @@
-// $Id: Handle.h 570 2013-05-17 07:47:11Z markus.frank $
+// $Id$
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
-// Copyright (C) Organisation europ茅enne pour la Recherche nucl茅aire (CERN)
+// Copyright (C) Organisation europeenne pour la Recherche nucleaire (CERN)
 // All rights reserved.
 //
 // For the licensing terms see $DD4hepINSTALL/LICENSE.
diff --git a/UtilityApps/src/converter.cpp b/UtilityApps/src/converter.cpp
index f5ce9c11d8ca82384d74c045c76e5e5a189e620d..9b28e4790a3bbfb88573785582f157dc27294e6e 100644
--- a/UtilityApps/src/converter.cpp
+++ b/UtilityApps/src/converter.cpp
@@ -2,7 +2,7 @@
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
-// Copyright (C) Organisation europ茅enne pour la Recherche nucl茅aire (CERN)
+// Copyright (C) Organisation europeenne pour la Recherche nucleaire (CERN)
 // All rights reserved.
 //
 // For the licensing terms see $DD4hepINSTALL/LICENSE.
diff --git a/UtilityApps/src/display.cpp b/UtilityApps/src/display.cpp
index 464c6241f2079162da38d3a07f8e21ffb64c031c..9fe8dff95c56edd1b195b3682864f3c69de2abeb 100644
--- a/UtilityApps/src/display.cpp
+++ b/UtilityApps/src/display.cpp
@@ -2,7 +2,7 @@
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
-// Copyright (C) Organisation europ茅enne pour la Recherche nucl茅aire (CERN)
+// Copyright (C) Organisation europeenne pour la Recherche nucleaire (CERN)
 // All rights reserved.
 //
 // For the licensing terms see $DD4hepINSTALL/LICENSE.
diff --git a/UtilityApps/src/dumpdetector.cpp b/UtilityApps/src/dumpdetector.cpp
index d25d22b11a5496c8f47b9e21b7829d0edf9f1b2f..8180b018c18249c0f483e47adf31c88122c077f3 100644
--- a/UtilityApps/src/dumpdetector.cpp
+++ b/UtilityApps/src/dumpdetector.cpp
@@ -1,8 +1,8 @@
-// $Id: Handle.h 570 2013-05-17 07:47:11Z markus.frank $
+// $Id$
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
-// Copyright (C) Organisation europ茅enne pour la Recherche nucl茅aire (CERN)
+// Copyright (C) Organisation europeenne pour la Recherche nucleaire (CERN)
 // All rights reserved.
 //
 // For the licensing terms see $DD4hepINSTALL/LICENSE.
diff --git a/UtilityApps/src/materialScan.cpp b/UtilityApps/src/materialScan.cpp
index 3e214e0cfd897ee5e811e060302d74bbda57f08e..006b32d592e8bd20fcd47a6e4068d80552e90956 100644
--- a/UtilityApps/src/materialScan.cpp
+++ b/UtilityApps/src/materialScan.cpp
@@ -1,8 +1,8 @@
-// $Id: Handle.h 570 2013-05-17 07:47:11Z markus.frank $
+// $Id$
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
-// Copyright (C) Organisation europ茅enne pour la Recherche nucl茅aire (CERN)
+// Copyright (C) Organisation europeenne pour la Recherche nucleaire (CERN)
 // All rights reserved.
 //
 // For the licensing terms see $DD4hepINSTALL/LICENSE.
diff --git a/UtilityApps/src/next_event_dummy.cpp b/UtilityApps/src/next_event_dummy.cpp
index 8193eed5e752b0e4d33698ae6fad8154492447c9..01f142037d161091535b58d134878cff525b3a2a 100644
--- a/UtilityApps/src/next_event_dummy.cpp
+++ b/UtilityApps/src/next_event_dummy.cpp
@@ -1,8 +1,8 @@
-// $Id: Handle.h 570 2013-05-17 07:47:11Z markus.frank $
+// $Id$
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
-// Copyright (C) Organisation europ茅enne pour la Recherche nucl茅aire (CERN)
+// Copyright (C) Organisation europeenne pour la Recherche nucleaire (CERN)
 // All rights reserved.
 //
 // For the licensing terms see $DD4hepINSTALL/LICENSE.
diff --git a/UtilityApps/src/next_event_lcio.cpp b/UtilityApps/src/next_event_lcio.cpp
index 6fd5d2444a8bd7c8d44fad876c7d8f366baab38b..3e114ef20652a02323b2cb6c0a311bdfd0364137 100644
--- a/UtilityApps/src/next_event_lcio.cpp
+++ b/UtilityApps/src/next_event_lcio.cpp
@@ -1,8 +1,8 @@
-// $Id: Handle.h 570 2013-05-17 07:47:11Z markus.frank $
+// $Id$
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
-// Copyright (C) Organisation europ茅enne pour la Recherche nucl茅aire (CERN)
+// Copyright (C) Organisation europeenne pour la Recherche nucleaire (CERN)
 // All rights reserved.
 //
 // For the licensing terms see $DD4hepINSTALL/LICENSE.
diff --git a/UtilityApps/src/plugin_runner.cpp b/UtilityApps/src/plugin_runner.cpp
index 63647ed118b1540d68212529060a8335a7e78be3..29a864873de19049dc058a1889bdfff2698cacfb 100644
--- a/UtilityApps/src/plugin_runner.cpp
+++ b/UtilityApps/src/plugin_runner.cpp
@@ -2,7 +2,7 @@
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
-// Copyright (C) Organisation europ茅enne pour la Recherche nucl茅aire (CERN)
+// Copyright (C) Organisation europeenne pour la Recherche nucleaire (CERN)
 // All rights reserved.
 //
 // For the licensing terms see $DD4hepINSTALL/LICENSE.
diff --git a/UtilityApps/src/print_materials.cpp b/UtilityApps/src/print_materials.cpp
index 9e950d29c607e09fa50d6cfd9411f7d000a2b2a7..e834f1c82a8bb318d46e457edc835daa431f728e 100644
--- a/UtilityApps/src/print_materials.cpp
+++ b/UtilityApps/src/print_materials.cpp
@@ -1,8 +1,8 @@
-// $Id: Handle.h 570 2013-05-17 07:47:11Z markus.frank $
+// $Id$
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
-// Copyright (C) Organisation europ茅enne pour la Recherche nucl茅aire (CERN)
+// Copyright (C) Organisation europeenne pour la Recherche nucleaire (CERN)
 // All rights reserved.
 //
 // For the licensing terms see $DD4hepINSTALL/LICENSE.
diff --git a/UtilityApps/src/run_plugin.h b/UtilityApps/src/run_plugin.h
index 2a6c3b208c45fd119a55a886bdc85843df4a34cc..994e45db98fdafc75a814e1020abb766ec2c21af 100644
--- a/UtilityApps/src/run_plugin.h
+++ b/UtilityApps/src/run_plugin.h
@@ -2,7 +2,7 @@
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
-// Copyright (C) Organisation europ茅enne pour la Recherche nucl茅aire (CERN)
+// Copyright (C) Organisation europeenne pour la Recherche nucleaire (CERN)
 // All rights reserved.
 //
 // For the licensing terms see $DD4hepINSTALL/LICENSE.
diff --git a/UtilityApps/src/test_surfaces.cpp b/UtilityApps/src/test_surfaces.cpp
index 39c30b5b8518be6928e584ac093a91836b5d1b65..9c1a2a669e1a46ad57d383298c881a778c81f129 100644
--- a/UtilityApps/src/test_surfaces.cpp
+++ b/UtilityApps/src/test_surfaces.cpp
@@ -1,8 +1,8 @@
-// $Id: Handle.h 570 2013-05-17 07:47:11Z markus.frank $
+// $Id$
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
-// Copyright (C) Organisation europ茅enne pour la Recherche nucl茅aire (CERN)
+// Copyright (C) Organisation europeenne pour la Recherche nucleaire (CERN)
 // All rights reserved.
 //
 // For the licensing terms see $DD4hepINSTALL/LICENSE.
diff --git a/UtilityApps/src/teve_display.cpp b/UtilityApps/src/teve_display.cpp
index 4ac90e666a58b07efebfb8bde49f64e6cdb7fc75..dc492eefdb622d15309ef00379f402e4882a2560 100644
--- a/UtilityApps/src/teve_display.cpp
+++ b/UtilityApps/src/teve_display.cpp
@@ -1,8 +1,8 @@
-// $Id: Handle.h 570 2013-05-17 07:47:11Z markus.frank $
+// $Id$
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
-// Copyright (C) Organisation europ茅enne pour la Recherche nucl茅aire (CERN)
+// Copyright (C) Organisation europeenne pour la Recherche nucleaire (CERN)
 // All rights reserved.
 //
 // For the licensing terms see $DD4hepINSTALL/LICENSE.