diff --git a/CMakeLists.txt b/CMakeLists.txt
index 6fac687738a41b757df60d4796fc570256c5c7b1..926366ba7c201df5b625552134ee6b46b4d90b18 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,23 +1,24 @@
-#-------------------------------------------------------------------------------
+#------------------------------------------------------------------------------
# Project Phoenix
#
# Copyright (c) 2017 RWTH Aachen University, Germany,
-# Virtual Reality & Immersive Visualisation Group.
-#-------------------------------------------------------------------------------
-# License
+# Virtual Reality & Immersive Visualization Group.
+#------------------------------------------------------------------------------
+# License
#
-# Licensed under the Apache License, Version 2.0 (the "License");
+# Licensed under the 3-Clause BSD License (the "License");
# you may not use this file except in compliance with the License.
+# See the file LICENSE for the full text.
# You may obtain a copy of the License at
#
-# http://www.apache.org/licenses/LICENSE-2.0
+# https://opensource.org/licenses/BSD-3-Clause
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
-#-------------------------------------------------------------------------------
+#------------------------------------------------------------------------------
cmake_minimum_required(VERSION 3.8.2)
diff --git a/LICENSE b/LICENSE
index 1a64f5d8b9d0710ec617ccd5aa9e5c873fa1f1d5..6b9b89a931166a76b2a209a0b026d3bc72e5a857 100644
--- a/LICENSE
+++ b/LICENSE
@@ -2,7 +2,7 @@
Project Phoenix
Copyright (c) 2017 RWTH Aachen University, Germany,
- Virtual Reality & Immersive Visualisation Group.
+ Virtual Reality & Immersive Visualization Group.
--------------------------------------------------------------------------------
Contact Information
@@ -10,7 +10,7 @@
info@vr.rwth-aachen.de
Address:
- Virtual Reality & Immersive Visualisation Group
+ Virtual Reality & Immersive Visualization Group
RWTH Aachen University
Seffenter Weg 23
52074 Aachen
diff --git a/README.md b/README.md
index 119628c5aedee1551ca1b08d979e745e7c8fd2ac..c331a333d0dc73820dbc3812fdf209ee1fe85a71 100644
--- a/README.md
+++ b/README.md
@@ -10,11 +10,12 @@ Virtual Reality & Immersive Visualization Group.
## License
-Licensed under the Apache License, Version 2.0 (the "License");
+Licensed under the 3-Clause BSD License (the "License");
you may not use this file except in compliance with the License.
+See the file LICENSE for the full text.
You may obtain a copy of the License at
- http://www.apache.org/licenses/LICENSE-2.0
+ https://opensource.org/licenses/BSD-3-Clause
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/cmake/ConanHelpers.cmake b/cmake/ConanHelpers.cmake
index ad7d51e298634dcfed0c1790c8c361a07e5d73a8..d807a0a9db07249cf7b19550c2059b26642014e4 100644
--- a/cmake/ConanHelpers.cmake
+++ b/cmake/ConanHelpers.cmake
@@ -1,14 +1,14 @@
-#-------------------------------------------------------------------------------
-# ConanHelpers.cmake
+#------------------------------------------------------------------------------
+# Project Phoenix
#
# Copyright (c) 2017 RWTH Aachen University, Germany,
-# Virtual Reality & Immersive Visualisation Group.
-#-------------------------------------------------------------------------------
+# Virtual Reality & Immersive Visualization Group.
+#------------------------------------------------------------------------------
# License
-# only for this file
#
# Licensed under the 3-Clause BSD License (the "License");
# you may not use this file except in compliance with the License.
+# See the file LICENSE for the full text.
# You may obtain a copy of the License at
#
# https://opensource.org/licenses/BSD-3-Clause
@@ -18,7 +18,7 @@
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
-#-------------------------------------------------------------------------------
+#------------------------------------------------------------------------------
#download/build the missing dependencies
include(conan)
diff --git a/cmake/ConfigureFiles.cmake b/cmake/ConfigureFiles.cmake
index 7ab14ee31a9138f65ae19001d9d9bf7c84f90e1b..04481a4ec4c048bcd19de6bfb35308144c0eea0e 100644
--- a/cmake/ConfigureFiles.cmake
+++ b/cmake/ConfigureFiles.cmake
@@ -1,23 +1,24 @@
-#-------------------------------------------------------------------------------
+#------------------------------------------------------------------------------
# Project Phoenix
#
# Copyright (c) 2017 RWTH Aachen University, Germany,
-# Virtual Reality & Immersive Visualisation Group.
-#-------------------------------------------------------------------------------
-# License
+# Virtual Reality & Immersive Visualization Group.
+#------------------------------------------------------------------------------
+# License
#
-# Licensed under the Apache License, Version 2.0 (the "License");
+# Licensed under the 3-Clause BSD License (the "License");
# you may not use this file except in compliance with the License.
+# See the file LICENSE for the full text.
# You may obtain a copy of the License at
#
-# http://www.apache.org/licenses/LICENSE-2.0
+# https://opensource.org/licenses/BSD-3-Clause
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
-#-------------------------------------------------------------------------------
+#------------------------------------------------------------------------------
function(GENERATE_CONFIGURE_FILES TARGET)
# config for the build tree
diff --git a/cmake/FindSDL2.cmake b/cmake/FindSDL2.cmake
index 7043b66b2973df7635a36176542152dec771d20c..53ea4b2c11e30e6bb5d0c252b7b8a45726fff2b7 100644
--- a/cmake/FindSDL2.cmake
+++ b/cmake/FindSDL2.cmake
@@ -160,4 +160,4 @@ ENDIF(SDL2_LIBRARY_TEMP)
INCLUDE(FindPackageHandleStandardArgs)
-FIND_PACKAGE_HANDLE_STANDARD_ARGS(SDL2 REQUIRED_VARS SDL2_LIBRARY SDL2_INCLUDE_DIR)
\ No newline at end of file
+FIND_PACKAGE_HANDLE_STANDARD_ARGS(SDL2 REQUIRED_VARS SDL2_LIBRARY SDL2_INCLUDE_DIR)
diff --git a/cmake/Testing.cmake b/cmake/Testing.cmake
index 532023b17b935f59a58e95acda5b25f9e0cf089e..9d34236a57e112d515310d3d086da92ff9c42250 100644
--- a/cmake/Testing.cmake
+++ b/cmake/Testing.cmake
@@ -1,23 +1,24 @@
-#-------------------------------------------------------------------------------
+#------------------------------------------------------------------------------
# Project Phoenix
#
# Copyright (c) 2017 RWTH Aachen University, Germany,
-# Virtual Reality & Immersive Visualisation Group.
-#-------------------------------------------------------------------------------
-# License
+# Virtual Reality & Immersive Visualization Group.
+#------------------------------------------------------------------------------
+# License
#
-# Licensed under the Apache License, Version 2.0 (the "License");
+# Licensed under the 3-Clause BSD License (the "License");
# you may not use this file except in compliance with the License.
+# See the file LICENSE for the full text.
# You may obtain a copy of the License at
#
-# http://www.apache.org/licenses/LICENSE-2.0
+# https://opensource.org/licenses/BSD-3-Clause
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
-#-------------------------------------------------------------------------------
+#------------------------------------------------------------------------------
include(CTest)
enable_testing()
diff --git a/cmake/WarningLevels.cmake b/cmake/WarningLevels.cmake
index 40b39b95bb0fcb8776b3a1b171f3c90fcd38f751..e2e48aa512065151cdc0fa7bbed5f150d71ef308 100644
--- a/cmake/WarningLevels.cmake
+++ b/cmake/WarningLevels.cmake
@@ -1,23 +1,24 @@
-#-------------------------------------------------------------------------------
+#------------------------------------------------------------------------------
# Project Phoenix
#
# Copyright (c) 2017 RWTH Aachen University, Germany,
-# Virtual Reality & Immersive Visualisation Group.
-#-------------------------------------------------------------------------------
-# License
+# Virtual Reality & Immersive Visualization Group.
+#------------------------------------------------------------------------------
+# License
#
-# Licensed under the Apache License, Version 2.0 (the "License");
+# Licensed under the 3-Clause BSD License (the "License");
# you may not use this file except in compliance with the License.
+# See the file LICENSE for the full text.
# You may obtain a copy of the License at
#
-# http://www.apache.org/licenses/LICENSE-2.0
+# https://opensource.org/licenses/BSD-3-Clause
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
-#-------------------------------------------------------------------------------
+#------------------------------------------------------------------------------
# flags for default warning levels
set(WARNING_LEVELS_RWTH_CLANG
diff --git a/cmake/conan.cmake b/cmake/conan.cmake
index cc4d6d426734a6bc0009824aaf9e5387f7541645..65f73023a5a49fa74db9b59793eb351da3ed27b4 100644
--- a/cmake/conan.cmake
+++ b/cmake/conan.cmake
@@ -333,4 +333,4 @@ macro(conan_cmake_run)
conan_basic_setup()
endif()
endif()
-endmacro()
\ No newline at end of file
+endmacro()
diff --git a/cmake/cppcheck.cmake b/cmake/cppcheck.cmake
index 44909555c832341aaf4b99a48aacc9b378ccde96..79447ce7c5f37299477037a77cd8a30e0ecdf5eb 100644
--- a/cmake/cppcheck.cmake
+++ b/cmake/cppcheck.cmake
@@ -1,23 +1,24 @@
-#-------------------------------------------------------------------------------
+#------------------------------------------------------------------------------
# Project Phoenix
#
# Copyright (c) 2017 RWTH Aachen University, Germany,
-# Virtual Reality & Immersive Visualisation Group.
-#-------------------------------------------------------------------------------
-# License
+# Virtual Reality & Immersive Visualization Group.
+#------------------------------------------------------------------------------
+# License
#
-# Licensed under the Apache License, Version 2.0 (the "License");
+# Licensed under the 3-Clause BSD License (the "License");
# you may not use this file except in compliance with the License.
+# See the file LICENSE for the full text.
# You may obtain a copy of the License at
#
-# http://www.apache.org/licenses/LICENSE-2.0
+# https://opensource.org/licenses/BSD-3-Clause
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
-#-------------------------------------------------------------------------------
+#------------------------------------------------------------------------------
set(CPPCHECK_COMMAND NOTFOUND)
find_program(CPPCHECK_COMMAND NAMES cppcheck cppcheck.exe
diff --git a/cmake/cpplint.cmake b/cmake/cpplint.cmake
index 68dcfa7de907fa8b34d8f31914a0d0d87dd16a02..e0cc1cc767e5cbe1a291e5e169c279a6210a858b 100644
--- a/cmake/cpplint.cmake
+++ b/cmake/cpplint.cmake
@@ -1,23 +1,24 @@
-#-------------------------------------------------------------------------------
+#------------------------------------------------------------------------------
# Project Phoenix
#
# Copyright (c) 2017 RWTH Aachen University, Germany,
-# Virtual Reality & Immersive Visualisation Group.
-#-------------------------------------------------------------------------------
-# License
+# Virtual Reality & Immersive Visualization Group.
+#------------------------------------------------------------------------------
+# License
#
-# Licensed under the Apache License, Version 2.0 (the "License");
+# Licensed under the 3-Clause BSD License (the "License");
# you may not use this file except in compliance with the License.
+# See the file LICENSE for the full text.
# You may obtain a copy of the License at
#
-# http://www.apache.org/licenses/LICENSE-2.0
+# https://opensource.org/licenses/BSD-3-Clause
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
-#-------------------------------------------------------------------------------
+#------------------------------------------------------------------------------
find_package(PythonInterp 2.7 REQUIRED)
if(NOT PYTHON_EXECUTABLE)
diff --git a/cmake/phoenix-config.cmake.in b/cmake/phoenix-config.cmake.in
index d70b6393d7fcba617023281db9f60f01fa92cacb..410a82491a3ba8e7ecc2c4bc010f48547e67daa2 100644
--- a/cmake/phoenix-config.cmake.in
+++ b/cmake/phoenix-config.cmake.in
@@ -2,7 +2,7 @@
# Project Phoenix
#
# Copyright (c) 2017 RWTH Aachen University, Germany,
-# Virtual Reality & Immersive Visualisation Group.
+# Virtual Reality & Immersive Visualization Group.
#-------------------------------------------------------------------------------
# License
#
diff --git a/cmake/resources_path.hpp.in b/cmake/resources_path.hpp.in
index c275b0f69081373ff5c72ed1cb3bb43fb3ccde37..0a784dec71ccf458fe2b156d576008c44fd1ff69 100644
--- a/cmake/resources_path.hpp.in
+++ b/cmake/resources_path.hpp.in
@@ -2,7 +2,7 @@
// Project Phoenix
//
// Copyright (c) 2017 RWTH Aachen University, Germany,
-// Virtual Reality & Immersive Visualisation Group.
+// Virtual Reality & Immersive Visualization Group.
//------------------------------------------------------------------------------
// License
//
diff --git a/cmake/suppress_warnings.hpp.in b/cmake/suppress_warnings.hpp.in
index 4d4cc51d7af5211842f5a2bdf0534734d85fdc24..4c19fe1c774b4d45b969319921186205870cfbbe 100644
--- a/cmake/suppress_warnings.hpp.in
+++ b/cmake/suppress_warnings.hpp.in
@@ -2,7 +2,7 @@
// Project Phoenix
//
// Copyright (c) 2017 RWTH Aachen University, Germany,
-// Virtual Reality & Immersive Visualisation Group.
+// Virtual Reality & Immersive Visualization Group.
//------------------------------------------------------------------------------
// License
//
diff --git a/conanfile.py b/conanfile.py
index 393696888e21c2b838d48294e442735e8661960b..c6fe9b99099eb2dbc8fdbd7ec4bd915ede9c5f5e 100644
--- a/conanfile.py
+++ b/conanfile.py
@@ -1,23 +1,24 @@
-#-------------------------------------------------------------------------------
+#------------------------------------------------------------------------------
# Project Phoenix
#
# Copyright (c) 2017 RWTH Aachen University, Germany,
-# Virtual Reality & Immersive Visualisation Group.
-#-------------------------------------------------------------------------------
-# License
+# Virtual Reality & Immersive Visualization Group.
+#------------------------------------------------------------------------------
+# License
#
-# Licensed under the Apache License, Version 2.0 (the "License");
+# Licensed under the 3-Clause BSD License (the "License");
# you may not use this file except in compliance with the License.
+# See the file LICENSE for the full text.
# You may obtain a copy of the License at
#
-# http://www.apache.org/licenses/LICENSE-2.0
+# https://opensource.org/licenses/BSD-3-Clause
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
-#-------------------------------------------------------------------------------
+#------------------------------------------------------------------------------
from conans import ConanFile, CMake
diff --git a/demos/CMakeLists.txt b/demos/CMakeLists.txt
index 4d91bcfd818dc3f29a4fbe5ecb03b118f840368f..374c36caf2fb0cc78e86f708b53b8f0dd3cf3775 100644
--- a/demos/CMakeLists.txt
+++ b/demos/CMakeLists.txt
@@ -1,22 +1,23 @@
-#-------------------------------------------------------------------------------
+#------------------------------------------------------------------------------
# Project Phoenix
#
# Copyright (c) 2017 RWTH Aachen University, Germany,
-# Virtual Reality & Immersive Visualisation Group.
-#-------------------------------------------------------------------------------
-# License
+# Virtual Reality & Immersive Visualization Group.
+#------------------------------------------------------------------------------
+# License
#
-# Licensed under the Apache License, Version 2.0 (the "License");
+# Licensed under the 3-Clause BSD License (the "License");
# you may not use this file except in compliance with the License.
+# See the file LICENSE for the full text.
# You may obtain a copy of the License at
#
-# http://www.apache.org/licenses/LICENSE-2.0
+# https://opensource.org/licenses/BSD-3-Clause
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
-#-------------------------------------------------------------------------------
+#------------------------------------------------------------------------------
add_subdirectory(viewer)
diff --git a/demos/viewer/CMakeLists.txt b/demos/viewer/CMakeLists.txt
index 63184ce18eb0820e52e20f5d9c70b22fc923e07d..d3bfb58406c1afb51c3d20c61c288886943704ca 100644
--- a/demos/viewer/CMakeLists.txt
+++ b/demos/viewer/CMakeLists.txt
@@ -1,23 +1,24 @@
-#-------------------------------------------------------------------------------
+#------------------------------------------------------------------------------
# Project Phoenix
#
# Copyright (c) 2017 RWTH Aachen University, Germany,
-# Virtual Reality & Immersive Visualisation Group.
-#-------------------------------------------------------------------------------
-# License
+# Virtual Reality & Immersive Visualization Group.
+#------------------------------------------------------------------------------
+# License
#
-# Licensed under the Apache License, Version 2.0 (the "License");
+# Licensed under the 3-Clause BSD License (the "License");
# you may not use this file except in compliance with the License.
+# See the file LICENSE for the full text.
# You may obtain a copy of the License at
#
-# http://www.apache.org/licenses/LICENSE-2.0
+# https://opensource.org/licenses/BSD-3-Clause
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
-#-------------------------------------------------------------------------------
+#------------------------------------------------------------------------------
file(GLOB VIEWER_SOURCES src/*.cpp)
file(GLOB VIEWER_HEADERS src/*.hpp)
@@ -42,4 +43,4 @@ add_test_cpplint(NAME "viewer--cpplint"
add_test_cppcheck(NAME "viewer--cppcheck"
${VIEWER_SOURCES}
${VIEWER_HEADERS}
-)
\ No newline at end of file
+)
diff --git a/demos/viewer/src/rotation_behavior.cpp b/demos/viewer/src/rotation_behavior.cpp
index 8f3ff3e3eafcacf31441a80ea22caf5b7a3ae95b..61128cdbbb820adaf063dd8fb761564fabff9b3c 100644
--- a/demos/viewer/src/rotation_behavior.cpp
+++ b/demos/viewer/src/rotation_behavior.cpp
@@ -2,15 +2,16 @@
// Project Phoenix
//
// Copyright (c) 2017 RWTH Aachen University, Germany,
-// Virtual Reality & Immersive Visualisation Group.
+// Virtual Reality & Immersive Visualization Group.
//------------------------------------------------------------------------------
// License
//
-// Licensed under the Apache License, Version 2.0 (the "License");
+// Licensed under the 3-Clause BSD License (the "License");
// you may not use this file except in compliance with the License.
+// See the file LICENSE for the full text.
// You may obtain a copy of the License at
//
-// http://www.apache.org/licenses/LICENSE-2.0
+// https://opensource.org/licenses/BSD-3-Clause
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/demos/viewer/src/rotation_behavior.hpp b/demos/viewer/src/rotation_behavior.hpp
index 818ad571cf3330a6728ca746e5f45e0c3050f11d..56b41ee5cfd6e01e0e7cf8400cb5436efbe92d9f 100644
--- a/demos/viewer/src/rotation_behavior.hpp
+++ b/demos/viewer/src/rotation_behavior.hpp
@@ -2,15 +2,16 @@
// Project Phoenix
//
// Copyright (c) 2017 RWTH Aachen University, Germany,
-// Virtual Reality & Immersive Visualisation Group.
+// Virtual Reality & Immersive Visualization Group.
//------------------------------------------------------------------------------
// License
//
-// Licensed under the Apache License, Version 2.0 (the "License");
+// Licensed under the 3-Clause BSD License (the "License");
// you may not use this file except in compliance with the License.
+// See the file LICENSE for the full text.
// You may obtain a copy of the License at
//
-// http://www.apache.org/licenses/LICENSE-2.0
+// https://opensource.org/licenses/BSD-3-Clause
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/demos/viewer/src/viewer.cpp b/demos/viewer/src/viewer.cpp
index 56d2be93f7c3fecdbb5406d64490f3734c495ab1..5f9d09c4a9070680541c7dbd0d98dc34a2d5f828 100644
--- a/demos/viewer/src/viewer.cpp
+++ b/demos/viewer/src/viewer.cpp
@@ -2,15 +2,16 @@
// Project Phoenix
//
// Copyright (c) 2017 RWTH Aachen University, Germany,
-// Virtual Reality & Immersive Visualisation Group.
+// Virtual Reality & Immersive Visualization Group.
//------------------------------------------------------------------------------
// License
//
-// Licensed under the Apache License, Version 2.0 (the "License");
+// Licensed under the 3-Clause BSD License (the "License");
// you may not use this file except in compliance with the License.
+// See the file LICENSE for the full text.
// You may obtain a copy of the License at
//
-// http://www.apache.org/licenses/LICENSE-2.0
+// https://opensource.org/licenses/BSD-3-Clause
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/demos/viewer/src/viewer_system.cpp b/demos/viewer/src/viewer_system.cpp
index 16c25775bfa10a68f0b4224dd600ce40492a53a0..8d5e5238c48b0a250cc98df45d1eebf4fe4bb630 100644
--- a/demos/viewer/src/viewer_system.cpp
+++ b/demos/viewer/src/viewer_system.cpp
@@ -2,15 +2,16 @@
// Project Phoenix
//
// Copyright (c) 2017 RWTH Aachen University, Germany,
-// Virtual Reality & Immersive Visualisation Group.
+// Virtual Reality & Immersive Visualization Group.
//------------------------------------------------------------------------------
// License
//
-// Licensed under the Apache License, Version 2.0 (the "License");
+// Licensed under the 3-Clause BSD License (the "License");
// you may not use this file except in compliance with the License.
+// See the file LICENSE for the full text.
// You may obtain a copy of the License at
//
-// http://www.apache.org/licenses/LICENSE-2.0
+// https://opensource.org/licenses/BSD-3-Clause
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/demos/viewer/src/viewer_system.hpp b/demos/viewer/src/viewer_system.hpp
index 90999b221ed805d84266c8f5f8b581793ae6f8c7..535190122303b22c033d77f79ffc8dcbbbed8f0c 100644
--- a/demos/viewer/src/viewer_system.hpp
+++ b/demos/viewer/src/viewer_system.hpp
@@ -2,15 +2,16 @@
// Project Phoenix
//
// Copyright (c) 2017 RWTH Aachen University, Germany,
-// Virtual Reality & Immersive Visualisation Group.
+// Virtual Reality & Immersive Visualization Group.
//------------------------------------------------------------------------------
// License
//
-// Licensed under the Apache License, Version 2.0 (the "License");
+// Licensed under the 3-Clause BSD License (the "License");
// you may not use this file except in compliance with the License.
+// See the file LICENSE for the full text.
// You may obtain a copy of the License at
//
-// http://www.apache.org/licenses/LICENSE-2.0
+// https://opensource.org/licenses/BSD-3-Clause
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/library/CMakeLists.txt b/library/CMakeLists.txt
index 0f098d9ddfd25c897260b619aac07a930daf2737..890b1d9404fe2a394da32cfbdeb64a979e2772a9 100644
--- a/library/CMakeLists.txt
+++ b/library/CMakeLists.txt
@@ -1,23 +1,24 @@
-#-------------------------------------------------------------------------------
+#------------------------------------------------------------------------------
# Project Phoenix
#
# Copyright (c) 2017 RWTH Aachen University, Germany,
-# Virtual Reality & Immersive Visualisation Group.
-#-------------------------------------------------------------------------------
-# License
+# Virtual Reality & Immersive Visualization Group.
+#------------------------------------------------------------------------------
+# License
#
-# Licensed under the Apache License, Version 2.0 (the "License");
+# Licensed under the 3-Clause BSD License (the "License");
# you may not use this file except in compliance with the License.
+# See the file LICENSE for the full text.
# You may obtain a copy of the License at
#
-# http://www.apache.org/licenses/LICENSE-2.0
+# https://opensource.org/licenses/BSD-3-Clause
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
-#-------------------------------------------------------------------------------
+#------------------------------------------------------------------------------
file(GLOB PHOENIX_SOURCES phx/*.cpp)
file(GLOB PHOENIX_HEADERS phx/*.hpp)
diff --git a/library/phx/assimp_loader.cpp b/library/phx/assimp_loader.cpp
index 651cff947be96e992e1fbdb792b4b764ec40d8aa..b1ba4eac5933143e140a610f8cda27d73b23f78d 100644
--- a/library/phx/assimp_loader.cpp
+++ b/library/phx/assimp_loader.cpp
@@ -2,15 +2,16 @@
// Project Phoenix
//
// Copyright (c) 2017 RWTH Aachen University, Germany,
-// Virtual Reality & Immersive Visualisation Group.
+// Virtual Reality & Immersive Visualization Group.
//------------------------------------------------------------------------------
// License
//
-// Licensed under the Apache License, Version 2.0 (the "License");
+// Licensed under the 3-Clause BSD License (the "License");
// you may not use this file except in compliance with the License.
+// See the file LICENSE for the full text.
// You may obtain a copy of the License at
//
-// http://www.apache.org/licenses/LICENSE-2.0
+// https://opensource.org/licenses/BSD-3-Clause
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/library/phx/assimp_loader.hpp b/library/phx/assimp_loader.hpp
index c4c77746463add28e46edbb60b003f470c7b2f8f..b837aca27169758f1bbe9328dfccf64586b03122 100644
--- a/library/phx/assimp_loader.hpp
+++ b/library/phx/assimp_loader.hpp
@@ -2,15 +2,16 @@
// Project Phoenix
//
// Copyright (c) 2017 RWTH Aachen University, Germany,
-// Virtual Reality & Immersive Visualisation Group.
+// Virtual Reality & Immersive Visualization Group.
//------------------------------------------------------------------------------
// License
//
-// Licensed under the Apache License, Version 2.0 (the "License");
+// Licensed under the 3-Clause BSD License (the "License");
// you may not use this file except in compliance with the License.
+// See the file LICENSE for the full text.
// You may obtain a copy of the License at
//
-// http://www.apache.org/licenses/LICENSE-2.0
+// https://opensource.org/licenses/BSD-3-Clause
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/library/phx/behavior.cpp b/library/phx/behavior.cpp
index a663dbcd416a145394c2ea3a9f139730b8103696..5c1480956d0980531b6b9c440b84f2014d0b1708 100644
--- a/library/phx/behavior.cpp
+++ b/library/phx/behavior.cpp
@@ -2,15 +2,16 @@
// Project Phoenix
//
// Copyright (c) 2017 RWTH Aachen University, Germany,
-// Virtual Reality & Immersive Visualisation Group.
+// Virtual Reality & Immersive Visualization Group.
//------------------------------------------------------------------------------
// License
//
-// Licensed under the Apache License, Version 2.0 (the "License");
+// Licensed under the 3-Clause BSD License (the "License");
// you may not use this file except in compliance with the License.
+// See the file LICENSE for the full text.
// You may obtain a copy of the License at
//
-// http://www.apache.org/licenses/LICENSE-2.0
+// https://opensource.org/licenses/BSD-3-Clause
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/library/phx/behavior.hpp b/library/phx/behavior.hpp
index f296ec1dbf756f69415bd1cd105a4eba88eb9035..2cb411782b6f46c433b5d07f1f9862f909568116 100644
--- a/library/phx/behavior.hpp
+++ b/library/phx/behavior.hpp
@@ -2,15 +2,16 @@
// Project Phoenix
//
// Copyright (c) 2017 RWTH Aachen University, Germany,
-// Virtual Reality & Immersive Visualisation Group.
+// Virtual Reality & Immersive Visualization Group.
//------------------------------------------------------------------------------
// License
//
-// Licensed under the Apache License, Version 2.0 (the "License");
+// Licensed under the 3-Clause BSD License (the "License");
// you may not use this file except in compliance with the License.
+// See the file LICENSE for the full text.
// You may obtain a copy of the License at
//
-// http://www.apache.org/licenses/LICENSE-2.0
+// https://opensource.org/licenses/BSD-3-Clause
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/library/phx/behavior_system.cpp b/library/phx/behavior_system.cpp
index f70ef76f42d489fdc6ca8f9c79490b7f6093026a..130e0cba6baad75ef427ce1950a0e0cbad3f349d 100644
--- a/library/phx/behavior_system.cpp
+++ b/library/phx/behavior_system.cpp
@@ -2,15 +2,16 @@
// Project Phoenix
//
// Copyright (c) 2017 RWTH Aachen University, Germany,
-// Virtual Reality & Immersive Visualisation Group.
+// Virtual Reality & Immersive Visualization Group.
//------------------------------------------------------------------------------
// License
//
-// Licensed under the Apache License, Version 2.0 (the "License");
+// Licensed under the 3-Clause BSD License (the "License");
// you may not use this file except in compliance with the License.
+// See the file LICENSE for the full text.
// You may obtain a copy of the License at
//
-// http://www.apache.org/licenses/LICENSE-2.0
+// https://opensource.org/licenses/BSD-3-Clause
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/library/phx/behavior_system.hpp b/library/phx/behavior_system.hpp
index 7171850f295abd69486e3ba3c047ec1f5ec49645..ffb67f57d5ff87655b9312919ffdf87535d5ab6f 100644
--- a/library/phx/behavior_system.hpp
+++ b/library/phx/behavior_system.hpp
@@ -2,15 +2,16 @@
// Project Phoenix
//
// Copyright (c) 2017 RWTH Aachen University, Germany,
-// Virtual Reality & Immersive Visualisation Group.
+// Virtual Reality & Immersive Visualization Group.
//------------------------------------------------------------------------------
// License
//
-// Licensed under the Apache License, Version 2.0 (the "License");
+// Licensed under the 3-Clause BSD License (the "License");
// you may not use this file except in compliance with the License.
+// See the file LICENSE for the full text.
// You may obtain a copy of the License at
//
-// http://www.apache.org/licenses/LICENSE-2.0
+// https://opensource.org/licenses/BSD-3-Clause
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/library/phx/clear_pass.cpp b/library/phx/clear_pass.cpp
index 7118729d2addb355b299317c7e2ab7b597f51a4b..f0e25117bf94432f3c046507f0e749df8b6b11d0 100644
--- a/library/phx/clear_pass.cpp
+++ b/library/phx/clear_pass.cpp
@@ -2,15 +2,16 @@
// Project Phoenix
//
// Copyright (c) 2017 RWTH Aachen University, Germany,
-// Virtual Reality & Immersive Visualisation Group.
+// Virtual Reality & Immersive Visualization Group.
//------------------------------------------------------------------------------
// License
//
-// Licensed under the Apache License, Version 2.0 (the "License");
+// Licensed under the 3-Clause BSD License (the "License");
// you may not use this file except in compliance with the License.
+// See the file LICENSE for the full text.
// You may obtain a copy of the License at
//
-// http://www.apache.org/licenses/LICENSE-2.0
+// https://opensource.org/licenses/BSD-3-Clause
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/library/phx/clear_pass.hpp b/library/phx/clear_pass.hpp
index df181c2c2b544d2de71c8a467a6a85bbc24d6d72..406b6c139d82c20ead769cf85de06b04f16ece92 100644
--- a/library/phx/clear_pass.hpp
+++ b/library/phx/clear_pass.hpp
@@ -2,15 +2,16 @@
// Project Phoenix
//
// Copyright (c) 2017 RWTH Aachen University, Germany,
-// Virtual Reality & Immersive Visualisation Group.
+// Virtual Reality & Immersive Visualization Group.
//------------------------------------------------------------------------------
// License
//
-// Licensed under the Apache License, Version 2.0 (the "License");
+// Licensed under the 3-Clause BSD License (the "License");
// you may not use this file except in compliance with the License.
+// See the file LICENSE for the full text.
// You may obtain a copy of the License at
//
-// http://www.apache.org/licenses/LICENSE-2.0
+// https://opensource.org/licenses/BSD-3-Clause
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/library/phx/component.cpp b/library/phx/component.cpp
index ef3897b77ac55143ae8d2d9b49482ec389bd472a..a3abeec58ef73c75b60760229c14fd86675f0367 100644
--- a/library/phx/component.cpp
+++ b/library/phx/component.cpp
@@ -2,15 +2,16 @@
// Project Phoenix
//
// Copyright (c) 2017 RWTH Aachen University, Germany,
-// Virtual Reality & Immersive Visualisation Group.
+// Virtual Reality & Immersive Visualization Group.
//------------------------------------------------------------------------------
// License
//
-// Licensed under the Apache License, Version 2.0 (the "License");
+// Licensed under the 3-Clause BSD License (the "License");
// you may not use this file except in compliance with the License.
+// See the file LICENSE for the full text.
// You may obtain a copy of the License at
//
-// http://www.apache.org/licenses/LICENSE-2.0
+// https://opensource.org/licenses/BSD-3-Clause
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/library/phx/component.hpp b/library/phx/component.hpp
index 548abe592642941654357f9c9492dc699794b402..38c98b3c11e2721391b3b84b9c7d7ba932bda149 100644
--- a/library/phx/component.hpp
+++ b/library/phx/component.hpp
@@ -2,15 +2,16 @@
// Project Phoenix
//
// Copyright (c) 2017 RWTH Aachen University, Germany,
-// Virtual Reality & Immersive Visualisation Group.
+// Virtual Reality & Immersive Visualization Group.
//------------------------------------------------------------------------------
// License
//
-// Licensed under the Apache License, Version 2.0 (the "License");
+// Licensed under the 3-Clause BSD License (the "License");
// you may not use this file except in compliance with the License.
+// See the file LICENSE for the full text.
// You may obtain a copy of the License at
//
-// http://www.apache.org/licenses/LICENSE-2.0
+// https://opensource.org/licenses/BSD-3-Clause
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/library/phx/component_check.hpp b/library/phx/component_check.hpp
index 325a6858f9c7d0313790bdb04379604a8887f374..c83f655463081bc8e9113426bcd3dc00f53d0447 100644
--- a/library/phx/component_check.hpp
+++ b/library/phx/component_check.hpp
@@ -2,15 +2,16 @@
// Project Phoenix
//
// Copyright (c) 2017 RWTH Aachen University, Germany,
-// Virtual Reality & Immersive Visualisation Group.
+// Virtual Reality & Immersive Visualization Group.
//------------------------------------------------------------------------------
// License
//
-// Licensed under the Apache License, Version 2.0 (the "License");
+// Licensed under the 3-Clause BSD License (the "License");
// you may not use this file except in compliance with the License.
+// See the file LICENSE for the full text.
// You may obtain a copy of the License at
//
-// http://www.apache.org/licenses/LICENSE-2.0
+// https://opensource.org/licenses/BSD-3-Clause
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/library/phx/engine.cpp b/library/phx/engine.cpp
index 530ad27299c4c19c0b0666dc5faac536431b4091..a7c8fab15bdfa195f3b34a9621d697edde00ec1a 100644
--- a/library/phx/engine.cpp
+++ b/library/phx/engine.cpp
@@ -2,15 +2,16 @@
// Project Phoenix
//
// Copyright (c) 2017 RWTH Aachen University, Germany,
-// Virtual Reality & Immersive Visualisation Group.
+// Virtual Reality & Immersive Visualization Group.
//------------------------------------------------------------------------------
// License
//
-// Licensed under the Apache License, Version 2.0 (the "License");
+// Licensed under the 3-Clause BSD License (the "License");
// you may not use this file except in compliance with the License.
+// See the file LICENSE for the full text.
// You may obtain a copy of the License at
//
-// http://www.apache.org/licenses/LICENSE-2.0
+// https://opensource.org/licenses/BSD-3-Clause
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/library/phx/engine.hpp b/library/phx/engine.hpp
index 07acd1cb5bde5214b1dc984ac85210215d044429..3c2bde6f3eec218b68b33706c8bd3c0f9becd019 100644
--- a/library/phx/engine.hpp
+++ b/library/phx/engine.hpp
@@ -2,15 +2,16 @@
// Project Phoenix
//
// Copyright (c) 2017 RWTH Aachen University, Germany,
-// Virtual Reality & Immersive Visualisation Group.
+// Virtual Reality & Immersive Visualization Group.
//------------------------------------------------------------------------------
// License
//
-// Licensed under the Apache License, Version 2.0 (the "License");
+// Licensed under the 3-Clause BSD License (the "License");
// you may not use this file except in compliance with the License.
+// See the file LICENSE for the full text.
// You may obtain a copy of the License at
//
-// http://www.apache.org/licenses/LICENSE-2.0
+// https://opensource.org/licenses/BSD-3-Clause
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/library/phx/entity.cpp b/library/phx/entity.cpp
index 6910d412f86aa1aa58bd3858d5f03f6819881077..ef6d862a586ddb48b7fe2468850ae48ebf29acaa 100644
--- a/library/phx/entity.cpp
+++ b/library/phx/entity.cpp
@@ -2,15 +2,16 @@
// Project Phoenix
//
// Copyright (c) 2017 RWTH Aachen University, Germany,
-// Virtual Reality & Immersive Visualisation Group.
+// Virtual Reality & Immersive Visualization Group.
//------------------------------------------------------------------------------
// License
//
-// Licensed under the Apache License, Version 2.0 (the "License");
+// Licensed under the 3-Clause BSD License (the "License");
// you may not use this file except in compliance with the License.
+// See the file LICENSE for the full text.
// You may obtain a copy of the License at
//
-// http://www.apache.org/licenses/LICENSE-2.0
+// https://opensource.org/licenses/BSD-3-Clause
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/library/phx/entity.hpp b/library/phx/entity.hpp
index 9b101514fa8b8c784aca420f39f66302538d1685..9ebd945165e656da71d4dc2627bfc064c2379094 100644
--- a/library/phx/entity.hpp
+++ b/library/phx/entity.hpp
@@ -2,15 +2,16 @@
// Project Phoenix
//
// Copyright (c) 2017 RWTH Aachen University, Germany,
-// Virtual Reality & Immersive Visualisation Group.
+// Virtual Reality & Immersive Visualization Group.
//------------------------------------------------------------------------------
// License
//
-// Licensed under the Apache License, Version 2.0 (the "License");
+// Licensed under the 3-Clause BSD License (the "License");
// you may not use this file except in compliance with the License.
+// See the file LICENSE for the full text.
// You may obtain a copy of the License at
//
-// http://www.apache.org/licenses/LICENSE-2.0
+// https://opensource.org/licenses/BSD-3-Clause
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/library/phx/frame_graph.cpp b/library/phx/frame_graph.cpp
index bb2f61cdc921a594580a7f466e004f5741082be5..4fb59d5635d8beac9c907191b268e9a55aecdff1 100644
--- a/library/phx/frame_graph.cpp
+++ b/library/phx/frame_graph.cpp
@@ -2,15 +2,16 @@
// Project Phoenix
//
// Copyright (c) 2017 RWTH Aachen University, Germany,
-// Virtual Reality & Immersive Visualisation Group.
+// Virtual Reality & Immersive Visualization Group.
//------------------------------------------------------------------------------
// License
//
-// Licensed under the Apache License, Version 2.0 (the "License");
+// Licensed under the 3-Clause BSD License (the "License");
// you may not use this file except in compliance with the License.
+// See the file LICENSE for the full text.
// You may obtain a copy of the License at
//
-// http://www.apache.org/licenses/LICENSE-2.0
+// https://opensource.org/licenses/BSD-3-Clause
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/library/phx/frame_graph.hpp b/library/phx/frame_graph.hpp
index ef399755e755c25d602e552a755a83342d571ae4..e021fd526c4fb78f698f3b321240b4124db0864a 100644
--- a/library/phx/frame_graph.hpp
+++ b/library/phx/frame_graph.hpp
@@ -2,15 +2,16 @@
// Project Phoenix
//
// Copyright (c) 2017 RWTH Aachen University, Germany,
-// Virtual Reality & Immersive Visualisation Group.
+// Virtual Reality & Immersive Visualization Group.
//------------------------------------------------------------------------------
// License
//
-// Licensed under the Apache License, Version 2.0 (the "License");
+// Licensed under the 3-Clause BSD License (the "License");
// you may not use this file except in compliance with the License.
+// See the file LICENSE for the full text.
// You may obtain a copy of the License at
//
-// http://www.apache.org/licenses/LICENSE-2.0
+// https://opensource.org/licenses/BSD-3-Clause
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/library/phx/frame_timer.hpp b/library/phx/frame_timer.hpp
index 44ee2febeddce4af98734f3dc3aa167156662496..7b924df1aeae8d5d415ecb8d0e58003ca0a9b90e 100644
--- a/library/phx/frame_timer.hpp
+++ b/library/phx/frame_timer.hpp
@@ -2,15 +2,16 @@
// Project Phoenix
//
// Copyright (c) 2017 RWTH Aachen University, Germany,
-// Virtual Reality & Immersive Visualisation Group.
+// Virtual Reality & Immersive Visualization Group.
//------------------------------------------------------------------------------
// License
//
-// Licensed under the Apache License, Version 2.0 (the "License");
+// Licensed under the 3-Clause BSD License (the "License");
// you may not use this file except in compliance with the License.
+// See the file LICENSE for the full text.
// You may obtain a copy of the License at
//
-// http://www.apache.org/licenses/LICENSE-2.0
+// https://opensource.org/licenses/BSD-3-Clause
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/library/phx/geometry_pass.cpp b/library/phx/geometry_pass.cpp
index 43e8fb79f2c24581e48d9508ce65f920d6e63e62..d559068109faa16a95dc8f566d4107438cdbf892 100644
--- a/library/phx/geometry_pass.cpp
+++ b/library/phx/geometry_pass.cpp
@@ -2,15 +2,16 @@
// Project Phoenix
//
// Copyright (c) 2017 RWTH Aachen University, Germany,
-// Virtual Reality & Immersive Visualisation Group.
+// Virtual Reality & Immersive Visualization Group.
//------------------------------------------------------------------------------
// License
//
-// Licensed under the Apache License, Version 2.0 (the "License");
+// Licensed under the 3-Clause BSD License (the "License");
// you may not use this file except in compliance with the License.
+// See the file LICENSE for the full text.
// You may obtain a copy of the License at
//
-// http://www.apache.org/licenses/LICENSE-2.0
+// https://opensource.org/licenses/BSD-3-Clause
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/library/phx/geometry_pass.hpp b/library/phx/geometry_pass.hpp
index 730015abd22c21db3b5d811190f608b5c320862a..7a148f1c22c45de87cbceba7fce8adf525568e17 100644
--- a/library/phx/geometry_pass.hpp
+++ b/library/phx/geometry_pass.hpp
@@ -2,15 +2,16 @@
// Project Phoenix
//
// Copyright (c) 2017 RWTH Aachen University, Germany,
-// Virtual Reality & Immersive Visualisation Group.
+// Virtual Reality & Immersive Visualization Group.
//------------------------------------------------------------------------------
// License
//
-// Licensed under the Apache License, Version 2.0 (the "License");
+// Licensed under the 3-Clause BSD License (the "License");
// you may not use this file except in compliance with the License.
+// See the file LICENSE for the full text.
// You may obtain a copy of the License at
//
-// http://www.apache.org/licenses/LICENSE-2.0
+// https://opensource.org/licenses/BSD-3-Clause
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/library/phx/hierarchical.hpp b/library/phx/hierarchical.hpp
index a7450ccd19d68a5fd991bd5588c1fb2a3b91b5bc..18af1b150a7fe5547e18c521fb2e15cd757f9f26 100644
--- a/library/phx/hierarchical.hpp
+++ b/library/phx/hierarchical.hpp
@@ -2,15 +2,16 @@
// Project Phoenix
//
// Copyright (c) 2017 RWTH Aachen University, Germany,
-// Virtual Reality & Immersive Visualisation Group.
+// Virtual Reality & Immersive Visualization Group.
//------------------------------------------------------------------------------
// License
//
-// Licensed under the Apache License, Version 2.0 (the "License");
+// Licensed under the 3-Clause BSD License (the "License");
// you may not use this file except in compliance with the License.
+// See the file LICENSE for the full text.
// You may obtain a copy of the License at
//
-// http://www.apache.org/licenses/LICENSE-2.0
+// https://opensource.org/licenses/BSD-3-Clause
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/library/phx/image.cpp b/library/phx/image.cpp
index c4b286a09f7080fde63a9905b3f26eb3cefee74d..df8e56e7daedeae1699cf0460a10d67a3a91b680 100644
--- a/library/phx/image.cpp
+++ b/library/phx/image.cpp
@@ -2,15 +2,16 @@
// Project Phoenix
//
// Copyright (c) 2017 RWTH Aachen University, Germany,
-// Virtual Reality & Immersive Visualisation Group.
+// Virtual Reality & Immersive Visualization Group.
//------------------------------------------------------------------------------
// License
//
-// Licensed under the Apache License, Version 2.0 (the "License");
+// Licensed under the 3-Clause BSD License (the "License");
// you may not use this file except in compliance with the License.
+// See the file LICENSE for the full text.
// You may obtain a copy of the License at
//
-// http://www.apache.org/licenses/LICENSE-2.0
+// https://opensource.org/licenses/BSD-3-Clause
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/library/phx/image.hpp b/library/phx/image.hpp
index 954346d499cced472fed71b83588fb89889f0c12..f345be2f8b157be85342afd6e7430bde77bae85d 100644
--- a/library/phx/image.hpp
+++ b/library/phx/image.hpp
@@ -2,15 +2,16 @@
// Project Phoenix
//
// Copyright (c) 2017 RWTH Aachen University, Germany,
-// Virtual Reality & Immersive Visualisation Group.
+// Virtual Reality & Immersive Visualization Group.
//------------------------------------------------------------------------------
// License
//
-// Licensed under the Apache License, Version 2.0 (the "License");
+// Licensed under the 3-Clause BSD License (the "License");
// you may not use this file except in compliance with the License.
+// See the file LICENSE for the full text.
// You may obtain a copy of the License at
//
-// http://www.apache.org/licenses/LICENSE-2.0
+// https://opensource.org/licenses/BSD-3-Clause
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/library/phx/input_system.cpp b/library/phx/input_system.cpp
index 6c5f35b7bac08cd45daf272b630cc0cdb51a15f9..69e89cf70a10aa784f22185656a7652cbabda129 100644
--- a/library/phx/input_system.cpp
+++ b/library/phx/input_system.cpp
@@ -2,15 +2,16 @@
// Project Phoenix
//
// Copyright (c) 2017 RWTH Aachen University, Germany,
-// Virtual Reality & Immersive Visualisation Group.
+// Virtual Reality & Immersive Visualization Group.
//------------------------------------------------------------------------------
// License
//
-// Licensed under the Apache License, Version 2.0 (the "License");
+// Licensed under the 3-Clause BSD License (the "License");
// you may not use this file except in compliance with the License.
+// See the file LICENSE for the full text.
// You may obtain a copy of the License at
//
-// http://www.apache.org/licenses/LICENSE-2.0
+// https://opensource.org/licenses/BSD-3-Clause
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/library/phx/input_system.hpp b/library/phx/input_system.hpp
index 790b41d38a504e5ac19de35128d2cd81557d20d9..46fbac9af3268abb29396ead4ebbab60f9a50319 100644
--- a/library/phx/input_system.hpp
+++ b/library/phx/input_system.hpp
@@ -2,15 +2,16 @@
// Project Phoenix
//
// Copyright (c) 2017 RWTH Aachen University, Germany,
-// Virtual Reality & Immersive Visualisation Group.
+// Virtual Reality & Immersive Visualization Group.
//------------------------------------------------------------------------------
// License
//
-// Licensed under the Apache License, Version 2.0 (the "License");
+// Licensed under the 3-Clause BSD License (the "License");
// you may not use this file except in compliance with the License.
+// See the file LICENSE for the full text.
// You may obtain a copy of the License at
//
-// http://www.apache.org/licenses/LICENSE-2.0
+// https://opensource.org/licenses/BSD-3-Clause
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/library/phx/light.cpp b/library/phx/light.cpp
index ecd91ae4b2cc66c83f3c0e33e12d296c92f92a53..4c36491ebb0ef4de48cbff8bfefb96e93d890d69 100644
--- a/library/phx/light.cpp
+++ b/library/phx/light.cpp
@@ -2,15 +2,16 @@
// Project Phoenix
//
// Copyright (c) 2017 RWTH Aachen University, Germany,
-// Virtual Reality & Immersive Visualisation Group.
+// Virtual Reality & Immersive Visualization Group.
//------------------------------------------------------------------------------
// License
//
-// Licensed under the Apache License, Version 2.0 (the "License");
+// Licensed under the 3-Clause BSD License (the "License");
// you may not use this file except in compliance with the License.
+// See the file LICENSE for the full text.
// You may obtain a copy of the License at
//
-// http://www.apache.org/licenses/LICENSE-2.0
+// https://opensource.org/licenses/BSD-3-Clause
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/library/phx/light.hpp b/library/phx/light.hpp
index f434b4056063e8709bc7d15880bd7880d6bc3963..23544710b2a8f2edef7acf3e714365ce312c9f4c 100644
--- a/library/phx/light.hpp
+++ b/library/phx/light.hpp
@@ -2,15 +2,16 @@
// Project Phoenix
//
// Copyright (c) 2017 RWTH Aachen University, Germany,
-// Virtual Reality & Immersive Visualisation Group.
+// Virtual Reality & Immersive Visualization Group.
//------------------------------------------------------------------------------
// License
//
-// Licensed under the Apache License, Version 2.0 (the "License");
+// Licensed under the 3-Clause BSD License (the "License");
// you may not use this file except in compliance with the License.
+// See the file LICENSE for the full text.
// You may obtain a copy of the License at
//
-// http://www.apache.org/licenses/LICENSE-2.0
+// https://opensource.org/licenses/BSD-3-Clause
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/library/phx/loggable.hpp b/library/phx/loggable.hpp
index c7cb8537511fd3edda6871e9c41d1a8bd2abec02..c8ee7ce966e31e4d1a6622100c9a4abe2dc621fa 100644
--- a/library/phx/loggable.hpp
+++ b/library/phx/loggable.hpp
@@ -2,15 +2,16 @@
// Project Phoenix
//
// Copyright (c) 2017 RWTH Aachen University, Germany,
-// Virtual Reality & Immersive Visualisation Group.
+// Virtual Reality & Immersive Visualization Group.
//------------------------------------------------------------------------------
// License
//
-// Licensed under the Apache License, Version 2.0 (the "License");
+// Licensed under the 3-Clause BSD License (the "License");
// you may not use this file except in compliance with the License.
+// See the file LICENSE for the full text.
// You may obtain a copy of the License at
//
-// http://www.apache.org/licenses/LICENSE-2.0
+// https://opensource.org/licenses/BSD-3-Clause
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/library/phx/logger.cpp b/library/phx/logger.cpp
index 320a72c415d33b869152a7a285ae67f8d7ee4d23..e8a1e00b4d3a48f08823eacc4a235289b0b0527c 100644
--- a/library/phx/logger.cpp
+++ b/library/phx/logger.cpp
@@ -2,15 +2,16 @@
// Project Phoenix
//
// Copyright (c) 2017 RWTH Aachen University, Germany,
-// Virtual Reality & Immersive Visualisation Group.
+// Virtual Reality & Immersive Visualization Group.
//------------------------------------------------------------------------------
// License
//
-// Licensed under the Apache License, Version 2.0 (the "License");
+// Licensed under the 3-Clause BSD License (the "License");
// you may not use this file except in compliance with the License.
+// See the file LICENSE for the full text.
// You may obtain a copy of the License at
//
-// http://www.apache.org/licenses/LICENSE-2.0
+// https://opensource.org/licenses/BSD-3-Clause
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/library/phx/logger.hpp b/library/phx/logger.hpp
index 0984c71f28d05837add0f49f64a0245ba0ea55ca..9201975d630c9c06064abb4cce8d4c6d028270db 100644
--- a/library/phx/logger.hpp
+++ b/library/phx/logger.hpp
@@ -2,15 +2,16 @@
// Project Phoenix
//
// Copyright (c) 2017 RWTH Aachen University, Germany,
-// Virtual Reality & Immersive Visualisation Group.
+// Virtual Reality & Immersive Visualization Group.
//------------------------------------------------------------------------------
// License
//
-// Licensed under the Apache License, Version 2.0 (the "License");
+// Licensed under the 3-Clause BSD License (the "License");
// you may not use this file except in compliance with the License.
+// See the file LICENSE for the full text.
// You may obtain a copy of the License at
//
-// http://www.apache.org/licenses/LICENSE-2.0
+// https://opensource.org/licenses/BSD-3-Clause
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/library/phx/material.cpp b/library/phx/material.cpp
index d57bf71f54cb7865b5196037c6fc44bb5325a8bb..4144669fe56ac8b6d0a6a8a8d149396a65472723 100644
--- a/library/phx/material.cpp
+++ b/library/phx/material.cpp
@@ -2,15 +2,16 @@
// Project Phoenix
//
// Copyright (c) 2017 RWTH Aachen University, Germany,
-// Virtual Reality & Immersive Visualisation Group.
+// Virtual Reality & Immersive Visualization Group.
//------------------------------------------------------------------------------
// License
//
-// Licensed under the Apache License, Version 2.0 (the "License");
+// Licensed under the 3-Clause BSD License (the "License");
// you may not use this file except in compliance with the License.
+// See the file LICENSE for the full text.
// You may obtain a copy of the License at
//
-// http://www.apache.org/licenses/LICENSE-2.0
+// https://opensource.org/licenses/BSD-3-Clause
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/library/phx/material.hpp b/library/phx/material.hpp
index ba20d2d6319e44d76f979cfea8a76315a1e326e4..2a06fda26bbe1b86fc0065f50948b2c8b48a078d 100644
--- a/library/phx/material.hpp
+++ b/library/phx/material.hpp
@@ -2,15 +2,16 @@
// Project Phoenix
//
// Copyright (c) 2017 RWTH Aachen University, Germany,
-// Virtual Reality & Immersive Visualisation Group.
+// Virtual Reality & Immersive Visualization Group.
//------------------------------------------------------------------------------
// License
//
-// Licensed under the Apache License, Version 2.0 (the "License");
+// Licensed under the 3-Clause BSD License (the "License");
// you may not use this file except in compliance with the License.
+// See the file LICENSE for the full text.
// You may obtain a copy of the License at
//
-// http://www.apache.org/licenses/LICENSE-2.0
+// https://opensource.org/licenses/BSD-3-Clause
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/library/phx/mesh.cpp b/library/phx/mesh.cpp
index 3f76a781e97275cc45cbe97e2de918b3cfafd992..65af1afc9f438368b24c48e1f69cd6637c84af50 100644
--- a/library/phx/mesh.cpp
+++ b/library/phx/mesh.cpp
@@ -2,15 +2,16 @@
// Project Phoenix
//
// Copyright (c) 2017 RWTH Aachen University, Germany,
-// Virtual Reality & Immersive Visualisation Group.
+// Virtual Reality & Immersive Visualization Group.
//------------------------------------------------------------------------------
// License
//
-// Licensed under the Apache License, Version 2.0 (the "License");
+// Licensed under the 3-Clause BSD License (the "License");
// you may not use this file except in compliance with the License.
+// See the file LICENSE for the full text.
// You may obtain a copy of the License at
//
-// http://www.apache.org/licenses/LICENSE-2.0
+// https://opensource.org/licenses/BSD-3-Clause
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/library/phx/mesh.hpp b/library/phx/mesh.hpp
index 91f5637f53e2a399e1592cbb30139ae106c82d2f..b45e98f945aa16d375efc0a8d6b5ef0499c23994 100644
--- a/library/phx/mesh.hpp
+++ b/library/phx/mesh.hpp
@@ -2,15 +2,16 @@
// Project Phoenix
//
// Copyright (c) 2017 RWTH Aachen University, Germany,
-// Virtual Reality & Immersive Visualisation Group.
+// Virtual Reality & Immersive Visualization Group.
//------------------------------------------------------------------------------
// License
//
-// Licensed under the Apache License, Version 2.0 (the "License");
+// Licensed under the 3-Clause BSD License (the "License");
// you may not use this file except in compliance with the License.
+// See the file LICENSE for the full text.
// You may obtain a copy of the License at
//
-// http://www.apache.org/licenses/LICENSE-2.0
+// https://opensource.org/licenses/BSD-3-Clause
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/library/phx/nameable.hpp b/library/phx/nameable.hpp
index 3c00995e35f86bfd4fa0be29c28469b8f94444ca..9cd2748033c14064675620a71440cf720f385e64 100644
--- a/library/phx/nameable.hpp
+++ b/library/phx/nameable.hpp
@@ -2,15 +2,16 @@
// Project Phoenix
//
// Copyright (c) 2017 RWTH Aachen University, Germany,
-// Virtual Reality & Immersive Visualisation Group.
+// Virtual Reality & Immersive Visualization Group.
//------------------------------------------------------------------------------
// License
//
-// Licensed under the Apache License, Version 2.0 (the "License");
+// Licensed under the 3-Clause BSD License (the "License");
// you may not use this file except in compliance with the License.
+// See the file LICENSE for the full text.
// You may obtain a copy of the License at
//
-// http://www.apache.org/licenses/LICENSE-2.0
+// https://opensource.org/licenses/BSD-3-Clause
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/library/phx/opengl_image_buffer_data.cpp b/library/phx/opengl_image_buffer_data.cpp
index bfedca532b8ece110b5b1923b6e18e1d5372c3da..10b8cd0e9198b68606ce6d4f89b55ba7ebdc417d 100644
--- a/library/phx/opengl_image_buffer_data.cpp
+++ b/library/phx/opengl_image_buffer_data.cpp
@@ -2,15 +2,16 @@
// Project Phoenix
//
// Copyright (c) 2017 RWTH Aachen University, Germany,
-// Virtual Reality & Immersive Visualisation Group.
+// Virtual Reality & Immersive Visualization Group.
//------------------------------------------------------------------------------
// License
//
-// Licensed under the Apache License, Version 2.0 (the "License");
+// Licensed under the 3-Clause BSD License (the "License");
// you may not use this file except in compliance with the License.
+// See the file LICENSE for the full text.
// You may obtain a copy of the License at
//
-// http://www.apache.org/licenses/LICENSE-2.0
+// https://opensource.org/licenses/BSD-3-Clause
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/library/phx/opengl_image_buffer_data.hpp b/library/phx/opengl_image_buffer_data.hpp
index 1a0f2f848a5436da13b82a38915688cfe67e8af6..0712988f60cb23ac2a398ddaa3c4b4f9d1c4ff13 100644
--- a/library/phx/opengl_image_buffer_data.hpp
+++ b/library/phx/opengl_image_buffer_data.hpp
@@ -2,15 +2,16 @@
// Project Phoenix
//
// Copyright (c) 2017 RWTH Aachen University, Germany,
-// Virtual Reality & Immersive Visualisation Group.
+// Virtual Reality & Immersive Visualization Group.
//------------------------------------------------------------------------------
// License
//
-// Licensed under the Apache License, Version 2.0 (the "License");
+// Licensed under the 3-Clause BSD License (the "License");
// you may not use this file except in compliance with the License.
+// See the file LICENSE for the full text.
// You may obtain a copy of the License at
//
-// http://www.apache.org/licenses/LICENSE-2.0
+// https://opensource.org/licenses/BSD-3-Clause
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/library/phx/output_system.cpp b/library/phx/output_system.cpp
index 7afc7a12c32a6c44c699f2610075065fcb1ad940..b4ed71834cd1e86831f3020ad849e19da90c3e61 100644
--- a/library/phx/output_system.cpp
+++ b/library/phx/output_system.cpp
@@ -2,15 +2,16 @@
// Project Phoenix
//
// Copyright (c) 2017 RWTH Aachen University, Germany,
-// Virtual Reality & Immersive Visualisation Group.
+// Virtual Reality & Immersive Visualization Group.
//------------------------------------------------------------------------------
// License
//
-// Licensed under the Apache License, Version 2.0 (the "License");
+// Licensed under the 3-Clause BSD License (the "License");
// you may not use this file except in compliance with the License.
+// See the file LICENSE for the full text.
// You may obtain a copy of the License at
//
-// http://www.apache.org/licenses/LICENSE-2.0
+// https://opensource.org/licenses/BSD-3-Clause
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/library/phx/output_system.hpp b/library/phx/output_system.hpp
index 93b88dc85f14ce44bd4d0cfaca2947e72854da58..625966d4e5e7728251eca46aaad8dbfd13a3ddde 100644
--- a/library/phx/output_system.hpp
+++ b/library/phx/output_system.hpp
@@ -2,15 +2,16 @@
// Project Phoenix
//
// Copyright (c) 2017 RWTH Aachen University, Germany,
-// Virtual Reality & Immersive Visualisation Group.
+// Virtual Reality & Immersive Visualization Group.
//------------------------------------------------------------------------------
// License
//
-// Licensed under the Apache License, Version 2.0 (the "License");
+// Licensed under the 3-Clause BSD License (the "License");
// you may not use this file except in compliance with the License.
+// See the file LICENSE for the full text.
// You may obtain a copy of the License at
//
-// http://www.apache.org/licenses/LICENSE-2.0
+// https://opensource.org/licenses/BSD-3-Clause
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/library/phx/phoenix.cpp b/library/phx/phoenix.cpp
index 18258b2d4580894ae1b54e71a68865f522e3ee39..c4f9875d31d7ee14631da281750b859b6514b674 100644
--- a/library/phx/phoenix.cpp
+++ b/library/phx/phoenix.cpp
@@ -2,15 +2,16 @@
// Project Phoenix
//
// Copyright (c) 2017 RWTH Aachen University, Germany,
-// Virtual Reality & Immersive Visualisation Group.
+// Virtual Reality & Immersive Visualization Group.
//------------------------------------------------------------------------------
// License
//
-// Licensed under the Apache License, Version 2.0 (the "License");
+// Licensed under the 3-Clause BSD License (the "License");
// you may not use this file except in compliance with the License.
+// See the file LICENSE for the full text.
// You may obtain a copy of the License at
//
-// http://www.apache.org/licenses/LICENSE-2.0
+// https://opensource.org/licenses/BSD-3-Clause
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/library/phx/phoenix.hpp b/library/phx/phoenix.hpp
index 6afb39dd9a7cc2f2b4916cc793122eef4b058a5e..c156fdb87c51718d4c6e17eacf25c2399a15b24d 100644
--- a/library/phx/phoenix.hpp
+++ b/library/phx/phoenix.hpp
@@ -2,15 +2,16 @@
// Project Phoenix
//
// Copyright (c) 2017 RWTH Aachen University, Germany,
-// Virtual Reality & Immersive Visualisation Group.
+// Virtual Reality & Immersive Visualization Group.
//------------------------------------------------------------------------------
// License
//
-// Licensed under the Apache License, Version 2.0 (the "License");
+// Licensed under the 3-Clause BSD License (the "License");
// you may not use this file except in compliance with the License.
+// See the file LICENSE for the full text.
// You may obtain a copy of the License at
//
-// http://www.apache.org/licenses/LICENSE-2.0
+// https://opensource.org/licenses/BSD-3-Clause
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/library/phx/projection.cpp b/library/phx/projection.cpp
index cf29e0be14be2c9fd23be710c8e33e1a099a41ad..3ff100d63a82e9545f8495b66f28d58d03c08633 100644
--- a/library/phx/projection.cpp
+++ b/library/phx/projection.cpp
@@ -2,15 +2,16 @@
// Project Phoenix
//
// Copyright (c) 2017 RWTH Aachen University, Germany,
-// Virtual Reality & Immersive Visualisation Group.
+// Virtual Reality & Immersive Visualization Group.
//------------------------------------------------------------------------------
// License
//
-// Licensed under the Apache License, Version 2.0 (the "License");
+// Licensed under the 3-Clause BSD License (the "License");
// you may not use this file except in compliance with the License.
+// See the file LICENSE for the full text.
// You may obtain a copy of the License at
//
-// http://www.apache.org/licenses/LICENSE-2.0
+// https://opensource.org/licenses/BSD-3-Clause
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/library/phx/projection.hpp b/library/phx/projection.hpp
index 17358a3f2a6fc8b05558356396454c914276718e..9a1a8296d601df85d1868907b13e8fe2518b03e8 100644
--- a/library/phx/projection.hpp
+++ b/library/phx/projection.hpp
@@ -2,15 +2,16 @@
// Project Phoenix
//
// Copyright (c) 2017 RWTH Aachen University, Germany,
-// Virtual Reality & Immersive Visualisation Group.
+// Virtual Reality & Immersive Visualization Group.
//------------------------------------------------------------------------------
// License
//
-// Licensed under the Apache License, Version 2.0 (the "License");
+// Licensed under the 3-Clause BSD License (the "License");
// you may not use this file except in compliance with the License.
+// See the file LICENSE for the full text.
// You may obtain a copy of the License at
//
-// http://www.apache.org/licenses/LICENSE-2.0
+// https://opensource.org/licenses/BSD-3-Clause
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/library/phx/render_pass.hpp b/library/phx/render_pass.hpp
index 223ca3913d5b943678fb84f9039884c4dde59564..524fc7f6e91419b5390589f4ee38e85692408282 100644
--- a/library/phx/render_pass.hpp
+++ b/library/phx/render_pass.hpp
@@ -2,15 +2,16 @@
// Project Phoenix
//
// Copyright (c) 2017 RWTH Aachen University, Germany,
-// Virtual Reality & Immersive Visualisation Group.
+// Virtual Reality & Immersive Visualization Group.
//------------------------------------------------------------------------------
// License
//
-// Licensed under the Apache License, Version 2.0 (the "License");
+// Licensed under the 3-Clause BSD License (the "License");
// you may not use this file except in compliance with the License.
+// See the file LICENSE for the full text.
// You may obtain a copy of the License at
//
-// http://www.apache.org/licenses/LICENSE-2.0
+// https://opensource.org/licenses/BSD-3-Clause
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/library/phx/rendering_system.cpp b/library/phx/rendering_system.cpp
index 9a859eec5839235fcde6c043d82dae3121b1549c..c92c7baf962d81b49ffd9d51058dd8f8b26c249b 100644
--- a/library/phx/rendering_system.cpp
+++ b/library/phx/rendering_system.cpp
@@ -2,15 +2,16 @@
// Project Phoenix
//
// Copyright (c) 2017 RWTH Aachen University, Germany,
-// Virtual Reality & Immersive Visualisation Group.
+// Virtual Reality & Immersive Visualization Group.
//------------------------------------------------------------------------------
// License
//
-// Licensed under the Apache License, Version 2.0 (the "License");
+// Licensed under the 3-Clause BSD License (the "License");
// you may not use this file except in compliance with the License.
+// See the file LICENSE for the full text.
// You may obtain a copy of the License at
//
-// http://www.apache.org/licenses/LICENSE-2.0
+// https://opensource.org/licenses/BSD-3-Clause
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/library/phx/rendering_system.hpp b/library/phx/rendering_system.hpp
index b2b67a2c40845d677b947e98b3c47e225100e7ad..6f9808a900955ef9623f94d1eb75aa9905548702 100644
--- a/library/phx/rendering_system.hpp
+++ b/library/phx/rendering_system.hpp
@@ -2,15 +2,16 @@
// Project Phoenix
//
// Copyright (c) 2017 RWTH Aachen University, Germany,
-// Virtual Reality & Immersive Visualisation Group.
+// Virtual Reality & Immersive Visualization Group.
//------------------------------------------------------------------------------
// License
//
-// Licensed under the Apache License, Version 2.0 (the "License");
+// Licensed under the 3-Clause BSD License (the "License");
// you may not use this file except in compliance with the License.
+// See the file LICENSE for the full text.
// You may obtain a copy of the License at
//
-// http://www.apache.org/licenses/LICENSE-2.0
+// https://opensource.org/licenses/BSD-3-Clause
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/library/phx/scene.cpp b/library/phx/scene.cpp
index ebb9e1408ae8c7d2d4d6bf793a748e65f5e8e9d0..ae8f532def2534a34308fec8143879cbda1fa903 100644
--- a/library/phx/scene.cpp
+++ b/library/phx/scene.cpp
@@ -2,15 +2,16 @@
// Project Phoenix
//
// Copyright (c) 2017 RWTH Aachen University, Germany,
-// Virtual Reality & Immersive Visualisation Group.
+// Virtual Reality & Immersive Visualization Group.
//------------------------------------------------------------------------------
// License
//
-// Licensed under the Apache License, Version 2.0 (the "License");
+// Licensed under the 3-Clause BSD License (the "License");
// you may not use this file except in compliance with the License.
+// See the file LICENSE for the full text.
// You may obtain a copy of the License at
//
-// http://www.apache.org/licenses/LICENSE-2.0
+// https://opensource.org/licenses/BSD-3-Clause
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/library/phx/scene.hpp b/library/phx/scene.hpp
index dc2e18afa462f4c9dfb136b4547953be223af19d..b47ab78ba5e1db15823f297ce1c43c05a0243569 100644
--- a/library/phx/scene.hpp
+++ b/library/phx/scene.hpp
@@ -2,15 +2,16 @@
// Project Phoenix
//
// Copyright (c) 2017 RWTH Aachen University, Germany,
-// Virtual Reality & Immersive Visualisation Group.
+// Virtual Reality & Immersive Visualization Group.
//------------------------------------------------------------------------------
// License
//
-// Licensed under the Apache License, Version 2.0 (the "License");
+// Licensed under the 3-Clause BSD License (the "License");
// you may not use this file except in compliance with the License.
+// See the file LICENSE for the full text.
// You may obtain a copy of the License at
//
-// http://www.apache.org/licenses/LICENSE-2.0
+// https://opensource.org/licenses/BSD-3-Clause
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/library/phx/setup.cpp b/library/phx/setup.cpp
index 37e1fa2efa898e35296400143b6658d7a567f915..5f52e02c38edcb16048322a34a319cf4ea64371c 100644
--- a/library/phx/setup.cpp
+++ b/library/phx/setup.cpp
@@ -2,15 +2,16 @@
// Project Phoenix
//
// Copyright (c) 2017 RWTH Aachen University, Germany,
-// Virtual Reality & Immersive Visualisation Group.
+// Virtual Reality & Immersive Visualization Group.
//------------------------------------------------------------------------------
// License
//
-// Licensed under the Apache License, Version 2.0 (the "License");
+// Licensed under the 3-Clause BSD License (the "License");
// you may not use this file except in compliance with the License.
+// See the file LICENSE for the full text.
// You may obtain a copy of the License at
//
-// http://www.apache.org/licenses/LICENSE-2.0
+// https://opensource.org/licenses/BSD-3-Clause
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/library/phx/setup.hpp b/library/phx/setup.hpp
index d282c967e832ce937455ce3f45f57ac36409bc48..802c0461caf7a03e099471f3b25917144085af52 100644
--- a/library/phx/setup.hpp
+++ b/library/phx/setup.hpp
@@ -2,15 +2,16 @@
// Project Phoenix
//
// Copyright (c) 2017 RWTH Aachen University, Germany,
-// Virtual Reality & Immersive Visualisation Group.
+// Virtual Reality & Immersive Visualization Group.
//------------------------------------------------------------------------------
// License
//
-// Licensed under the Apache License, Version 2.0 (the "License");
+// Licensed under the 3-Clause BSD License (the "License");
// you may not use this file except in compliance with the License.
+// See the file LICENSE for the full text.
// You may obtain a copy of the License at
//
-// http://www.apache.org/licenses/LICENSE-2.0
+// https://opensource.org/licenses/BSD-3-Clause
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/library/phx/shader_program.cpp b/library/phx/shader_program.cpp
index c900fb53d7cb57ea6c6bc30c4b3224b02948b73b..896ab11feebfbbc56200108ac0f56c553b6b64a4 100644
--- a/library/phx/shader_program.cpp
+++ b/library/phx/shader_program.cpp
@@ -2,15 +2,16 @@
// Project Phoenix
//
// Copyright (c) 2017 RWTH Aachen University, Germany,
-// Virtual Reality & Immersive Visualisation Group.
+// Virtual Reality & Immersive Visualization Group.
//------------------------------------------------------------------------------
// License
//
-// Licensed under the Apache License, Version 2.0 (the "License");
+// Licensed under the 3-Clause BSD License (the "License");
// you may not use this file except in compliance with the License.
+// See the file LICENSE for the full text.
// You may obtain a copy of the License at
//
-// http://www.apache.org/licenses/LICENSE-2.0
+// https://opensource.org/licenses/BSD-3-Clause
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/library/phx/shader_program.hpp b/library/phx/shader_program.hpp
index 21225638b4f73945cfee194e2f2c1f7db44ec7c2..a9b506fced3cc8316b4c4324c4af49e33fdee665 100644
--- a/library/phx/shader_program.hpp
+++ b/library/phx/shader_program.hpp
@@ -2,15 +2,16 @@
// Project Phoenix
//
// Copyright (c) 2017 RWTH Aachen University, Germany,
-// Virtual Reality & Immersive Visualisation Group.
+// Virtual Reality & Immersive Visualization Group.
//------------------------------------------------------------------------------
// License
//
-// Licensed under the Apache License, Version 2.0 (the "License");
+// Licensed under the 3-Clause BSD License (the "License");
// you may not use this file except in compliance with the License.
+// See the file LICENSE for the full text.
// You may obtain a copy of the License at
//
-// http://www.apache.org/licenses/LICENSE-2.0
+// https://opensource.org/licenses/BSD-3-Clause
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/library/phx/stream_helpers.cpp b/library/phx/stream_helpers.cpp
index ce05973f73b6148a448fb5d1e43fcb4130112cca..c14de1320ae26cfecc97fb46992db4b785795f97 100644
--- a/library/phx/stream_helpers.cpp
+++ b/library/phx/stream_helpers.cpp
@@ -2,15 +2,16 @@
// Project Phoenix
//
// Copyright (c) 2017 RWTH Aachen University, Germany,
-// Virtual Reality & Immersive Visualisation Group.
+// Virtual Reality & Immersive Visualization Group.
//------------------------------------------------------------------------------
// License
//
-// Licensed under the Apache License, Version 2.0 (the "License");
+// Licensed under the 3-Clause BSD License (the "License");
// you may not use this file except in compliance with the License.
+// See the file LICENSE for the full text.
// You may obtain a copy of the License at
//
-// http://www.apache.org/licenses/LICENSE-2.0
+// https://opensource.org/licenses/BSD-3-Clause
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/library/phx/stream_helpers.hpp b/library/phx/stream_helpers.hpp
index 0eeab5e70cb76d956836c94d5a993385aabc7eb2..13c601a432c77757636fc50545ef2b0fb5cac15c 100644
--- a/library/phx/stream_helpers.hpp
+++ b/library/phx/stream_helpers.hpp
@@ -2,15 +2,16 @@
// Project Phoenix
//
// Copyright (c) 2017 RWTH Aachen University, Germany,
-// Virtual Reality & Immersive Visualisation Group.
+// Virtual Reality & Immersive Visualization Group.
//------------------------------------------------------------------------------
// License
//
-// Licensed under the Apache License, Version 2.0 (the "License");
+// Licensed under the 3-Clause BSD License (the "License");
// you may not use this file except in compliance with the License.
+// See the file LICENSE for the full text.
// You may obtain a copy of the License at
//
-// http://www.apache.org/licenses/LICENSE-2.0
+// https://opensource.org/licenses/BSD-3-Clause
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/library/phx/swap_buffers_pass.cpp b/library/phx/swap_buffers_pass.cpp
index 2b4a9c1c198fa1a170501ba747b53b06faa24b24..66729ff6d77a3000b2be546efd5fc3c58505b894 100644
--- a/library/phx/swap_buffers_pass.cpp
+++ b/library/phx/swap_buffers_pass.cpp
@@ -2,15 +2,16 @@
// Project Phoenix
//
// Copyright (c) 2017 RWTH Aachen University, Germany,
-// Virtual Reality & Immersive Visualisation Group.
+// Virtual Reality & Immersive Visualization Group.
//------------------------------------------------------------------------------
// License
//
-// Licensed under the Apache License, Version 2.0 (the "License");
+// Licensed under the 3-Clause BSD License (the "License");
// you may not use this file except in compliance with the License.
+// See the file LICENSE for the full text.
// You may obtain a copy of the License at
//
-// http://www.apache.org/licenses/LICENSE-2.0
+// https://opensource.org/licenses/BSD-3-Clause
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/library/phx/swap_buffers_pass.hpp b/library/phx/swap_buffers_pass.hpp
index e4e383a26a6c68e6a56798024c22a38e98f936d0..5cec8881c0f8865b5f7f2b508b3b5c335f14a106 100644
--- a/library/phx/swap_buffers_pass.hpp
+++ b/library/phx/swap_buffers_pass.hpp
@@ -2,15 +2,16 @@
// Project Phoenix
//
// Copyright (c) 2017 RWTH Aachen University, Germany,
-// Virtual Reality & Immersive Visualisation Group.
+// Virtual Reality & Immersive Visualization Group.
//------------------------------------------------------------------------------
// License
//
-// Licensed under the Apache License, Version 2.0 (the "License");
+// Licensed under the 3-Clause BSD License (the "License");
// you may not use this file except in compliance with the License.
+// See the file LICENSE for the full text.
// You may obtain a copy of the License at
//
-// http://www.apache.org/licenses/LICENSE-2.0
+// https://opensource.org/licenses/BSD-3-Clause
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/library/phx/system.cpp b/library/phx/system.cpp
index d9836c25737fb7beaa1743077ce72dfb5b3344ea..7037bd3b2cd1a52f447d15aa8de0b3437b13484d 100644
--- a/library/phx/system.cpp
+++ b/library/phx/system.cpp
@@ -2,15 +2,16 @@
// Project Phoenix
//
// Copyright (c) 2017 RWTH Aachen University, Germany,
-// Virtual Reality & Immersive Visualisation Group.
+// Virtual Reality & Immersive Visualization Group.
//------------------------------------------------------------------------------
// License
//
-// Licensed under the Apache License, Version 2.0 (the "License");
+// Licensed under the 3-Clause BSD License (the "License");
// you may not use this file except in compliance with the License.
+// See the file LICENSE for the full text.
// You may obtain a copy of the License at
//
-// http://www.apache.org/licenses/LICENSE-2.0
+// https://opensource.org/licenses/BSD-3-Clause
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/library/phx/system.hpp b/library/phx/system.hpp
index d485be00c29e3724baa77cae924255b1e1f30c66..ff448323b1d4de56b16255421f5cca9092fbfb68 100644
--- a/library/phx/system.hpp
+++ b/library/phx/system.hpp
@@ -2,15 +2,16 @@
// Project Phoenix
//
// Copyright (c) 2017 RWTH Aachen University, Germany,
-// Virtual Reality & Immersive Visualisation Group.
+// Virtual Reality & Immersive Visualization Group.
//------------------------------------------------------------------------------
// License
//
-// Licensed under the Apache License, Version 2.0 (the "License");
+// Licensed under the 3-Clause BSD License (the "License");
// you may not use this file except in compliance with the License.
+// See the file LICENSE for the full text.
// You may obtain a copy of the License at
//
-// http://www.apache.org/licenses/LICENSE-2.0
+// https://opensource.org/licenses/BSD-3-Clause
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/library/phx/time_info.hpp b/library/phx/time_info.hpp
index b5b86f550d0ad4c902063f621f8d5ed1940cd624..98e2cf5f168159a44f7967aa80e83437443a686d 100644
--- a/library/phx/time_info.hpp
+++ b/library/phx/time_info.hpp
@@ -2,15 +2,16 @@
// Project Phoenix
//
// Copyright (c) 2017 RWTH Aachen University, Germany,
-// Virtual Reality & Immersive Visualisation Group.
+// Virtual Reality & Immersive Visualization Group.
//------------------------------------------------------------------------------
// License
//
-// Licensed under the Apache License, Version 2.0 (the "License");
+// Licensed under the 3-Clause BSD License (the "License");
// you may not use this file except in compliance with the License.
+// See the file LICENSE for the full text.
// You may obtain a copy of the License at
//
-// http://www.apache.org/licenses/LICENSE-2.0
+// https://opensource.org/licenses/BSD-3-Clause
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/library/phx/transform.cpp b/library/phx/transform.cpp
index 8213b7bb6efca3cc9aef82e039fee9fb5a3d7991..cbeac031b27a566841e43f2b38954ade0207a6ef 100644
--- a/library/phx/transform.cpp
+++ b/library/phx/transform.cpp
@@ -2,15 +2,16 @@
// Project Phoenix
//
// Copyright (c) 2017 RWTH Aachen University, Germany,
-// Virtual Reality & Immersive Visualisation Group.
+// Virtual Reality & Immersive Visualization Group.
//------------------------------------------------------------------------------
// License
//
-// Licensed under the Apache License, Version 2.0 (the "License");
+// Licensed under the 3-Clause BSD License (the "License");
// you may not use this file except in compliance with the License.
+// See the file LICENSE for the full text.
// You may obtain a copy of the License at
//
-// http://www.apache.org/licenses/LICENSE-2.0
+// https://opensource.org/licenses/BSD-3-Clause
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/library/phx/transform.hpp b/library/phx/transform.hpp
index 378f1baa50db208d20dbd6b54cee53b42ea5e9ab..edf6d31da57111788f2dd016638fb945ae1a3532 100644
--- a/library/phx/transform.hpp
+++ b/library/phx/transform.hpp
@@ -2,15 +2,16 @@
// Project Phoenix
//
// Copyright (c) 2017 RWTH Aachen University, Germany,
-// Virtual Reality & Immersive Visualisation Group.
+// Virtual Reality & Immersive Visualization Group.
//------------------------------------------------------------------------------
// License
//
-// Licensed under the Apache License, Version 2.0 (the "License");
+// Licensed under the 3-Clause BSD License (the "License");
// you may not use this file except in compliance with the License.
+// See the file LICENSE for the full text.
// You may obtain a copy of the License at
//
-// http://www.apache.org/licenses/LICENSE-2.0
+// https://opensource.org/licenses/BSD-3-Clause
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/library/phx/window.cpp b/library/phx/window.cpp
index 6bd495c23f798cea5cc60e034e5d63fbdd4d24f6..7ae730e53877ccb97329fca58a05524b1dcc7bee 100644
--- a/library/phx/window.cpp
+++ b/library/phx/window.cpp
@@ -2,15 +2,16 @@
// Project Phoenix
//
// Copyright (c) 2017 RWTH Aachen University, Germany,
-// Virtual Reality & Immersive Visualisation Group.
+// Virtual Reality & Immersive Visualization Group.
//------------------------------------------------------------------------------
// License
//
-// Licensed under the Apache License, Version 2.0 (the "License");
+// Licensed under the 3-Clause BSD License (the "License");
// you may not use this file except in compliance with the License.
+// See the file LICENSE for the full text.
// You may obtain a copy of the License at
//
-// http://www.apache.org/licenses/LICENSE-2.0
+// https://opensource.org/licenses/BSD-3-Clause
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/library/phx/window.hpp b/library/phx/window.hpp
index f7a30306abe293baf4924c90452bc25b4e44713e..32dfee914866e75a6053d375729d6ae67ff34150 100644
--- a/library/phx/window.hpp
+++ b/library/phx/window.hpp
@@ -2,15 +2,16 @@
// Project Phoenix
//
// Copyright (c) 2017 RWTH Aachen University, Germany,
-// Virtual Reality & Immersive Visualisation Group.
+// Virtual Reality & Immersive Visualization Group.
//------------------------------------------------------------------------------
// License
//
-// Licensed under the Apache License, Version 2.0 (the "License");
+// Licensed under the 3-Clause BSD License (the "License");
// you may not use this file except in compliance with the License.
+// See the file LICENSE for the full text.
// You may obtain a copy of the License at
//
-// http://www.apache.org/licenses/LICENSE-2.0
+// https://opensource.org/licenses/BSD-3-Clause
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/resources/shader/test.frag b/resources/shader/test.frag
index 30d74d258442c7c65512eafab474568dd706c430..9daeafb9864cf43055ae93beb0afd6c7d144bfa4 100644
--- a/resources/shader/test.frag
+++ b/resources/shader/test.frag
@@ -1 +1 @@
-test
\ No newline at end of file
+test
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index b43df89ac51b2fc0ed5397349b867bc79bafc9e8..c527e7e8b0574a68b6474586d5c02673beae4ef2 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -1,23 +1,24 @@
-#-------------------------------------------------------------------------------
+#------------------------------------------------------------------------------
# Project Phoenix
#
# Copyright (c) 2017 RWTH Aachen University, Germany,
-# Virtual Reality & Immersive Visualisation Group.
-#-------------------------------------------------------------------------------
-# License
+# Virtual Reality & Immersive Visualization Group.
+#------------------------------------------------------------------------------
+# License
#
-# Licensed under the Apache License, Version 2.0 (the "License");
+# Licensed under the 3-Clause BSD License (the "License");
# you may not use this file except in compliance with the License.
+# See the file LICENSE for the full text.
# You may obtain a copy of the License at
#
-# http://www.apache.org/licenses/LICENSE-2.0
+# https://opensource.org/licenses/BSD-3-Clause
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
-#-------------------------------------------------------------------------------
+#------------------------------------------------------------------------------
#see at the bottom how to add mocked tests
diff --git a/tests/src/integration_test_model_rendering.cpp b/tests/src/integration_test_model_rendering.cpp
index 5b2c4da4ec881a17751bcdbdff4b58271134059e..f3c27f0daf9a46fee87e1246e7749e85137dfd16 100644
--- a/tests/src/integration_test_model_rendering.cpp
+++ b/tests/src/integration_test_model_rendering.cpp
@@ -2,15 +2,16 @@
// Project Phoenix
//
// Copyright (c) 2017 RWTH Aachen University, Germany,
-// Virtual Reality & Immersive Visualisation Group.
+// Virtual Reality & Immersive Visualization Group.
//------------------------------------------------------------------------------
// License
//
-// Licensed under the Apache License, Version 2.0 (the "License");
+// Licensed under the 3-Clause BSD License (the "License");
// you may not use this file except in compliance with the License.
+// See the file LICENSE for the full text.
// You may obtain a copy of the License at
//
-// http://www.apache.org/licenses/LICENSE-2.0
+// https://opensource.org/licenses/BSD-3-Clause
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/tests/src/integration_test_opengl_buffer_data_download.cpp b/tests/src/integration_test_opengl_buffer_data_download.cpp
index fdc4a1636694a006cd4e53f88a013532bbd9d7ea..23f341a5c304594e0e90ebadc70cc915d16dd294 100644
--- a/tests/src/integration_test_opengl_buffer_data_download.cpp
+++ b/tests/src/integration_test_opengl_buffer_data_download.cpp
@@ -2,15 +2,16 @@
// Project Phoenix
//
// Copyright (c) 2017 RWTH Aachen University, Germany,
-// Virtual Reality & Immersive Visualisation Group.
+// Virtual Reality & Immersive Visualization Group.
//------------------------------------------------------------------------------
// License
//
-// Licensed under the Apache License, Version 2.0 (the "License");
+// Licensed under the 3-Clause BSD License (the "License");
// you may not use this file except in compliance with the License.
+// See the file LICENSE for the full text.
// You may obtain a copy of the License at
//
-// http://www.apache.org/licenses/LICENSE-2.0
+// https://opensource.org/licenses/BSD-3-Clause
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/tests/src/integration_test_rendering.cpp b/tests/src/integration_test_rendering.cpp
index d7d786a3038e8c2e3990bc9d2212d7c139e03141..88084d7969edfb1c22011ebe83673e1608b7a571 100644
--- a/tests/src/integration_test_rendering.cpp
+++ b/tests/src/integration_test_rendering.cpp
@@ -2,15 +2,16 @@
// Project Phoenix
//
// Copyright (c) 2017 RWTH Aachen University, Germany,
-// Virtual Reality & Immersive Visualisation Group.
+// Virtual Reality & Immersive Visualization Group.
//------------------------------------------------------------------------------
// License
//
-// Licensed under the Apache License, Version 2.0 (the "License");
+// Licensed under the 3-Clause BSD License (the "License");
// you may not use this file except in compliance with the License.
+// See the file LICENSE for the full text.
// You may obtain a copy of the License at
//
-// http://www.apache.org/licenses/LICENSE-2.0
+// https://opensource.org/licenses/BSD-3-Clause
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/tests/src/mocks/generation/Create_openGL_mock.py b/tests/src/mocks/generation/Create_openGL_mock.py
index 4daa1b2230fc77f6f3a29ead52e3cd88d911344f..8af1f2e49349216276d44aa2be46496be27cd80c 100644
--- a/tests/src/mocks/generation/Create_openGL_mock.py
+++ b/tests/src/mocks/generation/Create_openGL_mock.py
@@ -1,3 +1,24 @@
+#------------------------------------------------------------------------------
+# Project Phoenix
+#
+# Copyright (c) 2017 RWTH Aachen University, Germany,
+# Virtual Reality & Immersive Visualization Group.
+#------------------------------------------------------------------------------
+# License
+#
+# Licensed under the 3-Clause BSD License (the "License");
+# you may not use this file except in compliance with the License.
+# See the file LICENSE for the full text.
+# You may obtain a copy of the License at
+#
+# https://opensource.org/licenses/BSD-3-Clause
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#------------------------------------------------------------------------------
import sys, getopt
#functions you want to mock should be put in this list
diff --git a/tests/src/mocks/generation/README.txt b/tests/src/mocks/generation/README.txt
index a37b263c34c096c40bf593466b5b8c1a7d0ffd80..bf2e5cfc0d0e176134d253ab1ee97ccc66b68b68 100644
--- a/tests/src/mocks/generation/README.txt
+++ b/tests/src/mocks/generation/README.txt
@@ -1,3 +1,24 @@
+#------------------------------------------------------------------------------
+# Project Phoenix
+#
+# Copyright (c) 2017 RWTH Aachen University, Germany,
+# Virtual Reality & Immersive Visualization Group.
+#------------------------------------------------------------------------------
+# License
+#
+# Licensed under the 3-Clause BSD License (the "License");
+# you may not use this file except in compliance with the License.
+# See the file LICENSE for the full text.
+# You may obtain a copy of the License at
+#
+# https://opensource.org/licenses/BSD-3-Clause
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#------------------------------------------------------------------------------
If a method is missing and a linker error is thrown, you have to add the methods
to the functions_to_mock list in the beginning of the python generator script.
diff --git a/tests/src/mocks/generation/open_gl_mock_template.cpp b/tests/src/mocks/generation/open_gl_mock_template.cpp
index 744ab95ccbbb3050e2aed1802ee462a4267f9a75..082571e106c15b06b8c52b4935d867a974a6992e 100644
--- a/tests/src/mocks/generation/open_gl_mock_template.cpp
+++ b/tests/src/mocks/generation/open_gl_mock_template.cpp
@@ -2,15 +2,16 @@
// Project Phoenix
//
// Copyright (c) 2017 RWTH Aachen University, Germany,
-// Virtual Reality & Immersive Visualisation Group.
+// Virtual Reality & Immersive Visualization Group.
//------------------------------------------------------------------------------
// License
//
-// Licensed under the Apache License, Version 2.0 (the "License");
+// Licensed under the 3-Clause BSD License (the "License");
// you may not use this file except in compliance with the License.
+// See the file LICENSE for the full text.
// You may obtain a copy of the License at
//
-// http://www.apache.org/licenses/LICENSE-2.0
+// https://opensource.org/licenses/BSD-3-Clause
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/tests/src/mocks/generation/open_gl_mock_template.hpp b/tests/src/mocks/generation/open_gl_mock_template.hpp
index 71650ae5bd5cf2809ba343483db6bdae0a4e12a3..a0b462cbe3a97ed218055cff8fdb03d74e1d87e7 100644
--- a/tests/src/mocks/generation/open_gl_mock_template.hpp
+++ b/tests/src/mocks/generation/open_gl_mock_template.hpp
@@ -2,15 +2,16 @@
// Project Phoenix
//
// Copyright (c) 2017 RWTH Aachen University, Germany,
-// Virtual Reality & Immersive Visualisation Group.
+// Virtual Reality & Immersive Visualization Group.
//------------------------------------------------------------------------------
// License
//
-// Licensed under the Apache License, Version 2.0 (the "License");
+// Licensed under the 3-Clause BSD License (the "License");
// you may not use this file except in compliance with the License.
+// See the file LICENSE for the full text.
// You may obtain a copy of the License at
//
-// http://www.apache.org/licenses/LICENSE-2.0
+// https://opensource.org/licenses/BSD-3-Clause
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/tests/src/mocks/sdl_mock.cpp b/tests/src/mocks/sdl_mock.cpp
index 77d81091949fd5abe84378a7787e0f02a13c500e..1058fc0402a4d9031acd5c49f741ad1dd9087c76 100644
--- a/tests/src/mocks/sdl_mock.cpp
+++ b/tests/src/mocks/sdl_mock.cpp
@@ -2,15 +2,16 @@
// Project Phoenix
//
// Copyright (c) 2017 RWTH Aachen University, Germany,
-// Virtual Reality & Immersive Visualisation Group.
+// Virtual Reality & Immersive Visualization Group.
//------------------------------------------------------------------------------
// License
//
-// Licensed under the Apache License, Version 2.0 (the "License");
+// Licensed under the 3-Clause BSD License (the "License");
// you may not use this file except in compliance with the License.
+// See the file LICENSE for the full text.
// You may obtain a copy of the License at
//
-// http://www.apache.org/licenses/LICENSE-2.0
+// https://opensource.org/licenses/BSD-3-Clause
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/tests/src/mocks/sdl_mock.hpp b/tests/src/mocks/sdl_mock.hpp
index 9c993c65f54b8f8c5b4845b4d9edee3c15499c67..ffad925cbb0d16ad9da4853ca70cad2bffa84309 100644
--- a/tests/src/mocks/sdl_mock.hpp
+++ b/tests/src/mocks/sdl_mock.hpp
@@ -2,15 +2,16 @@
// Project Phoenix
//
// Copyright (c) 2017 RWTH Aachen University, Germany,
-// Virtual Reality & Immersive Visualisation Group.
+// Virtual Reality & Immersive Visualization Group.
//------------------------------------------------------------------------------
// License
//
-// Licensed under the Apache License, Version 2.0 (the "License");
+// Licensed under the 3-Clause BSD License (the "License");
// you may not use this file except in compliance with the License.
+// See the file LICENSE for the full text.
// You may obtain a copy of the License at
//
-// http://www.apache.org/licenses/LICENSE-2.0
+// https://opensource.org/licenses/BSD-3-Clause
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/tests/src/test-phoenix.cpp b/tests/src/test-phoenix.cpp
index 9ff0e549bfbbcf9ec83bb2d2118b6bfa6480c0d0..34b10faf9a774162ebd78b2676ef6e4e16201d8a 100644
--- a/tests/src/test-phoenix.cpp
+++ b/tests/src/test-phoenix.cpp
@@ -2,15 +2,16 @@
// Project Phoenix
//
// Copyright (c) 2017 RWTH Aachen University, Germany,
-// Virtual Reality & Immersive Visualisation Group.
+// Virtual Reality & Immersive Visualization Group.
//------------------------------------------------------------------------------
// License
//
-// Licensed under the Apache License, Version 2.0 (the "License");
+// Licensed under the 3-Clause BSD License (the "License");
// you may not use this file except in compliance with the License.
+// See the file LICENSE for the full text.
// You may obtain a copy of the License at
//
-// http://www.apache.org/licenses/LICENSE-2.0
+// https://opensource.org/licenses/BSD-3-Clause
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/tests/src/test-transform.cpp b/tests/src/test-transform.cpp
index c99f28fd487decfa83548313b41576d8377886a6..d5b23f89f78c944c3d5b6154564c44b32b46f341 100644
--- a/tests/src/test-transform.cpp
+++ b/tests/src/test-transform.cpp
@@ -2,15 +2,16 @@
// Project Phoenix
//
// Copyright (c) 2017 RWTH Aachen University, Germany,
-// Virtual Reality & Immersive Visualisation Group.
+// Virtual Reality & Immersive Visualization Group.
//------------------------------------------------------------------------------
// License
//
-// Licensed under the Apache License, Version 2.0 (the "License");
+// Licensed under the 3-Clause BSD License (the "License");
// you may not use this file except in compliance with the License.
+// See the file LICENSE for the full text.
// You may obtain a copy of the License at
//
-// http://www.apache.org/licenses/LICENSE-2.0
+// https://opensource.org/licenses/BSD-3-Clause
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/tests/src/test_assimp_loader.cpp b/tests/src/test_assimp_loader.cpp
index 0c093d50b6bf2fdc57060799de69892d9fe92c0a..96a6e3bed2874ea19c6d110d263d2b1b9f66b1d3 100644
--- a/tests/src/test_assimp_loader.cpp
+++ b/tests/src/test_assimp_loader.cpp
@@ -2,15 +2,16 @@
// Project Phoenix
//
// Copyright (c) 2017 RWTH Aachen University, Germany,
-// Virtual Reality & Immersive Visualisation Group.
+// Virtual Reality & Immersive Visualization Group.
//------------------------------------------------------------------------------
// License
//
-// Licensed under the Apache License, Version 2.0 (the "License");
+// Licensed under the 3-Clause BSD License (the "License");
// you may not use this file except in compliance with the License.
+// See the file LICENSE for the full text.
// You may obtain a copy of the License at
//
-// http://www.apache.org/licenses/LICENSE-2.0
+// https://opensource.org/licenses/BSD-3-Clause
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/tests/src/test_behavior_system.cpp b/tests/src/test_behavior_system.cpp
index 11375b060340c2317b11db123a88fffefe5f8adc..e7e2510fafc7f69ffbe6efd14585f3c04b293426 100644
--- a/tests/src/test_behavior_system.cpp
+++ b/tests/src/test_behavior_system.cpp
@@ -2,15 +2,16 @@
// Project Phoenix
//
// Copyright (c) 2017 RWTH Aachen University, Germany,
-// Virtual Reality & Immersive Visualisation Group.
+// Virtual Reality & Immersive Visualization Group.
//------------------------------------------------------------------------------
// License
//
-// Licensed under the Apache License, Version 2.0 (the "License");
+// Licensed under the 3-Clause BSD License (the "License");
// you may not use this file except in compliance with the License.
+// See the file LICENSE for the full text.
// You may obtain a copy of the License at
//
-// http://www.apache.org/licenses/LICENSE-2.0
+// https://opensource.org/licenses/BSD-3-Clause
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/tests/src/test_clear_pass.cpp b/tests/src/test_clear_pass.cpp
index b74e437d4a99509bb5c673bb7079e5927d5bc534..479a2cc4e74d4d6cdd4443dd3df7938b6d1a0cc1 100644
--- a/tests/src/test_clear_pass.cpp
+++ b/tests/src/test_clear_pass.cpp
@@ -2,15 +2,16 @@
// Project Phoenix
//
// Copyright (c) 2017 RWTH Aachen University, Germany,
-// Virtual Reality & Immersive Visualisation Group.
+// Virtual Reality & Immersive Visualization Group.
//------------------------------------------------------------------------------
// License
//
-// Licensed under the Apache License, Version 2.0 (the "License");
+// Licensed under the 3-Clause BSD License (the "License");
// you may not use this file except in compliance with the License.
+// See the file LICENSE for the full text.
// You may obtain a copy of the License at
//
-// http://www.apache.org/licenses/LICENSE-2.0
+// https://opensource.org/licenses/BSD-3-Clause
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/tests/src/test_engine.cpp b/tests/src/test_engine.cpp
index 52f95c1adbd313e8e4e38ffd76af8cec11b46150..93e57a00396abfea516003eb1b73ea38867406cf 100644
--- a/tests/src/test_engine.cpp
+++ b/tests/src/test_engine.cpp
@@ -2,15 +2,16 @@
// Project Phoenix
//
// Copyright (c) 2017 RWTH Aachen University, Germany,
-// Virtual Reality & Immersive Visualisation Group.
+// Virtual Reality & Immersive Visualization Group.
//------------------------------------------------------------------------------
// License
//
-// Licensed under the Apache License, Version 2.0 (the "License");
+// Licensed under the 3-Clause BSD License (the "License");
// you may not use this file except in compliance with the License.
+// See the file LICENSE for the full text.
// You may obtain a copy of the License at
//
-// http://www.apache.org/licenses/LICENSE-2.0
+// https://opensource.org/licenses/BSD-3-Clause
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/tests/src/test_entity.cpp b/tests/src/test_entity.cpp
index 3baf219e7c5d09a2706355c3de4b6b5b1e889dfa..c4f20a49a55c18b5f0683b22ff8338bad341a87c 100644
--- a/tests/src/test_entity.cpp
+++ b/tests/src/test_entity.cpp
@@ -2,15 +2,16 @@
// Project Phoenix
//
// Copyright (c) 2017 RWTH Aachen University, Germany,
-// Virtual Reality & Immersive Visualisation Group.
+// Virtual Reality & Immersive Visualization Group.
//------------------------------------------------------------------------------
// License
//
-// Licensed under the Apache License, Version 2.0 (the "License");
+// Licensed under the 3-Clause BSD License (the "License");
// you may not use this file except in compliance with the License.
+// See the file LICENSE for the full text.
// You may obtain a copy of the License at
//
-// http://www.apache.org/licenses/LICENSE-2.0
+// https://opensource.org/licenses/BSD-3-Clause
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/tests/src/test_frame_graph.cpp b/tests/src/test_frame_graph.cpp
index e6746a2ebdc7f6944cf7fd180380752c457ed83f..a90ad4dfc13576472083cff2c44df8cc9a01cd79 100644
--- a/tests/src/test_frame_graph.cpp
+++ b/tests/src/test_frame_graph.cpp
@@ -2,15 +2,16 @@
// Project Phoenix
//
// Copyright (c) 2017 RWTH Aachen University, Germany,
-// Virtual Reality & Immersive Visualisation Group.
+// Virtual Reality & Immersive Visualization Group.
//------------------------------------------------------------------------------
// License
//
-// Licensed under the Apache License, Version 2.0 (the "License");
+// Licensed under the 3-Clause BSD License (the "License");
// you may not use this file except in compliance with the License.
+// See the file LICENSE for the full text.
// You may obtain a copy of the License at
//
-// http://www.apache.org/licenses/LICENSE-2.0
+// https://opensource.org/licenses/BSD-3-Clause
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/tests/src/test_geometry_pass.cpp b/tests/src/test_geometry_pass.cpp
index bae04ae398cb0f73650d3cf100961811b17809a7..947527e87088bc754816f6ce5fd71f1222b209cc 100644
--- a/tests/src/test_geometry_pass.cpp
+++ b/tests/src/test_geometry_pass.cpp
@@ -2,15 +2,16 @@
// Project Phoenix
//
// Copyright (c) 2017 RWTH Aachen University, Germany,
-// Virtual Reality & Immersive Visualisation Group.
+// Virtual Reality & Immersive Visualization Group.
//------------------------------------------------------------------------------
// License
//
-// Licensed under the Apache License, Version 2.0 (the "License");
+// Licensed under the 3-Clause BSD License (the "License");
// you may not use this file except in compliance with the License.
+// See the file LICENSE for the full text.
// You may obtain a copy of the License at
//
-// http://www.apache.org/licenses/LICENSE-2.0
+// https://opensource.org/licenses/BSD-3-Clause
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/tests/src/test_image.cpp b/tests/src/test_image.cpp
index 995ce1dd4ff5151a78231dc22da5b486445c5488..ac5b0596067fa9b62565881a1435d6ba99ce1f7f 100644
--- a/tests/src/test_image.cpp
+++ b/tests/src/test_image.cpp
@@ -2,15 +2,16 @@
// Project Phoenix
//
// Copyright (c) 2017 RWTH Aachen University, Germany,
-// Virtual Reality & Immersive Visualisation Group.
+// Virtual Reality & Immersive Visualization Group.
//------------------------------------------------------------------------------
// License
//
-// Licensed under the Apache License, Version 2.0 (the "License");
+// Licensed under the 3-Clause BSD License (the "License");
// you may not use this file except in compliance with the License.
+// See the file LICENSE for the full text.
// You may obtain a copy of the License at
//
-// http://www.apache.org/licenses/LICENSE-2.0
+// https://opensource.org/licenses/BSD-3-Clause
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/tests/src/test_input_system.cpp b/tests/src/test_input_system.cpp
index 90f213e69d29754bbc0af50f3246f5ec8a0eb119..fb595a98cc05a116e2455149f881eaafc7952773 100644
--- a/tests/src/test_input_system.cpp
+++ b/tests/src/test_input_system.cpp
@@ -2,15 +2,16 @@
// Project Phoenix
//
// Copyright (c) 2017 RWTH Aachen University, Germany,
-// Virtual Reality & Immersive Visualisation Group.
+// Virtual Reality & Immersive Visualization Group.
//------------------------------------------------------------------------------
// License
//
-// Licensed under the Apache License, Version 2.0 (the "License");
+// Licensed under the 3-Clause BSD License (the "License");
// you may not use this file except in compliance with the License.
+// See the file LICENSE for the full text.
// You may obtain a copy of the License at
//
-// http://www.apache.org/licenses/LICENSE-2.0
+// https://opensource.org/licenses/BSD-3-Clause
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/tests/src/test_light.cpp b/tests/src/test_light.cpp
index 95f61bd3a13b7efd21dc4e54a7dc3f089829ce38..0fd01abaaae77970579e3729510b988e28421a96 100644
--- a/tests/src/test_light.cpp
+++ b/tests/src/test_light.cpp
@@ -2,15 +2,16 @@
// Project Phoenix
//
// Copyright (c) 2017 RWTH Aachen University, Germany,
-// Virtual Reality & Immersive Visualisation Group.
+// Virtual Reality & Immersive Visualization Group.
//------------------------------------------------------------------------------
// License
//
-// Licensed under the Apache License, Version 2.0 (the "License");
+// Licensed under the 3-Clause BSD License (the "License");
// you may not use this file except in compliance with the License.
+// See the file LICENSE for the full text.
// You may obtain a copy of the License at
//
-// http://www.apache.org/licenses/LICENSE-2.0
+// https://opensource.org/licenses/BSD-3-Clause
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/tests/src/test_material.cpp b/tests/src/test_material.cpp
index 97ac159adacb34a0429f50e2a4d80916d7c8d00b..c5afef276b1b581e03bb3f50f65c597903ea9eac 100644
--- a/tests/src/test_material.cpp
+++ b/tests/src/test_material.cpp
@@ -2,15 +2,16 @@
// Project Phoenix
//
// Copyright (c) 2017 RWTH Aachen University, Germany,
-// Virtual Reality & Immersive Visualisation Group.
+// Virtual Reality & Immersive Visualization Group.
//------------------------------------------------------------------------------
// License
//
-// Licensed under the Apache License, Version 2.0 (the "License");
+// Licensed under the 3-Clause BSD License (the "License");
// you may not use this file except in compliance with the License.
+// See the file LICENSE for the full text.
// You may obtain a copy of the License at
//
-// http://www.apache.org/licenses/LICENSE-2.0
+// https://opensource.org/licenses/BSD-3-Clause
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/tests/src/test_mesh.cpp b/tests/src/test_mesh.cpp
index 2f8700c28b8fb0b4f7668a69fc4df33e8b5a8318..234be24b6690934038968e0fcdde16d9eb05f188 100644
--- a/tests/src/test_mesh.cpp
+++ b/tests/src/test_mesh.cpp
@@ -2,15 +2,16 @@
// Project Phoenix
//
// Copyright (c) 2017 RWTH Aachen University, Germany,
-// Virtual Reality & Immersive Visualisation Group.
+// Virtual Reality & Immersive Visualization Group.
//------------------------------------------------------------------------------
// License
//
-// Licensed under the Apache License, Version 2.0 (the "License");
+// Licensed under the 3-Clause BSD License (the "License");
// you may not use this file except in compliance with the License.
+// See the file LICENSE for the full text.
// You may obtain a copy of the License at
//
-// http://www.apache.org/licenses/LICENSE-2.0
+// https://opensource.org/licenses/BSD-3-Clause
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/tests/src/test_opengl_buffer_data.cpp b/tests/src/test_opengl_buffer_data.cpp
index 309479fedc3d7f7a4caf94b47ea42ddf517a25fa..24705b00cb0dae00ff963e0b05732f50f587a7a7 100644
--- a/tests/src/test_opengl_buffer_data.cpp
+++ b/tests/src/test_opengl_buffer_data.cpp
@@ -2,15 +2,16 @@
// Project Phoenix
//
// Copyright (c) 2017 RWTH Aachen University, Germany,
-// Virtual Reality & Immersive Visualisation Group.
+// Virtual Reality & Immersive Visualization Group.
//------------------------------------------------------------------------------
// License
//
-// Licensed under the Apache License, Version 2.0 (the "License");
+// Licensed under the 3-Clause BSD License (the "License");
// you may not use this file except in compliance with the License.
+// See the file LICENSE for the full text.
// You may obtain a copy of the License at
//
-// http://www.apache.org/licenses/LICENSE-2.0
+// https://opensource.org/licenses/BSD-3-Clause
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/tests/src/test_opengl_buffer_data_comparison.cpp b/tests/src/test_opengl_buffer_data_comparison.cpp
index 4d36d4cb98dc445c684af2afadde319fbc69dae0..4f206a7a6fffcd58b6d4a31aa6906e2e09c782ed 100644
--- a/tests/src/test_opengl_buffer_data_comparison.cpp
+++ b/tests/src/test_opengl_buffer_data_comparison.cpp
@@ -2,15 +2,16 @@
// Project Phoenix
//
// Copyright (c) 2017 RWTH Aachen University, Germany,
-// Virtual Reality & Immersive Visualisation Group.
+// Virtual Reality & Immersive Visualization Group.
//------------------------------------------------------------------------------
// License
//
-// Licensed under the Apache License, Version 2.0 (the "License");
+// Licensed under the 3-Clause BSD License (the "License");
// you may not use this file except in compliance with the License.
+// See the file LICENSE for the full text.
// You may obtain a copy of the License at
//
-// http://www.apache.org/licenses/LICENSE-2.0
+// https://opensource.org/licenses/BSD-3-Clause
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/tests/src/test_output_system.cpp b/tests/src/test_output_system.cpp
index 1ea715475542d8ccf53f72492a0c4e9268cca5c5..0b6d86cf5ae45b31ce8e33716cd0be19eabab770 100644
--- a/tests/src/test_output_system.cpp
+++ b/tests/src/test_output_system.cpp
@@ -2,15 +2,16 @@
// Project Phoenix
//
// Copyright (c) 2017 RWTH Aachen University, Germany,
-// Virtual Reality & Immersive Visualisation Group.
+// Virtual Reality & Immersive Visualization Group.
//------------------------------------------------------------------------------
// License
//
-// Licensed under the Apache License, Version 2.0 (the "License");
+// Licensed under the 3-Clause BSD License (the "License");
// you may not use this file except in compliance with the License.
+// See the file LICENSE for the full text.
// You may obtain a copy of the License at
//
-// http://www.apache.org/licenses/LICENSE-2.0
+// https://opensource.org/licenses/BSD-3-Clause
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/tests/src/test_projection.cpp b/tests/src/test_projection.cpp
index 199863e87de4e78c55fe964df461e06dc9840d7f..41ba917388cb67fff804fc4b4ba76fd1853a5467 100644
--- a/tests/src/test_projection.cpp
+++ b/tests/src/test_projection.cpp
@@ -2,15 +2,16 @@
// Project Phoenix
//
// Copyright (c) 2017 RWTH Aachen University, Germany,
-// Virtual Reality & Immersive Visualisation Group.
+// Virtual Reality & Immersive Visualization Group.
//------------------------------------------------------------------------------
// License
//
-// Licensed under the Apache License, Version 2.0 (the "License");
+// Licensed under the 3-Clause BSD License (the "License");
// you may not use this file except in compliance with the License.
+// See the file LICENSE for the full text.
// You may obtain a copy of the License at
//
-// http://www.apache.org/licenses/LICENSE-2.0
+// https://opensource.org/licenses/BSD-3-Clause
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/tests/src/test_rendering_system.cpp b/tests/src/test_rendering_system.cpp
index 08c06b2da9dcd84866ed997f8a02dda39b1f1d4e..d918912493e699ed12fef7238ac19bcaacffa07a 100644
--- a/tests/src/test_rendering_system.cpp
+++ b/tests/src/test_rendering_system.cpp
@@ -2,15 +2,16 @@
// Project Phoenix
//
// Copyright (c) 2017 RWTH Aachen University, Germany,
-// Virtual Reality & Immersive Visualisation Group.
+// Virtual Reality & Immersive Visualization Group.
//------------------------------------------------------------------------------
// License
//
-// Licensed under the Apache License, Version 2.0 (the "License");
+// Licensed under the 3-Clause BSD License (the "License");
// you may not use this file except in compliance with the License.
+// See the file LICENSE for the full text.
// You may obtain a copy of the License at
//
-// http://www.apache.org/licenses/LICENSE-2.0
+// https://opensource.org/licenses/BSD-3-Clause
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/tests/src/test_scene.cpp b/tests/src/test_scene.cpp
index 958d5daa21eaa11bd9513a934dce92d2b5ae2fa0..5721fba943d5720c09a7a08363eea19fc57f0c0c 100644
--- a/tests/src/test_scene.cpp
+++ b/tests/src/test_scene.cpp
@@ -2,15 +2,16 @@
// Project Phoenix
//
// Copyright (c) 2017 RWTH Aachen University, Germany,
-// Virtual Reality & Immersive Visualisation Group.
+// Virtual Reality & Immersive Visualization Group.
//------------------------------------------------------------------------------
// License
//
-// Licensed under the Apache License, Version 2.0 (the "License");
+// Licensed under the 3-Clause BSD License (the "License");
// you may not use this file except in compliance with the License.
+// See the file LICENSE for the full text.
// You may obtain a copy of the License at
//
-// http://www.apache.org/licenses/LICENSE-2.0
+// https://opensource.org/licenses/BSD-3-Clause
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/tests/src/test_shader.cpp b/tests/src/test_shader.cpp
index 8c0c6483ae7f42301bb1fea1d2682e7406ced432..73b3c0aacf139ebf2bd35b992bca770cb05dd8a8 100644
--- a/tests/src/test_shader.cpp
+++ b/tests/src/test_shader.cpp
@@ -2,15 +2,16 @@
// Project Phoenix
//
// Copyright (c) 2017 RWTH Aachen University, Germany,
-// Virtual Reality & Immersive Visualisation Group.
+// Virtual Reality & Immersive Visualization Group.
//------------------------------------------------------------------------------
// License
//
-// Licensed under the Apache License, Version 2.0 (the "License");
+// Licensed under the 3-Clause BSD License (the "License");
// you may not use this file except in compliance with the License.
+// See the file LICENSE for the full text.
// You may obtain a copy of the License at
//
-// http://www.apache.org/licenses/LICENSE-2.0
+// https://opensource.org/licenses/BSD-3-Clause
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
@@ -71,7 +72,7 @@ SCENARIO("We can load shaders.", "[phx][phx::Shader]") {
.SIDE_EFFECT(*_3 = 1);
REQUIRE_CALL(open_gl_mock, glCreateShader(_)).RETURN(1u);
REQUIRE_CALL(open_gl_mock, glShaderSource(1u, 1, _, _))
- .WITH(std::string(*_3) == "test");
+ .WITH(std::string(*_3) == "test\n");
REQUIRE_CALL(open_gl_mock, glCompileShader(1u));
REQUIRE_CALL(open_gl_mock, glAttachShader(1u, 1u));
diff --git a/tests/src/test_swap_buffers_pass.cpp b/tests/src/test_swap_buffers_pass.cpp
index 9fbb561519c0d4e35a95afac8505deedc303bf99..cc8a2894a423d3bddb4af84e5bae544bb3d46013 100644
--- a/tests/src/test_swap_buffers_pass.cpp
+++ b/tests/src/test_swap_buffers_pass.cpp
@@ -2,15 +2,16 @@
// Project Phoenix
//
// Copyright (c) 2017 RWTH Aachen University, Germany,
-// Virtual Reality & Immersive Visualisation Group.
+// Virtual Reality & Immersive Visualization Group.
//------------------------------------------------------------------------------
// License
//
-// Licensed under the Apache License, Version 2.0 (the "License");
+// Licensed under the 3-Clause BSD License (the "License");
// you may not use this file except in compliance with the License.
+// See the file LICENSE for the full text.
// You may obtain a copy of the License at
//
-// http://www.apache.org/licenses/LICENSE-2.0
+// https://opensource.org/licenses/BSD-3-Clause
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/tests/src/test_window.cpp b/tests/src/test_window.cpp
index ee59e0e6b7d469b69bf446e819624cbeb2682ec9..db2086bf01f64ab495660183d24f678a3f195b27 100644
--- a/tests/src/test_window.cpp
+++ b/tests/src/test_window.cpp
@@ -2,15 +2,16 @@
// Project Phoenix
//
// Copyright (c) 2017 RWTH Aachen University, Germany,
-// Virtual Reality & Immersive Visualisation Group.
+// Virtual Reality & Immersive Visualization Group.
//------------------------------------------------------------------------------
// License
//
-// Licensed under the Apache License, Version 2.0 (the "License");
+// Licensed under the 3-Clause BSD License (the "License");
// you may not use this file except in compliance with the License.
+// See the file LICENSE for the full text.
// You may obtain a copy of the License at
//
-// http://www.apache.org/licenses/LICENSE-2.0
+// https://opensource.org/licenses/BSD-3-Clause
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/tests/src/tests.cpp b/tests/src/tests.cpp
index cec226dcd45814137c22a227791b74c449e97fc3..fe328dea4695b2615b441d5e88b8221f79414797 100644
--- a/tests/src/tests.cpp
+++ b/tests/src/tests.cpp
@@ -2,15 +2,16 @@
// Project Phoenix
//
// Copyright (c) 2017 RWTH Aachen University, Germany,
-// Virtual Reality & Immersive Visualisation Group.
+// Virtual Reality & Immersive Visualization Group.
//------------------------------------------------------------------------------
// License
//
-// Licensed under the Apache License, Version 2.0 (the "License");
+// Licensed under the 3-Clause BSD License (the "License");
// you may not use this file except in compliance with the License.
+// See the file LICENSE for the full text.
// You may obtain a copy of the License at
//
-// http://www.apache.org/licenses/LICENSE-2.0
+// https://opensource.org/licenses/BSD-3-Clause
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/tests/test_utilities/approx.hpp b/tests/test_utilities/approx.hpp
index 1f25a235197213e5332a697672cc210ea1d1bb71..5555b7f1bab82843f4a21cfc94cd274bba4fcaab 100644
--- a/tests/test_utilities/approx.hpp
+++ b/tests/test_utilities/approx.hpp
@@ -2,15 +2,16 @@
// Project Phoenix
//
// Copyright (c) 2017 RWTH Aachen University, Germany,
-// Virtual Reality & Immersive Visualisation Group.
+// Virtual Reality & Immersive Visualization Group.
//------------------------------------------------------------------------------
// License
//
-// Licensed under the Apache License, Version 2.0 (the "License");
+// Licensed under the 3-Clause BSD License (the "License");
// you may not use this file except in compliance with the License.
+// See the file LICENSE for the full text.
// You may obtain a copy of the License at
//
-// http://www.apache.org/licenses/LICENSE-2.0
+// https://opensource.org/licenses/BSD-3-Clause
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/tests/test_utilities/glm_mat4.hpp b/tests/test_utilities/glm_mat4.hpp
index c29718e53ba13b06814878c73bbb51680c8907fa..26446c8d1c56a60ed86cc62f12c8f43d8909076e 100644
--- a/tests/test_utilities/glm_mat4.hpp
+++ b/tests/test_utilities/glm_mat4.hpp
@@ -2,15 +2,16 @@
// Project Phoenix
//
// Copyright (c) 2017 RWTH Aachen University, Germany,
-// Virtual Reality & Immersive Visualisation Group.
+// Virtual Reality & Immersive Visualization Group.
//------------------------------------------------------------------------------
// License
//
-// Licensed under the Apache License, Version 2.0 (the "License");
+// Licensed under the 3-Clause BSD License (the "License");
// you may not use this file except in compliance with the License.
+// See the file LICENSE for the full text.
// You may obtain a copy of the License at
//
-// http://www.apache.org/licenses/LICENSE-2.0
+// https://opensource.org/licenses/BSD-3-Clause
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/tests/test_utilities/glm_quat.hpp b/tests/test_utilities/glm_quat.hpp
index ab024cf2c4dbdfce94ed9eb420bab087df0aec15..b7ece2750655e7d9ffca4f63088a70d20758490c 100644
--- a/tests/test_utilities/glm_quat.hpp
+++ b/tests/test_utilities/glm_quat.hpp
@@ -2,15 +2,16 @@
// Project Phoenix
//
// Copyright (c) 2017 RWTH Aachen University, Germany,
-// Virtual Reality & Immersive Visualisation Group.
+// Virtual Reality & Immersive Visualization Group.
//------------------------------------------------------------------------------
// License
//
-// Licensed under the Apache License, Version 2.0 (the "License");
+// Licensed under the 3-Clause BSD License (the "License");
// you may not use this file except in compliance with the License.
+// See the file LICENSE for the full text.
// You may obtain a copy of the License at
//
-// http://www.apache.org/licenses/LICENSE-2.0
+// https://opensource.org/licenses/BSD-3-Clause
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/tests/test_utilities/glm_vec3.hpp b/tests/test_utilities/glm_vec3.hpp
index 819a923fd416d2c8937778b964c5737fa8494fa4..55456b0b57ff7e06196339a2478685595fc73b77 100644
--- a/tests/test_utilities/glm_vec3.hpp
+++ b/tests/test_utilities/glm_vec3.hpp
@@ -2,15 +2,16 @@
// Project Phoenix
//
// Copyright (c) 2017 RWTH Aachen University, Germany,
-// Virtual Reality & Immersive Visualisation Group.
+// Virtual Reality & Immersive Visualization Group.
//------------------------------------------------------------------------------
// License
//
-// Licensed under the Apache License, Version 2.0 (the "License");
+// Licensed under the 3-Clause BSD License (the "License");
// you may not use this file except in compliance with the License.
+// See the file LICENSE for the full text.
// You may obtain a copy of the License at
//
-// http://www.apache.org/licenses/LICENSE-2.0
+// https://opensource.org/licenses/BSD-3-Clause
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/tests/test_utilities/log_capture.cpp b/tests/test_utilities/log_capture.cpp
index 951a119710e1eb0270d823c63d56add52f8650d6..19e574590e4cc58a53b6f62982beb67b2636b4f2 100644
--- a/tests/test_utilities/log_capture.cpp
+++ b/tests/test_utilities/log_capture.cpp
@@ -2,15 +2,16 @@
// Project Phoenix
//
// Copyright (c) 2017 RWTH Aachen University, Germany,
-// Virtual Reality & Immersive Visualisation Group.
+// Virtual Reality & Immersive Visualization Group.
//------------------------------------------------------------------------------
// License
//
-// Licensed under the Apache License, Version 2.0 (the "License");
+// Licensed under the 3-Clause BSD License (the "License");
// you may not use this file except in compliance with the License.
+// See the file LICENSE for the full text.
// You may obtain a copy of the License at
//
-// http://www.apache.org/licenses/LICENSE-2.0
+// https://opensource.org/licenses/BSD-3-Clause
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/tests/test_utilities/log_capture.hpp b/tests/test_utilities/log_capture.hpp
index 0082f9309b06fc8174cd380486fcbfde8e44e10b..2b9f75ea8e40658d2fe8b75a7d22f8414c10d2c8 100644
--- a/tests/test_utilities/log_capture.hpp
+++ b/tests/test_utilities/log_capture.hpp
@@ -2,15 +2,16 @@
// Project Phoenix
//
// Copyright (c) 2017 RWTH Aachen University, Germany,
-// Virtual Reality & Immersive Visualisation Group.
+// Virtual Reality & Immersive Visualization Group.
//------------------------------------------------------------------------------
// License
//
-// Licensed under the Apache License, Version 2.0 (the "License");
+// Licensed under the 3-Clause BSD License (the "License");
// you may not use this file except in compliance with the License.
+// See the file LICENSE for the full text.
// You may obtain a copy of the License at
//
-// http://www.apache.org/licenses/LICENSE-2.0
+// https://opensource.org/licenses/BSD-3-Clause
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/tests/test_utilities/opengl_buffer_data_comparison.cpp b/tests/test_utilities/opengl_buffer_data_comparison.cpp
index 98b158ce31cbf026ac213ee0bb9e82b76ea5e316..f7eff01d791f5271c54d9c882a12a23a38ab71a3 100644
--- a/tests/test_utilities/opengl_buffer_data_comparison.cpp
+++ b/tests/test_utilities/opengl_buffer_data_comparison.cpp
@@ -2,15 +2,16 @@
// Project Phoenix
//
// Copyright (c) 2017 RWTH Aachen University, Germany,
-// Virtual Reality & Immersive Visualisation Group.
+// Virtual Reality & Immersive Visualization Group.
//------------------------------------------------------------------------------
// License
//
-// Licensed under the Apache License, Version 2.0 (the "License");
+// Licensed under the 3-Clause BSD License (the "License");
// you may not use this file except in compliance with the License.
+// See the file LICENSE for the full text.
// You may obtain a copy of the License at
//
-// http://www.apache.org/licenses/LICENSE-2.0
+// https://opensource.org/licenses/BSD-3-Clause
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/tests/test_utilities/opengl_buffer_data_comparison.hpp b/tests/test_utilities/opengl_buffer_data_comparison.hpp
index ac62a9648c52c98c6ffef2fc6ca96b21220665ef..3f97d9ab6b1e0d49c0c359dcc1b771da4b1a54ca 100644
--- a/tests/test_utilities/opengl_buffer_data_comparison.hpp
+++ b/tests/test_utilities/opengl_buffer_data_comparison.hpp
@@ -2,15 +2,16 @@
// Project Phoenix
//
// Copyright (c) 2017 RWTH Aachen University, Germany,
-// Virtual Reality & Immersive Visualisation Group.
+// Virtual Reality & Immersive Visualization Group.
//------------------------------------------------------------------------------
// License
//
-// Licensed under the Apache License, Version 2.0 (the "License");
+// Licensed under the 3-Clause BSD License (the "License");
// you may not use this file except in compliance with the License.
+// See the file LICENSE for the full text.
// You may obtain a copy of the License at
//
-// http://www.apache.org/licenses/LICENSE-2.0
+// https://opensource.org/licenses/BSD-3-Clause
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/tests/test_utilities/reference_image_path.hpp.template b/tests/test_utilities/reference_image_path.hpp.template
index e6baf680dfd9ca024fb2d907ae1a38dc797d20c2..d197f71c2a2c993f0a0a686371bbca0f23425260 100644
--- a/tests/test_utilities/reference_image_path.hpp.template
+++ b/tests/test_utilities/reference_image_path.hpp.template
@@ -2,7 +2,7 @@
// Project Phoenix
//
// Copyright (c) 2017 RWTH Aachen University, Germany,
-// Virtual Reality & Immersive Visualisation Group.
+// Virtual Reality & Immersive Visualization Group.
//------------------------------------------------------------------------------
// License
//
diff --git a/tests/test_utilities/tests/src/test_log_capture.cpp b/tests/test_utilities/tests/src/test_log_capture.cpp
index 9fde0d961f4b9f21736a966dab05ac2b666fb2aa..e9f3e7124c3b82b3490846e3c0bd7fb992025738 100644
--- a/tests/test_utilities/tests/src/test_log_capture.cpp
+++ b/tests/test_utilities/tests/src/test_log_capture.cpp
@@ -2,15 +2,16 @@
// Project Phoenix
//
// Copyright (c) 2017 RWTH Aachen University, Germany,
-// Virtual Reality & Immersive Visualisation Group.
+// Virtual Reality & Immersive Visualization Group.
//------------------------------------------------------------------------------
// License
//
-// Licensed under the Apache License, Version 2.0 (the "License");
+// Licensed under the 3-Clause BSD License (the "License");
// you may not use this file except in compliance with the License.
+// See the file LICENSE for the full text.
// You may obtain a copy of the License at
//
-// http://www.apache.org/licenses/LICENSE-2.0
+// https://opensource.org/licenses/BSD-3-Clause
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/tests/test_utilities/tests/src/test_reference_images.cpp b/tests/test_utilities/tests/src/test_reference_images.cpp
index f8f88a83829645c60e28a7232380c4792995c0d2..194590614a18451badb35820285ad374edc3be0e 100644
--- a/tests/test_utilities/tests/src/test_reference_images.cpp
+++ b/tests/test_utilities/tests/src/test_reference_images.cpp
@@ -2,15 +2,16 @@
// Project Phoenix
//
// Copyright (c) 2017 RWTH Aachen University, Germany,
-// Virtual Reality & Immersive Visualisation Group.
+// Virtual Reality & Immersive Visualization Group.
//------------------------------------------------------------------------------
// License
//
-// Licensed under the Apache License, Version 2.0 (the "License");
+// Licensed under the 3-Clause BSD License (the "License");
// you may not use this file except in compliance with the License.
+// See the file LICENSE for the full text.
// You may obtain a copy of the License at
//
-// http://www.apache.org/licenses/LICENSE-2.0
+// https://opensource.org/licenses/BSD-3-Clause
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,