diff --git a/AUTHORS b/AUTHORS
index c9e4bfbf7f90ae705e92842f29602df5268ec685..0a54c4a3210267cb73f8713ec2c32870a709850e 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -1,4 +1,4 @@
-Contributors to the ACTS project are (in alphabetical order):
+Contributors to the Acts project are (in alphabetical order):
 - Noemi Calace
 - Christian Gumpert
 - Julia Hrdinka
diff --git a/CI/apply_clang_format b/CI/apply_clang_format
index 43da896f74a7769fa252fff1eabe306db225c593..62029d793a6c25151e4daafe740952590f4555dc 100755
--- a/CI/apply_clang_format
+++ b/CI/apply_clang_format
@@ -8,7 +8,7 @@ set -ex
 : ${gitlabSourceRepoName:?"'gitlabSourceRepoName' not set or empty"}
 : ${gitlabSourceBranch:?"'gitlabSourceBranch' not set or empty"}
 
-# check for ACTS
+# check for Acts
 ACTS_DIR=`readlink -f $1`
 if [ ! -d "$ACTS_DIR" ]
 then
diff --git a/CI/check_license b/CI/check_license
index 904caa7595748a7be4b3ee5678b42006a9d10c3a..916fd7749267edd3b3ef0da956850d6471399344 100755
--- a/CI/check_license
+++ b/CI/check_license
@@ -17,7 +17,7 @@ fi
 : ${gitlabTargetRepoName:?"'gitlabTargetRepoName' not set or empty"}
 : ${gitlabMergeRequestId:?"'gitlabMergeRequestId' not set or empty"}
 
-# check for ACTS
+# check for Acts
 ACTS_DIR=`readlink -f $1`
 if [ ! -d "$ACTS_DIR" ]
 then
@@ -26,10 +26,10 @@ then
 fi
 
 # license template
-MPLv2_BEGIN="// This file is part of the ACTS project.
+MPLv2_BEGIN="// This file is part of the Acts project.
 //
 // Copyright (C) 20"
-MPLv2_END=" ACTS project team
+MPLv2_END=" Acts project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/CI/check_license.py b/CI/check_license.py
index 281e257a058e31cad29233359365da60d6a70257..cc2adb6e6e2682d02fdd31063102999858b3e0a6 100755
--- a/CI/check_license.py
+++ b/CI/check_license.py
@@ -70,18 +70,18 @@ def main():
 
     year = int(datetime.now().strftime("%Y"))
 
-    raw = """// This file is part of the ACTS project.
+    raw = """// This file is part of the Acts project.
 //
-// Copyright (C) {year} ACTS project team
+// Copyright (C) {year} Acts project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
 // file, You can obtain one at http://mozilla.org/MPL/2.0/."""
 
     reg = (
-        r"\A// This file is part of the ACTS project.\n"
+        r"\A// This file is part of the Acts project.\n"
         +r"//\n"
-        +r"// Copyright \(C\) (?P<year>.*) ACTS project team\n"
+        +r"// Copyright \(C\) (?P<year>.*) Acts project team\n"
         +r"//\n"
         +r"// This Source Code Form is subject to the terms of the Mozilla Public\n"
         +r"// License, v\. 2\.0\. If a copy of the MPL was not distributed with this\n"
@@ -89,7 +89,7 @@ def main():
         )
 
     ref = re.compile(reg, re.M)
-    clean_re = re.compile(r"(\(C\)) (.*) (ACTS)", re.M)
+    clean_re = re.compile(r"(\(C\)) (.*) (Acts)", re.M)
     year_re = re.compile(r"^(?P<year1>20\d{2}|(?P<year2>20\d{2})-(?P<year3>20\d{2}))$")
     extract_re = re.compile(r"(20\d{2})-?(20\d{2})?")
     
diff --git a/CI/check_license_local b/CI/check_license_local
index 970b86033b151e8e754b17c7d3d6d399748a2d93..a4c0cb55a940394e9e6821e217f543118d999525 100755
--- a/CI/check_license_local
+++ b/CI/check_license_local
@@ -15,9 +15,9 @@ if [ $# -ne 1 ]; then
 fi
 
 # license template
-MPLv2="// This file is part of the ACTS project.
+MPLv2="// This file is part of the Acts project.
 //
-// Copyright (C) 2016 ACTS project team
+// Copyright (C) 2016 Acts project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/CI/deploy_tag b/CI/deploy_tag
index 33d312bab2a7d25d310db706eb5d51d65ce05455..59282767aea5e19c48e07e234d783b44254a5db3 100755
--- a/CI/deploy_tag
+++ b/CI/deploy_tag
@@ -22,7 +22,7 @@ fi
 # check for required environment variables
 : ${CI_COMMIT_REF_NAME:?"'CI_COMMIT_REF_NAME' not set or empty"}
 
-# check for ACTS
+# check for Acts
 ACTS_DIR=`readlink -f $1`
 if [ ! -d "$ACTS_DIR" ]
 then
@@ -38,7 +38,7 @@ then
     exit 1
 fi
 
-# get ACTS version tag
+# get Acts version tag
 VERSION=`basename $CI_COMMIT_REF_NAME`
 
 # create tarball with source and copy it to server
@@ -58,10 +58,10 @@ ssh atsjenkins@lxplus.CERN.CH "mkdir -p $ACTS_WWW_DIR/$VERSION"
 scp -r $DOC_DIR atsjenkins@lxplus.cern.ch:$ACTS_WWW_DIR/$VERSION/doc
 
 # send notification email
-ssh atsjenkins@lxplus.CERN.CH "mail -v -s 'New tag ACTS-$VERSION' -r 'atsjenkins@cern.ch' $3 <<EOF
-Dear ACTS enthusiasts,
+ssh atsjenkins@lxplus.CERN.CH "mail -v -s 'New tag Acts-$VERSION' -r 'atsjenkins@cern.ch' $3 <<EOF
+Dear Acts enthusiasts,
 
-a new tag '$VERSION' of the ACTS project has been released. You can get the source code from git using
+a new tag '$VERSION' of the Acts project has been released. You can get the source code from git using
 
 git clone https://gitlab.cern.ch/acts/acts-core.git acts
 cd acts/
@@ -76,5 +76,5 @@ Detailed documentation can be found at
 https://acts.web.cern.ch/ACTS/$VERSION/doc/index.html
 
 Cheers,
-your friendly ACTS robot
+your friendly Acts robot
 EOF"
diff --git a/CI/env_info.sh b/CI/env_info.sh
index d519e2c2d2e9609d1295e4a5598380ae09d17b91..6db886ae9dd688d2182ebb21372edc0500bf9991 100644
--- a/CI/env_info.sh
+++ b/CI/env_info.sh
@@ -12,10 +12,10 @@ fi
 echo "$ACTS_OS $ACTS_COMPILER"
 
 if [ "$(echo $CI_RUNNER_TAGS | grep 'acts')" ]; then
-  echo "Running on ACTS CI runner: use 8 cores"
+  echo "Running on Acts CI runner: use 8 cores"
   export ACTS_NCPUS=8
 else
-  echo "NOT running on ACTS CI runner: use 2 cores"
+  echo "NOT running on Acts CI runner: use 2 cores"
   export ACTS_NCPUS=2
 fi
 
diff --git a/CI/perform_code_analysis b/CI/perform_code_analysis
index 908a933554ca61871235706a331072b2f1defc60..0a68cf4121d37992db2560272e4ae286e7099b9a 100755
--- a/CI/perform_code_analysis
+++ b/CI/perform_code_analysis
@@ -24,7 +24,7 @@ ACTS_DIR=$1
 BUILD_DIR=$2
 OUTDIR=$3
 
-# check for ACTS
+# check for Acts
 if [ ! -d "$ACTS_DIR" ]
 then
     echo "ACTS_DIR='$ACTS_DIR' not found -> aborting"
diff --git a/CI/test_coverage b/CI/test_coverage
index e253061a9209ac4ac360cf4a9a7cd8fceac64266..e81d2ecc7aafb07e5db72270ab4cd2c841f82b68 100755
--- a/CI/test_coverage
+++ b/CI/test_coverage
@@ -23,7 +23,7 @@ ACTS_DIR=$1
 BUILD_DIR=$2
 OUTDIR=$3
 
-# check for ACTS
+# check for Acts
 if [ ! -d "$ACTS_DIR" ]
 then
     echo "ACTS_DIR='$ACTS_DIR' not found -> aborting"
@@ -34,12 +34,12 @@ fi
 rm -rf $OUTDIR
 
 # run lcov
-lcov -c -t ACTS -o coverage.info --no-external -d $BUILD_DIR -d $ACTS_DIR
+lcov -c -t Acts -o coverage.info --no-external -d $BUILD_DIR -d $ACTS_DIR
 # remove test source files
 lcov -r coverage.info "Tests/*" > tmp.info
 mv tmp.info coverage.info
 # generate HTML output
-genhtml coverage.info -t ACTS -p /acts/Core/src/ -p /acts/Core/include/ --demangle-cpp -s --output-directory $OUTDIR > coverage.log
+genhtml coverage.info -t Acts -p /acts/Core/src/ -p /acts/Core/include/ --demangle-cpp -s --output-directory $OUTDIR > coverage.log
 
 COMMENT="test coverage result:<br />"`tail -n 3 coverage.log | head -n 1`"<br />"
 COMMENT="$COMMENT"`tail -n 2 coverage.log | head -n 1`"<br />"
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 129c39859a1b4a2ddf0ee8729222e3fbe79b2504..4d3860959aa8e0d41a83ea28e1fd5ead19af09b1 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -50,7 +50,7 @@ endif()
 
 include (GNUInstallDirs) # GNU-like installation paths, e.g. lib/, include/, ...
 include (ActsCompilerOptions) # default compile options
-include (ActsFunctions) # ACTS-specific helper functions
+include (ActsFunctions) # Acts-specific helper functions
 include (ActsComponentsHelpers) # handle components via add_..._if commands
 
 # core library and plugins
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 6da9dcd9613418e62f1b47e1669c49748e72b3c4..85d813822018637a0fc89505d33026b1aafe16fd 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -1,6 +1,6 @@
-# Contributing to ACTS
+# Contributing to Acts
 
-Contributions to the ACTS project are very welcome and feedback on the documentation is greatly appreciated. In order to be able to contribute to the ACTS project, developers must have a valid CERN user account. Unfortunately, lightweight CERN accounts for external users do not have sufficient permissions to access certain CERN services used by the ACTS project.
+Contributions to the Acts project are very welcome and feedback on the documentation is greatly appreciated. In order to be able to contribute to the Acts project, developers must have a valid CERN user account. Unfortunately, lightweight CERN accounts for external users do not have sufficient permissions to access certain CERN services used by the Acts project.
 
 1. [Mailing lists](#mailing-lists)
 2. [Bug reports and feature requests](#bug-reports-and-feature-requests)
@@ -16,30 +16,30 @@ Contributions to the ACTS project are very welcome and feedback on the documenta
     1. [Approving a merge request](#approving-a-merge-request)
     2. [Merging a merge request](#merging-a-merge-request)
 5. [Administrator's corner](#admin-corner)
-    1. [Making a new ACTS release](#tag-release)
+    1. [Making a new Acts release](#tag-release)
 
 ## <a name="mailing-lists">Mailing lists</a>
 
-1. [acts-users@cern.ch](https://e-groups.cern.ch/e-groups/Egroup.do?egroupName=acts-users): Users of the ACTS project should subscribe to this list as it provides:
+1. [acts-users@cern.ch](https://e-groups.cern.ch/e-groups/Egroup.do?egroupName=acts-users): Users of the Acts project should subscribe to this list as it provides:
     - regular updates on the software,
-    - access to the ACTS JIRA project for bug fixes/feature requests,
+    - access to the Acts JIRA project for bug fixes/feature requests,
     - a common place for asking any kind of questions.
 1. [acts-developers@cern.ch](https://e-groups.cern.ch/e-groups/Egroup.do?egroupName=acts-developers): Developers are encouraged to also subscribe to this list as it provides you with:
-    - a developer role in the ACTS JIRA project (allows you to handle tickets),
-    - developer access to the [ACTS git repository](https://gitlab.cern.ch/acts/acts-core)
+    - a developer role in the Acts JIRA project (allows you to handle tickets),
+    - developer access to the [Acts git repository](https://gitlab.cern.ch/acts/acts-core)
     - information about developer meetings,
     - a common place for technical discussions.
 
 ## <a name="bug-reports-and-feature-requests">Bug reports and feature requests</a>
 
-If you want to report or start a feature request, please open a ticket in the [ACTS JIRA](https://its.cern.ch/jira/projects/ACTS/) (**Note:** access is restricted to members of the mailing lists mentioned above). A comprehensive explanation will help the development team to respond in a timely manner. Therefore, the following details should be mentioned:
+If you want to report or start a feature request, please open a ticket in the [Acts JIRA](https://its.cern.ch/jira/projects/ACTS/) (**Note:** access is restricted to members of the mailing lists mentioned above). A comprehensive explanation will help the development team to respond in a timely manner. Therefore, the following details should be mentioned:
 
 - bug reports
     - issue type: "Bug"
     - summary: short description of the problem
     - priority: will be set by the development team
-    - components: if known, part of ACTS affected by this bug; leave empty otherwise
-    - affects version: version of ACTS affected by this bug
+    - components: if known, part of Acts affected by this bug; leave empty otherwise
+    - affects version: version of Acts affected by this bug
     - a detailed description of the bug including a receipe on how to reproduce it and any hints which may help diagnosing the problem
 - feature requests
     - issue type: "Improvement" or "New Feature"
@@ -49,9 +49,9 @@ If you want to report or start a feature request, please open a ticket in the [A
 
 ## <a name="make-a-contribution">Make a contribution</a>
 
-The instructions below should help you getting started with development process in the ACTS project. If you have any questions, feel free to ask [acts-developers@cern](mailto:acts-developers@cern.ch) for help or guidance.
+The instructions below should help you getting started with development process in the Acts project. If you have any questions, feel free to ask [acts-developers@cern](mailto:acts-developers@cern.ch) for help or guidance.
 
-The ACTS project uses a git repository which is hosted on the CERN GitLab server. In order to be able to push your changes and to create merge requests (and thus, contribute to the development of ACTS), you must be subscribed to acts-developers@cern.ch.
+The Acts project uses a git repository which is hosted on the CERN GitLab server. In order to be able to push your changes and to create merge requests (and thus, contribute to the development of Acts), you must be subscribed to acts-developers@cern.ch.
 A general introduction to the GitLab web interface can be found [here](http://gitlab.cern.ch/help/gitlab-basics/README). Very nice tutorials as well as explanations of concepts and workflows with git can be found on [Atlassian](http://www.atlassian.com/git/). For a shorter introduction and the full git documentation have a look at the [git tutorial](http://git-scm.com/docs/gittutorial).
 
 ### <a name="preparation">Preparation</a>
@@ -83,18 +83,18 @@ git config --global pull.rebase true
 
 #### Getting a local working copy
 
-As a first step, you need to clone the ACTS repository which gives you a local, fully functional and self-contained git repository. This means you can work locally (commit changes, compare versions, inspect the history) while being offline. An internet connection is only required for *pull*ing in new updates or *push*ing your changes to the Gitlab server.
+As a first step, you need to clone the Acts repository which gives you a local, fully functional and self-contained git repository. This means you can work locally (commit changes, compare versions, inspect the history) while being offline. An internet connection is only required for *pull*ing in new updates or *push*ing your changes to the Gitlab server.
 
 ```bash
 git clone <ACTS_URL> <DESTINATION>
 ```
 
-- &lt;ACTS_URL&gt; can be found on the project page of the [ACTS git repository](https://gitlab.cern.ch/acts/acts-core). There are different URLs for different authentication methods.
+- &lt;ACTS_URL&gt; can be found on the project page of the [Acts git repository](https://gitlab.cern.ch/acts/acts-core). There are different URLs for different authentication methods.
 - &lt;DESTINATION&gt; is optional and gives the path on your local machine where the clone will be created.
 
 ### <a name="new-development">Starting a new development</a>
 
-When you start a new development, you should make sure to start from the most recent version. Therefore, you need to *fetch* the latest changes from the remote repository by running from inside the ACTS directory:
+When you start a new development, you should make sure to start from the most recent version. Therefore, you need to *fetch* the latest changes from the remote repository by running from inside the Acts directory:
 
 ```bash
 git fetch origin
@@ -114,7 +114,7 @@ Let's go through the options one by one:
 
 ### <a name="creating-a-merge-request">Creating a merge request</a>
 
-Once your development is ready for integration, you should open a merge request at the [ACTS project](https://gitlab.cern.ch/acts/acts-core) ([GitLab Help: Create a merge request](https://gitlab.cern.ch/help/gitlab-basics/add-merge-request)). The target branch should usually be _master_ for feature requests and _releas-X,Y,Z_ for bugfixes. The ACTS projects accepts only fast-foward merges which means that your branch must have been rebased on the target branch. This can be achieved by fetching upstream changes and rebasing afterwards:
+Once your development is ready for integration, you should open a merge request at the [Acts project](https://gitlab.cern.ch/acts/acts-core) ([GitLab Help: Create a merge request](https://gitlab.cern.ch/help/gitlab-basics/add-merge-request)). The target branch should usually be _master_ for feature requests and _releas-X,Y,Z_ for bugfixes. The Acts projects accepts only fast-foward merges which means that your branch must have been rebased on the target branch. This can be achieved by fetching upstream changes and rebasing afterwards:
 
 ```bash
 git fetch origin
@@ -124,19 +124,19 @@ git push -u origin <my_feature_branch>
 ```
 
 At this point you should make use of the interactive rebase procedure to clean up your commits (squash small fixes, improve commit messages etc; [Rewriting history](https://robots.thoughtbot.com/git-interactive-rebase-squash-amend-rewriting-history)).
-Merge requests are required to close a ACTS JIRA ticket. This is achieved by adding e.g. 'fixes ACTS-XYZ' to the end of the merge request description. Please note that JIRA tickets should only be referenced by merge requests and not individual commits (since strictly there should only be one JIRA ticket per merge request). Once the merge request is opened, a continous integration job is triggered which will add multiple comments to the merge request (e.g. build status, missing license statements, doxygen errors, test coverage etc). Please have a look at them and fix them by adding more commits to your branch if needed.
+Merge requests are required to close a Acts JIRA ticket. This is achieved by adding e.g. 'fixes ACTS-XYZ' to the end of the merge request description. Please note that JIRA tickets should only be referenced by merge requests and not individual commits (since strictly there should only be one JIRA ticket per merge request). Once the merge request is opened, a continous integration job is triggered which will add multiple comments to the merge request (e.g. build status, missing license statements, doxygen errors, test coverage etc). Please have a look at them and fix them by adding more commits to your branch if needed.
 Please find below a short checklist for merge requests.
 
 ### <a name="using-forks">Using forks</a>
 
 Users or groups with git experience may prefer to use their own forks of the
-ACTS project to develop and test their changes before they are integrated back
-into the main ACTS repository. We assume that you are experienced with a
+Acts project to develop and test their changes before they are integrated back
+into the main Acts repository. We assume that you are experienced with a
 fork-based workflow in git and only summarise the most important commands at the
 end of this section.
 
-As a first step, you need to create your own fork of the ACTS project. For doing
-this, please go to the [ACTS GitLab
+As a first step, you need to create your own fork of the Acts project. For doing
+this, please go to the [Acts GitLab
 page](https://gitlab.cern.ch/acts/acts-core), click on the fork
 button, and follow the instructions ([GitLab Help "How to fork a
 project"](https://gitlab.cern.ch/help/gitlab-basics/fork-project)). In a second
@@ -148,12 +148,12 @@ setup:
 "Username" and leave it empty
 
 **Important:** The second option is needed due to some limitations in the GitLab
-JIRA integration. If you fail to do so, the ACTS JIRA project will be spammed
+JIRA integration. If you fail to do so, the Acts JIRA project will be spammed
 with hundreds of duplicates comments and you will likely receive an angry email
 from the development team ;-).
 
 ```bash
-# adding the central ACTS repository as remote
+# adding the central Acts repository as remote
 git remote add upstream ssh://git@gitlab.cern.ch:7999/acts/acts-core.git
 # get latest upstream changes
 git fetch upstream
@@ -187,7 +187,7 @@ git push
 
 ### <a name="workflow-recommendations">Workflow recommendations</a>
 
-In the following a few recommendations are outlined which should help you to get familiar with development process in the ACTS project.
+In the following a few recommendations are outlined which should help you to get familiar with development process in the Acts project.
 
 1. **Each development its own branch!**
 Branching in git is simple, it is fun and it helps you keep your working copy clean. Therefore, you should start a new branch for every development. All work which is logically/conceptually linked should happen in one branch. Keep your branches short. This helps immensly to understand the git history if you need to look at it in the future.
@@ -195,7 +195,7 @@ If projects are complex (e.g. large code refactoring or complex new features), y
 
 <img src="doc/figures/sub_dev.png" alt="workflow for large feature">
 1. **Never, ever directly work on any "official" branch!**
-Though not strictly necessary and in the end it is up to you, it is strongly recommended that you never commit directly on a branch which tracks an "official" branch. As all branches are equal in git, the definition of "official" branch is quite subjective. In the ACTS project you should not work directly on branches which are **protected** in the CERN GitLab repository. Usually, these are the _master_ and _release-X.Y.Z_ branches. The benefit of this strategy is that you will never have problems to update your fork. Any git merge in your local repository on such an "official" branch will always be a fast-forward merge.
+Though not strictly necessary and in the end it is up to you, it is strongly recommended that you never commit directly on a branch which tracks an "official" branch. As all branches are equal in git, the definition of "official" branch is quite subjective. In the Acts project you should not work directly on branches which are **protected** in the CERN GitLab repository. Usually, these are the _master_ and _release-X.Y.Z_ branches. The benefit of this strategy is that you will never have problems to update your fork. Any git merge in your local repository on such an "official" branch will always be a fast-forward merge.
 
 1. **Use atomic commits!**
 Similarly to the concept of branches, each commit should reflect a self-contained change. Try to avoid overly large commits (bad examples are for instance mixing logical change with code cleanup and typo fixes).
@@ -216,9 +216,9 @@ Make sure that the documentation is still valid after your changes. Perform upda
 
 ### <a name="coding-style-and-guidelines">Coding style and guidelines</a>
 
-The ACTS project uses [clang-format](http://clang.llvm.org/docs/ClangFormat.html) (currently v3.8.0) for formatting its source code. A `.clang-format` configuration file comes with the project and should be used to automatically format the code. There are several instructions available on how to integrate clang-format with your favourite IDE (e.g. [eclipse](https://marketplace.eclipse.org/content/cppstyle), [Xcode](https://github.com/travisjeffery/ClangFormat-Xcode), [emacs](http://clang.llvm.org/docs/ClangFormat.html#emacs-integration)). The ACTS CI system will automatically apply code reformatting using the provided clang-format configuration once merge requests are opened. However, developers are strongly encouraged to use this code formatter also locally to reduce conflicts due to formatting issues.
+The Acts project uses [clang-format](http://clang.llvm.org/docs/ClangFormat.html) (currently v3.8.0) for formatting its source code. A `.clang-format` configuration file comes with the project and should be used to automatically format the code. There are several instructions available on how to integrate clang-format with your favourite IDE (e.g. [eclipse](https://marketplace.eclipse.org/content/cppstyle), [Xcode](https://github.com/travisjeffery/ClangFormat-Xcode), [emacs](http://clang.llvm.org/docs/ClangFormat.html#emacs-integration)). The Acts CI system will automatically apply code reformatting using the provided clang-format configuration once merge requests are opened. However, developers are strongly encouraged to use this code formatter also locally to reduce conflicts due to formatting issues.
 
-In addition, the following conventions are used in ACTS code:
+In addition, the following conventions are used in Acts code:
 
 - Class names start with a capital letter.
 - Function names start with a lower-case letter and use camel-case.
@@ -333,39 +333,39 @@ Now, master is pointing to B, HEAD and &lt;new\_branch\_name&gt; are pointing to
 
 ### <a name="approving-a-merge-request">Approving a merge request</a>
 
-Writing new code is not the only way one can contribute to the ACTS project. Another greatly appreciated contribution is looking at other proposed contributions to the project. The more eyeballs look at a piece of code before it is merged into the ACTS repository, the smaller the chances that a bug or other unwanted behaviour is accidentally introduced into the ACTS codebase. This is why we require that every ACTS merge request receives at least one human review before being merged.
+Writing new code is not the only way one can contribute to the Acts project. Another greatly appreciated contribution is looking at other proposed contributions to the project. The more eyeballs look at a piece of code before it is merged into the Acts repository, the smaller the chances that a bug or other unwanted behaviour is accidentally introduced into the Acts codebase. This is why we require that every Acts merge request receives at least one human review before being merged.
 
-You can help reviewing proposed contributions by going to [the "merge requests" section of the ACTS Gitlab repository](https://gitlab.cern.ch/acts/acts-core/merge_requests) and having a look at the proposals that are being made here. The present contribution guide should serve as a good indication of what we expect from code submissions. In addition, please look at the merge request itself:
+You can help reviewing proposed contributions by going to [the "merge requests" section of the Acts Gitlab repository](https://gitlab.cern.ch/acts/acts-core/merge_requests) and having a look at the proposals that are being made here. The present contribution guide should serve as a good indication of what we expect from code submissions. In addition, please look at the merge request itself:
 
 * Does its title and description reflect its contents?
 * Is it associated with a JIRA ticket so that we can easily document it in the release notes?
 * Do the automated continuous integration tests pass without problems?
 * Have all the comments raised by previous reviewers been addressed?
 
-If you are confident that a merge request is ready for integration, please make it known by clicking the "Approve merge request" button of the Gitlab interface. This notifies other members of the ACTS team of your decision, and marks the merge request as ready to be merged.
+If you are confident that a merge request is ready for integration, please make it known by clicking the "Approve merge request" button of the Gitlab interface. This notifies other members of the Acts team of your decision, and marks the merge request as ready to be merged.
 
 ### <a name="merging-a-merge-request">Merging a merge request</a>
 
-If you have been granted merge rights on the ACTS repository, you can merge a merge request into the ACTS master branch after it has been approved by someone else. In order to give everyone a chance to review the merge request, please wait for at least two days (48h) after the merge request has been submitted before doing so, even if the merge request has been approved by someone before this delay has elapsed.
+If you have been granted merge rights on the Acts repository, you can merge a merge request into the Acts master branch after it has been approved by someone else. In order to give everyone a chance to review the merge request, please wait for at least two days (48h) after the merge request has been submitted before doing so, even if the merge request has been approved by someone before this delay has elapsed.
 
-Gitlab may warn you that a "Fast-forward merge is not possible". This warning means that the merge request has fallen behind the current ACTS master branch, and should be updated through a rebase. Please notify the merge request author in order to make sure that the latest master changes do not affect the merge request, and to have it updated as appropriate.
+Gitlab may warn you that a "Fast-forward merge is not possible". This warning means that the merge request has fallen behind the current Acts master branch, and should be updated through a rebase. Please notify the merge request author in order to make sure that the latest master changes do not affect the merge request, and to have it updated as appropriate.
 
 ## <a name="admin-corner">Administrator's corner</a>
 
-This section gives useful information to the administrators of the ACTS project. For normal developers the sections below are irrelevant.
+This section gives useful information to the administrators of the Acts project. For normal developers the sections below are irrelevant.
 
-### <a name="tag-release">Make a new ACTS release</a>
+### <a name="tag-release">Make a new Acts release</a>
 
-In order to release a new version of ACTS the following steps need to be taken:
+In order to release a new version of Acts the following steps need to be taken:
 
 1. Check out all open JIRA issues for the next release in <a href="https://its.cern.ch/jira/projects/ACTS/versions/">JIRA</a>.
 2. Create a new branch called <tt>release-X.YY.ZZ</tt> branching off from <tt>origin/master</tt>.
 3. In this branch, update the <tt>ACTS_VERSION</tt> variable in the top-level CMakeLists.txt file to <tt>X.YY.ZZ</tt> and commit the change.
 4. Pushing this commit to the remote repository should trigger a CI build. Make sure that everything compiles without any warnings and all tests look fine.
 5. Create a new annotated tag locally. The tag should have the format <tt>vX.YY.ZZ</tt> and an associated tag message 'version vX.YY.ZZ'.
-6. Push the tag to the remote repository. This should trigger a CI job which rebuilds to documentation and deploys it together with a tar file of the source code to the ACTS webpage. Make sure that the new release appears under the **Releases** section on the <a href="http://acts.web.cern.ch/ACTS/">ACTS webpage</a>.
+6. Push the tag to the remote repository. This should trigger a CI job which rebuilds to documentation and deploys it together with a tar file of the source code to the Acts webpage. Make sure that the new release appears under the **Releases** section on the <a href="http://acts.web.cern.ch/ACTS/">Acts webpage</a>.
 7. If there is not yet a JIRA version for the next minor release, create it in the <a href="https://its.cern.ch/jira/plugins/servlet/project-config/ACTS/versions">JIRA project administration</a> area (e.g. if 1.23.02 was just released, version 1.23.03 should exist in JIRA for the next minor release for bug fixes).
-8. Got to the <a href="https://its.cern.ch/jira/projects/ACTS/versions/">ACTS Releases page in JIRA</a> and release the version. Make sure that a correct release data is set and that all open issues get moved to the next major/minor release.
+8. Got to the <a href="https://its.cern.ch/jira/projects/ACTS/versions/">Acts Releases page in JIRA</a> and release the version. Make sure that a correct release data is set and that all open issues get moved to the next major/minor release.
 9. From the JIRA release page, copy (all) the HTML code for the release notes. Login to lxplus using the service account <tt>atsjenkins</tt> (<tt>ssh atsjenkins@lxplus.cern.ch</tt>). Create the file <tt>~/www/ACTS/vX.YY.ZZ/ReleaseNotes.html</tt> with the copied HTML code for the release notes. Please make sure that _sub_-tasks appear as nested lists (JIRA unfortunately puts them all on one level in alphabetical order).
-10. Check that the release notes appear on the <a href="http://acts.web.cern.ch/ACTS/">ACTS webpage</a> and are available from the respective link in the **Releases** section.
+10. Check that the release notes appear on the <a href="http://acts.web.cern.ch/ACTS/">Acts webpage</a> and are available from the respective link in the **Releases** section.
 
diff --git a/CTestConfig.cmake b/CTestConfig.cmake
index 463efc911f70eb1357f3d051e8bd08415d5ec585..9e83b1af6b3ef7e659d6b87d4e297147bd4d7837 100644
--- a/CTestConfig.cmake
+++ b/CTestConfig.cmake
@@ -6,13 +6,13 @@
 ##   ENABLE_TESTING()
 ##   INCLUDE(CTest)
 
-set(CTEST_PROJECT_NAME "ACTS")
+set(CTEST_PROJECT_NAME "Acts")
 set(CTEST_NIGHTLY_START_TIME "00:00:00 EST")
 
 # CDash configuration
 set (CTEST_DROP_METHOD "http")
 set (CTEST_DROP_SITE "my.cdash.org")
-set (CTEST_DROP_LOCATION "/submit.php?project=ACTS")
+set (CTEST_DROP_LOCATION "/submit.php?project=Acts")
 set (CTEST_DROP_SITE_CDASH TRUE)
 
 # sub projects
diff --git a/Core/ActsVersion.hpp.in b/Core/ActsVersion.hpp.in
index 58522e825f908b571a2aa06a6e78dfa9d028385a..3173f0a5b245074990a2df6536fcbde1305ea8c3 100644
--- a/Core/ActsVersion.hpp.in
+++ b/Core/ActsVersion.hpp.in
@@ -1,9 +1,9 @@
 #ifndef ActsVersion_h
 #define ActsVersion_h
 
-//  Caution: this is the only ACTS header that is guaranteed
-//  to change with every ACTS release. Including this header
-//  will cause a recompile every time a new ACTS version is
+//  Caution: this is the only Acts header that is guaranteed
+//  to change with every Acts release. Including this header
+//  will cause a recompile every time a new Acts version is
 //  used.
 
 namespace Acts {
diff --git a/Core/include/Acts/Detector/DetachedTrackingVolume.hpp b/Core/include/Acts/Detector/DetachedTrackingVolume.hpp
index 59310cb8fab1f83e2358c5a11a29ca011be474aa..73ee56360cbb072b2fb631872dc0cf896317fd60 100644
--- a/Core/include/Acts/Detector/DetachedTrackingVolume.hpp
+++ b/Core/include/Acts/Detector/DetachedTrackingVolume.hpp
@@ -1,13 +1,13 @@
-// This file is part of the ACTS project.
+// This file is part of the Acts project.
 //
-// Copyright (C) 2016-2017 ACTS project team
+// Copyright (C) 2016-2017 Acts project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
 // file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 ///////////////////////////////////////////////////////////////////
-// DetachedTrackingVolume.h, ACTS project
+// DetachedTrackingVolume.h, Acts project
 ///////////////////////////////////////////////////////////////////
 
 #pragma once
diff --git a/Core/include/Acts/Detector/DetectorElementBase.hpp b/Core/include/Acts/Detector/DetectorElementBase.hpp
index 6963d6e1730916ed65a6bf50dab9fc0c9ca7da0b..259d97c3b2e7296b8b62fbfc348b458e664fc955 100644
--- a/Core/include/Acts/Detector/DetectorElementBase.hpp
+++ b/Core/include/Acts/Detector/DetectorElementBase.hpp
@@ -1,13 +1,13 @@
-// This file is part of the ACTS project.
+// This file is part of the Acts project.
 //
-// Copyright (C) 2016-2017 ACTS project team
+// Copyright (C) 2016-2017 Acts project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
 // file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 ///////////////////////////////////////////////////////////////////
-// DetectorElementBase.h, ACTS project
+// DetectorElementBase.h, Acts project
 ///////////////////////////////////////////////////////////////////
 
 #pragma once
diff --git a/Core/include/Acts/Detector/GlueVolumesDescriptor.hpp b/Core/include/Acts/Detector/GlueVolumesDescriptor.hpp
index 4541f8266f99f28ec0eb2fdd8e22f769dd0772e1..500b2d66043356a25f15bc4dceea3e69aae86ca5 100644
--- a/Core/include/Acts/Detector/GlueVolumesDescriptor.hpp
+++ b/Core/include/Acts/Detector/GlueVolumesDescriptor.hpp
@@ -1,13 +1,13 @@
-// This file is part of the ACTS project.
+// This file is part of the Acts project.
 //
-// Copyright (C) 2016-2017 ACTS project team
+// Copyright (C) 2016-2017 Acts project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
 // file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 ///////////////////////////////////////////////////////////////////
-// GlueVolumesDescriptor.h, ACTS project
+// GlueVolumesDescriptor.h, Acts project
 ///////////////////////////////////////////////////////////////////
 
 #pragma once
diff --git a/Core/include/Acts/Detector/TrackingGeometry.hpp b/Core/include/Acts/Detector/TrackingGeometry.hpp
index 7dc7e7852a8cc2e69e8322efa2ce249204d860e9..f8338dad43a7bdd59b56153ede8e8800b3698e5b 100644
--- a/Core/include/Acts/Detector/TrackingGeometry.hpp
+++ b/Core/include/Acts/Detector/TrackingGeometry.hpp
@@ -1,13 +1,13 @@
-// This file is part of the ACTS project.
+// This file is part of the Acts project.
 //
-// Copyright (C) 2016-2017 ACTS project team
+// Copyright (C) 2016-2017 Acts project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
 // file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 ///////////////////////////////////////////////////////////////////
-// TrackingGeometry.h, ACTS project
+// TrackingGeometry.h, Acts project
 ///////////////////////////////////////////////////////////////////
 
 #pragma once
diff --git a/Core/include/Acts/Detector/TrackingVolume.hpp b/Core/include/Acts/Detector/TrackingVolume.hpp
index f2aaf2f9def487f29c29aba60679b5fc783c7a07..063014b274ca45d9da498b9ecae0824446960940 100644
--- a/Core/include/Acts/Detector/TrackingVolume.hpp
+++ b/Core/include/Acts/Detector/TrackingVolume.hpp
@@ -1,13 +1,13 @@
-// This file is part of the ACTS project.
+// This file is part of the Acts project.
 //
-// Copyright (C) 2016-2017 ACTS project team
+// Copyright (C) 2016-2017 Acts project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
 // file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 ///////////////////////////////////////////////////////////////////
-// TrackingVolume.h, ACTS project
+// TrackingVolume.h, Acts project
 ///////////////////////////////////////////////////////////////////
 
 #pragma once
diff --git a/Core/include/Acts/Digitization/CartesianSegmentation.hpp b/Core/include/Acts/Digitization/CartesianSegmentation.hpp
index 4dcaa466a651f43f024ae6dad436d6dd79f5a40f..8205a3789fc1055faf3cc63171df8d57830c0b77 100644
--- a/Core/include/Acts/Digitization/CartesianSegmentation.hpp
+++ b/Core/include/Acts/Digitization/CartesianSegmentation.hpp
@@ -1,6 +1,6 @@
-// This file is part of the ACTS project.
+// This file is part of the Acts project.
 //
-// Copyright (C) 2016-2017 ACTS project team
+// Copyright (C) 2016-2017 Acts project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/Core/include/Acts/Digitization/Clusterization.hpp b/Core/include/Acts/Digitization/Clusterization.hpp
index fbdaed4e34d730ff7f11295d82ab4a7409629563..b6ded200af956ca33c1f1679b491061f91f8c15f 100644
--- a/Core/include/Acts/Digitization/Clusterization.hpp
+++ b/Core/include/Acts/Digitization/Clusterization.hpp
@@ -1,6 +1,6 @@
-// This file is part of the ACTS project.
+// This file is part of the Acts project.
 //
-// Copyright (C) 2018 ACTS project team
+// Copyright (C) 2018 Acts project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/Core/include/Acts/Digitization/DigitizationCell.hpp b/Core/include/Acts/Digitization/DigitizationCell.hpp
index d3ddf1955a0812966ddb994c5e2496a26abbd26e..21087c4770b3402d9865fc15efef765399483815 100644
--- a/Core/include/Acts/Digitization/DigitizationCell.hpp
+++ b/Core/include/Acts/Digitization/DigitizationCell.hpp
@@ -1,6 +1,6 @@
-// This file is part of the ACTS project.
+// This file is part of the Acts project.
 //
-// Copyright (C) 2016-2017 ACTS project team
+// Copyright (C) 2016-2017 Acts project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/Core/include/Acts/Digitization/DigitizationModule.hpp b/Core/include/Acts/Digitization/DigitizationModule.hpp
index 71014db1daf4d6267d312ce09ed14912982d35d6..e5cbf874f8ee2e49c422c19c5d645110904b04bc 100644
--- a/Core/include/Acts/Digitization/DigitizationModule.hpp
+++ b/Core/include/Acts/Digitization/DigitizationModule.hpp
@@ -1,6 +1,6 @@
-// This file is part of the ACTS project.
+// This file is part of the Acts project.
 //
-// Copyright (C) 2016-2017 ACTS project team
+// Copyright (C) 2016-2017 Acts project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/Core/include/Acts/Digitization/PlanarModuleCluster.hpp b/Core/include/Acts/Digitization/PlanarModuleCluster.hpp
index 3a97c0bf6ba1e58da087b634b9e25c7f62bf1036..1951d2d4d6080435703ca1e023d2dbdf502c85bf 100644
--- a/Core/include/Acts/Digitization/PlanarModuleCluster.hpp
+++ b/Core/include/Acts/Digitization/PlanarModuleCluster.hpp
@@ -1,6 +1,6 @@
-// This file is part of the ACTS project.
+// This file is part of the Acts project.
 //
-// Copyright (C) 2016-2017 ACTS project team
+// Copyright (C) 2016-2017 Acts project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/Core/include/Acts/Digitization/PlanarModuleStepper.hpp b/Core/include/Acts/Digitization/PlanarModuleStepper.hpp
index 0bc05a662e25a7dff855f1087f8b365ae195532e..343e63f06719880408fc174f25a29a13885ddc9b 100644
--- a/Core/include/Acts/Digitization/PlanarModuleStepper.hpp
+++ b/Core/include/Acts/Digitization/PlanarModuleStepper.hpp
@@ -1,6 +1,6 @@
-// This file is part of the ACTS project.
+// This file is part of the Acts project.
 //
-// Copyright (C) 2016-2017 ACTS project team
+// Copyright (C) 2016-2017 Acts project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/Core/include/Acts/Digitization/PolarSegmentation.hpp b/Core/include/Acts/Digitization/PolarSegmentation.hpp
index af02b3746f478c497f3d2fad6efbc77791241542..52e709861ca33c631d3fd667c8582c955e594a6d 100644
--- a/Core/include/Acts/Digitization/PolarSegmentation.hpp
+++ b/Core/include/Acts/Digitization/PolarSegmentation.hpp
@@ -1,6 +1,6 @@
-// This file is part of the ACTS project.
+// This file is part of the Acts project.
 //
-// Copyright (C) 2016-2017 ACTS project team
+// Copyright (C) 2016-2017 Acts project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/Core/include/Acts/Digitization/Segmentation.hpp b/Core/include/Acts/Digitization/Segmentation.hpp
index cfeaa49c688e368b610c74bd554638b1ab047a7c..9744fddff5da6dd192c12729661f9c979dcc2e71 100644
--- a/Core/include/Acts/Digitization/Segmentation.hpp
+++ b/Core/include/Acts/Digitization/Segmentation.hpp
@@ -1,6 +1,6 @@
-// This file is part of the ACTS project.
+// This file is part of the Acts project.
 //
-// Copyright (C) 2016-2017 ACTS project team
+// Copyright (C) 2016-2017 Acts project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/Core/include/Acts/EventData/ChargePolicy.hpp b/Core/include/Acts/EventData/ChargePolicy.hpp
index 581996bf60d23e27c3f6560e2dab2ca90e187666..b636396748f9d4a096db792ef14eafcfed9332de 100644
--- a/Core/include/Acts/EventData/ChargePolicy.hpp
+++ b/Core/include/Acts/EventData/ChargePolicy.hpp
@@ -1,6 +1,6 @@
-// This file is part of the ACTS project.
+// This file is part of the Acts project.
 //
-// Copyright (C) 2016-2017 ACTS project team
+// Copyright (C) 2016-2017 Acts project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/Core/include/Acts/EventData/Measurement.hpp b/Core/include/Acts/EventData/Measurement.hpp
index 6984dbbe0c2ac44474d4ba01d69e8ccc199f0f0b..37bfb815a1dc82faf4dc17e82175a8af59fa68e7 100644
--- a/Core/include/Acts/EventData/Measurement.hpp
+++ b/Core/include/Acts/EventData/Measurement.hpp
@@ -1,6 +1,6 @@
-// This file is part of the ACTS project.
+// This file is part of the Acts project.
 //
-// Copyright (C) 2016-2017 ACTS project team
+// Copyright (C) 2016-2017 Acts project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/Core/include/Acts/EventData/NeutralParameters.hpp b/Core/include/Acts/EventData/NeutralParameters.hpp
index aa31ced5f68402f6e3f2037cf391bfd593a44dc9..0c245630cbef668ebbdb2fa0c022ba6285a6ee59 100644
--- a/Core/include/Acts/EventData/NeutralParameters.hpp
+++ b/Core/include/Acts/EventData/NeutralParameters.hpp
@@ -1,6 +1,6 @@
-// This file is part of the ACTS project.
+// This file is part of the Acts project.
 //
-// Copyright (C) 2016 ACTS project team
+// Copyright (C) 2016 Acts project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/Core/include/Acts/EventData/ParameterSet.hpp b/Core/include/Acts/EventData/ParameterSet.hpp
index c0c18a4b8cf3a2dc3d88a90188ba94037bab2156..b4ffeb6d3b6389d59928978a8851a449fe910be9 100644
--- a/Core/include/Acts/EventData/ParameterSet.hpp
+++ b/Core/include/Acts/EventData/ParameterSet.hpp
@@ -1,6 +1,6 @@
-// This file is part of the ACTS project.
+// This file is part of the Acts project.
 //
-// Copyright (C) 2016-2017 ACTS project team
+// Copyright (C) 2016-2017 Acts project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
@@ -12,7 +12,7 @@
 #include <type_traits>
 #include <utility>
 
-// ACTS includes
+// Acts includes
 #include "Acts/EventData/detail/full_parameter_set.hpp"
 #include "Acts/EventData/detail/initialize_parameter_set.hpp"
 #include "Acts/EventData/detail/make_projection_matrix.hpp"
diff --git a/Core/include/Acts/EventData/ParticleDefinitions.hpp b/Core/include/Acts/EventData/ParticleDefinitions.hpp
index 49a38113a976223f8b051f3c4f81e047f1b908f1..37c0cee87efa2849093546c1a5d0666a3ae220dd 100644
--- a/Core/include/Acts/EventData/ParticleDefinitions.hpp
+++ b/Core/include/Acts/EventData/ParticleDefinitions.hpp
@@ -1,13 +1,13 @@
-// This file is part of the ACTS project.
+// This file is part of the Acts project.
 //
-// Copyright (C) 2016-2017 ACTS project team
+// Copyright (C) 2016-2017 Acts project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
 // file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 ///////////////////////////////////////////////////////////////////
-// ParticleDefinitions.h, ACTS project
+// ParticleDefinitions.h, Acts project
 ///////////////////////////////////////////////////////////////////
 
 #pragma once
diff --git a/Core/include/Acts/EventData/SingleBoundTrackParameters.hpp b/Core/include/Acts/EventData/SingleBoundTrackParameters.hpp
index 8bc67347b01aad8bb8aa26057ccf3e82a50e0611..c3dba80ed4c03e8e83cd463692202bb3584f43ad 100644
--- a/Core/include/Acts/EventData/SingleBoundTrackParameters.hpp
+++ b/Core/include/Acts/EventData/SingleBoundTrackParameters.hpp
@@ -1,6 +1,6 @@
-// This file is part of the ACTS project.
+// This file is part of the Acts project.
 //
-// Copyright (C) 2016-2017 ACTS project team
+// Copyright (C) 2016-2017 Acts project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/Core/include/Acts/EventData/SingleCurvilinearTrackParameters.hpp b/Core/include/Acts/EventData/SingleCurvilinearTrackParameters.hpp
index 795c764699dc6b0ffb85455b9413f4d61160a01b..44bde4bf8d0e66b73cf1666dbe481a61f5652f4c 100644
--- a/Core/include/Acts/EventData/SingleCurvilinearTrackParameters.hpp
+++ b/Core/include/Acts/EventData/SingleCurvilinearTrackParameters.hpp
@@ -1,6 +1,6 @@
-// This file is part of the ACTS project.
+// This file is part of the Acts project.
 //
-// Copyright (C) 2016-2018 ACTS project team
+// Copyright (C) 2016-2018 Acts project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/Core/include/Acts/EventData/SingleTrackParameters.hpp b/Core/include/Acts/EventData/SingleTrackParameters.hpp
index 76b2eef82d54995c0c5dabc8551054f7ad4fe379..a32cbc73f66d273cbd1725b17082f4e978affa99 100644
--- a/Core/include/Acts/EventData/SingleTrackParameters.hpp
+++ b/Core/include/Acts/EventData/SingleTrackParameters.hpp
@@ -1,6 +1,6 @@
-// This file is part of the ACTS project.
+// This file is part of the Acts project.
 //
-// Copyright (C) 2016-2017 ACTS project team
+// Copyright (C) 2016-2017 Acts project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/Core/include/Acts/EventData/TrackParameters.hpp b/Core/include/Acts/EventData/TrackParameters.hpp
index 7f9d527a402b413147ef5a8fc59c20604ae06bc7..402e0e84aa8dbeaf89b6dfa09172951d89e4713d 100644
--- a/Core/include/Acts/EventData/TrackParameters.hpp
+++ b/Core/include/Acts/EventData/TrackParameters.hpp
@@ -1,6 +1,6 @@
-// This file is part of the ACTS project.
+// This file is part of the Acts project.
 //
-// Copyright (C) 2016-2017 ACTS project team
+// Copyright (C) 2016-2017 Acts project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/Core/include/Acts/EventData/TrackParametersBase.hpp b/Core/include/Acts/EventData/TrackParametersBase.hpp
index ca53056c675aa1cf16ca1f80396094a3990b9617..a4b75e80c32a129e7a1900b6dae7dd10c28739bd 100644
--- a/Core/include/Acts/EventData/TrackParametersBase.hpp
+++ b/Core/include/Acts/EventData/TrackParametersBase.hpp
@@ -1,6 +1,6 @@
-// This file is part of the ACTS project.
+// This file is part of the Acts project.
 //
-// Copyright (C) 2016-2017 ACTS project team
+// Copyright (C) 2016-2017 Acts project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
@@ -11,7 +11,7 @@
 #include <ostream>
 
 #include "Acts/Utilities/Definitions.hpp"
-// ACTS includes
+// Acts includes
 #include "Acts/EventData/ChargePolicy.hpp"
 #include "Acts/EventData/ParameterSet.hpp"
 #include "Acts/Utilities/ParameterDefinitions.hpp"
diff --git a/Core/include/Acts/EventData/TransportJacobian.hpp b/Core/include/Acts/EventData/TransportJacobian.hpp
index 5517a915f252b608be53a95d69fd12aa63ff0923..d813bfd26d988d10b85e5e01e0025b6dee65c9e6 100644
--- a/Core/include/Acts/EventData/TransportJacobian.hpp
+++ b/Core/include/Acts/EventData/TransportJacobian.hpp
@@ -1,13 +1,13 @@
-// This file is part of the ACTS project.
+// This file is part of the Acts project.
 //
-// Copyright (C) 2016-2017 ACTS project team
+// Copyright (C) 2016-2017 Acts project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
 // file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 ///////////////////////////////////////////////////////////////////
-// TransportJacobian.h, ACTS project
+// TransportJacobian.h, Acts project
 ///////////////////////////////////////////////////////////////////
 
 #pragma once
diff --git a/Core/include/Acts/EventData/detail/coordinate_transformations.hpp b/Core/include/Acts/EventData/detail/coordinate_transformations.hpp
index 5642601321e20b78a17d7b14805775a7100e5899..b67387b3b3af6f0e50931f25b24741c56ee31647 100644
--- a/Core/include/Acts/EventData/detail/coordinate_transformations.hpp
+++ b/Core/include/Acts/EventData/detail/coordinate_transformations.hpp
@@ -1,13 +1,13 @@
-// This file is part of the ACTS project.
+// This file is part of the Acts project.
 //
-// Copyright (C) 2016-2017 ACTS project team
+// Copyright (C) 2016-2017 Acts project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
 // file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 #pragma once
-// ACTS includes
+// Acts includes
 #include <cmath>
 #include "Acts/Surfaces/Surface.hpp"
 #include "Acts/Utilities/ParameterDefinitions.hpp"
diff --git a/Core/include/Acts/EventData/detail/fittable_type_generator.hpp b/Core/include/Acts/EventData/detail/fittable_type_generator.hpp
index 9e0bb1af0485b91b78b28bac8d02efd2f70b6222..b1703dce0bf1187152b635f1af24751a0aff7a9f 100644
--- a/Core/include/Acts/EventData/detail/fittable_type_generator.hpp
+++ b/Core/include/Acts/EventData/detail/fittable_type_generator.hpp
@@ -1,6 +1,6 @@
-// This file is part of the ACTS project.
+// This file is part of the Acts project.
 //
-// Copyright (C) 2016-2017 ACTS project team
+// Copyright (C) 2016-2017 Acts project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
@@ -11,7 +11,7 @@
 #include <boost/mpl/vector.hpp>
 #include <boost/variant.hpp>
 
-// ACTS include(s)
+// Acts include(s)
 #include "Acts/Utilities/ParameterDefinitions.hpp"
 
 namespace Acts {
diff --git a/Core/include/Acts/EventData/detail/full_parameter_set.hpp b/Core/include/Acts/EventData/detail/full_parameter_set.hpp
index 901ed74eb465a0ec620c93302fbefa111afa1704..4d3401b24725381c87dad74a8fe2d654f0c5b8f9 100644
--- a/Core/include/Acts/EventData/detail/full_parameter_set.hpp
+++ b/Core/include/Acts/EventData/detail/full_parameter_set.hpp
@@ -1,6 +1,6 @@
-// This file is part of the ACTS project.
+// This file is part of the Acts project.
 //
-// Copyright (C) 2016 ACTS project team
+// Copyright (C) 2016 Acts project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
@@ -11,7 +11,7 @@
 #include <type_traits>
 #include <utility>
 
-// ACTS include(s)
+// Acts include(s)
 #include "Acts/Utilities/ParameterDefinitions.hpp"
 
 namespace Acts {
diff --git a/Core/include/Acts/EventData/detail/initialize_parameter_set.hpp b/Core/include/Acts/EventData/detail/initialize_parameter_set.hpp
index da83f9f44bc12680cf320dfa4ce61cbada7216ca..2a20db5835cbd5ad6fb499f658abb8257a6f10ff 100644
--- a/Core/include/Acts/EventData/detail/initialize_parameter_set.hpp
+++ b/Core/include/Acts/EventData/detail/initialize_parameter_set.hpp
@@ -1,6 +1,6 @@
-// This file is part of the ACTS project.
+// This file is part of the Acts project.
 //
-// Copyright (C) 2016 ACTS project team
+// Copyright (C) 2016 Acts project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/Core/include/Acts/EventData/detail/make_projection_matrix.hpp b/Core/include/Acts/EventData/detail/make_projection_matrix.hpp
index 29ab64200105a5f09d6c75b2418cdd3c28603bcf..5246a5ae37cf4c8c5e034878e3aaf7d9c33e641c 100644
--- a/Core/include/Acts/EventData/detail/make_projection_matrix.hpp
+++ b/Core/include/Acts/EventData/detail/make_projection_matrix.hpp
@@ -1,13 +1,13 @@
-// This file is part of the ACTS project.
+// This file is part of the Acts project.
 //
-// Copyright (C) 2016 ACTS project team
+// Copyright (C) 2016 Acts project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
 // file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 #pragma once
-// ACTS include(s)
+// Acts include(s)
 #include "Acts/Utilities/Definitions.hpp"
 
 namespace Acts {
diff --git a/Core/include/Acts/EventData/detail/residual_calculator.hpp b/Core/include/Acts/EventData/detail/residual_calculator.hpp
index 19aac650beecceaae338cc9e23a8434bfd0e303e..99572195f28d0a5992c0f6d07049f8008c30e7f4 100644
--- a/Core/include/Acts/EventData/detail/residual_calculator.hpp
+++ b/Core/include/Acts/EventData/detail/residual_calculator.hpp
@@ -1,13 +1,13 @@
-// This file is part of the ACTS project.
+// This file is part of the Acts project.
 //
-// Copyright (C) 2016 ACTS project team
+// Copyright (C) 2016 Acts project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
 // file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 #pragma once
-// ACTS include(s)
+// Acts include(s)
 #include "Acts/Utilities/Definitions.hpp"
 #include "Acts/Utilities/ParameterDefinitions.hpp"
 
diff --git a/Core/include/Acts/EventData/detail/value_corrector.hpp b/Core/include/Acts/EventData/detail/value_corrector.hpp
index 05bc92fbec852d009965aa3dcb71866f8b1b8b87..7678fd0b715e1328474c029ac81e6bc6197a21b5 100644
--- a/Core/include/Acts/EventData/detail/value_corrector.hpp
+++ b/Core/include/Acts/EventData/detail/value_corrector.hpp
@@ -1,13 +1,13 @@
-// This file is part of the ACTS project.
+// This file is part of the Acts project.
 //
-// Copyright (C) 2016 ACTS project team
+// Copyright (C) 2016 Acts project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
 // file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 #pragma once
-// ACTS include(s)
+// Acts include(s)
 #include "Acts/Utilities/Definitions.hpp"
 #include "Acts/Utilities/ParameterDefinitions.hpp"
 
diff --git a/Core/include/Acts/Fitter/KalmanFitter.hpp b/Core/include/Acts/Fitter/KalmanFitter.hpp
index 4902a26c032ff6a8dca980e1967e8aabd07d37bb..47375fb760bb092b14a2c694859e1b2de6befab2 100644
--- a/Core/include/Acts/Fitter/KalmanFitter.hpp
+++ b/Core/include/Acts/Fitter/KalmanFitter.hpp
@@ -1,6 +1,6 @@
-// This file is part of the ACTS project.
+// This file is part of the Acts project.
 //
-// Copyright (C) 2016-2018 ACTS project team
+// Copyright (C) 2016-2018 Acts project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/Core/include/Acts/Fitter/KalmanUpdator.hpp b/Core/include/Acts/Fitter/KalmanUpdator.hpp
index cb05a8a742e7693566f9b09e300b9cf4acba37b4..da9e02e546aa51e6a05ce02eaabbc754413e8956 100644
--- a/Core/include/Acts/Fitter/KalmanUpdator.hpp
+++ b/Core/include/Acts/Fitter/KalmanUpdator.hpp
@@ -1,6 +1,6 @@
-// This file is part of the ACTS project.
+// This file is part of the Acts project.
 //
-// Copyright (C) 2016-2017 ACTS project team
+// Copyright (C) 2016-2017 Acts project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/Core/include/Acts/Layers/ConeLayer.hpp b/Core/include/Acts/Layers/ConeLayer.hpp
index 8bf55a883ebe9eda51cdbfccfb790007484d39d9..5a15ba5e1ba79992524e5a514033b083538d13a2 100644
--- a/Core/include/Acts/Layers/ConeLayer.hpp
+++ b/Core/include/Acts/Layers/ConeLayer.hpp
@@ -1,13 +1,13 @@
-// This file is part of the ACTS project.
+// This file is part of the Acts project.
 //
-// Copyright (C) 2016-2017 ACTS project team
+// Copyright (C) 2016-2017 Acts project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
 // file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 ///////////////////////////////////////////////////////////////////
-// ConeLayer.h, ACTS project
+// ConeLayer.h, Acts project
 ///////////////////////////////////////////////////////////////////
 
 #pragma once
diff --git a/Core/include/Acts/Layers/CylinderLayer.hpp b/Core/include/Acts/Layers/CylinderLayer.hpp
index eb3a2e72f5c0b561a1e8d3bb6852bf78422bfabd..36de622f522691a8b917633318a287ab893cdf92 100644
--- a/Core/include/Acts/Layers/CylinderLayer.hpp
+++ b/Core/include/Acts/Layers/CylinderLayer.hpp
@@ -1,13 +1,13 @@
-// This file is part of the ACTS project.
+// This file is part of the Acts project.
 //
-// Copyright (C) 2016-2017 ACTS project team
+// Copyright (C) 2016-2017 Acts project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
 // file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 ///////////////////////////////////////////////////////////////////
-// CylinderLayer.h, ACTS project
+// CylinderLayer.h, Acts project
 ///////////////////////////////////////////////////////////////////
 
 #pragma once
diff --git a/Core/include/Acts/Layers/DiscLayer.hpp b/Core/include/Acts/Layers/DiscLayer.hpp
index 7ebd946cb691332aefc9c217d8f999ee076c7fe4..6638c25c442dbd13d18905682ba2da5202fa7a0e 100644
--- a/Core/include/Acts/Layers/DiscLayer.hpp
+++ b/Core/include/Acts/Layers/DiscLayer.hpp
@@ -1,13 +1,13 @@
-// This file is part of the ACTS project.
+// This file is part of the Acts project.
 //
-// Copyright (C) 2016-2017 ACTS project team
+// Copyright (C) 2016-2017 Acts project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
 // file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 ///////////////////////////////////////////////////////////////////
-// DiscLayer.h, ACTS project
+// DiscLayer.h, Acts project
 ///////////////////////////////////////////////////////////////////
 
 #pragma once
diff --git a/Core/include/Acts/Layers/GenericApproachDescriptor.hpp b/Core/include/Acts/Layers/GenericApproachDescriptor.hpp
index 9db3ebf59515c94791f02fb35f7a87e9fdb1936b..c6e180cbb99cf58705e1ff36b80c0fc307c2df8b 100644
--- a/Core/include/Acts/Layers/GenericApproachDescriptor.hpp
+++ b/Core/include/Acts/Layers/GenericApproachDescriptor.hpp
@@ -1,13 +1,13 @@
-// This file is part of the ACTS project.
+// This file is part of the Acts project.
 //
-// Copyright (C) 2016-2017 ACTS project team
+// Copyright (C) 2016-2017 Acts project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
 // file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 ///////////////////////////////////////////////////////////////////
-// GenericApproachDescriptor.h, ACTS project
+// GenericApproachDescriptor.h, Acts project
 ///////////////////////////////////////////////////////////////////
 
 #pragma once
diff --git a/Core/include/Acts/Layers/Layer.hpp b/Core/include/Acts/Layers/Layer.hpp
index 77d26f56cf11c14405a5e32f7e1a15186e4b1ed3..b2a22d555c67fd8e7880b77aece25dcb93243a1b 100644
--- a/Core/include/Acts/Layers/Layer.hpp
+++ b/Core/include/Acts/Layers/Layer.hpp
@@ -1,13 +1,13 @@
-// This file is part of the ACTS project.
+// This file is part of the Acts project.
 //
-// Copyright (C) 2016-2017 ACTS project team
+// Copyright (C) 2016-2017 Acts project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
 // file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 ///////////////////////////////////////////////////////////////////
-// Layer.h, ACTS project
+// Layer.h, Acts project
 ///////////////////////////////////////////////////////////////////
 
 #pragma once
diff --git a/Core/include/Acts/Layers/NavigationLayer.hpp b/Core/include/Acts/Layers/NavigationLayer.hpp
index 4639d3804d4eb6acb0e7e667847284d555b0fd15..28bef080a0569d52e2b38ae240d856f74964fdcf 100644
--- a/Core/include/Acts/Layers/NavigationLayer.hpp
+++ b/Core/include/Acts/Layers/NavigationLayer.hpp
@@ -1,13 +1,13 @@
-// This file is part of the ACTS project.
+// This file is part of the Acts project.
 //
-// Copyright (C) 2016-2017 ACTS project team
+// Copyright (C) 2016-2017 Acts project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
 // file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 ///////////////////////////////////////////////////////////////////
-// NavigationLayer.h, ACTS project
+// NavigationLayer.h, Acts project
 ///////////////////////////////////////////////////////////////////
 
 #pragma once
diff --git a/Core/include/Acts/Layers/PlaneLayer.hpp b/Core/include/Acts/Layers/PlaneLayer.hpp
index 8d631bd5396b3135c78afb5fbd26542178347cfa..882690c0d42b9b4462ffb05a5ee80acb768f9634 100644
--- a/Core/include/Acts/Layers/PlaneLayer.hpp
+++ b/Core/include/Acts/Layers/PlaneLayer.hpp
@@ -1,13 +1,13 @@
-// This file is part of the ACTS project.
+// This file is part of the Acts project.
 //
-// Copyright (C) 2016-2017 ACTS project team
+// Copyright (C) 2016-2017 Acts project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
 // file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 ///////////////////////////////////////////////////////////////////
-// PlaneLayer.h, ACTS project
+// PlaneLayer.h, Acts project
 ///////////////////////////////////////////////////////////////////
 
 #pragma once
diff --git a/Core/include/Acts/Layers/ProtoLayer.hpp b/Core/include/Acts/Layers/ProtoLayer.hpp
index 99f286c605d505cc21fbd93f4dd2438aa2e887b9..e7a3072563c1592ee7e619251d0b24296182d9c3 100644
--- a/Core/include/Acts/Layers/ProtoLayer.hpp
+++ b/Core/include/Acts/Layers/ProtoLayer.hpp
@@ -1,6 +1,6 @@
-// This file is part of the ACTS project.
+// This file is part of the Acts project.
 //
-// Copyright (C) 2017-2018 ACTS project team
+// Copyright (C) 2017-2018 Acts project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/Core/include/Acts/Layers/detail/Layer.ipp b/Core/include/Acts/Layers/detail/Layer.ipp
index 5fb40b35a42db97968626625163281c61ee3a715..712f608100abd34e65fb1d9c716be9207b2fac0b 100644
--- a/Core/include/Acts/Layers/detail/Layer.ipp
+++ b/Core/include/Acts/Layers/detail/Layer.ipp
@@ -1,6 +1,6 @@
-// This file is part of the ACTS project.
+// This file is part of the Acts project.
 //
-// Copyright (C) 2016-2018 ACTS project team
+// Copyright (C) 2016-2018 Acts project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/Core/include/Acts/MagneticField/ConstantBField.hpp b/Core/include/Acts/MagneticField/ConstantBField.hpp
index 3c56529edd1b549d24ccad4470cc59a50835a30c..514017eadf2fd08b4278ea638d38ec46e49c95ba 100644
--- a/Core/include/Acts/MagneticField/ConstantBField.hpp
+++ b/Core/include/Acts/MagneticField/ConstantBField.hpp
@@ -1,6 +1,6 @@
-// This file is part of the ACTS project.
+// This file is part of the Acts project.
 //
-// Copyright (C) 2016-2018 ACTS project team
+// Copyright (C) 2016-2018 Acts project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/Core/include/Acts/MagneticField/InterpolatedBFieldMap.hpp b/Core/include/Acts/MagneticField/InterpolatedBFieldMap.hpp
index 5d3c956257dac161711a8a20e3b5a1d2e61f2b8b..e59fbebe8682e9c1415cec36796fcc046e03b2c7 100644
--- a/Core/include/Acts/MagneticField/InterpolatedBFieldMap.hpp
+++ b/Core/include/Acts/MagneticField/InterpolatedBFieldMap.hpp
@@ -1,6 +1,6 @@
-// This file is part of the ACTS project.
+// This file is part of the Acts project.
 //
-// Copyright (C) 2016-2017 ACTS project team
+// Copyright (C) 2016-2017 Acts project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/Core/include/Acts/MagneticField/SharedBFieldMap.hpp b/Core/include/Acts/MagneticField/SharedBFieldMap.hpp
index d66ca934b9548ea1775a89a730855135c244f3eb..231ed459208522f2305c70746479c3328ed9871e 100644
--- a/Core/include/Acts/MagneticField/SharedBFieldMap.hpp
+++ b/Core/include/Acts/MagneticField/SharedBFieldMap.hpp
@@ -1,6 +1,6 @@
-// This file is part of the ACTS project.
+// This file is part of the Acts project.
 //
-// Copyright (C) 2017 ACTS project team
+// Copyright (C) 2017 Acts project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/Core/include/Acts/MagneticField/concept/AnyFieldLookup.hpp b/Core/include/Acts/MagneticField/concept/AnyFieldLookup.hpp
index 2a0f99ac2ed28fd6fbbc8291bf681a7016a7ba06..198dc202fd7035e88aae60178e24d4d0dc73bfa9 100644
--- a/Core/include/Acts/MagneticField/concept/AnyFieldLookup.hpp
+++ b/Core/include/Acts/MagneticField/concept/AnyFieldLookup.hpp
@@ -1,6 +1,6 @@
-// This file is part of the ACTS project.
+// This file is part of the Acts project.
 //
-// Copyright (C) 2017-2018 ACTS project team
+// Copyright (C) 2017-2018 Acts project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/Core/include/Acts/Material/BinnedSurfaceMaterial.hpp b/Core/include/Acts/Material/BinnedSurfaceMaterial.hpp
index 102fea20ed701faa8a9459b93f7056485bb672f1..b2340465d424736fc691785a3b92d6d82abbb1bf 100644
--- a/Core/include/Acts/Material/BinnedSurfaceMaterial.hpp
+++ b/Core/include/Acts/Material/BinnedSurfaceMaterial.hpp
@@ -1,13 +1,13 @@
-// This file is part of the ACTS project.
+// This file is part of the Acts project.
 //
-// Copyright (C) 2016-2017 ACTS project team
+// Copyright (C) 2016-2017 Acts project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
 // file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 ///////////////////////////////////////////////////////////////////
-// BinnedSurfaceMaterial.h, ACTS project
+// BinnedSurfaceMaterial.h, Acts project
 ///////////////////////////////////////////////////////////////////
 
 #pragma once
diff --git a/Core/include/Acts/Material/HomogeneousSurfaceMaterial.hpp b/Core/include/Acts/Material/HomogeneousSurfaceMaterial.hpp
index 0402565547603ed989acb539786a7edacda6b6ff..a28c0a9ac39086e952a3c30ef5b15e639323a1de 100644
--- a/Core/include/Acts/Material/HomogeneousSurfaceMaterial.hpp
+++ b/Core/include/Acts/Material/HomogeneousSurfaceMaterial.hpp
@@ -1,13 +1,13 @@
-// This file is part of the ACTS project.
+// This file is part of the Acts project.
 //
-// Copyright (C) 2016-2017 ACTS project team
+// Copyright (C) 2016-2017 Acts project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
 // file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 ///////////////////////////////////////////////////////////////////
-// HomogeneousSurfaceMaterial.h, ACTS project
+// HomogeneousSurfaceMaterial.h, Acts project
 ///////////////////////////////////////////////////////////////////
 
 #pragma once
diff --git a/Core/include/Acts/Material/Material.hpp b/Core/include/Acts/Material/Material.hpp
index 984b5f72212c2d1a5391cdbf053563fffcfc086b..1fb88912ce3aced09c32f9253c05ff4cb6d90d2f 100644
--- a/Core/include/Acts/Material/Material.hpp
+++ b/Core/include/Acts/Material/Material.hpp
@@ -1,13 +1,13 @@
-// This file is part of the ACTS project.
+// This file is part of the Acts project.
 //
-// Copyright (C) 2016-2017 ACTS project team
+// Copyright (C) 2016-2017 Acts project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
 // file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 ///////////////////////////////////////////////////////////////////
-// Material.h, ACTS project
+// Material.h, Acts project
 ///////////////////////////////////////////////////////////////////
 
 #pragma once
diff --git a/Core/include/Acts/Material/MaterialProperties.hpp b/Core/include/Acts/Material/MaterialProperties.hpp
index 5c7d8d2952996d07676cf0abcf37c6f133b90670..24a87d27e8a874612bae6b6e5d8b9cefaa800a0b 100644
--- a/Core/include/Acts/Material/MaterialProperties.hpp
+++ b/Core/include/Acts/Material/MaterialProperties.hpp
@@ -1,13 +1,13 @@
-// This file is part of the ACTS project.
+// This file is part of the Acts project.
 //
-// Copyright (C) 2016-2017 ACTS project team
+// Copyright (C) 2016-2017 Acts project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
 // file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 ///////////////////////////////////////////////////////////////////
-// MaterialProperties.h, ACTS project
+// MaterialProperties.h, Acts project
 ///////////////////////////////////////////////////////////////////
 
 #pragma once
diff --git a/Core/include/Acts/Material/SurfaceMaterial.hpp b/Core/include/Acts/Material/SurfaceMaterial.hpp
index c4d3870adc48ffe4fe0775355129e1d2e5a95ecf..e672443c0b0c816ab68edb43b0f1a8da6e7996c4 100644
--- a/Core/include/Acts/Material/SurfaceMaterial.hpp
+++ b/Core/include/Acts/Material/SurfaceMaterial.hpp
@@ -1,13 +1,13 @@
-// This file is part of the ACTS project.
+// This file is part of the Acts project.
 //
-// Copyright (C) 2016-2017 ACTS project team
+// Copyright (C) 2016-2017 Acts project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
 // file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 ///////////////////////////////////////////////////////////////////
-// SurfaceMaterial.h, ACTS project
+// SurfaceMaterial.h, Acts project
 ///////////////////////////////////////////////////////////////////
 
 #pragma once
diff --git a/Core/include/Acts/Material/SurfaceMaterialProxy.hpp b/Core/include/Acts/Material/SurfaceMaterialProxy.hpp
index 48db273e5423ecf0d8f752f985b451e2a4c8f25c..4999a59d602d46028404e601822886499165e6bc 100644
--- a/Core/include/Acts/Material/SurfaceMaterialProxy.hpp
+++ b/Core/include/Acts/Material/SurfaceMaterialProxy.hpp
@@ -1,13 +1,13 @@
-// This file is part of the ACTS project.
+// This file is part of the Acts project.
 //
-// Copyright (C) 2016-2017 ACTS project team
+// Copyright (C) 2016-2017 Acts project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
 // file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 ///////////////////////////////////////////////////////////////////
-// SurfaceMaterialProxy.hpp, ACTS project MaterialPlugins
+// SurfaceMaterialProxy.hpp, Acts project MaterialPlugins
 ///////////////////////////////////////////////////////////////////
 
 #pragma once
diff --git a/Core/include/Acts/Propagator/AbortList.hpp b/Core/include/Acts/Propagator/AbortList.hpp
index 4feec7713f5bc2bff4d7bfd78817620f0ab8581a..ffb4e4fc6a169c3f28d7742e9c469bcad5f57cc3 100644
--- a/Core/include/Acts/Propagator/AbortList.hpp
+++ b/Core/include/Acts/Propagator/AbortList.hpp
@@ -1,6 +1,6 @@
-// This file is part of the ACTS project.
+// This file is part of the Acts project.
 //
-// Copyright (C) 2016-2018 ACTS project team
+// Copyright (C) 2016-2018 Acts project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/Core/include/Acts/Propagator/ActionList.hpp b/Core/include/Acts/Propagator/ActionList.hpp
index de7d8efeaf00d4b26aef2cd1c412939a9070abff..46ef804731c53dfadf40d26bc7e09143e7b0a829 100644
--- a/Core/include/Acts/Propagator/ActionList.hpp
+++ b/Core/include/Acts/Propagator/ActionList.hpp
@@ -1,6 +1,6 @@
-// This file is part of the ACTS project.
+// This file is part of the Acts project.
 //
-// Copyright (C) 2016-2018 ACTS project team
+// Copyright (C) 2016-2018 Acts project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/Core/include/Acts/Propagator/EigenStepper.hpp b/Core/include/Acts/Propagator/EigenStepper.hpp
index 9dd8e33ee47ec07a37d6e0f5b1376355551ef2d3..04a35b6cd4f948dfc937069a6c2d26cf3f7d947c 100644
--- a/Core/include/Acts/Propagator/EigenStepper.hpp
+++ b/Core/include/Acts/Propagator/EigenStepper.hpp
@@ -1,6 +1,6 @@
-// This file is part of the ACTS project.
+// This file is part of the Acts project.
 //
-// Copyright (C) 2016-2018 ACTS project team
+// Copyright (C) 2016-2018 Acts project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/Core/include/Acts/Propagator/Propagator.hpp b/Core/include/Acts/Propagator/Propagator.hpp
index 14ff95fc37d4873566c33706fff7aa5fe93ef24a..d95691a7bda9b18f2bc6819b6871705e6bd08c1e 100644
--- a/Core/include/Acts/Propagator/Propagator.hpp
+++ b/Core/include/Acts/Propagator/Propagator.hpp
@@ -1,6 +1,6 @@
-// This file is part of the ACTS project.
+// This file is part of the Acts project.
 //
-// Copyright (C) 2016-2018 ACTS project team
+// Copyright (C) 2016-2018 Acts project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/Core/include/Acts/Propagator/detail/Extendable.hpp b/Core/include/Acts/Propagator/detail/Extendable.hpp
index ead1685538538a6216ccf7089cb4241839f78cfa..7c222e4d6cd7e1099f0d4e830901852c6743a95f 100644
--- a/Core/include/Acts/Propagator/detail/Extendable.hpp
+++ b/Core/include/Acts/Propagator/detail/Extendable.hpp
@@ -1,6 +1,6 @@
-// This file is part of the ACTS project.
+// This file is part of the Acts project.
 //
-// Copyright (C) 2016-2018 ACTS project team
+// Copyright (C) 2016-2018 Acts project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/Core/include/Acts/Propagator/detail/abort_condition_signature_check.hpp b/Core/include/Acts/Propagator/detail/abort_condition_signature_check.hpp
index c15a77ccb77aeacd13335d28dfc5ff7b55313d44..691a1787a5477132f02a1fe04540d5b13d1599c4 100644
--- a/Core/include/Acts/Propagator/detail/abort_condition_signature_check.hpp
+++ b/Core/include/Acts/Propagator/detail/abort_condition_signature_check.hpp
@@ -1,6 +1,6 @@
-// This file is part of the ACTS project.
+// This file is part of the Acts project.
 //
-// Copyright (C) 2016-2018 ACTS project team
+// Copyright (C) 2016-2018 Acts project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/Core/include/Acts/Propagator/detail/abort_list_implementation.hpp b/Core/include/Acts/Propagator/detail/abort_list_implementation.hpp
index d2df9137193cd8dc356c3ff09507c3235a138650..fe1bf3111277f9137a8d706bed93490423548d88 100644
--- a/Core/include/Acts/Propagator/detail/abort_list_implementation.hpp
+++ b/Core/include/Acts/Propagator/detail/abort_list_implementation.hpp
@@ -1,6 +1,6 @@
-// This file is part of the ACTS project.
+// This file is part of the Acts project.
 //
-// Copyright (C) 2018 ACTS project team
+// Copyright (C) 2018 Acts project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/Core/include/Acts/Propagator/detail/action_list_implementation.hpp b/Core/include/Acts/Propagator/detail/action_list_implementation.hpp
index b4af936c8d9519da142e4027c198798b54eb424f..ff0abfab2ee0d2b47ea386e518b540c8da7f2fa5 100644
--- a/Core/include/Acts/Propagator/detail/action_list_implementation.hpp
+++ b/Core/include/Acts/Propagator/detail/action_list_implementation.hpp
@@ -1,6 +1,6 @@
-// This file is part of the ACTS project.
+// This file is part of the Acts project.
 //
-// Copyright (C) 2018 ACTS project team
+// Copyright (C) 2018 Acts project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/Core/include/Acts/Propagator/detail/action_signature_check.hpp b/Core/include/Acts/Propagator/detail/action_signature_check.hpp
index 276d4062af28195666ced9d690d4e9025d4c398b..a3927e78a4a3f9d8f9810101b941161eda396703 100644
--- a/Core/include/Acts/Propagator/detail/action_signature_check.hpp
+++ b/Core/include/Acts/Propagator/detail/action_signature_check.hpp
@@ -1,6 +1,6 @@
-// This file is part of the ACTS project.
+// This file is part of the Acts project.
 //
-// Copyright (C) 2016-2018 ACTS project team
+// Copyright (C) 2016-2018 Acts project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/Core/include/Acts/Propagator/detail/condition_uses_result_type.hpp b/Core/include/Acts/Propagator/detail/condition_uses_result_type.hpp
index 24fda6a41615b3deefb13dfbca843f91a5815d8f..e28593fb2a73bff5880ece9a1081b8e19979a6b8 100644
--- a/Core/include/Acts/Propagator/detail/condition_uses_result_type.hpp
+++ b/Core/include/Acts/Propagator/detail/condition_uses_result_type.hpp
@@ -1,6 +1,6 @@
-// This file is part of the ACTS project.
+// This file is part of the Acts project.
 //
-// Copyright (C) 2016-2018 ACTS project team
+// Copyright (C) 2016-2018 Acts project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/Core/include/Acts/Propagator/detail/standard_abort_conditions.hpp b/Core/include/Acts/Propagator/detail/standard_abort_conditions.hpp
index 945f5313d5ab8d2eb74ca8e18bb73de3b91f0d76..5c95dbed4330f9ce45c8c2fcc4a06d8bf0228f69 100644
--- a/Core/include/Acts/Propagator/detail/standard_abort_conditions.hpp
+++ b/Core/include/Acts/Propagator/detail/standard_abort_conditions.hpp
@@ -1,6 +1,6 @@
-// This file is part of the ACTS project.
+// This file is part of the Acts project.
 //
-// Copyright (C) 2017-2018 ACTS project team
+// Copyright (C) 2017-2018 Acts project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/Core/include/Acts/Seeding/BarrelSeedFinder.hpp b/Core/include/Acts/Seeding/BarrelSeedFinder.hpp
index 2339ef83fef5c6f5385a2a27f32f98d9b242bc36..ebfbf896370a4f017bc22944e0d66e296ad978c5 100644
--- a/Core/include/Acts/Seeding/BarrelSeedFinder.hpp
+++ b/Core/include/Acts/Seeding/BarrelSeedFinder.hpp
@@ -1,6 +1,6 @@
-// This file is part of the ACTS project.
+// This file is part of the Acts project.
 //
-// Copyright (C) 2016 ACTS project team
+// Copyright (C) 2016 Acts project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/Core/include/Acts/Seeding/SpacePoint.hpp b/Core/include/Acts/Seeding/SpacePoint.hpp
index 9c0c3a31869d8c62faee91ede34dce2a26345ba8..aaa4b410a69671a65a36d7e4eddbcf1d07c17e85 100644
--- a/Core/include/Acts/Seeding/SpacePoint.hpp
+++ b/Core/include/Acts/Seeding/SpacePoint.hpp
@@ -1,6 +1,6 @@
-// This file is part of the ACTS project.
+// This file is part of the Acts project.
 //
-// Copyright (C) 2016 ACTS project team
+// Copyright (C) 2016 Acts project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/Core/include/Acts/Seeding/TrackSeed.hpp b/Core/include/Acts/Seeding/TrackSeed.hpp
index 5bf6c841d69f8ba6baa09ce73119faae13582d98..26033aa4ab032efc6e7432da77fbb5466663a417 100644
--- a/Core/include/Acts/Seeding/TrackSeed.hpp
+++ b/Core/include/Acts/Seeding/TrackSeed.hpp
@@ -1,6 +1,6 @@
-// This file is part of the ACTS project.
+// This file is part of the Acts project.
 //
-// Copyright (C) 2016-2017 ACTS project team
+// Copyright (C) 2016-2017 Acts project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/Core/include/Acts/Seeding/detail/cyclic_range.hpp b/Core/include/Acts/Seeding/detail/cyclic_range.hpp
index 1d95da97df94b4fb24d9643fbf298a454fd841e4..3943cd2583b558f110907cbc0f53f62039fdeefc 100644
--- a/Core/include/Acts/Seeding/detail/cyclic_range.hpp
+++ b/Core/include/Acts/Seeding/detail/cyclic_range.hpp
@@ -1,6 +1,6 @@
-// This file is part of the ACTS project.
+// This file is part of the Acts project.
 //
-// Copyright (C) 2016 ACTS project team
+// Copyright (C) 2016 Acts project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/Core/include/Acts/Seeding/detail/geometry.hpp b/Core/include/Acts/Seeding/detail/geometry.hpp
index 79408e0832bacbcabba15bdd70efe23a012b4e46..d61783c37c77e43715274d17a31229cd1c06c31d 100644
--- a/Core/include/Acts/Seeding/detail/geometry.hpp
+++ b/Core/include/Acts/Seeding/detail/geometry.hpp
@@ -1,6 +1,6 @@
-// This file is part of the ACTS project.
+// This file is part of the Acts project.
 //
-// Copyright (C) 2016-2018 ACTS project team
+// Copyright (C) 2016-2018 Acts project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/Core/include/Acts/Surfaces/BoundaryCheck.hpp b/Core/include/Acts/Surfaces/BoundaryCheck.hpp
index 9e18d1122fba79da8807cef5a01a6506ca17948b..84e7d49202dfa363823b0e63082bc2df59b5f635 100644
--- a/Core/include/Acts/Surfaces/BoundaryCheck.hpp
+++ b/Core/include/Acts/Surfaces/BoundaryCheck.hpp
@@ -1,13 +1,13 @@
-// This file is part of the ACTS project.
+// This file is part of the Acts project.
 //
-// Copyright (C) 2016-2018 ACTS project team
+// Copyright (C) 2016-2018 Acts project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
 // file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 ///////////////////////////////////////////////////////////////////
-// BoundaryCheck.hpp, ACTS project
+// BoundaryCheck.hpp, Acts project
 ///////////////////////////////////////////////////////////////////
 
 #pragma once
diff --git a/Core/include/Acts/Surfaces/ConeBounds.hpp b/Core/include/Acts/Surfaces/ConeBounds.hpp
index c059018cb3616a2d68a335afe50eaffdcd580327..b81ce01cd5ce5cf637464d71879121fb449c734d 100644
--- a/Core/include/Acts/Surfaces/ConeBounds.hpp
+++ b/Core/include/Acts/Surfaces/ConeBounds.hpp
@@ -1,13 +1,13 @@
-// This file is part of the ACTS project.
+// This file is part of the Acts project.
 //
-// Copyright (C) 2016-2017 ACTS project team
+// Copyright (C) 2016-2017 Acts project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
 // file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 ///////////////////////////////////////////////////////////////////
-// ConeBounds.h, ACTS project
+// ConeBounds.h, Acts project
 ///////////////////////////////////////////////////////////////////
 
 #pragma once
diff --git a/Core/include/Acts/Surfaces/ConeSurface.hpp b/Core/include/Acts/Surfaces/ConeSurface.hpp
index 7a1d00a8c8806e29840f68e9f047c9d813c7e0fc..2456f75861184d5fd06348886ce7a9ce905f1265 100644
--- a/Core/include/Acts/Surfaces/ConeSurface.hpp
+++ b/Core/include/Acts/Surfaces/ConeSurface.hpp
@@ -1,13 +1,13 @@
-// This file is part of the ACTS project.
+// This file is part of the Acts project.
 //
-// Copyright (C) 2016-2018 ACTS project team
+// Copyright (C) 2016-2018 Acts project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
 // file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 ///////////////////////////////////////////////////////////////////
-// ConeSurface.h, ACTS project
+// ConeSurface.h, Acts project
 ///////////////////////////////////////////////////////////////////
 
 #pragma once
diff --git a/Core/include/Acts/Surfaces/CylinderBounds.hpp b/Core/include/Acts/Surfaces/CylinderBounds.hpp
index 8f4497e6a371ca48f6051a271a1e40ac9b654e6a..868b4c1dd9d00355b38d7260fedd189799d28fce 100644
--- a/Core/include/Acts/Surfaces/CylinderBounds.hpp
+++ b/Core/include/Acts/Surfaces/CylinderBounds.hpp
@@ -1,13 +1,13 @@
-// This file is part of the ACTS project.
+// This file is part of the Acts project.
 //
-// Copyright (C) 2016-2017 ACTS project team
+// Copyright (C) 2016-2017 Acts project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
 // file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 ///////////////////////////////////////////////////////////////////
-// CylinderBounds.h, ACTS project
+// CylinderBounds.h, Acts project
 ///////////////////////////////////////////////////////////////////
 
 #pragma once
diff --git a/Core/include/Acts/Surfaces/CylinderSurface.hpp b/Core/include/Acts/Surfaces/CylinderSurface.hpp
index d3be2e3a5148e606dda087b2b974d59e329fee9c..6cb7e9b8bb18c11d796de22461c45be809df9c56 100644
--- a/Core/include/Acts/Surfaces/CylinderSurface.hpp
+++ b/Core/include/Acts/Surfaces/CylinderSurface.hpp
@@ -1,13 +1,13 @@
-// This file is part of the ACTS project.
+// This file is part of the Acts project.
 //
-// Copyright (C) 2016-2018 ACTS project team
+// Copyright (C) 2016-2018 Acts project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
 // file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 ///////////////////////////////////////////////////////////////////
-// CylinderSurface.h, ACTS project
+// CylinderSurface.h, Acts project
 ///////////////////////////////////////////////////////////////////
 
 #pragma once
diff --git a/Core/include/Acts/Surfaces/DiamondBounds.hpp b/Core/include/Acts/Surfaces/DiamondBounds.hpp
index 610631dadc5d1af93201c33b671ff76d1029c33f..9dfe29856312ac678ba222841a69b3087e2d3326 100644
--- a/Core/include/Acts/Surfaces/DiamondBounds.hpp
+++ b/Core/include/Acts/Surfaces/DiamondBounds.hpp
@@ -1,13 +1,13 @@
-// This file is part of the ACTS project.
+// This file is part of the Acts project.
 //
-// Copyright (C) 2016-2017 ACTS project team
+// Copyright (C) 2016-2017 Acts project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
 // file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 ///////////////////////////////////////////////////////////////////
-// DiamondBounds.h, ACTS project
+// DiamondBounds.h, Acts project
 ///////////////////////////////////////////////////////////////////
 
 #pragma once
diff --git a/Core/include/Acts/Surfaces/DiscBounds.hpp b/Core/include/Acts/Surfaces/DiscBounds.hpp
index ee1aaddf739984cc4ef3ab8d50ae9b785d66ce62..dffaa7c3b6482fbd08e5bbf10688fe9c8563c0f4 100644
--- a/Core/include/Acts/Surfaces/DiscBounds.hpp
+++ b/Core/include/Acts/Surfaces/DiscBounds.hpp
@@ -1,13 +1,13 @@
-// This file is part of the ACTS project.
+// This file is part of the Acts project.
 //
-// Copyright (C) 2016-2017 ACTS project team
+// Copyright (C) 2016-2017 Acts project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
 // file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 ///////////////////////////////////////////////////////////////////
-// DiscBounds.h, ACTS project
+// DiscBounds.h, Acts project
 ///////////////////////////////////////////////////////////////////
 
 #pragma once
diff --git a/Core/include/Acts/Surfaces/DiscSurface.hpp b/Core/include/Acts/Surfaces/DiscSurface.hpp
index 2fad108451e011ea831ae89ec81604631469cca9..b2ddd845c037a714ff368eb2f3176437cd1fb600 100644
--- a/Core/include/Acts/Surfaces/DiscSurface.hpp
+++ b/Core/include/Acts/Surfaces/DiscSurface.hpp
@@ -1,13 +1,13 @@
-// This file is part of the ACTS project.
+// This file is part of the Acts project.
 //
-// Copyright (C) 2016-2018 ACTS project team
+// Copyright (C) 2016-2018 Acts project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
 // file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 ///////////////////////////////////////////////////////////////////
-// DiscSurface.h, ACTS project
+// DiscSurface.h, Acts project
 ///////////////////////////////////////////////////////////////////
 
 #pragma once
diff --git a/Core/include/Acts/Surfaces/DiscTrapezoidalBounds.hpp b/Core/include/Acts/Surfaces/DiscTrapezoidalBounds.hpp
index acf2df77e0322a69cb6e82f043461db59f8c1d61..838adf0dbefeca6afc26eee95ceb71a00c272be2 100644
--- a/Core/include/Acts/Surfaces/DiscTrapezoidalBounds.hpp
+++ b/Core/include/Acts/Surfaces/DiscTrapezoidalBounds.hpp
@@ -1,13 +1,13 @@
-// This file is part of the ACTS project.
+// This file is part of the Acts project.
 //
-// Copyright (C) 2016-2017 ACTS project team
+// Copyright (C) 2016-2017 Acts project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
 // file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 ///////////////////////////////////////////////////////////////////
-// DiscTrapezoidalBounds.h, ACTS project
+// DiscTrapezoidalBounds.h, Acts project
 ///////////////////////////////////////////////////////////////////
 
 #pragma once
diff --git a/Core/include/Acts/Surfaces/EllipseBounds.hpp b/Core/include/Acts/Surfaces/EllipseBounds.hpp
index 2dd53d7c39e32de3f628c6e6546f3a8052315405..16d136fe41000c201c8601f4ea45b60900a90533 100644
--- a/Core/include/Acts/Surfaces/EllipseBounds.hpp
+++ b/Core/include/Acts/Surfaces/EllipseBounds.hpp
@@ -1,13 +1,13 @@
-// This file is part of the ACTS project.
+// This file is part of the Acts project.
 //
-// Copyright (C) 2016-2017 ACTS project team
+// Copyright (C) 2016-2017 Acts project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
 // file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 ///////////////////////////////////////////////////////////////////
-// EllipseBounds.h, ACTS project
+// EllipseBounds.h, Acts project
 ///////////////////////////////////////////////////////////////////
 
 #pragma once
diff --git a/Core/include/Acts/Surfaces/InfiniteBounds.hpp b/Core/include/Acts/Surfaces/InfiniteBounds.hpp
index 3ea1687369aa9c495559f3949af1fd17b377033d..a322a9ab48993fcb934ece0dd7fb81fab7c57f12 100644
--- a/Core/include/Acts/Surfaces/InfiniteBounds.hpp
+++ b/Core/include/Acts/Surfaces/InfiniteBounds.hpp
@@ -1,13 +1,13 @@
-// This file is part of the ACTS project.
+// This file is part of the Acts project.
 //
-// Copyright (C) 2016-2018 ACTS project team
+// Copyright (C) 2016-2018 Acts project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
 // file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 ///////////////////////////////////////////////////////////////////
-// InfiniteBounds.h, ACTS project
+// InfiniteBounds.h, Acts project
 ///////////////////////////////////////////////////////////////////
 
 #pragma once
diff --git a/Core/include/Acts/Surfaces/LineBounds.hpp b/Core/include/Acts/Surfaces/LineBounds.hpp
index e1d94a59bd4b2358e3ba8cf29741133f17ddf717..01511ca6f3a9feebbdcfa338267a4a327a96d00d 100644
--- a/Core/include/Acts/Surfaces/LineBounds.hpp
+++ b/Core/include/Acts/Surfaces/LineBounds.hpp
@@ -1,13 +1,13 @@
-// This file is part of the ACTS project.
+// This file is part of the Acts project.
 //
-// Copyright (C) 2016-2017 ACTS project team
+// Copyright (C) 2016-2017 Acts project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
 // file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 ///////////////////////////////////////////////////////////////////
-// LineBounds.h, ACTS project
+// LineBounds.h, Acts project
 ///////////////////////////////////////////////////////////////////
 
 #pragma once
diff --git a/Core/include/Acts/Surfaces/LineSurface.hpp b/Core/include/Acts/Surfaces/LineSurface.hpp
index d7e3a2f535d5a93084a195f0ed8e797348ebe4df..deb1740e0b5af2bf42e3e8efd7de5d24ae690121 100644
--- a/Core/include/Acts/Surfaces/LineSurface.hpp
+++ b/Core/include/Acts/Surfaces/LineSurface.hpp
@@ -1,13 +1,13 @@
-// This file is part of the ACTS project.
+// This file is part of the Acts project.
 //
-// Copyright (C) 2016-2018 ACTS project team
+// Copyright (C) 2016-2018 Acts project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
 // file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 /////////////////////////////////////////////////////////////////
-// LineSurface.h, ACTS project
+// LineSurface.h, Acts project
 ///////////////////////////////////////////////////////////////////
 
 #pragma once
diff --git a/Core/include/Acts/Surfaces/PerigeeSurface.hpp b/Core/include/Acts/Surfaces/PerigeeSurface.hpp
index 84d6c51037757c39295b84dcffcf30c90ef1f936..b6879745322a6ab3f52e92c04fc29a3d2a789931 100644
--- a/Core/include/Acts/Surfaces/PerigeeSurface.hpp
+++ b/Core/include/Acts/Surfaces/PerigeeSurface.hpp
@@ -1,13 +1,13 @@
-// This file is part of the ACTS project.
+// This file is part of the Acts project.
 //
-// Copyright (C) 2016-2017 ACTS project team
+// Copyright (C) 2016-2017 Acts project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
 // file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 /////////////////////////////////////////////////////////////////
-// PerigeeSurface.h, ACTS project
+// PerigeeSurface.h, Acts project
 ///////////////////////////////////////////////////////////////////
 
 #pragma once
diff --git a/Core/include/Acts/Surfaces/PlanarBounds.hpp b/Core/include/Acts/Surfaces/PlanarBounds.hpp
index c10b041b21c889c183e5f71a680f53772a179011..c904b3d94449eea01275ef336d413877da4395ff 100644
--- a/Core/include/Acts/Surfaces/PlanarBounds.hpp
+++ b/Core/include/Acts/Surfaces/PlanarBounds.hpp
@@ -1,13 +1,13 @@
-// This file is part of the ACTS project.
+// This file is part of the Acts project.
 //
-// Copyright (C) 2016-2017 ACTS project team
+// Copyright (C) 2016-2017 Acts project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
 // file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 ///////////////////////////////////////////////////////////////////
-// PlanarBounds.h, ACTS project
+// PlanarBounds.h, Acts project
 ///////////////////////////////////////////////////////////////////
 
 #pragma once
diff --git a/Core/include/Acts/Surfaces/PlaneSurface.hpp b/Core/include/Acts/Surfaces/PlaneSurface.hpp
index de665ef7eacae6f16bb11d8b98588bfa92d99a72..ece17baf5d109b06c36bb2014afa99d3b750617d 100644
--- a/Core/include/Acts/Surfaces/PlaneSurface.hpp
+++ b/Core/include/Acts/Surfaces/PlaneSurface.hpp
@@ -1,13 +1,13 @@
-// This file is part of the ACTS project.
+// This file is part of the Acts project.
 //
-// Copyright (C) 2016-2018 ACTS project team
+// Copyright (C) 2016-2018 Acts project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
 // file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 ///////////////////////////////////////////////////////////////////
-// PlaneSurface.h, ACTS project
+// PlaneSurface.h, Acts project
 ///////////////////////////////////////////////////////////////////
 
 #pragma once
diff --git a/Core/include/Acts/Surfaces/RadialBounds.hpp b/Core/include/Acts/Surfaces/RadialBounds.hpp
index e5a6b3583593d73eacb82a5acdebaa57bab6dd24..26e9780034b2cfa41be659f0ddf2a304132375d8 100644
--- a/Core/include/Acts/Surfaces/RadialBounds.hpp
+++ b/Core/include/Acts/Surfaces/RadialBounds.hpp
@@ -1,6 +1,6 @@
-// This file is part of the ACTS project.
+// This file is part of the Acts project.
 //
-// Copyright (C) 2016-2017 ACTS project team
+// Copyright (C) 2016-2017 Acts project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/Core/include/Acts/Surfaces/RectangleBounds.hpp b/Core/include/Acts/Surfaces/RectangleBounds.hpp
index 01e3f8b25b43f7a69fed3430f87abccfca2d1dc1..9446ef512b7d1ec7233812cbd939ca55a19245b2 100644
--- a/Core/include/Acts/Surfaces/RectangleBounds.hpp
+++ b/Core/include/Acts/Surfaces/RectangleBounds.hpp
@@ -1,13 +1,13 @@
-// This file is part of the ACTS project.
+// This file is part of the Acts project.
 //
-// Copyright (C) 2016-2017 ACTS project team
+// Copyright (C) 2016-2017 Acts project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
 // file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 ///////////////////////////////////////////////////////////////////
-// RectangleBounds.h, ACTS project
+// RectangleBounds.h, Acts project
 ///////////////////////////////////////////////////////////////////
 
 #pragma once
diff --git a/Core/include/Acts/Surfaces/StrawSurface.hpp b/Core/include/Acts/Surfaces/StrawSurface.hpp
index a58be5195a4567f68cb690c3e1f3efecce3f22b2..83ee355c9cf623ecddd58281f9764a28266b4308 100644
--- a/Core/include/Acts/Surfaces/StrawSurface.hpp
+++ b/Core/include/Acts/Surfaces/StrawSurface.hpp
@@ -1,13 +1,13 @@
-// This file is part of the ACTS project.
+// This file is part of the Acts project.
 //
-// Copyright (C) 2016-2018 ACTS project team
+// Copyright (C) 2016-2018 Acts project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
 // file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 /////////////////////////////////////////////////////////////////
-// StrawSurface.h, ACTS project
+// StrawSurface.h, Acts project
 ///////////////////////////////////////////////////////////////////
 
 #pragma once
diff --git a/Core/include/Acts/Surfaces/Surface.hpp b/Core/include/Acts/Surfaces/Surface.hpp
index aba9a9d5a69353a69fd4d52904c33ed4236ea8f2..0a422854147cbe952322316fcbe9731f0211cfda 100644
--- a/Core/include/Acts/Surfaces/Surface.hpp
+++ b/Core/include/Acts/Surfaces/Surface.hpp
@@ -1,13 +1,13 @@
-// This file is part of the ACTS project.
+// This file is part of the Acts project.
 //
-// Copyright (C) 2016-2018 ACTS project team
+// Copyright (C) 2016-2018 Acts project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
 // file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 ///////////////////////////////////////////////////////////////////
-// Surface.h, ACTS project
+// Surface.h, Acts project
 ///////////////////////////////////////////////////////////////////
 
 #pragma once
@@ -35,7 +35,7 @@ class TrackingVolume;
 ///
 /// @brief Abstract Base Class for tracking surfaces
 ///
-/// The Surface class builds the core of the ACTS Tracking Geometry.
+/// The Surface class builds the core of the Acts Tracking Geometry.
 /// All other geometrical objects are either extending the surface or
 /// are built from it.
 ///
diff --git a/Core/include/Acts/Surfaces/SurfaceArray.hpp b/Core/include/Acts/Surfaces/SurfaceArray.hpp
index 54e82284ca6d8f82c819aee6566d1ecb821bbe81..ba81236e67f7cfae339632c42f0e91a2f3fb8800 100644
--- a/Core/include/Acts/Surfaces/SurfaceArray.hpp
+++ b/Core/include/Acts/Surfaces/SurfaceArray.hpp
@@ -1,6 +1,6 @@
-// This file is part of the ACTS project.
+// This file is part of the Acts project.
 //
-// Copyright (C) 2017-2018 ACTS project team
+// Copyright (C) 2017-2018 Acts project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/Core/include/Acts/Surfaces/SurfaceBounds.hpp b/Core/include/Acts/Surfaces/SurfaceBounds.hpp
index bbaedff4bf65dc63525b4ab756bc240e157fca50..124a748c007dee25e18222fb159f13123ff785eb 100644
--- a/Core/include/Acts/Surfaces/SurfaceBounds.hpp
+++ b/Core/include/Acts/Surfaces/SurfaceBounds.hpp
@@ -1,13 +1,13 @@
-// This file is part of the ACTS project.
+// This file is part of the Acts project.
 //
-// Copyright (C) 2016-2017 ACTS project team
+// Copyright (C) 2016-2017 Acts project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
 // file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 ///////////////////////////////////////////////////////////////////
-// SurfaceBounds.h, ACTS project
+// SurfaceBounds.h, Acts project
 ///////////////////////////////////////////////////////////////////
 
 #pragma once
diff --git a/Core/include/Acts/Surfaces/TrapezoidBounds.hpp b/Core/include/Acts/Surfaces/TrapezoidBounds.hpp
index 7b986fdf92442d611bf1fdb968b1f70e99b7bffd..e87902957600eb6fbad7dc92618abd431febbd84 100644
--- a/Core/include/Acts/Surfaces/TrapezoidBounds.hpp
+++ b/Core/include/Acts/Surfaces/TrapezoidBounds.hpp
@@ -1,13 +1,13 @@
-// This file is part of the ACTS project.
+// This file is part of the Acts project.
 //
-// Copyright (C) 2016-2017 ACTS project team
+// Copyright (C) 2016-2017 Acts project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
 // file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 ///////////////////////////////////////////////////////////////////
-// TrapezoidBounds.h, ACTS project
+// TrapezoidBounds.h, Acts project
 ///////////////////////////////////////////////////////////////////
 
 #pragma once
diff --git a/Core/include/Acts/Surfaces/TriangleBounds.hpp b/Core/include/Acts/Surfaces/TriangleBounds.hpp
index 8e61913b1d77a53a66540baae18e7a94ca83a892..b0858b1d7fd275b79d5310447385fb8cd7a5fdae 100644
--- a/Core/include/Acts/Surfaces/TriangleBounds.hpp
+++ b/Core/include/Acts/Surfaces/TriangleBounds.hpp
@@ -1,13 +1,13 @@
-// This file is part of the ACTS project.
+// This file is part of the Acts project.
 //
-// Copyright (C) 2016-2017 ACTS project team
+// Copyright (C) 2016-2017 Acts project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
 // file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 ///////////////////////////////////////////////////////////////////
-// TriangleBounds.h, ACTS project
+// TriangleBounds.h, Acts project
 ///////////////////////////////////////////////////////////////////
 
 #pragma once
diff --git a/Core/include/Acts/Tools/CylinderVolumeBuilder.hpp b/Core/include/Acts/Tools/CylinderVolumeBuilder.hpp
index 4eb7f989a32895e47a45796a300e4ccc1bb11a8f..5764dbbc41c2810c736c8debd94979c4b3cb4d34 100644
--- a/Core/include/Acts/Tools/CylinderVolumeBuilder.hpp
+++ b/Core/include/Acts/Tools/CylinderVolumeBuilder.hpp
@@ -1,13 +1,13 @@
-// This file is part of the ACTS project.
+// This file is part of the Acts project.
 //
-// Copyright (C) 2016-2017 ACTS project team
+// Copyright (C) 2016-2017 Acts project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
 // file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 ///////////////////////////////////////////////////////////////////
-// CylinderVolumeBuilder.h, ACTS project
+// CylinderVolumeBuilder.h, Acts project
 ///////////////////////////////////////////////////////////////////
 
 #pragma once
diff --git a/Core/include/Acts/Tools/CylinderVolumeHelper.hpp b/Core/include/Acts/Tools/CylinderVolumeHelper.hpp
index 54e090b0ffd48cef441eb6405ae3a6ba80821f6d..da4353180fdc9d7e6741208b897009016c58536d 100644
--- a/Core/include/Acts/Tools/CylinderVolumeHelper.hpp
+++ b/Core/include/Acts/Tools/CylinderVolumeHelper.hpp
@@ -1,13 +1,13 @@
-// This file is part of the ACTS project.
+// This file is part of the Acts project.
 //
-// Copyright (C) 2016-2017 ACTS project team
+// Copyright (C) 2016-2017 Acts project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
 // file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 ///////////////////////////////////////////////////////////////////
-// CylinderVolumeHelper.h, ACTS project
+// CylinderVolumeHelper.h, Acts project
 ///////////////////////////////////////////////////////////////////
 
 #pragma once
diff --git a/Core/include/Acts/Tools/ILayerArrayCreator.hpp b/Core/include/Acts/Tools/ILayerArrayCreator.hpp
index 1e9e33c3daed6f9bae3a0e8ba2ca289d82db541b..50dd3a22c00f7ceebbbae7e3c169a1224a1f40ab 100644
--- a/Core/include/Acts/Tools/ILayerArrayCreator.hpp
+++ b/Core/include/Acts/Tools/ILayerArrayCreator.hpp
@@ -1,13 +1,13 @@
-// This file is part of the ACTS project.
+// This file is part of the Acts project.
 //
-// Copyright (C) 2016 ACTS project team
+// Copyright (C) 2016 Acts project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
 // file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 ///////////////////////////////////////////////////////////////////
-// ILayerArrayCreator.h, ACTS project
+// ILayerArrayCreator.h, Acts project
 ///////////////////////////////////////////////////////////////////
 
 #pragma once
diff --git a/Core/include/Acts/Tools/ILayerBuilder.hpp b/Core/include/Acts/Tools/ILayerBuilder.hpp
index d2079460209b8b50b9941e02685e21039788bd6d..66f071c6265b7665ca7140e0d3bc302e11063c0f 100644
--- a/Core/include/Acts/Tools/ILayerBuilder.hpp
+++ b/Core/include/Acts/Tools/ILayerBuilder.hpp
@@ -1,13 +1,13 @@
-// This file is part of the ACTS project.
+// This file is part of the Acts project.
 //
-// Copyright (C) 2016 ACTS project team
+// Copyright (C) 2016 Acts project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
 // file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 ///////////////////////////////////////////////////////////////////
-// ILayerBuilder.h, ACTS project
+// ILayerBuilder.h, Acts project
 ///////////////////////////////////////////////////////////////////
 
 #pragma once
diff --git a/Core/include/Acts/Tools/ITrackingGeometryBuilder.hpp b/Core/include/Acts/Tools/ITrackingGeometryBuilder.hpp
index e679e9d2163fab3b088b2d69e2783b52be3ccca4..2dd5a03a0db7f43a0bd1f523646737f7066bf690 100644
--- a/Core/include/Acts/Tools/ITrackingGeometryBuilder.hpp
+++ b/Core/include/Acts/Tools/ITrackingGeometryBuilder.hpp
@@ -1,13 +1,13 @@
-// This file is part of the ACTS project.
+// This file is part of the Acts project.
 //
-// Copyright (C) 2016-2017 ACTS project team
+// Copyright (C) 2016-2017 Acts project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
 // file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 ///////////////////////////////////////////////////////////////////
-// ITrackingGeometryBuilder.h, ACTS project
+// ITrackingGeometryBuilder.h, Acts project
 ///////////////////////////////////////////////////////////////////
 
 #pragma once
diff --git a/Core/include/Acts/Tools/ITrackingVolumeArrayCreator.hpp b/Core/include/Acts/Tools/ITrackingVolumeArrayCreator.hpp
index 55a68975cf1d6cce4300a3bfcb6dfbfa64368df8..7defec5e4e9e052a69962daabc37112cec477bfc 100644
--- a/Core/include/Acts/Tools/ITrackingVolumeArrayCreator.hpp
+++ b/Core/include/Acts/Tools/ITrackingVolumeArrayCreator.hpp
@@ -1,13 +1,13 @@
-// This file is part of the ACTS project.
+// This file is part of the Acts project.
 //
-// Copyright (C) 2016-2017 ACTS project team
+// Copyright (C) 2016-2017 Acts project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
 // file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 ///////////////////////////////////////////////////////////////////
-// ITrackingVolumeArrayCreator.h, ACTS project
+// ITrackingVolumeArrayCreator.h, Acts project
 ///////////////////////////////////////////////////////////////////
 
 #pragma once
diff --git a/Core/include/Acts/Tools/ITrackingVolumeBuilder.hpp b/Core/include/Acts/Tools/ITrackingVolumeBuilder.hpp
index dbe61f5d2437167ff84569d893790ee0f7cc0707..1f1c93fa173d36165ea2afdbb98101838f60d316 100644
--- a/Core/include/Acts/Tools/ITrackingVolumeBuilder.hpp
+++ b/Core/include/Acts/Tools/ITrackingVolumeBuilder.hpp
@@ -1,13 +1,13 @@
-// This file is part of the ACTS project.
+// This file is part of the Acts project.
 //
-// Copyright (C) 2016-2017 ACTS project team
+// Copyright (C) 2016-2017 Acts project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
 // file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 ///////////////////////////////////////////////////////////////////
-// ITrackingVolumeBuilder.h, ACTS project
+// ITrackingVolumeBuilder.h, Acts project
 ///////////////////////////////////////////////////////////////////
 
 #pragma once
diff --git a/Core/include/Acts/Tools/ITrackingVolumeHelper.hpp b/Core/include/Acts/Tools/ITrackingVolumeHelper.hpp
index 734e7706df58037dd43d4215006f6dcd7918a605..d2f137e8e333f8fa23c3a42b339606a708ba7195 100644
--- a/Core/include/Acts/Tools/ITrackingVolumeHelper.hpp
+++ b/Core/include/Acts/Tools/ITrackingVolumeHelper.hpp
@@ -1,13 +1,13 @@
-// This file is part of the ACTS project.
+// This file is part of the Acts project.
 //
-// Copyright (C) 2016-2017 ACTS project team
+// Copyright (C) 2016-2017 Acts project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
 // file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 ///////////////////////////////////////////////////////////////////
-// ITrackingVolumeHelper.h, ACTS project
+// ITrackingVolumeHelper.h, Acts project
 ///////////////////////////////////////////////////////////////////
 
 #pragma once
diff --git a/Core/include/Acts/Tools/LayerArrayCreator.hpp b/Core/include/Acts/Tools/LayerArrayCreator.hpp
index eb40242ac065c516d3cf1e1422cd3c12446e11e7..da204a582c3673ca3e974bf62b9aa58a83747e5b 100644
--- a/Core/include/Acts/Tools/LayerArrayCreator.hpp
+++ b/Core/include/Acts/Tools/LayerArrayCreator.hpp
@@ -1,13 +1,13 @@
-// This file is part of the ACTS project.
+// This file is part of the Acts project.
 //
-// Copyright (C) 2016-2017 ACTS project team
+// Copyright (C) 2016-2017 Acts project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
 // file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 ///////////////////////////////////////////////////////////////////
-// LayerArrayCreator.h, ACTS project
+// LayerArrayCreator.h, Acts project
 ///////////////////////////////////////////////////////////////////
 
 #pragma once
diff --git a/Core/include/Acts/Tools/LayerCreator.hpp b/Core/include/Acts/Tools/LayerCreator.hpp
index 1c7fbbd24d0cd3b5059f29485d2946cdf600b23a..1748a891bf7ce00d01ec777f0ccc2cf5a192263a 100644
--- a/Core/include/Acts/Tools/LayerCreator.hpp
+++ b/Core/include/Acts/Tools/LayerCreator.hpp
@@ -1,13 +1,13 @@
-// This file is part of the ACTS project.
+// This file is part of the Acts project.
 //
-// Copyright (C) 2016-2018 ACTS project team
+// Copyright (C) 2016-2018 Acts project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
 // file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 ///////////////////////////////////////////////////////////////////
-// LayerCreator.h, ACTS project
+// LayerCreator.h, Acts project
 ///////////////////////////////////////////////////////////////////
 
 #pragma once
diff --git a/Core/include/Acts/Tools/PassiveLayerBuilder.hpp b/Core/include/Acts/Tools/PassiveLayerBuilder.hpp
index 1ea2abae30ba7ffe4ff28ef236816db4dd887582..4515789133282961e6c3aa3a8efbee8301169337 100644
--- a/Core/include/Acts/Tools/PassiveLayerBuilder.hpp
+++ b/Core/include/Acts/Tools/PassiveLayerBuilder.hpp
@@ -1,13 +1,13 @@
-// This file is part of the ACTS project.
+// This file is part of the Acts project.
 //
-// Copyright (C) 2016-2017 ACTS project team
+// Copyright (C) 2016-2017 Acts project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
 // file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 ///////////////////////////////////////////////////////////////////
-// PassiveLayerBuilder.h, ACTS project
+// PassiveLayerBuilder.h, Acts project
 ///////////////////////////////////////////////////////////////////
 
 #pragma once
diff --git a/Core/include/Acts/Tools/SurfaceArrayCreator.hpp b/Core/include/Acts/Tools/SurfaceArrayCreator.hpp
index fe1193dcf0e12517734bdd75e1e445183a10f66a..69d43de186cbe882a85e43ff7c3517a3aaa49656 100644
--- a/Core/include/Acts/Tools/SurfaceArrayCreator.hpp
+++ b/Core/include/Acts/Tools/SurfaceArrayCreator.hpp
@@ -1,13 +1,13 @@
-// This file is part of the ACTS project.
+// This file is part of the Acts project.
 //
-// Copyright (C) 2016-2018 ACTS project team
+// Copyright (C) 2016-2018 Acts project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
 // file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 ///////////////////////////////////////////////////////////////////
-// SurfaceArrayCreator.h, ACTS project
+// SurfaceArrayCreator.h, Acts project
 ///////////////////////////////////////////////////////////////////
 
 #pragma once
diff --git a/Core/include/Acts/Tools/TrackingGeometryBuilder.hpp b/Core/include/Acts/Tools/TrackingGeometryBuilder.hpp
index 02297b8b5bbdb20659afce05eda5cacd5f8be0d6..80cd03430c9c16f4a4d2184fcb39b2663f0fbe9e 100644
--- a/Core/include/Acts/Tools/TrackingGeometryBuilder.hpp
+++ b/Core/include/Acts/Tools/TrackingGeometryBuilder.hpp
@@ -1,13 +1,13 @@
-// This file is part of the ACTS project.
+// This file is part of the Acts project.
 //
-// Copyright (C) 2016-2017 ACTS project team
+// Copyright (C) 2016-2017 Acts project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
 // file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 ///////////////////////////////////////////////////////////////////
-// TrackingGeometryBuilder.h, ACTS project
+// TrackingGeometryBuilder.h, Acts project
 ///////////////////////////////////////////////////////////////////
 
 #pragma once
diff --git a/Core/include/Acts/Tools/TrackingVolumeArrayCreator.hpp b/Core/include/Acts/Tools/TrackingVolumeArrayCreator.hpp
index 72516347dd76f404930130c6bb7c9066bc9dc612..d72ed525ef03da4411f64f8c2873ca4ae0a6fe4b 100644
--- a/Core/include/Acts/Tools/TrackingVolumeArrayCreator.hpp
+++ b/Core/include/Acts/Tools/TrackingVolumeArrayCreator.hpp
@@ -1,13 +1,13 @@
-// This file is part of the ACTS project.
+// This file is part of the Acts project.
 //
-// Copyright (C) 2016-2017 ACTS project team
+// Copyright (C) 2016-2017 Acts project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
 // file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 ///////////////////////////////////////////////////////////////////
-// TrackingVolumeArrayCreator.h, ACTS project
+// TrackingVolumeArrayCreator.h, Acts project
 ///////////////////////////////////////////////////////////////////
 
 #pragma once
diff --git a/Core/include/Acts/Utilities/ApproachDescriptor.hpp b/Core/include/Acts/Utilities/ApproachDescriptor.hpp
index 1cf2ef404329db69f84e2fe67d7e8406b033a699..7aba6c5fab8f4a03d6b22ac7cc3d0e8a4e8081b7 100644
--- a/Core/include/Acts/Utilities/ApproachDescriptor.hpp
+++ b/Core/include/Acts/Utilities/ApproachDescriptor.hpp
@@ -1,13 +1,13 @@
-// This file is part of the ACTS project.
+// This file is part of the Acts project.
 //
-// Copyright (C) 2016-2017 ACTS project team
+// Copyright (C) 2016-2017 Acts project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
 // file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 ///////////////////////////////////////////////////////////////////
-// ApproachDescriptor.h, ACTS project
+// ApproachDescriptor.h, Acts project
 ///////////////////////////////////////////////////////////////////
 
 #pragma once
diff --git a/Core/include/Acts/Utilities/BFieldMapUtils.hpp b/Core/include/Acts/Utilities/BFieldMapUtils.hpp
index 15c2746e66e6b69a98c3d192adbfa43f3822ef37..079f5cab490eda1560cd4c3c5df5d2ae550f022b 100644
--- a/Core/include/Acts/Utilities/BFieldMapUtils.hpp
+++ b/Core/include/Acts/Utilities/BFieldMapUtils.hpp
@@ -1,6 +1,6 @@
-// This file is part of the ACTS project.
+// This file is part of the Acts project.
 //
-// Copyright (C) 2017 ACTS project team
+// Copyright (C) 2017 Acts project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/Core/include/Acts/Utilities/BinUtility.hpp b/Core/include/Acts/Utilities/BinUtility.hpp
index e4b56f1910b742885611848da00987f7f80149dc..06301b491ab8fd8b0c0fe744f6cfb56857afcb59 100644
--- a/Core/include/Acts/Utilities/BinUtility.hpp
+++ b/Core/include/Acts/Utilities/BinUtility.hpp
@@ -1,13 +1,13 @@
-// This file is part of the ACTS project.
+// This file is part of the Acts project.
 //
-// Copyright (C) 2016-2017 ACTS project team
+// Copyright (C) 2016-2017 Acts project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
 // file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 ///////////////////////////////////////////////////////////////////
-// BinUtility.h, ACTS project
+// BinUtility.h, Acts project
 ///////////////////////////////////////////////////////////////////
 
 #pragma once
diff --git a/Core/include/Acts/Utilities/BinnedArray.hpp b/Core/include/Acts/Utilities/BinnedArray.hpp
index 66143eeca80097961a9b1e1710558692bd767b70..52df8a5b518169d731e8d86b152689fc6604a860 100644
--- a/Core/include/Acts/Utilities/BinnedArray.hpp
+++ b/Core/include/Acts/Utilities/BinnedArray.hpp
@@ -1,13 +1,13 @@
-// This file is part of the ACTS project.
+// This file is part of the Acts project.
 //
-// Copyright (C) 2016-2017 ACTS project team
+// Copyright (C) 2016-2017 Acts project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
 // file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 ///////////////////////////////////////////////////////////////////
-// BinnedArray.h, ACTS project
+// BinnedArray.h, Acts project
 ///////////////////////////////////////////////////////////////////
 
 #pragma once
diff --git a/Core/include/Acts/Utilities/BinnedArrayXD.hpp b/Core/include/Acts/Utilities/BinnedArrayXD.hpp
index f4dee908dd96d4b86566ef8b4a3ba5e3475b184c..6d66f67a326e09abf944c5a66fe0cc612cc0a6ab 100644
--- a/Core/include/Acts/Utilities/BinnedArrayXD.hpp
+++ b/Core/include/Acts/Utilities/BinnedArrayXD.hpp
@@ -1,13 +1,13 @@
-// This file is part of the ACTS project.
+// This file is part of the Acts project.
 //
-// Copyright (C) 2016-2017 ACTS project team
+// Copyright (C) 2016-2017 Acts project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
 // file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 ///////////////////////////////////////////////////////////////////
-// BinnedArrayXD.h, ACTS project
+// BinnedArrayXD.h, Acts project
 ///////////////////////////////////////////////////////////////////
 
 #pragma once
diff --git a/Core/include/Acts/Utilities/BinningData.hpp b/Core/include/Acts/Utilities/BinningData.hpp
index ad92d9e9691547e832783dd1752e7c30fd7c7839..470d30a37913f680fd7b1e10c5e444a079c848f9 100644
--- a/Core/include/Acts/Utilities/BinningData.hpp
+++ b/Core/include/Acts/Utilities/BinningData.hpp
@@ -1,13 +1,13 @@
-// This file is part of the ACTS project.
+// This file is part of the Acts project.
 //
-// Copyright (C) 2016-2018 ACTS project team
+// Copyright (C) 2016-2018 Acts project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
 // file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 ///////////////////////////////////////////////////////////////////
-// BinUtility.h, ACTS project
+// BinUtility.h, Acts project
 ///////////////////////////////////////////////////////////////////
 #pragma once
 #include <cmath>
diff --git a/Core/include/Acts/Utilities/BinningType.hpp b/Core/include/Acts/Utilities/BinningType.hpp
index 1534a0491d3f3ae337890381fa7164a98cebb627..694f79c65d74443e1f554b819ccae3000f9ece85 100644
--- a/Core/include/Acts/Utilities/BinningType.hpp
+++ b/Core/include/Acts/Utilities/BinningType.hpp
@@ -1,13 +1,13 @@
-// This file is part of the ACTS project.
+// This file is part of the Acts project.
 //
-// Copyright (C) 2016-2017 ACTS project team
+// Copyright (C) 2016-2017 Acts project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
 // file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 ///////////////////////////////////////////////////////////////////
-// BinningType.h, ACTS project
+// BinningType.h, Acts project
 ///////////////////////////////////////////////////////////////////
 
 #pragma once
diff --git a/Core/include/Acts/Utilities/Definitions.hpp b/Core/include/Acts/Utilities/Definitions.hpp
index 61c39f9964f29ef1f08d3fcbedb32b039e5a7077..45e5e55559e0ab4856954467d7aca867d59a6dd8 100644
--- a/Core/include/Acts/Utilities/Definitions.hpp
+++ b/Core/include/Acts/Utilities/Definitions.hpp
@@ -1,6 +1,6 @@
-// This file is part of the ACTS project.
+// This file is part of the Acts project.
 //
-// Copyright (C) 2016-2018 ACTS project team
+// Copyright (C) 2016-2018 Acts project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/Core/include/Acts/Utilities/GeometryID.hpp b/Core/include/Acts/Utilities/GeometryID.hpp
index 3d9739152e26ac8213bcddd3babdd8db1deb3f84..84a87d2b6c3a45a13fa1cdc4bc49aa543fb13925 100644
--- a/Core/include/Acts/Utilities/GeometryID.hpp
+++ b/Core/include/Acts/Utilities/GeometryID.hpp
@@ -1,13 +1,13 @@
-// This file is part of the ACTS project.
+// This file is part of the Acts project.
 //
-// Copyright (C) 2016-2017 ACTS project team
+// Copyright (C) 2016-2017 Acts project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
 // file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 ///////////////////////////////////////////////////////////////////
-// GeometryID.h, ACTS project
+// GeometryID.h, Acts project
 ///////////////////////////////////////////////////////////////////
 
 #pragma once
diff --git a/Core/include/Acts/Utilities/GeometryObject.hpp b/Core/include/Acts/Utilities/GeometryObject.hpp
index cb4596f0bcf4dab1e70863a8c8d752877388fdb4..e4efa55654822c25be1552d92eb1e3c8bd9d2374 100644
--- a/Core/include/Acts/Utilities/GeometryObject.hpp
+++ b/Core/include/Acts/Utilities/GeometryObject.hpp
@@ -1,13 +1,13 @@
-// This file is part of the ACTS project.
+// This file is part of the Acts project.
 //
-// Copyright (C) 2016-2017 ACTS project team
+// Copyright (C) 2016-2017 Acts project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
 // file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 ///////////////////////////////////////////////////////////////////
-// GeometryObject.h, ACTS project
+// GeometryObject.h, Acts project
 ///////////////////////////////////////////////////////////////////
 
 #pragma once
diff --git a/Core/include/Acts/Utilities/GeometryObjectSorter.hpp b/Core/include/Acts/Utilities/GeometryObjectSorter.hpp
index 7b0de6a22518ddd3eba9c9e1489683919438fb8b..735378efe8641337585fedd15d20ada0c059e233 100644
--- a/Core/include/Acts/Utilities/GeometryObjectSorter.hpp
+++ b/Core/include/Acts/Utilities/GeometryObjectSorter.hpp
@@ -1,13 +1,13 @@
-// This file is part of the ACTS project.
+// This file is part of the Acts project.
 //
-// Copyright (C) 2016-2017 ACTS project team
+// Copyright (C) 2016-2017 Acts project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
 // file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 ///////////////////////////////////////////////////////////////////
-// GeometryObjectSorter.h, ACTS project
+// GeometryObjectSorter.h, Acts project
 ///////////////////////////////////////////////////////////////////
 
 #pragma once
diff --git a/Core/include/Acts/Utilities/GeometrySignature.hpp b/Core/include/Acts/Utilities/GeometrySignature.hpp
index 5c05297c8bb7af9d6689603398144e15d835af46..bea315be27e264500b45489b99a9e45262ec562c 100644
--- a/Core/include/Acts/Utilities/GeometrySignature.hpp
+++ b/Core/include/Acts/Utilities/GeometrySignature.hpp
@@ -1,13 +1,13 @@
-// This file is part of the ACTS project.
+// This file is part of the Acts project.
 //
-// Copyright (C) 2016 ACTS project team
+// Copyright (C) 2016 Acts project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
 // file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 ///////////////////////////////////////////////////////////////////
-// GeometrySignature.h, ACTS project
+// GeometrySignature.h, Acts project
 ///////////////////////////////////////////////////////////////////
 
 #pragma once
diff --git a/Core/include/Acts/Utilities/GeometryStatics.hpp b/Core/include/Acts/Utilities/GeometryStatics.hpp
index 16ac66440edcccaa4ac16f245413ded3c6e23c9b..ea6d604f216760daaddf560e365d13ad486a57a5 100644
--- a/Core/include/Acts/Utilities/GeometryStatics.hpp
+++ b/Core/include/Acts/Utilities/GeometryStatics.hpp
@@ -1,13 +1,13 @@
-// This file is part of the ACTS project.
+// This file is part of the Acts project.
 //
-// Copyright (C) 2016-2017 ACTS project team
+// Copyright (C) 2016-2017 Acts project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
 // file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 ///////////////////////////////////////////////////////////////////
-// GeometryStatics.h, ACTS project
+// GeometryStatics.h, Acts project
 ///////////////////////////////////////////////////////////////////
 
 #pragma once
diff --git a/Core/include/Acts/Utilities/Helpers.hpp b/Core/include/Acts/Utilities/Helpers.hpp
index 2028857044467623da138d34fae68028970f80ad..75f5ae1e0cf71b608c9c94cca7aff50dc86dd01d 100644
--- a/Core/include/Acts/Utilities/Helpers.hpp
+++ b/Core/include/Acts/Utilities/Helpers.hpp
@@ -1,13 +1,13 @@
-// This file is part of the ACTS project.
+// This file is part of the Acts project.
 //
-// Copyright (C) 2016-2017 ACTS project team
+// Copyright (C) 2016-2017 Acts project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
 // file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 ///////////////////////////////////////////////////////////////////
-// AlgebraHelper.h, ACTS project
+// AlgebraHelper.h, Acts project
 ///////////////////////////////////////////////////////////////////
 
 #pragma once
@@ -17,7 +17,7 @@
 #include <iostream>
 #include <string>
 
-// ACTS include(s)
+// Acts include(s)
 #include "Definitions.hpp"
 
 #ifndef ACTS_BIT_CODING
diff --git a/Core/include/Acts/Utilities/IAxis.hpp b/Core/include/Acts/Utilities/IAxis.hpp
index edf895977534b75297c5ec03f8d6ab535899e1c4..006dfc1b16f7fe7670cfb56acc2a2f7307a6d596 100644
--- a/Core/include/Acts/Utilities/IAxis.hpp
+++ b/Core/include/Acts/Utilities/IAxis.hpp
@@ -1,6 +1,6 @@
-// This file is part of the ACTS project.
+// This file is part of the Acts project.
 //
-// Copyright (C) 2018 ACTS project team
+// Copyright (C) 2018 Acts project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/Core/include/Acts/Utilities/Identifier.hpp b/Core/include/Acts/Utilities/Identifier.hpp
index 18e3029a5db84ca973e5fcd128ae2845d8402c79..528f43f03e18e19f4d168a211b699231260bf780 100644
--- a/Core/include/Acts/Utilities/Identifier.hpp
+++ b/Core/include/Acts/Utilities/Identifier.hpp
@@ -1,13 +1,13 @@
-// This file is part of the ACTS project.
+// This file is part of the Acts project.
 //
-// Copyright (C) 2016-2017 ACTS project team
+// Copyright (C) 2016-2017 Acts project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
 // file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 ///////////////////////////////////////////////////////////////////
-// Identifier.h, ACTS project
+// Identifier.h, Acts project
 ///////////////////////////////////////////////////////////////////
 
 #pragma once
diff --git a/Core/include/Acts/Utilities/InstanceFactory.hpp b/Core/include/Acts/Utilities/InstanceFactory.hpp
index 7c9fcc6ecf207779cf8876eb50680ad08513d489..59c4919578c08038cb7040f8d1ec9dcf9fa7bc7a 100644
--- a/Core/include/Acts/Utilities/InstanceFactory.hpp
+++ b/Core/include/Acts/Utilities/InstanceFactory.hpp
@@ -1,6 +1,6 @@
-// This file is part of the ACTS project.
+// This file is part of the Acts project.
 //
-// Copyright (C) 2018 ACTS project team
+// Copyright (C) 2018 Acts project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/Core/include/Acts/Utilities/Interpolation.hpp b/Core/include/Acts/Utilities/Interpolation.hpp
index 41edd7043efcafd58d3a0cf1646ba39a4260416b..1f4b35d9e1f4a9406430e9d1d2a6a3d6fcaf6132 100644
--- a/Core/include/Acts/Utilities/Interpolation.hpp
+++ b/Core/include/Acts/Utilities/Interpolation.hpp
@@ -1,6 +1,6 @@
-// This file is part of the ACTS project.
+// This file is part of the Acts project.
 //
-// Copyright (C) 2017 ACTS project team
+// Copyright (C) 2017 Acts project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/Core/include/Acts/Utilities/Intersection.hpp b/Core/include/Acts/Utilities/Intersection.hpp
index 7a0ca9615d307a2998596020fabf0c4ea4b35f75..ecfc9fae86794a9b79dd1f7356436dfd1f565346 100644
--- a/Core/include/Acts/Utilities/Intersection.hpp
+++ b/Core/include/Acts/Utilities/Intersection.hpp
@@ -1,13 +1,13 @@
-// This file is part of the ACTS project.
+// This file is part of the Acts project.
 //
-// Copyright (C) 2016-2017 ACTS project team
+// Copyright (C) 2016-2017 Acts project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
 // file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 ///////////////////////////////////////////////////////////////////
-// Intersection.h, ACTS project
+// Intersection.h, Acts project
 ///////////////////////////////////////////////////////////////////
 
 #pragma once
diff --git a/Core/include/Acts/Utilities/Logger.hpp b/Core/include/Acts/Utilities/Logger.hpp
index 823115722586ec455eb7438d4fa9e7417b7ea372..bfe07c40fe5cbf8f734a71e570876d434aa781a8 100644
--- a/Core/include/Acts/Utilities/Logger.hpp
+++ b/Core/include/Acts/Utilities/Logger.hpp
@@ -1,6 +1,6 @@
-// This file is part of the ACTS project.
+// This file is part of the Acts project.
 //
-// Copyright (C) 2016-2018 ACTS project team
+// Copyright (C) 2016-2018 Acts project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/Core/include/Acts/Utilities/MaterialInteraction.hpp b/Core/include/Acts/Utilities/MaterialInteraction.hpp
index 33850beb01ce32deff9f14a3fc29afeed14d9565..4b5948124789fa64d7df8fa4d84aa78fe857bfdc 100644
--- a/Core/include/Acts/Utilities/MaterialInteraction.hpp
+++ b/Core/include/Acts/Utilities/MaterialInteraction.hpp
@@ -1,6 +1,6 @@
-// This file is part of the ACTS project.
+// This file is part of the Acts project.
 //
-// Copyright (C) 2017 ACTS project team
+// Copyright (C) 2017 Acts project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/Core/include/Acts/Utilities/ParameterDefinitions.hpp b/Core/include/Acts/Utilities/ParameterDefinitions.hpp
index e5318d9ba64279ba0dbab5339cc30b0ac68e72e5..0a7c2c53efb749dbe740b27d2428ab9e493f7f98 100644
--- a/Core/include/Acts/Utilities/ParameterDefinitions.hpp
+++ b/Core/include/Acts/Utilities/ParameterDefinitions.hpp
@@ -1,6 +1,6 @@
-// This file is part of the ACTS project.
+// This file is part of the Acts project.
 //
-// Copyright (C) 2016-2017 ACTS project team
+// Copyright (C) 2016-2017 Acts project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/Core/include/Acts/Utilities/ParameterTypes.hpp b/Core/include/Acts/Utilities/ParameterTypes.hpp
index 310c761b0691f5f819c1f9308661cd6626dc2ae3..c9e05915f4b1a7cc6291759e86a784167c7a50cd 100644
--- a/Core/include/Acts/Utilities/ParameterTypes.hpp
+++ b/Core/include/Acts/Utilities/ParameterTypes.hpp
@@ -1,6 +1,6 @@
-// This file is part of the ACTS project.
+// This file is part of the Acts project.
 //
-// Copyright (C) 2016 ACTS project team
+// Copyright (C) 2016 Acts project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/Core/include/Acts/Utilities/ThrowAssert.hpp b/Core/include/Acts/Utilities/ThrowAssert.hpp
index 26a3286eb2e4439ae34569a6cdec583f5ab83964..8523d25f4ab0bfc059afde6ff74c050bc51b6c4b 100644
--- a/Core/include/Acts/Utilities/ThrowAssert.hpp
+++ b/Core/include/Acts/Utilities/ThrowAssert.hpp
@@ -1,6 +1,6 @@
-// This file is part of the ACTS project.
+// This file is part of the Acts project.
 //
-// Copyright (C) 2018 ACTS project team
+// Copyright (C) 2018 Acts project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/Core/include/Acts/Utilities/Units.hpp b/Core/include/Acts/Utilities/Units.hpp
index d660db767be9cf9ccc6bacb6a3fdbc20619975a5..c9099b537b4d2ab3eb8aa1a7c000e1b7329dd8c9 100644
--- a/Core/include/Acts/Utilities/Units.hpp
+++ b/Core/include/Acts/Utilities/Units.hpp
@@ -1,6 +1,6 @@
-// This file is part of the ACTS project.
+// This file is part of the Acts project.
 //
-// Copyright (C) 2016-2017 ACTS project team
+// Copyright (C) 2016-2017 Acts project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
@@ -15,7 +15,7 @@ namespace Acts {
 /// calculations, one should make use of the constants defined in this
 /// namespace to express the units of numerical values. The following
 /// conventions are used:
-/// - Input values to ACTS must be given as `numerical_value * unit_constant`.
+/// - Input values to Acts must be given as `numerical_value * unit_constant`.
 /// - Output values can be converted into the desired unit using
 ///   `numerical_value / unit_constant`.
 /// - Converting between SI and natural units should be done using the template
diff --git a/Core/include/Acts/Utilities/VariantData.hpp b/Core/include/Acts/Utilities/VariantData.hpp
index f8f373673941f3de59bff1f96903059566c1cbb7..f137464de9b284bfb741c277c817476e3eeb4598 100644
--- a/Core/include/Acts/Utilities/VariantData.hpp
+++ b/Core/include/Acts/Utilities/VariantData.hpp
@@ -1,6 +1,6 @@
-// This file is part of the ACTS project.
+// This file is part of the Acts project.
 //
-// Copyright (C) 2018 ACTS project team
+// Copyright (C) 2018 Acts project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/Core/include/Acts/Utilities/VariantDataFwd.hpp b/Core/include/Acts/Utilities/VariantDataFwd.hpp
index c98dd471b2b904877fb62fd65774ee051e577829..47bf823f288a87ab12f75b87ad86237b5f13ce98 100644
--- a/Core/include/Acts/Utilities/VariantDataFwd.hpp
+++ b/Core/include/Acts/Utilities/VariantDataFwd.hpp
@@ -1,6 +1,6 @@
-// This file is part of the ACTS project.
+// This file is part of the Acts project.
 //
-// Copyright (C) 2018 ACTS project team
+// Copyright (C) 2018 Acts project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/Core/include/Acts/Utilities/concept/AnyGrid.hpp b/Core/include/Acts/Utilities/concept/AnyGrid.hpp
index d64f8a25f6f464e8933c94c31420e5e65ca930e6..c622f31f52d6a19ded2b7a7b6c7a5fca15e34b6c 100644
--- a/Core/include/Acts/Utilities/concept/AnyGrid.hpp
+++ b/Core/include/Acts/Utilities/concept/AnyGrid.hpp
@@ -1,6 +1,6 @@
-// This file is part of the ACTS project.
+// This file is part of the Acts project.
 //
-// Copyright (C) 2017-2018 ACTS project team
+// Copyright (C) 2017-2018 Acts project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/Core/include/Acts/Utilities/detail/Axis.hpp b/Core/include/Acts/Utilities/detail/Axis.hpp
index 517a8b7e9aeda174f084fd6b34a90acc157ac5e6..e885b224fdcf8497705a85b1509c61f95bafa2bc 100644
--- a/Core/include/Acts/Utilities/detail/Axis.hpp
+++ b/Core/include/Acts/Utilities/detail/Axis.hpp
@@ -1,6 +1,6 @@
-// This file is part of the ACTS project.
+// This file is part of the Acts project.
 //
-// Copyright (C) 2017-2018 ACTS project team
+// Copyright (C) 2017-2018 Acts project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/Core/include/Acts/Utilities/detail/DefaultParameterDefinitions.hpp b/Core/include/Acts/Utilities/detail/DefaultParameterDefinitions.hpp
index cc7af3f620d81894f0df57d0bc21b80a657c5214..a38adc73609bb4009d687c818aca1d4b57909632 100644
--- a/Core/include/Acts/Utilities/detail/DefaultParameterDefinitions.hpp
+++ b/Core/include/Acts/Utilities/detail/DefaultParameterDefinitions.hpp
@@ -1,6 +1,6 @@
-// This file is part of the ACTS project.
+// This file is part of the Acts project.
 //
-// Copyright (C) 2016-2017 ACTS project team
+// Copyright (C) 2016-2017 Acts project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
@@ -10,7 +10,7 @@
 // STL include(s)
 #include <cmath>
 
-// ACTS includes
+// Acts includes
 #include "Acts/Utilities/ParameterTypes.hpp"
 
 namespace Acts {
diff --git a/Core/include/Acts/Utilities/detail/Grid.hpp b/Core/include/Acts/Utilities/detail/Grid.hpp
index 306edd42143ad9c963a26cd87581c4b2c1c87471..f852cbc8486a07b4deecf61052e8606433bc1d70 100644
--- a/Core/include/Acts/Utilities/detail/Grid.hpp
+++ b/Core/include/Acts/Utilities/detail/Grid.hpp
@@ -1,6 +1,6 @@
-// This file is part of the ACTS project.
+// This file is part of the Acts project.
 //
-// Copyright (C) 2017-2018 ACTS project team
+// Copyright (C) 2017-2018 Acts project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/Core/include/Acts/Utilities/detail/MPL/all_of.hpp b/Core/include/Acts/Utilities/detail/MPL/all_of.hpp
index 1da5a9413c8e87ee91810cc5f73c79adee475eda..bf88ae2054a9c4a1f3469a8b878429af53302e45 100644
--- a/Core/include/Acts/Utilities/detail/MPL/all_of.hpp
+++ b/Core/include/Acts/Utilities/detail/MPL/all_of.hpp
@@ -1,6 +1,6 @@
-// This file is part of the ACTS project.
+// This file is part of the Acts project.
 //
-// Copyright (C) 2016 ACTS project team
+// Copyright (C) 2016 Acts project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/Core/include/Acts/Utilities/detail/MPL/any_of.hpp b/Core/include/Acts/Utilities/detail/MPL/any_of.hpp
index 6eee966f0b1cfcf2561fd56330fd2806da4e3b17..d2b49c986965172d9076d4d59b41d93a76241ef5 100644
--- a/Core/include/Acts/Utilities/detail/MPL/any_of.hpp
+++ b/Core/include/Acts/Utilities/detail/MPL/any_of.hpp
@@ -1,6 +1,6 @@
-// This file is part of the ACTS project.
+// This file is part of the Acts project.
 //
-// Copyright (C) 2016 ACTS project team
+// Copyright (C) 2016 Acts project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/Core/include/Acts/Utilities/detail/MPL/are_sorted.hpp b/Core/include/Acts/Utilities/detail/MPL/are_sorted.hpp
index 5e37eeafb02f40657561b0d8932fe10195d500ae..f5e2b8bd349137803d60a62abb8bdc4f5460371d 100644
--- a/Core/include/Acts/Utilities/detail/MPL/are_sorted.hpp
+++ b/Core/include/Acts/Utilities/detail/MPL/are_sorted.hpp
@@ -1,6 +1,6 @@
-// This file is part of the ACTS project.
+// This file is part of the Acts project.
 //
-// Copyright (C) 2016 ACTS project team
+// Copyright (C) 2016 Acts project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/Core/include/Acts/Utilities/detail/MPL/are_within.hpp b/Core/include/Acts/Utilities/detail/MPL/are_within.hpp
index 9b77e549880bed7a141077cbe3d1afe7222fe6bc..a7bc5698e79186f4f59e3132c004dd5d2f20ffbc 100644
--- a/Core/include/Acts/Utilities/detail/MPL/are_within.hpp
+++ b/Core/include/Acts/Utilities/detail/MPL/are_within.hpp
@@ -1,6 +1,6 @@
-// This file is part of the ACTS project.
+// This file is part of the Acts project.
 //
-// Copyright (C) 2016 ACTS project team
+// Copyright (C) 2016 Acts project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/Core/include/Acts/Utilities/detail/MPL/at_index.hpp b/Core/include/Acts/Utilities/detail/MPL/at_index.hpp
index e4ddd3c98084cbe2c11bddf7815850e1e104e84c..5a3101b5ebc2a923bd070daabc76dc985b221247 100644
--- a/Core/include/Acts/Utilities/detail/MPL/at_index.hpp
+++ b/Core/include/Acts/Utilities/detail/MPL/at_index.hpp
@@ -1,6 +1,6 @@
-// This file is part of the ACTS project.
+// This file is part of the Acts project.
 //
-// Copyright (C) 2016 ACTS project team
+// Copyright (C) 2016 Acts project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/Core/include/Acts/Utilities/detail/MPL/boost_mpl_helper.hpp b/Core/include/Acts/Utilities/detail/MPL/boost_mpl_helper.hpp
index 29824a420dbbf6e5010afa81c9d9eef316f0191a..021ac8987249d0d4e434972c3949301dcff3b77e 100644
--- a/Core/include/Acts/Utilities/detail/MPL/boost_mpl_helper.hpp
+++ b/Core/include/Acts/Utilities/detail/MPL/boost_mpl_helper.hpp
@@ -1,6 +1,6 @@
-// This file is part of the ACTS project.
+// This file is part of the Acts project.
 //
-// Copyright (C) 2016 ACTS project team
+// Copyright (C) 2016 Acts project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/Core/include/Acts/Utilities/detail/MPL/get_position.hpp b/Core/include/Acts/Utilities/detail/MPL/get_position.hpp
index d654aac106858fb9b4bd4cac8f62a515c7d1343f..6b29a29c9e7a674c1d9334a5f29885ae35992ac5 100644
--- a/Core/include/Acts/Utilities/detail/MPL/get_position.hpp
+++ b/Core/include/Acts/Utilities/detail/MPL/get_position.hpp
@@ -1,6 +1,6 @@
-// This file is part of the ACTS project.
+// This file is part of the Acts project.
 //
-// Copyright (C) 2016 ACTS project team
+// Copyright (C) 2016 Acts project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/Core/include/Acts/Utilities/detail/MPL/has_duplicates.hpp b/Core/include/Acts/Utilities/detail/MPL/has_duplicates.hpp
index 35bd8493a96a8aeb534bbef3beccb849f0f577b2..4b1e587fafe02346644178afc63e2a9f2cfb5e94 100644
--- a/Core/include/Acts/Utilities/detail/MPL/has_duplicates.hpp
+++ b/Core/include/Acts/Utilities/detail/MPL/has_duplicates.hpp
@@ -1,6 +1,6 @@
-// This file is part of the ACTS project.
+// This file is part of the Acts project.
 //
-// Copyright (C) 2016 ACTS project team
+// Copyright (C) 2016 Acts project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/Core/include/Acts/Utilities/detail/MPL/is_contained.hpp b/Core/include/Acts/Utilities/detail/MPL/is_contained.hpp
index 7d6d9683ce09910532003a004efd120812bbd06c..2aa8be26c780ca94bd9408c245f1f7a4d64d6b1e 100644
--- a/Core/include/Acts/Utilities/detail/MPL/is_contained.hpp
+++ b/Core/include/Acts/Utilities/detail/MPL/is_contained.hpp
@@ -1,6 +1,6 @@
-// This file is part of the ACTS project.
+// This file is part of the Acts project.
 //
-// Copyright (C) 2016 ACTS project team
+// Copyright (C) 2016 Acts project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/Core/include/Acts/Utilities/detail/MPL/type_collector.hpp b/Core/include/Acts/Utilities/detail/MPL/type_collector.hpp
index 8b84252d75167e622298a8ad55a34de9f2f41772..d1bca029d80528e878650fba222fe8eafd908c0b 100644
--- a/Core/include/Acts/Utilities/detail/MPL/type_collector.hpp
+++ b/Core/include/Acts/Utilities/detail/MPL/type_collector.hpp
@@ -1,6 +1,6 @@
-// This file is part of the ACTS project.
+// This file is part of the Acts project.
 //
-// Copyright (C) 2016-2018 ACTS project team
+// Copyright (C) 2016-2018 Acts project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/Core/include/Acts/Utilities/detail/MatrixBasePlugin.hpp b/Core/include/Acts/Utilities/detail/MatrixBasePlugin.hpp
index 30b341e31c3ab9d2b37c9f3149fca544acc65023..01c30663fd11d95ca6e84651e75c36531444f91e 100644
--- a/Core/include/Acts/Utilities/detail/MatrixBasePlugin.hpp
+++ b/Core/include/Acts/Utilities/detail/MatrixBasePlugin.hpp
@@ -1,13 +1,13 @@
-// This file is part of the ACTS project.
+// This file is part of the Acts project.
 //
-// Copyright (C) 2016-2018 ACTS project team
+// Copyright (C) 2016-2018 Acts project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
 // file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 ///////////////////////////////////////////////////////////////////
-// AmgMatrixPlugin.h, ACTS project
+// AmgMatrixPlugin.h, Acts project
 ///////////////////////////////////////////////////////////////////
 
 #pragma once
diff --git a/Core/include/Acts/Utilities/detail/MatrixPlugin.hpp b/Core/include/Acts/Utilities/detail/MatrixPlugin.hpp
index ad875f1ebda9bdf5dea4d313f3f0076b0febd3a9..88b05b4c70bc64b049862a9f6bbc6c2271a6755a 100644
--- a/Core/include/Acts/Utilities/detail/MatrixPlugin.hpp
+++ b/Core/include/Acts/Utilities/detail/MatrixPlugin.hpp
@@ -1,6 +1,6 @@
-// This file is part of the ACTS project.
+// This file is part of the Acts project.
 //
-// Copyright (C) 2016 ACTS project team
+// Copyright (C) 2016 Acts project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/Core/include/Acts/Utilities/detail/RealQuadraticEquation.hpp b/Core/include/Acts/Utilities/detail/RealQuadraticEquation.hpp
index 26c2f0b31a410fbb8e7de6b3592a0d8d4206b9cf..c23ba164e00b483f2d3d01032fcf7949bb10981a 100644
--- a/Core/include/Acts/Utilities/detail/RealQuadraticEquation.hpp
+++ b/Core/include/Acts/Utilities/detail/RealQuadraticEquation.hpp
@@ -1,13 +1,13 @@
-// This file is part of the ACTS project.
+// This file is part of the Acts project.
 //
-// Copyright (C) 2017 ACTS project team
+// Copyright (C) 2017 Acts project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
 // file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 ///////////////////////////////////////////////////////////////////
-// RealQuadraticEquation.h, ACTS project
+// RealQuadraticEquation.h, Acts project
 ///////////////////////////////////////////////////////////////////
 
 #pragma once
diff --git a/Core/include/Acts/Utilities/detail/TransformPlugin.hpp b/Core/include/Acts/Utilities/detail/TransformPlugin.hpp
index ffc64c7b83437f4bc60ba9faa4a171e917dfc917..7ee20f3261148f2d59198d0b167680a267d5c681 100644
--- a/Core/include/Acts/Utilities/detail/TransformPlugin.hpp
+++ b/Core/include/Acts/Utilities/detail/TransformPlugin.hpp
@@ -1,13 +1,13 @@
-// This file is part of the ACTS project.
+// This file is part of the Acts project.
 //
-// Copyright (C) 2016 ACTS project team
+// Copyright (C) 2016 Acts project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
 // file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 ///////////////////////////////////////////////////////////////////
-// GeoPrimitivesHelpers.h, ACTS project
+// GeoPrimitivesHelpers.h, Acts project
 ///////////////////////////////////////////////////////////////////
 
 #pragma once
diff --git a/Core/include/Acts/Utilities/detail/grid_helper.hpp b/Core/include/Acts/Utilities/detail/grid_helper.hpp
index 0dd7fdc784c8babd96547eb8d4523c60553fa615..248d4d70efb0dd0a114c29dbd7b1ac0d2a8bcea0 100644
--- a/Core/include/Acts/Utilities/detail/grid_helper.hpp
+++ b/Core/include/Acts/Utilities/detail/grid_helper.hpp
@@ -1,6 +1,6 @@
-// This file is part of the ACTS project.
+// This file is part of the Acts project.
 //
-// Copyright (C) 2017-2018 ACTS project team
+// Copyright (C) 2017-2018 Acts project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/Core/include/Acts/Utilities/detail/interpolation_impl.hpp b/Core/include/Acts/Utilities/detail/interpolation_impl.hpp
index 1e2df1fa6955aa2de550685c5c068a5a770b1f8f..7ddf926f18f199cd44e82027070d169eec85eb8f 100644
--- a/Core/include/Acts/Utilities/detail/interpolation_impl.hpp
+++ b/Core/include/Acts/Utilities/detail/interpolation_impl.hpp
@@ -1,6 +1,6 @@
-// This file is part of the ACTS project.
+// This file is part of the Acts project.
 //
-// Copyright (C) 2017 ACTS project team
+// Copyright (C) 2017 Acts project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/Core/include/Acts/Utilities/detail/periodic.hpp b/Core/include/Acts/Utilities/detail/periodic.hpp
index f252b2cc80b21fa14244064d6e46b70631837b34..b9417e88913c9c7b5e5b90c7ede17c427cfd5638 100644
--- a/Core/include/Acts/Utilities/detail/periodic.hpp
+++ b/Core/include/Acts/Utilities/detail/periodic.hpp
@@ -1,6 +1,6 @@
-// This file is part of the ACTS project.
+// This file is part of the Acts project.
 //
-// Copyright (C) 2016 ACTS project team
+// Copyright (C) 2016 Acts project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/Core/include/Acts/Volumes/AbstractVolume.hpp b/Core/include/Acts/Volumes/AbstractVolume.hpp
index 9a39a15ffd6a7dfa199378718fb7c3742cf472ea..74bc899c0c3f54fe5be7101f731fa29aafd14339 100644
--- a/Core/include/Acts/Volumes/AbstractVolume.hpp
+++ b/Core/include/Acts/Volumes/AbstractVolume.hpp
@@ -1,13 +1,13 @@
-// This file is part of the ACTS project.
+// This file is part of the Acts project.
 //
-// Copyright (C) 2016-2017 ACTS project team
+// Copyright (C) 2016-2017 Acts project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
 // file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 ///////////////////////////////////////////////////////////////////
-// AbstractVolume.h, ACTS project
+// AbstractVolume.h, Acts project
 ///////////////////////////////////////////////////////////////////
 
 #pragma once
diff --git a/Core/include/Acts/Volumes/BoundarySurfaceFace.hpp b/Core/include/Acts/Volumes/BoundarySurfaceFace.hpp
index 260fa111881ec27170f302e9c920b22d677c64dc..04cf7227553301f9e74d30024b31f505b6779d3b 100644
--- a/Core/include/Acts/Volumes/BoundarySurfaceFace.hpp
+++ b/Core/include/Acts/Volumes/BoundarySurfaceFace.hpp
@@ -1,13 +1,13 @@
-// This file is part of the ACTS project.
+// This file is part of the Acts project.
 //
-// Copyright (C) 2016 ACTS project team
+// Copyright (C) 2016 Acts project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
 // file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 ///////////////////////////////////////////////////////////////////
-// BoundarySurfaceFace.h, ACTS project
+// BoundarySurfaceFace.h, Acts project
 ///////////////////////////////////////////////////////////////////
 
 #pragma once
diff --git a/Core/include/Acts/Volumes/BoundarySurfaceT.hpp b/Core/include/Acts/Volumes/BoundarySurfaceT.hpp
index 31a8e45a4ecaea0e5f427294965cb65d00b01fb9..8546826222ef6761d9a4bf7cd22d1aba5fc66c66 100644
--- a/Core/include/Acts/Volumes/BoundarySurfaceT.hpp
+++ b/Core/include/Acts/Volumes/BoundarySurfaceT.hpp
@@ -1,13 +1,13 @@
-// This file is part of the ACTS project.
+// This file is part of the Acts project.
 //
-// Copyright (C) 2016-2017 ACTS project team
+// Copyright (C) 2016-2017 Acts project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
 // file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 ///////////////////////////////////////////////////////////////////
-// BoundarySurfaceT.h, ACTS project
+// BoundarySurfaceT.h, Acts project
 ///////////////////////////////////////////////////////////////////
 
 #pragma once
diff --git a/Core/include/Acts/Volumes/CuboidVolumeBounds.hpp b/Core/include/Acts/Volumes/CuboidVolumeBounds.hpp
index 35d0994920d2faff97e7d957c4b65f211bf10496..896bd65046ca71a41f11d02e00880c1ad407d636 100644
--- a/Core/include/Acts/Volumes/CuboidVolumeBounds.hpp
+++ b/Core/include/Acts/Volumes/CuboidVolumeBounds.hpp
@@ -1,13 +1,13 @@
-// This file is part of the ACTS project.
+// This file is part of the Acts project.
 //
-// Copyright (C) 2016-2017 ACTS project team
+// Copyright (C) 2016-2017 Acts project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
 // file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 ///////////////////////////////////////////////////////////////////
-// CuboidVolumeBounds.h, ACTS project
+// CuboidVolumeBounds.h, Acts project
 ///////////////////////////////////////////////////////////////////
 
 #pragma once
diff --git a/Core/include/Acts/Volumes/CylinderVolumeBounds.hpp b/Core/include/Acts/Volumes/CylinderVolumeBounds.hpp
index 2892e7842710788b130e44c8de0f66e9028d27b9..272dabcb0dd85d159108b73d1dc60a747e246743 100644
--- a/Core/include/Acts/Volumes/CylinderVolumeBounds.hpp
+++ b/Core/include/Acts/Volumes/CylinderVolumeBounds.hpp
@@ -1,13 +1,13 @@
-// This file is part of the ACTS project.
+// This file is part of the Acts project.
 //
-// Copyright (C) 2016-2017 ACTS project team
+// Copyright (C) 2016-2017 Acts project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
 // file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 ///////////////////////////////////////////////////////////////////
-// CylinderVolumeBounds.h, ACTS project
+// CylinderVolumeBounds.h, Acts project
 ///////////////////////////////////////////////////////////////////
 
 #pragma once
diff --git a/Core/include/Acts/Volumes/DoubleTrapezoidVolumeBounds.hpp b/Core/include/Acts/Volumes/DoubleTrapezoidVolumeBounds.hpp
index 54b639f708077f303e08b263bc1bc862227865d8..11c94a6457bd2b1a8175c2cbe2cdd023e61dc901 100644
--- a/Core/include/Acts/Volumes/DoubleTrapezoidVolumeBounds.hpp
+++ b/Core/include/Acts/Volumes/DoubleTrapezoidVolumeBounds.hpp
@@ -1,13 +1,13 @@
-// This file is part of the ACTS project.
+// This file is part of the Acts project.
 //
-// Copyright (C) 2016-2017 ACTS project team
+// Copyright (C) 2016-2017 Acts project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
 // file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 ///////////////////////////////////////////////////////////////////
-// DoubleTrapezoidVolumeBounds.h, ACTS project
+// DoubleTrapezoidVolumeBounds.h, Acts project
 ///////////////////////////////////////////////////////////////////
 
 #pragma once
diff --git a/Core/include/Acts/Volumes/TrapezoidVolumeBounds.hpp b/Core/include/Acts/Volumes/TrapezoidVolumeBounds.hpp
index aa8b642c0d1226feeb23cb079e908c55408b22eb..36c33166deedafcb8271383e8f0a0d0396289d90 100644
--- a/Core/include/Acts/Volumes/TrapezoidVolumeBounds.hpp
+++ b/Core/include/Acts/Volumes/TrapezoidVolumeBounds.hpp
@@ -1,13 +1,13 @@
-// This file is part of the ACTS project.
+// This file is part of the Acts project.
 //
-// Copyright (C) 2016-2017 ACTS project team
+// Copyright (C) 2016-2017 Acts project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
 // file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 ///////////////////////////////////////////////////////////////////
-// TrapezoidVolumeBounds.h, ACTS project
+// TrapezoidVolumeBounds.h, Acts project
 ///////////////////////////////////////////////////////////////////
 
 #pragma once
diff --git a/Core/include/Acts/Volumes/Volume.hpp b/Core/include/Acts/Volumes/Volume.hpp
index cfecd5082ec6e1c336fb5f63b1559e585d35f539..31e1c8deb8fa5796539ee354cb30963866946221 100644
--- a/Core/include/Acts/Volumes/Volume.hpp
+++ b/Core/include/Acts/Volumes/Volume.hpp
@@ -1,13 +1,13 @@
-// This file is part of the ACTS project.
+// This file is part of the Acts project.
 //
-// Copyright (C) 2016-2017 ACTS project team
+// Copyright (C) 2016-2017 Acts project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
 // file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 ///////////////////////////////////////////////////////////////////
-// AbstractVolume.h, ACTS project
+// AbstractVolume.h, Acts project
 ///////////////////////////////////////////////////////////////////
 #pragma once
 #include <memory>
diff --git a/Core/include/Acts/Volumes/VolumeBounds.hpp b/Core/include/Acts/Volumes/VolumeBounds.hpp
index f28435baabc0dcebeca6736ec785720ed11147e5..f2db2fe7de7fb2d3d1b506e7a5d12f4e161c98e6 100644
--- a/Core/include/Acts/Volumes/VolumeBounds.hpp
+++ b/Core/include/Acts/Volumes/VolumeBounds.hpp
@@ -1,13 +1,13 @@
-// This file is part of the ACTS project.
+// This file is part of the Acts project.
 //
-// Copyright (C) 2016-2017 ACTS project team
+// Copyright (C) 2016-2017 Acts project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
 // file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 ///////////////////////////////////////////////////////////////////
-// VolumeBounds.h, ACTS project
+// VolumeBounds.h, Acts project
 ///////////////////////////////////////////////////////////////////
 
 #pragma once
diff --git a/Core/src/Detector/DetachedTrackingVolume.cpp b/Core/src/Detector/DetachedTrackingVolume.cpp
index 66a5c7150953a38fa17ff8681aafb8b41b6e47c2..37a4fa027113dba9503f1a51bf1c4ecabdf3ee35 100644
--- a/Core/src/Detector/DetachedTrackingVolume.cpp
+++ b/Core/src/Detector/DetachedTrackingVolume.cpp
@@ -1,13 +1,13 @@
-// This file is part of the ACTS project.
+// This file is part of the Acts project.
 //
-// Copyright (C) 2016-2017 ACTS project team
+// Copyright (C) 2016-2017 Acts project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
 // file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 ///////////////////////////////////////////////////////////////////
-// DetachedTrackingVolume.cpp, ACTS project
+// DetachedTrackingVolume.cpp, Acts project
 ///////////////////////////////////////////////////////////////////
 
 // Geometry module
diff --git a/Core/src/Detector/GlueVolumesDescriptor.cpp b/Core/src/Detector/GlueVolumesDescriptor.cpp
index 4b3a5b4fe7ddf21e0e2464781e882b58fb857b31..13bb46ffb2d8b7b199f35651d784ce5dcea66fb4 100644
--- a/Core/src/Detector/GlueVolumesDescriptor.cpp
+++ b/Core/src/Detector/GlueVolumesDescriptor.cpp
@@ -1,13 +1,13 @@
-// This file is part of the ACTS project.
+// This file is part of the Acts project.
 //
-// Copyright (C) 2016-2017 ACTS project team
+// Copyright (C) 2016-2017 Acts project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
 // file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 ///////////////////////////////////////////////////////////////////
-// GlueVolumesDescriptor.cpp, ACTS project
+// GlueVolumesDescriptor.cpp, Acts project
 ///////////////////////////////////////////////////////////////////
 
 #include "Acts/Detector/GlueVolumesDescriptor.hpp"
diff --git a/Core/src/Detector/TrackingGeometry.cpp b/Core/src/Detector/TrackingGeometry.cpp
index fd99adb2158b116e4acec8e1c541d3e7fc9d6109..90c72e1c651d54c1a7a3c4d682ad73e5c53a2c58 100644
--- a/Core/src/Detector/TrackingGeometry.cpp
+++ b/Core/src/Detector/TrackingGeometry.cpp
@@ -1,13 +1,13 @@
-// This file is part of the ACTS project.
+// This file is part of the Acts project.
 //
-// Copyright (C) 2016-2017 ACTS project team
+// Copyright (C) 2016-2017 Acts project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
 // file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 ///////////////////////////////////////////////////////////////////
-// TrackingGeometry.cpp, ACTS project
+// TrackingGeometry.cpp, Acts project
 ///////////////////////////////////////////////////////////////////
 
 #include "Acts/Detector/TrackingGeometry.hpp"
diff --git a/Core/src/Detector/TrackingVolume.cpp b/Core/src/Detector/TrackingVolume.cpp
index e084094c68d35533362b89da03723d585cc88461..a1c74b0c88fde9ef297f14286c6f35a2fa16c308 100644
--- a/Core/src/Detector/TrackingVolume.cpp
+++ b/Core/src/Detector/TrackingVolume.cpp
@@ -1,13 +1,13 @@
-// This file is part of the ACTS project.
+// This file is part of the Acts project.
 //
-// Copyright (C) 2016-2017 ACTS project team
+// Copyright (C) 2016-2017 Acts project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
 // file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 ///////////////////////////////////////////////////////////////////
-// TrackingVolume.cpp, ACTS project
+// TrackingVolume.cpp, Acts project
 ///////////////////////////////////////////////////////////////////
 
 #include "Acts/Detector/TrackingVolume.hpp"
diff --git a/Core/src/Digitization/CartesianSegmentation.cpp b/Core/src/Digitization/CartesianSegmentation.cpp
index c1f45bd43215230aa8eca29d3b91c8d92c880294..1d1e01e22cc2d3bbb67fbaf195e40c7ee405c982 100644
--- a/Core/src/Digitization/CartesianSegmentation.cpp
+++ b/Core/src/Digitization/CartesianSegmentation.cpp
@@ -1,13 +1,13 @@
-// This file is part of the ACTS project.
+// This file is part of the Acts project.
 //
-// Copyright (C) 2016-2017 ACTS project team
+// Copyright (C) 2016-2017 Acts project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
 // file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 ///////////////////////////////////////////////////////////////////
-// CartesianSegmentation.cpp, ACTS project
+// CartesianSegmentation.cpp, Acts project
 ///////////////////////////////////////////////////////////////////
 
 #include "Acts/Digitization/CartesianSegmentation.hpp"
diff --git a/Core/src/Digitization/Clusterization.cpp b/Core/src/Digitization/Clusterization.cpp
index 24784af79cf0db2b072607383afdd787b1836fc8..71d1d0125f320dfdc3290efb687ae427f9f27d58 100644
--- a/Core/src/Digitization/Clusterization.cpp
+++ b/Core/src/Digitization/Clusterization.cpp
@@ -1,6 +1,6 @@
-// This file is part of the ACTS project.
+// This file is part of the Acts project.
 //
-// Copyright (C) 2018 ACTS project team
+// Copyright (C) 2018 Acts project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/Core/src/Digitization/DigitizationModule.cpp b/Core/src/Digitization/DigitizationModule.cpp
index 31bb955f0875286a5d924f20debe8960e866fec4..4c35ece3b0025425bfaffe6c3aa867377d0624ef 100644
--- a/Core/src/Digitization/DigitizationModule.cpp
+++ b/Core/src/Digitization/DigitizationModule.cpp
@@ -1,13 +1,13 @@
-// This file is part of the ACTS project.
+// This file is part of the Acts project.
 //
-// Copyright (C) 2016 ACTS project team
+// Copyright (C) 2016 Acts project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
 // file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 ///////////////////////////////////////////////////////////////////
-// DigitizationModule.cpp, ACTS project
+// DigitizationModule.cpp, Acts project
 ///////////////////////////////////////////////////////////////////
 
 #include "Acts/Digitization/DigitizationModule.hpp"
diff --git a/Core/src/Digitization/PlanarModuleStepper.cpp b/Core/src/Digitization/PlanarModuleStepper.cpp
index a92f5dd5258807fc3e8f0500177d75cb2372d2ca..d29b68eff6b30bfbfb0a7734e3a9c51930e490f7 100644
--- a/Core/src/Digitization/PlanarModuleStepper.cpp
+++ b/Core/src/Digitization/PlanarModuleStepper.cpp
@@ -1,13 +1,13 @@
-// This file is part of the ACTS project.
+// This file is part of the Acts project.
 //
-// Copyright (C) 2016-2017 ACTS project team
+// Copyright (C) 2016-2017 Acts project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
 // file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 ///////////////////////////////////////////////////////////////////
-// PlanarModuleStepper.cpp, ACTS project
+// PlanarModuleStepper.cpp, Acts project
 ///////////////////////////////////////////////////////////////////
 
 #include "Acts/Digitization//PlanarModuleStepper.hpp"
diff --git a/Core/src/Digitization/PolarSegmentation.cpp b/Core/src/Digitization/PolarSegmentation.cpp
index 31893d0d2bb1bbab91bad1749f54fe98690bfda1..782215bab9448bb1eb88f3bcba35f02b6df61c82 100644
--- a/Core/src/Digitization/PolarSegmentation.cpp
+++ b/Core/src/Digitization/PolarSegmentation.cpp
@@ -1,13 +1,13 @@
-// This file is part of the ACTS project.
+// This file is part of the Acts project.
 //
-// Copyright (C) 2016-2017 ACTS project team
+// Copyright (C) 2016-2017 Acts project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
 // file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 ///////////////////////////////////////////////////////////////////
-// TrapezoidSegmentation.cpp, ACTS project
+// TrapezoidSegmentation.cpp, Acts project
 ///////////////////////////////////////////////////////////////////
 
 /*
diff --git a/Core/src/EventData/NeutralParameters.cpp b/Core/src/EventData/NeutralParameters.cpp
index 96f93a25ecfb710211797c2f9c4018e77a21dbe0..ec1213e012cf54b531fb31d95289ebd8a9081aad 100644
--- a/Core/src/EventData/NeutralParameters.cpp
+++ b/Core/src/EventData/NeutralParameters.cpp
@@ -1,6 +1,6 @@
-// This file is part of the ACTS project.
+// This file is part of the Acts project.
 //
-// Copyright (C) 2016 ACTS project team
+// Copyright (C) 2016 Acts project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/Core/src/EventData/TrackParameters.cpp b/Core/src/EventData/TrackParameters.cpp
index cedfb08dfd21a06646a0e104a7820c22a8c0f7f1..d8c82ca00d1632e0523b5e90335a2eec32ab8557 100644
--- a/Core/src/EventData/TrackParameters.cpp
+++ b/Core/src/EventData/TrackParameters.cpp
@@ -1,6 +1,6 @@
-// This file is part of the ACTS project.
+// This file is part of the Acts project.
 //
-// Copyright (C) 2016 ACTS project team
+// Copyright (C) 2016 Acts project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/Core/src/EventData/TrackParametersBase.cpp b/Core/src/EventData/TrackParametersBase.cpp
index 21c371d63512c9f27c7c9a5d6096c158b2c0a60b..59a90e51729c257e732d60c5e4911bb9dcedbbea 100644
--- a/Core/src/EventData/TrackParametersBase.cpp
+++ b/Core/src/EventData/TrackParametersBase.cpp
@@ -1,6 +1,6 @@
-// This file is part of the ACTS project.
+// This file is part of the Acts project.
 //
-// Copyright (C) 2016 ACTS project team
+// Copyright (C) 2016 Acts project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
@@ -9,7 +9,7 @@
 // STL include(s)
 #include <iomanip>
 
-// ACTS include(s)
+// Acts include(s)
 #include "Acts/EventData/TrackParametersBase.hpp"
 
 namespace Acts {
diff --git a/Core/src/EventData/TransportJacobian.cpp b/Core/src/EventData/TransportJacobian.cpp
index bfd7329ba15cf505c705aa0ba0387c0d3b21e449..42653fe16283bcdb2feaca0833e6388fc7552175 100644
--- a/Core/src/EventData/TransportJacobian.cpp
+++ b/Core/src/EventData/TransportJacobian.cpp
@@ -1,13 +1,13 @@
-// This file is part of the ACTS project.
+// This file is part of the Acts project.
 //
-// Copyright (C) 2016 ACTS project team
+// Copyright (C) 2016 Acts project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
 // file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 ///////////////////////////////////////////////////////////////////
-// TransportJacobian.cpp, ACTS project
+// TransportJacobian.cpp, Acts project
 ///////////////////////////////////////////////////////////////////
 
 #include "Acts/EventData/TransportJacobian.hpp"
diff --git a/Core/src/GeometryUtils/BinUtility.cpp b/Core/src/GeometryUtils/BinUtility.cpp
index 0bdd145658f6f2b1f12b217bb05999bc3f7efc24..c1e83669d0f842d9e7259346dd88b3f416bf924d 100644
--- a/Core/src/GeometryUtils/BinUtility.cpp
+++ b/Core/src/GeometryUtils/BinUtility.cpp
@@ -1,13 +1,13 @@
-// This file is part of the ACTS project.
+// This file is part of the Acts project.
 //
-// Copyright (C) 2016 ACTS project team
+// Copyright (C) 2016 Acts project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
 // file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 ///////////////////////////////////////////////////////////////////
-// BinUtility.cpp, ACTS project
+// BinUtility.cpp, Acts project
 ///////////////////////////////////////////////////////////////////
 
 // Trk
diff --git a/Core/src/GeometryUtils/GeometryID.cpp b/Core/src/GeometryUtils/GeometryID.cpp
index 7800ad9ce2abbf4cc26b0ef30b3fc1a84c40d9e5..dd48ff234c0583009e521e754ef26b6bed9cd5cf 100644
--- a/Core/src/GeometryUtils/GeometryID.cpp
+++ b/Core/src/GeometryUtils/GeometryID.cpp
@@ -1,13 +1,13 @@
-// This file is part of the ACTS project.
+// This file is part of the Acts project.
 //
-// Copyright (C) 2016 ACTS project team
+// Copyright (C) 2016 Acts project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
 // file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 ///////////////////////////////////////////////////////////////////
-// GeometryIDCalculator.cpp, ACTS project
+// GeometryIDCalculator.cpp, Acts project
 ///////////////////////////////////////////////////////////////////
 
 #include "Acts/Utilities/GeometryID.hpp"
diff --git a/Core/src/Layers/ConeLayer.cpp b/Core/src/Layers/ConeLayer.cpp
index d468a5dc25b9625198d5dcf7e66c100e6c6d26f6..aa232b09a1593feeba3bb86181919e687cbd6000 100644
--- a/Core/src/Layers/ConeLayer.cpp
+++ b/Core/src/Layers/ConeLayer.cpp
@@ -1,13 +1,13 @@
-// This file is part of the ACTS project.
+// This file is part of the Acts project.
 //
-// Copyright (C) 2016-2017 ACTS project team
+// Copyright (C) 2016-2017 Acts project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
 // file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 ///////////////////////////////////////////////////////////////////
-// ConeLayer.cpp, ACTS project
+// ConeLayer.cpp, Acts project
 ///////////////////////////////////////////////////////////////////
 
 #include "Acts/Layers/ConeLayer.hpp"
diff --git a/Core/src/Layers/CylinderLayer.cpp b/Core/src/Layers/CylinderLayer.cpp
index 7266194be628a64f78a25b7c6e73a3fa5d9ef234..51c1b0f7840e427cba3c55f2e5512726c74a3fdc 100644
--- a/Core/src/Layers/CylinderLayer.cpp
+++ b/Core/src/Layers/CylinderLayer.cpp
@@ -1,13 +1,13 @@
-// This file is part of the ACTS project.
+// This file is part of the Acts project.
 //
-// Copyright (C) 2016-2017 ACTS project team
+// Copyright (C) 2016-2017 Acts project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
 // file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 ///////////////////////////////////////////////////////////////////
-// CylinderLayer.cpp, ACTS project
+// CylinderLayer.cpp, Acts project
 ///////////////////////////////////////////////////////////////////
 
 #include "Acts/Layers/CylinderLayer.hpp"
diff --git a/Core/src/Layers/DiscLayer.cpp b/Core/src/Layers/DiscLayer.cpp
index a970ffcd8618508127232ccf9e58809ad7454b1e..9e6179165452ad1539ac2d4df1756dc4b5bbe174 100644
--- a/Core/src/Layers/DiscLayer.cpp
+++ b/Core/src/Layers/DiscLayer.cpp
@@ -1,13 +1,13 @@
-// This file is part of the ACTS project.
+// This file is part of the Acts project.
 //
-// Copyright (C) 2016-2017 ACTS project team
+// Copyright (C) 2016-2017 Acts project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
 // file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 ///////////////////////////////////////////////////////////////////
-// DiscLayer.cpp, ACTS project
+// DiscLayer.cpp, Acts project
 ///////////////////////////////////////////////////////////////////
 
 #include "Acts/Layers/DiscLayer.hpp"
diff --git a/Core/src/Layers/Layer.cpp b/Core/src/Layers/Layer.cpp
index 3c1cb2fc812f790249080ea5331ae6bb8b2b432f..0c01bbe33bb0a870aada93c9faf18123157f3674 100644
--- a/Core/src/Layers/Layer.cpp
+++ b/Core/src/Layers/Layer.cpp
@@ -1,13 +1,13 @@
-// This file is part of the ACTS project.
+// This file is part of the Acts project.
 //
-// Copyright (C) 2016-2017 ACTS project team
+// Copyright (C) 2016-2017 Acts project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
 // file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 ///////////////////////////////////////////////////////////////////
-// Layer.cpp, ACTS project
+// Layer.cpp, Acts project
 ///////////////////////////////////////////////////////////////////
 
 // Geometry module
diff --git a/Core/src/Layers/NavigationLayer.cpp b/Core/src/Layers/NavigationLayer.cpp
index 5c91d9e817a13f9c9680418e9647f81f2396d720..f3faad9714ec8af11bec79324c2cfee453efd76c 100644
--- a/Core/src/Layers/NavigationLayer.cpp
+++ b/Core/src/Layers/NavigationLayer.cpp
@@ -1,13 +1,13 @@
-// This file is part of the ACTS project.
+// This file is part of the Acts project.
 //
-// Copyright (C) 2016-2017 ACTS project team
+// Copyright (C) 2016-2017 Acts project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
 // file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 ///////////////////////////////////////////////////////////////////
-// NavigationLayer.cpp, ACTS project
+// NavigationLayer.cpp, Acts project
 ///////////////////////////////////////////////////////////////////
 
 #include "Acts/Layers/NavigationLayer.hpp"
diff --git a/Core/src/Layers/PlaneLayer.cpp b/Core/src/Layers/PlaneLayer.cpp
index b88f67dbd6342e21c542e793ca0ef1d4eff1d373..da9c1cd9b55ce9a17e2891b38daa1e94a28218e3 100644
--- a/Core/src/Layers/PlaneLayer.cpp
+++ b/Core/src/Layers/PlaneLayer.cpp
@@ -1,13 +1,13 @@
-// This file is part of the ACTS project.
+// This file is part of the Acts project.
 //
-// Copyright (C) 2016-2017 ACTS project team
+// Copyright (C) 2016-2017 Acts project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
 // file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 ///////////////////////////////////////////////////////////////////
-// PlaneLayer.cpp, ACTS project
+// PlaneLayer.cpp, Acts project
 ///////////////////////////////////////////////////////////////////
 
 // Geometry module
diff --git a/Core/src/Layers/ProtoLayer.cpp b/Core/src/Layers/ProtoLayer.cpp
index 4d5d9cb0406bedbb154f8468ac431e209e723bee..a9400b21fc5a2fbd25a56e8310d4bf255f028eae 100644
--- a/Core/src/Layers/ProtoLayer.cpp
+++ b/Core/src/Layers/ProtoLayer.cpp
@@ -1,6 +1,6 @@
-// This file is part of the ACTS project.
+// This file is part of the Acts project.
 //
-// Copyright (C) 2018 ACTS project team
+// Copyright (C) 2018 Acts project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/Core/src/Material/BinnedSurfaceMaterial.cpp b/Core/src/Material/BinnedSurfaceMaterial.cpp
index ff59e22923407d6b35d306f0f8a1d286a127ad4c..efbe950e05433e240fb63dc838ff58514c238b94 100644
--- a/Core/src/Material/BinnedSurfaceMaterial.cpp
+++ b/Core/src/Material/BinnedSurfaceMaterial.cpp
@@ -1,13 +1,13 @@
-// This file is part of the ACTS project.
+// This file is part of the Acts project.
 //
-// Copyright (C) 2016-2017 ACTS project team
+// Copyright (C) 2016-2017 Acts project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
 // file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 ///////////////////////////////////////////////////////////////////
-// BinnedSurfaceMaterial.cpp, ACTS project
+// BinnedSurfaceMaterial.cpp, Acts project
 ///////////////////////////////////////////////////////////////////
 
 #include "Acts/Material/BinnedSurfaceMaterial.hpp"
diff --git a/Core/src/Material/HomogeneousSurfaceMaterial.cpp b/Core/src/Material/HomogeneousSurfaceMaterial.cpp
index 312e0649fcbefbcaa6f2a3827061fe0ba77ae8c4..88e309973d869e2f2ae73112feb19233d122ce7c 100644
--- a/Core/src/Material/HomogeneousSurfaceMaterial.cpp
+++ b/Core/src/Material/HomogeneousSurfaceMaterial.cpp
@@ -1,13 +1,13 @@
-// This file is part of the ACTS project.
+// This file is part of the Acts project.
 //
-// Copyright (C) 2016-2017 ACTS project team
+// Copyright (C) 2016-2017 Acts project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
 // file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 ///////////////////////////////////////////////////////////////////
-// HomogeneousSurfaceMaterial.cpp, ACTS project
+// HomogeneousSurfaceMaterial.cpp, Acts project
 ///////////////////////////////////////////////////////////////////
 
 #include "Acts/Material/HomogeneousSurfaceMaterial.hpp"
diff --git a/Core/src/Material/MaterialProperties.cpp b/Core/src/Material/MaterialProperties.cpp
index 91888faf187f428030f015db5afbda806fd81a6d..5d2685be551a3f94a91dddf9f6ee9aafa786cddf 100644
--- a/Core/src/Material/MaterialProperties.cpp
+++ b/Core/src/Material/MaterialProperties.cpp
@@ -1,13 +1,13 @@
-// This file is part of the ACTS project.
+// This file is part of the Acts project.
 //
-// Copyright (C) 2016-2017 ACTS project team
+// Copyright (C) 2016-2017 Acts project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
 // file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 ///////////////////////////////////////////////////////////////////
-// MaterialProperties.cpp, ACTS project
+// MaterialProperties.cpp, Acts project
 ///////////////////////////////////////////////////////////////////
 
 #include "Acts/Material/MaterialProperties.hpp"
diff --git a/Core/src/Material/SurfaceMaterialProxy.cpp b/Core/src/Material/SurfaceMaterialProxy.cpp
index 4cc167f2b8fe3ea23d392c2848d7be3fb257b23d..3129b0757a43b1822c6492b1413dc09333c6e8b7 100644
--- a/Core/src/Material/SurfaceMaterialProxy.cpp
+++ b/Core/src/Material/SurfaceMaterialProxy.cpp
@@ -1,13 +1,13 @@
-// This file is part of the ACTS project.
+// This file is part of the Acts project.
 //
-// Copyright (C) 2016-2017 ACTS project team
+// Copyright (C) 2016-2017 Acts project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
 // file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 ///////////////////////////////////////////////////////////////////
-// SurfaceMaterialProxy.cpp, ACTS project
+// SurfaceMaterialProxy.cpp, Acts project
 ///////////////////////////////////////////////////////////////////
 
 #include "Acts/Material/SurfaceMaterialProxy.hpp"
diff --git a/Core/src/Surfaces/ConeBounds.cpp b/Core/src/Surfaces/ConeBounds.cpp
index 438bbfb3b25e72d4a74ef6f137414c1be6922575..588ed11f3427d918982c591c4ae958b59ebd3421 100644
--- a/Core/src/Surfaces/ConeBounds.cpp
+++ b/Core/src/Surfaces/ConeBounds.cpp
@@ -1,13 +1,13 @@
-// This file is part of the ACTS project.
+// This file is part of the Acts project.
 //
-// Copyright (C) 2016-2017 ACTS project team
+// Copyright (C) 2016-2017 Acts project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
 // file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 ///////////////////////////////////////////////////////////////////
-// ConeBounds.cpp, ACTS project
+// ConeBounds.cpp, Acts project
 ///////////////////////////////////////////////////////////////////
 
 #include "Acts/Surfaces/ConeBounds.hpp"
diff --git a/Core/src/Surfaces/ConeSurface.cpp b/Core/src/Surfaces/ConeSurface.cpp
index 50f6752fa019368403fa05703aadc11accf19b82..1a45b3e505d8c33643b1bc07a5739a43c1a8a90a 100644
--- a/Core/src/Surfaces/ConeSurface.cpp
+++ b/Core/src/Surfaces/ConeSurface.cpp
@@ -1,13 +1,13 @@
-// This file is part of the ACTS project.
+// This file is part of the Acts project.
 //
-// Copyright (C) 2016-2018 ACTS project team
+// Copyright (C) 2016-2018 Acts project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
 // file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 ///////////////////////////////////////////////////////////////////
-// ConeSurface.cpp, ACTS project
+// ConeSurface.cpp, Acts project
 ///////////////////////////////////////////////////////////////////
 
 #include "Acts/Surfaces/ConeSurface.hpp"
diff --git a/Core/src/Surfaces/CylinderBounds.cpp b/Core/src/Surfaces/CylinderBounds.cpp
index 9e5e9c09b77be5610c87992c3fb4176fbd944795..76be0e1f10fdeb1ee1fec8ccb9a6ab8d7fb30f9c 100644
--- a/Core/src/Surfaces/CylinderBounds.cpp
+++ b/Core/src/Surfaces/CylinderBounds.cpp
@@ -1,13 +1,13 @@
-// This file is part of the ACTS project.
+// This file is part of the Acts project.
 //
-// Copyright (C) 2016-2017 ACTS project team
+// Copyright (C) 2016-2017 Acts project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
 // file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 ///////////////////////////////////////////////////////////////////
-// CylinderBounds.cpp, ACTS project
+// CylinderBounds.cpp, Acts project
 ///////////////////////////////////////////////////////////////////
 
 #include "Acts/Surfaces/CylinderBounds.hpp"
diff --git a/Core/src/Surfaces/CylinderSurface.cpp b/Core/src/Surfaces/CylinderSurface.cpp
index 6903d220fa97162e8ceb8ccd1857bff3b8a22118..2b19cc00c0e6a0738db85e7370bc221b9bcd0136 100644
--- a/Core/src/Surfaces/CylinderSurface.cpp
+++ b/Core/src/Surfaces/CylinderSurface.cpp
@@ -1,13 +1,13 @@
-// This file is part of the ACTS project.
+// This file is part of the Acts project.
 //
-// Copyright (C) 2016-2018 ACTS project team
+// Copyright (C) 2016-2018 Acts project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
 // file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 ///////////////////////////////////////////////////////////////////
-// CylinderSurface.cpp, ACTS project
+// CylinderSurface.cpp, Acts project
 ///////////////////////////////////////////////////////////////////
 
 #include "Acts/Surfaces/CylinderSurface.hpp"
diff --git a/Core/src/Surfaces/DiamondBounds.cpp b/Core/src/Surfaces/DiamondBounds.cpp
index 47c8568f49cd619ac7eff323c19641abf05c67be..a75f0345abe9b205f5b5a283e9619704073babb9 100644
--- a/Core/src/Surfaces/DiamondBounds.cpp
+++ b/Core/src/Surfaces/DiamondBounds.cpp
@@ -1,13 +1,13 @@
-// This file is part of the ACTS project.
+// This file is part of the Acts project.
 //
-// Copyright (C) 2016-2018 ACTS project team
+// Copyright (C) 2016-2018 Acts project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
 // file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 ///////////////////////////////////////////////////////////////////
-// DiamondBounds.cpp, ACTS project
+// DiamondBounds.cpp, Acts project
 ///////////////////////////////////////////////////////////////////
 
 #include "Acts/Surfaces/DiamondBounds.hpp"
diff --git a/Core/src/Surfaces/DiscSurface.cpp b/Core/src/Surfaces/DiscSurface.cpp
index 955abb1d5139c6866a56b12e457d99af4ccbf02f..09ce47db7938101f73f2e0bf2916d7ecf1913cc1 100644
--- a/Core/src/Surfaces/DiscSurface.cpp
+++ b/Core/src/Surfaces/DiscSurface.cpp
@@ -1,13 +1,13 @@
-// This file is part of the ACTS project.
+// This file is part of the Acts project.
 //
-// Copyright (C) 2016-2018 ACTS project team
+// Copyright (C) 2016-2018 Acts project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
 // file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 ///////////////////////////////////////////////////////////////////
-// DiscSurface.cpp, ACTS project
+// DiscSurface.cpp, Acts project
 ///////////////////////////////////////////////////////////////////
 
 #include "Acts/Surfaces/DiscSurface.hpp"
diff --git a/Core/src/Surfaces/DiscTrapezoidalBounds.cpp b/Core/src/Surfaces/DiscTrapezoidalBounds.cpp
index 2a550c217277ae5af9449ba44499c66cf1021f03..c7887466aed403e0de356fa7309bd82f0284b071 100644
--- a/Core/src/Surfaces/DiscTrapezoidalBounds.cpp
+++ b/Core/src/Surfaces/DiscTrapezoidalBounds.cpp
@@ -1,13 +1,13 @@
-// This file is part of the ACTS project.
+// This file is part of the Acts project.
 //
-// Copyright (C) 2016-2017 ACTS project team
+// Copyright (C) 2016-2017 Acts project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
 // file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 ///////////////////////////////////////////////////////////////////
-// DiscTrapezoidalBounds.cpp, ACTS project
+// DiscTrapezoidalBounds.cpp, Acts project
 ///////////////////////////////////////////////////////////////////
 
 #include "Acts/Surfaces/DiscTrapezoidalBounds.hpp"
diff --git a/Core/src/Surfaces/EllipseBounds.cpp b/Core/src/Surfaces/EllipseBounds.cpp
index 09f7dcbb092074fe61190bba8de20c97074a8dae..ef6a37ce5066ffa5c50d3a544bd69984c6c9f1ab 100644
--- a/Core/src/Surfaces/EllipseBounds.cpp
+++ b/Core/src/Surfaces/EllipseBounds.cpp
@@ -1,13 +1,13 @@
-// This file is part of the ACTS project.
+// This file is part of the Acts project.
 //
-// Copyright (C) 2016-2017 ACTS project team
+// Copyright (C) 2016-2017 Acts project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
 // file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 ///////////////////////////////////////////////////////////////////
-// EllipseBounds.cpp, ACTS project
+// EllipseBounds.cpp, Acts project
 ///////////////////////////////////////////////////////////////////
 
 #include "Acts/Surfaces/EllipseBounds.hpp"
diff --git a/Core/src/Surfaces/InfinitieBounds.cpp b/Core/src/Surfaces/InfinitieBounds.cpp
index c0c3d3e08ffcc48018833af343b67823de811fc2..a9930ab7a90e099f3975035748a57a2347afe118 100644
--- a/Core/src/Surfaces/InfinitieBounds.cpp
+++ b/Core/src/Surfaces/InfinitieBounds.cpp
@@ -1,6 +1,6 @@
-// This file is part of the ACTS project.
+// This file is part of the Acts project.
 //
-// Copyright (C) 2018 ACTS project team
+// Copyright (C) 2018 Acts project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/Core/src/Surfaces/LineBounds.cpp b/Core/src/Surfaces/LineBounds.cpp
index f1764f78be3c9a349477d09d0b2ad6b22fb1cb29..324343cc6959460348a46bde40724c45aa1e9a0b 100644
--- a/Core/src/Surfaces/LineBounds.cpp
+++ b/Core/src/Surfaces/LineBounds.cpp
@@ -1,13 +1,13 @@
-// This file is part of the ACTS project.
+// This file is part of the Acts project.
 //
-// Copyright (C) 2016-2017 ACTS project team
+// Copyright (C) 2016-2017 Acts project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
 // file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 ///////////////////////////////////////////////////////////////////
-// LineBounds.cpp, ACTS project
+// LineBounds.cpp, Acts project
 ///////////////////////////////////////////////////////////////////
 
 #include "Acts/Surfaces/LineBounds.hpp"
diff --git a/Core/src/Surfaces/LineSurface.cpp b/Core/src/Surfaces/LineSurface.cpp
index 209bfb98c23eefe36cc35ee2482336c993f6e7db..a662ae5f77e5e620f133aa6c60f52ec554ef561f 100644
--- a/Core/src/Surfaces/LineSurface.cpp
+++ b/Core/src/Surfaces/LineSurface.cpp
@@ -1,13 +1,13 @@
-// This file is part of the ACTS project.
+// This file is part of the Acts project.
 //
-// Copyright (C) 2016-2018 ACTS project team
+// Copyright (C) 2016-2018 Acts project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
 // file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 ///////////////////////////////////////////////////////////////////
-// LineSurface.cpp, ACTS project
+// LineSurface.cpp, Acts project
 ///////////////////////////////////////////////////////////////////
 
 #include "Acts/Surfaces/LineSurface.hpp"
diff --git a/Core/src/Surfaces/PerigeeSurface.cpp b/Core/src/Surfaces/PerigeeSurface.cpp
index e885857d5674c538a00886f2b60c8b41b8a1adc5..bc158cbd0b3a762e9392923aa38fab5faa007ac4 100644
--- a/Core/src/Surfaces/PerigeeSurface.cpp
+++ b/Core/src/Surfaces/PerigeeSurface.cpp
@@ -1,13 +1,13 @@
-// This file is part of the ACTS project.
+// This file is part of the Acts project.
 //
-// Copyright (C) 2016-2018 ACTS project team
+// Copyright (C) 2016-2018 Acts project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
 // file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 /////////////////////////////////////////////////////////////////
-// PerigeeSurface.cpp, ACTS project
+// PerigeeSurface.cpp, Acts project
 ///////////////////////////////////////////////////////////////////
 
 #include "Acts/Surfaces/PerigeeSurface.hpp"
diff --git a/Core/src/Surfaces/PlaneSurface.cpp b/Core/src/Surfaces/PlaneSurface.cpp
index a3e580109473731464264e65f5a2288f75f936d1..5966f684eaa147810d278798f230df9d9b746abc 100644
--- a/Core/src/Surfaces/PlaneSurface.cpp
+++ b/Core/src/Surfaces/PlaneSurface.cpp
@@ -1,13 +1,13 @@
-// This file is part of the ACTS project.
+// This file is part of the Acts project.
 //
-// Copyright (C) 2016-2018 ACTS project team
+// Copyright (C) 2016-2018 Acts project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
 // file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 ///////////////////////////////////////////////////////////////////
-// PlaneSurface.cpp, ACTS project
+// PlaneSurface.cpp, Acts project
 ///////////////////////////////////////////////////////////////////
 
 #include "Acts/Surfaces/PlaneSurface.hpp"
diff --git a/Core/src/Surfaces/RadialBounds.cpp b/Core/src/Surfaces/RadialBounds.cpp
index 2bf39e36e2052ebade7347ca0e78e9743bcca5ba..8def3a1cf8b1ffc6a8539d500b2bc84da55e11ea 100644
--- a/Core/src/Surfaces/RadialBounds.cpp
+++ b/Core/src/Surfaces/RadialBounds.cpp
@@ -1,13 +1,13 @@
-// This file is part of the ACTS project.
+// This file is part of the Acts project.
 //
-// Copyright (C) 2016-2017 ACTS project team
+// Copyright (C) 2016-2017 Acts project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
 // file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 ///////////////////////////////////////////////////////////////////
-// RadialBounds.cpp, ACTS project
+// RadialBounds.cpp, Acts project
 ///////////////////////////////////////////////////////////////////
 
 #include "Acts/Surfaces/RadialBounds.hpp"
diff --git a/Core/src/Surfaces/RectangleBounds.cpp b/Core/src/Surfaces/RectangleBounds.cpp
index cd4c0c0f1374d8bac09f7e711cf94342f0fef2a3..6621628898ba0b5834e791666541eed7ab6a7418 100644
--- a/Core/src/Surfaces/RectangleBounds.cpp
+++ b/Core/src/Surfaces/RectangleBounds.cpp
@@ -1,13 +1,13 @@
-// This file is part of the ACTS project.
+// This file is part of the Acts project.
 //
-// Copyright (C) 2016-2017 ACTS project team
+// Copyright (C) 2016-2017 Acts project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
 // file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 ///////////////////////////////////////////////////////////////////
-// RectangleBounds.cpp, ACTS project
+// RectangleBounds.cpp, Acts project
 ///////////////////////////////////////////////////////////////////
 
 #include "Acts/Surfaces/RectangleBounds.hpp"
diff --git a/Core/src/Surfaces/StrawSurface.cpp b/Core/src/Surfaces/StrawSurface.cpp
index bea3f2e48a6fefe8dd27520a057e52f2e6c17f2f..6e61a3dfc192170c2aba686c5deee042ebec1940 100644
--- a/Core/src/Surfaces/StrawSurface.cpp
+++ b/Core/src/Surfaces/StrawSurface.cpp
@@ -1,13 +1,13 @@
-// This file is part of the ACTS project.
+// This file is part of the Acts project.
 //
-// Copyright (C) 2016-2018 ACTS project team
+// Copyright (C) 2016-2018 Acts project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
 // file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 ///////////////////////////////////////////////////////////////////
-// StrawSurface.cpp, ACTS project
+// StrawSurface.cpp, Acts project
 ///////////////////////////////////////////////////////////////////
 
 #include "Acts/Surfaces/StrawSurface.hpp"
diff --git a/Core/src/Surfaces/Surface.cpp b/Core/src/Surfaces/Surface.cpp
index f887ecb24dd09eb522d39bf59795c58c904884ad..f2e789367f74d061c499ac80d0f7a0586d0d486c 100644
--- a/Core/src/Surfaces/Surface.cpp
+++ b/Core/src/Surfaces/Surface.cpp
@@ -1,13 +1,13 @@
-// This file is part of the ACTS project.
+// This file is part of the Acts project.
 //
-// Copyright (C) 2016-2017 ACTS project team
+// Copyright (C) 2016-2017 Acts project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
 // file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 ///////////////////////////////////////////////////////////////////
-// Surface.cpp, ACTS project
+// Surface.cpp, Acts project
 ///////////////////////////////////////////////////////////////////
 
 #include "Acts/Surfaces/Surface.hpp"
diff --git a/Core/src/Surfaces/SurfaceArray.cpp b/Core/src/Surfaces/SurfaceArray.cpp
index 1c80778585221507f0367f78757ad63ae13a2a46..a41e88e52c8b98321ab484b254518ac4e42bd220 100644
--- a/Core/src/Surfaces/SurfaceArray.cpp
+++ b/Core/src/Surfaces/SurfaceArray.cpp
@@ -1,6 +1,6 @@
-// This file is part of the ACTS project.
+// This file is part of the Acts project.
 //
-// Copyright (C) 2018 ACTS project team
+// Copyright (C) 2018 Acts project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/Core/src/Surfaces/TrapezoidBounds.cpp b/Core/src/Surfaces/TrapezoidBounds.cpp
index a664b990989f526ad529e275c3463fb725641b19..af5df3333dba4b8ca07fee47cc9d887ac4000743 100644
--- a/Core/src/Surfaces/TrapezoidBounds.cpp
+++ b/Core/src/Surfaces/TrapezoidBounds.cpp
@@ -1,13 +1,13 @@
-// This file is part of the ACTS project.
+// This file is part of the Acts project.
 //
-// Copyright (C) 2016-2017 ACTS project team
+// Copyright (C) 2016-2017 Acts project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
 // file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 ///////////////////////////////////////////////////////////////////
-// TrapezoidBounds.cpp, ACTS project
+// TrapezoidBounds.cpp, Acts project
 ///////////////////////////////////////////////////////////////////
 
 #include "Acts/Surfaces/TrapezoidBounds.hpp"
diff --git a/Core/src/Surfaces/TriangleBounds.cpp b/Core/src/Surfaces/TriangleBounds.cpp
index 846bae3e1d6a492c310ff0b4503a50406f7f0b67..1740900bce1948afe44d0bbd0725a657b0bea0cb 100644
--- a/Core/src/Surfaces/TriangleBounds.cpp
+++ b/Core/src/Surfaces/TriangleBounds.cpp
@@ -1,13 +1,13 @@
-// This file is part of the ACTS project.
+// This file is part of the Acts project.
 //
-// Copyright (C) 2016-2017 ACTS project team
+// Copyright (C) 2016-2017 Acts project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
 // file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 ///////////////////////////////////////////////////////////////////
-// TriangleBounds.cpp, ACTS project
+// TriangleBounds.cpp, Acts project
 ///////////////////////////////////////////////////////////////////
 
 #include "Acts/Surfaces/TriangleBounds.hpp"
diff --git a/Core/src/Tools/CylinderVolumeBuilder.cpp b/Core/src/Tools/CylinderVolumeBuilder.cpp
index f4abbea26032f8ad240779f0fc31970537358f63..53c26d2ae0bfce9f8171ce68bc724bcbe70d4b91 100644
--- a/Core/src/Tools/CylinderVolumeBuilder.cpp
+++ b/Core/src/Tools/CylinderVolumeBuilder.cpp
@@ -1,13 +1,13 @@
-// This file is part of the ACTS project.
+// This file is part of the Acts project.
 //
-// Copyright (C) 2016-2017 ACTS project team
+// Copyright (C) 2016-2017 Acts project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
 // file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 ///////////////////////////////////////////////////////////////////
-// CylinderVolumeBuilder.cpp, ACTS project
+// CylinderVolumeBuilder.cpp, Acts project
 ///////////////////////////////////////////////////////////////////
 
 #include "Acts/Tools/CylinderVolumeBuilder.hpp"
diff --git a/Core/src/Tools/CylinderVolumeHelper.cpp b/Core/src/Tools/CylinderVolumeHelper.cpp
index 4b201bc3cae5a1de4f1ec7c9472d888bd025309d..a9722060f7f0b86062355fb38ffeb387366f2e50 100644
--- a/Core/src/Tools/CylinderVolumeHelper.cpp
+++ b/Core/src/Tools/CylinderVolumeHelper.cpp
@@ -1,13 +1,13 @@
-// This file is part of the ACTS project.
+// This file is part of the Acts project.
 //
-// Copyright (C) 2016-2018 ACTS project team
+// Copyright (C) 2016-2018 Acts project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
 // file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 ///////////////////////////////////////////////////////////////////
-// CylinderVolumeHelper.cpp, ACTS project
+// CylinderVolumeHelper.cpp, Acts project
 ///////////////////////////////////////////////////////////////////
 
 #include "Acts/Tools/CylinderVolumeHelper.hpp"
diff --git a/Core/src/Tools/LayerArrayCreator.cpp b/Core/src/Tools/LayerArrayCreator.cpp
index 33368dd7964429affbbf904759094fc746eb42c1..82cd9876873076be5f9aca33191d43113a91f0b1 100644
--- a/Core/src/Tools/LayerArrayCreator.cpp
+++ b/Core/src/Tools/LayerArrayCreator.cpp
@@ -1,13 +1,13 @@
-// This file is part of the ACTS project.
+// This file is part of the Acts project.
 //
-// Copyright (C) 2016-2017 ACTS project team
+// Copyright (C) 2016-2017 Acts project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
 // file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 ///////////////////////////////////////////////////////////////////
-// LayerArrayCreator.cpp, ACTS project
+// LayerArrayCreator.cpp, Acts project
 ///////////////////////////////////////////////////////////////////
 
 #include "Acts/Tools/LayerArrayCreator.hpp"
diff --git a/Core/src/Tools/LayerCreator.cpp b/Core/src/Tools/LayerCreator.cpp
index 6cd6d651157cda29007bfe19acd6433242b29154..d7bad8a936ae7913d1c2cdd6a956861045ed950f 100644
--- a/Core/src/Tools/LayerCreator.cpp
+++ b/Core/src/Tools/LayerCreator.cpp
@@ -1,13 +1,13 @@
-// This file is part of the ACTS project.
+// This file is part of the Acts project.
 //
-// Copyright (C) 2016-2018 ACTS project team
+// Copyright (C) 2016-2018 Acts project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
 // file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 ///////////////////////////////////////////////////////////////////
-// LayerCreator.cpp, ACTS project
+// LayerCreator.cpp, Acts project
 ///////////////////////////////////////////////////////////////////
 
 #include "Acts/Tools/LayerCreator.hpp"
diff --git a/Core/src/Tools/PassiveLayerBuilder.cpp b/Core/src/Tools/PassiveLayerBuilder.cpp
index ed745cf0a01bdc2c5444886015ff3d3da67a6391..d7a0c0198a9fe610c25baaac1969dc72cb044626 100644
--- a/Core/src/Tools/PassiveLayerBuilder.cpp
+++ b/Core/src/Tools/PassiveLayerBuilder.cpp
@@ -1,13 +1,13 @@
-// This file is part of the ACTS project.
+// This file is part of the Acts project.
 //
-// Copyright (C) 2016-2017 ACTS project team
+// Copyright (C) 2016-2017 Acts project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
 // file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 ///////////////////////////////////////////////////////////////////
-// PassiveLayerBuilder.cpp, ACTS project
+// PassiveLayerBuilder.cpp, Acts project
 ///////////////////////////////////////////////////////////////////
 
 #include "Acts/Tools/PassiveLayerBuilder.hpp"
diff --git a/Core/src/Tools/SurfaceArrayCreator.cpp b/Core/src/Tools/SurfaceArrayCreator.cpp
index d9ea9ed5d2cd6cab9d589b238a156026a8962079..9b6c0480df9bf717aa5d857e2a13073faf6a44d1 100644
--- a/Core/src/Tools/SurfaceArrayCreator.cpp
+++ b/Core/src/Tools/SurfaceArrayCreator.cpp
@@ -1,13 +1,13 @@
-// This file is part of the ACTS project.
+// This file is part of the Acts project.
 //
-// Copyright (C) 2016-2018 ACTS project team
+// Copyright (C) 2016-2018 Acts project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
 // file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 ///////////////////////////////////////////////////////////////////
-// SurfaceArrayCreator.cpp, ACTS project
+// SurfaceArrayCreator.cpp, Acts project
 ///////////////////////////////////////////////////////////////////
 
 #include "Acts/Tools/SurfaceArrayCreator.hpp"
diff --git a/Core/src/Tools/TrackingGeometryBuilder.cpp b/Core/src/Tools/TrackingGeometryBuilder.cpp
index 80726274850e13b4a20456864f2e74ff0b7e239d..44da6409d8791ec6c92b5ae7a5fa6ea787f26395 100644
--- a/Core/src/Tools/TrackingGeometryBuilder.cpp
+++ b/Core/src/Tools/TrackingGeometryBuilder.cpp
@@ -1,13 +1,13 @@
-// This file is part of the ACTS project.
+// This file is part of the Acts project.
 //
-// Copyright (C) 2016-2017 ACTS project team
+// Copyright (C) 2016-2017 Acts project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
 // file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 ///////////////////////////////////////////////////////////////////
-// TrackingGeometryBuilder.cpp, ACTS project
+// TrackingGeometryBuilder.cpp, Acts project
 ///////////////////////////////////////////////////////////////////
 
 #include "Acts/Tools/TrackingGeometryBuilder.hpp"
diff --git a/Core/src/Tools/TrackingVolumeArrayCreator.cpp b/Core/src/Tools/TrackingVolumeArrayCreator.cpp
index 86050b13dcc371b40fc0888ad7b54e487a7cc501..44cba3e2bbcb282112d53ca7b4df7395d3d93563 100644
--- a/Core/src/Tools/TrackingVolumeArrayCreator.cpp
+++ b/Core/src/Tools/TrackingVolumeArrayCreator.cpp
@@ -1,13 +1,13 @@
-// This file is part of the ACTS project.
+// This file is part of the Acts project.
 //
-// Copyright (C) 2016-2017 ACTS project team
+// Copyright (C) 2016-2017 Acts project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
 // file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 ///////////////////////////////////////////////////////////////////
-// TrackingVolumeArrayCreator.cpp, ACTS project
+// TrackingVolumeArrayCreator.cpp, Acts project
 ///////////////////////////////////////////////////////////////////
 
 #include "Acts/Tools/TrackingVolumeArrayCreator.hpp"
diff --git a/Core/src/Utilities/BFieldMapUtils.cpp b/Core/src/Utilities/BFieldMapUtils.cpp
index 68760bc2f65d7e98a6596dac4b849030ad44ddc5..fd60aa95277d0d1665ee04c7ea984158287b8361 100644
--- a/Core/src/Utilities/BFieldMapUtils.cpp
+++ b/Core/src/Utilities/BFieldMapUtils.cpp
@@ -1,6 +1,6 @@
-// This file is part of the ACTS project.
+// This file is part of the Acts project.
 //
-// Copyright (C) 2017-2018 ACTS project team
+// Copyright (C) 2017-2018 Acts project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/Core/src/Utilities/Logger.cpp b/Core/src/Utilities/Logger.cpp
index a212ae24f32cc74eb073cc7cc5b44292808e8be1..7cb68d7382f9ee6dddfb819027120b7e80235f15 100644
--- a/Core/src/Utilities/Logger.cpp
+++ b/Core/src/Utilities/Logger.cpp
@@ -1,6 +1,6 @@
-// This file is part of the ACTS project.
+// This file is part of the Acts project.
 //
-// Copyright (C) 2016-2017 ACTS project team
+// Copyright (C) 2016-2017 Acts project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/Core/src/Utilities/MaterialInteraction.cpp b/Core/src/Utilities/MaterialInteraction.cpp
index e29b9994af3ed03fdbc2b8ca26fb2a3ce2f91ff6..c46583a5c061828a45ff74c0412b698820f16874 100644
--- a/Core/src/Utilities/MaterialInteraction.cpp
+++ b/Core/src/Utilities/MaterialInteraction.cpp
@@ -1,6 +1,6 @@
-// This file is part of the ACTS project.
+// This file is part of the Acts project.
 //
-// Copyright (C) 2017 ACTS project team
+// Copyright (C) 2017 Acts project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/Core/src/Utilities/Units.cpp b/Core/src/Utilities/Units.cpp
index bde5296f63f8881d83c51c4b09723fbecd6f39a1..d1e70a0059371d17018b69251c20b564b1e5e11d 100644
--- a/Core/src/Utilities/Units.cpp
+++ b/Core/src/Utilities/Units.cpp
@@ -1,6 +1,6 @@
-// This file is part of the ACTS project.
+// This file is part of the Acts project.
 //
-// Copyright (C) 2016 ACTS project team
+// Copyright (C) 2016 Acts project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/Core/src/Volumes/AbstractVolume.cpp b/Core/src/Volumes/AbstractVolume.cpp
index ea1a4f660e72fa5358c3711e77f7f1213b8ebcb4..4b86f1db9dd44b028795ba079dc8f7ba6eddaf05 100644
--- a/Core/src/Volumes/AbstractVolume.cpp
+++ b/Core/src/Volumes/AbstractVolume.cpp
@@ -1,13 +1,13 @@
-// This file is part of the ACTS project.
+// This file is part of the Acts project.
 //
-// Copyright (C) 2016-2017 ACTS project team
+// Copyright (C) 2016-2017 Acts project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
 // file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 ///////////////////////////////////////////////////////////////////
-// AbstractVolume.cpp, ACTS project
+// AbstractVolume.cpp, Acts project
 ///////////////////////////////////////////////////////////////////
 
 #include "Acts/Volumes/AbstractVolume.hpp"
diff --git a/Core/src/Volumes/CuboidVolumeBounds.cpp b/Core/src/Volumes/CuboidVolumeBounds.cpp
index 72e5953455b9975ff896ffff3450476ae9a9d391..dc872985498fd215c40352c8edba5b9b3ab62229 100644
--- a/Core/src/Volumes/CuboidVolumeBounds.cpp
+++ b/Core/src/Volumes/CuboidVolumeBounds.cpp
@@ -1,13 +1,13 @@
-// This file is part of the ACTS project.
+// This file is part of the Acts project.
 //
-// Copyright (C) 2016-2017 ACTS project team
+// Copyright (C) 2016-2017 Acts project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
 // file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 ///////////////////////////////////////////////////////////////////
-// CuboidVolumeBounds.cpp, ACTS project
+// CuboidVolumeBounds.cpp, Acts project
 ///////////////////////////////////////////////////////////////////
 
 #include "Acts/Volumes/CuboidVolumeBounds.hpp"
diff --git a/Core/src/Volumes/CylinderVolumeBounds.cpp b/Core/src/Volumes/CylinderVolumeBounds.cpp
index 9672c504ae1887f8b9b2ce48f9aa1c3084b5d06a..21dad7c46a37539623e89dd4d74fb44332232c9b 100644
--- a/Core/src/Volumes/CylinderVolumeBounds.cpp
+++ b/Core/src/Volumes/CylinderVolumeBounds.cpp
@@ -1,13 +1,13 @@
-// This file is part of the ACTS project.
+// This file is part of the Acts project.
 //
-// Copyright (C) 2016-2017 ACTS project team
+// Copyright (C) 2016-2017 Acts project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
 // file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 ///////////////////////////////////////////////////////////////////
-// CylinderVolumeBounds.cpp, ACTS project
+// CylinderVolumeBounds.cpp, Acts project
 ///////////////////////////////////////////////////////////////////
 
 #include "Acts/Volumes/CylinderVolumeBounds.hpp"
diff --git a/Core/src/Volumes/DoubleTrapezoidVolumeBounds.cpp b/Core/src/Volumes/DoubleTrapezoidVolumeBounds.cpp
index a357476dbe0bde7e2734734164c256a1ab3c4932..eca1331dd04df33dd638cb8235f418a586804738 100644
--- a/Core/src/Volumes/DoubleTrapezoidVolumeBounds.cpp
+++ b/Core/src/Volumes/DoubleTrapezoidVolumeBounds.cpp
@@ -1,13 +1,13 @@
-// This file is part of the ACTS project.
+// This file is part of the Acts project.
 //
-// Copyright (C) 2016-2017 ACTS project team
+// Copyright (C) 2016-2017 Acts project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
 // file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 ///////////////////////////////////////////////////////////////////
-// DoubleTrapezoidVolumeBounds.cpp, ACTS project
+// DoubleTrapezoidVolumeBounds.cpp, Acts project
 ///////////////////////////////////////////////////////////////////
 
 #include "Acts/Volumes/DoubleTrapezoidVolumeBounds.hpp"
diff --git a/Core/src/Volumes/TrapezoidVolumeBounds.cpp b/Core/src/Volumes/TrapezoidVolumeBounds.cpp
index 551f70d7f9eceea0ba828c5f06b856fb2f0ec507..ea05ae2eac78d9dc1e38093398620c4872f44b9a 100644
--- a/Core/src/Volumes/TrapezoidVolumeBounds.cpp
+++ b/Core/src/Volumes/TrapezoidVolumeBounds.cpp
@@ -1,13 +1,13 @@
-// This file is part of the ACTS project.
+// This file is part of the Acts project.
 //
-// Copyright (C) 2016-2017 ACTS project team
+// Copyright (C) 2016-2017 Acts project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
 // file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 ///////////////////////////////////////////////////////////////////
-// TrapezoidVolumeBounds.cpp, ACTS project
+// TrapezoidVolumeBounds.cpp, Acts project
 ///////////////////////////////////////////////////////////////////
 
 #include "Acts/Volumes/TrapezoidVolumeBounds.hpp"
diff --git a/Core/src/Volumes/Volume.cpp b/Core/src/Volumes/Volume.cpp
index b2e2e0b8853701f89a6dc191249800e1d7f4ffc8..eeeab4f5a8bd5d4a09b679e3a9acc33f24e7cf24 100644
--- a/Core/src/Volumes/Volume.cpp
+++ b/Core/src/Volumes/Volume.cpp
@@ -1,13 +1,13 @@
-// This file is part of the ACTS project.
+// This file is part of the Acts project.
 //
-// Copyright (C) 2016-2017 ACTS project team
+// Copyright (C) 2016-2017 Acts project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
 // file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 ///////////////////////////////////////////////////////////////////
-// Volume.cpp, ACTS project
+// Volume.cpp, Acts project
 ///////////////////////////////////////////////////////////////////
 
 #include "Acts/Volumes/Volume.hpp"
diff --git a/Core/src/Volumes/VolumeBounds.cpp b/Core/src/Volumes/VolumeBounds.cpp
index d8d0eb1110b77fa18337755fae01a41d6efc9ed7..1ce13295f1d1cc895c395067b4ddc358cc141c85 100644
--- a/Core/src/Volumes/VolumeBounds.cpp
+++ b/Core/src/Volumes/VolumeBounds.cpp
@@ -1,13 +1,13 @@
-// This file is part of the ACTS project.
+// This file is part of the Acts project.
 //
-// Copyright (C) 2016 ACTS project team
+// Copyright (C) 2016 Acts project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
 // file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 ///////////////////////////////////////////////////////////////////
-// VolumeBounds.cpp, ACTS project
+// VolumeBounds.cpp, Acts project
 ///////////////////////////////////////////////////////////////////
 
 #include "Acts/Volumes/VolumeBounds.hpp"
diff --git a/Examples/src/CustomDefaultLogger.cpp b/Examples/src/CustomDefaultLogger.cpp
index 7df33c9938fab76eaa85ebd64dc3f4aad9db0602..73de979011fb4e88742b4e7dbfa0ad74020a9675 100644
--- a/Examples/src/CustomDefaultLogger.cpp
+++ b/Examples/src/CustomDefaultLogger.cpp
@@ -1,6 +1,6 @@
-// This file is part of the ACTS project.
+// This file is part of the Acts project.
 //
-// Copyright (C) 2017-2018 ACTS project team
+// Copyright (C) 2017-2018 Acts project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
@@ -60,7 +60,7 @@ namespace Logging {
 /// @param [in] log_stream output stream used for printing debug messages
 ///
 /// This function returns a pointer to an alternative Logger instance to
-/// the default ACTS logger. This instance prints the log output mirrored
+/// the default Acts logger. This instance prints the log output mirrored
 /// from right to left.
 ///
 /// @return pointer to logging instance
diff --git a/IntegrationTests/ATLSeedingIntegrationTest.cpp b/IntegrationTests/ATLSeedingIntegrationTest.cpp
index e5ace5c324ee9271053e6b0535357c0c8d41c015..92dfcfcb8eae1b29efac17d2b87e5382e766be4e 100644
--- a/IntegrationTests/ATLSeedingIntegrationTest.cpp
+++ b/IntegrationTests/ATLSeedingIntegrationTest.cpp
@@ -1,6 +1,6 @@
-// This file is part of the ACTS project.
+// This file is part of the Acts project.
 //
-// Copyright (C) 2018 ACTS project team
+// Copyright (C) 2018 Acts project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/IntegrationTests/PropagationTestBase.hpp b/IntegrationTests/PropagationTestBase.hpp
index 5662960a98b66d05a8a82a55b633b4ebff0c47be..1227b6625f97a732ef29d1676470e5a5211a8341 100644
--- a/IntegrationTests/PropagationTestBase.hpp
+++ b/IntegrationTests/PropagationTestBase.hpp
@@ -1,6 +1,6 @@
-// This file is part of the ACTS project.
+// This file is part of the Acts project.
 //
-// Copyright (C) 2017-2018 ACTS project team
+// Copyright (C) 2017-2018 Acts project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/IntegrationTests/PropagationTestHelper.hpp b/IntegrationTests/PropagationTestHelper.hpp
index fc43e2acdbbf84a8d364397fa63dbd4db8ca81d8..b2a8c4147886b4545fc72910795bc7a145ae45c8 100644
--- a/IntegrationTests/PropagationTestHelper.hpp
+++ b/IntegrationTests/PropagationTestHelper.hpp
@@ -1,6 +1,6 @@
-// This file is part of the ACTS project.
+// This file is part of the Acts project.
 //
-// Copyright (C) 2017-2018 ACTS project team
+// Copyright (C) 2017-2018 Acts project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/IntegrationTests/PropagationTests.cpp b/IntegrationTests/PropagationTests.cpp
index 7e608d9612bfee504f82e43e2069cf78f8f3ae0e..b0ad445345e48525db35a43ff505126aebf6a194 100644
--- a/IntegrationTests/PropagationTests.cpp
+++ b/IntegrationTests/PropagationTests.cpp
@@ -1,6 +1,6 @@
-// This file is part of the ACTS project.
+// This file is part of the Acts project.
 //
-// Copyright (C) 2017-2018 ACTS project team
+// Copyright (C) 2017-2018 Acts project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/IntegrationTests/PropagationTestsAtlasField.cpp b/IntegrationTests/PropagationTestsAtlasField.cpp
index ca07a07b9d216fff3cb5d5592a0c7957a9b69e80..ed93a391899236917891d96de627a27561315ccd 100644
--- a/IntegrationTests/PropagationTestsAtlasField.cpp
+++ b/IntegrationTests/PropagationTestsAtlasField.cpp
@@ -1,6 +1,6 @@
-// This file is part of the ACTS project.
+// This file is part of the Acts project.
 //
-// Copyright (C) 2017 ACTS project team
+// Copyright (C) 2017 Acts project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/IntegrationTests/covariance_validation_fixture.hpp b/IntegrationTests/covariance_validation_fixture.hpp
index b064f7768b1dbda6daf2b118edd616fd69d6c6cd..a1b39822a97d93eb222396a61eca98fea03694d8 100644
--- a/IntegrationTests/covariance_validation_fixture.hpp
+++ b/IntegrationTests/covariance_validation_fixture.hpp
@@ -1,6 +1,6 @@
-// This file is part of the ACTS project.
+// This file is part of the Acts project.
 //
-// Copyright (C) 2017-2018 ACTS project team
+// Copyright (C) 2017-2018 Acts project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/Legacy/include/Acts/Extrapolation/ExtrapolationCell.hpp b/Legacy/include/Acts/Extrapolation/ExtrapolationCell.hpp
index 254f970d71d5e0a484f391caa9d8a9b0945a5126..d04147908306ca7fbe6167c81c59b002ce666fc8 100644
--- a/Legacy/include/Acts/Extrapolation/ExtrapolationCell.hpp
+++ b/Legacy/include/Acts/Extrapolation/ExtrapolationCell.hpp
@@ -1,13 +1,13 @@
-// This file is part of the ACTS project.
+// This file is part of the Acts project.
 //
-// Copyright (C) 2016-2017 ACTS project team
+// Copyright (C) 2016-2017 Acts project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
 // file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 ///////////////////////////////////////////////////////////////////
-// ExtrapolationCell.h, ACTS project
+// ExtrapolationCell.h, Acts project
 ///////////////////////////////////////////////////////////////////
 
 #pragma once
diff --git a/Legacy/include/Acts/Extrapolation/ExtrapolationEngine.hpp b/Legacy/include/Acts/Extrapolation/ExtrapolationEngine.hpp
index 8349cdc8b089e60d1d82e867704e5c8df69219dc..a2d88ec74914a666ad9491d0e61c00dea63cda46 100644
--- a/Legacy/include/Acts/Extrapolation/ExtrapolationEngine.hpp
+++ b/Legacy/include/Acts/Extrapolation/ExtrapolationEngine.hpp
@@ -1,13 +1,13 @@
-// This file is part of the ACTS project.
+// This file is part of the Acts project.
 //
-// Copyright (C) 2016-2017 ACTS project team
+// Copyright (C) 2016-2017 Acts project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
 // file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 ///////////////////////////////////////////////////////////////////
-// ExtrapolationEngine.h, ACTS project
+// ExtrapolationEngine.h, Acts project
 ///////////////////////////////////////////////////////////////////
 
 #pragma once
diff --git a/Legacy/include/Acts/Extrapolation/IExtrapolationEngine.hpp b/Legacy/include/Acts/Extrapolation/IExtrapolationEngine.hpp
index 147576fc2b2b1333cda36d5b320ebe4ae572efe6..216978ebd0b8f024587d9948cae69972b9022a95 100644
--- a/Legacy/include/Acts/Extrapolation/IExtrapolationEngine.hpp
+++ b/Legacy/include/Acts/Extrapolation/IExtrapolationEngine.hpp
@@ -1,13 +1,13 @@
-// This file is part of the ACTS project.
+// This file is part of the Acts project.
 //
-// Copyright (C) 2016 ACTS project team
+// Copyright (C) 2016 Acts project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
 // file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 ///////////////////////////////////////////////////////////////////
-// IExtrapolationEngine.h, ACTS project
+// IExtrapolationEngine.h, Acts project
 ///////////////////////////////////////////////////////////////////
 
 #pragma once
diff --git a/Legacy/include/Acts/Extrapolation/IMaterialEffectsEngine.hpp b/Legacy/include/Acts/Extrapolation/IMaterialEffectsEngine.hpp
index 34a2029f300ce5e499f751e064b5b23262d099e1..879a2e972378ebb74344099f67038e19b86ce019 100644
--- a/Legacy/include/Acts/Extrapolation/IMaterialEffectsEngine.hpp
+++ b/Legacy/include/Acts/Extrapolation/IMaterialEffectsEngine.hpp
@@ -1,13 +1,13 @@
-// This file is part of the ACTS project.
+// This file is part of the Acts project.
 //
-// Copyright (C) 2016-2017 ACTS project team
+// Copyright (C) 2016-2017 Acts project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
 // file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 ///////////////////////////////////////////////////////////////////
-// IMaterialEffectsEngine.h, ACTS project
+// IMaterialEffectsEngine.h, Acts project
 ///////////////////////////////////////////////////////////////////
 
 #pragma once
diff --git a/Legacy/include/Acts/Extrapolation/IMultipleScatteringUpdator.hpp b/Legacy/include/Acts/Extrapolation/IMultipleScatteringUpdator.hpp
index d636808e1eacce4aff43dad8a039058323449779..2af53bfa2bbc78f157668bdf4c665a9f1ac0236d 100644
--- a/Legacy/include/Acts/Extrapolation/IMultipleScatteringUpdator.hpp
+++ b/Legacy/include/Acts/Extrapolation/IMultipleScatteringUpdator.hpp
@@ -1,13 +1,13 @@
-// This file is part of the ACTS project.
+// This file is part of the Acts project.
 //
-// Copyright (C) 2016 ACTS project team
+// Copyright (C) 2016 Acts project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
 // file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 ///////////////////////////////////////////////////////////////////
-// IMultipleScatteringUpdator.h, ACTS project
+// IMultipleScatteringUpdator.h, Acts project
 ///////////////////////////////////////////////////////////////////
 
 #pragma once
diff --git a/Legacy/include/Acts/Extrapolation/INavigationEngine.hpp b/Legacy/include/Acts/Extrapolation/INavigationEngine.hpp
index 3f6cd15260040ec0c8d5f2edd13715f2a011e7f7..4117996996d5b4af445d38388cdd06bd3c1a61b5 100644
--- a/Legacy/include/Acts/Extrapolation/INavigationEngine.hpp
+++ b/Legacy/include/Acts/Extrapolation/INavigationEngine.hpp
@@ -1,13 +1,13 @@
-// This file is part of the ACTS project.
+// This file is part of the Acts project.
 //
-// Copyright (C) 2016-2017 ACTS project team
+// Copyright (C) 2016-2017 Acts project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
 // file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 ///////////////////////////////////////////////////////////////////
-// INavigationEngine.h, ACTS project
+// INavigationEngine.h, Acts project
 ///////////////////////////////////////////////////////////////////
 
 #pragma once
diff --git a/Legacy/include/Acts/Extrapolation/IPropagationEngine.hpp b/Legacy/include/Acts/Extrapolation/IPropagationEngine.hpp
index 7d015d0d02f0263cc3621bc994efd4077fd5430a..af7081104ae9f13ea3716ada27a3d11454e4050a 100644
--- a/Legacy/include/Acts/Extrapolation/IPropagationEngine.hpp
+++ b/Legacy/include/Acts/Extrapolation/IPropagationEngine.hpp
@@ -1,13 +1,13 @@
-// This file is part of the ACTS project.
+// This file is part of the Acts project.
 //
-// Copyright (C) 2016-2017 ACTS project team
+// Copyright (C) 2016-2017 Acts project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
 // file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 ///////////////////////////////////////////////////////////////////
-// IPropagationEngine.h, ACTS project
+// IPropagationEngine.h, Acts project
 ///////////////////////////////////////////////////////////////////
 
 #pragma once
diff --git a/Legacy/include/Acts/Extrapolation/MaterialEffectsEngine.hpp b/Legacy/include/Acts/Extrapolation/MaterialEffectsEngine.hpp
index 941a249505dfa609f612dab910eeb8dd37a473ef..59a13e9a43098aacc7326a2a8255c2cce6a9834f 100644
--- a/Legacy/include/Acts/Extrapolation/MaterialEffectsEngine.hpp
+++ b/Legacy/include/Acts/Extrapolation/MaterialEffectsEngine.hpp
@@ -1,13 +1,13 @@
-// This file is part of the ACTS project.
+// This file is part of the Acts project.
 //
-// Copyright (C) 2016-2017 ACTS project team
+// Copyright (C) 2016-2017 Acts project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
 // file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 ///////////////////////////////////////////////////////////////////
-// MaterialEffectsEngine.h, ACTS project
+// MaterialEffectsEngine.h, Acts project
 ///////////////////////////////////////////////////////////////////
 
 #pragma once
diff --git a/Legacy/include/Acts/Extrapolation/MaterialUpdateMode.hpp b/Legacy/include/Acts/Extrapolation/MaterialUpdateMode.hpp
index 9c942aa4c5e1a15ccbadf23a2c2c0d0bb36eb5e3..571d89605d18c521d7fbf0c32cdb9ecaeef1ded9 100644
--- a/Legacy/include/Acts/Extrapolation/MaterialUpdateMode.hpp
+++ b/Legacy/include/Acts/Extrapolation/MaterialUpdateMode.hpp
@@ -1,6 +1,6 @@
-// This file is part of the ACTS project.
+// This file is part of the Acts project.
 //
-// Copyright (C) 2016 ACTS project team
+// Copyright (C) 2016 Acts project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/Legacy/include/Acts/Extrapolation/RungeKuttaEngine.hpp b/Legacy/include/Acts/Extrapolation/RungeKuttaEngine.hpp
index 1e84509efa534ef6fe01c8279df5b6a86607d7d0..24d8574bac7601b2b0456581fd75a1831ce5b3c4 100644
--- a/Legacy/include/Acts/Extrapolation/RungeKuttaEngine.hpp
+++ b/Legacy/include/Acts/Extrapolation/RungeKuttaEngine.hpp
@@ -1,13 +1,13 @@
-// This file is part of the ACTS project.
+// This file is part of the Acts project.
 //
-// Copyright (C) 2016-2018 ACTS project team
+// Copyright (C) 2016-2018 Acts project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
 // file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 /////////////////////////////////////////////////////////////////////////////////
-//  Header file for class RungeKuttaEngine, ACTS project
+//  Header file for class RungeKuttaEngine, Acts project
 /////////////////////////////////////////////////////////////////////////////////
 
 #pragma once
diff --git a/Legacy/include/Acts/Extrapolation/StaticEngine.hpp b/Legacy/include/Acts/Extrapolation/StaticEngine.hpp
index 570a8d0710c21ec2310a7bbbf1e004270d242018..395152f3f8550de17649c4b7ec0874e3ec62688a 100644
--- a/Legacy/include/Acts/Extrapolation/StaticEngine.hpp
+++ b/Legacy/include/Acts/Extrapolation/StaticEngine.hpp
@@ -1,13 +1,13 @@
-// This file is part of the ACTS project.
+// This file is part of the Acts project.
 //
-// Copyright (C) 2016-2017 ACTS project team
+// Copyright (C) 2016-2017 Acts project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
 // file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 ///////////////////////////////////////////////////////////////////
-// StaticEngine.h, ACTS project
+// StaticEngine.h, Acts project
 ///////////////////////////////////////////////////////////////////
 
 #pragma once
diff --git a/Legacy/include/Acts/Extrapolation/StaticNavigationEngine.hpp b/Legacy/include/Acts/Extrapolation/StaticNavigationEngine.hpp
index 0c846048708d26b44753838ab17801c4a67febdb..4a4efefa4824a523f8e757e817693e7f6375388f 100644
--- a/Legacy/include/Acts/Extrapolation/StaticNavigationEngine.hpp
+++ b/Legacy/include/Acts/Extrapolation/StaticNavigationEngine.hpp
@@ -1,13 +1,13 @@
-// This file is part of the ACTS project.
+// This file is part of the Acts project.
 //
-// Copyright (C) 2016-2017 ACTS project team
+// Copyright (C) 2016-2017 Acts project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
 // file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 ///////////////////////////////////////////////////////////////////
-// StaticNavigationEngine.h, ACTS project
+// StaticNavigationEngine.h, Acts project
 ///////////////////////////////////////////////////////////////////
 
 #pragma once
diff --git a/Legacy/include/Acts/Extrapolation/Wrapper.hpp b/Legacy/include/Acts/Extrapolation/Wrapper.hpp
index 6dc6e1f2d62ddbeb150dcd9bb3eaa3b6e2c41321..542833ef8119be18676da66d477c66d13796611b 100644
--- a/Legacy/include/Acts/Extrapolation/Wrapper.hpp
+++ b/Legacy/include/Acts/Extrapolation/Wrapper.hpp
@@ -1,6 +1,6 @@
-// This file is part of the ACTS project.
+// This file is part of the Acts project.
 //
-// Copyright (C) 2017-2018 ACTS project team
+// Copyright (C) 2017-2018 Acts project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
@@ -55,7 +55,7 @@ namespace propagation {
   };
 
   /// @brief Wrapper for PropagationEngine to compare with the
-  /// the ACTS Propagator
+  /// the Acts Propagator
   ///
   /// @tparam Impl Implementation of the propagation algorithm
   template <typename Impl>
diff --git a/Legacy/include/Acts/Extrapolation/detail/ExtrapolationCell.ipp b/Legacy/include/Acts/Extrapolation/detail/ExtrapolationCell.ipp
index 6fc22a890f0c8d7df0e048e65c4ebaac25ba3741..964fa6f7f8d7454b54055446cd025e74f11ed384 100644
--- a/Legacy/include/Acts/Extrapolation/detail/ExtrapolationCell.ipp
+++ b/Legacy/include/Acts/Extrapolation/detail/ExtrapolationCell.ipp
@@ -1,13 +1,13 @@
-// This file is part of the ACTS project.
+// This file is part of the Acts project.
 //
-// Copyright (C) 2017 ACTS project team
+// Copyright (C) 2017 Acts project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
 // file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 ///////////////////////////////////////////////////////////////////
-// ExtrapolationCell.ipp, ACTS project
+// ExtrapolationCell.ipp, Acts project
 ///////////////////////////////////////////////////////////////////
 
 template <class T>
diff --git a/Legacy/include/Acts/Extrapolation/detail/ExtrapolationEngine.ipp b/Legacy/include/Acts/Extrapolation/detail/ExtrapolationEngine.ipp
index 12a7459ce79136380ef830f1ef377f131429765a..56b2c6a2a503575f5386d1ce91f133cd98a1b575 100644
--- a/Legacy/include/Acts/Extrapolation/detail/ExtrapolationEngine.ipp
+++ b/Legacy/include/Acts/Extrapolation/detail/ExtrapolationEngine.ipp
@@ -1,13 +1,13 @@
-// This file is part of the ACTS project.
+// This file is part of the Acts project.
 //
-// Copyright (C) 2016-2017 ACTS project team
+// Copyright (C) 2016-2017 Acts project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
 // file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 ///////////////////////////////////////////////////////////////////
-// ExtrapolationEngine.ipp, ACTS project
+// ExtrapolationEngine.ipp, Acts project
 ///////////////////////////////////////////////////////////////////
 
 #include <iomanip>
diff --git a/Legacy/include/Acts/Extrapolation/detail/ExtrapolationMacros.hpp b/Legacy/include/Acts/Extrapolation/detail/ExtrapolationMacros.hpp
index c8dacf5bb07477220eda3aacf5e9e23e3bd69a27..2d301281b82f1a0effa70532577f5821090e2c8a 100644
--- a/Legacy/include/Acts/Extrapolation/detail/ExtrapolationMacros.hpp
+++ b/Legacy/include/Acts/Extrapolation/detail/ExtrapolationMacros.hpp
@@ -1,13 +1,13 @@
-// This file is part of the ACTS project.
+// This file is part of the Acts project.
 //
-// Copyright (C) 2016-2017 ACTS project team
+// Copyright (C) 2016-2017 Acts project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
 // file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 ///////////////////////////////////////////////////////////////////
-// ExtrapolationMacros.h, ACTS project
+// ExtrapolationMacros.h, Acts project
 ///////////////////////////////////////////////////////////////////
 // output stream macros to facilitate screen output and consistent checking
 
diff --git a/Legacy/include/Acts/Extrapolation/detail/RungeKuttaEngine.ipp b/Legacy/include/Acts/Extrapolation/detail/RungeKuttaEngine.ipp
index 78ac8baf6d06f9d6e77dcbfe19492458cc810985..ff00600b22e1d9ec9b13bdc9c6404735e4855644 100644
--- a/Legacy/include/Acts/Extrapolation/detail/RungeKuttaEngine.ipp
+++ b/Legacy/include/Acts/Extrapolation/detail/RungeKuttaEngine.ipp
@@ -1,6 +1,6 @@
-// This file is part of the ACTS project.
+// This file is part of the Acts project.
 //
-// Copyright (C) 2016-2018 ACTS project team
+// Copyright (C) 2016-2018 Acts project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/Legacy/include/Acts/Extrapolation/detail/RungeKuttaUtils.hpp b/Legacy/include/Acts/Extrapolation/detail/RungeKuttaUtils.hpp
index 2005d05d0c124becfb5c5a8e2e0e1752c5ef1b85..ab95eb462407a04d5f06820f62b9e1830d764cee 100644
--- a/Legacy/include/Acts/Extrapolation/detail/RungeKuttaUtils.hpp
+++ b/Legacy/include/Acts/Extrapolation/detail/RungeKuttaUtils.hpp
@@ -1,13 +1,13 @@
-// This file is part of the ACTS project.
+// This file is part of the Acts project.
 //
-// Copyright (C) 2016-2017 ACTS project team
+// Copyright (C) 2016-2017 Acts project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
 // file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 /////////////////////////////////////////////////////////////////////////////////
-//  RungeKuttaUtils.h, ACTS project
+//  RungeKuttaUtils.h, Acts project
 /////////////////////////////////////////////////////////////////////////////////
 
 #pragma once
diff --git a/Legacy/include/Acts/Extrapolation/detail/StaticEngine.ipp b/Legacy/include/Acts/Extrapolation/detail/StaticEngine.ipp
index a937f5aa1945132f86fa43c04a64165c79a6b6c2..f6e68c2334a14e1c3cf045d878912717f649454c 100644
--- a/Legacy/include/Acts/Extrapolation/detail/StaticEngine.ipp
+++ b/Legacy/include/Acts/Extrapolation/detail/StaticEngine.ipp
@@ -1,13 +1,13 @@
-// This file is part of the ACTS project.
+// This file is part of the Acts project.
 //
-// Copyright (C) 2016-2018 ACTS project team
+// Copyright (C) 2016-2018 Acts project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
 // file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 ///////////////////////////////////////////////////////////////////
-// StaticEngine.ipp, ACTS project
+// StaticEngine.ipp, Acts project
 ///////////////////////////////////////////////////////////////////
 
 #include <iomanip>
diff --git a/Legacy/include/Acts/Extrapolation/detail/StaticNavigationEngine.ipp b/Legacy/include/Acts/Extrapolation/detail/StaticNavigationEngine.ipp
index 254d00872293c58203299d051fdffc3a339f84f1..79efe34de19af593bddd4aa84f1768bd3258624e 100644
--- a/Legacy/include/Acts/Extrapolation/detail/StaticNavigationEngine.ipp
+++ b/Legacy/include/Acts/Extrapolation/detail/StaticNavigationEngine.ipp
@@ -1,13 +1,13 @@
-// This file is part of the ACTS project.
+// This file is part of the Acts project.
 //
-// Copyright (C) 2016-2018 ACTS project team
+// Copyright (C) 2016-2018 Acts project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
 // file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 ///////////////////////////////////////////////////////////////////
-// StaticNavigationEngine.ipp, ACTS project
+// StaticNavigationEngine.ipp, Acts project
 ///////////////////////////////////////////////////////////////////
 
 #include "Acts/Detector/TrackingGeometry.hpp"
diff --git a/Legacy/include/Acts/Propagator/AtlasStepper.hpp b/Legacy/include/Acts/Propagator/AtlasStepper.hpp
index 31389aa7c6bdf415b567c1d4f75c5a217826233b..87e31a248a524564460d1a203b85d52018cf893b 100644
--- a/Legacy/include/Acts/Propagator/AtlasStepper.hpp
+++ b/Legacy/include/Acts/Propagator/AtlasStepper.hpp
@@ -1,6 +1,6 @@
-// This file is part of the ACTS project.
+// This file is part of the Acts project.
 //
-// Copyright (C) 2016-2018 ACTS project team
+// Copyright (C) 2016-2018 Acts project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/Legacy/include/Acts/Seeding/ATL_Seedmaker.hpp b/Legacy/include/Acts/Seeding/ATL_Seedmaker.hpp
index 3523b5950890e21c929baf4249019bd0a7d6d309..83b7aa286f07b79b83b925e41ff1e482fdee641c 100644
--- a/Legacy/include/Acts/Seeding/ATL_Seedmaker.hpp
+++ b/Legacy/include/Acts/Seeding/ATL_Seedmaker.hpp
@@ -1,13 +1,13 @@
-// This file is part of the ACTS project.
+// This file is part of the Acts project.
 //
-// Copyright (C) 2018 ACTS project team
+// Copyright (C) 2018 Acts project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
 // file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 ///////////////////////////////////////////////////////////////////
-// ATL_Seedmaker.hpp ACTS project
+// ATL_Seedmaker.hpp Acts project
 ///////////////////////////////////////////////////////////////////
 
 #pragma once
diff --git a/Legacy/include/Acts/Seeding/ATL_Seedmaker.ipp b/Legacy/include/Acts/Seeding/ATL_Seedmaker.ipp
index 56b1dba0c3c29178caad3a724f689be0683d220f..4af9240c230b91f1178dd4c678f1d3de4c3ec887 100644
--- a/Legacy/include/Acts/Seeding/ATL_Seedmaker.ipp
+++ b/Legacy/include/Acts/Seeding/ATL_Seedmaker.ipp
@@ -1,13 +1,13 @@
-// This file is part of the ACTS project.
+// This file is part of the Acts project.
 //
-// Copyright (C) 2018 ACTS project team
+// Copyright (C) 2018 Acts project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
 // file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 ///////////////////////////////////////////////////////////////////
-// ATL_Seedmaker.ipp ACTS project
+// ATL_Seedmaker.ipp Acts project
 ///////////////////////////////////////////////////////////////////
 
 #include <algorithm>
diff --git a/Legacy/include/Acts/Seeding/InternalSeed.hpp b/Legacy/include/Acts/Seeding/InternalSeed.hpp
index d56d76bac359eb6822995fa8003d0b61a1a6fd36..12f6d798abec2bddbd424ba2aa1807316925e8d0 100644
--- a/Legacy/include/Acts/Seeding/InternalSeed.hpp
+++ b/Legacy/include/Acts/Seeding/InternalSeed.hpp
@@ -1,13 +1,13 @@
-// This file is part of the ACTS project.
+// This file is part of the Acts project.
 //
-// Copyright (C) 2018 ACTS project team
+// Copyright (C) 2018 Acts project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
 // file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 ///////////////////////////////////////////////////////////////////
-// InternalSeed.hpp ACTS project
+// InternalSeed.hpp Acts project
 ///////////////////////////////////////////////////////////////////
 
 #pragma once
diff --git a/Legacy/include/Acts/Seeding/SPForSeed.hpp b/Legacy/include/Acts/Seeding/SPForSeed.hpp
index 91d3ab353e8c91238c582d1b7d44968277947d82..6e4144e8cc28bba7b989bcbc2c5218cde08f1e48 100644
--- a/Legacy/include/Acts/Seeding/SPForSeed.hpp
+++ b/Legacy/include/Acts/Seeding/SPForSeed.hpp
@@ -1,13 +1,13 @@
-// This file is part of the ACTS project.
+// This file is part of the Acts project.
 //
-// Copyright (C) 2018 ACTS project team
+// Copyright (C) 2018 Acts project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
 // file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 ///////////////////////////////////////////////////////////////////
-// SPForSeed.hpp ACTS project
+// SPForSeed.hpp Acts project
 ///////////////////////////////////////////////////////////////////
 
 #pragma once
diff --git a/Legacy/include/Acts/Seeding/Seed.hpp b/Legacy/include/Acts/Seeding/Seed.hpp
index 2dfbbcb5e581f65e71b56f02d826d083d6b91db6..3f4dbacbd1e6fe545e1869e0b7654e268f08f0bd 100644
--- a/Legacy/include/Acts/Seeding/Seed.hpp
+++ b/Legacy/include/Acts/Seeding/Seed.hpp
@@ -1,13 +1,13 @@
-// This file is part of the ACTS project.
+// This file is part of the Acts project.
 //
-// Copyright (C) 2018 ACTS project team
+// Copyright (C) 2018 Acts project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
 // file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 ///////////////////////////////////////////////////////////////////
-// Seed.hpp ACTS project
+// Seed.hpp Acts project
 ///////////////////////////////////////////////////////////////////
 
 #pragma once
diff --git a/Legacy/src/Extrapolation/ExtrapolationCell.cpp b/Legacy/src/Extrapolation/ExtrapolationCell.cpp
index 485d372f7cb35ad3cdf8004f9ecedfe04bca9df4..e10eb3382bd3efcecc093913fd7148ed62978c9b 100644
--- a/Legacy/src/Extrapolation/ExtrapolationCell.cpp
+++ b/Legacy/src/Extrapolation/ExtrapolationCell.cpp
@@ -1,13 +1,13 @@
-// This file is part of the ACTS project.
+// This file is part of the Acts project.
 //
-// Copyright (C) 2016-2017 ACTS project team
+// Copyright (C) 2016-2017 Acts project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
 // file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 ///////////////////////////////////////////////////////////////////
-// ExtrapolationCell.cpp, ACTS project
+// ExtrapolationCell.cpp, Acts project
 ///////////////////////////////////////////////////////////////////
 
 #include "Acts/Extrapolation/ExtrapolationCell.hpp"
diff --git a/Legacy/src/Extrapolation/ExtrapolationEngine.cpp b/Legacy/src/Extrapolation/ExtrapolationEngine.cpp
index f36ff11c878c2732a755374a669a62243f2eb90e..c812a77c66a52bd55aa1bc0d69118b06c3fb09a8 100644
--- a/Legacy/src/Extrapolation/ExtrapolationEngine.cpp
+++ b/Legacy/src/Extrapolation/ExtrapolationEngine.cpp
@@ -1,13 +1,13 @@
-// This file is part of the ACTS project.
+// This file is part of the Acts project.
 //
-// Copyright (C) 2016-2017 ACTS project team
+// Copyright (C) 2016-2017 Acts project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
 // file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 ///////////////////////////////////////////////////////////////////
-// ExtrapolationEngine.cpp, ACTS project
+// ExtrapolationEngine.cpp, Acts project
 ///////////////////////////////////////////////////////////////////
 
 #include "Acts/Extrapolation/ExtrapolationEngine.hpp"
diff --git a/Legacy/src/Extrapolation/MaterialEffectsEngine.cpp b/Legacy/src/Extrapolation/MaterialEffectsEngine.cpp
index f212ca6c5fe6ff23d2c482e120d368aa90ce2336..2ac51be6cc1541121dc277154108533390dd4853 100644
--- a/Legacy/src/Extrapolation/MaterialEffectsEngine.cpp
+++ b/Legacy/src/Extrapolation/MaterialEffectsEngine.cpp
@@ -1,13 +1,13 @@
-// This file is part of the ACTS project.
+// This file is part of the Acts project.
 //
-// Copyright (C) 2016-2018 ACTS project team
+// Copyright (C) 2016-2018 Acts project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
 // file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 ///////////////////////////////////////////////////////////////////
-// MaterialEffectsEngine.cpp, ACTS project
+// MaterialEffectsEngine.cpp, Acts project
 ///////////////////////////////////////////////////////////////////
 
 #include "Acts/Extrapolation/MaterialEffectsEngine.hpp"
diff --git a/Legacy/src/Extrapolation/RungeKuttaUtils.cpp b/Legacy/src/Extrapolation/RungeKuttaUtils.cpp
index ebc7029921e8f72d6ede526d4971f61f0028373f..ca45968e78a2d337410dfdb63b4625af03592e46 100644
--- a/Legacy/src/Extrapolation/RungeKuttaUtils.cpp
+++ b/Legacy/src/Extrapolation/RungeKuttaUtils.cpp
@@ -1,13 +1,13 @@
-// This file is part of the ACTS project.
+// This file is part of the Acts project.
 //
-// Copyright (C) 2016-2018 ACTS project team
+// Copyright (C) 2016-2018 Acts project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
 // file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 /////////////////////////////////////////////////////////////////////////////////
-// RungeKuttaUtils.cpp , ACTS project
+// RungeKuttaUtils.cpp , Acts project
 ///////////////////////////////////////////////////////////////////
 
 #include "Acts/Extrapolation/detail/RungeKuttaUtils.hpp"
diff --git a/Legacy/src/Extrapolation/StaticEngine.cpp b/Legacy/src/Extrapolation/StaticEngine.cpp
index 0e80af5bea28b189ec8ff25a3fe6bad4054acce1..1c491660a319a2c061e2f535faf8b51037586466 100644
--- a/Legacy/src/Extrapolation/StaticEngine.cpp
+++ b/Legacy/src/Extrapolation/StaticEngine.cpp
@@ -1,13 +1,13 @@
-// This file is part of the ACTS project.
+// This file is part of the Acts project.
 //
-// Copyright (C) 2016-2017 ACTS project team
+// Copyright (C) 2016-2017 Acts project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
 // file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 ///////////////////////////////////////////////////////////////////
-// StaticEngine.cpp, ACTS project
+// StaticEngine.cpp, Acts project
 ///////////////////////////////////////////////////////////////////
 
 // STL
diff --git a/Legacy/src/Extrapolation/StaticNavigationEngine.cpp b/Legacy/src/Extrapolation/StaticNavigationEngine.cpp
index a3d1cfe3f355341f38744c5d1411b4900ea9f113..a05d5387b21195d190bffe3d209d1b38c9995155 100644
--- a/Legacy/src/Extrapolation/StaticNavigationEngine.cpp
+++ b/Legacy/src/Extrapolation/StaticNavigationEngine.cpp
@@ -1,13 +1,13 @@
-// This file is part of the ACTS project.
+// This file is part of the Acts project.
 //
-// Copyright (C) 2016-2017 ACTS project team
+// Copyright (C) 2016-2017 Acts project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
 // file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 ///////////////////////////////////////////////////////////////////
-// StaticNavigationEngine.cpp, ACTS project
+// StaticNavigationEngine.cpp, Acts project
 ///////////////////////////////////////////////////////////////////
 
 // STL
diff --git a/Plugins/DD4hepPlugin/include/Acts/Plugins/DD4hepPlugins/ActsExtension.hpp b/Plugins/DD4hepPlugin/include/Acts/Plugins/DD4hepPlugins/ActsExtension.hpp
index f8487cd18b50816d9a6beed620fb27997442628a..a7d61c4f13a8224a50eb82a6383f3b68a7687104 100644
--- a/Plugins/DD4hepPlugin/include/Acts/Plugins/DD4hepPlugins/ActsExtension.hpp
+++ b/Plugins/DD4hepPlugin/include/Acts/Plugins/DD4hepPlugins/ActsExtension.hpp
@@ -1,13 +1,13 @@
-// This file is part of the ACTS project.
+// This file is part of the Acts project.
 //
-// Copyright (C) 2017 ACTS project team
+// Copyright (C) 2017 Acts project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
 // file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 ///////////////////////////////////////////////////////////////////
-// ActsExtension.h, ACTS project, DD4hepDetector plugin
+// ActsExtension.h, Acts project, DD4hepDetector plugin
 ///////////////////////////////////////////////////////////////////
 
 #pragma once
@@ -61,7 +61,7 @@ trapezoidalDigiModule(double                      minHalflengthX,
 /// @class ActsExtension
 ///
 /// @brief Extension of the \a %DD4hep \a DetElement needed for translation
-/// into the ACTS tracking geometry
+/// into the Acts tracking geometry
 ///
 /// @todo re-validate material mapping with new implementation + allow material
 /// mapping onto modules ++ allow handing over average material to layers(?)
@@ -69,7 +69,7 @@ trapezoidalDigiModule(double                      minHalflengthX,
 /// Implementation of the Acts::IActsExtension class, which uses the
 /// extension mechanism of DD4hep for the \a %DD4hep \a DetElement.
 /// This extensions are needed for the translation from the \a %DD4hep
-/// geometry into the tracking geometry of the ACTS package.
+/// geometry into the tracking geometry of the Acts package.
 ///
 /// This extensions are necessary in order to distinguish during the translation
 /// if
@@ -89,12 +89,12 @@ trapezoidalDigiModule(double                      minHalflengthX,
 /// declared as a layer and the specific parameters needed for material mapping
 /// should be handed over.
 /// In case the sensitive modules/components contained by a layer have a
-/// different orientation in respect to the local tracking frame of ACTS,
+/// different orientation in respect to the local tracking frame of Acts,
 /// the axes orientation of these modules can be set for the layer.
 ///
 /// In \a %DD4hep cylinder and disc volumes are both described with the
 /// underlying
-/// \a ROOT \c TGeoConeSeg class. In ACTS one needs to distinguish these two
+/// \a ROOT \c TGeoConeSeg class. In Acts one needs to distinguish these two
 /// volume
 /// types. Therefore volumes which are endcaps or barrels should be
 /// indicated as
@@ -160,7 +160,7 @@ trapezoidalDigiModule(double                      minHalflengthX,
 /// segmentation please use the global functions rectangleDigiModule() and
 /// trapezoidalDigiModule().
 ///
-/// If one wants to build the ACTS Tracking Geometry with \a %DD4hep input
+/// If one wants to build the Acts Tracking Geometry with \a %DD4hep input
 /// these
 /// extension should be used during the construction of the \a %DD4hep
 /// geometry
@@ -235,7 +235,7 @@ public:
     /// Orientation of the modules contained by a layer in respect to the
     /// tracking frame. A different orientation can occur because in TGeo (which
     /// is the underlying geometry model of %DD4hep) all shapes are 3D volumes
-    /// also the sensitive components of a detector. In the ACTS tracking
+    /// also the sensitive components of a detector. In the Acts tracking
     /// geometry these sensitive components are described as 2D surfaces, which
     /// have their local 2D coordinate system. Therefore one needs to know which
     /// coordinates should be taken as the local coordinates.
diff --git a/Plugins/DD4hepPlugin/include/Acts/Plugins/DD4hepPlugins/ConvertDD4hepDetector.hpp b/Plugins/DD4hepPlugin/include/Acts/Plugins/DD4hepPlugins/ConvertDD4hepDetector.hpp
index a7c102de55d390625a5c2b2ba1fea8b7c4f69256..12ad40b4b410e40d3eafe6eb8604b1eb5a6a2aa9 100644
--- a/Plugins/DD4hepPlugin/include/Acts/Plugins/DD4hepPlugins/ConvertDD4hepDetector.hpp
+++ b/Plugins/DD4hepPlugin/include/Acts/Plugins/DD4hepPlugins/ConvertDD4hepDetector.hpp
@@ -1,6 +1,6 @@
-// This file is part of the ACTS project.
+// This file is part of the Acts project.
 //
-// Copyright (C) 2017 ACTS project team
+// Copyright (C) 2017 Acts project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/Plugins/DD4hepPlugin/include/Acts/Plugins/DD4hepPlugins/DD4hepDetElement.hpp b/Plugins/DD4hepPlugin/include/Acts/Plugins/DD4hepPlugins/DD4hepDetElement.hpp
index 9948066025ddfb9c476ab8fd32367c8e134d2969..2c07f1929b56177f2bbf089aac5d4cc18df23e30 100644
--- a/Plugins/DD4hepPlugin/include/Acts/Plugins/DD4hepPlugins/DD4hepDetElement.hpp
+++ b/Plugins/DD4hepPlugin/include/Acts/Plugins/DD4hepPlugins/DD4hepDetElement.hpp
@@ -1,13 +1,13 @@
-// This file is part of the ACTS project.
+// This file is part of the Acts project.
 //
-// Copyright (C) 2017 ACTS project team
+// Copyright (C) 2017 Acts project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
 // file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 ///////////////////////////////////////////////////////////////////
-// DD4hepDetElement.h, ACTS project, DD4hepDetector plugin
+// DD4hepDetElement.h, Acts project, DD4hepDetector plugin
 ///////////////////////////////////////////////////////////////////
 
 #pragma once
diff --git a/Plugins/DD4hepPlugin/include/Acts/Plugins/DD4hepPlugins/DD4hepLayerBuilder.hpp b/Plugins/DD4hepPlugin/include/Acts/Plugins/DD4hepPlugins/DD4hepLayerBuilder.hpp
index 568e40b40609ab8d258fc1f5a121640e4c149bc1..928cf373fa59cdc62625aeb5b81077505f42e255 100644
--- a/Plugins/DD4hepPlugin/include/Acts/Plugins/DD4hepPlugins/DD4hepLayerBuilder.hpp
+++ b/Plugins/DD4hepPlugin/include/Acts/Plugins/DD4hepPlugins/DD4hepLayerBuilder.hpp
@@ -1,6 +1,6 @@
-// This file is part of the ACTS project.
+// This file is part of the Acts project.
 //
-// Copyright (C) 2017 ACTS project team
+// Copyright (C) 2017 Acts project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
@@ -142,7 +142,7 @@ private:
   /// @param detElement the DD4hep::DetElement of the layer
   /// @param surfaces the vector of surfaces which should be filled with the
   /// sensitive detector elements
-  /// @param axes the orientation of the modules to the ACTS frame
+  /// @param axes the orientation of the modules to the Acts frame
   void
   collectSensitive(const dd4hep::DetElement&          detElement,
                    std::vector<const Acts::Surface*>& surfaces,
@@ -154,7 +154,7 @@ private:
   /// created
   /// @param isDisc in case the sensitive detector module should be translated
   ///        as disc (e.g. for endcaps) this flag should be set to true
-  /// @param axes the orientation of the modules to the ACTS frame
+  /// @param axes the orientation of the modules to the Acts frame
   const Acts::Surface*
   createSensitiveSurface(const dd4hep::DetElement& detElement,
                          bool                      isDisc = false,
@@ -162,7 +162,7 @@ private:
 
   // Private helper function to convert the TGeo transformation matrix into
   // a
-  // ACTS transformation matrix
+  // Acts transformation matrix
   /// @param tGeoTrans TGeo transformation matrix which should be converted
   std::shared_ptr<const Acts::Transform3D>
   convertTransform(const TGeoMatrix* tGeoTrans) const;
diff --git a/Plugins/DD4hepPlugin/include/Acts/Plugins/DD4hepPlugins/IActsExtension.hpp b/Plugins/DD4hepPlugin/include/Acts/Plugins/DD4hepPlugins/IActsExtension.hpp
index 43fc9f0417589a8e2e480793bc9601f2aea2c4a4..dc605f8e322e129fb609cedfdeb4644a89cef6fe 100644
--- a/Plugins/DD4hepPlugin/include/Acts/Plugins/DD4hepPlugins/IActsExtension.hpp
+++ b/Plugins/DD4hepPlugin/include/Acts/Plugins/DD4hepPlugins/IActsExtension.hpp
@@ -1,13 +1,13 @@
-// This file is part of the ACTS project.
+// This file is part of the Acts project.
 //
-// Copyright (C) 2017 ACTS project team
+// Copyright (C) 2017 Acts project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
 // file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 ///////////////////////////////////////////////////////////////////
-// IDetExtension.h, ACTS project, DD4hepDetector plugin
+// IDetExtension.h, Acts project, DD4hepDetector plugin
 ///////////////////////////////////////////////////////////////////
 
 #pragma once
@@ -28,11 +28,11 @@ namespace Acts {
 /// @class IActsExtension
 ///
 /// @brief Interface for Extension of the DD4hep \a DetElement needed for
-/// translation into ACTS tracking geometry
+/// translation into Acts tracking geometry
 ///
 /// Interface class for making extensions to the DD4hep \a DetElement class,
 /// needed  for the translation from the DD4hep geometry into the tracking
-/// geometry of the ACTS package.
+/// geometry of the Acts package.
 ///
 /// This extensions are necessary in order to distinguish in the translation if
 /// a DD4hep \a DetElement is
@@ -51,7 +51,7 @@ namespace Acts {
 /// which should carry material should also be declared as a layer and the
 /// specific parameters needed for material mapping should be handed over.
 /// In case the sensitive modules/components contained by a layer have a
-/// different orientation in respect to the local tracking frame of ACTS, the
+/// different orientation in respect to the local tracking frame of Acts, the
 /// axes orientation of these modules can be set for the layer.
 /// In case the segmentation is set for the module (by using the second
 /// constructor setting the segmentation or using the setSegmentation()
@@ -59,7 +59,7 @@ namespace Acts {
 /// the modules.
 ///
 /// In DD4hep cylinder and disc volumes are both described with the underlying
-/// ROOT TGeoConeSeg class. In ACTS one needs to distinguish these two volume
+/// ROOT TGeoConeSeg class. In Acts one needs to distinguish these two volume
 /// types. Therefore volumes which are endcaps or barrels should be indicated as
 /// these.
 /// The ActsExtension should also be used to indicate that a \a DetElement is
diff --git a/Plugins/DD4hepPlugin/src/ActsExtension.cpp b/Plugins/DD4hepPlugin/src/ActsExtension.cpp
index 7364ace0e8173631f7f2b93fbfc13625193b48d3..43c356564f19c75709ce672b51df0f00cd67900c 100644
--- a/Plugins/DD4hepPlugin/src/ActsExtension.cpp
+++ b/Plugins/DD4hepPlugin/src/ActsExtension.cpp
@@ -1,6 +1,6 @@
-// This file is part of the ACTS project.
+// This file is part of the Acts project.
 //
-// Copyright (C) 2017 ACTS project team
+// Copyright (C) 2017 Acts project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
@@ -23,7 +23,7 @@ Acts::rectangleDigiModule(double                      halflengthX,
                           double                      thickness,
                           const dd4hep::Segmentation& segmentation)
 {
-  // convert to ACTS units
+  // convert to Acts units
   double scalor = units::_cm;
   halflengthX *= scalor;
   halflengthY *= scalor;
@@ -58,7 +58,7 @@ Acts::trapezoidalDigiModule(double                      minHalflengthX,
                             double                      thickness,
                             const dd4hep::Segmentation& segmentation)
 {
-  // convert to ACTS units
+  // convert to Acts units
   double scalor = units::_cm;
   minHalflengthX *= scalor;
   maxHalflengthX *= scalor;
diff --git a/Plugins/DD4hepPlugin/src/ConvertDD4hepDetector.cpp b/Plugins/DD4hepPlugin/src/ConvertDD4hepDetector.cpp
index c341e9a4de941c1fc88aed058dfc62526d62fb31..1d56bef6d445d509a9b3caa7239ffcc990baff56 100644
--- a/Plugins/DD4hepPlugin/src/ConvertDD4hepDetector.cpp
+++ b/Plugins/DD4hepPlugin/src/ConvertDD4hepDetector.cpp
@@ -1,6 +1,6 @@
-// This file is part of the ACTS project.
+// This file is part of the Acts project.
 //
-// Copyright (C) 2017-2018 ACTS project team
+// Copyright (C) 2017-2018 Acts project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
@@ -40,7 +40,7 @@ convertDD4hepDetector(
       = Acts::getDefaultLogger("DD4hepConversion", loggingLevel);
   ACTS_LOCAL_LOGGER(DD4hepConverterlogger);
 
-  ACTS_INFO("Translating DD4hep geometry into ACTS geometry");
+  ACTS_INFO("Translating DD4hep geometry into Acts geometry");
   // get the sub detectors of the world detector e.g. beampipe, pixel detector,
   // strip detector
   std::vector<dd4hep::DetElement> subDetectors;
diff --git a/Plugins/DD4hepPlugin/src/DD4hepDetectorElement.cpp b/Plugins/DD4hepPlugin/src/DD4hepDetectorElement.cpp
index 9932ed19b2f482099091f9672d4c5910203322a0..99670bb00f92e43affcf5d60dab4f248ecb8baab 100644
--- a/Plugins/DD4hepPlugin/src/DD4hepDetectorElement.cpp
+++ b/Plugins/DD4hepPlugin/src/DD4hepDetectorElement.cpp
@@ -1,6 +1,6 @@
-// This file is part of the ACTS project.
+// This file is part of the Acts project.
 //
-// Copyright (C) 2017 ACTS project team
+// Copyright (C) 2017 Acts project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/Plugins/DD4hepPlugin/src/DD4hepLayerBuilder.cpp b/Plugins/DD4hepPlugin/src/DD4hepLayerBuilder.cpp
index 5b3e9fb028ff9a8148aa3c0fe05268cfcc2ccce5..f49f0c8386b9cea7aa40fc6b8f3256dfe5caeac2 100644
--- a/Plugins/DD4hepPlugin/src/DD4hepLayerBuilder.cpp
+++ b/Plugins/DD4hepPlugin/src/DD4hepLayerBuilder.cpp
@@ -1,6 +1,6 @@
-// This file is part of the ACTS project.
+// This file is part of the Acts project.
 //
-// Copyright (C) 2017-2018 ACTS project team
+// Copyright (C) 2017-2018 Acts project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/Plugins/Geant4Plugin/include/Acts/Plugins/Geant4Plugins/Geant4DetectorElement.hpp b/Plugins/Geant4Plugin/include/Acts/Plugins/Geant4Plugins/Geant4DetectorElement.hpp
index 2536f104813dd3394b7f6024f10d24c72f403383..848240ce1047fcf2f56fde9ae583e56bee7758fc 100644
--- a/Plugins/Geant4Plugin/include/Acts/Plugins/Geant4Plugins/Geant4DetectorElement.hpp
+++ b/Plugins/Geant4Plugin/include/Acts/Plugins/Geant4Plugins/Geant4DetectorElement.hpp
@@ -1,13 +1,13 @@
-// This file is part of the ACTS project.
+// This file is part of the Acts project.
 //
-// Copyright (C) 2017 ACTS project team
+// Copyright (C) 2017 Acts project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
 // file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 ///////////////////////////////////////////////////////////////////
-// Geant4DetElement.h, ACTS project, DD4hepDetector plugin
+// Geant4DetElement.h, Acts project, DD4hepDetector plugin
 ///////////////////////////////////////////////////////////////////
 
 #pragma once
diff --git a/Plugins/JsonPlugin/include/Acts/Plugins/JsonPlugin/FromJson.hpp b/Plugins/JsonPlugin/include/Acts/Plugins/JsonPlugin/FromJson.hpp
index f704f6d16a4d77794e9c1d3903c5e367513fdd97..5947b9ef4e5d6e4881f11454646e67bb9b249d0f 100644
--- a/Plugins/JsonPlugin/include/Acts/Plugins/JsonPlugin/FromJson.hpp
+++ b/Plugins/JsonPlugin/include/Acts/Plugins/JsonPlugin/FromJson.hpp
@@ -1,6 +1,6 @@
-// This file is part of the ACTS project.
+// This file is part of the Acts project.
 //
-// Copyright (C) 2018 ACTS project team
+// Copyright (C) 2018 Acts project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/Plugins/JsonPlugin/src/FromJson.cpp b/Plugins/JsonPlugin/src/FromJson.cpp
index 1cdfdf242f9c7f382c86215482e51de77e83e9d1..38700c81683e1e51215938f40f45f17af983741a 100644
--- a/Plugins/JsonPlugin/src/FromJson.cpp
+++ b/Plugins/JsonPlugin/src/FromJson.cpp
@@ -1,6 +1,6 @@
-// This file is part of the ACTS project.
+// This file is part of the Acts project.
 //
-// Copyright (C) 2018 ACTS project team
+// Copyright (C) 2018 Acts project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/Plugins/MaterialPlugin/include/Acts/Plugins/MaterialPlugins/AssignedMaterialSteps.hpp b/Plugins/MaterialPlugin/include/Acts/Plugins/MaterialPlugins/AssignedMaterialSteps.hpp
index ff9da717a9b25626b75dcb512dc7ff4c131fd60a..af7f08ccc1c5ef581985471b7b582109eaedacdf 100644
--- a/Plugins/MaterialPlugin/include/Acts/Plugins/MaterialPlugins/AssignedMaterialSteps.hpp
+++ b/Plugins/MaterialPlugin/include/Acts/Plugins/MaterialPlugins/AssignedMaterialSteps.hpp
@@ -1,13 +1,13 @@
-// This file is part of the ACTS project.
+// This file is part of the Acts project.
 //
-// Copyright (C) 2017 ACTS project team
+// Copyright (C) 2017 Acts project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
 // file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 ///////////////////////////////////////////////////////////////////
-// AssignedMaterialSteps.h, ACTS project MaterialPlugins
+// AssignedMaterialSteps.h, Acts project MaterialPlugins
 ///////////////////////////////////////////////////////////////////
 
 #pragma once
diff --git a/Plugins/MaterialPlugin/include/Acts/Plugins/MaterialPlugins/MaterialMapper.hpp b/Plugins/MaterialPlugin/include/Acts/Plugins/MaterialPlugins/MaterialMapper.hpp
index a574d637d82ed9a69737d8c028f0c87c8f8bb1db..2c0fcf49021d5e48a1ec30bf19badf17719c1c17 100644
--- a/Plugins/MaterialPlugin/include/Acts/Plugins/MaterialPlugins/MaterialMapper.hpp
+++ b/Plugins/MaterialPlugin/include/Acts/Plugins/MaterialPlugins/MaterialMapper.hpp
@@ -1,13 +1,13 @@
-// This file is part of the ACTS project.
+// This file is part of the Acts project.
 //
-// Copyright (C) 2017 ACTS project team
+// Copyright (C) 2017 Acts project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
 // file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 ///////////////////////////////////////////////////////////////////
-// MaterialMapper.h, ACTS project MaterialPlugins
+// MaterialMapper.h, Acts project MaterialPlugins
 ///////////////////////////////////////////////////////////////////
 
 #pragma once
@@ -32,7 +32,7 @@ class MaterialProperties;
 /// @brief Class for material mapping
 ///
 /// This class should be used to map material from the full and detailed
-/// detector geometry onto the simplified ACTS geometry. It offers options to
+/// detector geometry onto the simplified Acts geometry. It offers options to
 /// map, average and finalize the material.
 ///
 /// Preconditions are:
@@ -48,7 +48,7 @@ class MaterialProperties;
 /// One MaterialTrack (containing all the MaterialSteps along a Track) is
 /// mapped by using the function Acts::MaterialMapper::mapMaterial(). The
 /// mapping process starts by extrapolating from the same starting
-/// point and direction as the MaterialTrack through the ACTS geometry.
+/// point and direction as the MaterialTrack through the Acts geometry.
 /// The extrapolation engine then finds  the closest surface marked to carry
 /// material (by carrying a SurfaceMaterialProxy).
 /// The material steps are then assigned to the corresponding surfaces
diff --git a/Plugins/MaterialPlugin/include/Acts/Plugins/MaterialPlugins/MaterialStep.hpp b/Plugins/MaterialPlugin/include/Acts/Plugins/MaterialPlugins/MaterialStep.hpp
index e80d394b31a36fadaeba72620ef2fdb99de87419..3ab21d5ac8777cddb77dd57e97c96d78c4c076aa 100644
--- a/Plugins/MaterialPlugin/include/Acts/Plugins/MaterialPlugins/MaterialStep.hpp
+++ b/Plugins/MaterialPlugin/include/Acts/Plugins/MaterialPlugins/MaterialStep.hpp
@@ -1,13 +1,13 @@
-// This file is part of the ACTS project.
+// This file is part of the Acts project.
 //
-// Copyright (C) 2017-2018 ACTS project team
+// Copyright (C) 2017-2018 Acts project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
 // file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 ///////////////////////////////////////////////////////////////////
-// MaterialStep.hpp, ACTS project
+// MaterialStep.hpp, Acts project
 ///////////////////////////////////////////////////////////////////
 
 #pragma once
diff --git a/Plugins/MaterialPlugin/include/Acts/Plugins/MaterialPlugins/MaterialTrack.hpp b/Plugins/MaterialPlugin/include/Acts/Plugins/MaterialPlugins/MaterialTrack.hpp
index 4e1a77a83e2a417d66d35230c638ea0501d6a84b..9a6393967b834231269a40c93cdb3e912fd52145 100644
--- a/Plugins/MaterialPlugin/include/Acts/Plugins/MaterialPlugins/MaterialTrack.hpp
+++ b/Plugins/MaterialPlugin/include/Acts/Plugins/MaterialPlugins/MaterialTrack.hpp
@@ -1,13 +1,13 @@
-// This file is part of the ACTS project.
+// This file is part of the Acts project.
 //
-// Copyright (C) 2017 ACTS project team
+// Copyright (C) 2017 Acts project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
 // file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 ///////////////////////////////////////////////////////////////////
-// MaterialTrack.hpp, ACTS project MaterialPlugins
+// MaterialTrack.hpp, Acts project MaterialPlugins
 ///////////////////////////////////////////////////////////////////
 
 #pragma once
diff --git a/Plugins/MaterialPlugin/include/Acts/Plugins/MaterialPlugins/SurfaceMaterialRecord.hpp b/Plugins/MaterialPlugin/include/Acts/Plugins/MaterialPlugins/SurfaceMaterialRecord.hpp
index 2317ecc83dfbcd213db3d161e4dbe63e72352e2f..8a3709253da556509f5c4755abe7680e72d2ecdf 100644
--- a/Plugins/MaterialPlugin/include/Acts/Plugins/MaterialPlugins/SurfaceMaterialRecord.hpp
+++ b/Plugins/MaterialPlugin/include/Acts/Plugins/MaterialPlugins/SurfaceMaterialRecord.hpp
@@ -1,13 +1,13 @@
-// This file is part of the ACTS project.
+// This file is part of the Acts project.
 //
-// Copyright (C) 2017 ACTS project team
+// Copyright (C) 2017 Acts project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
 // file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 ///////////////////////////////////////////////////////////////////
-// SurfaceMaterialRecord.h, ACTS project MaterialPlugins
+// SurfaceMaterialRecord.h, Acts project MaterialPlugins
 ///////////////////////////////////////////////////////////////////
 
 #pragma once
diff --git a/Plugins/MaterialPlugin/src/MaterialMapper.cpp b/Plugins/MaterialPlugin/src/MaterialMapper.cpp
index 23b22577e42dcce3aa728f2dccd92c968001300f..61a9cd90f4567eaeb4a8514633c6fcbec099f0c2 100644
--- a/Plugins/MaterialPlugin/src/MaterialMapper.cpp
+++ b/Plugins/MaterialPlugin/src/MaterialMapper.cpp
@@ -1,13 +1,13 @@
-// This file is part of the ACTS project.
+// This file is part of the Acts project.
 //
-// Copyright (C) 2017 ACTS project team
+// Copyright (C) 2017 Acts project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
 // file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 ///////////////////////////////////////////////////////////////////
-// MaterialMapper.cpp, ACTS project
+// MaterialMapper.cpp, Acts project
 ///////////////////////////////////////////////////////////////////
 
 #include "Acts/Plugins/MaterialPlugins/MaterialMapper.hpp"
@@ -94,7 +94,7 @@ Acts::MaterialMapper::mapMaterialTrack(Cache&               mappingCache,
   // collect for validation output
   std::map<geo_id_value, std::pair<double, double>> collectedMaterial;
 
-  // let's extrapolate through the ACTS detector and record all surfaces
+  // let's extrapolate through the Acts detector and record all surfaces
   // that have a material proxy
   if (materialSteps.size()) {
     // get the number of materialsteps
diff --git a/Plugins/MaterialPlugin/src/MaterialStep.cpp b/Plugins/MaterialPlugin/src/MaterialStep.cpp
index 137b6ba3c168b23891f2dc455591282379a8363b..9482de1be58c6f22dce7bdd85c30e87a1841eeda 100644
--- a/Plugins/MaterialPlugin/src/MaterialStep.cpp
+++ b/Plugins/MaterialPlugin/src/MaterialStep.cpp
@@ -1,13 +1,13 @@
-// This file is part of the ACTS project.
+// This file is part of the Acts project.
 //
-// Copyright (C) 2017 ACTS project team
+// Copyright (C) 2017 Acts project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
 // file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 ///////////////////////////////////////////////////////////////////
-// MaterialStep.cpp, ACTS project
+// MaterialStep.cpp, Acts project
 ///////////////////////////////////////////////////////////////////
 
 #include "Acts/Plugins/MaterialPlugins/MaterialStep.hpp"
diff --git a/Plugins/MaterialPlugin/src/MaterialTrack.cpp b/Plugins/MaterialPlugin/src/MaterialTrack.cpp
index e7fa1d13d38392b5cac282253be927dcefcdf2b4..52382103906e8e31c28311a18748cca281162884 100644
--- a/Plugins/MaterialPlugin/src/MaterialTrack.cpp
+++ b/Plugins/MaterialPlugin/src/MaterialTrack.cpp
@@ -1,13 +1,13 @@
-// This file is part of the ACTS project.
+// This file is part of the Acts project.
 //
-// Copyright (C) 2017 ACTS project team
+// Copyright (C) 2017 Acts project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
 // file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 ///////////////////////////////////////////////////////////////////
-// MaterialTrack.cpp, ACTS project
+// MaterialTrack.cpp, Acts project
 ///////////////////////////////////////////////////////////////////
 
 #include "Acts/Plugins/MaterialPlugins/MaterialTrack.hpp"
diff --git a/Plugins/MaterialPlugin/src/SurfaceMaterialRecord.cpp b/Plugins/MaterialPlugin/src/SurfaceMaterialRecord.cpp
index 1a73fa0c00acf1dc80f8228d0f83fd9c1736ee6c..fc117da684dd915ab24000a71a47a4b950761741 100644
--- a/Plugins/MaterialPlugin/src/SurfaceMaterialRecord.cpp
+++ b/Plugins/MaterialPlugin/src/SurfaceMaterialRecord.cpp
@@ -1,13 +1,13 @@
-// This file is part of the ACTS project.
+// This file is part of the Acts project.
 //
-// Copyright (C) 2017 ACTS project team
+// Copyright (C) 2017 Acts project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
 // file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 ///////////////////////////////////////////////////////////////////
-// SurfaceMaterialRecord.cpp, ACTS project
+// SurfaceMaterialRecord.cpp, Acts project
 ///////////////////////////////////////////////////////////////////
 
 #include "Acts/Plugins/MaterialPlugins/SurfaceMaterialRecord.hpp"
diff --git a/Plugins/TGeoPlugin/include/Acts/Plugins/TGeoPlugins/TGeoDetectorElement.hpp b/Plugins/TGeoPlugin/include/Acts/Plugins/TGeoPlugins/TGeoDetectorElement.hpp
index dc86905d8d85d215f8c62349f5316a1c2a6dba0a..e50664a1babd45fac8ff62f0df4ce9a0ab8a9eb4 100644
--- a/Plugins/TGeoPlugin/include/Acts/Plugins/TGeoPlugins/TGeoDetectorElement.hpp
+++ b/Plugins/TGeoPlugin/include/Acts/Plugins/TGeoPlugins/TGeoDetectorElement.hpp
@@ -1,13 +1,13 @@
-// This file is part of the ACTS project.
+// This file is part of the Acts project.
 //
-// Copyright (C) 2017 ACTS project team
+// Copyright (C) 2017 Acts project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
 // file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 ///////////////////////////////////////////////////////////////////
-// TGeoDetectorElement.h, ACTS project, TGeoDetector plugin
+// TGeoDetectorElement.h, Acts project, TGeoDetector plugin
 ///////////////////////////////////////////////////////////////////
 
 #pragma once
diff --git a/Plugins/TGeoPlugin/include/Acts/Plugins/TGeoPlugins/TGeoLayerBuilder.hpp b/Plugins/TGeoPlugin/include/Acts/Plugins/TGeoPlugins/TGeoLayerBuilder.hpp
index 7df4daf867cd6da5df9a6f4a37507897ed030aae..73fe2364df012f78aaf6e5227add222ca3674a72 100644
--- a/Plugins/TGeoPlugin/include/Acts/Plugins/TGeoPlugins/TGeoLayerBuilder.hpp
+++ b/Plugins/TGeoPlugin/include/Acts/Plugins/TGeoPlugins/TGeoLayerBuilder.hpp
@@ -1,13 +1,13 @@
-// This file is part of the ACTS project.
+// This file is part of the Acts project.
 //
-// Copyright (C) 2017 ACTS project team
+// Copyright (C) 2017 Acts project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
 // file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 ///////////////////////////////////////////////////////////////////
-// TGeoLayerBuilder.h, ACTS project, TGeoDetector plugin
+// TGeoLayerBuilder.h, Acts project, TGeoDetector plugin
 ///////////////////////////////////////////////////////////////////
 
 #pragma once
diff --git a/Plugins/TGeoPlugin/src/TGeoDetectorElement.cpp b/Plugins/TGeoPlugin/src/TGeoDetectorElement.cpp
index 38b6a316a62c4c222100985165741bdfd4658e55..aed6dcff29f7a81c6c27fd018d9eb677008f8de7 100644
--- a/Plugins/TGeoPlugin/src/TGeoDetectorElement.cpp
+++ b/Plugins/TGeoPlugin/src/TGeoDetectorElement.cpp
@@ -1,6 +1,6 @@
-// This file is part of the ACTS project.
+// This file is part of the Acts project.
 //
-// Copyright (C) 2017-2018 ACTS project team
+// Copyright (C) 2017-2018 Acts project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/Plugins/TGeoPlugin/src/TGeoLayerBuilder.cpp b/Plugins/TGeoPlugin/src/TGeoLayerBuilder.cpp
index d9ef55c6e6de559e142937c9b678676bb069d657..7485be72eb07741387b38fdc01f677307f161229 100644
--- a/Plugins/TGeoPlugin/src/TGeoLayerBuilder.cpp
+++ b/Plugins/TGeoPlugin/src/TGeoLayerBuilder.cpp
@@ -1,6 +1,6 @@
-// This file is part of the ACTS project.
+// This file is part of the Acts project.
 //
-// Copyright (C) 2017-2018 ACTS project team
+// Copyright (C) 2017-2018 Acts project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/README.md b/README.md
index f8e166fbdd760cb99e6cff02338fab527e71b283..647f7ecbc908852f69cc4e423ce22d98e081a834 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-# A Common Tracking Software (ACTS) Project
+# A Common Tracking Software (Acts) Project
 
 [![build status](https://gitlab.cern.ch/acts/acts-core/badges/master/build.svg)](https://gitlab.cern.ch/acts/acts-core/commits/master)
 [![coverage report](https://gitlab.cern.ch/acts/acts-core/badges/master/coverage.svg)](https://gitlab.cern.ch/acts/acts-core/commits/master)
@@ -17,18 +17,18 @@ Key features of this project include:
 * performant and highly flexible algorithms for track propagation and fitting,
 * basic seed finding algorithms.
 
-The git repository for the ACTS project can be found at <a href="https://gitlab.cern.ch/acts/acts-core.git">https://gitlab.cern.ch/acts/acts-core.git</a>.
+The git repository for the Acts project can be found at <a href="https://gitlab.cern.ch/acts/acts-core.git">https://gitlab.cern.ch/acts/acts-core.git</a>.
 
 To get started, you can have a look at our [Getting Started Guide](getting_started.md)
 
 # <a name="mailing-list">Mailing list</a>
 
-In order to receive the latest updates, users of the ACTS project are encouraged to subscribe to [acts-users@cern.ch](https://e-groups.cern.ch/e-groups/Egroup.do?egroupName=acts-users). This list provides:
+In order to receive the latest updates, users of the Acts project are encouraged to subscribe to [acts-users@cern.ch](https://e-groups.cern.ch/e-groups/Egroup.do?egroupName=acts-users). This list provides:
 - regular updates on the software,
-- access to the ACTS JIRA project for bug fixes/feature requests,
+- access to the Acts JIRA project for bug fixes/feature requests,
 - a common place for asking any kind of questions.
 
-If you find a bug, have a feature request, or want to contribute to ACTS, please have a look at the [contribution guide](CONTRIBUTING.md).
+If you find a bug, have a feature request, or want to contribute to Acts, please have a look at the [contribution guide](CONTRIBUTING.md).
 
 # <a name="license-authors">License and authors</a>
 
@@ -36,12 +36,12 @@ This project is published under the Mozilla Public License, v. 2.0. Details of
 this license can be found in the [LICENSE](LICENSE) file or at
 http://mozilla.org/MPL/2.0/.
 
-Contributors to the ACTS project are listed in [AUTHORS](AUTHORS).
+Contributors to the Acts project are listed in [AUTHORS](AUTHORS).
 
-The ACTS project is based on the ATLAS tracking software. A list of contributors
+The Acts project is based on the ATLAS tracking software. A list of contributors
 to the ATLAS tracking repository can be found <a href="http://acts.web.cern.ch/ACTS/ATLAS_authors.html">here</a>.
 
-The ACTS project contains a copy of [gcovr](http://gcovr.com) licensed under
+The Acts project contains a copy of [gcovr](http://gcovr.com) licensed under
 the 3-Clause BSD license.
 
 This software contains a copy of the `JSON for Modern C++`-library by Niels Lohmann licensed under the MIT License.
diff --git a/Tests/Detector/GeometryCreation.hpp b/Tests/Detector/GeometryCreation.hpp
index d440b7fb72702faf84458429b65e4a251af2b3ed..93b1fb8e447e0dc1af7c4de760c529fff1ed9c2a 100644
--- a/Tests/Detector/GeometryCreation.hpp
+++ b/Tests/Detector/GeometryCreation.hpp
@@ -1,6 +1,6 @@
-// This file is part of the ACTS project.
+// This file is part of the Acts project.
 //
-// Copyright (C) 2016-2018 ACTS project team
+// Copyright (C) 2016-2018 Acts project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/Tests/Detector/TrackingGeometryClosureTests.cpp b/Tests/Detector/TrackingGeometryClosureTests.cpp
index 98c60a7e2186c9d5fb3c6032263374098c642d69..6961bbd44fc78608a1d0408dc87125f5ad98122a 100644
--- a/Tests/Detector/TrackingGeometryClosureTests.cpp
+++ b/Tests/Detector/TrackingGeometryClosureTests.cpp
@@ -1,6 +1,6 @@
-// This file is part of the ACTS project.
+// This file is part of the Acts project.
 //
-// Copyright (C) 2017 ACTS project team
+// Copyright (C) 2017 Acts project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/Tests/Detector/TrackingGeometryGeoIDTests.cpp b/Tests/Detector/TrackingGeometryGeoIDTests.cpp
index 06e38c1260631b514d5bed34a076158ef265ebe9..f0ab025f7bd555d039aa3085ae26a60ecbdc168f 100644
--- a/Tests/Detector/TrackingGeometryGeoIDTests.cpp
+++ b/Tests/Detector/TrackingGeometryGeoIDTests.cpp
@@ -1,6 +1,6 @@
-// This file is part of the ACTS project.
+// This file is part of the Acts project.
 //
-// Copyright (C) 2017 ACTS project team
+// Copyright (C) 2017 Acts project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/Tests/Digitization/ClusterizationTests.cpp b/Tests/Digitization/ClusterizationTests.cpp
index a5add5331e902b6feac33557499f5b6896133943..c21f067b70875652a7b7e080c78fa9337988e953 100644
--- a/Tests/Digitization/ClusterizationTests.cpp
+++ b/Tests/Digitization/ClusterizationTests.cpp
@@ -1,6 +1,6 @@
-// This file is part of the ACTS project.
+// This file is part of the Acts project.
 //
-// Copyright (C) 2018 ACTS project team
+// Copyright (C) 2018 Acts project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/Tests/EventData/BoundParametersTests.cpp b/Tests/EventData/BoundParametersTests.cpp
index 797685d86133a5e64f23ad62549917c72a0b4542..590e7903cc04d5296c961b88f5356d2cbe3b9a21 100644
--- a/Tests/EventData/BoundParametersTests.cpp
+++ b/Tests/EventData/BoundParametersTests.cpp
@@ -1,6 +1,6 @@
-// This file is part of the ACTS project.
+// This file is part of the Acts project.
 //
-// Copyright (C) 2017-2018 ACTS project team
+// Copyright (C) 2017-2018 Acts project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/Tests/EventData/CurvilinearParametersTests.cpp b/Tests/EventData/CurvilinearParametersTests.cpp
index d7a333173c78890e7afa90352784c76ea33657d6..5628d245e2d783ed0bd6c00ee2d55a0058f514b2 100644
--- a/Tests/EventData/CurvilinearParametersTests.cpp
+++ b/Tests/EventData/CurvilinearParametersTests.cpp
@@ -1,6 +1,6 @@
-// This file is part of the ACTS project.
+// This file is part of the Acts project.
 //
-// Copyright (C) 2017 ACTS project team
+// Copyright (C) 2017 Acts project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/Tests/EventData/MeasurementTests.cpp b/Tests/EventData/MeasurementTests.cpp
index b50615cd92996aaf16416369771c34ae21a1d968..a28ef10b930ef771cf10d158bfa37f00cabb4ace 100644
--- a/Tests/EventData/MeasurementTests.cpp
+++ b/Tests/EventData/MeasurementTests.cpp
@@ -1,6 +1,6 @@
-// This file is part of the ACTS project.
+// This file is part of the Acts project.
 //
-// Copyright (C) 2016-2017 ACTS project team
+// Copyright (C) 2016-2017 Acts project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
@@ -10,7 +10,7 @@
 #define BOOST_TEST_MODULE Measurement Tests
 #include <boost/test/included/unit_test.hpp>
 
-// ACTS include(s)
+// Acts include(s)
 #include "Acts/EventData/Measurement.hpp"
 #include "Acts/Surfaces/CylinderSurface.hpp"
 #include "Acts/Utilities/ParameterDefinitions.hpp"
diff --git a/Tests/EventData/ParameterSetTests.cpp b/Tests/EventData/ParameterSetTests.cpp
index 14dbe90ee56d49e2fed6d1ae56e4231d89ae7a07..501d8f7fbb803a1e89efd8695970a36d5f93b642 100644
--- a/Tests/EventData/ParameterSetTests.cpp
+++ b/Tests/EventData/ParameterSetTests.cpp
@@ -1,6 +1,6 @@
-// This file is part of the ACTS project.
+// This file is part of the Acts project.
 //
-// Copyright (C) 2016-2017 ACTS project team
+// Copyright (C) 2016-2017 Acts project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/Tests/EventData/ParametersTestHelper.hpp b/Tests/EventData/ParametersTestHelper.hpp
index 1f4c8162da86c8bf46dbb355ac0543149787e231..a702d31a9fc012f12d08f3534cf2f51660e7614c 100644
--- a/Tests/EventData/ParametersTestHelper.hpp
+++ b/Tests/EventData/ParametersTestHelper.hpp
@@ -1,6 +1,6 @@
-// This file is part of the ACTS project.
+// This file is part of the Acts project.
 //
-// Copyright (C) 2017 ACTS project team
+// Copyright (C) 2017 Acts project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/Tests/Extrapolation/ExtrapolationCellTests.cpp b/Tests/Extrapolation/ExtrapolationCellTests.cpp
index 87f9b4a4eb368acf7bd639a0fca1657badea5553..4833f7c987bcd96f42bfdb4bb53740b07b2297dc 100644
--- a/Tests/Extrapolation/ExtrapolationCellTests.cpp
+++ b/Tests/Extrapolation/ExtrapolationCellTests.cpp
@@ -1,6 +1,6 @@
-// This file is part of the ACTS project.
+// This file is part of the Acts project.
 //
-// Copyright (C) 2017 ACTS project team
+// Copyright (C) 2017 Acts project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/Tests/Fitter/GainMatrixTests.cpp b/Tests/Fitter/GainMatrixTests.cpp
index 9538b383180fb291e1cbae8a7f1cb519b6f46cc0..8ef6ecae19ec8d6c9d9f9beb41ab45d6a4d1047c 100644
--- a/Tests/Fitter/GainMatrixTests.cpp
+++ b/Tests/Fitter/GainMatrixTests.cpp
@@ -1,6 +1,6 @@
-// This file is part of the ACTS project.
+// This file is part of the Acts project.
 //
-// Copyright (C) 2016-2017 ACTS project team
+// Copyright (C) 2016-2017 Acts project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/Tests/Fitter/KalmanFilterTestUtils.hpp b/Tests/Fitter/KalmanFilterTestUtils.hpp
index 6e68bff286cf1f1049f9979cf415a98643220a19..f9eb11744b28ab1d50225ac2c97a4ab1c5df682e 100644
--- a/Tests/Fitter/KalmanFilterTestUtils.hpp
+++ b/Tests/Fitter/KalmanFilterTestUtils.hpp
@@ -1,6 +1,6 @@
-// This file is part of the ACTS project.
+// This file is part of the Acts project.
 //
-// Copyright (C) 2017-2018 ACTS project team
+// Copyright (C) 2017-2018 Acts project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/Tests/Fitter/KalmanFilterTests.cpp b/Tests/Fitter/KalmanFilterTests.cpp
index cdbfbbe31077c3b5d7870a6d83e7377092e34640..5266c27daf9c7219baf844cd714bfa41b942616a 100644
--- a/Tests/Fitter/KalmanFilterTests.cpp
+++ b/Tests/Fitter/KalmanFilterTests.cpp
@@ -1,6 +1,6 @@
-// This file is part of the ACTS project.
+// This file is part of the Acts project.
 //
-// Copyright (C) 2017 ACTS project team
+// Copyright (C) 2017 Acts project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/Tests/Json/FromJsonTests.cpp b/Tests/Json/FromJsonTests.cpp
index 4aa8b00ff5f00736c17fa5b38a616fa1de77a151..c64fb38f39aa47e856822be98285ecd73921c567 100644
--- a/Tests/Json/FromJsonTests.cpp
+++ b/Tests/Json/FromJsonTests.cpp
@@ -1,6 +1,6 @@
-// This file is part of the ACTS project.
+// This file is part of the Acts project.
 //
-// Copyright (C) 2017 ACTS project team
+// Copyright (C) 2017 Acts project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/Tests/Layers/ConeLayerTests.cpp b/Tests/Layers/ConeLayerTests.cpp
index 708b1d705dfb2918542afa85d5cdad895e31b181..66bc5889a6288370e485cebb4ddefbedf26396da 100644
--- a/Tests/Layers/ConeLayerTests.cpp
+++ b/Tests/Layers/ConeLayerTests.cpp
@@ -1,6 +1,6 @@
-// This file is part of the ACTS project.
+// This file is part of the Acts project.
 //
-// Copyright (C) 2017-2018 ACTS project team
+// Copyright (C) 2017-2018 Acts project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/Tests/Layers/CylinderLayerTests.cpp b/Tests/Layers/CylinderLayerTests.cpp
index c2fe0406376cce6ecd15919a27a258323010f017..c4192e684373bde79b42c07f8de9553fe3dc9d13 100644
--- a/Tests/Layers/CylinderLayerTests.cpp
+++ b/Tests/Layers/CylinderLayerTests.cpp
@@ -1,6 +1,6 @@
-// This file is part of the ACTS project.
+// This file is part of the Acts project.
 //
-// Copyright (C) 2017-2018 ACTS project team
+// Copyright (C) 2017-2018 Acts project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/Tests/Layers/DiscLayerTests.cpp b/Tests/Layers/DiscLayerTests.cpp
index cecc5df9c1aed182de1e439478d06a1b5df1221a..71480074f6ea2005c811ed17bd6bb966ea4aed4f 100644
--- a/Tests/Layers/DiscLayerTests.cpp
+++ b/Tests/Layers/DiscLayerTests.cpp
@@ -1,6 +1,6 @@
-// This file is part of the ACTS project.
+// This file is part of the Acts project.
 //
-// Copyright (C) 2017-2018 ACTS project team
+// Copyright (C) 2017-2018 Acts project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/Tests/Layers/GenericApproachDescriptorTests.cpp b/Tests/Layers/GenericApproachDescriptorTests.cpp
index a9496cb645c3a4efba55e93efaae3894bbd0b5da..c4ac58a8c5f155aab000fafcb6040e20ed77c97e 100644
--- a/Tests/Layers/GenericApproachDescriptorTests.cpp
+++ b/Tests/Layers/GenericApproachDescriptorTests.cpp
@@ -1,6 +1,6 @@
-// This file is part of the ACTS project.
+// This file is part of the Acts project.
 //
-// Copyright (C) 2017-2018 ACTS project team
+// Copyright (C) 2017-2018 Acts project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/Tests/Layers/LayerStub.hpp b/Tests/Layers/LayerStub.hpp
index d203b069dfb512ad0fac166aba75ec66f0d958fb..005d84115a89a662855ac4ab17fa3dff96710a89 100644
--- a/Tests/Layers/LayerStub.hpp
+++ b/Tests/Layers/LayerStub.hpp
@@ -1,6 +1,6 @@
-// This file is part of the ACTS project.
+// This file is part of the Acts project.
 //
-// Copyright (C) 2017 ACTS project team
+// Copyright (C) 2017 Acts project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/Tests/Layers/LayerTests.cpp b/Tests/Layers/LayerTests.cpp
index f2e0a4093305a24d931a85fced932b1ecf9f5549..315f544a57e3b69f71fc0359cf6ce21995e499b3 100644
--- a/Tests/Layers/LayerTests.cpp
+++ b/Tests/Layers/LayerTests.cpp
@@ -1,6 +1,6 @@
-// This file is part of the ACTS project.
+// This file is part of the Acts project.
 //
-// Copyright (C) 2017-2018 ACTS project team
+// Copyright (C) 2017-2018 Acts project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/Tests/Layers/NavigationLayerTests.cpp b/Tests/Layers/NavigationLayerTests.cpp
index ecba4aa1bdcd0b1bec984afea8b131dc34c9c9a7..feb4d55c2fb5074f797ab14159b171c1e40b37b4 100644
--- a/Tests/Layers/NavigationLayerTests.cpp
+++ b/Tests/Layers/NavigationLayerTests.cpp
@@ -1,6 +1,6 @@
-// This file is part of the ACTS project.
+// This file is part of the Acts project.
 //
-// Copyright (C) 2017-2018 ACTS project team
+// Copyright (C) 2017-2018 Acts project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/Tests/Layers/PlaneLayerTests.cpp b/Tests/Layers/PlaneLayerTests.cpp
index 8a8ef825456d2ecd67c11e221bbd9f83db4f7e60..27f6d4fdf2e331fdba3b8c2ca4888d190d7b4b38 100644
--- a/Tests/Layers/PlaneLayerTests.cpp
+++ b/Tests/Layers/PlaneLayerTests.cpp
@@ -1,6 +1,6 @@
-// This file is part of the ACTS project.
+// This file is part of the Acts project.
 //
-// Copyright (C) 2017-2018 ACTS project team
+// Copyright (C) 2017-2018 Acts project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/Tests/Layers/ProtoLayerTests.cpp b/Tests/Layers/ProtoLayerTests.cpp
index 9975ab255341916cf43380f03218cb911ba31cda..16d532ed20ba343757c49dfb9bc91655080a220f 100644
--- a/Tests/Layers/ProtoLayerTests.cpp
+++ b/Tests/Layers/ProtoLayerTests.cpp
@@ -1,6 +1,6 @@
-// This file is part of the ACTS project.
+// This file is part of the Acts project.
 //
-// Copyright (C) 2018 ACTS project team
+// Copyright (C) 2018 Acts project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/Tests/MagneticField/ConstantBFieldTests.cpp b/Tests/MagneticField/ConstantBFieldTests.cpp
index 03ea388e022bb3c72ca9078143140d34e7cd37df..22e43d94360e360a44dddaf99c8103dd89d02044 100644
--- a/Tests/MagneticField/ConstantBFieldTests.cpp
+++ b/Tests/MagneticField/ConstantBFieldTests.cpp
@@ -1,6 +1,6 @@
-// This file is part of the ACTS project.
+// This file is part of the Acts project.
 //
-// Copyright (C) 2017-2018 ACTS project team
+// Copyright (C) 2017-2018 Acts project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/Tests/MagneticField/InterpolatedBFieldMapTests.cpp b/Tests/MagneticField/InterpolatedBFieldMapTests.cpp
index bbaf670e186c914dcba7d2e6527e74ac6cb8c5a1..09caaf72a49716065f621c73b93221a48e56e943 100644
--- a/Tests/MagneticField/InterpolatedBFieldMapTests.cpp
+++ b/Tests/MagneticField/InterpolatedBFieldMapTests.cpp
@@ -1,6 +1,6 @@
-// This file is part of the ACTS project.
+// This file is part of the Acts project.
 //
-// Copyright (C) 2017 ACTS project team
+// Copyright (C) 2017 Acts project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/Tests/Material/MaterialPropertiesTests.cpp b/Tests/Material/MaterialPropertiesTests.cpp
index 543980893a91d7419acd662b27e992e229207971..b7604fa586dcf4fb228c7cb3e0cc316be6490848 100644
--- a/Tests/Material/MaterialPropertiesTests.cpp
+++ b/Tests/Material/MaterialPropertiesTests.cpp
@@ -1,6 +1,6 @@
-// This file is part of the ACTS project.
+// This file is part of the Acts project.
 //
-// Copyright (C) 2017 ACTS project team
+// Copyright (C) 2017 Acts project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/Tests/Material/MaterialTests.cpp b/Tests/Material/MaterialTests.cpp
index c0643ccfcc15fc6019cbfd868d6a5ce91df85f54..ca67bf6e7418c99a96a2b0ff99ec80c6db611889 100644
--- a/Tests/Material/MaterialTests.cpp
+++ b/Tests/Material/MaterialTests.cpp
@@ -1,6 +1,6 @@
-// This file is part of the ACTS project.
+// This file is part of the Acts project.
 //
-// Copyright (C) 2017 ACTS project team
+// Copyright (C) 2017 Acts project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/Tests/MaterialMapping/MaterialMappingTests.cpp b/Tests/MaterialMapping/MaterialMappingTests.cpp
index 88a0c7f9e7fdaf0205c5b019ef1fc65b887c7335..218b02e3961c6b5d69e1860ce2af0efa9153d180 100644
--- a/Tests/MaterialMapping/MaterialMappingTests.cpp
+++ b/Tests/MaterialMapping/MaterialMappingTests.cpp
@@ -1,6 +1,6 @@
-// This file is part of the ACTS project.
+// This file is part of the Acts project.
 //
-// Copyright (C) 2017 ACTS project team
+// Copyright (C) 2017 Acts project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/Tests/Propagator/AbortListTests.cpp b/Tests/Propagator/AbortListTests.cpp
index 5300bdef4ef1ef118038c6a26c7789155246711d..6f92674693c1d82bfb712c7f6c3ea3e0d2bcdb08 100644
--- a/Tests/Propagator/AbortListTests.cpp
+++ b/Tests/Propagator/AbortListTests.cpp
@@ -1,6 +1,6 @@
-// This file is part of the ACTS project.
+// This file is part of the Acts project.
 //
-// Copyright (C) 2017-2018 ACTS project team
+// Copyright (C) 2017-2018 Acts project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/Tests/Propagator/ActionListTests.cpp b/Tests/Propagator/ActionListTests.cpp
index 80dccdec17704bff10d78722482776657e4378f1..02d1ca73894af404876adcc7e5eedfef64a64761 100644
--- a/Tests/Propagator/ActionListTests.cpp
+++ b/Tests/Propagator/ActionListTests.cpp
@@ -1,6 +1,6 @@
-// This file is part of the ACTS project.
+// This file is part of the Acts project.
 //
-// Copyright (C) 2016-2018 ACTS project team
+// Copyright (C) 2016-2018 Acts project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/Tests/Propagator/AtlasPropagatorBenchmark.cpp b/Tests/Propagator/AtlasPropagatorBenchmark.cpp
index 54bc5831d8dc90d5956451bb47665fd6823899d4..6cf3dafc503ad2b45a9e8af432c096b76e6929eb 100644
--- a/Tests/Propagator/AtlasPropagatorBenchmark.cpp
+++ b/Tests/Propagator/AtlasPropagatorBenchmark.cpp
@@ -1,6 +1,6 @@
-// This file is part of the ACTS project.
+// This file is part of the Acts project.
 //
-// Copyright (C) 2017 ACTS project team
+// Copyright (C) 2017 Acts project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/Tests/Propagator/AtlasStepperBenchmark.cpp b/Tests/Propagator/AtlasStepperBenchmark.cpp
index 85d6ca5b2b63f60b7970bd438e3e309bbb756c0b..69ffbcd88538769887c3dfdc7a0634c5cc076214 100644
--- a/Tests/Propagator/AtlasStepperBenchmark.cpp
+++ b/Tests/Propagator/AtlasStepperBenchmark.cpp
@@ -1,6 +1,6 @@
-// This file is part of the ACTS project.
+// This file is part of the Acts project.
 //
-// Copyright (C) 2017 ACTS project team
+// Copyright (C) 2017 Acts project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/Tests/Propagator/EigenStepperBenchmark.cpp b/Tests/Propagator/EigenStepperBenchmark.cpp
index 599b2682e2443eb4f31615e0ceb694e82ded292a..91a1b378f30d66815593d206dcd4b958aeb7aa1d 100644
--- a/Tests/Propagator/EigenStepperBenchmark.cpp
+++ b/Tests/Propagator/EigenStepperBenchmark.cpp
@@ -1,6 +1,6 @@
-// This file is part of the ACTS project.
+// This file is part of the Acts project.
 //
-// Copyright (C) 2017 ACTS project team
+// Copyright (C) 2017 Acts project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/Tests/Propagator/ExtendableTests.cpp b/Tests/Propagator/ExtendableTests.cpp
index 1d299351db11a179aa940982c59451bb918ad9da..0c20b932b4afd957e8cdc99360dbd108de04f8b7 100644
--- a/Tests/Propagator/ExtendableTests.cpp
+++ b/Tests/Propagator/ExtendableTests.cpp
@@ -1,6 +1,6 @@
-// This file is part of the ACTS project.
+// This file is part of the Acts project.
 //
-// Copyright (C) 2016-2018 ACTS project team
+// Copyright (C) 2016-2018 Acts project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/Tests/Propagator/JacobianTests.cpp b/Tests/Propagator/JacobianTests.cpp
index 03417515aa07b6954ed401aba2ece0c7e220c48e..9cc42cd6eab6c5bbb280efc8f7ca4e8317473f3d 100644
--- a/Tests/Propagator/JacobianTests.cpp
+++ b/Tests/Propagator/JacobianTests.cpp
@@ -1,6 +1,6 @@
-// This file is part of the ACTS project.
+// This file is part of the Acts project.
 //
-// Copyright (C) 2018 ACTS project team
+// Copyright (C) 2018 Acts project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/Tests/Propagator/PropagatorTests.cpp b/Tests/Propagator/PropagatorTests.cpp
index 82b709d63568169c43373b9cbe071e6e51b50318..397450b5155d02888128f5ad7f19170a5cc66aa3 100644
--- a/Tests/Propagator/PropagatorTests.cpp
+++ b/Tests/Propagator/PropagatorTests.cpp
@@ -1,6 +1,6 @@
-// This file is part of the ACTS project.
+// This file is part of the Acts project.
 //
-// Copyright (C) 2016-2018 ACTS project team
+// Copyright (C) 2016-2018 Acts project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/Tests/Propagator/RungeKuttaEngineTests.cpp b/Tests/Propagator/RungeKuttaEngineTests.cpp
index 36e0938c9dbd525b94c9e085f1432ce5c893194f..1bd4c6fab5663dae4ba8af99e070fcc4d6755fe7 100644
--- a/Tests/Propagator/RungeKuttaEngineTests.cpp
+++ b/Tests/Propagator/RungeKuttaEngineTests.cpp
@@ -1,6 +1,6 @@
-// This file is part of the ACTS project.
+// This file is part of the Acts project.
 //
-// Copyright (C) 2017-2018 ACTS project team
+// Copyright (C) 2017-2018 Acts project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/Tests/Seeding/SeedingTests.cpp b/Tests/Seeding/SeedingTests.cpp
index 54f74ef54b45d984cf9bceb7d2d2553cb0df7d34..a5cef9b0437f490f9f05f7fd9cf35840a11d38e5 100644
--- a/Tests/Seeding/SeedingTests.cpp
+++ b/Tests/Seeding/SeedingTests.cpp
@@ -1,6 +1,6 @@
-// This file is part of the ACTS project.
+// This file is part of the Acts project.
 //
-// Copyright (C) 2016-2017 ACTS project team
+// Copyright (C) 2016-2017 Acts project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/Tests/Seeding/SeedingTestsCommon.hpp b/Tests/Seeding/SeedingTestsCommon.hpp
index 454c126307ad1c2bfb1b752e552012611e463910..c098fd58cf4587623ad3799899ececc01c1c2b7d 100644
--- a/Tests/Seeding/SeedingTestsCommon.hpp
+++ b/Tests/Seeding/SeedingTestsCommon.hpp
@@ -1,6 +1,6 @@
-// This file is part of the ACTS project.
+// This file is part of the Acts project.
 //
-// Copyright (C) 2016 ACTS project team
+// Copyright (C) 2016 Acts project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/Tests/Seeding/SeedingToolsTests.cpp b/Tests/Seeding/SeedingToolsTests.cpp
index 1b0a2647e6828d9ee1df742a194ab11de9634bdc..81f116e08317694bad3b50db9410bea871e844e2 100644
--- a/Tests/Seeding/SeedingToolsTests.cpp
+++ b/Tests/Seeding/SeedingToolsTests.cpp
@@ -1,6 +1,6 @@
-// This file is part of the ACTS project.
+// This file is part of the Acts project.
 //
-// Copyright (C) 2016 ACTS project team
+// Copyright (C) 2016 Acts project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/Tests/Surfaces/BoundaryCheckBenchmark.cpp b/Tests/Surfaces/BoundaryCheckBenchmark.cpp
index aed01017dcd0217a52e4f2c520c8f1ea51c2740d..6102c61f35438f2e3dd99e8ea557c57bc2d8c960 100644
--- a/Tests/Surfaces/BoundaryCheckBenchmark.cpp
+++ b/Tests/Surfaces/BoundaryCheckBenchmark.cpp
@@ -1,6 +1,6 @@
-// This file is part of the ACTS project.
+// This file is part of the Acts project.
 //
-// Copyright (C) 2017-2018 ACTS project team
+// Copyright (C) 2017-2018 Acts project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/Tests/Surfaces/BoundaryCheckTests.cpp b/Tests/Surfaces/BoundaryCheckTests.cpp
index 9f157e0dc2c69f1220b932ba8347edc125b45e69..79b6530784a94e9d43026f409332e28cabbbd8af 100644
--- a/Tests/Surfaces/BoundaryCheckTests.cpp
+++ b/Tests/Surfaces/BoundaryCheckTests.cpp
@@ -1,6 +1,6 @@
-// This file is part of the ACTS project.
+// This file is part of the Acts project.
 //
-// Copyright (C) 2017-2018 ACTS project team
+// Copyright (C) 2017-2018 Acts project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/Tests/Surfaces/ConeBoundsTests.cpp b/Tests/Surfaces/ConeBoundsTests.cpp
index 43e46c3420708a10afb7362690f875c8bb7e0946..04a77b8bb93d0e7595078a82176fef6912f88934 100644
--- a/Tests/Surfaces/ConeBoundsTests.cpp
+++ b/Tests/Surfaces/ConeBoundsTests.cpp
@@ -1,6 +1,6 @@
-// This file is part of the ACTS project.
+// This file is part of the Acts project.
 //
-// Copyright (C) 2017-2018 ACTS project team
+// Copyright (C) 2017-2018 Acts project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/Tests/Surfaces/ConeSurfaceTests.cpp b/Tests/Surfaces/ConeSurfaceTests.cpp
index 4b6704bde3026f8b1b2ddeb2c5b791815968304b..88b9f848be582e274839b499695e335cfbb938f6 100644
--- a/Tests/Surfaces/ConeSurfaceTests.cpp
+++ b/Tests/Surfaces/ConeSurfaceTests.cpp
@@ -1,6 +1,6 @@
-// This file is part of the ACTS project.
+// This file is part of the Acts project.
 //
-// Copyright (C) 2017-2018 ACTS project team
+// Copyright (C) 2017-2018 Acts project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/Tests/Surfaces/CylinderBoundsTests.cpp b/Tests/Surfaces/CylinderBoundsTests.cpp
index d06b9e47a99ad9e652efbaaf86a10e5f77597c0b..519bc589a9dc71d5551fcd7a6f2422588705a7ea 100644
--- a/Tests/Surfaces/CylinderBoundsTests.cpp
+++ b/Tests/Surfaces/CylinderBoundsTests.cpp
@@ -1,6 +1,6 @@
-// This file is part of the ACTS project.
+// This file is part of the Acts project.
 //
-// Copyright (C) 2017-2018 ACTS project team
+// Copyright (C) 2017-2018 Acts project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/Tests/Surfaces/CylinderSurfaceTests.cpp b/Tests/Surfaces/CylinderSurfaceTests.cpp
index a7b35ae07fa4ab26953ecfe650072ec69d15f181..0651cbf89010286f918b2d20d878eb44c77071b4 100644
--- a/Tests/Surfaces/CylinderSurfaceTests.cpp
+++ b/Tests/Surfaces/CylinderSurfaceTests.cpp
@@ -1,6 +1,6 @@
-// This file is part of the ACTS project.
+// This file is part of the Acts project.
 //
-// Copyright (C) 2017-2018 ACTS project team
+// Copyright (C) 2017-2018 Acts project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/Tests/Surfaces/DetectorElementStub.hpp b/Tests/Surfaces/DetectorElementStub.hpp
index fae56002414b45cb073744354d03edf93ca4671e..a325690c4c747558104c695bce39128533d71355 100644
--- a/Tests/Surfaces/DetectorElementStub.hpp
+++ b/Tests/Surfaces/DetectorElementStub.hpp
@@ -1,13 +1,13 @@
-// This file is part of the ACTS project.
+// This file is part of the Acts project.
 //
-// Copyright (C) 2017-2018 ACTS project team
+// Copyright (C) 2017-2018 Acts project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
 // file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 ///////////////////////////////////////////////////////////////////
-// DetectorElementStub.h, ACTS project, Generic Detector plugin
+// DetectorElementStub.h, Acts project, Generic Detector plugin
 ///////////////////////////////////////////////////////////////////
 
 #pragma once
diff --git a/Tests/Surfaces/DiamondBoundsTests.cpp b/Tests/Surfaces/DiamondBoundsTests.cpp
index 54a8ec031a205112873a2d6bb796275fd7e2ce0e..549d3d151fe67aef35db7db338578f75680b5426 100644
--- a/Tests/Surfaces/DiamondBoundsTests.cpp
+++ b/Tests/Surfaces/DiamondBoundsTests.cpp
@@ -1,6 +1,6 @@
-// This file is part of the ACTS project.
+// This file is part of the Acts project.
 //
-// Copyright (C) 2017-2018 ACTS project team
+// Copyright (C) 2017-2018 Acts project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/Tests/Surfaces/DiscSurfaceTests.cpp b/Tests/Surfaces/DiscSurfaceTests.cpp
index 31a5b4e8ce67063f3225e536437175dc2ea6366e..1591741813788b8663fda9cb31761aefe2fc7050 100644
--- a/Tests/Surfaces/DiscSurfaceTests.cpp
+++ b/Tests/Surfaces/DiscSurfaceTests.cpp
@@ -1,6 +1,6 @@
-// This file is part of the ACTS project.
+// This file is part of the Acts project.
 //
-// Copyright (C) 2017-2018 ACTS project team
+// Copyright (C) 2017-2018 Acts project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/Tests/Surfaces/DiscTrapezoidalBoundsTests.cpp b/Tests/Surfaces/DiscTrapezoidalBoundsTests.cpp
index fe4e6dbad801877179a1f05b357c6a9a2d647c37..2af02715955035f087eaafb8651e6706596995a8 100644
--- a/Tests/Surfaces/DiscTrapezoidalBoundsTests.cpp
+++ b/Tests/Surfaces/DiscTrapezoidalBoundsTests.cpp
@@ -1,6 +1,6 @@
-// This file is part of the ACTS project.
+// This file is part of the Acts project.
 //
-// Copyright (C) 2017-2018 ACTS project team
+// Copyright (C) 2017-2018 Acts project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/Tests/Surfaces/EllipseBoundsTests.cpp b/Tests/Surfaces/EllipseBoundsTests.cpp
index cb0f94a3b4a1ce682144a4f26ca50681ec0c6a8f..9133aaad936054410b1c5e4e8882a70fd32b58e9 100644
--- a/Tests/Surfaces/EllipseBoundsTests.cpp
+++ b/Tests/Surfaces/EllipseBoundsTests.cpp
@@ -1,6 +1,6 @@
-// This file is part of the ACTS project.
+// This file is part of the Acts project.
 //
-// Copyright (C) 2017-2018 ACTS project team
+// Copyright (C) 2017-2018 Acts project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/Tests/Surfaces/InfiniteBoundsTests.cpp b/Tests/Surfaces/InfiniteBoundsTests.cpp
index 27efb91793f4af5a6424bedb2f2b51c384d8bf74..3bd01c7cce071834532420923bb15508fcb131f9 100644
--- a/Tests/Surfaces/InfiniteBoundsTests.cpp
+++ b/Tests/Surfaces/InfiniteBoundsTests.cpp
@@ -1,6 +1,6 @@
-// This file is part of the ACTS project.
+// This file is part of the Acts project.
 //
-// Copyright (C) 2017-2018 ACTS project team
+// Copyright (C) 2017-2018 Acts project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/Tests/Surfaces/LineBoundsTests.cpp b/Tests/Surfaces/LineBoundsTests.cpp
index 4449877c6038e62cedc7d8d3ddd13fec15f2027d..1835ea52adfbcd29a9bda04f23c6d4427a27ad11 100644
--- a/Tests/Surfaces/LineBoundsTests.cpp
+++ b/Tests/Surfaces/LineBoundsTests.cpp
@@ -1,6 +1,6 @@
-// This file is part of the ACTS project.
+// This file is part of the Acts project.
 //
-// Copyright (C) 2017-2018 ACTS project team
+// Copyright (C) 2017-2018 Acts project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/Tests/Surfaces/LineSurfaceStub.hpp b/Tests/Surfaces/LineSurfaceStub.hpp
index fa945c145f42b310154cb87454944079edafe685..6105b3f7e0ed4c306406d72746ef09a48f2c7d49 100644
--- a/Tests/Surfaces/LineSurfaceStub.hpp
+++ b/Tests/Surfaces/LineSurfaceStub.hpp
@@ -1,6 +1,6 @@
-// This file is part of the ACTS project.
+// This file is part of the Acts project.
 //
-// Copyright (C) 2017-2018 ACTS project team
+// Copyright (C) 2017-2018 Acts project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/Tests/Surfaces/LineSurfaceTests.cpp b/Tests/Surfaces/LineSurfaceTests.cpp
index 87dd05ee4ae245c760b9553ee1b07aa429dbf1de..503c23edf72e1e92de1f6299868d2ce8aabbaf7a 100644
--- a/Tests/Surfaces/LineSurfaceTests.cpp
+++ b/Tests/Surfaces/LineSurfaceTests.cpp
@@ -1,6 +1,6 @@
-// This file is part of the ACTS project.
+// This file is part of the Acts project.
 //
-// Copyright (C) 2017-2018 ACTS project team
+// Copyright (C) 2017-2018 Acts project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/Tests/Surfaces/PerigeeSurfaceTests.cpp b/Tests/Surfaces/PerigeeSurfaceTests.cpp
index 2b54f8e89650f1dc4dff26dc08d7bad75637f4fc..532016b1bf2d3efd3edc21e9c0a328f51f068374 100644
--- a/Tests/Surfaces/PerigeeSurfaceTests.cpp
+++ b/Tests/Surfaces/PerigeeSurfaceTests.cpp
@@ -1,6 +1,6 @@
-// This file is part of the ACTS project.
+// This file is part of the Acts project.
 //
-// Copyright (C) 2017-2018 ACTS project team
+// Copyright (C) 2017-2018 Acts project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/Tests/Surfaces/PlaneSurfaceTests.cpp b/Tests/Surfaces/PlaneSurfaceTests.cpp
index 73b60b9b2cb303b014a7e24ce96471bfaff97b8e..74dde745a44ad3c89227e3ddfe1ea57e3fca9f4f 100644
--- a/Tests/Surfaces/PlaneSurfaceTests.cpp
+++ b/Tests/Surfaces/PlaneSurfaceTests.cpp
@@ -1,6 +1,6 @@
-// This file is part of the ACTS project.
+// This file is part of the Acts project.
 //
-// Copyright (C) 2017-2018 ACTS project team
+// Copyright (C) 2017-2018 Acts project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/Tests/Surfaces/RadialBoundsTests.cpp b/Tests/Surfaces/RadialBoundsTests.cpp
index e16ab6df32993d3137e043cb2c67c50aef1d12cc..a6807470c969e321f200b7e9740a3944f3f50954 100644
--- a/Tests/Surfaces/RadialBoundsTests.cpp
+++ b/Tests/Surfaces/RadialBoundsTests.cpp
@@ -1,6 +1,6 @@
-// This file is part of the ACTS project.
+// This file is part of the Acts project.
 //
-// Copyright (C) 2017-2018 ACTS project team
+// Copyright (C) 2017-2018 Acts project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/Tests/Surfaces/RectangleBoundsTests.cpp b/Tests/Surfaces/RectangleBoundsTests.cpp
index daa491d989db638e1219a5edff09a78f160872ea..7127fa817fc2af46b9513ab9b1506897ca19005b 100644
--- a/Tests/Surfaces/RectangleBoundsTests.cpp
+++ b/Tests/Surfaces/RectangleBoundsTests.cpp
@@ -1,6 +1,6 @@
-// This file is part of the ACTS project.
+// This file is part of the Acts project.
 //
-// Copyright (C) 2017-2018 ACTS project team
+// Copyright (C) 2017-2018 Acts project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/Tests/Surfaces/StrawSurfaceTests.cpp b/Tests/Surfaces/StrawSurfaceTests.cpp
index 199553e3ee034acbc512ca440bf7e8b261ed512e..42ff0b5f7a90edff31d0d6568b09d1b1b2fc0157 100644
--- a/Tests/Surfaces/StrawSurfaceTests.cpp
+++ b/Tests/Surfaces/StrawSurfaceTests.cpp
@@ -1,6 +1,6 @@
-// This file is part of the ACTS project.
+// This file is part of the Acts project.
 //
-// Copyright (C) 2017-2018 ACTS project team
+// Copyright (C) 2017-2018 Acts project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/Tests/Surfaces/SurfaceArrayTests.cpp b/Tests/Surfaces/SurfaceArrayTests.cpp
index b96c4cdd0d2edd20b3c548174551ba26c7ef77ae..b47b3aa2ab3fcfa210402815b07eb16118807a3c 100644
--- a/Tests/Surfaces/SurfaceArrayTests.cpp
+++ b/Tests/Surfaces/SurfaceArrayTests.cpp
@@ -1,6 +1,6 @@
-// This file is part of the ACTS project.
+// This file is part of the Acts project.
 //
-// Copyright (C) 2017-2018 ACTS project team
+// Copyright (C) 2017-2018 Acts project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/Tests/Surfaces/SurfaceBoundsTests.cpp b/Tests/Surfaces/SurfaceBoundsTests.cpp
index 56688e41cc184341b49c346fd66233c56adfda79..22f473be8c180d0b512909da739f8d1f41954545 100644
--- a/Tests/Surfaces/SurfaceBoundsTests.cpp
+++ b/Tests/Surfaces/SurfaceBoundsTests.cpp
@@ -1,6 +1,6 @@
-// This file is part of the ACTS project.
+// This file is part of the Acts project.
 //
-// Copyright (C) 2017-2018 ACTS project team
+// Copyright (C) 2017-2018 Acts project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/Tests/Surfaces/SurfaceStub.hpp b/Tests/Surfaces/SurfaceStub.hpp
index e8331f8175e5a43c5a6a7f7edaa0278abcd68cca..f65168bce9f2c868967cdac61c314f54b6693a5a 100644
--- a/Tests/Surfaces/SurfaceStub.hpp
+++ b/Tests/Surfaces/SurfaceStub.hpp
@@ -1,6 +1,6 @@
-// This file is part of the ACTS project.
+// This file is part of the Acts project.
 //
-// Copyright (C) 2017-2018 ACTS project team
+// Copyright (C) 2017-2018 Acts project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/Tests/Surfaces/SurfaceTests.cpp b/Tests/Surfaces/SurfaceTests.cpp
index 0bb9fde21f548953ce76c0a903675a3c47250e4d..1c0358ab538d6b2b7fe755b71eb514d87a471de2 100644
--- a/Tests/Surfaces/SurfaceTests.cpp
+++ b/Tests/Surfaces/SurfaceTests.cpp
@@ -1,6 +1,6 @@
-// This file is part of the ACTS project.
+// This file is part of the Acts project.
 //
-// Copyright (C) 2017-2018 ACTS project team
+// Copyright (C) 2017-2018 Acts project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/Tests/Surfaces/TrapezoidBoundsTests.cpp b/Tests/Surfaces/TrapezoidBoundsTests.cpp
index 76916913b35204872e2e601eb71acc68af055647..f792a47eb63c99b1a773cef7e5df8330636814b6 100644
--- a/Tests/Surfaces/TrapezoidBoundsTests.cpp
+++ b/Tests/Surfaces/TrapezoidBoundsTests.cpp
@@ -1,6 +1,6 @@
-// This file is part of the ACTS project.
+// This file is part of the Acts project.
 //
-// Copyright (C) 2017-2018 ACTS project team
+// Copyright (C) 2017-2018 Acts project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/Tests/Surfaces/TriangleBoundsTests.cpp b/Tests/Surfaces/TriangleBoundsTests.cpp
index 5d5182cc31e213fa6579390fe35eee8985e9c057..3ac284661b345b70b06c87b7b3e5b6126887f787 100644
--- a/Tests/Surfaces/TriangleBoundsTests.cpp
+++ b/Tests/Surfaces/TriangleBoundsTests.cpp
@@ -1,6 +1,6 @@
-// This file is part of the ACTS project.
+// This file is part of the Acts project.
 //
-// Copyright (C) 2017-2018 ACTS project team
+// Copyright (C) 2017-2018 Acts project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/Tests/Tools/CylinderVolumeBuilderTests.cpp b/Tests/Tools/CylinderVolumeBuilderTests.cpp
index 0002d93d15b6bd5b7d4a769bf82c09184330ea96..8263d6b04fd722a6317a2b77830470b1c0e314f8 100644
--- a/Tests/Tools/CylinderVolumeBuilderTests.cpp
+++ b/Tests/Tools/CylinderVolumeBuilderTests.cpp
@@ -1,6 +1,6 @@
-// This file is part of the ACTS project.
+// This file is part of the Acts project.
 //
-// Copyright (C) 2017-2018 ACTS project team
+// Copyright (C) 2017-2018 Acts project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/Tests/Tools/LayerCreatorTests.cpp b/Tests/Tools/LayerCreatorTests.cpp
index 5f4c97f5bcd711207a1d16c318aef521effa802f..87404bf3015bd43b2b6fc62228492196e492a8df 100644
--- a/Tests/Tools/LayerCreatorTests.cpp
+++ b/Tests/Tools/LayerCreatorTests.cpp
@@ -1,6 +1,6 @@
-// This file is part of the ACTS project.
+// This file is part of the Acts project.
 //
-// Copyright (C) 2017-2018 ACTS project team
+// Copyright (C) 2017-2018 Acts project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/Tests/Tools/SurfaceArrayCreatorTests.cpp b/Tests/Tools/SurfaceArrayCreatorTests.cpp
index 306e2aba5deeae71ce466b8ecd12a3b582f8c807..35f198e8f76ecac632ae8b775b47aa7c990453c9 100644
--- a/Tests/Tools/SurfaceArrayCreatorTests.cpp
+++ b/Tests/Tools/SurfaceArrayCreatorTests.cpp
@@ -1,6 +1,6 @@
-// This file is part of the ACTS project.
+// This file is part of the Acts project.
 //
-// Copyright (C) 2017-2018 ACTS project team
+// Copyright (C) 2017-2018 Acts project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/Tests/Utilities/AxesTests.cpp b/Tests/Utilities/AxesTests.cpp
index 2199c15b4602cf3a823380d7fb112d091e742057..8469072e0a15a12784c26edc6ba29dec0fd3a413 100644
--- a/Tests/Utilities/AxesTests.cpp
+++ b/Tests/Utilities/AxesTests.cpp
@@ -1,6 +1,6 @@
-// This file is part of the ACTS project.
+// This file is part of the Acts project.
 //
-// Copyright (C) 2017-2018 ACTS project team
+// Copyright (C) 2017-2018 Acts project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/Tests/Utilities/BFieldMapUtilsTests.cpp b/Tests/Utilities/BFieldMapUtilsTests.cpp
index 621e4f50c85776ea8a60fc7dd1df79fbd71ec513..c612fbe2515b02f5573072689401a9d00bde287f 100644
--- a/Tests/Utilities/BFieldMapUtilsTests.cpp
+++ b/Tests/Utilities/BFieldMapUtilsTests.cpp
@@ -1,6 +1,6 @@
-// This file is part of the ACTS project.
+// This file is part of the Acts project.
 //
-// Copyright (C) 2016 ACTS project team
+// Copyright (C) 2016 Acts project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/Tests/Utilities/BinUtilityTests.cpp b/Tests/Utilities/BinUtilityTests.cpp
index affa47f446256f8fa6f9ab783640e0d4982c539a..b6afac729a423ca2f24f26a3d28c21aeb2a27001 100644
--- a/Tests/Utilities/BinUtilityTests.cpp
+++ b/Tests/Utilities/BinUtilityTests.cpp
@@ -1,6 +1,6 @@
-// This file is part of the ACTS project.
+// This file is part of the Acts project.
 //
-// Copyright (C) 2017 ACTS project team
+// Copyright (C) 2017 Acts project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/Tests/Utilities/BinningDataTests.cpp b/Tests/Utilities/BinningDataTests.cpp
index 6829f268b5faa6fc6eb04a3c85fed35ad2f968b5..53dfbeeb02fbd3d2aaa9622170a508e6aa7f6b8f 100644
--- a/Tests/Utilities/BinningDataTests.cpp
+++ b/Tests/Utilities/BinningDataTests.cpp
@@ -1,6 +1,6 @@
-// This file is part of the ACTS project.
+// This file is part of the Acts project.
 //
-// Copyright (C) 2017 ACTS project team
+// Copyright (C) 2017 Acts project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/Tests/Utilities/GeometryIDTests.cpp b/Tests/Utilities/GeometryIDTests.cpp
index 6794876f52c6e7f401a9d5f95039307e8929e9c5..1ac8e26dc4cfcea7733b960d8b28d2c5910c067a 100644
--- a/Tests/Utilities/GeometryIDTests.cpp
+++ b/Tests/Utilities/GeometryIDTests.cpp
@@ -1,6 +1,6 @@
-// This file is part of the ACTS project.
+// This file is part of the Acts project.
 //
-// Copyright (C) 2017-2018 ACTS project team
+// Copyright (C) 2017-2018 Acts project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/Tests/Utilities/GridTests.cpp b/Tests/Utilities/GridTests.cpp
index 9b2be9d992d16129ce3552a76962018b1027f1ac..9683bc073ee16038ca23c1dbaa1118777aa6d2f0 100644
--- a/Tests/Utilities/GridTests.cpp
+++ b/Tests/Utilities/GridTests.cpp
@@ -1,6 +1,6 @@
-// This file is part of the ACTS project.
+// This file is part of the Acts project.
 //
-// Copyright (C) 2017-2018 ACTS project team
+// Copyright (C) 2017-2018 Acts project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/Tests/Utilities/InterpolationTests.cpp b/Tests/Utilities/InterpolationTests.cpp
index fb3e3222739e2bd6e85c6d186d6f2252dc420a78..02d7791e78b39a2b6367b19674d20192cc81b173 100644
--- a/Tests/Utilities/InterpolationTests.cpp
+++ b/Tests/Utilities/InterpolationTests.cpp
@@ -1,6 +1,6 @@
-// This file is part of the ACTS project.
+// This file is part of the Acts project.
 //
-// Copyright (C) 2017 ACTS project team
+// Copyright (C) 2017 Acts project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/Tests/Utilities/LoggerTests.cpp b/Tests/Utilities/LoggerTests.cpp
index c15e25214adbfc5a32b3093b1b0cd43930cc321d..06938d9078ddfe6871ec4575747561904a63c55e 100644
--- a/Tests/Utilities/LoggerTests.cpp
+++ b/Tests/Utilities/LoggerTests.cpp
@@ -1,6 +1,6 @@
-// This file is part of the ACTS project.
+// This file is part of the Acts project.
 //
-// Copyright (C) 2017 ACTS project team
+// Copyright (C) 2017 Acts project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/Tests/Utilities/MPLTests.cpp b/Tests/Utilities/MPLTests.cpp
index 3b7083215e15f1d73423de51e94a6fca78f8e127..e98a23c536885afde0b586cee63eb8628c728231 100644
--- a/Tests/Utilities/MPLTests.cpp
+++ b/Tests/Utilities/MPLTests.cpp
@@ -1,6 +1,6 @@
-// This file is part of the ACTS project.
+// This file is part of the Acts project.
 //
-// Copyright (C) 2017-2018 ACTS project team
+// Copyright (C) 2017-2018 Acts project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/Tests/Utilities/RealQuadraticEquationTests.cpp b/Tests/Utilities/RealQuadraticEquationTests.cpp
index 93cbd1793dab8f98bd46b793becd2d8612b01a6a..b918f34a4581ccce21d2ada3355f4390477e1367 100644
--- a/Tests/Utilities/RealQuadraticEquationTests.cpp
+++ b/Tests/Utilities/RealQuadraticEquationTests.cpp
@@ -1,6 +1,6 @@
-// This file is part of the ACTS project.
+// This file is part of the Acts project.
 //
-// Copyright (C) 2017-2018 ACTS project team
+// Copyright (C) 2017-2018 Acts project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/Tests/Utilities/UnitConversionTests.cpp b/Tests/Utilities/UnitConversionTests.cpp
index 1a525f6d0081959fef2f9b594928acea0e15da03..44ba0e159e8625e8170dd309e74dedd0739c622f 100644
--- a/Tests/Utilities/UnitConversionTests.cpp
+++ b/Tests/Utilities/UnitConversionTests.cpp
@@ -1,6 +1,6 @@
-// This file is part of the ACTS project.
+// This file is part of the Acts project.
 //
-// Copyright (C) 2017-2018 ACTS project team
+// Copyright (C) 2017-2018 Acts project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/Tests/Volumes/CylinderVolumeBoundsTests.cpp b/Tests/Volumes/CylinderVolumeBoundsTests.cpp
index d2cdf458fe1e78d7902e5fc86006bdd88517d564..2863c91914653c54ce08af0b9a9afd4a9979c4b0 100644
--- a/Tests/Volumes/CylinderVolumeBoundsTests.cpp
+++ b/Tests/Volumes/CylinderVolumeBoundsTests.cpp
@@ -1,6 +1,6 @@
-// This file is part of the ACTS project.
+// This file is part of the Acts project.
 //
-// Copyright (C) 2017-2018 ACTS project team
+// Copyright (C) 2017-2018 Acts project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/cmake/ActsCompilerOptions.cmake b/cmake/ActsCompilerOptions.cmake
index 9d89d104fca576a92332239a72c991ef948cebcd..292a9fddddc31b179b406aec40148ee9293bc191 100644
--- a/cmake/ActsCompilerOptions.cmake
+++ b/cmake/ActsCompilerOptions.cmake
@@ -1,11 +1,11 @@
-# set ACTS compiler flags
+# set Acts compiler flags
 set (ACTS_CXX_FLAGS "-Wall -Wextra -Wpedantic -Wshadow -Wunused-local-typedefs")
 set (ACTS_CXX_FLAGS_DEBUG "--coverage")
 set (ACTS_CXX_FLAGS_MINSIZEREL "")
 set (ACTS_CXX_FLAGS_RELEASE "")
 set (ACTS_CXX_FLAGS_RELWITHDEBINFO "")
 
-# set ACTS linker flags
+# set Acts linker flags
 set (ACTS_EXE_LINKER_FLAGS_DEBUG "--coverage")
 set (ACTS_SHARED_LINKER_FLAGS_DEBUG "--coverage ")
 
diff --git a/cmake/ActsConfig.cmake.in b/cmake/ActsConfig.cmake.in
index 5c2de169a029ae7baa092903c56ca1338a97ef8a..9fff9a93263df18ec359ef89ae1d474f7266f5f0 100644
--- a/cmake/ActsConfig.cmake.in
+++ b/cmake/ActsConfig.cmake.in
@@ -10,7 +10,7 @@
 #  + ACTS_CXX_FLAGS_MINSIZEREL
 #  + ACTS_CXX_FLAGS_RELEASE
 #  + ACTS_CXX_FLAGS_RELWITHDEBINFO
-# - linker flags used for ACTS:
+# - linker flags used for Acts:
 #  + ACTS_EXE_LINKER_FLAGS_DEBUG
 #  + ACTS_SHARED_LINKER_FLAGS_DEBUG
 
@@ -66,12 +66,14 @@ endforeach ()
 # the imported targets created later.
 set_and_check (ACTS_INCLUDE_DIR "@PACKAGE_CMAKE_INSTALL_INCLUDEDIR@")
 set_and_check (ACTS_LIBRARY_DIR "@PACKAGE_CMAKE_INSTALL_LIBDIR@")
+set_and_check (Acts_INCLUDE_DIR "@PACKAGE_CMAKE_INSTALL_INCLUDEDIR@")
+set_and_check (Acts_LIBRARY_DIR "@PACKAGE_CMAKE_INSTALL_LIBDIR@")
 
-# set ACTS compilation and linker flags
-set (ACTS_CXX_FLAGS "@Acts_CXX_FLAGS@")
-set (ACTS_CXX_FLAGS_DEBUG "@Acts_CXX_FLAGS_DEBUG@")
-set (ACTS_CXX_FLAGS_MINSIZEREL "@Acts_CXX_FLAGS_MINSIZEREL@")
-set (ACTS_CXX_FLAGS_RELEASE "@Acts_CXX_FLAGS_RELEASE@")
-set (ACTS_CXX_FLAGS_RELWITHDEBINFO "@Acts_CXX_FLAGS_RELWITHDEBINFO@")
-set (ACTS_EXE_LINKER_FLAGS_DEBUG "@Acts_EXE_LINKER_FLAGS_DEBUG@")
-set (ACTS_SHARED_LINKER_FLAGS_DEBUG "@Acts_SHARED_LINKER_FLAGS_DEBUG@")
+# set Acts compilation and linker flags
+set (ACTS_CXX_FLAGS "@ACTS_CXX_FLAGS@")
+set (ACTS_CXX_FLAGS_DEBUG "@ACTS_CXX_FLAGS_DEBUG@")
+set (ACTS_CXX_FLAGS_MINSIZEREL "@ACTS_CXX_FLAGS_MINSIZEREL@")
+set (ACTS_CXX_FLAGS_RELEASE "@ACTS_CXX_FLAGS_RELEASE@")
+set (ACTS_CXX_FLAGS_RELWITHDEBINFO "@ACTS_CXX_FLAGS_RELWITHDEBINFO@")
+set (ACTS_EXE_LINKER_FLAGS_DEBUG "@ACTS_EXE_LINKER_FLAGS_DEBUG@")
+set (ACTS_SHARED_LINKER_FLAGS_DEBUG "@ACTS_SHARED_LINKER_FLAGS_DEBUG@")
diff --git a/cmake/Project.xml b/cmake/Project.xml
index 19318707701d50b51fac4340b49f4949e255b161..d31b7ca603354392f827ac28057ea6d342374223 100644
--- a/cmake/Project.xml
+++ b/cmake/Project.xml
@@ -1,17 +1,17 @@
-<Project name="ACTS">
-  <SubProject name="ACore" Group="ACTS">
+<Project name="Acts">
+  <SubProject name="ACore" Group="Acts">
   </SubProject>
-  <SubProject name="Examples" Group="ACTS">
+  <SubProject name="Examples" Group="Acts">
     <Dependency name="ACore"/>
   </SubProject>
-  <SubProject name="DD4hepPlugin" Group="ACTS">
+  <SubProject name="DD4hepPlugin" Group="Acts">
    <Dependency name="ACore"/>
    <Dependency name="TGeoPlugin"/>
   </SubProject>
-  <SubProject name="MaterialPlugin" Group="ACTS">
+  <SubProject name="MaterialPlugin" Group="Acts">
    <Dependency name="ACore"/>
   </SubProject>
-  <SubProject name="TGeoPlugin" Group="ACTS">
+  <SubProject name="TGeoPlugin" Group="Acts">
    <Dependency name="ACore"/>
   </SubProject>
 </Project>
diff --git a/doc/CMakeLists.txt b/doc/CMakeLists.txt
index 25d446dd8e2d5ef67c814a52603ca7f0d0621775..72c52bc9fb064c21334bf883b3450e5a7eedd6e8 100644
--- a/doc/CMakeLists.txt
+++ b/doc/CMakeLists.txt
@@ -1,5 +1,5 @@
 configure_file (${CMAKE_CURRENT_SOURCE_DIR}/doxygen.config.in ${CMAKE_CURRENT_BINARY_DIR}/doxygen.config @ONLY)
-configure_file (${CMAKE_CURRENT_SOURCE_DIR}/figures/ACTSlogo.gif ${CMAKE_CURRENT_BINARY_DIR}/ACTSlogo.gif COPYONLY)
+configure_file (${CMAKE_CURRENT_SOURCE_DIR}/figures/Actslogo.gif ${CMAKE_CURRENT_BINARY_DIR}/Actslogo.gif COPYONLY)
 configure_file (${CMAKE_CURRENT_SOURCE_DIR}/DoxygenLayout.xml ${CMAKE_CURRENT_BINARY_DIR}/DoxygenLayout.xml COPYONLY)
 
 add_custom_target (doc ${DOXYGEN_EXECUTABLE} ${CMAKE_CURRENT_BINARY_DIR}/doxygen.config
diff --git a/doc/DoxygenLayout.xml b/doc/DoxygenLayout.xml
index f8c57cf8a4b369f5b7a3374e23a9d28f20957af9..6c69c364eddb1076f55fc069649ac9ecf44ddc89 100644
--- a/doc/DoxygenLayout.xml
+++ b/doc/DoxygenLayout.xml
@@ -2,7 +2,7 @@
   <!-- Generated by doxygen 1.8.11 -->
   <!-- Navigation index tabs for HTML output -->
   <navindex>
-    <tab type="user" visible="yes" title="ACTS Home Page" url="http://acts.web.cern.ch/ACTS/index.php"/>
+    <tab type="user" visible="yes" title="Acts Home Page" url="http://acts.web.cern.ch/ACTS/index.php"/>
     <tab type="mainpage" visible="yes" title=""/>
     <tab type="pages" visible="no" title="" intro=""/>
     <tab type="user" visible="yes" title="Contribution Guide" url="group__Contributing.html"/>
diff --git a/doc/Modules.hpp b/doc/Modules.hpp
index 8c671ec55eab9d847d6ffee899c93667157d9276..6c2c8e44dfd95e51d1eb86bb719e8e6de66d6845 100644
--- a/doc/Modules.hpp
+++ b/doc/Modules.hpp
@@ -1,6 +1,6 @@
-// This file is part of the ACTS project.
+// This file is part of the Acts project.
 //
-// Copyright (C) 2016-2017 ACTS project team
+// Copyright (C) 2016-2017 Acts project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
@@ -10,13 +10,13 @@
 // clang-format off
 
 /// @defgroup Design Design and concept descriptions
-/// @brief description of general concepts used in ACTS
+/// @brief description of general concepts used in Acts
 
 /// @defgroup Logging Debug output options
 /// @ingroup Design
 /// @brief description of debug output options
 ///
-/// The ACTS logging facility supports several severity levels which allow you
+/// The Acts logging facility supports several severity levels which allow you
 /// to control the amount of information displayed at run-time. Logger objects
 /// can easily be created using the Acts::getDefaultLogger function which
 /// should be sufficient to get you started. In case you need more customized
@@ -57,7 +57,7 @@
 ///    std::unique_ptr<const Acts::Logger> myLogger
 ///        = Acts::getDefaultLogger("MyLogger", Acts::Logging::INFO, &logfile);
 ///
-///    // make sure the ACTS debug macros can work with your logger
+///    // make sure the Acts debug macros can work with your logger
 ///    ACTS_LOCAL_LOGGER(myLogger);
 ///
 ///    ACTS_VERBOSE("This message will not appear in the logfile.");
@@ -68,14 +68,14 @@
 /// }
 /// @endcode
 ///
-/// In case you are using ACTS in another framework which comes with its own
-/// logging facility (e.g. Gaudi) you can pipe the logging output from ACTS
+/// In case you are using Acts in another framework which comes with its own
+/// logging facility (e.g. Gaudi) you can pipe the logging output from Acts
 /// tools and algorithms to your framework's logging system by supplying different
 /// implementations of:
 /// - Acts::Logging::OutputFilterPolicy (for mapping logging levels)
-/// - Acts::Logging::OutputPrintPolicy (for passing the ACTS output to your internal logging system)
+/// - Acts::Logging::OutputPrintPolicy (for passing the Acts output to your internal logging system)
 ///
-/// Since ACTS makes extensive use of Acts::getDefaultLogger to provide
+/// Since Acts makes extensive use of Acts::getDefaultLogger to provide
 /// sufficient information for debugging, you would need to provide a modified
 /// implementation of this function (using your output filter and printing
 /// policies) to also pipe this output to your framework.
@@ -94,7 +94,7 @@
 /// }
 /// @endcode
 ///
-/// Then you can run your executable, which uses ACTS tools and algorithms, in
+/// Then you can run your executable, which uses Acts tools and algorithms, in
 /// the following way (tested under Unix)
 ///
 /// @code{bash}
@@ -110,7 +110,7 @@
 /// @endcode
 
 /// @defgroup Core Core classes
-/// @brief ACTS core classes
+/// @brief Acts core classes
 
 /// @defgroup Detector Tracking geometry
 /// @ingroup Core
@@ -209,15 +209,15 @@
 /// @brief Description of geometric volumes
 
 /// @defgroup Examples Examples
-/// @brief ACTS Examples
+/// @brief Acts Examples
 
 
 /// @defgroup Plugins Plugins
-/// @brief ACTS extensions
+/// @brief Acts extensions
 
 /// @defgroup DD4hepPlugins DD4hepPlugins
 /// @ingroup Plugins
-/// @brief Build ACTS tracking geometry from \a %DD4hep input.
+/// @brief Build Acts tracking geometry from \a %DD4hep input.
 ///
 /// The DD4hepPlugin allows building of the Acts TrackingGeometry from <a href="http://aidasoft.web.cern.ch/DD4hep">DD4hep</a> input.
 /// \a %DD4hep uses <a href="https://root.cern.ch">ROOT</a> TGeo as an underlying geometry model.
@@ -256,7 +256,7 @@
 /// The extensions are used to indicate certain volumes, e.g. if a \a DetElement is the
 /// beam pipe or if a \a DetElement is a layer carrying the sensitive modules. In addition
 /// the extensions are used in order to distinguish if a sub detector is a barrel (described
-/// as a cylinder volume in ACTS) or an endcap (which is described as a disc volume in Acts).
+/// as a cylinder volume in Acts) or an endcap (which is described as a disc volume in Acts).
 /// Furthermore the
 /// extensions are used to hand over specific information needed for tracking, e.g.
 /// paramters for material mapping.
@@ -280,7 +280,7 @@
 ///
 /// <B>Prerequisites</B>
 ///
-/// To guarantee a working translation from \a %DD4hep input to ACTS geometry the
+/// To guarantee a working translation from \a %DD4hep input to Acts geometry the
 /// following conditions need to be met:
 ///
 /// * The detector needs to have a barrel-endcap structure:
@@ -344,7 +344,7 @@
 ///
 /// There are two modes building the layers around the sensitive detector modules:
 /// * The \a DetElements containing the sensitive modules have a geometrical shape
-/// 	- the boundaries of the layers in ACTS are taken directly from the given shape
+/// 	- the boundaries of the layers in Acts are taken directly from the given shape
 /// * The \a DetElements containing the sensitive modules have no specific shape (assembliy)
 /// 	- the boundaries of the layers are calculated automatically by adding a tolerance to the geometric extension of the contained surfaces
 ///		- the tolerances in r and z need to be set for every \a DetElement representing layer using envelopeR and envelopeZ in the Acts::ActsExtension's
@@ -378,9 +378,9 @@
 
 /// @defgroup MaterialPlugins MaterialPlugins
 /// @ingroup Plugins
-/// @brief Map material onto the ACTS geometry.
+/// @brief Map material onto the Acts geometry.
 ///
-/// The MaterialPlugins allow to map material from a detailed full detector geometry onto the simplfied ACTS geometry.
+/// The MaterialPlugins allow to map material from a detailed full detector geometry onto the simplfied Acts geometry.
 /// The material is mapped onto layers of the tracking geometry which are marked to carry support material. The marking
 /// is done during the geometry building process. The material can be mapped onto either, the inner, the outer
 /// boundary surface or the central (representing) Acts::Surface of the Acts::Layer. The Acts::Material is described on a two dimensional
@@ -388,7 +388,7 @@
 /// @note The DD4hepPlugin offers the possiility to mark layers which should carry material and to determine the
 /// grid granularity, using the class Acts::ActsExtension.
 ///
-/// Following the ACTS philosophy the material mapping is agnostic to any file format and software used to create or store
+/// Following the Acts philosophy the material mapping is agnostic to any file format and software used to create or store
 /// the material maps. The material should be stored in instances of the class Acts::MaterialTrack. This material track record
 /// represents a track starting from a certain position, in a certain direction, containing all material along this
 /// track. The material along the material track record ist stored as a container of Acts::MaterialStep instances. Each material
diff --git a/doc/doxygen.config.in b/doc/doxygen.config.in
index 5fc09c754c1a378655d09963d86614abee989bd5..6e5ce463cabfb2bdd5c3e5ac96dbc7404809d0a6 100644
--- a/doc/doxygen.config.in
+++ b/doc/doxygen.config.in
@@ -38,7 +38,7 @@ PROJECT_NAME           = @PROJECT_NAME@
 # could be handy for archiving the generated documentation or if some version
 # control system is used.
 
-PROJECT_NUMBER         = @ACTS_VERSION@
+PROJECT_NUMBER         = @Acts_VERSION@
 
 # Using the PROJECT_BRIEF tag one can provide an optional one line description
 # for a project that appears at the top of each page and should give viewer a
@@ -51,7 +51,7 @@ PROJECT_BRIEF          = "Reference Guide"
 # pixels and the maximum width should not exceed 200 pixels. Doxygen will copy
 # the logo to the output directory.
 
-PROJECT_LOGO           = ACTSlogo.gif
+PROJECT_LOGO           = Actslogo.gif
 
 # The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute) path
 # into which the generated documentation will be written. If a relative path is
@@ -2092,7 +2092,7 @@ TAGFILES               =
 # tag file that is based on the input files it reads. See section "Linking to
 # external documentation" for more information about the usage of tag files.
 
-GENERATE_TAGFILE       = ACTS.tag
+GENERATE_TAGFILE       = Acts.tag
 
 # If the ALLEXTERNALS tag is set to YES, all external class will be listed in
 # the class index. If set to NO, only the inherited external classes will be
diff --git a/getting_started.md b/getting_started.md
index 1d871ac31bbbefee7faddee6d5fe4ff2d8571d38..7a414bc2d1f1a99ae836c6b7bfe4d72da82c9c5f 100644
--- a/getting_started.md
+++ b/getting_started.md
@@ -4,14 +4,14 @@
     1. [Prerequisites](#prerequisites)
     2. [Installation](#installation)
     3. [CMake build system](#cmake)
-    4. [Build ACTS on lxplus](#build-lxplus)
-    5. [Build ACTS on your local machine](#build-local)
-2. [Using ACTS in your own cmake project](#using-acts)
+    4. [Build Acts on lxplus](#build-lxplus)
+    5. [Build Acts on your local machine](#build-local)
+2. [Using Acts in your own cmake project](#using-acts)
 3. [Documentation](#documentation)
 
 ## <a name="prerequisites">Prerequisites</a>
 
-Only few dependencies are required to build the Core library of ACTS. A list of
+Only few dependencies are required to build the Core library of Acts. A list of
 prerequisites required is given below with the version numbers indicating which
 versions were tested. Older versions may or may not work, feedback is very
 welcome.
@@ -32,7 +32,7 @@ components:
 *   [ROOT](https://root.cern.ch) (>= 6.10.00) for the TGeo plugin
 
 Compatible versions of all dependencies are provided by **LCG releases**.
-The current recommended release for building ACTS is the
+The current recommended release for building Acts is the
 [LCG91 Release](http://lcginfo.cern.ch/release/91). This release is also used in the
 continous integration (CI) system to test the software. Setup scripts are provided
 in the repository that can be used to setup this release, and a few others, on
@@ -41,14 +41,14 @@ lxplus machines at CERN (see [below](#installation)).
 
 ## <a name="installation">Installation and quick start</a>
 
-The ACTS repository is hosted on the GitLab instance at CERN. In order to aquire the latest
+The Acts repository is hosted on the GitLab instance at CERN. In order to aquire the latest
 version from the git repository you can simply clone:
 
 ```bash
 git clone https://gitlab.cern.ch/acts/acts-core.git <ACTS_DIR>
 ```
 
-You can then `cd <ACTS_DIR>` continue building ACTS:
+You can then `cd <ACTS_DIR>` continue building Acts:
 
 ```bash
 source CI/setup_lcg91.sh
@@ -60,10 +60,10 @@ cmake --build . -- install
 
 ## <a name="cmake">CMake build system</a>
 
-CMake is used as build system for compiling and installing ACTS.  For a
+CMake is used as build system for compiling and installing Acts.  For a
 complete list of CMake options please refer to the [official documentation](https://cmake.org/cmake/help/v3.1/index.html) 
 and this nice [list of general cmake options](https://cmake.org/Wiki/CMake_Useful_Variables).
-Important options relevant for the ACTS project are given below. They are set
+Important options relevant for the Acts project are given below. They are set
 by adding `-D<OPTION>=<VALUE>` to the `cmake` command.
 
 | option                       | default | description                                             |
@@ -82,11 +82,11 @@ by adding `-D<OPTION>=<VALUE>` to the `cmake` command.
 | CMAKE_BUILD_TYPE             |         | build type (e.g. Debug, Release) affects compiler flags |
 | DD4hep_DIR                   |         | path to the DD4hep installation                         |
 
-## <a name="building-acts">Building ACTS</a>
+## <a name="building-acts">Building Acts</a>
 
-### <a name="build-lxplus">Building ACTS on lxplus</a>
+### <a name="build-lxplus">Building Acts on lxplus</a>
 
-The first step to build ACTS is to acquire supported versions of the
+The first step to build Acts is to acquire supported versions of the
 dependencies.  Which dependencies are required depends on the plugins you
 enable, as mentioned above.
 
@@ -102,11 +102,11 @@ source <ACTS_DIR>/CI/setup_lcgXYZ.sh
 where `XYZ` is the version number of the LCG release. There are multiple setup
 scripts for different LCG releases, which corresponds to the releases the CI
 tests against. The releases which can be set up using these scripts are therefore
-sure to be compatible. **You can build ACTS with any of these releases**. 
+sure to be compatible. **You can build Acts with any of these releases**. 
 Additionally, there is a script called `setup_clang.sh` which will make the `clang` compiler available on top of one
 of the LCG releases. This configuration is also tested by the CI.
 
-Using one of the scripts, you can use the following commands to build ACTS with
+Using one of the scripts, you can use the following commands to build Acts with
 all plugins using the same dependency versions as in the continous integration
 system.
 
@@ -123,26 +123,26 @@ cmake --build . -- install
 In this example the DD4hep, Material and TGeo plugins. The install prefix is
 set to `<path you want>`.
 
-### <a name="build-local">Building ACTS on your local machine</a>
+### <a name="build-local">Building Acts on your local machine</a>
 
-Building and running ACTS on your local machine is not offically supported.
+Building and running Acts on your local machine is not offically supported.
 However, if you have the necessary prerequisites installed it should be
-possible to use it locally. ACTS developers regularly use different
-recent Linux distributions and macOS to build and develop ACTS.
+possible to use it locally. Acts developers regularly use different
+recent Linux distributions and macOS to build and develop Acts.
 
-# <a name="using-acts">Using ACTS in your own cmake project</a>
+# <a name="using-acts">Using Acts in your own cmake project</a>
 
-When using ACTS in your own cmake-based project, you need to include the
+When using Acts in your own cmake-based project, you need to include the
 following lines in your `CMakeLists.txt` file:
 
 ```bash
-find_package (ACTS COMPONENTS comp1 comp2 ...)
+find_package (Acts COMPONENTS comp1 comp2 ...)
 ```
 
-where `compX` are the required components from the ACTS project. See the
+where `compX` are the required components from the Acts project. See the
 `cmake` output for more information about which components are available.
 
 # <a name="documentation">Documentation</a>
 
-You can find a complete documentation of the ACTS functionality and the class reference guide at [http://acts.web.cern.ch/ACTS/latest/doc/index.html](http://acts.web.cern.ch/ACTS/latest/doc/index.html).
+You can find a complete documentation of the Acts functionality and the class reference guide at [http://acts.web.cern.ch/ACTS/latest/doc/index.html](http://acts.web.cern.ch/ACTS/latest/doc/index.html).
 
diff --git a/setup.sh.in b/setup.sh.in
index 2fd493cfc356f3eb2320224f2b9ef299ec225100..3949c41c9e54a77e9a9eedaa9d185dc9c7be2e2c 100644
--- a/setup.sh.in
+++ b/setup.sh.in
@@ -1,3 +1,3 @@
-# set up ACTS environment
+# set up Acts environment
 export PATH=@CMAKE_INSTALL_PREFIX@/@CMAKE_INSTALL_BINDIR@:$PATH
-export LD_LIBRARY_PATH=@CMAKE_INSTALL_PREFIX@/@CMAKE_INSTALL_LIBDIR@:$LD_LIBRARY_PATH
\ No newline at end of file
+export LD_LIBRARY_PATH=@CMAKE_INSTALL_PREFIX@/@CMAKE_INSTALL_LIBDIR@:$LD_LIBRARY_PATH