diff --git a/CMakeLists.txt b/CMakeLists.txt
index c99b5318f7993e4839a0a526f490ecebeb64a1ab..9299a09418e19b8b78cf02e78ac90dead5e0d1ae 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -19,7 +19,7 @@ option (ACTS_BUILD_TGEO_PLUGIN "Build TGeo plugins" OFF)
 option (ACTS_BUILD_JSON_PLUGIN "Build Json plugin" OFF)
 # all other compile-time parameters must be defined here for clear visibility
 # and to avoid forgotten options somewhere deep in the hierarchy
-set (ACTS_PARAMETER_DEFINITIONS_PLUGIN "ACTS/Utilities/detail/DefaultParameterDefinitions.hpp" CACHE FILEPATH "Default track parameter definition")
+set (ACTS_PARAMETER_DEFINITIONS_PLUGIN "Acts/Utilities/detail/DefaultParameterDefinitions.hpp" CACHE FILEPATH "Default track parameter definition")
 
 # handle inter-plugin dependencies
 if (ACTS_BUILD_DD4HEP_PLUGIN)
diff --git a/Core/ACTSVersion.hpp.in b/Core/ActsVersion.hpp.in
similarity index 100%
rename from Core/ACTSVersion.hpp.in
rename to Core/ActsVersion.hpp.in
diff --git a/Core/CMakeLists.txt b/Core/CMakeLists.txt
index 29f0eee917e8cda66b76c3d2a8c2c8f0d41fcdc6..990e123d2d48606fc38fe1c687a88fbeb8eb2587 100644
--- a/Core/CMakeLists.txt
+++ b/Core/CMakeLists.txt
@@ -17,11 +17,11 @@ install (DIRECTORY include/ACTS
 
 # generate version header and make it available to the build
 configure_file(
-  ACTSVersion.hpp.in
-  ${CMAKE_CURRENT_BINARY_DIR}/ACTS/ACTSVersion.hpp)
+  ActsVersion.hpp.in
+  ${CMAKE_CURRENT_BINARY_DIR}/Acts/ActsVersion.hpp)
 install(
-  FILES ${CMAKE_CURRENT_BINARY_DIR}/ACTS/ACTSVersion.hpp
-  DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/ACTS)
+  FILES ${CMAKE_CURRENT_BINARY_DIR}/Acts/ActsVersion.hpp
+  DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/Acts)
 target_include_directories(ACTSCore PUBLIC $<BUILD_INTERFACE:${CMAKE_CURRENT_BINARY_DIR}>)
 
 acts_add_targets_to_cdash_project(PROJECT ACore TARGETS ACTSCore)
diff --git a/Core/include/ACTS/Detector/DetachedTrackingVolume.hpp b/Core/include/Acts/Detector/DetachedTrackingVolume.hpp
similarity index 96%
rename from Core/include/ACTS/Detector/DetachedTrackingVolume.hpp
rename to Core/include/Acts/Detector/DetachedTrackingVolume.hpp
index 4bd74f5ef6ec4d5ac228f35cf99541734a8b3be0..b5bacc5bee828aba72da229f9b551847cabb22ba 100644
--- a/Core/include/ACTS/Detector/DetachedTrackingVolume.hpp
+++ b/Core/include/Acts/Detector/DetachedTrackingVolume.hpp
@@ -14,11 +14,11 @@
 #define ACTS_DETECTOR_DETACHEDTRACKINGVOLUME_H 1
 
 #include <memory>
-#include "ACTS/Layers/Layer.hpp"
-#include "ACTS/Layers/PlaneLayer.hpp"
-#include "ACTS/Surfaces/Surface.hpp"
-#include "ACTS/Utilities/Definitions.hpp"
-#include "ACTS/Utilities/GeometrySignature.hpp"
+#include "Acts/Layers/Layer.hpp"
+#include "Acts/Layers/PlaneLayer.hpp"
+#include "Acts/Surfaces/Surface.hpp"
+#include "Acts/Utilities/Definitions.hpp"
+#include "Acts/Utilities/GeometrySignature.hpp"
 
 namespace Acts {
 
diff --git a/Core/include/ACTS/Detector/DetectorElementBase.hpp b/Core/include/Acts/Detector/DetectorElementBase.hpp
similarity index 98%
rename from Core/include/ACTS/Detector/DetectorElementBase.hpp
rename to Core/include/Acts/Detector/DetectorElementBase.hpp
index df5257cc90c78b518d09e1c676f9f27820c8a21c..337e368831b83de82266444d3ebb04a5b8f9346f 100644
--- a/Core/include/ACTS/Detector/DetectorElementBase.hpp
+++ b/Core/include/Acts/Detector/DetectorElementBase.hpp
@@ -19,8 +19,8 @@
 
 #include <memory>
 #include <vector>
-#include "ACTS/Utilities/Definitions.hpp"
-#include "ACTS/Utilities/Identifier.hpp"
+#include "Acts/Utilities/Definitions.hpp"
+#include "Acts/Utilities/Identifier.hpp"
 
 namespace Acts {
 
diff --git a/Core/include/ACTS/Detector/GlueVolumesDescriptor.hpp b/Core/include/Acts/Detector/GlueVolumesDescriptor.hpp
similarity index 96%
rename from Core/include/ACTS/Detector/GlueVolumesDescriptor.hpp
rename to Core/include/Acts/Detector/GlueVolumesDescriptor.hpp
index e3a02bfa07a81e36e97df4cb7e33bc57341c2437..690e1ef562bfb761cd0bfcbea405537322a50030 100644
--- a/Core/include/ACTS/Detector/GlueVolumesDescriptor.hpp
+++ b/Core/include/Acts/Detector/GlueVolumesDescriptor.hpp
@@ -16,8 +16,8 @@
 #include <map>
 #include <memory>
 #include <vector>
-#include "ACTS/Utilities/BinnedArray.hpp"
-#include "ACTS/Volumes/BoundarySurfaceFace.hpp"
+#include "Acts/Utilities/BinnedArray.hpp"
+#include "Acts/Volumes/BoundarySurfaceFace.hpp"
 
 namespace Acts {
 
diff --git a/Core/include/ACTS/Detector/TrackingGeometry.hpp b/Core/include/Acts/Detector/TrackingGeometry.hpp
similarity index 98%
rename from Core/include/ACTS/Detector/TrackingGeometry.hpp
rename to Core/include/Acts/Detector/TrackingGeometry.hpp
index 22e95749f3fbfba98b70c49441007b61b3854c38..3dcbda7344324b8c745a57de3fe31ca199900676 100644
--- a/Core/include/ACTS/Detector/TrackingGeometry.hpp
+++ b/Core/include/Acts/Detector/TrackingGeometry.hpp
@@ -13,8 +13,8 @@
 #ifndef ACTS_DETECTOR_TRACKINGGEOMETRY_H
 #define ACTS_DETECTOR_TRACKINGGEOMETRY_H
 
-#include "ACTS/Utilities/Definitions.hpp"
-#include "ACTS/Utilities/GeometrySignature.hpp"
+#include "Acts/Utilities/Definitions.hpp"
+#include "Acts/Utilities/GeometrySignature.hpp"
 // STD
 #include <map>
 #include <memory>
diff --git a/Core/include/ACTS/Detector/TrackingVolume.hpp b/Core/include/Acts/Detector/TrackingVolume.hpp
similarity index 98%
rename from Core/include/ACTS/Detector/TrackingVolume.hpp
rename to Core/include/Acts/Detector/TrackingVolume.hpp
index 7479e0f90bf3e072e5669dda9cf6a758843209a3..e69e173bf4df22651aeede3cfaee3f8ecac09fdc 100644
--- a/Core/include/ACTS/Detector/TrackingVolume.hpp
+++ b/Core/include/Acts/Detector/TrackingVolume.hpp
@@ -15,14 +15,14 @@
 
 #include <map>
 #include <string>
-#include "ACTS/Layers/Layer.hpp"
-#include "ACTS/Surfaces/BoundaryCheck.hpp"
-#include "ACTS/Surfaces/Surface.hpp"
-#include "ACTS/Utilities/BinnedArray.hpp"
-#include "ACTS/Utilities/Definitions.hpp"
-#include "ACTS/Utilities/GeometrySignature.hpp"
-#include "ACTS/Volumes/BoundarySurfaceT.hpp"
-#include "ACTS/Volumes/Volume.hpp"
+#include "Acts/Layers/Layer.hpp"
+#include "Acts/Surfaces/BoundaryCheck.hpp"
+#include "Acts/Surfaces/Surface.hpp"
+#include "Acts/Utilities/BinnedArray.hpp"
+#include "Acts/Utilities/Definitions.hpp"
+#include "Acts/Utilities/GeometrySignature.hpp"
+#include "Acts/Volumes/BoundarySurfaceT.hpp"
+#include "Acts/Volumes/Volume.hpp"
 
 namespace Acts {
 
diff --git a/Core/include/ACTS/Digitization/CartesianSegmentation.hpp b/Core/include/Acts/Digitization/CartesianSegmentation.hpp
similarity index 95%
rename from Core/include/ACTS/Digitization/CartesianSegmentation.hpp
rename to Core/include/Acts/Digitization/CartesianSegmentation.hpp
index 1fdf51c0007a9f5d43bd7ca16124df2ddaa88383..3173c8b01bad292652f28e230d5ae663f18c40c2 100644
--- a/Core/include/ACTS/Digitization/CartesianSegmentation.hpp
+++ b/Core/include/Acts/Digitization/CartesianSegmentation.hpp
@@ -10,11 +10,11 @@
 #define ACTS_DIGITIZATION_CARTESIANSEGMENTATION_H
 
 #include <memory>
-#include "ACTS/Digitization/DigitizationCell.hpp"
-#include "ACTS/Digitization/Segmentation.hpp"
-#include "ACTS/Surfaces/PlanarBounds.hpp"
-#include "ACTS/Utilities/BinUtility.hpp"
-#include "ACTS/Utilities/Definitions.hpp"
+#include "Acts/Digitization/DigitizationCell.hpp"
+#include "Acts/Digitization/Segmentation.hpp"
+#include "Acts/Surfaces/PlanarBounds.hpp"
+#include "Acts/Utilities/BinUtility.hpp"
+#include "Acts/Utilities/Definitions.hpp"
 
 namespace Acts {
 
diff --git a/Core/include/ACTS/Digitization/DigitizationCell.hpp b/Core/include/Acts/Digitization/DigitizationCell.hpp
similarity index 98%
rename from Core/include/ACTS/Digitization/DigitizationCell.hpp
rename to Core/include/Acts/Digitization/DigitizationCell.hpp
index 1f2cd1c41f54ebcf0924602416a1d6c936d811ad..ca7861a1acb04963acf97babe71a1ed4e136d253 100644
--- a/Core/include/ACTS/Digitization/DigitizationCell.hpp
+++ b/Core/include/Acts/Digitization/DigitizationCell.hpp
@@ -9,7 +9,7 @@
 #ifndef ACTS_DIGITIZATION_DIGITIZATIONCELL_H
 #define ACTS_DIGITIZATION_DIGITIZATIONCELL_H
 
-#include "ACTS/Utilities/Definitions.hpp"
+#include "Acts/Utilities/Definitions.hpp"
 
 namespace Acts {
 
diff --git a/Core/include/ACTS/Digitization/DigitizationModule.hpp b/Core/include/Acts/Digitization/DigitizationModule.hpp
similarity index 97%
rename from Core/include/ACTS/Digitization/DigitizationModule.hpp
rename to Core/include/Acts/Digitization/DigitizationModule.hpp
index df5d82ecf3d6acb3d4c39fc67a029aa14e4af221..ad6c0b96bf0eb43326c12540c008d4ec6ec7424f 100644
--- a/Core/include/ACTS/Digitization/DigitizationModule.hpp
+++ b/Core/include/Acts/Digitization/DigitizationModule.hpp
@@ -10,9 +10,9 @@
 #define ACTS_DIGITIZATION_DIGITIZATIONMODULE_H
 
 #include <memory>
-#include "ACTS/Digitization/DigitizationCell.hpp"
-#include "ACTS/Digitization/Segmentation.hpp"
-#include "ACTS/Utilities/Definitions.hpp"
+#include "Acts/Digitization/DigitizationCell.hpp"
+#include "Acts/Digitization/Segmentation.hpp"
+#include "Acts/Utilities/Definitions.hpp"
 
 namespace Acts {
 
diff --git a/Core/include/ACTS/Digitization/PlanarModuleCluster.hpp b/Core/include/Acts/Digitization/PlanarModuleCluster.hpp
similarity index 89%
rename from Core/include/ACTS/Digitization/PlanarModuleCluster.hpp
rename to Core/include/Acts/Digitization/PlanarModuleCluster.hpp
index 2fed4da8ebc0054a9dd647e8b5728646856112c0..1d238786c20061f3303addd712efd9b75d91f058 100644
--- a/Core/include/ACTS/Digitization/PlanarModuleCluster.hpp
+++ b/Core/include/Acts/Digitization/PlanarModuleCluster.hpp
@@ -9,13 +9,13 @@
 #ifndef ACTS_DIGITIZATION_PLANARMODULECLUSTER_H
 #define ACTS_DIGITIZATION_PLANARMODULECLUSTER_H 1
 
-#include "ACTS/Digitization/DigitizationCell.hpp"
-#include "ACTS/EventData/Measurement.hpp"
-#include "ACTS/EventData/ParticleDefinitions.hpp"
-#include "ACTS/Utilities/Definitions.hpp"
-#include "ACTS/Utilities/Identifier.hpp"
-#include "ACTS/Utilities/Logger.hpp"
-#include "ACTS/Utilities/ParameterDefinitions.hpp"
+#include "Acts/Digitization/DigitizationCell.hpp"
+#include "Acts/EventData/Measurement.hpp"
+#include "Acts/EventData/ParticleDefinitions.hpp"
+#include "Acts/Utilities/Definitions.hpp"
+#include "Acts/Utilities/Identifier.hpp"
+#include "Acts/Utilities/Logger.hpp"
+#include "Acts/Utilities/ParameterDefinitions.hpp"
 
 namespace Acts {
 
diff --git a/Core/include/ACTS/Digitization/PlanarModuleStepper.hpp b/Core/include/Acts/Digitization/PlanarModuleStepper.hpp
similarity index 95%
rename from Core/include/ACTS/Digitization/PlanarModuleStepper.hpp
rename to Core/include/Acts/Digitization/PlanarModuleStepper.hpp
index d349114734f19a0ee5f54617c42c2e9481b04e11..178dc24e404da51d612e3eb5c91fe7946a823255 100644
--- a/Core/include/ACTS/Digitization/PlanarModuleStepper.hpp
+++ b/Core/include/Acts/Digitization/PlanarModuleStepper.hpp
@@ -11,9 +11,9 @@
 
 #include <memory>
 #include <vector>
-#include "ACTS/Digitization/DigitizationCell.hpp"
-#include "ACTS/Utilities/Definitions.hpp"
-#include "ACTS/Utilities/Logger.hpp"
+#include "Acts/Digitization/DigitizationCell.hpp"
+#include "Acts/Utilities/Definitions.hpp"
+#include "Acts/Utilities/Logger.hpp"
 
 namespace Acts {
 
diff --git a/Core/include/ACTS/Digitization/PolarSegmentation.hpp b/Core/include/Acts/Digitization/PolarSegmentation.hpp
similarity index 96%
rename from Core/include/ACTS/Digitization/PolarSegmentation.hpp
rename to Core/include/Acts/Digitization/PolarSegmentation.hpp
index 242a62e8e3ad8c5b51241df4120f41bdb2d810f1..af02b3746f478c497f3d2fad6efbc77791241542 100644
--- a/Core/include/ACTS/Digitization/PolarSegmentation.hpp
+++ b/Core/include/Acts/Digitization/PolarSegmentation.hpp
@@ -10,11 +10,11 @@
 // #define ACTS_DIGITIZATION_POLARSEGMENTATION_H
 //
 // #include <memory>
-// #include "ACTS/Digitization/DigitizationCell.hpp"
-// #include "ACTS/Digitization/Segmentation.hpp"
-// #include "ACTS/Surfaces/TrapezoidBounds.hpp"
-// #include "ACTS/Utilities/BinUtility.hpp"
-// #include "ACTS/Utilities/Definitions.hpp"
+// #include "Acts/Digitization/DigitizationCell.hpp"
+// #include "Acts/Digitization/Segmentation.hpp"
+// #include "Acts/Surfaces/TrapezoidBounds.hpp"
+// #include "Acts/Utilities/BinUtility.hpp"
+// #include "Acts/Utilities/Definitions.hpp"
 
 // namespace Acts {
 //
diff --git a/Core/include/ACTS/Digitization/Segmentation.hpp b/Core/include/Acts/Digitization/Segmentation.hpp
similarity index 97%
rename from Core/include/ACTS/Digitization/Segmentation.hpp
rename to Core/include/Acts/Digitization/Segmentation.hpp
index 28d69a4d3a846f86d88689a40e64edba249d4de8..59feafb8cb3a4703f4f9a93a7507d8b2d9cab896 100644
--- a/Core/include/ACTS/Digitization/Segmentation.hpp
+++ b/Core/include/Acts/Digitization/Segmentation.hpp
@@ -11,8 +11,8 @@
 
 #include <memory>
 #include <vector>
-#include "ACTS/Digitization/DigitizationCell.hpp"
-#include "ACTS/Utilities/Definitions.hpp"
+#include "Acts/Digitization/DigitizationCell.hpp"
+#include "Acts/Utilities/Definitions.hpp"
 
 namespace Acts {
 
diff --git a/Core/include/ACTS/EventData/ChargePolicy.hpp b/Core/include/Acts/EventData/ChargePolicy.hpp
similarity index 100%
rename from Core/include/ACTS/EventData/ChargePolicy.hpp
rename to Core/include/Acts/EventData/ChargePolicy.hpp
diff --git a/Core/include/ACTS/EventData/Measurement.hpp b/Core/include/Acts/EventData/Measurement.hpp
similarity index 98%
rename from Core/include/ACTS/EventData/Measurement.hpp
rename to Core/include/Acts/EventData/Measurement.hpp
index b03988a618ed80f0e8f02855024e0a5782771893..844164d27c0df48556ea4767537341c267c56fc0 100644
--- a/Core/include/ACTS/EventData/Measurement.hpp
+++ b/Core/include/Acts/EventData/Measurement.hpp
@@ -13,10 +13,10 @@
 #include <ostream>
 #include <type_traits>
 #include <utility>
-#include "ACTS/EventData/ParameterSet.hpp"
-#include "ACTS/EventData/TrackParameters.hpp"
-#include "ACTS/EventData/detail/fittable_type_generator.hpp"
-#include "ACTS/Utilities/ParameterDefinitions.hpp"
+#include "Acts/EventData/ParameterSet.hpp"
+#include "Acts/EventData/TrackParameters.hpp"
+#include "Acts/EventData/detail/fittable_type_generator.hpp"
+#include "Acts/Utilities/ParameterDefinitions.hpp"
 
 namespace Acts {
 
diff --git a/Core/include/ACTS/EventData/NeutralParameters.hpp b/Core/include/Acts/EventData/NeutralParameters.hpp
similarity index 76%
rename from Core/include/ACTS/EventData/NeutralParameters.hpp
rename to Core/include/Acts/EventData/NeutralParameters.hpp
index fdbd05233005b70acaff37ffd10e2e17ce69c260..b4ada7d2f22bdd57d5bdb8a6888490babf46c88c 100644
--- a/Core/include/ACTS/EventData/NeutralParameters.hpp
+++ b/Core/include/Acts/EventData/NeutralParameters.hpp
@@ -9,10 +9,10 @@
 #ifndef ACTS_NEUTRALPARAMETERS_H
 #define ACTS_NEUTRALPARAMETERS_H 1
 
-#include "ACTS/EventData/ChargePolicy.hpp"
-#include "ACTS/EventData/SingleBoundTrackParameters.hpp"
-#include "ACTS/EventData/SingleCurvilinearTrackParameters.hpp"
-#include "ACTS/EventData/SingleTrackParameters.hpp"
+#include "Acts/EventData/ChargePolicy.hpp"
+#include "Acts/EventData/SingleBoundTrackParameters.hpp"
+#include "Acts/EventData/SingleCurvilinearTrackParameters.hpp"
+#include "Acts/EventData/SingleTrackParameters.hpp"
 
 namespace Acts {
 typedef SingleTrackParameters<NeutralPolicy> NeutralParameters;
diff --git a/Core/include/ACTS/EventData/ParameterSet.hpp b/Core/include/Acts/EventData/ParameterSet.hpp
similarity index 96%
rename from Core/include/ACTS/EventData/ParameterSet.hpp
rename to Core/include/Acts/EventData/ParameterSet.hpp
index 404e8efdfa987ce1c44831d5ea3973d3f232eebd..3f92f95b6f6ca31d8220e68b345d6863413ab63a 100644
--- a/Core/include/ACTS/EventData/ParameterSet.hpp
+++ b/Core/include/Acts/EventData/ParameterSet.hpp
@@ -15,18 +15,18 @@
 #include <utility>
 
 // 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"
-#include "ACTS/EventData/detail/residual_calculator.hpp"
-#include "ACTS/EventData/detail/value_corrector.hpp"
-#include "ACTS/Utilities/Definitions.hpp"
-#include "ACTS/Utilities/ParameterDefinitions.hpp"
-#include "ACTS/Utilities/detail/MPL/are_sorted.hpp"
-#include "ACTS/Utilities/detail/MPL/are_within.hpp"
-#include "ACTS/Utilities/detail/MPL/at_index.hpp"
-#include "ACTS/Utilities/detail/MPL/get_position.hpp"
-#include "ACTS/Utilities/detail/MPL/is_contained.hpp"
+#include "Acts/EventData/detail/full_parameter_set.hpp"
+#include "Acts/EventData/detail/initialize_parameter_set.hpp"
+#include "Acts/EventData/detail/make_projection_matrix.hpp"
+#include "Acts/EventData/detail/residual_calculator.hpp"
+#include "Acts/EventData/detail/value_corrector.hpp"
+#include "Acts/Utilities/Definitions.hpp"
+#include "Acts/Utilities/ParameterDefinitions.hpp"
+#include "Acts/Utilities/detail/MPL/are_sorted.hpp"
+#include "Acts/Utilities/detail/MPL/are_within.hpp"
+#include "Acts/Utilities/detail/MPL/at_index.hpp"
+#include "Acts/Utilities/detail/MPL/get_position.hpp"
+#include "Acts/Utilities/detail/MPL/is_contained.hpp"
 
 namespace Acts {
 /// @cond
diff --git a/Core/include/ACTS/EventData/ParticleDefinitions.hpp b/Core/include/Acts/EventData/ParticleDefinitions.hpp
similarity index 99%
rename from Core/include/ACTS/EventData/ParticleDefinitions.hpp
rename to Core/include/Acts/EventData/ParticleDefinitions.hpp
index 245ab8c03b45f82efb152c9ecd8017f7ba88a684..c85d67c67b99fefbc923bfac9514d8ed66865a65 100644
--- a/Core/include/ACTS/EventData/ParticleDefinitions.hpp
+++ b/Core/include/Acts/EventData/ParticleDefinitions.hpp
@@ -14,8 +14,8 @@
 #define ACTS_EVENTDATA_PARTICLEDEFINITIONS_H
 
 #include <vector>
-#include "ACTS/Utilities/Definitions.hpp"
-#include "ACTS/Utilities/Units.hpp"
+#include "Acts/Utilities/Definitions.hpp"
+#include "Acts/Utilities/Units.hpp"
 
 // barcodes
 typedef unsigned long barcode_type;
diff --git a/Core/include/ACTS/EventData/SingleBoundTrackParameters.hpp b/Core/include/Acts/EventData/SingleBoundTrackParameters.hpp
similarity index 99%
rename from Core/include/ACTS/EventData/SingleBoundTrackParameters.hpp
rename to Core/include/Acts/EventData/SingleBoundTrackParameters.hpp
index 55c1dcba8dadfeb7cd3b693ccca671a2ef8e3fac..db2161fb2efac18b6d9c8ca07a67835caadef25b 100644
--- a/Core/include/ACTS/EventData/SingleBoundTrackParameters.hpp
+++ b/Core/include/Acts/EventData/SingleBoundTrackParameters.hpp
@@ -9,8 +9,8 @@
 #ifndef ACTS_SINGLEBOUNDTRACKPARAMETERS_H
 #define ACTS_SINGLEBOUNDTRACKPARAMETERS_H
 
-#include "ACTS/EventData/SingleTrackParameters.hpp"
-#include "ACTS/Surfaces/Surface.hpp"
+#include "Acts/EventData/SingleTrackParameters.hpp"
+#include "Acts/Surfaces/Surface.hpp"
 
 namespace Acts {
 
diff --git a/Core/include/ACTS/EventData/SingleCurvilinearTrackParameters.hpp b/Core/include/Acts/EventData/SingleCurvilinearTrackParameters.hpp
similarity index 98%
rename from Core/include/ACTS/EventData/SingleCurvilinearTrackParameters.hpp
rename to Core/include/Acts/EventData/SingleCurvilinearTrackParameters.hpp
index 571741f4a6c93d3b2955743658bf2f973f9aefed..16387994abd5edc7c6a8ab1379b2be7e3ef24a47 100644
--- a/Core/include/ACTS/EventData/SingleCurvilinearTrackParameters.hpp
+++ b/Core/include/Acts/EventData/SingleCurvilinearTrackParameters.hpp
@@ -10,8 +10,8 @@
 #define ACTS_SINGLECURVILINEARTRACKPARAMETERS_H
 
 #include <memory>
-#include "ACTS/EventData/SingleTrackParameters.hpp"
-#include "ACTS/Surfaces/PlaneSurface.hpp"
+#include "Acts/EventData/SingleTrackParameters.hpp"
+#include "Acts/Surfaces/PlaneSurface.hpp"
 
 namespace Acts {
 
diff --git a/Core/include/ACTS/EventData/SingleTrackParameters.hpp b/Core/include/Acts/EventData/SingleTrackParameters.hpp
similarity index 97%
rename from Core/include/ACTS/EventData/SingleTrackParameters.hpp
rename to Core/include/Acts/EventData/SingleTrackParameters.hpp
index 46a833c5f9960e2a098f60143081164f9133776a..b466030583f80f27a2ab34bd69d407d8862baea3 100644
--- a/Core/include/ACTS/EventData/SingleTrackParameters.hpp
+++ b/Core/include/Acts/EventData/SingleTrackParameters.hpp
@@ -10,9 +10,9 @@
 #define ACTS_SINGLETRACKPARAMETERS_H
 
 #include <type_traits>
-#include "ACTS/EventData/TrackParametersBase.hpp"
-#include "ACTS/EventData/detail/coordinate_transformations.hpp"
-#include "ACTS/Utilities/Definitions.hpp"
+#include "Acts/EventData/TrackParametersBase.hpp"
+#include "Acts/EventData/detail/coordinate_transformations.hpp"
+#include "Acts/Utilities/Definitions.hpp"
 
 namespace Acts {
 
diff --git a/Core/include/ACTS/EventData/TrackParameters.hpp b/Core/include/Acts/EventData/TrackParameters.hpp
similarity index 75%
rename from Core/include/ACTS/EventData/TrackParameters.hpp
rename to Core/include/Acts/EventData/TrackParameters.hpp
index 591ab8f66f5fe544b4a75422d90404a299396371..b98d9406f51fda07ee00e001e03783aa2ee13fcc 100644
--- a/Core/include/ACTS/EventData/TrackParameters.hpp
+++ b/Core/include/Acts/EventData/TrackParameters.hpp
@@ -9,10 +9,10 @@
 #ifndef ACTS_TRACKPARAMETERS_H
 #define ACTS_TRACKPARAMETERS_H
 
-#include "ACTS/EventData/ChargePolicy.hpp"
-#include "ACTS/EventData/SingleBoundTrackParameters.hpp"
-#include "ACTS/EventData/SingleCurvilinearTrackParameters.hpp"
-#include "ACTS/EventData/SingleTrackParameters.hpp"
+#include "Acts/EventData/ChargePolicy.hpp"
+#include "Acts/EventData/SingleBoundTrackParameters.hpp"
+#include "Acts/EventData/SingleCurvilinearTrackParameters.hpp"
+#include "Acts/EventData/SingleTrackParameters.hpp"
 
 namespace Acts {
 typedef SingleTrackParameters<ChargedPolicy>            TrackParameters;
diff --git a/Core/include/ACTS/EventData/TrackParametersBase.hpp b/Core/include/Acts/EventData/TrackParametersBase.hpp
similarity index 96%
rename from Core/include/ACTS/EventData/TrackParametersBase.hpp
rename to Core/include/Acts/EventData/TrackParametersBase.hpp
index 81735c28cb380c48452b6110667a7d7de7a846bb..be2cef0250bcc220807f0a27ab3afecb75e475a6 100644
--- a/Core/include/ACTS/EventData/TrackParametersBase.hpp
+++ b/Core/include/Acts/EventData/TrackParametersBase.hpp
@@ -12,11 +12,11 @@
 // STL include(s)
 #include <ostream>
 
-#include "ACTS/Utilities/Definitions.hpp"
+#include "Acts/Utilities/Definitions.hpp"
 // ACTS includes
-#include "ACTS/EventData/ChargePolicy.hpp"
-#include "ACTS/EventData/ParameterSet.hpp"
-#include "ACTS/Utilities/ParameterDefinitions.hpp"
+#include "Acts/EventData/ChargePolicy.hpp"
+#include "Acts/EventData/ParameterSet.hpp"
+#include "Acts/Utilities/ParameterDefinitions.hpp"
 
 namespace Acts {
 // forward declarations
diff --git a/Core/include/ACTS/EventData/TransportJacobian.hpp b/Core/include/Acts/EventData/TransportJacobian.hpp
similarity index 98%
rename from Core/include/ACTS/EventData/TransportJacobian.hpp
rename to Core/include/Acts/EventData/TransportJacobian.hpp
index 16a8b74f73280be8acbb4320a4c10cfbf24d361b..9bfb788c35057b272625b75c610b84d313eaea0a 100644
--- a/Core/include/ACTS/EventData/TransportJacobian.hpp
+++ b/Core/include/Acts/EventData/TransportJacobian.hpp
@@ -13,7 +13,7 @@
 #ifndef ACTS_EXTRAPOLATIONUTILS_TRANSPORTJACOBIAN_H
 #define ACTS_EXTRAPOLATIONUTILS_TRANSPORTJACOBIAN_H 1
 
-#include "ACTS/Utilities/Definitions.hpp"
+#include "Acts/Utilities/Definitions.hpp"
 
 namespace Acts {
 
diff --git a/Core/include/ACTS/EventData/detail/coordinate_transformations.hpp b/Core/include/Acts/EventData/detail/coordinate_transformations.hpp
similarity index 96%
rename from Core/include/ACTS/EventData/detail/coordinate_transformations.hpp
rename to Core/include/Acts/EventData/detail/coordinate_transformations.hpp
index 8aaa145b25520e3a5cb313698effdfc0d5327e19..d1aaa8cab6d917ce2593606e1ac28211374b3599 100644
--- a/Core/include/ACTS/EventData/detail/coordinate_transformations.hpp
+++ b/Core/include/Acts/EventData/detail/coordinate_transformations.hpp
@@ -11,8 +11,8 @@
 
 // ACTS includes
 #include <cmath>
-#include "ACTS/Surfaces/Surface.hpp"
-#include "ACTS/Utilities/ParameterDefinitions.hpp"
+#include "Acts/Surfaces/Surface.hpp"
+#include "Acts/Utilities/ParameterDefinitions.hpp"
 
 #ifdef ACTS_COORDINATE_TRANSFORM_PLUGIN
 
diff --git a/Core/include/ACTS/EventData/detail/fittable_type_generator.hpp b/Core/include/Acts/EventData/detail/fittable_type_generator.hpp
similarity index 98%
rename from Core/include/ACTS/EventData/detail/fittable_type_generator.hpp
rename to Core/include/Acts/EventData/detail/fittable_type_generator.hpp
index da909d3b90ae9a6ec072ff61d7a8d1b3d156a9f5..f541535ae968f12de1c70624abb0b1bd1a6eaa65 100644
--- a/Core/include/ACTS/EventData/detail/fittable_type_generator.hpp
+++ b/Core/include/Acts/EventData/detail/fittable_type_generator.hpp
@@ -14,7 +14,7 @@
 #include <boost/variant.hpp>
 
 // ACTS include(s)
-#include "ACTS/Utilities/ParameterDefinitions.hpp"
+#include "Acts/Utilities/ParameterDefinitions.hpp"
 
 namespace Acts {
 // forward declaration
diff --git a/Core/include/ACTS/EventData/detail/full_parameter_set.hpp b/Core/include/Acts/EventData/detail/full_parameter_set.hpp
similarity index 97%
rename from Core/include/ACTS/EventData/detail/full_parameter_set.hpp
rename to Core/include/Acts/EventData/detail/full_parameter_set.hpp
index c2c548fdeef250d05b41241ba992b477ddfc3a76..d2556d6421989596ccac98e2b23bd93bced8ea59 100644
--- a/Core/include/ACTS/EventData/detail/full_parameter_set.hpp
+++ b/Core/include/Acts/EventData/detail/full_parameter_set.hpp
@@ -14,7 +14,7 @@
 #include <utility>
 
 // ACTS include(s)
-#include "ACTS/Utilities/ParameterDefinitions.hpp"
+#include "Acts/Utilities/ParameterDefinitions.hpp"
 
 namespace Acts {
 /// @cond
diff --git a/Core/include/ACTS/EventData/detail/initialize_parameter_set.hpp b/Core/include/Acts/EventData/detail/initialize_parameter_set.hpp
similarity index 100%
rename from Core/include/ACTS/EventData/detail/initialize_parameter_set.hpp
rename to Core/include/Acts/EventData/detail/initialize_parameter_set.hpp
diff --git a/Core/include/ACTS/EventData/detail/make_projection_matrix.hpp b/Core/include/Acts/EventData/detail/make_projection_matrix.hpp
similarity index 98%
rename from Core/include/ACTS/EventData/detail/make_projection_matrix.hpp
rename to Core/include/Acts/EventData/detail/make_projection_matrix.hpp
index f3ce6e2dedadf1da3267edaefe7bf757a5f702f1..82fbc743cb34e732fcfa4faa0103c32c8b6fa944 100644
--- a/Core/include/ACTS/EventData/detail/make_projection_matrix.hpp
+++ b/Core/include/Acts/EventData/detail/make_projection_matrix.hpp
@@ -10,7 +10,7 @@
 #define ACTS_MAKE_PROJECTION_MATRIX_H 1
 
 // ACTS include(s)
-#include "ACTS/Utilities/Definitions.hpp"
+#include "Acts/Utilities/Definitions.hpp"
 
 namespace Acts {
 /// @cond detail
diff --git a/Core/include/ACTS/EventData/detail/residual_calculator.hpp b/Core/include/Acts/EventData/detail/residual_calculator.hpp
similarity index 96%
rename from Core/include/ACTS/EventData/detail/residual_calculator.hpp
rename to Core/include/Acts/EventData/detail/residual_calculator.hpp
index d14001af7c49252d9e6ba51cb2b84d076de70762..cf3589eb6a8f8bde3e14d0098b2df089a6fb8bfe 100644
--- a/Core/include/ACTS/EventData/detail/residual_calculator.hpp
+++ b/Core/include/Acts/EventData/detail/residual_calculator.hpp
@@ -10,8 +10,8 @@
 #define ACTS_RESIDUAL_CALCULATOR_H 1
 
 // ACTS include(s)
-#include "ACTS/Utilities/Definitions.hpp"
-#include "ACTS/Utilities/ParameterDefinitions.hpp"
+#include "Acts/Utilities/Definitions.hpp"
+#include "Acts/Utilities/ParameterDefinitions.hpp"
 
 namespace Acts {
 /// @cond detail
diff --git a/Core/include/ACTS/EventData/detail/value_corrector.hpp b/Core/include/Acts/EventData/detail/value_corrector.hpp
similarity index 96%
rename from Core/include/ACTS/EventData/detail/value_corrector.hpp
rename to Core/include/Acts/EventData/detail/value_corrector.hpp
index 98259872aae33b1142f3535738b59a641085ee8c..bb4d4bf221afe9cc7e21fbcf9ff7847876273a47 100644
--- a/Core/include/ACTS/EventData/detail/value_corrector.hpp
+++ b/Core/include/Acts/EventData/detail/value_corrector.hpp
@@ -10,8 +10,8 @@
 #define ACTS_VALUE_CORRECTOR_H 1
 
 // ACTS include(s)
-#include "ACTS/Utilities/Definitions.hpp"
-#include "ACTS/Utilities/ParameterDefinitions.hpp"
+#include "Acts/Utilities/Definitions.hpp"
+#include "Acts/Utilities/ParameterDefinitions.hpp"
 
 namespace Acts {
 /// @cond detail
diff --git a/Core/include/ACTS/Fitter/KalmanFitter.hpp b/Core/include/Acts/Fitter/KalmanFitter.hpp
similarity index 98%
rename from Core/include/ACTS/Fitter/KalmanFitter.hpp
rename to Core/include/Acts/Fitter/KalmanFitter.hpp
index f2a7d274299442e8a412eb0564b0824a74fdc47d..0fed98b9f392daf652c973966a634ef11f6a856a 100644
--- a/Core/include/ACTS/Fitter/KalmanFitter.hpp
+++ b/Core/include/Acts/Fitter/KalmanFitter.hpp
@@ -15,9 +15,9 @@
 #include <type_traits>
 
 // ATS include(s)
-#include "ACTS/EventData/Measurement.hpp"
-#include "ACTS/EventData/TrackParameters.hpp"
-#include "ACTS/Utilities/Definitions.hpp"
+#include "Acts/EventData/Measurement.hpp"
+#include "Acts/EventData/TrackParameters.hpp"
+#include "Acts/Utilities/Definitions.hpp"
 
 namespace Acts {
 class Track;
diff --git a/Core/include/ACTS/Fitter/KalmanUpdator.hpp b/Core/include/Acts/Fitter/KalmanUpdator.hpp
similarity index 94%
rename from Core/include/ACTS/Fitter/KalmanUpdator.hpp
rename to Core/include/Acts/Fitter/KalmanUpdator.hpp
index c21bda8edb44fbddc381502ceaa7bbee6f62d02a..e012a0bb64c137cd7ba8378ab3c428866dc60ae1 100644
--- a/Core/include/ACTS/Fitter/KalmanUpdator.hpp
+++ b/Core/include/Acts/Fitter/KalmanUpdator.hpp
@@ -16,9 +16,9 @@
 #include <boost/variant.hpp>
 
 // ATS include(s)
-#include "ACTS/EventData/Measurement.hpp"
-#include "ACTS/EventData/TrackParameters.hpp"
-#include "ACTS/Utilities/Definitions.hpp"
+#include "Acts/EventData/Measurement.hpp"
+#include "Acts/EventData/TrackParameters.hpp"
+#include "Acts/Utilities/Definitions.hpp"
 
 namespace Acts {
 /**
diff --git a/Core/include/ACTS/Layers/ConeLayer.hpp b/Core/include/Acts/Layers/ConeLayer.hpp
similarity index 97%
rename from Core/include/ACTS/Layers/ConeLayer.hpp
rename to Core/include/Acts/Layers/ConeLayer.hpp
index eb0aa789bf97dc87535b152b3b10979f8f8df893..ac38699195c40af87ac139420a73ca50850667a3 100644
--- a/Core/include/ACTS/Layers/ConeLayer.hpp
+++ b/Core/include/Acts/Layers/ConeLayer.hpp
@@ -14,9 +14,9 @@
 #define ACTS_LAYERS_CONELAYER_H
 
 #include <algorithm>
-#include "ACTS/Layers/Layer.hpp"
-#include "ACTS/Surfaces/ConeSurface.hpp"
-#include "ACTS/Utilities/Definitions.hpp"
+#include "Acts/Layers/Layer.hpp"
+#include "Acts/Surfaces/ConeSurface.hpp"
+#include "Acts/Utilities/Definitions.hpp"
 
 namespace Acts {
 
diff --git a/Core/include/ACTS/Layers/CylinderLayer.hpp b/Core/include/Acts/Layers/CylinderLayer.hpp
similarity index 94%
rename from Core/include/ACTS/Layers/CylinderLayer.hpp
rename to Core/include/Acts/Layers/CylinderLayer.hpp
index 32d11e95deeb58aab4e66045d6bdaab446c3e44e..357c5364685e8563169b2f998b92c6dc51a49b63 100644
--- a/Core/include/ACTS/Layers/CylinderLayer.hpp
+++ b/Core/include/Acts/Layers/CylinderLayer.hpp
@@ -14,13 +14,13 @@
 #define ACTS_LAYERS_CYLINDERLAYER_H
 
 #include <algorithm>
-#include "ACTS/Layers/Layer.hpp"
-#include "ACTS/Surfaces/CylinderSurface.hpp"
-#include "ACTS/Utilities/Definitions.hpp"
-#include "ACTS/Utilities/InstanceFactory.hpp"
-#include "ACTS/Utilities/ThrowAssert.hpp"
-#include "ACTS/Utilities/VariantDataFwd.hpp"
-#include "ACTS/Volumes/CylinderVolumeBounds.hpp"
+#include "Acts/Layers/Layer.hpp"
+#include "Acts/Surfaces/CylinderSurface.hpp"
+#include "Acts/Utilities/Definitions.hpp"
+#include "Acts/Utilities/InstanceFactory.hpp"
+#include "Acts/Utilities/ThrowAssert.hpp"
+#include "Acts/Utilities/VariantDataFwd.hpp"
+#include "Acts/Volumes/CylinderVolumeBounds.hpp"
 
 namespace Acts {
 
diff --git a/Core/include/ACTS/Layers/DiscLayer.hpp b/Core/include/Acts/Layers/DiscLayer.hpp
similarity index 96%
rename from Core/include/ACTS/Layers/DiscLayer.hpp
rename to Core/include/Acts/Layers/DiscLayer.hpp
index 46311996067a753dd917f811bf8a099e208b374a..9ab68e12743740c52339fa41d6d2dd30914ccf2b 100644
--- a/Core/include/ACTS/Layers/DiscLayer.hpp
+++ b/Core/include/Acts/Layers/DiscLayer.hpp
@@ -16,10 +16,10 @@
 class MsgStream;
 
 #include <algorithm>
-#include "ACTS/Layers/Layer.hpp"
-#include "ACTS/Surfaces/DiscSurface.hpp"
-#include "ACTS/Utilities/Definitions.hpp"
-#include "ACTS/Utilities/VariantDataFwd.hpp"
+#include "Acts/Layers/Layer.hpp"
+#include "Acts/Surfaces/DiscSurface.hpp"
+#include "Acts/Utilities/Definitions.hpp"
+#include "Acts/Utilities/VariantDataFwd.hpp"
 
 namespace Acts {
 
diff --git a/Core/include/ACTS/Layers/GenericApproachDescriptor.hpp b/Core/include/Acts/Layers/GenericApproachDescriptor.hpp
similarity index 99%
rename from Core/include/ACTS/Layers/GenericApproachDescriptor.hpp
rename to Core/include/Acts/Layers/GenericApproachDescriptor.hpp
index aace4847171f4772653f641d6565ce01098fb046..3ed9151e441b8524fc1353fa3ded7a9e77e10efd 100644
--- a/Core/include/ACTS/Layers/GenericApproachDescriptor.hpp
+++ b/Core/include/Acts/Layers/GenericApproachDescriptor.hpp
@@ -14,7 +14,7 @@
 #define ACTS_DETECTOR_GENERICAPPROPACHDESCRIPTOR_H 1
 
 #include <algorithm>
-#include "ACTS/Utilities/ApproachDescriptor.hpp"
+#include "Acts/Utilities/ApproachDescriptor.hpp"
 
 namespace Acts {
 
diff --git a/Core/include/ACTS/Layers/Layer.hpp b/Core/include/Acts/Layers/Layer.hpp
similarity index 97%
rename from Core/include/ACTS/Layers/Layer.hpp
rename to Core/include/Acts/Layers/Layer.hpp
index 2ac4d111904fb566a83074d458d97689c7cc89f1..b7fd21b1a0c52b3a3d0f8deb401e240a4d51e4e8 100644
--- a/Core/include/ACTS/Layers/Layer.hpp
+++ b/Core/include/Acts/Layers/Layer.hpp
@@ -15,15 +15,15 @@
 
 // Core module
 #include <map>
-#include "ACTS/EventData/NeutralParameters.hpp"
-#include "ACTS/EventData/TrackParameters.hpp"
-#include "ACTS/Surfaces/SurfaceArray.hpp"
-#include "ACTS/Utilities/ApproachDescriptor.hpp"
-#include "ACTS/Utilities/BinnedArray.hpp"
-#include "ACTS/Utilities/Definitions.hpp"
-#include "ACTS/Utilities/GeometryObject.hpp"
-#include "ACTS/Utilities/Intersection.hpp"
-#include "ACTS/Volumes/AbstractVolume.hpp"
+#include "Acts/EventData/NeutralParameters.hpp"
+#include "Acts/EventData/TrackParameters.hpp"
+#include "Acts/Surfaces/SurfaceArray.hpp"
+#include "Acts/Utilities/ApproachDescriptor.hpp"
+#include "Acts/Utilities/BinnedArray.hpp"
+#include "Acts/Utilities/Definitions.hpp"
+#include "Acts/Utilities/GeometryObject.hpp"
+#include "Acts/Utilities/Intersection.hpp"
+#include "Acts/Volumes/AbstractVolume.hpp"
 
 namespace Acts {
 
@@ -545,6 +545,6 @@ typedef BinnedArray<LayerPtr> LayerArray;
 
 }  // end of namespace
 
-#include "ACTS/Layers/detail/Layer.ipp"
+#include "Acts/Layers/detail/Layer.ipp"
 
 #endif  // ACTS_DETECTOR_LAYER_H
diff --git a/Core/include/ACTS/Layers/NavigationLayer.hpp b/Core/include/Acts/Layers/NavigationLayer.hpp
similarity index 96%
rename from Core/include/ACTS/Layers/NavigationLayer.hpp
rename to Core/include/Acts/Layers/NavigationLayer.hpp
index ca19989ffa8abad663efd2ff5bff9a75aa4ca17d..8943ed995088052c02c2f8eaacc13cbbfd5c3086 100644
--- a/Core/include/ACTS/Layers/NavigationLayer.hpp
+++ b/Core/include/Acts/Layers/NavigationLayer.hpp
@@ -13,10 +13,10 @@
 #ifndef ACTS_LAYERS_NAVIGATIONLAYER_H
 #define ACTS_LAYERS_NAVIGATIONLAYER_H
 
-#include "ACTS/Layers/Layer.hpp"
-#include "ACTS/Utilities/BinnedArray.hpp"
-#include "ACTS/Utilities/Definitions.hpp"
-#include "ACTS/Utilities/VariantDataFwd.hpp"
+#include "Acts/Layers/Layer.hpp"
+#include "Acts/Utilities/BinnedArray.hpp"
+#include "Acts/Utilities/Definitions.hpp"
+#include "Acts/Utilities/VariantDataFwd.hpp"
 
 namespace Acts {
 
diff --git a/Core/include/ACTS/Layers/PlaneLayer.hpp b/Core/include/Acts/Layers/PlaneLayer.hpp
similarity index 97%
rename from Core/include/ACTS/Layers/PlaneLayer.hpp
rename to Core/include/Acts/Layers/PlaneLayer.hpp
index ecf69887ac5c960ef514d1a7c11852b42183ee43..b5e7bf32780d595ecbb12579e5ad1a62bfd05070 100644
--- a/Core/include/ACTS/Layers/PlaneLayer.hpp
+++ b/Core/include/Acts/Layers/PlaneLayer.hpp
@@ -14,9 +14,9 @@
 #define ACTS_LAYERS_PLANELAYER_H
 
 #include <algorithm>
-#include "ACTS/Layers/Layer.hpp"
-#include "ACTS/Surfaces/PlaneSurface.hpp"
-#include "ACTS/Utilities/Definitions.hpp"
+#include "Acts/Layers/Layer.hpp"
+#include "Acts/Surfaces/PlaneSurface.hpp"
+#include "Acts/Utilities/Definitions.hpp"
 
 namespace Acts {
 
diff --git a/Core/include/ACTS/Layers/ProtoLayer.hpp b/Core/include/Acts/Layers/ProtoLayer.hpp
similarity index 93%
rename from Core/include/ACTS/Layers/ProtoLayer.hpp
rename to Core/include/Acts/Layers/ProtoLayer.hpp
index 83985b81e2664681c8b303b64d3bedff3fbe8ffb..0db7088e24e2ee07254b0815e9cae9318294d483 100644
--- a/Core/include/ACTS/Layers/ProtoLayer.hpp
+++ b/Core/include/Acts/Layers/ProtoLayer.hpp
@@ -10,9 +10,9 @@
 #define ACTS_LAYERS_PROTOLAYER_H 1
 
 #include <iostream>
-#include "ACTS/Surfaces/PlanarBounds.hpp"
-#include "ACTS/Surfaces/Surface.hpp"
-#include "ACTS/Utilities/Definitions.hpp"
+#include "Acts/Surfaces/PlanarBounds.hpp"
+#include "Acts/Surfaces/Surface.hpp"
+#include "Acts/Utilities/Definitions.hpp"
 
 namespace Acts {
 
diff --git a/Core/include/ACTS/Layers/detail/Layer.ipp b/Core/include/Acts/Layers/detail/Layer.ipp
similarity index 100%
rename from Core/include/ACTS/Layers/detail/Layer.ipp
rename to Core/include/Acts/Layers/detail/Layer.ipp
diff --git a/Core/include/ACTS/MagneticField/ConstantBField.hpp b/Core/include/Acts/MagneticField/ConstantBField.hpp
similarity index 98%
rename from Core/include/ACTS/MagneticField/ConstantBField.hpp
rename to Core/include/Acts/MagneticField/ConstantBField.hpp
index 27ac71b1761a7806b51f9a2aa93162368b607768..3719278b1a34c6a9de229ae6e790363a8ce5c8b2 100644
--- a/Core/include/ACTS/MagneticField/ConstantBField.hpp
+++ b/Core/include/Acts/MagneticField/ConstantBField.hpp
@@ -9,8 +9,8 @@
 #ifndef ACTS_MAGNETICFIELD_CONSTANTBFIELD_H
 #define ACTS_MAGNETICFIELD_CONSTANTBFIELD_H 1
 
-#include "ACTS/MagneticField/concept/AnyFieldLookup.hpp"
-#include "ACTS/Utilities/Definitions.hpp"
+#include "Acts/MagneticField/concept/AnyFieldLookup.hpp"
+#include "Acts/Utilities/Definitions.hpp"
 
 namespace Acts {
 
diff --git a/Core/include/ACTS/MagneticField/InterpolatedBFieldMap.hpp b/Core/include/Acts/MagneticField/InterpolatedBFieldMap.hpp
similarity index 98%
rename from Core/include/ACTS/MagneticField/InterpolatedBFieldMap.hpp
rename to Core/include/Acts/MagneticField/InterpolatedBFieldMap.hpp
index d6a8f98315bfa784cde45f9302f6242cd760b711..5d3c956257dac161711a8a20e3b5a1d2e61f2b8b 100644
--- a/Core/include/ACTS/MagneticField/InterpolatedBFieldMap.hpp
+++ b/Core/include/Acts/MagneticField/InterpolatedBFieldMap.hpp
@@ -9,10 +9,10 @@
 #pragma once
 
 #include <functional>
-#include "ACTS/MagneticField/concept/AnyFieldLookup.hpp"
-#include "ACTS/Utilities/Definitions.hpp"
-#include "ACTS/Utilities/Interpolation.hpp"
-#include "ACTS/Utilities/concept/AnyGrid.hpp"
+#include "Acts/MagneticField/concept/AnyFieldLookup.hpp"
+#include "Acts/Utilities/Definitions.hpp"
+#include "Acts/Utilities/Interpolation.hpp"
+#include "Acts/Utilities/concept/AnyGrid.hpp"
 
 namespace Acts {
 
diff --git a/Core/include/ACTS/MagneticField/SharedBFieldMap.hpp b/Core/include/Acts/MagneticField/SharedBFieldMap.hpp
similarity index 95%
rename from Core/include/ACTS/MagneticField/SharedBFieldMap.hpp
rename to Core/include/Acts/MagneticField/SharedBFieldMap.hpp
index d91b3a8bc99492cfeff04eda1c8981b249524d09..c0965e2b3b9cc0e38da930b0261ea9d71334b124 100644
--- a/Core/include/ACTS/MagneticField/SharedBFieldMap.hpp
+++ b/Core/include/Acts/MagneticField/SharedBFieldMap.hpp
@@ -9,8 +9,8 @@
 #ifndef ACTS_MAGNETICFIELD_SHAREDBFIELD_H
 #define ACTS_MAGNETICFIELD_SHAREDBFIELD_H
 
-#include "ACTS/MagneticField/concept/AnyFieldLookup.hpp"
-#include "ACTS/Utilities/Definitions.hpp"
+#include "Acts/MagneticField/concept/AnyFieldLookup.hpp"
+#include "Acts/Utilities/Definitions.hpp"
 
 namespace Acts {
 
diff --git a/Core/include/ACTS/MagneticField/concept/AnyFieldLookup.hpp b/Core/include/Acts/MagneticField/concept/AnyFieldLookup.hpp
similarity index 99%
rename from Core/include/ACTS/MagneticField/concept/AnyFieldLookup.hpp
rename to Core/include/Acts/MagneticField/concept/AnyFieldLookup.hpp
index d440e847c4e91c704f8245c603b312135c51a860..2a0f99ac2ed28fd6fbbc8291bf681a7016a7ba06 100644
--- a/Core/include/ACTS/MagneticField/concept/AnyFieldLookup.hpp
+++ b/Core/include/Acts/MagneticField/concept/AnyFieldLookup.hpp
@@ -14,7 +14,7 @@
 #include <boost/type_erasure/member.hpp>
 #include <boost/type_erasure/relaxed.hpp>
 #include <vector>
-#include "ACTS/Utilities/Definitions.hpp"
+#include "Acts/Utilities/Definitions.hpp"
 
 // clang-format off
 BOOST_TYPE_ERASURE_MEMBER((Acts)(concept)(afl_detail)(has_getField), getField, 1)
diff --git a/Core/include/ACTS/Material/BinnedSurfaceMaterial.hpp b/Core/include/Acts/Material/BinnedSurfaceMaterial.hpp
similarity index 96%
rename from Core/include/ACTS/Material/BinnedSurfaceMaterial.hpp
rename to Core/include/Acts/Material/BinnedSurfaceMaterial.hpp
index 4a56e5188e05c41aa57d0e9dc2b424f1121a199e..b1eacb7f9142be0ce383c05d5ac820bf19985f8b 100644
--- a/Core/include/ACTS/Material/BinnedSurfaceMaterial.hpp
+++ b/Core/include/Acts/Material/BinnedSurfaceMaterial.hpp
@@ -13,10 +13,10 @@
 #ifndef ACTS_MATERIAL_BINNEDSURFACEMATERIAL_H
 #define ACTS_MATERIAL_BINNEDSURFACEMATERIAL_H 1
 
-#include "ACTS/Material/MaterialProperties.hpp"
-#include "ACTS/Material/SurfaceMaterial.hpp"
-#include "ACTS/Utilities/BinUtility.hpp"
-#include "ACTS/Utilities/Definitions.hpp"
+#include "Acts/Material/MaterialProperties.hpp"
+#include "Acts/Material/SurfaceMaterial.hpp"
+#include "Acts/Utilities/BinUtility.hpp"
+#include "Acts/Utilities/Definitions.hpp"
 
 namespace Acts {
 
diff --git a/Core/include/ACTS/Material/HomogeneousSurfaceMaterial.hpp b/Core/include/Acts/Material/HomogeneousSurfaceMaterial.hpp
similarity index 95%
rename from Core/include/ACTS/Material/HomogeneousSurfaceMaterial.hpp
rename to Core/include/Acts/Material/HomogeneousSurfaceMaterial.hpp
index 878e7480eaec72a1e1c0d281969495258676a952..cf4c50c4e6b931249509db8070f828b35364c9a6 100644
--- a/Core/include/ACTS/Material/HomogeneousSurfaceMaterial.hpp
+++ b/Core/include/Acts/Material/HomogeneousSurfaceMaterial.hpp
@@ -14,9 +14,9 @@
 #define ACTS_MATERIAL_HOMOGENOUSLAYERMATERIAL_H
 
 #include <vector>
-#include "ACTS/Material/MaterialProperties.hpp"
-#include "ACTS/Material/SurfaceMaterial.hpp"
-#include "ACTS/Utilities/Definitions.hpp"
+#include "Acts/Material/MaterialProperties.hpp"
+#include "Acts/Material/SurfaceMaterial.hpp"
+#include "Acts/Utilities/Definitions.hpp"
 
 namespace Acts {
 
diff --git a/Core/include/ACTS/Material/Material.hpp b/Core/include/Acts/Material/Material.hpp
similarity index 100%
rename from Core/include/ACTS/Material/Material.hpp
rename to Core/include/Acts/Material/Material.hpp
diff --git a/Core/include/ACTS/Material/MaterialProperties.hpp b/Core/include/Acts/Material/MaterialProperties.hpp
similarity index 99%
rename from Core/include/ACTS/Material/MaterialProperties.hpp
rename to Core/include/Acts/Material/MaterialProperties.hpp
index f78a1fb4acd9653bfc254a5451cba442bff55a7e..47a3d165c88283611f54ce7757fe3ba52d0191d3 100644
--- a/Core/include/ACTS/Material/MaterialProperties.hpp
+++ b/Core/include/Acts/Material/MaterialProperties.hpp
@@ -14,7 +14,7 @@
 #define ACTS_MATERIAL_MATERIALPROPERTIES_H
 
 // Geometry module
-#include "ACTS/Material/Material.hpp"
+#include "Acts/Material/Material.hpp"
 // STD/STL
 #include <iostream>
 
diff --git a/Core/include/ACTS/Material/SurfaceMaterial.hpp b/Core/include/Acts/Material/SurfaceMaterial.hpp
similarity index 96%
rename from Core/include/ACTS/Material/SurfaceMaterial.hpp
rename to Core/include/Acts/Material/SurfaceMaterial.hpp
index ef3ec8a47edacdbae7753ba9030da5e6ee2e36ba..82046be511b1aa67cc17a096005b47d5afcf5d67 100644
--- a/Core/include/ACTS/Material/SurfaceMaterial.hpp
+++ b/Core/include/Acts/Material/SurfaceMaterial.hpp
@@ -15,9 +15,9 @@
 
 #include <memory>
 #include <vector>
-#include "ACTS/Material/MaterialProperties.hpp"
-#include "ACTS/Utilities/Definitions.hpp"
-#include "ACTS/Utilities/GeometryID.hpp"
+#include "Acts/Material/MaterialProperties.hpp"
+#include "Acts/Utilities/Definitions.hpp"
+#include "Acts/Utilities/GeometryID.hpp"
 
 namespace Acts {
 
diff --git a/Core/include/ACTS/Material/SurfaceMaterialProxy.hpp b/Core/include/Acts/Material/SurfaceMaterialProxy.hpp
similarity index 97%
rename from Core/include/ACTS/Material/SurfaceMaterialProxy.hpp
rename to Core/include/Acts/Material/SurfaceMaterialProxy.hpp
index 0922679629406d118f30a6597ce816744964bdc1..108a673d77b3c9d14a0c9a8dc27c738b6859079f 100644
--- a/Core/include/ACTS/Material/SurfaceMaterialProxy.hpp
+++ b/Core/include/Acts/Material/SurfaceMaterialProxy.hpp
@@ -13,8 +13,8 @@
 #ifndef ACTS_MATERIAL_SURFACEMATERIALPROXY_H
 #define ACTS_MATERIAL_SURFACEMATERIALPROXY_H
 
-#include "ACTS/Material/SurfaceMaterial.hpp"
-#include "ACTS/Utilities/BinUtility.hpp"
+#include "Acts/Material/SurfaceMaterial.hpp"
+#include "Acts/Utilities/BinUtility.hpp"
 
 namespace Acts {
 
diff --git a/Core/include/ACTS/Propagator/AbortList.hpp b/Core/include/Acts/Propagator/AbortList.hpp
similarity index 84%
rename from Core/include/ACTS/Propagator/AbortList.hpp
rename to Core/include/Acts/Propagator/AbortList.hpp
index fd0ad06b21179851943a681dd330412879cea2a2..dd8cbf69ad445b16a89e1d4e731db16c35aa6a37 100644
--- a/Core/include/ACTS/Propagator/AbortList.hpp
+++ b/Core/include/Acts/Propagator/AbortList.hpp
@@ -9,12 +9,12 @@
 #ifndef ACTS_ABORT_LIST_HPP
 #define ACTS_ABORT_LIST_HPP 1
 
-#include "ACTS/Propagator/ActionList.hpp"
-#include "ACTS/Propagator/detail/Extendable.hpp"
-#include "ACTS/Propagator/detail/abort_condition_signature_check.hpp"
-#include "ACTS/Propagator/detail/abort_list_implementation.hpp"
-#include "ACTS/Utilities/detail/MPL/boost_mpl_helper.hpp"
-#include "ACTS/Utilities/detail/MPL/has_duplicates.hpp"
+#include "Acts/Propagator/ActionList.hpp"
+#include "Acts/Propagator/detail/Extendable.hpp"
+#include "Acts/Propagator/detail/abort_condition_signature_check.hpp"
+#include "Acts/Propagator/detail/abort_list_implementation.hpp"
+#include "Acts/Utilities/detail/MPL/boost_mpl_helper.hpp"
+#include "Acts/Utilities/detail/MPL/has_duplicates.hpp"
 
 namespace Acts {
 
diff --git a/Core/include/ACTS/Propagator/ActionList.hpp b/Core/include/Acts/Propagator/ActionList.hpp
similarity index 85%
rename from Core/include/ACTS/Propagator/ActionList.hpp
rename to Core/include/Acts/Propagator/ActionList.hpp
index dcd1a8481b529d76258426070bd8ec7efbcfb614..82e68fefc41bb552e5ab1ba5e530c1708b2fe3fb 100644
--- a/Core/include/ACTS/Propagator/ActionList.hpp
+++ b/Core/include/Acts/Propagator/ActionList.hpp
@@ -9,12 +9,12 @@
 #ifndef ACTS_ACTION_LIST_HPP
 #define ACTS_ACTION_LIST_HPP
 
-#include "ACTS/Propagator/detail/Extendable.hpp"
-#include "ACTS/Propagator/detail/action_list_implementation.hpp"
-#include "ACTS/Propagator/detail/action_signature_check.hpp"
-#include "ACTS/Utilities/detail/MPL/all_of.hpp"
-#include "ACTS/Utilities/detail/MPL/has_duplicates.hpp"
-#include "ACTS/Utilities/detail/MPL/type_collector.hpp"
+#include "Acts/Propagator/detail/Extendable.hpp"
+#include "Acts/Propagator/detail/action_list_implementation.hpp"
+#include "Acts/Propagator/detail/action_signature_check.hpp"
+#include "Acts/Utilities/detail/MPL/all_of.hpp"
+#include "Acts/Utilities/detail/MPL/has_duplicates.hpp"
+#include "Acts/Utilities/detail/MPL/type_collector.hpp"
 
 namespace Acts {
 
diff --git a/Core/include/ACTS/Propagator/EigenStepper.hpp b/Core/include/Acts/Propagator/EigenStepper.hpp
similarity index 98%
rename from Core/include/ACTS/Propagator/EigenStepper.hpp
rename to Core/include/Acts/Propagator/EigenStepper.hpp
index 2896082f0308e8176a5a40a255299adae549e72f..d60fcdf98f679cbc74ef10c86e3f1061b4ec21db 100644
--- a/Core/include/ACTS/Propagator/EigenStepper.hpp
+++ b/Core/include/Acts/Propagator/EigenStepper.hpp
@@ -10,11 +10,11 @@
 #define ACTS_EIGEN_STEPPER_HPP 1
 
 #include <cmath>
-#include "ACTS/EventData/TrackParameters.hpp"
-#include "ACTS/MagneticField/concept/AnyFieldLookup.hpp"
-#include "ACTS/Surfaces/Surface.hpp"
-#include "ACTS/Utilities/Definitions.hpp"
-#include "ACTS/Utilities/Units.hpp"
+#include "Acts/EventData/TrackParameters.hpp"
+#include "Acts/MagneticField/concept/AnyFieldLookup.hpp"
+#include "Acts/Surfaces/Surface.hpp"
+#include "Acts/Utilities/Definitions.hpp"
+#include "Acts/Utilities/Units.hpp"
 
 namespace Acts {
 
diff --git a/Core/include/ACTS/Propagator/Propagator.hpp b/Core/include/Acts/Propagator/Propagator.hpp
similarity index 98%
rename from Core/include/ACTS/Propagator/Propagator.hpp
rename to Core/include/Acts/Propagator/Propagator.hpp
index 7aea84d4070737ef5a429095cb8656d4165c3308..64a235bd5f73f029d449e19493ec8e64655cdfa8 100644
--- a/Core/include/ACTS/Propagator/Propagator.hpp
+++ b/Core/include/Acts/Propagator/Propagator.hpp
@@ -12,10 +12,10 @@
 #include <cmath>
 #include <memory>
 #include <type_traits>
-#include "ACTS/Propagator/AbortList.hpp"
-#include "ACTS/Propagator/ActionList.hpp"
-#include "ACTS/Propagator/detail/standard_abort_conditions.hpp"
-#include "ACTS/Utilities/Units.hpp"
+#include "Acts/Propagator/AbortList.hpp"
+#include "Acts/Propagator/ActionList.hpp"
+#include "Acts/Propagator/detail/standard_abort_conditions.hpp"
+#include "Acts/Utilities/Units.hpp"
 
 namespace Acts {
 
diff --git a/Core/include/ACTS/Propagator/detail/Extendable.hpp b/Core/include/Acts/Propagator/detail/Extendable.hpp
similarity index 97%
rename from Core/include/ACTS/Propagator/detail/Extendable.hpp
rename to Core/include/Acts/Propagator/detail/Extendable.hpp
index 8875ebca95be118189e091a878cbd03065ea8bc8..66fcae2527662e2e3b0e882b5f68ce77ba0fd176 100644
--- a/Core/include/ACTS/Propagator/detail/Extendable.hpp
+++ b/Core/include/Acts/Propagator/detail/Extendable.hpp
@@ -11,7 +11,7 @@
 
 #include <tuple>
 #include <type_traits>
-#include "ACTS/Utilities/detail/MPL/all_of.hpp"
+#include "Acts/Utilities/detail/MPL/all_of.hpp"
 
 namespace Acts {
 
diff --git a/Core/include/ACTS/Propagator/detail/abort_condition_signature_check.hpp b/Core/include/Acts/Propagator/detail/abort_condition_signature_check.hpp
similarity index 95%
rename from Core/include/ACTS/Propagator/detail/abort_condition_signature_check.hpp
rename to Core/include/Acts/Propagator/detail/abort_condition_signature_check.hpp
index 23d675bcad0632dd19f890b65586febf0f6e97e6..206447e617311e983ace0d2da001bf03cf596d9f 100644
--- a/Core/include/ACTS/Propagator/detail/abort_condition_signature_check.hpp
+++ b/Core/include/Acts/Propagator/detail/abort_condition_signature_check.hpp
@@ -10,8 +10,8 @@
 #define ACTS_ABORT_CONDITION_SIGNATURE_CHECK_HPP 1
 
 #include <type_traits>
-#include "ACTS/Propagator/detail/condition_uses_result_type.hpp"
-#include "ACTS/Utilities/detail/MPL/type_collector.hpp"
+#include "Acts/Propagator/detail/condition_uses_result_type.hpp"
+#include "Acts/Utilities/detail/MPL/type_collector.hpp"
 
 namespace Acts {
 
diff --git a/Core/include/ACTS/Propagator/detail/abort_list_implementation.hpp b/Core/include/Acts/Propagator/detail/abort_list_implementation.hpp
similarity index 96%
rename from Core/include/ACTS/Propagator/detail/abort_list_implementation.hpp
rename to Core/include/Acts/Propagator/detail/abort_list_implementation.hpp
index 2ccd6c002da88e3def5c1a83c9550522754261b4..0bac72cb4703d53f4dceac7c869990d7fc90a5c9 100644
--- a/Core/include/ACTS/Propagator/detail/abort_list_implementation.hpp
+++ b/Core/include/Acts/Propagator/detail/abort_list_implementation.hpp
@@ -10,8 +10,8 @@
 #define ACTS_ABORT_LIST_IMPLEMENTATION_HPP
 
 #include <algorithm>
-#include "ACTS/Propagator/detail/condition_uses_result_type.hpp"
-#include "ACTS/Utilities/detail/MPL/type_collector.hpp"
+#include "Acts/Propagator/detail/condition_uses_result_type.hpp"
+#include "Acts/Utilities/detail/MPL/type_collector.hpp"
 
 namespace Acts {
 
diff --git a/Core/include/ACTS/Propagator/detail/action_list_implementation.hpp b/Core/include/Acts/Propagator/detail/action_list_implementation.hpp
similarity index 97%
rename from Core/include/ACTS/Propagator/detail/action_list_implementation.hpp
rename to Core/include/Acts/Propagator/detail/action_list_implementation.hpp
index 7d500e8fb2a3c9e6c68a3aecb46654d7943a50c7..2f6fde29d14c02636cd16eda0cfd677c1297329b 100644
--- a/Core/include/ACTS/Propagator/detail/action_list_implementation.hpp
+++ b/Core/include/Acts/Propagator/detail/action_list_implementation.hpp
@@ -9,7 +9,7 @@
 #ifndef ACTS_ACTION_LIST_IMPLEMENTATION_HPP
 #define ACTS_ACTION_LIST_IMPLEMENTATION_HPP
 
-#include "ACTS/Utilities/detail/MPL/type_collector.hpp"
+#include "Acts/Utilities/detail/MPL/type_collector.hpp"
 
 namespace Acts {
 
diff --git a/Core/include/ACTS/Propagator/detail/action_signature_check.hpp b/Core/include/Acts/Propagator/detail/action_signature_check.hpp
similarity index 97%
rename from Core/include/ACTS/Propagator/detail/action_signature_check.hpp
rename to Core/include/Acts/Propagator/detail/action_signature_check.hpp
index 6e1a3f18bbfe00f7513238ade8925ba668b9cc3b..00d317cb7f3023f99f280ae13c85b61e28cb05f6 100644
--- a/Core/include/ACTS/Propagator/detail/action_signature_check.hpp
+++ b/Core/include/Acts/Propagator/detail/action_signature_check.hpp
@@ -10,7 +10,7 @@
 #define ACTS_ACTION_SIGNATURE_CHECK_HPP
 
 #include <type_traits>
-#include "ACTS/Utilities/detail/MPL/type_collector.hpp"
+#include "Acts/Utilities/detail/MPL/type_collector.hpp"
 
 namespace Acts {
 
diff --git a/Core/include/ACTS/Propagator/detail/condition_uses_result_type.hpp b/Core/include/Acts/Propagator/detail/condition_uses_result_type.hpp
similarity index 94%
rename from Core/include/ACTS/Propagator/detail/condition_uses_result_type.hpp
rename to Core/include/Acts/Propagator/detail/condition_uses_result_type.hpp
index 0abbe74f4f636fbaaa7de0f616178220d3758686..791699364e1d155f2c14e1da71f8fe39fdd0d8df 100644
--- a/Core/include/ACTS/Propagator/detail/condition_uses_result_type.hpp
+++ b/Core/include/Acts/Propagator/detail/condition_uses_result_type.hpp
@@ -10,7 +10,7 @@
 #define ACTS_CONDITION_USES_RESULT_TYPE_HPP 1
 
 #include <type_traits>
-#include "ACTS/Utilities/detail/MPL/type_collector.hpp"
+#include "Acts/Utilities/detail/MPL/type_collector.hpp"
 
 namespace Acts {
 
diff --git a/Core/include/ACTS/Propagator/detail/standard_abort_conditions.hpp b/Core/include/Acts/Propagator/detail/standard_abort_conditions.hpp
similarity index 100%
rename from Core/include/ACTS/Propagator/detail/standard_abort_conditions.hpp
rename to Core/include/Acts/Propagator/detail/standard_abort_conditions.hpp
diff --git a/Core/include/ACTS/Seeding/BarrelSeedFinder.hpp b/Core/include/Acts/Seeding/BarrelSeedFinder.hpp
similarity index 95%
rename from Core/include/ACTS/Seeding/BarrelSeedFinder.hpp
rename to Core/include/Acts/Seeding/BarrelSeedFinder.hpp
index ec87d4116456dffbc837169eeaeaf0bd3b6e875b..4f0de62a0fb6b05f850f823f462b9fd1bb912dd9 100644
--- a/Core/include/ACTS/Seeding/BarrelSeedFinder.hpp
+++ b/Core/include/Acts/Seeding/BarrelSeedFinder.hpp
@@ -9,9 +9,9 @@
 #ifndef ACTS_SEEDING_BARRELSEEDFINDER_HPP
 #define ACTS_SEEDING_BARRELSEEDFINDER_HPP
 
-#include "ACTS/Seeding/SpacePoint.hpp"
-#include "ACTS/Seeding/TrackSeed.hpp"
-#include "ACTS/Seeding/detail/geometry.hpp"
+#include "Acts/Seeding/SpacePoint.hpp"
+#include "Acts/Seeding/TrackSeed.hpp"
+#include "Acts/Seeding/detail/geometry.hpp"
 
 namespace Acts {
 namespace Seeding {
diff --git a/Core/include/ACTS/Seeding/SpacePoint.hpp b/Core/include/Acts/Seeding/SpacePoint.hpp
similarity index 96%
rename from Core/include/ACTS/Seeding/SpacePoint.hpp
rename to Core/include/Acts/Seeding/SpacePoint.hpp
index 557bdf79fd1c388ebdc6df6b54666026497cd1c2..9e2f4ebcae2781344afb61cd143e31ba537b25c8 100644
--- a/Core/include/ACTS/Seeding/SpacePoint.hpp
+++ b/Core/include/Acts/Seeding/SpacePoint.hpp
@@ -13,8 +13,8 @@
 #include <ostream>
 #include <vector>
 
-#include "ACTS/Seeding/detail/cyclic_range.hpp"
-#include "ACTS/Utilities/Definitions.hpp"
+#include "Acts/Seeding/detail/cyclic_range.hpp"
+#include "Acts/Utilities/Definitions.hpp"
 
 namespace Acts {
 namespace Seeding {
diff --git a/Core/include/ACTS/Seeding/TrackSeed.hpp b/Core/include/Acts/Seeding/TrackSeed.hpp
similarity index 95%
rename from Core/include/ACTS/Seeding/TrackSeed.hpp
rename to Core/include/Acts/Seeding/TrackSeed.hpp
index 147ebbed98f67d8299cc728e2c81d024ef3c4f7d..591c74a08e6fce062803f7f204e20ead3bae1265 100644
--- a/Core/include/ACTS/Seeding/TrackSeed.hpp
+++ b/Core/include/Acts/Seeding/TrackSeed.hpp
@@ -14,9 +14,9 @@
 #include <utility>
 #include <vector>
 
-#include "ACTS/Seeding/SpacePoint.hpp"
-#include "ACTS/Utilities/Definitions.hpp"
-#include "ACTS/Utilities/detail/periodic.hpp"
+#include "Acts/Seeding/SpacePoint.hpp"
+#include "Acts/Utilities/Definitions.hpp"
+#include "Acts/Utilities/detail/periodic.hpp"
 
 namespace Acts {
 namespace Seeding {
diff --git a/Core/include/ACTS/Seeding/detail/cyclic_range.hpp b/Core/include/Acts/Seeding/detail/cyclic_range.hpp
similarity index 98%
rename from Core/include/ACTS/Seeding/detail/cyclic_range.hpp
rename to Core/include/Acts/Seeding/detail/cyclic_range.hpp
index 794b31389d885e6edfaed708de5949147ae4085f..117a50a6f63b60f5b5432455f405a1187e820fd0 100644
--- a/Core/include/ACTS/Seeding/detail/cyclic_range.hpp
+++ b/Core/include/Acts/Seeding/detail/cyclic_range.hpp
@@ -11,7 +11,7 @@
 
 #include <algorithm>
 
-#include "ACTS/Utilities/detail/periodic.hpp"
+#include "Acts/Utilities/detail/periodic.hpp"
 
 namespace Acts {
 namespace detail {
diff --git a/Core/include/ACTS/Seeding/detail/geometry.hpp b/Core/include/Acts/Seeding/detail/geometry.hpp
similarity index 97%
rename from Core/include/ACTS/Seeding/detail/geometry.hpp
rename to Core/include/Acts/Seeding/detail/geometry.hpp
index a5b9d4eb83ba412270a672d2dc7b9851b530caee..c795b5e16825f7876c8f0939dfcc9f4ce7652a6a 100644
--- a/Core/include/ACTS/Seeding/detail/geometry.hpp
+++ b/Core/include/Acts/Seeding/detail/geometry.hpp
@@ -11,8 +11,8 @@
 
 #include <cmath>
 
-#include <ACTS/Utilities/Definitions.hpp>
-#include <ACTS/Utilities/detail/RealQuadraticEquation.hpp>
+#include "Acts/Utilities/Definitions.hpp"
+#include "Acts/Utilities/detail/RealQuadraticEquation.hpp"
 
 namespace Acts {
 namespace detail {
diff --git a/Core/include/ACTS/Surfaces/BoundaryCheck.hpp b/Core/include/Acts/Surfaces/BoundaryCheck.hpp
similarity index 99%
rename from Core/include/ACTS/Surfaces/BoundaryCheck.hpp
rename to Core/include/Acts/Surfaces/BoundaryCheck.hpp
index 3a84edfbbdaf9763a9e8b6e6ae4a24b377f0422d..8767f9fcc072230daaf6d3ebd78e5d0f9460a024 100644
--- a/Core/include/ACTS/Surfaces/BoundaryCheck.hpp
+++ b/Core/include/Acts/Surfaces/BoundaryCheck.hpp
@@ -18,8 +18,8 @@
 #include <iterator>
 #include <vector>
 
-#include "ACTS/Utilities/Definitions.hpp"
-#include "ACTS/Utilities/ParameterDefinitions.hpp"
+#include "Acts/Utilities/Definitions.hpp"
+#include "Acts/Utilities/ParameterDefinitions.hpp"
 
 namespace Acts {
 
diff --git a/Core/include/ACTS/Surfaces/ConeBounds.hpp b/Core/include/Acts/Surfaces/ConeBounds.hpp
similarity index 97%
rename from Core/include/ACTS/Surfaces/ConeBounds.hpp
rename to Core/include/Acts/Surfaces/ConeBounds.hpp
index 9125bc43a862954c1fe89154b5f732cda9a39ca9..a71fccc55e3fd86cdc0499606c2198c10c6fdd68 100644
--- a/Core/include/ACTS/Surfaces/ConeBounds.hpp
+++ b/Core/include/Acts/Surfaces/ConeBounds.hpp
@@ -15,9 +15,9 @@
 
 #include <cfloat>
 
-#include "ACTS/Surfaces/SurfaceBounds.hpp"
-#include "ACTS/Utilities/Definitions.hpp"
-#include "ACTS/Utilities/VariantDataFwd.hpp"
+#include "Acts/Surfaces/SurfaceBounds.hpp"
+#include "Acts/Utilities/Definitions.hpp"
+#include "Acts/Utilities/VariantDataFwd.hpp"
 
 namespace Acts {
 
diff --git a/Core/include/ACTS/Surfaces/ConeSurface.hpp b/Core/include/Acts/Surfaces/ConeSurface.hpp
similarity index 97%
rename from Core/include/ACTS/Surfaces/ConeSurface.hpp
rename to Core/include/Acts/Surfaces/ConeSurface.hpp
index ec24bd9023f535559322667c95796024385865b6..61d294a5d6178da1d0b719556205dfabcccb32a4 100644
--- a/Core/include/ACTS/Surfaces/ConeSurface.hpp
+++ b/Core/include/Acts/Surfaces/ConeSurface.hpp
@@ -13,11 +13,11 @@
 #ifndef ACTS_SURFACES_CONESURFACE_H
 #define ACTS_SURFACES_CONESURFACE_H 1
 
-#include "ACTS/Surfaces/ConeBounds.hpp"
-#include "ACTS/Surfaces/Surface.hpp"
-#include "ACTS/Utilities/Definitions.hpp"
-#include "ACTS/Utilities/ParameterDefinitions.hpp"
-#include "ACTS/Utilities/VariantDataFwd.hpp"
+#include "Acts/Surfaces/ConeBounds.hpp"
+#include "Acts/Surfaces/Surface.hpp"
+#include "Acts/Utilities/Definitions.hpp"
+#include "Acts/Utilities/ParameterDefinitions.hpp"
+#include "Acts/Utilities/VariantDataFwd.hpp"
 
 namespace Acts {
 
diff --git a/Core/include/ACTS/Surfaces/CylinderBounds.hpp b/Core/include/Acts/Surfaces/CylinderBounds.hpp
similarity index 96%
rename from Core/include/ACTS/Surfaces/CylinderBounds.hpp
rename to Core/include/Acts/Surfaces/CylinderBounds.hpp
index c82538020e9d262d68fb5761c1ed37560ce7cf64..a6f0c0576ed25d4c110a4117f805fef5ab1e9805 100644
--- a/Core/include/ACTS/Surfaces/CylinderBounds.hpp
+++ b/Core/include/Acts/Surfaces/CylinderBounds.hpp
@@ -15,10 +15,10 @@
 
 #include <cmath>
 
-#include "ACTS/Surfaces/SurfaceBounds.hpp"
-#include "ACTS/Utilities/Definitions.hpp"
-#include "ACTS/Utilities/VariantDataFwd.hpp"
-#include "ACTS/Utilities/detail/periodic.hpp"
+#include "Acts/Surfaces/SurfaceBounds.hpp"
+#include "Acts/Utilities/Definitions.hpp"
+#include "Acts/Utilities/VariantDataFwd.hpp"
+#include "Acts/Utilities/detail/periodic.hpp"
 
 namespace Acts {
 
diff --git a/Core/include/ACTS/Surfaces/CylinderSurface.hpp b/Core/include/Acts/Surfaces/CylinderSurface.hpp
similarity index 98%
rename from Core/include/ACTS/Surfaces/CylinderSurface.hpp
rename to Core/include/Acts/Surfaces/CylinderSurface.hpp
index 9315a84a5cdf1358f198b7280e85ff46c5bd2d19..0e22e00f203b9206b00934f467fd350a30a1e05b 100644
--- a/Core/include/ACTS/Surfaces/CylinderSurface.hpp
+++ b/Core/include/Acts/Surfaces/CylinderSurface.hpp
@@ -15,10 +15,10 @@
 
 #include <cmath>
 
-#include "ACTS/Surfaces/CylinderBounds.hpp"
-#include "ACTS/Surfaces/Surface.hpp"
-#include "ACTS/Utilities/Definitions.hpp"
-#include "ACTS/Utilities/VariantDataFwd.hpp"
+#include "Acts/Surfaces/CylinderBounds.hpp"
+#include "Acts/Surfaces/Surface.hpp"
+#include "Acts/Utilities/Definitions.hpp"
+#include "Acts/Utilities/VariantDataFwd.hpp"
 
 namespace Acts {
 
diff --git a/Core/include/ACTS/Surfaces/DiamondBounds.hpp b/Core/include/Acts/Surfaces/DiamondBounds.hpp
similarity index 95%
rename from Core/include/ACTS/Surfaces/DiamondBounds.hpp
rename to Core/include/Acts/Surfaces/DiamondBounds.hpp
index 153d9c4aff77fc5d989ab24668992d65ebe2f2e6..47424df464d316001b6e6f6341e42d673d0e3e71 100644
--- a/Core/include/ACTS/Surfaces/DiamondBounds.hpp
+++ b/Core/include/Acts/Surfaces/DiamondBounds.hpp
@@ -15,11 +15,11 @@
 
 #include <cmath>
 
-#include "ACTS/Surfaces/PlanarBounds.hpp"
-#include "ACTS/Surfaces/RectangleBounds.hpp"
-#include "ACTS/Utilities/Definitions.hpp"
-#include "ACTS/Utilities/ParameterDefinitions.hpp"
-#include "ACTS/Utilities/VariantDataFwd.hpp"
+#include "Acts/Surfaces/PlanarBounds.hpp"
+#include "Acts/Surfaces/RectangleBounds.hpp"
+#include "Acts/Utilities/Definitions.hpp"
+#include "Acts/Utilities/ParameterDefinitions.hpp"
+#include "Acts/Utilities/VariantDataFwd.hpp"
 
 namespace Acts {
 
diff --git a/Core/include/ACTS/Surfaces/DiscBounds.hpp b/Core/include/Acts/Surfaces/DiscBounds.hpp
similarity index 95%
rename from Core/include/ACTS/Surfaces/DiscBounds.hpp
rename to Core/include/Acts/Surfaces/DiscBounds.hpp
index 2035384d74cd7e6bcce9468c8993fb5a0df19b47..5b8d4683d4110c2cc3041913750b83e5eb5a66b3 100644
--- a/Core/include/ACTS/Surfaces/DiscBounds.hpp
+++ b/Core/include/Acts/Surfaces/DiscBounds.hpp
@@ -13,7 +13,7 @@
 #ifndef ACTS_SURFACESDISCBOUNDS_H
 #define ACTS_SURFACESDISCBOUNDS_H
 
-#include "ACTS/Surfaces/SurfaceBounds.hpp"
+#include "Acts/Surfaces/SurfaceBounds.hpp"
 
 namespace Acts {
 
diff --git a/Core/include/ACTS/Surfaces/DiscSurface.hpp b/Core/include/Acts/Surfaces/DiscSurface.hpp
similarity index 98%
rename from Core/include/ACTS/Surfaces/DiscSurface.hpp
rename to Core/include/Acts/Surfaces/DiscSurface.hpp
index e7f67d65de495e3f5bade1c73fa38e377b9cf1b5..d02ed245f22cde51f69858e6c7bbc837dcd79ebb 100644
--- a/Core/include/ACTS/Surfaces/DiscSurface.hpp
+++ b/Core/include/Acts/Surfaces/DiscSurface.hpp
@@ -13,12 +13,12 @@
 #ifndef ACTS_SURFACE_SDISCSURFACE_H
 #define ACTS_SURFACE_SDISCSURFACE_H 1
 
-#include "ACTS/Surfaces/DiscBounds.hpp"
-#include "ACTS/Surfaces/InfiniteBounds.hpp"
-#include "ACTS/Surfaces/Surface.hpp"
-#include "ACTS/Utilities/Definitions.hpp"
-#include "ACTS/Utilities/Identifier.hpp"
-#include "ACTS/Utilities/VariantDataFwd.hpp"
+#include "Acts/Surfaces/DiscBounds.hpp"
+#include "Acts/Surfaces/InfiniteBounds.hpp"
+#include "Acts/Surfaces/Surface.hpp"
+#include "Acts/Utilities/Definitions.hpp"
+#include "Acts/Utilities/Identifier.hpp"
+#include "Acts/Utilities/VariantDataFwd.hpp"
 
 namespace Acts {
 
diff --git a/Core/include/ACTS/Surfaces/DiscTrapezoidalBounds.hpp b/Core/include/Acts/Surfaces/DiscTrapezoidalBounds.hpp
similarity index 96%
rename from Core/include/ACTS/Surfaces/DiscTrapezoidalBounds.hpp
rename to Core/include/Acts/Surfaces/DiscTrapezoidalBounds.hpp
index 3fb29e9a01fa4e605ba80ce8b1971cb7cff63d4a..5c0d978dfe439747c1a5c08fc8bbb4fe83d23bf5 100644
--- a/Core/include/ACTS/Surfaces/DiscTrapezoidalBounds.hpp
+++ b/Core/include/Acts/Surfaces/DiscTrapezoidalBounds.hpp
@@ -15,10 +15,10 @@
 
 #include <cmath>
 
-#include "ACTS/Surfaces/DiscBounds.hpp"
-#include "ACTS/Utilities/Definitions.hpp"
-#include "ACTS/Utilities/ParameterDefinitions.hpp"
-#include "ACTS/Utilities/VariantDataFwd.hpp"
+#include "Acts/Surfaces/DiscBounds.hpp"
+#include "Acts/Utilities/Definitions.hpp"
+#include "Acts/Utilities/ParameterDefinitions.hpp"
+#include "Acts/Utilities/VariantDataFwd.hpp"
 
 namespace Acts {
 
diff --git a/Core/include/ACTS/Surfaces/EllipseBounds.hpp b/Core/include/Acts/Surfaces/EllipseBounds.hpp
similarity index 96%
rename from Core/include/ACTS/Surfaces/EllipseBounds.hpp
rename to Core/include/Acts/Surfaces/EllipseBounds.hpp
index fbf2061ca15f5f1fc9828db786e9bedc9ca7bb5f..e3b4003c6a7181c3d10b739ce60c95b2c720a2cf 100644
--- a/Core/include/ACTS/Surfaces/EllipseBounds.hpp
+++ b/Core/include/Acts/Surfaces/EllipseBounds.hpp
@@ -16,10 +16,10 @@
 #include <cmath>
 #include <cstdlib>
 
-#include "ACTS/Surfaces/PlanarBounds.hpp"
-#include "ACTS/Surfaces/RectangleBounds.hpp"
-#include "ACTS/Utilities/Definitions.hpp"
-#include "ACTS/Utilities/VariantDataFwd.hpp"
+#include "Acts/Surfaces/PlanarBounds.hpp"
+#include "Acts/Surfaces/RectangleBounds.hpp"
+#include "Acts/Utilities/Definitions.hpp"
+#include "Acts/Utilities/VariantDataFwd.hpp"
 
 namespace Acts {
 
diff --git a/Core/include/ACTS/Surfaces/InfiniteBounds.hpp b/Core/include/Acts/Surfaces/InfiniteBounds.hpp
similarity index 93%
rename from Core/include/ACTS/Surfaces/InfiniteBounds.hpp
rename to Core/include/Acts/Surfaces/InfiniteBounds.hpp
index db2dd01e859c257de9d07ecd1eb20eaa69ac03a8..d6333051a11c906d25a46f31af203538f9c564c4 100644
--- a/Core/include/ACTS/Surfaces/InfiniteBounds.hpp
+++ b/Core/include/Acts/Surfaces/InfiniteBounds.hpp
@@ -13,9 +13,9 @@
 #ifndef ACTS_INFINITE_BOUNDS_H
 #define ACTS_INFINITE_BOUNDS_H 1
 
-#include "ACTS/Surfaces/SurfaceBounds.hpp"
-#include "ACTS/Utilities/Definitions.hpp"
-#include "ACTS/Utilities/VariantDataFwd.hpp"
+#include "Acts/Surfaces/SurfaceBounds.hpp"
+#include "Acts/Utilities/Definitions.hpp"
+#include "Acts/Utilities/VariantDataFwd.hpp"
 
 namespace Acts {
 
diff --git a/Core/include/ACTS/Surfaces/LineBounds.hpp b/Core/include/Acts/Surfaces/LineBounds.hpp
similarity index 95%
rename from Core/include/ACTS/Surfaces/LineBounds.hpp
rename to Core/include/Acts/Surfaces/LineBounds.hpp
index bc5c953ea50800d03ea9e8d0389a65fa6bbbc5d1..a1e1e8c5c087703adefe535d48de807d62b8fbf8 100644
--- a/Core/include/ACTS/Surfaces/LineBounds.hpp
+++ b/Core/include/Acts/Surfaces/LineBounds.hpp
@@ -13,9 +13,9 @@
 #ifndef ACTS_SURFACES_LINEBOUNDS_H
 #define ACTS_SURFACES_LINEBOUNDS_H 1
 
-#include "ACTS/Surfaces/SurfaceBounds.hpp"
-#include "ACTS/Utilities/Definitions.hpp"
-#include "ACTS/Utilities/VariantDataFwd.hpp"
+#include "Acts/Surfaces/SurfaceBounds.hpp"
+#include "Acts/Utilities/Definitions.hpp"
+#include "Acts/Utilities/VariantDataFwd.hpp"
 
 namespace Acts {
 
diff --git a/Core/include/ACTS/Surfaces/LineSurface.hpp b/Core/include/Acts/Surfaces/LineSurface.hpp
similarity index 98%
rename from Core/include/ACTS/Surfaces/LineSurface.hpp
rename to Core/include/Acts/Surfaces/LineSurface.hpp
index b3dbe69dbede8d20d2e3d032be5f5e69cbdbdfe5..0e2ae3eb77d622b8f7e9ff932e13a3e0f32cd0d2 100644
--- a/Core/include/ACTS/Surfaces/LineSurface.hpp
+++ b/Core/include/Acts/Surfaces/LineSurface.hpp
@@ -13,11 +13,11 @@
 #ifndef ACTS_SURFACES_LINESURFACE_H
 #define ACTS_SURFACES_LINESURFACE_H
 
-#include "ACTS/Surfaces/InfiniteBounds.hpp"
-#include "ACTS/Surfaces/LineBounds.hpp"
-#include "ACTS/Surfaces/Surface.hpp"
-#include "ACTS/Utilities/Definitions.hpp"
-#include "ACTS/Utilities/VariantDataFwd.hpp"
+#include "Acts/Surfaces/InfiniteBounds.hpp"
+#include "Acts/Surfaces/LineBounds.hpp"
+#include "Acts/Surfaces/Surface.hpp"
+#include "Acts/Utilities/Definitions.hpp"
+#include "Acts/Utilities/VariantDataFwd.hpp"
 
 namespace Acts {
 
diff --git a/Core/include/ACTS/Surfaces/PerigeeSurface.hpp b/Core/include/Acts/Surfaces/PerigeeSurface.hpp
similarity index 92%
rename from Core/include/ACTS/Surfaces/PerigeeSurface.hpp
rename to Core/include/Acts/Surfaces/PerigeeSurface.hpp
index ea0e8e85c91a7b595787ee9eafaeb8255db79e6f..981ee380e8aea38c3cc3aa32560f760c85d7637b 100644
--- a/Core/include/ACTS/Surfaces/PerigeeSurface.hpp
+++ b/Core/include/Acts/Surfaces/PerigeeSurface.hpp
@@ -13,11 +13,11 @@
 #ifndef ACTS_SURFACES_PERIGEESURFACE_H
 #define ACTS_SURFACES_PERIGEESURFACE_H 1
 
-#include "ACTS/Surfaces/InfiniteBounds.hpp"
-#include "ACTS/Surfaces/LineSurface.hpp"
-#include "ACTS/Utilities/Definitions.hpp"
-#include "ACTS/Utilities/GeometryStatics.hpp"
-#include "ACTS/Utilities/VariantDataFwd.hpp"
+#include "Acts/Surfaces/InfiniteBounds.hpp"
+#include "Acts/Surfaces/LineSurface.hpp"
+#include "Acts/Utilities/Definitions.hpp"
+#include "Acts/Utilities/GeometryStatics.hpp"
+#include "Acts/Utilities/VariantDataFwd.hpp"
 
 namespace Acts {
 
diff --git a/Core/include/ACTS/Surfaces/PlanarBounds.hpp b/Core/include/Acts/Surfaces/PlanarBounds.hpp
similarity index 93%
rename from Core/include/ACTS/Surfaces/PlanarBounds.hpp
rename to Core/include/Acts/Surfaces/PlanarBounds.hpp
index b37c060de40f7db8e73dadfec6d4c4325b7124b9..0447ae0f30f72a5f4c4f1ca6f09b93446c2a30d2 100644
--- a/Core/include/ACTS/Surfaces/PlanarBounds.hpp
+++ b/Core/include/Acts/Surfaces/PlanarBounds.hpp
@@ -15,8 +15,8 @@
 
 #include <vector>
 
-#include "ACTS/Surfaces/SurfaceBounds.hpp"
-#include "ACTS/Utilities/VariantDataFwd.hpp"
+#include "Acts/Surfaces/SurfaceBounds.hpp"
+#include "Acts/Utilities/VariantDataFwd.hpp"
 
 namespace Acts {
 
diff --git a/Core/include/ACTS/Surfaces/PlaneSurface.hpp b/Core/include/Acts/Surfaces/PlaneSurface.hpp
similarity index 97%
rename from Core/include/ACTS/Surfaces/PlaneSurface.hpp
rename to Core/include/Acts/Surfaces/PlaneSurface.hpp
index c4a0a9f5a4e99cb94ef601bf2438a3767f8ae70c..4dc117f372aa911078a33bab9812b53c57c34aed 100644
--- a/Core/include/ACTS/Surfaces/PlaneSurface.hpp
+++ b/Core/include/Acts/Surfaces/PlaneSurface.hpp
@@ -14,12 +14,12 @@
 #define ACTS_SURFACES_PLANESURFACE_H 1
 
 #include <limits>
-#include "ACTS/Surfaces/InfiniteBounds.hpp"
-#include "ACTS/Surfaces/PlanarBounds.hpp"
-#include "ACTS/Surfaces/Surface.hpp"
-#include "ACTS/Utilities/Definitions.hpp"
-#include "ACTS/Utilities/Identifier.hpp"
-#include "ACTS/Utilities/VariantDataFwd.hpp"
+#include "Acts/Surfaces/InfiniteBounds.hpp"
+#include "Acts/Surfaces/PlanarBounds.hpp"
+#include "Acts/Surfaces/Surface.hpp"
+#include "Acts/Utilities/Definitions.hpp"
+#include "Acts/Utilities/Identifier.hpp"
+#include "Acts/Utilities/VariantDataFwd.hpp"
 
 namespace Acts {
 
diff --git a/Core/include/ACTS/Surfaces/RadialBounds.hpp b/Core/include/Acts/Surfaces/RadialBounds.hpp
similarity index 94%
rename from Core/include/ACTS/Surfaces/RadialBounds.hpp
rename to Core/include/Acts/Surfaces/RadialBounds.hpp
index 38a4d9d8a6a5b5a28c20963b4c62ec060be6d717..f9a209b922a67e041a1461b7945aef6066dda6f7 100644
--- a/Core/include/ACTS/Surfaces/RadialBounds.hpp
+++ b/Core/include/Acts/Surfaces/RadialBounds.hpp
@@ -15,11 +15,11 @@
 
 #include <cmath>
 
-#include "ACTS/Surfaces/DiscBounds.hpp"
-#include "ACTS/Utilities/Definitions.hpp"
-#include "ACTS/Utilities/ParameterDefinitions.hpp"
-#include "ACTS/Utilities/VariantDataFwd.hpp"
-#include "ACTS/Utilities/detail/periodic.hpp"
+#include "Acts/Surfaces/DiscBounds.hpp"
+#include "Acts/Utilities/Definitions.hpp"
+#include "Acts/Utilities/ParameterDefinitions.hpp"
+#include "Acts/Utilities/VariantDataFwd.hpp"
+#include "Acts/Utilities/detail/periodic.hpp"
 
 namespace Acts {
 
diff --git a/Core/include/ACTS/Surfaces/RectangleBounds.hpp b/Core/include/Acts/Surfaces/RectangleBounds.hpp
similarity index 96%
rename from Core/include/ACTS/Surfaces/RectangleBounds.hpp
rename to Core/include/Acts/Surfaces/RectangleBounds.hpp
index eb6aa2a7faa6568c8d1532574e8e4a07b0490d85..7b0803e87ad78f6c2ac078544ac95e7775824327 100644
--- a/Core/include/ACTS/Surfaces/RectangleBounds.hpp
+++ b/Core/include/Acts/Surfaces/RectangleBounds.hpp
@@ -13,9 +13,9 @@
 #ifndef ACTS_SURFACES_RECTANGLEBOUNDS_H
 #define ACTS_SURFACES_RECTANGLEBOUNDS_H 1
 
-#include "ACTS/Surfaces/PlanarBounds.hpp"
-#include "ACTS/Utilities/Definitions.hpp"
-#include "ACTS/Utilities/VariantDataFwd.hpp"
+#include "Acts/Surfaces/PlanarBounds.hpp"
+#include "Acts/Utilities/Definitions.hpp"
+#include "Acts/Utilities/VariantDataFwd.hpp"
 
 namespace Acts {
 
diff --git a/Core/include/ACTS/Surfaces/StrawSurface.hpp b/Core/include/Acts/Surfaces/StrawSurface.hpp
similarity index 94%
rename from Core/include/ACTS/Surfaces/StrawSurface.hpp
rename to Core/include/Acts/Surfaces/StrawSurface.hpp
index 4335a0fd3d99527c826c17c78ed691d2108d2620..2c6579e790a33bf5349f77878d0bb8d295a65549 100644
--- a/Core/include/ACTS/Surfaces/StrawSurface.hpp
+++ b/Core/include/Acts/Surfaces/StrawSurface.hpp
@@ -13,11 +13,11 @@
 #ifndef ACTS_SURFACES_STRAWSURFACE_H
 #define ACTS_SURFACES_STRAWSURFACE_H
 
-#include "ACTS/Surfaces/LineBounds.hpp"
-#include "ACTS/Surfaces/LineSurface.hpp"
-#include "ACTS/Utilities/Definitions.hpp"
-#include "ACTS/Utilities/Identifier.hpp"
-#include "ACTS/Utilities/VariantDataFwd.hpp"
+#include "Acts/Surfaces/LineBounds.hpp"
+#include "Acts/Surfaces/LineSurface.hpp"
+#include "Acts/Utilities/Definitions.hpp"
+#include "Acts/Utilities/Identifier.hpp"
+#include "Acts/Utilities/VariantDataFwd.hpp"
 
 namespace Acts {
 
diff --git a/Core/include/ACTS/Surfaces/Surface.hpp b/Core/include/Acts/Surfaces/Surface.hpp
similarity index 97%
rename from Core/include/ACTS/Surfaces/Surface.hpp
rename to Core/include/Acts/Surfaces/Surface.hpp
index 3751c920ed02631f861c7198f6e3b8118a6bcfd8..dc6bfaa96add369bd758b69bd0995092c6712feb 100644
--- a/Core/include/ACTS/Surfaces/Surface.hpp
+++ b/Core/include/Acts/Surfaces/Surface.hpp
@@ -13,17 +13,17 @@
 #ifndef ACTS_SURFACES_SURFACE_H
 #define ACTS_SURFACES_SURFACE_H 1
 
-#include "ACTS/Detector/DetectorElementBase.hpp"
-#include "ACTS/Surfaces/BoundaryCheck.hpp"
-#include "ACTS/Surfaces/SurfaceBounds.hpp"
-#include "ACTS/Utilities/BinnedArray.hpp"
-#include "ACTS/Utilities/BinningType.hpp"
-#include "ACTS/Utilities/Definitions.hpp"
-#include "ACTS/Utilities/GeometryObject.hpp"
-#include "ACTS/Utilities/GeometryStatics.hpp"
-#include "ACTS/Utilities/Identifier.hpp"
-#include "ACTS/Utilities/Intersection.hpp"
-#include "ACTS/Utilities/VariantDataFwd.hpp"
+#include "Acts/Detector/DetectorElementBase.hpp"
+#include "Acts/Surfaces/BoundaryCheck.hpp"
+#include "Acts/Surfaces/SurfaceBounds.hpp"
+#include "Acts/Utilities/BinnedArray.hpp"
+#include "Acts/Utilities/BinningType.hpp"
+#include "Acts/Utilities/Definitions.hpp"
+#include "Acts/Utilities/GeometryObject.hpp"
+#include "Acts/Utilities/GeometryStatics.hpp"
+#include "Acts/Utilities/Identifier.hpp"
+#include "Acts/Utilities/Intersection.hpp"
+#include "Acts/Utilities/VariantDataFwd.hpp"
 
 namespace Acts {
 
diff --git a/Core/include/ACTS/Surfaces/SurfaceArray.hpp b/Core/include/Acts/Surfaces/SurfaceArray.hpp
similarity index 98%
rename from Core/include/ACTS/Surfaces/SurfaceArray.hpp
rename to Core/include/Acts/Surfaces/SurfaceArray.hpp
index 7ea78515a8eb14d4d9cd995b0a71eaffa49c963f..499902f0b62116e4b9e63f0be0cd8921a90cc6dd 100644
--- a/Core/include/ACTS/Surfaces/SurfaceArray.hpp
+++ b/Core/include/Acts/Surfaces/SurfaceArray.hpp
@@ -12,14 +12,14 @@
 #include <iostream>
 #include <type_traits>
 #include <vector>
-#include "ACTS/Surfaces/Surface.hpp"
-#include "ACTS/Utilities/BinningType.hpp"
-#include "ACTS/Utilities/Definitions.hpp"
-#include "ACTS/Utilities/IAxis.hpp"
-#include "ACTS/Utilities/InstanceFactory.hpp"
-#include "ACTS/Utilities/VariantDataFwd.hpp"
-#include "ACTS/Utilities/detail/Axis.hpp"
-#include "ACTS/Utilities/detail/Grid.hpp"
+#include "Acts/Surfaces/Surface.hpp"
+#include "Acts/Utilities/BinningType.hpp"
+#include "Acts/Utilities/Definitions.hpp"
+#include "Acts/Utilities/IAxis.hpp"
+#include "Acts/Utilities/InstanceFactory.hpp"
+#include "Acts/Utilities/VariantDataFwd.hpp"
+#include "Acts/Utilities/detail/Axis.hpp"
+#include "Acts/Utilities/detail/Grid.hpp"
 
 namespace Acts {
 
diff --git a/Core/include/ACTS/Surfaces/SurfaceBounds.hpp b/Core/include/Acts/Surfaces/SurfaceBounds.hpp
similarity index 96%
rename from Core/include/ACTS/Surfaces/SurfaceBounds.hpp
rename to Core/include/Acts/Surfaces/SurfaceBounds.hpp
index abbffe4ab8638faeb6503fcfb75a04d181dd0277..79ac27e6372348a4bd1c79638da8f996fcec8f38 100644
--- a/Core/include/ACTS/Surfaces/SurfaceBounds.hpp
+++ b/Core/include/Acts/Surfaces/SurfaceBounds.hpp
@@ -15,9 +15,9 @@
 
 #include <ostream>
 
-#include "ACTS/Surfaces/BoundaryCheck.hpp"
-#include "ACTS/Utilities/Definitions.hpp"
-#include "ACTS/Utilities/VariantDataFwd.hpp"
+#include "Acts/Surfaces/BoundaryCheck.hpp"
+#include "Acts/Utilities/Definitions.hpp"
+#include "Acts/Utilities/VariantDataFwd.hpp"
 
 namespace Acts {
 
diff --git a/Core/include/ACTS/Surfaces/TrapezoidBounds.hpp b/Core/include/Acts/Surfaces/TrapezoidBounds.hpp
similarity index 96%
rename from Core/include/ACTS/Surfaces/TrapezoidBounds.hpp
rename to Core/include/Acts/Surfaces/TrapezoidBounds.hpp
index 808670404be26b044ff26a61ac4dfd4f12da6cd5..ce871ae5634f3c96b26e3e94aa47adeb4e1a4466 100644
--- a/Core/include/ACTS/Surfaces/TrapezoidBounds.hpp
+++ b/Core/include/Acts/Surfaces/TrapezoidBounds.hpp
@@ -15,11 +15,11 @@
 
 #include <cmath>
 
-#include "ACTS/Surfaces/PlanarBounds.hpp"
-#include "ACTS/Surfaces/RectangleBounds.hpp"
-#include "ACTS/Utilities/Definitions.hpp"
-#include "ACTS/Utilities/ParameterDefinitions.hpp"
-#include "ACTS/Utilities/VariantDataFwd.hpp"
+#include "Acts/Surfaces/PlanarBounds.hpp"
+#include "Acts/Surfaces/RectangleBounds.hpp"
+#include "Acts/Utilities/Definitions.hpp"
+#include "Acts/Utilities/ParameterDefinitions.hpp"
+#include "Acts/Utilities/VariantDataFwd.hpp"
 
 namespace Acts {
 
diff --git a/Core/include/ACTS/Surfaces/TriangleBounds.hpp b/Core/include/Acts/Surfaces/TriangleBounds.hpp
similarity index 92%
rename from Core/include/ACTS/Surfaces/TriangleBounds.hpp
rename to Core/include/Acts/Surfaces/TriangleBounds.hpp
index c7d314380cead36537dceac88120ae633e53b9d0..b9fe7c9648be5fd22aee69f560e3d433bdc42711 100644
--- a/Core/include/ACTS/Surfaces/TriangleBounds.hpp
+++ b/Core/include/Acts/Surfaces/TriangleBounds.hpp
@@ -16,11 +16,11 @@
 #include <array>
 #include <utility>
 
-#include "ACTS/Surfaces/PlanarBounds.hpp"
-#include "ACTS/Surfaces/RectangleBounds.hpp"
-#include "ACTS/Utilities/Definitions.hpp"
-#include "ACTS/Utilities/ParameterDefinitions.hpp"
-#include "ACTS/Utilities/VariantDataFwd.hpp"
+#include "Acts/Surfaces/PlanarBounds.hpp"
+#include "Acts/Surfaces/RectangleBounds.hpp"
+#include "Acts/Utilities/Definitions.hpp"
+#include "Acts/Utilities/ParameterDefinitions.hpp"
+#include "Acts/Utilities/VariantDataFwd.hpp"
 
 namespace Acts {
 
diff --git a/Core/include/ACTS/Tools/CylinderVolumeBuilder.hpp b/Core/include/Acts/Tools/CylinderVolumeBuilder.hpp
similarity index 98%
rename from Core/include/ACTS/Tools/CylinderVolumeBuilder.hpp
rename to Core/include/Acts/Tools/CylinderVolumeBuilder.hpp
index 24f87e5619893ee0a9b46e810182720c31257028..70e3113a9b54fcf0738a4eeb4b610436258106fa 100644
--- a/Core/include/ACTS/Tools/CylinderVolumeBuilder.hpp
+++ b/Core/include/Acts/Tools/CylinderVolumeBuilder.hpp
@@ -15,13 +15,13 @@
 
 #include <limits>
 #include <string>
-#include "ACTS/Material/Material.hpp"
-#include "ACTS/Tools/ILayerBuilder.hpp"
-#include "ACTS/Tools/ITrackingVolumeBuilder.hpp"
-#include "ACTS/Tools/ITrackingVolumeHelper.hpp"
-#include "ACTS/Utilities/BinningType.hpp"
-#include "ACTS/Utilities/Logger.hpp"
-#include "ACTS/Utilities/Units.hpp"
+#include "Acts/Material/Material.hpp"
+#include "Acts/Tools/ILayerBuilder.hpp"
+#include "Acts/Tools/ITrackingVolumeBuilder.hpp"
+#include "Acts/Tools/ITrackingVolumeHelper.hpp"
+#include "Acts/Utilities/BinningType.hpp"
+#include "Acts/Utilities/Logger.hpp"
+#include "Acts/Utilities/Units.hpp"
 
 #ifndef ATAS_GEOMETRYTOOLS_TAKESMALLERBIGGER
 #define ATAS_GEOMETRYTOOLS_TAKESMALLERBIGGER
diff --git a/Core/include/ACTS/Tools/CylinderVolumeHelper.hpp b/Core/include/Acts/Tools/CylinderVolumeHelper.hpp
similarity index 98%
rename from Core/include/ACTS/Tools/CylinderVolumeHelper.hpp
rename to Core/include/Acts/Tools/CylinderVolumeHelper.hpp
index 5c75ec7f8bb702c6291c692288d6fdb166b65752..58d8796f9cb3d8930a25aca5c7ebba32179334ea 100644
--- a/Core/include/ACTS/Tools/CylinderVolumeHelper.hpp
+++ b/Core/include/Acts/Tools/CylinderVolumeHelper.hpp
@@ -25,11 +25,11 @@
 #include <memory>
 #include <string>
 #include <vector>
-#include "ACTS/Tools/ILayerArrayCreator.hpp"
-#include "ACTS/Tools/ITrackingVolumeArrayCreator.hpp"
-#include "ACTS/Tools/ITrackingVolumeHelper.hpp"
-#include "ACTS/Utilities/Logger.hpp"
-#include "ACTS/Volumes/BoundarySurfaceFace.hpp"
+#include "Acts/Tools/ILayerArrayCreator.hpp"
+#include "Acts/Tools/ITrackingVolumeArrayCreator.hpp"
+#include "Acts/Tools/ITrackingVolumeHelper.hpp"
+#include "Acts/Utilities/Logger.hpp"
+#include "Acts/Volumes/BoundarySurfaceFace.hpp"
 
 namespace Acts {
 
diff --git a/Core/include/ACTS/Tools/ILayerArrayCreator.hpp b/Core/include/Acts/Tools/ILayerArrayCreator.hpp
similarity index 95%
rename from Core/include/ACTS/Tools/ILayerArrayCreator.hpp
rename to Core/include/Acts/Tools/ILayerArrayCreator.hpp
index 27bc15b96dacb9f9a9066528a42b03e282f33225..2544a49ed6c0a54ff2c826018fd930cd2651ea76 100644
--- a/Core/include/ACTS/Tools/ILayerArrayCreator.hpp
+++ b/Core/include/Acts/Tools/ILayerArrayCreator.hpp
@@ -15,8 +15,8 @@
 
 #include <memory>
 #include <vector>
-#include "ACTS/Utilities/BinnedArray.hpp"
-#include "ACTS/Utilities/BinningType.hpp"
+#include "Acts/Utilities/BinnedArray.hpp"
+#include "Acts/Utilities/BinningType.hpp"
 
 namespace Acts {
 
diff --git a/Core/include/ACTS/Tools/ILayerBuilder.hpp b/Core/include/Acts/Tools/ILayerBuilder.hpp
similarity index 100%
rename from Core/include/ACTS/Tools/ILayerBuilder.hpp
rename to Core/include/Acts/Tools/ILayerBuilder.hpp
diff --git a/Core/include/ACTS/Tools/ITrackingGeometryBuilder.hpp b/Core/include/Acts/Tools/ITrackingGeometryBuilder.hpp
similarity index 100%
rename from Core/include/ACTS/Tools/ITrackingGeometryBuilder.hpp
rename to Core/include/Acts/Tools/ITrackingGeometryBuilder.hpp
diff --git a/Core/include/ACTS/Tools/ITrackingVolumeArrayCreator.hpp b/Core/include/Acts/Tools/ITrackingVolumeArrayCreator.hpp
similarity index 96%
rename from Core/include/ACTS/Tools/ITrackingVolumeArrayCreator.hpp
rename to Core/include/Acts/Tools/ITrackingVolumeArrayCreator.hpp
index 454b6c9fa2fc5f15b48c2fbcb393dcfb7455b651..3b1db9cb537d333792863f6731e4d3c276f3201a 100644
--- a/Core/include/ACTS/Tools/ITrackingVolumeArrayCreator.hpp
+++ b/Core/include/Acts/Tools/ITrackingVolumeArrayCreator.hpp
@@ -15,8 +15,8 @@
 
 #include <memory>
 #include <vector>
-#include "ACTS/Utilities/BinnedArray.hpp"
-#include "ACTS/Utilities/BinningType.hpp"
+#include "Acts/Utilities/BinnedArray.hpp"
+#include "Acts/Utilities/BinningType.hpp"
 
 namespace Acts {
 
diff --git a/Core/include/ACTS/Tools/ITrackingVolumeBuilder.hpp b/Core/include/Acts/Tools/ITrackingVolumeBuilder.hpp
similarity index 100%
rename from Core/include/ACTS/Tools/ITrackingVolumeBuilder.hpp
rename to Core/include/Acts/Tools/ITrackingVolumeBuilder.hpp
diff --git a/Core/include/ACTS/Tools/ITrackingVolumeHelper.hpp b/Core/include/Acts/Tools/ITrackingVolumeHelper.hpp
similarity index 98%
rename from Core/include/ACTS/Tools/ITrackingVolumeHelper.hpp
rename to Core/include/Acts/Tools/ITrackingVolumeHelper.hpp
index 411af2cb70d46007698278b69d082c113a443c69..3c63e95447eb4e76db32cc279ae4dcab1790d765 100644
--- a/Core/include/ACTS/Tools/ITrackingVolumeHelper.hpp
+++ b/Core/include/Acts/Tools/ITrackingVolumeHelper.hpp
@@ -14,12 +14,12 @@
 #define ACTS_TOOLS_ITRACKINGVOLUMEHELPER_H 1
 
 // Geometry module
-#include "ACTS/Utilities/BinningType.hpp"
+#include "Acts/Utilities/BinningType.hpp"
 // Core module
 #include <memory>
 #include <string>
 #include <vector>
-#include "ACTS/Utilities/Definitions.hpp"
+#include "Acts/Utilities/Definitions.hpp"
 
 namespace Acts {
 
diff --git a/Core/include/ACTS/Tools/LayerArrayCreator.hpp b/Core/include/Acts/Tools/LayerArrayCreator.hpp
similarity index 96%
rename from Core/include/ACTS/Tools/LayerArrayCreator.hpp
rename to Core/include/Acts/Tools/LayerArrayCreator.hpp
index 4952887ece36f6f3035f334c4f23fe2dbc63f688..04c076eb058d4e2e2103a47e3f71dc36470ffbc2 100644
--- a/Core/include/ACTS/Tools/LayerArrayCreator.hpp
+++ b/Core/include/Acts/Tools/LayerArrayCreator.hpp
@@ -23,9 +23,9 @@
 #endif
 
 #include <algorithm>
-#include "ACTS/Tools/ILayerArrayCreator.hpp"
-#include "ACTS/Utilities/Definitions.hpp"
-#include "ACTS/Utilities/Logger.hpp"
+#include "Acts/Tools/ILayerArrayCreator.hpp"
+#include "Acts/Utilities/Definitions.hpp"
+#include "Acts/Utilities/Logger.hpp"
 
 namespace Acts {
 
diff --git a/Core/include/ACTS/Tools/LayerCreator.hpp b/Core/include/Acts/Tools/LayerCreator.hpp
similarity index 97%
rename from Core/include/ACTS/Tools/LayerCreator.hpp
rename to Core/include/Acts/Tools/LayerCreator.hpp
index a1f0143ba827f1e498894c093959e2383f5a4ed1..9e9af3f589b35f49140235bbe65e4c0f35058aa8 100644
--- a/Core/include/ACTS/Tools/LayerCreator.hpp
+++ b/Core/include/Acts/Tools/LayerCreator.hpp
@@ -14,11 +14,11 @@
 #define ACTS_GEOMETRYTOOLS_LAYERCREATOR_H 1
 
 #include <boost/optional.hpp>
-#include "ACTS/Tools/SurfaceArrayCreator.hpp"
-#include "ACTS/Utilities/ApproachDescriptor.hpp"
-#include "ACTS/Utilities/BinUtility.hpp"
-#include "ACTS/Utilities/Definitions.hpp"
-#include "ACTS/Utilities/Logger.hpp"
+#include "Acts/Tools/SurfaceArrayCreator.hpp"
+#include "Acts/Utilities/ApproachDescriptor.hpp"
+#include "Acts/Utilities/BinUtility.hpp"
+#include "Acts/Utilities/Definitions.hpp"
+#include "Acts/Utilities/Logger.hpp"
 
 #ifndef ACTS_LAYERCREATOR_TAKESMALLERBIGGER
 #define ACTS_LAYERCREATOR_TAKESMALLERBIGGER
diff --git a/Core/include/ACTS/Tools/PassiveLayerBuilder.hpp b/Core/include/Acts/Tools/PassiveLayerBuilder.hpp
similarity index 97%
rename from Core/include/ACTS/Tools/PassiveLayerBuilder.hpp
rename to Core/include/Acts/Tools/PassiveLayerBuilder.hpp
index 18e8af431f0b970b2aa87e8fbb3071f2d9578204..011d762f2e1bd11324ee0e5d5c12e1d1cb9900fe 100644
--- a/Core/include/ACTS/Tools/PassiveLayerBuilder.hpp
+++ b/Core/include/Acts/Tools/PassiveLayerBuilder.hpp
@@ -13,9 +13,9 @@
 #ifndef ACTS_GEOMETRYTOOLS_PASSIVELAYERBUILDER_H
 #define ACTS_GEOMETRYTOOLS_PASSIVELAYERBUILDER_H 1
 
-#include "ACTS/Layers/Layer.hpp"
-#include "ACTS/Tools/ILayerBuilder.hpp"
-#include "ACTS/Utilities/Logger.hpp"
+#include "Acts/Layers/Layer.hpp"
+#include "Acts/Tools/ILayerBuilder.hpp"
+#include "Acts/Utilities/Logger.hpp"
 
 namespace Acts {
 
diff --git a/Core/include/ACTS/Tools/SurfaceArrayCreator.hpp b/Core/include/Acts/Tools/SurfaceArrayCreator.hpp
similarity index 98%
rename from Core/include/ACTS/Tools/SurfaceArrayCreator.hpp
rename to Core/include/Acts/Tools/SurfaceArrayCreator.hpp
index 8f750a99eb54c69b0d1108ab4af801554d5e3cdf..1b63ad37f20edf5e54300f0baeb32d9e2a170a90 100644
--- a/Core/include/ACTS/Tools/SurfaceArrayCreator.hpp
+++ b/Core/include/Acts/Tools/SurfaceArrayCreator.hpp
@@ -15,13 +15,13 @@
 
 #include <boost/none.hpp>
 #include <boost/optional.hpp>
-#include "ACTS/Layers/ProtoLayer.hpp"
-#include "ACTS/Surfaces/PlanarBounds.hpp"
-#include "ACTS/Surfaces/Surface.hpp"
-#include "ACTS/Surfaces/SurfaceArray.hpp"
-#include "ACTS/Utilities/Definitions.hpp"
-#include "ACTS/Utilities/Logger.hpp"
-#include "ACTS/Utilities/Units.hpp"
+#include "Acts/Layers/ProtoLayer.hpp"
+#include "Acts/Surfaces/PlanarBounds.hpp"
+#include "Acts/Surfaces/Surface.hpp"
+#include "Acts/Surfaces/SurfaceArray.hpp"
+#include "Acts/Utilities/Definitions.hpp"
+#include "Acts/Utilities/Logger.hpp"
+#include "Acts/Utilities/Units.hpp"
 
 namespace Acts {
 
diff --git a/Core/include/ACTS/Tools/TrackingGeometryBuilder.hpp b/Core/include/Acts/Tools/TrackingGeometryBuilder.hpp
similarity index 93%
rename from Core/include/ACTS/Tools/TrackingGeometryBuilder.hpp
rename to Core/include/Acts/Tools/TrackingGeometryBuilder.hpp
index 14aa4c9964c1a74d4ad05dd17c7e45bfef923052..121899be8808626066ac4fcac6118ae6cf63f8d2 100644
--- a/Core/include/ACTS/Tools/TrackingGeometryBuilder.hpp
+++ b/Core/include/Acts/Tools/TrackingGeometryBuilder.hpp
@@ -15,11 +15,11 @@
 
 #include <list>
 #include <memory>
-#include "ACTS/Tools/ITrackingGeometryBuilder.hpp"
-#include "ACTS/Tools/ITrackingVolumeBuilder.hpp"
-#include "ACTS/Tools/ITrackingVolumeHelper.hpp"
-#include "ACTS/Utilities/Definitions.hpp"
-#include "ACTS/Utilities/Logger.hpp"
+#include "Acts/Tools/ITrackingGeometryBuilder.hpp"
+#include "Acts/Tools/ITrackingVolumeBuilder.hpp"
+#include "Acts/Tools/ITrackingVolumeHelper.hpp"
+#include "Acts/Utilities/Definitions.hpp"
+#include "Acts/Utilities/Logger.hpp"
 
 namespace Acts {
 class TrackingGeometry;
diff --git a/Core/include/ACTS/Tools/TrackingVolumeArrayCreator.hpp b/Core/include/Acts/Tools/TrackingVolumeArrayCreator.hpp
similarity index 92%
rename from Core/include/ACTS/Tools/TrackingVolumeArrayCreator.hpp
rename to Core/include/Acts/Tools/TrackingVolumeArrayCreator.hpp
index 98a4e157c56405de3938dbf1de1277f4ca5054c4..320b84bc0fe1043434a68a95f6fcb94db3bdb6fe 100644
--- a/Core/include/ACTS/Tools/TrackingVolumeArrayCreator.hpp
+++ b/Core/include/Acts/Tools/TrackingVolumeArrayCreator.hpp
@@ -14,10 +14,10 @@
 #define ACTS_GEOMETRYTOOLS_TRACKINGVOLUMEARRAYCREATOR_H
 
 #include <algorithm>
-#include "ACTS/Tools/ITrackingVolumeArrayCreator.hpp"
-#include "ACTS/Utilities/BinnedArray.hpp"
-#include "ACTS/Utilities/Definitions.hpp"
-#include "ACTS/Utilities/Logger.hpp"
+#include "Acts/Tools/ITrackingVolumeArrayCreator.hpp"
+#include "Acts/Utilities/BinnedArray.hpp"
+#include "Acts/Utilities/Definitions.hpp"
+#include "Acts/Utilities/Logger.hpp"
 
 namespace Acts {
 
diff --git a/Core/include/ACTS/Utilities/ApproachDescriptor.hpp b/Core/include/Acts/Utilities/ApproachDescriptor.hpp
similarity index 96%
rename from Core/include/ACTS/Utilities/ApproachDescriptor.hpp
rename to Core/include/Acts/Utilities/ApproachDescriptor.hpp
index 5aaed94e75a544f86b42a641ccace7088a45df0a..34f8b2740a292c0926292687c6819b548200472f 100644
--- a/Core/include/ACTS/Utilities/ApproachDescriptor.hpp
+++ b/Core/include/Acts/Utilities/ApproachDescriptor.hpp
@@ -14,8 +14,8 @@
 #define ACTS_UTILITIES_APPROACHDESCRIPTOR_H 1
 
 #include <vector>
-#include "ACTS/Utilities/Definitions.hpp"
-#include "ACTS/Utilities/Intersection.hpp"
+#include "Acts/Utilities/Definitions.hpp"
+#include "Acts/Utilities/Intersection.hpp"
 
 namespace Acts {
 
diff --git a/Core/include/ACTS/Utilities/BFieldMapUtils.hpp b/Core/include/Acts/Utilities/BFieldMapUtils.hpp
similarity index 98%
rename from Core/include/ACTS/Utilities/BFieldMapUtils.hpp
rename to Core/include/Acts/Utilities/BFieldMapUtils.hpp
index 649ea9db7b94b16293bb36121505ae79ecfa0f43..cf49f0bc14e3c8803dea2a27518a142e3aa7ee81 100644
--- a/Core/include/ACTS/Utilities/BFieldMapUtils.hpp
+++ b/Core/include/Acts/Utilities/BFieldMapUtils.hpp
@@ -10,8 +10,8 @@
 #define ACTFW_BFIELD_BFIELDMAPUTILS_HPP
 
 #include <vector>
-#include "ACTS/MagneticField/InterpolatedBFieldMap.hpp"
-#include "ACTS/Utilities/Units.hpp"
+#include "Acts/MagneticField/InterpolatedBFieldMap.hpp"
+#include "Acts/Utilities/Units.hpp"
 
 /// Convenience functions to ease creation of and Acts::InterpolatedBFieldMap
 /// and to avoid code duplication. Currently implemented for the two most common
diff --git a/Core/include/ACTS/Utilities/BinUtility.hpp b/Core/include/Acts/Utilities/BinUtility.hpp
similarity index 99%
rename from Core/include/ACTS/Utilities/BinUtility.hpp
rename to Core/include/Acts/Utilities/BinUtility.hpp
index 84770bbfffbe21b95f618634e6136612d2956628..ba48abc34598be5976d88b2b19a290f957f121fe 100644
--- a/Core/include/ACTS/Utilities/BinUtility.hpp
+++ b/Core/include/Acts/Utilities/BinUtility.hpp
@@ -17,9 +17,9 @@
 #include <iostream>
 #include <memory>
 #include <vector>
-#include "ACTS/Utilities/BinningData.hpp"
-#include "ACTS/Utilities/BinningType.hpp"
-#include "ACTS/Utilities/Definitions.hpp"
+#include "Acts/Utilities/BinningData.hpp"
+#include "Acts/Utilities/BinningType.hpp"
+#include "Acts/Utilities/Definitions.hpp"
 
 namespace Acts {
 
diff --git a/Core/include/ACTS/Utilities/BinnedArray.hpp b/Core/include/Acts/Utilities/BinnedArray.hpp
similarity index 97%
rename from Core/include/ACTS/Utilities/BinnedArray.hpp
rename to Core/include/Acts/Utilities/BinnedArray.hpp
index ea98dc48456a11f056bcbf1f21aacd47aa2c8cc5..db3eb32f8dedc636140d5990fafef516c3a601d8 100644
--- a/Core/include/ACTS/Utilities/BinnedArray.hpp
+++ b/Core/include/Acts/Utilities/BinnedArray.hpp
@@ -15,8 +15,8 @@
 
 #include <array>
 #include <vector>
-#include "ACTS/Utilities/BinUtility.hpp"
-#include "ACTS/Utilities/Definitions.hpp"
+#include "Acts/Utilities/BinUtility.hpp"
+#include "Acts/Utilities/Definitions.hpp"
 
 namespace Acts {
 
diff --git a/Core/include/ACTS/Utilities/BinnedArrayXD.hpp b/Core/include/Acts/Utilities/BinnedArrayXD.hpp
similarity index 98%
rename from Core/include/ACTS/Utilities/BinnedArrayXD.hpp
rename to Core/include/Acts/Utilities/BinnedArrayXD.hpp
index cf0818015ebc8c994baef88418a8deb8ab9c45de..0f4377942e50d1f0960e24b556aaa8428c2e1f3b 100644
--- a/Core/include/ACTS/Utilities/BinnedArrayXD.hpp
+++ b/Core/include/Acts/Utilities/BinnedArrayXD.hpp
@@ -16,8 +16,8 @@
 #include <array>
 #include <iostream>
 #include <vector>
-#include "ACTS/Utilities/BinUtility.hpp"
-#include "ACTS/Utilities/BinnedArray.hpp"
+#include "Acts/Utilities/BinUtility.hpp"
+#include "Acts/Utilities/BinnedArray.hpp"
 
 class MsgStream;
 
diff --git a/Core/include/ACTS/Utilities/BinningData.hpp b/Core/include/Acts/Utilities/BinningData.hpp
similarity index 99%
rename from Core/include/ACTS/Utilities/BinningData.hpp
rename to Core/include/Acts/Utilities/BinningData.hpp
index 37b7616deb2762a1f3aa95846338a544e92bd142..75243cce5aaf821bd04c4c8517904c303f674201 100644
--- a/Core/include/ACTS/Utilities/BinningData.hpp
+++ b/Core/include/Acts/Utilities/BinningData.hpp
@@ -17,9 +17,9 @@
 #include <memory>
 #include <utility>
 #include <vector>
-#include "ACTS/Utilities/BinningType.hpp"
-#include "ACTS/Utilities/Definitions.hpp"
-#include "ACTS/Utilities/ThrowAssert.hpp"
+#include "Acts/Utilities/BinningType.hpp"
+#include "Acts/Utilities/Definitions.hpp"
+#include "Acts/Utilities/ThrowAssert.hpp"
 
 namespace Acts {
 
diff --git a/Core/include/ACTS/Utilities/BinningType.hpp b/Core/include/Acts/Utilities/BinningType.hpp
similarity index 100%
rename from Core/include/ACTS/Utilities/BinningType.hpp
rename to Core/include/Acts/Utilities/BinningType.hpp
diff --git a/Core/include/ACTS/Utilities/Definitions.hpp b/Core/include/Acts/Utilities/Definitions.hpp
similarity index 95%
rename from Core/include/ACTS/Utilities/Definitions.hpp
rename to Core/include/Acts/Utilities/Definitions.hpp
index bb72c168aa3906c917ceec0e9de8913c8518c61c..69675538677b8ec4d7e12d467d944e0cbed4aa5a 100644
--- a/Core/include/ACTS/Utilities/Definitions.hpp
+++ b/Core/include/Acts/Utilities/Definitions.hpp
@@ -10,9 +10,9 @@
 #define ACTS_Definitions_H
 
 // API addons
-#define EIGEN_MATRIXBASE_PLUGIN "ACTS/Utilities/detail/MatrixBasePlugin.hpp"
-#define EIGEN_MATRIX_PLUGIN "ACTS/Utilities/detail/MatrixPlugin.hpp"
-#define EIGEN_TRANSFORM_PLUGIN "ACTS/Utilities/detail/TransformPlugin.hpp"
+#define EIGEN_MATRIXBASE_PLUGIN "Acts/Utilities/detail/MatrixBasePlugin.hpp"
+#define EIGEN_MATRIX_PLUGIN "Acts/Utilities/detail/MatrixPlugin.hpp"
+#define EIGEN_TRANSFORM_PLUGIN "Acts/Utilities/detail/TransformPlugin.hpp"
 
 // for GNU: ignore this specific warning, otherwise just include Eigen/Dense
 #if defined(__GNUC__) && !defined(__clang__) && !defined(__INTEL_COMPILER)
diff --git a/Core/include/ACTS/Utilities/GeometryID.hpp b/Core/include/Acts/Utilities/GeometryID.hpp
similarity index 99%
rename from Core/include/ACTS/Utilities/GeometryID.hpp
rename to Core/include/Acts/Utilities/GeometryID.hpp
index c79c1a962ac89f6eb8276289749853b39acc52d0..c9e1c2abbbd9db5cfcfd2d5b7dae82c60c3b2f33 100644
--- a/Core/include/ACTS/Utilities/GeometryID.hpp
+++ b/Core/include/Acts/Utilities/GeometryID.hpp
@@ -14,7 +14,7 @@
 #define ACTS_GEOMETRYUTILS_GEOMETRYID_H 1
 
 #include <iostream>
-#include "ACTS/Utilities/Helpers.hpp"
+#include "Acts/Utilities/Helpers.hpp"
 
 typedef uint64_t geo_id_value;
 
diff --git a/Core/include/ACTS/Utilities/GeometryObject.hpp b/Core/include/Acts/Utilities/GeometryObject.hpp
similarity index 95%
rename from Core/include/ACTS/Utilities/GeometryObject.hpp
rename to Core/include/Acts/Utilities/GeometryObject.hpp
index 37d0fd297d99e60c1f44e5f5df5fc8f1b1aea022..39b1bcd60d9e714501a5d17f6fc8d0bd267cebe5 100644
--- a/Core/include/ACTS/Utilities/GeometryObject.hpp
+++ b/Core/include/Acts/Utilities/GeometryObject.hpp
@@ -13,9 +13,9 @@
 #ifndef ACTS_GEOMETRYUTILS_GEOMETRYOBJECT_H
 #define ACTS_GEOMETRYUTILS_GEOMETRYOBJECT_H
 
-#include "ACTS/Utilities/BinningType.hpp"
-#include "ACTS/Utilities/Definitions.hpp"
-#include "ACTS/Utilities/GeometryID.hpp"
+#include "Acts/Utilities/BinningType.hpp"
+#include "Acts/Utilities/Definitions.hpp"
+#include "Acts/Utilities/GeometryID.hpp"
 
 namespace Acts {
 
diff --git a/Core/include/ACTS/Utilities/GeometryObjectSorter.hpp b/Core/include/Acts/Utilities/GeometryObjectSorter.hpp
similarity index 100%
rename from Core/include/ACTS/Utilities/GeometryObjectSorter.hpp
rename to Core/include/Acts/Utilities/GeometryObjectSorter.hpp
diff --git a/Core/include/ACTS/Utilities/GeometrySignature.hpp b/Core/include/Acts/Utilities/GeometrySignature.hpp
similarity index 100%
rename from Core/include/ACTS/Utilities/GeometrySignature.hpp
rename to Core/include/Acts/Utilities/GeometrySignature.hpp
diff --git a/Core/include/ACTS/Utilities/GeometryStatics.hpp b/Core/include/Acts/Utilities/GeometryStatics.hpp
similarity index 97%
rename from Core/include/ACTS/Utilities/GeometryStatics.hpp
rename to Core/include/Acts/Utilities/GeometryStatics.hpp
index 6593c0bf1f59d3cf8394f72208e4e30789817872..19c54de2caf5007e9325164503f9e641f0f9d6a2 100644
--- a/Core/include/ACTS/Utilities/GeometryStatics.hpp
+++ b/Core/include/Acts/Utilities/GeometryStatics.hpp
@@ -13,7 +13,7 @@
 #ifndef ACTS_GEOMETYRUTILS_GEOMETRYSTATICS_H
 #define ACTS_GEOMETYRUTILS_GEOMETRYSTATICS_H 1
 
-#include "ACTS/Utilities/Definitions.hpp"
+#include "Acts/Utilities/Definitions.hpp"
 
 /// Define statics for Geometry in Tracking
 ///
diff --git a/Core/include/ACTS/Utilities/Helpers.hpp b/Core/include/Acts/Utilities/Helpers.hpp
similarity index 100%
rename from Core/include/ACTS/Utilities/Helpers.hpp
rename to Core/include/Acts/Utilities/Helpers.hpp
diff --git a/Core/include/ACTS/Utilities/IAxis.hpp b/Core/include/Acts/Utilities/IAxis.hpp
similarity index 100%
rename from Core/include/ACTS/Utilities/IAxis.hpp
rename to Core/include/Acts/Utilities/IAxis.hpp
diff --git a/Core/include/ACTS/Utilities/Identifier.hpp b/Core/include/Acts/Utilities/Identifier.hpp
similarity index 100%
rename from Core/include/ACTS/Utilities/Identifier.hpp
rename to Core/include/Acts/Utilities/Identifier.hpp
diff --git a/Core/include/ACTS/Utilities/InstanceFactory.hpp b/Core/include/Acts/Utilities/InstanceFactory.hpp
similarity index 89%
rename from Core/include/ACTS/Utilities/InstanceFactory.hpp
rename to Core/include/Acts/Utilities/InstanceFactory.hpp
index 48132a9a1964d72a9f8e92cf327bca3f27b25ba5..14d49ed8e87c052c41c83e7f5b79ec695a7b42ef 100644
--- a/Core/include/ACTS/Utilities/InstanceFactory.hpp
+++ b/Core/include/Acts/Utilities/InstanceFactory.hpp
@@ -11,19 +11,19 @@
 
 #include <boost/functional/value_factory.hpp>
 #include <map>
-#include "ACTS/Utilities/ThrowAssert.hpp"
-#include "ACTS/Utilities/VariantData.hpp"
+#include "Acts/Utilities/ThrowAssert.hpp"
+#include "Acts/Utilities/VariantData.hpp"
 
-#include "ACTS/Surfaces/CylinderBounds.hpp"
-#include "ACTS/Surfaces/DiamondBounds.hpp"
-#include "ACTS/Surfaces/DiscBounds.hpp"
-#include "ACTS/Surfaces/DiscTrapezoidalBounds.hpp"
-#include "ACTS/Surfaces/EllipseBounds.hpp"
-#include "ACTS/Surfaces/PlaneSurface.hpp"
-#include "ACTS/Surfaces/RadialBounds.hpp"
-#include "ACTS/Surfaces/RectangleBounds.hpp"
-#include "ACTS/Surfaces/TrapezoidBounds.hpp"
-#include "ACTS/Surfaces/TriangleBounds.hpp"
+#include "Acts/Surfaces/CylinderBounds.hpp"
+#include "Acts/Surfaces/DiamondBounds.hpp"
+#include "Acts/Surfaces/DiscBounds.hpp"
+#include "Acts/Surfaces/DiscTrapezoidalBounds.hpp"
+#include "Acts/Surfaces/EllipseBounds.hpp"
+#include "Acts/Surfaces/PlaneSurface.hpp"
+#include "Acts/Surfaces/RadialBounds.hpp"
+#include "Acts/Surfaces/RectangleBounds.hpp"
+#include "Acts/Surfaces/TrapezoidBounds.hpp"
+#include "Acts/Surfaces/TriangleBounds.hpp"
 
 namespace Acts {
 
diff --git a/Core/include/ACTS/Utilities/Interpolation.hpp b/Core/include/Acts/Utilities/Interpolation.hpp
similarity index 97%
rename from Core/include/ACTS/Utilities/Interpolation.hpp
rename to Core/include/Acts/Utilities/Interpolation.hpp
index 2056f292f0e37e6b40396aad2da930ccf42c889d..41edd7043efcafd58d3a0cf1646ba39a4260416b 100644
--- a/Core/include/ACTS/Utilities/Interpolation.hpp
+++ b/Core/include/Acts/Utilities/Interpolation.hpp
@@ -10,8 +10,8 @@
 
 #include <array>
 #include <type_traits>
-#include "ACTS/Utilities/Definitions.hpp"
-#include "ACTS/Utilities/detail/interpolation_impl.hpp"
+#include "Acts/Utilities/Definitions.hpp"
+#include "Acts/Utilities/detail/interpolation_impl.hpp"
 
 namespace Acts {
 
diff --git a/Core/include/ACTS/Utilities/Intersection.hpp b/Core/include/Acts/Utilities/Intersection.hpp
similarity index 100%
rename from Core/include/ACTS/Utilities/Intersection.hpp
rename to Core/include/Acts/Utilities/Intersection.hpp
diff --git a/Core/include/ACTS/Utilities/Logger.hpp b/Core/include/Acts/Utilities/Logger.hpp
similarity index 100%
rename from Core/include/ACTS/Utilities/Logger.hpp
rename to Core/include/Acts/Utilities/Logger.hpp
diff --git a/Core/include/ACTS/Utilities/MaterialInteraction.hpp b/Core/include/Acts/Utilities/MaterialInteraction.hpp
similarity index 96%
rename from Core/include/ACTS/Utilities/MaterialInteraction.hpp
rename to Core/include/Acts/Utilities/MaterialInteraction.hpp
index d95534f8840c69da3be9de18f18dea06a1646ec6..caaf3b8b3b50d9ad939a0d2e6f6fbdcfc969ec75 100644
--- a/Core/include/ACTS/Utilities/MaterialInteraction.hpp
+++ b/Core/include/Acts/Utilities/MaterialInteraction.hpp
@@ -9,9 +9,9 @@
 #ifndef ACTS_EXTRAPOLATIONUTILS_MATERIALINTERACTION_H
 #define ACTS_EXTRAPOLATIONUTILS_MATERIALINTERACTION_H 1
 
-#include "ACTS/EventData/ParticleDefinitions.hpp"
-#include "ACTS/Material/Material.hpp"
-#include "ACTS/Utilities/Definitions.hpp"
+#include "Acts/EventData/ParticleDefinitions.hpp"
+#include "Acts/Material/Material.hpp"
+#include "Acts/Utilities/Definitions.hpp"
 
 /// Collection of parametrizations used for
 /// energy loss and scattering
diff --git a/Core/include/ACTS/Utilities/ParameterDefinitions.hpp b/Core/include/Acts/Utilities/ParameterDefinitions.hpp
similarity index 100%
rename from Core/include/ACTS/Utilities/ParameterDefinitions.hpp
rename to Core/include/Acts/Utilities/ParameterDefinitions.hpp
diff --git a/Core/include/ACTS/Utilities/ParameterTypes.hpp b/Core/include/Acts/Utilities/ParameterTypes.hpp
similarity index 100%
rename from Core/include/ACTS/Utilities/ParameterTypes.hpp
rename to Core/include/Acts/Utilities/ParameterTypes.hpp
diff --git a/Core/include/ACTS/Utilities/ThrowAssert.hpp b/Core/include/Acts/Utilities/ThrowAssert.hpp
similarity index 100%
rename from Core/include/ACTS/Utilities/ThrowAssert.hpp
rename to Core/include/Acts/Utilities/ThrowAssert.hpp
diff --git a/Core/include/ACTS/Utilities/Units.hpp b/Core/include/Acts/Utilities/Units.hpp
similarity index 94%
rename from Core/include/ACTS/Utilities/Units.hpp
rename to Core/include/Acts/Utilities/Units.hpp
index f5ae6f25e8902e721ad6ad553d5e4af5ecca39aa..9dfd5c4d67bc583e0ae0df127acac0814fa1e17a 100644
--- a/Core/include/ACTS/Utilities/Units.hpp
+++ b/Core/include/Acts/Utilities/Units.hpp
@@ -25,7 +25,7 @@ namespace Acts {
 ///
 /// Examples:
 /// @code
-/// #include "ACTS/include/Utilities/Units.hpp"
+/// #include "Acts/include/Utilities/Units.hpp"
 /// using namespace Acts::units;
 /// // specify input variables
 /// double momentum = 2.5 * _GeV;
@@ -153,7 +153,7 @@ namespace units {
   /// This function converts the given energy value from SI units to natural
   /// units. Example:
   /// @code
-  /// #include "ACTS/include/Utilities/Units.hpp"
+  /// #include "Acts/include/Utilities/Units.hpp"
   /// using namespace Acts::units;
   ///
   /// double E_in_TeV = SI2Nat<ENERGY>(2.3 * _J) / _TeV;
@@ -170,7 +170,7 @@ namespace units {
   /// This function converts the given energy value from natural units to SI
   /// units. Example:
   /// @code
-  /// #include "ACTS/include/Utilities/Units.hpp"
+  /// #include "Acts/include/Utilities/Units.hpp"
   /// using namespace Acts::units;
   ///
   /// double E_in_Joule = Nat2SI<ENERGY>(2.3 * _TeV) / _J;
@@ -187,7 +187,7 @@ namespace units {
   /// This function converts the given length value from SI units to natural
   /// units. Example:
   /// @code
-  /// #include "ACTS/include/Utilities/Units.hpp"
+  /// #include "Acts/include/Utilities/Units.hpp"
   /// using namespace Acts::units;
   ///
   /// double l_per_MeV = SI2Nat<LENGTH>(3 * _um) * _MeV;
@@ -204,7 +204,7 @@ namespace units {
   /// This function converts the given length value from natural units to SI
   /// units. Example:
   /// @code
-  /// #include "ACTS/include/Utilities/Units.hpp"
+  /// #include "Acts/include/Utilities/Units.hpp"
   /// using namespace Acts::units;
   ///
   /// double l_in_m = Nat2SI<LENGTH>(1. / (2 * _TeV)) / _m;
@@ -221,7 +221,7 @@ namespace units {
   /// This function converts the given momentum value from SI units to natural
   /// units. Example:
   /// @code
-  /// #include "ACTS/include/Utilities/Units.hpp"
+  /// #include "Acts/include/Utilities/Units.hpp"
   /// using namespace Acts::units;
   ///
   /// double p_in_GeV = SI2Nat<MOMENTUM>(2 * _N * _s) / _GeV;
@@ -238,7 +238,7 @@ namespace units {
   /// This function converts the given momentum value from natural units to SI
   /// units. Example:
   /// @code
-  /// #include "ACTS/include/Utilities/Units.hpp"
+  /// #include "Acts/include/Utilities/Units.hpp"
   /// using namespace Acts::units;
   ///
   /// double p_in_Ns = Nat2SI<MOMENTUM>(132 * _GeV) / (_N * _s);
@@ -255,7 +255,7 @@ namespace units {
   /// This function converts the given mass value from SI units to natural
   /// units. Example:
   /// @code
-  /// #include "ACTS/include/Utilities/Units.hpp"
+  /// #include "Acts/include/Utilities/Units.hpp"
   /// using namespace Acts::units;
   ///
   /// double m_in_keV = SI2Nat<MASS>(2 * _g) / _keV;
@@ -272,7 +272,7 @@ namespace units {
   /// This function converts the given mass value from natural units to SI
   /// units. Example:
   /// @code
-  /// #include "ACTS/include/Utilities/Units.hpp"
+  /// #include "Acts/include/Utilities/Units.hpp"
   /// using namespace Acts::units;
   ///
   /// double higgs_in_kg= Nat2SI<MASS>(125 * _GeV) / _kg;
diff --git a/Core/include/ACTS/Utilities/VariantData.hpp b/Core/include/Acts/Utilities/VariantData.hpp
similarity index 99%
rename from Core/include/ACTS/Utilities/VariantData.hpp
rename to Core/include/Acts/Utilities/VariantData.hpp
index 27886ddca3d7c826d9039fb424ead1c831d6f51e..b9de57277c2d7dfec387c43ae9d199a4de054e74 100644
--- a/Core/include/ACTS/Utilities/VariantData.hpp
+++ b/Core/include/Acts/Utilities/VariantData.hpp
@@ -17,8 +17,8 @@
 #include <sstream>
 #include <vector>
 
-#include "ACTS/Utilities/Definitions.hpp"
-#include "ACTS/Utilities/ThrowAssert.hpp"
+#include "Acts/Utilities/Definitions.hpp"
+#include "Acts/Utilities/ThrowAssert.hpp"
 
 namespace Acts {
 
diff --git a/Core/include/ACTS/Utilities/VariantDataFwd.hpp b/Core/include/Acts/Utilities/VariantDataFwd.hpp
similarity index 100%
rename from Core/include/ACTS/Utilities/VariantDataFwd.hpp
rename to Core/include/Acts/Utilities/VariantDataFwd.hpp
diff --git a/Core/include/ACTS/Utilities/concept/AnyGrid.hpp b/Core/include/Acts/Utilities/concept/AnyGrid.hpp
similarity index 100%
rename from Core/include/ACTS/Utilities/concept/AnyGrid.hpp
rename to Core/include/Acts/Utilities/concept/AnyGrid.hpp
diff --git a/Core/include/ACTS/Utilities/detail/Axis.hpp b/Core/include/Acts/Utilities/detail/Axis.hpp
similarity index 99%
rename from Core/include/ACTS/Utilities/detail/Axis.hpp
rename to Core/include/Acts/Utilities/detail/Axis.hpp
index a5d22da1523186d4d321b59392807c1591216698..517a8b7e9aeda174f084fd6b34a90acc157ac5e6 100644
--- a/Core/include/ACTS/Utilities/detail/Axis.hpp
+++ b/Core/include/Acts/Utilities/detail/Axis.hpp
@@ -12,7 +12,7 @@
 #include <cmath>
 #include <set>
 #include <vector>
-#include "ACTS/Utilities/IAxis.hpp"
+#include "Acts/Utilities/IAxis.hpp"
 
 namespace Acts {
 
diff --git a/Core/include/ACTS/Utilities/detail/DefaultParameterDefinitions.hpp b/Core/include/Acts/Utilities/detail/DefaultParameterDefinitions.hpp
similarity index 97%
rename from Core/include/ACTS/Utilities/detail/DefaultParameterDefinitions.hpp
rename to Core/include/Acts/Utilities/detail/DefaultParameterDefinitions.hpp
index 8cca1da7bd7b3e33d259f1f2742a717f2af562ce..46e79949834fdf9b4553decbcb027789ea045ff2 100644
--- a/Core/include/ACTS/Utilities/detail/DefaultParameterDefinitions.hpp
+++ b/Core/include/Acts/Utilities/detail/DefaultParameterDefinitions.hpp
@@ -13,7 +13,7 @@
 #include <cmath>
 
 // ACTS includes
-#include "ACTS/Utilities/ParameterTypes.hpp"
+#include "Acts/Utilities/ParameterTypes.hpp"
 
 namespace Acts {
 enum ParDef : unsigned int {
diff --git a/Core/include/ACTS/Utilities/detail/Grid.hpp b/Core/include/Acts/Utilities/detail/Grid.hpp
similarity index 99%
rename from Core/include/ACTS/Utilities/detail/Grid.hpp
rename to Core/include/Acts/Utilities/detail/Grid.hpp
index 29c37d71ff42e3e956cda8c20cee25bc0cb15a0c..306edd42143ad9c963a26cd87581c4b2c1c87471 100644
--- a/Core/include/ACTS/Utilities/detail/Grid.hpp
+++ b/Core/include/Acts/Utilities/detail/Grid.hpp
@@ -14,9 +14,9 @@
 #include <tuple>
 #include <type_traits>
 #include <vector>
-#include "ACTS/Utilities/IAxis.hpp"
-#include "ACTS/Utilities/Interpolation.hpp"
-#include "ACTS/Utilities/detail/grid_helper.hpp"
+#include "Acts/Utilities/IAxis.hpp"
+#include "Acts/Utilities/Interpolation.hpp"
+#include "Acts/Utilities/detail/grid_helper.hpp"
 
 namespace Acts {
 
diff --git a/Core/include/ACTS/Utilities/detail/MPL/all_of.hpp b/Core/include/Acts/Utilities/detail/MPL/all_of.hpp
similarity index 100%
rename from Core/include/ACTS/Utilities/detail/MPL/all_of.hpp
rename to Core/include/Acts/Utilities/detail/MPL/all_of.hpp
diff --git a/Core/include/ACTS/Utilities/detail/MPL/any_of.hpp b/Core/include/Acts/Utilities/detail/MPL/any_of.hpp
similarity index 100%
rename from Core/include/ACTS/Utilities/detail/MPL/any_of.hpp
rename to Core/include/Acts/Utilities/detail/MPL/any_of.hpp
diff --git a/Core/include/ACTS/Utilities/detail/MPL/are_sorted.hpp b/Core/include/Acts/Utilities/detail/MPL/are_sorted.hpp
similarity index 100%
rename from Core/include/ACTS/Utilities/detail/MPL/are_sorted.hpp
rename to Core/include/Acts/Utilities/detail/MPL/are_sorted.hpp
diff --git a/Core/include/ACTS/Utilities/detail/MPL/are_within.hpp b/Core/include/Acts/Utilities/detail/MPL/are_within.hpp
similarity index 100%
rename from Core/include/ACTS/Utilities/detail/MPL/are_within.hpp
rename to Core/include/Acts/Utilities/detail/MPL/are_within.hpp
diff --git a/Core/include/ACTS/Utilities/detail/MPL/at_index.hpp b/Core/include/Acts/Utilities/detail/MPL/at_index.hpp
similarity index 100%
rename from Core/include/ACTS/Utilities/detail/MPL/at_index.hpp
rename to Core/include/Acts/Utilities/detail/MPL/at_index.hpp
diff --git a/Core/include/ACTS/Utilities/detail/MPL/boost_mpl_helper.hpp b/Core/include/Acts/Utilities/detail/MPL/boost_mpl_helper.hpp
similarity index 100%
rename from Core/include/ACTS/Utilities/detail/MPL/boost_mpl_helper.hpp
rename to Core/include/Acts/Utilities/detail/MPL/boost_mpl_helper.hpp
diff --git a/Core/include/ACTS/Utilities/detail/MPL/get_position.hpp b/Core/include/Acts/Utilities/detail/MPL/get_position.hpp
similarity index 100%
rename from Core/include/ACTS/Utilities/detail/MPL/get_position.hpp
rename to Core/include/Acts/Utilities/detail/MPL/get_position.hpp
diff --git a/Core/include/ACTS/Utilities/detail/MPL/has_duplicates.hpp b/Core/include/Acts/Utilities/detail/MPL/has_duplicates.hpp
similarity index 100%
rename from Core/include/ACTS/Utilities/detail/MPL/has_duplicates.hpp
rename to Core/include/Acts/Utilities/detail/MPL/has_duplicates.hpp
diff --git a/Core/include/ACTS/Utilities/detail/MPL/is_contained.hpp b/Core/include/Acts/Utilities/detail/MPL/is_contained.hpp
similarity index 100%
rename from Core/include/ACTS/Utilities/detail/MPL/is_contained.hpp
rename to Core/include/Acts/Utilities/detail/MPL/is_contained.hpp
diff --git a/Core/include/ACTS/Utilities/detail/MPL/type_collector.hpp b/Core/include/Acts/Utilities/detail/MPL/type_collector.hpp
similarity index 98%
rename from Core/include/ACTS/Utilities/detail/MPL/type_collector.hpp
rename to Core/include/Acts/Utilities/detail/MPL/type_collector.hpp
index 9b2934ad716721d9cb0c67a145df11608156a8b8..a81396cf048d708e5172690bd1683714b0a5e28e 100644
--- a/Core/include/ACTS/Utilities/detail/MPL/type_collector.hpp
+++ b/Core/include/Acts/Utilities/detail/MPL/type_collector.hpp
@@ -11,7 +11,7 @@
 
 #include <boost/mpl/set.hpp>
 #include <type_traits>
-#include "ACTS/Utilities/detail/MPL/boost_mpl_helper.hpp"
+#include "Acts/Utilities/detail/MPL/boost_mpl_helper.hpp"
 namespace bm = boost::mpl;
 
 #define HAS_TYPE(x)                                                            \
diff --git a/Core/include/ACTS/Utilities/detail/MatrixBasePlugin.hpp b/Core/include/Acts/Utilities/detail/MatrixBasePlugin.hpp
similarity index 100%
rename from Core/include/ACTS/Utilities/detail/MatrixBasePlugin.hpp
rename to Core/include/Acts/Utilities/detail/MatrixBasePlugin.hpp
diff --git a/Core/include/ACTS/Utilities/detail/MatrixPlugin.hpp b/Core/include/Acts/Utilities/detail/MatrixPlugin.hpp
similarity index 100%
rename from Core/include/ACTS/Utilities/detail/MatrixPlugin.hpp
rename to Core/include/Acts/Utilities/detail/MatrixPlugin.hpp
diff --git a/Core/include/ACTS/Utilities/detail/RealQuadraticEquation.hpp b/Core/include/Acts/Utilities/detail/RealQuadraticEquation.hpp
similarity index 100%
rename from Core/include/ACTS/Utilities/detail/RealQuadraticEquation.hpp
rename to Core/include/Acts/Utilities/detail/RealQuadraticEquation.hpp
diff --git a/Core/include/ACTS/Utilities/detail/TransformPlugin.hpp b/Core/include/Acts/Utilities/detail/TransformPlugin.hpp
similarity index 100%
rename from Core/include/ACTS/Utilities/detail/TransformPlugin.hpp
rename to Core/include/Acts/Utilities/detail/TransformPlugin.hpp
diff --git a/Core/include/ACTS/Utilities/detail/grid_helper.hpp b/Core/include/Acts/Utilities/detail/grid_helper.hpp
similarity index 99%
rename from Core/include/ACTS/Utilities/detail/grid_helper.hpp
rename to Core/include/Acts/Utilities/detail/grid_helper.hpp
index 419c9b6fb1bba4952160a12b40687d2e59ba909a..0dd7fdc784c8babd96547eb8d4523c60553fa615 100644
--- a/Core/include/ACTS/Utilities/detail/grid_helper.hpp
+++ b/Core/include/Acts/Utilities/detail/grid_helper.hpp
@@ -11,7 +11,7 @@
 #include <array>
 #include <tuple>
 #include <utility>
-#include "ACTS/Utilities/IAxis.hpp"
+#include "Acts/Utilities/IAxis.hpp"
 
 namespace Acts {
 
diff --git a/Core/include/ACTS/Utilities/detail/interpolation_impl.hpp b/Core/include/Acts/Utilities/detail/interpolation_impl.hpp
similarity index 100%
rename from Core/include/ACTS/Utilities/detail/interpolation_impl.hpp
rename to Core/include/Acts/Utilities/detail/interpolation_impl.hpp
diff --git a/Core/include/ACTS/Utilities/detail/periodic.hpp b/Core/include/Acts/Utilities/detail/periodic.hpp
similarity index 100%
rename from Core/include/ACTS/Utilities/detail/periodic.hpp
rename to Core/include/Acts/Utilities/detail/periodic.hpp
diff --git a/Core/include/ACTS/Volumes/AbstractVolume.hpp b/Core/include/Acts/Volumes/AbstractVolume.hpp
similarity index 95%
rename from Core/include/ACTS/Volumes/AbstractVolume.hpp
rename to Core/include/Acts/Volumes/AbstractVolume.hpp
index 640ad17de4b5b0828428843b9a961493561ae784..586bf3cd93cda448353e313a489f3609fd031d45 100644
--- a/Core/include/ACTS/Volumes/AbstractVolume.hpp
+++ b/Core/include/Acts/Volumes/AbstractVolume.hpp
@@ -14,9 +14,9 @@
 #define ACTS_VOLUMES_ABSTRACTVOLUME_H
 
 #include <vector>
-#include "ACTS/Utilities/Definitions.hpp"
-#include "ACTS/Volumes/BoundarySurfaceT.hpp"
-#include "ACTS/Volumes/Volume.hpp"
+#include "Acts/Utilities/Definitions.hpp"
+#include "Acts/Volumes/BoundarySurfaceT.hpp"
+#include "Acts/Volumes/Volume.hpp"
 
 namespace Acts {
 
diff --git a/Core/include/ACTS/Volumes/BoundarySurfaceFace.hpp b/Core/include/Acts/Volumes/BoundarySurfaceFace.hpp
similarity index 100%
rename from Core/include/ACTS/Volumes/BoundarySurfaceFace.hpp
rename to Core/include/Acts/Volumes/BoundarySurfaceFace.hpp
diff --git a/Core/include/ACTS/Volumes/BoundarySurfaceT.hpp b/Core/include/Acts/Volumes/BoundarySurfaceT.hpp
similarity index 97%
rename from Core/include/ACTS/Volumes/BoundarySurfaceT.hpp
rename to Core/include/Acts/Volumes/BoundarySurfaceT.hpp
index 05aab1957988c2e9a8a1a0ce8500ee6663cf4930..922de6dc7641e52a05dcf658403e3c3b6d1a5f5c 100644
--- a/Core/include/ACTS/Volumes/BoundarySurfaceT.hpp
+++ b/Core/include/Acts/Volumes/BoundarySurfaceT.hpp
@@ -14,10 +14,10 @@
 #define ACTS_VOLUMES_BOUNDARYSURFACET_H
 
 #include <memory>
-#include "ACTS/Utilities/BinnedArray.hpp"
-#include "ACTS/Utilities/Definitions.hpp"
-#include "ACTS/Volumes/BoundarySurfaceFace.hpp"
-#include "ACTS/Volumes/Volume.hpp"
+#include "Acts/Utilities/BinnedArray.hpp"
+#include "Acts/Utilities/Definitions.hpp"
+#include "Acts/Volumes/BoundarySurfaceFace.hpp"
+#include "Acts/Volumes/Volume.hpp"
 
 namespace Acts {
 
diff --git a/Core/include/ACTS/Volumes/CuboidVolumeBounds.hpp b/Core/include/Acts/Volumes/CuboidVolumeBounds.hpp
similarity index 98%
rename from Core/include/ACTS/Volumes/CuboidVolumeBounds.hpp
rename to Core/include/Acts/Volumes/CuboidVolumeBounds.hpp
index 6fac20d65c5ca40d9ff8453d2c352dc3b4738e68..46a9fe27029c306956da3150f53a4ee729281f86 100644
--- a/Core/include/ACTS/Volumes/CuboidVolumeBounds.hpp
+++ b/Core/include/Acts/Volumes/CuboidVolumeBounds.hpp
@@ -14,8 +14,8 @@
 #define ACTS_VOLUMES_CUBOIDVOLUMESBOUNDS_H 1
 
 #include <cmath>
-#include "ACTS/Utilities/Definitions.hpp"
-#include "ACTS/Volumes/VolumeBounds.hpp"
+#include "Acts/Utilities/Definitions.hpp"
+#include "Acts/Volumes/VolumeBounds.hpp"
 
 namespace Acts {
 
diff --git a/Core/include/ACTS/Volumes/CylinderVolumeBounds.hpp b/Core/include/Acts/Volumes/CylinderVolumeBounds.hpp
similarity index 99%
rename from Core/include/ACTS/Volumes/CylinderVolumeBounds.hpp
rename to Core/include/Acts/Volumes/CylinderVolumeBounds.hpp
index d386f0dc05c326a42296470f182c1bfb60c32a0d..0442ae6459b01f6e513d9b748c2bda36d0c5252a 100644
--- a/Core/include/ACTS/Volumes/CylinderVolumeBounds.hpp
+++ b/Core/include/Acts/Volumes/CylinderVolumeBounds.hpp
@@ -14,8 +14,8 @@
 #define ACTS_VOLUMES_CYLINDERVOLUMESBOUNDS_H 1
 
 #include <cmath>
-#include "ACTS/Utilities/Definitions.hpp"
-#include "ACTS/Volumes/VolumeBounds.hpp"
+#include "Acts/Utilities/Definitions.hpp"
+#include "Acts/Volumes/VolumeBounds.hpp"
 
 namespace Acts {
 
diff --git a/Core/include/ACTS/Volumes/DoubleTrapezoidVolumeBounds.hpp b/Core/include/Acts/Volumes/DoubleTrapezoidVolumeBounds.hpp
similarity index 99%
rename from Core/include/ACTS/Volumes/DoubleTrapezoidVolumeBounds.hpp
rename to Core/include/Acts/Volumes/DoubleTrapezoidVolumeBounds.hpp
index 2e031c61ce4ac29e87daa76e5873a307cd188f6d..9abe816e8af267bf99642e9fa758e60a0f989f94 100644
--- a/Core/include/ACTS/Volumes/DoubleTrapezoidVolumeBounds.hpp
+++ b/Core/include/Acts/Volumes/DoubleTrapezoidVolumeBounds.hpp
@@ -13,8 +13,8 @@
 #ifndef ACTS_VOLUMES_DOUBLETRAPEZOIDVOLUMESBOUNDS_H
 #define ACTS_VOLUMES_DOUBLETRAPEZOIDVOLUMESBOUNDS_H 1
 
-#include "ACTS/Utilities/Definitions.hpp"
-#include "ACTS/Volumes/VolumeBounds.hpp"
+#include "Acts/Utilities/Definitions.hpp"
+#include "Acts/Volumes/VolumeBounds.hpp"
 
 namespace Acts {
 
diff --git a/Core/include/ACTS/Volumes/TrapezoidVolumeBounds.hpp b/Core/include/Acts/Volumes/TrapezoidVolumeBounds.hpp
similarity index 98%
rename from Core/include/ACTS/Volumes/TrapezoidVolumeBounds.hpp
rename to Core/include/Acts/Volumes/TrapezoidVolumeBounds.hpp
index 916938a3540ab16174e6cc9cf821ec8242c95d21..c4552fc41dbb11f5c13da27e573983f1a60175a2 100644
--- a/Core/include/ACTS/Volumes/TrapezoidVolumeBounds.hpp
+++ b/Core/include/Acts/Volumes/TrapezoidVolumeBounds.hpp
@@ -13,8 +13,8 @@
 #ifndef ACTS_VOLUMES_TRAPEZOIDVOLUMESBOUNDS_H
 #define ACTS_VOLUMES_TRAPEZOIDVOLUMESBOUNDS_H 1
 
-#include "ACTS/Utilities/Definitions.hpp"
-#include "ACTS/Volumes/VolumeBounds.hpp"
+#include "Acts/Utilities/Definitions.hpp"
+#include "Acts/Volumes/VolumeBounds.hpp"
 
 namespace Acts {
 
diff --git a/Core/include/ACTS/Volumes/Volume.hpp b/Core/include/Acts/Volumes/Volume.hpp
similarity index 95%
rename from Core/include/ACTS/Volumes/Volume.hpp
rename to Core/include/Acts/Volumes/Volume.hpp
index fcf08b9d32d85d70ecb39986d57f48665177d2ce..e48923435fe8e85a35bd2fd1939a38a3c6abdf6f 100644
--- a/Core/include/ACTS/Volumes/Volume.hpp
+++ b/Core/include/Acts/Volumes/Volume.hpp
@@ -13,9 +13,9 @@
 #define ACTS_VOLUMES_VOLUME_H 1
 
 #include <memory>
-#include "ACTS/Utilities/Definitions.hpp"
-#include "ACTS/Utilities/GeometryObject.hpp"
-#include "ACTS/Utilities/GeometryStatics.hpp"
+#include "Acts/Utilities/Definitions.hpp"
+#include "Acts/Utilities/GeometryObject.hpp"
+#include "Acts/Utilities/GeometryStatics.hpp"
 
 namespace Acts {
 
diff --git a/Core/include/ACTS/Volumes/VolumeBounds.hpp b/Core/include/Acts/Volumes/VolumeBounds.hpp
similarity index 97%
rename from Core/include/ACTS/Volumes/VolumeBounds.hpp
rename to Core/include/Acts/Volumes/VolumeBounds.hpp
index 177c7074c5193a6f064c900466890164fecd6b44..8143f2522a803e65af92dd8240cdce728fad9444 100644
--- a/Core/include/ACTS/Volumes/VolumeBounds.hpp
+++ b/Core/include/Acts/Volumes/VolumeBounds.hpp
@@ -16,8 +16,8 @@
 #include <iomanip>
 #include <iostream>
 #include <memory>
-#include "ACTS/Utilities/BinningType.hpp"
-#include "ACTS/Utilities/Definitions.hpp"
+#include "Acts/Utilities/BinningType.hpp"
+#include "Acts/Utilities/Definitions.hpp"
 
 namespace Acts {
 
diff --git a/Core/src/Detector/DetachedTrackingVolume.cpp b/Core/src/Detector/DetachedTrackingVolume.cpp
index a1c8f175d11586de4192dd59c82a3148d91fab11..66a5c7150953a38fa17ff8681aafb8b41b6e47c2 100644
--- a/Core/src/Detector/DetachedTrackingVolume.cpp
+++ b/Core/src/Detector/DetachedTrackingVolume.cpp
@@ -11,9 +11,9 @@
 ///////////////////////////////////////////////////////////////////
 
 // Geometry module
-#include "ACTS/Detector/DetachedTrackingVolume.hpp"
-#include "ACTS/Detector/TrackingVolume.hpp"
-#include "ACTS/Layers/Layer.hpp"
+#include "Acts/Detector/DetachedTrackingVolume.hpp"
+#include "Acts/Detector/TrackingVolume.hpp"
+#include "Acts/Layers/Layer.hpp"
 
 Acts::DetachedTrackingVolume::DetachedTrackingVolume()
   : m_name("undefined")
diff --git a/Core/src/Detector/GlueVolumesDescriptor.cpp b/Core/src/Detector/GlueVolumesDescriptor.cpp
index 776491920ebe70bc6163ffa3f7eac1cf761d45e8..4b3a5b4fe7ddf21e0e2464781e882b58fb857b31 100644
--- a/Core/src/Detector/GlueVolumesDescriptor.cpp
+++ b/Core/src/Detector/GlueVolumesDescriptor.cpp
@@ -10,8 +10,8 @@
 // GlueVolumesDescriptor.cpp, ACTS project
 ///////////////////////////////////////////////////////////////////
 
-#include "ACTS/Detector/GlueVolumesDescriptor.hpp"
-#include "ACTS/Detector/TrackingVolume.hpp"
+#include "Acts/Detector/GlueVolumesDescriptor.hpp"
+#include "Acts/Detector/TrackingVolume.hpp"
 
 Acts::GlueVolumesDescriptor::GlueVolumesDescriptor(
     const std::map<BoundarySurfaceFace,
diff --git a/Core/src/Detector/TrackingGeometry.cpp b/Core/src/Detector/TrackingGeometry.cpp
index f85b445503b0962e22af3323689d620727a3cc3e..fd99adb2158b116e4acec8e1c541d3e7fc9d6109 100644
--- a/Core/src/Detector/TrackingGeometry.cpp
+++ b/Core/src/Detector/TrackingGeometry.cpp
@@ -10,12 +10,12 @@
 // TrackingGeometry.cpp, ACTS project
 ///////////////////////////////////////////////////////////////////
 
-#include "ACTS/Detector/TrackingGeometry.hpp"
-#include "ACTS/Detector/DetachedTrackingVolume.hpp"
-#include "ACTS/Detector/TrackingVolume.hpp"
-#include "ACTS/Layers/Layer.hpp"
-#include "ACTS/Surfaces/PerigeeSurface.hpp"
-#include "ACTS/Surfaces/Surface.hpp"
+#include "Acts/Detector/TrackingGeometry.hpp"
+#include "Acts/Detector/DetachedTrackingVolume.hpp"
+#include "Acts/Detector/TrackingVolume.hpp"
+#include "Acts/Layers/Layer.hpp"
+#include "Acts/Surfaces/PerigeeSurface.hpp"
+#include "Acts/Surfaces/Surface.hpp"
 
 Acts::TrackingGeometry::TrackingGeometry(MutableTrackingVolumePtr highestVolume)
   : m_world(highestVolume)
diff --git a/Core/src/Detector/TrackingVolume.cpp b/Core/src/Detector/TrackingVolume.cpp
index add559792cef5a702d1c59617e5a3cb90666b20b..e084094c68d35533362b89da03723d585cc88461 100644
--- a/Core/src/Detector/TrackingVolume.cpp
+++ b/Core/src/Detector/TrackingVolume.cpp
@@ -10,13 +10,13 @@
 // TrackingVolume.cpp, ACTS project
 ///////////////////////////////////////////////////////////////////
 
-#include "ACTS/Detector/TrackingVolume.hpp"
-#include "ACTS/Detector/DetachedTrackingVolume.hpp"
-#include "ACTS/Detector/GlueVolumesDescriptor.hpp"
-#include "ACTS/Material/Material.hpp"
-#include "ACTS/Surfaces/Surface.hpp"
-#include "ACTS/Utilities/BinUtility.hpp"
-#include "ACTS/Volumes/VolumeBounds.hpp"
+#include "Acts/Detector/TrackingVolume.hpp"
+#include "Acts/Detector/DetachedTrackingVolume.hpp"
+#include "Acts/Detector/GlueVolumesDescriptor.hpp"
+#include "Acts/Material/Material.hpp"
+#include "Acts/Surfaces/Surface.hpp"
+#include "Acts/Utilities/BinUtility.hpp"
+#include "Acts/Volumes/VolumeBounds.hpp"
 
 Acts::TrackingVolume::TrackingVolume()
   : Volume()
diff --git a/Core/src/Digitization/CartesianSegmentation.cpp b/Core/src/Digitization/CartesianSegmentation.cpp
index 07e710fa51ab8ad2f796eb9befefffafda032d38..c1f45bd43215230aa8eca29d3b91c8d92c880294 100644
--- a/Core/src/Digitization/CartesianSegmentation.cpp
+++ b/Core/src/Digitization/CartesianSegmentation.cpp
@@ -10,10 +10,10 @@
 // CartesianSegmentation.cpp, ACTS project
 ///////////////////////////////////////////////////////////////////
 
-#include "ACTS/Digitization/CartesianSegmentation.hpp"
-#include "ACTS/Surfaces/PlaneSurface.hpp"
-#include "ACTS/Surfaces/RectangleBounds.hpp"
-#include "ACTS/Utilities/Helpers.hpp"
+#include "Acts/Digitization/CartesianSegmentation.hpp"
+#include "Acts/Surfaces/PlaneSurface.hpp"
+#include "Acts/Surfaces/RectangleBounds.hpp"
+#include "Acts/Utilities/Helpers.hpp"
 
 Acts::CartesianSegmentation::CartesianSegmentation(
     std::shared_ptr<const PlanarBounds> mBounds,
diff --git a/Core/src/Digitization/DigitizationModule.cpp b/Core/src/Digitization/DigitizationModule.cpp
index c675a7b1f8e9851ecbc45ba26e5223a9be85ee67..31bb955f0875286a5d924f20debe8960e866fec4 100644
--- a/Core/src/Digitization/DigitizationModule.cpp
+++ b/Core/src/Digitization/DigitizationModule.cpp
@@ -10,7 +10,7 @@
 // DigitizationModule.cpp, ACTS project
 ///////////////////////////////////////////////////////////////////
 
-#include "ACTS/Digitization/DigitizationModule.hpp"
+#include "Acts/Digitization/DigitizationModule.hpp"
 
 Acts::DigitizationModule::DigitizationModule(
     std::shared_ptr<const Segmentation> moduleSegmentation,
diff --git a/Core/src/Digitization/PlanarModuleStepper.cpp b/Core/src/Digitization/PlanarModuleStepper.cpp
index e32a71d76f37a01f673abc2ae9cffeb43509195f..a92f5dd5258807fc3e8f0500177d75cb2372d2ca 100644
--- a/Core/src/Digitization/PlanarModuleStepper.cpp
+++ b/Core/src/Digitization/PlanarModuleStepper.cpp
@@ -10,11 +10,11 @@
 // PlanarModuleStepper.cpp, ACTS project
 ///////////////////////////////////////////////////////////////////
 
-#include "ACTS/Digitization//PlanarModuleStepper.hpp"
-#include "ACTS/Digitization/DigitizationModule.hpp"
-#include "ACTS/Surfaces/Surface.hpp"
-#include "ACTS/Utilities/Definitions.hpp"
-#include "ACTS/Utilities/Intersection.hpp"
+#include "Acts/Digitization//PlanarModuleStepper.hpp"
+#include "Acts/Digitization/DigitizationModule.hpp"
+#include "Acts/Surfaces/Surface.hpp"
+#include "Acts/Utilities/Definitions.hpp"
+#include "Acts/Utilities/Intersection.hpp"
 
 Acts::PlanarModuleStepper::PlanarModuleStepper(
     const Config&                 pmsConfig,
diff --git a/Core/src/Digitization/PolarSegmentation.cpp b/Core/src/Digitization/PolarSegmentation.cpp
index 4771fe3ac5bbb855569af91b3b54cba3b506d91e..31893d0d2bb1bbab91bad1749f54fe98690bfda1 100644
--- a/Core/src/Digitization/PolarSegmentation.cpp
+++ b/Core/src/Digitization/PolarSegmentation.cpp
@@ -11,11 +11,11 @@
 ///////////////////////////////////////////////////////////////////
 
 /*
-#include "ACTS/Digitization/PolarSegmentation.hpp"
-#include "ACTS/Surfaces/PlaneSurface.hpp"
-#include "ACTS/Surfaces/RectangleBounds.hpp"
-#include "ACTS/Surfaces/TrapezoidBounds.hpp"
-#include "ACTS/Utilities/Helpers.hpp"
+#include "Acts/Digitization/PolarSegmentation.hpp"
+#include "Acts/Surfaces/PlaneSurface.hpp"
+#include "Acts/Surfaces/RectangleBounds.hpp"
+#include "Acts/Surfaces/TrapezoidBounds.hpp"
+#include "Acts/Utilities/Helpers.hpp"
 
 Acts::TrapezoidSegmentation::TrapezoidSegmentation(
     std::shared_ptr<const TrapezoidBounds> mBounds,
diff --git a/Core/src/EventData/NeutralParameters.cpp b/Core/src/EventData/NeutralParameters.cpp
index d5f667523b480d19947fcce374fcf7c4fffb3321..96f93a25ecfb710211797c2f9c4018e77a21dbe0 100644
--- a/Core/src/EventData/NeutralParameters.cpp
+++ b/Core/src/EventData/NeutralParameters.cpp
@@ -6,7 +6,7 @@
 // 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/.
 
-#include "ACTS/EventData/NeutralParameters.hpp"
+#include "Acts/EventData/NeutralParameters.hpp"
 
 namespace Acts {
 template class SingleTrackParameters<NeutralPolicy>;
diff --git a/Core/src/EventData/TrackParameters.cpp b/Core/src/EventData/TrackParameters.cpp
index 502786d196f5cb7290c84ca59bf062d769d37d4e..cedfb08dfd21a06646a0e104a7820c22a8c0f7f1 100644
--- a/Core/src/EventData/TrackParameters.cpp
+++ b/Core/src/EventData/TrackParameters.cpp
@@ -6,7 +6,7 @@
 // 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/.
 
-#include "ACTS/EventData/TrackParameters.hpp"
+#include "Acts/EventData/TrackParameters.hpp"
 
 namespace Acts {
 template class SingleTrackParameters<ChargedPolicy>;
diff --git a/Core/src/EventData/TrackParametersBase.cpp b/Core/src/EventData/TrackParametersBase.cpp
index 4b7383bc7912ffacc11566118e2209e1d2ac1bd7..21c371d63512c9f27c7c9a5d6096c158b2c0a60b 100644
--- a/Core/src/EventData/TrackParametersBase.cpp
+++ b/Core/src/EventData/TrackParametersBase.cpp
@@ -10,7 +10,7 @@
 #include <iomanip>
 
 // ACTS include(s)
-#include "ACTS/EventData/TrackParametersBase.hpp"
+#include "Acts/EventData/TrackParametersBase.hpp"
 
 namespace Acts {
 std::ostream&
diff --git a/Core/src/EventData/TransportJacobian.cpp b/Core/src/EventData/TransportJacobian.cpp
index 7843959bb777c3a64dc2539ffcdbde0c8b0756a2..bfd7329ba15cf505c705aa0ba0387c0d3b21e449 100644
--- a/Core/src/EventData/TransportJacobian.cpp
+++ b/Core/src/EventData/TransportJacobian.cpp
@@ -10,7 +10,7 @@
 // TransportJacobian.cpp, ACTS project
 ///////////////////////////////////////////////////////////////////
 
-#include "ACTS/EventData/TransportJacobian.hpp"
+#include "Acts/EventData/TransportJacobian.hpp"
 #include <iomanip>
 #include <iostream>
 
diff --git a/Core/src/GeometryUtils/BinUtility.cpp b/Core/src/GeometryUtils/BinUtility.cpp
index 8f62df3165a117dc916c104bd542bc5c093ae5da..0bdd145658f6f2b1f12b217bb05999bc3f7efc24 100644
--- a/Core/src/GeometryUtils/BinUtility.cpp
+++ b/Core/src/GeometryUtils/BinUtility.cpp
@@ -11,7 +11,7 @@
 ///////////////////////////////////////////////////////////////////
 
 // Trk
-#include "ACTS/Utilities/BinUtility.hpp"
+#include "Acts/Utilities/BinUtility.hpp"
 
 // STD/STL
 #include <iostream>
diff --git a/Core/src/GeometryUtils/GeometryID.cpp b/Core/src/GeometryUtils/GeometryID.cpp
index 4bd0126a93732b0f77b37df3abfae5e9f0fd9c39..7800ad9ce2abbf4cc26b0ef30b3fc1a84c40d9e5 100644
--- a/Core/src/GeometryUtils/GeometryID.cpp
+++ b/Core/src/GeometryUtils/GeometryID.cpp
@@ -10,7 +10,7 @@
 // GeometryIDCalculator.cpp, ACTS project
 ///////////////////////////////////////////////////////////////////
 
-#include "ACTS/Utilities/GeometryID.hpp"
+#include "Acts/Utilities/GeometryID.hpp"
 
 bool
 Acts::operator<(const Acts::GeometryID& one, const Acts::GeometryID& two)
diff --git a/Core/src/Layers/ConeLayer.cpp b/Core/src/Layers/ConeLayer.cpp
index a1cd62ef87e90852af5cdcd271559207f8e0a114..d468a5dc25b9625198d5dcf7e66c100e6c6d26f6 100644
--- a/Core/src/Layers/ConeLayer.cpp
+++ b/Core/src/Layers/ConeLayer.cpp
@@ -10,10 +10,10 @@
 // ConeLayer.cpp, ACTS project
 ///////////////////////////////////////////////////////////////////
 
-#include "ACTS/Layers/ConeLayer.hpp"
-#include "ACTS/EventData/TrackParameters.hpp"
-#include "ACTS/Surfaces/ConeBounds.hpp"
-#include "ACTS/Utilities/Definitions.hpp"
+#include "Acts/Layers/ConeLayer.hpp"
+#include "Acts/EventData/TrackParameters.hpp"
+#include "Acts/Surfaces/ConeBounds.hpp"
+#include "Acts/Utilities/Definitions.hpp"
 
 Acts::ConeLayer::ConeLayer(std::shared_ptr<const Transform3D>  transform,
                            std::shared_ptr<const ConeBounds>   cbounds,
diff --git a/Core/src/Layers/CylinderLayer.cpp b/Core/src/Layers/CylinderLayer.cpp
index 2031d5371efa49c87b17dc79a7d66dc60ce4aac3..7266194be628a64f78a25b7c6e73a3fa5d9ef234 100644
--- a/Core/src/Layers/CylinderLayer.cpp
+++ b/Core/src/Layers/CylinderLayer.cpp
@@ -10,17 +10,17 @@
 // CylinderLayer.cpp, ACTS project
 ///////////////////////////////////////////////////////////////////
 
-#include "ACTS/Layers/CylinderLayer.hpp"
-#include "ACTS/Layers/GenericApproachDescriptor.hpp"
-#include "ACTS/Material/SurfaceMaterial.hpp"
-#include "ACTS/Surfaces/CylinderBounds.hpp"
-#include "ACTS/Utilities/BinUtility.hpp"
-#include "ACTS/Utilities/Definitions.hpp"
-#include "ACTS/Utilities/InstanceFactory.hpp"
-#include "ACTS/Utilities/VariantData.hpp"
-#include "ACTS/Volumes/AbstractVolume.hpp"
-#include "ACTS/Volumes/BoundarySurfaceFace.hpp"
-#include "ACTS/Volumes/CylinderVolumeBounds.hpp"
+#include "Acts/Layers/CylinderLayer.hpp"
+#include "Acts/Layers/GenericApproachDescriptor.hpp"
+#include "Acts/Material/SurfaceMaterial.hpp"
+#include "Acts/Surfaces/CylinderBounds.hpp"
+#include "Acts/Utilities/BinUtility.hpp"
+#include "Acts/Utilities/Definitions.hpp"
+#include "Acts/Utilities/InstanceFactory.hpp"
+#include "Acts/Utilities/VariantData.hpp"
+#include "Acts/Volumes/AbstractVolume.hpp"
+#include "Acts/Volumes/BoundarySurfaceFace.hpp"
+#include "Acts/Volumes/CylinderVolumeBounds.hpp"
 
 Acts::CylinderLayer::CylinderLayer(
     std::shared_ptr<const Transform3D>    transform,
diff --git a/Core/src/Layers/DiscLayer.cpp b/Core/src/Layers/DiscLayer.cpp
index a926203778fbe32c978ed65648d44933a5cc323e..a970ffcd8618508127232ccf9e58809ad7454b1e 100644
--- a/Core/src/Layers/DiscLayer.cpp
+++ b/Core/src/Layers/DiscLayer.cpp
@@ -10,18 +10,18 @@
 // DiscLayer.cpp, ACTS project
 ///////////////////////////////////////////////////////////////////
 
-#include "ACTS/Layers/DiscLayer.hpp"
-#include "ACTS/Layers/GenericApproachDescriptor.hpp"
-#include "ACTS/Layers/Layer.hpp"
-#include "ACTS/Material/SurfaceMaterial.hpp"
-#include "ACTS/Surfaces/DiscBounds.hpp"
-#include "ACTS/Surfaces/RadialBounds.hpp"
-#include "ACTS/Utilities/BinUtility.hpp"
-#include "ACTS/Utilities/Definitions.hpp"
-#include "ACTS/Utilities/VariantData.hpp"
-#include "ACTS/Volumes/AbstractVolume.hpp"
-#include "ACTS/Volumes/BoundarySurfaceFace.hpp"
-#include "ACTS/Volumes/CylinderVolumeBounds.hpp"
+#include "Acts/Layers/DiscLayer.hpp"
+#include "Acts/Layers/GenericApproachDescriptor.hpp"
+#include "Acts/Layers/Layer.hpp"
+#include "Acts/Material/SurfaceMaterial.hpp"
+#include "Acts/Surfaces/DiscBounds.hpp"
+#include "Acts/Surfaces/RadialBounds.hpp"
+#include "Acts/Utilities/BinUtility.hpp"
+#include "Acts/Utilities/Definitions.hpp"
+#include "Acts/Utilities/VariantData.hpp"
+#include "Acts/Volumes/AbstractVolume.hpp"
+#include "Acts/Volumes/BoundarySurfaceFace.hpp"
+#include "Acts/Volumes/CylinderVolumeBounds.hpp"
 
 Acts::DiscLayer::DiscLayer(std::shared_ptr<const Transform3D>  transform,
                            std::shared_ptr<const DiscBounds>   dbounds,
diff --git a/Core/src/Layers/Layer.cpp b/Core/src/Layers/Layer.cpp
index bd6c5941a136c722b4447fc6b4d8850b9f3adef5..3c1cb2fc812f790249080ea5331ae6bb8b2b432f 100644
--- a/Core/src/Layers/Layer.cpp
+++ b/Core/src/Layers/Layer.cpp
@@ -11,12 +11,12 @@
 ///////////////////////////////////////////////////////////////////
 
 // Geometry module
-#include "ACTS/Layers/Layer.hpp"
-#include "ACTS/EventData/TrackParameters.hpp"
-#include "ACTS/Material/SurfaceMaterial.hpp"
-#include "ACTS/Surfaces/Surface.hpp"
-#include "ACTS/Utilities/ApproachDescriptor.hpp"
-#include "ACTS/Utilities/BinUtility.hpp"
+#include "Acts/Layers/Layer.hpp"
+#include "Acts/EventData/TrackParameters.hpp"
+#include "Acts/Material/SurfaceMaterial.hpp"
+#include "Acts/Surfaces/Surface.hpp"
+#include "Acts/Utilities/ApproachDescriptor.hpp"
+#include "Acts/Utilities/BinUtility.hpp"
 
 Acts::Layer::Layer(std::unique_ptr<SurfaceArray>       surfaceArray,
                    double                              thickness,
diff --git a/Core/src/Layers/NavigationLayer.cpp b/Core/src/Layers/NavigationLayer.cpp
index 28d25b3950a944f1add3f86c3175db0bb402cc83..5c91d9e817a13f9c9680418e9647f81f2396d720 100644
--- a/Core/src/Layers/NavigationLayer.cpp
+++ b/Core/src/Layers/NavigationLayer.cpp
@@ -10,10 +10,10 @@
 // NavigationLayer.cpp, ACTS project
 ///////////////////////////////////////////////////////////////////
 
-#include "ACTS/Layers/NavigationLayer.hpp"
-#include "ACTS/Surfaces/Surface.hpp"
-#include "ACTS/Utilities/InstanceFactory.hpp"
-#include "ACTS/Utilities/VariantData.hpp"
+#include "Acts/Layers/NavigationLayer.hpp"
+#include "Acts/Surfaces/Surface.hpp"
+#include "Acts/Utilities/InstanceFactory.hpp"
+#include "Acts/Utilities/VariantData.hpp"
 
 Acts::NavigationLayer::NavigationLayer(
     std::unique_ptr<const Surface> surfaceRepresentation,
diff --git a/Core/src/Layers/PlaneLayer.cpp b/Core/src/Layers/PlaneLayer.cpp
index 89d460dde3221a622cb9f880befde7601bb55e65..b88f67dbd6342e21c542e793ca0ef1d4eff1d373 100644
--- a/Core/src/Layers/PlaneLayer.cpp
+++ b/Core/src/Layers/PlaneLayer.cpp
@@ -11,11 +11,11 @@
 ///////////////////////////////////////////////////////////////////
 
 // Geometry module
-#include "ACTS/Layers/PlaneLayer.hpp"
-#include "ACTS/EventData/TrackParameters.hpp"
-#include "ACTS/Layers/GenericApproachDescriptor.hpp"
-#include "ACTS/Utilities/Definitions.hpp"
-#include "ACTS/Utilities/Helpers.hpp"
+#include "Acts/Layers/PlaneLayer.hpp"
+#include "Acts/EventData/TrackParameters.hpp"
+#include "Acts/Layers/GenericApproachDescriptor.hpp"
+#include "Acts/Utilities/Definitions.hpp"
+#include "Acts/Utilities/Helpers.hpp"
 
 Acts::PlaneLayer::PlaneLayer(std::shared_ptr<const Transform3D>   transform,
                              std::shared_ptr<const PlanarBounds>& pbounds,
diff --git a/Core/src/Layers/ProtoLayer.cpp b/Core/src/Layers/ProtoLayer.cpp
index 80c0e87e8e3e46f3e68ebc1488e9d799a618c5c4..4d5d9cb0406bedbb154f8468ac431e209e723bee 100644
--- a/Core/src/Layers/ProtoLayer.cpp
+++ b/Core/src/Layers/ProtoLayer.cpp
@@ -6,7 +6,7 @@
 // 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/.
 
-#include "ACTS/Layers/ProtoLayer.hpp"
+#include "Acts/Layers/ProtoLayer.hpp"
 #include <algorithm>
 
 namespace Acts {
diff --git a/Core/src/Material/BinnedSurfaceMaterial.cpp b/Core/src/Material/BinnedSurfaceMaterial.cpp
index 44a78ad0fe65400e74fb26e638539fa6be23df42..ff59e22923407d6b35d306f0f8a1d286a127ad4c 100644
--- a/Core/src/Material/BinnedSurfaceMaterial.cpp
+++ b/Core/src/Material/BinnedSurfaceMaterial.cpp
@@ -10,8 +10,8 @@
 // BinnedSurfaceMaterial.cpp, ACTS project
 ///////////////////////////////////////////////////////////////////
 
-#include "ACTS/Material/BinnedSurfaceMaterial.hpp"
-#include "ACTS/Material/MaterialProperties.hpp"
+#include "Acts/Material/BinnedSurfaceMaterial.hpp"
+#include "Acts/Material/MaterialProperties.hpp"
 
 Acts::BinnedSurfaceMaterial::BinnedSurfaceMaterial(
     const BinUtility&               binUtility,
diff --git a/Core/src/Material/HomogeneousSurfaceMaterial.cpp b/Core/src/Material/HomogeneousSurfaceMaterial.cpp
index 341a3fb846b3dddd456a7b56d1d1e57831b3d729..312e0649fcbefbcaa6f2a3827061fe0ba77ae8c4 100644
--- a/Core/src/Material/HomogeneousSurfaceMaterial.cpp
+++ b/Core/src/Material/HomogeneousSurfaceMaterial.cpp
@@ -10,8 +10,8 @@
 // HomogeneousSurfaceMaterial.cpp, ACTS project
 ///////////////////////////////////////////////////////////////////
 
-#include "ACTS/Material/HomogeneousSurfaceMaterial.hpp"
-#include "ACTS/Material/MaterialProperties.hpp"
+#include "Acts/Material/HomogeneousSurfaceMaterial.hpp"
+#include "Acts/Material/MaterialProperties.hpp"
 
 Acts::HomogeneousSurfaceMaterial::HomogeneousSurfaceMaterial(
     const MaterialProperties& full,
diff --git a/Core/src/Material/MaterialProperties.cpp b/Core/src/Material/MaterialProperties.cpp
index 60e03eca99960f6d9373eabffd8054a46c1e2711..91888faf187f428030f015db5afbda806fd81a6d 100644
--- a/Core/src/Material/MaterialProperties.cpp
+++ b/Core/src/Material/MaterialProperties.cpp
@@ -10,7 +10,7 @@
 // MaterialProperties.cpp, ACTS project
 ///////////////////////////////////////////////////////////////////
 
-#include "ACTS/Material/MaterialProperties.hpp"
+#include "Acts/Material/MaterialProperties.hpp"
 #include <climits>
 
 Acts::MaterialProperties::MaterialProperties()
diff --git a/Core/src/Material/SurfaceMaterialProxy.cpp b/Core/src/Material/SurfaceMaterialProxy.cpp
index 9a176cb946c6f6af992f27de4c31bf186b755506..4cc167f2b8fe3ea23d392c2848d7be3fb257b23d 100644
--- a/Core/src/Material/SurfaceMaterialProxy.cpp
+++ b/Core/src/Material/SurfaceMaterialProxy.cpp
@@ -10,7 +10,7 @@
 // SurfaceMaterialProxy.cpp, ACTS project
 ///////////////////////////////////////////////////////////////////
 
-#include "ACTS/Material/SurfaceMaterialProxy.hpp"
+#include "Acts/Material/SurfaceMaterialProxy.hpp"
 
 Acts::SurfaceMaterialProxy::SurfaceMaterialProxy()
   : SurfaceMaterial(), m_binUtility(nullptr)
diff --git a/Core/src/Surfaces/ConeBounds.cpp b/Core/src/Surfaces/ConeBounds.cpp
index cce0a04b489d216fa06b802fe580992b9ebef2c9..438bbfb3b25e72d4a74ef6f137414c1be6922575 100644
--- a/Core/src/Surfaces/ConeBounds.cpp
+++ b/Core/src/Surfaces/ConeBounds.cpp
@@ -10,15 +10,15 @@
 // ConeBounds.cpp, ACTS project
 ///////////////////////////////////////////////////////////////////
 
-#include "ACTS/Surfaces/ConeBounds.hpp"
+#include "Acts/Surfaces/ConeBounds.hpp"
 
 #include <cmath>
 #include <iomanip>
 #include <iostream>
 #include <limits>
 
-#include "ACTS/Utilities/VariantData.hpp"
-#include "ACTS/Utilities/detail/periodic.hpp"
+#include "Acts/Utilities/VariantData.hpp"
+#include "Acts/Utilities/detail/periodic.hpp"
 
 Acts::ConeBounds::ConeBounds(double alpha,
                              bool   symm,
diff --git a/Core/src/Surfaces/ConeSurface.cpp b/Core/src/Surfaces/ConeSurface.cpp
index a966ca34b933635622a8d7d72a927152477c4449..50f6752fa019368403fa05703aadc11accf19b82 100644
--- a/Core/src/Surfaces/ConeSurface.cpp
+++ b/Core/src/Surfaces/ConeSurface.cpp
@@ -10,16 +10,16 @@
 // ConeSurface.cpp, ACTS project
 ///////////////////////////////////////////////////////////////////
 
-#include "ACTS/Surfaces/ConeSurface.hpp"
+#include "Acts/Surfaces/ConeSurface.hpp"
 
 #include <cassert>
 #include <cmath>
 #include <iomanip>
 #include <iostream>
 
-#include "ACTS/Utilities/ThrowAssert.hpp"
-#include "ACTS/Utilities/VariantData.hpp"
-#include "ACTS/Utilities/detail/RealQuadraticEquation.hpp"
+#include "Acts/Utilities/ThrowAssert.hpp"
+#include "Acts/Utilities/VariantData.hpp"
+#include "Acts/Utilities/detail/RealQuadraticEquation.hpp"
 
 Acts::ConeSurface::ConeSurface(const ConeSurface& other)
   : GeometryObject(), Surface(other), m_bounds(other.m_bounds)
diff --git a/Core/src/Surfaces/CylinderBounds.cpp b/Core/src/Surfaces/CylinderBounds.cpp
index 6ad646b07293aa5813cd512602c8db508e051fcb..9e5e9c09b77be5610c87992c3fb4176fbd944795 100644
--- a/Core/src/Surfaces/CylinderBounds.cpp
+++ b/Core/src/Surfaces/CylinderBounds.cpp
@@ -10,14 +10,14 @@
 // CylinderBounds.cpp, ACTS project
 ///////////////////////////////////////////////////////////////////
 
-#include "ACTS/Surfaces/CylinderBounds.hpp"
+#include "Acts/Surfaces/CylinderBounds.hpp"
 
 #include <cmath>
 #include <iomanip>
 #include <iostream>
 
-#include "ACTS/Utilities/VariantData.hpp"
-#include "ACTS/Utilities/detail/periodic.hpp"
+#include "Acts/Utilities/VariantData.hpp"
+#include "Acts/Utilities/detail/periodic.hpp"
 
 Acts::CylinderBounds::CylinderBounds(double radius, double halfZ)
   : CylinderBounds(radius, 0, M_PI, halfZ)
diff --git a/Core/src/Surfaces/CylinderSurface.cpp b/Core/src/Surfaces/CylinderSurface.cpp
index d35fd09dbd32ab65dcdb2c140e353e08c5a87111..6903d220fa97162e8ceb8ccd1857bff3b8a22118 100644
--- a/Core/src/Surfaces/CylinderSurface.cpp
+++ b/Core/src/Surfaces/CylinderSurface.cpp
@@ -10,16 +10,16 @@
 // CylinderSurface.cpp, ACTS project
 ///////////////////////////////////////////////////////////////////
 
-#include "ACTS/Surfaces/CylinderSurface.hpp"
+#include "Acts/Surfaces/CylinderSurface.hpp"
 
 #include <cassert>
 #include <cmath>
 #include <iomanip>
 #include <iostream>
 
-#include "ACTS/Utilities/ThrowAssert.hpp"
-#include "ACTS/Utilities/VariantData.hpp"
-#include "ACTS/Utilities/detail/RealQuadraticEquation.hpp"
+#include "Acts/Utilities/ThrowAssert.hpp"
+#include "Acts/Utilities/VariantData.hpp"
+#include "Acts/Utilities/detail/RealQuadraticEquation.hpp"
 
 Acts::CylinderSurface::CylinderSurface(const CylinderSurface& other)
   : GeometryObject(), Surface(other), m_bounds(other.m_bounds)
diff --git a/Core/src/Surfaces/DiamondBounds.cpp b/Core/src/Surfaces/DiamondBounds.cpp
index f0e87c7c74da67862ffc37aeb238a33ab4cd7ffb..47c8568f49cd619ac7eff323c19641abf05c67be 100644
--- a/Core/src/Surfaces/DiamondBounds.cpp
+++ b/Core/src/Surfaces/DiamondBounds.cpp
@@ -10,9 +10,9 @@
 // DiamondBounds.cpp, ACTS project
 ///////////////////////////////////////////////////////////////////
 
-#include "ACTS/Surfaces/DiamondBounds.hpp"
-#include "ACTS/Utilities/ThrowAssert.hpp"
-#include "ACTS/Utilities/VariantData.hpp"
+#include "Acts/Surfaces/DiamondBounds.hpp"
+#include "Acts/Utilities/ThrowAssert.hpp"
+#include "Acts/Utilities/VariantData.hpp"
 
 #include <cmath>
 #include <iomanip>
diff --git a/Core/src/Surfaces/DiscSurface.cpp b/Core/src/Surfaces/DiscSurface.cpp
index 7b0494456bfe75923fd8f6d378dc6a939a458a93..955abb1d5139c6866a56b12e457d99af4ccbf02f 100644
--- a/Core/src/Surfaces/DiscSurface.cpp
+++ b/Core/src/Surfaces/DiscSurface.cpp
@@ -10,19 +10,19 @@
 // DiscSurface.cpp, ACTS project
 ///////////////////////////////////////////////////////////////////
 
-#include "ACTS/Surfaces/DiscSurface.hpp"
+#include "Acts/Surfaces/DiscSurface.hpp"
 
 #include <cmath>
 #include <iomanip>
 #include <iostream>
 
-#include "ACTS/Surfaces/DiscTrapezoidalBounds.hpp"
-#include "ACTS/Surfaces/InfiniteBounds.hpp"
-#include "ACTS/Surfaces/RadialBounds.hpp"
-#include "ACTS/Utilities/Definitions.hpp"
-#include "ACTS/Utilities/InstanceFactory.hpp"
-#include "ACTS/Utilities/ThrowAssert.hpp"
-#include "ACTS/Utilities/VariantData.hpp"
+#include "Acts/Surfaces/DiscTrapezoidalBounds.hpp"
+#include "Acts/Surfaces/InfiniteBounds.hpp"
+#include "Acts/Surfaces/RadialBounds.hpp"
+#include "Acts/Utilities/Definitions.hpp"
+#include "Acts/Utilities/InstanceFactory.hpp"
+#include "Acts/Utilities/ThrowAssert.hpp"
+#include "Acts/Utilities/VariantData.hpp"
 
 Acts::DiscSurface::DiscSurface(const DiscSurface& other)
   : GeometryObject(), Surface(other), m_bounds(other.m_bounds)
diff --git a/Core/src/Surfaces/DiscTrapezoidalBounds.cpp b/Core/src/Surfaces/DiscTrapezoidalBounds.cpp
index bfa593f999bd454f7be0cb079e1dea41ad640f76..2a550c217277ae5af9449ba44499c66cf1021f03 100644
--- a/Core/src/Surfaces/DiscTrapezoidalBounds.cpp
+++ b/Core/src/Surfaces/DiscTrapezoidalBounds.cpp
@@ -10,14 +10,14 @@
 // DiscTrapezoidalBounds.cpp, ACTS project
 ///////////////////////////////////////////////////////////////////
 
-#include "ACTS/Surfaces/DiscTrapezoidalBounds.hpp"
+#include "Acts/Surfaces/DiscTrapezoidalBounds.hpp"
 
 #include <cmath>
 #include <iomanip>
 #include <iostream>
 
-#include "ACTS/Utilities/VariantData.hpp"
-#include "ACTS/Utilities/detail/periodic.hpp"
+#include "Acts/Utilities/VariantData.hpp"
+#include "Acts/Utilities/detail/periodic.hpp"
 
 Acts::DiscTrapezoidalBounds::DiscTrapezoidalBounds(double minhalfx,
                                                    double maxhalfx,
diff --git a/Core/src/Surfaces/EllipseBounds.cpp b/Core/src/Surfaces/EllipseBounds.cpp
index 5c5c1074d13fb53281cdb128c9cc0359d80e0448..09f7dcbb092074fe61190bba8de20c97074a8dae 100644
--- a/Core/src/Surfaces/EllipseBounds.cpp
+++ b/Core/src/Surfaces/EllipseBounds.cpp
@@ -10,14 +10,14 @@
 // EllipseBounds.cpp, ACTS project
 ///////////////////////////////////////////////////////////////////
 
-#include "ACTS/Surfaces/EllipseBounds.hpp"
+#include "Acts/Surfaces/EllipseBounds.hpp"
 
 #include <cmath>
 #include <iomanip>
 #include <iostream>
 
-#include "ACTS/Utilities/VariantData.hpp"
-#include "ACTS/Utilities/detail/periodic.hpp"
+#include "Acts/Utilities/VariantData.hpp"
+#include "Acts/Utilities/detail/periodic.hpp"
 
 Acts::EllipseBounds::EllipseBounds(double minRadius0,
                                    double minRadius1,
diff --git a/Core/src/Surfaces/InfinitieBounds.cpp b/Core/src/Surfaces/InfinitieBounds.cpp
index 2d8d2e50c1b969d23389e7e0e73233b891c20c35..c0c3d3e08ffcc48018833af343b67823de811fc2 100644
--- a/Core/src/Surfaces/InfinitieBounds.cpp
+++ b/Core/src/Surfaces/InfinitieBounds.cpp
@@ -6,8 +6,8 @@
 // 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/.
 
-#include "ACTS/Surfaces/InfiniteBounds.hpp"
-#include "ACTS/Utilities/VariantData.hpp"
+#include "Acts/Surfaces/InfiniteBounds.hpp"
+#include "Acts/Utilities/VariantData.hpp"
 
 Acts::variant_data
 Acts::InfiniteBounds::toVariantData() const
diff --git a/Core/src/Surfaces/LineBounds.cpp b/Core/src/Surfaces/LineBounds.cpp
index 019d793f2454a7d708c4551369fede11486219ea..f1764f78be3c9a349477d09d0b2ad6b22fb1cb29 100644
--- a/Core/src/Surfaces/LineBounds.cpp
+++ b/Core/src/Surfaces/LineBounds.cpp
@@ -10,8 +10,8 @@
 // LineBounds.cpp, ACTS project
 ///////////////////////////////////////////////////////////////////
 
-#include "ACTS/Surfaces/LineBounds.hpp"
-#include "ACTS/Utilities/VariantData.hpp"
+#include "Acts/Surfaces/LineBounds.hpp"
+#include "Acts/Utilities/VariantData.hpp"
 
 #include <iomanip>
 #include <iostream>
diff --git a/Core/src/Surfaces/LineSurface.cpp b/Core/src/Surfaces/LineSurface.cpp
index 1d1fcc951059d2f99e0f991017a6f240ff90891a..209bfb98c23eefe36cc35ee2482336c993f6e7db 100644
--- a/Core/src/Surfaces/LineSurface.cpp
+++ b/Core/src/Surfaces/LineSurface.cpp
@@ -10,14 +10,14 @@
 // LineSurface.cpp, ACTS project
 ///////////////////////////////////////////////////////////////////
 
-#include "ACTS/Surfaces/LineSurface.hpp"
+#include "Acts/Surfaces/LineSurface.hpp"
 
 #include <cmath>
 #include <iomanip>
 #include <iostream>
 
-#include "ACTS/Utilities/ThrowAssert.hpp"
-#include "ACTS/Utilities/VariantData.hpp"
+#include "Acts/Utilities/ThrowAssert.hpp"
+#include "Acts/Utilities/VariantData.hpp"
 
 Acts::LineSurface::LineSurface(std::shared_ptr<const Transform3D> htrans,
                                double                             radius,
diff --git a/Core/src/Surfaces/PerigeeSurface.cpp b/Core/src/Surfaces/PerigeeSurface.cpp
index 61cae0e6711a1407926335e0d5c07deb179fce55..e885857d5674c538a00886f2b60c8b41b8a1adc5 100644
--- a/Core/src/Surfaces/PerigeeSurface.cpp
+++ b/Core/src/Surfaces/PerigeeSurface.cpp
@@ -10,8 +10,8 @@
 // PerigeeSurface.cpp, ACTS project
 ///////////////////////////////////////////////////////////////////
 
-#include "ACTS/Surfaces/PerigeeSurface.hpp"
-#include "ACTS/Utilities/VariantData.hpp"
+#include "Acts/Surfaces/PerigeeSurface.hpp"
+#include "Acts/Utilities/VariantData.hpp"
 
 #include <iomanip>
 #include <iostream>
diff --git a/Core/src/Surfaces/PlaneSurface.cpp b/Core/src/Surfaces/PlaneSurface.cpp
index 937175fe2e2f5a62915d0c1ec352f1cbe98d7131..a3e580109473731464264e65f5a2288f75f936d1 100644
--- a/Core/src/Surfaces/PlaneSurface.cpp
+++ b/Core/src/Surfaces/PlaneSurface.cpp
@@ -10,19 +10,19 @@
 // PlaneSurface.cpp, ACTS project
 ///////////////////////////////////////////////////////////////////
 
-#include "ACTS/Surfaces/PlaneSurface.hpp"
+#include "Acts/Surfaces/PlaneSurface.hpp"
 
 #include <cmath>
 #include <iomanip>
 #include <iostream>
 
-#include "ACTS/Surfaces/InfiniteBounds.hpp"
-#include "ACTS/Surfaces/RectangleBounds.hpp"
-#include "ACTS/Utilities/Identifier.hpp"
-#include "ACTS/Utilities/ThrowAssert.hpp"
-#include "ACTS/Utilities/VariantData.hpp"
+#include "Acts/Surfaces/InfiniteBounds.hpp"
+#include "Acts/Surfaces/RectangleBounds.hpp"
+#include "Acts/Utilities/Identifier.hpp"
+#include "Acts/Utilities/ThrowAssert.hpp"
+#include "Acts/Utilities/VariantData.hpp"
 
-#include "ACTS/Utilities/InstanceFactory.hpp"
+#include "Acts/Utilities/InstanceFactory.hpp"
 
 Acts::PlaneSurface::PlaneSurface(const PlaneSurface& other)
   : GeometryObject(), Surface(other), m_bounds(other.m_bounds)
diff --git a/Core/src/Surfaces/RadialBounds.cpp b/Core/src/Surfaces/RadialBounds.cpp
index 4cd8d2e04cb78d3fe9b8389a3b6ff5df134fbc6a..2bf39e36e2052ebade7347ca0e78e9743bcca5ba 100644
--- a/Core/src/Surfaces/RadialBounds.cpp
+++ b/Core/src/Surfaces/RadialBounds.cpp
@@ -10,14 +10,14 @@
 // RadialBounds.cpp, ACTS project
 ///////////////////////////////////////////////////////////////////
 
-#include "ACTS/Surfaces/RadialBounds.hpp"
+#include "Acts/Surfaces/RadialBounds.hpp"
 
 #include <cmath>
 #include <iomanip>
 #include <iostream>
 
-#include "ACTS/Utilities/VariantData.hpp"
-#include "ACTS/Utilities/detail/periodic.hpp"
+#include "Acts/Utilities/VariantData.hpp"
+#include "Acts/Utilities/detail/periodic.hpp"
 
 Acts::RadialBounds::RadialBounds(double minrad, double maxrad, double hphisec)
   : RadialBounds(minrad, maxrad, 0, hphisec)
diff --git a/Core/src/Surfaces/RectangleBounds.cpp b/Core/src/Surfaces/RectangleBounds.cpp
index 66e8b3bfd45b25101b6e55324e630201a041ec59..cd4c0c0f1374d8bac09f7e711cf94342f0fef2a3 100644
--- a/Core/src/Surfaces/RectangleBounds.cpp
+++ b/Core/src/Surfaces/RectangleBounds.cpp
@@ -10,9 +10,9 @@
 // RectangleBounds.cpp, ACTS project
 ///////////////////////////////////////////////////////////////////
 
-#include "ACTS/Surfaces/RectangleBounds.hpp"
-#include "ACTS/Utilities/ThrowAssert.hpp"
-#include "ACTS/Utilities/VariantData.hpp"
+#include "Acts/Surfaces/RectangleBounds.hpp"
+#include "Acts/Utilities/ThrowAssert.hpp"
+#include "Acts/Utilities/VariantData.hpp"
 
 #include <cmath>
 #include <iomanip>
diff --git a/Core/src/Surfaces/StrawSurface.cpp b/Core/src/Surfaces/StrawSurface.cpp
index fabec1b235f0618189f54b75dd831fb9a8eed75a..bea3f2e48a6fefe8dd27520a057e52f2e6c17f2f 100644
--- a/Core/src/Surfaces/StrawSurface.cpp
+++ b/Core/src/Surfaces/StrawSurface.cpp
@@ -10,14 +10,14 @@
 // StrawSurface.cpp, ACTS project
 ///////////////////////////////////////////////////////////////////
 
-#include "ACTS/Surfaces/StrawSurface.hpp"
+#include "Acts/Surfaces/StrawSurface.hpp"
 
 #include <iomanip>
 #include <iostream>
 
-#include "ACTS/Surfaces/InfiniteBounds.hpp"
-#include "ACTS/Utilities/Identifier.hpp"
-#include "ACTS/Utilities/VariantData.hpp"
+#include "Acts/Surfaces/InfiniteBounds.hpp"
+#include "Acts/Utilities/Identifier.hpp"
+#include "Acts/Utilities/VariantData.hpp"
 
 Acts::StrawSurface::StrawSurface(std::shared_ptr<const Transform3D> htrans,
                                  double                             radius,
diff --git a/Core/src/Surfaces/Surface.cpp b/Core/src/Surfaces/Surface.cpp
index c755b6dba4404df81ea8b34b70e988d6fd69b542..f887ecb24dd09eb522d39bf59795c58c904884ad 100644
--- a/Core/src/Surfaces/Surface.cpp
+++ b/Core/src/Surfaces/Surface.cpp
@@ -10,7 +10,7 @@
 // Surface.cpp, ACTS project
 ///////////////////////////////////////////////////////////////////
 
-#include "ACTS/Surfaces/Surface.hpp"
+#include "Acts/Surfaces/Surface.hpp"
 
 #include <iomanip>
 #include <iostream>
diff --git a/Core/src/Surfaces/SurfaceArray.cpp b/Core/src/Surfaces/SurfaceArray.cpp
index 880e96c897db0f3c8da841b508ac250fe325045f..1c80778585221507f0367f78757ad63ae13a2a46 100644
--- a/Core/src/Surfaces/SurfaceArray.cpp
+++ b/Core/src/Surfaces/SurfaceArray.cpp
@@ -6,12 +6,12 @@
 // 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/.
 
-#include "ACTS/Surfaces/SurfaceArray.hpp"
-#include "ACTS/Tools/SurfaceArrayCreator.hpp"
-#include "ACTS/Utilities/Definitions.hpp"
-#include "ACTS/Utilities/InstanceFactory.hpp"
-#include "ACTS/Utilities/ThrowAssert.hpp"
-#include "ACTS/Utilities/VariantData.hpp"
+#include "Acts/Surfaces/SurfaceArray.hpp"
+#include "Acts/Tools/SurfaceArrayCreator.hpp"
+#include "Acts/Utilities/Definitions.hpp"
+#include "Acts/Utilities/InstanceFactory.hpp"
+#include "Acts/Utilities/ThrowAssert.hpp"
+#include "Acts/Utilities/VariantData.hpp"
 
 // implementation for pure virtual destructor of ISurfaceGridLookup
 Acts::SurfaceArray::ISurfaceGridLookup::~ISurfaceGridLookup()
diff --git a/Core/src/Surfaces/TrapezoidBounds.cpp b/Core/src/Surfaces/TrapezoidBounds.cpp
index 1e30ef0a8f9d8f169495c96464a498d1c7545274..a664b990989f526ad529e275c3463fb725641b19 100644
--- a/Core/src/Surfaces/TrapezoidBounds.cpp
+++ b/Core/src/Surfaces/TrapezoidBounds.cpp
@@ -10,12 +10,12 @@
 // TrapezoidBounds.cpp, ACTS project
 ///////////////////////////////////////////////////////////////////
 
-#include "ACTS/Surfaces/TrapezoidBounds.hpp"
+#include "Acts/Surfaces/TrapezoidBounds.hpp"
 
 #include <cmath>
 #include <iomanip>
 #include <iostream>
-#include "ACTS/Utilities/VariantData.hpp"
+#include "Acts/Utilities/VariantData.hpp"
 
 Acts::TrapezoidBounds::TrapezoidBounds(double minhalex,
                                        double maxhalex,
diff --git a/Core/src/Surfaces/TriangleBounds.cpp b/Core/src/Surfaces/TriangleBounds.cpp
index e8c66df316b273918bf452d4667ef17e012519b3..846bae3e1d6a492c310ff0b4503a50406f7f0b67 100644
--- a/Core/src/Surfaces/TriangleBounds.cpp
+++ b/Core/src/Surfaces/TriangleBounds.cpp
@@ -10,8 +10,8 @@
 // TriangleBounds.cpp, ACTS project
 ///////////////////////////////////////////////////////////////////
 
-#include "ACTS/Surfaces/TriangleBounds.hpp"
-#include "ACTS/Utilities/VariantData.hpp"
+#include "Acts/Surfaces/TriangleBounds.hpp"
+#include "Acts/Utilities/VariantData.hpp"
 
 #include <iomanip>
 #include <iostream>
diff --git a/Core/src/Tools/CylinderVolumeBuilder.cpp b/Core/src/Tools/CylinderVolumeBuilder.cpp
index 593a2803ee261a8f0e8606f9b4e638e9afb027b3..f4abbea26032f8ad240779f0fc31970537358f63 100644
--- a/Core/src/Tools/CylinderVolumeBuilder.cpp
+++ b/Core/src/Tools/CylinderVolumeBuilder.cpp
@@ -10,15 +10,15 @@
 // CylinderVolumeBuilder.cpp, ACTS project
 ///////////////////////////////////////////////////////////////////
 
-#include "ACTS/Tools/CylinderVolumeBuilder.hpp"
-#include "ACTS/Detector/TrackingVolume.hpp"
-#include "ACTS/Layers/CylinderLayer.hpp"
-#include "ACTS/Layers/DiscLayer.hpp"
-#include "ACTS/Surfaces/CylinderBounds.hpp"
-#include "ACTS/Surfaces/RadialBounds.hpp"
-#include "ACTS/Tools/ITrackingVolumeHelper.hpp"
-#include "ACTS/Utilities/Definitions.hpp"
-#include "ACTS/Volumes/CylinderVolumeBounds.hpp"
+#include "Acts/Tools/CylinderVolumeBuilder.hpp"
+#include "Acts/Detector/TrackingVolume.hpp"
+#include "Acts/Layers/CylinderLayer.hpp"
+#include "Acts/Layers/DiscLayer.hpp"
+#include "Acts/Surfaces/CylinderBounds.hpp"
+#include "Acts/Surfaces/RadialBounds.hpp"
+#include "Acts/Tools/ITrackingVolumeHelper.hpp"
+#include "Acts/Utilities/Definitions.hpp"
+#include "Acts/Volumes/CylinderVolumeBounds.hpp"
 
 Acts::CylinderVolumeBuilder::CylinderVolumeBuilder(
     const Acts::CylinderVolumeBuilder::Config& cvbConfig,
diff --git a/Core/src/Tools/CylinderVolumeHelper.cpp b/Core/src/Tools/CylinderVolumeHelper.cpp
index 5c162667c216551a118e3f48251c4ee1fe09fc92..4b201bc3cae5a1de4f1ec7c9472d888bd025309d 100644
--- a/Core/src/Tools/CylinderVolumeHelper.cpp
+++ b/Core/src/Tools/CylinderVolumeHelper.cpp
@@ -10,23 +10,23 @@
 // CylinderVolumeHelper.cpp, ACTS project
 ///////////////////////////////////////////////////////////////////
 
-#include "ACTS/Tools/CylinderVolumeHelper.hpp"
+#include "Acts/Tools/CylinderVolumeHelper.hpp"
 #include <cmath>
-#include "ACTS/Detector/GlueVolumesDescriptor.hpp"
-#include "ACTS/Detector/TrackingVolume.hpp"
-#include "ACTS/Layers/CylinderLayer.hpp"
-#include "ACTS/Layers/DiscLayer.hpp"
-#include "ACTS/Material/BinnedSurfaceMaterial.hpp"
-#include "ACTS/Material/Material.hpp"
-#include "ACTS/Surfaces/CylinderBounds.hpp"
-#include "ACTS/Surfaces/RadialBounds.hpp"
-#include "ACTS/Tools/ILayerArrayCreator.hpp"
-#include "ACTS/Tools/ITrackingVolumeArrayCreator.hpp"
-#include "ACTS/Utilities/BinUtility.hpp"
-#include "ACTS/Utilities/Definitions.hpp"
-#include "ACTS/Volumes/AbstractVolume.hpp"
-#include "ACTS/Volumes/BoundarySurfaceT.hpp"
-#include "ACTS/Volumes/CylinderVolumeBounds.hpp"
+#include "Acts/Detector/GlueVolumesDescriptor.hpp"
+#include "Acts/Detector/TrackingVolume.hpp"
+#include "Acts/Layers/CylinderLayer.hpp"
+#include "Acts/Layers/DiscLayer.hpp"
+#include "Acts/Material/BinnedSurfaceMaterial.hpp"
+#include "Acts/Material/Material.hpp"
+#include "Acts/Surfaces/CylinderBounds.hpp"
+#include "Acts/Surfaces/RadialBounds.hpp"
+#include "Acts/Tools/ILayerArrayCreator.hpp"
+#include "Acts/Tools/ITrackingVolumeArrayCreator.hpp"
+#include "Acts/Utilities/BinUtility.hpp"
+#include "Acts/Utilities/Definitions.hpp"
+#include "Acts/Volumes/AbstractVolume.hpp"
+#include "Acts/Volumes/BoundarySurfaceT.hpp"
+#include "Acts/Volumes/CylinderVolumeBounds.hpp"
 
 Acts::CylinderVolumeHelper::CylinderVolumeHelper(
     const Acts::CylinderVolumeHelper::Config& cvhConfig,
diff --git a/Core/src/Tools/LayerArrayCreator.cpp b/Core/src/Tools/LayerArrayCreator.cpp
index 82b03ecf41883be066467754a1a36b9088e9947c..33368dd7964429affbbf904759094fc746eb42c1 100644
--- a/Core/src/Tools/LayerArrayCreator.cpp
+++ b/Core/src/Tools/LayerArrayCreator.cpp
@@ -10,22 +10,22 @@
 // LayerArrayCreator.cpp, ACTS project
 ///////////////////////////////////////////////////////////////////
 
-#include "ACTS/Tools/LayerArrayCreator.hpp"
+#include "Acts/Tools/LayerArrayCreator.hpp"
 #include <cmath>
-#include "ACTS/Layers/Layer.hpp"
-#include "ACTS/Layers/NavigationLayer.hpp"
-#include "ACTS/Surfaces/CylinderSurface.hpp"
-#include "ACTS/Surfaces/DiscBounds.hpp"
-#include "ACTS/Surfaces/DiscSurface.hpp"
-#include "ACTS/Surfaces/PlaneSurface.hpp"
-#include "ACTS/Surfaces/RectangleBounds.hpp"
-#include "ACTS/Surfaces/SurfaceBounds.hpp"
-#include "ACTS/Surfaces/TrapezoidBounds.hpp"
-#include "ACTS/Utilities/BinUtility.hpp"
-#include "ACTS/Utilities/BinnedArrayXD.hpp"
-#include "ACTS/Utilities/Definitions.hpp"
-#include "ACTS/Utilities/GeometryObjectSorter.hpp"
-#include "ACTS/Utilities/GeometryStatics.hpp"
+#include "Acts/Layers/Layer.hpp"
+#include "Acts/Layers/NavigationLayer.hpp"
+#include "Acts/Surfaces/CylinderSurface.hpp"
+#include "Acts/Surfaces/DiscBounds.hpp"
+#include "Acts/Surfaces/DiscSurface.hpp"
+#include "Acts/Surfaces/PlaneSurface.hpp"
+#include "Acts/Surfaces/RectangleBounds.hpp"
+#include "Acts/Surfaces/SurfaceBounds.hpp"
+#include "Acts/Surfaces/TrapezoidBounds.hpp"
+#include "Acts/Utilities/BinUtility.hpp"
+#include "Acts/Utilities/BinnedArrayXD.hpp"
+#include "Acts/Utilities/Definitions.hpp"
+#include "Acts/Utilities/GeometryObjectSorter.hpp"
+#include "Acts/Utilities/GeometryStatics.hpp"
 
 std::unique_ptr<const Acts::LayerArray>
 Acts::LayerArrayCreator::layerArray(const LayerVector& layersInput,
diff --git a/Core/src/Tools/LayerCreator.cpp b/Core/src/Tools/LayerCreator.cpp
index 4c8cac559bdaa3f4529751bcb4dde37e961d13e6..6cd6d651157cda29007bfe19acd6433242b29154 100644
--- a/Core/src/Tools/LayerCreator.cpp
+++ b/Core/src/Tools/LayerCreator.cpp
@@ -10,17 +10,17 @@
 // LayerCreator.cpp, ACTS project
 ///////////////////////////////////////////////////////////////////
 
-#include "ACTS/Tools/LayerCreator.hpp"
+#include "Acts/Tools/LayerCreator.hpp"
 #include <cmath>
 #include <set>
-#include "ACTS/Layers/CylinderLayer.hpp"
-#include "ACTS/Layers/DiscLayer.hpp"
-#include "ACTS/Layers/ProtoLayer.hpp"
-#include "ACTS/Surfaces/CylinderBounds.hpp"
-#include "ACTS/Surfaces/PlanarBounds.hpp"
-#include "ACTS/Surfaces/RadialBounds.hpp"
-#include "ACTS/Utilities/Definitions.hpp"
-#include "ACTS/Utilities/Units.hpp"
+#include "Acts/Layers/CylinderLayer.hpp"
+#include "Acts/Layers/DiscLayer.hpp"
+#include "Acts/Layers/ProtoLayer.hpp"
+#include "Acts/Surfaces/CylinderBounds.hpp"
+#include "Acts/Surfaces/PlanarBounds.hpp"
+#include "Acts/Surfaces/RadialBounds.hpp"
+#include "Acts/Utilities/Definitions.hpp"
+#include "Acts/Utilities/Units.hpp"
 
 Acts::LayerCreator::LayerCreator(const Acts::LayerCreator::Config& lcConfig,
                                  std::unique_ptr<const Logger>     logger)
diff --git a/Core/src/Tools/PassiveLayerBuilder.cpp b/Core/src/Tools/PassiveLayerBuilder.cpp
index ea7663e70e527bd97c0df09c58df30680b2e0ccb..ed745cf0a01bdc2c5444886015ff3d3da67a6391 100644
--- a/Core/src/Tools/PassiveLayerBuilder.cpp
+++ b/Core/src/Tools/PassiveLayerBuilder.cpp
@@ -10,14 +10,14 @@
 // PassiveLayerBuilder.cpp, ACTS project
 ///////////////////////////////////////////////////////////////////
 
-#include "ACTS/Tools/PassiveLayerBuilder.hpp"
-#include "ACTS/Layers/CylinderLayer.hpp"
-#include "ACTS/Layers/DiscLayer.hpp"
-#include "ACTS/Material/HomogeneousSurfaceMaterial.hpp"
-#include "ACTS/Material/MaterialProperties.hpp"
-#include "ACTS/Surfaces/CylinderBounds.hpp"
-#include "ACTS/Surfaces/RadialBounds.hpp"
-#include "ACTS/Utilities/Definitions.hpp"
+#include "Acts/Tools/PassiveLayerBuilder.hpp"
+#include "Acts/Layers/CylinderLayer.hpp"
+#include "Acts/Layers/DiscLayer.hpp"
+#include "Acts/Material/HomogeneousSurfaceMaterial.hpp"
+#include "Acts/Material/MaterialProperties.hpp"
+#include "Acts/Surfaces/CylinderBounds.hpp"
+#include "Acts/Surfaces/RadialBounds.hpp"
+#include "Acts/Utilities/Definitions.hpp"
 
 Acts::PassiveLayerBuilder::PassiveLayerBuilder(
     const PassiveLayerBuilder::Config& plConfig,
diff --git a/Core/src/Tools/SurfaceArrayCreator.cpp b/Core/src/Tools/SurfaceArrayCreator.cpp
index 4f1e328393d14c170cd597ac3b154e84fe443f8c..d9ea9ed5d2cd6cab9d589b238a156026a8962079 100644
--- a/Core/src/Tools/SurfaceArrayCreator.cpp
+++ b/Core/src/Tools/SurfaceArrayCreator.cpp
@@ -10,17 +10,17 @@
 // SurfaceArrayCreator.cpp, ACTS project
 ///////////////////////////////////////////////////////////////////
 
-#include "ACTS/Tools/SurfaceArrayCreator.hpp"
+#include "Acts/Tools/SurfaceArrayCreator.hpp"
 #include <algorithm>
 #include <cmath>
-#include "ACTS/Surfaces/PlanarBounds.hpp"
-#include "ACTS/Surfaces/Surface.hpp"
-#include "ACTS/Surfaces/SurfaceArray.hpp"
-#include "ACTS/Utilities/BinUtility.hpp"
-#include "ACTS/Utilities/BinnedArrayXD.hpp"
-#include "ACTS/Utilities/Definitions.hpp"
-#include "ACTS/Utilities/Units.hpp"
-#include "ACTS/Utilities/detail/Axis.hpp"
+#include "Acts/Surfaces/PlanarBounds.hpp"
+#include "Acts/Surfaces/Surface.hpp"
+#include "Acts/Surfaces/SurfaceArray.hpp"
+#include "Acts/Utilities/BinUtility.hpp"
+#include "Acts/Utilities/BinnedArrayXD.hpp"
+#include "Acts/Utilities/Definitions.hpp"
+#include "Acts/Utilities/Units.hpp"
+#include "Acts/Utilities/detail/Axis.hpp"
 
 std::unique_ptr<Acts::SurfaceArray>
 Acts::SurfaceArrayCreator::surfaceArrayOnCylinder(
diff --git a/Core/src/Tools/TrackingGeometryBuilder.cpp b/Core/src/Tools/TrackingGeometryBuilder.cpp
index 6369077e4abd78a788ead611191f2ef8197b2438..80726274850e13b4a20456864f2e74ff0b7e239d 100644
--- a/Core/src/Tools/TrackingGeometryBuilder.cpp
+++ b/Core/src/Tools/TrackingGeometryBuilder.cpp
@@ -10,12 +10,12 @@
 // TrackingGeometryBuilder.cpp, ACTS project
 ///////////////////////////////////////////////////////////////////
 
-#include "ACTS/Tools/TrackingGeometryBuilder.hpp"
-#include "ACTS/Detector/TrackingGeometry.hpp"
-#include "ACTS/Detector/TrackingVolume.hpp"
-#include "ACTS/Tools/ITrackingVolumeBuilder.hpp"
-#include "ACTS/Tools/ITrackingVolumeHelper.hpp"
-#include "ACTS/Volumes/CylinderVolumeBounds.hpp"
+#include "Acts/Tools/TrackingGeometryBuilder.hpp"
+#include "Acts/Detector/TrackingGeometry.hpp"
+#include "Acts/Detector/TrackingVolume.hpp"
+#include "Acts/Tools/ITrackingVolumeBuilder.hpp"
+#include "Acts/Tools/ITrackingVolumeHelper.hpp"
+#include "Acts/Volumes/CylinderVolumeBounds.hpp"
 
 Acts::TrackingGeometryBuilder::TrackingGeometryBuilder(
     const Acts::TrackingGeometryBuilder::Config& cgbConfig,
diff --git a/Core/src/Tools/TrackingVolumeArrayCreator.cpp b/Core/src/Tools/TrackingVolumeArrayCreator.cpp
index f78d6b769d317fb0224517edf913ca9137e14b4f..86050b13dcc371b40fc0888ad7b54e487a7cc501 100644
--- a/Core/src/Tools/TrackingVolumeArrayCreator.cpp
+++ b/Core/src/Tools/TrackingVolumeArrayCreator.cpp
@@ -10,13 +10,13 @@
 // TrackingVolumeArrayCreator.cpp, ACTS project
 ///////////////////////////////////////////////////////////////////
 
-#include "ACTS/Tools/TrackingVolumeArrayCreator.hpp"
-#include "ACTS/Detector/TrackingVolume.hpp"
-#include "ACTS/Utilities/BinUtility.hpp"
-#include "ACTS/Utilities/BinnedArrayXD.hpp"
-#include "ACTS/Utilities/Definitions.hpp"
-#include "ACTS/Utilities/GeometryObjectSorter.hpp"
-#include "ACTS/Volumes/VolumeBounds.hpp"
+#include "Acts/Tools/TrackingVolumeArrayCreator.hpp"
+#include "Acts/Detector/TrackingVolume.hpp"
+#include "Acts/Utilities/BinUtility.hpp"
+#include "Acts/Utilities/BinnedArrayXD.hpp"
+#include "Acts/Utilities/Definitions.hpp"
+#include "Acts/Utilities/GeometryObjectSorter.hpp"
+#include "Acts/Volumes/VolumeBounds.hpp"
 
 std::shared_ptr<const Acts::TrackingVolumeArray>
 Acts::TrackingVolumeArrayCreator::trackingVolumeArray(
diff --git a/Core/src/Utilities/BFieldMapUtils.cpp b/Core/src/Utilities/BFieldMapUtils.cpp
index c5849a4b96e119423822eef8160223f791af6b47..68760bc2f65d7e98a6596dac4b849030ad44ddc5 100644
--- a/Core/src/Utilities/BFieldMapUtils.cpp
+++ b/Core/src/Utilities/BFieldMapUtils.cpp
@@ -6,10 +6,10 @@
 // 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/.
 
-#include "ACTS/Utilities/BFieldMapUtils.hpp"
+#include "Acts/Utilities/BFieldMapUtils.hpp"
 #include <iostream>
-#include "ACTS/Utilities/detail/Axis.hpp"
-#include "ACTS/Utilities/detail/Grid.hpp"
+#include "Acts/Utilities/detail/Axis.hpp"
+#include "Acts/Utilities/detail/Grid.hpp"
 
 Acts::InterpolatedBFieldMap::FieldMapper<2, 2> Acts::fieldMapperRZ(
     std::function<size_t(std::array<size_t, 2> binsRZ,
diff --git a/Core/src/Utilities/Logger.cpp b/Core/src/Utilities/Logger.cpp
index 8e6374e3ee32710a7cf2e87d1ac963d65119a818..a212ae24f32cc74eb073cc7cc5b44292808e8be1 100644
--- a/Core/src/Utilities/Logger.cpp
+++ b/Core/src/Utilities/Logger.cpp
@@ -6,7 +6,7 @@
 // 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/.
 
-#include "ACTS/Utilities/Logger.hpp"
+#include "Acts/Utilities/Logger.hpp"
 
 namespace Acts {
 
diff --git a/Core/src/Utilities/MaterialInteraction.cpp b/Core/src/Utilities/MaterialInteraction.cpp
index 48cba3413b48ce634e7d2b7d6f2762660467581e..e29b9994af3ed03fdbc2b8ca26fb2a3ce2f91ff6 100644
--- a/Core/src/Utilities/MaterialInteraction.cpp
+++ b/Core/src/Utilities/MaterialInteraction.cpp
@@ -6,7 +6,7 @@
 // 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/.
 
-#include "ACTS/Utilities/MaterialInteraction.hpp"
+#include "Acts/Utilities/MaterialInteraction.hpp"
 
 namespace Acts {
 
diff --git a/Core/src/Utilities/Units.cpp b/Core/src/Utilities/Units.cpp
index c8982f2e2a2facacd7de88021d999a014c4d1cb6..bde5296f63f8881d83c51c4b09723fbecd6f39a1 100644
--- a/Core/src/Utilities/Units.cpp
+++ b/Core/src/Utilities/Units.cpp
@@ -6,7 +6,7 @@
 // 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/.
 
-#include "ACTS/Utilities/Units.hpp"
+#include "Acts/Utilities/Units.hpp"
 
 namespace Acts {
 
diff --git a/Core/src/Volumes/AbstractVolume.cpp b/Core/src/Volumes/AbstractVolume.cpp
index 3f53de7d17fdfa5b580c3b53e6857d79311ca560..ea1a4f660e72fa5358c3711e77f7f1213b8ebcb4 100644
--- a/Core/src/Volumes/AbstractVolume.cpp
+++ b/Core/src/Volumes/AbstractVolume.cpp
@@ -10,11 +10,11 @@
 // AbstractVolume.cpp, ACTS project
 ///////////////////////////////////////////////////////////////////
 
-#include "ACTS/Volumes/AbstractVolume.hpp"
+#include "Acts/Volumes/AbstractVolume.hpp"
 #include <iostream>
-#include "ACTS/Surfaces/Surface.hpp"
-#include "ACTS/Volumes/BoundarySurfaceT.hpp"
-#include "ACTS/Volumes/VolumeBounds.hpp"
+#include "Acts/Surfaces/Surface.hpp"
+#include "Acts/Volumes/BoundarySurfaceT.hpp"
+#include "Acts/Volumes/VolumeBounds.hpp"
 
 Acts::AbstractVolume::AbstractVolume(
     std::shared_ptr<const Transform3D>  htrans,
diff --git a/Core/src/Volumes/CuboidVolumeBounds.cpp b/Core/src/Volumes/CuboidVolumeBounds.cpp
index 767d826a0ac7f17acabcca484a55fe2be9ce8df1..72e5953455b9975ff896ffff3450476ae9a9d391 100644
--- a/Core/src/Volumes/CuboidVolumeBounds.cpp
+++ b/Core/src/Volumes/CuboidVolumeBounds.cpp
@@ -10,12 +10,12 @@
 // CuboidVolumeBounds.cpp, ACTS project
 ///////////////////////////////////////////////////////////////////
 
-#include "ACTS/Volumes/CuboidVolumeBounds.hpp"
+#include "Acts/Volumes/CuboidVolumeBounds.hpp"
 #include <cmath>
 #include <iostream>
-#include "ACTS/Surfaces/PlaneSurface.hpp"
-#include "ACTS/Surfaces/RectangleBounds.hpp"
-#include "ACTS/Surfaces/Surface.hpp"
+#include "Acts/Surfaces/PlaneSurface.hpp"
+#include "Acts/Surfaces/RectangleBounds.hpp"
+#include "Acts/Surfaces/Surface.hpp"
 
 Acts::CuboidVolumeBounds::CuboidVolumeBounds()
   : VolumeBounds(), m_valueStore(bv_length, 0.)
diff --git a/Core/src/Volumes/CylinderVolumeBounds.cpp b/Core/src/Volumes/CylinderVolumeBounds.cpp
index 8844aee7c769dcb8e8e330d2db0e8b77fe426b69..9672c504ae1887f8b9b2ce48f9aa1c3084b5d06a 100644
--- a/Core/src/Volumes/CylinderVolumeBounds.cpp
+++ b/Core/src/Volumes/CylinderVolumeBounds.cpp
@@ -10,15 +10,15 @@
 // CylinderVolumeBounds.cpp, ACTS project
 ///////////////////////////////////////////////////////////////////
 
-#include "ACTS/Volumes/CylinderVolumeBounds.hpp"
+#include "Acts/Volumes/CylinderVolumeBounds.hpp"
 #include <cmath>
 #include <iostream>
-#include "ACTS/Surfaces/CylinderBounds.hpp"
-#include "ACTS/Surfaces/CylinderSurface.hpp"
-#include "ACTS/Surfaces/DiscSurface.hpp"
-#include "ACTS/Surfaces/PlaneSurface.hpp"
-#include "ACTS/Surfaces/RadialBounds.hpp"
-#include "ACTS/Surfaces/RectangleBounds.hpp"
+#include "Acts/Surfaces/CylinderBounds.hpp"
+#include "Acts/Surfaces/CylinderSurface.hpp"
+#include "Acts/Surfaces/DiscSurface.hpp"
+#include "Acts/Surfaces/PlaneSurface.hpp"
+#include "Acts/Surfaces/RadialBounds.hpp"
+#include "Acts/Surfaces/RectangleBounds.hpp"
 
 const double Acts::CylinderVolumeBounds::s_numericalStable = 10e-2;
 
diff --git a/Core/src/Volumes/DoubleTrapezoidVolumeBounds.cpp b/Core/src/Volumes/DoubleTrapezoidVolumeBounds.cpp
index 900b296ae5061b101eb9b4b4ab83ac38adae1fec..a357476dbe0bde7e2734734164c256a1ab3c4932 100644
--- a/Core/src/Volumes/DoubleTrapezoidVolumeBounds.cpp
+++ b/Core/src/Volumes/DoubleTrapezoidVolumeBounds.cpp
@@ -10,13 +10,13 @@
 // DoubleTrapezoidVolumeBounds.cpp, ACTS project
 ///////////////////////////////////////////////////////////////////
 
-#include "ACTS/Volumes/DoubleTrapezoidVolumeBounds.hpp"
+#include "Acts/Volumes/DoubleTrapezoidVolumeBounds.hpp"
 #include <cmath>
 #include <iomanip>
 #include <iostream>
-#include "ACTS/Surfaces/DiamondBounds.hpp"
-#include "ACTS/Surfaces/PlaneSurface.hpp"
-#include "ACTS/Surfaces/RectangleBounds.hpp"
+#include "Acts/Surfaces/DiamondBounds.hpp"
+#include "Acts/Surfaces/PlaneSurface.hpp"
+#include "Acts/Surfaces/RectangleBounds.hpp"
 
 Acts::DoubleTrapezoidVolumeBounds::DoubleTrapezoidVolumeBounds()
   : VolumeBounds(), m_valueStore(bv_length, 0.)
diff --git a/Core/src/Volumes/TrapezoidVolumeBounds.cpp b/Core/src/Volumes/TrapezoidVolumeBounds.cpp
index 0c37ea1df26db5c310a819cc821db4bf0edd245e..551f70d7f9eceea0ba828c5f06b856fb2f0ec507 100644
--- a/Core/src/Volumes/TrapezoidVolumeBounds.cpp
+++ b/Core/src/Volumes/TrapezoidVolumeBounds.cpp
@@ -10,14 +10,14 @@
 // TrapezoidVolumeBounds.cpp, ACTS project
 ///////////////////////////////////////////////////////////////////
 
-#include "ACTS/Volumes/TrapezoidVolumeBounds.hpp"
+#include "Acts/Volumes/TrapezoidVolumeBounds.hpp"
 #include <cmath>
 #include <iomanip>
 #include <iostream>
-#include "ACTS/Surfaces/PlaneSurface.hpp"
-#include "ACTS/Surfaces/RectangleBounds.hpp"
-#include "ACTS/Surfaces/TrapezoidBounds.hpp"
-#include "ACTS/Utilities/GeometryStatics.hpp"
+#include "Acts/Surfaces/PlaneSurface.hpp"
+#include "Acts/Surfaces/RectangleBounds.hpp"
+#include "Acts/Surfaces/TrapezoidBounds.hpp"
+#include "Acts/Utilities/GeometryStatics.hpp"
 
 Acts::TrapezoidVolumeBounds::TrapezoidVolumeBounds()
   : VolumeBounds(), m_valueStore(bv_length, 0.)
diff --git a/Core/src/Volumes/Volume.cpp b/Core/src/Volumes/Volume.cpp
index 435f8b9deed9d5fe4e2b0a0f05322866efe75be8..b2e2e0b8853701f89a6dc191249800e1d7f4ffc8 100644
--- a/Core/src/Volumes/Volume.cpp
+++ b/Core/src/Volumes/Volume.cpp
@@ -10,9 +10,9 @@
 // Volume.cpp, ACTS project
 ///////////////////////////////////////////////////////////////////
 
-#include "ACTS/Volumes/Volume.hpp"
+#include "Acts/Volumes/Volume.hpp"
 #include <iostream>
-#include "ACTS/Volumes/VolumeBounds.hpp"
+#include "Acts/Volumes/VolumeBounds.hpp"
 
 Acts::Volume::Volume()
   : GeometryObject()
diff --git a/Core/src/Volumes/VolumeBounds.cpp b/Core/src/Volumes/VolumeBounds.cpp
index 2827728fb8a151af47d6e43b414d010f4ee29427..d8d0eb1110b77fa18337755fae01a41d6efc9ed7 100644
--- a/Core/src/Volumes/VolumeBounds.cpp
+++ b/Core/src/Volumes/VolumeBounds.cpp
@@ -10,7 +10,7 @@
 // VolumeBounds.cpp, ACTS project
 ///////////////////////////////////////////////////////////////////
 
-#include "ACTS/Volumes/VolumeBounds.hpp"
+#include "Acts/Volumes/VolumeBounds.hpp"
 
 /**Overload of << operator for std::ostream for debug output*/
 std::ostream&
diff --git a/Examples/src/CustomDefaultLogger.cpp b/Examples/src/CustomDefaultLogger.cpp
index bde2f1a4c0e1f15deaefc14e681e057b6c0c6e73..7df33c9938fab76eaa85ebd64dc3f4aad9db0602 100644
--- a/Examples/src/CustomDefaultLogger.cpp
+++ b/Examples/src/CustomDefaultLogger.cpp
@@ -8,7 +8,7 @@
 
 #include <algorithm>
 
-#include "ACTS/Utilities/Logger.hpp"
+#include "Acts/Utilities/Logger.hpp"
 
 namespace Acts {
 
diff --git a/IntegrationTests/ATLSeedingIntegrationTest.cpp b/IntegrationTests/ATLSeedingIntegrationTest.cpp
index 3ffbd206a797af650a167cad28e09983708d8d25..e5ace5c324ee9271053e6b0535357c0c8d41c015 100644
--- a/IntegrationTests/ATLSeedingIntegrationTest.cpp
+++ b/IntegrationTests/ATLSeedingIntegrationTest.cpp
@@ -7,7 +7,7 @@
 // file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 #include <algorithm>
-#include "ACTS/Seeding/ATL_Seedmaker.hpp"
+#include "Acts/Seeding/ATL_Seedmaker.hpp"
 
 #define BOOST_TEST_MODULE SeedmakerIntegrationTest
 #include <boost/test/included/unit_test.hpp>
diff --git a/IntegrationTests/PropagationTests.cpp b/IntegrationTests/PropagationTests.cpp
index 07952b2806670a6aa4adcb8a63e659752b3280f3..7e608d9612bfee504f82e43e2069cf78f8f3ae0e 100644
--- a/IntegrationTests/PropagationTests.cpp
+++ b/IntegrationTests/PropagationTests.cpp
@@ -16,20 +16,20 @@
 #include <cmath>
 
 #include <boost/test/data/test_case.hpp>
-#include "ACTS/ACTSVersion.hpp"
-#include "ACTS/EventData/TrackParameters.hpp"
-#include "ACTS/Extrapolation/RungeKuttaEngine.hpp"
-#include "ACTS/Extrapolation/Wrapper.hpp"
-#include "ACTS/MagneticField/ConstantBField.hpp"
-#include "ACTS/Propagator/AtlasStepper.hpp"
-#include "ACTS/Propagator/EigenStepper.hpp"
-#include "ACTS/Propagator/Propagator.hpp"
-#include "ACTS/Surfaces/CylinderSurface.hpp"
-#include "ACTS/Surfaces/DiscSurface.hpp"
-#include "ACTS/Surfaces/PlaneSurface.hpp"
-#include "ACTS/Surfaces/StrawSurface.hpp"
-#include "ACTS/Utilities/Definitions.hpp"
-#include "ACTS/Utilities/Units.hpp"
+#include "Acts/ActsVersion.hpp"
+#include "Acts/EventData/TrackParameters.hpp"
+#include "Acts/Extrapolation/RungeKuttaEngine.hpp"
+#include "Acts/Extrapolation/Wrapper.hpp"
+#include "Acts/MagneticField/ConstantBField.hpp"
+#include "Acts/Propagator/AtlasStepper.hpp"
+#include "Acts/Propagator/EigenStepper.hpp"
+#include "Acts/Propagator/Propagator.hpp"
+#include "Acts/Surfaces/CylinderSurface.hpp"
+#include "Acts/Surfaces/DiscSurface.hpp"
+#include "Acts/Surfaces/PlaneSurface.hpp"
+#include "Acts/Surfaces/StrawSurface.hpp"
+#include "Acts/Utilities/Definitions.hpp"
+#include "Acts/Utilities/Units.hpp"
 #include "PropagationTestHelper.hpp"
 
 namespace bdata = boost::unit_test::data;
diff --git a/IntegrationTests/PropagationTestsAtlasField.cpp b/IntegrationTests/PropagationTestsAtlasField.cpp
index ba75257623842006e6434e58edf532ad7ae1861c..ca07a07b9d216fff3cb5d5592a0c7957a9b69e80 100644
--- a/IntegrationTests/PropagationTestsAtlasField.cpp
+++ b/IntegrationTests/PropagationTestsAtlasField.cpp
@@ -13,24 +13,24 @@
 // leave blank
 #include <boost/test/data/test_case.hpp>
 
-#include "ACTS/EventData/TrackParameters.hpp"
-#include "ACTS/Extrapolation/RungeKuttaEngine.hpp"
-#include "ACTS/Extrapolation/Wrapper.hpp"
-#include "ACTS/MagneticField/InterpolatedBFieldMap.hpp"
-#include "ACTS/MagneticField/SharedBFieldMap.hpp"
-#include "ACTS/MagneticField/concept/AnyFieldLookup.hpp"
-#include "ACTS/Propagator/AtlasStepper.hpp"
-#include "ACTS/Propagator/EigenStepper.hpp"
-#include "ACTS/Propagator/Propagator.hpp"
-#include "ACTS/Surfaces/CylinderSurface.hpp"
-#include "ACTS/Surfaces/DiscSurface.hpp"
-#include "ACTS/Surfaces/PlaneSurface.hpp"
-#include "ACTS/Surfaces/StrawSurface.hpp"
-#include "ACTS/Utilities/BFieldMapUtils.hpp"
-#include "ACTS/Utilities/Definitions.hpp"
-#include "ACTS/Utilities/Units.hpp"
-#include "ACTS/Utilities/detail/Axis.hpp"
-#include "ACTS/Utilities/detail/Grid.hpp"
+#include "Acts/EventData/TrackParameters.hpp"
+#include "Acts/Extrapolation/RungeKuttaEngine.hpp"
+#include "Acts/Extrapolation/Wrapper.hpp"
+#include "Acts/MagneticField/InterpolatedBFieldMap.hpp"
+#include "Acts/MagneticField/SharedBFieldMap.hpp"
+#include "Acts/MagneticField/concept/AnyFieldLookup.hpp"
+#include "Acts/Propagator/AtlasStepper.hpp"
+#include "Acts/Propagator/EigenStepper.hpp"
+#include "Acts/Propagator/Propagator.hpp"
+#include "Acts/Surfaces/CylinderSurface.hpp"
+#include "Acts/Surfaces/DiscSurface.hpp"
+#include "Acts/Surfaces/PlaneSurface.hpp"
+#include "Acts/Surfaces/StrawSurface.hpp"
+#include "Acts/Utilities/BFieldMapUtils.hpp"
+#include "Acts/Utilities/Definitions.hpp"
+#include "Acts/Utilities/Units.hpp"
+#include "Acts/Utilities/detail/Axis.hpp"
+#include "Acts/Utilities/detail/Grid.hpp"
 #include "PropagationTestHelper.hpp"
 
 namespace bdata = boost::unit_test::data;
diff --git a/IntegrationTests/covariance_validation_fixture.hpp b/IntegrationTests/covariance_validation_fixture.hpp
index 7a82fab8f209d47d0782893c144e82f07fa13dc5..6a8f4031589f35269a72def0e834253c404556a7 100644
--- a/IntegrationTests/covariance_validation_fixture.hpp
+++ b/IntegrationTests/covariance_validation_fixture.hpp
@@ -10,9 +10,9 @@
 #define ACTS_COVARIANCE_VALIDATION_FIXTURE_HPP 1
 
 #include <array>
-#include "ACTS/EventData/TrackParameters.hpp"
-#include "ACTS/Surfaces/PlaneSurface.hpp"
-#include "ACTS/Surfaces/Surface.hpp"
+#include "Acts/EventData/TrackParameters.hpp"
+#include "Acts/Surfaces/PlaneSurface.hpp"
+#include "Acts/Surfaces/Surface.hpp"
 
 namespace Acts {
 
diff --git a/Legacy/include/ACTS/Extrapolation/ExtrapolationCell.hpp b/Legacy/include/Acts/Extrapolation/ExtrapolationCell.hpp
similarity index 98%
rename from Legacy/include/ACTS/Extrapolation/ExtrapolationCell.hpp
rename to Legacy/include/Acts/Extrapolation/ExtrapolationCell.hpp
index f4bb1d5abeab85064d74e91e4235c532242af4fa..968c70d9fce33e07cb9d4d83411d5d689023abc1 100644
--- a/Legacy/include/ACTS/Extrapolation/ExtrapolationCell.hpp
+++ b/Legacy/include/Acts/Extrapolation/ExtrapolationCell.hpp
@@ -13,13 +13,13 @@
 #ifndef ACTS_EXTRAPOLATIONUTILS_EXTRAPOLATIONCELL_H
 #define ACTS_EXTRAPOLATIONUTILS_EXTRAPOLATIONCELL_H 1
 
-#include "ACTS/EventData/ParticleDefinitions.hpp"
-#include "ACTS/EventData/TransportJacobian.hpp"
-#include "ACTS/Extrapolation/MaterialUpdateMode.hpp"
-#include "ACTS/Material/MaterialProperties.hpp"
-#include "ACTS/Surfaces/Surface.hpp"
-#include "ACTS/Utilities/Definitions.hpp"
-#include "ACTS/Utilities/GeometrySignature.hpp"
+#include "Acts/EventData/ParticleDefinitions.hpp"
+#include "Acts/EventData/TransportJacobian.hpp"
+#include "Acts/Extrapolation/MaterialUpdateMode.hpp"
+#include "Acts/Material/MaterialProperties.hpp"
+#include "Acts/Surfaces/Surface.hpp"
+#include "Acts/Utilities/Definitions.hpp"
+#include "Acts/Utilities/GeometrySignature.hpp"
 
 #ifndef ACTS_EXTRAPOLATIONUTILSS_CHECKPATHMACRO
 #define ACTS_EXTRAPOLATIONUTILSS_CHECKPATHMACRO 1
@@ -603,6 +603,6 @@ public:
 };
 }  // end of namespace
 
-#include "ACTS/Extrapolation/detail/ExtrapolationCell.ipp"
+#include "Acts/Extrapolation/detail/ExtrapolationCell.ipp"
 
 #endif  // TRKEXUTILS_SOLUTIONSELECTOR_H
diff --git a/Legacy/include/ACTS/Extrapolation/ExtrapolationEngine.hpp b/Legacy/include/Acts/Extrapolation/ExtrapolationEngine.hpp
similarity index 92%
rename from Legacy/include/ACTS/Extrapolation/ExtrapolationEngine.hpp
rename to Legacy/include/Acts/Extrapolation/ExtrapolationEngine.hpp
index 499823b6f8473880c36b2f2999f606d5b8e896e6..f747a110f2787ff89e950b6d5ab282a70b10eae0 100644
--- a/Legacy/include/ACTS/Extrapolation/ExtrapolationEngine.hpp
+++ b/Legacy/include/Acts/Extrapolation/ExtrapolationEngine.hpp
@@ -13,14 +13,14 @@
 #ifndef ACTS_EXTRAPOLATION_EXTRAPOLATIONENGINE_H
 #define ACTS_EXTRAPOLATION_EXTRAPOLATIONENGINE_H 1
 
-#include "ACTS/EventData/NeutralParameters.hpp"
-#include "ACTS/EventData/TrackParameters.hpp"
-#include "ACTS/Extrapolation/ExtrapolationCell.hpp"
-#include "ACTS/Extrapolation/IExtrapolationEngine.hpp"
-#include "ACTS/Extrapolation/INavigationEngine.hpp"
-#include "ACTS/Extrapolation/IPropagationEngine.hpp"
-#include "ACTS/Extrapolation/detail/ExtrapolationMacros.hpp"
-#include "ACTS/Utilities/Logger.hpp"
+#include "Acts/EventData/NeutralParameters.hpp"
+#include "Acts/EventData/TrackParameters.hpp"
+#include "Acts/Extrapolation/ExtrapolationCell.hpp"
+#include "Acts/Extrapolation/IExtrapolationEngine.hpp"
+#include "Acts/Extrapolation/INavigationEngine.hpp"
+#include "Acts/Extrapolation/IPropagationEngine.hpp"
+#include "Acts/Extrapolation/detail/ExtrapolationMacros.hpp"
+#include "Acts/Utilities/Logger.hpp"
 
 namespace Acts {
 
@@ -192,6 +192,6 @@ ExtrapolationEngine::getConfiguration() const
 
 }  // end of namespace
 
-#include "ACTS/Extrapolation/detail/ExtrapolationEngine.ipp"
+#include "Acts/Extrapolation/detail/ExtrapolationEngine.ipp"
 
 #endif  // ACTS_EXTRAPOLATION_EXTRAPOLATIONENGINE_H
diff --git a/Legacy/include/ACTS/Extrapolation/IExtrapolationEngine.hpp b/Legacy/include/Acts/Extrapolation/IExtrapolationEngine.hpp
similarity index 92%
rename from Legacy/include/ACTS/Extrapolation/IExtrapolationEngine.hpp
rename to Legacy/include/Acts/Extrapolation/IExtrapolationEngine.hpp
index fc0b9945ebed9ba1d906b09ce360cd3e80a32301..38606de1e5758f1a1dbeb5d3f7f5c4fb4e3791bb 100644
--- a/Legacy/include/ACTS/Extrapolation/IExtrapolationEngine.hpp
+++ b/Legacy/include/Acts/Extrapolation/IExtrapolationEngine.hpp
@@ -13,10 +13,10 @@
 #ifndef ACTS_EXTRAPOLATION_IEXTRAPOLATIONENGINE_H
 #define ACTS_EXTRAPOLATION_IEXTRAPOLATIONENGINE_H 1
 
-#include "ACTS/EventData/NeutralParameters.hpp"
-#include "ACTS/EventData/TrackParameters.hpp"
-#include "ACTS/Extrapolation/ExtrapolationCell.hpp"
-#include "ACTS/Utilities/GeometrySignature.hpp"
+#include "Acts/EventData/NeutralParameters.hpp"
+#include "Acts/EventData/TrackParameters.hpp"
+#include "Acts/Extrapolation/ExtrapolationCell.hpp"
+#include "Acts/Utilities/GeometrySignature.hpp"
 
 namespace Acts {
 
diff --git a/Legacy/include/ACTS/Extrapolation/IMaterialEffectsEngine.hpp b/Legacy/include/Acts/Extrapolation/IMaterialEffectsEngine.hpp
similarity index 91%
rename from Legacy/include/ACTS/Extrapolation/IMaterialEffectsEngine.hpp
rename to Legacy/include/Acts/Extrapolation/IMaterialEffectsEngine.hpp
index 0a1ee4f011ed5c875025c64cde288dca71914ef0..72295f091f9ddb2c76cde4bbc5fa6333b3c052d2 100644
--- a/Legacy/include/ACTS/Extrapolation/IMaterialEffectsEngine.hpp
+++ b/Legacy/include/Acts/Extrapolation/IMaterialEffectsEngine.hpp
@@ -13,11 +13,11 @@
 #ifndef ACTS_EXTRAPOLATION_IMATERIALEFFECTSENGINE_H
 #define ACTS_EXTRAPOLATION_IMATERIALEFFECTSENGINE_H 1
 
-#include "ACTS/EventData/NeutralParameters.hpp"
-#include "ACTS/EventData/TrackParameters.hpp"
-#include "ACTS/Extrapolation/ExtrapolationCell.hpp"
-#include "ACTS/Extrapolation/MaterialUpdateMode.hpp"
-#include "ACTS/Utilities/Definitions.hpp"
+#include "Acts/EventData/NeutralParameters.hpp"
+#include "Acts/EventData/TrackParameters.hpp"
+#include "Acts/Extrapolation/ExtrapolationCell.hpp"
+#include "Acts/Extrapolation/MaterialUpdateMode.hpp"
+#include "Acts/Utilities/Definitions.hpp"
 
 namespace Acts {
 
diff --git a/Legacy/include/ACTS/Extrapolation/IMultipleScatteringUpdator.hpp b/Legacy/include/Acts/Extrapolation/IMultipleScatteringUpdator.hpp
similarity index 96%
rename from Legacy/include/ACTS/Extrapolation/IMultipleScatteringUpdator.hpp
rename to Legacy/include/Acts/Extrapolation/IMultipleScatteringUpdator.hpp
index d8d5f857e5a79107e0fa8802a7851d9a21db8ee7..08c813aa3fd5198f2410692e4205260907947799 100644
--- a/Legacy/include/ACTS/Extrapolation/IMultipleScatteringUpdator.hpp
+++ b/Legacy/include/Acts/Extrapolation/IMultipleScatteringUpdator.hpp
@@ -13,7 +13,7 @@
 #ifndef ACTS_EXTRAPOLATIONIN_IMULTIPLESCATTERINGUPDATOR_H
 #define ACTS_EXTRAPOLATIONIN_IMULTIPLESCATTERINGUPDATOR_H 1
 
-#include "ACTS/EventData/ParticleDefinitions.hpp"
+#include "Acts/EventData/ParticleDefinitions.hpp"
 
 namespace Acts {
 
diff --git a/Legacy/include/ACTS/Extrapolation/INavigationEngine.hpp b/Legacy/include/Acts/Extrapolation/INavigationEngine.hpp
similarity index 95%
rename from Legacy/include/ACTS/Extrapolation/INavigationEngine.hpp
rename to Legacy/include/Acts/Extrapolation/INavigationEngine.hpp
index b57b82f10e6d4148b449ade8e71b5a6a183c5227..b900d2c2ae683dacb4a85f5dc0eb1f62ec11384d 100644
--- a/Legacy/include/ACTS/Extrapolation/INavigationEngine.hpp
+++ b/Legacy/include/Acts/Extrapolation/INavigationEngine.hpp
@@ -13,9 +13,9 @@
 #ifndef ACTS_EXTRAPOLATION_INAVIGATIONENGINE_H
 #define ACTS_EXTRAPOLATION_INAVIGATIONENGINE_H
 
-#include "ACTS/EventData/NeutralParameters.hpp"
-#include "ACTS/EventData/TrackParameters.hpp"
-#include "ACTS/Extrapolation/ExtrapolationCell.hpp"
+#include "Acts/EventData/NeutralParameters.hpp"
+#include "Acts/EventData/TrackParameters.hpp"
+#include "Acts/Extrapolation/ExtrapolationCell.hpp"
 
 namespace Acts {
 
diff --git a/Legacy/include/ACTS/Extrapolation/IPropagationEngine.hpp b/Legacy/include/Acts/Extrapolation/IPropagationEngine.hpp
similarity index 96%
rename from Legacy/include/ACTS/Extrapolation/IPropagationEngine.hpp
rename to Legacy/include/Acts/Extrapolation/IPropagationEngine.hpp
index 55e05269ffd7fb90d13cf5f568bc4c290f0a01fb..f334833fc798fb588d6b501cdf4653b13396a0c9 100644
--- a/Legacy/include/ACTS/Extrapolation/IPropagationEngine.hpp
+++ b/Legacy/include/Acts/Extrapolation/IPropagationEngine.hpp
@@ -13,9 +13,9 @@
 #ifndef ACTS_EXTRAPOLATION_IPROPAGATIONENGINE_H
 #define ACTS_EXTRAPOLATION_IPROPAGATIONENGINE_H 1
 
-#include "ACTS/EventData/NeutralParameters.hpp"
-#include "ACTS/EventData/TrackParameters.hpp"
-#include "ACTS/Extrapolation/ExtrapolationCell.hpp"
+#include "Acts/EventData/NeutralParameters.hpp"
+#include "Acts/EventData/TrackParameters.hpp"
+#include "Acts/Extrapolation/ExtrapolationCell.hpp"
 
 namespace Acts {
 
diff --git a/Legacy/include/ACTS/Extrapolation/MaterialEffectsEngine.hpp b/Legacy/include/Acts/Extrapolation/MaterialEffectsEngine.hpp
similarity index 92%
rename from Legacy/include/ACTS/Extrapolation/MaterialEffectsEngine.hpp
rename to Legacy/include/Acts/Extrapolation/MaterialEffectsEngine.hpp
index 0630affd6f7bc646d213892fa167992abdbed126..4e46188c68a3243fd356de4333fefd411130e2bf 100644
--- a/Legacy/include/ACTS/Extrapolation/MaterialEffectsEngine.hpp
+++ b/Legacy/include/Acts/Extrapolation/MaterialEffectsEngine.hpp
@@ -13,14 +13,14 @@
 #ifndef ACTS_EXTRAPOLATION_MATERIALEFFECTSENGINE_H
 #define ACTS_EXTRAPOLATION_MATERIALEFFECTSENGINE_H 1
 
-#include "ACTS/EventData/NeutralParameters.hpp"
-#include "ACTS/EventData/TrackParameters.hpp"
-#include "ACTS/Extrapolation/ExtrapolationCell.hpp"
-#include "ACTS/Extrapolation/IMaterialEffectsEngine.hpp"
-#include "ACTS/Extrapolation/MaterialUpdateMode.hpp"
-#include "ACTS/Extrapolation/detail/ExtrapolationMacros.hpp"
-#include "ACTS/Utilities/Definitions.hpp"
-#include "ACTS/Utilities/Logger.hpp"
+#include "Acts/EventData/NeutralParameters.hpp"
+#include "Acts/EventData/TrackParameters.hpp"
+#include "Acts/Extrapolation/ExtrapolationCell.hpp"
+#include "Acts/Extrapolation/IMaterialEffectsEngine.hpp"
+#include "Acts/Extrapolation/MaterialUpdateMode.hpp"
+#include "Acts/Extrapolation/detail/ExtrapolationMacros.hpp"
+#include "Acts/Utilities/Definitions.hpp"
+#include "Acts/Utilities/Logger.hpp"
 
 namespace Acts {
 
diff --git a/Legacy/include/ACTS/Extrapolation/MaterialUpdateMode.hpp b/Legacy/include/Acts/Extrapolation/MaterialUpdateMode.hpp
similarity index 100%
rename from Legacy/include/ACTS/Extrapolation/MaterialUpdateMode.hpp
rename to Legacy/include/Acts/Extrapolation/MaterialUpdateMode.hpp
diff --git a/Legacy/include/ACTS/Extrapolation/RungeKuttaEngine.hpp b/Legacy/include/Acts/Extrapolation/RungeKuttaEngine.hpp
similarity index 95%
rename from Legacy/include/ACTS/Extrapolation/RungeKuttaEngine.hpp
rename to Legacy/include/Acts/Extrapolation/RungeKuttaEngine.hpp
index 180a6ea5cd6192d51d17d0d4c452d033c739ec90..299b3c9d218a986e6a6d3e093ed0627b46d2b967 100644
--- a/Legacy/include/ACTS/Extrapolation/RungeKuttaEngine.hpp
+++ b/Legacy/include/Acts/Extrapolation/RungeKuttaEngine.hpp
@@ -13,19 +13,19 @@
 #ifndef ACTS_EXTRAPOLATION_RUNGEKUTAENGINE_H
 #define ACTS_EXTRAPOLATION_RUNGEKUTAENGINE_H 1
 
-#include "ACTS/EventData/NeutralParameters.hpp"
-#include "ACTS/EventData/TrackParameters.hpp"
-#include "ACTS/Extrapolation/ExtrapolationCell.hpp"
-#include "ACTS/Extrapolation/IPropagationEngine.hpp"
-#include "ACTS/Extrapolation/detail/ExtrapolationMacros.hpp"
-#include "ACTS/Extrapolation/detail/RungeKuttaUtils.hpp"
-#include "ACTS/MagneticField/ConstantBField.hpp"
-#include "ACTS/Surfaces/BoundaryCheck.hpp"
-#include "ACTS/Surfaces/ConeSurface.hpp"
-#include "ACTS/Surfaces/CylinderSurface.hpp"
-#include "ACTS/Surfaces/Surface.hpp"
-#include "ACTS/Utilities/Definitions.hpp"
-#include "ACTS/Utilities/Logger.hpp"
+#include "Acts/EventData/NeutralParameters.hpp"
+#include "Acts/EventData/TrackParameters.hpp"
+#include "Acts/Extrapolation/ExtrapolationCell.hpp"
+#include "Acts/Extrapolation/IPropagationEngine.hpp"
+#include "Acts/Extrapolation/detail/ExtrapolationMacros.hpp"
+#include "Acts/Extrapolation/detail/RungeKuttaUtils.hpp"
+#include "Acts/MagneticField/ConstantBField.hpp"
+#include "Acts/Surfaces/BoundaryCheck.hpp"
+#include "Acts/Surfaces/ConeSurface.hpp"
+#include "Acts/Surfaces/CylinderSurface.hpp"
+#include "Acts/Surfaces/Surface.hpp"
+#include "Acts/Utilities/Definitions.hpp"
+#include "Acts/Utilities/Logger.hpp"
 
 namespace Acts {
 
@@ -385,6 +385,6 @@ private:
 ////////////////////////////////////////////////////////////////////////////////
 // Templated method
 ////////////////////////////////////////////////////////////////////////////////
-#include "ACTS/Extrapolation/detail/RungeKuttaEngine.ipp"
+#include "Acts/Extrapolation/detail/RungeKuttaEngine.ipp"
 
 #endif  // ACTS_EXTRAPOLATION_RUNGEKUTAENGINE_H
diff --git a/Legacy/include/ACTS/Extrapolation/StaticEngine.hpp b/Legacy/include/Acts/Extrapolation/StaticEngine.hpp
similarity index 93%
rename from Legacy/include/ACTS/Extrapolation/StaticEngine.hpp
rename to Legacy/include/Acts/Extrapolation/StaticEngine.hpp
index 5b8479f44c677a28f285f7e52c7aff1fa63d36f0..4051551cbcb5a7da20d5968159ce9e556ceebe6b 100644
--- a/Legacy/include/ACTS/Extrapolation/StaticEngine.hpp
+++ b/Legacy/include/Acts/Extrapolation/StaticEngine.hpp
@@ -18,15 +18,15 @@
 #define OH_CHECKFOUND(object) (object ? "found" : "not found")
 #endif
 
-#include "ACTS/EventData/NeutralParameters.hpp"
-#include "ACTS/EventData/TrackParameters.hpp"
-#include "ACTS/Extrapolation/ExtrapolationCell.hpp"
-#include "ACTS/Extrapolation/IExtrapolationEngine.hpp"
-#include "ACTS/Extrapolation/IMaterialEffectsEngine.hpp"
-#include "ACTS/Extrapolation/INavigationEngine.hpp"
-#include "ACTS/Extrapolation/IPropagationEngine.hpp"
-#include "ACTS/Extrapolation/detail/ExtrapolationMacros.hpp"
-#include "ACTS/Utilities/Logger.hpp"
+#include "Acts/EventData/NeutralParameters.hpp"
+#include "Acts/EventData/TrackParameters.hpp"
+#include "Acts/Extrapolation/ExtrapolationCell.hpp"
+#include "Acts/Extrapolation/IExtrapolationEngine.hpp"
+#include "Acts/Extrapolation/IMaterialEffectsEngine.hpp"
+#include "Acts/Extrapolation/INavigationEngine.hpp"
+#include "Acts/Extrapolation/IPropagationEngine.hpp"
+#include "Acts/Extrapolation/detail/ExtrapolationMacros.hpp"
+#include "Acts/Utilities/Logger.hpp"
 
 namespace Acts {
 
@@ -240,6 +240,6 @@ StaticEngine::getConfiguration() const
 
 }  // end of namespace
 
-#include "ACTS/Extrapolation/detail/StaticEngine.ipp"
+#include "Acts/Extrapolation/detail/StaticEngine.ipp"
 
 #endif  // ACTS_EXTRAPOLATION_STATICENGINE_H
diff --git a/Legacy/include/ACTS/Extrapolation/StaticNavigationEngine.hpp b/Legacy/include/Acts/Extrapolation/StaticNavigationEngine.hpp
similarity index 92%
rename from Legacy/include/ACTS/Extrapolation/StaticNavigationEngine.hpp
rename to Legacy/include/Acts/Extrapolation/StaticNavigationEngine.hpp
index cdfd349c73e58d8b29686496e38d47c0f680977c..b5802590f9f9a9398e777758ccd8a2bc339a76a1 100644
--- a/Legacy/include/ACTS/Extrapolation/StaticNavigationEngine.hpp
+++ b/Legacy/include/Acts/Extrapolation/StaticNavigationEngine.hpp
@@ -13,15 +13,15 @@
 #ifndef ACTS_EXTRAPOLATION_STATICNAVIGATIONENGINE_H
 #define ACTS_EXTRAPOLATION_STATICNAVIGATIONENGINE_H 1
 
-#include "ACTS/EventData/NeutralParameters.hpp"
-#include "ACTS/EventData/TrackParameters.hpp"
-#include "ACTS/Extrapolation/ExtrapolationCell.hpp"
-#include "ACTS/Extrapolation/IMaterialEffectsEngine.hpp"
-#include "ACTS/Extrapolation/INavigationEngine.hpp"
-#include "ACTS/Extrapolation/IPropagationEngine.hpp"
-#include "ACTS/Extrapolation/detail/ExtrapolationMacros.hpp"
-#include "ACTS/Utilities/Logger.hpp"
-#include "ACTS/Volumes/BoundarySurfaceT.hpp"
+#include "Acts/EventData/NeutralParameters.hpp"
+#include "Acts/EventData/TrackParameters.hpp"
+#include "Acts/Extrapolation/ExtrapolationCell.hpp"
+#include "Acts/Extrapolation/IMaterialEffectsEngine.hpp"
+#include "Acts/Extrapolation/INavigationEngine.hpp"
+#include "Acts/Extrapolation/IPropagationEngine.hpp"
+#include "Acts/Extrapolation/detail/ExtrapolationMacros.hpp"
+#include "Acts/Utilities/Logger.hpp"
+#include "Acts/Volumes/BoundarySurfaceT.hpp"
 
 namespace Acts {
 
@@ -192,6 +192,6 @@ StaticNavigationEngine::getConfiguration() const
 
 }  // end of namespace
 
-#include "ACTS/Extrapolation/detail/StaticNavigationEngine.ipp"
+#include "Acts/Extrapolation/detail/StaticNavigationEngine.ipp"
 
 #endif  // ACTS_EXTRAPOLATION_STATICNAVIGATIONENGINE_H
diff --git a/Legacy/include/ACTS/Extrapolation/Wrapper.hpp b/Legacy/include/Acts/Extrapolation/Wrapper.hpp
similarity index 96%
rename from Legacy/include/ACTS/Extrapolation/Wrapper.hpp
rename to Legacy/include/Acts/Extrapolation/Wrapper.hpp
index c68147c811cf56ca1e6dbd10e80b7d6e02c074fe..24ee83d24f8e0880a00d842ef4483ed5a9904fbe 100644
--- a/Legacy/include/ACTS/Extrapolation/Wrapper.hpp
+++ b/Legacy/include/Acts/Extrapolation/Wrapper.hpp
@@ -12,14 +12,14 @@
 #include <cmath>
 #include <limits>
 #include <memory>
-#include "ACTS/EventData/NeutralParameters.hpp"
-#include "ACTS/EventData/TrackParameters.hpp"
-#include "ACTS/Extrapolation/ExtrapolationCell.hpp"
-#include "ACTS/Propagator/AbortList.hpp"
-#include "ACTS/Propagator/ActionList.hpp"
-#include "ACTS/Propagator/Propagator.hpp"
-#include "ACTS/Surfaces/CylinderSurface.hpp"
-#include "ACTS/Utilities/Units.hpp"
+#include "Acts/EventData/NeutralParameters.hpp"
+#include "Acts/EventData/TrackParameters.hpp"
+#include "Acts/Extrapolation/ExtrapolationCell.hpp"
+#include "Acts/Propagator/AbortList.hpp"
+#include "Acts/Propagator/ActionList.hpp"
+#include "Acts/Propagator/Propagator.hpp"
+#include "Acts/Surfaces/CylinderSurface.hpp"
+#include "Acts/Utilities/Units.hpp"
 
 namespace Acts {
 
diff --git a/Legacy/include/ACTS/Extrapolation/detail/ExtrapolationCell.ipp b/Legacy/include/Acts/Extrapolation/detail/ExtrapolationCell.ipp
similarity index 100%
rename from Legacy/include/ACTS/Extrapolation/detail/ExtrapolationCell.ipp
rename to Legacy/include/Acts/Extrapolation/detail/ExtrapolationCell.ipp
diff --git a/Legacy/include/ACTS/Extrapolation/detail/ExtrapolationEngine.ipp b/Legacy/include/Acts/Extrapolation/detail/ExtrapolationEngine.ipp
similarity index 98%
rename from Legacy/include/ACTS/Extrapolation/detail/ExtrapolationEngine.ipp
rename to Legacy/include/Acts/Extrapolation/detail/ExtrapolationEngine.ipp
index a9f7961916225d4e3b76434155e800c12eaac9dd..12a7459ce79136380ef830f1ef377f131429765a 100644
--- a/Legacy/include/ACTS/Extrapolation/detail/ExtrapolationEngine.ipp
+++ b/Legacy/include/Acts/Extrapolation/detail/ExtrapolationEngine.ipp
@@ -12,10 +12,10 @@
 
 #include <iomanip>
 #include <iostream>
-#include "ACTS/Detector/TrackingGeometry.hpp"
-#include "ACTS/Detector/TrackingVolume.hpp"
-#include "ACTS/Layers/Layer.hpp"
-#include "ACTS/Surfaces/Surface.hpp"
+#include "Acts/Detector/TrackingGeometry.hpp"
+#include "Acts/Detector/TrackingVolume.hpp"
+#include "Acts/Layers/Layer.hpp"
+#include "Acts/Surfaces/Surface.hpp"
 
 template <class T>
 Acts::ExtrapolationCode
diff --git a/Legacy/include/ACTS/Extrapolation/detail/ExtrapolationMacros.hpp b/Legacy/include/Acts/Extrapolation/detail/ExtrapolationMacros.hpp
similarity index 100%
rename from Legacy/include/ACTS/Extrapolation/detail/ExtrapolationMacros.hpp
rename to Legacy/include/Acts/Extrapolation/detail/ExtrapolationMacros.hpp
diff --git a/Legacy/include/ACTS/Extrapolation/detail/RungeKuttaEngine.ipp b/Legacy/include/Acts/Extrapolation/detail/RungeKuttaEngine.ipp
similarity index 99%
rename from Legacy/include/ACTS/Extrapolation/detail/RungeKuttaEngine.ipp
rename to Legacy/include/Acts/Extrapolation/detail/RungeKuttaEngine.ipp
index be6dd7d3451f6a6bc815366967c5ef4adb8bc1a5..78ac8baf6d06f9d6e77dcbfe19492458cc810985 100644
--- a/Legacy/include/ACTS/Extrapolation/detail/RungeKuttaEngine.ipp
+++ b/Legacy/include/Acts/Extrapolation/detail/RungeKuttaEngine.ipp
@@ -7,14 +7,14 @@
 // file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 #include <cmath>
-#include "ACTS/EventData/TransportJacobian.hpp"
-#include "ACTS/EventData/detail/coordinate_transformations.hpp"
-#include "ACTS/Surfaces/DiscSurface.hpp"
-#include "ACTS/Surfaces/PerigeeSurface.hpp"
-#include "ACTS/Surfaces/PlaneSurface.hpp"
-#include "ACTS/Surfaces/StrawSurface.hpp"
-#include "ACTS/Surfaces/Surface.hpp"
-#include "ACTS/Utilities/Units.hpp"
+#include "Acts/EventData/TransportJacobian.hpp"
+#include "Acts/EventData/detail/coordinate_transformations.hpp"
+#include "Acts/Surfaces/DiscSurface.hpp"
+#include "Acts/Surfaces/PerigeeSurface.hpp"
+#include "Acts/Surfaces/PlaneSurface.hpp"
+#include "Acts/Surfaces/StrawSurface.hpp"
+#include "Acts/Surfaces/Surface.hpp"
+#include "Acts/Utilities/Units.hpp"
 
 template <class MagneticField>
 template <class T>
diff --git a/Legacy/include/ACTS/Extrapolation/detail/RungeKuttaUtils.hpp b/Legacy/include/Acts/Extrapolation/detail/RungeKuttaUtils.hpp
similarity index 98%
rename from Legacy/include/ACTS/Extrapolation/detail/RungeKuttaUtils.hpp
rename to Legacy/include/Acts/Extrapolation/detail/RungeKuttaUtils.hpp
index b46ad5ee6327ea96434dc90b1c3eeb477c2a0b48..71b742f4b71c6a9a83b2368b9fc0b2e8610e501d 100644
--- a/Legacy/include/ACTS/Extrapolation/detail/RungeKuttaUtils.hpp
+++ b/Legacy/include/Acts/Extrapolation/detail/RungeKuttaUtils.hpp
@@ -16,9 +16,9 @@
 #include <limits>
 #include <map>
 #include <vector>
-#include "ACTS/EventData/NeutralParameters.hpp"
-#include "ACTS/EventData/TrackParameters.hpp"
-#include "ACTS/Surfaces/BoundaryCheck.hpp"
+#include "Acts/EventData/NeutralParameters.hpp"
+#include "Acts/EventData/TrackParameters.hpp"
+#include "Acts/Surfaces/BoundaryCheck.hpp"
 
 namespace Acts {
 
diff --git a/Legacy/include/ACTS/Extrapolation/detail/StaticEngine.ipp b/Legacy/include/Acts/Extrapolation/detail/StaticEngine.ipp
similarity index 98%
rename from Legacy/include/ACTS/Extrapolation/detail/StaticEngine.ipp
rename to Legacy/include/Acts/Extrapolation/detail/StaticEngine.ipp
index 7a567a69366a830f7f6f3c4282454211565adc1b..a937f5aa1945132f86fa43c04a64165c79a6b6c2 100644
--- a/Legacy/include/ACTS/Extrapolation/detail/StaticEngine.ipp
+++ b/Legacy/include/Acts/Extrapolation/detail/StaticEngine.ipp
@@ -12,13 +12,13 @@
 
 #include <iomanip>
 #include <iostream>
-#include "ACTS/Detector/TrackingGeometry.hpp"
-#include "ACTS/Detector/TrackingVolume.hpp"
-#include "ACTS/Extrapolation/IMaterialEffectsEngine.hpp"
-#include "ACTS/Extrapolation/INavigationEngine.hpp"
-#include "ACTS/Extrapolation/IPropagationEngine.hpp"
-#include "ACTS/Layers/Layer.hpp"
-#include "ACTS/Surfaces/Surface.hpp"
+#include "Acts/Detector/TrackingGeometry.hpp"
+#include "Acts/Detector/TrackingVolume.hpp"
+#include "Acts/Extrapolation/IMaterialEffectsEngine.hpp"
+#include "Acts/Extrapolation/INavigationEngine.hpp"
+#include "Acts/Extrapolation/IPropagationEngine.hpp"
+#include "Acts/Layers/Layer.hpp"
+#include "Acts/Surfaces/Surface.hpp"
 
 template <class T>
 Acts::ExtrapolationCode
diff --git a/Legacy/include/ACTS/Extrapolation/detail/StaticNavigationEngine.ipp b/Legacy/include/Acts/Extrapolation/detail/StaticNavigationEngine.ipp
similarity index 98%
rename from Legacy/include/ACTS/Extrapolation/detail/StaticNavigationEngine.ipp
rename to Legacy/include/Acts/Extrapolation/detail/StaticNavigationEngine.ipp
index db7dbb243b2c8c937bbc100282cb1a4472144408..254d00872293c58203299d051fdffc3a339f84f1 100644
--- a/Legacy/include/ACTS/Extrapolation/detail/StaticNavigationEngine.ipp
+++ b/Legacy/include/Acts/Extrapolation/detail/StaticNavigationEngine.ipp
@@ -10,12 +10,12 @@
 // StaticNavigationEngine.ipp, ACTS project
 ///////////////////////////////////////////////////////////////////
 
-#include "ACTS/Detector/TrackingGeometry.hpp"
-#include "ACTS/Detector/TrackingVolume.hpp"
-#include "ACTS/Extrapolation/IMaterialEffectsEngine.hpp"
-#include "ACTS/Extrapolation/IPropagationEngine.hpp"
-#include "ACTS/Utilities/Definitions.hpp"
-#include "ACTS/Volumes/BoundarySurfaceT.hpp"
+#include "Acts/Detector/TrackingGeometry.hpp"
+#include "Acts/Detector/TrackingVolume.hpp"
+#include "Acts/Extrapolation/IMaterialEffectsEngine.hpp"
+#include "Acts/Extrapolation/IPropagationEngine.hpp"
+#include "Acts/Utilities/Definitions.hpp"
+#include "Acts/Volumes/BoundarySurfaceT.hpp"
 
 template <class T>
 Acts::ExtrapolationCode
diff --git a/Legacy/include/ACTS/Propagator/AtlasStepper.hpp b/Legacy/include/Acts/Propagator/AtlasStepper.hpp
similarity index 99%
rename from Legacy/include/ACTS/Propagator/AtlasStepper.hpp
rename to Legacy/include/Acts/Propagator/AtlasStepper.hpp
index a75784beac85574632bf25b040bf4145662b803f..1e0a6161697e6a28c841e4be240c5fa95a76b7e6 100644
--- a/Legacy/include/ACTS/Propagator/AtlasStepper.hpp
+++ b/Legacy/include/Acts/Propagator/AtlasStepper.hpp
@@ -10,10 +10,10 @@
 #define ACTS_ATLAS_STEPPER_HPP
 
 #include <cmath>
-#include "ACTS/EventData/TrackParameters.hpp"
-#include "ACTS/MagneticField/concept/AnyFieldLookup.hpp"
-#include "ACTS/Surfaces/Surface.hpp"
-#include "ACTS/Utilities/Units.hpp"
+#include "Acts/EventData/TrackParameters.hpp"
+#include "Acts/MagneticField/concept/AnyFieldLookup.hpp"
+#include "Acts/Surfaces/Surface.hpp"
+#include "Acts/Utilities/Units.hpp"
 
 // This is based original stepper code from the ATLAS RungeKuttePropagagor
 namespace Acts {
diff --git a/Legacy/include/ACTS/Seeding/ATL_Seedmaker.hpp b/Legacy/include/Acts/Seeding/ATL_Seedmaker.hpp
similarity index 98%
rename from Legacy/include/ACTS/Seeding/ATL_Seedmaker.hpp
rename to Legacy/include/Acts/Seeding/ATL_Seedmaker.hpp
index 9512a911ad25edb37d53fe6edf8d41abb8c0211c..71dbf305710073c0e39fe73860f18ca70f982ee0 100644
--- a/Legacy/include/ACTS/Seeding/ATL_Seedmaker.hpp
+++ b/Legacy/include/Acts/Seeding/ATL_Seedmaker.hpp
@@ -20,8 +20,8 @@
 #include <utility>
 #include <vector>
 
-#include "ACTS/Seeding/InternalSeed.hpp"
-#include "ACTS/Seeding/SPForSeed.hpp"
+#include "Acts/Seeding/InternalSeed.hpp"
+#include "Acts/Seeding/SPForSeed.hpp"
 
 namespace Acts {
 namespace Seeding {
@@ -331,6 +331,6 @@ namespace Seeding {
   };
 }  // end of Seeding namespace
 }  // end of Acts namespace
-#include "ACTS/Seeding/ATL_Seedmaker.ipp"
+#include "Acts/Seeding/ATL_Seedmaker.ipp"
 
 #endif  // ATL_Seedmaker_hpp
diff --git a/Legacy/include/ACTS/Seeding/ATL_Seedmaker.ipp b/Legacy/include/Acts/Seeding/ATL_Seedmaker.ipp
similarity index 100%
rename from Legacy/include/ACTS/Seeding/ATL_Seedmaker.ipp
rename to Legacy/include/Acts/Seeding/ATL_Seedmaker.ipp
diff --git a/Legacy/include/ACTS/Seeding/InternalSeed.hpp b/Legacy/include/Acts/Seeding/InternalSeed.hpp
similarity index 98%
rename from Legacy/include/ACTS/Seeding/InternalSeed.hpp
rename to Legacy/include/Acts/Seeding/InternalSeed.hpp
index 7f4abc749878411eb6bdad1cb012620a344b27b0..1d76b2643316c538abc7b3d49d27ce5db2b9dadb 100644
--- a/Legacy/include/ACTS/Seeding/InternalSeed.hpp
+++ b/Legacy/include/Acts/Seeding/InternalSeed.hpp
@@ -13,8 +13,8 @@
 #ifndef InternalSeed_h
 #define InternalSeed_h
 
-#include "ACTS/Seeding/SPForSeed.hpp"
-#include "ACTS/Seeding/Seed.hpp"
+#include "Acts/Seeding/SPForSeed.hpp"
+#include "Acts/Seeding/Seed.hpp"
 
 namespace Acts {
 namespace Seeding {
diff --git a/Legacy/include/ACTS/Seeding/SPForSeed.hpp b/Legacy/include/Acts/Seeding/SPForSeed.hpp
similarity index 100%
rename from Legacy/include/ACTS/Seeding/SPForSeed.hpp
rename to Legacy/include/Acts/Seeding/SPForSeed.hpp
diff --git a/Legacy/include/ACTS/Seeding/Seed.hpp b/Legacy/include/Acts/Seeding/Seed.hpp
similarity index 100%
rename from Legacy/include/ACTS/Seeding/Seed.hpp
rename to Legacy/include/Acts/Seeding/Seed.hpp
diff --git a/Legacy/src/Extrapolation/ExtrapolationCell.cpp b/Legacy/src/Extrapolation/ExtrapolationCell.cpp
index 6d9f992ea271fa0f13e42ae4108eb132ee3b440d..485d372f7cb35ad3cdf8004f9ecedfe04bca9df4 100644
--- a/Legacy/src/Extrapolation/ExtrapolationCell.cpp
+++ b/Legacy/src/Extrapolation/ExtrapolationCell.cpp
@@ -10,7 +10,7 @@
 // ExtrapolationCell.cpp, ACTS project
 ///////////////////////////////////////////////////////////////////
 
-#include "ACTS/Extrapolation/ExtrapolationCell.hpp"
+#include "Acts/Extrapolation/ExtrapolationCell.hpp"
 
 const std::vector<std::string> Acts::ExtrapolationCode::s_ecodeNames
     = {"Unset",
diff --git a/Legacy/src/Extrapolation/ExtrapolationEngine.cpp b/Legacy/src/Extrapolation/ExtrapolationEngine.cpp
index eaa5bd75b3e81d157b7e07a9cbaed67ea2351c30..f36ff11c878c2732a755374a669a62243f2eb90e 100644
--- a/Legacy/src/Extrapolation/ExtrapolationEngine.cpp
+++ b/Legacy/src/Extrapolation/ExtrapolationEngine.cpp
@@ -10,7 +10,7 @@
 // ExtrapolationEngine.cpp, ACTS project
 ///////////////////////////////////////////////////////////////////
 
-#include "ACTS/Extrapolation/ExtrapolationEngine.hpp"
+#include "Acts/Extrapolation/ExtrapolationEngine.hpp"
 
 // constructor
 Acts::ExtrapolationEngine::ExtrapolationEngine(
diff --git a/Legacy/src/Extrapolation/MaterialEffectsEngine.cpp b/Legacy/src/Extrapolation/MaterialEffectsEngine.cpp
index 879090ae7d10123082c7b2ad1c2af90b992ba875..f212ca6c5fe6ff23d2c482e120d368aa90ce2336 100644
--- a/Legacy/src/Extrapolation/MaterialEffectsEngine.cpp
+++ b/Legacy/src/Extrapolation/MaterialEffectsEngine.cpp
@@ -10,11 +10,11 @@
 // MaterialEffectsEngine.cpp, ACTS project
 ///////////////////////////////////////////////////////////////////
 
-#include "ACTS/Extrapolation/MaterialEffectsEngine.hpp"
+#include "Acts/Extrapolation/MaterialEffectsEngine.hpp"
 #include <sstream>
-#include "ACTS/Layers/Layer.hpp"
-#include "ACTS/Material/SurfaceMaterial.hpp"
-#include "ACTS/Utilities/MaterialInteraction.hpp"
+#include "Acts/Layers/Layer.hpp"
+#include "Acts/Material/SurfaceMaterial.hpp"
+#include "Acts/Utilities/MaterialInteraction.hpp"
 
 // constructor
 Acts::MaterialEffectsEngine::MaterialEffectsEngine(
diff --git a/Legacy/src/Extrapolation/RungeKuttaUtils.cpp b/Legacy/src/Extrapolation/RungeKuttaUtils.cpp
index a206441068a4b288b8efd5de1736cec07667e868..ebc7029921e8f72d6ede526d4971f61f0028373f 100644
--- a/Legacy/src/Extrapolation/RungeKuttaUtils.cpp
+++ b/Legacy/src/Extrapolation/RungeKuttaUtils.cpp
@@ -10,14 +10,14 @@
 // RungeKuttaUtils.cpp , ACTS project
 ///////////////////////////////////////////////////////////////////
 
-#include "ACTS/Extrapolation/detail/RungeKuttaUtils.hpp"
+#include "Acts/Extrapolation/detail/RungeKuttaUtils.hpp"
 #include <cmath>
-#include "ACTS/Surfaces/ConeSurface.hpp"
-#include "ACTS/Surfaces/CylinderSurface.hpp"
-#include "ACTS/Surfaces/DiscSurface.hpp"
-#include "ACTS/Surfaces/PerigeeSurface.hpp"
-#include "ACTS/Surfaces/PlaneSurface.hpp"
-#include "ACTS/Surfaces/StrawSurface.hpp"
+#include "Acts/Surfaces/ConeSurface.hpp"
+#include "Acts/Surfaces/CylinderSurface.hpp"
+#include "Acts/Surfaces/DiscSurface.hpp"
+#include "Acts/Surfaces/PerigeeSurface.hpp"
+#include "Acts/Surfaces/PlaneSurface.hpp"
+#include "Acts/Surfaces/StrawSurface.hpp"
 
 #ifndef __USE_GNU
 void
diff --git a/Legacy/src/Extrapolation/StaticEngine.cpp b/Legacy/src/Extrapolation/StaticEngine.cpp
index 614b69ce9b67e7f8961b6b0328ad59d065ae2cd7..0e80af5bea28b189ec8ff25a3fe6bad4054acce1 100644
--- a/Legacy/src/Extrapolation/StaticEngine.cpp
+++ b/Legacy/src/Extrapolation/StaticEngine.cpp
@@ -13,7 +13,7 @@
 // STL
 #include <sstream>
 // Extrapolation module
-#include "ACTS/Extrapolation/StaticEngine.hpp"
+#include "Acts/Extrapolation/StaticEngine.hpp"
 
 // constructor
 Acts::StaticEngine::StaticEngine(const Acts::StaticEngine::Config& seConfig,
diff --git a/Legacy/src/Extrapolation/StaticNavigationEngine.cpp b/Legacy/src/Extrapolation/StaticNavigationEngine.cpp
index c58b2d2707659eacd8a443a2da0d9ad5e4dad9df..a3d1cfe3f355341f38744c5d1411b4900ea9f113 100644
--- a/Legacy/src/Extrapolation/StaticNavigationEngine.cpp
+++ b/Legacy/src/Extrapolation/StaticNavigationEngine.cpp
@@ -13,7 +13,7 @@
 // STL
 #include <sstream>
 // Extrapolation module
-#include "ACTS/Extrapolation/StaticNavigationEngine.hpp"
+#include "Acts/Extrapolation/StaticNavigationEngine.hpp"
 
 // constructor
 Acts::StaticNavigationEngine::StaticNavigationEngine(
diff --git a/Plugins/DD4hepPlugin/include/ACTS/Plugins/DD4hepPlugins/ActsExtension.hpp b/Plugins/DD4hepPlugin/include/Acts/Plugins/DD4hepPlugins/ActsExtension.hpp
similarity index 98%
rename from Plugins/DD4hepPlugin/include/ACTS/Plugins/DD4hepPlugins/ActsExtension.hpp
rename to Plugins/DD4hepPlugin/include/Acts/Plugins/DD4hepPlugins/ActsExtension.hpp
index 4713e2ce93ed04d8856f0e24d0792936f676d072..63d0eede0a1189c141036d26ec187500cf10dd07 100644
--- a/Plugins/DD4hepPlugin/include/ACTS/Plugins/DD4hepPlugins/ActsExtension.hpp
+++ b/Plugins/DD4hepPlugin/include/Acts/Plugins/DD4hepPlugins/ActsExtension.hpp
@@ -13,12 +13,12 @@
 #ifndef ACTS_DD4HEPDETECTORELEMENT_ACTSEXTENSION_H
 #define ACTS_DD4HEPDETECTORELEMENT_ACTSEXTENSION_H 1
 
-#include <ACTS/Plugins/DD4hepPlugins/IActsExtension.hpp>
+#include "Acts/Plugins/DD4hepPlugins/IActsExtension.hpp"
 #include <vector>
-#include "ACTS/Digitization/CartesianSegmentation.hpp"
-#include "ACTS/Digitization/DigitizationModule.hpp"
-#include "ACTS/Material/SurfaceMaterial.hpp"
-#include "ACTS/Surfaces/RectangleBounds.hpp"
+#include "Acts/Digitization/CartesianSegmentation.hpp"
+#include "Acts/Digitization/DigitizationModule.hpp"
+#include "Acts/Material/SurfaceMaterial.hpp"
+#include "Acts/Surfaces/RectangleBounds.hpp"
 #include "DD4hep/CartesianGridXY.h"
 #include "DD4hep/Detector.h"
 #include "DD4hep/Objects.h"
diff --git a/Plugins/DD4hepPlugin/include/ACTS/Plugins/DD4hepPlugins/ConvertDD4hepDetector.hpp b/Plugins/DD4hepPlugin/include/Acts/Plugins/DD4hepPlugins/ConvertDD4hepDetector.hpp
similarity index 97%
rename from Plugins/DD4hepPlugin/include/ACTS/Plugins/DD4hepPlugins/ConvertDD4hepDetector.hpp
rename to Plugins/DD4hepPlugin/include/Acts/Plugins/DD4hepPlugins/ConvertDD4hepDetector.hpp
index 6784ba6d5279f6cef6a548646bac82fb350613ef..6f84834a5718028e5293cf6afd0a7da79aca5378 100644
--- a/Plugins/DD4hepPlugin/include/ACTS/Plugins/DD4hepPlugins/ConvertDD4hepDetector.hpp
+++ b/Plugins/DD4hepPlugin/include/Acts/Plugins/DD4hepPlugins/ConvertDD4hepDetector.hpp
@@ -9,12 +9,12 @@
 #ifndef ACTS_DD4HEPPLUGIN_CONVERTDD4HEPDETECTOR_H
 #define ACTS_DD4HEPPLUGIN_CONVERTDD4HEPDETECTOR_H 1
 
-#include "ACTS/Detector/TrackingGeometry.hpp"
-#include "ACTS/Tools/CylinderVolumeBuilder.hpp"
-#include "ACTS/Tools/CylinderVolumeHelper.hpp"
-#include "ACTS/Utilities/BinningType.hpp"
-#include "ACTS/Utilities/Logger.hpp"
-#include "ACTS/Utilities/Units.hpp"
+#include "Acts/Detector/TrackingGeometry.hpp"
+#include "Acts/Tools/CylinderVolumeBuilder.hpp"
+#include "Acts/Tools/CylinderVolumeHelper.hpp"
+#include "Acts/Utilities/BinningType.hpp"
+#include "Acts/Utilities/Logger.hpp"
+#include "Acts/Utilities/Units.hpp"
 #include "DD4hep/DetElement.h"
 
 namespace Acts {
diff --git a/Plugins/DD4hepPlugin/include/ACTS/Plugins/DD4hepPlugins/DD4hepDetElement.hpp b/Plugins/DD4hepPlugin/include/Acts/Plugins/DD4hepPlugins/DD4hepDetElement.hpp
similarity index 98%
rename from Plugins/DD4hepPlugin/include/ACTS/Plugins/DD4hepPlugins/DD4hepDetElement.hpp
rename to Plugins/DD4hepPlugin/include/Acts/Plugins/DD4hepPlugins/DD4hepDetElement.hpp
index 2a6db247199c3e6ee56274dfc662e3ef52288694..aa1c76d1f0b3eae969f475fbb22544be1c01b693 100644
--- a/Plugins/DD4hepPlugin/include/ACTS/Plugins/DD4hepPlugins/DD4hepDetElement.hpp
+++ b/Plugins/DD4hepPlugin/include/Acts/Plugins/DD4hepPlugins/DD4hepDetElement.hpp
@@ -13,7 +13,7 @@
 #ifndef ACTS_DD4HEPDETECTORELEMENT_DD4HEPDETELEMENT_H
 #define ACTS_DD4HEPDETECTORELEMENT_DD4HEPDETELEMENT_H 1
 
-#include "ACTS/Plugins/TGeoPlugins/TGeoDetectorElement.hpp"
+#include "Acts/Plugins/TGeoPlugins/TGeoDetectorElement.hpp"
 #include "DD4hep/DetElement.h"
 
 namespace Acts {
diff --git a/Plugins/DD4hepPlugin/include/ACTS/Plugins/DD4hepPlugins/DD4hepLayerBuilder.hpp b/Plugins/DD4hepPlugin/include/Acts/Plugins/DD4hepPlugins/DD4hepLayerBuilder.hpp
similarity index 96%
rename from Plugins/DD4hepPlugin/include/ACTS/Plugins/DD4hepPlugins/DD4hepLayerBuilder.hpp
rename to Plugins/DD4hepPlugin/include/Acts/Plugins/DD4hepPlugins/DD4hepLayerBuilder.hpp
index c7b20aaba2141cf7e066e03b6f710778158b01ed..3505cdce25deaad3bbf9444e116bd16510c19372 100644
--- a/Plugins/DD4hepPlugin/include/ACTS/Plugins/DD4hepPlugins/DD4hepLayerBuilder.hpp
+++ b/Plugins/DD4hepPlugin/include/Acts/Plugins/DD4hepPlugins/DD4hepLayerBuilder.hpp
@@ -9,12 +9,12 @@
 #ifndef ACTS_DD4HEPPLUGIN_DD4HEPLAYERBUILDER_H
 #define ACTS_DD4HEPPLUGIN_DD4HEPLAYERBUILDER_H 1
 
-#include "ACTS/Surfaces/Surface.hpp"
-#include "ACTS/Tools/ILayerBuilder.hpp"
-#include "ACTS/Tools/LayerCreator.hpp"
-#include "ACTS/Utilities/BinUtility.hpp"
-#include "ACTS/Utilities/Definitions.hpp"
-#include "ACTS/Utilities/Logger.hpp"
+#include "Acts/Surfaces/Surface.hpp"
+#include "Acts/Tools/ILayerBuilder.hpp"
+#include "Acts/Tools/LayerCreator.hpp"
+#include "Acts/Utilities/BinUtility.hpp"
+#include "Acts/Utilities/Definitions.hpp"
+#include "Acts/Utilities/Logger.hpp"
 
 class TGeoMatrix;
 
diff --git a/Plugins/DD4hepPlugin/include/ACTS/Plugins/DD4hepPlugins/IActsExtension.hpp b/Plugins/DD4hepPlugin/include/Acts/Plugins/DD4hepPlugins/IActsExtension.hpp
similarity index 99%
rename from Plugins/DD4hepPlugin/include/ACTS/Plugins/DD4hepPlugins/IActsExtension.hpp
rename to Plugins/DD4hepPlugin/include/Acts/Plugins/DD4hepPlugins/IActsExtension.hpp
index 9edd6707644fe97718679abba81da868027e59bc..26382b9587513e81a6474a6fa63237fe8ae8aeb2 100644
--- a/Plugins/DD4hepPlugin/include/ACTS/Plugins/DD4hepPlugins/IActsExtension.hpp
+++ b/Plugins/DD4hepPlugin/include/Acts/Plugins/DD4hepPlugins/IActsExtension.hpp
@@ -16,7 +16,7 @@
 // Algebra
 #include <memory>
 #include <vector>
-#include "ACTS/Utilities/Definitions.hpp"
+#include "Acts/Utilities/Definitions.hpp"
 
 namespace dd4hep {
 class DetElement;
diff --git a/Plugins/DD4hepPlugin/src/ActsExtension.cpp b/Plugins/DD4hepPlugin/src/ActsExtension.cpp
index c4b7d11f0ef47334e228188c51e824c32f7199bb..7364ace0e8173631f7f2b93fbfc13625193b48d3 100644
--- a/Plugins/DD4hepPlugin/src/ActsExtension.cpp
+++ b/Plugins/DD4hepPlugin/src/ActsExtension.cpp
@@ -6,15 +6,15 @@
 // 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/.
 
-#include "ACTS/Plugins/DD4hepPlugins/ActsExtension.hpp"
+#include "Acts/Plugins/DD4hepPlugins/ActsExtension.hpp"
 #include <boost/algorithm/string.hpp>
-#include "ACTS/Digitization/CartesianSegmentation.hpp"
-#include "ACTS/Digitization/DigitizationModule.hpp"
-#include "ACTS/Material/HomogeneousSurfaceMaterial.hpp"
-#include "ACTS/Surfaces/PlanarBounds.hpp"
-#include "ACTS/Surfaces/RectangleBounds.hpp"
-#include "ACTS/Surfaces/TrapezoidBounds.hpp"
-#include "ACTS/Utilities/Units.hpp"
+#include "Acts/Digitization/CartesianSegmentation.hpp"
+#include "Acts/Digitization/DigitizationModule.hpp"
+#include "Acts/Material/HomogeneousSurfaceMaterial.hpp"
+#include "Acts/Surfaces/PlanarBounds.hpp"
+#include "Acts/Surfaces/RectangleBounds.hpp"
+#include "Acts/Surfaces/TrapezoidBounds.hpp"
+#include "Acts/Utilities/Units.hpp"
 #include "DD4hep/CartesianGridXY.h"
 
 std::shared_ptr<const Acts::DigitizationModule>
diff --git a/Plugins/DD4hepPlugin/src/ConvertDD4hepDetector.cpp b/Plugins/DD4hepPlugin/src/ConvertDD4hepDetector.cpp
index e9d0f11737035c325d669d73e41812aaef135fe5..c341e9a4de941c1fc88aed058dfc62526d62fb31 100644
--- a/Plugins/DD4hepPlugin/src/ConvertDD4hepDetector.cpp
+++ b/Plugins/DD4hepPlugin/src/ConvertDD4hepDetector.cpp
@@ -6,18 +6,18 @@
 // 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/.
 
-#include "ACTS/Plugins/DD4hepPlugins/ConvertDD4hepDetector.hpp"
+#include "Acts/Plugins/DD4hepPlugins/ConvertDD4hepDetector.hpp"
 #include <list>
 #include <stdexcept>
-#include "ACTS/Material/MaterialProperties.hpp"
-#include "ACTS/Plugins/DD4hepPlugins/DD4hepLayerBuilder.hpp"
-#include "ACTS/Plugins/DD4hepPlugins/IActsExtension.hpp"
-#include "ACTS/Tools/LayerArrayCreator.hpp"
-#include "ACTS/Tools/LayerCreator.hpp"
-#include "ACTS/Tools/PassiveLayerBuilder.hpp"
-#include "ACTS/Tools/SurfaceArrayCreator.hpp"
-#include "ACTS/Tools/TrackingGeometryBuilder.hpp"
-#include "ACTS/Tools/TrackingVolumeArrayCreator.hpp"
+#include "Acts/Material/MaterialProperties.hpp"
+#include "Acts/Plugins/DD4hepPlugins/DD4hepLayerBuilder.hpp"
+#include "Acts/Plugins/DD4hepPlugins/IActsExtension.hpp"
+#include "Acts/Tools/LayerArrayCreator.hpp"
+#include "Acts/Tools/LayerCreator.hpp"
+#include "Acts/Tools/PassiveLayerBuilder.hpp"
+#include "Acts/Tools/SurfaceArrayCreator.hpp"
+#include "Acts/Tools/TrackingGeometryBuilder.hpp"
+#include "Acts/Tools/TrackingVolumeArrayCreator.hpp"
 #include "TGeoManager.h"
 
 namespace Acts {
diff --git a/Plugins/DD4hepPlugin/src/DD4hepDetectorElement.cpp b/Plugins/DD4hepPlugin/src/DD4hepDetectorElement.cpp
index f9b93cc800c7175452e10ef5fc692f909bb0b194..9932ed19b2f482099091f9672d4c5910203322a0 100644
--- a/Plugins/DD4hepPlugin/src/DD4hepDetectorElement.cpp
+++ b/Plugins/DD4hepPlugin/src/DD4hepDetectorElement.cpp
@@ -6,13 +6,13 @@
 // 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/.
 
-#include "ACTS/Digitization/CartesianSegmentation.hpp"
-#include "ACTS/Digitization/DigitizationModule.hpp"
-#include "ACTS/Plugins/DD4hepPlugins/DD4hepDetElement.hpp"
-#include "ACTS/Surfaces/RectangleBounds.hpp"
-#include "ACTS/Surfaces/Surface.hpp"
-#include "ACTS/Surfaces/TrapezoidBounds.hpp"
-#include "ACTS/Utilities/Units.hpp"
+#include "Acts/Digitization/CartesianSegmentation.hpp"
+#include "Acts/Digitization/DigitizationModule.hpp"
+#include "Acts/Plugins/DD4hepPlugins/DD4hepDetElement.hpp"
+#include "Acts/Surfaces/RectangleBounds.hpp"
+#include "Acts/Surfaces/Surface.hpp"
+#include "Acts/Surfaces/TrapezoidBounds.hpp"
+#include "Acts/Utilities/Units.hpp"
 #include "DD4hep/CartesianGridXY.h"
 
 Acts::DD4hepDetElement::DD4hepDetElement(
diff --git a/Plugins/DD4hepPlugin/src/DD4hepLayerBuilder.cpp b/Plugins/DD4hepPlugin/src/DD4hepLayerBuilder.cpp
index 2b62b9c22d56b19ca54090e4d50328231c681cf4..5b3e9fb028ff9a8148aa3c0fe05268cfcc2ccce5 100644
--- a/Plugins/DD4hepPlugin/src/DD4hepLayerBuilder.cpp
+++ b/Plugins/DD4hepPlugin/src/DD4hepLayerBuilder.cpp
@@ -6,29 +6,29 @@
 // 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/.
 
-#include "ACTS/Plugins/DD4hepPlugins/DD4hepLayerBuilder.hpp"
-#include "ACTS/Layers/CylinderLayer.hpp"
-#include "ACTS/Layers/DiscLayer.hpp"
-#include "ACTS/Layers/GenericApproachDescriptor.hpp"
-#include "ACTS/Layers/Layer.hpp"
-#include "ACTS/Layers/ProtoLayer.hpp"
-#include "ACTS/Material/SurfaceMaterialProxy.hpp"
-#include "ACTS/Plugins/DD4hepPlugins/DD4hepDetElement.hpp"
-#include "ACTS/Plugins/DD4hepPlugins/IActsExtension.hpp"
-#include "ACTS/Surfaces/CylinderSurface.hpp"
-#include "ACTS/Surfaces/RadialBounds.hpp"
-#include "ACTS/Surfaces/Surface.hpp"
-#include "ACTS/Surfaces/SurfaceArray.hpp"
-#include "ACTS/Tools/LayerCreator.hpp"
-#include "ACTS/Utilities/BinUtility.hpp"
-#include "ACTS/Utilities/BinnedArrayXD.hpp"
-#include "ACTS/Utilities/Units.hpp"
+#include "Acts/Plugins/DD4hepPlugins/DD4hepLayerBuilder.hpp"
+#include "Acts/Layers/CylinderLayer.hpp"
+#include "Acts/Layers/DiscLayer.hpp"
+#include "Acts/Layers/GenericApproachDescriptor.hpp"
+#include "Acts/Layers/Layer.hpp"
+#include "Acts/Layers/ProtoLayer.hpp"
+#include "Acts/Material/SurfaceMaterialProxy.hpp"
+#include "Acts/Plugins/DD4hepPlugins/DD4hepDetElement.hpp"
+#include "Acts/Plugins/DD4hepPlugins/IActsExtension.hpp"
+#include "Acts/Surfaces/CylinderSurface.hpp"
+#include "Acts/Surfaces/RadialBounds.hpp"
+#include "Acts/Surfaces/Surface.hpp"
+#include "Acts/Surfaces/SurfaceArray.hpp"
+#include "Acts/Tools/LayerCreator.hpp"
+#include "Acts/Utilities/BinUtility.hpp"
+#include "Acts/Utilities/BinnedArrayXD.hpp"
+#include "Acts/Utilities/Units.hpp"
 #include "DD4hep/Detector.h"
 #include "TGeoManager.h"
 #include "TGeoMatrix.h"
 
 #include <boost/algorithm/string.hpp>
-#include "ACTS/Material/HomogeneousSurfaceMaterial.hpp"
+#include "Acts/Material/HomogeneousSurfaceMaterial.hpp"
 
 Acts::DD4hepLayerBuilder::DD4hepLayerBuilder(
     const Acts::DD4hepLayerBuilder::Config& config,
diff --git a/Plugins/Geant4Plugin/include/ACTS/Plugins/Geant4Plugins/Geant4DetectorElement.hpp b/Plugins/Geant4Plugin/include/Acts/Plugins/Geant4Plugins/Geant4DetectorElement.hpp
similarity index 100%
rename from Plugins/Geant4Plugin/include/ACTS/Plugins/Geant4Plugins/Geant4DetectorElement.hpp
rename to Plugins/Geant4Plugin/include/Acts/Plugins/Geant4Plugins/Geant4DetectorElement.hpp
diff --git a/Plugins/JsonPlugin/include/ACTS/Plugins/JsonPlugin/FromJson.hpp b/Plugins/JsonPlugin/include/Acts/Plugins/JsonPlugin/FromJson.hpp
similarity index 93%
rename from Plugins/JsonPlugin/include/ACTS/Plugins/JsonPlugin/FromJson.hpp
rename to Plugins/JsonPlugin/include/Acts/Plugins/JsonPlugin/FromJson.hpp
index 504434ecbd07ac921d5fd0dd25ac4f41c9b03081..e33fdbe4e0d06d80298649394ab33b50cf32edff 100644
--- a/Plugins/JsonPlugin/include/ACTS/Plugins/JsonPlugin/FromJson.hpp
+++ b/Plugins/JsonPlugin/include/Acts/Plugins/JsonPlugin/FromJson.hpp
@@ -9,7 +9,7 @@
 #ifndef ACTS_PLUGINS_JSONPLUGIN_JSONLOADER_H
 #define ACTS_PLUGINS_JSONPLUGIN_JSONLOADER_H
 
-#include "ACTS/Utilities/VariantDataFwd.hpp"
+#include "Acts/Utilities/VariantDataFwd.hpp"
 #include "lib/json.hpp"
 
 namespace Acts {
diff --git a/Plugins/JsonPlugin/include/ACTS/Plugins/JsonPlugin/lib/json.hpp b/Plugins/JsonPlugin/include/Acts/Plugins/JsonPlugin/lib/json.hpp
similarity index 100%
rename from Plugins/JsonPlugin/include/ACTS/Plugins/JsonPlugin/lib/json.hpp
rename to Plugins/JsonPlugin/include/Acts/Plugins/JsonPlugin/lib/json.hpp
diff --git a/Plugins/JsonPlugin/src/FromJson.cpp b/Plugins/JsonPlugin/src/FromJson.cpp
index 1ea12030d2c78bf441b131e81ad2bbe17a9b0920..1cdfdf242f9c7f382c86215482e51de77e83e9d1 100644
--- a/Plugins/JsonPlugin/src/FromJson.cpp
+++ b/Plugins/JsonPlugin/src/FromJson.cpp
@@ -6,11 +6,11 @@
 // 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/.
 
-#include "ACTS/Plugins/JsonPlugin/lib/json.hpp"
-#include "ACTS/Utilities/VariantData.hpp"
+#include "Acts/Plugins/JsonPlugin/lib/json.hpp"
+#include "Acts/Utilities/VariantData.hpp"
 
-#include "ACTS/Plugins/JsonPlugin/FromJson.hpp"
-#include "ACTS/Utilities/ThrowAssert.hpp"
+#include "Acts/Plugins/JsonPlugin/FromJson.hpp"
+#include "Acts/Utilities/ThrowAssert.hpp"
 
 using json = nlohmann::json;
 
diff --git a/Plugins/MaterialPlugin/include/ACTS/Plugins/MaterialPlugins/AssignedMaterialSteps.hpp b/Plugins/MaterialPlugin/include/Acts/Plugins/MaterialPlugins/AssignedMaterialSteps.hpp
similarity index 90%
rename from Plugins/MaterialPlugin/include/ACTS/Plugins/MaterialPlugins/AssignedMaterialSteps.hpp
rename to Plugins/MaterialPlugin/include/Acts/Plugins/MaterialPlugins/AssignedMaterialSteps.hpp
index e31b79d4d9dcc27b3b849292adc50f02761946e8..1d3b4c063f571ce9a92ace2c929f2e19ebedac31 100644
--- a/Plugins/MaterialPlugin/include/ACTS/Plugins/MaterialPlugins/AssignedMaterialSteps.hpp
+++ b/Plugins/MaterialPlugin/include/Acts/Plugins/MaterialPlugins/AssignedMaterialSteps.hpp
@@ -13,9 +13,9 @@
 #ifndef ACTS_MATERIALPLUGINS_ASSIGNEDMATERIALSTEPS_H
 #define ACTS_MATERIALPLUGINS_ASSIGNEDMATERIALSTEPS_H
 
-#include "ACTS/Plugins/MaterialPlugins/MaterialStep.hpp"
-#include "ACTS/Utilities/Definitions.hpp"
-#include "ACTS/Utilities/GeometryID.hpp"
+#include "Acts/Plugins/MaterialPlugins/MaterialStep.hpp"
+#include "Acts/Utilities/Definitions.hpp"
+#include "Acts/Utilities/GeometryID.hpp"
 
 namespace Acts {
 
diff --git a/Plugins/MaterialPlugin/include/ACTS/Plugins/MaterialPlugins/MaterialMapper.hpp b/Plugins/MaterialPlugin/include/Acts/Plugins/MaterialPlugins/MaterialMapper.hpp
similarity index 93%
rename from Plugins/MaterialPlugin/include/ACTS/Plugins/MaterialPlugins/MaterialMapper.hpp
rename to Plugins/MaterialPlugin/include/Acts/Plugins/MaterialPlugins/MaterialMapper.hpp
index 122c4aa7d68be951804e177275d502919bfdecbe..83f03898b45699ee3265df13949e75a098855211 100644
--- a/Plugins/MaterialPlugin/include/ACTS/Plugins/MaterialPlugins/MaterialMapper.hpp
+++ b/Plugins/MaterialPlugin/include/Acts/Plugins/MaterialPlugins/MaterialMapper.hpp
@@ -15,13 +15,13 @@
 
 #include <map>
 #include <utility>
-#include "ACTS/Extrapolation/IExtrapolationEngine.hpp"
-#include "ACTS/Plugins/MaterialPlugins/AssignedMaterialSteps.hpp"
-#include "ACTS/Plugins/MaterialPlugins/MaterialStep.hpp"
-#include "ACTS/Plugins/MaterialPlugins/MaterialTrack.hpp"
-#include "ACTS/Plugins/MaterialPlugins/SurfaceMaterialRecord.hpp"
-#include "ACTS/Utilities/Definitions.hpp"
-#include "ACTS/Utilities/Logger.hpp"
+#include "Acts/Extrapolation/IExtrapolationEngine.hpp"
+#include "Acts/Plugins/MaterialPlugins/AssignedMaterialSteps.hpp"
+#include "Acts/Plugins/MaterialPlugins/MaterialStep.hpp"
+#include "Acts/Plugins/MaterialPlugins/MaterialTrack.hpp"
+#include "Acts/Plugins/MaterialPlugins/SurfaceMaterialRecord.hpp"
+#include "Acts/Utilities/Definitions.hpp"
+#include "Acts/Utilities/Logger.hpp"
 
 namespace Acts {
 
diff --git a/Plugins/MaterialPlugin/include/ACTS/Plugins/MaterialPlugins/MaterialStep.hpp b/Plugins/MaterialPlugin/include/Acts/Plugins/MaterialPlugins/MaterialStep.hpp
similarity index 97%
rename from Plugins/MaterialPlugin/include/ACTS/Plugins/MaterialPlugins/MaterialStep.hpp
rename to Plugins/MaterialPlugin/include/Acts/Plugins/MaterialPlugins/MaterialStep.hpp
index 551843f0d9739d26516489a7cd33f13cbcd80b57..e7edbf1a5eb4c28348ccee28283b6881cf90c57a 100644
--- a/Plugins/MaterialPlugin/include/ACTS/Plugins/MaterialPlugins/MaterialStep.hpp
+++ b/Plugins/MaterialPlugin/include/Acts/Plugins/MaterialPlugins/MaterialStep.hpp
@@ -14,10 +14,10 @@
 #define ACTS_MATERIALPLUGINS_MATERIALSTEP_H
 
 #include <memory>
-#include "ACTS/Material/MaterialProperties.hpp"
+#include "Acts/Material/MaterialProperties.hpp"
 
 #if !defined(__CLING__)
-#include "ACTS/Utilities/Definitions.hpp"
+#include "Acts/Utilities/Definitions.hpp"
 #endif
 
 namespace Acts {
diff --git a/Plugins/MaterialPlugin/include/ACTS/Plugins/MaterialPlugins/MaterialTrack.hpp b/Plugins/MaterialPlugin/include/Acts/Plugins/MaterialPlugins/MaterialTrack.hpp
similarity index 98%
rename from Plugins/MaterialPlugin/include/ACTS/Plugins/MaterialPlugins/MaterialTrack.hpp
rename to Plugins/MaterialPlugin/include/Acts/Plugins/MaterialPlugins/MaterialTrack.hpp
index e9d10fc6133658c9644aeda12fe4c995f09206cf..bbd77abb1e0fb380f8dfcd16b40b69b83932fd32 100644
--- a/Plugins/MaterialPlugin/include/ACTS/Plugins/MaterialPlugins/MaterialTrack.hpp
+++ b/Plugins/MaterialPlugin/include/Acts/Plugins/MaterialPlugins/MaterialTrack.hpp
@@ -14,7 +14,7 @@
 #define ACTS_MATERIALPLUGINS_MATERIALTRACK_H
 
 #include <vector>
-#include "ACTS/Plugins/MaterialPlugins/MaterialStep.hpp"
+#include "Acts/Plugins/MaterialPlugins/MaterialStep.hpp"
 
 namespace Acts {
 
diff --git a/Plugins/MaterialPlugin/include/ACTS/Plugins/MaterialPlugins/SurfaceMaterialRecord.hpp b/Plugins/MaterialPlugin/include/Acts/Plugins/MaterialPlugins/SurfaceMaterialRecord.hpp
similarity index 93%
rename from Plugins/MaterialPlugin/include/ACTS/Plugins/MaterialPlugins/SurfaceMaterialRecord.hpp
rename to Plugins/MaterialPlugin/include/Acts/Plugins/MaterialPlugins/SurfaceMaterialRecord.hpp
index 290c6623a019cd32ebcc8799129512b6b28eb421..42e581b09cbb890862ff27c17d4cae872740e2f3 100644
--- a/Plugins/MaterialPlugin/include/ACTS/Plugins/MaterialPlugins/SurfaceMaterialRecord.hpp
+++ b/Plugins/MaterialPlugin/include/Acts/Plugins/MaterialPlugins/SurfaceMaterialRecord.hpp
@@ -13,11 +13,11 @@
 #ifndef ACTS_MATERIALPLUGINS_SURFACEMATERIALRECORD_H
 #define ACTS_MATERIALPLUGINS_SURFACEMATERIALRECORD_H
 
-#include "ACTS/Material/BinnedSurfaceMaterial.hpp"
-#include "ACTS/Material/MaterialProperties.hpp"
-#include "ACTS/Plugins/MaterialPlugins/AssignedMaterialSteps.hpp"
-#include "ACTS/Plugins/MaterialPlugins/MaterialStep.hpp"
-#include "ACTS/Utilities/BinUtility.hpp"
+#include "Acts/Material/BinnedSurfaceMaterial.hpp"
+#include "Acts/Material/MaterialProperties.hpp"
+#include "Acts/Plugins/MaterialPlugins/AssignedMaterialSteps.hpp"
+#include "Acts/Plugins/MaterialPlugins/MaterialStep.hpp"
+#include "Acts/Utilities/BinUtility.hpp"
 
 namespace Acts {
 
diff --git a/Plugins/MaterialPlugin/src/MaterialMapper.cpp b/Plugins/MaterialPlugin/src/MaterialMapper.cpp
index 4e35ef960a3fb89dd3f5f0ab4e0fefa9bc3ea576..23b22577e42dcce3aa728f2dccd92c968001300f 100644
--- a/Plugins/MaterialPlugin/src/MaterialMapper.cpp
+++ b/Plugins/MaterialPlugin/src/MaterialMapper.cpp
@@ -10,24 +10,24 @@
 // MaterialMapper.cpp, ACTS project
 ///////////////////////////////////////////////////////////////////
 
-#include "ACTS/Plugins/MaterialPlugins/MaterialMapper.hpp"
+#include "Acts/Plugins/MaterialPlugins/MaterialMapper.hpp"
 #include <climits>
-#include "ACTS/Detector/TrackingGeometry.hpp"
-#include "ACTS/Detector/TrackingVolume.hpp"
-#include "ACTS/EventData/NeutralParameters.hpp"
-#include "ACTS/EventData/TrackParameters.hpp"
-#include "ACTS/Extrapolation/ExtrapolationCell.hpp"
-#include "ACTS/Layers/Layer.hpp"
-#include "ACTS/Material/BinnedSurfaceMaterial.hpp"
-#include "ACTS/Material/SurfaceMaterial.hpp"
-#include "ACTS/Material/SurfaceMaterialProxy.hpp"
-#include "ACTS/Plugins/MaterialPlugins/SurfaceMaterialRecord.hpp"
-#include "ACTS/Surfaces/CylinderBounds.hpp"
-#include "ACTS/Surfaces/RadialBounds.hpp"
-#include "ACTS/Surfaces/Surface.hpp"
-#include "ACTS/Utilities/BinUtility.hpp"
-#include "ACTS/Utilities/GeometryObjectSorter.hpp"
-#include "ACTS/Utilities/Helpers.hpp"
+#include "Acts/Detector/TrackingGeometry.hpp"
+#include "Acts/Detector/TrackingVolume.hpp"
+#include "Acts/EventData/NeutralParameters.hpp"
+#include "Acts/EventData/TrackParameters.hpp"
+#include "Acts/Extrapolation/ExtrapolationCell.hpp"
+#include "Acts/Layers/Layer.hpp"
+#include "Acts/Material/BinnedSurfaceMaterial.hpp"
+#include "Acts/Material/SurfaceMaterial.hpp"
+#include "Acts/Material/SurfaceMaterialProxy.hpp"
+#include "Acts/Plugins/MaterialPlugins/SurfaceMaterialRecord.hpp"
+#include "Acts/Surfaces/CylinderBounds.hpp"
+#include "Acts/Surfaces/RadialBounds.hpp"
+#include "Acts/Surfaces/Surface.hpp"
+#include "Acts/Utilities/BinUtility.hpp"
+#include "Acts/Utilities/GeometryObjectSorter.hpp"
+#include "Acts/Utilities/Helpers.hpp"
 
 Acts::MaterialMapper::MaterialMapper(const Config&                 cfg,
                                      std::unique_ptr<const Logger> log)
diff --git a/Plugins/MaterialPlugin/src/MaterialStep.cpp b/Plugins/MaterialPlugin/src/MaterialStep.cpp
index bc521c3f04678af833951758c8933f29fc59b2f0..137b6ba3c168b23891f2dc455591282379a8363b 100644
--- a/Plugins/MaterialPlugin/src/MaterialStep.cpp
+++ b/Plugins/MaterialPlugin/src/MaterialStep.cpp
@@ -10,7 +10,7 @@
 // MaterialStep.cpp, ACTS project
 ///////////////////////////////////////////////////////////////////
 
-#include "ACTS/Plugins/MaterialPlugins/MaterialStep.hpp"
+#include "Acts/Plugins/MaterialPlugins/MaterialStep.hpp"
 
 Acts::MaterialStep::MaterialStep()
   : m_position(Position()), m_material(), m_geoID(0)
diff --git a/Plugins/MaterialPlugin/src/MaterialTrack.cpp b/Plugins/MaterialPlugin/src/MaterialTrack.cpp
index b1243f58cf3f441579d1d04dc4fd1ccf774693cc..e7fa1d13d38392b5cac282253be927dcefcdf2b4 100644
--- a/Plugins/MaterialPlugin/src/MaterialTrack.cpp
+++ b/Plugins/MaterialPlugin/src/MaterialTrack.cpp
@@ -10,7 +10,7 @@
 // MaterialTrack.cpp, ACTS project
 ///////////////////////////////////////////////////////////////////
 
-#include "ACTS/Plugins/MaterialPlugins/MaterialTrack.hpp"
+#include "Acts/Plugins/MaterialPlugins/MaterialTrack.hpp"
 
 Acts::MaterialTrack::MaterialTrack(const MaterialStep::Position& startPos,
                                    double                        theta,
diff --git a/Plugins/MaterialPlugin/src/SurfaceMaterialRecord.cpp b/Plugins/MaterialPlugin/src/SurfaceMaterialRecord.cpp
index 89969c3884d386c81b961396177fc6939cda3d92..1a73fa0c00acf1dc80f8228d0f83fd9c1736ee6c 100644
--- a/Plugins/MaterialPlugin/src/SurfaceMaterialRecord.cpp
+++ b/Plugins/MaterialPlugin/src/SurfaceMaterialRecord.cpp
@@ -10,8 +10,8 @@
 // SurfaceMaterialRecord.cpp, ACTS project
 ///////////////////////////////////////////////////////////////////
 
-#include "ACTS/Plugins/MaterialPlugins/SurfaceMaterialRecord.hpp"
-#include "ACTS/Surfaces/Surface.hpp"
+#include "Acts/Plugins/MaterialPlugins/SurfaceMaterialRecord.hpp"
+#include "Acts/Surfaces/Surface.hpp"
 
 Acts::SurfaceMaterialRecord::SurfaceMaterialRecord(const Surface&    surface,
                                                    const BinUtility& binUtility)
diff --git a/Plugins/TGeoPlugin/include/ACTS/Plugins/TGeoPlugins/TGeoDetectorElement.hpp b/Plugins/TGeoPlugin/include/Acts/Plugins/TGeoPlugins/TGeoDetectorElement.hpp
similarity index 99%
rename from Plugins/TGeoPlugin/include/ACTS/Plugins/TGeoPlugins/TGeoDetectorElement.hpp
rename to Plugins/TGeoPlugin/include/Acts/Plugins/TGeoPlugins/TGeoDetectorElement.hpp
index 7b727cdfdcf9d80ff6d2e6d9b970df618fbd9248..d31168a44fd54fa5f4b57613ed23bd26d909db19 100644
--- a/Plugins/TGeoPlugin/include/ACTS/Plugins/TGeoPlugins/TGeoDetectorElement.hpp
+++ b/Plugins/TGeoPlugin/include/Acts/Plugins/TGeoPlugins/TGeoDetectorElement.hpp
@@ -14,7 +14,7 @@
 #define ACTS_TGEODETECTORELEMENT_TGEODETECTORELEMENT 1
 
 #include <iostream>
-#include "ACTS/Detector/DetectorElementBase.hpp"
+#include "Acts/Detector/DetectorElementBase.hpp"
 #include "TGeoManager.h"
 
 namespace Acts {
diff --git a/Plugins/TGeoPlugin/include/ACTS/Plugins/TGeoPlugins/TGeoLayerBuilder.hpp b/Plugins/TGeoPlugin/include/Acts/Plugins/TGeoPlugins/TGeoLayerBuilder.hpp
similarity index 96%
rename from Plugins/TGeoPlugin/include/ACTS/Plugins/TGeoPlugins/TGeoLayerBuilder.hpp
rename to Plugins/TGeoPlugin/include/Acts/Plugins/TGeoPlugins/TGeoLayerBuilder.hpp
index 849b6d681e79e005a8c70e7196027f71c66caa24..ec9d680d96453fc5049efede47afaab3be563166 100644
--- a/Plugins/TGeoPlugin/include/ACTS/Plugins/TGeoPlugins/TGeoLayerBuilder.hpp
+++ b/Plugins/TGeoPlugin/include/Acts/Plugins/TGeoPlugins/TGeoLayerBuilder.hpp
@@ -13,10 +13,10 @@
 #ifndef ACTS_TGEOPLUGINS_TGEOLAYERBUILDER_H
 #define ACTS_TGEOPLUGINS_TGEOLAYERBUILDER_H
 
-#include "ACTS/Tools/ILayerBuilder.hpp"
-#include "ACTS/Tools/LayerCreator.hpp"
-#include "ACTS/Utilities/Definitions.hpp"
-#include "ACTS/Utilities/Logger.hpp"
+#include "Acts/Tools/ILayerBuilder.hpp"
+#include "Acts/Tools/LayerCreator.hpp"
+#include "Acts/Utilities/Definitions.hpp"
+#include "Acts/Utilities/Logger.hpp"
 
 class TGeoMatrix;
 class TGeoVolume;
diff --git a/Plugins/TGeoPlugin/src/TGeoDetectorElement.cpp b/Plugins/TGeoPlugin/src/TGeoDetectorElement.cpp
index 5ff25c1acc0008e3a36251c5eea1c1d54141c599..38b6a316a62c4c222100985165741bdfd4658e55 100644
--- a/Plugins/TGeoPlugin/src/TGeoDetectorElement.cpp
+++ b/Plugins/TGeoPlugin/src/TGeoDetectorElement.cpp
@@ -6,19 +6,19 @@
 // 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/.
 
-#include "ACTS/Plugins/TGeoPlugins/TGeoDetectorElement.hpp"
+#include "Acts/Plugins/TGeoPlugins/TGeoDetectorElement.hpp"
 #include <boost/algorithm/string.hpp>
 #include <iostream>
-#include "ACTS/Digitization/DigitizationModule.hpp"
-#include "ACTS/Material/SurfaceMaterial.hpp"
-#include "ACTS/Surfaces/CylinderBounds.hpp"
-#include "ACTS/Surfaces/CylinderSurface.hpp"
-#include "ACTS/Surfaces/DiscSurface.hpp"
-#include "ACTS/Surfaces/PlaneSurface.hpp"
-#include "ACTS/Surfaces/RadialBounds.hpp"
-#include "ACTS/Surfaces/RectangleBounds.hpp"
-#include "ACTS/Surfaces/TrapezoidBounds.hpp"
-#include "ACTS/Utilities/Definitions.hpp"
+#include "Acts/Digitization/DigitizationModule.hpp"
+#include "Acts/Material/SurfaceMaterial.hpp"
+#include "Acts/Surfaces/CylinderBounds.hpp"
+#include "Acts/Surfaces/CylinderSurface.hpp"
+#include "Acts/Surfaces/DiscSurface.hpp"
+#include "Acts/Surfaces/PlaneSurface.hpp"
+#include "Acts/Surfaces/RadialBounds.hpp"
+#include "Acts/Surfaces/RectangleBounds.hpp"
+#include "Acts/Surfaces/TrapezoidBounds.hpp"
+#include "Acts/Utilities/Definitions.hpp"
 #include "TGeoBBox.h"
 #include "TGeoTrd2.h"
 #include "TGeoTube.h"
diff --git a/Plugins/TGeoPlugin/src/TGeoLayerBuilder.cpp b/Plugins/TGeoPlugin/src/TGeoLayerBuilder.cpp
index 429c4a788dd2a61ed28c6831bf89818f10b73e08..d9ef55c6e6de559e142937c9b678676bb069d657 100644
--- a/Plugins/TGeoPlugin/src/TGeoLayerBuilder.cpp
+++ b/Plugins/TGeoPlugin/src/TGeoLayerBuilder.cpp
@@ -6,10 +6,10 @@
 // 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/.
 
-#include "ACTS/Plugins/TGeoPlugins/TGeoLayerBuilder.hpp"
+#include "Acts/Plugins/TGeoPlugins/TGeoLayerBuilder.hpp"
 #include <stdio.h>
-#include "ACTS/Layers/ProtoLayer.hpp"
-#include "ACTS/Plugins/TGeoPlugins/TGeoDetectorElement.hpp"
+#include "Acts/Layers/ProtoLayer.hpp"
+#include "Acts/Plugins/TGeoPlugins/TGeoDetectorElement.hpp"
 #include "TGeoManager.h"
 #include "TGeoMatrix.h"
 
diff --git a/Tests/Detector/GeometryCreation.hpp b/Tests/Detector/GeometryCreation.hpp
index 0834ece516748caf531ec6dd635c4962c2f07991..d440b7fb72702faf84458429b65e4a251af2b3ed 100644
--- a/Tests/Detector/GeometryCreation.hpp
+++ b/Tests/Detector/GeometryCreation.hpp
@@ -6,15 +6,15 @@
 // 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/.
 
-#include "ACTS/Detector/TrackingGeometry.hpp"
-#include "ACTS/Detector/TrackingVolume.hpp"
-#include "ACTS/Layers/CylinderLayer.hpp"
-#include "ACTS/Surfaces/CylinderBounds.hpp"
-#include "ACTS/Surfaces/CylinderSurface.hpp"
-#include "ACTS/Utilities/BinUtility.hpp"
-#include "ACTS/Utilities/BinnedArrayXD.hpp"
-#include "ACTS/Utilities/Definitions.hpp"
-#include "ACTS/Volumes/CylinderVolumeBounds.hpp"
+#include "Acts/Detector/TrackingGeometry.hpp"
+#include "Acts/Detector/TrackingVolume.hpp"
+#include "Acts/Layers/CylinderLayer.hpp"
+#include "Acts/Surfaces/CylinderBounds.hpp"
+#include "Acts/Surfaces/CylinderSurface.hpp"
+#include "Acts/Utilities/BinUtility.hpp"
+#include "Acts/Utilities/BinnedArrayXD.hpp"
+#include "Acts/Utilities/Definitions.hpp"
+#include "Acts/Volumes/CylinderVolumeBounds.hpp"
 
 namespace Acts {
 
diff --git a/Tests/Detector/TrackingGeometryClosureTests.cpp b/Tests/Detector/TrackingGeometryClosureTests.cpp
index a9ba31dd32bf614a97bfe7a98ea4a92aacccea01..98c60a7e2186c9d5fb3c6032263374098c642d69 100644
--- a/Tests/Detector/TrackingGeometryClosureTests.cpp
+++ b/Tests/Detector/TrackingGeometryClosureTests.cpp
@@ -9,8 +9,8 @@
 ///  Boost include(s)
 #define BOOST_TEST_MODULE GeometryID Tests
 #include <boost/test/included/unit_test.hpp>
-#include "ACTS/Utilities/Helpers.hpp"
-#include "ACTS/Utilities/Units.hpp"
+#include "Acts/Utilities/Helpers.hpp"
+#include "Acts/Utilities/Units.hpp"
 #include "GeometryCreation.hpp"
 
 namespace Acts {
diff --git a/Tests/Detector/TrackingGeometryGeoIDTests.cpp b/Tests/Detector/TrackingGeometryGeoIDTests.cpp
index 95a18bb8f8a32eb2d9bf66eefe8cd0eafc23c362..06e38c1260631b514d5bed34a076158ef265ebe9 100644
--- a/Tests/Detector/TrackingGeometryGeoIDTests.cpp
+++ b/Tests/Detector/TrackingGeometryGeoIDTests.cpp
@@ -9,8 +9,8 @@
 ///  Boost include(s)
 #define BOOST_TEST_MODULE GeometryID Tests
 #include <boost/test/included/unit_test.hpp>
-#include "ACTS/Detector/TrackingGeometry.hpp"
-#include "ACTS/Utilities/Units.hpp"
+#include "Acts/Detector/TrackingGeometry.hpp"
+#include "Acts/Utilities/Units.hpp"
 #include "GeometryCreation.hpp"
 
 namespace Acts {
diff --git a/Tests/EventData/BoundParametersTests.cpp b/Tests/EventData/BoundParametersTests.cpp
index bf247d7779286da795cd2f6914639342e4056688..797685d86133a5e64f23ad62549917c72a0b4542 100644
--- a/Tests/EventData/BoundParametersTests.cpp
+++ b/Tests/EventData/BoundParametersTests.cpp
@@ -12,19 +12,19 @@
 // leave blank as
 #include <boost/test/data/test_case.hpp>
 
-#include "ACTS/EventData/NeutralParameters.hpp"
-#include "ACTS/EventData/TrackParameters.hpp"
-#include "ACTS/Surfaces/CylinderBounds.hpp"
-#include "ACTS/Surfaces/CylinderSurface.hpp"
-#include "ACTS/Surfaces/DiscSurface.hpp"
-#include "ACTS/Surfaces/PerigeeSurface.hpp"
-#include "ACTS/Surfaces/PlaneSurface.hpp"
-#include "ACTS/Surfaces/RadialBounds.hpp"
-#include "ACTS/Surfaces/RectangleBounds.hpp"
-#include "ACTS/Surfaces/StrawSurface.hpp"
-#include "ACTS/Utilities/Definitions.hpp"
-#include "ACTS/Utilities/Units.hpp"
-#include "ACTS/Utilities/VariantData.hpp"
+#include "Acts/EventData/NeutralParameters.hpp"
+#include "Acts/EventData/TrackParameters.hpp"
+#include "Acts/Surfaces/CylinderBounds.hpp"
+#include "Acts/Surfaces/CylinderSurface.hpp"
+#include "Acts/Surfaces/DiscSurface.hpp"
+#include "Acts/Surfaces/PerigeeSurface.hpp"
+#include "Acts/Surfaces/PlaneSurface.hpp"
+#include "Acts/Surfaces/RadialBounds.hpp"
+#include "Acts/Surfaces/RectangleBounds.hpp"
+#include "Acts/Surfaces/StrawSurface.hpp"
+#include "Acts/Utilities/Definitions.hpp"
+#include "Acts/Utilities/Units.hpp"
+#include "Acts/Utilities/VariantData.hpp"
 #include "ParametersTestHelper.hpp"
 
 namespace bdata = boost::unit_test::data;
@@ -456,4 +456,4 @@ namespace Test {
                 != &(n_ataLine_from_global.referenceSurface()));
   }
 }
-}
\ No newline at end of file
+}
diff --git a/Tests/EventData/CurvilinearParametersTests.cpp b/Tests/EventData/CurvilinearParametersTests.cpp
index 435ea1111dcd15c287c9035daf44f80eb4322d62..d7a333173c78890e7afa90352784c76ea33657d6 100644
--- a/Tests/EventData/CurvilinearParametersTests.cpp
+++ b/Tests/EventData/CurvilinearParametersTests.cpp
@@ -8,9 +8,9 @@
 
 #define BOOST_TEST_MODULE CurvilinearParameters Tests
 #include <boost/test/included/unit_test.hpp>
-#include "ACTS/EventData/NeutralParameters.hpp"
-#include "ACTS/EventData/TrackParameters.hpp"
-#include "ACTS/Utilities/Definitions.hpp"
+#include "Acts/EventData/NeutralParameters.hpp"
+#include "Acts/EventData/TrackParameters.hpp"
+#include "Acts/Utilities/Definitions.hpp"
 #include "ParametersTestHelper.hpp"
 
 namespace Acts {
diff --git a/Tests/EventData/MeasurementTests.cpp b/Tests/EventData/MeasurementTests.cpp
index cfcaefbbb25ef2a9644682fb3d3eebc9017a1f38..b50615cd92996aaf16416369771c34ae21a1d968 100644
--- a/Tests/EventData/MeasurementTests.cpp
+++ b/Tests/EventData/MeasurementTests.cpp
@@ -11,9 +11,9 @@
 #include <boost/test/included/unit_test.hpp>
 
 // ACTS include(s)
-#include "ACTS/EventData/Measurement.hpp"
-#include "ACTS/Surfaces/CylinderSurface.hpp"
-#include "ACTS/Utilities/ParameterDefinitions.hpp"
+#include "Acts/EventData/Measurement.hpp"
+#include "Acts/Surfaces/CylinderSurface.hpp"
+#include "Acts/Utilities/ParameterDefinitions.hpp"
 
 namespace Acts {
 namespace Test {
diff --git a/Tests/EventData/ParameterSetTests.cpp b/Tests/EventData/ParameterSetTests.cpp
index 287217ddbdb66befec7edf9640ed73f70e3fa3df..14dbe90ee56d49e2fed6d1ae56e4231d89ae7a07 100644
--- a/Tests/EventData/ParameterSetTests.cpp
+++ b/Tests/EventData/ParameterSetTests.cpp
@@ -12,8 +12,8 @@
 
 #define BOOST_TEST_MODULE ParameterSet Tests
 #include <boost/test/included/unit_test.hpp>
-#include "ACTS/EventData/ParameterSet.hpp"
-#include "ACTS/Utilities/Definitions.hpp"
+#include "Acts/EventData/ParameterSet.hpp"
+#include "Acts/Utilities/Definitions.hpp"
 using namespace Acts::detail;
 
 ///
diff --git a/Tests/EventData/ParametersTestHelper.hpp b/Tests/EventData/ParametersTestHelper.hpp
index 5d6d9fbccd3c27632f3ba19f6814d68a168b9a33..b5acc2acf8689b5419366a2a9e5f63b4f17c3ab1 100644
--- a/Tests/EventData/ParametersTestHelper.hpp
+++ b/Tests/EventData/ParametersTestHelper.hpp
@@ -10,7 +10,7 @@
 #define ACTS_TESTS_EVENTDATA_PARAMETERTESTHELPER_H
 
 #include <boost/test/included/unit_test.hpp>
-#include "ACTS/Utilities/Definitions.hpp"
+#include "Acts/Utilities/Definitions.hpp"
 
 namespace Acts {
 namespace Test {
@@ -40,4 +40,4 @@ namespace Test {
 }
 }
 
-#endif
\ No newline at end of file
+#endif
diff --git a/Tests/Extrapolation/ExtrapolationCellTests.cpp b/Tests/Extrapolation/ExtrapolationCellTests.cpp
index 92ed8e3d1317fd254205b99c308a979b2daec2d0..87f9b4a4eb368acf7bd639a0fca1657badea5553 100644
--- a/Tests/Extrapolation/ExtrapolationCellTests.cpp
+++ b/Tests/Extrapolation/ExtrapolationCellTests.cpp
@@ -9,11 +9,11 @@
 ///  Boost include(s)
 #define BOOST_TEST_MODULE ExtrapolationCell Tests
 #include <boost/test/included/unit_test.hpp>
-#include "ACTS/EventData/NeutralParameters.hpp"
-#include "ACTS/Extrapolation/ExtrapolationCell.hpp"
-#include "ACTS/Material/Material.hpp"
-#include "ACTS/Material/MaterialProperties.hpp"
-#include "ACTS/Utilities/Units.hpp"
+#include "Acts/EventData/NeutralParameters.hpp"
+#include "Acts/Extrapolation/ExtrapolationCell.hpp"
+#include "Acts/Material/Material.hpp"
+#include "Acts/Material/MaterialProperties.hpp"
+#include "Acts/Utilities/Units.hpp"
 
 namespace Acts {
 
diff --git a/Tests/Fitter/GainMatrixTests.cpp b/Tests/Fitter/GainMatrixTests.cpp
index 0ed0d7bfe61fc110be809b7a65bb0262369efb88..9538b383180fb291e1cbae8a7f1cb519b6f46cc0 100644
--- a/Tests/Fitter/GainMatrixTests.cpp
+++ b/Tests/Fitter/GainMatrixTests.cpp
@@ -18,11 +18,11 @@
 #include <boost/test/included/unit_test.hpp>
 
 // ATS include(s)
-#include "ACTS/EventData/Measurement.hpp"
-#include "ACTS/EventData/TrackParameters.hpp"
-#include "ACTS/Fitter/KalmanUpdator.hpp"
-#include "ACTS/Surfaces/CylinderSurface.hpp"
-#include "ACTS/Utilities/ParameterDefinitions.hpp"
+#include "Acts/EventData/Measurement.hpp"
+#include "Acts/EventData/TrackParameters.hpp"
+#include "Acts/Fitter/KalmanUpdator.hpp"
+#include "Acts/Surfaces/CylinderSurface.hpp"
+#include "Acts/Utilities/ParameterDefinitions.hpp"
 
 namespace Acts {
 namespace Test {
diff --git a/Tests/Fitter/KalmanFilterTestUtils.hpp b/Tests/Fitter/KalmanFilterTestUtils.hpp
index 667a95a8738105705c529b193e120477352fce84..d3cadb14a07f53d7bc4a96a50df4d100f117e07d 100644
--- a/Tests/Fitter/KalmanFilterTestUtils.hpp
+++ b/Tests/Fitter/KalmanFilterTestUtils.hpp
@@ -15,22 +15,22 @@
 #include <memory>
 #include <random>
 #include <vector>
-#include "ACTS/Detector/TrackingGeometry.hpp"
-#include "ACTS/EventData/Measurement.hpp"
-#include "ACTS/Extrapolation/ExtrapolationCell.hpp"
-#include "ACTS/Extrapolation/ExtrapolationEngine.hpp"
-#include "ACTS/Extrapolation/IExtrapolationEngine.hpp"
-#include "ACTS/Extrapolation/MaterialEffectsEngine.hpp"
-#include "ACTS/Extrapolation/RungeKuttaEngine.hpp"
-#include "ACTS/Extrapolation/StaticEngine.hpp"
-#include "ACTS/Extrapolation/StaticNavigationEngine.hpp"
-#include "ACTS/Fitter/KalmanFitter.hpp"
-#include "ACTS/Fitter/KalmanUpdator.hpp"
-#include "ACTS/MagneticField/ConstantBField.hpp"
-#include "ACTS/Surfaces/PerigeeSurface.hpp"
-#include "ACTS/Utilities/Definitions.hpp"
-#include "ACTS/Utilities/Logger.hpp"
-#include "ACTS/Utilities/Units.hpp"
+#include "Acts/Detector/TrackingGeometry.hpp"
+#include "Acts/EventData/Measurement.hpp"
+#include "Acts/Extrapolation/ExtrapolationCell.hpp"
+#include "Acts/Extrapolation/ExtrapolationEngine.hpp"
+#include "Acts/Extrapolation/IExtrapolationEngine.hpp"
+#include "Acts/Extrapolation/MaterialEffectsEngine.hpp"
+#include "Acts/Extrapolation/RungeKuttaEngine.hpp"
+#include "Acts/Extrapolation/StaticEngine.hpp"
+#include "Acts/Extrapolation/StaticNavigationEngine.hpp"
+#include "Acts/Fitter/KalmanFitter.hpp"
+#include "Acts/Fitter/KalmanUpdator.hpp"
+#include "Acts/MagneticField/ConstantBField.hpp"
+#include "Acts/Surfaces/PerigeeSurface.hpp"
+#include "Acts/Utilities/Definitions.hpp"
+#include "Acts/Utilities/Logger.hpp"
+#include "Acts/Utilities/Units.hpp"
 
 // shorthands
 using namespace Acts;
diff --git a/Tests/Fitter/KalmanFilterTests.cpp b/Tests/Fitter/KalmanFilterTests.cpp
index 17915a1cecf4d3b8fb3a00d144539c46487ad563..cdbfbbe31077c3b5d7870a6d83e7377092e34640 100644
--- a/Tests/Fitter/KalmanFilterTests.cpp
+++ b/Tests/Fitter/KalmanFilterTests.cpp
@@ -14,20 +14,20 @@
 #include <boost/test/included/unit_test.hpp>
 
 // ATS include(s)
-#include "ACTS/Detector/TrackingGeometry.hpp"
-#include "ACTS/Detector/TrackingVolume.hpp"
-#include "ACTS/EventData/Measurement.hpp"
-#include "ACTS/EventData/TrackParameters.hpp"
-#include "ACTS/Fitter/KalmanUpdator.hpp"
-#include "ACTS/Layers/CylinderLayer.hpp"
-#include "ACTS/Material/Material.hpp"
-#include "ACTS/Surfaces/CylinderSurface.hpp"
-#include "ACTS/Tools/LayerArrayCreator.hpp"
-#include "ACTS/Tools/LayerCreator.hpp"
-#include "ACTS/Utilities/BinUtility.hpp"
-#include "ACTS/Utilities/BinnedArrayXD.hpp"
-#include "ACTS/Utilities/ParameterDefinitions.hpp"
-#include "ACTS/Volumes/CylinderVolumeBounds.hpp"
+#include "Acts/Detector/TrackingGeometry.hpp"
+#include "Acts/Detector/TrackingVolume.hpp"
+#include "Acts/EventData/Measurement.hpp"
+#include "Acts/EventData/TrackParameters.hpp"
+#include "Acts/Fitter/KalmanUpdator.hpp"
+#include "Acts/Layers/CylinderLayer.hpp"
+#include "Acts/Material/Material.hpp"
+#include "Acts/Surfaces/CylinderSurface.hpp"
+#include "Acts/Tools/LayerArrayCreator.hpp"
+#include "Acts/Tools/LayerCreator.hpp"
+#include "Acts/Utilities/BinUtility.hpp"
+#include "Acts/Utilities/BinnedArrayXD.hpp"
+#include "Acts/Utilities/ParameterDefinitions.hpp"
+#include "Acts/Volumes/CylinderVolumeBounds.hpp"
 
 #include "KalmanFilterTestUtils.hpp"
 
diff --git a/Tests/Json/FromJsonTests.cpp b/Tests/Json/FromJsonTests.cpp
index 1f14fedc3124a7050b96b4c1d46faa0b953fb632..4aa8b00ff5f00736c17fa5b38a616fa1de77a151 100644
--- a/Tests/Json/FromJsonTests.cpp
+++ b/Tests/Json/FromJsonTests.cpp
@@ -11,17 +11,17 @@
 #include <climits>
 #include <fstream>
 
-#include "ACTS/Layers/DiscLayer.hpp"
-#include "ACTS/Layers/ProtoLayer.hpp"
-#include "ACTS/Plugins/JsonPlugin/lib/json.hpp"
-#include "ACTS/Surfaces/RectangleBounds.hpp"
-#include "ACTS/Surfaces/Surface.hpp"
-#include "ACTS/Tools/LayerCreator.hpp"
-#include "ACTS/Tools/SurfaceArrayCreator.hpp"
-#include "ACTS/Utilities/Definitions.hpp"
-#include "ACTS/Utilities/VariantData.hpp"
-
-#include "ACTS/Plugins/JsonPlugin/FromJson.hpp"
+#include "Acts/Layers/DiscLayer.hpp"
+#include "Acts/Layers/ProtoLayer.hpp"
+#include "Acts/Plugins/JsonPlugin/lib/json.hpp"
+#include "Acts/Surfaces/RectangleBounds.hpp"
+#include "Acts/Surfaces/Surface.hpp"
+#include "Acts/Tools/LayerCreator.hpp"
+#include "Acts/Tools/SurfaceArrayCreator.hpp"
+#include "Acts/Utilities/Definitions.hpp"
+#include "Acts/Utilities/VariantData.hpp"
+
+#include "Acts/Plugins/JsonPlugin/FromJson.hpp"
 
 namespace Acts {
 
diff --git a/Tests/Layers/ConeLayerTests.cpp b/Tests/Layers/ConeLayerTests.cpp
index d93b5ad9d45e929e6ea1de964360c420de7d5d5c..708b1d705dfb2918542afa85d5cdad895e31b181 100644
--- a/Tests/Layers/ConeLayerTests.cpp
+++ b/Tests/Layers/ConeLayerTests.cpp
@@ -18,13 +18,13 @@
 // leave blank line
 
 //#include <limits>
-#include "ACTS/Layers/ConeLayer.hpp"
-#include "ACTS/Surfaces/ConeBounds.hpp"
-//#include "ACTS/Utilities/Definitions.hpp"
-#include "ACTS/EventData/SingleTrackParameters.hpp"
-#include "ACTS/Layers/GenericApproachDescriptor.hpp"
-#include "ACTS/Tools/SurfaceArrayCreator.hpp"
-#include "ACTS/Volumes/CuboidVolumeBounds.hpp"
+#include "Acts/Layers/ConeLayer.hpp"
+#include "Acts/Surfaces/ConeBounds.hpp"
+//#include "Acts/Utilities/Definitions.hpp"
+#include "Acts/EventData/SingleTrackParameters.hpp"
+#include "Acts/Layers/GenericApproachDescriptor.hpp"
+#include "Acts/Tools/SurfaceArrayCreator.hpp"
+#include "Acts/Volumes/CuboidVolumeBounds.hpp"
 #include "LayerStub.hpp"
 
 using boost::test_tools::output_test_stream;
diff --git a/Tests/Layers/CylinderLayerTests.cpp b/Tests/Layers/CylinderLayerTests.cpp
index bd2c1db2ff80de0a895ab7634190e57a689d4523..c2fe0406376cce6ecd15919a27a258323010f017 100644
--- a/Tests/Layers/CylinderLayerTests.cpp
+++ b/Tests/Layers/CylinderLayerTests.cpp
@@ -18,14 +18,14 @@
 // leave blank line
 
 //#include <limits>
-#include "ACTS/Layers/CylinderLayer.hpp"
-#include "ACTS/Surfaces/CylinderBounds.hpp"
-//#include "ACTS/Utilities/Definitions.hpp"
-#include "ACTS/EventData/SingleTrackParameters.hpp"
-#include "ACTS/Layers/GenericApproachDescriptor.hpp"
-#include "ACTS/Tools/SurfaceArrayCreator.hpp"
-#include "ACTS/Utilities/VariantData.hpp"
-#include "ACTS/Volumes/CuboidVolumeBounds.hpp"
+#include "Acts/Layers/CylinderLayer.hpp"
+#include "Acts/Surfaces/CylinderBounds.hpp"
+//#include "Acts/Utilities/Definitions.hpp"
+#include "Acts/EventData/SingleTrackParameters.hpp"
+#include "Acts/Layers/GenericApproachDescriptor.hpp"
+#include "Acts/Tools/SurfaceArrayCreator.hpp"
+#include "Acts/Utilities/VariantData.hpp"
+#include "Acts/Volumes/CuboidVolumeBounds.hpp"
 #include "LayerStub.hpp"
 
 using boost::test_tools::output_test_stream;
diff --git a/Tests/Layers/DiscLayerTests.cpp b/Tests/Layers/DiscLayerTests.cpp
index 51ada50c288c168fba548f95387d9da0b3c2aa0f..cecc5df9c1aed182de1e439478d06a1b5df1221a 100644
--- a/Tests/Layers/DiscLayerTests.cpp
+++ b/Tests/Layers/DiscLayerTests.cpp
@@ -18,15 +18,15 @@
 // leave blank line
 
 //#include <limits>
-#include "ACTS/Layers/DiscLayer.hpp"
-#include "ACTS/Surfaces/RadialBounds.hpp"
-//#include "ACTS/Utilities/Definitions.hpp"
-#include "ACTS/EventData/SingleTrackParameters.hpp"
-#include "ACTS/Layers/GenericApproachDescriptor.hpp"
-#include "ACTS/Tools/SurfaceArrayCreator.hpp"
-#include "ACTS/Utilities/VariantData.hpp"
-#include "ACTS/Volumes/CuboidVolumeBounds.hpp"
-#include "ACTS/Volumes/CylinderVolumeBounds.hpp"
+#include "Acts/Layers/DiscLayer.hpp"
+#include "Acts/Surfaces/RadialBounds.hpp"
+//#include "Acts/Utilities/Definitions.hpp"
+#include "Acts/EventData/SingleTrackParameters.hpp"
+#include "Acts/Layers/GenericApproachDescriptor.hpp"
+#include "Acts/Tools/SurfaceArrayCreator.hpp"
+#include "Acts/Utilities/VariantData.hpp"
+#include "Acts/Volumes/CuboidVolumeBounds.hpp"
+#include "Acts/Volumes/CylinderVolumeBounds.hpp"
 #include "LayerStub.hpp"
 
 using boost::test_tools::output_test_stream;
diff --git a/Tests/Layers/GenericApproachDescriptorTests.cpp b/Tests/Layers/GenericApproachDescriptorTests.cpp
index 330c6edb7b0008b70d598ec2fa1cb21e105c58a3..a9496cb645c3a4efba55e93efaae3894bbd0b5da 100644
--- a/Tests/Layers/GenericApproachDescriptorTests.cpp
+++ b/Tests/Layers/GenericApproachDescriptorTests.cpp
@@ -18,8 +18,8 @@
 // leave blank line
 
 #include "../Surfaces/SurfaceStub.hpp"
-#include "ACTS/Layers/GenericApproachDescriptor.hpp"
-#include "ACTS/Tools/SurfaceArrayCreator.hpp"
+#include "Acts/Layers/GenericApproachDescriptor.hpp"
+#include "Acts/Tools/SurfaceArrayCreator.hpp"
 #include "LayerStub.hpp"
 
 using boost::test_tools::output_test_stream;
diff --git a/Tests/Layers/LayerStub.hpp b/Tests/Layers/LayerStub.hpp
index 297ef4dc5b90bce483f875938a8b7ad09952a964..a026714c879eb3e992a7310a5868648290ba2e84 100644
--- a/Tests/Layers/LayerStub.hpp
+++ b/Tests/Layers/LayerStub.hpp
@@ -9,7 +9,7 @@
 #define ACTS_TEST_LAYERSTUB 1
 
 #include "../Surfaces/SurfaceStub.hpp"
-#include "ACTS/Layers/Layer.hpp"
+#include "Acts/Layers/Layer.hpp"
 
 namespace Acts {
 /// Layer derived class stub
diff --git a/Tests/Layers/LayerTests.cpp b/Tests/Layers/LayerTests.cpp
index 86415fe533dfb27881ff6868dc8d3c88c13207c3..f2e0a4093305a24d931a85fced932b1ecf9f5549 100644
--- a/Tests/Layers/LayerTests.cpp
+++ b/Tests/Layers/LayerTests.cpp
@@ -18,12 +18,12 @@
 // leave blank line
 
 //#include <limits>
-#include "ACTS/Layers/Layer.hpp"
-//#include "ACTS/Utilities/Definitions.hpp"
-#include "ACTS/EventData/SingleTrackParameters.hpp"
-#include "ACTS/Layers/GenericApproachDescriptor.hpp"
-#include "ACTS/Tools/SurfaceArrayCreator.hpp"
-#include "ACTS/Volumes/CuboidVolumeBounds.hpp"
+#include "Acts/Layers/Layer.hpp"
+//#include "Acts/Utilities/Definitions.hpp"
+#include "Acts/EventData/SingleTrackParameters.hpp"
+#include "Acts/Layers/GenericApproachDescriptor.hpp"
+#include "Acts/Tools/SurfaceArrayCreator.hpp"
+#include "Acts/Volumes/CuboidVolumeBounds.hpp"
 #include "LayerStub.hpp"
 
 using boost::test_tools::output_test_stream;
diff --git a/Tests/Layers/NavigationLayerTests.cpp b/Tests/Layers/NavigationLayerTests.cpp
index ed5d2cfd383c653c472cc43c13de574a9e5b86cc..ecba4aa1bdcd0b1bec984afea8b131dc34c9c9a7 100644
--- a/Tests/Layers/NavigationLayerTests.cpp
+++ b/Tests/Layers/NavigationLayerTests.cpp
@@ -18,13 +18,13 @@
 // leave blank line
 
 //#include <limits>
-#include "ACTS/Layers/NavigationLayer.hpp"
-//#include "ACTS/Utilities/Definitions.hpp"
-#include "ACTS/Surfaces/PlaneSurface.hpp"
-#include "ACTS/Surfaces/RectangleBounds.hpp"
-#include "ACTS/Tools/SurfaceArrayCreator.hpp"
-#include "ACTS/Utilities/VariantData.hpp"
-#include "ACTS/Volumes/CuboidVolumeBounds.hpp"
+#include "Acts/Layers/NavigationLayer.hpp"
+//#include "Acts/Utilities/Definitions.hpp"
+#include "Acts/Surfaces/PlaneSurface.hpp"
+#include "Acts/Surfaces/RectangleBounds.hpp"
+#include "Acts/Tools/SurfaceArrayCreator.hpp"
+#include "Acts/Utilities/VariantData.hpp"
+#include "Acts/Volumes/CuboidVolumeBounds.hpp"
 #include "LayerStub.hpp"
 
 using boost::test_tools::output_test_stream;
diff --git a/Tests/Layers/PlaneLayerTests.cpp b/Tests/Layers/PlaneLayerTests.cpp
index cf76422b1c0042503bbb6328c225b840c0e7f960..8a8ef825456d2ecd67c11e221bbd9f83db4f7e60 100644
--- a/Tests/Layers/PlaneLayerTests.cpp
+++ b/Tests/Layers/PlaneLayerTests.cpp
@@ -18,13 +18,13 @@
 // leave blank line
 
 //#include <limits>
-#include "ACTS/Layers/PlaneLayer.hpp"
-#include "ACTS/Surfaces/RectangleBounds.hpp"
-//#include "ACTS/Utilities/Definitions.hpp"
-#include "ACTS/EventData/SingleTrackParameters.hpp"
-#include "ACTS/Layers/GenericApproachDescriptor.hpp"
-#include "ACTS/Tools/SurfaceArrayCreator.hpp"
-#include "ACTS/Volumes/CuboidVolumeBounds.hpp"
+#include "Acts/Layers/PlaneLayer.hpp"
+#include "Acts/Surfaces/RectangleBounds.hpp"
+//#include "Acts/Utilities/Definitions.hpp"
+#include "Acts/EventData/SingleTrackParameters.hpp"
+#include "Acts/Layers/GenericApproachDescriptor.hpp"
+#include "Acts/Tools/SurfaceArrayCreator.hpp"
+#include "Acts/Volumes/CuboidVolumeBounds.hpp"
 #include "LayerStub.hpp"
 
 using boost::test_tools::output_test_stream;
diff --git a/Tests/Layers/ProtoLayerTests.cpp b/Tests/Layers/ProtoLayerTests.cpp
index 38f535306522de9ebd492fd36fac58f535b6b717..9975ab255341916cf43380f03218cb911ba31cda 100644
--- a/Tests/Layers/ProtoLayerTests.cpp
+++ b/Tests/Layers/ProtoLayerTests.cpp
@@ -12,7 +12,7 @@
 #include <boost/test/data/test_case.hpp>
 
 #include <cmath>
-#include "ACTS/Layers/ProtoLayer.hpp"
+#include "Acts/Layers/ProtoLayer.hpp"
 
 namespace Acts {
 
diff --git a/Tests/MagneticField/ConstantBFieldTests.cpp b/Tests/MagneticField/ConstantBFieldTests.cpp
index 9b034730941e0aafc3cba01887821d980673f5e9..03ea388e022bb3c72ca9078143140d34e7cd37df 100644
--- a/Tests/MagneticField/ConstantBFieldTests.cpp
+++ b/Tests/MagneticField/ConstantBFieldTests.cpp
@@ -12,9 +12,9 @@
 // clang-format off
 #include <boost/test/included/unit_test.hpp>
 #include <boost/test/data/test_case.hpp>
-#include "ACTS/MagneticField/ConstantBField.hpp"
-#include "ACTS/Utilities/Definitions.hpp"
-#include "ACTS/Utilities/Units.hpp"
+#include "Acts/MagneticField/ConstantBField.hpp"
+#include "Acts/Utilities/Definitions.hpp"
+#include "Acts/Utilities/Units.hpp"
 // clang-format on
 
 namespace bdata = boost::unit_test::data;
diff --git a/Tests/MagneticField/InterpolatedBFieldMapTests.cpp b/Tests/MagneticField/InterpolatedBFieldMapTests.cpp
index 2967b8ad9a791284bc138d20d4bdaa8fb990c9d8..bbaf670e186c914dcba7d2e6527e74ac6cb8c5a1 100644
--- a/Tests/MagneticField/InterpolatedBFieldMapTests.cpp
+++ b/Tests/MagneticField/InterpolatedBFieldMapTests.cpp
@@ -10,9 +10,9 @@
 
 #define BOOST_TEST_MODULE Mapped magnetic field tests
 #include <boost/test/included/unit_test.hpp>
-#include "ACTS/MagneticField/InterpolatedBFieldMap.hpp"
-#include "ACTS/Utilities/detail/Axis.hpp"
-#include "ACTS/Utilities/detail/Grid.hpp"
+#include "Acts/MagneticField/InterpolatedBFieldMap.hpp"
+#include "Acts/Utilities/detail/Axis.hpp"
+#include "Acts/Utilities/detail/Grid.hpp"
 
 namespace tt = boost::test_tools;
 
diff --git a/Tests/Material/MaterialPropertiesTests.cpp b/Tests/Material/MaterialPropertiesTests.cpp
index d71d0e46d1eb87293aafd6209f4d40d39e0abd27..543980893a91d7419acd662b27e992e229207971 100644
--- a/Tests/Material/MaterialPropertiesTests.cpp
+++ b/Tests/Material/MaterialPropertiesTests.cpp
@@ -10,7 +10,7 @@
 #define BOOST_TEST_MODULE Material Tests
 #include <boost/test/included/unit_test.hpp>
 #include <climits>
-#include "ACTS/Material/MaterialProperties.hpp"
+#include "Acts/Material/MaterialProperties.hpp"
 
 namespace Acts {
 
diff --git a/Tests/Material/MaterialTests.cpp b/Tests/Material/MaterialTests.cpp
index 5e28689529004d3be63729c14f635823973ccbcb..c0643ccfcc15fc6019cbfd868d6a5ce91df85f54 100644
--- a/Tests/Material/MaterialTests.cpp
+++ b/Tests/Material/MaterialTests.cpp
@@ -10,7 +10,7 @@
 #define BOOST_TEST_MODULE Material Tests
 #include <boost/test/included/unit_test.hpp>
 #include <climits>
-#include "ACTS/Material/Material.hpp"
+#include "Acts/Material/Material.hpp"
 
 namespace Acts {
 
diff --git a/Tests/MaterialMapping/MaterialMappingTests.cpp b/Tests/MaterialMapping/MaterialMappingTests.cpp
index 5665687ea0675292ddad92fa24eada1b11ba4a59..88a0c7f9e7fdaf0205c5b019ef1fc65b887c7335 100644
--- a/Tests/MaterialMapping/MaterialMappingTests.cpp
+++ b/Tests/MaterialMapping/MaterialMappingTests.cpp
@@ -10,10 +10,10 @@
 #define BOOST_TEST_MODULE MaterialMapper Tests
 #include <boost/test/included/unit_test.hpp>
 #include <climits>
-#include "ACTS/Material/MaterialProperties.hpp"
-#include "ACTS/Plugins/MaterialPlugins/AssignedMaterialSteps.hpp"
-#include "ACTS/Plugins/MaterialPlugins/MaterialMapper.hpp"
-#include "ACTS/Plugins/MaterialPlugins/MaterialStep.hpp"
+#include "Acts/Material/MaterialProperties.hpp"
+#include "Acts/Plugins/MaterialPlugins/AssignedMaterialSteps.hpp"
+#include "Acts/Plugins/MaterialPlugins/MaterialMapper.hpp"
+#include "Acts/Plugins/MaterialPlugins/MaterialStep.hpp"
 
 namespace Acts {
 
diff --git a/Tests/Propagator/AbortListTests.cpp b/Tests/Propagator/AbortListTests.cpp
index 31404b6a47bead6eca0e39ecd5ba474b4e6917a6..5300bdef4ef1ef118038c6a26c7789155246711d 100644
--- a/Tests/Propagator/AbortListTests.cpp
+++ b/Tests/Propagator/AbortListTests.cpp
@@ -18,11 +18,11 @@
 #include <boost/test/output_test_stream.hpp>
 // leave blank line
 
-#include "ACTS/Propagator/AbortList.hpp"
-#include "ACTS/Propagator/detail/Extendable.hpp"
-#include "ACTS/Propagator/detail/standard_abort_conditions.hpp"
-#include "ACTS/Utilities/Definitions.hpp"
-#include "ACTS/Utilities/Units.hpp"
+#include "Acts/Propagator/AbortList.hpp"
+#include "Acts/Propagator/detail/Extendable.hpp"
+#include "Acts/Propagator/detail/standard_abort_conditions.hpp"
+#include "Acts/Utilities/Definitions.hpp"
+#include "Acts/Utilities/Units.hpp"
 
 namespace bdata = boost::unit_test::data;
 namespace tt    = boost::test_tools;
@@ -88,4 +88,4 @@ namespace Test {
   }
 
 }  // namespace Test
-}  // namespace Acts
\ No newline at end of file
+}  // namespace Acts
diff --git a/Tests/Propagator/ActionListTests.cpp b/Tests/Propagator/ActionListTests.cpp
index c82c7eb46cb0badf871f30e155bdee84258e27ff..80dccdec17704bff10d78722482776657e4378f1 100644
--- a/Tests/Propagator/ActionListTests.cpp
+++ b/Tests/Propagator/ActionListTests.cpp
@@ -18,15 +18,15 @@
 #include <boost/test/output_test_stream.hpp>
 // leave blank line
 
-#include "ACTS/EventData/TrackParameters.hpp"
-#include "ACTS/MagneticField/ConstantBField.hpp"
-#include "ACTS/Propagator/ActionList.hpp"
-#include "ACTS/Propagator/EigenStepper.hpp"
-#include "ACTS/Propagator/Propagator.hpp"
-#include "ACTS/Propagator/detail/standard_abort_conditions.hpp"
-#include "ACTS/Surfaces/CylinderSurface.hpp"
-#include "ACTS/Utilities/Definitions.hpp"
-#include "ACTS/Utilities/Units.hpp"
+#include "Acts/EventData/TrackParameters.hpp"
+#include "Acts/MagneticField/ConstantBField.hpp"
+#include "Acts/Propagator/ActionList.hpp"
+#include "Acts/Propagator/EigenStepper.hpp"
+#include "Acts/Propagator/Propagator.hpp"
+#include "Acts/Propagator/detail/standard_abort_conditions.hpp"
+#include "Acts/Surfaces/CylinderSurface.hpp"
+#include "Acts/Utilities/Definitions.hpp"
+#include "Acts/Utilities/Units.hpp"
 
 namespace bdata = boost::unit_test::data;
 namespace tt    = boost::test_tools;
@@ -156,4 +156,4 @@ namespace Test {
   }
 
 }  // namespace Test
-}  // namespace Acts
\ No newline at end of file
+}  // namespace Acts
diff --git a/Tests/Propagator/AtlasPropagatorBenchmark.cpp b/Tests/Propagator/AtlasPropagatorBenchmark.cpp
index b83750c1d9f7ffb5276cece6f2981b10ed00e0c0..54bc5831d8dc90d5956451bb47665fd6823899d4 100644
--- a/Tests/Propagator/AtlasPropagatorBenchmark.cpp
+++ b/Tests/Propagator/AtlasPropagatorBenchmark.cpp
@@ -8,12 +8,12 @@
 
 #include <boost/program_options.hpp>
 #include <iostream>
-#include "ACTS/EventData/TrackParameters.hpp"
-#include "ACTS/Extrapolation/RungeKuttaEngine.hpp"
-#include "ACTS/MagneticField/ConstantBField.hpp"
-#include "ACTS/Surfaces/CylinderSurface.hpp"
-#include "ACTS/Utilities/Logger.hpp"
-#include "ACTS/Utilities/Units.hpp"
+#include "Acts/EventData/TrackParameters.hpp"
+#include "Acts/Extrapolation/RungeKuttaEngine.hpp"
+#include "Acts/MagneticField/ConstantBField.hpp"
+#include "Acts/Surfaces/CylinderSurface.hpp"
+#include "Acts/Utilities/Logger.hpp"
+#include "Acts/Utilities/Units.hpp"
 
 namespace po = boost::program_options;
 using namespace Acts;
diff --git a/Tests/Propagator/AtlasStepperBenchmark.cpp b/Tests/Propagator/AtlasStepperBenchmark.cpp
index 476dfe469fbf10452b61d1dde06970f89aaf646b..85d6ca5b2b63f60b7970bd438e3e309bbb756c0b 100644
--- a/Tests/Propagator/AtlasStepperBenchmark.cpp
+++ b/Tests/Propagator/AtlasStepperBenchmark.cpp
@@ -8,12 +8,12 @@
 
 #include <boost/program_options.hpp>
 #include <iostream>
-#include "ACTS/EventData/TrackParameters.hpp"
-#include "ACTS/MagneticField/ConstantBField.hpp"
-#include "ACTS/Propagator/AtlasStepper.hpp"
-#include "ACTS/Propagator/Propagator.hpp"
-#include "ACTS/Utilities/Logger.hpp"
-#include "ACTS/Utilities/Units.hpp"
+#include "Acts/EventData/TrackParameters.hpp"
+#include "Acts/MagneticField/ConstantBField.hpp"
+#include "Acts/Propagator/AtlasStepper.hpp"
+#include "Acts/Propagator/Propagator.hpp"
+#include "Acts/Utilities/Logger.hpp"
+#include "Acts/Utilities/Units.hpp"
 
 namespace po = boost::program_options;
 using namespace Acts;
diff --git a/Tests/Propagator/EigenStepperBenchmark.cpp b/Tests/Propagator/EigenStepperBenchmark.cpp
index 23929cc179c07ce9d07d4180dd87639370259d10..599b2682e2443eb4f31615e0ceb694e82ded292a 100644
--- a/Tests/Propagator/EigenStepperBenchmark.cpp
+++ b/Tests/Propagator/EigenStepperBenchmark.cpp
@@ -8,12 +8,12 @@
 
 #include <boost/program_options.hpp>
 #include <iostream>
-#include "ACTS/EventData/TrackParameters.hpp"
-#include "ACTS/MagneticField/ConstantBField.hpp"
-#include "ACTS/Propagator/EigenStepper.hpp"
-#include "ACTS/Propagator/Propagator.hpp"
-#include "ACTS/Utilities/Logger.hpp"
-#include "ACTS/Utilities/Units.hpp"
+#include "Acts/EventData/TrackParameters.hpp"
+#include "Acts/MagneticField/ConstantBField.hpp"
+#include "Acts/Propagator/EigenStepper.hpp"
+#include "Acts/Propagator/Propagator.hpp"
+#include "Acts/Utilities/Logger.hpp"
+#include "Acts/Utilities/Units.hpp"
 
 namespace po = boost::program_options;
 using namespace Acts;
diff --git a/Tests/Propagator/ExtendableTests.cpp b/Tests/Propagator/ExtendableTests.cpp
index dc99b693c403e796f53dc1e6d32fd36cab3e0297..1d299351db11a179aa940982c59451bb918ad9da 100644
--- a/Tests/Propagator/ExtendableTests.cpp
+++ b/Tests/Propagator/ExtendableTests.cpp
@@ -18,7 +18,7 @@
 #include <boost/test/output_test_stream.hpp>
 // leave blank line
 
-#include "ACTS/Propagator/detail/Extendable.hpp"
+#include "Acts/Propagator/detail/Extendable.hpp"
 
 namespace bdata = boost::unit_test::data;
 namespace tt    = boost::test_tools;
@@ -58,4 +58,4 @@ namespace Test {
   }
 
 }  // namespace Test
-}  // namespace Acts
\ No newline at end of file
+}  // namespace Acts
diff --git a/Tests/Propagator/JacobianTests.cpp b/Tests/Propagator/JacobianTests.cpp
index 1e5148e7dd73e68160ee1a7836d164ea33228fca..03417515aa07b6954ed401aba2ece0c7e220c48e 100644
--- a/Tests/Propagator/JacobianTests.cpp
+++ b/Tests/Propagator/JacobianTests.cpp
@@ -18,16 +18,16 @@
 #include <boost/test/output_test_stream.hpp>
 // leave blank line
 
-#include "ACTS/EventData/TrackParameters.hpp"
-#include "ACTS/Extrapolation/detail/RungeKuttaUtils.hpp"
-#include "ACTS/MagneticField/ConstantBField.hpp"
-#include "ACTS/Propagator/AtlasStepper.hpp"
-#include "ACTS/Propagator/EigenStepper.hpp"
-#include "ACTS/Surfaces/CylinderSurface.hpp"
-#include "ACTS/Surfaces/DiscSurface.hpp"
-#include "ACTS/Surfaces/PerigeeSurface.hpp"
-#include "ACTS/Surfaces/PlaneSurface.hpp"
-#include "ACTS/Surfaces/StrawSurface.hpp"
+#include "Acts/EventData/TrackParameters.hpp"
+#include "Acts/Extrapolation/detail/RungeKuttaUtils.hpp"
+#include "Acts/MagneticField/ConstantBField.hpp"
+#include "Acts/Propagator/AtlasStepper.hpp"
+#include "Acts/Propagator/EigenStepper.hpp"
+#include "Acts/Surfaces/CylinderSurface.hpp"
+#include "Acts/Surfaces/DiscSurface.hpp"
+#include "Acts/Surfaces/PerigeeSurface.hpp"
+#include "Acts/Surfaces/PlaneSurface.hpp"
+#include "Acts/Surfaces/StrawSurface.hpp"
 
 namespace bdata = boost::unit_test::data;
 namespace tt    = boost::test_tools;
diff --git a/Tests/Propagator/PropagatorTests.cpp b/Tests/Propagator/PropagatorTests.cpp
index 514f78525f3127ce4073906efd4c8c526de64579..82b709d63568169c43373b9cbe071e6e51b50318 100644
--- a/Tests/Propagator/PropagatorTests.cpp
+++ b/Tests/Propagator/PropagatorTests.cpp
@@ -18,15 +18,15 @@
 #include <boost/test/output_test_stream.hpp>
 // leave blank line
 
-#include "ACTS/EventData/TrackParameters.hpp"
-#include "ACTS/MagneticField/ConstantBField.hpp"
-#include "ACTS/Propagator/ActionList.hpp"
-#include "ACTS/Propagator/EigenStepper.hpp"
-#include "ACTS/Propagator/Propagator.hpp"
-#include "ACTS/Propagator/detail/standard_abort_conditions.hpp"
-#include "ACTS/Surfaces/CylinderSurface.hpp"
-#include "ACTS/Utilities/Definitions.hpp"
-#include "ACTS/Utilities/Units.hpp"
+#include "Acts/EventData/TrackParameters.hpp"
+#include "Acts/MagneticField/ConstantBField.hpp"
+#include "Acts/Propagator/ActionList.hpp"
+#include "Acts/Propagator/EigenStepper.hpp"
+#include "Acts/Propagator/Propagator.hpp"
+#include "Acts/Propagator/detail/standard_abort_conditions.hpp"
+#include "Acts/Surfaces/CylinderSurface.hpp"
+#include "Acts/Utilities/Definitions.hpp"
+#include "Acts/Utilities/Units.hpp"
 
 namespace bdata = boost::unit_test::data;
 namespace tt    = boost::test_tools;
diff --git a/Tests/Propagator/RungeKuttaEngineTests.cpp b/Tests/Propagator/RungeKuttaEngineTests.cpp
index bc885e78e60370ed062835f1280b3595f02af3fe..36e0938c9dbd525b94c9e085f1432ce5c893194f 100644
--- a/Tests/Propagator/RungeKuttaEngineTests.cpp
+++ b/Tests/Propagator/RungeKuttaEngineTests.cpp
@@ -18,17 +18,17 @@
 #include <boost/test/output_test_stream.hpp>
 // leave blank line
 
-#include "ACTS/EventData/NeutralParameters.hpp"
-#include "ACTS/EventData/TrackParameters.hpp"
-#include "ACTS/Extrapolation/ExtrapolationCell.hpp"
-#include "ACTS/Extrapolation/RungeKuttaEngine.hpp"
-#include "ACTS/MagneticField/ConstantBField.hpp"
-#include "ACTS/MagneticField/InterpolatedBFieldMap.hpp"
-#include "ACTS/Surfaces/CylinderSurface.hpp"
-#include "ACTS/Surfaces/PerigeeSurface.hpp"
-#include "ACTS/Utilities/Units.hpp"
-#include "ACTS/Utilities/detail/Axis.hpp"
-#include "ACTS/Utilities/detail/Grid.hpp"
+#include "Acts/EventData/NeutralParameters.hpp"
+#include "Acts/EventData/TrackParameters.hpp"
+#include "Acts/Extrapolation/ExtrapolationCell.hpp"
+#include "Acts/Extrapolation/RungeKuttaEngine.hpp"
+#include "Acts/MagneticField/ConstantBField.hpp"
+#include "Acts/MagneticField/InterpolatedBFieldMap.hpp"
+#include "Acts/Surfaces/CylinderSurface.hpp"
+#include "Acts/Surfaces/PerigeeSurface.hpp"
+#include "Acts/Utilities/Units.hpp"
+#include "Acts/Utilities/detail/Axis.hpp"
+#include "Acts/Utilities/detail/Grid.hpp"
 
 namespace bdata = boost::unit_test::data;
 namespace tt    = boost::test_tools;
diff --git a/Tests/Seeding/SeedingTests.cpp b/Tests/Seeding/SeedingTests.cpp
index b9df8f54d730443eb7b56ccdee67a7dc0dd524c6..54f74ef54b45d984cf9bceb7d2d2553cb0df7d34 100644
--- a/Tests/Seeding/SeedingTests.cpp
+++ b/Tests/Seeding/SeedingTests.cpp
@@ -11,9 +11,9 @@
 #define BOOST_TEST_MODULE Seeding Tests
 #include <boost/test/included/unit_test.hpp>
 
-#include "ACTS/Seeding/BarrelSeedFinder.hpp"
-#include "ACTS/Seeding/SpacePoint.hpp"
-#include "ACTS/Seeding/TrackSeed.hpp"
+#include "Acts/Seeding/BarrelSeedFinder.hpp"
+#include "Acts/Seeding/SpacePoint.hpp"
+#include "Acts/Seeding/TrackSeed.hpp"
 #include "SeedingTestsCommon.hpp"
 
 using namespace Acts::Seeding;
diff --git a/Tests/Seeding/SeedingTestsCommon.hpp b/Tests/Seeding/SeedingTestsCommon.hpp
index 0d4210d3b917c04b7947b25a4c5d67124d2b3018..454c126307ad1c2bfb1b752e552012611e463910 100644
--- a/Tests/Seeding/SeedingTestsCommon.hpp
+++ b/Tests/Seeding/SeedingTestsCommon.hpp
@@ -10,8 +10,8 @@
 
 #include <iostream>
 
-#include "ACTS/Seeding/SpacePoint.hpp"
-#include "ACTS/Seeding/TrackSeed.hpp"
+#include "Acts/Seeding/SpacePoint.hpp"
+#include "Acts/Seeding/TrackSeed.hpp"
 
 /// Construct barrel layer w/ n points equidistant in phi.
 ///
diff --git a/Tests/Seeding/SeedingToolsTests.cpp b/Tests/Seeding/SeedingToolsTests.cpp
index 663696f38e3f7e3020dcae9e049b00f4307ec1c1..1b0a2647e6828d9ee1df742a194ab11de9634bdc 100644
--- a/Tests/Seeding/SeedingToolsTests.cpp
+++ b/Tests/Seeding/SeedingToolsTests.cpp
@@ -14,9 +14,9 @@
 #include <boost/test/data/test_case.hpp>
 // clang-format on
 
-#include "ACTS/Seeding/SpacePoint.hpp"
-#include "ACTS/Seeding/detail/cyclic_range.hpp"
-#include "ACTS/Seeding/detail/geometry.hpp"
+#include "Acts/Seeding/SpacePoint.hpp"
+#include "Acts/Seeding/detail/cyclic_range.hpp"
+#include "Acts/Seeding/detail/geometry.hpp"
 #include "SeedingTestsCommon.hpp"
 
 namespace data = boost::unit_test::data;
diff --git a/Tests/Surfaces/BoundaryCheckBenchmark.cpp b/Tests/Surfaces/BoundaryCheckBenchmark.cpp
index 3e011daccf41117565bea836458a9bc02d639e42..aed01017dcd0217a52e4f2c520c8f1ea51c2740d 100644
--- a/Tests/Surfaces/BoundaryCheckBenchmark.cpp
+++ b/Tests/Surfaces/BoundaryCheckBenchmark.cpp
@@ -13,9 +13,9 @@
 #include <random>
 #include <vector>
 
-#include <ACTS/Surfaces/BoundaryCheck.hpp>
-#include <ACTS/Utilities/Definitions.hpp>
-#include <ACTS/Utilities/Units.hpp>
+#include "Acts/Surfaces/BoundaryCheck.hpp"
+#include "Acts/Utilities/Definitions.hpp"
+#include "Acts/Utilities/Units.hpp"
 
 using namespace Acts;
 
diff --git a/Tests/Surfaces/BoundaryCheckTests.cpp b/Tests/Surfaces/BoundaryCheckTests.cpp
index 15c791f65e6f41115f2bb363f402458f3c06002a..9f157e0dc2c69f1220b932ba8347edc125b45e69 100644
--- a/Tests/Surfaces/BoundaryCheckTests.cpp
+++ b/Tests/Surfaces/BoundaryCheckTests.cpp
@@ -17,9 +17,9 @@
 #include <boost/test/output_test_stream.hpp>
 // leave blank line
 
-#include "ACTS/Surfaces/BoundaryCheck.hpp"
-#include "ACTS/Utilities/Definitions.hpp"
-#include "ACTS/Utilities/Units.hpp"
+#include "Acts/Surfaces/BoundaryCheck.hpp"
+#include "Acts/Utilities/Definitions.hpp"
+#include "Acts/Utilities/Units.hpp"
 
 namespace Acts {
 namespace Test {
diff --git a/Tests/Surfaces/ConeBoundsTests.cpp b/Tests/Surfaces/ConeBoundsTests.cpp
index b4242b49132278a44a2f116f7f6562b60744fc53..43e46c3420708a10afb7362690f875c8bb7e0946 100644
--- a/Tests/Surfaces/ConeBoundsTests.cpp
+++ b/Tests/Surfaces/ConeBoundsTests.cpp
@@ -18,9 +18,9 @@
 // leave blank line
 
 //
-#include "ACTS/Surfaces/ConeBounds.hpp"
-#include "ACTS/Utilities/Definitions.hpp"
-#include "ACTS/Utilities/VariantData.hpp"
+#include "Acts/Surfaces/ConeBounds.hpp"
+#include "Acts/Utilities/Definitions.hpp"
+#include "Acts/Utilities/VariantData.hpp"
 //
 #include <limits>
 
diff --git a/Tests/Surfaces/ConeSurfaceTests.cpp b/Tests/Surfaces/ConeSurfaceTests.cpp
index eb446838ad0305e0ed418ef7ac8d4552468c27a4..4b6704bde3026f8b1b2ddeb2c5b791815968304b 100644
--- a/Tests/Surfaces/ConeSurfaceTests.cpp
+++ b/Tests/Surfaces/ConeSurfaceTests.cpp
@@ -19,10 +19,10 @@
 
 //
 #include <limits>
-#include "ACTS/Surfaces/ConeSurface.hpp"
-#include "ACTS/Surfaces/RectangleBounds.hpp"
-#include "ACTS/Utilities/Definitions.hpp"
-#include "ACTS/Utilities/VariantData.hpp"
+#include "Acts/Surfaces/ConeSurface.hpp"
+#include "Acts/Surfaces/RectangleBounds.hpp"
+#include "Acts/Utilities/Definitions.hpp"
+#include "Acts/Utilities/VariantData.hpp"
 
 namespace tt = boost::test_tools;
 using boost::test_tools::output_test_stream;
diff --git a/Tests/Surfaces/CylinderBoundsTests.cpp b/Tests/Surfaces/CylinderBoundsTests.cpp
index dbace02f24aca9157abe801b84fa401760fc5e55..d06b9e47a99ad9e652efbaaf86a10e5f77597c0b 100644
--- a/Tests/Surfaces/CylinderBoundsTests.cpp
+++ b/Tests/Surfaces/CylinderBoundsTests.cpp
@@ -18,9 +18,9 @@
 // leave blank line
 
 //
-#include "ACTS/Surfaces/CylinderBounds.hpp"
-#include "ACTS/Utilities/Definitions.hpp"
-#include "ACTS/Utilities/VariantData.hpp"
+#include "Acts/Surfaces/CylinderBounds.hpp"
+#include "Acts/Utilities/Definitions.hpp"
+#include "Acts/Utilities/VariantData.hpp"
 //
 #include <limits>
 
diff --git a/Tests/Surfaces/CylinderSurfaceTests.cpp b/Tests/Surfaces/CylinderSurfaceTests.cpp
index 4676ff1f5f7e15fa9a610d397b103be7b83e2cb8..a7b35ae07fa4ab26953ecfe650072ec69d15f181 100644
--- a/Tests/Surfaces/CylinderSurfaceTests.cpp
+++ b/Tests/Surfaces/CylinderSurfaceTests.cpp
@@ -19,10 +19,10 @@
 
 //
 #include <limits>
-#include "ACTS/Surfaces/CylinderSurface.hpp"
-#include "ACTS/Surfaces/RectangleBounds.hpp"
-#include "ACTS/Utilities/Definitions.hpp"
-#include "ACTS/Utilities/VariantData.hpp"
+#include "Acts/Surfaces/CylinderSurface.hpp"
+#include "Acts/Surfaces/RectangleBounds.hpp"
+#include "Acts/Utilities/Definitions.hpp"
+#include "Acts/Utilities/VariantData.hpp"
 #include "DetectorElementStub.hpp"
 
 namespace tt = boost::test_tools;
diff --git a/Tests/Surfaces/DetectorElementStub.hpp b/Tests/Surfaces/DetectorElementStub.hpp
index e318e6aea50bdb24c3cb494b2a31649e7099e185..613b7a462f6f6f35952b307cbe4a48a9c31b2089 100644
--- a/Tests/Surfaces/DetectorElementStub.hpp
+++ b/Tests/Surfaces/DetectorElementStub.hpp
@@ -14,14 +14,14 @@
 #define ACTS_TEST_DetectorElementStub_DetectorElementStub 1
 
 // Algebra and Identifier
-#include "ACTS/Utilities/Definitions.hpp"
-#include "ACTS/Utilities/Identifier.hpp"
+#include "Acts/Utilities/Definitions.hpp"
+#include "Acts/Utilities/Identifier.hpp"
 // Geometry module
-#include "ACTS/Detector/DetectorElementBase.hpp"
-#include "ACTS/Surfaces/PlanarBounds.hpp"
-#include "ACTS/Surfaces/PlaneSurface.hpp"
+#include "Acts/Detector/DetectorElementBase.hpp"
+#include "Acts/Surfaces/PlanarBounds.hpp"
+#include "Acts/Surfaces/PlaneSurface.hpp"
 #include "LineSurfaceStub.hpp"
-//#include "ACTS/Surfaces/DiscSurface.hpp"
+//#include "Acts/Surfaces/DiscSurface.hpp"
 
 namespace Acts {
 
diff --git a/Tests/Surfaces/DiamondBoundsTests.cpp b/Tests/Surfaces/DiamondBoundsTests.cpp
index 39769a395ba53ce6eb04933d95e32790e3317c76..54a8ec031a205112873a2d6bb796275fd7e2ce0e 100644
--- a/Tests/Surfaces/DiamondBoundsTests.cpp
+++ b/Tests/Surfaces/DiamondBoundsTests.cpp
@@ -18,10 +18,10 @@
 // leave blank
 
 //
-#include "ACTS/Surfaces/DiamondBounds.hpp"
-#include "ACTS/Utilities/Definitions.hpp"
-#include "ACTS/Utilities/ThrowAssert.hpp"
-#include "ACTS/Utilities/VariantData.hpp"
+#include "Acts/Surfaces/DiamondBounds.hpp"
+#include "Acts/Utilities/Definitions.hpp"
+#include "Acts/Utilities/ThrowAssert.hpp"
+#include "Acts/Utilities/VariantData.hpp"
 //
 #include <limits>
 
diff --git a/Tests/Surfaces/DiscSurfaceTests.cpp b/Tests/Surfaces/DiscSurfaceTests.cpp
index 3b418630a0c6a1b06362e655400e05ed97800ea4..31a5b4e8ce67063f3225e536437175dc2ea6366e 100644
--- a/Tests/Surfaces/DiscSurfaceTests.cpp
+++ b/Tests/Surfaces/DiscSurfaceTests.cpp
@@ -18,12 +18,12 @@
 // leave blank line
 
 //
-#include "ACTS/Material/HomogeneousSurfaceMaterial.hpp"
-#include "ACTS/Surfaces/DiscSurface.hpp"
-#include "ACTS/Surfaces/DiscTrapezoidalBounds.hpp"
-#include "ACTS/Surfaces/RadialBounds.hpp"
-#include "ACTS/Utilities/Definitions.hpp"
-#include "ACTS/Utilities/VariantData.hpp"
+#include "Acts/Material/HomogeneousSurfaceMaterial.hpp"
+#include "Acts/Surfaces/DiscSurface.hpp"
+#include "Acts/Surfaces/DiscTrapezoidalBounds.hpp"
+#include "Acts/Surfaces/RadialBounds.hpp"
+#include "Acts/Utilities/Definitions.hpp"
+#include "Acts/Utilities/VariantData.hpp"
 //
 #include "DetectorElementStub.hpp"
 //
diff --git a/Tests/Surfaces/DiscTrapezoidalBoundsTests.cpp b/Tests/Surfaces/DiscTrapezoidalBoundsTests.cpp
index e3612a00f8590ff88e91f88fdff181a4d1058f52..fe4e6dbad801877179a1f05b357c6a9a2d647c37 100644
--- a/Tests/Surfaces/DiscTrapezoidalBoundsTests.cpp
+++ b/Tests/Surfaces/DiscTrapezoidalBoundsTests.cpp
@@ -18,9 +18,9 @@
 // leave blank
 
 //
-#include "ACTS/Surfaces/DiscTrapezoidalBounds.hpp"
-#include "ACTS/Utilities/Definitions.hpp"
-#include "ACTS/Utilities/VariantData.hpp"
+#include "Acts/Surfaces/DiscTrapezoidalBounds.hpp"
+#include "Acts/Utilities/Definitions.hpp"
+#include "Acts/Utilities/VariantData.hpp"
 
 #include <limits>
 
diff --git a/Tests/Surfaces/EllipseBoundsTests.cpp b/Tests/Surfaces/EllipseBoundsTests.cpp
index e7b82272bd41ac5487749ee6bbdd4862c0e19eb8..cb0f94a3b4a1ce682144a4f26ca50681ec0c6a8f 100644
--- a/Tests/Surfaces/EllipseBoundsTests.cpp
+++ b/Tests/Surfaces/EllipseBoundsTests.cpp
@@ -18,9 +18,9 @@
 // leave blank
 
 //
-#include "ACTS/Surfaces/EllipseBounds.hpp"
-#include "ACTS/Utilities/Definitions.hpp"
-#include "ACTS/Utilities/VariantData.hpp"
+#include "Acts/Surfaces/EllipseBounds.hpp"
+#include "Acts/Utilities/Definitions.hpp"
+#include "Acts/Utilities/VariantData.hpp"
 //
 #include <limits>
 
diff --git a/Tests/Surfaces/InfiniteBoundsTests.cpp b/Tests/Surfaces/InfiniteBoundsTests.cpp
index ab6dcd4cdfc15fcb23b0df1c29ec16f7cd348fa1..27efb91793f4af5a6424bedb2f2b51c384d8bf74 100644
--- a/Tests/Surfaces/InfiniteBoundsTests.cpp
+++ b/Tests/Surfaces/InfiniteBoundsTests.cpp
@@ -18,8 +18,8 @@
 // leave blank line
 
 //
-#include "ACTS/Surfaces/InfiniteBounds.hpp"
-#include "ACTS/Utilities/Definitions.hpp"
+#include "Acts/Surfaces/InfiniteBounds.hpp"
+#include "Acts/Utilities/Definitions.hpp"
 
 namespace Acts {
 
diff --git a/Tests/Surfaces/LineBoundsTests.cpp b/Tests/Surfaces/LineBoundsTests.cpp
index ea53ebf6946f7ccc4b4ada5a3ea474e78170959e..4449877c6038e62cedc7d8d3ddd13fec15f2027d 100644
--- a/Tests/Surfaces/LineBoundsTests.cpp
+++ b/Tests/Surfaces/LineBoundsTests.cpp
@@ -18,8 +18,8 @@
 // leave blank line
 
 //
-#include "ACTS/Surfaces/LineBounds.hpp"
-#include "ACTS/Utilities/Definitions.hpp"
+#include "Acts/Surfaces/LineBounds.hpp"
+#include "Acts/Utilities/Definitions.hpp"
 
 namespace Acts {
 
diff --git a/Tests/Surfaces/LineSurfaceStub.hpp b/Tests/Surfaces/LineSurfaceStub.hpp
index ed2bf5383d12a79df9523ae7b2728e9a67dc864d..476821f1816cec94a3d2fd6caf6f84024def6bb0 100644
--- a/Tests/Surfaces/LineSurfaceStub.hpp
+++ b/Tests/Surfaces/LineSurfaceStub.hpp
@@ -9,9 +9,9 @@
 #define ACTS_TESTS_SURFACES_LINESURFACESTUB 1
 
 //
-#include "ACTS/Surfaces/LineSurface.hpp"
-#include "ACTS/Utilities/Definitions.hpp"
-#include "ACTS/Utilities/VariantDataFwd.hpp"
+#include "Acts/Surfaces/LineSurface.hpp"
+#include "Acts/Utilities/Definitions.hpp"
+#include "Acts/Utilities/VariantDataFwd.hpp"
 //
 //
 #include <limits>
diff --git a/Tests/Surfaces/LineSurfaceTests.cpp b/Tests/Surfaces/LineSurfaceTests.cpp
index c4e675d8a7b7f5d68ef95be819e933f0f9d1aceb..87dd05ee4ae245c760b9553ee1b07aa429dbf1de 100644
--- a/Tests/Surfaces/LineSurfaceTests.cpp
+++ b/Tests/Surfaces/LineSurfaceTests.cpp
@@ -18,10 +18,10 @@
 // leave blank line
 
 //
-#include "ACTS/Material/HomogeneousSurfaceMaterial.hpp"
-#include "ACTS/Surfaces/LineSurface.hpp"
-#include "ACTS/Utilities/Definitions.hpp"
-#include "ACTS/Utilities/VariantData.hpp"
+#include "Acts/Material/HomogeneousSurfaceMaterial.hpp"
+#include "Acts/Surfaces/LineSurface.hpp"
+#include "Acts/Utilities/Definitions.hpp"
+#include "Acts/Utilities/VariantData.hpp"
 //
 #include "DetectorElementStub.hpp"
 #include "LineSurfaceStub.hpp"
diff --git a/Tests/Surfaces/PerigeeSurfaceTests.cpp b/Tests/Surfaces/PerigeeSurfaceTests.cpp
index 9bbfd53ed80a1c596b668adf6fd3313f9edd1d5f..2b54f8e89650f1dc4dff26dc08d7bad75637f4fc 100644
--- a/Tests/Surfaces/PerigeeSurfaceTests.cpp
+++ b/Tests/Surfaces/PerigeeSurfaceTests.cpp
@@ -19,13 +19,13 @@
 
 //
 #include <limits>
-#include "ACTS/Layers/PlaneLayer.hpp"
-#include "ACTS/Material/HomogeneousSurfaceMaterial.hpp"
-#include "ACTS/Surfaces/InfiniteBounds.hpp"  //to get s_noBounds
-#include "ACTS/Surfaces/PerigeeSurface.hpp"
-#include "ACTS/Surfaces/RectangleBounds.hpp"  //to get s_noBounds
-#include "ACTS/Utilities/Definitions.hpp"
-#include "ACTS/Utilities/VariantData.hpp"
+#include "Acts/Layers/PlaneLayer.hpp"
+#include "Acts/Material/HomogeneousSurfaceMaterial.hpp"
+#include "Acts/Surfaces/InfiniteBounds.hpp"  //to get s_noBounds
+#include "Acts/Surfaces/PerigeeSurface.hpp"
+#include "Acts/Surfaces/RectangleBounds.hpp"  //to get s_noBounds
+#include "Acts/Utilities/Definitions.hpp"
+#include "Acts/Utilities/VariantData.hpp"
 
 using boost::test_tools::output_test_stream;
 namespace utf    = boost::unit_test;
diff --git a/Tests/Surfaces/PlaneSurfaceTests.cpp b/Tests/Surfaces/PlaneSurfaceTests.cpp
index 90cdcb04a7c0874ac9e45520c6852cab9693f047..73b60b9b2cb303b014a7e24ce96471bfaff97b8e 100644
--- a/Tests/Surfaces/PlaneSurfaceTests.cpp
+++ b/Tests/Surfaces/PlaneSurfaceTests.cpp
@@ -18,11 +18,11 @@
 // leave blank line
 
 #include <limits>
-#include "ACTS/Surfaces/PlaneSurface.hpp"
-#include "ACTS/Surfaces/RectangleBounds.hpp"
-#include "ACTS/Surfaces/TriangleBounds.hpp"
-#include "ACTS/Utilities/Definitions.hpp"
-#include "ACTS/Utilities/VariantData.hpp"
+#include "Acts/Surfaces/PlaneSurface.hpp"
+#include "Acts/Surfaces/RectangleBounds.hpp"
+#include "Acts/Surfaces/TriangleBounds.hpp"
+#include "Acts/Utilities/Definitions.hpp"
+#include "Acts/Utilities/VariantData.hpp"
 #include "DetectorElementStub.hpp"
 
 namespace tt = boost::test_tools;
diff --git a/Tests/Surfaces/RadialBoundsTests.cpp b/Tests/Surfaces/RadialBoundsTests.cpp
index 54f648e6ff8b1da02d270f4310c992a13ef743c2..e16ab6df32993d3137e043cb2c67c50aef1d12cc 100644
--- a/Tests/Surfaces/RadialBoundsTests.cpp
+++ b/Tests/Surfaces/RadialBoundsTests.cpp
@@ -18,9 +18,9 @@
 // leave blank
 
 //
-#include "ACTS/Surfaces/RadialBounds.hpp"
-#include "ACTS/Utilities/Definitions.hpp"
-#include "ACTS/Utilities/VariantData.hpp"
+#include "Acts/Surfaces/RadialBounds.hpp"
+#include "Acts/Utilities/Definitions.hpp"
+#include "Acts/Utilities/VariantData.hpp"
 //
 #include <limits>
 
diff --git a/Tests/Surfaces/RectangleBoundsTests.cpp b/Tests/Surfaces/RectangleBoundsTests.cpp
index e3298b61d46dd6c8ff14c53e99bef8a99ab30acf..daa491d989db638e1219a5edff09a78f160872ea 100644
--- a/Tests/Surfaces/RectangleBoundsTests.cpp
+++ b/Tests/Surfaces/RectangleBoundsTests.cpp
@@ -19,9 +19,9 @@
 
 #include <algorithm>
 #include <limits>
-#include "ACTS/Surfaces/RectangleBounds.hpp"
-#include "ACTS/Utilities/Definitions.hpp"
-#include "ACTS/Utilities/VariantData.hpp"
+#include "Acts/Surfaces/RectangleBounds.hpp"
+#include "Acts/Utilities/Definitions.hpp"
+#include "Acts/Utilities/VariantData.hpp"
 
 namespace utf    = boost::unit_test;
 const double inf = std::numeric_limits<double>::infinity();
diff --git a/Tests/Surfaces/StrawSurfaceTests.cpp b/Tests/Surfaces/StrawSurfaceTests.cpp
index 4c257399e6a4c89f2115bd546b87e37d312e75bc..199553e3ee034acbc512ca440bf7e8b261ed512e 100644
--- a/Tests/Surfaces/StrawSurfaceTests.cpp
+++ b/Tests/Surfaces/StrawSurfaceTests.cpp
@@ -18,12 +18,12 @@
 // leave blank line
 
 #include <limits>
-#include "ACTS/Layers/PlaneLayer.hpp"
-#include "ACTS/Material/HomogeneousSurfaceMaterial.hpp"
-#include "ACTS/Surfaces/RectangleBounds.hpp"
-#include "ACTS/Surfaces/StrawSurface.hpp"
-#include "ACTS/Utilities/Definitions.hpp"
-#include "ACTS/Utilities/VariantData.hpp"
+#include "Acts/Layers/PlaneLayer.hpp"
+#include "Acts/Material/HomogeneousSurfaceMaterial.hpp"
+#include "Acts/Surfaces/RectangleBounds.hpp"
+#include "Acts/Surfaces/StrawSurface.hpp"
+#include "Acts/Utilities/Definitions.hpp"
+#include "Acts/Utilities/VariantData.hpp"
 #include "DetectorElementStub.hpp"
 
 using boost::test_tools::output_test_stream;
diff --git a/Tests/Surfaces/SurfaceArrayTests.cpp b/Tests/Surfaces/SurfaceArrayTests.cpp
index b339f17b4da2c1d1504be65f656fd94eb75ee0ab..b96c4cdd0d2edd20b3c548174551ba26c7ef77ae 100644
--- a/Tests/Surfaces/SurfaceArrayTests.cpp
+++ b/Tests/Surfaces/SurfaceArrayTests.cpp
@@ -12,17 +12,17 @@
 #include <boost/format.hpp>
 #include <boost/test/data/test_case.hpp>
 
-#include "ACTS/Surfaces/CylinderBounds.hpp"
-#include "ACTS/Surfaces/PlaneSurface.hpp"
-#include "ACTS/Surfaces/RadialBounds.hpp"
-#include "ACTS/Surfaces/RectangleBounds.hpp"
-#include "ACTS/Surfaces/SurfaceArray.hpp"
-#include "ACTS/Tools/LayerCreator.hpp"
-#include "ACTS/Tools/SurfaceArrayCreator.hpp"
-#include "ACTS/Utilities/BinningType.hpp"
-#include "ACTS/Utilities/Definitions.hpp"
-#include "ACTS/Utilities/VariantData.hpp"
-#include "ACTS/Utilities/detail/Grid.hpp"
+#include "Acts/Surfaces/CylinderBounds.hpp"
+#include "Acts/Surfaces/PlaneSurface.hpp"
+#include "Acts/Surfaces/RadialBounds.hpp"
+#include "Acts/Surfaces/RectangleBounds.hpp"
+#include "Acts/Surfaces/SurfaceArray.hpp"
+#include "Acts/Tools/LayerCreator.hpp"
+#include "Acts/Tools/SurfaceArrayCreator.hpp"
+#include "Acts/Utilities/BinningType.hpp"
+#include "Acts/Utilities/Definitions.hpp"
+#include "Acts/Utilities/VariantData.hpp"
+#include "Acts/Utilities/detail/Grid.hpp"
 
 namespace bdata = boost::unit_test::data;
 namespace tt    = boost::test_tools;
diff --git a/Tests/Surfaces/SurfaceBoundsTests.cpp b/Tests/Surfaces/SurfaceBoundsTests.cpp
index 646bdf98acd1e8357160ec2fc98ea8e49c786f7a..56688e41cc184341b49c346fd66233c56adfda79 100644
--- a/Tests/Surfaces/SurfaceBoundsTests.cpp
+++ b/Tests/Surfaces/SurfaceBoundsTests.cpp
@@ -18,9 +18,9 @@
 // leave blank line
 
 //
-#include "ACTS/Surfaces/SurfaceBounds.hpp"
-#include "ACTS/Utilities/Definitions.hpp"
-#include "ACTS/Utilities/VariantData.hpp"
+#include "Acts/Surfaces/SurfaceBounds.hpp"
+#include "Acts/Utilities/Definitions.hpp"
+#include "Acts/Utilities/VariantData.hpp"
 
 namespace Acts {
 
diff --git a/Tests/Surfaces/SurfaceStub.hpp b/Tests/Surfaces/SurfaceStub.hpp
index 41e728d66ef131682551984530bf194bf8f90a9f..415536b1941f061af49da1c5c0634722c6a9f733 100644
--- a/Tests/Surfaces/SurfaceStub.hpp
+++ b/Tests/Surfaces/SurfaceStub.hpp
@@ -8,11 +8,11 @@
 #ifndef ACTS_TEST_SURFACESTUB
 #define ACTS_TEST_SURFACESTUB 1
 
-#include "ACTS/Surfaces/InfiniteBounds.hpp"  //to get s_noBounds
-#include "ACTS/Surfaces/PlanarBounds.hpp"
-#include "ACTS/Surfaces/Surface.hpp"
-#include "ACTS/Utilities/Definitions.hpp"
-#include "ACTS/Utilities/VariantData.hpp"
+#include "Acts/Surfaces/InfiniteBounds.hpp"  //to get s_noBounds
+#include "Acts/Surfaces/PlanarBounds.hpp"
+#include "Acts/Surfaces/Surface.hpp"
+#include "Acts/Utilities/Definitions.hpp"
+#include "Acts/Utilities/VariantData.hpp"
 
 namespace Acts {
 /// Surface derived class stub
diff --git a/Tests/Surfaces/SurfaceTests.cpp b/Tests/Surfaces/SurfaceTests.cpp
index 86bba82fdeac29aa9859edbc2635454d8d9a1f01..0bb9fde21f548953ce76c0a903675a3c47250e4d 100644
--- a/Tests/Surfaces/SurfaceTests.cpp
+++ b/Tests/Surfaces/SurfaceTests.cpp
@@ -18,12 +18,12 @@
 // leave blank line
 
 #include <limits>
-#include "ACTS/Layers/PlaneLayer.hpp"
-#include "ACTS/Material/HomogeneousSurfaceMaterial.hpp"
-#include "ACTS/Surfaces/InfiniteBounds.hpp"   //to get s_noBounds
-#include "ACTS/Surfaces/RectangleBounds.hpp"  //to get s_noBounds
-#include "ACTS/Surfaces/Surface.hpp"
-#include "ACTS/Utilities/Definitions.hpp"
+#include "Acts/Layers/PlaneLayer.hpp"
+#include "Acts/Material/HomogeneousSurfaceMaterial.hpp"
+#include "Acts/Surfaces/InfiniteBounds.hpp"   //to get s_noBounds
+#include "Acts/Surfaces/RectangleBounds.hpp"  //to get s_noBounds
+#include "Acts/Surfaces/Surface.hpp"
+#include "Acts/Utilities/Definitions.hpp"
 #include "DetectorElementStub.hpp"
 #include "SurfaceStub.hpp"
 
diff --git a/Tests/Surfaces/TrapezoidBoundsTests.cpp b/Tests/Surfaces/TrapezoidBoundsTests.cpp
index a27b08a07b93cb526a9d5c059609ef81d4ebfed6..76916913b35204872e2e601eb71acc68af055647 100644
--- a/Tests/Surfaces/TrapezoidBoundsTests.cpp
+++ b/Tests/Surfaces/TrapezoidBoundsTests.cpp
@@ -19,9 +19,9 @@
 
 #include <limits>
 
-#include "ACTS/Surfaces/TrapezoidBounds.hpp"
-#include "ACTS/Utilities/Definitions.hpp"
-#include "ACTS/Utilities/VariantData.hpp"
+#include "Acts/Surfaces/TrapezoidBounds.hpp"
+#include "Acts/Utilities/Definitions.hpp"
+#include "Acts/Utilities/VariantData.hpp"
 
 namespace utf    = boost::unit_test;
 const double NaN = std::numeric_limits<double>::quiet_NaN();
diff --git a/Tests/Surfaces/TriangleBoundsTests.cpp b/Tests/Surfaces/TriangleBoundsTests.cpp
index 6d56908c73f8391d05ec313423d99ec1e696d37f..5d5182cc31e213fa6579390fe35eee8985e9c057 100644
--- a/Tests/Surfaces/TriangleBoundsTests.cpp
+++ b/Tests/Surfaces/TriangleBoundsTests.cpp
@@ -19,9 +19,9 @@
 
 #include <limits>
 
-#include "ACTS/Surfaces/TriangleBounds.hpp"
-#include "ACTS/Utilities/Definitions.hpp"
-#include "ACTS/Utilities/VariantData.hpp"
+#include "Acts/Surfaces/TriangleBounds.hpp"
+#include "Acts/Utilities/Definitions.hpp"
+#include "Acts/Utilities/VariantData.hpp"
 
 namespace utf = boost::unit_test;
 // const double NaN = std::numeric_limits<double>::quiet_NaN();
diff --git a/Tests/Tools/CylinderVolumeBuilderTests.cpp b/Tests/Tools/CylinderVolumeBuilderTests.cpp
index 2ee5f49b68c86d1da2d1ba0f6ae84ce0d338bd93..0002d93d15b6bd5b7d4a769bf82c09184330ea96 100644
--- a/Tests/Tools/CylinderVolumeBuilderTests.cpp
+++ b/Tests/Tools/CylinderVolumeBuilderTests.cpp
@@ -10,8 +10,8 @@
 #include <boost/test/included/unit_test.hpp>
 
 #include <boost/test/data/test_case.hpp>
-#include "ACTS/Tools/CylinderVolumeBuilder.hpp"
-#include "ACTS/Utilities/Definitions.hpp"
+#include "Acts/Tools/CylinderVolumeBuilder.hpp"
+#include "Acts/Utilities/Definitions.hpp"
 
 namespace bdata = boost::unit_test::data;
 namespace tt    = boost::test_tools;
diff --git a/Tests/Tools/LayerCreatorTests.cpp b/Tests/Tools/LayerCreatorTests.cpp
index fa57b033a76c4e34af998a509e343ffe4c2eee33..5f4c97f5bcd711207a1d16c318aef521effa802f 100644
--- a/Tests/Tools/LayerCreatorTests.cpp
+++ b/Tests/Tools/LayerCreatorTests.cpp
@@ -12,19 +12,19 @@
 #include <boost/format.hpp>
 #include <boost/test/data/test_case.hpp>
 
-#include "ACTS/Layers/CylinderLayer.hpp"
-#include "ACTS/Layers/DiscLayer.hpp"
-#include "ACTS/Layers/ProtoLayer.hpp"
-#include "ACTS/Surfaces/CylinderBounds.hpp"
-#include "ACTS/Surfaces/PlaneSurface.hpp"
-#include "ACTS/Surfaces/RadialBounds.hpp"
-#include "ACTS/Surfaces/RectangleBounds.hpp"
-#include "ACTS/Tools/LayerCreator.hpp"
-#include "ACTS/Tools/SurfaceArrayCreator.hpp"
-#include "ACTS/Utilities/BinningType.hpp"
-#include "ACTS/Utilities/VariantData.hpp"
-
-#include "ACTS/Utilities/Definitions.hpp"
+#include "Acts/Layers/CylinderLayer.hpp"
+#include "Acts/Layers/DiscLayer.hpp"
+#include "Acts/Layers/ProtoLayer.hpp"
+#include "Acts/Surfaces/CylinderBounds.hpp"
+#include "Acts/Surfaces/PlaneSurface.hpp"
+#include "Acts/Surfaces/RadialBounds.hpp"
+#include "Acts/Surfaces/RectangleBounds.hpp"
+#include "Acts/Tools/LayerCreator.hpp"
+#include "Acts/Tools/SurfaceArrayCreator.hpp"
+#include "Acts/Utilities/BinningType.hpp"
+#include "Acts/Utilities/VariantData.hpp"
+
+#include "Acts/Utilities/Definitions.hpp"
 
 #include <fstream>
 #include <random>
diff --git a/Tests/Tools/SurfaceArrayCreatorTests.cpp b/Tests/Tools/SurfaceArrayCreatorTests.cpp
index 2b3983ff21c6a4193cd5bded6906f9757c12c419..306e2aba5deeae71ce466b8ecd12a3b582f8c807 100644
--- a/Tests/Tools/SurfaceArrayCreatorTests.cpp
+++ b/Tests/Tools/SurfaceArrayCreatorTests.cpp
@@ -12,12 +12,12 @@
 #include <boost/format.hpp>
 #include <boost/test/data/test_case.hpp>
 
-#include "ACTS/Surfaces/PlaneSurface.hpp"
-#include "ACTS/Surfaces/RectangleBounds.hpp"
-#include "ACTS/Tools/SurfaceArrayCreator.hpp"
-#include "ACTS/Utilities/BinningType.hpp"
+#include "Acts/Surfaces/PlaneSurface.hpp"
+#include "Acts/Surfaces/RectangleBounds.hpp"
+#include "Acts/Tools/SurfaceArrayCreator.hpp"
+#include "Acts/Utilities/BinningType.hpp"
 
-#include "ACTS/Utilities/Definitions.hpp"
+#include "Acts/Utilities/Definitions.hpp"
 
 #include <fstream>
 #include <random>
diff --git a/Tests/Utilities/AxesTests.cpp b/Tests/Utilities/AxesTests.cpp
index 8ba0b419891fdf10107ffeeeb8c471141071f874..2199c15b4602cf3a823380d7fb112d091e742057 100644
--- a/Tests/Utilities/AxesTests.cpp
+++ b/Tests/Utilities/AxesTests.cpp
@@ -9,7 +9,7 @@
 #define BOOST_TEST_MODULE grid axis tests
 #include <boost/test/included/unit_test.hpp>
 
-#include "ACTS/Utilities/detail/Axis.hpp"
+#include "Acts/Utilities/detail/Axis.hpp"
 
 namespace Acts {
 
diff --git a/Tests/Utilities/BFieldMapUtilsTests.cpp b/Tests/Utilities/BFieldMapUtilsTests.cpp
index ba7d29365f22e8beb20f89756a6abd38e3c52115..621e4f50c85776ea8a60fc7dd1df79fbd71ec513 100644
--- a/Tests/Utilities/BFieldMapUtilsTests.cpp
+++ b/Tests/Utilities/BFieldMapUtilsTests.cpp
@@ -11,8 +11,8 @@
 #include <boost/test/included/unit_test.hpp>
 
 #include <boost/test/data/test_case.hpp>
-#include "ACTS/Utilities/BFieldMapUtils.hpp"
-#include "ACTS/Utilities/detail/Axis.hpp"
+#include "Acts/Utilities/BFieldMapUtils.hpp"
+#include "Acts/Utilities/detail/Axis.hpp"
 
 namespace bdata = boost::unit_test::data;
 
diff --git a/Tests/Utilities/BinUtilityTests.cpp b/Tests/Utilities/BinUtilityTests.cpp
index 20404a16e2dca825f815fcb80c63098474d1e941..affa47f446256f8fa6f9ab783640e0d4982c539a 100644
--- a/Tests/Utilities/BinUtilityTests.cpp
+++ b/Tests/Utilities/BinUtilityTests.cpp
@@ -9,9 +9,9 @@
 // Boost include(s)
 #define BOOST_TEST_MODULE BinUtility Tests
 #include <boost/test/included/unit_test.hpp>
-#include "ACTS/Utilities/BinUtility.hpp"
-#include "ACTS/Utilities/BinningData.hpp"
-#include "ACTS/Utilities/BinningType.hpp"
+#include "Acts/Utilities/BinUtility.hpp"
+#include "Acts/Utilities/BinningData.hpp"
+#include "Acts/Utilities/BinningType.hpp"
 
 namespace Acts {
 namespace Test {
diff --git a/Tests/Utilities/BinningDataTests.cpp b/Tests/Utilities/BinningDataTests.cpp
index 2b59b81ce7cd9a6001d19bb1b580258f53348e95..6829f268b5faa6fc6eb04a3c85fed35ad2f968b5 100644
--- a/Tests/Utilities/BinningDataTests.cpp
+++ b/Tests/Utilities/BinningDataTests.cpp
@@ -10,8 +10,8 @@
 #define BOOST_TEST_MODULE BinningData Tests
 #include <boost/test/included/unit_test.hpp>
 #include <cmath>
-#include "ACTS/Utilities/BinningData.hpp"
-#include "ACTS/Utilities/BinningType.hpp"
+#include "Acts/Utilities/BinningData.hpp"
+#include "Acts/Utilities/BinningType.hpp"
 
 namespace Acts {
 namespace Test {
diff --git a/Tests/Utilities/GeometryIDTests.cpp b/Tests/Utilities/GeometryIDTests.cpp
index 34845c7d538b948c57be47eb99046a81c4d19feb..6794876f52c6e7f401a9d5f95039307e8929e9c5 100644
--- a/Tests/Utilities/GeometryIDTests.cpp
+++ b/Tests/Utilities/GeometryIDTests.cpp
@@ -9,8 +9,8 @@
 // Boost include(s)
 #define BOOST_TEST_MODULE GeometryID Tests
 #include <boost/test/included/unit_test.hpp>
-#include "ACTS/Utilities/GeometryID.hpp"
-#include "ACTS/Utilities/Helpers.hpp"
+#include "Acts/Utilities/GeometryID.hpp"
+#include "Acts/Utilities/Helpers.hpp"
 
 namespace Acts {
 namespace Test {
diff --git a/Tests/Utilities/GridTests.cpp b/Tests/Utilities/GridTests.cpp
index 92f6ca8868e3f7d00735f220793805f9c27a9ccc..9b2be9d992d16129ce3552a76962018b1027f1ac 100644
--- a/Tests/Utilities/GridTests.cpp
+++ b/Tests/Utilities/GridTests.cpp
@@ -11,9 +11,9 @@
 #include <chrono>
 #include <random>
 
-#include "ACTS/Utilities/concept/AnyGrid.hpp"
-#include "ACTS/Utilities/detail/Axis.hpp"
-#include "ACTS/Utilities/detail/Grid.hpp"
+#include "Acts/Utilities/concept/AnyGrid.hpp"
+#include "Acts/Utilities/detail/Axis.hpp"
+#include "Acts/Utilities/detail/Grid.hpp"
 
 namespace Acts {
 
diff --git a/Tests/Utilities/InterpolationTests.cpp b/Tests/Utilities/InterpolationTests.cpp
index 3dd270358a37452bce5552b0a369f27536f01ad7..fb3e3222739e2bd6e85c6d186d6f2252dc420a78 100644
--- a/Tests/Utilities/InterpolationTests.cpp
+++ b/Tests/Utilities/InterpolationTests.cpp
@@ -9,9 +9,9 @@
 #define BOOST_TEST_MODULE interpolation tests
 #include <boost/test/included/unit_test.hpp>
 
-#include "ACTS/Utilities/Definitions.hpp"
-#include "ACTS/Utilities/Interpolation.hpp"
-#include "ACTS/Utilities/detail/interpolation_impl.hpp"
+#include "Acts/Utilities/Definitions.hpp"
+#include "Acts/Utilities/Interpolation.hpp"
+#include "Acts/Utilities/detail/interpolation_impl.hpp"
 
 namespace Acts {
 
diff --git a/Tests/Utilities/LoggerTests.cpp b/Tests/Utilities/LoggerTests.cpp
index 3dda14146041c3b4b8da0a24dc22d8f17a3b6b8b..c15e25214adbfc5a32b3093b1b0cd43930cc321d 100644
--- a/Tests/Utilities/LoggerTests.cpp
+++ b/Tests/Utilities/LoggerTests.cpp
@@ -12,7 +12,7 @@
 #include <boost/test/included/unit_test.hpp>
 #include <fstream>
 #include <string>
-#include "ACTS/Utilities/Logger.hpp"
+#include "Acts/Utilities/Logger.hpp"
 
 namespace Acts {
 namespace Test {
diff --git a/Tests/Utilities/MPLTests.cpp b/Tests/Utilities/MPLTests.cpp
index af1b07c8adc6bb1370e4e6bf10148049c0d100d6..3b7083215e15f1d73423de51e94a6fca78f8e127 100644
--- a/Tests/Utilities/MPLTests.cpp
+++ b/Tests/Utilities/MPLTests.cpp
@@ -13,14 +13,14 @@
 #include <boost/mpl/vector.hpp>
 #include <boost/test/included/unit_test.hpp>
 #include <type_traits>
-#include "ACTS/Utilities/detail/MPL/all_of.hpp"
-#include "ACTS/Utilities/detail/MPL/any_of.hpp"
-#include "ACTS/Utilities/detail/MPL/are_sorted.hpp"
-#include "ACTS/Utilities/detail/MPL/are_within.hpp"
-#include "ACTS/Utilities/detail/MPL/at_index.hpp"
-#include "ACTS/Utilities/detail/MPL/boost_mpl_helper.hpp"
-#include "ACTS/Utilities/detail/MPL/has_duplicates.hpp"
-#include "ACTS/Utilities/detail/MPL/type_collector.hpp"
+#include "Acts/Utilities/detail/MPL/all_of.hpp"
+#include "Acts/Utilities/detail/MPL/any_of.hpp"
+#include "Acts/Utilities/detail/MPL/are_sorted.hpp"
+#include "Acts/Utilities/detail/MPL/are_within.hpp"
+#include "Acts/Utilities/detail/MPL/at_index.hpp"
+#include "Acts/Utilities/detail/MPL/boost_mpl_helper.hpp"
+#include "Acts/Utilities/detail/MPL/has_duplicates.hpp"
+#include "Acts/Utilities/detail/MPL/type_collector.hpp"
 
 namespace bm = bm;
 
diff --git a/Tests/Utilities/RealQuadraticEquationTests.cpp b/Tests/Utilities/RealQuadraticEquationTests.cpp
index e422aade9bcbd8f56aae9683b2605f11558441ca..93cbd1793dab8f98bd46b793becd2d8612b01a6a 100644
--- a/Tests/Utilities/RealQuadraticEquationTests.cpp
+++ b/Tests/Utilities/RealQuadraticEquationTests.cpp
@@ -18,8 +18,8 @@
 // leave blank
 
 //
-#include "ACTS/Utilities/Definitions.hpp"
-#include "ACTS/Utilities/detail/RealQuadraticEquation.hpp"
+#include "Acts/Utilities/Definitions.hpp"
+#include "Acts/Utilities/detail/RealQuadraticEquation.hpp"
 //
 #include <limits>
 
diff --git a/Tests/Utilities/UnitConversionTests.cpp b/Tests/Utilities/UnitConversionTests.cpp
index a20818caf6f2a25950385ead44b6232e69bf19a6..1a525f6d0081959fef2f9b594928acea0e15da03 100644
--- a/Tests/Utilities/UnitConversionTests.cpp
+++ b/Tests/Utilities/UnitConversionTests.cpp
@@ -9,7 +9,7 @@
 // Boost include(s)
 #define BOOST_TEST_MODULE Unit Conversion Tests
 #include <boost/test/included/unit_test.hpp>
-#include "ACTS/Utilities/Units.hpp"
+#include "Acts/Utilities/Units.hpp"
 
 using namespace Acts::units;
 namespace utf = boost::unit_test;
diff --git a/Tests/Volumes/CylinderVolumeBoundsTests.cpp b/Tests/Volumes/CylinderVolumeBoundsTests.cpp
index 5832793ddd9af9fc434cf1e6b14bf992ef1551bd..d2cdf458fe1e78d7902e5fc86006bdd88517d564 100644
--- a/Tests/Volumes/CylinderVolumeBoundsTests.cpp
+++ b/Tests/Volumes/CylinderVolumeBoundsTests.cpp
@@ -10,9 +10,9 @@
 #include <boost/test/included/unit_test.hpp>
 
 #include <boost/test/data/test_case.hpp>
-#include "ACTS/Surfaces/Surface.hpp"
-#include "ACTS/Utilities/Definitions.hpp"
-#include "ACTS/Volumes/CylinderVolumeBounds.hpp"
+#include "Acts/Surfaces/Surface.hpp"
+#include "Acts/Utilities/Definitions.hpp"
+#include "Acts/Volumes/CylinderVolumeBounds.hpp"
 
 namespace bdata = boost::unit_test::data;
 namespace tt    = boost::test_tools;
diff --git a/doc/Modules.hpp b/doc/Modules.hpp
index 28124f6c45c08721703b9409553816790790ea38..c5068e28bf56a2bc8c885add03a96d832e591b77 100644
--- a/doc/Modules.hpp
+++ b/doc/Modules.hpp
@@ -47,7 +47,7 @@
 /// @code{.cpp}
 /// #include <fstream>
 /// #include <memory>
-/// #include "ACTS/Utilities/Logger.hpp"
+/// #include "Acts/Utilities/Logger.hpp"
 ///
 /// void myFunction() {
 ///    // open the logfile