diff --git a/.gitsuper b/.gitsuper
index 94ff1333b42995ccab13094cb6bb5c89b8e55dc8..221b2919584048939bd5a1c1204d97390e14a70f 100644
--- a/.gitsuper
+++ b/.gitsuper
@@ -14,7 +14,7 @@ status = 1a3bcab04b011a5d6e44f9983cae6ff89fa695e8 bin (heads/master)
 	 07f9700459c616186737a9a34277f2edee76f475 dune-uggrid (v2.6.0-1-g07f97004)
 	+bf48b2929a26dc043925c41672570600b936f032 dune-xt-common (heads/fix_issue_149)
 	 cad4071f7722374d5131c21244970e93c98ad6ba dune-xt-data (remotes/origin/HEAD)
-	+918ff8a904c95a077270b094be5de5eb084c912c dune-xt-functions (heads/update_indicator_tests)
+	+0bdb4e53bdc193530299611b01c35ed152b4cc8d dune-xt-functions (heads/update_license)
 	 08242248ae7d1e79018fc2e91e85bccdd453107a dune-xt-grid (remotes/origin/HEAD)
 	 0c3b93e32d48b7b389db1c3572d567bff272190c dune-xt-la (remotes/origin/HEAD)
 	 09d0378f616b94d68bcdd9fc6114813181849ec0 scripts (heads/master)
@@ -93,7 +93,7 @@ commit = cad4071f7722374d5131c21244970e93c98ad6ba
 [submodule.dune-xt-functions]
 remote = https://github.com/dune-community/dune-xt-functions.git
 status = c0b1735fab0ecbd4bb4f1eaa27cb65fe813e98f0 .vcsetup (remotes/origin/HEAD)
-commit = 918ff8a904c95a077270b094be5de5eb084c912c
+commit = 0bdb4e53bdc193530299611b01c35ed152b4cc8d
 
 [submodule.dune-xt-grid]
 remote = https://github.com/dune-community/dune-xt-grid.git
diff --git a/.mailmap b/.mailmap
index cba7dc2ed16047af94b145c9a3d7cdc03bbefb31..eef28a16cce0b4e911b6ace54b17aee74d0fd635 100644
--- a/.mailmap
+++ b/.mailmap
@@ -43,6 +43,8 @@ Stefan Girke <stefan.girke@gmx.de> Stefan <stefan@stefan.(none)>
 Tobias Leibner <tobias.leibner@uni-muenster.de> tobiasleibner <tobias.leibner@googlemail.com>
 Tobias Leibner <tobias.leibner@uni-muenster.de> Tobias Leibner <tobias.leibner@googlemail.com>
 Barbara Verfürth <b_verf01@uni-muenster.de> b_verf01 <b_verf01@uni-muenster.de>
+Tim Keil <tim.keil@wwu.de> Tim Keil <tim.keil@wwu.de>
+Tim Keil <tim.keil@wwu.de> TiKeil <keil.menden@web.de>
 
 # geratene duneadm zuordnung
 René Fritze <rene.fritze@wwu.de> Mario Ohlberger <duneadm@DUNE-PROJECT.(none)>
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 2fcb8e074e5b439ce99f2db244c076a52c45011c..1a2cd1da7d58110987fc9169fbd803894daf487c 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -8,7 +8,7 @@
 # Authors:
 #   Felix Schindler (2016 - 2017)
 #   René Fritze     (2016 - 2018)
-#   TiKeil          (2018)
+#   Tim Keil        (2018)
 #   Tobias Leibner  (2016, 2018)
 # ~~~
 
diff --git a/cmake/modules/DuneXtFunctionsMacros.cmake b/cmake/modules/DuneXtFunctionsMacros.cmake
index 877bedfecc18c554a95ca1be6036bbe86e058a88..a85324bd5fd6dc1edba48034cf66fe7a5a14909d 100644
--- a/cmake/modules/DuneXtFunctionsMacros.cmake
+++ b/cmake/modules/DuneXtFunctionsMacros.cmake
@@ -12,3 +12,4 @@
 #
 # File for module specific CMake tests.
 # ~~~
+
diff --git a/dune/xt/functions/CMakeLists.txt b/dune/xt/functions/CMakeLists.txt
index 6fde26f4e3f36dbf59527b07c4c68afe6e76e6d7..71209d03952de3f173aa73dae113ad2a4befde9f 100644
--- a/dune/xt/functions/CMakeLists.txt
+++ b/dune/xt/functions/CMakeLists.txt
@@ -8,7 +8,7 @@
 # Authors:
 #   Felix Schindler (2016 - 2017)
 #   René Fritze     (2016, 2018)
-#   TiKeil          (2018)
+#   Tim Keil        (2018)
 #   Tobias Leibner  (2016, 2018)
 # ~~~
 
diff --git a/dune/xt/functions/ESV2007.hh b/dune/xt/functions/ESV2007.hh
index d3ab8fdf6e54add81fc5d0d4c90090848f213b2a..72421eb548e47711d52da46965aea66df4199557 100644
--- a/dune/xt/functions/ESV2007.hh
+++ b/dune/xt/functions/ESV2007.hh
@@ -7,7 +7,7 @@
 // Authors:
 //   Felix Schindler (2014 - 2018)
 //   René Fritze     (2014 - 2016, 2018)
-//   TiKeil          (2018)
+//   Tim Keil        (2018)
 //   Tobias Leibner  (2014 - 2018)
 
 #ifndef DUNEXT_FUNCTIONS_ESV2007_HH
diff --git a/dune/xt/functions/base/combined-functions.hh b/dune/xt/functions/base/combined-functions.hh
index c8becaa5a87e98639bae009fb56536bcfa5357fc..7f449ebbcbd494357302526570a6dd4e97d07c6b 100644
--- a/dune/xt/functions/base/combined-functions.hh
+++ b/dune/xt/functions/base/combined-functions.hh
@@ -6,7 +6,8 @@
 //          with "runtime exception" (http://www.dune-project.org/license.html)
 // Authors:
 //   Felix Schindler (2018)
-//   TiKeil          (2018)
+//   René Fritze     (2018)
+//   Tim Keil        (2018)
 //   Tobias Leibner  (2018)
 //
 // reserved.
diff --git a/dune/xt/functions/base/combined-grid-functions.hh b/dune/xt/functions/base/combined-grid-functions.hh
index 1463b146c575b3b05b9ff1736b0f995d8e7bdc2d..49e63febf878d6f838d1ef297f8a279586125a59 100644
--- a/dune/xt/functions/base/combined-grid-functions.hh
+++ b/dune/xt/functions/base/combined-grid-functions.hh
@@ -6,7 +6,8 @@
 //          with "runtime exception" (http://www.dune-project.org/license.html)
 // Authors:
 //   Felix Schindler (2018)
-//   TiKeil          (2018)
+//   René Fritze     (2018)
+//   Tim Keil        (2018)
 //   Tobias Leibner  (2018)
 //
 // reserved.
diff --git a/dune/xt/functions/base/composition.hh b/dune/xt/functions/base/composition.hh
index c8ef3df87709a3d275b6f4dc8c95e5def8243b9a..21b187e283fe634b77b53c3386ab95869f1ecd84 100644
--- a/dune/xt/functions/base/composition.hh
+++ b/dune/xt/functions/base/composition.hh
@@ -7,7 +7,7 @@
 // Authors:
 //   Felix Schindler (2017 - 2018)
 //   René Fritze     (2016 - 2018)
-//   TiKeil          (2018)
+//   Tim Keil        (2018)
 //   Tobias Leibner  (2016 - 2017)
 
 #ifndef DUNE_XT_FUNCTIONS_COMPOSITION_HH
diff --git a/dune/xt/functions/base/derived.hh b/dune/xt/functions/base/derived.hh
index 66d0ca82e88bc45e23608cb0fe6f9c38521aeb4e..5128df132bcaca6cc748a6b1ad944dc851e84643 100644
--- a/dune/xt/functions/base/derived.hh
+++ b/dune/xt/functions/base/derived.hh
@@ -7,7 +7,7 @@
 // Authors:
 //   Felix Schindler (2014 - 2018)
 //   René Fritze     (2015 - 2018)
-//   TiKeil          (2018)
+//   Tim Keil        (2018)
 //   Tobias Leibner  (2017)
 
 #ifndef DUNE_XT_FUNCTIONS_BASE_DERIVED_HH
diff --git a/dune/xt/functions/base/function-as-grid-function.hh b/dune/xt/functions/base/function-as-grid-function.hh
index 59d7bd3a66677183d69f3d404696442e3a135819..46036fb555ccac51326dcf12bedd2545cb6483b8 100644
--- a/dune/xt/functions/base/function-as-grid-function.hh
+++ b/dune/xt/functions/base/function-as-grid-function.hh
@@ -7,7 +7,7 @@
 // Authors:
 //   Felix Schindler (2017 - 2018)
 //   René Fritze     (2017 - 2018)
-//   TiKeil          (2018)
+//   Tim Keil        (2018)
 //   Tobias Leibner  (2017)
 
 #ifndef DUNE_XT_FUNCTIONS_BASE_FUNCTION_AS_GRID_FUNCTION_HH
diff --git a/dune/xt/functions/base/reinterpret.hh b/dune/xt/functions/base/reinterpret.hh
index 74223ded24523607679a38db0ef683d1781134f4..8dae257d31d881e2bfd6300b325b24b85bcf6eed 100644
--- a/dune/xt/functions/base/reinterpret.hh
+++ b/dune/xt/functions/base/reinterpret.hh
@@ -7,7 +7,7 @@
 // Authors:
 //   Felix Schindler (2017 - 2018)
 //   René Fritze     (2016, 2018)
-//   TiKeil          (2018)
+//   Tim Keil        (2018)
 //   Tobias Leibner  (2016 - 2018)
 
 #ifndef DUNE_XT_FUNCTION_BASE_REINTERPRET_HH
diff --git a/dune/xt/functions/base/sliced.hh b/dune/xt/functions/base/sliced.hh
index c2f6bb45252492da4c891765662649ab28eeb445..499e1d76696bd3422c7bffcc568536906e9d2b35 100644
--- a/dune/xt/functions/base/sliced.hh
+++ b/dune/xt/functions/base/sliced.hh
@@ -7,7 +7,7 @@
 // Authors:
 //   Felix Schindler (2017 - 2018)
 //   René Fritze     (2018)
-//   TiKeil          (2018)
+//   Tim Keil        (2018)
 
 #ifndef DUNE_XT_FUNCTIONS_BASE_SLICED_HH
 #define DUNE_XT_FUNCTIONS_BASE_SLICED_HH
diff --git a/dune/xt/functions/base/transformed.hh b/dune/xt/functions/base/transformed.hh
index b70885a3da3677a18519644a9dab76896ede00e8..a0c80521da0bd7fcb81941df495c78371ea9a2ea 100644
--- a/dune/xt/functions/base/transformed.hh
+++ b/dune/xt/functions/base/transformed.hh
@@ -7,7 +7,7 @@
 // Authors:
 //   Felix Schindler (2017 - 2018)
 //   René Fritze     (2018)
-//   TiKeil          (2018)
+//   Tim Keil        (2018)
 
 #ifndef DUNE_XT_FUNCTIONS_BASE_TRANSFORMED_HH
 #define DUNE_XT_FUNCTIONS_BASE_TRANSFORMED_HH
diff --git a/dune/xt/functions/base/visualization.hh b/dune/xt/functions/base/visualization.hh
index c61976fa2a66083d8346febf809bab9a89e66c0a..cfbbb053442e358dae829e0886db9bf160a9b5a9 100644
--- a/dune/xt/functions/base/visualization.hh
+++ b/dune/xt/functions/base/visualization.hh
@@ -7,7 +7,7 @@
 // Authors:
 //   Felix Schindler (2013 - 2018)
 //   René Fritze     (2013 - 2016, 2018)
-//   TiKeil          (2018)
+//   Tim Keil        (2018)
 //   Tobias Leibner  (2014)
 
 #ifndef DUNE_XT_FUNCTIONS_BASE_VISUALIZATION_HH
diff --git a/dune/xt/functions/checkerboard.hh b/dune/xt/functions/checkerboard.hh
index 33618ef90317cde945e448b3d7b0175e57106a54..69f62ae899d972f0ce85d179714d99a0203c7f10 100644
--- a/dune/xt/functions/checkerboard.hh
+++ b/dune/xt/functions/checkerboard.hh
@@ -8,7 +8,7 @@
 //   Andreas Buhr    (2014)
 //   Felix Schindler (2012 - 2018)
 //   René Fritze     (2013 - 2018)
-//   TiKeil          (2018)
+//   Tim Keil        (2018)
 //   Tobias Leibner  (2014 - 2017)
 
 #ifndef DUNE_XT_FUNCTIONS_CHECKERBOARD_HH
diff --git a/dune/xt/functions/constant.hh b/dune/xt/functions/constant.hh
index d3d1bcb02cb8d1c1f6ea1ba168efa4bc3a9236ad..2cc89a299d5bf732305c106ee4625e19dabae9c5 100644
--- a/dune/xt/functions/constant.hh
+++ b/dune/xt/functions/constant.hh
@@ -8,7 +8,7 @@
 //   Felix Schindler (2013 - 2018)
 //   Kirsten Weber   (2013)
 //   René Fritze     (2013 - 2018)
-//   TiKeil          (2018)
+//   Tim Keil        (2018)
 //   Tobias Leibner  (2014 - 2015, 2017)
 
 #ifndef DUNE_XT_FUNCTIONS_CONSTANT_HH
diff --git a/dune/xt/functions/exceptions.hh b/dune/xt/functions/exceptions.hh
index 762451984b82fd671601ec76a1a4d29319a589dc..e54052129d0b2c46f9e47a597c4c614bf6f05972 100644
--- a/dune/xt/functions/exceptions.hh
+++ b/dune/xt/functions/exceptions.hh
@@ -6,7 +6,8 @@
 //          with "runtime exception" (http://www.dune-project.org/license.html)
 // Authors:
 //   Felix Schindler (2017 - 2018)
-//   TiKeil          (2018)
+//   René Fritze     (2018)
+//   Tim Keil        (2018)
 //   Tobias Leibner  (2018)
 
 #ifndef DUNE_XT_FUNCTIONS_EXCEPTIONS_HH
diff --git a/dune/xt/functions/expression.hh b/dune/xt/functions/expression.hh
index 495ed39a168f73c4a51fa6b24bd1fde1a2d06f2b..80944b122cecc95e3164452e1a3336448bdee001 100644
--- a/dune/xt/functions/expression.hh
+++ b/dune/xt/functions/expression.hh
@@ -8,7 +8,7 @@
 //   Felix Schindler (2012 - 2017)
 //   Kirsten Weber   (2013)
 //   René Fritze     (2012 - 2016, 2018)
-//   TiKeil          (2018)
+//   Tim Keil        (2018)
 //   Tobias Leibner  (2014 - 2017)
 
 #ifndef DUNE_XT_FUNCTIONS_EXPRESSION_HH
diff --git a/dune/xt/functions/expression/base.hh b/dune/xt/functions/expression/base.hh
index 1b9acaec30214f0a990985abfa897d1785d9dd46..c34889d4b06531f9e5850eea4890d8ea3bf9ae2e 100644
--- a/dune/xt/functions/expression/base.hh
+++ b/dune/xt/functions/expression/base.hh
@@ -8,7 +8,7 @@
 //   Andreas Buhr    (2014)
 //   Felix Schindler (2013 - 2017)
 //   René Fritze     (2013, 2015 - 2016, 2018)
-//   TiKeil          (2018)
+//   Tim Keil        (2018)
 //   Tobias Leibner  (2014 - 2015, 2017)
 
 #ifndef DUNE_XT_FUNCTIONS_EXPRESSION_BASE_HH
diff --git a/dune/xt/functions/expression/default.hh b/dune/xt/functions/expression/default.hh
index f637ccb4298267c4630861ccbe51f0ea81a3197c..5e5e032b0d3a473dcdc715915154fac2bf192048 100644
--- a/dune/xt/functions/expression/default.hh
+++ b/dune/xt/functions/expression/default.hh
@@ -8,7 +8,7 @@
 //   Felix Schindler (2012 - 2018)
 //   Kirsten Weber   (2013)
 //   René Fritze     (2012 - 2016, 2018)
-//   TiKeil          (2018)
+//   Tim Keil        (2018)
 //   Tobias Leibner  (2014 - 2018)
 
 #ifndef DUNE_XT_FUNCTIONS_EXPRESSION_DEFAULT_HH
diff --git a/dune/xt/functions/expression/mathexpr.cc b/dune/xt/functions/expression/mathexpr.cc
index 22187a9835d52709422f78a2d8c44a823165062c..54eff7c11afb6dd196b5f7f73d75715e52281605 100644
--- a/dune/xt/functions/expression/mathexpr.cc
+++ b/dune/xt/functions/expression/mathexpr.cc
@@ -6,7 +6,7 @@
 //          with "runtime exception" (http://www.dune-project.org/license.html)
 // Authors:
 //   Felix Schindler (2012 - 2013, 2015 - 2016)
-//   René Fritze     (2012)
+//   René Fritze     (2012, 2018)
 
 /*
 
diff --git a/dune/xt/functions/expression/parametric.hh b/dune/xt/functions/expression/parametric.hh
index 83b4e02aaaef834f0642cd69a914ec8de3595bf3..5687705d46e69c9742f87e858c86d6ba3283419b 100644
--- a/dune/xt/functions/expression/parametric.hh
+++ b/dune/xt/functions/expression/parametric.hh
@@ -7,7 +7,7 @@
 // Authors:
 //   Felix Schindler (2017 - 2018)
 //   René Fritze     (2018)
-//   TiKeil          (2018)
+//   Tim Keil        (2018)
 //   Tobias Leibner  (2017 - 2018)
 
 #ifndef DUNE_XT_FUNCTIONS_EXPRESSION_PARAMETRIC_HH
diff --git a/dune/xt/functions/flattop.hh b/dune/xt/functions/flattop.hh
index 13c41f8b8cfe3d94c4b7e924a33f6c56e5eec653..d5ffc276f2dc8358e501431ce6772826b0ca18d8 100644
--- a/dune/xt/functions/flattop.hh
+++ b/dune/xt/functions/flattop.hh
@@ -7,7 +7,7 @@
 // Authors:
 //   Felix Schindler (2014 - 2018)
 //   René Fritze     (2014 - 2016, 2018)
-//   TiKeil          (2018)
+//   Tim Keil        (2018)
 //   Tobias Leibner  (2015, 2017)
 
 #ifndef DUNE_XT_FUNCTIONS_FLATTOP_HH
diff --git a/dune/xt/functions/generic/function.hh b/dune/xt/functions/generic/function.hh
index e4d0949f8147fca05e34438ebe74ea6714c7fe3d..ea053e0b42b00d2946bd1bef7f5539afb4bc884c 100644
--- a/dune/xt/functions/generic/function.hh
+++ b/dune/xt/functions/generic/function.hh
@@ -8,7 +8,7 @@
 //   Felix Schindler (2013 - 2018)
 //   René Fritze     (2013 - 2016, 2018)
 //   Sven Kaulmann   (2013)
-//   TiKeil          (2018)
+//   Tim Keil        (2018)
 //   Tobias Leibner  (2014, 2017)
 
 #ifndef DUNE_XT_FUNCTIONS_GENRIC_FUNCTION_HH
diff --git a/dune/xt/functions/generic/grid-function.hh b/dune/xt/functions/generic/grid-function.hh
index 305b0b7de33c244164075e6b323dac9418788106..57aeb53a2e41463e887fac4ffc61081aeb60c23b 100644
--- a/dune/xt/functions/generic/grid-function.hh
+++ b/dune/xt/functions/generic/grid-function.hh
@@ -7,7 +7,7 @@
 // Authors:
 //   Felix Schindler (2017 - 2018)
 //   René Fritze     (2018)
-//   TiKeil          (2018)
+//   Tim Keil        (2018)
 //   Tobias Leibner  (2017)
 
 #ifndef DUNE_XT_FUNCTIONS_GENERIC_GRID_FUNCTION_HH
diff --git a/dune/xt/functions/indicator.hh b/dune/xt/functions/indicator.hh
index 08f9176654f9fe869df65e68f1aa54a7da0080cf..4990693ac5d601484b9439056ff1259fc663d253 100644
--- a/dune/xt/functions/indicator.hh
+++ b/dune/xt/functions/indicator.hh
@@ -7,7 +7,7 @@
 // Authors:
 //   Felix Schindler (2015 - 2018)
 //   René Fritze     (2015 - 2016, 2018)
-//   TiKeil          (2018)
+//   Tim Keil        (2018)
 //   Tobias Leibner  (2017)
 
 #ifndef DUNE_XT_FUNCTIONS_INDICATOR_HH
diff --git a/dune/xt/functions/interfaces/element-functions.hh b/dune/xt/functions/interfaces/element-functions.hh
index 0850eb54c99aad2ef2cc3feba1ca7ef4471f6248..09682d609ec6c95ac4c2f56fcc89a2a47ed3c7cb 100644
--- a/dune/xt/functions/interfaces/element-functions.hh
+++ b/dune/xt/functions/interfaces/element-functions.hh
@@ -7,7 +7,7 @@
 // Authors:
 //   Felix Schindler (2017 - 2018)
 //   René Fritze     (2018)
-//   TiKeil          (2018)
+//   Tim Keil        (2018)
 //   Tobias Leibner  (2017)
 
 #ifndef DUNE_XT_FUNCTIONS_INTERFACES_ELEMENT_FUNCTIONS_HH
diff --git a/dune/xt/functions/interfaces/function.hh b/dune/xt/functions/interfaces/function.hh
index 0cc4dc3ada40290c58b2b9cf5ed8e97aaab02573..cba06a0cd744af1b4068e9ae50f54fb65cf59a93 100644
--- a/dune/xt/functions/interfaces/function.hh
+++ b/dune/xt/functions/interfaces/function.hh
@@ -6,7 +6,8 @@
 //          with "runtime exception" (http://www.dune-project.org/license.html)
 // Authors:
 //   Felix Schindler (2017 - 2018)
-//   TiKeil          (2018)
+//   René Fritze     (2018)
+//   Tim Keil        (2018)
 
 #ifndef DUNE_XT_FUNCTIONS_INTERFACES_FUNCTION_HH
 #define DUNE_XT_FUNCTIONS_INTERFACES_FUNCTION_HH
diff --git a/dune/xt/functions/interfaces/grid-function.hh b/dune/xt/functions/interfaces/grid-function.hh
index 1a07e074b79fe711e27497906cb2f2596819ca12..8679658c57fb5fc66a07d9bac2d2396c7becfa73 100644
--- a/dune/xt/functions/interfaces/grid-function.hh
+++ b/dune/xt/functions/interfaces/grid-function.hh
@@ -7,7 +7,7 @@
 // Authors:
 //   Felix Schindler (2017 - 2018)
 //   René Fritze     (2018)
-//   TiKeil          (2018)
+//   Tim Keil        (2018)
 //   Tobias Leibner  (2017)
 
 #ifndef DUNE_XT_FUNCTIONS_INTERFACES_GRID_FUNCTION_HH
diff --git a/dune/xt/functions/spe10/model1.hh b/dune/xt/functions/spe10/model1.hh
index 3af8b51be21df1ee678a99e6a54f062714100fa5..04dd3014e229da54835fdecb857eda1ea9485252 100644
--- a/dune/xt/functions/spe10/model1.hh
+++ b/dune/xt/functions/spe10/model1.hh
@@ -7,7 +7,7 @@
 // Authors:
 //   Felix Schindler (2013 - 2018)
 //   René Fritze     (2014 - 2016, 2018)
-//   TiKeil          (2018)
+//   Tim Keil        (2018)
 //   Tobias Leibner  (2014, 2018)
 
 #ifndef DUNE_XT_FUNCTIONS_SPE10_MODEL1_HH
diff --git a/dune/xt/functions/spe10/model2.hh b/dune/xt/functions/spe10/model2.hh
index e856380bd046913a45594762fa23a0aaeab9d846..9315a6947f8316f07bba8b9cf1d0d352c8729b6d 100644
--- a/dune/xt/functions/spe10/model2.hh
+++ b/dune/xt/functions/spe10/model2.hh
@@ -7,7 +7,7 @@
 // Authors:
 //   Felix Schindler (2016 - 2018)
 //   René Fritze     (2015 - 2016, 2018)
-//   TiKeil          (2018)
+//   Tim Keil        (2018)
 //   Tobias Leibner  (2017 - 2018)
 
 #ifndef DUNE_XT_FUNCTIONS_SPE10_MODEL2_HH
diff --git a/dune/xt/functions/test/CMakeLists.txt b/dune/xt/functions/test/CMakeLists.txt
index 1d7fc3d0130009bf4e3437356b6ccb6c6d66d495..66cc26528d1ea80c115c3dce7f6c17398d6927a5 100644
--- a/dune/xt/functions/test/CMakeLists.txt
+++ b/dune/xt/functions/test/CMakeLists.txt
@@ -8,7 +8,7 @@
 # Authors:
 #   Felix Schindler (2016 - 2017)
 #   René Fritze     (2016 - 2018)
-#   TiKeil          (2018)
+#   Tim Keil        (2018)
 #   Tobias Leibner  (2016, 2018)
 # ~~~
 
diff --git a/dune/xt/functions/test/ESV2007_cutoff_1d.py b/dune/xt/functions/test/ESV2007_cutoff_1d.py
index a0c297b60f080ef0efeba0d3d8d70b1c7f684871..1486554ee4555bbfc60233d223620b213afa2297 100644
--- a/dune/xt/functions/test/ESV2007_cutoff_1d.py
+++ b/dune/xt/functions/test/ESV2007_cutoff_1d.py
@@ -6,7 +6,8 @@
 #      or  GPL-2.0+ (http://opensource.org/licenses/gpl-license)
 #          with "runtime exception" (http://www.dune-project.org/license.html)
 # Authors:
-#   TiKeil (2018)
+#   René Fritze (2018)
+#   Tim Keil    (2018)
 # ~~~
 
 import grids
diff --git a/dune/xt/functions/test/ESV2007_cutoff_2d_3d.py b/dune/xt/functions/test/ESV2007_cutoff_2d_3d.py
index ce6e8ffe7eb66d380609b983e27bc159cc0c7c8f..cee88c6e2b757a807b252f78796173b0bce0e1c1 100644
--- a/dune/xt/functions/test/ESV2007_cutoff_2d_3d.py
+++ b/dune/xt/functions/test/ESV2007_cutoff_2d_3d.py
@@ -6,7 +6,8 @@
 #      or  GPL-2.0+ (http://opensource.org/licenses/gpl-license)
 #          with "runtime exception" (http://www.dune-project.org/license.html)
 # Authors:
-#   TiKeil (2018)
+#   René Fritze (2018)
+#   Tim Keil    (2018)
 # ~~~
 
 import grids
diff --git a/dune/xt/functions/test/ESV2007_exact_solution.py b/dune/xt/functions/test/ESV2007_exact_solution.py
index db3bb129044d9bf1abda61ce1d0b1dda4048ebf8..48689f905b1a285ae3939a87a8834e2b0af4258a 100644
--- a/dune/xt/functions/test/ESV2007_exact_solution.py
+++ b/dune/xt/functions/test/ESV2007_exact_solution.py
@@ -6,7 +6,8 @@
 #      or  GPL-2.0+ (http://opensource.org/licenses/gpl-license)
 #          with "runtime exception" (http://www.dune-project.org/license.html)
 # Authors:
-#   TiKeil (2018)
+#   René Fritze (2018)
+#   Tim Keil    (2018)
 # ~~~
 
 import grids
diff --git a/dune/xt/functions/test/ESV2007_force.py b/dune/xt/functions/test/ESV2007_force.py
index db3bb129044d9bf1abda61ce1d0b1dda4048ebf8..48689f905b1a285ae3939a87a8834e2b0af4258a 100644
--- a/dune/xt/functions/test/ESV2007_force.py
+++ b/dune/xt/functions/test/ESV2007_force.py
@@ -6,7 +6,8 @@
 #      or  GPL-2.0+ (http://opensource.org/licenses/gpl-license)
 #          with "runtime exception" (http://www.dune-project.org/license.html)
 # Authors:
-#   TiKeil (2018)
+#   René Fritze (2018)
+#   Tim Keil    (2018)
 # ~~~
 
 import grids
diff --git a/dune/xt/functions/test/checkerboard.py b/dune/xt/functions/test/checkerboard.py
index 1b898631a762df2c93e9e08ec335e5dee4697e92..96c274e37ac77904dff64b6380b3dbf22c54a8a0 100644
--- a/dune/xt/functions/test/checkerboard.py
+++ b/dune/xt/functions/test/checkerboard.py
@@ -6,7 +6,8 @@
 #      or  GPL-2.0+ (http://opensource.org/licenses/gpl-license)
 #          with "runtime exception" (http://www.dune-project.org/license.html)
 # Authors:
-#   TiKeil (2018)
+#   René Fritze (2018)
+#   Tim Keil    (2018)
 # ~~~
 
 import grids
diff --git a/dune/xt/functions/test/constant.py b/dune/xt/functions/test/constant.py
index 1b898631a762df2c93e9e08ec335e5dee4697e92..96c274e37ac77904dff64b6380b3dbf22c54a8a0 100644
--- a/dune/xt/functions/test/constant.py
+++ b/dune/xt/functions/test/constant.py
@@ -6,7 +6,8 @@
 #      or  GPL-2.0+ (http://opensource.org/licenses/gpl-license)
 #          with "runtime exception" (http://www.dune-project.org/license.html)
 # Authors:
-#   TiKeil (2018)
+#   René Fritze (2018)
+#   Tim Keil    (2018)
 # ~~~
 
 import grids
diff --git a/dune/xt/functions/test/difference.py b/dune/xt/functions/test/difference.py
index 1b898631a762df2c93e9e08ec335e5dee4697e92..96c274e37ac77904dff64b6380b3dbf22c54a8a0 100644
--- a/dune/xt/functions/test/difference.py
+++ b/dune/xt/functions/test/difference.py
@@ -6,7 +6,8 @@
 #      or  GPL-2.0+ (http://opensource.org/licenses/gpl-license)
 #          with "runtime exception" (http://www.dune-project.org/license.html)
 # Authors:
-#   TiKeil (2018)
+#   René Fritze (2018)
+#   Tim Keil    (2018)
 # ~~~
 
 import grids
diff --git a/dune/xt/functions/test/disabled_affine.cc b/dune/xt/functions/test/disabled_affine.cc
index 780fbfd358c02fa826de899fba6a618f36403ba9..d729423197c11668ae69699a68c4d1d73807541a 100644
--- a/dune/xt/functions/test/disabled_affine.cc
+++ b/dune/xt/functions/test/disabled_affine.cc
@@ -7,7 +7,7 @@
 // Authors:
 //   Felix Schindler (2017)
 //   René Fritze     (2018)
-//   TiKeil          (2018)
+//   Tim Keil        (2018)
 
 #include <dune/xt/common/test/main.hxx>
 
diff --git a/dune/xt/functions/test/disabled_affine_flux.cc b/dune/xt/functions/test/disabled_affine_flux.cc
index 1ce316105d49bacc1a8648afa861553614db7bec..f60ef0e6de66a78cb30269710f8e4816fa655b80 100644
--- a/dune/xt/functions/test/disabled_affine_flux.cc
+++ b/dune/xt/functions/test/disabled_affine_flux.cc
@@ -7,7 +7,7 @@
 // Authors:
 //   Felix Schindler (2017)
 //   René Fritze     (2018)
-//   TiKeil          (2018)
+//   Tim Keil        (2018)
 
 #include <dune/xt/common/test/main.hxx>
 
diff --git a/dune/xt/functions/test/disabled_lambda_global_flux_function.cc b/dune/xt/functions/test/disabled_lambda_global_flux_function.cc
index f46984b5fe443b07ffcd9317c30ce08f9f02eebd..df433d3a01f355612747d76926db3f6e00b27c4e 100644
--- a/dune/xt/functions/test/disabled_lambda_global_flux_function.cc
+++ b/dune/xt/functions/test/disabled_lambda_global_flux_function.cc
@@ -7,7 +7,7 @@
 // Authors:
 //   Felix Schindler (2017)
 //   René Fritze     (2018)
-//   TiKeil          (2018)
+//   Tim Keil        (2018)
 //   Tobias Leibner  (2017)
 
 #include <dune/xt/common/test/main.hxx>
diff --git a/dune/xt/functions/test/disabled_lambda_local_flux_function.cc b/dune/xt/functions/test/disabled_lambda_local_flux_function.cc
index 628a0722255bfa10c8491ccd1453fd058a49a53a..27ad3be96439209d61e51397600a31c78b48db79 100644
--- a/dune/xt/functions/test/disabled_lambda_local_flux_function.cc
+++ b/dune/xt/functions/test/disabled_lambda_local_flux_function.cc
@@ -7,7 +7,7 @@
 // Authors:
 //   Felix Schindler (2017)
 //   René Fritze     (2018)
-//   TiKeil          (2018)
+//   Tim Keil        (2018)
 //   Tobias Leibner  (2017)
 
 #include <dune/xt/common/test/main.hxx>
diff --git a/dune/xt/functions/test/expression_matrix_valued.py b/dune/xt/functions/test/expression_matrix_valued.py
index 6210ea14e67c8963b7c1df6fa63c6477752fd79f..85bb7b2a763375c2071899e9c7049176454056a6 100644
--- a/dune/xt/functions/test/expression_matrix_valued.py
+++ b/dune/xt/functions/test/expression_matrix_valued.py
@@ -6,7 +6,8 @@
 #      or  GPL-2.0+ (http://opensource.org/licenses/gpl-license)
 #          with "runtime exception" (http://www.dune-project.org/license.html)
 # Authors:
-#   TiKeil (2018)
+#   René Fritze (2018)
+#   Tim Keil    (2018)
 # ~~~
 
 import grids
diff --git a/dune/xt/functions/test/expression_parametric.py b/dune/xt/functions/test/expression_parametric.py
index 12ee469682286a6c252c36054f06ab859f011355..b551166a7f1a876dc5098610dbecb7c6238e2b63 100644
--- a/dune/xt/functions/test/expression_parametric.py
+++ b/dune/xt/functions/test/expression_parametric.py
@@ -6,7 +6,8 @@
 #      or  GPL-2.0+ (http://opensource.org/licenses/gpl-license)
 #          with "runtime exception" (http://www.dune-project.org/license.html)
 # Authors:
-#   TiKeil (2018)
+#   René Fritze (2018)
+#   Tim Keil    (2018)
 # ~~~
 
 import grids
diff --git a/dune/xt/functions/test/expression_vector_valued.py b/dune/xt/functions/test/expression_vector_valued.py
index 12ee469682286a6c252c36054f06ab859f011355..b551166a7f1a876dc5098610dbecb7c6238e2b63 100644
--- a/dune/xt/functions/test/expression_vector_valued.py
+++ b/dune/xt/functions/test/expression_vector_valued.py
@@ -6,7 +6,8 @@
 #      or  GPL-2.0+ (http://opensource.org/licenses/gpl-license)
 #          with "runtime exception" (http://www.dune-project.org/license.html)
 # Authors:
-#   TiKeil (2018)
+#   René Fritze (2018)
+#   Tim Keil    (2018)
 # ~~~
 
 import grids
diff --git a/dune/xt/functions/test/flattop.py b/dune/xt/functions/test/flattop.py
index c7d7793f1b07b4b0bb5fd7f725f89579c1aa92a9..be70a137fd9feb8028a16575bb52927d7744005e 100644
--- a/dune/xt/functions/test/flattop.py
+++ b/dune/xt/functions/test/flattop.py
@@ -6,7 +6,8 @@
 #      or  GPL-2.0+ (http://opensource.org/licenses/gpl-license)
 #          with "runtime exception" (http://www.dune-project.org/license.html)
 # Authors:
-#   TiKeil (2018)
+#   René Fritze (2018)
+#   Tim Keil    (2018)
 # ~~~
 
 import grids
diff --git a/dune/xt/functions/test/grids.py b/dune/xt/functions/test/grids.py
index 35f937577ff018c9994f574df8c034934b724c17..41c39f2fa1e5f5a9e64b1a23d2adc3ff73b61133 100644
--- a/dune/xt/functions/test/grids.py
+++ b/dune/xt/functions/test/grids.py
@@ -6,7 +6,8 @@
 #      or  GPL-2.0+ (http://opensource.org/licenses/gpl-license)
 #          with "runtime exception" (http://www.dune-project.org/license.html)
 # Authors:
-#   TiKeil (2018)
+#   René Fritze (2018)
+#   Tim Keil    (2018)
 # ~~~
 
 import itertools
diff --git a/dune/xt/functions/test/lambda_function.py b/dune/xt/functions/test/lambda_function.py
index 1b898631a762df2c93e9e08ec335e5dee4697e92..96c274e37ac77904dff64b6380b3dbf22c54a8a0 100644
--- a/dune/xt/functions/test/lambda_function.py
+++ b/dune/xt/functions/test/lambda_function.py
@@ -6,7 +6,8 @@
 #      or  GPL-2.0+ (http://opensource.org/licenses/gpl-license)
 #          with "runtime exception" (http://www.dune-project.org/license.html)
 # Authors:
-#   TiKeil (2018)
+#   René Fritze (2018)
+#   Tim Keil    (2018)
 # ~~~
 
 import grids
diff --git a/dune/xt/functions/test/lambda_grid_function.py b/dune/xt/functions/test/lambda_grid_function.py
index 1b898631a762df2c93e9e08ec335e5dee4697e92..96c274e37ac77904dff64b6380b3dbf22c54a8a0 100644
--- a/dune/xt/functions/test/lambda_grid_function.py
+++ b/dune/xt/functions/test/lambda_grid_function.py
@@ -6,7 +6,8 @@
 #      or  GPL-2.0+ (http://opensource.org/licenses/gpl-license)
 #          with "runtime exception" (http://www.dune-project.org/license.html)
 # Authors:
-#   TiKeil (2018)
+#   René Fritze (2018)
+#   Tim Keil    (2018)
 # ~~~
 
 import grids
diff --git a/dune/xt/functions/test/product.py b/dune/xt/functions/test/product.py
index 1b898631a762df2c93e9e08ec335e5dee4697e92..96c274e37ac77904dff64b6380b3dbf22c54a8a0 100644
--- a/dune/xt/functions/test/product.py
+++ b/dune/xt/functions/test/product.py
@@ -6,7 +6,8 @@
 #      or  GPL-2.0+ (http://opensource.org/licenses/gpl-license)
 #          with "runtime exception" (http://www.dune-project.org/license.html)
 # Authors:
-#   TiKeil (2018)
+#   René Fritze (2018)
+#   Tim Keil    (2018)
 # ~~~
 
 import grids
diff --git a/dune/xt/functions/test/spe10_model1.py b/dune/xt/functions/test/spe10_model1.py
index db3bb129044d9bf1abda61ce1d0b1dda4048ebf8..48689f905b1a285ae3939a87a8834e2b0af4258a 100644
--- a/dune/xt/functions/test/spe10_model1.py
+++ b/dune/xt/functions/test/spe10_model1.py
@@ -6,7 +6,8 @@
 #      or  GPL-2.0+ (http://opensource.org/licenses/gpl-license)
 #          with "runtime exception" (http://www.dune-project.org/license.html)
 # Authors:
-#   TiKeil (2018)
+#   René Fritze (2018)
+#   Tim Keil    (2018)
 # ~~~
 
 import grids
diff --git a/dune/xt/functions/test/spe10_model2.py b/dune/xt/functions/test/spe10_model2.py
index 4c2fffa2e4a6b96cc3c2ccc197469be272a74e7b..1e5875aaaa01fcaccc3172c36add7f1be41480d1 100644
--- a/dune/xt/functions/test/spe10_model2.py
+++ b/dune/xt/functions/test/spe10_model2.py
@@ -6,7 +6,8 @@
 #      or  GPL-2.0+ (http://opensource.org/licenses/gpl-license)
 #          with "runtime exception" (http://www.dune-project.org/license.html)
 # Authors:
-#   TiKeil (2018)
+#   René Fritze (2018)
+#   Tim Keil    (2018)
 # ~~~
 
 import grids
diff --git a/dune/xt/functions/test/sum_for_functions.py b/dune/xt/functions/test/sum_for_functions.py
index 1b898631a762df2c93e9e08ec335e5dee4697e92..96c274e37ac77904dff64b6380b3dbf22c54a8a0 100644
--- a/dune/xt/functions/test/sum_for_functions.py
+++ b/dune/xt/functions/test/sum_for_functions.py
@@ -6,7 +6,8 @@
 #      or  GPL-2.0+ (http://opensource.org/licenses/gpl-license)
 #          with "runtime exception" (http://www.dune-project.org/license.html)
 # Authors:
-#   TiKeil (2018)
+#   René Fritze (2018)
+#   Tim Keil    (2018)
 # ~~~
 
 import grids
diff --git a/dune/xt/functions/test/sum_for_grid_functions.py b/dune/xt/functions/test/sum_for_grid_functions.py
index 1b898631a762df2c93e9e08ec335e5dee4697e92..96c274e37ac77904dff64b6380b3dbf22c54a8a0 100644
--- a/dune/xt/functions/test/sum_for_grid_functions.py
+++ b/dune/xt/functions/test/sum_for_grid_functions.py
@@ -6,7 +6,8 @@
 #      or  GPL-2.0+ (http://opensource.org/licenses/gpl-license)
 #          with "runtime exception" (http://www.dune-project.org/license.html)
 # Authors:
-#   TiKeil (2018)
+#   René Fritze (2018)
+#   Tim Keil    (2018)
 # ~~~
 
 import grids
diff --git a/dune/xt/functions/type_traits.hh b/dune/xt/functions/type_traits.hh
index 28e7c20c6056cd88ccef07828ff4539460d4fa43..cdc32bce04a96c05bdf58d7ee2f85333e8e15bd0 100644
--- a/dune/xt/functions/type_traits.hh
+++ b/dune/xt/functions/type_traits.hh
@@ -7,7 +7,7 @@
 // Authors:
 //   Felix Schindler (2017 - 2018)
 //   René Fritze     (2018)
-//   TiKeil          (2018)
+//   Tim Keil        (2018)
 //   Tobias Leibner  (2017)
 
 #ifndef DUNE_XT_FUNCTIONS_TYPE_TRAITS_HH
diff --git a/python/dune/xt/CMakeLists.txt b/python/dune/xt/CMakeLists.txt
index 9322be0faf722c0f54722a7b552645bb674daa15..a34e7638345e9eb723e5be7031369359973a2fb9 100644
--- a/python/dune/xt/CMakeLists.txt
+++ b/python/dune/xt/CMakeLists.txt
@@ -7,7 +7,7 @@
 #          with "runtime exception" (http://www.dune-project.org/license.html)
 # Authors:
 #   René Fritze (2018)
-#   TiKeil      (2018)
+#   Tim Keil    (2018)
 # ~~~
 
 dune_pybindxi_add_module(_interfaces EXCLUDE_FROM_ALL interfaces.cc)
diff --git a/python/dune/xt/bindings.cc b/python/dune/xt/bindings.cc
index 50f8e4014fedf78a5fccdbd9d5f6facf18df6cf3..9b72f83c97bfee619ed4832e1eb797127bb2f5ea 100644
--- a/python/dune/xt/bindings.cc
+++ b/python/dune/xt/bindings.cc
@@ -7,7 +7,7 @@
 // Authors:
 //   Felix Schindler (2016 - 2018)
 //   René Fritze     (2018)
-//   TiKeil          (2018)
+//   Tim Keil        (2018)
 
 #include "config.h"
 
diff --git a/python/dune/xt/functions/ESV2007.bindings.hh b/python/dune/xt/functions/ESV2007.bindings.hh
index e9f05baa2b828d658bc282a13a27d12f2395a110..2ec038c6d2a8da99f09f269ebb5fa525a29b0a49 100644
--- a/python/dune/xt/functions/ESV2007.bindings.hh
+++ b/python/dune/xt/functions/ESV2007.bindings.hh
@@ -7,7 +7,7 @@
 // Authors:
 //   Felix Schindler (2017)
 //   René Fritze     (2018)
-//   TiKeil          (2018)
+//   Tim Keil        (2018)
 
 #ifndef DUNE_XT_FUNCTIONS_ESV2007_BINDINGS_HH
 #define DUNE_XT_FUNCTIONS_ESV2007_BINDINGS_HH
diff --git a/python/dune/xt/functions/__init__.py b/python/dune/xt/functions/__init__.py
index abf7fd807b76c69383024c2ca5486e7522cfb7fd..7ee5fc3f5455ef97aec9aa8102cf79ca0b80d45c 100644
--- a/python/dune/xt/functions/__init__.py
+++ b/python/dune/xt/functions/__init__.py
@@ -8,7 +8,7 @@
 # Authors:
 #   Felix Schindler (2017)
 #   René Fritze     (2018)
-#   TiKeil          (2018)
+#   Tim Keil        (2018)
 # ~~~
 
 import dune.xt
diff --git a/python/dune/xt/functions/checkerboard.hh b/python/dune/xt/functions/checkerboard.hh
index 81fd26ab908d20f5fbf922ea8afbb606bcae0a2e..9c4cbb9af82f4d6eeab87ba12786cbb1d8280048 100644
--- a/python/dune/xt/functions/checkerboard.hh
+++ b/python/dune/xt/functions/checkerboard.hh
@@ -7,7 +7,7 @@
 // Authors:
 //   Felix Schindler (2016 - 2017)
 //   René Fritze     (2018)
-//   TiKeil          (2018)
+//   Tim Keil        (2018)
 //   Tobias Leibner  (2018)
 
 #ifndef DUNE_XT_FUNCTIONS_CHECKERBOARD_PBH
diff --git a/python/dune/xt/functions/constant.hh b/python/dune/xt/functions/constant.hh
index 4fceb347a65cd143ae0f47936ba4f8de0d39a7f0..fdc1e7854ac8e8d7ca557ea6ed48fd7737838987 100644
--- a/python/dune/xt/functions/constant.hh
+++ b/python/dune/xt/functions/constant.hh
@@ -7,7 +7,7 @@
 // Authors:
 //   Felix Schindler (2016 - 2018)
 //   René Fritze     (2018)
-//   TiKeil          (2018)
+//   Tim Keil        (2018)
 
 #ifndef DUNE_XT_FUNCTIONS_CONSTANT_PBH
 #define DUNE_XT_FUNCTIONS_CONSTANT_PBH
diff --git a/python/dune/xt/functions/expression.hh b/python/dune/xt/functions/expression.hh
index 0e595881597c0e2f2620086ec458c22d2be17294..527ac8ae6eed49d4a67d641c7abf4ca15b995944 100644
--- a/python/dune/xt/functions/expression.hh
+++ b/python/dune/xt/functions/expression.hh
@@ -7,7 +7,7 @@
 // Authors:
 //   Felix Schindler (2016 - 2017)
 //   René Fritze     (2018)
-//   TiKeil          (2018)
+//   Tim Keil        (2018)
 
 #ifndef DUNE_XT_FUNCTIONS_EXPRESSION_PBH
 #define DUNE_XT_FUNCTIONS_EXPRESSION_PBH
diff --git a/python/dune/xt/functions/indicator.hh b/python/dune/xt/functions/indicator.hh
index c696a33035474342631bb80c1a8b4821ebcc7d3b..a3b7f3cb0ad25dc0aebd4d5d1c438e3dc794192d 100644
--- a/python/dune/xt/functions/indicator.hh
+++ b/python/dune/xt/functions/indicator.hh
@@ -7,7 +7,7 @@
 // Authors:
 //   Felix Schindler (2018)
 //   René Fritze     (2018)
-//   TiKeil          (2018)
+//   Tim Keil        (2018)
 
 #ifndef PYTHON_DUNE_XT_FUNCTIONS_INDICATOR_HH
 #define PYTHON_DUNE_XT_FUNCTIONS_INDICATOR_HH
diff --git a/python/dune/xt/functions/interfaces.hh b/python/dune/xt/functions/interfaces.hh
index 350ac1b19decbb9d608839a50b41182ee9d47e25..c7cf65e735dd2ed7f2eeae1936781ee3221ab9bc 100644
--- a/python/dune/xt/functions/interfaces.hh
+++ b/python/dune/xt/functions/interfaces.hh
@@ -7,7 +7,7 @@
 // Authors:
 //   Felix Schindler (2016 - 2018)
 //   René Fritze     (2018)
-//   TiKeil          (2018)
+//   Tim Keil        (2018)
 //   Tobias Leibner  (2018)
 
 #ifndef DUNE_XT_FUNCTIONS_INTERFACE_PBH
diff --git a/python/dune/xt/functions/spe10.hh b/python/dune/xt/functions/spe10.hh
index 67c7222bf947622c80a33ce6afcdf7d54a9c3c4c..c1eb7703bf643555ea6243ce8684377f31b50af8 100644
--- a/python/dune/xt/functions/spe10.hh
+++ b/python/dune/xt/functions/spe10.hh
@@ -7,7 +7,7 @@
 // Authors:
 //   Felix Schindler (2016 - 2017)
 //   René Fritze     (2018)
-//   TiKeil          (2018)
+//   Tim Keil        (2018)
 //   Tobias Leibner  (2018)
 
 #ifndef DUNE_XT_FUNCTIONS_SPE10_PBH
diff --git a/python/dune/xt/interfaces.cc b/python/dune/xt/interfaces.cc
index aab659ac0e9f57b0caad281520ca6d402a72b4b9..3cb48aaf5e6717ff2d00e269a202cfa6db61ddcb 100644
--- a/python/dune/xt/interfaces.cc
+++ b/python/dune/xt/interfaces.cc
@@ -7,7 +7,7 @@
 // Authors:
 //   Felix Schindler (2016 - 2017)
 //   René Fritze     (2018)
-//   TiKeil          (2018)
+//   Tim Keil        (2018)
 
 #include "config.h"
 
diff --git a/python/setup.cfg b/python/setup.cfg
index 9f063e6953feea55877eaa0f7c857749df641adc..447a70555887f0481cf10ab7a98e7e1dbefbac76 100644
--- a/python/setup.cfg
+++ b/python/setup.cfg
@@ -7,7 +7,7 @@
 #          with "runtime exception" (http://www.dune-project.org/license.html)
 # Authors:
 #   Rene Fritze (2018)
-#   TiKeil      (2018)
+#   Tim Keil    (2018)
 # ~~~
 
 [aliases]
diff --git a/python/test/constant.py b/python/test/constant.py
index cfa82bae7f65beb8ee229559441df79c1388d7a7..e9f0ad80d20fb4ae0e47e16729b43bc63ba21d27 100644
--- a/python/test/constant.py
+++ b/python/test/constant.py
@@ -6,7 +6,8 @@
 #      or  GPL-2.0+ (http://opensource.org/licenses/gpl-license)
 #          with "runtime exception" (http://www.dune-project.org/license.html)
 # Authors:
-#   TiKeil         (2018)
+#   René Fritze    (2018)
+#   Tim Keil       (2018)
 #   Tobias Leibner (2018)
 # ~~~