From d14e8047af4185974a1060becb1cabd70b734b9c Mon Sep 17 00:00:00 2001
From: Paul Gessinger <hello@paulgessinger.com>
Date: Tue, 22 May 2018 18:57:27 +0200
Subject: [PATCH] =?UTF-8?q?reduce=20number=20of=20occurrences=20of=20?=
 =?UTF-8?q?=E2=80=9CACTS=E2=80=9D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 AUTHORS                                       |  2 +-
 CI/apply_clang_format                         |  2 +-
 CI/check_license                              |  6 +-
 CI/check_license.py                           | 10 +--
 CI/check_license_local                        |  4 +-
 CI/deploy_tag                                 | 12 +--
 CI/env_info.sh                                |  4 +-
 CI/perform_code_analysis                      |  2 +-
 CI/test_coverage                              |  6 +-
 CMakeLists.txt                                |  2 +-
 CONTRIBUTING.md                               | 76 +++++++++----------
 CTestConfig.cmake                             |  4 +-
 Core/ActsVersion.hpp.in                       |  6 +-
 .../Acts/Detector/DetachedTrackingVolume.hpp  |  6 +-
 .../Acts/Detector/DetectorElementBase.hpp     |  6 +-
 .../Acts/Detector/GlueVolumesDescriptor.hpp   |  6 +-
 .../Acts/Detector/TrackingGeometry.hpp        |  6 +-
 Core/include/Acts/Detector/TrackingVolume.hpp |  6 +-
 .../Digitization/CartesianSegmentation.hpp    |  4 +-
 .../Acts/Digitization/Clusterization.hpp      |  4 +-
 .../Acts/Digitization/DigitizationCell.hpp    |  4 +-
 .../Acts/Digitization/DigitizationModule.hpp  |  4 +-
 .../Acts/Digitization/PlanarModuleCluster.hpp |  4 +-
 .../Acts/Digitization/PlanarModuleStepper.hpp |  4 +-
 .../Acts/Digitization/PolarSegmentation.hpp   |  4 +-
 .../Acts/Digitization/Segmentation.hpp        |  4 +-
 Core/include/Acts/EventData/ChargePolicy.hpp  |  4 +-
 Core/include/Acts/EventData/Measurement.hpp   |  4 +-
 .../Acts/EventData/NeutralParameters.hpp      |  4 +-
 Core/include/Acts/EventData/ParameterSet.hpp  |  6 +-
 .../Acts/EventData/ParticleDefinitions.hpp    |  6 +-
 .../EventData/SingleBoundTrackParameters.hpp  |  4 +-
 .../SingleCurvilinearTrackParameters.hpp      |  4 +-
 .../Acts/EventData/SingleTrackParameters.hpp  |  4 +-
 .../Acts/EventData/TrackParameters.hpp        |  4 +-
 .../Acts/EventData/TrackParametersBase.hpp    |  6 +-
 .../Acts/EventData/TransportJacobian.hpp      |  6 +-
 .../detail/coordinate_transformations.hpp     |  6 +-
 .../detail/fittable_type_generator.hpp        |  6 +-
 .../EventData/detail/full_parameter_set.hpp   |  6 +-
 .../detail/initialize_parameter_set.hpp       |  4 +-
 .../detail/make_projection_matrix.hpp         |  6 +-
 .../EventData/detail/residual_calculator.hpp  |  6 +-
 .../Acts/EventData/detail/value_corrector.hpp |  6 +-
 Core/include/Acts/Fitter/KalmanFitter.hpp     |  4 +-
 Core/include/Acts/Fitter/KalmanUpdator.hpp    |  4 +-
 Core/include/Acts/Layers/ConeLayer.hpp        |  6 +-
 Core/include/Acts/Layers/CylinderLayer.hpp    |  6 +-
 Core/include/Acts/Layers/DiscLayer.hpp        |  6 +-
 .../Acts/Layers/GenericApproachDescriptor.hpp |  6 +-
 Core/include/Acts/Layers/Layer.hpp            |  6 +-
 Core/include/Acts/Layers/NavigationLayer.hpp  |  6 +-
 Core/include/Acts/Layers/PlaneLayer.hpp       |  6 +-
 Core/include/Acts/Layers/ProtoLayer.hpp       |  4 +-
 Core/include/Acts/Layers/detail/Layer.ipp     |  4 +-
 .../Acts/MagneticField/ConstantBField.hpp     |  4 +-
 .../MagneticField/InterpolatedBFieldMap.hpp   |  4 +-
 .../Acts/MagneticField/SharedBFieldMap.hpp    |  4 +-
 .../MagneticField/concept/AnyFieldLookup.hpp  |  4 +-
 .../Acts/Material/BinnedSurfaceMaterial.hpp   |  6 +-
 .../Material/HomogeneousSurfaceMaterial.hpp   |  6 +-
 Core/include/Acts/Material/Material.hpp       |  6 +-
 .../Acts/Material/MaterialProperties.hpp      |  6 +-
 .../include/Acts/Material/SurfaceMaterial.hpp |  6 +-
 .../Acts/Material/SurfaceMaterialProxy.hpp    |  6 +-
 Core/include/Acts/Propagator/AbortList.hpp    |  4 +-
 Core/include/Acts/Propagator/ActionList.hpp   |  4 +-
 Core/include/Acts/Propagator/EigenStepper.hpp |  4 +-
 Core/include/Acts/Propagator/Propagator.hpp   |  4 +-
 .../Acts/Propagator/detail/Extendable.hpp     |  4 +-
 .../abort_condition_signature_check.hpp       |  4 +-
 .../detail/abort_list_implementation.hpp      |  4 +-
 .../detail/action_list_implementation.hpp     |  4 +-
 .../detail/action_signature_check.hpp         |  4 +-
 .../detail/condition_uses_result_type.hpp     |  4 +-
 .../detail/standard_abort_conditions.hpp      |  4 +-
 .../include/Acts/Seeding/BarrelSeedFinder.hpp |  4 +-
 Core/include/Acts/Seeding/SpacePoint.hpp      |  4 +-
 Core/include/Acts/Seeding/TrackSeed.hpp       |  4 +-
 .../Acts/Seeding/detail/cyclic_range.hpp      |  4 +-
 Core/include/Acts/Seeding/detail/geometry.hpp |  4 +-
 Core/include/Acts/Surfaces/BoundaryCheck.hpp  |  6 +-
 Core/include/Acts/Surfaces/ConeBounds.hpp     |  6 +-
 Core/include/Acts/Surfaces/ConeSurface.hpp    |  6 +-
 Core/include/Acts/Surfaces/CylinderBounds.hpp |  6 +-
 .../include/Acts/Surfaces/CylinderSurface.hpp |  6 +-
 Core/include/Acts/Surfaces/DiamondBounds.hpp  |  6 +-
 Core/include/Acts/Surfaces/DiscBounds.hpp     |  6 +-
 Core/include/Acts/Surfaces/DiscSurface.hpp    |  6 +-
 .../Acts/Surfaces/DiscTrapezoidalBounds.hpp   |  6 +-
 Core/include/Acts/Surfaces/EllipseBounds.hpp  |  6 +-
 Core/include/Acts/Surfaces/InfiniteBounds.hpp |  6 +-
 Core/include/Acts/Surfaces/LineBounds.hpp     |  6 +-
 Core/include/Acts/Surfaces/LineSurface.hpp    |  6 +-
 Core/include/Acts/Surfaces/PerigeeSurface.hpp |  6 +-
 Core/include/Acts/Surfaces/PlanarBounds.hpp   |  6 +-
 Core/include/Acts/Surfaces/PlaneSurface.hpp   |  6 +-
 Core/include/Acts/Surfaces/RadialBounds.hpp   |  4 +-
 .../include/Acts/Surfaces/RectangleBounds.hpp |  6 +-
 Core/include/Acts/Surfaces/StrawSurface.hpp   |  6 +-
 Core/include/Acts/Surfaces/Surface.hpp        |  8 +-
 Core/include/Acts/Surfaces/SurfaceArray.hpp   |  4 +-
 Core/include/Acts/Surfaces/SurfaceBounds.hpp  |  6 +-
 .../include/Acts/Surfaces/TrapezoidBounds.hpp |  6 +-
 Core/include/Acts/Surfaces/TriangleBounds.hpp |  6 +-
 .../Acts/Tools/CylinderVolumeBuilder.hpp      |  6 +-
 .../Acts/Tools/CylinderVolumeHelper.hpp       |  6 +-
 .../include/Acts/Tools/ILayerArrayCreator.hpp |  6 +-
 Core/include/Acts/Tools/ILayerBuilder.hpp     |  6 +-
 .../Acts/Tools/ITrackingGeometryBuilder.hpp   |  6 +-
 .../Tools/ITrackingVolumeArrayCreator.hpp     |  6 +-
 .../Acts/Tools/ITrackingVolumeBuilder.hpp     |  6 +-
 .../Acts/Tools/ITrackingVolumeHelper.hpp      |  6 +-
 Core/include/Acts/Tools/LayerArrayCreator.hpp |  6 +-
 Core/include/Acts/Tools/LayerCreator.hpp      |  6 +-
 .../Acts/Tools/PassiveLayerBuilder.hpp        |  6 +-
 .../Acts/Tools/SurfaceArrayCreator.hpp        |  6 +-
 .../Acts/Tools/TrackingGeometryBuilder.hpp    |  6 +-
 .../Acts/Tools/TrackingVolumeArrayCreator.hpp |  6 +-
 .../Acts/Utilities/ApproachDescriptor.hpp     |  6 +-
 .../include/Acts/Utilities/BFieldMapUtils.hpp |  4 +-
 Core/include/Acts/Utilities/BinUtility.hpp    |  6 +-
 Core/include/Acts/Utilities/BinnedArray.hpp   |  6 +-
 Core/include/Acts/Utilities/BinnedArrayXD.hpp |  6 +-
 Core/include/Acts/Utilities/BinningData.hpp   |  6 +-
 Core/include/Acts/Utilities/BinningType.hpp   |  6 +-
 Core/include/Acts/Utilities/Definitions.hpp   |  4 +-
 Core/include/Acts/Utilities/GeometryID.hpp    |  6 +-
 .../include/Acts/Utilities/GeometryObject.hpp |  6 +-
 .../Acts/Utilities/GeometryObjectSorter.hpp   |  6 +-
 .../Acts/Utilities/GeometrySignature.hpp      |  6 +-
 .../Acts/Utilities/GeometryStatics.hpp        |  6 +-
 Core/include/Acts/Utilities/Helpers.hpp       |  8 +-
 Core/include/Acts/Utilities/IAxis.hpp         |  4 +-
 Core/include/Acts/Utilities/Identifier.hpp    |  6 +-
 .../Acts/Utilities/InstanceFactory.hpp        |  4 +-
 Core/include/Acts/Utilities/Interpolation.hpp |  4 +-
 Core/include/Acts/Utilities/Intersection.hpp  |  6 +-
 Core/include/Acts/Utilities/Logger.hpp        |  4 +-
 .../Acts/Utilities/MaterialInteraction.hpp    |  4 +-
 .../Acts/Utilities/ParameterDefinitions.hpp   |  4 +-
 .../include/Acts/Utilities/ParameterTypes.hpp |  4 +-
 Core/include/Acts/Utilities/ThrowAssert.hpp   |  4 +-
 Core/include/Acts/Utilities/Units.hpp         |  6 +-
 Core/include/Acts/Utilities/VariantData.hpp   |  4 +-
 .../include/Acts/Utilities/VariantDataFwd.hpp |  4 +-
 .../Acts/Utilities/concept/AnyGrid.hpp        |  4 +-
 Core/include/Acts/Utilities/detail/Axis.hpp   |  4 +-
 .../detail/DefaultParameterDefinitions.hpp    |  6 +-
 Core/include/Acts/Utilities/detail/Grid.hpp   |  4 +-
 .../Acts/Utilities/detail/MPL/all_of.hpp      |  4 +-
 .../Acts/Utilities/detail/MPL/any_of.hpp      |  4 +-
 .../Acts/Utilities/detail/MPL/are_sorted.hpp  |  4 +-
 .../Acts/Utilities/detail/MPL/are_within.hpp  |  4 +-
 .../Acts/Utilities/detail/MPL/at_index.hpp    |  4 +-
 .../Utilities/detail/MPL/boost_mpl_helper.hpp |  4 +-
 .../Utilities/detail/MPL/get_position.hpp     |  4 +-
 .../Utilities/detail/MPL/has_duplicates.hpp   |  4 +-
 .../Utilities/detail/MPL/is_contained.hpp     |  4 +-
 .../Utilities/detail/MPL/type_collector.hpp   |  4 +-
 .../Utilities/detail/MatrixBasePlugin.hpp     |  6 +-
 .../Acts/Utilities/detail/MatrixPlugin.hpp    |  4 +-
 .../detail/RealQuadraticEquation.hpp          |  6 +-
 .../Acts/Utilities/detail/TransformPlugin.hpp |  6 +-
 .../Acts/Utilities/detail/grid_helper.hpp     |  4 +-
 .../Utilities/detail/interpolation_impl.hpp   |  4 +-
 .../Acts/Utilities/detail/periodic.hpp        |  4 +-
 Core/include/Acts/Volumes/AbstractVolume.hpp  |  6 +-
 .../Acts/Volumes/BoundarySurfaceFace.hpp      |  6 +-
 .../include/Acts/Volumes/BoundarySurfaceT.hpp |  6 +-
 .../Acts/Volumes/CuboidVolumeBounds.hpp       |  6 +-
 .../Acts/Volumes/CylinderVolumeBounds.hpp     |  6 +-
 .../Volumes/DoubleTrapezoidVolumeBounds.hpp   |  6 +-
 .../Acts/Volumes/TrapezoidVolumeBounds.hpp    |  6 +-
 Core/include/Acts/Volumes/Volume.hpp          |  6 +-
 Core/include/Acts/Volumes/VolumeBounds.hpp    |  6 +-
 Core/src/Detector/DetachedTrackingVolume.cpp  |  6 +-
 Core/src/Detector/GlueVolumesDescriptor.cpp   |  6 +-
 Core/src/Detector/TrackingGeometry.cpp        |  6 +-
 Core/src/Detector/TrackingVolume.cpp          |  6 +-
 .../Digitization/CartesianSegmentation.cpp    |  6 +-
 Core/src/Digitization/Clusterization.cpp      |  4 +-
 Core/src/Digitization/DigitizationModule.cpp  |  6 +-
 Core/src/Digitization/PlanarModuleStepper.cpp |  6 +-
 Core/src/Digitization/PolarSegmentation.cpp   |  6 +-
 Core/src/EventData/NeutralParameters.cpp      |  4 +-
 Core/src/EventData/TrackParameters.cpp        |  4 +-
 Core/src/EventData/TrackParametersBase.cpp    |  6 +-
 Core/src/EventData/TransportJacobian.cpp      |  6 +-
 Core/src/GeometryUtils/BinUtility.cpp         |  6 +-
 Core/src/GeometryUtils/GeometryID.cpp         |  6 +-
 Core/src/Layers/ConeLayer.cpp                 |  6 +-
 Core/src/Layers/CylinderLayer.cpp             |  6 +-
 Core/src/Layers/DiscLayer.cpp                 |  6 +-
 Core/src/Layers/Layer.cpp                     |  6 +-
 Core/src/Layers/NavigationLayer.cpp           |  6 +-
 Core/src/Layers/PlaneLayer.cpp                |  6 +-
 Core/src/Layers/ProtoLayer.cpp                |  4 +-
 Core/src/Material/BinnedSurfaceMaterial.cpp   |  6 +-
 .../Material/HomogeneousSurfaceMaterial.cpp   |  6 +-
 Core/src/Material/MaterialProperties.cpp      |  6 +-
 Core/src/Material/SurfaceMaterialProxy.cpp    |  6 +-
 Core/src/Surfaces/ConeBounds.cpp              |  6 +-
 Core/src/Surfaces/ConeSurface.cpp             |  6 +-
 Core/src/Surfaces/CylinderBounds.cpp          |  6 +-
 Core/src/Surfaces/CylinderSurface.cpp         |  6 +-
 Core/src/Surfaces/DiamondBounds.cpp           |  6 +-
 Core/src/Surfaces/DiscSurface.cpp             |  6 +-
 Core/src/Surfaces/DiscTrapezoidalBounds.cpp   |  6 +-
 Core/src/Surfaces/EllipseBounds.cpp           |  6 +-
 Core/src/Surfaces/InfinitieBounds.cpp         |  4 +-
 Core/src/Surfaces/LineBounds.cpp              |  6 +-
 Core/src/Surfaces/LineSurface.cpp             |  6 +-
 Core/src/Surfaces/PerigeeSurface.cpp          |  6 +-
 Core/src/Surfaces/PlaneSurface.cpp            |  6 +-
 Core/src/Surfaces/RadialBounds.cpp            |  6 +-
 Core/src/Surfaces/RectangleBounds.cpp         |  6 +-
 Core/src/Surfaces/StrawSurface.cpp            |  6 +-
 Core/src/Surfaces/Surface.cpp                 |  6 +-
 Core/src/Surfaces/SurfaceArray.cpp            |  4 +-
 Core/src/Surfaces/TrapezoidBounds.cpp         |  6 +-
 Core/src/Surfaces/TriangleBounds.cpp          |  6 +-
 Core/src/Tools/CylinderVolumeBuilder.cpp      |  6 +-
 Core/src/Tools/CylinderVolumeHelper.cpp       |  6 +-
 Core/src/Tools/LayerArrayCreator.cpp          |  6 +-
 Core/src/Tools/LayerCreator.cpp               |  6 +-
 Core/src/Tools/PassiveLayerBuilder.cpp        |  6 +-
 Core/src/Tools/SurfaceArrayCreator.cpp        |  6 +-
 Core/src/Tools/TrackingGeometryBuilder.cpp    |  6 +-
 Core/src/Tools/TrackingVolumeArrayCreator.cpp |  6 +-
 Core/src/Utilities/BFieldMapUtils.cpp         |  4 +-
 Core/src/Utilities/Logger.cpp                 |  4 +-
 Core/src/Utilities/MaterialInteraction.cpp    |  4 +-
 Core/src/Utilities/Units.cpp                  |  4 +-
 Core/src/Volumes/AbstractVolume.cpp           |  6 +-
 Core/src/Volumes/CuboidVolumeBounds.cpp       |  6 +-
 Core/src/Volumes/CylinderVolumeBounds.cpp     |  6 +-
 .../Volumes/DoubleTrapezoidVolumeBounds.cpp   |  6 +-
 Core/src/Volumes/TrapezoidVolumeBounds.cpp    |  6 +-
 Core/src/Volumes/Volume.cpp                   |  6 +-
 Core/src/Volumes/VolumeBounds.cpp             |  6 +-
 Examples/src/CustomDefaultLogger.cpp          |  6 +-
 .../ATLSeedingIntegrationTest.cpp             |  4 +-
 IntegrationTests/PropagationTestBase.hpp      |  4 +-
 IntegrationTests/PropagationTestHelper.hpp    |  4 +-
 IntegrationTests/PropagationTests.cpp         |  4 +-
 .../PropagationTestsAtlasField.cpp            |  4 +-
 .../covariance_validation_fixture.hpp         |  4 +-
 .../Acts/Extrapolation/ExtrapolationCell.hpp  |  6 +-
 .../Extrapolation/ExtrapolationEngine.hpp     |  6 +-
 .../Extrapolation/IExtrapolationEngine.hpp    |  6 +-
 .../Extrapolation/IMaterialEffectsEngine.hpp  |  6 +-
 .../IMultipleScatteringUpdator.hpp            |  6 +-
 .../Acts/Extrapolation/INavigationEngine.hpp  |  6 +-
 .../Acts/Extrapolation/IPropagationEngine.hpp |  6 +-
 .../Extrapolation/MaterialEffectsEngine.hpp   |  6 +-
 .../Acts/Extrapolation/MaterialUpdateMode.hpp |  4 +-
 .../Acts/Extrapolation/RungeKuttaEngine.hpp   |  6 +-
 .../Acts/Extrapolation/StaticEngine.hpp       |  6 +-
 .../Extrapolation/StaticNavigationEngine.hpp  |  6 +-
 Legacy/include/Acts/Extrapolation/Wrapper.hpp |  6 +-
 .../detail/ExtrapolationCell.ipp              |  6 +-
 .../detail/ExtrapolationEngine.ipp            |  6 +-
 .../detail/ExtrapolationMacros.hpp            |  6 +-
 .../Extrapolation/detail/RungeKuttaEngine.ipp |  4 +-
 .../Extrapolation/detail/RungeKuttaUtils.hpp  |  6 +-
 .../Extrapolation/detail/StaticEngine.ipp     |  6 +-
 .../detail/StaticNavigationEngine.ipp         |  6 +-
 .../include/Acts/Propagator/AtlasStepper.hpp  |  4 +-
 Legacy/include/Acts/Seeding/ATL_Seedmaker.hpp |  6 +-
 Legacy/include/Acts/Seeding/ATL_Seedmaker.ipp |  6 +-
 Legacy/include/Acts/Seeding/InternalSeed.hpp  |  6 +-
 Legacy/include/Acts/Seeding/SPForSeed.hpp     |  6 +-
 Legacy/include/Acts/Seeding/Seed.hpp          |  6 +-
 .../src/Extrapolation/ExtrapolationCell.cpp   |  6 +-
 .../src/Extrapolation/ExtrapolationEngine.cpp |  6 +-
 .../Extrapolation/MaterialEffectsEngine.cpp   |  6 +-
 Legacy/src/Extrapolation/RungeKuttaUtils.cpp  |  6 +-
 Legacy/src/Extrapolation/StaticEngine.cpp     |  6 +-
 .../Extrapolation/StaticNavigationEngine.cpp  |  6 +-
 .../Plugins/DD4hepPlugins/ActsExtension.hpp   | 18 ++---
 .../DD4hepPlugins/ConvertDD4hepDetector.hpp   |  4 +-
 .../DD4hepPlugins/DD4hepDetElement.hpp        |  6 +-
 .../DD4hepPlugins/DD4hepLayerBuilder.hpp      | 10 +--
 .../Plugins/DD4hepPlugins/IActsExtension.hpp  | 14 ++--
 Plugins/DD4hepPlugin/src/ActsExtension.cpp    |  8 +-
 .../src/ConvertDD4hepDetector.cpp             |  6 +-
 .../src/DD4hepDetectorElement.cpp             |  4 +-
 .../DD4hepPlugin/src/DD4hepLayerBuilder.cpp   |  4 +-
 .../Geant4Plugins/Geant4DetectorElement.hpp   |  6 +-
 .../Acts/Plugins/JsonPlugin/FromJson.hpp      |  4 +-
 Plugins/JsonPlugin/src/FromJson.cpp           |  4 +-
 .../MaterialPlugins/AssignedMaterialSteps.hpp |  6 +-
 .../MaterialPlugins/MaterialMapper.hpp        | 10 +--
 .../Plugins/MaterialPlugins/MaterialStep.hpp  |  6 +-
 .../Plugins/MaterialPlugins/MaterialTrack.hpp |  6 +-
 .../MaterialPlugins/SurfaceMaterialRecord.hpp |  6 +-
 Plugins/MaterialPlugin/src/MaterialMapper.cpp |  8 +-
 Plugins/MaterialPlugin/src/MaterialStep.cpp   |  6 +-
 Plugins/MaterialPlugin/src/MaterialTrack.cpp  |  6 +-
 .../src/SurfaceMaterialRecord.cpp             |  6 +-
 .../TGeoPlugins/TGeoDetectorElement.hpp       |  6 +-
 .../Plugins/TGeoPlugins/TGeoLayerBuilder.hpp  |  6 +-
 .../TGeoPlugin/src/TGeoDetectorElement.cpp    |  4 +-
 Plugins/TGeoPlugin/src/TGeoLayerBuilder.cpp   |  4 +-
 README.md                                     | 16 ++--
 Tests/Detector/GeometryCreation.hpp           |  4 +-
 .../Detector/TrackingGeometryClosureTests.cpp |  4 +-
 Tests/Detector/TrackingGeometryGeoIDTests.cpp |  4 +-
 Tests/Digitization/ClusterizationTests.cpp    |  4 +-
 Tests/EventData/BoundParametersTests.cpp      |  4 +-
 .../EventData/CurvilinearParametersTests.cpp  |  4 +-
 Tests/EventData/MeasurementTests.cpp          |  6 +-
 Tests/EventData/ParameterSetTests.cpp         |  4 +-
 Tests/EventData/ParametersTestHelper.hpp      |  4 +-
 .../Extrapolation/ExtrapolationCellTests.cpp  |  4 +-
 Tests/Fitter/GainMatrixTests.cpp              |  4 +-
 Tests/Fitter/KalmanFilterTestUtils.hpp        |  4 +-
 Tests/Fitter/KalmanFilterTests.cpp            |  4 +-
 Tests/Json/FromJsonTests.cpp                  |  4 +-
 Tests/Layers/ConeLayerTests.cpp               |  4 +-
 Tests/Layers/CylinderLayerTests.cpp           |  4 +-
 Tests/Layers/DiscLayerTests.cpp               |  4 +-
 .../Layers/GenericApproachDescriptorTests.cpp |  4 +-
 Tests/Layers/LayerStub.hpp                    |  4 +-
 Tests/Layers/LayerTests.cpp                   |  4 +-
 Tests/Layers/NavigationLayerTests.cpp         |  4 +-
 Tests/Layers/PlaneLayerTests.cpp              |  4 +-
 Tests/Layers/ProtoLayerTests.cpp              |  4 +-
 Tests/MagneticField/ConstantBFieldTests.cpp   |  4 +-
 .../InterpolatedBFieldMapTests.cpp            |  4 +-
 Tests/Material/MaterialPropertiesTests.cpp    |  4 +-
 Tests/Material/MaterialTests.cpp              |  4 +-
 .../MaterialMapping/MaterialMappingTests.cpp  |  4 +-
 Tests/Propagator/AbortListTests.cpp           |  4 +-
 Tests/Propagator/ActionListTests.cpp          |  4 +-
 Tests/Propagator/AtlasPropagatorBenchmark.cpp |  4 +-
 Tests/Propagator/AtlasStepperBenchmark.cpp    |  4 +-
 Tests/Propagator/EigenStepperBenchmark.cpp    |  4 +-
 Tests/Propagator/ExtendableTests.cpp          |  4 +-
 Tests/Propagator/JacobianTests.cpp            |  4 +-
 Tests/Propagator/PropagatorTests.cpp          |  4 +-
 Tests/Propagator/RungeKuttaEngineTests.cpp    |  4 +-
 Tests/Seeding/SeedingTests.cpp                |  4 +-
 Tests/Seeding/SeedingTestsCommon.hpp          |  4 +-
 Tests/Seeding/SeedingToolsTests.cpp           |  4 +-
 Tests/Surfaces/BoundaryCheckBenchmark.cpp     |  4 +-
 Tests/Surfaces/BoundaryCheckTests.cpp         |  4 +-
 Tests/Surfaces/ConeBoundsTests.cpp            |  4 +-
 Tests/Surfaces/ConeSurfaceTests.cpp           |  4 +-
 Tests/Surfaces/CylinderBoundsTests.cpp        |  4 +-
 Tests/Surfaces/CylinderSurfaceTests.cpp       |  4 +-
 Tests/Surfaces/DetectorElementStub.hpp        |  6 +-
 Tests/Surfaces/DiamondBoundsTests.cpp         |  4 +-
 Tests/Surfaces/DiscSurfaceTests.cpp           |  4 +-
 Tests/Surfaces/DiscTrapezoidalBoundsTests.cpp |  4 +-
 Tests/Surfaces/EllipseBoundsTests.cpp         |  4 +-
 Tests/Surfaces/InfiniteBoundsTests.cpp        |  4 +-
 Tests/Surfaces/LineBoundsTests.cpp            |  4 +-
 Tests/Surfaces/LineSurfaceStub.hpp            |  4 +-
 Tests/Surfaces/LineSurfaceTests.cpp           |  4 +-
 Tests/Surfaces/PerigeeSurfaceTests.cpp        |  4 +-
 Tests/Surfaces/PlaneSurfaceTests.cpp          |  4 +-
 Tests/Surfaces/RadialBoundsTests.cpp          |  4 +-
 Tests/Surfaces/RectangleBoundsTests.cpp       |  4 +-
 Tests/Surfaces/StrawSurfaceTests.cpp          |  4 +-
 Tests/Surfaces/SurfaceArrayTests.cpp          |  4 +-
 Tests/Surfaces/SurfaceBoundsTests.cpp         |  4 +-
 Tests/Surfaces/SurfaceStub.hpp                |  4 +-
 Tests/Surfaces/SurfaceTests.cpp               |  4 +-
 Tests/Surfaces/TrapezoidBoundsTests.cpp       |  4 +-
 Tests/Surfaces/TriangleBoundsTests.cpp        |  4 +-
 Tests/Tools/CylinderVolumeBuilderTests.cpp    |  4 +-
 Tests/Tools/LayerCreatorTests.cpp             |  4 +-
 Tests/Tools/SurfaceArrayCreatorTests.cpp      |  4 +-
 Tests/Utilities/AxesTests.cpp                 |  4 +-
 Tests/Utilities/BFieldMapUtilsTests.cpp       |  4 +-
 Tests/Utilities/BinUtilityTests.cpp           |  4 +-
 Tests/Utilities/BinningDataTests.cpp          |  4 +-
 Tests/Utilities/GeometryIDTests.cpp           |  4 +-
 Tests/Utilities/GridTests.cpp                 |  4 +-
 Tests/Utilities/InterpolationTests.cpp        |  4 +-
 Tests/Utilities/LoggerTests.cpp               |  4 +-
 Tests/Utilities/MPLTests.cpp                  |  4 +-
 .../Utilities/RealQuadraticEquationTests.cpp  |  4 +-
 Tests/Utilities/UnitConversionTests.cpp       |  4 +-
 Tests/Volumes/CylinderVolumeBoundsTests.cpp   |  4 +-
 cmake/ActsCompilerOptions.cmake               |  4 +-
 cmake/ActsConfig.cmake.in                     | 20 ++---
 cmake/Project.xml                             | 12 +--
 doc/CMakeLists.txt                            |  2 +-
 doc/DoxygenLayout.xml                         |  2 +-
 doc/Modules.hpp                               | 40 +++++-----
 doc/doxygen.config.in                         |  6 +-
 getting_started.md                            | 46 +++++------
 setup.sh.in                                   |  4 +-
 396 files changed, 1106 insertions(+), 1104 deletions(-)

diff --git a/AUTHORS b/AUTHORS
index c9e4bfbf7..0a54c4a32 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -1,4 +1,4 @@
-Contributors to the ACTS project are (in alphabetical order):
+Contributors to the Acts project are (in alphabetical order):
 - Noemi Calace
 - Christian Gumpert
 - Julia Hrdinka
diff --git a/CI/apply_clang_format b/CI/apply_clang_format
index 43da896f7..62029d793 100755
--- a/CI/apply_clang_format
+++ b/CI/apply_clang_format
@@ -8,7 +8,7 @@ set -ex
 : ${gitlabSourceRepoName:?"'gitlabSourceRepoName' not set or empty"}
 : ${gitlabSourceBranch:?"'gitlabSourceBranch' not set or empty"}
 
-# check for ACTS
+# check for Acts
 ACTS_DIR=`readlink -f $1`
 if [ ! -d "$ACTS_DIR" ]
 then
diff --git a/CI/check_license b/CI/check_license
index 904caa759..916fd7749 100755
--- a/CI/check_license
+++ b/CI/check_license
@@ -17,7 +17,7 @@ fi
 : ${gitlabTargetRepoName:?"'gitlabTargetRepoName' not set or empty"}
 : ${gitlabMergeRequestId:?"'gitlabMergeRequestId' not set or empty"}
 
-# check for ACTS
+# check for Acts
 ACTS_DIR=`readlink -f $1`
 if [ ! -d "$ACTS_DIR" ]
 then
@@ -26,10 +26,10 @@ then
 fi
 
 # license template
-MPLv2_BEGIN="// This file is part of the ACTS project.
+MPLv2_BEGIN="// This file is part of the Acts project.
 //
 // Copyright (C) 20"
-MPLv2_END=" ACTS project team
+MPLv2_END=" Acts project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/CI/check_license.py b/CI/check_license.py
index 281e257a0..cc2adb6e6 100755
--- a/CI/check_license.py
+++ b/CI/check_license.py
@@ -70,18 +70,18 @@ def main():
 
     year = int(datetime.now().strftime("%Y"))
 
-    raw = """// This file is part of the ACTS project.
+    raw = """// This file is part of the Acts project.
 //
-// Copyright (C) {year} ACTS project team
+// Copyright (C) {year} Acts project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
 // file, You can obtain one at http://mozilla.org/MPL/2.0/."""
 
     reg = (
-        r"\A// This file is part of the ACTS project.\n"
+        r"\A// This file is part of the Acts project.\n"
         +r"//\n"
-        +r"// Copyright \(C\) (?P<year>.*) ACTS project team\n"
+        +r"// Copyright \(C\) (?P<year>.*) Acts project team\n"
         +r"//\n"
         +r"// This Source Code Form is subject to the terms of the Mozilla Public\n"
         +r"// License, v\. 2\.0\. If a copy of the MPL was not distributed with this\n"
@@ -89,7 +89,7 @@ def main():
         )
 
     ref = re.compile(reg, re.M)
-    clean_re = re.compile(r"(\(C\)) (.*) (ACTS)", re.M)
+    clean_re = re.compile(r"(\(C\)) (.*) (Acts)", re.M)
     year_re = re.compile(r"^(?P<year1>20\d{2}|(?P<year2>20\d{2})-(?P<year3>20\d{2}))$")
     extract_re = re.compile(r"(20\d{2})-?(20\d{2})?")
     
diff --git a/CI/check_license_local b/CI/check_license_local
index 970b86033..a4c0cb55a 100755
--- a/CI/check_license_local
+++ b/CI/check_license_local
@@ -15,9 +15,9 @@ if [ $# -ne 1 ]; then
 fi
 
 # license template
-MPLv2="// This file is part of the ACTS project.
+MPLv2="// This file is part of the Acts project.
 //
-// Copyright (C) 2016 ACTS project team
+// Copyright (C) 2016 Acts project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/CI/deploy_tag b/CI/deploy_tag
index 33d312bab..59282767a 100755
--- a/CI/deploy_tag
+++ b/CI/deploy_tag
@@ -22,7 +22,7 @@ fi
 # check for required environment variables
 : ${CI_COMMIT_REF_NAME:?"'CI_COMMIT_REF_NAME' not set or empty"}
 
-# check for ACTS
+# check for Acts
 ACTS_DIR=`readlink -f $1`
 if [ ! -d "$ACTS_DIR" ]
 then
@@ -38,7 +38,7 @@ then
     exit 1
 fi
 
-# get ACTS version tag
+# get Acts version tag
 VERSION=`basename $CI_COMMIT_REF_NAME`
 
 # create tarball with source and copy it to server
@@ -58,10 +58,10 @@ ssh atsjenkins@lxplus.CERN.CH "mkdir -p $ACTS_WWW_DIR/$VERSION"
 scp -r $DOC_DIR atsjenkins@lxplus.cern.ch:$ACTS_WWW_DIR/$VERSION/doc
 
 # send notification email
-ssh atsjenkins@lxplus.CERN.CH "mail -v -s 'New tag ACTS-$VERSION' -r 'atsjenkins@cern.ch' $3 <<EOF
-Dear ACTS enthusiasts,
+ssh atsjenkins@lxplus.CERN.CH "mail -v -s 'New tag Acts-$VERSION' -r 'atsjenkins@cern.ch' $3 <<EOF
+Dear Acts enthusiasts,
 
-a new tag '$VERSION' of the ACTS project has been released. You can get the source code from git using
+a new tag '$VERSION' of the Acts project has been released. You can get the source code from git using
 
 git clone https://gitlab.cern.ch/acts/acts-core.git acts
 cd acts/
@@ -76,5 +76,5 @@ Detailed documentation can be found at
 https://acts.web.cern.ch/ACTS/$VERSION/doc/index.html
 
 Cheers,
-your friendly ACTS robot
+your friendly Acts robot
 EOF"
diff --git a/CI/env_info.sh b/CI/env_info.sh
index d519e2c2d..6db886ae9 100644
--- a/CI/env_info.sh
+++ b/CI/env_info.sh
@@ -12,10 +12,10 @@ fi
 echo "$ACTS_OS $ACTS_COMPILER"
 
 if [ "$(echo $CI_RUNNER_TAGS | grep 'acts')" ]; then
-  echo "Running on ACTS CI runner: use 8 cores"
+  echo "Running on Acts CI runner: use 8 cores"
   export ACTS_NCPUS=8
 else
-  echo "NOT running on ACTS CI runner: use 2 cores"
+  echo "NOT running on Acts CI runner: use 2 cores"
   export ACTS_NCPUS=2
 fi
 
diff --git a/CI/perform_code_analysis b/CI/perform_code_analysis
index 908a93355..0a68cf412 100755
--- a/CI/perform_code_analysis
+++ b/CI/perform_code_analysis
@@ -24,7 +24,7 @@ ACTS_DIR=$1
 BUILD_DIR=$2
 OUTDIR=$3
 
-# check for ACTS
+# check for Acts
 if [ ! -d "$ACTS_DIR" ]
 then
     echo "ACTS_DIR='$ACTS_DIR' not found -> aborting"
diff --git a/CI/test_coverage b/CI/test_coverage
index e253061a9..e81d2ecc7 100755
--- a/CI/test_coverage
+++ b/CI/test_coverage
@@ -23,7 +23,7 @@ ACTS_DIR=$1
 BUILD_DIR=$2
 OUTDIR=$3
 
-# check for ACTS
+# check for Acts
 if [ ! -d "$ACTS_DIR" ]
 then
     echo "ACTS_DIR='$ACTS_DIR' not found -> aborting"
@@ -34,12 +34,12 @@ fi
 rm -rf $OUTDIR
 
 # run lcov
-lcov -c -t ACTS -o coverage.info --no-external -d $BUILD_DIR -d $ACTS_DIR
+lcov -c -t Acts -o coverage.info --no-external -d $BUILD_DIR -d $ACTS_DIR
 # remove test source files
 lcov -r coverage.info "Tests/*" > tmp.info
 mv tmp.info coverage.info
 # generate HTML output
-genhtml coverage.info -t ACTS -p /acts/Core/src/ -p /acts/Core/include/ --demangle-cpp -s --output-directory $OUTDIR > coverage.log
+genhtml coverage.info -t Acts -p /acts/Core/src/ -p /acts/Core/include/ --demangle-cpp -s --output-directory $OUTDIR > coverage.log
 
 COMMENT="test coverage result:<br />"`tail -n 3 coverage.log | head -n 1`"<br />"
 COMMENT="$COMMENT"`tail -n 2 coverage.log | head -n 1`"<br />"
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 129c39859..4d3860959 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -50,7 +50,7 @@ endif()
 
 include (GNUInstallDirs) # GNU-like installation paths, e.g. lib/, include/, ...
 include (ActsCompilerOptions) # default compile options
-include (ActsFunctions) # ACTS-specific helper functions
+include (ActsFunctions) # Acts-specific helper functions
 include (ActsComponentsHelpers) # handle components via add_..._if commands
 
 # core library and plugins
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 6da9dcd96..85d813822 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -1,6 +1,6 @@
-# Contributing to ACTS
+# Contributing to Acts
 
-Contributions to the ACTS project are very welcome and feedback on the documentation is greatly appreciated. In order to be able to contribute to the ACTS project, developers must have a valid CERN user account. Unfortunately, lightweight CERN accounts for external users do not have sufficient permissions to access certain CERN services used by the ACTS project.
+Contributions to the Acts project are very welcome and feedback on the documentation is greatly appreciated. In order to be able to contribute to the Acts project, developers must have a valid CERN user account. Unfortunately, lightweight CERN accounts for external users do not have sufficient permissions to access certain CERN services used by the Acts project.
 
 1. [Mailing lists](#mailing-lists)
 2. [Bug reports and feature requests](#bug-reports-and-feature-requests)
@@ -16,30 +16,30 @@ Contributions to the ACTS project are very welcome and feedback on the documenta
     1. [Approving a merge request](#approving-a-merge-request)
     2. [Merging a merge request](#merging-a-merge-request)
 5. [Administrator's corner](#admin-corner)
-    1. [Making a new ACTS release](#tag-release)
+    1. [Making a new Acts release](#tag-release)
 
 ## <a name="mailing-lists">Mailing lists</a>
 
-1. [acts-users@cern.ch](https://e-groups.cern.ch/e-groups/Egroup.do?egroupName=acts-users): Users of the ACTS project should subscribe to this list as it provides:
+1. [acts-users@cern.ch](https://e-groups.cern.ch/e-groups/Egroup.do?egroupName=acts-users): Users of the Acts project should subscribe to this list as it provides:
     - regular updates on the software,
-    - access to the ACTS JIRA project for bug fixes/feature requests,
+    - access to the Acts JIRA project for bug fixes/feature requests,
     - a common place for asking any kind of questions.
 1. [acts-developers@cern.ch](https://e-groups.cern.ch/e-groups/Egroup.do?egroupName=acts-developers): Developers are encouraged to also subscribe to this list as it provides you with:
-    - a developer role in the ACTS JIRA project (allows you to handle tickets),
-    - developer access to the [ACTS git repository](https://gitlab.cern.ch/acts/acts-core)
+    - a developer role in the Acts JIRA project (allows you to handle tickets),
+    - developer access to the [Acts git repository](https://gitlab.cern.ch/acts/acts-core)
     - information about developer meetings,
     - a common place for technical discussions.
 
 ## <a name="bug-reports-and-feature-requests">Bug reports and feature requests</a>
 
-If you want to report or start a feature request, please open a ticket in the [ACTS JIRA](https://its.cern.ch/jira/projects/ACTS/) (**Note:** access is restricted to members of the mailing lists mentioned above). A comprehensive explanation will help the development team to respond in a timely manner. Therefore, the following details should be mentioned:
+If you want to report or start a feature request, please open a ticket in the [Acts JIRA](https://its.cern.ch/jira/projects/ACTS/) (**Note:** access is restricted to members of the mailing lists mentioned above). A comprehensive explanation will help the development team to respond in a timely manner. Therefore, the following details should be mentioned:
 
 - bug reports
     - issue type: "Bug"
     - summary: short description of the problem
     - priority: will be set by the development team
-    - components: if known, part of ACTS affected by this bug; leave empty otherwise
-    - affects version: version of ACTS affected by this bug
+    - components: if known, part of Acts affected by this bug; leave empty otherwise
+    - affects version: version of Acts affected by this bug
     - a detailed description of the bug including a receipe on how to reproduce it and any hints which may help diagnosing the problem
 - feature requests
     - issue type: "Improvement" or "New Feature"
@@ -49,9 +49,9 @@ If you want to report or start a feature request, please open a ticket in the [A
 
 ## <a name="make-a-contribution">Make a contribution</a>
 
-The instructions below should help you getting started with development process in the ACTS project. If you have any questions, feel free to ask [acts-developers@cern](mailto:acts-developers@cern.ch) for help or guidance.
+The instructions below should help you getting started with development process in the Acts project. If you have any questions, feel free to ask [acts-developers@cern](mailto:acts-developers@cern.ch) for help or guidance.
 
-The ACTS project uses a git repository which is hosted on the CERN GitLab server. In order to be able to push your changes and to create merge requests (and thus, contribute to the development of ACTS), you must be subscribed to acts-developers@cern.ch.
+The Acts project uses a git repository which is hosted on the CERN GitLab server. In order to be able to push your changes and to create merge requests (and thus, contribute to the development of Acts), you must be subscribed to acts-developers@cern.ch.
 A general introduction to the GitLab web interface can be found [here](http://gitlab.cern.ch/help/gitlab-basics/README). Very nice tutorials as well as explanations of concepts and workflows with git can be found on [Atlassian](http://www.atlassian.com/git/). For a shorter introduction and the full git documentation have a look at the [git tutorial](http://git-scm.com/docs/gittutorial).
 
 ### <a name="preparation">Preparation</a>
@@ -83,18 +83,18 @@ git config --global pull.rebase true
 
 #### Getting a local working copy
 
-As a first step, you need to clone the ACTS repository which gives you a local, fully functional and self-contained git repository. This means you can work locally (commit changes, compare versions, inspect the history) while being offline. An internet connection is only required for *pull*ing in new updates or *push*ing your changes to the Gitlab server.
+As a first step, you need to clone the Acts repository which gives you a local, fully functional and self-contained git repository. This means you can work locally (commit changes, compare versions, inspect the history) while being offline. An internet connection is only required for *pull*ing in new updates or *push*ing your changes to the Gitlab server.
 
 ```bash
 git clone <ACTS_URL> <DESTINATION>
 ```
 
-- &lt;ACTS_URL&gt; can be found on the project page of the [ACTS git repository](https://gitlab.cern.ch/acts/acts-core). There are different URLs for different authentication methods.
+- &lt;ACTS_URL&gt; can be found on the project page of the [Acts git repository](https://gitlab.cern.ch/acts/acts-core). There are different URLs for different authentication methods.
 - &lt;DESTINATION&gt; is optional and gives the path on your local machine where the clone will be created.
 
 ### <a name="new-development">Starting a new development</a>
 
-When you start a new development, you should make sure to start from the most recent version. Therefore, you need to *fetch* the latest changes from the remote repository by running from inside the ACTS directory:
+When you start a new development, you should make sure to start from the most recent version. Therefore, you need to *fetch* the latest changes from the remote repository by running from inside the Acts directory:
 
 ```bash
 git fetch origin
@@ -114,7 +114,7 @@ Let's go through the options one by one:
 
 ### <a name="creating-a-merge-request">Creating a merge request</a>
 
-Once your development is ready for integration, you should open a merge request at the [ACTS project](https://gitlab.cern.ch/acts/acts-core) ([GitLab Help: Create a merge request](https://gitlab.cern.ch/help/gitlab-basics/add-merge-request)). The target branch should usually be _master_ for feature requests and _releas-X,Y,Z_ for bugfixes. The ACTS projects accepts only fast-foward merges which means that your branch must have been rebased on the target branch. This can be achieved by fetching upstream changes and rebasing afterwards:
+Once your development is ready for integration, you should open a merge request at the [Acts project](https://gitlab.cern.ch/acts/acts-core) ([GitLab Help: Create a merge request](https://gitlab.cern.ch/help/gitlab-basics/add-merge-request)). The target branch should usually be _master_ for feature requests and _releas-X,Y,Z_ for bugfixes. The Acts projects accepts only fast-foward merges which means that your branch must have been rebased on the target branch. This can be achieved by fetching upstream changes and rebasing afterwards:
 
 ```bash
 git fetch origin
@@ -124,19 +124,19 @@ git push -u origin <my_feature_branch>
 ```
 
 At this point you should make use of the interactive rebase procedure to clean up your commits (squash small fixes, improve commit messages etc; [Rewriting history](https://robots.thoughtbot.com/git-interactive-rebase-squash-amend-rewriting-history)).
-Merge requests are required to close a ACTS JIRA ticket. This is achieved by adding e.g. 'fixes ACTS-XYZ' to the end of the merge request description. Please note that JIRA tickets should only be referenced by merge requests and not individual commits (since strictly there should only be one JIRA ticket per merge request). Once the merge request is opened, a continous integration job is triggered which will add multiple comments to the merge request (e.g. build status, missing license statements, doxygen errors, test coverage etc). Please have a look at them and fix them by adding more commits to your branch if needed.
+Merge requests are required to close a Acts JIRA ticket. This is achieved by adding e.g. 'fixes ACTS-XYZ' to the end of the merge request description. Please note that JIRA tickets should only be referenced by merge requests and not individual commits (since strictly there should only be one JIRA ticket per merge request). Once the merge request is opened, a continous integration job is triggered which will add multiple comments to the merge request (e.g. build status, missing license statements, doxygen errors, test coverage etc). Please have a look at them and fix them by adding more commits to your branch if needed.
 Please find below a short checklist for merge requests.
 
 ### <a name="using-forks">Using forks</a>
 
 Users or groups with git experience may prefer to use their own forks of the
-ACTS project to develop and test their changes before they are integrated back
-into the main ACTS repository. We assume that you are experienced with a
+Acts project to develop and test their changes before they are integrated back
+into the main Acts repository. We assume that you are experienced with a
 fork-based workflow in git and only summarise the most important commands at the
 end of this section.
 
-As a first step, you need to create your own fork of the ACTS project. For doing
-this, please go to the [ACTS GitLab
+As a first step, you need to create your own fork of the Acts project. For doing
+this, please go to the [Acts GitLab
 page](https://gitlab.cern.ch/acts/acts-core), click on the fork
 button, and follow the instructions ([GitLab Help "How to fork a
 project"](https://gitlab.cern.ch/help/gitlab-basics/fork-project)). In a second
@@ -148,12 +148,12 @@ setup:
 "Username" and leave it empty
 
 **Important:** The second option is needed due to some limitations in the GitLab
-JIRA integration. If you fail to do so, the ACTS JIRA project will be spammed
+JIRA integration. If you fail to do so, the Acts JIRA project will be spammed
 with hundreds of duplicates comments and you will likely receive an angry email
 from the development team ;-).
 
 ```bash
-# adding the central ACTS repository as remote
+# adding the central Acts repository as remote
 git remote add upstream ssh://git@gitlab.cern.ch:7999/acts/acts-core.git
 # get latest upstream changes
 git fetch upstream
@@ -187,7 +187,7 @@ git push
 
 ### <a name="workflow-recommendations">Workflow recommendations</a>
 
-In the following a few recommendations are outlined which should help you to get familiar with development process in the ACTS project.
+In the following a few recommendations are outlined which should help you to get familiar with development process in the Acts project.
 
 1. **Each development its own branch!**
 Branching in git is simple, it is fun and it helps you keep your working copy clean. Therefore, you should start a new branch for every development. All work which is logically/conceptually linked should happen in one branch. Keep your branches short. This helps immensly to understand the git history if you need to look at it in the future.
@@ -195,7 +195,7 @@ If projects are complex (e.g. large code refactoring or complex new features), y
 
 <img src="doc/figures/sub_dev.png" alt="workflow for large feature">
 1. **Never, ever directly work on any "official" branch!**
-Though not strictly necessary and in the end it is up to you, it is strongly recommended that you never commit directly on a branch which tracks an "official" branch. As all branches are equal in git, the definition of "official" branch is quite subjective. In the ACTS project you should not work directly on branches which are **protected** in the CERN GitLab repository. Usually, these are the _master_ and _release-X.Y.Z_ branches. The benefit of this strategy is that you will never have problems to update your fork. Any git merge in your local repository on such an "official" branch will always be a fast-forward merge.
+Though not strictly necessary and in the end it is up to you, it is strongly recommended that you never commit directly on a branch which tracks an "official" branch. As all branches are equal in git, the definition of "official" branch is quite subjective. In the Acts project you should not work directly on branches which are **protected** in the CERN GitLab repository. Usually, these are the _master_ and _release-X.Y.Z_ branches. The benefit of this strategy is that you will never have problems to update your fork. Any git merge in your local repository on such an "official" branch will always be a fast-forward merge.
 
 1. **Use atomic commits!**
 Similarly to the concept of branches, each commit should reflect a self-contained change. Try to avoid overly large commits (bad examples are for instance mixing logical change with code cleanup and typo fixes).
@@ -216,9 +216,9 @@ Make sure that the documentation is still valid after your changes. Perform upda
 
 ### <a name="coding-style-and-guidelines">Coding style and guidelines</a>
 
-The ACTS project uses [clang-format](http://clang.llvm.org/docs/ClangFormat.html) (currently v3.8.0) for formatting its source code. A `.clang-format` configuration file comes with the project and should be used to automatically format the code. There are several instructions available on how to integrate clang-format with your favourite IDE (e.g. [eclipse](https://marketplace.eclipse.org/content/cppstyle), [Xcode](https://github.com/travisjeffery/ClangFormat-Xcode), [emacs](http://clang.llvm.org/docs/ClangFormat.html#emacs-integration)). The ACTS CI system will automatically apply code reformatting using the provided clang-format configuration once merge requests are opened. However, developers are strongly encouraged to use this code formatter also locally to reduce conflicts due to formatting issues.
+The Acts project uses [clang-format](http://clang.llvm.org/docs/ClangFormat.html) (currently v3.8.0) for formatting its source code. A `.clang-format` configuration file comes with the project and should be used to automatically format the code. There are several instructions available on how to integrate clang-format with your favourite IDE (e.g. [eclipse](https://marketplace.eclipse.org/content/cppstyle), [Xcode](https://github.com/travisjeffery/ClangFormat-Xcode), [emacs](http://clang.llvm.org/docs/ClangFormat.html#emacs-integration)). The Acts CI system will automatically apply code reformatting using the provided clang-format configuration once merge requests are opened. However, developers are strongly encouraged to use this code formatter also locally to reduce conflicts due to formatting issues.
 
-In addition, the following conventions are used in ACTS code:
+In addition, the following conventions are used in Acts code:
 
 - Class names start with a capital letter.
 - Function names start with a lower-case letter and use camel-case.
@@ -333,39 +333,39 @@ Now, master is pointing to B, HEAD and &lt;new\_branch\_name&gt; are pointing to
 
 ### <a name="approving-a-merge-request">Approving a merge request</a>
 
-Writing new code is not the only way one can contribute to the ACTS project. Another greatly appreciated contribution is looking at other proposed contributions to the project. The more eyeballs look at a piece of code before it is merged into the ACTS repository, the smaller the chances that a bug or other unwanted behaviour is accidentally introduced into the ACTS codebase. This is why we require that every ACTS merge request receives at least one human review before being merged.
+Writing new code is not the only way one can contribute to the Acts project. Another greatly appreciated contribution is looking at other proposed contributions to the project. The more eyeballs look at a piece of code before it is merged into the Acts repository, the smaller the chances that a bug or other unwanted behaviour is accidentally introduced into the Acts codebase. This is why we require that every Acts merge request receives at least one human review before being merged.
 
-You can help reviewing proposed contributions by going to [the "merge requests" section of the ACTS Gitlab repository](https://gitlab.cern.ch/acts/acts-core/merge_requests) and having a look at the proposals that are being made here. The present contribution guide should serve as a good indication of what we expect from code submissions. In addition, please look at the merge request itself:
+You can help reviewing proposed contributions by going to [the "merge requests" section of the Acts Gitlab repository](https://gitlab.cern.ch/acts/acts-core/merge_requests) and having a look at the proposals that are being made here. The present contribution guide should serve as a good indication of what we expect from code submissions. In addition, please look at the merge request itself:
 
 * Does its title and description reflect its contents?
 * Is it associated with a JIRA ticket so that we can easily document it in the release notes?
 * Do the automated continuous integration tests pass without problems?
 * Have all the comments raised by previous reviewers been addressed?
 
-If you are confident that a merge request is ready for integration, please make it known by clicking the "Approve merge request" button of the Gitlab interface. This notifies other members of the ACTS team of your decision, and marks the merge request as ready to be merged.
+If you are confident that a merge request is ready for integration, please make it known by clicking the "Approve merge request" button of the Gitlab interface. This notifies other members of the Acts team of your decision, and marks the merge request as ready to be merged.
 
 ### <a name="merging-a-merge-request">Merging a merge request</a>
 
-If you have been granted merge rights on the ACTS repository, you can merge a merge request into the ACTS master branch after it has been approved by someone else. In order to give everyone a chance to review the merge request, please wait for at least two days (48h) after the merge request has been submitted before doing so, even if the merge request has been approved by someone before this delay has elapsed.
+If you have been granted merge rights on the Acts repository, you can merge a merge request into the Acts master branch after it has been approved by someone else. In order to give everyone a chance to review the merge request, please wait for at least two days (48h) after the merge request has been submitted before doing so, even if the merge request has been approved by someone before this delay has elapsed.
 
-Gitlab may warn you that a "Fast-forward merge is not possible". This warning means that the merge request has fallen behind the current ACTS master branch, and should be updated through a rebase. Please notify the merge request author in order to make sure that the latest master changes do not affect the merge request, and to have it updated as appropriate.
+Gitlab may warn you that a "Fast-forward merge is not possible". This warning means that the merge request has fallen behind the current Acts master branch, and should be updated through a rebase. Please notify the merge request author in order to make sure that the latest master changes do not affect the merge request, and to have it updated as appropriate.
 
 ## <a name="admin-corner">Administrator's corner</a>
 
-This section gives useful information to the administrators of the ACTS project. For normal developers the sections below are irrelevant.
+This section gives useful information to the administrators of the Acts project. For normal developers the sections below are irrelevant.
 
-### <a name="tag-release">Make a new ACTS release</a>
+### <a name="tag-release">Make a new Acts release</a>
 
-In order to release a new version of ACTS the following steps need to be taken:
+In order to release a new version of Acts the following steps need to be taken:
 
 1. Check out all open JIRA issues for the next release in <a href="https://its.cern.ch/jira/projects/ACTS/versions/">JIRA</a>.
 2. Create a new branch called <tt>release-X.YY.ZZ</tt> branching off from <tt>origin/master</tt>.
 3. In this branch, update the <tt>ACTS_VERSION</tt> variable in the top-level CMakeLists.txt file to <tt>X.YY.ZZ</tt> and commit the change.
 4. Pushing this commit to the remote repository should trigger a CI build. Make sure that everything compiles without any warnings and all tests look fine.
 5. Create a new annotated tag locally. The tag should have the format <tt>vX.YY.ZZ</tt> and an associated tag message 'version vX.YY.ZZ'.
-6. Push the tag to the remote repository. This should trigger a CI job which rebuilds to documentation and deploys it together with a tar file of the source code to the ACTS webpage. Make sure that the new release appears under the **Releases** section on the <a href="http://acts.web.cern.ch/ACTS/">ACTS webpage</a>.
+6. Push the tag to the remote repository. This should trigger a CI job which rebuilds to documentation and deploys it together with a tar file of the source code to the Acts webpage. Make sure that the new release appears under the **Releases** section on the <a href="http://acts.web.cern.ch/ACTS/">Acts webpage</a>.
 7. If there is not yet a JIRA version for the next minor release, create it in the <a href="https://its.cern.ch/jira/plugins/servlet/project-config/ACTS/versions">JIRA project administration</a> area (e.g. if 1.23.02 was just released, version 1.23.03 should exist in JIRA for the next minor release for bug fixes).
-8. Got to the <a href="https://its.cern.ch/jira/projects/ACTS/versions/">ACTS Releases page in JIRA</a> and release the version. Make sure that a correct release data is set and that all open issues get moved to the next major/minor release.
+8. Got to the <a href="https://its.cern.ch/jira/projects/ACTS/versions/">Acts Releases page in JIRA</a> and release the version. Make sure that a correct release data is set and that all open issues get moved to the next major/minor release.
 9. From the JIRA release page, copy (all) the HTML code for the release notes. Login to lxplus using the service account <tt>atsjenkins</tt> (<tt>ssh atsjenkins@lxplus.cern.ch</tt>). Create the file <tt>~/www/ACTS/vX.YY.ZZ/ReleaseNotes.html</tt> with the copied HTML code for the release notes. Please make sure that _sub_-tasks appear as nested lists (JIRA unfortunately puts them all on one level in alphabetical order).
-10. Check that the release notes appear on the <a href="http://acts.web.cern.ch/ACTS/">ACTS webpage</a> and are available from the respective link in the **Releases** section.
+10. Check that the release notes appear on the <a href="http://acts.web.cern.ch/ACTS/">Acts webpage</a> and are available from the respective link in the **Releases** section.
 
diff --git a/CTestConfig.cmake b/CTestConfig.cmake
index 463efc911..9e83b1af6 100644
--- a/CTestConfig.cmake
+++ b/CTestConfig.cmake
@@ -6,13 +6,13 @@
 ##   ENABLE_TESTING()
 ##   INCLUDE(CTest)
 
-set(CTEST_PROJECT_NAME "ACTS")
+set(CTEST_PROJECT_NAME "Acts")
 set(CTEST_NIGHTLY_START_TIME "00:00:00 EST")
 
 # CDash configuration
 set (CTEST_DROP_METHOD "http")
 set (CTEST_DROP_SITE "my.cdash.org")
-set (CTEST_DROP_LOCATION "/submit.php?project=ACTS")
+set (CTEST_DROP_LOCATION "/submit.php?project=Acts")
 set (CTEST_DROP_SITE_CDASH TRUE)
 
 # sub projects
diff --git a/Core/ActsVersion.hpp.in b/Core/ActsVersion.hpp.in
index 58522e825..3173f0a5b 100644
--- a/Core/ActsVersion.hpp.in
+++ b/Core/ActsVersion.hpp.in
@@ -1,9 +1,9 @@
 #ifndef ActsVersion_h
 #define ActsVersion_h
 
-//  Caution: this is the only ACTS header that is guaranteed
-//  to change with every ACTS release. Including this header
-//  will cause a recompile every time a new ACTS version is
+//  Caution: this is the only Acts header that is guaranteed
+//  to change with every Acts release. Including this header
+//  will cause a recompile every time a new Acts version is
 //  used.
 
 namespace Acts {
diff --git a/Core/include/Acts/Detector/DetachedTrackingVolume.hpp b/Core/include/Acts/Detector/DetachedTrackingVolume.hpp
index 59310cb8f..73ee56360 100644
--- a/Core/include/Acts/Detector/DetachedTrackingVolume.hpp
+++ b/Core/include/Acts/Detector/DetachedTrackingVolume.hpp
@@ -1,13 +1,13 @@
-// This file is part of the ACTS project.
+// This file is part of the Acts project.
 //
-// Copyright (C) 2016-2017 ACTS project team
+// Copyright (C) 2016-2017 Acts project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
 // file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 ///////////////////////////////////////////////////////////////////
-// DetachedTrackingVolume.h, ACTS project
+// DetachedTrackingVolume.h, Acts project
 ///////////////////////////////////////////////////////////////////
 
 #pragma once
diff --git a/Core/include/Acts/Detector/DetectorElementBase.hpp b/Core/include/Acts/Detector/DetectorElementBase.hpp
index 6963d6e17..259d97c3b 100644
--- a/Core/include/Acts/Detector/DetectorElementBase.hpp
+++ b/Core/include/Acts/Detector/DetectorElementBase.hpp
@@ -1,13 +1,13 @@
-// This file is part of the ACTS project.
+// This file is part of the Acts project.
 //
-// Copyright (C) 2016-2017 ACTS project team
+// Copyright (C) 2016-2017 Acts project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
 // file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 ///////////////////////////////////////////////////////////////////
-// DetectorElementBase.h, ACTS project
+// DetectorElementBase.h, Acts project
 ///////////////////////////////////////////////////////////////////
 
 #pragma once
diff --git a/Core/include/Acts/Detector/GlueVolumesDescriptor.hpp b/Core/include/Acts/Detector/GlueVolumesDescriptor.hpp
index 4541f8266..500b2d660 100644
--- a/Core/include/Acts/Detector/GlueVolumesDescriptor.hpp
+++ b/Core/include/Acts/Detector/GlueVolumesDescriptor.hpp
@@ -1,13 +1,13 @@
-// This file is part of the ACTS project.
+// This file is part of the Acts project.
 //
-// Copyright (C) 2016-2017 ACTS project team
+// Copyright (C) 2016-2017 Acts project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
 // file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 ///////////////////////////////////////////////////////////////////
-// GlueVolumesDescriptor.h, ACTS project
+// GlueVolumesDescriptor.h, Acts project
 ///////////////////////////////////////////////////////////////////
 
 #pragma once
diff --git a/Core/include/Acts/Detector/TrackingGeometry.hpp b/Core/include/Acts/Detector/TrackingGeometry.hpp
index 7dc7e7852..f8338dad4 100644
--- a/Core/include/Acts/Detector/TrackingGeometry.hpp
+++ b/Core/include/Acts/Detector/TrackingGeometry.hpp
@@ -1,13 +1,13 @@
-// This file is part of the ACTS project.
+// This file is part of the Acts project.
 //
-// Copyright (C) 2016-2017 ACTS project team
+// Copyright (C) 2016-2017 Acts project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
 // file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 ///////////////////////////////////////////////////////////////////
-// TrackingGeometry.h, ACTS project
+// TrackingGeometry.h, Acts project
 ///////////////////////////////////////////////////////////////////
 
 #pragma once
diff --git a/Core/include/Acts/Detector/TrackingVolume.hpp b/Core/include/Acts/Detector/TrackingVolume.hpp
index f2aaf2f9d..063014b27 100644
--- a/Core/include/Acts/Detector/TrackingVolume.hpp
+++ b/Core/include/Acts/Detector/TrackingVolume.hpp
@@ -1,13 +1,13 @@
-// This file is part of the ACTS project.
+// This file is part of the Acts project.
 //
-// Copyright (C) 2016-2017 ACTS project team
+// Copyright (C) 2016-2017 Acts project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
 // file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 ///////////////////////////////////////////////////////////////////
-// TrackingVolume.h, ACTS project
+// TrackingVolume.h, Acts project
 ///////////////////////////////////////////////////////////////////
 
 #pragma once
diff --git a/Core/include/Acts/Digitization/CartesianSegmentation.hpp b/Core/include/Acts/Digitization/CartesianSegmentation.hpp
index 4dcaa466a..8205a3789 100644
--- a/Core/include/Acts/Digitization/CartesianSegmentation.hpp
+++ b/Core/include/Acts/Digitization/CartesianSegmentation.hpp
@@ -1,6 +1,6 @@
-// This file is part of the ACTS project.
+// This file is part of the Acts project.
 //
-// Copyright (C) 2016-2017 ACTS project team
+// Copyright (C) 2016-2017 Acts project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/Core/include/Acts/Digitization/Clusterization.hpp b/Core/include/Acts/Digitization/Clusterization.hpp
index fbdaed4e3..b6ded200a 100644
--- a/Core/include/Acts/Digitization/Clusterization.hpp
+++ b/Core/include/Acts/Digitization/Clusterization.hpp
@@ -1,6 +1,6 @@
-// This file is part of the ACTS project.
+// This file is part of the Acts project.
 //
-// Copyright (C) 2018 ACTS project team
+// Copyright (C) 2018 Acts project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/Core/include/Acts/Digitization/DigitizationCell.hpp b/Core/include/Acts/Digitization/DigitizationCell.hpp
index d3ddf1955..21087c477 100644
--- a/Core/include/Acts/Digitization/DigitizationCell.hpp
+++ b/Core/include/Acts/Digitization/DigitizationCell.hpp
@@ -1,6 +1,6 @@
-// This file is part of the ACTS project.
+// This file is part of the Acts project.
 //
-// Copyright (C) 2016-2017 ACTS project team
+// Copyright (C) 2016-2017 Acts project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/Core/include/Acts/Digitization/DigitizationModule.hpp b/Core/include/Acts/Digitization/DigitizationModule.hpp
index 71014db1d..e5cbf874f 100644
--- a/Core/include/Acts/Digitization/DigitizationModule.hpp
+++ b/Core/include/Acts/Digitization/DigitizationModule.hpp
@@ -1,6 +1,6 @@
-// This file is part of the ACTS project.
+// This file is part of the Acts project.
 //
-// Copyright (C) 2016-2017 ACTS project team
+// Copyright (C) 2016-2017 Acts project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/Core/include/Acts/Digitization/PlanarModuleCluster.hpp b/Core/include/Acts/Digitization/PlanarModuleCluster.hpp
index 3a97c0bf6..1951d2d4d 100644
--- a/Core/include/Acts/Digitization/PlanarModuleCluster.hpp
+++ b/Core/include/Acts/Digitization/PlanarModuleCluster.hpp
@@ -1,6 +1,6 @@
-// This file is part of the ACTS project.
+// This file is part of the Acts project.
 //
-// Copyright (C) 2016-2017 ACTS project team
+// Copyright (C) 2016-2017 Acts project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/Core/include/Acts/Digitization/PlanarModuleStepper.hpp b/Core/include/Acts/Digitization/PlanarModuleStepper.hpp
index 0bc05a662..343e63f06 100644
--- a/Core/include/Acts/Digitization/PlanarModuleStepper.hpp
+++ b/Core/include/Acts/Digitization/PlanarModuleStepper.hpp
@@ -1,6 +1,6 @@
-// This file is part of the ACTS project.
+// This file is part of the Acts project.
 //
-// Copyright (C) 2016-2017 ACTS project team
+// Copyright (C) 2016-2017 Acts project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/Core/include/Acts/Digitization/PolarSegmentation.hpp b/Core/include/Acts/Digitization/PolarSegmentation.hpp
index af02b3746..52e709861 100644
--- a/Core/include/Acts/Digitization/PolarSegmentation.hpp
+++ b/Core/include/Acts/Digitization/PolarSegmentation.hpp
@@ -1,6 +1,6 @@
-// This file is part of the ACTS project.
+// This file is part of the Acts project.
 //
-// Copyright (C) 2016-2017 ACTS project team
+// Copyright (C) 2016-2017 Acts project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/Core/include/Acts/Digitization/Segmentation.hpp b/Core/include/Acts/Digitization/Segmentation.hpp
index cfeaa49c6..9744fddff 100644
--- a/Core/include/Acts/Digitization/Segmentation.hpp
+++ b/Core/include/Acts/Digitization/Segmentation.hpp
@@ -1,6 +1,6 @@
-// This file is part of the ACTS project.
+// This file is part of the Acts project.
 //
-// Copyright (C) 2016-2017 ACTS project team
+// Copyright (C) 2016-2017 Acts project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/Core/include/Acts/EventData/ChargePolicy.hpp b/Core/include/Acts/EventData/ChargePolicy.hpp
index 581996bf6..b63639674 100644
--- a/Core/include/Acts/EventData/ChargePolicy.hpp
+++ b/Core/include/Acts/EventData/ChargePolicy.hpp
@@ -1,6 +1,6 @@
-// This file is part of the ACTS project.
+// This file is part of the Acts project.
 //
-// Copyright (C) 2016-2017 ACTS project team
+// Copyright (C) 2016-2017 Acts project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/Core/include/Acts/EventData/Measurement.hpp b/Core/include/Acts/EventData/Measurement.hpp
index 6984dbbe0..37bfb815a 100644
--- a/Core/include/Acts/EventData/Measurement.hpp
+++ b/Core/include/Acts/EventData/Measurement.hpp
@@ -1,6 +1,6 @@
-// This file is part of the ACTS project.
+// This file is part of the Acts project.
 //
-// Copyright (C) 2016-2017 ACTS project team
+// Copyright (C) 2016-2017 Acts project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/Core/include/Acts/EventData/NeutralParameters.hpp b/Core/include/Acts/EventData/NeutralParameters.hpp
index aa31ced5f..0c245630c 100644
--- a/Core/include/Acts/EventData/NeutralParameters.hpp
+++ b/Core/include/Acts/EventData/NeutralParameters.hpp
@@ -1,6 +1,6 @@
-// This file is part of the ACTS project.
+// This file is part of the Acts project.
 //
-// Copyright (C) 2016 ACTS project team
+// Copyright (C) 2016 Acts project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/Core/include/Acts/EventData/ParameterSet.hpp b/Core/include/Acts/EventData/ParameterSet.hpp
index c0c18a4b8..b4ffeb6d3 100644
--- a/Core/include/Acts/EventData/ParameterSet.hpp
+++ b/Core/include/Acts/EventData/ParameterSet.hpp
@@ -1,6 +1,6 @@
-// This file is part of the ACTS project.
+// This file is part of the Acts project.
 //
-// Copyright (C) 2016-2017 ACTS project team
+// Copyright (C) 2016-2017 Acts project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
@@ -12,7 +12,7 @@
 #include <type_traits>
 #include <utility>
 
-// ACTS includes
+// Acts includes
 #include "Acts/EventData/detail/full_parameter_set.hpp"
 #include "Acts/EventData/detail/initialize_parameter_set.hpp"
 #include "Acts/EventData/detail/make_projection_matrix.hpp"
diff --git a/Core/include/Acts/EventData/ParticleDefinitions.hpp b/Core/include/Acts/EventData/ParticleDefinitions.hpp
index 49a38113a..37c0cee87 100644
--- a/Core/include/Acts/EventData/ParticleDefinitions.hpp
+++ b/Core/include/Acts/EventData/ParticleDefinitions.hpp
@@ -1,13 +1,13 @@
-// This file is part of the ACTS project.
+// This file is part of the Acts project.
 //
-// Copyright (C) 2016-2017 ACTS project team
+// Copyright (C) 2016-2017 Acts project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
 // file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 ///////////////////////////////////////////////////////////////////
-// ParticleDefinitions.h, ACTS project
+// ParticleDefinitions.h, Acts project
 ///////////////////////////////////////////////////////////////////
 
 #pragma once
diff --git a/Core/include/Acts/EventData/SingleBoundTrackParameters.hpp b/Core/include/Acts/EventData/SingleBoundTrackParameters.hpp
index 8bc67347b..c3dba80ed 100644
--- a/Core/include/Acts/EventData/SingleBoundTrackParameters.hpp
+++ b/Core/include/Acts/EventData/SingleBoundTrackParameters.hpp
@@ -1,6 +1,6 @@
-// This file is part of the ACTS project.
+// This file is part of the Acts project.
 //
-// Copyright (C) 2016-2017 ACTS project team
+// Copyright (C) 2016-2017 Acts project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/Core/include/Acts/EventData/SingleCurvilinearTrackParameters.hpp b/Core/include/Acts/EventData/SingleCurvilinearTrackParameters.hpp
index 795c76469..44bde4bf8 100644
--- a/Core/include/Acts/EventData/SingleCurvilinearTrackParameters.hpp
+++ b/Core/include/Acts/EventData/SingleCurvilinearTrackParameters.hpp
@@ -1,6 +1,6 @@
-// This file is part of the ACTS project.
+// This file is part of the Acts project.
 //
-// Copyright (C) 2016-2018 ACTS project team
+// Copyright (C) 2016-2018 Acts project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/Core/include/Acts/EventData/SingleTrackParameters.hpp b/Core/include/Acts/EventData/SingleTrackParameters.hpp
index 76b2eef82..a32cbc73f 100644
--- a/Core/include/Acts/EventData/SingleTrackParameters.hpp
+++ b/Core/include/Acts/EventData/SingleTrackParameters.hpp
@@ -1,6 +1,6 @@
-// This file is part of the ACTS project.
+// This file is part of the Acts project.
 //
-// Copyright (C) 2016-2017 ACTS project team
+// Copyright (C) 2016-2017 Acts project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/Core/include/Acts/EventData/TrackParameters.hpp b/Core/include/Acts/EventData/TrackParameters.hpp
index 7f9d527a4..402e0e84a 100644
--- a/Core/include/Acts/EventData/TrackParameters.hpp
+++ b/Core/include/Acts/EventData/TrackParameters.hpp
@@ -1,6 +1,6 @@
-// This file is part of the ACTS project.
+// This file is part of the Acts project.
 //
-// Copyright (C) 2016-2017 ACTS project team
+// Copyright (C) 2016-2017 Acts project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/Core/include/Acts/EventData/TrackParametersBase.hpp b/Core/include/Acts/EventData/TrackParametersBase.hpp
index ca53056c6..a4b75e80c 100644
--- a/Core/include/Acts/EventData/TrackParametersBase.hpp
+++ b/Core/include/Acts/EventData/TrackParametersBase.hpp
@@ -1,6 +1,6 @@
-// This file is part of the ACTS project.
+// This file is part of the Acts project.
 //
-// Copyright (C) 2016-2017 ACTS project team
+// Copyright (C) 2016-2017 Acts project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
@@ -11,7 +11,7 @@
 #include <ostream>
 
 #include "Acts/Utilities/Definitions.hpp"
-// ACTS includes
+// Acts includes
 #include "Acts/EventData/ChargePolicy.hpp"
 #include "Acts/EventData/ParameterSet.hpp"
 #include "Acts/Utilities/ParameterDefinitions.hpp"
diff --git a/Core/include/Acts/EventData/TransportJacobian.hpp b/Core/include/Acts/EventData/TransportJacobian.hpp
index 5517a915f..d813bfd26 100644
--- a/Core/include/Acts/EventData/TransportJacobian.hpp
+++ b/Core/include/Acts/EventData/TransportJacobian.hpp
@@ -1,13 +1,13 @@
-// This file is part of the ACTS project.
+// This file is part of the Acts project.
 //
-// Copyright (C) 2016-2017 ACTS project team
+// Copyright (C) 2016-2017 Acts project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
 // file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 ///////////////////////////////////////////////////////////////////
-// TransportJacobian.h, ACTS project
+// TransportJacobian.h, Acts project
 ///////////////////////////////////////////////////////////////////
 
 #pragma once
diff --git a/Core/include/Acts/EventData/detail/coordinate_transformations.hpp b/Core/include/Acts/EventData/detail/coordinate_transformations.hpp
index 564260132..b67387b3b 100644
--- a/Core/include/Acts/EventData/detail/coordinate_transformations.hpp
+++ b/Core/include/Acts/EventData/detail/coordinate_transformations.hpp
@@ -1,13 +1,13 @@
-// This file is part of the ACTS project.
+// This file is part of the Acts project.
 //
-// Copyright (C) 2016-2017 ACTS project team
+// Copyright (C) 2016-2017 Acts project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
 // file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 #pragma once
-// ACTS includes
+// Acts includes
 #include <cmath>
 #include "Acts/Surfaces/Surface.hpp"
 #include "Acts/Utilities/ParameterDefinitions.hpp"
diff --git a/Core/include/Acts/EventData/detail/fittable_type_generator.hpp b/Core/include/Acts/EventData/detail/fittable_type_generator.hpp
index 9e0bb1af0..b1703dce0 100644
--- a/Core/include/Acts/EventData/detail/fittable_type_generator.hpp
+++ b/Core/include/Acts/EventData/detail/fittable_type_generator.hpp
@@ -1,6 +1,6 @@
-// This file is part of the ACTS project.
+// This file is part of the Acts project.
 //
-// Copyright (C) 2016-2017 ACTS project team
+// Copyright (C) 2016-2017 Acts project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
@@ -11,7 +11,7 @@
 #include <boost/mpl/vector.hpp>
 #include <boost/variant.hpp>
 
-// ACTS include(s)
+// Acts include(s)
 #include "Acts/Utilities/ParameterDefinitions.hpp"
 
 namespace Acts {
diff --git a/Core/include/Acts/EventData/detail/full_parameter_set.hpp b/Core/include/Acts/EventData/detail/full_parameter_set.hpp
index 901ed74eb..4d3401b24 100644
--- a/Core/include/Acts/EventData/detail/full_parameter_set.hpp
+++ b/Core/include/Acts/EventData/detail/full_parameter_set.hpp
@@ -1,6 +1,6 @@
-// This file is part of the ACTS project.
+// This file is part of the Acts project.
 //
-// Copyright (C) 2016 ACTS project team
+// Copyright (C) 2016 Acts project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
@@ -11,7 +11,7 @@
 #include <type_traits>
 #include <utility>
 
-// ACTS include(s)
+// Acts include(s)
 #include "Acts/Utilities/ParameterDefinitions.hpp"
 
 namespace Acts {
diff --git a/Core/include/Acts/EventData/detail/initialize_parameter_set.hpp b/Core/include/Acts/EventData/detail/initialize_parameter_set.hpp
index da83f9f44..2a20db583 100644
--- a/Core/include/Acts/EventData/detail/initialize_parameter_set.hpp
+++ b/Core/include/Acts/EventData/detail/initialize_parameter_set.hpp
@@ -1,6 +1,6 @@
-// This file is part of the ACTS project.
+// This file is part of the Acts project.
 //
-// Copyright (C) 2016 ACTS project team
+// Copyright (C) 2016 Acts project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/Core/include/Acts/EventData/detail/make_projection_matrix.hpp b/Core/include/Acts/EventData/detail/make_projection_matrix.hpp
index 29ab64200..5246a5ae3 100644
--- a/Core/include/Acts/EventData/detail/make_projection_matrix.hpp
+++ b/Core/include/Acts/EventData/detail/make_projection_matrix.hpp
@@ -1,13 +1,13 @@
-// This file is part of the ACTS project.
+// This file is part of the Acts project.
 //
-// Copyright (C) 2016 ACTS project team
+// Copyright (C) 2016 Acts project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
 // file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 #pragma once
-// ACTS include(s)
+// Acts include(s)
 #include "Acts/Utilities/Definitions.hpp"
 
 namespace Acts {
diff --git a/Core/include/Acts/EventData/detail/residual_calculator.hpp b/Core/include/Acts/EventData/detail/residual_calculator.hpp
index 19aac650b..99572195f 100644
--- a/Core/include/Acts/EventData/detail/residual_calculator.hpp
+++ b/Core/include/Acts/EventData/detail/residual_calculator.hpp
@@ -1,13 +1,13 @@
-// This file is part of the ACTS project.
+// This file is part of the Acts project.
 //
-// Copyright (C) 2016 ACTS project team
+// Copyright (C) 2016 Acts project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
 // file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 #pragma once
-// ACTS include(s)
+// Acts include(s)
 #include "Acts/Utilities/Definitions.hpp"
 #include "Acts/Utilities/ParameterDefinitions.hpp"
 
diff --git a/Core/include/Acts/EventData/detail/value_corrector.hpp b/Core/include/Acts/EventData/detail/value_corrector.hpp
index 05bc92fbe..7678fd0b7 100644
--- a/Core/include/Acts/EventData/detail/value_corrector.hpp
+++ b/Core/include/Acts/EventData/detail/value_corrector.hpp
@@ -1,13 +1,13 @@
-// This file is part of the ACTS project.
+// This file is part of the Acts project.
 //
-// Copyright (C) 2016 ACTS project team
+// Copyright (C) 2016 Acts project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
 // file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 #pragma once
-// ACTS include(s)
+// Acts include(s)
 #include "Acts/Utilities/Definitions.hpp"
 #include "Acts/Utilities/ParameterDefinitions.hpp"
 
diff --git a/Core/include/Acts/Fitter/KalmanFitter.hpp b/Core/include/Acts/Fitter/KalmanFitter.hpp
index 4902a26c0..47375fb76 100644
--- a/Core/include/Acts/Fitter/KalmanFitter.hpp
+++ b/Core/include/Acts/Fitter/KalmanFitter.hpp
@@ -1,6 +1,6 @@
-// This file is part of the ACTS project.
+// This file is part of the Acts project.
 //
-// Copyright (C) 2016-2018 ACTS project team
+// Copyright (C) 2016-2018 Acts project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/Core/include/Acts/Fitter/KalmanUpdator.hpp b/Core/include/Acts/Fitter/KalmanUpdator.hpp
index cb05a8a74..da9e02e54 100644
--- a/Core/include/Acts/Fitter/KalmanUpdator.hpp
+++ b/Core/include/Acts/Fitter/KalmanUpdator.hpp
@@ -1,6 +1,6 @@
-// This file is part of the ACTS project.
+// This file is part of the Acts project.
 //
-// Copyright (C) 2016-2017 ACTS project team
+// Copyright (C) 2016-2017 Acts project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/Core/include/Acts/Layers/ConeLayer.hpp b/Core/include/Acts/Layers/ConeLayer.hpp
index 8bf55a883..5a15ba5e1 100644
--- a/Core/include/Acts/Layers/ConeLayer.hpp
+++ b/Core/include/Acts/Layers/ConeLayer.hpp
@@ -1,13 +1,13 @@
-// This file is part of the ACTS project.
+// This file is part of the Acts project.
 //
-// Copyright (C) 2016-2017 ACTS project team
+// Copyright (C) 2016-2017 Acts project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
 // file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 ///////////////////////////////////////////////////////////////////
-// ConeLayer.h, ACTS project
+// ConeLayer.h, Acts project
 ///////////////////////////////////////////////////////////////////
 
 #pragma once
diff --git a/Core/include/Acts/Layers/CylinderLayer.hpp b/Core/include/Acts/Layers/CylinderLayer.hpp
index eb3a2e72f..36de622f5 100644
--- a/Core/include/Acts/Layers/CylinderLayer.hpp
+++ b/Core/include/Acts/Layers/CylinderLayer.hpp
@@ -1,13 +1,13 @@
-// This file is part of the ACTS project.
+// This file is part of the Acts project.
 //
-// Copyright (C) 2016-2017 ACTS project team
+// Copyright (C) 2016-2017 Acts project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
 // file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 ///////////////////////////////////////////////////////////////////
-// CylinderLayer.h, ACTS project
+// CylinderLayer.h, Acts project
 ///////////////////////////////////////////////////////////////////
 
 #pragma once
diff --git a/Core/include/Acts/Layers/DiscLayer.hpp b/Core/include/Acts/Layers/DiscLayer.hpp
index 7ebd946cb..6638c25c4 100644
--- a/Core/include/Acts/Layers/DiscLayer.hpp
+++ b/Core/include/Acts/Layers/DiscLayer.hpp
@@ -1,13 +1,13 @@
-// This file is part of the ACTS project.
+// This file is part of the Acts project.
 //
-// Copyright (C) 2016-2017 ACTS project team
+// Copyright (C) 2016-2017 Acts project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
 // file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 ///////////////////////////////////////////////////////////////////
-// DiscLayer.h, ACTS project
+// DiscLayer.h, Acts project
 ///////////////////////////////////////////////////////////////////
 
 #pragma once
diff --git a/Core/include/Acts/Layers/GenericApproachDescriptor.hpp b/Core/include/Acts/Layers/GenericApproachDescriptor.hpp
index 9db3ebf59..c6e180cbb 100644
--- a/Core/include/Acts/Layers/GenericApproachDescriptor.hpp
+++ b/Core/include/Acts/Layers/GenericApproachDescriptor.hpp
@@ -1,13 +1,13 @@
-// This file is part of the ACTS project.
+// This file is part of the Acts project.
 //
-// Copyright (C) 2016-2017 ACTS project team
+// Copyright (C) 2016-2017 Acts project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
 // file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 ///////////////////////////////////////////////////////////////////
-// GenericApproachDescriptor.h, ACTS project
+// GenericApproachDescriptor.h, Acts project
 ///////////////////////////////////////////////////////////////////
 
 #pragma once
diff --git a/Core/include/Acts/Layers/Layer.hpp b/Core/include/Acts/Layers/Layer.hpp
index 77d26f56c..b2a22d555 100644
--- a/Core/include/Acts/Layers/Layer.hpp
+++ b/Core/include/Acts/Layers/Layer.hpp
@@ -1,13 +1,13 @@
-// This file is part of the ACTS project.
+// This file is part of the Acts project.
 //
-// Copyright (C) 2016-2017 ACTS project team
+// Copyright (C) 2016-2017 Acts project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
 // file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 ///////////////////////////////////////////////////////////////////
-// Layer.h, ACTS project
+// Layer.h, Acts project
 ///////////////////////////////////////////////////////////////////
 
 #pragma once
diff --git a/Core/include/Acts/Layers/NavigationLayer.hpp b/Core/include/Acts/Layers/NavigationLayer.hpp
index 4639d3804..28bef080a 100644
--- a/Core/include/Acts/Layers/NavigationLayer.hpp
+++ b/Core/include/Acts/Layers/NavigationLayer.hpp
@@ -1,13 +1,13 @@
-// This file is part of the ACTS project.
+// This file is part of the Acts project.
 //
-// Copyright (C) 2016-2017 ACTS project team
+// Copyright (C) 2016-2017 Acts project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
 // file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 ///////////////////////////////////////////////////////////////////
-// NavigationLayer.h, ACTS project
+// NavigationLayer.h, Acts project
 ///////////////////////////////////////////////////////////////////
 
 #pragma once
diff --git a/Core/include/Acts/Layers/PlaneLayer.hpp b/Core/include/Acts/Layers/PlaneLayer.hpp
index 8d631bd53..882690c0d 100644
--- a/Core/include/Acts/Layers/PlaneLayer.hpp
+++ b/Core/include/Acts/Layers/PlaneLayer.hpp
@@ -1,13 +1,13 @@
-// This file is part of the ACTS project.
+// This file is part of the Acts project.
 //
-// Copyright (C) 2016-2017 ACTS project team
+// Copyright (C) 2016-2017 Acts project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
 // file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 ///////////////////////////////////////////////////////////////////
-// PlaneLayer.h, ACTS project
+// PlaneLayer.h, Acts project
 ///////////////////////////////////////////////////////////////////
 
 #pragma once
diff --git a/Core/include/Acts/Layers/ProtoLayer.hpp b/Core/include/Acts/Layers/ProtoLayer.hpp
index 99f286c60..e7a307256 100644
--- a/Core/include/Acts/Layers/ProtoLayer.hpp
+++ b/Core/include/Acts/Layers/ProtoLayer.hpp
@@ -1,6 +1,6 @@
-// This file is part of the ACTS project.
+// This file is part of the Acts project.
 //
-// Copyright (C) 2017-2018 ACTS project team
+// Copyright (C) 2017-2018 Acts project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/Core/include/Acts/Layers/detail/Layer.ipp b/Core/include/Acts/Layers/detail/Layer.ipp
index 5fb40b35a..712f60810 100644
--- a/Core/include/Acts/Layers/detail/Layer.ipp
+++ b/Core/include/Acts/Layers/detail/Layer.ipp
@@ -1,6 +1,6 @@
-// This file is part of the ACTS project.
+// This file is part of the Acts project.
 //
-// Copyright (C) 2016-2018 ACTS project team
+// Copyright (C) 2016-2018 Acts project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/Core/include/Acts/MagneticField/ConstantBField.hpp b/Core/include/Acts/MagneticField/ConstantBField.hpp
index 3c56529ed..514017ead 100644
--- a/Core/include/Acts/MagneticField/ConstantBField.hpp
+++ b/Core/include/Acts/MagneticField/ConstantBField.hpp
@@ -1,6 +1,6 @@
-// This file is part of the ACTS project.
+// This file is part of the Acts project.
 //
-// Copyright (C) 2016-2018 ACTS project team
+// Copyright (C) 2016-2018 Acts project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/Core/include/Acts/MagneticField/InterpolatedBFieldMap.hpp b/Core/include/Acts/MagneticField/InterpolatedBFieldMap.hpp
index 5d3c95625..e59fbebe8 100644
--- a/Core/include/Acts/MagneticField/InterpolatedBFieldMap.hpp
+++ b/Core/include/Acts/MagneticField/InterpolatedBFieldMap.hpp
@@ -1,6 +1,6 @@
-// This file is part of the ACTS project.
+// This file is part of the Acts project.
 //
-// Copyright (C) 2016-2017 ACTS project team
+// Copyright (C) 2016-2017 Acts project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/Core/include/Acts/MagneticField/SharedBFieldMap.hpp b/Core/include/Acts/MagneticField/SharedBFieldMap.hpp
index d66ca934b..231ed4592 100644
--- a/Core/include/Acts/MagneticField/SharedBFieldMap.hpp
+++ b/Core/include/Acts/MagneticField/SharedBFieldMap.hpp
@@ -1,6 +1,6 @@
-// This file is part of the ACTS project.
+// This file is part of the Acts project.
 //
-// Copyright (C) 2017 ACTS project team
+// Copyright (C) 2017 Acts project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/Core/include/Acts/MagneticField/concept/AnyFieldLookup.hpp b/Core/include/Acts/MagneticField/concept/AnyFieldLookup.hpp
index 2a0f99ac2..198dc202f 100644
--- a/Core/include/Acts/MagneticField/concept/AnyFieldLookup.hpp
+++ b/Core/include/Acts/MagneticField/concept/AnyFieldLookup.hpp
@@ -1,6 +1,6 @@
-// This file is part of the ACTS project.
+// This file is part of the Acts project.
 //
-// Copyright (C) 2017-2018 ACTS project team
+// Copyright (C) 2017-2018 Acts project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/Core/include/Acts/Material/BinnedSurfaceMaterial.hpp b/Core/include/Acts/Material/BinnedSurfaceMaterial.hpp
index 102fea20e..b2340465d 100644
--- a/Core/include/Acts/Material/BinnedSurfaceMaterial.hpp
+++ b/Core/include/Acts/Material/BinnedSurfaceMaterial.hpp
@@ -1,13 +1,13 @@
-// This file is part of the ACTS project.
+// This file is part of the Acts project.
 //
-// Copyright (C) 2016-2017 ACTS project team
+// Copyright (C) 2016-2017 Acts project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
 // file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 ///////////////////////////////////////////////////////////////////
-// BinnedSurfaceMaterial.h, ACTS project
+// BinnedSurfaceMaterial.h, Acts project
 ///////////////////////////////////////////////////////////////////
 
 #pragma once
diff --git a/Core/include/Acts/Material/HomogeneousSurfaceMaterial.hpp b/Core/include/Acts/Material/HomogeneousSurfaceMaterial.hpp
index 040256554..a28c0a9ac 100644
--- a/Core/include/Acts/Material/HomogeneousSurfaceMaterial.hpp
+++ b/Core/include/Acts/Material/HomogeneousSurfaceMaterial.hpp
@@ -1,13 +1,13 @@
-// This file is part of the ACTS project.
+// This file is part of the Acts project.
 //
-// Copyright (C) 2016-2017 ACTS project team
+// Copyright (C) 2016-2017 Acts project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
 // file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 ///////////////////////////////////////////////////////////////////
-// HomogeneousSurfaceMaterial.h, ACTS project
+// HomogeneousSurfaceMaterial.h, Acts project
 ///////////////////////////////////////////////////////////////////
 
 #pragma once
diff --git a/Core/include/Acts/Material/Material.hpp b/Core/include/Acts/Material/Material.hpp
index 984b5f722..1fb88912c 100644
--- a/Core/include/Acts/Material/Material.hpp
+++ b/Core/include/Acts/Material/Material.hpp
@@ -1,13 +1,13 @@
-// This file is part of the ACTS project.
+// This file is part of the Acts project.
 //
-// Copyright (C) 2016-2017 ACTS project team
+// Copyright (C) 2016-2017 Acts project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
 // file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 ///////////////////////////////////////////////////////////////////
-// Material.h, ACTS project
+// Material.h, Acts project
 ///////////////////////////////////////////////////////////////////
 
 #pragma once
diff --git a/Core/include/Acts/Material/MaterialProperties.hpp b/Core/include/Acts/Material/MaterialProperties.hpp
index 5c7d8d295..24a87d27e 100644
--- a/Core/include/Acts/Material/MaterialProperties.hpp
+++ b/Core/include/Acts/Material/MaterialProperties.hpp
@@ -1,13 +1,13 @@
-// This file is part of the ACTS project.
+// This file is part of the Acts project.
 //
-// Copyright (C) 2016-2017 ACTS project team
+// Copyright (C) 2016-2017 Acts project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
 // file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 ///////////////////////////////////////////////////////////////////
-// MaterialProperties.h, ACTS project
+// MaterialProperties.h, Acts project
 ///////////////////////////////////////////////////////////////////
 
 #pragma once
diff --git a/Core/include/Acts/Material/SurfaceMaterial.hpp b/Core/include/Acts/Material/SurfaceMaterial.hpp
index c4d3870ad..e672443c0 100644
--- a/Core/include/Acts/Material/SurfaceMaterial.hpp
+++ b/Core/include/Acts/Material/SurfaceMaterial.hpp
@@ -1,13 +1,13 @@
-// This file is part of the ACTS project.
+// This file is part of the Acts project.
 //
-// Copyright (C) 2016-2017 ACTS project team
+// Copyright (C) 2016-2017 Acts project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
 // file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 ///////////////////////////////////////////////////////////////////
-// SurfaceMaterial.h, ACTS project
+// SurfaceMaterial.h, Acts project
 ///////////////////////////////////////////////////////////////////
 
 #pragma once
diff --git a/Core/include/Acts/Material/SurfaceMaterialProxy.hpp b/Core/include/Acts/Material/SurfaceMaterialProxy.hpp
index 48db273e5..4999a59d6 100644
--- a/Core/include/Acts/Material/SurfaceMaterialProxy.hpp
+++ b/Core/include/Acts/Material/SurfaceMaterialProxy.hpp
@@ -1,13 +1,13 @@
-// This file is part of the ACTS project.
+// This file is part of the Acts project.
 //
-// Copyright (C) 2016-2017 ACTS project team
+// Copyright (C) 2016-2017 Acts project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
 // file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 ///////////////////////////////////////////////////////////////////
-// SurfaceMaterialProxy.hpp, ACTS project MaterialPlugins
+// SurfaceMaterialProxy.hpp, Acts project MaterialPlugins
 ///////////////////////////////////////////////////////////////////
 
 #pragma once
diff --git a/Core/include/Acts/Propagator/AbortList.hpp b/Core/include/Acts/Propagator/AbortList.hpp
index 4feec7713..ffb4e4fc6 100644
--- a/Core/include/Acts/Propagator/AbortList.hpp
+++ b/Core/include/Acts/Propagator/AbortList.hpp
@@ -1,6 +1,6 @@
-// This file is part of the ACTS project.
+// This file is part of the Acts project.
 //
-// Copyright (C) 2016-2018 ACTS project team
+// Copyright (C) 2016-2018 Acts project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/Core/include/Acts/Propagator/ActionList.hpp b/Core/include/Acts/Propagator/ActionList.hpp
index de7d8efea..46ef80473 100644
--- a/Core/include/Acts/Propagator/ActionList.hpp
+++ b/Core/include/Acts/Propagator/ActionList.hpp
@@ -1,6 +1,6 @@
-// This file is part of the ACTS project.
+// This file is part of the Acts project.
 //
-// Copyright (C) 2016-2018 ACTS project team
+// Copyright (C) 2016-2018 Acts project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/Core/include/Acts/Propagator/EigenStepper.hpp b/Core/include/Acts/Propagator/EigenStepper.hpp
index 9dd8e33ee..04a35b6cd 100644
--- a/Core/include/Acts/Propagator/EigenStepper.hpp
+++ b/Core/include/Acts/Propagator/EigenStepper.hpp
@@ -1,6 +1,6 @@
-// This file is part of the ACTS project.
+// This file is part of the Acts project.
 //
-// Copyright (C) 2016-2018 ACTS project team
+// Copyright (C) 2016-2018 Acts project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/Core/include/Acts/Propagator/Propagator.hpp b/Core/include/Acts/Propagator/Propagator.hpp
index 14ff95fc3..d95691a7b 100644
--- a/Core/include/Acts/Propagator/Propagator.hpp
+++ b/Core/include/Acts/Propagator/Propagator.hpp
@@ -1,6 +1,6 @@
-// This file is part of the ACTS project.
+// This file is part of the Acts project.
 //
-// Copyright (C) 2016-2018 ACTS project team
+// Copyright (C) 2016-2018 Acts project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/Core/include/Acts/Propagator/detail/Extendable.hpp b/Core/include/Acts/Propagator/detail/Extendable.hpp
index ead168553..7c222e4d6 100644
--- a/Core/include/Acts/Propagator/detail/Extendable.hpp
+++ b/Core/include/Acts/Propagator/detail/Extendable.hpp
@@ -1,6 +1,6 @@
-// This file is part of the ACTS project.
+// This file is part of the Acts project.
 //
-// Copyright (C) 2016-2018 ACTS project team
+// Copyright (C) 2016-2018 Acts project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/Core/include/Acts/Propagator/detail/abort_condition_signature_check.hpp b/Core/include/Acts/Propagator/detail/abort_condition_signature_check.hpp
index c15a77ccb..691a1787a 100644
--- a/Core/include/Acts/Propagator/detail/abort_condition_signature_check.hpp
+++ b/Core/include/Acts/Propagator/detail/abort_condition_signature_check.hpp
@@ -1,6 +1,6 @@
-// This file is part of the ACTS project.
+// This file is part of the Acts project.
 //
-// Copyright (C) 2016-2018 ACTS project team
+// Copyright (C) 2016-2018 Acts project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/Core/include/Acts/Propagator/detail/abort_list_implementation.hpp b/Core/include/Acts/Propagator/detail/abort_list_implementation.hpp
index d2df91371..fe1bf3111 100644
--- a/Core/include/Acts/Propagator/detail/abort_list_implementation.hpp
+++ b/Core/include/Acts/Propagator/detail/abort_list_implementation.hpp
@@ -1,6 +1,6 @@
-// This file is part of the ACTS project.
+// This file is part of the Acts project.
 //
-// Copyright (C) 2018 ACTS project team
+// Copyright (C) 2018 Acts project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/Core/include/Acts/Propagator/detail/action_list_implementation.hpp b/Core/include/Acts/Propagator/detail/action_list_implementation.hpp
index b4af936c8..ff0abfab2 100644
--- a/Core/include/Acts/Propagator/detail/action_list_implementation.hpp
+++ b/Core/include/Acts/Propagator/detail/action_list_implementation.hpp
@@ -1,6 +1,6 @@
-// This file is part of the ACTS project.
+// This file is part of the Acts project.
 //
-// Copyright (C) 2018 ACTS project team
+// Copyright (C) 2018 Acts project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/Core/include/Acts/Propagator/detail/action_signature_check.hpp b/Core/include/Acts/Propagator/detail/action_signature_check.hpp
index 276d4062a..a3927e78a 100644
--- a/Core/include/Acts/Propagator/detail/action_signature_check.hpp
+++ b/Core/include/Acts/Propagator/detail/action_signature_check.hpp
@@ -1,6 +1,6 @@
-// This file is part of the ACTS project.
+// This file is part of the Acts project.
 //
-// Copyright (C) 2016-2018 ACTS project team
+// Copyright (C) 2016-2018 Acts project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/Core/include/Acts/Propagator/detail/condition_uses_result_type.hpp b/Core/include/Acts/Propagator/detail/condition_uses_result_type.hpp
index 24fda6a41..e28593fb2 100644
--- a/Core/include/Acts/Propagator/detail/condition_uses_result_type.hpp
+++ b/Core/include/Acts/Propagator/detail/condition_uses_result_type.hpp
@@ -1,6 +1,6 @@
-// This file is part of the ACTS project.
+// This file is part of the Acts project.
 //
-// Copyright (C) 2016-2018 ACTS project team
+// Copyright (C) 2016-2018 Acts project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/Core/include/Acts/Propagator/detail/standard_abort_conditions.hpp b/Core/include/Acts/Propagator/detail/standard_abort_conditions.hpp
index 945f5313d..5c95dbed4 100644
--- a/Core/include/Acts/Propagator/detail/standard_abort_conditions.hpp
+++ b/Core/include/Acts/Propagator/detail/standard_abort_conditions.hpp
@@ -1,6 +1,6 @@
-// This file is part of the ACTS project.
+// This file is part of the Acts project.
 //
-// Copyright (C) 2017-2018 ACTS project team
+// Copyright (C) 2017-2018 Acts project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/Core/include/Acts/Seeding/BarrelSeedFinder.hpp b/Core/include/Acts/Seeding/BarrelSeedFinder.hpp
index 2339ef83f..ebfbf8963 100644
--- a/Core/include/Acts/Seeding/BarrelSeedFinder.hpp
+++ b/Core/include/Acts/Seeding/BarrelSeedFinder.hpp
@@ -1,6 +1,6 @@
-// This file is part of the ACTS project.
+// This file is part of the Acts project.
 //
-// Copyright (C) 2016 ACTS project team
+// Copyright (C) 2016 Acts project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/Core/include/Acts/Seeding/SpacePoint.hpp b/Core/include/Acts/Seeding/SpacePoint.hpp
index 9c0c3a318..aaa4b410a 100644
--- a/Core/include/Acts/Seeding/SpacePoint.hpp
+++ b/Core/include/Acts/Seeding/SpacePoint.hpp
@@ -1,6 +1,6 @@
-// This file is part of the ACTS project.
+// This file is part of the Acts project.
 //
-// Copyright (C) 2016 ACTS project team
+// Copyright (C) 2016 Acts project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/Core/include/Acts/Seeding/TrackSeed.hpp b/Core/include/Acts/Seeding/TrackSeed.hpp
index 5bf6c841d..26033aa4a 100644
--- a/Core/include/Acts/Seeding/TrackSeed.hpp
+++ b/Core/include/Acts/Seeding/TrackSeed.hpp
@@ -1,6 +1,6 @@
-// This file is part of the ACTS project.
+// This file is part of the Acts project.
 //
-// Copyright (C) 2016-2017 ACTS project team
+// Copyright (C) 2016-2017 Acts project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/Core/include/Acts/Seeding/detail/cyclic_range.hpp b/Core/include/Acts/Seeding/detail/cyclic_range.hpp
index 1d95da97d..3943cd258 100644
--- a/Core/include/Acts/Seeding/detail/cyclic_range.hpp
+++ b/Core/include/Acts/Seeding/detail/cyclic_range.hpp
@@ -1,6 +1,6 @@
-// This file is part of the ACTS project.
+// This file is part of the Acts project.
 //
-// Copyright (C) 2016 ACTS project team
+// Copyright (C) 2016 Acts project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/Core/include/Acts/Seeding/detail/geometry.hpp b/Core/include/Acts/Seeding/detail/geometry.hpp
index 79408e083..d61783c37 100644
--- a/Core/include/Acts/Seeding/detail/geometry.hpp
+++ b/Core/include/Acts/Seeding/detail/geometry.hpp
@@ -1,6 +1,6 @@
-// This file is part of the ACTS project.
+// This file is part of the Acts project.
 //
-// Copyright (C) 2016-2018 ACTS project team
+// Copyright (C) 2016-2018 Acts project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/Core/include/Acts/Surfaces/BoundaryCheck.hpp b/Core/include/Acts/Surfaces/BoundaryCheck.hpp
index 9e18d1122..84e7d4920 100644
--- a/Core/include/Acts/Surfaces/BoundaryCheck.hpp
+++ b/Core/include/Acts/Surfaces/BoundaryCheck.hpp
@@ -1,13 +1,13 @@
-// This file is part of the ACTS project.
+// This file is part of the Acts project.
 //
-// Copyright (C) 2016-2018 ACTS project team
+// Copyright (C) 2016-2018 Acts project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
 // file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 ///////////////////////////////////////////////////////////////////
-// BoundaryCheck.hpp, ACTS project
+// BoundaryCheck.hpp, Acts project
 ///////////////////////////////////////////////////////////////////
 
 #pragma once
diff --git a/Core/include/Acts/Surfaces/ConeBounds.hpp b/Core/include/Acts/Surfaces/ConeBounds.hpp
index c059018cb..b81ce01cd 100644
--- a/Core/include/Acts/Surfaces/ConeBounds.hpp
+++ b/Core/include/Acts/Surfaces/ConeBounds.hpp
@@ -1,13 +1,13 @@
-// This file is part of the ACTS project.
+// This file is part of the Acts project.
 //
-// Copyright (C) 2016-2017 ACTS project team
+// Copyright (C) 2016-2017 Acts project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
 // file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 ///////////////////////////////////////////////////////////////////
-// ConeBounds.h, ACTS project
+// ConeBounds.h, Acts project
 ///////////////////////////////////////////////////////////////////
 
 #pragma once
diff --git a/Core/include/Acts/Surfaces/ConeSurface.hpp b/Core/include/Acts/Surfaces/ConeSurface.hpp
index 7a1d00a8c..2456f7586 100644
--- a/Core/include/Acts/Surfaces/ConeSurface.hpp
+++ b/Core/include/Acts/Surfaces/ConeSurface.hpp
@@ -1,13 +1,13 @@
-// This file is part of the ACTS project.
+// This file is part of the Acts project.
 //
-// Copyright (C) 2016-2018 ACTS project team
+// Copyright (C) 2016-2018 Acts project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
 // file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 ///////////////////////////////////////////////////////////////////
-// ConeSurface.h, ACTS project
+// ConeSurface.h, Acts project
 ///////////////////////////////////////////////////////////////////
 
 #pragma once
diff --git a/Core/include/Acts/Surfaces/CylinderBounds.hpp b/Core/include/Acts/Surfaces/CylinderBounds.hpp
index 8f4497e6a..868b4c1dd 100644
--- a/Core/include/Acts/Surfaces/CylinderBounds.hpp
+++ b/Core/include/Acts/Surfaces/CylinderBounds.hpp
@@ -1,13 +1,13 @@
-// This file is part of the ACTS project.
+// This file is part of the Acts project.
 //
-// Copyright (C) 2016-2017 ACTS project team
+// Copyright (C) 2016-2017 Acts project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
 // file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 ///////////////////////////////////////////////////////////////////
-// CylinderBounds.h, ACTS project
+// CylinderBounds.h, Acts project
 ///////////////////////////////////////////////////////////////////
 
 #pragma once
diff --git a/Core/include/Acts/Surfaces/CylinderSurface.hpp b/Core/include/Acts/Surfaces/CylinderSurface.hpp
index d3be2e3a5..6cb7e9b8b 100644
--- a/Core/include/Acts/Surfaces/CylinderSurface.hpp
+++ b/Core/include/Acts/Surfaces/CylinderSurface.hpp
@@ -1,13 +1,13 @@
-// This file is part of the ACTS project.
+// This file is part of the Acts project.
 //
-// Copyright (C) 2016-2018 ACTS project team
+// Copyright (C) 2016-2018 Acts project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
 // file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 ///////////////////////////////////////////////////////////////////
-// CylinderSurface.h, ACTS project
+// CylinderSurface.h, Acts project
 ///////////////////////////////////////////////////////////////////
 
 #pragma once
diff --git a/Core/include/Acts/Surfaces/DiamondBounds.hpp b/Core/include/Acts/Surfaces/DiamondBounds.hpp
index 610631dad..9dfe29856 100644
--- a/Core/include/Acts/Surfaces/DiamondBounds.hpp
+++ b/Core/include/Acts/Surfaces/DiamondBounds.hpp
@@ -1,13 +1,13 @@
-// This file is part of the ACTS project.
+// This file is part of the Acts project.
 //
-// Copyright (C) 2016-2017 ACTS project team
+// Copyright (C) 2016-2017 Acts project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
 // file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 ///////////////////////////////////////////////////////////////////
-// DiamondBounds.h, ACTS project
+// DiamondBounds.h, Acts project
 ///////////////////////////////////////////////////////////////////
 
 #pragma once
diff --git a/Core/include/Acts/Surfaces/DiscBounds.hpp b/Core/include/Acts/Surfaces/DiscBounds.hpp
index ee1aaddf7..dffaa7c3b 100644
--- a/Core/include/Acts/Surfaces/DiscBounds.hpp
+++ b/Core/include/Acts/Surfaces/DiscBounds.hpp
@@ -1,13 +1,13 @@
-// This file is part of the ACTS project.
+// This file is part of the Acts project.
 //
-// Copyright (C) 2016-2017 ACTS project team
+// Copyright (C) 2016-2017 Acts project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
 // file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 ///////////////////////////////////////////////////////////////////
-// DiscBounds.h, ACTS project
+// DiscBounds.h, Acts project
 ///////////////////////////////////////////////////////////////////
 
 #pragma once
diff --git a/Core/include/Acts/Surfaces/DiscSurface.hpp b/Core/include/Acts/Surfaces/DiscSurface.hpp
index 2fad10845..b2ddd845c 100644
--- a/Core/include/Acts/Surfaces/DiscSurface.hpp
+++ b/Core/include/Acts/Surfaces/DiscSurface.hpp
@@ -1,13 +1,13 @@
-// This file is part of the ACTS project.
+// This file is part of the Acts project.
 //
-// Copyright (C) 2016-2018 ACTS project team
+// Copyright (C) 2016-2018 Acts project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
 // file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 ///////////////////////////////////////////////////////////////////
-// DiscSurface.h, ACTS project
+// DiscSurface.h, Acts project
 ///////////////////////////////////////////////////////////////////
 
 #pragma once
diff --git a/Core/include/Acts/Surfaces/DiscTrapezoidalBounds.hpp b/Core/include/Acts/Surfaces/DiscTrapezoidalBounds.hpp
index acf2df77e..838adf0db 100644
--- a/Core/include/Acts/Surfaces/DiscTrapezoidalBounds.hpp
+++ b/Core/include/Acts/Surfaces/DiscTrapezoidalBounds.hpp
@@ -1,13 +1,13 @@
-// This file is part of the ACTS project.
+// This file is part of the Acts project.
 //
-// Copyright (C) 2016-2017 ACTS project team
+// Copyright (C) 2016-2017 Acts project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
 // file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 ///////////////////////////////////////////////////////////////////
-// DiscTrapezoidalBounds.h, ACTS project
+// DiscTrapezoidalBounds.h, Acts project
 ///////////////////////////////////////////////////////////////////
 
 #pragma once
diff --git a/Core/include/Acts/Surfaces/EllipseBounds.hpp b/Core/include/Acts/Surfaces/EllipseBounds.hpp
index 2dd53d7c3..16d136fe4 100644
--- a/Core/include/Acts/Surfaces/EllipseBounds.hpp
+++ b/Core/include/Acts/Surfaces/EllipseBounds.hpp
@@ -1,13 +1,13 @@
-// This file is part of the ACTS project.
+// This file is part of the Acts project.
 //
-// Copyright (C) 2016-2017 ACTS project team
+// Copyright (C) 2016-2017 Acts project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
 // file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 ///////////////////////////////////////////////////////////////////
-// EllipseBounds.h, ACTS project
+// EllipseBounds.h, Acts project
 ///////////////////////////////////////////////////////////////////
 
 #pragma once
diff --git a/Core/include/Acts/Surfaces/InfiniteBounds.hpp b/Core/include/Acts/Surfaces/InfiniteBounds.hpp
index 3ea168736..a322a9ab4 100644
--- a/Core/include/Acts/Surfaces/InfiniteBounds.hpp
+++ b/Core/include/Acts/Surfaces/InfiniteBounds.hpp
@@ -1,13 +1,13 @@
-// This file is part of the ACTS project.
+// This file is part of the Acts project.
 //
-// Copyright (C) 2016-2018 ACTS project team
+// Copyright (C) 2016-2018 Acts project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
 // file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 ///////////////////////////////////////////////////////////////////
-// InfiniteBounds.h, ACTS project
+// InfiniteBounds.h, Acts project
 ///////////////////////////////////////////////////////////////////
 
 #pragma once
diff --git a/Core/include/Acts/Surfaces/LineBounds.hpp b/Core/include/Acts/Surfaces/LineBounds.hpp
index e1d94a59b..01511ca6f 100644
--- a/Core/include/Acts/Surfaces/LineBounds.hpp
+++ b/Core/include/Acts/Surfaces/LineBounds.hpp
@@ -1,13 +1,13 @@
-// This file is part of the ACTS project.
+// This file is part of the Acts project.
 //
-// Copyright (C) 2016-2017 ACTS project team
+// Copyright (C) 2016-2017 Acts project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
 // file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 ///////////////////////////////////////////////////////////////////
-// LineBounds.h, ACTS project
+// LineBounds.h, Acts project
 ///////////////////////////////////////////////////////////////////
 
 #pragma once
diff --git a/Core/include/Acts/Surfaces/LineSurface.hpp b/Core/include/Acts/Surfaces/LineSurface.hpp
index d7e3a2f53..deb1740e0 100644
--- a/Core/include/Acts/Surfaces/LineSurface.hpp
+++ b/Core/include/Acts/Surfaces/LineSurface.hpp
@@ -1,13 +1,13 @@
-// This file is part of the ACTS project.
+// This file is part of the Acts project.
 //
-// Copyright (C) 2016-2018 ACTS project team
+// Copyright (C) 2016-2018 Acts project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
 // file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 /////////////////////////////////////////////////////////////////
-// LineSurface.h, ACTS project
+// LineSurface.h, Acts project
 ///////////////////////////////////////////////////////////////////
 
 #pragma once
diff --git a/Core/include/Acts/Surfaces/PerigeeSurface.hpp b/Core/include/Acts/Surfaces/PerigeeSurface.hpp
index 84d6c5103..b68797453 100644
--- a/Core/include/Acts/Surfaces/PerigeeSurface.hpp
+++ b/Core/include/Acts/Surfaces/PerigeeSurface.hpp
@@ -1,13 +1,13 @@
-// This file is part of the ACTS project.
+// This file is part of the Acts project.
 //
-// Copyright (C) 2016-2017 ACTS project team
+// Copyright (C) 2016-2017 Acts project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
 // file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 /////////////////////////////////////////////////////////////////
-// PerigeeSurface.h, ACTS project
+// PerigeeSurface.h, Acts project
 ///////////////////////////////////////////////////////////////////
 
 #pragma once
diff --git a/Core/include/Acts/Surfaces/PlanarBounds.hpp b/Core/include/Acts/Surfaces/PlanarBounds.hpp
index c10b041b2..c904b3d94 100644
--- a/Core/include/Acts/Surfaces/PlanarBounds.hpp
+++ b/Core/include/Acts/Surfaces/PlanarBounds.hpp
@@ -1,13 +1,13 @@
-// This file is part of the ACTS project.
+// This file is part of the Acts project.
 //
-// Copyright (C) 2016-2017 ACTS project team
+// Copyright (C) 2016-2017 Acts project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
 // file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 ///////////////////////////////////////////////////////////////////
-// PlanarBounds.h, ACTS project
+// PlanarBounds.h, Acts project
 ///////////////////////////////////////////////////////////////////
 
 #pragma once
diff --git a/Core/include/Acts/Surfaces/PlaneSurface.hpp b/Core/include/Acts/Surfaces/PlaneSurface.hpp
index de665ef7e..ece17baf5 100644
--- a/Core/include/Acts/Surfaces/PlaneSurface.hpp
+++ b/Core/include/Acts/Surfaces/PlaneSurface.hpp
@@ -1,13 +1,13 @@
-// This file is part of the ACTS project.
+// This file is part of the Acts project.
 //
-// Copyright (C) 2016-2018 ACTS project team
+// Copyright (C) 2016-2018 Acts project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
 // file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 ///////////////////////////////////////////////////////////////////
-// PlaneSurface.h, ACTS project
+// PlaneSurface.h, Acts project
 ///////////////////////////////////////////////////////////////////
 
 #pragma once
diff --git a/Core/include/Acts/Surfaces/RadialBounds.hpp b/Core/include/Acts/Surfaces/RadialBounds.hpp
index e5a6b3583..26e978003 100644
--- a/Core/include/Acts/Surfaces/RadialBounds.hpp
+++ b/Core/include/Acts/Surfaces/RadialBounds.hpp
@@ -1,6 +1,6 @@
-// This file is part of the ACTS project.
+// This file is part of the Acts project.
 //
-// Copyright (C) 2016-2017 ACTS project team
+// Copyright (C) 2016-2017 Acts project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/Core/include/Acts/Surfaces/RectangleBounds.hpp b/Core/include/Acts/Surfaces/RectangleBounds.hpp
index 01e3f8b25..9446ef512 100644
--- a/Core/include/Acts/Surfaces/RectangleBounds.hpp
+++ b/Core/include/Acts/Surfaces/RectangleBounds.hpp
@@ -1,13 +1,13 @@
-// This file is part of the ACTS project.
+// This file is part of the Acts project.
 //
-// Copyright (C) 2016-2017 ACTS project team
+// Copyright (C) 2016-2017 Acts project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
 // file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 ///////////////////////////////////////////////////////////////////
-// RectangleBounds.h, ACTS project
+// RectangleBounds.h, Acts project
 ///////////////////////////////////////////////////////////////////
 
 #pragma once
diff --git a/Core/include/Acts/Surfaces/StrawSurface.hpp b/Core/include/Acts/Surfaces/StrawSurface.hpp
index a58be5195..83ee355c9 100644
--- a/Core/include/Acts/Surfaces/StrawSurface.hpp
+++ b/Core/include/Acts/Surfaces/StrawSurface.hpp
@@ -1,13 +1,13 @@
-// This file is part of the ACTS project.
+// This file is part of the Acts project.
 //
-// Copyright (C) 2016-2018 ACTS project team
+// Copyright (C) 2016-2018 Acts project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
 // file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 /////////////////////////////////////////////////////////////////
-// StrawSurface.h, ACTS project
+// StrawSurface.h, Acts project
 ///////////////////////////////////////////////////////////////////
 
 #pragma once
diff --git a/Core/include/Acts/Surfaces/Surface.hpp b/Core/include/Acts/Surfaces/Surface.hpp
index aba9a9d5a..0a4228541 100644
--- a/Core/include/Acts/Surfaces/Surface.hpp
+++ b/Core/include/Acts/Surfaces/Surface.hpp
@@ -1,13 +1,13 @@
-// This file is part of the ACTS project.
+// This file is part of the Acts project.
 //
-// Copyright (C) 2016-2018 ACTS project team
+// Copyright (C) 2016-2018 Acts project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
 // file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 ///////////////////////////////////////////////////////////////////
-// Surface.h, ACTS project
+// Surface.h, Acts project
 ///////////////////////////////////////////////////////////////////
 
 #pragma once
@@ -35,7 +35,7 @@ class TrackingVolume;
 ///
 /// @brief Abstract Base Class for tracking surfaces
 ///
-/// The Surface class builds the core of the ACTS Tracking Geometry.
+/// The Surface class builds the core of the Acts Tracking Geometry.
 /// All other geometrical objects are either extending the surface or
 /// are built from it.
 ///
diff --git a/Core/include/Acts/Surfaces/SurfaceArray.hpp b/Core/include/Acts/Surfaces/SurfaceArray.hpp
index 54e82284c..ba81236e6 100644
--- a/Core/include/Acts/Surfaces/SurfaceArray.hpp
+++ b/Core/include/Acts/Surfaces/SurfaceArray.hpp
@@ -1,6 +1,6 @@
-// This file is part of the ACTS project.
+// This file is part of the Acts project.
 //
-// Copyright (C) 2017-2018 ACTS project team
+// Copyright (C) 2017-2018 Acts project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/Core/include/Acts/Surfaces/SurfaceBounds.hpp b/Core/include/Acts/Surfaces/SurfaceBounds.hpp
index bbaedff4b..124a748c0 100644
--- a/Core/include/Acts/Surfaces/SurfaceBounds.hpp
+++ b/Core/include/Acts/Surfaces/SurfaceBounds.hpp
@@ -1,13 +1,13 @@
-// This file is part of the ACTS project.
+// This file is part of the Acts project.
 //
-// Copyright (C) 2016-2017 ACTS project team
+// Copyright (C) 2016-2017 Acts project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
 // file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 ///////////////////////////////////////////////////////////////////
-// SurfaceBounds.h, ACTS project
+// SurfaceBounds.h, Acts project
 ///////////////////////////////////////////////////////////////////
 
 #pragma once
diff --git a/Core/include/Acts/Surfaces/TrapezoidBounds.hpp b/Core/include/Acts/Surfaces/TrapezoidBounds.hpp
index 7b986fdf9..e87902957 100644
--- a/Core/include/Acts/Surfaces/TrapezoidBounds.hpp
+++ b/Core/include/Acts/Surfaces/TrapezoidBounds.hpp
@@ -1,13 +1,13 @@
-// This file is part of the ACTS project.
+// This file is part of the Acts project.
 //
-// Copyright (C) 2016-2017 ACTS project team
+// Copyright (C) 2016-2017 Acts project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
 // file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 ///////////////////////////////////////////////////////////////////
-// TrapezoidBounds.h, ACTS project
+// TrapezoidBounds.h, Acts project
 ///////////////////////////////////////////////////////////////////
 
 #pragma once
diff --git a/Core/include/Acts/Surfaces/TriangleBounds.hpp b/Core/include/Acts/Surfaces/TriangleBounds.hpp
index 8e61913b1..b0858b1d7 100644
--- a/Core/include/Acts/Surfaces/TriangleBounds.hpp
+++ b/Core/include/Acts/Surfaces/TriangleBounds.hpp
@@ -1,13 +1,13 @@
-// This file is part of the ACTS project.
+// This file is part of the Acts project.
 //
-// Copyright (C) 2016-2017 ACTS project team
+// Copyright (C) 2016-2017 Acts project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
 // file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 ///////////////////////////////////////////////////////////////////
-// TriangleBounds.h, ACTS project
+// TriangleBounds.h, Acts project
 ///////////////////////////////////////////////////////////////////
 
 #pragma once
diff --git a/Core/include/Acts/Tools/CylinderVolumeBuilder.hpp b/Core/include/Acts/Tools/CylinderVolumeBuilder.hpp
index 4eb7f989a..5764dbbc4 100644
--- a/Core/include/Acts/Tools/CylinderVolumeBuilder.hpp
+++ b/Core/include/Acts/Tools/CylinderVolumeBuilder.hpp
@@ -1,13 +1,13 @@
-// This file is part of the ACTS project.
+// This file is part of the Acts project.
 //
-// Copyright (C) 2016-2017 ACTS project team
+// Copyright (C) 2016-2017 Acts project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
 // file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 ///////////////////////////////////////////////////////////////////
-// CylinderVolumeBuilder.h, ACTS project
+// CylinderVolumeBuilder.h, Acts project
 ///////////////////////////////////////////////////////////////////
 
 #pragma once
diff --git a/Core/include/Acts/Tools/CylinderVolumeHelper.hpp b/Core/include/Acts/Tools/CylinderVolumeHelper.hpp
index 54e090b0f..da4353180 100644
--- a/Core/include/Acts/Tools/CylinderVolumeHelper.hpp
+++ b/Core/include/Acts/Tools/CylinderVolumeHelper.hpp
@@ -1,13 +1,13 @@
-// This file is part of the ACTS project.
+// This file is part of the Acts project.
 //
-// Copyright (C) 2016-2017 ACTS project team
+// Copyright (C) 2016-2017 Acts project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
 // file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 ///////////////////////////////////////////////////////////////////
-// CylinderVolumeHelper.h, ACTS project
+// CylinderVolumeHelper.h, Acts project
 ///////////////////////////////////////////////////////////////////
 
 #pragma once
diff --git a/Core/include/Acts/Tools/ILayerArrayCreator.hpp b/Core/include/Acts/Tools/ILayerArrayCreator.hpp
index 1e9e33c3d..50dd3a22c 100644
--- a/Core/include/Acts/Tools/ILayerArrayCreator.hpp
+++ b/Core/include/Acts/Tools/ILayerArrayCreator.hpp
@@ -1,13 +1,13 @@
-// This file is part of the ACTS project.
+// This file is part of the Acts project.
 //
-// Copyright (C) 2016 ACTS project team
+// Copyright (C) 2016 Acts project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
 // file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 ///////////////////////////////////////////////////////////////////
-// ILayerArrayCreator.h, ACTS project
+// ILayerArrayCreator.h, Acts project
 ///////////////////////////////////////////////////////////////////
 
 #pragma once
diff --git a/Core/include/Acts/Tools/ILayerBuilder.hpp b/Core/include/Acts/Tools/ILayerBuilder.hpp
index d20794602..66f071c62 100644
--- a/Core/include/Acts/Tools/ILayerBuilder.hpp
+++ b/Core/include/Acts/Tools/ILayerBuilder.hpp
@@ -1,13 +1,13 @@
-// This file is part of the ACTS project.
+// This file is part of the Acts project.
 //
-// Copyright (C) 2016 ACTS project team
+// Copyright (C) 2016 Acts project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
 // file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 ///////////////////////////////////////////////////////////////////
-// ILayerBuilder.h, ACTS project
+// ILayerBuilder.h, Acts project
 ///////////////////////////////////////////////////////////////////
 
 #pragma once
diff --git a/Core/include/Acts/Tools/ITrackingGeometryBuilder.hpp b/Core/include/Acts/Tools/ITrackingGeometryBuilder.hpp
index e679e9d21..2dd5a03a0 100644
--- a/Core/include/Acts/Tools/ITrackingGeometryBuilder.hpp
+++ b/Core/include/Acts/Tools/ITrackingGeometryBuilder.hpp
@@ -1,13 +1,13 @@
-// This file is part of the ACTS project.
+// This file is part of the Acts project.
 //
-// Copyright (C) 2016-2017 ACTS project team
+// Copyright (C) 2016-2017 Acts project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
 // file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 ///////////////////////////////////////////////////////////////////
-// ITrackingGeometryBuilder.h, ACTS project
+// ITrackingGeometryBuilder.h, Acts project
 ///////////////////////////////////////////////////////////////////
 
 #pragma once
diff --git a/Core/include/Acts/Tools/ITrackingVolumeArrayCreator.hpp b/Core/include/Acts/Tools/ITrackingVolumeArrayCreator.hpp
index 55a68975c..7defec5e4 100644
--- a/Core/include/Acts/Tools/ITrackingVolumeArrayCreator.hpp
+++ b/Core/include/Acts/Tools/ITrackingVolumeArrayCreator.hpp
@@ -1,13 +1,13 @@
-// This file is part of the ACTS project.
+// This file is part of the Acts project.
 //
-// Copyright (C) 2016-2017 ACTS project team
+// Copyright (C) 2016-2017 Acts project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
 // file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 ///////////////////////////////////////////////////////////////////
-// ITrackingVolumeArrayCreator.h, ACTS project
+// ITrackingVolumeArrayCreator.h, Acts project
 ///////////////////////////////////////////////////////////////////
 
 #pragma once
diff --git a/Core/include/Acts/Tools/ITrackingVolumeBuilder.hpp b/Core/include/Acts/Tools/ITrackingVolumeBuilder.hpp
index dbe61f5d2..1f1c93fa1 100644
--- a/Core/include/Acts/Tools/ITrackingVolumeBuilder.hpp
+++ b/Core/include/Acts/Tools/ITrackingVolumeBuilder.hpp
@@ -1,13 +1,13 @@
-// This file is part of the ACTS project.
+// This file is part of the Acts project.
 //
-// Copyright (C) 2016-2017 ACTS project team
+// Copyright (C) 2016-2017 Acts project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
 // file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 ///////////////////////////////////////////////////////////////////
-// ITrackingVolumeBuilder.h, ACTS project
+// ITrackingVolumeBuilder.h, Acts project
 ///////////////////////////////////////////////////////////////////
 
 #pragma once
diff --git a/Core/include/Acts/Tools/ITrackingVolumeHelper.hpp b/Core/include/Acts/Tools/ITrackingVolumeHelper.hpp
index 734e7706d..d2f137e8e 100644
--- a/Core/include/Acts/Tools/ITrackingVolumeHelper.hpp
+++ b/Core/include/Acts/Tools/ITrackingVolumeHelper.hpp
@@ -1,13 +1,13 @@
-// This file is part of the ACTS project.
+// This file is part of the Acts project.
 //
-// Copyright (C) 2016-2017 ACTS project team
+// Copyright (C) 2016-2017 Acts project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
 // file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 ///////////////////////////////////////////////////////////////////
-// ITrackingVolumeHelper.h, ACTS project
+// ITrackingVolumeHelper.h, Acts project
 ///////////////////////////////////////////////////////////////////
 
 #pragma once
diff --git a/Core/include/Acts/Tools/LayerArrayCreator.hpp b/Core/include/Acts/Tools/LayerArrayCreator.hpp
index eb40242ac..da204a582 100644
--- a/Core/include/Acts/Tools/LayerArrayCreator.hpp
+++ b/Core/include/Acts/Tools/LayerArrayCreator.hpp
@@ -1,13 +1,13 @@
-// This file is part of the ACTS project.
+// This file is part of the Acts project.
 //
-// Copyright (C) 2016-2017 ACTS project team
+// Copyright (C) 2016-2017 Acts project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
 // file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 ///////////////////////////////////////////////////////////////////
-// LayerArrayCreator.h, ACTS project
+// LayerArrayCreator.h, Acts project
 ///////////////////////////////////////////////////////////////////
 
 #pragma once
diff --git a/Core/include/Acts/Tools/LayerCreator.hpp b/Core/include/Acts/Tools/LayerCreator.hpp
index 1c7fbbd24..1748a891b 100644
--- a/Core/include/Acts/Tools/LayerCreator.hpp
+++ b/Core/include/Acts/Tools/LayerCreator.hpp
@@ -1,13 +1,13 @@
-// This file is part of the ACTS project.
+// This file is part of the Acts project.
 //
-// Copyright (C) 2016-2018 ACTS project team
+// Copyright (C) 2016-2018 Acts project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
 // file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 ///////////////////////////////////////////////////////////////////
-// LayerCreator.h, ACTS project
+// LayerCreator.h, Acts project
 ///////////////////////////////////////////////////////////////////
 
 #pragma once
diff --git a/Core/include/Acts/Tools/PassiveLayerBuilder.hpp b/Core/include/Acts/Tools/PassiveLayerBuilder.hpp
index 1ea2abae3..451578913 100644
--- a/Core/include/Acts/Tools/PassiveLayerBuilder.hpp
+++ b/Core/include/Acts/Tools/PassiveLayerBuilder.hpp
@@ -1,13 +1,13 @@
-// This file is part of the ACTS project.
+// This file is part of the Acts project.
 //
-// Copyright (C) 2016-2017 ACTS project team
+// Copyright (C) 2016-2017 Acts project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
 // file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 ///////////////////////////////////////////////////////////////////
-// PassiveLayerBuilder.h, ACTS project
+// PassiveLayerBuilder.h, Acts project
 ///////////////////////////////////////////////////////////////////
 
 #pragma once
diff --git a/Core/include/Acts/Tools/SurfaceArrayCreator.hpp b/Core/include/Acts/Tools/SurfaceArrayCreator.hpp
index fe1193dcf..69d43de18 100644
--- a/Core/include/Acts/Tools/SurfaceArrayCreator.hpp
+++ b/Core/include/Acts/Tools/SurfaceArrayCreator.hpp
@@ -1,13 +1,13 @@
-// This file is part of the ACTS project.
+// This file is part of the Acts project.
 //
-// Copyright (C) 2016-2018 ACTS project team
+// Copyright (C) 2016-2018 Acts project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
 // file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 ///////////////////////////////////////////////////////////////////
-// SurfaceArrayCreator.h, ACTS project
+// SurfaceArrayCreator.h, Acts project
 ///////////////////////////////////////////////////////////////////
 
 #pragma once
diff --git a/Core/include/Acts/Tools/TrackingGeometryBuilder.hpp b/Core/include/Acts/Tools/TrackingGeometryBuilder.hpp
index 02297b8b5..80cd03430 100644
--- a/Core/include/Acts/Tools/TrackingGeometryBuilder.hpp
+++ b/Core/include/Acts/Tools/TrackingGeometryBuilder.hpp
@@ -1,13 +1,13 @@
-// This file is part of the ACTS project.
+// This file is part of the Acts project.
 //
-// Copyright (C) 2016-2017 ACTS project team
+// Copyright (C) 2016-2017 Acts project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
 // file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 ///////////////////////////////////////////////////////////////////
-// TrackingGeometryBuilder.h, ACTS project
+// TrackingGeometryBuilder.h, Acts project
 ///////////////////////////////////////////////////////////////////
 
 #pragma once
diff --git a/Core/include/Acts/Tools/TrackingVolumeArrayCreator.hpp b/Core/include/Acts/Tools/TrackingVolumeArrayCreator.hpp
index 72516347d..d72ed525e 100644
--- a/Core/include/Acts/Tools/TrackingVolumeArrayCreator.hpp
+++ b/Core/include/Acts/Tools/TrackingVolumeArrayCreator.hpp
@@ -1,13 +1,13 @@
-// This file is part of the ACTS project.
+// This file is part of the Acts project.
 //
-// Copyright (C) 2016-2017 ACTS project team
+// Copyright (C) 2016-2017 Acts project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
 // file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 ///////////////////////////////////////////////////////////////////
-// TrackingVolumeArrayCreator.h, ACTS project
+// TrackingVolumeArrayCreator.h, Acts project
 ///////////////////////////////////////////////////////////////////
 
 #pragma once
diff --git a/Core/include/Acts/Utilities/ApproachDescriptor.hpp b/Core/include/Acts/Utilities/ApproachDescriptor.hpp
index 1cf2ef404..7aba6c5fa 100644
--- a/Core/include/Acts/Utilities/ApproachDescriptor.hpp
+++ b/Core/include/Acts/Utilities/ApproachDescriptor.hpp
@@ -1,13 +1,13 @@
-// This file is part of the ACTS project.
+// This file is part of the Acts project.
 //
-// Copyright (C) 2016-2017 ACTS project team
+// Copyright (C) 2016-2017 Acts project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
 // file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 ///////////////////////////////////////////////////////////////////
-// ApproachDescriptor.h, ACTS project
+// ApproachDescriptor.h, Acts project
 ///////////////////////////////////////////////////////////////////
 
 #pragma once
diff --git a/Core/include/Acts/Utilities/BFieldMapUtils.hpp b/Core/include/Acts/Utilities/BFieldMapUtils.hpp
index 15c2746e6..079f5cab4 100644
--- a/Core/include/Acts/Utilities/BFieldMapUtils.hpp
+++ b/Core/include/Acts/Utilities/BFieldMapUtils.hpp
@@ -1,6 +1,6 @@
-// This file is part of the ACTS project.
+// This file is part of the Acts project.
 //
-// Copyright (C) 2017 ACTS project team
+// Copyright (C) 2017 Acts project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/Core/include/Acts/Utilities/BinUtility.hpp b/Core/include/Acts/Utilities/BinUtility.hpp
index e4b56f191..06301b491 100644
--- a/Core/include/Acts/Utilities/BinUtility.hpp
+++ b/Core/include/Acts/Utilities/BinUtility.hpp
@@ -1,13 +1,13 @@
-// This file is part of the ACTS project.
+// This file is part of the Acts project.
 //
-// Copyright (C) 2016-2017 ACTS project team
+// Copyright (C) 2016-2017 Acts project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
 // file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 ///////////////////////////////////////////////////////////////////
-// BinUtility.h, ACTS project
+// BinUtility.h, Acts project
 ///////////////////////////////////////////////////////////////////
 
 #pragma once
diff --git a/Core/include/Acts/Utilities/BinnedArray.hpp b/Core/include/Acts/Utilities/BinnedArray.hpp
index 66143eeca..52df8a5b5 100644
--- a/Core/include/Acts/Utilities/BinnedArray.hpp
+++ b/Core/include/Acts/Utilities/BinnedArray.hpp
@@ -1,13 +1,13 @@
-// This file is part of the ACTS project.
+// This file is part of the Acts project.
 //
-// Copyright (C) 2016-2017 ACTS project team
+// Copyright (C) 2016-2017 Acts project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
 // file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 ///////////////////////////////////////////////////////////////////
-// BinnedArray.h, ACTS project
+// BinnedArray.h, Acts project
 ///////////////////////////////////////////////////////////////////
 
 #pragma once
diff --git a/Core/include/Acts/Utilities/BinnedArrayXD.hpp b/Core/include/Acts/Utilities/BinnedArrayXD.hpp
index f4dee908d..6d66f67a3 100644
--- a/Core/include/Acts/Utilities/BinnedArrayXD.hpp
+++ b/Core/include/Acts/Utilities/BinnedArrayXD.hpp
@@ -1,13 +1,13 @@
-// This file is part of the ACTS project.
+// This file is part of the Acts project.
 //
-// Copyright (C) 2016-2017 ACTS project team
+// Copyright (C) 2016-2017 Acts project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
 // file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 ///////////////////////////////////////////////////////////////////
-// BinnedArrayXD.h, ACTS project
+// BinnedArrayXD.h, Acts project
 ///////////////////////////////////////////////////////////////////
 
 #pragma once
diff --git a/Core/include/Acts/Utilities/BinningData.hpp b/Core/include/Acts/Utilities/BinningData.hpp
index ad92d9e96..470d30a37 100644
--- a/Core/include/Acts/Utilities/BinningData.hpp
+++ b/Core/include/Acts/Utilities/BinningData.hpp
@@ -1,13 +1,13 @@
-// This file is part of the ACTS project.
+// This file is part of the Acts project.
 //
-// Copyright (C) 2016-2018 ACTS project team
+// Copyright (C) 2016-2018 Acts project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
 // file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 ///////////////////////////////////////////////////////////////////
-// BinUtility.h, ACTS project
+// BinUtility.h, Acts project
 ///////////////////////////////////////////////////////////////////
 #pragma once
 #include <cmath>
diff --git a/Core/include/Acts/Utilities/BinningType.hpp b/Core/include/Acts/Utilities/BinningType.hpp
index 1534a0491..694f79c65 100644
--- a/Core/include/Acts/Utilities/BinningType.hpp
+++ b/Core/include/Acts/Utilities/BinningType.hpp
@@ -1,13 +1,13 @@
-// This file is part of the ACTS project.
+// This file is part of the Acts project.
 //
-// Copyright (C) 2016-2017 ACTS project team
+// Copyright (C) 2016-2017 Acts project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
 // file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 ///////////////////////////////////////////////////////////////////
-// BinningType.h, ACTS project
+// BinningType.h, Acts project
 ///////////////////////////////////////////////////////////////////
 
 #pragma once
diff --git a/Core/include/Acts/Utilities/Definitions.hpp b/Core/include/Acts/Utilities/Definitions.hpp
index 61c39f996..45e5e5555 100644
--- a/Core/include/Acts/Utilities/Definitions.hpp
+++ b/Core/include/Acts/Utilities/Definitions.hpp
@@ -1,6 +1,6 @@
-// This file is part of the ACTS project.
+// This file is part of the Acts project.
 //
-// Copyright (C) 2016-2018 ACTS project team
+// Copyright (C) 2016-2018 Acts project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/Core/include/Acts/Utilities/GeometryID.hpp b/Core/include/Acts/Utilities/GeometryID.hpp
index 3d9739152..84a87d2b6 100644
--- a/Core/include/Acts/Utilities/GeometryID.hpp
+++ b/Core/include/Acts/Utilities/GeometryID.hpp
@@ -1,13 +1,13 @@
-// This file is part of the ACTS project.
+// This file is part of the Acts project.
 //
-// Copyright (C) 2016-2017 ACTS project team
+// Copyright (C) 2016-2017 Acts project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
 // file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 ///////////////////////////////////////////////////////////////////
-// GeometryID.h, ACTS project
+// GeometryID.h, Acts project
 ///////////////////////////////////////////////////////////////////
 
 #pragma once
diff --git a/Core/include/Acts/Utilities/GeometryObject.hpp b/Core/include/Acts/Utilities/GeometryObject.hpp
index cb4596f0b..e4efa5565 100644
--- a/Core/include/Acts/Utilities/GeometryObject.hpp
+++ b/Core/include/Acts/Utilities/GeometryObject.hpp
@@ -1,13 +1,13 @@
-// This file is part of the ACTS project.
+// This file is part of the Acts project.
 //
-// Copyright (C) 2016-2017 ACTS project team
+// Copyright (C) 2016-2017 Acts project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
 // file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 ///////////////////////////////////////////////////////////////////
-// GeometryObject.h, ACTS project
+// GeometryObject.h, Acts project
 ///////////////////////////////////////////////////////////////////
 
 #pragma once
diff --git a/Core/include/Acts/Utilities/GeometryObjectSorter.hpp b/Core/include/Acts/Utilities/GeometryObjectSorter.hpp
index 7b0de6a22..735378efe 100644
--- a/Core/include/Acts/Utilities/GeometryObjectSorter.hpp
+++ b/Core/include/Acts/Utilities/GeometryObjectSorter.hpp
@@ -1,13 +1,13 @@
-// This file is part of the ACTS project.
+// This file is part of the Acts project.
 //
-// Copyright (C) 2016-2017 ACTS project team
+// Copyright (C) 2016-2017 Acts project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
 // file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 ///////////////////////////////////////////////////////////////////
-// GeometryObjectSorter.h, ACTS project
+// GeometryObjectSorter.h, Acts project
 ///////////////////////////////////////////////////////////////////
 
 #pragma once
diff --git a/Core/include/Acts/Utilities/GeometrySignature.hpp b/Core/include/Acts/Utilities/GeometrySignature.hpp
index 5c05297c8..bea315be2 100644
--- a/Core/include/Acts/Utilities/GeometrySignature.hpp
+++ b/Core/include/Acts/Utilities/GeometrySignature.hpp
@@ -1,13 +1,13 @@
-// This file is part of the ACTS project.
+// This file is part of the Acts project.
 //
-// Copyright (C) 2016 ACTS project team
+// Copyright (C) 2016 Acts project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
 // file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 ///////////////////////////////////////////////////////////////////
-// GeometrySignature.h, ACTS project
+// GeometrySignature.h, Acts project
 ///////////////////////////////////////////////////////////////////
 
 #pragma once
diff --git a/Core/include/Acts/Utilities/GeometryStatics.hpp b/Core/include/Acts/Utilities/GeometryStatics.hpp
index 16ac66440..ea6d604f2 100644
--- a/Core/include/Acts/Utilities/GeometryStatics.hpp
+++ b/Core/include/Acts/Utilities/GeometryStatics.hpp
@@ -1,13 +1,13 @@
-// This file is part of the ACTS project.
+// This file is part of the Acts project.
 //
-// Copyright (C) 2016-2017 ACTS project team
+// Copyright (C) 2016-2017 Acts project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
 // file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 ///////////////////////////////////////////////////////////////////
-// GeometryStatics.h, ACTS project
+// GeometryStatics.h, Acts project
 ///////////////////////////////////////////////////////////////////
 
 #pragma once
diff --git a/Core/include/Acts/Utilities/Helpers.hpp b/Core/include/Acts/Utilities/Helpers.hpp
index 202885704..75f5ae1e0 100644
--- a/Core/include/Acts/Utilities/Helpers.hpp
+++ b/Core/include/Acts/Utilities/Helpers.hpp
@@ -1,13 +1,13 @@
-// This file is part of the ACTS project.
+// This file is part of the Acts project.
 //
-// Copyright (C) 2016-2017 ACTS project team
+// Copyright (C) 2016-2017 Acts project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
 // file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 ///////////////////////////////////////////////////////////////////
-// AlgebraHelper.h, ACTS project
+// AlgebraHelper.h, Acts project
 ///////////////////////////////////////////////////////////////////
 
 #pragma once
@@ -17,7 +17,7 @@
 #include <iostream>
 #include <string>
 
-// ACTS include(s)
+// Acts include(s)
 #include "Definitions.hpp"
 
 #ifndef ACTS_BIT_CODING
diff --git a/Core/include/Acts/Utilities/IAxis.hpp b/Core/include/Acts/Utilities/IAxis.hpp
index edf895977..006dfc1b1 100644
--- a/Core/include/Acts/Utilities/IAxis.hpp
+++ b/Core/include/Acts/Utilities/IAxis.hpp
@@ -1,6 +1,6 @@
-// This file is part of the ACTS project.
+// This file is part of the Acts project.
 //
-// Copyright (C) 2018 ACTS project team
+// Copyright (C) 2018 Acts project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/Core/include/Acts/Utilities/Identifier.hpp b/Core/include/Acts/Utilities/Identifier.hpp
index 18e3029a5..528f43f03 100644
--- a/Core/include/Acts/Utilities/Identifier.hpp
+++ b/Core/include/Acts/Utilities/Identifier.hpp
@@ -1,13 +1,13 @@
-// This file is part of the ACTS project.
+// This file is part of the Acts project.
 //
-// Copyright (C) 2016-2017 ACTS project team
+// Copyright (C) 2016-2017 Acts project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
 // file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 ///////////////////////////////////////////////////////////////////
-// Identifier.h, ACTS project
+// Identifier.h, Acts project
 ///////////////////////////////////////////////////////////////////
 
 #pragma once
diff --git a/Core/include/Acts/Utilities/InstanceFactory.hpp b/Core/include/Acts/Utilities/InstanceFactory.hpp
index 7c9fcc6ec..59c491957 100644
--- a/Core/include/Acts/Utilities/InstanceFactory.hpp
+++ b/Core/include/Acts/Utilities/InstanceFactory.hpp
@@ -1,6 +1,6 @@
-// This file is part of the ACTS project.
+// This file is part of the Acts project.
 //
-// Copyright (C) 2018 ACTS project team
+// Copyright (C) 2018 Acts project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/Core/include/Acts/Utilities/Interpolation.hpp b/Core/include/Acts/Utilities/Interpolation.hpp
index 41edd7043..1f4b35d9e 100644
--- a/Core/include/Acts/Utilities/Interpolation.hpp
+++ b/Core/include/Acts/Utilities/Interpolation.hpp
@@ -1,6 +1,6 @@
-// This file is part of the ACTS project.
+// This file is part of the Acts project.
 //
-// Copyright (C) 2017 ACTS project team
+// Copyright (C) 2017 Acts project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/Core/include/Acts/Utilities/Intersection.hpp b/Core/include/Acts/Utilities/Intersection.hpp
index 7a0ca9615..ecfc9fae8 100644
--- a/Core/include/Acts/Utilities/Intersection.hpp
+++ b/Core/include/Acts/Utilities/Intersection.hpp
@@ -1,13 +1,13 @@
-// This file is part of the ACTS project.
+// This file is part of the Acts project.
 //
-// Copyright (C) 2016-2017 ACTS project team
+// Copyright (C) 2016-2017 Acts project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
 // file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 ///////////////////////////////////////////////////////////////////
-// Intersection.h, ACTS project
+// Intersection.h, Acts project
 ///////////////////////////////////////////////////////////////////
 
 #pragma once
diff --git a/Core/include/Acts/Utilities/Logger.hpp b/Core/include/Acts/Utilities/Logger.hpp
index 823115722..bfe07c40f 100644
--- a/Core/include/Acts/Utilities/Logger.hpp
+++ b/Core/include/Acts/Utilities/Logger.hpp
@@ -1,6 +1,6 @@
-// This file is part of the ACTS project.
+// This file is part of the Acts project.
 //
-// Copyright (C) 2016-2018 ACTS project team
+// Copyright (C) 2016-2018 Acts project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/Core/include/Acts/Utilities/MaterialInteraction.hpp b/Core/include/Acts/Utilities/MaterialInteraction.hpp
index 33850beb0..4b5948124 100644
--- a/Core/include/Acts/Utilities/MaterialInteraction.hpp
+++ b/Core/include/Acts/Utilities/MaterialInteraction.hpp
@@ -1,6 +1,6 @@
-// This file is part of the ACTS project.
+// This file is part of the Acts project.
 //
-// Copyright (C) 2017 ACTS project team
+// Copyright (C) 2017 Acts project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/Core/include/Acts/Utilities/ParameterDefinitions.hpp b/Core/include/Acts/Utilities/ParameterDefinitions.hpp
index e5318d9ba..0a7c2c53e 100644
--- a/Core/include/Acts/Utilities/ParameterDefinitions.hpp
+++ b/Core/include/Acts/Utilities/ParameterDefinitions.hpp
@@ -1,6 +1,6 @@
-// This file is part of the ACTS project.
+// This file is part of the Acts project.
 //
-// Copyright (C) 2016-2017 ACTS project team
+// Copyright (C) 2016-2017 Acts project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/Core/include/Acts/Utilities/ParameterTypes.hpp b/Core/include/Acts/Utilities/ParameterTypes.hpp
index 310c761b0..c9e05915f 100644
--- a/Core/include/Acts/Utilities/ParameterTypes.hpp
+++ b/Core/include/Acts/Utilities/ParameterTypes.hpp
@@ -1,6 +1,6 @@
-// This file is part of the ACTS project.
+// This file is part of the Acts project.
 //
-// Copyright (C) 2016 ACTS project team
+// Copyright (C) 2016 Acts project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/Core/include/Acts/Utilities/ThrowAssert.hpp b/Core/include/Acts/Utilities/ThrowAssert.hpp
index 26a3286eb..8523d25f4 100644
--- a/Core/include/Acts/Utilities/ThrowAssert.hpp
+++ b/Core/include/Acts/Utilities/ThrowAssert.hpp
@@ -1,6 +1,6 @@
-// This file is part of the ACTS project.
+// This file is part of the Acts project.
 //
-// Copyright (C) 2018 ACTS project team
+// Copyright (C) 2018 Acts project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/Core/include/Acts/Utilities/Units.hpp b/Core/include/Acts/Utilities/Units.hpp
index d660db767..c9099b537 100644
--- a/Core/include/Acts/Utilities/Units.hpp
+++ b/Core/include/Acts/Utilities/Units.hpp
@@ -1,6 +1,6 @@
-// This file is part of the ACTS project.
+// This file is part of the Acts project.
 //
-// Copyright (C) 2016-2017 ACTS project team
+// Copyright (C) 2016-2017 Acts project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
@@ -15,7 +15,7 @@ namespace Acts {
 /// calculations, one should make use of the constants defined in this
 /// namespace to express the units of numerical values. The following
 /// conventions are used:
-/// - Input values to ACTS must be given as `numerical_value * unit_constant`.
+/// - Input values to Acts must be given as `numerical_value * unit_constant`.
 /// - Output values can be converted into the desired unit using
 ///   `numerical_value / unit_constant`.
 /// - Converting between SI and natural units should be done using the template
diff --git a/Core/include/Acts/Utilities/VariantData.hpp b/Core/include/Acts/Utilities/VariantData.hpp
index f8f373673..f137464de 100644
--- a/Core/include/Acts/Utilities/VariantData.hpp
+++ b/Core/include/Acts/Utilities/VariantData.hpp
@@ -1,6 +1,6 @@
-// This file is part of the ACTS project.
+// This file is part of the Acts project.
 //
-// Copyright (C) 2018 ACTS project team
+// Copyright (C) 2018 Acts project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/Core/include/Acts/Utilities/VariantDataFwd.hpp b/Core/include/Acts/Utilities/VariantDataFwd.hpp
index c98dd471b..47bf823f2 100644
--- a/Core/include/Acts/Utilities/VariantDataFwd.hpp
+++ b/Core/include/Acts/Utilities/VariantDataFwd.hpp
@@ -1,6 +1,6 @@
-// This file is part of the ACTS project.
+// This file is part of the Acts project.
 //
-// Copyright (C) 2018 ACTS project team
+// Copyright (C) 2018 Acts project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/Core/include/Acts/Utilities/concept/AnyGrid.hpp b/Core/include/Acts/Utilities/concept/AnyGrid.hpp
index d64f8a25f..c622f31f5 100644
--- a/Core/include/Acts/Utilities/concept/AnyGrid.hpp
+++ b/Core/include/Acts/Utilities/concept/AnyGrid.hpp
@@ -1,6 +1,6 @@
-// This file is part of the ACTS project.
+// This file is part of the Acts project.
 //
-// Copyright (C) 2017-2018 ACTS project team
+// Copyright (C) 2017-2018 Acts project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/Core/include/Acts/Utilities/detail/Axis.hpp b/Core/include/Acts/Utilities/detail/Axis.hpp
index 517a8b7e9..e885b224f 100644
--- a/Core/include/Acts/Utilities/detail/Axis.hpp
+++ b/Core/include/Acts/Utilities/detail/Axis.hpp
@@ -1,6 +1,6 @@
-// This file is part of the ACTS project.
+// This file is part of the Acts project.
 //
-// Copyright (C) 2017-2018 ACTS project team
+// Copyright (C) 2017-2018 Acts project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/Core/include/Acts/Utilities/detail/DefaultParameterDefinitions.hpp b/Core/include/Acts/Utilities/detail/DefaultParameterDefinitions.hpp
index cc7af3f62..a38adc736 100644
--- a/Core/include/Acts/Utilities/detail/DefaultParameterDefinitions.hpp
+++ b/Core/include/Acts/Utilities/detail/DefaultParameterDefinitions.hpp
@@ -1,6 +1,6 @@
-// This file is part of the ACTS project.
+// This file is part of the Acts project.
 //
-// Copyright (C) 2016-2017 ACTS project team
+// Copyright (C) 2016-2017 Acts project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
@@ -10,7 +10,7 @@
 // STL include(s)
 #include <cmath>
 
-// ACTS includes
+// Acts includes
 #include "Acts/Utilities/ParameterTypes.hpp"
 
 namespace Acts {
diff --git a/Core/include/Acts/Utilities/detail/Grid.hpp b/Core/include/Acts/Utilities/detail/Grid.hpp
index 306edd421..f852cbc84 100644
--- a/Core/include/Acts/Utilities/detail/Grid.hpp
+++ b/Core/include/Acts/Utilities/detail/Grid.hpp
@@ -1,6 +1,6 @@
-// This file is part of the ACTS project.
+// This file is part of the Acts project.
 //
-// Copyright (C) 2017-2018 ACTS project team
+// Copyright (C) 2017-2018 Acts project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/Core/include/Acts/Utilities/detail/MPL/all_of.hpp b/Core/include/Acts/Utilities/detail/MPL/all_of.hpp
index 1da5a9413..bf88ae205 100644
--- a/Core/include/Acts/Utilities/detail/MPL/all_of.hpp
+++ b/Core/include/Acts/Utilities/detail/MPL/all_of.hpp
@@ -1,6 +1,6 @@
-// This file is part of the ACTS project.
+// This file is part of the Acts project.
 //
-// Copyright (C) 2016 ACTS project team
+// Copyright (C) 2016 Acts project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/Core/include/Acts/Utilities/detail/MPL/any_of.hpp b/Core/include/Acts/Utilities/detail/MPL/any_of.hpp
index 6eee966f0..d2b49c986 100644
--- a/Core/include/Acts/Utilities/detail/MPL/any_of.hpp
+++ b/Core/include/Acts/Utilities/detail/MPL/any_of.hpp
@@ -1,6 +1,6 @@
-// This file is part of the ACTS project.
+// This file is part of the Acts project.
 //
-// Copyright (C) 2016 ACTS project team
+// Copyright (C) 2016 Acts project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/Core/include/Acts/Utilities/detail/MPL/are_sorted.hpp b/Core/include/Acts/Utilities/detail/MPL/are_sorted.hpp
index 5e37eeafb..f5e2b8bd3 100644
--- a/Core/include/Acts/Utilities/detail/MPL/are_sorted.hpp
+++ b/Core/include/Acts/Utilities/detail/MPL/are_sorted.hpp
@@ -1,6 +1,6 @@
-// This file is part of the ACTS project.
+// This file is part of the Acts project.
 //
-// Copyright (C) 2016 ACTS project team
+// Copyright (C) 2016 Acts project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/Core/include/Acts/Utilities/detail/MPL/are_within.hpp b/Core/include/Acts/Utilities/detail/MPL/are_within.hpp
index 9b77e5498..a7bc5698e 100644
--- a/Core/include/Acts/Utilities/detail/MPL/are_within.hpp
+++ b/Core/include/Acts/Utilities/detail/MPL/are_within.hpp
@@ -1,6 +1,6 @@
-// This file is part of the ACTS project.
+// This file is part of the Acts project.
 //
-// Copyright (C) 2016 ACTS project team
+// Copyright (C) 2016 Acts project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/Core/include/Acts/Utilities/detail/MPL/at_index.hpp b/Core/include/Acts/Utilities/detail/MPL/at_index.hpp
index e4ddd3c98..5a3101b5e 100644
--- a/Core/include/Acts/Utilities/detail/MPL/at_index.hpp
+++ b/Core/include/Acts/Utilities/detail/MPL/at_index.hpp
@@ -1,6 +1,6 @@
-// This file is part of the ACTS project.
+// This file is part of the Acts project.
 //
-// Copyright (C) 2016 ACTS project team
+// Copyright (C) 2016 Acts project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/Core/include/Acts/Utilities/detail/MPL/boost_mpl_helper.hpp b/Core/include/Acts/Utilities/detail/MPL/boost_mpl_helper.hpp
index 29824a420..021ac8987 100644
--- a/Core/include/Acts/Utilities/detail/MPL/boost_mpl_helper.hpp
+++ b/Core/include/Acts/Utilities/detail/MPL/boost_mpl_helper.hpp
@@ -1,6 +1,6 @@
-// This file is part of the ACTS project.
+// This file is part of the Acts project.
 //
-// Copyright (C) 2016 ACTS project team
+// Copyright (C) 2016 Acts project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/Core/include/Acts/Utilities/detail/MPL/get_position.hpp b/Core/include/Acts/Utilities/detail/MPL/get_position.hpp
index d654aac10..6b29a29c9 100644
--- a/Core/include/Acts/Utilities/detail/MPL/get_position.hpp
+++ b/Core/include/Acts/Utilities/detail/MPL/get_position.hpp
@@ -1,6 +1,6 @@
-// This file is part of the ACTS project.
+// This file is part of the Acts project.
 //
-// Copyright (C) 2016 ACTS project team
+// Copyright (C) 2016 Acts project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/Core/include/Acts/Utilities/detail/MPL/has_duplicates.hpp b/Core/include/Acts/Utilities/detail/MPL/has_duplicates.hpp
index 35bd8493a..4b1e587fa 100644
--- a/Core/include/Acts/Utilities/detail/MPL/has_duplicates.hpp
+++ b/Core/include/Acts/Utilities/detail/MPL/has_duplicates.hpp
@@ -1,6 +1,6 @@
-// This file is part of the ACTS project.
+// This file is part of the Acts project.
 //
-// Copyright (C) 2016 ACTS project team
+// Copyright (C) 2016 Acts project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/Core/include/Acts/Utilities/detail/MPL/is_contained.hpp b/Core/include/Acts/Utilities/detail/MPL/is_contained.hpp
index 7d6d9683c..2aa8be26c 100644
--- a/Core/include/Acts/Utilities/detail/MPL/is_contained.hpp
+++ b/Core/include/Acts/Utilities/detail/MPL/is_contained.hpp
@@ -1,6 +1,6 @@
-// This file is part of the ACTS project.
+// This file is part of the Acts project.
 //
-// Copyright (C) 2016 ACTS project team
+// Copyright (C) 2016 Acts project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/Core/include/Acts/Utilities/detail/MPL/type_collector.hpp b/Core/include/Acts/Utilities/detail/MPL/type_collector.hpp
index 8b84252d7..d1bca029d 100644
--- a/Core/include/Acts/Utilities/detail/MPL/type_collector.hpp
+++ b/Core/include/Acts/Utilities/detail/MPL/type_collector.hpp
@@ -1,6 +1,6 @@
-// This file is part of the ACTS project.
+// This file is part of the Acts project.
 //
-// Copyright (C) 2016-2018 ACTS project team
+// Copyright (C) 2016-2018 Acts project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/Core/include/Acts/Utilities/detail/MatrixBasePlugin.hpp b/Core/include/Acts/Utilities/detail/MatrixBasePlugin.hpp
index 30b341e31..01c30663f 100644
--- a/Core/include/Acts/Utilities/detail/MatrixBasePlugin.hpp
+++ b/Core/include/Acts/Utilities/detail/MatrixBasePlugin.hpp
@@ -1,13 +1,13 @@
-// This file is part of the ACTS project.
+// This file is part of the Acts project.
 //
-// Copyright (C) 2016-2018 ACTS project team
+// Copyright (C) 2016-2018 Acts project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
 // file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 ///////////////////////////////////////////////////////////////////
-// AmgMatrixPlugin.h, ACTS project
+// AmgMatrixPlugin.h, Acts project
 ///////////////////////////////////////////////////////////////////
 
 #pragma once
diff --git a/Core/include/Acts/Utilities/detail/MatrixPlugin.hpp b/Core/include/Acts/Utilities/detail/MatrixPlugin.hpp
index ad875f1eb..88b05b4c7 100644
--- a/Core/include/Acts/Utilities/detail/MatrixPlugin.hpp
+++ b/Core/include/Acts/Utilities/detail/MatrixPlugin.hpp
@@ -1,6 +1,6 @@
-// This file is part of the ACTS project.
+// This file is part of the Acts project.
 //
-// Copyright (C) 2016 ACTS project team
+// Copyright (C) 2016 Acts project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/Core/include/Acts/Utilities/detail/RealQuadraticEquation.hpp b/Core/include/Acts/Utilities/detail/RealQuadraticEquation.hpp
index 26c2f0b31..c23ba164e 100644
--- a/Core/include/Acts/Utilities/detail/RealQuadraticEquation.hpp
+++ b/Core/include/Acts/Utilities/detail/RealQuadraticEquation.hpp
@@ -1,13 +1,13 @@
-// This file is part of the ACTS project.
+// This file is part of the Acts project.
 //
-// Copyright (C) 2017 ACTS project team
+// Copyright (C) 2017 Acts project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
 // file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 ///////////////////////////////////////////////////////////////////
-// RealQuadraticEquation.h, ACTS project
+// RealQuadraticEquation.h, Acts project
 ///////////////////////////////////////////////////////////////////
 
 #pragma once
diff --git a/Core/include/Acts/Utilities/detail/TransformPlugin.hpp b/Core/include/Acts/Utilities/detail/TransformPlugin.hpp
index ffc64c7b8..7ee20f326 100644
--- a/Core/include/Acts/Utilities/detail/TransformPlugin.hpp
+++ b/Core/include/Acts/Utilities/detail/TransformPlugin.hpp
@@ -1,13 +1,13 @@
-// This file is part of the ACTS project.
+// This file is part of the Acts project.
 //
-// Copyright (C) 2016 ACTS project team
+// Copyright (C) 2016 Acts project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
 // file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 ///////////////////////////////////////////////////////////////////
-// GeoPrimitivesHelpers.h, ACTS project
+// GeoPrimitivesHelpers.h, Acts project
 ///////////////////////////////////////////////////////////////////
 
 #pragma once
diff --git a/Core/include/Acts/Utilities/detail/grid_helper.hpp b/Core/include/Acts/Utilities/detail/grid_helper.hpp
index 0dd7fdc78..248d4d70e 100644
--- a/Core/include/Acts/Utilities/detail/grid_helper.hpp
+++ b/Core/include/Acts/Utilities/detail/grid_helper.hpp
@@ -1,6 +1,6 @@
-// This file is part of the ACTS project.
+// This file is part of the Acts project.
 //
-// Copyright (C) 2017-2018 ACTS project team
+// Copyright (C) 2017-2018 Acts project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/Core/include/Acts/Utilities/detail/interpolation_impl.hpp b/Core/include/Acts/Utilities/detail/interpolation_impl.hpp
index 1e2df1fa6..7ddf926f1 100644
--- a/Core/include/Acts/Utilities/detail/interpolation_impl.hpp
+++ b/Core/include/Acts/Utilities/detail/interpolation_impl.hpp
@@ -1,6 +1,6 @@
-// This file is part of the ACTS project.
+// This file is part of the Acts project.
 //
-// Copyright (C) 2017 ACTS project team
+// Copyright (C) 2017 Acts project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/Core/include/Acts/Utilities/detail/periodic.hpp b/Core/include/Acts/Utilities/detail/periodic.hpp
index f252b2cc8..b9417e889 100644
--- a/Core/include/Acts/Utilities/detail/periodic.hpp
+++ b/Core/include/Acts/Utilities/detail/periodic.hpp
@@ -1,6 +1,6 @@
-// This file is part of the ACTS project.
+// This file is part of the Acts project.
 //
-// Copyright (C) 2016 ACTS project team
+// Copyright (C) 2016 Acts project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/Core/include/Acts/Volumes/AbstractVolume.hpp b/Core/include/Acts/Volumes/AbstractVolume.hpp
index 9a39a15ff..74bc899c0 100644
--- a/Core/include/Acts/Volumes/AbstractVolume.hpp
+++ b/Core/include/Acts/Volumes/AbstractVolume.hpp
@@ -1,13 +1,13 @@
-// This file is part of the ACTS project.
+// This file is part of the Acts project.
 //
-// Copyright (C) 2016-2017 ACTS project team
+// Copyright (C) 2016-2017 Acts project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
 // file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 ///////////////////////////////////////////////////////////////////
-// AbstractVolume.h, ACTS project
+// AbstractVolume.h, Acts project
 ///////////////////////////////////////////////////////////////////
 
 #pragma once
diff --git a/Core/include/Acts/Volumes/BoundarySurfaceFace.hpp b/Core/include/Acts/Volumes/BoundarySurfaceFace.hpp
index 260fa1118..04cf72275 100644
--- a/Core/include/Acts/Volumes/BoundarySurfaceFace.hpp
+++ b/Core/include/Acts/Volumes/BoundarySurfaceFace.hpp
@@ -1,13 +1,13 @@
-// This file is part of the ACTS project.
+// This file is part of the Acts project.
 //
-// Copyright (C) 2016 ACTS project team
+// Copyright (C) 2016 Acts project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
 // file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 ///////////////////////////////////////////////////////////////////
-// BoundarySurfaceFace.h, ACTS project
+// BoundarySurfaceFace.h, Acts project
 ///////////////////////////////////////////////////////////////////
 
 #pragma once
diff --git a/Core/include/Acts/Volumes/BoundarySurfaceT.hpp b/Core/include/Acts/Volumes/BoundarySurfaceT.hpp
index 31a8e45a4..854682622 100644
--- a/Core/include/Acts/Volumes/BoundarySurfaceT.hpp
+++ b/Core/include/Acts/Volumes/BoundarySurfaceT.hpp
@@ -1,13 +1,13 @@
-// This file is part of the ACTS project.
+// This file is part of the Acts project.
 //
-// Copyright (C) 2016-2017 ACTS project team
+// Copyright (C) 2016-2017 Acts project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
 // file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 ///////////////////////////////////////////////////////////////////
-// BoundarySurfaceT.h, ACTS project
+// BoundarySurfaceT.h, Acts project
 ///////////////////////////////////////////////////////////////////
 
 #pragma once
diff --git a/Core/include/Acts/Volumes/CuboidVolumeBounds.hpp b/Core/include/Acts/Volumes/CuboidVolumeBounds.hpp
index 35d099492..896bd6504 100644
--- a/Core/include/Acts/Volumes/CuboidVolumeBounds.hpp
+++ b/Core/include/Acts/Volumes/CuboidVolumeBounds.hpp
@@ -1,13 +1,13 @@
-// This file is part of the ACTS project.
+// This file is part of the Acts project.
 //
-// Copyright (C) 2016-2017 ACTS project team
+// Copyright (C) 2016-2017 Acts project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
 // file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 ///////////////////////////////////////////////////////////////////
-// CuboidVolumeBounds.h, ACTS project
+// CuboidVolumeBounds.h, Acts project
 ///////////////////////////////////////////////////////////////////
 
 #pragma once
diff --git a/Core/include/Acts/Volumes/CylinderVolumeBounds.hpp b/Core/include/Acts/Volumes/CylinderVolumeBounds.hpp
index 2892e7842..272dabcb0 100644
--- a/Core/include/Acts/Volumes/CylinderVolumeBounds.hpp
+++ b/Core/include/Acts/Volumes/CylinderVolumeBounds.hpp
@@ -1,13 +1,13 @@
-// This file is part of the ACTS project.
+// This file is part of the Acts project.
 //
-// Copyright (C) 2016-2017 ACTS project team
+// Copyright (C) 2016-2017 Acts project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
 // file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 ///////////////////////////////////////////////////////////////////
-// CylinderVolumeBounds.h, ACTS project
+// CylinderVolumeBounds.h, Acts project
 ///////////////////////////////////////////////////////////////////
 
 #pragma once
diff --git a/Core/include/Acts/Volumes/DoubleTrapezoidVolumeBounds.hpp b/Core/include/Acts/Volumes/DoubleTrapezoidVolumeBounds.hpp
index 54b639f70..11c94a645 100644
--- a/Core/include/Acts/Volumes/DoubleTrapezoidVolumeBounds.hpp
+++ b/Core/include/Acts/Volumes/DoubleTrapezoidVolumeBounds.hpp
@@ -1,13 +1,13 @@
-// This file is part of the ACTS project.
+// This file is part of the Acts project.
 //
-// Copyright (C) 2016-2017 ACTS project team
+// Copyright (C) 2016-2017 Acts project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
 // file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 ///////////////////////////////////////////////////////////////////
-// DoubleTrapezoidVolumeBounds.h, ACTS project
+// DoubleTrapezoidVolumeBounds.h, Acts project
 ///////////////////////////////////////////////////////////////////
 
 #pragma once
diff --git a/Core/include/Acts/Volumes/TrapezoidVolumeBounds.hpp b/Core/include/Acts/Volumes/TrapezoidVolumeBounds.hpp
index aa8b642c0..36c33166d 100644
--- a/Core/include/Acts/Volumes/TrapezoidVolumeBounds.hpp
+++ b/Core/include/Acts/Volumes/TrapezoidVolumeBounds.hpp
@@ -1,13 +1,13 @@
-// This file is part of the ACTS project.
+// This file is part of the Acts project.
 //
-// Copyright (C) 2016-2017 ACTS project team
+// Copyright (C) 2016-2017 Acts project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
 // file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 ///////////////////////////////////////////////////////////////////
-// TrapezoidVolumeBounds.h, ACTS project
+// TrapezoidVolumeBounds.h, Acts project
 ///////////////////////////////////////////////////////////////////
 
 #pragma once
diff --git a/Core/include/Acts/Volumes/Volume.hpp b/Core/include/Acts/Volumes/Volume.hpp
index cfecd5082..31e1c8deb 100644
--- a/Core/include/Acts/Volumes/Volume.hpp
+++ b/Core/include/Acts/Volumes/Volume.hpp
@@ -1,13 +1,13 @@
-// This file is part of the ACTS project.
+// This file is part of the Acts project.
 //
-// Copyright (C) 2016-2017 ACTS project team
+// Copyright (C) 2016-2017 Acts project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
 // file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 ///////////////////////////////////////////////////////////////////
-// AbstractVolume.h, ACTS project
+// AbstractVolume.h, Acts project
 ///////////////////////////////////////////////////////////////////
 #pragma once
 #include <memory>
diff --git a/Core/include/Acts/Volumes/VolumeBounds.hpp b/Core/include/Acts/Volumes/VolumeBounds.hpp
index f28435baa..f2db2fe7d 100644
--- a/Core/include/Acts/Volumes/VolumeBounds.hpp
+++ b/Core/include/Acts/Volumes/VolumeBounds.hpp
@@ -1,13 +1,13 @@
-// This file is part of the ACTS project.
+// This file is part of the Acts project.
 //
-// Copyright (C) 2016-2017 ACTS project team
+// Copyright (C) 2016-2017 Acts project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
 // file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 ///////////////////////////////////////////////////////////////////
-// VolumeBounds.h, ACTS project
+// VolumeBounds.h, Acts project
 ///////////////////////////////////////////////////////////////////
 
 #pragma once
diff --git a/Core/src/Detector/DetachedTrackingVolume.cpp b/Core/src/Detector/DetachedTrackingVolume.cpp
index 66a5c7150..37a4fa027 100644
--- a/Core/src/Detector/DetachedTrackingVolume.cpp
+++ b/Core/src/Detector/DetachedTrackingVolume.cpp
@@ -1,13 +1,13 @@
-// This file is part of the ACTS project.
+// This file is part of the Acts project.
 //
-// Copyright (C) 2016-2017 ACTS project team
+// Copyright (C) 2016-2017 Acts project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
 // file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 ///////////////////////////////////////////////////////////////////
-// DetachedTrackingVolume.cpp, ACTS project
+// DetachedTrackingVolume.cpp, Acts project
 ///////////////////////////////////////////////////////////////////
 
 // Geometry module
diff --git a/Core/src/Detector/GlueVolumesDescriptor.cpp b/Core/src/Detector/GlueVolumesDescriptor.cpp
index 4b3a5b4fe..13bb46ffb 100644
--- a/Core/src/Detector/GlueVolumesDescriptor.cpp
+++ b/Core/src/Detector/GlueVolumesDescriptor.cpp
@@ -1,13 +1,13 @@
-// This file is part of the ACTS project.
+// This file is part of the Acts project.
 //
-// Copyright (C) 2016-2017 ACTS project team
+// Copyright (C) 2016-2017 Acts project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
 // file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 ///////////////////////////////////////////////////////////////////
-// GlueVolumesDescriptor.cpp, ACTS project
+// GlueVolumesDescriptor.cpp, Acts project
 ///////////////////////////////////////////////////////////////////
 
 #include "Acts/Detector/GlueVolumesDescriptor.hpp"
diff --git a/Core/src/Detector/TrackingGeometry.cpp b/Core/src/Detector/TrackingGeometry.cpp
index fd99adb21..90c72e1c6 100644
--- a/Core/src/Detector/TrackingGeometry.cpp
+++ b/Core/src/Detector/TrackingGeometry.cpp
@@ -1,13 +1,13 @@
-// This file is part of the ACTS project.
+// This file is part of the Acts project.
 //
-// Copyright (C) 2016-2017 ACTS project team
+// Copyright (C) 2016-2017 Acts project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
 // file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 ///////////////////////////////////////////////////////////////////
-// TrackingGeometry.cpp, ACTS project
+// TrackingGeometry.cpp, Acts project
 ///////////////////////////////////////////////////////////////////
 
 #include "Acts/Detector/TrackingGeometry.hpp"
diff --git a/Core/src/Detector/TrackingVolume.cpp b/Core/src/Detector/TrackingVolume.cpp
index e084094c6..a1c74b0c8 100644
--- a/Core/src/Detector/TrackingVolume.cpp
+++ b/Core/src/Detector/TrackingVolume.cpp
@@ -1,13 +1,13 @@
-// This file is part of the ACTS project.
+// This file is part of the Acts project.
 //
-// Copyright (C) 2016-2017 ACTS project team
+// Copyright (C) 2016-2017 Acts project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
 // file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 ///////////////////////////////////////////////////////////////////
-// TrackingVolume.cpp, ACTS project
+// TrackingVolume.cpp, Acts project
 ///////////////////////////////////////////////////////////////////
 
 #include "Acts/Detector/TrackingVolume.hpp"
diff --git a/Core/src/Digitization/CartesianSegmentation.cpp b/Core/src/Digitization/CartesianSegmentation.cpp
index c1f45bd43..1d1e01e22 100644
--- a/Core/src/Digitization/CartesianSegmentation.cpp
+++ b/Core/src/Digitization/CartesianSegmentation.cpp
@@ -1,13 +1,13 @@
-// This file is part of the ACTS project.
+// This file is part of the Acts project.
 //
-// Copyright (C) 2016-2017 ACTS project team
+// Copyright (C) 2016-2017 Acts project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
 // file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 ///////////////////////////////////////////////////////////////////
-// CartesianSegmentation.cpp, ACTS project
+// CartesianSegmentation.cpp, Acts project
 ///////////////////////////////////////////////////////////////////
 
 #include "Acts/Digitization/CartesianSegmentation.hpp"
diff --git a/Core/src/Digitization/Clusterization.cpp b/Core/src/Digitization/Clusterization.cpp
index 24784af79..71d1d0125 100644
--- a/Core/src/Digitization/Clusterization.cpp
+++ b/Core/src/Digitization/Clusterization.cpp
@@ -1,6 +1,6 @@
-// This file is part of the ACTS project.
+// This file is part of the Acts project.
 //
-// Copyright (C) 2018 ACTS project team
+// Copyright (C) 2018 Acts project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/Core/src/Digitization/DigitizationModule.cpp b/Core/src/Digitization/DigitizationModule.cpp
index 31bb955f0..4c35ece3b 100644
--- a/Core/src/Digitization/DigitizationModule.cpp
+++ b/Core/src/Digitization/DigitizationModule.cpp
@@ -1,13 +1,13 @@
-// This file is part of the ACTS project.
+// This file is part of the Acts project.
 //
-// Copyright (C) 2016 ACTS project team
+// Copyright (C) 2016 Acts project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
 // file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 ///////////////////////////////////////////////////////////////////
-// DigitizationModule.cpp, ACTS project
+// DigitizationModule.cpp, Acts project
 ///////////////////////////////////////////////////////////////////
 
 #include "Acts/Digitization/DigitizationModule.hpp"
diff --git a/Core/src/Digitization/PlanarModuleStepper.cpp b/Core/src/Digitization/PlanarModuleStepper.cpp
index a92f5dd52..d29b68eff 100644
--- a/Core/src/Digitization/PlanarModuleStepper.cpp
+++ b/Core/src/Digitization/PlanarModuleStepper.cpp
@@ -1,13 +1,13 @@
-// This file is part of the ACTS project.
+// This file is part of the Acts project.
 //
-// Copyright (C) 2016-2017 ACTS project team
+// Copyright (C) 2016-2017 Acts project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
 // file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 ///////////////////////////////////////////////////////////////////
-// PlanarModuleStepper.cpp, ACTS project
+// PlanarModuleStepper.cpp, Acts project
 ///////////////////////////////////////////////////////////////////
 
 #include "Acts/Digitization//PlanarModuleStepper.hpp"
diff --git a/Core/src/Digitization/PolarSegmentation.cpp b/Core/src/Digitization/PolarSegmentation.cpp
index 31893d0d2..782215bab 100644
--- a/Core/src/Digitization/PolarSegmentation.cpp
+++ b/Core/src/Digitization/PolarSegmentation.cpp
@@ -1,13 +1,13 @@
-// This file is part of the ACTS project.
+// This file is part of the Acts project.
 //
-// Copyright (C) 2016-2017 ACTS project team
+// Copyright (C) 2016-2017 Acts project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
 // file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 ///////////////////////////////////////////////////////////////////
-// TrapezoidSegmentation.cpp, ACTS project
+// TrapezoidSegmentation.cpp, Acts project
 ///////////////////////////////////////////////////////////////////
 
 /*
diff --git a/Core/src/EventData/NeutralParameters.cpp b/Core/src/EventData/NeutralParameters.cpp
index 96f93a25e..ec1213e01 100644
--- a/Core/src/EventData/NeutralParameters.cpp
+++ b/Core/src/EventData/NeutralParameters.cpp
@@ -1,6 +1,6 @@
-// This file is part of the ACTS project.
+// This file is part of the Acts project.
 //
-// Copyright (C) 2016 ACTS project team
+// Copyright (C) 2016 Acts project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/Core/src/EventData/TrackParameters.cpp b/Core/src/EventData/TrackParameters.cpp
index cedfb08df..d8c82ca00 100644
--- a/Core/src/EventData/TrackParameters.cpp
+++ b/Core/src/EventData/TrackParameters.cpp
@@ -1,6 +1,6 @@
-// This file is part of the ACTS project.
+// This file is part of the Acts project.
 //
-// Copyright (C) 2016 ACTS project team
+// Copyright (C) 2016 Acts project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/Core/src/EventData/TrackParametersBase.cpp b/Core/src/EventData/TrackParametersBase.cpp
index 21c371d63..59a90e517 100644
--- a/Core/src/EventData/TrackParametersBase.cpp
+++ b/Core/src/EventData/TrackParametersBase.cpp
@@ -1,6 +1,6 @@
-// This file is part of the ACTS project.
+// This file is part of the Acts project.
 //
-// Copyright (C) 2016 ACTS project team
+// Copyright (C) 2016 Acts project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
@@ -9,7 +9,7 @@
 // STL include(s)
 #include <iomanip>
 
-// ACTS include(s)
+// Acts include(s)
 #include "Acts/EventData/TrackParametersBase.hpp"
 
 namespace Acts {
diff --git a/Core/src/EventData/TransportJacobian.cpp b/Core/src/EventData/TransportJacobian.cpp
index bfd7329ba..42653fe16 100644
--- a/Core/src/EventData/TransportJacobian.cpp
+++ b/Core/src/EventData/TransportJacobian.cpp
@@ -1,13 +1,13 @@
-// This file is part of the ACTS project.
+// This file is part of the Acts project.
 //
-// Copyright (C) 2016 ACTS project team
+// Copyright (C) 2016 Acts project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
 // file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 ///////////////////////////////////////////////////////////////////
-// TransportJacobian.cpp, ACTS project
+// TransportJacobian.cpp, Acts project
 ///////////////////////////////////////////////////////////////////
 
 #include "Acts/EventData/TransportJacobian.hpp"
diff --git a/Core/src/GeometryUtils/BinUtility.cpp b/Core/src/GeometryUtils/BinUtility.cpp
index 0bdd14565..c1e83669d 100644
--- a/Core/src/GeometryUtils/BinUtility.cpp
+++ b/Core/src/GeometryUtils/BinUtility.cpp
@@ -1,13 +1,13 @@
-// This file is part of the ACTS project.
+// This file is part of the Acts project.
 //
-// Copyright (C) 2016 ACTS project team
+// Copyright (C) 2016 Acts project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
 // file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 ///////////////////////////////////////////////////////////////////
-// BinUtility.cpp, ACTS project
+// BinUtility.cpp, Acts project
 ///////////////////////////////////////////////////////////////////
 
 // Trk
diff --git a/Core/src/GeometryUtils/GeometryID.cpp b/Core/src/GeometryUtils/GeometryID.cpp
index 7800ad9ce..dd48ff234 100644
--- a/Core/src/GeometryUtils/GeometryID.cpp
+++ b/Core/src/GeometryUtils/GeometryID.cpp
@@ -1,13 +1,13 @@
-// This file is part of the ACTS project.
+// This file is part of the Acts project.
 //
-// Copyright (C) 2016 ACTS project team
+// Copyright (C) 2016 Acts project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
 // file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 ///////////////////////////////////////////////////////////////////
-// GeometryIDCalculator.cpp, ACTS project
+// GeometryIDCalculator.cpp, Acts project
 ///////////////////////////////////////////////////////////////////
 
 #include "Acts/Utilities/GeometryID.hpp"
diff --git a/Core/src/Layers/ConeLayer.cpp b/Core/src/Layers/ConeLayer.cpp
index d468a5dc2..aa232b09a 100644
--- a/Core/src/Layers/ConeLayer.cpp
+++ b/Core/src/Layers/ConeLayer.cpp
@@ -1,13 +1,13 @@
-// This file is part of the ACTS project.
+// This file is part of the Acts project.
 //
-// Copyright (C) 2016-2017 ACTS project team
+// Copyright (C) 2016-2017 Acts project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
 // file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 ///////////////////////////////////////////////////////////////////
-// ConeLayer.cpp, ACTS project
+// ConeLayer.cpp, Acts project
 ///////////////////////////////////////////////////////////////////
 
 #include "Acts/Layers/ConeLayer.hpp"
diff --git a/Core/src/Layers/CylinderLayer.cpp b/Core/src/Layers/CylinderLayer.cpp
index 7266194be..51c1b0f78 100644
--- a/Core/src/Layers/CylinderLayer.cpp
+++ b/Core/src/Layers/CylinderLayer.cpp
@@ -1,13 +1,13 @@
-// This file is part of the ACTS project.
+// This file is part of the Acts project.
 //
-// Copyright (C) 2016-2017 ACTS project team
+// Copyright (C) 2016-2017 Acts project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
 // file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 ///////////////////////////////////////////////////////////////////
-// CylinderLayer.cpp, ACTS project
+// CylinderLayer.cpp, Acts project
 ///////////////////////////////////////////////////////////////////
 
 #include "Acts/Layers/CylinderLayer.hpp"
diff --git a/Core/src/Layers/DiscLayer.cpp b/Core/src/Layers/DiscLayer.cpp
index a970ffcd8..9e6179165 100644
--- a/Core/src/Layers/DiscLayer.cpp
+++ b/Core/src/Layers/DiscLayer.cpp
@@ -1,13 +1,13 @@
-// This file is part of the ACTS project.
+// This file is part of the Acts project.
 //
-// Copyright (C) 2016-2017 ACTS project team
+// Copyright (C) 2016-2017 Acts project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
 // file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 ///////////////////////////////////////////////////////////////////
-// DiscLayer.cpp, ACTS project
+// DiscLayer.cpp, Acts project
 ///////////////////////////////////////////////////////////////////
 
 #include "Acts/Layers/DiscLayer.hpp"
diff --git a/Core/src/Layers/Layer.cpp b/Core/src/Layers/Layer.cpp
index 3c1cb2fc8..0c01bbe33 100644
--- a/Core/src/Layers/Layer.cpp
+++ b/Core/src/Layers/Layer.cpp
@@ -1,13 +1,13 @@
-// This file is part of the ACTS project.
+// This file is part of the Acts project.
 //
-// Copyright (C) 2016-2017 ACTS project team
+// Copyright (C) 2016-2017 Acts project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
 // file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 ///////////////////////////////////////////////////////////////////
-// Layer.cpp, ACTS project
+// Layer.cpp, Acts project
 ///////////////////////////////////////////////////////////////////
 
 // Geometry module
diff --git a/Core/src/Layers/NavigationLayer.cpp b/Core/src/Layers/NavigationLayer.cpp
index 5c91d9e81..f3faad971 100644
--- a/Core/src/Layers/NavigationLayer.cpp
+++ b/Core/src/Layers/NavigationLayer.cpp
@@ -1,13 +1,13 @@
-// This file is part of the ACTS project.
+// This file is part of the Acts project.
 //
-// Copyright (C) 2016-2017 ACTS project team
+// Copyright (C) 2016-2017 Acts project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
 // file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 ///////////////////////////////////////////////////////////////////
-// NavigationLayer.cpp, ACTS project
+// NavigationLayer.cpp, Acts project
 ///////////////////////////////////////////////////////////////////
 
 #include "Acts/Layers/NavigationLayer.hpp"
diff --git a/Core/src/Layers/PlaneLayer.cpp b/Core/src/Layers/PlaneLayer.cpp
index b88f67dbd..da9c1cd9b 100644
--- a/Core/src/Layers/PlaneLayer.cpp
+++ b/Core/src/Layers/PlaneLayer.cpp
@@ -1,13 +1,13 @@
-// This file is part of the ACTS project.
+// This file is part of the Acts project.
 //
-// Copyright (C) 2016-2017 ACTS project team
+// Copyright (C) 2016-2017 Acts project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
 // file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 ///////////////////////////////////////////////////////////////////
-// PlaneLayer.cpp, ACTS project
+// PlaneLayer.cpp, Acts project
 ///////////////////////////////////////////////////////////////////
 
 // Geometry module
diff --git a/Core/src/Layers/ProtoLayer.cpp b/Core/src/Layers/ProtoLayer.cpp
index 4d5d9cb04..a9400b21f 100644
--- a/Core/src/Layers/ProtoLayer.cpp
+++ b/Core/src/Layers/ProtoLayer.cpp
@@ -1,6 +1,6 @@
-// This file is part of the ACTS project.
+// This file is part of the Acts project.
 //
-// Copyright (C) 2018 ACTS project team
+// Copyright (C) 2018 Acts project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/Core/src/Material/BinnedSurfaceMaterial.cpp b/Core/src/Material/BinnedSurfaceMaterial.cpp
index ff59e2292..efbe950e0 100644
--- a/Core/src/Material/BinnedSurfaceMaterial.cpp
+++ b/Core/src/Material/BinnedSurfaceMaterial.cpp
@@ -1,13 +1,13 @@
-// This file is part of the ACTS project.
+// This file is part of the Acts project.
 //
-// Copyright (C) 2016-2017 ACTS project team
+// Copyright (C) 2016-2017 Acts project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
 // file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 ///////////////////////////////////////////////////////////////////
-// BinnedSurfaceMaterial.cpp, ACTS project
+// BinnedSurfaceMaterial.cpp, Acts project
 ///////////////////////////////////////////////////////////////////
 
 #include "Acts/Material/BinnedSurfaceMaterial.hpp"
diff --git a/Core/src/Material/HomogeneousSurfaceMaterial.cpp b/Core/src/Material/HomogeneousSurfaceMaterial.cpp
index 312e0649f..88e309973 100644
--- a/Core/src/Material/HomogeneousSurfaceMaterial.cpp
+++ b/Core/src/Material/HomogeneousSurfaceMaterial.cpp
@@ -1,13 +1,13 @@
-// This file is part of the ACTS project.
+// This file is part of the Acts project.
 //
-// Copyright (C) 2016-2017 ACTS project team
+// Copyright (C) 2016-2017 Acts project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
 // file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 ///////////////////////////////////////////////////////////////////
-// HomogeneousSurfaceMaterial.cpp, ACTS project
+// HomogeneousSurfaceMaterial.cpp, Acts project
 ///////////////////////////////////////////////////////////////////
 
 #include "Acts/Material/HomogeneousSurfaceMaterial.hpp"
diff --git a/Core/src/Material/MaterialProperties.cpp b/Core/src/Material/MaterialProperties.cpp
index 91888faf1..5d2685be5 100644
--- a/Core/src/Material/MaterialProperties.cpp
+++ b/Core/src/Material/MaterialProperties.cpp
@@ -1,13 +1,13 @@
-// This file is part of the ACTS project.
+// This file is part of the Acts project.
 //
-// Copyright (C) 2016-2017 ACTS project team
+// Copyright (C) 2016-2017 Acts project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
 // file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 ///////////////////////////////////////////////////////////////////
-// MaterialProperties.cpp, ACTS project
+// MaterialProperties.cpp, Acts project
 ///////////////////////////////////////////////////////////////////
 
 #include "Acts/Material/MaterialProperties.hpp"
diff --git a/Core/src/Material/SurfaceMaterialProxy.cpp b/Core/src/Material/SurfaceMaterialProxy.cpp
index 4cc167f2b..3129b0757 100644
--- a/Core/src/Material/SurfaceMaterialProxy.cpp
+++ b/Core/src/Material/SurfaceMaterialProxy.cpp
@@ -1,13 +1,13 @@
-// This file is part of the ACTS project.
+// This file is part of the Acts project.
 //
-// Copyright (C) 2016-2017 ACTS project team
+// Copyright (C) 2016-2017 Acts project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
 // file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 ///////////////////////////////////////////////////////////////////
-// SurfaceMaterialProxy.cpp, ACTS project
+// SurfaceMaterialProxy.cpp, Acts project
 ///////////////////////////////////////////////////////////////////
 
 #include "Acts/Material/SurfaceMaterialProxy.hpp"
diff --git a/Core/src/Surfaces/ConeBounds.cpp b/Core/src/Surfaces/ConeBounds.cpp
index 438bbfb3b..588ed11f3 100644
--- a/Core/src/Surfaces/ConeBounds.cpp
+++ b/Core/src/Surfaces/ConeBounds.cpp
@@ -1,13 +1,13 @@
-// This file is part of the ACTS project.
+// This file is part of the Acts project.
 //
-// Copyright (C) 2016-2017 ACTS project team
+// Copyright (C) 2016-2017 Acts project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
 // file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 ///////////////////////////////////////////////////////////////////
-// ConeBounds.cpp, ACTS project
+// ConeBounds.cpp, Acts project
 ///////////////////////////////////////////////////////////////////
 
 #include "Acts/Surfaces/ConeBounds.hpp"
diff --git a/Core/src/Surfaces/ConeSurface.cpp b/Core/src/Surfaces/ConeSurface.cpp
index 50f6752fa..1a45b3e50 100644
--- a/Core/src/Surfaces/ConeSurface.cpp
+++ b/Core/src/Surfaces/ConeSurface.cpp
@@ -1,13 +1,13 @@
-// This file is part of the ACTS project.
+// This file is part of the Acts project.
 //
-// Copyright (C) 2016-2018 ACTS project team
+// Copyright (C) 2016-2018 Acts project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
 // file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 ///////////////////////////////////////////////////////////////////
-// ConeSurface.cpp, ACTS project
+// ConeSurface.cpp, Acts project
 ///////////////////////////////////////////////////////////////////
 
 #include "Acts/Surfaces/ConeSurface.hpp"
diff --git a/Core/src/Surfaces/CylinderBounds.cpp b/Core/src/Surfaces/CylinderBounds.cpp
index 9e5e9c09b..76be0e1f1 100644
--- a/Core/src/Surfaces/CylinderBounds.cpp
+++ b/Core/src/Surfaces/CylinderBounds.cpp
@@ -1,13 +1,13 @@
-// This file is part of the ACTS project.
+// This file is part of the Acts project.
 //
-// Copyright (C) 2016-2017 ACTS project team
+// Copyright (C) 2016-2017 Acts project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
 // file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 ///////////////////////////////////////////////////////////////////
-// CylinderBounds.cpp, ACTS project
+// CylinderBounds.cpp, Acts project
 ///////////////////////////////////////////////////////////////////
 
 #include "Acts/Surfaces/CylinderBounds.hpp"
diff --git a/Core/src/Surfaces/CylinderSurface.cpp b/Core/src/Surfaces/CylinderSurface.cpp
index 6903d220f..2b19cc00c 100644
--- a/Core/src/Surfaces/CylinderSurface.cpp
+++ b/Core/src/Surfaces/CylinderSurface.cpp
@@ -1,13 +1,13 @@
-// This file is part of the ACTS project.
+// This file is part of the Acts project.
 //
-// Copyright (C) 2016-2018 ACTS project team
+// Copyright (C) 2016-2018 Acts project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
 // file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 ///////////////////////////////////////////////////////////////////
-// CylinderSurface.cpp, ACTS project
+// CylinderSurface.cpp, Acts project
 ///////////////////////////////////////////////////////////////////
 
 #include "Acts/Surfaces/CylinderSurface.hpp"
diff --git a/Core/src/Surfaces/DiamondBounds.cpp b/Core/src/Surfaces/DiamondBounds.cpp
index 47c8568f4..a75f0345a 100644
--- a/Core/src/Surfaces/DiamondBounds.cpp
+++ b/Core/src/Surfaces/DiamondBounds.cpp
@@ -1,13 +1,13 @@
-// This file is part of the ACTS project.
+// This file is part of the Acts project.
 //
-// Copyright (C) 2016-2018 ACTS project team
+// Copyright (C) 2016-2018 Acts project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
 // file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 ///////////////////////////////////////////////////////////////////
-// DiamondBounds.cpp, ACTS project
+// DiamondBounds.cpp, Acts project
 ///////////////////////////////////////////////////////////////////
 
 #include "Acts/Surfaces/DiamondBounds.hpp"
diff --git a/Core/src/Surfaces/DiscSurface.cpp b/Core/src/Surfaces/DiscSurface.cpp
index 955abb1d5..09ce47db7 100644
--- a/Core/src/Surfaces/DiscSurface.cpp
+++ b/Core/src/Surfaces/DiscSurface.cpp
@@ -1,13 +1,13 @@
-// This file is part of the ACTS project.
+// This file is part of the Acts project.
 //
-// Copyright (C) 2016-2018 ACTS project team
+// Copyright (C) 2016-2018 Acts project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
 // file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 ///////////////////////////////////////////////////////////////////
-// DiscSurface.cpp, ACTS project
+// DiscSurface.cpp, Acts project
 ///////////////////////////////////////////////////////////////////
 
 #include "Acts/Surfaces/DiscSurface.hpp"
diff --git a/Core/src/Surfaces/DiscTrapezoidalBounds.cpp b/Core/src/Surfaces/DiscTrapezoidalBounds.cpp
index 2a550c217..c7887466a 100644
--- a/Core/src/Surfaces/DiscTrapezoidalBounds.cpp
+++ b/Core/src/Surfaces/DiscTrapezoidalBounds.cpp
@@ -1,13 +1,13 @@
-// This file is part of the ACTS project.
+// This file is part of the Acts project.
 //
-// Copyright (C) 2016-2017 ACTS project team
+// Copyright (C) 2016-2017 Acts project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
 // file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 ///////////////////////////////////////////////////////////////////
-// DiscTrapezoidalBounds.cpp, ACTS project
+// DiscTrapezoidalBounds.cpp, Acts project
 ///////////////////////////////////////////////////////////////////
 
 #include "Acts/Surfaces/DiscTrapezoidalBounds.hpp"
diff --git a/Core/src/Surfaces/EllipseBounds.cpp b/Core/src/Surfaces/EllipseBounds.cpp
index 09f7dcbb0..ef6a37ce5 100644
--- a/Core/src/Surfaces/EllipseBounds.cpp
+++ b/Core/src/Surfaces/EllipseBounds.cpp
@@ -1,13 +1,13 @@
-// This file is part of the ACTS project.
+// This file is part of the Acts project.
 //
-// Copyright (C) 2016-2017 ACTS project team
+// Copyright (C) 2016-2017 Acts project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
 // file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 ///////////////////////////////////////////////////////////////////
-// EllipseBounds.cpp, ACTS project
+// EllipseBounds.cpp, Acts project
 ///////////////////////////////////////////////////////////////////
 
 #include "Acts/Surfaces/EllipseBounds.hpp"
diff --git a/Core/src/Surfaces/InfinitieBounds.cpp b/Core/src/Surfaces/InfinitieBounds.cpp
index c0c3d3e08..a9930ab7a 100644
--- a/Core/src/Surfaces/InfinitieBounds.cpp
+++ b/Core/src/Surfaces/InfinitieBounds.cpp
@@ -1,6 +1,6 @@
-// This file is part of the ACTS project.
+// This file is part of the Acts project.
 //
-// Copyright (C) 2018 ACTS project team
+// Copyright (C) 2018 Acts project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/Core/src/Surfaces/LineBounds.cpp b/Core/src/Surfaces/LineBounds.cpp
index f1764f78b..324343cc6 100644
--- a/Core/src/Surfaces/LineBounds.cpp
+++ b/Core/src/Surfaces/LineBounds.cpp
@@ -1,13 +1,13 @@
-// This file is part of the ACTS project.
+// This file is part of the Acts project.
 //
-// Copyright (C) 2016-2017 ACTS project team
+// Copyright (C) 2016-2017 Acts project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
 // file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 ///////////////////////////////////////////////////////////////////
-// LineBounds.cpp, ACTS project
+// LineBounds.cpp, Acts project
 ///////////////////////////////////////////////////////////////////
 
 #include "Acts/Surfaces/LineBounds.hpp"
diff --git a/Core/src/Surfaces/LineSurface.cpp b/Core/src/Surfaces/LineSurface.cpp
index 209bfb98c..a662ae5f7 100644
--- a/Core/src/Surfaces/LineSurface.cpp
+++ b/Core/src/Surfaces/LineSurface.cpp
@@ -1,13 +1,13 @@
-// This file is part of the ACTS project.
+// This file is part of the Acts project.
 //
-// Copyright (C) 2016-2018 ACTS project team
+// Copyright (C) 2016-2018 Acts project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
 // file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 ///////////////////////////////////////////////////////////////////
-// LineSurface.cpp, ACTS project
+// LineSurface.cpp, Acts project
 ///////////////////////////////////////////////////////////////////
 
 #include "Acts/Surfaces/LineSurface.hpp"
diff --git a/Core/src/Surfaces/PerigeeSurface.cpp b/Core/src/Surfaces/PerigeeSurface.cpp
index e885857d5..bc158cbd0 100644
--- a/Core/src/Surfaces/PerigeeSurface.cpp
+++ b/Core/src/Surfaces/PerigeeSurface.cpp
@@ -1,13 +1,13 @@
-// This file is part of the ACTS project.
+// This file is part of the Acts project.
 //
-// Copyright (C) 2016-2018 ACTS project team
+// Copyright (C) 2016-2018 Acts project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
 // file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 /////////////////////////////////////////////////////////////////
-// PerigeeSurface.cpp, ACTS project
+// PerigeeSurface.cpp, Acts project
 ///////////////////////////////////////////////////////////////////
 
 #include "Acts/Surfaces/PerigeeSurface.hpp"
diff --git a/Core/src/Surfaces/PlaneSurface.cpp b/Core/src/Surfaces/PlaneSurface.cpp
index a3e580109..5966f684e 100644
--- a/Core/src/Surfaces/PlaneSurface.cpp
+++ b/Core/src/Surfaces/PlaneSurface.cpp
@@ -1,13 +1,13 @@
-// This file is part of the ACTS project.
+// This file is part of the Acts project.
 //
-// Copyright (C) 2016-2018 ACTS project team
+// Copyright (C) 2016-2018 Acts project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
 // file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 ///////////////////////////////////////////////////////////////////
-// PlaneSurface.cpp, ACTS project
+// PlaneSurface.cpp, Acts project
 ///////////////////////////////////////////////////////////////////
 
 #include "Acts/Surfaces/PlaneSurface.hpp"
diff --git a/Core/src/Surfaces/RadialBounds.cpp b/Core/src/Surfaces/RadialBounds.cpp
index 2bf39e36e..8def3a1cf 100644
--- a/Core/src/Surfaces/RadialBounds.cpp
+++ b/Core/src/Surfaces/RadialBounds.cpp
@@ -1,13 +1,13 @@
-// This file is part of the ACTS project.
+// This file is part of the Acts project.
 //
-// Copyright (C) 2016-2017 ACTS project team
+// Copyright (C) 2016-2017 Acts project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
 // file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 ///////////////////////////////////////////////////////////////////
-// RadialBounds.cpp, ACTS project
+// RadialBounds.cpp, Acts project
 ///////////////////////////////////////////////////////////////////
 
 #include "Acts/Surfaces/RadialBounds.hpp"
diff --git a/Core/src/Surfaces/RectangleBounds.cpp b/Core/src/Surfaces/RectangleBounds.cpp
index cd4c0c0f1..662162889 100644
--- a/Core/src/Surfaces/RectangleBounds.cpp
+++ b/Core/src/Surfaces/RectangleBounds.cpp
@@ -1,13 +1,13 @@
-// This file is part of the ACTS project.
+// This file is part of the Acts project.
 //
-// Copyright (C) 2016-2017 ACTS project team
+// Copyright (C) 2016-2017 Acts project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
 // file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 ///////////////////////////////////////////////////////////////////
-// RectangleBounds.cpp, ACTS project
+// RectangleBounds.cpp, Acts project
 ///////////////////////////////////////////////////////////////////
 
 #include "Acts/Surfaces/RectangleBounds.hpp"
diff --git a/Core/src/Surfaces/StrawSurface.cpp b/Core/src/Surfaces/StrawSurface.cpp
index bea3f2e48..6e61a3dfc 100644
--- a/Core/src/Surfaces/StrawSurface.cpp
+++ b/Core/src/Surfaces/StrawSurface.cpp
@@ -1,13 +1,13 @@
-// This file is part of the ACTS project.
+// This file is part of the Acts project.
 //
-// Copyright (C) 2016-2018 ACTS project team
+// Copyright (C) 2016-2018 Acts project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
 // file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 ///////////////////////////////////////////////////////////////////
-// StrawSurface.cpp, ACTS project
+// StrawSurface.cpp, Acts project
 ///////////////////////////////////////////////////////////////////
 
 #include "Acts/Surfaces/StrawSurface.hpp"
diff --git a/Core/src/Surfaces/Surface.cpp b/Core/src/Surfaces/Surface.cpp
index f887ecb24..f2e789367 100644
--- a/Core/src/Surfaces/Surface.cpp
+++ b/Core/src/Surfaces/Surface.cpp
@@ -1,13 +1,13 @@
-// This file is part of the ACTS project.
+// This file is part of the Acts project.
 //
-// Copyright (C) 2016-2017 ACTS project team
+// Copyright (C) 2016-2017 Acts project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
 // file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 ///////////////////////////////////////////////////////////////////
-// Surface.cpp, ACTS project
+// Surface.cpp, Acts project
 ///////////////////////////////////////////////////////////////////
 
 #include "Acts/Surfaces/Surface.hpp"
diff --git a/Core/src/Surfaces/SurfaceArray.cpp b/Core/src/Surfaces/SurfaceArray.cpp
index 1c8077858..a41e88e52 100644
--- a/Core/src/Surfaces/SurfaceArray.cpp
+++ b/Core/src/Surfaces/SurfaceArray.cpp
@@ -1,6 +1,6 @@
-// This file is part of the ACTS project.
+// This file is part of the Acts project.
 //
-// Copyright (C) 2018 ACTS project team
+// Copyright (C) 2018 Acts project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/Core/src/Surfaces/TrapezoidBounds.cpp b/Core/src/Surfaces/TrapezoidBounds.cpp
index a664b9909..af5df3333 100644
--- a/Core/src/Surfaces/TrapezoidBounds.cpp
+++ b/Core/src/Surfaces/TrapezoidBounds.cpp
@@ -1,13 +1,13 @@
-// This file is part of the ACTS project.
+// This file is part of the Acts project.
 //
-// Copyright (C) 2016-2017 ACTS project team
+// Copyright (C) 2016-2017 Acts project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
 // file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 ///////////////////////////////////////////////////////////////////
-// TrapezoidBounds.cpp, ACTS project
+// TrapezoidBounds.cpp, Acts project
 ///////////////////////////////////////////////////////////////////
 
 #include "Acts/Surfaces/TrapezoidBounds.hpp"
diff --git a/Core/src/Surfaces/TriangleBounds.cpp b/Core/src/Surfaces/TriangleBounds.cpp
index 846bae3e1..1740900bc 100644
--- a/Core/src/Surfaces/TriangleBounds.cpp
+++ b/Core/src/Surfaces/TriangleBounds.cpp
@@ -1,13 +1,13 @@
-// This file is part of the ACTS project.
+// This file is part of the Acts project.
 //
-// Copyright (C) 2016-2017 ACTS project team
+// Copyright (C) 2016-2017 Acts project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
 // file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 ///////////////////////////////////////////////////////////////////
-// TriangleBounds.cpp, ACTS project
+// TriangleBounds.cpp, Acts project
 ///////////////////////////////////////////////////////////////////
 
 #include "Acts/Surfaces/TriangleBounds.hpp"
diff --git a/Core/src/Tools/CylinderVolumeBuilder.cpp b/Core/src/Tools/CylinderVolumeBuilder.cpp
index f4abbea26..53c26d2ae 100644
--- a/Core/src/Tools/CylinderVolumeBuilder.cpp
+++ b/Core/src/Tools/CylinderVolumeBuilder.cpp
@@ -1,13 +1,13 @@
-// This file is part of the ACTS project.
+// This file is part of the Acts project.
 //
-// Copyright (C) 2016-2017 ACTS project team
+// Copyright (C) 2016-2017 Acts project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
 // file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 ///////////////////////////////////////////////////////////////////
-// CylinderVolumeBuilder.cpp, ACTS project
+// CylinderVolumeBuilder.cpp, Acts project
 ///////////////////////////////////////////////////////////////////
 
 #include "Acts/Tools/CylinderVolumeBuilder.hpp"
diff --git a/Core/src/Tools/CylinderVolumeHelper.cpp b/Core/src/Tools/CylinderVolumeHelper.cpp
index 4b201bc3c..a9722060f 100644
--- a/Core/src/Tools/CylinderVolumeHelper.cpp
+++ b/Core/src/Tools/CylinderVolumeHelper.cpp
@@ -1,13 +1,13 @@
-// This file is part of the ACTS project.
+// This file is part of the Acts project.
 //
-// Copyright (C) 2016-2018 ACTS project team
+// Copyright (C) 2016-2018 Acts project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
 // file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 ///////////////////////////////////////////////////////////////////
-// CylinderVolumeHelper.cpp, ACTS project
+// CylinderVolumeHelper.cpp, Acts project
 ///////////////////////////////////////////////////////////////////
 
 #include "Acts/Tools/CylinderVolumeHelper.hpp"
diff --git a/Core/src/Tools/LayerArrayCreator.cpp b/Core/src/Tools/LayerArrayCreator.cpp
index 33368dd79..82cd98768 100644
--- a/Core/src/Tools/LayerArrayCreator.cpp
+++ b/Core/src/Tools/LayerArrayCreator.cpp
@@ -1,13 +1,13 @@
-// This file is part of the ACTS project.
+// This file is part of the Acts project.
 //
-// Copyright (C) 2016-2017 ACTS project team
+// Copyright (C) 2016-2017 Acts project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
 // file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 ///////////////////////////////////////////////////////////////////
-// LayerArrayCreator.cpp, ACTS project
+// LayerArrayCreator.cpp, Acts project
 ///////////////////////////////////////////////////////////////////
 
 #include "Acts/Tools/LayerArrayCreator.hpp"
diff --git a/Core/src/Tools/LayerCreator.cpp b/Core/src/Tools/LayerCreator.cpp
index 6cd6d6511..d7bad8a93 100644
--- a/Core/src/Tools/LayerCreator.cpp
+++ b/Core/src/Tools/LayerCreator.cpp
@@ -1,13 +1,13 @@
-// This file is part of the ACTS project.
+// This file is part of the Acts project.
 //
-// Copyright (C) 2016-2018 ACTS project team
+// Copyright (C) 2016-2018 Acts project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
 // file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 ///////////////////////////////////////////////////////////////////
-// LayerCreator.cpp, ACTS project
+// LayerCreator.cpp, Acts project
 ///////////////////////////////////////////////////////////////////
 
 #include "Acts/Tools/LayerCreator.hpp"
diff --git a/Core/src/Tools/PassiveLayerBuilder.cpp b/Core/src/Tools/PassiveLayerBuilder.cpp
index ed745cf0a..d7a0c0198 100644
--- a/Core/src/Tools/PassiveLayerBuilder.cpp
+++ b/Core/src/Tools/PassiveLayerBuilder.cpp
@@ -1,13 +1,13 @@
-// This file is part of the ACTS project.
+// This file is part of the Acts project.
 //
-// Copyright (C) 2016-2017 ACTS project team
+// Copyright (C) 2016-2017 Acts project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
 // file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 ///////////////////////////////////////////////////////////////////
-// PassiveLayerBuilder.cpp, ACTS project
+// PassiveLayerBuilder.cpp, Acts project
 ///////////////////////////////////////////////////////////////////
 
 #include "Acts/Tools/PassiveLayerBuilder.hpp"
diff --git a/Core/src/Tools/SurfaceArrayCreator.cpp b/Core/src/Tools/SurfaceArrayCreator.cpp
index d9ea9ed5d..9b6c0480d 100644
--- a/Core/src/Tools/SurfaceArrayCreator.cpp
+++ b/Core/src/Tools/SurfaceArrayCreator.cpp
@@ -1,13 +1,13 @@
-// This file is part of the ACTS project.
+// This file is part of the Acts project.
 //
-// Copyright (C) 2016-2018 ACTS project team
+// Copyright (C) 2016-2018 Acts project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
 // file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 ///////////////////////////////////////////////////////////////////
-// SurfaceArrayCreator.cpp, ACTS project
+// SurfaceArrayCreator.cpp, Acts project
 ///////////////////////////////////////////////////////////////////
 
 #include "Acts/Tools/SurfaceArrayCreator.hpp"
diff --git a/Core/src/Tools/TrackingGeometryBuilder.cpp b/Core/src/Tools/TrackingGeometryBuilder.cpp
index 807262748..44da6409d 100644
--- a/Core/src/Tools/TrackingGeometryBuilder.cpp
+++ b/Core/src/Tools/TrackingGeometryBuilder.cpp
@@ -1,13 +1,13 @@
-// This file is part of the ACTS project.
+// This file is part of the Acts project.
 //
-// Copyright (C) 2016-2017 ACTS project team
+// Copyright (C) 2016-2017 Acts project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
 // file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 ///////////////////////////////////////////////////////////////////
-// TrackingGeometryBuilder.cpp, ACTS project
+// TrackingGeometryBuilder.cpp, Acts project
 ///////////////////////////////////////////////////////////////////
 
 #include "Acts/Tools/TrackingGeometryBuilder.hpp"
diff --git a/Core/src/Tools/TrackingVolumeArrayCreator.cpp b/Core/src/Tools/TrackingVolumeArrayCreator.cpp
index 86050b13d..44cba3e2b 100644
--- a/Core/src/Tools/TrackingVolumeArrayCreator.cpp
+++ b/Core/src/Tools/TrackingVolumeArrayCreator.cpp
@@ -1,13 +1,13 @@
-// This file is part of the ACTS project.
+// This file is part of the Acts project.
 //
-// Copyright (C) 2016-2017 ACTS project team
+// Copyright (C) 2016-2017 Acts project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
 // file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 ///////////////////////////////////////////////////////////////////
-// TrackingVolumeArrayCreator.cpp, ACTS project
+// TrackingVolumeArrayCreator.cpp, Acts project
 ///////////////////////////////////////////////////////////////////
 
 #include "Acts/Tools/TrackingVolumeArrayCreator.hpp"
diff --git a/Core/src/Utilities/BFieldMapUtils.cpp b/Core/src/Utilities/BFieldMapUtils.cpp
index 68760bc2f..fd60aa952 100644
--- a/Core/src/Utilities/BFieldMapUtils.cpp
+++ b/Core/src/Utilities/BFieldMapUtils.cpp
@@ -1,6 +1,6 @@
-// This file is part of the ACTS project.
+// This file is part of the Acts project.
 //
-// Copyright (C) 2017-2018 ACTS project team
+// Copyright (C) 2017-2018 Acts project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/Core/src/Utilities/Logger.cpp b/Core/src/Utilities/Logger.cpp
index a212ae24f..7cb68d738 100644
--- a/Core/src/Utilities/Logger.cpp
+++ b/Core/src/Utilities/Logger.cpp
@@ -1,6 +1,6 @@
-// This file is part of the ACTS project.
+// This file is part of the Acts project.
 //
-// Copyright (C) 2016-2017 ACTS project team
+// Copyright (C) 2016-2017 Acts project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/Core/src/Utilities/MaterialInteraction.cpp b/Core/src/Utilities/MaterialInteraction.cpp
index e29b9994a..c46583a5c 100644
--- a/Core/src/Utilities/MaterialInteraction.cpp
+++ b/Core/src/Utilities/MaterialInteraction.cpp
@@ -1,6 +1,6 @@
-// This file is part of the ACTS project.
+// This file is part of the Acts project.
 //
-// Copyright (C) 2017 ACTS project team
+// Copyright (C) 2017 Acts project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/Core/src/Utilities/Units.cpp b/Core/src/Utilities/Units.cpp
index bde5296f6..d1e70a005 100644
--- a/Core/src/Utilities/Units.cpp
+++ b/Core/src/Utilities/Units.cpp
@@ -1,6 +1,6 @@
-// This file is part of the ACTS project.
+// This file is part of the Acts project.
 //
-// Copyright (C) 2016 ACTS project team
+// Copyright (C) 2016 Acts project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/Core/src/Volumes/AbstractVolume.cpp b/Core/src/Volumes/AbstractVolume.cpp
index ea1a4f660..4b86f1db9 100644
--- a/Core/src/Volumes/AbstractVolume.cpp
+++ b/Core/src/Volumes/AbstractVolume.cpp
@@ -1,13 +1,13 @@
-// This file is part of the ACTS project.
+// This file is part of the Acts project.
 //
-// Copyright (C) 2016-2017 ACTS project team
+// Copyright (C) 2016-2017 Acts project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
 // file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 ///////////////////////////////////////////////////////////////////
-// AbstractVolume.cpp, ACTS project
+// AbstractVolume.cpp, Acts project
 ///////////////////////////////////////////////////////////////////
 
 #include "Acts/Volumes/AbstractVolume.hpp"
diff --git a/Core/src/Volumes/CuboidVolumeBounds.cpp b/Core/src/Volumes/CuboidVolumeBounds.cpp
index 72e595345..dc8729854 100644
--- a/Core/src/Volumes/CuboidVolumeBounds.cpp
+++ b/Core/src/Volumes/CuboidVolumeBounds.cpp
@@ -1,13 +1,13 @@
-// This file is part of the ACTS project.
+// This file is part of the Acts project.
 //
-// Copyright (C) 2016-2017 ACTS project team
+// Copyright (C) 2016-2017 Acts project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
 // file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 ///////////////////////////////////////////////////////////////////
-// CuboidVolumeBounds.cpp, ACTS project
+// CuboidVolumeBounds.cpp, Acts project
 ///////////////////////////////////////////////////////////////////
 
 #include "Acts/Volumes/CuboidVolumeBounds.hpp"
diff --git a/Core/src/Volumes/CylinderVolumeBounds.cpp b/Core/src/Volumes/CylinderVolumeBounds.cpp
index 9672c504a..21dad7c46 100644
--- a/Core/src/Volumes/CylinderVolumeBounds.cpp
+++ b/Core/src/Volumes/CylinderVolumeBounds.cpp
@@ -1,13 +1,13 @@
-// This file is part of the ACTS project.
+// This file is part of the Acts project.
 //
-// Copyright (C) 2016-2017 ACTS project team
+// Copyright (C) 2016-2017 Acts project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
 // file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 ///////////////////////////////////////////////////////////////////
-// CylinderVolumeBounds.cpp, ACTS project
+// CylinderVolumeBounds.cpp, Acts project
 ///////////////////////////////////////////////////////////////////
 
 #include "Acts/Volumes/CylinderVolumeBounds.hpp"
diff --git a/Core/src/Volumes/DoubleTrapezoidVolumeBounds.cpp b/Core/src/Volumes/DoubleTrapezoidVolumeBounds.cpp
index a357476db..eca1331dd 100644
--- a/Core/src/Volumes/DoubleTrapezoidVolumeBounds.cpp
+++ b/Core/src/Volumes/DoubleTrapezoidVolumeBounds.cpp
@@ -1,13 +1,13 @@
-// This file is part of the ACTS project.
+// This file is part of the Acts project.
 //
-// Copyright (C) 2016-2017 ACTS project team
+// Copyright (C) 2016-2017 Acts project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
 // file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 ///////////////////////////////////////////////////////////////////
-// DoubleTrapezoidVolumeBounds.cpp, ACTS project
+// DoubleTrapezoidVolumeBounds.cpp, Acts project
 ///////////////////////////////////////////////////////////////////
 
 #include "Acts/Volumes/DoubleTrapezoidVolumeBounds.hpp"
diff --git a/Core/src/Volumes/TrapezoidVolumeBounds.cpp b/Core/src/Volumes/TrapezoidVolumeBounds.cpp
index 551f70d7f..ea05ae2ea 100644
--- a/Core/src/Volumes/TrapezoidVolumeBounds.cpp
+++ b/Core/src/Volumes/TrapezoidVolumeBounds.cpp
@@ -1,13 +1,13 @@
-// This file is part of the ACTS project.
+// This file is part of the Acts project.
 //
-// Copyright (C) 2016-2017 ACTS project team
+// Copyright (C) 2016-2017 Acts project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
 // file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 ///////////////////////////////////////////////////////////////////
-// TrapezoidVolumeBounds.cpp, ACTS project
+// TrapezoidVolumeBounds.cpp, Acts project
 ///////////////////////////////////////////////////////////////////
 
 #include "Acts/Volumes/TrapezoidVolumeBounds.hpp"
diff --git a/Core/src/Volumes/Volume.cpp b/Core/src/Volumes/Volume.cpp
index b2e2e0b88..eeeab4f5a 100644
--- a/Core/src/Volumes/Volume.cpp
+++ b/Core/src/Volumes/Volume.cpp
@@ -1,13 +1,13 @@
-// This file is part of the ACTS project.
+// This file is part of the Acts project.
 //
-// Copyright (C) 2016-2017 ACTS project team
+// Copyright (C) 2016-2017 Acts project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
 // file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 ///////////////////////////////////////////////////////////////////
-// Volume.cpp, ACTS project
+// Volume.cpp, Acts project
 ///////////////////////////////////////////////////////////////////
 
 #include "Acts/Volumes/Volume.hpp"
diff --git a/Core/src/Volumes/VolumeBounds.cpp b/Core/src/Volumes/VolumeBounds.cpp
index d8d0eb111..1ce13295f 100644
--- a/Core/src/Volumes/VolumeBounds.cpp
+++ b/Core/src/Volumes/VolumeBounds.cpp
@@ -1,13 +1,13 @@
-// This file is part of the ACTS project.
+// This file is part of the Acts project.
 //
-// Copyright (C) 2016 ACTS project team
+// Copyright (C) 2016 Acts project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
 // file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 ///////////////////////////////////////////////////////////////////
-// VolumeBounds.cpp, ACTS project
+// VolumeBounds.cpp, Acts project
 ///////////////////////////////////////////////////////////////////
 
 #include "Acts/Volumes/VolumeBounds.hpp"
diff --git a/Examples/src/CustomDefaultLogger.cpp b/Examples/src/CustomDefaultLogger.cpp
index 7df33c993..73de97901 100644
--- a/Examples/src/CustomDefaultLogger.cpp
+++ b/Examples/src/CustomDefaultLogger.cpp
@@ -1,6 +1,6 @@
-// This file is part of the ACTS project.
+// This file is part of the Acts project.
 //
-// Copyright (C) 2017-2018 ACTS project team
+// Copyright (C) 2017-2018 Acts project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
@@ -60,7 +60,7 @@ namespace Logging {
 /// @param [in] log_stream output stream used for printing debug messages
 ///
 /// This function returns a pointer to an alternative Logger instance to
-/// the default ACTS logger. This instance prints the log output mirrored
+/// the default Acts logger. This instance prints the log output mirrored
 /// from right to left.
 ///
 /// @return pointer to logging instance
diff --git a/IntegrationTests/ATLSeedingIntegrationTest.cpp b/IntegrationTests/ATLSeedingIntegrationTest.cpp
index e5ace5c32..92dfcfcb8 100644
--- a/IntegrationTests/ATLSeedingIntegrationTest.cpp
+++ b/IntegrationTests/ATLSeedingIntegrationTest.cpp
@@ -1,6 +1,6 @@
-// This file is part of the ACTS project.
+// This file is part of the Acts project.
 //
-// Copyright (C) 2018 ACTS project team
+// Copyright (C) 2018 Acts project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/IntegrationTests/PropagationTestBase.hpp b/IntegrationTests/PropagationTestBase.hpp
index 5662960a9..1227b6625 100644
--- a/IntegrationTests/PropagationTestBase.hpp
+++ b/IntegrationTests/PropagationTestBase.hpp
@@ -1,6 +1,6 @@
-// This file is part of the ACTS project.
+// This file is part of the Acts project.
 //
-// Copyright (C) 2017-2018 ACTS project team
+// Copyright (C) 2017-2018 Acts project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/IntegrationTests/PropagationTestHelper.hpp b/IntegrationTests/PropagationTestHelper.hpp
index fc43e2acd..b2a8c4147 100644
--- a/IntegrationTests/PropagationTestHelper.hpp
+++ b/IntegrationTests/PropagationTestHelper.hpp
@@ -1,6 +1,6 @@
-// This file is part of the ACTS project.
+// This file is part of the Acts project.
 //
-// Copyright (C) 2017-2018 ACTS project team
+// Copyright (C) 2017-2018 Acts project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/IntegrationTests/PropagationTests.cpp b/IntegrationTests/PropagationTests.cpp
index 7e608d961..b0ad44534 100644
--- a/IntegrationTests/PropagationTests.cpp
+++ b/IntegrationTests/PropagationTests.cpp
@@ -1,6 +1,6 @@
-// This file is part of the ACTS project.
+// This file is part of the Acts project.
 //
-// Copyright (C) 2017-2018 ACTS project team
+// Copyright (C) 2017-2018 Acts project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/IntegrationTests/PropagationTestsAtlasField.cpp b/IntegrationTests/PropagationTestsAtlasField.cpp
index ca07a07b9..ed93a3918 100644
--- a/IntegrationTests/PropagationTestsAtlasField.cpp
+++ b/IntegrationTests/PropagationTestsAtlasField.cpp
@@ -1,6 +1,6 @@
-// This file is part of the ACTS project.
+// This file is part of the Acts project.
 //
-// Copyright (C) 2017 ACTS project team
+// Copyright (C) 2017 Acts project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/IntegrationTests/covariance_validation_fixture.hpp b/IntegrationTests/covariance_validation_fixture.hpp
index b064f7768..a1b39822a 100644
--- a/IntegrationTests/covariance_validation_fixture.hpp
+++ b/IntegrationTests/covariance_validation_fixture.hpp
@@ -1,6 +1,6 @@
-// This file is part of the ACTS project.
+// This file is part of the Acts project.
 //
-// Copyright (C) 2017-2018 ACTS project team
+// Copyright (C) 2017-2018 Acts project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/Legacy/include/Acts/Extrapolation/ExtrapolationCell.hpp b/Legacy/include/Acts/Extrapolation/ExtrapolationCell.hpp
index 254f970d7..d04147908 100644
--- a/Legacy/include/Acts/Extrapolation/ExtrapolationCell.hpp
+++ b/Legacy/include/Acts/Extrapolation/ExtrapolationCell.hpp
@@ -1,13 +1,13 @@
-// This file is part of the ACTS project.
+// This file is part of the Acts project.
 //
-// Copyright (C) 2016-2017 ACTS project team
+// Copyright (C) 2016-2017 Acts project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
 // file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 ///////////////////////////////////////////////////////////////////
-// ExtrapolationCell.h, ACTS project
+// ExtrapolationCell.h, Acts project
 ///////////////////////////////////////////////////////////////////
 
 #pragma once
diff --git a/Legacy/include/Acts/Extrapolation/ExtrapolationEngine.hpp b/Legacy/include/Acts/Extrapolation/ExtrapolationEngine.hpp
index 8349cdc8b..a2d88ec74 100644
--- a/Legacy/include/Acts/Extrapolation/ExtrapolationEngine.hpp
+++ b/Legacy/include/Acts/Extrapolation/ExtrapolationEngine.hpp
@@ -1,13 +1,13 @@
-// This file is part of the ACTS project.
+// This file is part of the Acts project.
 //
-// Copyright (C) 2016-2017 ACTS project team
+// Copyright (C) 2016-2017 Acts project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
 // file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 ///////////////////////////////////////////////////////////////////
-// ExtrapolationEngine.h, ACTS project
+// ExtrapolationEngine.h, Acts project
 ///////////////////////////////////////////////////////////////////
 
 #pragma once
diff --git a/Legacy/include/Acts/Extrapolation/IExtrapolationEngine.hpp b/Legacy/include/Acts/Extrapolation/IExtrapolationEngine.hpp
index 147576fc2..216978ebd 100644
--- a/Legacy/include/Acts/Extrapolation/IExtrapolationEngine.hpp
+++ b/Legacy/include/Acts/Extrapolation/IExtrapolationEngine.hpp
@@ -1,13 +1,13 @@
-// This file is part of the ACTS project.
+// This file is part of the Acts project.
 //
-// Copyright (C) 2016 ACTS project team
+// Copyright (C) 2016 Acts project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
 // file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 ///////////////////////////////////////////////////////////////////
-// IExtrapolationEngine.h, ACTS project
+// IExtrapolationEngine.h, Acts project
 ///////////////////////////////////////////////////////////////////
 
 #pragma once
diff --git a/Legacy/include/Acts/Extrapolation/IMaterialEffectsEngine.hpp b/Legacy/include/Acts/Extrapolation/IMaterialEffectsEngine.hpp
index 34a2029f3..879a2e972 100644
--- a/Legacy/include/Acts/Extrapolation/IMaterialEffectsEngine.hpp
+++ b/Legacy/include/Acts/Extrapolation/IMaterialEffectsEngine.hpp
@@ -1,13 +1,13 @@
-// This file is part of the ACTS project.
+// This file is part of the Acts project.
 //
-// Copyright (C) 2016-2017 ACTS project team
+// Copyright (C) 2016-2017 Acts project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
 // file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 ///////////////////////////////////////////////////////////////////
-// IMaterialEffectsEngine.h, ACTS project
+// IMaterialEffectsEngine.h, Acts project
 ///////////////////////////////////////////////////////////////////
 
 #pragma once
diff --git a/Legacy/include/Acts/Extrapolation/IMultipleScatteringUpdator.hpp b/Legacy/include/Acts/Extrapolation/IMultipleScatteringUpdator.hpp
index d636808e1..2af53bfa2 100644
--- a/Legacy/include/Acts/Extrapolation/IMultipleScatteringUpdator.hpp
+++ b/Legacy/include/Acts/Extrapolation/IMultipleScatteringUpdator.hpp
@@ -1,13 +1,13 @@
-// This file is part of the ACTS project.
+// This file is part of the Acts project.
 //
-// Copyright (C) 2016 ACTS project team
+// Copyright (C) 2016 Acts project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
 // file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 ///////////////////////////////////////////////////////////////////
-// IMultipleScatteringUpdator.h, ACTS project
+// IMultipleScatteringUpdator.h, Acts project
 ///////////////////////////////////////////////////////////////////
 
 #pragma once
diff --git a/Legacy/include/Acts/Extrapolation/INavigationEngine.hpp b/Legacy/include/Acts/Extrapolation/INavigationEngine.hpp
index 3f6cd1526..411799699 100644
--- a/Legacy/include/Acts/Extrapolation/INavigationEngine.hpp
+++ b/Legacy/include/Acts/Extrapolation/INavigationEngine.hpp
@@ -1,13 +1,13 @@
-// This file is part of the ACTS project.
+// This file is part of the Acts project.
 //
-// Copyright (C) 2016-2017 ACTS project team
+// Copyright (C) 2016-2017 Acts project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
 // file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 ///////////////////////////////////////////////////////////////////
-// INavigationEngine.h, ACTS project
+// INavigationEngine.h, Acts project
 ///////////////////////////////////////////////////////////////////
 
 #pragma once
diff --git a/Legacy/include/Acts/Extrapolation/IPropagationEngine.hpp b/Legacy/include/Acts/Extrapolation/IPropagationEngine.hpp
index 7d015d0d0..af7081104 100644
--- a/Legacy/include/Acts/Extrapolation/IPropagationEngine.hpp
+++ b/Legacy/include/Acts/Extrapolation/IPropagationEngine.hpp
@@ -1,13 +1,13 @@
-// This file is part of the ACTS project.
+// This file is part of the Acts project.
 //
-// Copyright (C) 2016-2017 ACTS project team
+// Copyright (C) 2016-2017 Acts project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
 // file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 ///////////////////////////////////////////////////////////////////
-// IPropagationEngine.h, ACTS project
+// IPropagationEngine.h, Acts project
 ///////////////////////////////////////////////////////////////////
 
 #pragma once
diff --git a/Legacy/include/Acts/Extrapolation/MaterialEffectsEngine.hpp b/Legacy/include/Acts/Extrapolation/MaterialEffectsEngine.hpp
index 941a24950..59a13e9a4 100644
--- a/Legacy/include/Acts/Extrapolation/MaterialEffectsEngine.hpp
+++ b/Legacy/include/Acts/Extrapolation/MaterialEffectsEngine.hpp
@@ -1,13 +1,13 @@
-// This file is part of the ACTS project.
+// This file is part of the Acts project.
 //
-// Copyright (C) 2016-2017 ACTS project team
+// Copyright (C) 2016-2017 Acts project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
 // file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 ///////////////////////////////////////////////////////////////////
-// MaterialEffectsEngine.h, ACTS project
+// MaterialEffectsEngine.h, Acts project
 ///////////////////////////////////////////////////////////////////
 
 #pragma once
diff --git a/Legacy/include/Acts/Extrapolation/MaterialUpdateMode.hpp b/Legacy/include/Acts/Extrapolation/MaterialUpdateMode.hpp
index 9c942aa4c..571d89605 100644
--- a/Legacy/include/Acts/Extrapolation/MaterialUpdateMode.hpp
+++ b/Legacy/include/Acts/Extrapolation/MaterialUpdateMode.hpp
@@ -1,6 +1,6 @@
-// This file is part of the ACTS project.
+// This file is part of the Acts project.
 //
-// Copyright (C) 2016 ACTS project team
+// Copyright (C) 2016 Acts project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/Legacy/include/Acts/Extrapolation/RungeKuttaEngine.hpp b/Legacy/include/Acts/Extrapolation/RungeKuttaEngine.hpp
index 1e84509ef..24d8574ba 100644
--- a/Legacy/include/Acts/Extrapolation/RungeKuttaEngine.hpp
+++ b/Legacy/include/Acts/Extrapolation/RungeKuttaEngine.hpp
@@ -1,13 +1,13 @@
-// This file is part of the ACTS project.
+// This file is part of the Acts project.
 //
-// Copyright (C) 2016-2018 ACTS project team
+// Copyright (C) 2016-2018 Acts project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
 // file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 /////////////////////////////////////////////////////////////////////////////////
-//  Header file for class RungeKuttaEngine, ACTS project
+//  Header file for class RungeKuttaEngine, Acts project
 /////////////////////////////////////////////////////////////////////////////////
 
 #pragma once
diff --git a/Legacy/include/Acts/Extrapolation/StaticEngine.hpp b/Legacy/include/Acts/Extrapolation/StaticEngine.hpp
index 570a8d071..395152f3f 100644
--- a/Legacy/include/Acts/Extrapolation/StaticEngine.hpp
+++ b/Legacy/include/Acts/Extrapolation/StaticEngine.hpp
@@ -1,13 +1,13 @@
-// This file is part of the ACTS project.
+// This file is part of the Acts project.
 //
-// Copyright (C) 2016-2017 ACTS project team
+// Copyright (C) 2016-2017 Acts project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
 // file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 ///////////////////////////////////////////////////////////////////
-// StaticEngine.h, ACTS project
+// StaticEngine.h, Acts project
 ///////////////////////////////////////////////////////////////////
 
 #pragma once
diff --git a/Legacy/include/Acts/Extrapolation/StaticNavigationEngine.hpp b/Legacy/include/Acts/Extrapolation/StaticNavigationEngine.hpp
index 0c8460487..4a4efefa4 100644
--- a/Legacy/include/Acts/Extrapolation/StaticNavigationEngine.hpp
+++ b/Legacy/include/Acts/Extrapolation/StaticNavigationEngine.hpp
@@ -1,13 +1,13 @@
-// This file is part of the ACTS project.
+// This file is part of the Acts project.
 //
-// Copyright (C) 2016-2017 ACTS project team
+// Copyright (C) 2016-2017 Acts project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
 // file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 ///////////////////////////////////////////////////////////////////
-// StaticNavigationEngine.h, ACTS project
+// StaticNavigationEngine.h, Acts project
 ///////////////////////////////////////////////////////////////////
 
 #pragma once
diff --git a/Legacy/include/Acts/Extrapolation/Wrapper.hpp b/Legacy/include/Acts/Extrapolation/Wrapper.hpp
index 6dc6e1f2d..542833ef8 100644
--- a/Legacy/include/Acts/Extrapolation/Wrapper.hpp
+++ b/Legacy/include/Acts/Extrapolation/Wrapper.hpp
@@ -1,6 +1,6 @@
-// This file is part of the ACTS project.
+// This file is part of the Acts project.
 //
-// Copyright (C) 2017-2018 ACTS project team
+// Copyright (C) 2017-2018 Acts project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
@@ -55,7 +55,7 @@ namespace propagation {
   };
 
   /// @brief Wrapper for PropagationEngine to compare with the
-  /// the ACTS Propagator
+  /// the Acts Propagator
   ///
   /// @tparam Impl Implementation of the propagation algorithm
   template <typename Impl>
diff --git a/Legacy/include/Acts/Extrapolation/detail/ExtrapolationCell.ipp b/Legacy/include/Acts/Extrapolation/detail/ExtrapolationCell.ipp
index 6fc22a890..964fa6f7f 100644
--- a/Legacy/include/Acts/Extrapolation/detail/ExtrapolationCell.ipp
+++ b/Legacy/include/Acts/Extrapolation/detail/ExtrapolationCell.ipp
@@ -1,13 +1,13 @@
-// This file is part of the ACTS project.
+// This file is part of the Acts project.
 //
-// Copyright (C) 2017 ACTS project team
+// Copyright (C) 2017 Acts project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
 // file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 ///////////////////////////////////////////////////////////////////
-// ExtrapolationCell.ipp, ACTS project
+// ExtrapolationCell.ipp, Acts project
 ///////////////////////////////////////////////////////////////////
 
 template <class T>
diff --git a/Legacy/include/Acts/Extrapolation/detail/ExtrapolationEngine.ipp b/Legacy/include/Acts/Extrapolation/detail/ExtrapolationEngine.ipp
index 12a7459ce..56b2c6a2a 100644
--- a/Legacy/include/Acts/Extrapolation/detail/ExtrapolationEngine.ipp
+++ b/Legacy/include/Acts/Extrapolation/detail/ExtrapolationEngine.ipp
@@ -1,13 +1,13 @@
-// This file is part of the ACTS project.
+// This file is part of the Acts project.
 //
-// Copyright (C) 2016-2017 ACTS project team
+// Copyright (C) 2016-2017 Acts project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
 // file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 ///////////////////////////////////////////////////////////////////
-// ExtrapolationEngine.ipp, ACTS project
+// ExtrapolationEngine.ipp, Acts project
 ///////////////////////////////////////////////////////////////////
 
 #include <iomanip>
diff --git a/Legacy/include/Acts/Extrapolation/detail/ExtrapolationMacros.hpp b/Legacy/include/Acts/Extrapolation/detail/ExtrapolationMacros.hpp
index c8dacf5bb..2d301281b 100644
--- a/Legacy/include/Acts/Extrapolation/detail/ExtrapolationMacros.hpp
+++ b/Legacy/include/Acts/Extrapolation/detail/ExtrapolationMacros.hpp
@@ -1,13 +1,13 @@
-// This file is part of the ACTS project.
+// This file is part of the Acts project.
 //
-// Copyright (C) 2016-2017 ACTS project team
+// Copyright (C) 2016-2017 Acts project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
 // file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 ///////////////////////////////////////////////////////////////////
-// ExtrapolationMacros.h, ACTS project
+// ExtrapolationMacros.h, Acts project
 ///////////////////////////////////////////////////////////////////
 // output stream macros to facilitate screen output and consistent checking
 
diff --git a/Legacy/include/Acts/Extrapolation/detail/RungeKuttaEngine.ipp b/Legacy/include/Acts/Extrapolation/detail/RungeKuttaEngine.ipp
index 78ac8baf6..ff00600b2 100644
--- a/Legacy/include/Acts/Extrapolation/detail/RungeKuttaEngine.ipp
+++ b/Legacy/include/Acts/Extrapolation/detail/RungeKuttaEngine.ipp
@@ -1,6 +1,6 @@
-// This file is part of the ACTS project.
+// This file is part of the Acts project.
 //
-// Copyright (C) 2016-2018 ACTS project team
+// Copyright (C) 2016-2018 Acts project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/Legacy/include/Acts/Extrapolation/detail/RungeKuttaUtils.hpp b/Legacy/include/Acts/Extrapolation/detail/RungeKuttaUtils.hpp
index 2005d05d0..ab95eb462 100644
--- a/Legacy/include/Acts/Extrapolation/detail/RungeKuttaUtils.hpp
+++ b/Legacy/include/Acts/Extrapolation/detail/RungeKuttaUtils.hpp
@@ -1,13 +1,13 @@
-// This file is part of the ACTS project.
+// This file is part of the Acts project.
 //
-// Copyright (C) 2016-2017 ACTS project team
+// Copyright (C) 2016-2017 Acts project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
 // file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 /////////////////////////////////////////////////////////////////////////////////
-//  RungeKuttaUtils.h, ACTS project
+//  RungeKuttaUtils.h, Acts project
 /////////////////////////////////////////////////////////////////////////////////
 
 #pragma once
diff --git a/Legacy/include/Acts/Extrapolation/detail/StaticEngine.ipp b/Legacy/include/Acts/Extrapolation/detail/StaticEngine.ipp
index a937f5aa1..f6e68c233 100644
--- a/Legacy/include/Acts/Extrapolation/detail/StaticEngine.ipp
+++ b/Legacy/include/Acts/Extrapolation/detail/StaticEngine.ipp
@@ -1,13 +1,13 @@
-// This file is part of the ACTS project.
+// This file is part of the Acts project.
 //
-// Copyright (C) 2016-2018 ACTS project team
+// Copyright (C) 2016-2018 Acts project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
 // file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 ///////////////////////////////////////////////////////////////////
-// StaticEngine.ipp, ACTS project
+// StaticEngine.ipp, Acts project
 ///////////////////////////////////////////////////////////////////
 
 #include <iomanip>
diff --git a/Legacy/include/Acts/Extrapolation/detail/StaticNavigationEngine.ipp b/Legacy/include/Acts/Extrapolation/detail/StaticNavigationEngine.ipp
index 254d00872..79efe34de 100644
--- a/Legacy/include/Acts/Extrapolation/detail/StaticNavigationEngine.ipp
+++ b/Legacy/include/Acts/Extrapolation/detail/StaticNavigationEngine.ipp
@@ -1,13 +1,13 @@
-// This file is part of the ACTS project.
+// This file is part of the Acts project.
 //
-// Copyright (C) 2016-2018 ACTS project team
+// Copyright (C) 2016-2018 Acts project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
 // file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 ///////////////////////////////////////////////////////////////////
-// StaticNavigationEngine.ipp, ACTS project
+// StaticNavigationEngine.ipp, Acts project
 ///////////////////////////////////////////////////////////////////
 
 #include "Acts/Detector/TrackingGeometry.hpp"
diff --git a/Legacy/include/Acts/Propagator/AtlasStepper.hpp b/Legacy/include/Acts/Propagator/AtlasStepper.hpp
index 31389aa7c..87e31a248 100644
--- a/Legacy/include/Acts/Propagator/AtlasStepper.hpp
+++ b/Legacy/include/Acts/Propagator/AtlasStepper.hpp
@@ -1,6 +1,6 @@
-// This file is part of the ACTS project.
+// This file is part of the Acts project.
 //
-// Copyright (C) 2016-2018 ACTS project team
+// Copyright (C) 2016-2018 Acts project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/Legacy/include/Acts/Seeding/ATL_Seedmaker.hpp b/Legacy/include/Acts/Seeding/ATL_Seedmaker.hpp
index 3523b5950..83b7aa286 100644
--- a/Legacy/include/Acts/Seeding/ATL_Seedmaker.hpp
+++ b/Legacy/include/Acts/Seeding/ATL_Seedmaker.hpp
@@ -1,13 +1,13 @@
-// This file is part of the ACTS project.
+// This file is part of the Acts project.
 //
-// Copyright (C) 2018 ACTS project team
+// Copyright (C) 2018 Acts project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
 // file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 ///////////////////////////////////////////////////////////////////
-// ATL_Seedmaker.hpp ACTS project
+// ATL_Seedmaker.hpp Acts project
 ///////////////////////////////////////////////////////////////////
 
 #pragma once
diff --git a/Legacy/include/Acts/Seeding/ATL_Seedmaker.ipp b/Legacy/include/Acts/Seeding/ATL_Seedmaker.ipp
index 56b1dba0c..4af9240c2 100644
--- a/Legacy/include/Acts/Seeding/ATL_Seedmaker.ipp
+++ b/Legacy/include/Acts/Seeding/ATL_Seedmaker.ipp
@@ -1,13 +1,13 @@
-// This file is part of the ACTS project.
+// This file is part of the Acts project.
 //
-// Copyright (C) 2018 ACTS project team
+// Copyright (C) 2018 Acts project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
 // file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 ///////////////////////////////////////////////////////////////////
-// ATL_Seedmaker.ipp ACTS project
+// ATL_Seedmaker.ipp Acts project
 ///////////////////////////////////////////////////////////////////
 
 #include <algorithm>
diff --git a/Legacy/include/Acts/Seeding/InternalSeed.hpp b/Legacy/include/Acts/Seeding/InternalSeed.hpp
index d56d76bac..12f6d798a 100644
--- a/Legacy/include/Acts/Seeding/InternalSeed.hpp
+++ b/Legacy/include/Acts/Seeding/InternalSeed.hpp
@@ -1,13 +1,13 @@
-// This file is part of the ACTS project.
+// This file is part of the Acts project.
 //
-// Copyright (C) 2018 ACTS project team
+// Copyright (C) 2018 Acts project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
 // file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 ///////////////////////////////////////////////////////////////////
-// InternalSeed.hpp ACTS project
+// InternalSeed.hpp Acts project
 ///////////////////////////////////////////////////////////////////
 
 #pragma once
diff --git a/Legacy/include/Acts/Seeding/SPForSeed.hpp b/Legacy/include/Acts/Seeding/SPForSeed.hpp
index 91d3ab353..6e4144e8c 100644
--- a/Legacy/include/Acts/Seeding/SPForSeed.hpp
+++ b/Legacy/include/Acts/Seeding/SPForSeed.hpp
@@ -1,13 +1,13 @@
-// This file is part of the ACTS project.
+// This file is part of the Acts project.
 //
-// Copyright (C) 2018 ACTS project team
+// Copyright (C) 2018 Acts project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
 // file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 ///////////////////////////////////////////////////////////////////
-// SPForSeed.hpp ACTS project
+// SPForSeed.hpp Acts project
 ///////////////////////////////////////////////////////////////////
 
 #pragma once
diff --git a/Legacy/include/Acts/Seeding/Seed.hpp b/Legacy/include/Acts/Seeding/Seed.hpp
index 2dfbbcb5e..3f4dbacbd 100644
--- a/Legacy/include/Acts/Seeding/Seed.hpp
+++ b/Legacy/include/Acts/Seeding/Seed.hpp
@@ -1,13 +1,13 @@
-// This file is part of the ACTS project.
+// This file is part of the Acts project.
 //
-// Copyright (C) 2018 ACTS project team
+// Copyright (C) 2018 Acts project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
 // file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 ///////////////////////////////////////////////////////////////////
-// Seed.hpp ACTS project
+// Seed.hpp Acts project
 ///////////////////////////////////////////////////////////////////
 
 #pragma once
diff --git a/Legacy/src/Extrapolation/ExtrapolationCell.cpp b/Legacy/src/Extrapolation/ExtrapolationCell.cpp
index 485d372f7..e10eb3382 100644
--- a/Legacy/src/Extrapolation/ExtrapolationCell.cpp
+++ b/Legacy/src/Extrapolation/ExtrapolationCell.cpp
@@ -1,13 +1,13 @@
-// This file is part of the ACTS project.
+// This file is part of the Acts project.
 //
-// Copyright (C) 2016-2017 ACTS project team
+// Copyright (C) 2016-2017 Acts project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
 // file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 ///////////////////////////////////////////////////////////////////
-// ExtrapolationCell.cpp, ACTS project
+// ExtrapolationCell.cpp, Acts project
 ///////////////////////////////////////////////////////////////////
 
 #include "Acts/Extrapolation/ExtrapolationCell.hpp"
diff --git a/Legacy/src/Extrapolation/ExtrapolationEngine.cpp b/Legacy/src/Extrapolation/ExtrapolationEngine.cpp
index f36ff11c8..c812a77c6 100644
--- a/Legacy/src/Extrapolation/ExtrapolationEngine.cpp
+++ b/Legacy/src/Extrapolation/ExtrapolationEngine.cpp
@@ -1,13 +1,13 @@
-// This file is part of the ACTS project.
+// This file is part of the Acts project.
 //
-// Copyright (C) 2016-2017 ACTS project team
+// Copyright (C) 2016-2017 Acts project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
 // file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 ///////////////////////////////////////////////////////////////////
-// ExtrapolationEngine.cpp, ACTS project
+// ExtrapolationEngine.cpp, Acts project
 ///////////////////////////////////////////////////////////////////
 
 #include "Acts/Extrapolation/ExtrapolationEngine.hpp"
diff --git a/Legacy/src/Extrapolation/MaterialEffectsEngine.cpp b/Legacy/src/Extrapolation/MaterialEffectsEngine.cpp
index f212ca6c5..2ac51be6c 100644
--- a/Legacy/src/Extrapolation/MaterialEffectsEngine.cpp
+++ b/Legacy/src/Extrapolation/MaterialEffectsEngine.cpp
@@ -1,13 +1,13 @@
-// This file is part of the ACTS project.
+// This file is part of the Acts project.
 //
-// Copyright (C) 2016-2018 ACTS project team
+// Copyright (C) 2016-2018 Acts project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
 // file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 ///////////////////////////////////////////////////////////////////
-// MaterialEffectsEngine.cpp, ACTS project
+// MaterialEffectsEngine.cpp, Acts project
 ///////////////////////////////////////////////////////////////////
 
 #include "Acts/Extrapolation/MaterialEffectsEngine.hpp"
diff --git a/Legacy/src/Extrapolation/RungeKuttaUtils.cpp b/Legacy/src/Extrapolation/RungeKuttaUtils.cpp
index ebc702992..ca45968e7 100644
--- a/Legacy/src/Extrapolation/RungeKuttaUtils.cpp
+++ b/Legacy/src/Extrapolation/RungeKuttaUtils.cpp
@@ -1,13 +1,13 @@
-// This file is part of the ACTS project.
+// This file is part of the Acts project.
 //
-// Copyright (C) 2016-2018 ACTS project team
+// Copyright (C) 2016-2018 Acts project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
 // file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 /////////////////////////////////////////////////////////////////////////////////
-// RungeKuttaUtils.cpp , ACTS project
+// RungeKuttaUtils.cpp , Acts project
 ///////////////////////////////////////////////////////////////////
 
 #include "Acts/Extrapolation/detail/RungeKuttaUtils.hpp"
diff --git a/Legacy/src/Extrapolation/StaticEngine.cpp b/Legacy/src/Extrapolation/StaticEngine.cpp
index 0e80af5be..1c491660a 100644
--- a/Legacy/src/Extrapolation/StaticEngine.cpp
+++ b/Legacy/src/Extrapolation/StaticEngine.cpp
@@ -1,13 +1,13 @@
-// This file is part of the ACTS project.
+// This file is part of the Acts project.
 //
-// Copyright (C) 2016-2017 ACTS project team
+// Copyright (C) 2016-2017 Acts project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
 // file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 ///////////////////////////////////////////////////////////////////
-// StaticEngine.cpp, ACTS project
+// StaticEngine.cpp, Acts project
 ///////////////////////////////////////////////////////////////////
 
 // STL
diff --git a/Legacy/src/Extrapolation/StaticNavigationEngine.cpp b/Legacy/src/Extrapolation/StaticNavigationEngine.cpp
index a3d1cfe3f..a05d5387b 100644
--- a/Legacy/src/Extrapolation/StaticNavigationEngine.cpp
+++ b/Legacy/src/Extrapolation/StaticNavigationEngine.cpp
@@ -1,13 +1,13 @@
-// This file is part of the ACTS project.
+// This file is part of the Acts project.
 //
-// Copyright (C) 2016-2017 ACTS project team
+// Copyright (C) 2016-2017 Acts project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
 // file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 ///////////////////////////////////////////////////////////////////
-// StaticNavigationEngine.cpp, ACTS project
+// StaticNavigationEngine.cpp, Acts project
 ///////////////////////////////////////////////////////////////////
 
 // STL
diff --git a/Plugins/DD4hepPlugin/include/Acts/Plugins/DD4hepPlugins/ActsExtension.hpp b/Plugins/DD4hepPlugin/include/Acts/Plugins/DD4hepPlugins/ActsExtension.hpp
index f8487cd18..a7d61c4f1 100644
--- a/Plugins/DD4hepPlugin/include/Acts/Plugins/DD4hepPlugins/ActsExtension.hpp
+++ b/Plugins/DD4hepPlugin/include/Acts/Plugins/DD4hepPlugins/ActsExtension.hpp
@@ -1,13 +1,13 @@
-// This file is part of the ACTS project.
+// This file is part of the Acts project.
 //
-// Copyright (C) 2017 ACTS project team
+// Copyright (C) 2017 Acts project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
 // file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 ///////////////////////////////////////////////////////////////////
-// ActsExtension.h, ACTS project, DD4hepDetector plugin
+// ActsExtension.h, Acts project, DD4hepDetector plugin
 ///////////////////////////////////////////////////////////////////
 
 #pragma once
@@ -61,7 +61,7 @@ trapezoidalDigiModule(double                      minHalflengthX,
 /// @class ActsExtension
 ///
 /// @brief Extension of the \a %DD4hep \a DetElement needed for translation
-/// into the ACTS tracking geometry
+/// into the Acts tracking geometry
 ///
 /// @todo re-validate material mapping with new implementation + allow material
 /// mapping onto modules ++ allow handing over average material to layers(?)
@@ -69,7 +69,7 @@ trapezoidalDigiModule(double                      minHalflengthX,
 /// Implementation of the Acts::IActsExtension class, which uses the
 /// extension mechanism of DD4hep for the \a %DD4hep \a DetElement.
 /// This extensions are needed for the translation from the \a %DD4hep
-/// geometry into the tracking geometry of the ACTS package.
+/// geometry into the tracking geometry of the Acts package.
 ///
 /// This extensions are necessary in order to distinguish during the translation
 /// if
@@ -89,12 +89,12 @@ trapezoidalDigiModule(double                      minHalflengthX,
 /// declared as a layer and the specific parameters needed for material mapping
 /// should be handed over.
 /// In case the sensitive modules/components contained by a layer have a
-/// different orientation in respect to the local tracking frame of ACTS,
+/// different orientation in respect to the local tracking frame of Acts,
 /// the axes orientation of these modules can be set for the layer.
 ///
 /// In \a %DD4hep cylinder and disc volumes are both described with the
 /// underlying
-/// \a ROOT \c TGeoConeSeg class. In ACTS one needs to distinguish these two
+/// \a ROOT \c TGeoConeSeg class. In Acts one needs to distinguish these two
 /// volume
 /// types. Therefore volumes which are endcaps or barrels should be
 /// indicated as
@@ -160,7 +160,7 @@ trapezoidalDigiModule(double                      minHalflengthX,
 /// segmentation please use the global functions rectangleDigiModule() and
 /// trapezoidalDigiModule().
 ///
-/// If one wants to build the ACTS Tracking Geometry with \a %DD4hep input
+/// If one wants to build the Acts Tracking Geometry with \a %DD4hep input
 /// these
 /// extension should be used during the construction of the \a %DD4hep
 /// geometry
@@ -235,7 +235,7 @@ public:
     /// Orientation of the modules contained by a layer in respect to the
     /// tracking frame. A different orientation can occur because in TGeo (which
     /// is the underlying geometry model of %DD4hep) all shapes are 3D volumes
-    /// also the sensitive components of a detector. In the ACTS tracking
+    /// also the sensitive components of a detector. In the Acts tracking
     /// geometry these sensitive components are described as 2D surfaces, which
     /// have their local 2D coordinate system. Therefore one needs to know which
     /// coordinates should be taken as the local coordinates.
diff --git a/Plugins/DD4hepPlugin/include/Acts/Plugins/DD4hepPlugins/ConvertDD4hepDetector.hpp b/Plugins/DD4hepPlugin/include/Acts/Plugins/DD4hepPlugins/ConvertDD4hepDetector.hpp
index a7c102de5..12ad40b4b 100644
--- a/Plugins/DD4hepPlugin/include/Acts/Plugins/DD4hepPlugins/ConvertDD4hepDetector.hpp
+++ b/Plugins/DD4hepPlugin/include/Acts/Plugins/DD4hepPlugins/ConvertDD4hepDetector.hpp
@@ -1,6 +1,6 @@
-// This file is part of the ACTS project.
+// This file is part of the Acts project.
 //
-// Copyright (C) 2017 ACTS project team
+// Copyright (C) 2017 Acts project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/Plugins/DD4hepPlugin/include/Acts/Plugins/DD4hepPlugins/DD4hepDetElement.hpp b/Plugins/DD4hepPlugin/include/Acts/Plugins/DD4hepPlugins/DD4hepDetElement.hpp
index 994806602..2c07f1929 100644
--- a/Plugins/DD4hepPlugin/include/Acts/Plugins/DD4hepPlugins/DD4hepDetElement.hpp
+++ b/Plugins/DD4hepPlugin/include/Acts/Plugins/DD4hepPlugins/DD4hepDetElement.hpp
@@ -1,13 +1,13 @@
-// This file is part of the ACTS project.
+// This file is part of the Acts project.
 //
-// Copyright (C) 2017 ACTS project team
+// Copyright (C) 2017 Acts project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
 // file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 ///////////////////////////////////////////////////////////////////
-// DD4hepDetElement.h, ACTS project, DD4hepDetector plugin
+// DD4hepDetElement.h, Acts project, DD4hepDetector plugin
 ///////////////////////////////////////////////////////////////////
 
 #pragma once
diff --git a/Plugins/DD4hepPlugin/include/Acts/Plugins/DD4hepPlugins/DD4hepLayerBuilder.hpp b/Plugins/DD4hepPlugin/include/Acts/Plugins/DD4hepPlugins/DD4hepLayerBuilder.hpp
index 568e40b40..928cf373f 100644
--- a/Plugins/DD4hepPlugin/include/Acts/Plugins/DD4hepPlugins/DD4hepLayerBuilder.hpp
+++ b/Plugins/DD4hepPlugin/include/Acts/Plugins/DD4hepPlugins/DD4hepLayerBuilder.hpp
@@ -1,6 +1,6 @@
-// This file is part of the ACTS project.
+// This file is part of the Acts project.
 //
-// Copyright (C) 2017 ACTS project team
+// Copyright (C) 2017 Acts project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
@@ -142,7 +142,7 @@ private:
   /// @param detElement the DD4hep::DetElement of the layer
   /// @param surfaces the vector of surfaces which should be filled with the
   /// sensitive detector elements
-  /// @param axes the orientation of the modules to the ACTS frame
+  /// @param axes the orientation of the modules to the Acts frame
   void
   collectSensitive(const dd4hep::DetElement&          detElement,
                    std::vector<const Acts::Surface*>& surfaces,
@@ -154,7 +154,7 @@ private:
   /// created
   /// @param isDisc in case the sensitive detector module should be translated
   ///        as disc (e.g. for endcaps) this flag should be set to true
-  /// @param axes the orientation of the modules to the ACTS frame
+  /// @param axes the orientation of the modules to the Acts frame
   const Acts::Surface*
   createSensitiveSurface(const dd4hep::DetElement& detElement,
                          bool                      isDisc = false,
@@ -162,7 +162,7 @@ private:
 
   // Private helper function to convert the TGeo transformation matrix into
   // a
-  // ACTS transformation matrix
+  // Acts transformation matrix
   /// @param tGeoTrans TGeo transformation matrix which should be converted
   std::shared_ptr<const Acts::Transform3D>
   convertTransform(const TGeoMatrix* tGeoTrans) const;
diff --git a/Plugins/DD4hepPlugin/include/Acts/Plugins/DD4hepPlugins/IActsExtension.hpp b/Plugins/DD4hepPlugin/include/Acts/Plugins/DD4hepPlugins/IActsExtension.hpp
index 43fc9f041..dc605f8e3 100644
--- a/Plugins/DD4hepPlugin/include/Acts/Plugins/DD4hepPlugins/IActsExtension.hpp
+++ b/Plugins/DD4hepPlugin/include/Acts/Plugins/DD4hepPlugins/IActsExtension.hpp
@@ -1,13 +1,13 @@
-// This file is part of the ACTS project.
+// This file is part of the Acts project.
 //
-// Copyright (C) 2017 ACTS project team
+// Copyright (C) 2017 Acts project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
 // file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 ///////////////////////////////////////////////////////////////////
-// IDetExtension.h, ACTS project, DD4hepDetector plugin
+// IDetExtension.h, Acts project, DD4hepDetector plugin
 ///////////////////////////////////////////////////////////////////
 
 #pragma once
@@ -28,11 +28,11 @@ namespace Acts {
 /// @class IActsExtension
 ///
 /// @brief Interface for Extension of the DD4hep \a DetElement needed for
-/// translation into ACTS tracking geometry
+/// translation into Acts tracking geometry
 ///
 /// Interface class for making extensions to the DD4hep \a DetElement class,
 /// needed  for the translation from the DD4hep geometry into the tracking
-/// geometry of the ACTS package.
+/// geometry of the Acts package.
 ///
 /// This extensions are necessary in order to distinguish in the translation if
 /// a DD4hep \a DetElement is
@@ -51,7 +51,7 @@ namespace Acts {
 /// which should carry material should also be declared as a layer and the
 /// specific parameters needed for material mapping should be handed over.
 /// In case the sensitive modules/components contained by a layer have a
-/// different orientation in respect to the local tracking frame of ACTS, the
+/// different orientation in respect to the local tracking frame of Acts, the
 /// axes orientation of these modules can be set for the layer.
 /// In case the segmentation is set for the module (by using the second
 /// constructor setting the segmentation or using the setSegmentation()
@@ -59,7 +59,7 @@ namespace Acts {
 /// the modules.
 ///
 /// In DD4hep cylinder and disc volumes are both described with the underlying
-/// ROOT TGeoConeSeg class. In ACTS one needs to distinguish these two volume
+/// ROOT TGeoConeSeg class. In Acts one needs to distinguish these two volume
 /// types. Therefore volumes which are endcaps or barrels should be indicated as
 /// these.
 /// The ActsExtension should also be used to indicate that a \a DetElement is
diff --git a/Plugins/DD4hepPlugin/src/ActsExtension.cpp b/Plugins/DD4hepPlugin/src/ActsExtension.cpp
index 7364ace0e..43c356564 100644
--- a/Plugins/DD4hepPlugin/src/ActsExtension.cpp
+++ b/Plugins/DD4hepPlugin/src/ActsExtension.cpp
@@ -1,6 +1,6 @@
-// This file is part of the ACTS project.
+// This file is part of the Acts project.
 //
-// Copyright (C) 2017 ACTS project team
+// Copyright (C) 2017 Acts project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
@@ -23,7 +23,7 @@ Acts::rectangleDigiModule(double                      halflengthX,
                           double                      thickness,
                           const dd4hep::Segmentation& segmentation)
 {
-  // convert to ACTS units
+  // convert to Acts units
   double scalor = units::_cm;
   halflengthX *= scalor;
   halflengthY *= scalor;
@@ -58,7 +58,7 @@ Acts::trapezoidalDigiModule(double                      minHalflengthX,
                             double                      thickness,
                             const dd4hep::Segmentation& segmentation)
 {
-  // convert to ACTS units
+  // convert to Acts units
   double scalor = units::_cm;
   minHalflengthX *= scalor;
   maxHalflengthX *= scalor;
diff --git a/Plugins/DD4hepPlugin/src/ConvertDD4hepDetector.cpp b/Plugins/DD4hepPlugin/src/ConvertDD4hepDetector.cpp
index c341e9a4d..1d56bef6d 100644
--- a/Plugins/DD4hepPlugin/src/ConvertDD4hepDetector.cpp
+++ b/Plugins/DD4hepPlugin/src/ConvertDD4hepDetector.cpp
@@ -1,6 +1,6 @@
-// This file is part of the ACTS project.
+// This file is part of the Acts project.
 //
-// Copyright (C) 2017-2018 ACTS project team
+// Copyright (C) 2017-2018 Acts project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
@@ -40,7 +40,7 @@ convertDD4hepDetector(
       = Acts::getDefaultLogger("DD4hepConversion", loggingLevel);
   ACTS_LOCAL_LOGGER(DD4hepConverterlogger);
 
-  ACTS_INFO("Translating DD4hep geometry into ACTS geometry");
+  ACTS_INFO("Translating DD4hep geometry into Acts geometry");
   // get the sub detectors of the world detector e.g. beampipe, pixel detector,
   // strip detector
   std::vector<dd4hep::DetElement> subDetectors;
diff --git a/Plugins/DD4hepPlugin/src/DD4hepDetectorElement.cpp b/Plugins/DD4hepPlugin/src/DD4hepDetectorElement.cpp
index 9932ed19b..99670bb00 100644
--- a/Plugins/DD4hepPlugin/src/DD4hepDetectorElement.cpp
+++ b/Plugins/DD4hepPlugin/src/DD4hepDetectorElement.cpp
@@ -1,6 +1,6 @@
-// This file is part of the ACTS project.
+// This file is part of the Acts project.
 //
-// Copyright (C) 2017 ACTS project team
+// Copyright (C) 2017 Acts project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/Plugins/DD4hepPlugin/src/DD4hepLayerBuilder.cpp b/Plugins/DD4hepPlugin/src/DD4hepLayerBuilder.cpp
index 5b3e9fb02..f49f0c838 100644
--- a/Plugins/DD4hepPlugin/src/DD4hepLayerBuilder.cpp
+++ b/Plugins/DD4hepPlugin/src/DD4hepLayerBuilder.cpp
@@ -1,6 +1,6 @@
-// This file is part of the ACTS project.
+// This file is part of the Acts project.
 //
-// Copyright (C) 2017-2018 ACTS project team
+// Copyright (C) 2017-2018 Acts project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/Plugins/Geant4Plugin/include/Acts/Plugins/Geant4Plugins/Geant4DetectorElement.hpp b/Plugins/Geant4Plugin/include/Acts/Plugins/Geant4Plugins/Geant4DetectorElement.hpp
index 2536f1048..848240ce1 100644
--- a/Plugins/Geant4Plugin/include/Acts/Plugins/Geant4Plugins/Geant4DetectorElement.hpp
+++ b/Plugins/Geant4Plugin/include/Acts/Plugins/Geant4Plugins/Geant4DetectorElement.hpp
@@ -1,13 +1,13 @@
-// This file is part of the ACTS project.
+// This file is part of the Acts project.
 //
-// Copyright (C) 2017 ACTS project team
+// Copyright (C) 2017 Acts project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
 // file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 ///////////////////////////////////////////////////////////////////
-// Geant4DetElement.h, ACTS project, DD4hepDetector plugin
+// Geant4DetElement.h, Acts project, DD4hepDetector plugin
 ///////////////////////////////////////////////////////////////////
 
 #pragma once
diff --git a/Plugins/JsonPlugin/include/Acts/Plugins/JsonPlugin/FromJson.hpp b/Plugins/JsonPlugin/include/Acts/Plugins/JsonPlugin/FromJson.hpp
index f704f6d16..5947b9ef4 100644
--- a/Plugins/JsonPlugin/include/Acts/Plugins/JsonPlugin/FromJson.hpp
+++ b/Plugins/JsonPlugin/include/Acts/Plugins/JsonPlugin/FromJson.hpp
@@ -1,6 +1,6 @@
-// This file is part of the ACTS project.
+// This file is part of the Acts project.
 //
-// Copyright (C) 2018 ACTS project team
+// Copyright (C) 2018 Acts project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/Plugins/JsonPlugin/src/FromJson.cpp b/Plugins/JsonPlugin/src/FromJson.cpp
index 1cdfdf242..38700c816 100644
--- a/Plugins/JsonPlugin/src/FromJson.cpp
+++ b/Plugins/JsonPlugin/src/FromJson.cpp
@@ -1,6 +1,6 @@
-// This file is part of the ACTS project.
+// This file is part of the Acts project.
 //
-// Copyright (C) 2018 ACTS project team
+// Copyright (C) 2018 Acts project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/Plugins/MaterialPlugin/include/Acts/Plugins/MaterialPlugins/AssignedMaterialSteps.hpp b/Plugins/MaterialPlugin/include/Acts/Plugins/MaterialPlugins/AssignedMaterialSteps.hpp
index ff9da717a..af7f08ccc 100644
--- a/Plugins/MaterialPlugin/include/Acts/Plugins/MaterialPlugins/AssignedMaterialSteps.hpp
+++ b/Plugins/MaterialPlugin/include/Acts/Plugins/MaterialPlugins/AssignedMaterialSteps.hpp
@@ -1,13 +1,13 @@
-// This file is part of the ACTS project.
+// This file is part of the Acts project.
 //
-// Copyright (C) 2017 ACTS project team
+// Copyright (C) 2017 Acts project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
 // file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 ///////////////////////////////////////////////////////////////////
-// AssignedMaterialSteps.h, ACTS project MaterialPlugins
+// AssignedMaterialSteps.h, Acts project MaterialPlugins
 ///////////////////////////////////////////////////////////////////
 
 #pragma once
diff --git a/Plugins/MaterialPlugin/include/Acts/Plugins/MaterialPlugins/MaterialMapper.hpp b/Plugins/MaterialPlugin/include/Acts/Plugins/MaterialPlugins/MaterialMapper.hpp
index a574d637d..2c0fcf490 100644
--- a/Plugins/MaterialPlugin/include/Acts/Plugins/MaterialPlugins/MaterialMapper.hpp
+++ b/Plugins/MaterialPlugin/include/Acts/Plugins/MaterialPlugins/MaterialMapper.hpp
@@ -1,13 +1,13 @@
-// This file is part of the ACTS project.
+// This file is part of the Acts project.
 //
-// Copyright (C) 2017 ACTS project team
+// Copyright (C) 2017 Acts project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
 // file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 ///////////////////////////////////////////////////////////////////
-// MaterialMapper.h, ACTS project MaterialPlugins
+// MaterialMapper.h, Acts project MaterialPlugins
 ///////////////////////////////////////////////////////////////////
 
 #pragma once
@@ -32,7 +32,7 @@ class MaterialProperties;
 /// @brief Class for material mapping
 ///
 /// This class should be used to map material from the full and detailed
-/// detector geometry onto the simplified ACTS geometry. It offers options to
+/// detector geometry onto the simplified Acts geometry. It offers options to
 /// map, average and finalize the material.
 ///
 /// Preconditions are:
@@ -48,7 +48,7 @@ class MaterialProperties;
 /// One MaterialTrack (containing all the MaterialSteps along a Track) is
 /// mapped by using the function Acts::MaterialMapper::mapMaterial(). The
 /// mapping process starts by extrapolating from the same starting
-/// point and direction as the MaterialTrack through the ACTS geometry.
+/// point and direction as the MaterialTrack through the Acts geometry.
 /// The extrapolation engine then finds  the closest surface marked to carry
 /// material (by carrying a SurfaceMaterialProxy).
 /// The material steps are then assigned to the corresponding surfaces
diff --git a/Plugins/MaterialPlugin/include/Acts/Plugins/MaterialPlugins/MaterialStep.hpp b/Plugins/MaterialPlugin/include/Acts/Plugins/MaterialPlugins/MaterialStep.hpp
index e80d394b3..3ab21d5ac 100644
--- a/Plugins/MaterialPlugin/include/Acts/Plugins/MaterialPlugins/MaterialStep.hpp
+++ b/Plugins/MaterialPlugin/include/Acts/Plugins/MaterialPlugins/MaterialStep.hpp
@@ -1,13 +1,13 @@
-// This file is part of the ACTS project.
+// This file is part of the Acts project.
 //
-// Copyright (C) 2017-2018 ACTS project team
+// Copyright (C) 2017-2018 Acts project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
 // file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 ///////////////////////////////////////////////////////////////////
-// MaterialStep.hpp, ACTS project
+// MaterialStep.hpp, Acts project
 ///////////////////////////////////////////////////////////////////
 
 #pragma once
diff --git a/Plugins/MaterialPlugin/include/Acts/Plugins/MaterialPlugins/MaterialTrack.hpp b/Plugins/MaterialPlugin/include/Acts/Plugins/MaterialPlugins/MaterialTrack.hpp
index 4e1a77a83..9a6393967 100644
--- a/Plugins/MaterialPlugin/include/Acts/Plugins/MaterialPlugins/MaterialTrack.hpp
+++ b/Plugins/MaterialPlugin/include/Acts/Plugins/MaterialPlugins/MaterialTrack.hpp
@@ -1,13 +1,13 @@
-// This file is part of the ACTS project.
+// This file is part of the Acts project.
 //
-// Copyright (C) 2017 ACTS project team
+// Copyright (C) 2017 Acts project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
 // file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 ///////////////////////////////////////////////////////////////////
-// MaterialTrack.hpp, ACTS project MaterialPlugins
+// MaterialTrack.hpp, Acts project MaterialPlugins
 ///////////////////////////////////////////////////////////////////
 
 #pragma once
diff --git a/Plugins/MaterialPlugin/include/Acts/Plugins/MaterialPlugins/SurfaceMaterialRecord.hpp b/Plugins/MaterialPlugin/include/Acts/Plugins/MaterialPlugins/SurfaceMaterialRecord.hpp
index 2317ecc83..8a3709253 100644
--- a/Plugins/MaterialPlugin/include/Acts/Plugins/MaterialPlugins/SurfaceMaterialRecord.hpp
+++ b/Plugins/MaterialPlugin/include/Acts/Plugins/MaterialPlugins/SurfaceMaterialRecord.hpp
@@ -1,13 +1,13 @@
-// This file is part of the ACTS project.
+// This file is part of the Acts project.
 //
-// Copyright (C) 2017 ACTS project team
+// Copyright (C) 2017 Acts project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
 // file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 ///////////////////////////////////////////////////////////////////
-// SurfaceMaterialRecord.h, ACTS project MaterialPlugins
+// SurfaceMaterialRecord.h, Acts project MaterialPlugins
 ///////////////////////////////////////////////////////////////////
 
 #pragma once
diff --git a/Plugins/MaterialPlugin/src/MaterialMapper.cpp b/Plugins/MaterialPlugin/src/MaterialMapper.cpp
index 23b22577e..61a9cd90f 100644
--- a/Plugins/MaterialPlugin/src/MaterialMapper.cpp
+++ b/Plugins/MaterialPlugin/src/MaterialMapper.cpp
@@ -1,13 +1,13 @@
-// This file is part of the ACTS project.
+// This file is part of the Acts project.
 //
-// Copyright (C) 2017 ACTS project team
+// Copyright (C) 2017 Acts project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
 // file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 ///////////////////////////////////////////////////////////////////
-// MaterialMapper.cpp, ACTS project
+// MaterialMapper.cpp, Acts project
 ///////////////////////////////////////////////////////////////////
 
 #include "Acts/Plugins/MaterialPlugins/MaterialMapper.hpp"
@@ -94,7 +94,7 @@ Acts::MaterialMapper::mapMaterialTrack(Cache&               mappingCache,
   // collect for validation output
   std::map<geo_id_value, std::pair<double, double>> collectedMaterial;
 
-  // let's extrapolate through the ACTS detector and record all surfaces
+  // let's extrapolate through the Acts detector and record all surfaces
   // that have a material proxy
   if (materialSteps.size()) {
     // get the number of materialsteps
diff --git a/Plugins/MaterialPlugin/src/MaterialStep.cpp b/Plugins/MaterialPlugin/src/MaterialStep.cpp
index 137b6ba3c..9482de1be 100644
--- a/Plugins/MaterialPlugin/src/MaterialStep.cpp
+++ b/Plugins/MaterialPlugin/src/MaterialStep.cpp
@@ -1,13 +1,13 @@
-// This file is part of the ACTS project.
+// This file is part of the Acts project.
 //
-// Copyright (C) 2017 ACTS project team
+// Copyright (C) 2017 Acts project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
 // file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 ///////////////////////////////////////////////////////////////////
-// MaterialStep.cpp, ACTS project
+// MaterialStep.cpp, Acts project
 ///////////////////////////////////////////////////////////////////
 
 #include "Acts/Plugins/MaterialPlugins/MaterialStep.hpp"
diff --git a/Plugins/MaterialPlugin/src/MaterialTrack.cpp b/Plugins/MaterialPlugin/src/MaterialTrack.cpp
index e7fa1d13d..523821039 100644
--- a/Plugins/MaterialPlugin/src/MaterialTrack.cpp
+++ b/Plugins/MaterialPlugin/src/MaterialTrack.cpp
@@ -1,13 +1,13 @@
-// This file is part of the ACTS project.
+// This file is part of the Acts project.
 //
-// Copyright (C) 2017 ACTS project team
+// Copyright (C) 2017 Acts project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
 // file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 ///////////////////////////////////////////////////////////////////
-// MaterialTrack.cpp, ACTS project
+// MaterialTrack.cpp, Acts project
 ///////////////////////////////////////////////////////////////////
 
 #include "Acts/Plugins/MaterialPlugins/MaterialTrack.hpp"
diff --git a/Plugins/MaterialPlugin/src/SurfaceMaterialRecord.cpp b/Plugins/MaterialPlugin/src/SurfaceMaterialRecord.cpp
index 1a73fa0c0..fc117da68 100644
--- a/Plugins/MaterialPlugin/src/SurfaceMaterialRecord.cpp
+++ b/Plugins/MaterialPlugin/src/SurfaceMaterialRecord.cpp
@@ -1,13 +1,13 @@
-// This file is part of the ACTS project.
+// This file is part of the Acts project.
 //
-// Copyright (C) 2017 ACTS project team
+// Copyright (C) 2017 Acts project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
 // file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 ///////////////////////////////////////////////////////////////////
-// SurfaceMaterialRecord.cpp, ACTS project
+// SurfaceMaterialRecord.cpp, Acts project
 ///////////////////////////////////////////////////////////////////
 
 #include "Acts/Plugins/MaterialPlugins/SurfaceMaterialRecord.hpp"
diff --git a/Plugins/TGeoPlugin/include/Acts/Plugins/TGeoPlugins/TGeoDetectorElement.hpp b/Plugins/TGeoPlugin/include/Acts/Plugins/TGeoPlugins/TGeoDetectorElement.hpp
index dc86905d8..e50664a1b 100644
--- a/Plugins/TGeoPlugin/include/Acts/Plugins/TGeoPlugins/TGeoDetectorElement.hpp
+++ b/Plugins/TGeoPlugin/include/Acts/Plugins/TGeoPlugins/TGeoDetectorElement.hpp
@@ -1,13 +1,13 @@
-// This file is part of the ACTS project.
+// This file is part of the Acts project.
 //
-// Copyright (C) 2017 ACTS project team
+// Copyright (C) 2017 Acts project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
 // file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 ///////////////////////////////////////////////////////////////////
-// TGeoDetectorElement.h, ACTS project, TGeoDetector plugin
+// TGeoDetectorElement.h, Acts project, TGeoDetector plugin
 ///////////////////////////////////////////////////////////////////
 
 #pragma once
diff --git a/Plugins/TGeoPlugin/include/Acts/Plugins/TGeoPlugins/TGeoLayerBuilder.hpp b/Plugins/TGeoPlugin/include/Acts/Plugins/TGeoPlugins/TGeoLayerBuilder.hpp
index 7df4daf86..73fe2364d 100644
--- a/Plugins/TGeoPlugin/include/Acts/Plugins/TGeoPlugins/TGeoLayerBuilder.hpp
+++ b/Plugins/TGeoPlugin/include/Acts/Plugins/TGeoPlugins/TGeoLayerBuilder.hpp
@@ -1,13 +1,13 @@
-// This file is part of the ACTS project.
+// This file is part of the Acts project.
 //
-// Copyright (C) 2017 ACTS project team
+// Copyright (C) 2017 Acts project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
 // file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 ///////////////////////////////////////////////////////////////////
-// TGeoLayerBuilder.h, ACTS project, TGeoDetector plugin
+// TGeoLayerBuilder.h, Acts project, TGeoDetector plugin
 ///////////////////////////////////////////////////////////////////
 
 #pragma once
diff --git a/Plugins/TGeoPlugin/src/TGeoDetectorElement.cpp b/Plugins/TGeoPlugin/src/TGeoDetectorElement.cpp
index 38b6a316a..aed6dcff2 100644
--- a/Plugins/TGeoPlugin/src/TGeoDetectorElement.cpp
+++ b/Plugins/TGeoPlugin/src/TGeoDetectorElement.cpp
@@ -1,6 +1,6 @@
-// This file is part of the ACTS project.
+// This file is part of the Acts project.
 //
-// Copyright (C) 2017-2018 ACTS project team
+// Copyright (C) 2017-2018 Acts project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/Plugins/TGeoPlugin/src/TGeoLayerBuilder.cpp b/Plugins/TGeoPlugin/src/TGeoLayerBuilder.cpp
index d9ef55c6e..7485be72e 100644
--- a/Plugins/TGeoPlugin/src/TGeoLayerBuilder.cpp
+++ b/Plugins/TGeoPlugin/src/TGeoLayerBuilder.cpp
@@ -1,6 +1,6 @@
-// This file is part of the ACTS project.
+// This file is part of the Acts project.
 //
-// Copyright (C) 2017-2018 ACTS project team
+// Copyright (C) 2017-2018 Acts project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/README.md b/README.md
index f8e166fbd..647f7ecbc 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-# A Common Tracking Software (ACTS) Project
+# A Common Tracking Software (Acts) Project
 
 [![build status](https://gitlab.cern.ch/acts/acts-core/badges/master/build.svg)](https://gitlab.cern.ch/acts/acts-core/commits/master)
 [![coverage report](https://gitlab.cern.ch/acts/acts-core/badges/master/coverage.svg)](https://gitlab.cern.ch/acts/acts-core/commits/master)
@@ -17,18 +17,18 @@ Key features of this project include:
 * performant and highly flexible algorithms for track propagation and fitting,
 * basic seed finding algorithms.
 
-The git repository for the ACTS project can be found at <a href="https://gitlab.cern.ch/acts/acts-core.git">https://gitlab.cern.ch/acts/acts-core.git</a>.
+The git repository for the Acts project can be found at <a href="https://gitlab.cern.ch/acts/acts-core.git">https://gitlab.cern.ch/acts/acts-core.git</a>.
 
 To get started, you can have a look at our [Getting Started Guide](getting_started.md)
 
 # <a name="mailing-list">Mailing list</a>
 
-In order to receive the latest updates, users of the ACTS project are encouraged to subscribe to [acts-users@cern.ch](https://e-groups.cern.ch/e-groups/Egroup.do?egroupName=acts-users). This list provides:
+In order to receive the latest updates, users of the Acts project are encouraged to subscribe to [acts-users@cern.ch](https://e-groups.cern.ch/e-groups/Egroup.do?egroupName=acts-users). This list provides:
 - regular updates on the software,
-- access to the ACTS JIRA project for bug fixes/feature requests,
+- access to the Acts JIRA project for bug fixes/feature requests,
 - a common place for asking any kind of questions.
 
-If you find a bug, have a feature request, or want to contribute to ACTS, please have a look at the [contribution guide](CONTRIBUTING.md).
+If you find a bug, have a feature request, or want to contribute to Acts, please have a look at the [contribution guide](CONTRIBUTING.md).
 
 # <a name="license-authors">License and authors</a>
 
@@ -36,12 +36,12 @@ This project is published under the Mozilla Public License, v. 2.0. Details of
 this license can be found in the [LICENSE](LICENSE) file or at
 http://mozilla.org/MPL/2.0/.
 
-Contributors to the ACTS project are listed in [AUTHORS](AUTHORS).
+Contributors to the Acts project are listed in [AUTHORS](AUTHORS).
 
-The ACTS project is based on the ATLAS tracking software. A list of contributors
+The Acts project is based on the ATLAS tracking software. A list of contributors
 to the ATLAS tracking repository can be found <a href="http://acts.web.cern.ch/ACTS/ATLAS_authors.html">here</a>.
 
-The ACTS project contains a copy of [gcovr](http://gcovr.com) licensed under
+The Acts project contains a copy of [gcovr](http://gcovr.com) licensed under
 the 3-Clause BSD license.
 
 This software contains a copy of the `JSON for Modern C++`-library by Niels Lohmann licensed under the MIT License.
diff --git a/Tests/Detector/GeometryCreation.hpp b/Tests/Detector/GeometryCreation.hpp
index d440b7fb7..93b1fb8e4 100644
--- a/Tests/Detector/GeometryCreation.hpp
+++ b/Tests/Detector/GeometryCreation.hpp
@@ -1,6 +1,6 @@
-// This file is part of the ACTS project.
+// This file is part of the Acts project.
 //
-// Copyright (C) 2016-2018 ACTS project team
+// Copyright (C) 2016-2018 Acts project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/Tests/Detector/TrackingGeometryClosureTests.cpp b/Tests/Detector/TrackingGeometryClosureTests.cpp
index 98c60a7e2..6961bbd44 100644
--- a/Tests/Detector/TrackingGeometryClosureTests.cpp
+++ b/Tests/Detector/TrackingGeometryClosureTests.cpp
@@ -1,6 +1,6 @@
-// This file is part of the ACTS project.
+// This file is part of the Acts project.
 //
-// Copyright (C) 2017 ACTS project team
+// Copyright (C) 2017 Acts project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/Tests/Detector/TrackingGeometryGeoIDTests.cpp b/Tests/Detector/TrackingGeometryGeoIDTests.cpp
index 06e38c126..f0ab025f7 100644
--- a/Tests/Detector/TrackingGeometryGeoIDTests.cpp
+++ b/Tests/Detector/TrackingGeometryGeoIDTests.cpp
@@ -1,6 +1,6 @@
-// This file is part of the ACTS project.
+// This file is part of the Acts project.
 //
-// Copyright (C) 2017 ACTS project team
+// Copyright (C) 2017 Acts project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/Tests/Digitization/ClusterizationTests.cpp b/Tests/Digitization/ClusterizationTests.cpp
index a5add5331..c21f067b7 100644
--- a/Tests/Digitization/ClusterizationTests.cpp
+++ b/Tests/Digitization/ClusterizationTests.cpp
@@ -1,6 +1,6 @@
-// This file is part of the ACTS project.
+// This file is part of the Acts project.
 //
-// Copyright (C) 2018 ACTS project team
+// Copyright (C) 2018 Acts project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/Tests/EventData/BoundParametersTests.cpp b/Tests/EventData/BoundParametersTests.cpp
index 797685d86..590e7903c 100644
--- a/Tests/EventData/BoundParametersTests.cpp
+++ b/Tests/EventData/BoundParametersTests.cpp
@@ -1,6 +1,6 @@
-// This file is part of the ACTS project.
+// This file is part of the Acts project.
 //
-// Copyright (C) 2017-2018 ACTS project team
+// Copyright (C) 2017-2018 Acts project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/Tests/EventData/CurvilinearParametersTests.cpp b/Tests/EventData/CurvilinearParametersTests.cpp
index d7a333173..5628d245e 100644
--- a/Tests/EventData/CurvilinearParametersTests.cpp
+++ b/Tests/EventData/CurvilinearParametersTests.cpp
@@ -1,6 +1,6 @@
-// This file is part of the ACTS project.
+// This file is part of the Acts project.
 //
-// Copyright (C) 2017 ACTS project team
+// Copyright (C) 2017 Acts project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/Tests/EventData/MeasurementTests.cpp b/Tests/EventData/MeasurementTests.cpp
index b50615cd9..a28ef10b9 100644
--- a/Tests/EventData/MeasurementTests.cpp
+++ b/Tests/EventData/MeasurementTests.cpp
@@ -1,6 +1,6 @@
-// This file is part of the ACTS project.
+// This file is part of the Acts project.
 //
-// Copyright (C) 2016-2017 ACTS project team
+// Copyright (C) 2016-2017 Acts project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
@@ -10,7 +10,7 @@
 #define BOOST_TEST_MODULE Measurement Tests
 #include <boost/test/included/unit_test.hpp>
 
-// ACTS include(s)
+// Acts include(s)
 #include "Acts/EventData/Measurement.hpp"
 #include "Acts/Surfaces/CylinderSurface.hpp"
 #include "Acts/Utilities/ParameterDefinitions.hpp"
diff --git a/Tests/EventData/ParameterSetTests.cpp b/Tests/EventData/ParameterSetTests.cpp
index 14dbe90ee..501d8f7fb 100644
--- a/Tests/EventData/ParameterSetTests.cpp
+++ b/Tests/EventData/ParameterSetTests.cpp
@@ -1,6 +1,6 @@
-// This file is part of the ACTS project.
+// This file is part of the Acts project.
 //
-// Copyright (C) 2016-2017 ACTS project team
+// Copyright (C) 2016-2017 Acts project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/Tests/EventData/ParametersTestHelper.hpp b/Tests/EventData/ParametersTestHelper.hpp
index 1f4c8162d..a702d31a9 100644
--- a/Tests/EventData/ParametersTestHelper.hpp
+++ b/Tests/EventData/ParametersTestHelper.hpp
@@ -1,6 +1,6 @@
-// This file is part of the ACTS project.
+// This file is part of the Acts project.
 //
-// Copyright (C) 2017 ACTS project team
+// Copyright (C) 2017 Acts project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/Tests/Extrapolation/ExtrapolationCellTests.cpp b/Tests/Extrapolation/ExtrapolationCellTests.cpp
index 87f9b4a4e..4833f7c98 100644
--- a/Tests/Extrapolation/ExtrapolationCellTests.cpp
+++ b/Tests/Extrapolation/ExtrapolationCellTests.cpp
@@ -1,6 +1,6 @@
-// This file is part of the ACTS project.
+// This file is part of the Acts project.
 //
-// Copyright (C) 2017 ACTS project team
+// Copyright (C) 2017 Acts project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/Tests/Fitter/GainMatrixTests.cpp b/Tests/Fitter/GainMatrixTests.cpp
index 9538b3831..8ef6ecae1 100644
--- a/Tests/Fitter/GainMatrixTests.cpp
+++ b/Tests/Fitter/GainMatrixTests.cpp
@@ -1,6 +1,6 @@
-// This file is part of the ACTS project.
+// This file is part of the Acts project.
 //
-// Copyright (C) 2016-2017 ACTS project team
+// Copyright (C) 2016-2017 Acts project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/Tests/Fitter/KalmanFilterTestUtils.hpp b/Tests/Fitter/KalmanFilterTestUtils.hpp
index 6e68bff28..f9eb11744 100644
--- a/Tests/Fitter/KalmanFilterTestUtils.hpp
+++ b/Tests/Fitter/KalmanFilterTestUtils.hpp
@@ -1,6 +1,6 @@
-// This file is part of the ACTS project.
+// This file is part of the Acts project.
 //
-// Copyright (C) 2017-2018 ACTS project team
+// Copyright (C) 2017-2018 Acts project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/Tests/Fitter/KalmanFilterTests.cpp b/Tests/Fitter/KalmanFilterTests.cpp
index cdbfbbe31..5266c27da 100644
--- a/Tests/Fitter/KalmanFilterTests.cpp
+++ b/Tests/Fitter/KalmanFilterTests.cpp
@@ -1,6 +1,6 @@
-// This file is part of the ACTS project.
+// This file is part of the Acts project.
 //
-// Copyright (C) 2017 ACTS project team
+// Copyright (C) 2017 Acts project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/Tests/Json/FromJsonTests.cpp b/Tests/Json/FromJsonTests.cpp
index 4aa8b00ff..c64fb38f3 100644
--- a/Tests/Json/FromJsonTests.cpp
+++ b/Tests/Json/FromJsonTests.cpp
@@ -1,6 +1,6 @@
-// This file is part of the ACTS project.
+// This file is part of the Acts project.
 //
-// Copyright (C) 2017 ACTS project team
+// Copyright (C) 2017 Acts project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/Tests/Layers/ConeLayerTests.cpp b/Tests/Layers/ConeLayerTests.cpp
index 708b1d705..66bc5889a 100644
--- a/Tests/Layers/ConeLayerTests.cpp
+++ b/Tests/Layers/ConeLayerTests.cpp
@@ -1,6 +1,6 @@
-// This file is part of the ACTS project.
+// This file is part of the Acts project.
 //
-// Copyright (C) 2017-2018 ACTS project team
+// Copyright (C) 2017-2018 Acts project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/Tests/Layers/CylinderLayerTests.cpp b/Tests/Layers/CylinderLayerTests.cpp
index c2fe04063..c4192e684 100644
--- a/Tests/Layers/CylinderLayerTests.cpp
+++ b/Tests/Layers/CylinderLayerTests.cpp
@@ -1,6 +1,6 @@
-// This file is part of the ACTS project.
+// This file is part of the Acts project.
 //
-// Copyright (C) 2017-2018 ACTS project team
+// Copyright (C) 2017-2018 Acts project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/Tests/Layers/DiscLayerTests.cpp b/Tests/Layers/DiscLayerTests.cpp
index cecc5df9c..71480074f 100644
--- a/Tests/Layers/DiscLayerTests.cpp
+++ b/Tests/Layers/DiscLayerTests.cpp
@@ -1,6 +1,6 @@
-// This file is part of the ACTS project.
+// This file is part of the Acts project.
 //
-// Copyright (C) 2017-2018 ACTS project team
+// Copyright (C) 2017-2018 Acts project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/Tests/Layers/GenericApproachDescriptorTests.cpp b/Tests/Layers/GenericApproachDescriptorTests.cpp
index a9496cb64..c4ac58a8c 100644
--- a/Tests/Layers/GenericApproachDescriptorTests.cpp
+++ b/Tests/Layers/GenericApproachDescriptorTests.cpp
@@ -1,6 +1,6 @@
-// This file is part of the ACTS project.
+// This file is part of the Acts project.
 //
-// Copyright (C) 2017-2018 ACTS project team
+// Copyright (C) 2017-2018 Acts project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/Tests/Layers/LayerStub.hpp b/Tests/Layers/LayerStub.hpp
index d203b069d..005d84115 100644
--- a/Tests/Layers/LayerStub.hpp
+++ b/Tests/Layers/LayerStub.hpp
@@ -1,6 +1,6 @@
-// This file is part of the ACTS project.
+// This file is part of the Acts project.
 //
-// Copyright (C) 2017 ACTS project team
+// Copyright (C) 2017 Acts project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/Tests/Layers/LayerTests.cpp b/Tests/Layers/LayerTests.cpp
index f2e0a4093..315f544a5 100644
--- a/Tests/Layers/LayerTests.cpp
+++ b/Tests/Layers/LayerTests.cpp
@@ -1,6 +1,6 @@
-// This file is part of the ACTS project.
+// This file is part of the Acts project.
 //
-// Copyright (C) 2017-2018 ACTS project team
+// Copyright (C) 2017-2018 Acts project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/Tests/Layers/NavigationLayerTests.cpp b/Tests/Layers/NavigationLayerTests.cpp
index ecba4aa1b..feb4d55c2 100644
--- a/Tests/Layers/NavigationLayerTests.cpp
+++ b/Tests/Layers/NavigationLayerTests.cpp
@@ -1,6 +1,6 @@
-// This file is part of the ACTS project.
+// This file is part of the Acts project.
 //
-// Copyright (C) 2017-2018 ACTS project team
+// Copyright (C) 2017-2018 Acts project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/Tests/Layers/PlaneLayerTests.cpp b/Tests/Layers/PlaneLayerTests.cpp
index 8a8ef8254..27f6d4fdf 100644
--- a/Tests/Layers/PlaneLayerTests.cpp
+++ b/Tests/Layers/PlaneLayerTests.cpp
@@ -1,6 +1,6 @@
-// This file is part of the ACTS project.
+// This file is part of the Acts project.
 //
-// Copyright (C) 2017-2018 ACTS project team
+// Copyright (C) 2017-2018 Acts project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/Tests/Layers/ProtoLayerTests.cpp b/Tests/Layers/ProtoLayerTests.cpp
index 9975ab255..16d532ed2 100644
--- a/Tests/Layers/ProtoLayerTests.cpp
+++ b/Tests/Layers/ProtoLayerTests.cpp
@@ -1,6 +1,6 @@
-// This file is part of the ACTS project.
+// This file is part of the Acts project.
 //
-// Copyright (C) 2018 ACTS project team
+// Copyright (C) 2018 Acts project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/Tests/MagneticField/ConstantBFieldTests.cpp b/Tests/MagneticField/ConstantBFieldTests.cpp
index 03ea388e0..22e43d943 100644
--- a/Tests/MagneticField/ConstantBFieldTests.cpp
+++ b/Tests/MagneticField/ConstantBFieldTests.cpp
@@ -1,6 +1,6 @@
-// This file is part of the ACTS project.
+// This file is part of the Acts project.
 //
-// Copyright (C) 2017-2018 ACTS project team
+// Copyright (C) 2017-2018 Acts project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/Tests/MagneticField/InterpolatedBFieldMapTests.cpp b/Tests/MagneticField/InterpolatedBFieldMapTests.cpp
index bbaf670e1..09caaf72a 100644
--- a/Tests/MagneticField/InterpolatedBFieldMapTests.cpp
+++ b/Tests/MagneticField/InterpolatedBFieldMapTests.cpp
@@ -1,6 +1,6 @@
-// This file is part of the ACTS project.
+// This file is part of the Acts project.
 //
-// Copyright (C) 2017 ACTS project team
+// Copyright (C) 2017 Acts project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/Tests/Material/MaterialPropertiesTests.cpp b/Tests/Material/MaterialPropertiesTests.cpp
index 543980893..b7604fa58 100644
--- a/Tests/Material/MaterialPropertiesTests.cpp
+++ b/Tests/Material/MaterialPropertiesTests.cpp
@@ -1,6 +1,6 @@
-// This file is part of the ACTS project.
+// This file is part of the Acts project.
 //
-// Copyright (C) 2017 ACTS project team
+// Copyright (C) 2017 Acts project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/Tests/Material/MaterialTests.cpp b/Tests/Material/MaterialTests.cpp
index c0643ccfc..ca67bf6e7 100644
--- a/Tests/Material/MaterialTests.cpp
+++ b/Tests/Material/MaterialTests.cpp
@@ -1,6 +1,6 @@
-// This file is part of the ACTS project.
+// This file is part of the Acts project.
 //
-// Copyright (C) 2017 ACTS project team
+// Copyright (C) 2017 Acts project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/Tests/MaterialMapping/MaterialMappingTests.cpp b/Tests/MaterialMapping/MaterialMappingTests.cpp
index 88a0c7f9e..218b02e39 100644
--- a/Tests/MaterialMapping/MaterialMappingTests.cpp
+++ b/Tests/MaterialMapping/MaterialMappingTests.cpp
@@ -1,6 +1,6 @@
-// This file is part of the ACTS project.
+// This file is part of the Acts project.
 //
-// Copyright (C) 2017 ACTS project team
+// Copyright (C) 2017 Acts project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/Tests/Propagator/AbortListTests.cpp b/Tests/Propagator/AbortListTests.cpp
index 5300bdef4..6f9267469 100644
--- a/Tests/Propagator/AbortListTests.cpp
+++ b/Tests/Propagator/AbortListTests.cpp
@@ -1,6 +1,6 @@
-// This file is part of the ACTS project.
+// This file is part of the Acts project.
 //
-// Copyright (C) 2017-2018 ACTS project team
+// Copyright (C) 2017-2018 Acts project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/Tests/Propagator/ActionListTests.cpp b/Tests/Propagator/ActionListTests.cpp
index 80dccdec1..02d1ca738 100644
--- a/Tests/Propagator/ActionListTests.cpp
+++ b/Tests/Propagator/ActionListTests.cpp
@@ -1,6 +1,6 @@
-// This file is part of the ACTS project.
+// This file is part of the Acts project.
 //
-// Copyright (C) 2016-2018 ACTS project team
+// Copyright (C) 2016-2018 Acts project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/Tests/Propagator/AtlasPropagatorBenchmark.cpp b/Tests/Propagator/AtlasPropagatorBenchmark.cpp
index 54bc5831d..6cf3dafc5 100644
--- a/Tests/Propagator/AtlasPropagatorBenchmark.cpp
+++ b/Tests/Propagator/AtlasPropagatorBenchmark.cpp
@@ -1,6 +1,6 @@
-// This file is part of the ACTS project.
+// This file is part of the Acts project.
 //
-// Copyright (C) 2017 ACTS project team
+// Copyright (C) 2017 Acts project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/Tests/Propagator/AtlasStepperBenchmark.cpp b/Tests/Propagator/AtlasStepperBenchmark.cpp
index 85d6ca5b2..69ffbcd88 100644
--- a/Tests/Propagator/AtlasStepperBenchmark.cpp
+++ b/Tests/Propagator/AtlasStepperBenchmark.cpp
@@ -1,6 +1,6 @@
-// This file is part of the ACTS project.
+// This file is part of the Acts project.
 //
-// Copyright (C) 2017 ACTS project team
+// Copyright (C) 2017 Acts project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/Tests/Propagator/EigenStepperBenchmark.cpp b/Tests/Propagator/EigenStepperBenchmark.cpp
index 599b2682e..91a1b378f 100644
--- a/Tests/Propagator/EigenStepperBenchmark.cpp
+++ b/Tests/Propagator/EigenStepperBenchmark.cpp
@@ -1,6 +1,6 @@
-// This file is part of the ACTS project.
+// This file is part of the Acts project.
 //
-// Copyright (C) 2017 ACTS project team
+// Copyright (C) 2017 Acts project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/Tests/Propagator/ExtendableTests.cpp b/Tests/Propagator/ExtendableTests.cpp
index 1d299351d..0c20b932b 100644
--- a/Tests/Propagator/ExtendableTests.cpp
+++ b/Tests/Propagator/ExtendableTests.cpp
@@ -1,6 +1,6 @@
-// This file is part of the ACTS project.
+// This file is part of the Acts project.
 //
-// Copyright (C) 2016-2018 ACTS project team
+// Copyright (C) 2016-2018 Acts project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/Tests/Propagator/JacobianTests.cpp b/Tests/Propagator/JacobianTests.cpp
index 03417515a..9cc42cd6e 100644
--- a/Tests/Propagator/JacobianTests.cpp
+++ b/Tests/Propagator/JacobianTests.cpp
@@ -1,6 +1,6 @@
-// This file is part of the ACTS project.
+// This file is part of the Acts project.
 //
-// Copyright (C) 2018 ACTS project team
+// Copyright (C) 2018 Acts project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/Tests/Propagator/PropagatorTests.cpp b/Tests/Propagator/PropagatorTests.cpp
index 82b709d63..397450b51 100644
--- a/Tests/Propagator/PropagatorTests.cpp
+++ b/Tests/Propagator/PropagatorTests.cpp
@@ -1,6 +1,6 @@
-// This file is part of the ACTS project.
+// This file is part of the Acts project.
 //
-// Copyright (C) 2016-2018 ACTS project team
+// Copyright (C) 2016-2018 Acts project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/Tests/Propagator/RungeKuttaEngineTests.cpp b/Tests/Propagator/RungeKuttaEngineTests.cpp
index 36e0938c9..1bd4c6fab 100644
--- a/Tests/Propagator/RungeKuttaEngineTests.cpp
+++ b/Tests/Propagator/RungeKuttaEngineTests.cpp
@@ -1,6 +1,6 @@
-// This file is part of the ACTS project.
+// This file is part of the Acts project.
 //
-// Copyright (C) 2017-2018 ACTS project team
+// Copyright (C) 2017-2018 Acts project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/Tests/Seeding/SeedingTests.cpp b/Tests/Seeding/SeedingTests.cpp
index 54f74ef54..a5cef9b04 100644
--- a/Tests/Seeding/SeedingTests.cpp
+++ b/Tests/Seeding/SeedingTests.cpp
@@ -1,6 +1,6 @@
-// This file is part of the ACTS project.
+// This file is part of the Acts project.
 //
-// Copyright (C) 2016-2017 ACTS project team
+// Copyright (C) 2016-2017 Acts project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/Tests/Seeding/SeedingTestsCommon.hpp b/Tests/Seeding/SeedingTestsCommon.hpp
index 454c12630..c098fd58c 100644
--- a/Tests/Seeding/SeedingTestsCommon.hpp
+++ b/Tests/Seeding/SeedingTestsCommon.hpp
@@ -1,6 +1,6 @@
-// This file is part of the ACTS project.
+// This file is part of the Acts project.
 //
-// Copyright (C) 2016 ACTS project team
+// Copyright (C) 2016 Acts project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/Tests/Seeding/SeedingToolsTests.cpp b/Tests/Seeding/SeedingToolsTests.cpp
index 1b0a2647e..81f116e08 100644
--- a/Tests/Seeding/SeedingToolsTests.cpp
+++ b/Tests/Seeding/SeedingToolsTests.cpp
@@ -1,6 +1,6 @@
-// This file is part of the ACTS project.
+// This file is part of the Acts project.
 //
-// Copyright (C) 2016 ACTS project team
+// Copyright (C) 2016 Acts project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/Tests/Surfaces/BoundaryCheckBenchmark.cpp b/Tests/Surfaces/BoundaryCheckBenchmark.cpp
index aed01017d..6102c61f3 100644
--- a/Tests/Surfaces/BoundaryCheckBenchmark.cpp
+++ b/Tests/Surfaces/BoundaryCheckBenchmark.cpp
@@ -1,6 +1,6 @@
-// This file is part of the ACTS project.
+// This file is part of the Acts project.
 //
-// Copyright (C) 2017-2018 ACTS project team
+// Copyright (C) 2017-2018 Acts project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/Tests/Surfaces/BoundaryCheckTests.cpp b/Tests/Surfaces/BoundaryCheckTests.cpp
index 9f157e0dc..79b653078 100644
--- a/Tests/Surfaces/BoundaryCheckTests.cpp
+++ b/Tests/Surfaces/BoundaryCheckTests.cpp
@@ -1,6 +1,6 @@
-// This file is part of the ACTS project.
+// This file is part of the Acts project.
 //
-// Copyright (C) 2017-2018 ACTS project team
+// Copyright (C) 2017-2018 Acts project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/Tests/Surfaces/ConeBoundsTests.cpp b/Tests/Surfaces/ConeBoundsTests.cpp
index 43e46c342..04a77b8bb 100644
--- a/Tests/Surfaces/ConeBoundsTests.cpp
+++ b/Tests/Surfaces/ConeBoundsTests.cpp
@@ -1,6 +1,6 @@
-// This file is part of the ACTS project.
+// This file is part of the Acts project.
 //
-// Copyright (C) 2017-2018 ACTS project team
+// Copyright (C) 2017-2018 Acts project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/Tests/Surfaces/ConeSurfaceTests.cpp b/Tests/Surfaces/ConeSurfaceTests.cpp
index 4b6704bde..88b9f848b 100644
--- a/Tests/Surfaces/ConeSurfaceTests.cpp
+++ b/Tests/Surfaces/ConeSurfaceTests.cpp
@@ -1,6 +1,6 @@
-// This file is part of the ACTS project.
+// This file is part of the Acts project.
 //
-// Copyright (C) 2017-2018 ACTS project team
+// Copyright (C) 2017-2018 Acts project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/Tests/Surfaces/CylinderBoundsTests.cpp b/Tests/Surfaces/CylinderBoundsTests.cpp
index d06b9e47a..519bc589a 100644
--- a/Tests/Surfaces/CylinderBoundsTests.cpp
+++ b/Tests/Surfaces/CylinderBoundsTests.cpp
@@ -1,6 +1,6 @@
-// This file is part of the ACTS project.
+// This file is part of the Acts project.
 //
-// Copyright (C) 2017-2018 ACTS project team
+// Copyright (C) 2017-2018 Acts project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/Tests/Surfaces/CylinderSurfaceTests.cpp b/Tests/Surfaces/CylinderSurfaceTests.cpp
index a7b35ae07..0651cbf89 100644
--- a/Tests/Surfaces/CylinderSurfaceTests.cpp
+++ b/Tests/Surfaces/CylinderSurfaceTests.cpp
@@ -1,6 +1,6 @@
-// This file is part of the ACTS project.
+// This file is part of the Acts project.
 //
-// Copyright (C) 2017-2018 ACTS project team
+// Copyright (C) 2017-2018 Acts project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/Tests/Surfaces/DetectorElementStub.hpp b/Tests/Surfaces/DetectorElementStub.hpp
index fae560024..a325690c4 100644
--- a/Tests/Surfaces/DetectorElementStub.hpp
+++ b/Tests/Surfaces/DetectorElementStub.hpp
@@ -1,13 +1,13 @@
-// This file is part of the ACTS project.
+// This file is part of the Acts project.
 //
-// Copyright (C) 2017-2018 ACTS project team
+// Copyright (C) 2017-2018 Acts project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
 // file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 ///////////////////////////////////////////////////////////////////
-// DetectorElementStub.h, ACTS project, Generic Detector plugin
+// DetectorElementStub.h, Acts project, Generic Detector plugin
 ///////////////////////////////////////////////////////////////////
 
 #pragma once
diff --git a/Tests/Surfaces/DiamondBoundsTests.cpp b/Tests/Surfaces/DiamondBoundsTests.cpp
index 54a8ec031..549d3d151 100644
--- a/Tests/Surfaces/DiamondBoundsTests.cpp
+++ b/Tests/Surfaces/DiamondBoundsTests.cpp
@@ -1,6 +1,6 @@
-// This file is part of the ACTS project.
+// This file is part of the Acts project.
 //
-// Copyright (C) 2017-2018 ACTS project team
+// Copyright (C) 2017-2018 Acts project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/Tests/Surfaces/DiscSurfaceTests.cpp b/Tests/Surfaces/DiscSurfaceTests.cpp
index 31a5b4e8c..159174181 100644
--- a/Tests/Surfaces/DiscSurfaceTests.cpp
+++ b/Tests/Surfaces/DiscSurfaceTests.cpp
@@ -1,6 +1,6 @@
-// This file is part of the ACTS project.
+// This file is part of the Acts project.
 //
-// Copyright (C) 2017-2018 ACTS project team
+// Copyright (C) 2017-2018 Acts project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/Tests/Surfaces/DiscTrapezoidalBoundsTests.cpp b/Tests/Surfaces/DiscTrapezoidalBoundsTests.cpp
index fe4e6dbad..2af027159 100644
--- a/Tests/Surfaces/DiscTrapezoidalBoundsTests.cpp
+++ b/Tests/Surfaces/DiscTrapezoidalBoundsTests.cpp
@@ -1,6 +1,6 @@
-// This file is part of the ACTS project.
+// This file is part of the Acts project.
 //
-// Copyright (C) 2017-2018 ACTS project team
+// Copyright (C) 2017-2018 Acts project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/Tests/Surfaces/EllipseBoundsTests.cpp b/Tests/Surfaces/EllipseBoundsTests.cpp
index cb0f94a3b..9133aaad9 100644
--- a/Tests/Surfaces/EllipseBoundsTests.cpp
+++ b/Tests/Surfaces/EllipseBoundsTests.cpp
@@ -1,6 +1,6 @@
-// This file is part of the ACTS project.
+// This file is part of the Acts project.
 //
-// Copyright (C) 2017-2018 ACTS project team
+// Copyright (C) 2017-2018 Acts project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/Tests/Surfaces/InfiniteBoundsTests.cpp b/Tests/Surfaces/InfiniteBoundsTests.cpp
index 27efb9179..3bd01c7cc 100644
--- a/Tests/Surfaces/InfiniteBoundsTests.cpp
+++ b/Tests/Surfaces/InfiniteBoundsTests.cpp
@@ -1,6 +1,6 @@
-// This file is part of the ACTS project.
+// This file is part of the Acts project.
 //
-// Copyright (C) 2017-2018 ACTS project team
+// Copyright (C) 2017-2018 Acts project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/Tests/Surfaces/LineBoundsTests.cpp b/Tests/Surfaces/LineBoundsTests.cpp
index 4449877c6..1835ea52a 100644
--- a/Tests/Surfaces/LineBoundsTests.cpp
+++ b/Tests/Surfaces/LineBoundsTests.cpp
@@ -1,6 +1,6 @@
-// This file is part of the ACTS project.
+// This file is part of the Acts project.
 //
-// Copyright (C) 2017-2018 ACTS project team
+// Copyright (C) 2017-2018 Acts project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/Tests/Surfaces/LineSurfaceStub.hpp b/Tests/Surfaces/LineSurfaceStub.hpp
index fa945c145..6105b3f7e 100644
--- a/Tests/Surfaces/LineSurfaceStub.hpp
+++ b/Tests/Surfaces/LineSurfaceStub.hpp
@@ -1,6 +1,6 @@
-// This file is part of the ACTS project.
+// This file is part of the Acts project.
 //
-// Copyright (C) 2017-2018 ACTS project team
+// Copyright (C) 2017-2018 Acts project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/Tests/Surfaces/LineSurfaceTests.cpp b/Tests/Surfaces/LineSurfaceTests.cpp
index 87dd05ee4..503c23edf 100644
--- a/Tests/Surfaces/LineSurfaceTests.cpp
+++ b/Tests/Surfaces/LineSurfaceTests.cpp
@@ -1,6 +1,6 @@
-// This file is part of the ACTS project.
+// This file is part of the Acts project.
 //
-// Copyright (C) 2017-2018 ACTS project team
+// Copyright (C) 2017-2018 Acts project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/Tests/Surfaces/PerigeeSurfaceTests.cpp b/Tests/Surfaces/PerigeeSurfaceTests.cpp
index 2b54f8e89..532016b1b 100644
--- a/Tests/Surfaces/PerigeeSurfaceTests.cpp
+++ b/Tests/Surfaces/PerigeeSurfaceTests.cpp
@@ -1,6 +1,6 @@
-// This file is part of the ACTS project.
+// This file is part of the Acts project.
 //
-// Copyright (C) 2017-2018 ACTS project team
+// Copyright (C) 2017-2018 Acts project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/Tests/Surfaces/PlaneSurfaceTests.cpp b/Tests/Surfaces/PlaneSurfaceTests.cpp
index 73b60b9b2..74dde745a 100644
--- a/Tests/Surfaces/PlaneSurfaceTests.cpp
+++ b/Tests/Surfaces/PlaneSurfaceTests.cpp
@@ -1,6 +1,6 @@
-// This file is part of the ACTS project.
+// This file is part of the Acts project.
 //
-// Copyright (C) 2017-2018 ACTS project team
+// Copyright (C) 2017-2018 Acts project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/Tests/Surfaces/RadialBoundsTests.cpp b/Tests/Surfaces/RadialBoundsTests.cpp
index e16ab6df3..a6807470c 100644
--- a/Tests/Surfaces/RadialBoundsTests.cpp
+++ b/Tests/Surfaces/RadialBoundsTests.cpp
@@ -1,6 +1,6 @@
-// This file is part of the ACTS project.
+// This file is part of the Acts project.
 //
-// Copyright (C) 2017-2018 ACTS project team
+// Copyright (C) 2017-2018 Acts project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/Tests/Surfaces/RectangleBoundsTests.cpp b/Tests/Surfaces/RectangleBoundsTests.cpp
index daa491d98..7127fa817 100644
--- a/Tests/Surfaces/RectangleBoundsTests.cpp
+++ b/Tests/Surfaces/RectangleBoundsTests.cpp
@@ -1,6 +1,6 @@
-// This file is part of the ACTS project.
+// This file is part of the Acts project.
 //
-// Copyright (C) 2017-2018 ACTS project team
+// Copyright (C) 2017-2018 Acts project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/Tests/Surfaces/StrawSurfaceTests.cpp b/Tests/Surfaces/StrawSurfaceTests.cpp
index 199553e3e..42ff0b5f7 100644
--- a/Tests/Surfaces/StrawSurfaceTests.cpp
+++ b/Tests/Surfaces/StrawSurfaceTests.cpp
@@ -1,6 +1,6 @@
-// This file is part of the ACTS project.
+// This file is part of the Acts project.
 //
-// Copyright (C) 2017-2018 ACTS project team
+// Copyright (C) 2017-2018 Acts project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/Tests/Surfaces/SurfaceArrayTests.cpp b/Tests/Surfaces/SurfaceArrayTests.cpp
index b96c4cdd0..b47b3aa2a 100644
--- a/Tests/Surfaces/SurfaceArrayTests.cpp
+++ b/Tests/Surfaces/SurfaceArrayTests.cpp
@@ -1,6 +1,6 @@
-// This file is part of the ACTS project.
+// This file is part of the Acts project.
 //
-// Copyright (C) 2017-2018 ACTS project team
+// Copyright (C) 2017-2018 Acts project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/Tests/Surfaces/SurfaceBoundsTests.cpp b/Tests/Surfaces/SurfaceBoundsTests.cpp
index 56688e41c..22f473be8 100644
--- a/Tests/Surfaces/SurfaceBoundsTests.cpp
+++ b/Tests/Surfaces/SurfaceBoundsTests.cpp
@@ -1,6 +1,6 @@
-// This file is part of the ACTS project.
+// This file is part of the Acts project.
 //
-// Copyright (C) 2017-2018 ACTS project team
+// Copyright (C) 2017-2018 Acts project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/Tests/Surfaces/SurfaceStub.hpp b/Tests/Surfaces/SurfaceStub.hpp
index e8331f817..f65168bce 100644
--- a/Tests/Surfaces/SurfaceStub.hpp
+++ b/Tests/Surfaces/SurfaceStub.hpp
@@ -1,6 +1,6 @@
-// This file is part of the ACTS project.
+// This file is part of the Acts project.
 //
-// Copyright (C) 2017-2018 ACTS project team
+// Copyright (C) 2017-2018 Acts project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/Tests/Surfaces/SurfaceTests.cpp b/Tests/Surfaces/SurfaceTests.cpp
index 0bb9fde21..1c0358ab5 100644
--- a/Tests/Surfaces/SurfaceTests.cpp
+++ b/Tests/Surfaces/SurfaceTests.cpp
@@ -1,6 +1,6 @@
-// This file is part of the ACTS project.
+// This file is part of the Acts project.
 //
-// Copyright (C) 2017-2018 ACTS project team
+// Copyright (C) 2017-2018 Acts project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/Tests/Surfaces/TrapezoidBoundsTests.cpp b/Tests/Surfaces/TrapezoidBoundsTests.cpp
index 76916913b..f792a47eb 100644
--- a/Tests/Surfaces/TrapezoidBoundsTests.cpp
+++ b/Tests/Surfaces/TrapezoidBoundsTests.cpp
@@ -1,6 +1,6 @@
-// This file is part of the ACTS project.
+// This file is part of the Acts project.
 //
-// Copyright (C) 2017-2018 ACTS project team
+// Copyright (C) 2017-2018 Acts project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/Tests/Surfaces/TriangleBoundsTests.cpp b/Tests/Surfaces/TriangleBoundsTests.cpp
index 5d5182cc3..3ac284661 100644
--- a/Tests/Surfaces/TriangleBoundsTests.cpp
+++ b/Tests/Surfaces/TriangleBoundsTests.cpp
@@ -1,6 +1,6 @@
-// This file is part of the ACTS project.
+// This file is part of the Acts project.
 //
-// Copyright (C) 2017-2018 ACTS project team
+// Copyright (C) 2017-2018 Acts project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/Tests/Tools/CylinderVolumeBuilderTests.cpp b/Tests/Tools/CylinderVolumeBuilderTests.cpp
index 0002d93d1..8263d6b04 100644
--- a/Tests/Tools/CylinderVolumeBuilderTests.cpp
+++ b/Tests/Tools/CylinderVolumeBuilderTests.cpp
@@ -1,6 +1,6 @@
-// This file is part of the ACTS project.
+// This file is part of the Acts project.
 //
-// Copyright (C) 2017-2018 ACTS project team
+// Copyright (C) 2017-2018 Acts project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/Tests/Tools/LayerCreatorTests.cpp b/Tests/Tools/LayerCreatorTests.cpp
index 5f4c97f5b..87404bf30 100644
--- a/Tests/Tools/LayerCreatorTests.cpp
+++ b/Tests/Tools/LayerCreatorTests.cpp
@@ -1,6 +1,6 @@
-// This file is part of the ACTS project.
+// This file is part of the Acts project.
 //
-// Copyright (C) 2017-2018 ACTS project team
+// Copyright (C) 2017-2018 Acts project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/Tests/Tools/SurfaceArrayCreatorTests.cpp b/Tests/Tools/SurfaceArrayCreatorTests.cpp
index 306e2aba5..35f198e8f 100644
--- a/Tests/Tools/SurfaceArrayCreatorTests.cpp
+++ b/Tests/Tools/SurfaceArrayCreatorTests.cpp
@@ -1,6 +1,6 @@
-// This file is part of the ACTS project.
+// This file is part of the Acts project.
 //
-// Copyright (C) 2017-2018 ACTS project team
+// Copyright (C) 2017-2018 Acts project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/Tests/Utilities/AxesTests.cpp b/Tests/Utilities/AxesTests.cpp
index 2199c15b4..8469072e0 100644
--- a/Tests/Utilities/AxesTests.cpp
+++ b/Tests/Utilities/AxesTests.cpp
@@ -1,6 +1,6 @@
-// This file is part of the ACTS project.
+// This file is part of the Acts project.
 //
-// Copyright (C) 2017-2018 ACTS project team
+// Copyright (C) 2017-2018 Acts project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/Tests/Utilities/BFieldMapUtilsTests.cpp b/Tests/Utilities/BFieldMapUtilsTests.cpp
index 621e4f50c..c612fbe25 100644
--- a/Tests/Utilities/BFieldMapUtilsTests.cpp
+++ b/Tests/Utilities/BFieldMapUtilsTests.cpp
@@ -1,6 +1,6 @@
-// This file is part of the ACTS project.
+// This file is part of the Acts project.
 //
-// Copyright (C) 2016 ACTS project team
+// Copyright (C) 2016 Acts project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/Tests/Utilities/BinUtilityTests.cpp b/Tests/Utilities/BinUtilityTests.cpp
index affa47f44..b6afac729 100644
--- a/Tests/Utilities/BinUtilityTests.cpp
+++ b/Tests/Utilities/BinUtilityTests.cpp
@@ -1,6 +1,6 @@
-// This file is part of the ACTS project.
+// This file is part of the Acts project.
 //
-// Copyright (C) 2017 ACTS project team
+// Copyright (C) 2017 Acts project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/Tests/Utilities/BinningDataTests.cpp b/Tests/Utilities/BinningDataTests.cpp
index 6829f268b..53dfbeeb0 100644
--- a/Tests/Utilities/BinningDataTests.cpp
+++ b/Tests/Utilities/BinningDataTests.cpp
@@ -1,6 +1,6 @@
-// This file is part of the ACTS project.
+// This file is part of the Acts project.
 //
-// Copyright (C) 2017 ACTS project team
+// Copyright (C) 2017 Acts project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/Tests/Utilities/GeometryIDTests.cpp b/Tests/Utilities/GeometryIDTests.cpp
index 6794876f5..1ac8e26dc 100644
--- a/Tests/Utilities/GeometryIDTests.cpp
+++ b/Tests/Utilities/GeometryIDTests.cpp
@@ -1,6 +1,6 @@
-// This file is part of the ACTS project.
+// This file is part of the Acts project.
 //
-// Copyright (C) 2017-2018 ACTS project team
+// Copyright (C) 2017-2018 Acts project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/Tests/Utilities/GridTests.cpp b/Tests/Utilities/GridTests.cpp
index 9b2be9d99..9683bc073 100644
--- a/Tests/Utilities/GridTests.cpp
+++ b/Tests/Utilities/GridTests.cpp
@@ -1,6 +1,6 @@
-// This file is part of the ACTS project.
+// This file is part of the Acts project.
 //
-// Copyright (C) 2017-2018 ACTS project team
+// Copyright (C) 2017-2018 Acts project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/Tests/Utilities/InterpolationTests.cpp b/Tests/Utilities/InterpolationTests.cpp
index fb3e32227..02d7791e7 100644
--- a/Tests/Utilities/InterpolationTests.cpp
+++ b/Tests/Utilities/InterpolationTests.cpp
@@ -1,6 +1,6 @@
-// This file is part of the ACTS project.
+// This file is part of the Acts project.
 //
-// Copyright (C) 2017 ACTS project team
+// Copyright (C) 2017 Acts project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/Tests/Utilities/LoggerTests.cpp b/Tests/Utilities/LoggerTests.cpp
index c15e25214..06938d907 100644
--- a/Tests/Utilities/LoggerTests.cpp
+++ b/Tests/Utilities/LoggerTests.cpp
@@ -1,6 +1,6 @@
-// This file is part of the ACTS project.
+// This file is part of the Acts project.
 //
-// Copyright (C) 2017 ACTS project team
+// Copyright (C) 2017 Acts project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/Tests/Utilities/MPLTests.cpp b/Tests/Utilities/MPLTests.cpp
index 3b7083215..e98a23c53 100644
--- a/Tests/Utilities/MPLTests.cpp
+++ b/Tests/Utilities/MPLTests.cpp
@@ -1,6 +1,6 @@
-// This file is part of the ACTS project.
+// This file is part of the Acts project.
 //
-// Copyright (C) 2017-2018 ACTS project team
+// Copyright (C) 2017-2018 Acts project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/Tests/Utilities/RealQuadraticEquationTests.cpp b/Tests/Utilities/RealQuadraticEquationTests.cpp
index 93cbd1793..b918f34a4 100644
--- a/Tests/Utilities/RealQuadraticEquationTests.cpp
+++ b/Tests/Utilities/RealQuadraticEquationTests.cpp
@@ -1,6 +1,6 @@
-// This file is part of the ACTS project.
+// This file is part of the Acts project.
 //
-// Copyright (C) 2017-2018 ACTS project team
+// Copyright (C) 2017-2018 Acts project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/Tests/Utilities/UnitConversionTests.cpp b/Tests/Utilities/UnitConversionTests.cpp
index 1a525f6d0..44ba0e159 100644
--- a/Tests/Utilities/UnitConversionTests.cpp
+++ b/Tests/Utilities/UnitConversionTests.cpp
@@ -1,6 +1,6 @@
-// This file is part of the ACTS project.
+// This file is part of the Acts project.
 //
-// Copyright (C) 2017-2018 ACTS project team
+// Copyright (C) 2017-2018 Acts project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/Tests/Volumes/CylinderVolumeBoundsTests.cpp b/Tests/Volumes/CylinderVolumeBoundsTests.cpp
index d2cdf458f..2863c9191 100644
--- a/Tests/Volumes/CylinderVolumeBoundsTests.cpp
+++ b/Tests/Volumes/CylinderVolumeBoundsTests.cpp
@@ -1,6 +1,6 @@
-// This file is part of the ACTS project.
+// This file is part of the Acts project.
 //
-// Copyright (C) 2017-2018 ACTS project team
+// Copyright (C) 2017-2018 Acts project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/cmake/ActsCompilerOptions.cmake b/cmake/ActsCompilerOptions.cmake
index 9d89d104f..292a9fddd 100644
--- a/cmake/ActsCompilerOptions.cmake
+++ b/cmake/ActsCompilerOptions.cmake
@@ -1,11 +1,11 @@
-# set ACTS compiler flags
+# set Acts compiler flags
 set (ACTS_CXX_FLAGS "-Wall -Wextra -Wpedantic -Wshadow -Wunused-local-typedefs")
 set (ACTS_CXX_FLAGS_DEBUG "--coverage")
 set (ACTS_CXX_FLAGS_MINSIZEREL "")
 set (ACTS_CXX_FLAGS_RELEASE "")
 set (ACTS_CXX_FLAGS_RELWITHDEBINFO "")
 
-# set ACTS linker flags
+# set Acts linker flags
 set (ACTS_EXE_LINKER_FLAGS_DEBUG "--coverage")
 set (ACTS_SHARED_LINKER_FLAGS_DEBUG "--coverage ")
 
diff --git a/cmake/ActsConfig.cmake.in b/cmake/ActsConfig.cmake.in
index 5c2de169a..9fff9a932 100644
--- a/cmake/ActsConfig.cmake.in
+++ b/cmake/ActsConfig.cmake.in
@@ -10,7 +10,7 @@
 #  + ACTS_CXX_FLAGS_MINSIZEREL
 #  + ACTS_CXX_FLAGS_RELEASE
 #  + ACTS_CXX_FLAGS_RELWITHDEBINFO
-# - linker flags used for ACTS:
+# - linker flags used for Acts:
 #  + ACTS_EXE_LINKER_FLAGS_DEBUG
 #  + ACTS_SHARED_LINKER_FLAGS_DEBUG
 
@@ -66,12 +66,14 @@ endforeach ()
 # the imported targets created later.
 set_and_check (ACTS_INCLUDE_DIR "@PACKAGE_CMAKE_INSTALL_INCLUDEDIR@")
 set_and_check (ACTS_LIBRARY_DIR "@PACKAGE_CMAKE_INSTALL_LIBDIR@")
+set_and_check (Acts_INCLUDE_DIR "@PACKAGE_CMAKE_INSTALL_INCLUDEDIR@")
+set_and_check (Acts_LIBRARY_DIR "@PACKAGE_CMAKE_INSTALL_LIBDIR@")
 
-# set ACTS compilation and linker flags
-set (ACTS_CXX_FLAGS "@Acts_CXX_FLAGS@")
-set (ACTS_CXX_FLAGS_DEBUG "@Acts_CXX_FLAGS_DEBUG@")
-set (ACTS_CXX_FLAGS_MINSIZEREL "@Acts_CXX_FLAGS_MINSIZEREL@")
-set (ACTS_CXX_FLAGS_RELEASE "@Acts_CXX_FLAGS_RELEASE@")
-set (ACTS_CXX_FLAGS_RELWITHDEBINFO "@Acts_CXX_FLAGS_RELWITHDEBINFO@")
-set (ACTS_EXE_LINKER_FLAGS_DEBUG "@Acts_EXE_LINKER_FLAGS_DEBUG@")
-set (ACTS_SHARED_LINKER_FLAGS_DEBUG "@Acts_SHARED_LINKER_FLAGS_DEBUG@")
+# set Acts compilation and linker flags
+set (ACTS_CXX_FLAGS "@ACTS_CXX_FLAGS@")
+set (ACTS_CXX_FLAGS_DEBUG "@ACTS_CXX_FLAGS_DEBUG@")
+set (ACTS_CXX_FLAGS_MINSIZEREL "@ACTS_CXX_FLAGS_MINSIZEREL@")
+set (ACTS_CXX_FLAGS_RELEASE "@ACTS_CXX_FLAGS_RELEASE@")
+set (ACTS_CXX_FLAGS_RELWITHDEBINFO "@ACTS_CXX_FLAGS_RELWITHDEBINFO@")
+set (ACTS_EXE_LINKER_FLAGS_DEBUG "@ACTS_EXE_LINKER_FLAGS_DEBUG@")
+set (ACTS_SHARED_LINKER_FLAGS_DEBUG "@ACTS_SHARED_LINKER_FLAGS_DEBUG@")
diff --git a/cmake/Project.xml b/cmake/Project.xml
index 193187077..d31b7ca60 100644
--- a/cmake/Project.xml
+++ b/cmake/Project.xml
@@ -1,17 +1,17 @@
-<Project name="ACTS">
-  <SubProject name="ACore" Group="ACTS">
+<Project name="Acts">
+  <SubProject name="ACore" Group="Acts">
   </SubProject>
-  <SubProject name="Examples" Group="ACTS">
+  <SubProject name="Examples" Group="Acts">
     <Dependency name="ACore"/>
   </SubProject>
-  <SubProject name="DD4hepPlugin" Group="ACTS">
+  <SubProject name="DD4hepPlugin" Group="Acts">
    <Dependency name="ACore"/>
    <Dependency name="TGeoPlugin"/>
   </SubProject>
-  <SubProject name="MaterialPlugin" Group="ACTS">
+  <SubProject name="MaterialPlugin" Group="Acts">
    <Dependency name="ACore"/>
   </SubProject>
-  <SubProject name="TGeoPlugin" Group="ACTS">
+  <SubProject name="TGeoPlugin" Group="Acts">
    <Dependency name="ACore"/>
   </SubProject>
 </Project>
diff --git a/doc/CMakeLists.txt b/doc/CMakeLists.txt
index 25d446dd8..72c52bc9f 100644
--- a/doc/CMakeLists.txt
+++ b/doc/CMakeLists.txt
@@ -1,5 +1,5 @@
 configure_file (${CMAKE_CURRENT_SOURCE_DIR}/doxygen.config.in ${CMAKE_CURRENT_BINARY_DIR}/doxygen.config @ONLY)
-configure_file (${CMAKE_CURRENT_SOURCE_DIR}/figures/ACTSlogo.gif ${CMAKE_CURRENT_BINARY_DIR}/ACTSlogo.gif COPYONLY)
+configure_file (${CMAKE_CURRENT_SOURCE_DIR}/figures/Actslogo.gif ${CMAKE_CURRENT_BINARY_DIR}/Actslogo.gif COPYONLY)
 configure_file (${CMAKE_CURRENT_SOURCE_DIR}/DoxygenLayout.xml ${CMAKE_CURRENT_BINARY_DIR}/DoxygenLayout.xml COPYONLY)
 
 add_custom_target (doc ${DOXYGEN_EXECUTABLE} ${CMAKE_CURRENT_BINARY_DIR}/doxygen.config
diff --git a/doc/DoxygenLayout.xml b/doc/DoxygenLayout.xml
index f8c57cf8a..6c69c364e 100644
--- a/doc/DoxygenLayout.xml
+++ b/doc/DoxygenLayout.xml
@@ -2,7 +2,7 @@
   <!-- Generated by doxygen 1.8.11 -->
   <!-- Navigation index tabs for HTML output -->
   <navindex>
-    <tab type="user" visible="yes" title="ACTS Home Page" url="http://acts.web.cern.ch/ACTS/index.php"/>
+    <tab type="user" visible="yes" title="Acts Home Page" url="http://acts.web.cern.ch/ACTS/index.php"/>
     <tab type="mainpage" visible="yes" title=""/>
     <tab type="pages" visible="no" title="" intro=""/>
     <tab type="user" visible="yes" title="Contribution Guide" url="group__Contributing.html"/>
diff --git a/doc/Modules.hpp b/doc/Modules.hpp
index 8c671ec55..6c2c8e44d 100644
--- a/doc/Modules.hpp
+++ b/doc/Modules.hpp
@@ -1,6 +1,6 @@
-// This file is part of the ACTS project.
+// This file is part of the Acts project.
 //
-// Copyright (C) 2016-2017 ACTS project team
+// Copyright (C) 2016-2017 Acts project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
@@ -10,13 +10,13 @@
 // clang-format off
 
 /// @defgroup Design Design and concept descriptions
-/// @brief description of general concepts used in ACTS
+/// @brief description of general concepts used in Acts
 
 /// @defgroup Logging Debug output options
 /// @ingroup Design
 /// @brief description of debug output options
 ///
-/// The ACTS logging facility supports several severity levels which allow you
+/// The Acts logging facility supports several severity levels which allow you
 /// to control the amount of information displayed at run-time. Logger objects
 /// can easily be created using the Acts::getDefaultLogger function which
 /// should be sufficient to get you started. In case you need more customized
@@ -57,7 +57,7 @@
 ///    std::unique_ptr<const Acts::Logger> myLogger
 ///        = Acts::getDefaultLogger("MyLogger", Acts::Logging::INFO, &logfile);
 ///
-///    // make sure the ACTS debug macros can work with your logger
+///    // make sure the Acts debug macros can work with your logger
 ///    ACTS_LOCAL_LOGGER(myLogger);
 ///
 ///    ACTS_VERBOSE("This message will not appear in the logfile.");
@@ -68,14 +68,14 @@
 /// }
 /// @endcode
 ///
-/// In case you are using ACTS in another framework which comes with its own
-/// logging facility (e.g. Gaudi) you can pipe the logging output from ACTS
+/// In case you are using Acts in another framework which comes with its own
+/// logging facility (e.g. Gaudi) you can pipe the logging output from Acts
 /// tools and algorithms to your framework's logging system by supplying different
 /// implementations of:
 /// - Acts::Logging::OutputFilterPolicy (for mapping logging levels)
-/// - Acts::Logging::OutputPrintPolicy (for passing the ACTS output to your internal logging system)
+/// - Acts::Logging::OutputPrintPolicy (for passing the Acts output to your internal logging system)
 ///
-/// Since ACTS makes extensive use of Acts::getDefaultLogger to provide
+/// Since Acts makes extensive use of Acts::getDefaultLogger to provide
 /// sufficient information for debugging, you would need to provide a modified
 /// implementation of this function (using your output filter and printing
 /// policies) to also pipe this output to your framework.
@@ -94,7 +94,7 @@
 /// }
 /// @endcode
 ///
-/// Then you can run your executable, which uses ACTS tools and algorithms, in
+/// Then you can run your executable, which uses Acts tools and algorithms, in
 /// the following way (tested under Unix)
 ///
 /// @code{bash}
@@ -110,7 +110,7 @@
 /// @endcode
 
 /// @defgroup Core Core classes
-/// @brief ACTS core classes
+/// @brief Acts core classes
 
 /// @defgroup Detector Tracking geometry
 /// @ingroup Core
@@ -209,15 +209,15 @@
 /// @brief Description of geometric volumes
 
 /// @defgroup Examples Examples
-/// @brief ACTS Examples
+/// @brief Acts Examples
 
 
 /// @defgroup Plugins Plugins
-/// @brief ACTS extensions
+/// @brief Acts extensions
 
 /// @defgroup DD4hepPlugins DD4hepPlugins
 /// @ingroup Plugins
-/// @brief Build ACTS tracking geometry from \a %DD4hep input.
+/// @brief Build Acts tracking geometry from \a %DD4hep input.
 ///
 /// The DD4hepPlugin allows building of the Acts TrackingGeometry from <a href="http://aidasoft.web.cern.ch/DD4hep">DD4hep</a> input.
 /// \a %DD4hep uses <a href="https://root.cern.ch">ROOT</a> TGeo as an underlying geometry model.
@@ -256,7 +256,7 @@
 /// The extensions are used to indicate certain volumes, e.g. if a \a DetElement is the
 /// beam pipe or if a \a DetElement is a layer carrying the sensitive modules. In addition
 /// the extensions are used in order to distinguish if a sub detector is a barrel (described
-/// as a cylinder volume in ACTS) or an endcap (which is described as a disc volume in Acts).
+/// as a cylinder volume in Acts) or an endcap (which is described as a disc volume in Acts).
 /// Furthermore the
 /// extensions are used to hand over specific information needed for tracking, e.g.
 /// paramters for material mapping.
@@ -280,7 +280,7 @@
 ///
 /// <B>Prerequisites</B>
 ///
-/// To guarantee a working translation from \a %DD4hep input to ACTS geometry the
+/// To guarantee a working translation from \a %DD4hep input to Acts geometry the
 /// following conditions need to be met:
 ///
 /// * The detector needs to have a barrel-endcap structure:
@@ -344,7 +344,7 @@
 ///
 /// There are two modes building the layers around the sensitive detector modules:
 /// * The \a DetElements containing the sensitive modules have a geometrical shape
-/// 	- the boundaries of the layers in ACTS are taken directly from the given shape
+/// 	- the boundaries of the layers in Acts are taken directly from the given shape
 /// * The \a DetElements containing the sensitive modules have no specific shape (assembliy)
 /// 	- the boundaries of the layers are calculated automatically by adding a tolerance to the geometric extension of the contained surfaces
 ///		- the tolerances in r and z need to be set for every \a DetElement representing layer using envelopeR and envelopeZ in the Acts::ActsExtension's
@@ -378,9 +378,9 @@
 
 /// @defgroup MaterialPlugins MaterialPlugins
 /// @ingroup Plugins
-/// @brief Map material onto the ACTS geometry.
+/// @brief Map material onto the Acts geometry.
 ///
-/// The MaterialPlugins allow to map material from a detailed full detector geometry onto the simplfied ACTS geometry.
+/// The MaterialPlugins allow to map material from a detailed full detector geometry onto the simplfied Acts geometry.
 /// The material is mapped onto layers of the tracking geometry which are marked to carry support material. The marking
 /// is done during the geometry building process. The material can be mapped onto either, the inner, the outer
 /// boundary surface or the central (representing) Acts::Surface of the Acts::Layer. The Acts::Material is described on a two dimensional
@@ -388,7 +388,7 @@
 /// @note The DD4hepPlugin offers the possiility to mark layers which should carry material and to determine the
 /// grid granularity, using the class Acts::ActsExtension.
 ///
-/// Following the ACTS philosophy the material mapping is agnostic to any file format and software used to create or store
+/// Following the Acts philosophy the material mapping is agnostic to any file format and software used to create or store
 /// the material maps. The material should be stored in instances of the class Acts::MaterialTrack. This material track record
 /// represents a track starting from a certain position, in a certain direction, containing all material along this
 /// track. The material along the material track record ist stored as a container of Acts::MaterialStep instances. Each material
diff --git a/doc/doxygen.config.in b/doc/doxygen.config.in
index 5fc09c754..6e5ce463c 100644
--- a/doc/doxygen.config.in
+++ b/doc/doxygen.config.in
@@ -38,7 +38,7 @@ PROJECT_NAME           = @PROJECT_NAME@
 # could be handy for archiving the generated documentation or if some version
 # control system is used.
 
-PROJECT_NUMBER         = @ACTS_VERSION@
+PROJECT_NUMBER         = @Acts_VERSION@
 
 # Using the PROJECT_BRIEF tag one can provide an optional one line description
 # for a project that appears at the top of each page and should give viewer a
@@ -51,7 +51,7 @@ PROJECT_BRIEF          = "Reference Guide"
 # pixels and the maximum width should not exceed 200 pixels. Doxygen will copy
 # the logo to the output directory.
 
-PROJECT_LOGO           = ACTSlogo.gif
+PROJECT_LOGO           = Actslogo.gif
 
 # The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute) path
 # into which the generated documentation will be written. If a relative path is
@@ -2092,7 +2092,7 @@ TAGFILES               =
 # tag file that is based on the input files it reads. See section "Linking to
 # external documentation" for more information about the usage of tag files.
 
-GENERATE_TAGFILE       = ACTS.tag
+GENERATE_TAGFILE       = Acts.tag
 
 # If the ALLEXTERNALS tag is set to YES, all external class will be listed in
 # the class index. If set to NO, only the inherited external classes will be
diff --git a/getting_started.md b/getting_started.md
index 1d871ac31..7a414bc2d 100644
--- a/getting_started.md
+++ b/getting_started.md
@@ -4,14 +4,14 @@
     1. [Prerequisites](#prerequisites)
     2. [Installation](#installation)
     3. [CMake build system](#cmake)
-    4. [Build ACTS on lxplus](#build-lxplus)
-    5. [Build ACTS on your local machine](#build-local)
-2. [Using ACTS in your own cmake project](#using-acts)
+    4. [Build Acts on lxplus](#build-lxplus)
+    5. [Build Acts on your local machine](#build-local)
+2. [Using Acts in your own cmake project](#using-acts)
 3. [Documentation](#documentation)
 
 ## <a name="prerequisites">Prerequisites</a>
 
-Only few dependencies are required to build the Core library of ACTS. A list of
+Only few dependencies are required to build the Core library of Acts. A list of
 prerequisites required is given below with the version numbers indicating which
 versions were tested. Older versions may or may not work, feedback is very
 welcome.
@@ -32,7 +32,7 @@ components:
 *   [ROOT](https://root.cern.ch) (>= 6.10.00) for the TGeo plugin
 
 Compatible versions of all dependencies are provided by **LCG releases**.
-The current recommended release for building ACTS is the
+The current recommended release for building Acts is the
 [LCG91 Release](http://lcginfo.cern.ch/release/91). This release is also used in the
 continous integration (CI) system to test the software. Setup scripts are provided
 in the repository that can be used to setup this release, and a few others, on
@@ -41,14 +41,14 @@ lxplus machines at CERN (see [below](#installation)).
 
 ## <a name="installation">Installation and quick start</a>
 
-The ACTS repository is hosted on the GitLab instance at CERN. In order to aquire the latest
+The Acts repository is hosted on the GitLab instance at CERN. In order to aquire the latest
 version from the git repository you can simply clone:
 
 ```bash
 git clone https://gitlab.cern.ch/acts/acts-core.git <ACTS_DIR>
 ```
 
-You can then `cd <ACTS_DIR>` continue building ACTS:
+You can then `cd <ACTS_DIR>` continue building Acts:
 
 ```bash
 source CI/setup_lcg91.sh
@@ -60,10 +60,10 @@ cmake --build . -- install
 
 ## <a name="cmake">CMake build system</a>
 
-CMake is used as build system for compiling and installing ACTS.  For a
+CMake is used as build system for compiling and installing Acts.  For a
 complete list of CMake options please refer to the [official documentation](https://cmake.org/cmake/help/v3.1/index.html) 
 and this nice [list of general cmake options](https://cmake.org/Wiki/CMake_Useful_Variables).
-Important options relevant for the ACTS project are given below. They are set
+Important options relevant for the Acts project are given below. They are set
 by adding `-D<OPTION>=<VALUE>` to the `cmake` command.
 
 | option                       | default | description                                             |
@@ -82,11 +82,11 @@ by adding `-D<OPTION>=<VALUE>` to the `cmake` command.
 | CMAKE_BUILD_TYPE             |         | build type (e.g. Debug, Release) affects compiler flags |
 | DD4hep_DIR                   |         | path to the DD4hep installation                         |
 
-## <a name="building-acts">Building ACTS</a>
+## <a name="building-acts">Building Acts</a>
 
-### <a name="build-lxplus">Building ACTS on lxplus</a>
+### <a name="build-lxplus">Building Acts on lxplus</a>
 
-The first step to build ACTS is to acquire supported versions of the
+The first step to build Acts is to acquire supported versions of the
 dependencies.  Which dependencies are required depends on the plugins you
 enable, as mentioned above.
 
@@ -102,11 +102,11 @@ source <ACTS_DIR>/CI/setup_lcgXYZ.sh
 where `XYZ` is the version number of the LCG release. There are multiple setup
 scripts for different LCG releases, which corresponds to the releases the CI
 tests against. The releases which can be set up using these scripts are therefore
-sure to be compatible. **You can build ACTS with any of these releases**. 
+sure to be compatible. **You can build Acts with any of these releases**. 
 Additionally, there is a script called `setup_clang.sh` which will make the `clang` compiler available on top of one
 of the LCG releases. This configuration is also tested by the CI.
 
-Using one of the scripts, you can use the following commands to build ACTS with
+Using one of the scripts, you can use the following commands to build Acts with
 all plugins using the same dependency versions as in the continous integration
 system.
 
@@ -123,26 +123,26 @@ cmake --build . -- install
 In this example the DD4hep, Material and TGeo plugins. The install prefix is
 set to `<path you want>`.
 
-### <a name="build-local">Building ACTS on your local machine</a>
+### <a name="build-local">Building Acts on your local machine</a>
 
-Building and running ACTS on your local machine is not offically supported.
+Building and running Acts on your local machine is not offically supported.
 However, if you have the necessary prerequisites installed it should be
-possible to use it locally. ACTS developers regularly use different
-recent Linux distributions and macOS to build and develop ACTS.
+possible to use it locally. Acts developers regularly use different
+recent Linux distributions and macOS to build and develop Acts.
 
-# <a name="using-acts">Using ACTS in your own cmake project</a>
+# <a name="using-acts">Using Acts in your own cmake project</a>
 
-When using ACTS in your own cmake-based project, you need to include the
+When using Acts in your own cmake-based project, you need to include the
 following lines in your `CMakeLists.txt` file:
 
 ```bash
-find_package (ACTS COMPONENTS comp1 comp2 ...)
+find_package (Acts COMPONENTS comp1 comp2 ...)
 ```
 
-where `compX` are the required components from the ACTS project. See the
+where `compX` are the required components from the Acts project. See the
 `cmake` output for more information about which components are available.
 
 # <a name="documentation">Documentation</a>
 
-You can find a complete documentation of the ACTS functionality and the class reference guide at [http://acts.web.cern.ch/ACTS/latest/doc/index.html](http://acts.web.cern.ch/ACTS/latest/doc/index.html).
+You can find a complete documentation of the Acts functionality and the class reference guide at [http://acts.web.cern.ch/ACTS/latest/doc/index.html](http://acts.web.cern.ch/ACTS/latest/doc/index.html).
 
diff --git a/setup.sh.in b/setup.sh.in
index 2fd493cfc..3949c41c9 100644
--- a/setup.sh.in
+++ b/setup.sh.in
@@ -1,3 +1,3 @@
-# set up ACTS environment
+# set up Acts environment
 export PATH=@CMAKE_INSTALL_PREFIX@/@CMAKE_INSTALL_BINDIR@:$PATH
-export LD_LIBRARY_PATH=@CMAKE_INSTALL_PREFIX@/@CMAKE_INSTALL_LIBDIR@:$LD_LIBRARY_PATH
\ No newline at end of file
+export LD_LIBRARY_PATH=@CMAKE_INSTALL_PREFIX@/@CMAKE_INSTALL_LIBDIR@:$LD_LIBRARY_PATH
-- 
GitLab