From 5e714969c4bfc24887af04b69a9dd6820f226573 Mon Sep 17 00:00:00 2001
From: Markus Frank <markus.frank@cern.ch>
Date: Sun, 12 Jul 2015 02:24:02 +0000
Subject: [PATCH] Fix ID tags

---
 DDAlign/CMakeLists.txt                                   | 4 ++--
 DDAlign/include/DDAlign/AlignmentCache.h                 | 4 ++--
 DDAlign/include/DDAlign/AlignmentOperators.h             | 4 ++--
 DDAlign/include/DDAlign/AlignmentStack.h                 | 4 ++--
 DDAlign/include/DDAlign/AlignmentTags.h                  | 4 ++--
 DDAlign/include/DDAlign/AlignmentTransaction.h           | 4 ++--
 DDAlign/include/DDAlign/AlignmentWriter.h                | 4 ++--
 DDAlign/include/DDAlign/DetectorAlignment.h              | 4 ++--
 DDAlign/src/AlignmentCache.cpp                           | 4 ++--
 DDAlign/src/AlignmentOperators.cpp                       | 4 ++--
 DDAlign/src/AlignmentParser.cpp                          | 4 ++--
 DDAlign/src/AlignmentStack.cpp                           | 4 ++--
 DDAlign/src/AlignmentTags.cpp                            | 4 ++--
 DDAlign/src/AlignmentTransaction.cpp                     | 4 ++--
 DDAlign/src/AlignmentWriter.cpp                          | 4 ++--
 DDAlign/src/DetectorAlignment.cpp                        | 4 ++--
 DDCond/CMakeLists.txt                                    | 4 ++--
 DDCond/include/DDCond/ConditionValidator.h               | 4 ++--
 DDCond/include/DDCond/ConditionsHandler.h                | 4 ++--
 DDCond/include/DDCond/ConditionsOperators.h              | 4 ++--
 DDCond/include/DDCond/ConditionsStack.h                  | 4 ++--
 DDCond/include/DDCond/ConditionsTags.h                   | 4 ++--
 DDCond/include/DDCond/ConditionsTransaction.h            | 4 ++--
 DDCond/src/ConditionTest.cpp                             | 4 ++--
 DDCond/src/ConditionValidator.cpp                        | 4 ++--
 DDCond/src/ConditionsHandler.cpp                         | 4 ++--
 DDCond/src/ConditionsParser.cpp                          | 4 ++--
 DDCond/src/ConditionsStack.cpp                           | 4 ++--
 DDCond/src/ConditionsTags.cpp                            | 4 ++--
 DDCond/src/ConditionsTransaction.cpp                     | 4 ++--
 DDCore/CMakeLists.txt                                    | 4 ++--
 DDCore/include/DD4hep/Alignment.h                        | 4 ++--
 DDCore/include/DD4hep/BasicGrammar.h                     | 4 ++--
 DDCore/include/DD4hep/Callback.h                         | 4 ++--
 DDCore/include/DD4hep/ConditionTypes.h                   | 4 ++--
 DDCore/include/DD4hep/Conditions.h                       | 4 ++--
 DDCore/include/DD4hep/DD4hepRootPersistency.h            | 4 ++--
 DDCore/include/DD4hep/DD4hepUnits.h                      | 4 ++--
 DDCore/include/DD4hep/DetFactoryHelper.h                 | 2 +-
 DDCore/include/DD4hep/Detector.h                         | 2 +-
 DDCore/include/DD4hep/DetectorTools.h                    | 4 ++--
 DDCore/include/DD4hep/Dictionary.h                       | 4 ++--
 DDCore/include/DD4hep/Exceptions.h                       | 4 ++--
 DDCore/include/DD4hep/Factories.h                        | 2 +-
 DDCore/include/DD4hep/FieldTypes.h                       | 2 +-
 DDCore/include/DD4hep/Fields.h                           | 2 +-
 DDCore/include/DD4hep/GeoHandler.h                       | 2 +-
 DDCore/include/DD4hep/Handle.h                           | 2 +-
 DDCore/include/DD4hep/Handle.inl                         | 4 ++--
 DDCore/include/DD4hep/IDDescriptor.h                     | 2 +-
 DDCore/include/DD4hep/InstanceCount.h                    | 4 ++--
 DDCore/include/DD4hep/LCDD.h                             | 2 +-
 DDCore/include/DD4hep/LCDDData.h                         | 4 ++--
 DDCore/include/DD4hep/LCDDHelper.h                       | 4 ++--
 DDCore/include/DD4hep/LCDDLoad.h                         | 4 ++--
 DDCore/include/DD4hep/MatrixHelpers.h                    | 4 ++--
 DDCore/include/DD4hep/Memory.h                           | 4 ++--
 DDCore/include/DD4hep/NamedObject.h                      | 4 ++--
 DDCore/include/DD4hep/ObjectExtensions.h                 | 4 ++--
 DDCore/include/DD4hep/Objects.h                          | 2 +-
 DDCore/include/DD4hep/Parsers.h                          | 4 ++--
 DDCore/include/DD4hep/Plugins.h                          | 4 ++--
 DDCore/include/DD4hep/Plugins.inl                        | 4 ++--
 DDCore/include/DD4hep/Primitives.h                       | 4 ++--
 DDCore/include/DD4hep/Printout.h                         | 4 ++--
 DDCore/include/DD4hep/Readout.h                          | 2 +-
 DDCore/include/DD4hep/Segmentations.h                    | 2 +-
 DDCore/include/DD4hep/Shapes.h                           | 2 +-
 DDCore/include/DD4hep/SurfaceInstaller.h                 | 4 ++--
 DDCore/include/DD4hep/ToStream.h                         | 4 ++--
 DDCore/include/DD4hep/VolumeManager.h                    | 4 ++--
 DDCore/include/DD4hep/Volumes.h                          | 2 +-
 DDCore/include/DD4hep/config.h                           | 4 ++--
 DDCore/include/DD4hep/objects/BasicGrammar_inl.h         | 4 ++--
 DDCore/include/DD4hep/objects/ConditionsInterna.h        | 4 ++--
 DDCore/include/DD4hep/objects/DetectorInterna.h          | 4 ++--
 DDCore/include/DD4hep/objects/ObjectsInterna.h           | 4 ++--
 DDCore/include/DD4hep/objects/VolumeManagerInterna.h     | 4 ++--
 DDCore/include/ROOT/LinkDef.h                            | 2 +-
 DDCore/include/XML/Conversions.h                         | 2 +-
 DDCore/include/XML/DocumentHandler.h                     | 2 +-
 DDCore/include/XML/Evaluator.h                           | 2 +-
 DDCore/include/XML/Layering.h                            | 2 +-
 DDCore/include/XML/UnicodeValues.h                       | 2 +-
 DDCore/include/XML/Utilities.h                           | 4 ++--
 DDCore/include/XML/XMLChildValue.h                       | 4 ++--
 DDCore/include/XML/XMLDetector.h                         | 2 +-
 DDCore/include/XML/XMLDimension.h                        | 4 ++--
 DDCore/include/XML/XMLElements.h                         | 2 +-
 DDCore/include/XML/XMLTags.h                             | 2 +-
 DDCore/include/XML/config.h                              | 2 +-
 DDCore/python/lcdd.py                                    | 4 ++--
 DDCore/src/Alignment.cpp                                 | 4 ++--
 DDCore/src/BasicGrammar.cpp                              | 4 ++--
 DDCore/src/BasicGrammarTypes.cpp                         | 4 ++--
 DDCore/src/Callback.cpp                                  | 4 ++--
 DDCore/src/Conditions.cpp                                | 4 ++--
 DDCore/src/ConditionsInterna.cpp                         | 4 ++--
 DDCore/src/ConditonsTypes.cpp                            | 4 ++--
 DDCore/src/DD4hepRootPersistency.cpp                     | 4 ++--
 DDCore/src/Detector.cpp                                  | 2 +-
 DDCore/src/DetectorInterna.cpp                           | 4 ++--
 DDCore/src/DetectorTools.cpp                             | 4 ++--
 DDCore/src/Exceptions.cpp                                | 4 ++--
 DDCore/src/ExpressionEvaluator.cpp                       | 2 +-
 DDCore/src/FieldTypes.cpp                                | 2 +-
 DDCore/src/Fields.cpp                                    | 2 +-
 DDCore/src/GeoHandler.cpp                                | 2 +-
 DDCore/src/GeometryTreeDump.cpp                          | 2 +-
 DDCore/src/GeometryTreeDump.h                            | 2 +-
 DDCore/src/Handle.cpp                                    | 2 +-
 DDCore/src/IDDescriptor.cpp                              | 2 +-
 DDCore/src/InstanceCount.cpp                             | 4 ++--
 DDCore/src/LCDDData.cpp                                  | 4 ++--
 DDCore/src/LCDDHelper.cpp                                | 4 ++--
 DDCore/src/LCDDImp.cpp                                   | 2 +-
 DDCore/src/LCDDImp.h                                     | 2 +-
 DDCore/src/LCDDLoad.cpp                                  | 4 ++--
 DDCore/src/MatrixHelpers.cpp                             | 4 ++--
 DDCore/src/NamedObject.cpp                               | 4 ++--
 DDCore/src/ObjectExtensions.cpp                          | 4 ++--
 DDCore/src/Objects.cpp                                   | 2 +-
 DDCore/src/ObjectsInterna.cpp                            | 4 ++--
 DDCore/src/Plugins.cpp                                   | 4 ++--
 DDCore/src/Primitives.cpp                                | 4 ++--
 DDCore/src/Printout.cpp                                  | 4 ++--
 DDCore/src/Readout.cpp                                   | 2 +-
 DDCore/src/Segmentations.cpp                             | 2 +-
 DDCore/src/Shapes.cpp                                    | 2 +-
 DDCore/src/SimpleGDMLWriter.cpp                          | 2 +-
 DDCore/src/SimpleGDMLWriter.h                            | 2 +-
 DDCore/src/SurfaceInstaller.cpp                          | 4 ++--
 DDCore/src/ToStream.cpp                                  | 4 ++--
 DDCore/src/VolumeManager.cpp                             | 4 ++--
 DDCore/src/VolumeManagerInterna.cpp                      | 4 ++--
 DDCore/src/Volumes.cpp                                   | 2 +-
 DDCore/src/XML/DocumentHandler.cpp                       | 2 +-
 DDCore/src/XML/Layering.cpp                              | 2 +-
 DDCore/src/XML/Utilities.cpp                             | 4 ++--
 DDCore/src/XML/XMLChildValue.cpp                         | 4 ++--
 DDCore/src/XML/XMLDetector.cpp                           | 2 +-
 DDCore/src/XML/XMLDimension.cpp                          | 4 ++--
 DDCore/src/XML/XMLElements.cpp                           | 2 +-
 DDCore/src/XML/XMLTags.cpp                               | 2 +-
 DDCore/src/parsers/Grammars.h                            | 4 ++--
 DDCore/src/parsers/GrammarsV2.h                          | 4 ++--
 DDCore/src/parsers/Parsers.icpp                          | 4 ++--
 DDCore/src/parsers/ParsersFactory.h                      | 4 ++--
 DDCore/src/parsers/ParsersObjects.cpp                    | 4 ++--
 DDCore/src/parsers/ParsersStandardList1.cpp              | 4 ++--
 DDCore/src/parsers/ParsersStandardList2.cpp              | 4 ++--
 DDCore/src/parsers/ParsersStandardList3.cpp              | 4 ++--
 DDCore/src/parsers/ParsersStandardList4.cpp              | 4 ++--
 DDCore/src/parsers/ParsersStandardListCommon.h           | 4 ++--
 DDCore/src/parsers/ParsersStandardMisc1.cpp              | 4 ++--
 DDCore/src/parsers/ParsersStandardMisc2.cpp              | 4 ++--
 DDCore/src/parsers/ParsersStandardMisc3.cpp              | 4 ++--
 DDCore/src/parsers/ParsersStandardMisc4.cpp              | 4 ++--
 DDCore/src/parsers/ParsersStandardMisc5.cpp              | 4 ++--
 DDCore/src/parsers/ParsersStandardMiscCommon.h           | 4 ++--
 DDCore/src/parsers/ParsersStandardSingle.cpp             | 4 ++--
 DDCore/src/plugins/Compact2Objects.cpp                   | 2 +-
 DDCore/src/plugins/Geant4XML.cpp                         | 2 +-
 DDCore/src/plugins/GeometryWalk.cpp                      | 4 ++--
 DDCore/src/plugins/LCDD2Output.cpp                       | 2 +-
 DDCore/src/plugins/LCDDConverter.cpp                     | 2 +-
 DDCore/src/plugins/LCDDConverter.h                       | 2 +-
 DDCore/src/plugins/LCDDFields.cpp                        | 2 +-
 DDCore/src/plugins/LCDDHelperTest.cpp                    | 4 ++--
 DDCore/src/plugins/PandoraConverter.cpp                  | 2 +-
 DDCore/src/plugins/PluginInvoker.cpp                     | 4 ++--
 DDCore/src/plugins/ShapePlugins.cpp                      | 4 ++--
 DDCore/src/plugins/StandardPlugins.cpp                   | 2 +-
 DDCore/src/plugins/VolumeMgrTest.cpp                     | 4 ++--
 DDDetectors/CMakeLists.txt                               | 4 ++--
 DDDetectors/src/BoxSegment_geo.cpp                       | 4 ++--
 DDDetectors/src/CylindricalBarrelCalorimeter_geo.cpp     | 4 ++--
 DDDetectors/src/CylindricalEndcapCalorimeter_geo.cpp     | 4 ++--
 DDDetectors/src/DiskTracker_geo.cpp                      | 4 ++--
 DDDetectors/src/EcalBarrel_geo.cpp                       | 2 +-
 DDDetectors/src/ForwardDetector_geo.cpp                  | 4 ++--
 DDDetectors/src/LayeringExtensionPlugin.cpp              | 4 ++--
 DDDetectors/src/MultiLayerTracker_geo.cpp                | 4 ++--
 DDDetectors/src/PolyconeSupport_geo.cpp                  | 4 ++--
 DDDetectors/src/PolyhedraBarrelCalorimeter2_geo.cpp      | 4 ++--
 DDDetectors/src/PolyhedraEndcapCalorimeter2_geo.cpp      | 4 ++--
 DDDetectors/src/PolyhedraEndcapCalorimeter2_surfaces.cpp | 4 ++--
 DDDetectors/src/SiTrackerBarrel_geo.cpp                  | 4 ++--
 DDDetectors/src/SiTrackerBarrel_surfaces.cpp             | 4 ++--
 DDDetectors/src/SiTrackerEndcap2_geo.cpp                 | 4 ++--
 DDDetectors/src/SiTrackerEndcap_surfaces.cpp             | 4 ++--
 DDDetectors/src/SubdetectorAssembly_geo.cpp              | 4 ++--
 DDDetectors/src/SubdetectorExtensionPlugin.cpp           | 4 ++--
 DDDetectors/src/SurfaceExamplePlugin.cpp                 | 4 ++--
 DDDetectors/src/TubeSegment_geo.cpp                      | 4 ++--
 DDEve/CMakeLists.txt                                     | 4 ++--
 DDEve/DDEve/DDEve.C                                      | 4 ++--
 DDEve/DDEve/DDG4IO.C                                     | 4 ++--
 DDEve/include/DDEve/Annotation.h                         | 4 ++--
 DDEve/include/DDEve/Calo2DProjection.h                   | 4 ++--
 DDEve/include/DDEve/Calo3DProjection.h                   | 4 ++--
 DDEve/include/DDEve/CaloLego.h                           | 4 ++--
 DDEve/include/DDEve/ContextMenu.h                        | 4 ++--
 DDEve/include/DDEve/DD4hepMenu.h                         | 4 ++--
 DDEve/include/DDEve/DDEveEventData.h                     | 4 ++--
 DDEve/include/DDEve/DDG4EventHandler.h                   | 4 ++--
 DDEve/include/DDEve/Dictionary.h                         | 4 ++--
 DDEve/include/DDEve/Display.h                            | 4 ++--
 DDEve/include/DDEve/DisplayConfiguration.h               | 4 ++--
 DDEve/include/DDEve/ElementList.h                        | 4 ++--
 DDEve/include/DDEve/EvePgonSetProjectedContextMenu.h     | 4 ++--
 DDEve/include/DDEve/EveShapeContextMenu.h                | 4 ++--
 DDEve/include/DDEve/EveUserContextMenu.h                 | 4 ++--
 DDEve/include/DDEve/EventControl.h                       | 4 ++--
 DDEve/include/DDEve/EventHandler.h                       | 4 ++--
 DDEve/include/DDEve/Factories.h                          | 4 ++--
 DDEve/include/DDEve/FrameControl.h                       | 4 ++--
 DDEve/include/DDEve/GenericEventHandler.h                | 4 ++--
 DDEve/include/DDEve/HitActors.h                          | 4 ++--
 DDEve/include/DDEve/MultiView.h                          | 4 ++--
 DDEve/include/DDEve/ParticleActors.h                     | 4 ++--
 DDEve/include/DDEve/PopupMenu.h                          | 4 ++--
 DDEve/include/DDEve/Projection.h                         | 4 ++--
 DDEve/include/DDEve/RhoPhiProjection.h                   | 4 ++--
 DDEve/include/DDEve/RhoZProjection.h                     | 4 ++--
 DDEve/include/DDEve/Utilities.h                          | 4 ++--
 DDEve/include/DDEve/View.h                               | 4 ++--
 DDEve/include/DDEve/View3D.h                             | 4 ++--
 DDEve/include/DDEve/ViewMenu.h                           | 4 ++--
 DDEve/lcio/LCIOEventHandler.cpp                          | 4 ++--
 DDEve/lcio/LCIOEventHandler.h                            | 4 ++--
 DDEve/src/Annotation.cpp                                 | 4 ++--
 DDEve/src/Calo2DProjection.cpp                           | 4 ++--
 DDEve/src/Calo3DProjection.cpp                           | 4 ++--
 DDEve/src/CaloLego.cpp                                   | 4 ++--
 DDEve/src/ContextMenu.cpp                                | 4 ++--
 DDEve/src/DD4hepMenu.cpp                                 | 4 ++--
 DDEve/src/DDEveEventData.cpp                             | 4 ++--
 DDEve/src/DDEvePlugins.cpp                               | 4 ++--
 DDEve/src/DDG4EventHandler.cpp                           | 4 ++--
 DDEve/src/Display.cpp                                    | 4 ++--
 DDEve/src/DisplayConfiguration.cpp                       | 4 ++--
 DDEve/src/DisplayConfigurationParser.cpp                 | 4 ++--
 DDEve/src/ElementList.cpp                                | 4 ++--
 DDEve/src/EvePgonSetProjectedContextMenu.cpp             | 4 ++--
 DDEve/src/EveShapeContextMenu.cpp                        | 4 ++--
 DDEve/src/EveUserContextMenu.cpp                         | 4 ++--
 DDEve/src/EventControl.cpp                               | 4 ++--
 DDEve/src/EventHandler.cpp                               | 4 ++--
 DDEve/src/FrameControl.cpp                               | 4 ++--
 DDEve/src/GenericEventHandler.cpp                        | 4 ++--
 DDEve/src/HitActors.cpp                                  | 4 ++--
 DDEve/src/MultiView.cpp                                  | 4 ++--
 DDEve/src/ParticleActors.cpp                             | 4 ++--
 DDEve/src/PopupMenu.cpp                                  | 4 ++--
 DDEve/src/Projection.cpp                                 | 4 ++--
 DDEve/src/RhoPhiProjection.cpp                           | 4 ++--
 DDEve/src/RhoZProjection.cpp                             | 4 ++--
 DDEve/src/Utilities.cpp                                  | 4 ++--
 DDEve/src/View.cpp                                       | 4 ++--
 DDEve/src/View3D.cpp                                     | 4 ++--
 DDEve/src/ViewMenu.cpp                                   | 4 ++--
 DDG4/CMakeLists.txt                                      | 4 ++--
 DDG4/g4FromXML.cpp                                       | 4 ++--
 DDG4/g4gdmlDisplay.cpp                                   | 4 ++--
 DDG4/include/DDG4/ComponentProperties.h                  | 4 ++--
 DDG4/include/DDG4/ComponentProperties_inl.h              | 4 ++--
 DDG4/include/DDG4/ComponentUtils.h                       | 4 ++--
 DDG4/include/DDG4/DDG4Dict.h                             | 4 ++--
 DDG4/include/DDG4/Defs.h                                 | 2 +-
 DDG4/include/DDG4/Factories.h                            | 2 +-
 DDG4/include/DDG4/Geant4Action.h                         | 4 ++--
 DDG4/include/DDG4/Geant4ActionPhase.h                    | 4 ++--
 DDG4/include/DDG4/Geant4AssemblyVolume.h                 | 4 ++--
 DDG4/include/DDG4/Geant4Call.h                           | 4 ++--
 DDG4/include/DDG4/Geant4Callback.h                       | 4 ++--
 DDG4/include/DDG4/Geant4Config.h                         | 4 ++--
 DDG4/include/DDG4/Geant4Context.h                        | 4 ++--
 DDG4/include/DDG4/Geant4Converter.h                      | 2 +-
 DDG4/include/DDG4/Geant4Data.h                           | 4 ++--
 DDG4/include/DDG4/Geant4DataConversion.h                 | 4 ++--
 DDG4/include/DDG4/Geant4DataDump.h                       | 4 ++--
 DDG4/include/DDG4/Geant4DetectorConstruction.h           | 2 +-
 DDG4/include/DDG4/Geant4EventAction.h                    | 4 ++--
 DDG4/include/DDG4/Geant4Field.h                          | 2 +-
 DDG4/include/DDG4/Geant4GDMLDetector.h                   | 4 ++--
 DDG4/include/DDG4/Geant4GeneratorAction.h                | 4 ++--
 DDG4/include/DDG4/Geant4GeneratorActionInit.h            | 4 ++--
 DDG4/include/DDG4/Geant4GeometryInfo.h                   | 4 ++--
 DDG4/include/DDG4/Geant4Handle.h                         | 4 ++--
 DDG4/include/DDG4/Geant4HierarchyDump.h                  | 4 ++--
 DDG4/include/DDG4/Geant4HitCollection.h                  | 4 ++--
 DDG4/include/DDG4/Geant4Hits.h                           | 2 +-
 DDG4/include/DDG4/Geant4InputAction.h                    | 4 ++--
 DDG4/include/DDG4/Geant4InputHandling.h                  | 4 ++--
 DDG4/include/DDG4/Geant4InteractionMerger.h              | 4 ++--
 DDG4/include/DDG4/Geant4InteractionVertexBoost.h         | 4 ++--
 DDG4/include/DDG4/Geant4InteractionVertexSmear.h         | 4 ++--
 DDG4/include/DDG4/Geant4IsotropeGenerator.h              | 4 ++--
 DDG4/include/DDG4/Geant4Kernel.h                         | 4 ++--
 DDG4/include/DDG4/Geant4Mapping.h                        | 4 ++--
 DDG4/include/DDG4/Geant4MonteCarloTruth.h                | 4 ++--
 DDG4/include/DDG4/Geant4Output2ROOT.h                    | 4 ++--
 DDG4/include/DDG4/Geant4OutputAction.h                   | 4 ++--
 DDG4/include/DDG4/Geant4Particle.h                       | 4 ++--
 DDG4/include/DDG4/Geant4ParticleGenerator.h              | 4 ++--
 DDG4/include/DDG4/Geant4ParticleGun.h                    | 4 ++--
 DDG4/include/DDG4/Geant4ParticleHandler.h                | 4 ++--
 DDG4/include/DDG4/Geant4ParticlePrint.h                  | 4 ++--
 DDG4/include/DDG4/Geant4PhysicsList.h                    | 4 ++--
 DDG4/include/DDG4/Geant4Primary.h                        | 4 ++--
 DDG4/include/DDG4/Geant4PrimaryHandler.h                 | 4 ++--
 DDG4/include/DDG4/Geant4Primitives.h                     | 4 ++--
 DDG4/include/DDG4/Geant4Random.h                         | 4 ++--
 DDG4/include/DDG4/Geant4RunAction.h                      | 4 ++--
 DDG4/include/DDG4/Geant4SensDetAction.h                  | 4 ++--
 DDG4/include/DDG4/Geant4SensDetAction.inl                | 4 ++--
 DDG4/include/DDG4/Geant4SensitiveDetector.h              | 2 +-
 DDG4/include/DDG4/Geant4SensitiveDetector_inline.h       | 2 +-
 DDG4/include/DDG4/Geant4StackingAction.h                 | 4 ++--
 DDG4/include/DDG4/Geant4StepHandler.h                    | 2 +-
 DDG4/include/DDG4/Geant4SteppingAction.h                 | 4 ++--
 DDG4/include/DDG4/Geant4TestActions.h                    | 4 ++--
 DDG4/include/DDG4/Geant4TouchableHandler.h               | 4 ++--
 DDG4/include/DDG4/Geant4TrackHandler.h                   | 4 ++--
 DDG4/include/DDG4/Geant4TrackInformation.h               | 4 ++--
 DDG4/include/DDG4/Geant4TrackingAction.h                 | 4 ++--
 DDG4/include/DDG4/Geant4TrackingPostAction.h             | 4 ++--
 DDG4/include/DDG4/Geant4TrackingPreAction.h              | 4 ++--
 DDG4/include/DDG4/Geant4UIManager.h                      | 4 ++--
 DDG4/include/DDG4/Geant4UIMessenger.h                    | 4 ++--
 DDG4/include/DDG4/Geant4UserParticleHandler.h            | 4 ++--
 DDG4/include/DDG4/Geant4UserPhysicsList.h                | 4 ++--
 DDG4/include/DDG4/Geant4Vertex.h                         | 4 ++--
 DDG4/include/DDG4/Geant4VolumeManager.h                  | 4 ++--
 DDG4/include/DDG4/IoStreams.h                            | 4 ++--
 DDG4/lcio/Geant4Output2LCIO.cpp                          | 8 ++++----
 DDG4/lcio/LCIOConversions.cpp                            | 4 ++--
 DDG4/lcio/LCIOEventReader.cpp                            | 4 ++--
 DDG4/lcio/LCIOEventReader.h                              | 4 ++--
 DDG4/lcio/LCIOFileReader.cpp                             | 4 ++--
 DDG4/lcio/LCIOSDTestActions.cpp                          | 4 ++--
 DDG4/lcio/LCIOStdHepReader.cpp                           | 8 ++++----
 DDG4/legacy/Geant4CalorimeterSD.cpp                      | 4 ++--
 DDG4/legacy/Geant4TrackerCombineSD.cpp                   | 4 ++--
 DDG4/legacy/Geant4TrackerSD.cpp                          | 4 ++--
 DDG4/plugins/Geant4.10.PhysicsConstructors.h             | 4 ++--
 DDG4/plugins/Geant4.9.PhysicsConstructors.h              | 4 ++--
 DDG4/plugins/Geant4EscapeCounter.cpp                     | 4 ++--
 DDG4/plugins/Geant4EventReaderHepEvt.cpp                 | 4 ++--
 DDG4/plugins/Geant4EventReaderHepMC.cpp                  | 4 ++--
 DDG4/plugins/Geant4Factories.cpp                         | 4 ++--
 DDG4/plugins/Geant4FieldTrackingSetup.cpp                | 8 ++++----
 DDG4/plugins/Geant4HitExtractor.cpp                      | 4 ++--
 DDG4/plugins/Geant4MaterialScanner.cpp                   | 4 ++--
 DDG4/plugins/Geant4Particles.cpp                         | 4 ++--
 DDG4/plugins/Geant4PhysicsConstructors.cpp               | 4 ++--
 DDG4/plugins/Geant4PhysicsLists.cpp                      | 4 ++--
 DDG4/plugins/Geant4Processes.cpp                         | 4 ++--
 DDG4/plugins/Geant4SDActions.cpp                         | 4 ++--
 DDG4/plugins/Geant4SensDet.cpp                           | 4 ++--
 DDG4/plugins/Geant4SensDetFilters.cpp                    | 4 ++--
 DDG4/plugins/Geant4Steppers.cpp                          | 4 ++--
 DDG4/plugins/Geant4TCUserParticleHandler.cpp             | 4 ++--
 DDG4/plugins/Geant4XMLSetup.cpp                          | 4 ++--
 DDG4/python/DD4hep.py                                    | 4 ++--
 DDG4/python/DDG4.py                                      | 4 ++--
 DDG4/python/DDG4Dict.C                                   | 4 ++--
 DDG4/python/checkGeometry.py                             | 4 ++--
 DDG4/python/checkOverlaps.py                             | 4 ++--
 DDG4/scripts/dumpDDG4.C                                  | 4 ++--
 DDG4/src/ComponentProperties.cpp                         | 4 ++--
 DDG4/src/Geant4Action.cpp                                | 4 ++--
 DDG4/src/Geant4ActionPhase.cpp                           | 4 ++--
 DDG4/src/Geant4Call.cpp                                  | 4 ++--
 DDG4/src/Geant4Context.cpp                               | 4 ++--
 DDG4/src/Geant4Converter.cpp                             | 2 +-
 DDG4/src/Geant4Data.cpp                                  | 4 ++--
 DDG4/src/Geant4DataConversion.cpp                        | 4 ++--
 DDG4/src/Geant4DataDump.cpp                              | 4 ++--
 DDG4/src/Geant4DetectorConstruction.cpp                  | 2 +-
 DDG4/src/Geant4EventAction.cpp                           | 4 ++--
 DDG4/src/Geant4Exec.cpp                                  | 4 ++--
 DDG4/src/Geant4Field.cpp                                 | 2 +-
 DDG4/src/Geant4GDMLDetector.cpp                          | 4 ++--
 DDG4/src/Geant4GeneratorAction.cpp                       | 4 ++--
 DDG4/src/Geant4GeneratorActionInit.cpp                   | 4 ++--
 DDG4/src/Geant4GeometryInfo.cpp                          | 4 ++--
 DDG4/src/Geant4Handle.cpp                                | 4 ++--
 DDG4/src/Geant4HierarchyDump.cpp                         | 4 ++--
 DDG4/src/Geant4HitCollection.cpp                         | 4 ++--
 DDG4/src/Geant4Hits.cpp                                  | 2 +-
 DDG4/src/Geant4InputAction.cpp                           | 4 ++--
 DDG4/src/Geant4InputHandling.cpp                         | 4 ++--
 DDG4/src/Geant4InteractionMerger.cpp                     | 4 ++--
 DDG4/src/Geant4InteractionVertexBoost.cpp                | 4 ++--
 DDG4/src/Geant4InteractionVertexSmear.cpp                | 4 ++--
 DDG4/src/Geant4IsotropeGenerator.cpp                     | 4 ++--
 DDG4/src/Geant4Kernel.cpp                                | 4 ++--
 DDG4/src/Geant4Mapping.cpp                               | 4 ++--
 DDG4/src/Geant4MonteCarloTruth.cpp                       | 4 ++--
 DDG4/src/Geant4Output2ROOT.cpp                           | 4 ++--
 DDG4/src/Geant4OutputAction.cpp                          | 4 ++--
 DDG4/src/Geant4Particle.cpp                              | 4 ++--
 DDG4/src/Geant4ParticleGun.cpp                           | 4 ++--
 DDG4/src/Geant4ParticleHandler.cpp                       | 4 ++--
 DDG4/src/Geant4ParticlePrint.cpp                         | 4 ++--
 DDG4/src/Geant4PhysicsList.cpp                           | 4 ++--
 DDG4/src/Geant4Plugins.cpp                               | 4 ++--
 DDG4/src/Geant4Primary.cpp                               | 4 ++--
 DDG4/src/Geant4PrimaryHandler.cpp                        | 4 ++--
 DDG4/src/Geant4ROOTDump.cpp                              | 4 ++--
 DDG4/src/Geant4Random.cpp                                | 4 ++--
 DDG4/src/Geant4RunAction.cpp                             | 4 ++--
 DDG4/src/Geant4SensDetAction.cpp                         | 4 ++--
 DDG4/src/Geant4SensitiveDetector.cpp                     | 2 +-
 DDG4/src/Geant4StackingAction.cpp                        | 4 ++--
 DDG4/src/Geant4StepHandler.cpp                           | 2 +-
 DDG4/src/Geant4SteppingAction.cpp                        | 4 ++--
 DDG4/src/Geant4TestActions.cpp                           | 4 ++--
 DDG4/src/Geant4TouchableHandler.cpp                      | 4 ++--
 DDG4/src/Geant4TrackInformation.cpp                      | 4 ++--
 DDG4/src/Geant4TrackingAction.cpp                        | 4 ++--
 DDG4/src/Geant4TrackingPostAction.cpp                    | 4 ++--
 DDG4/src/Geant4TrackingPreAction.cpp                     | 4 ++--
 DDG4/src/Geant4UIManager.cpp                             | 4 ++--
 DDG4/src/Geant4UIMessenger.cpp                           | 4 ++--
 DDG4/src/Geant4UserParticleHandler.cpp                   | 4 ++--
 DDG4/src/Geant4Vertex.cpp                                | 4 ++--
 DDG4/src/Geant4VolumeManager.cpp                         | 4 ++--
 DDG4/src/IoStreams.cpp                                   | 4 ++--
 UtilityApps/CMakeLists.txt                               | 4 ++--
 UtilityApps/src/EvNavHandler.h                           | 4 ++--
 UtilityApps/src/LinkDef.h                                | 4 ++--
 UtilityApps/src/MultiView.h                              | 4 ++--
 UtilityApps/src/converter.cpp                            | 2 +-
 UtilityApps/src/display.cpp                              | 2 +-
 UtilityApps/src/dumpdetector.cpp                         | 4 ++--
 UtilityApps/src/materialScan.cpp                         | 4 ++--
 UtilityApps/src/next_event_dummy.cpp                     | 4 ++--
 UtilityApps/src/next_event_lcio.cpp                      | 4 ++--
 UtilityApps/src/plugin_runner.cpp                        | 2 +-
 UtilityApps/src/print_materials.cpp                      | 4 ++--
 UtilityApps/src/run_plugin.h                             | 2 +-
 UtilityApps/src/test_surfaces.cpp                        | 4 ++--
 UtilityApps/src/teve_display.cpp                         | 4 ++--
 446 files changed, 823 insertions(+), 823 deletions(-)

diff --git a/DDAlign/CMakeLists.txt b/DDAlign/CMakeLists.txt
index 20a3b52e3..a43b17c3e 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 d816c62ed..2f182d2a2 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 ca0f52e0e..a38ae6e97 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 d7b6db2d2..883a7acfb 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 62415d975..979e84e8f 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 61a270b92..acec73c6a 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 d0dbe35aa..85841bf2f 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 9efb03d0f..3df31fb9a 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 972b06b47..f7ec2c2f6 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 78670ff4c..c8d1df23b 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 2a5682b8c..b09e41508 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 e93d8c20c..1b01e926a 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 b7d342678..a1cf1aae9 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 db1a19edf..8b4ae91fe 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 67ff0bb35..5ba48f70a 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 4c69d95eb..39563ae8f 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 216c7df57..614f91b79 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 bb496551f..ad1f6cb05 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 2fee1c8d3..10622a217 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 6ff70d542..5de94cb55 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 343a82298..0da3cda20 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 52176ce76..17ccefc6c 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 1ee2468a2..e8267c717 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 8b922df3e..5db6649a3 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 df4f8c5c6..63a89888c 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 a7fa9e513..abb454417 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 3067ecb05..481333599 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 5628914e4..fc2e21e39 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 b42448478..6d12540ef 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 1f671f5db..c83285069 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 6a7b39e9f..e28bdccf9 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 0b6a36f61..56a96935a 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 322f910b4..7126f6a1b 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 099c7a1bf..9672d249a 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 45de0fff0..9da242660 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 5df198dbd..e09ba800c 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 2b4d01e1d..c73142adc 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 d87e962b7..4b4f38006 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 e7cd3f90e..16d867c7a 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 1a4d6aa1e..1c51f5f8a 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 9fe9b0534..6f5656a82 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 82761a173..7b4591519 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 a1e9464cb..42eb317b2 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 6b9ec9b84..5f55e5f7a 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 0439f7272..5dfd65be3 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 5a0962462..da4857215 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 4dcbd01a8..41b157832 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 7f0015e7c..467f21c25 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 1d9ef3c70..971e5bf74 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 d1b5e42b7..0930f8a78 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 970898557..0fe867739 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 7ab6a0a61..e9ff07191 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 24b1766e3..fa38cb7c4 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 ad1d2de4c..a74e834c9 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 d22916826..88aade6d1 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 efe916b97..0c86f3f72 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 f26da6727..129a7a2d3 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 22e525c07..fdf6c8a7c 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 0f24fbd05..3fa6f2e15 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 4bd2ae6ae..aae936eb0 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 6e031813b..1eb68a526 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 0ba91b162..176b88813 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 b389af524..5841e0c2d 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 3ab231628..056aad51c 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 40e07a403..6c59062cd 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 88b8a66b5..3998ee6aa 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 39e93b0cc..9553f94a9 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 612f48ca2..e02e4656a 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 cf3b8d292..b88459609 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 63743a4c1..3c771c7cb 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 a63be26f5..4ed5fe487 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 1975f13c2..6fdad02df 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 c8b451275..7fc707c8f 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 e7aeb7204..1a2746e5c 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 41bf3fed4..3e273683b 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 9a77cc2b3..169a55c27 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 a2ed62884..3a7cdcf6e 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 e8e8f826d..5484be697 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 ab9e10016..6ed673c06 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 119e7f1b0..e35cc3c00 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 ac1dd7f7d..a2e236e52 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 c542ddf42..f564539b8 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 1ba9231f2..7a482c32e 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 8b3a93a3b..1a3e7de5b 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 f74284f6c..d86152cc3 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 8f8c635d8..4d4dfc3a2 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 f19b1b25c..eaf605139 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 0f9869bae..25eb8a37f 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 956bb7412..2eb6fb4bc 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 5732956c6..9b75b6fb3 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 472ef8473..084d2f412 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 b9546c758..08baace76 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 fba675f2d..02ec2f3c0 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 2e6602afd..d81bfe1c7 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 f4d8a9b1d..0cce29d22 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 67b4abb95..61801abcb 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 d1082c8eb..7e6377ee7 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 f4d397e56..869a203ba 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 c07197e26..7ac14f135 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 a482524d1..25093f189 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 d8d84e8a0..5b1aeb1ed 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 af26f4062..5d64cf5d5 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 bd4012996..0a10a7f6e 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 0d51d8fc9..49fd40835 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 7b01f4469..67e3966fd 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 88199ee00..99f933bfb 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 af4858164..0b727c73a 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 43f4325bc..625614957 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 82632e295..ce5a8b578 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 d899845b0..ed1730ee2 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 8e0f1de44..33e520f55 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 f3d94641e..3d579b4de 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 97502ec4c..3fd7244b4 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 98cda856d..bc6d389f1 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 f20b9d70f..c483e8290 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 65ccc0bcc..080043b16 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 0277651fd..5dd269977 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 394781a45..af9795420 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 d222939f5..a18e04f50 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 bdaee9de3..9464ccddd 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 c57c84e5c..d6ce863fc 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 454a4e2f5..2113e9751 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 a7afec8c4..371cd97ed 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 cb6e2c6d0..05560c737 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 be08efca6..2dc267d8c 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 175e29f3c..153c188c5 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 4cd819eb0..23705c8d3 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 129c85287..99f8aa77f 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 3c97aaa30..0a7987a7b 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 e2b9aa9ff..510857621 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 a1ec405d4..75e01d6a7 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 f14f75f33..3a4bafadf 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 ab5c1738e..7f81cd68c 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 bd0a98168..5a26732a9 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 4e1d8b77f..cbb50403c 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 9c673dadb..4e954ec35 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 27de2f6bb..61882d57f 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 8659a16ff..ca2c7e873 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 b5f390af2..8902e35cb 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 e4d297ce2..e52435b67 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 ab40d3a9f..d336c3043 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 42ed25827..fbd977904 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 58c164c0a..2ff7fe7df 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 af827319e..e0427db29 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 ef8e0a8af..7aa0d12a9 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 a7fcc6c1e..75d6e6a25 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 3353b3081..c0889fd32 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 b07b464c1..b575a0085 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 6a2c02251..1c2a047be 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 381b3d6f7..48568e7b2 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 09d46c487..45c34d750 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 1e6c35905..b97a649ad 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 6df92a204..000bb5bf5 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 976daf014..f60e45272 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 15ce1db24..36258a20d 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 92960e318..186ec615b 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 05dd2f01e..e3d472dea 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 610206a74..a9b4b4e78 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 cbc8b0ef1..8dc9a6659 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 71ce7555a..4eeb28d4a 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 ccd35b8c0..2a494b437 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 7006ae6b5..34a0f57e1 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 aa3b01fee..2060098ce 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 de5b3097a..4f54a17df 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 9e18f8076..a691c6bac 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 f802bb3d7..a7eea5d65 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 f115208d0..c56f08be3 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 291dad36c..dcb135780 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 b6af50269..5d13f14b2 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 fe11589f5..3250b570f 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 2f702ca7d..7fee06a58 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 c3c0a7265..bd0a6b77b 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 d5392d9f8..8e471de9b 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 05328174f..fec5457c3 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 d156d1dc8..dfe21b4a5 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 78dad4e24..1024b4c3f 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 2f89637fb..e865de693 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 e6b9b23ec..6fddd3302 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 6dbe6aed4..7a093ae2b 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 cc7c8c1f5..86dc9ad29 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 c1ba5162a..79937c611 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 23aa6f3ae..68d0aaf04 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 726ed1603..708b9f0fe 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 0e09b8fb9..cbb0a35f0 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 1a3c69a0d..ff2197599 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 814a6e4e4..94a797ab9 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 ff10f0518..50d1dc8e6 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 3dd201e26..856d15f1a 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 59d599aaa..af7baccc8 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 b393147fe..5c64732aa 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 54dab20f1..39b19519c 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 594dd7e85..1054b1617 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 316c32d40..f3dfbc41f 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 45561c5f1..bd000a5d4 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 3bba3b0ab..9f0caa4fa 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 dc6e60a92..ce283e132 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 5a047274f..cfdd6d845 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 e5b82293f..de8904266 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 9673b1fb5..b1fd8de74 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 1ab748d2a..c01977410 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 90aae36e1..3cbc40a5a 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 38102de04..cd56b2526 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 69f3871f0..da7dbb896 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 311b7e95d..b5c527bd9 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 5abb27fcb..55691f4ff 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 a877137fc..07b0f2973 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 d5686f131..e46a2dd4a 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 1ba1bcabe..50ef91579 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 07e55d0e0..408962fbb 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 32db5dab2..a9b694ba6 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 6724e5d03..b5ad27802 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 dc4c929ff..b25960e17 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 2a6f863b9..132b84e25 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 e39df0b84..3d44d26e1 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 d1153b644..a8d42ed78 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 9aac80506..be53a7923 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 c3015451b..ec9a3d656 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 a50344923..0bc375422 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 78f7d7790..9c78ad1c9 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 f1b01d06f..61db13f6d 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 ab88bceb8..3f0e2feb3 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 8a0e9f641..5f4b49af4 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 5dcb7057f..d599e8032 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 5322443ca..a10b89452 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 7400f9d07..bfd193dfb 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 70cd338eb..a09f7e15b 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 56c8e04dc..96985e8a5 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 4814e5e0e..ae1d38f9e 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 707540c37..b7d750088 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 bfbb14c66..2554915c4 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 f98ae2f81..010cc17e1 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 244dee060..2cc57d8f2 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 daeb73897..421743a87 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 3f271c52a..427cf387f 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 d9055d661..17c6c7305 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 8f2f4e318..69834e647 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 c140b1061..8701f0af1 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 37e1f46ea..45ab9044d 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 17af9eca4..05c83a4ac 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 d138f7e8e..61ac94c63 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 bfb3ffb01..64166395c 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 3e0213233..59c895a4c 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 b7a6593ee..b6ad1f865 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 c4b335904..c422debca 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 17c12db25..b31e4e087 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 51606c53e..132cdb257 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 a78ade7e4..8c12dade9 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 f79f8fbd3..82d754e34 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 aa350afb1..daeeb55ea 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 6437c3297..cb17a6d47 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 45d701ea1..11d6cccf5 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 b02503cb7..094c8bd3a 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 aa3e19d8d..d26849b2d 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 53c29300b..a9a78efee 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 0480143ee..4cb799dbb 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 068a011b7..4a8c78ea9 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 e65d2aaba..6aabed3bb 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 2c8b70e38..c7d293609 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 170cb79c2..ffa5d927b 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 1a15f07a5..52bfef978 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 163b3c99d..a362c42ad 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 5c34fcb59..e54a7ad11 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 ba6ea7ef6..c91e1cf24 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 674cf4d49..a4e1bc147 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 86fee6018..05f18cd44 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 5a4bd9c15..50ed4bff6 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 0027fd1e3..11453bba7 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 c99d6f862..9d5f47a86 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 7c24ee584..4644f5c5c 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 0e29784dc..cb845ce52 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 81c8b2d34..a8b7bb138 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 e571c37c1..1b9433899 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 b4f2de603..55788f302 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 324b3a112..8fefc0733 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 5869767c1..9d7f7778b 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 d5f6b208a..d04b60a4d 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 96c82be1b..f68f6d733 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 5dc9ca381..67a013848 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 4b96fa63b..06c261ee2 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 cc7ee3378..b6abcd2a2 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 7d492cb72..0f6948e14 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 65c9d1442..1e14dc8a4 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 32dbab73f..8e52a7e69 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 c816930a3..66554db49 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 33eff2890..ebced70ee 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 16b23df4e..f6c4b0b59 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 14e597b70..daa7ca818 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 265f102c1..1ace9c856 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 febae86b4..e9f11474f 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 d682ac984..b2787f389 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 ee3d891b6..924924b1e 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 4f6a28da2..6f4e21486 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 c3a7844c4..556a0e7b0 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 32eda4baf..ce3a50437 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 c94db3aa5..4dc807700 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 33bd53c0b..1dc691390 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 b83b77840..59a6f7a19 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 301cedb81..26665db0c 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 9b39ec88e..604c247ed 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 544dd6ca2..ff4ad7f32 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 16ce142b8..de4e3cd75 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 0fde37435..4037a2615 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 d0f0c6234..84a0d1710 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 c05f1d864..b7e26cf70 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 7e3a0982e..cf92e2ae4 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 9c5f56aef..5331f5c15 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 d804f5282..bbd8dfc6b 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 bd9b6029e..8ef5ee4ed 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 7b75e3059..2df4ba501 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 4e6f11905..d2cc4de66 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 b90a5b0dd..73c4fb6a2 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 c433632f7..3066fbf5f 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 26627eb0e..501aee00c 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 248145ed4..ca67a6312 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 307d5c3c5..210890b46 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 8638585c0..2e77fe9e2 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 148494b29..74a2935b9 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 ef9fcce75..c80ee4743 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 0dc5cbb33..516f174e8 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 779adcd8c..70da879ca 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 204034f77..40b6e080b 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 b2d7eb985..f3f239a2f 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 38074298e..3b9a16e18 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 628694e3e..9f687221f 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 176afa8d4..d64088528 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 f4bfadcae..0ca826ba0 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 0404911ef..3fd9666ac 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 54e730ef6..f33d23837 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 d4b67fdf6..e18a672d5 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 f0ff13392..0566660de 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 b752df17c..a94539798 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 4cff239bc..a22e91321 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 ef4c8c844..96f02e02b 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 7f53b3ce5..fd6215175 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 9171db788..e85ff0c01 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 18837de3d..fd0ee0860 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 7591d81e1..8fa36913d 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 eb0130b65..ff59579c5 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 268611f9b..7d5da86a4 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 289d80d45..df3b6cd4c 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 7b60b49b6..91a43159c 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 087917442..e8ae0139a 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 43f1da530..55242a885 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 7658e5576..bfa928cfb 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 a8d22b584..ed7ecd3da 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 242016f2a..c5a8d0941 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 94ccc8793..e705b944f 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 f445df1d6..94b0be6bc 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 5c544e9ee..b5037601e 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 207bfe4ec..68f7f6b8d 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 a083c6bb1..a03824901 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 9566ca6cf..1de6cefca 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 8fd4919af..9a67364ad 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 4e782308d..3e24b2f21 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 cf6631d13..d535deffb 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 cfe550cd9..a5189606a 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 ef94a6787..f55720047 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 fb72b0b7b..d43849e42 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 edcae19d3..2706c6199 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 64f32772e..aa4488c2b 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 0ec48a4af..262477e08 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 0f1d65245..4f155b4e1 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 e6348ff23..c2f80ec9b 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 4a52df435..2cae3bb6f 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 336a2ddde..99e0b8837 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 b393d3d79..d41a9cfe7 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 132b31629..008ef63c6 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 73a1801e6..71cd90c9b 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 ba44a7ab2..1e857492b 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 0e1d1ac11..7f41ed02d 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 a7d62efdb..d8e56164b 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 fa0f179cb..d13f9aeee 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 2bb022489..e5d96f628 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 7698750c8..da60e9f24 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 223914aa5..ac3f57d7e 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 25e14ef15..b0add8c41 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 b45e594c1..7e6b0cdec 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 f68f34b82..8e59a0141 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 347a14c89..684f7752e 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 14fc7e398..5378eeab9 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 85b9797ce..bd5bbea5f 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 e3109b844..0394f343c 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 b268e6588..8f068d499 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 68007569b..3033736d4 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 c2dcff4cc..aa045fbaf 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 b8cb71e46..593d352c3 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 d701044c2..cf94c5195 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 aa13b37c7..1a1ac0cd9 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 b450fe143..a8e1ce298 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 757c2b9f8..fbe4cbd9e 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 74fa0e45e..3ff42e016 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 f280f4a52..86a96f1ec 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 1564bde62..0f8aadfd1 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 11444b9bb..b14926080 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 600a39673..1fd4dfb85 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 326f442b5..2af167fbd 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 0b2e49153..3e87684e1 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 625b3cf58..c08c372c3 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 cf470b70e..d583e7219 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 3c5bd005c..cb71c8324 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 f8862cbc0..5e1d7c2b6 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 9c77f0152..1d409303f 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 9fa61e018..97e2dc113 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 5171ae0d6..d7567c266 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 ccda0a356..20df50325 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 c9b1b3e9d..d122868d3 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 48e830cac..caf6e6184 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 0803c9d27..ec1937816 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 0f505f4f7..4af274e56 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 80a8ac633..72d427270 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 bf22db1cc..095f4d9e8 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 ba857780c..e997b2dea 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 aa587edf6..e6b94c5a8 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 b8e221bca..c44b229ae 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 32aa63a9c..88240c7fc 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 e06536f9c..bbf4e3042 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 3f9211ed0..b00a6589d 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 6567894f8..c5886dcbf 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 574db51d2..ba1339d0b 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 6a1720d2a..e41edc809 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 a1489e51d..656c1d1dd 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 525085b81..450daeb34 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 b8958b7f2..556652771 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 cba85e964..5e4552061 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 f676f9458..fcce3efbb 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 716db5c7f..b4e5b2fe9 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 ee5366f59..c4ed5c3c5 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 2d25d0609..454f76a68 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 f0ab89425..8f96088e0 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 6a8dfc1af..0bdaf5ab6 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 f4bd2fc5b..04d61a5c8 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 d85fd6bff..de5c2be50 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 939ebf19b..43bcfd50e 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 ed84a61c2..3a576a189 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 fea42ec46..f2f3b5404 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 f5ce9c11d..9b28e4790 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 464c6241f..9fe8dff95 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 d25d22b11..8180b018c 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 3e214e0cf..006b32d59 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 8193eed5e..01f142037 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 6fd5d2444..3e114ef20 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 63647ed11..29a864873 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 9e950d29c..e834f1c82 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 2a6c3b208..994e45db9 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 39c30b5b8..9c1a2a669 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 4ac90e666..dc492eefd 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.
-- 
GitLab