diff --git a/mvd/CbmMvdClusterfinder.h b/mvd/CbmMvdClusterfinder.h
index cba4d2dd4095a98cea5ca37aef5a809eb3716234..d5b94044fd2016d54588f648987e6f358cb17b67 100644
--- a/mvd/CbmMvdClusterfinder.h
+++ b/mvd/CbmMvdClusterfinder.h
@@ -1,4 +1,4 @@
-/* Copyright (C) 2014-2020 Institut für Kernphysik, Goethe-Universitaet Frankfurt, Frankfurt
+/* Copyright (C) 2014-2020 Institut fuer Kernphysik, Goethe-Universitaet Frankfurt, Frankfurt
SPDX-License-Identifier: GPL-3.0-only
Authors: Philipp Sitzmann [committer] */
diff --git a/mvd/CbmMvdClusterfinderTB.h b/mvd/CbmMvdClusterfinderTB.h
index 4bbb8392d234ece20cf7c048edfafc5c06fad4a6..4ea522f54fd56c9bbccaeae5ca15459b47370ee1 100644
--- a/mvd/CbmMvdClusterfinderTB.h
+++ b/mvd/CbmMvdClusterfinderTB.h
@@ -1,4 +1,4 @@
-/* Copyright (C) 2017-2020 Institut für Kernphysik, Goethe-Universitaet Frankfurt, Frankfurt
+/* Copyright (C) 2017-2020 Institut fuer Kernphysik, Goethe-Universitaet Frankfurt, Frankfurt
SPDX-License-Identifier: GPL-3.0-only
Authors: Philipp Sitzmann [committer] */
diff --git a/mvd/CbmMvdDetector.cxx b/mvd/CbmMvdDetector.cxx
index 1aff97bfa86c6c1339eddd8201afd6961cad5d14..d4566456f9599ffcf0c0010e3292e914ee3444ec 100644
--- a/mvd/CbmMvdDetector.cxx
+++ b/mvd/CbmMvdDetector.cxx
@@ -1,4 +1,4 @@
-/* Copyright (C) 2014-2021 Institut für Kernphysik, Goethe-Universitaet Frankfurt, Frankfurt
+/* Copyright (C) 2014-2021 Institut fuer Kernphysik, Goethe-Universitaet Frankfurt, Frankfurt
SPDX-License-Identifier: GPL-3.0-only
Authors: Philipp Sitzmann [committer] */
diff --git a/mvd/CbmMvdDetector.h b/mvd/CbmMvdDetector.h
index edc576bae41b8b751f98f83c82c6dc9d1f2b6e8c..f899f42a5c1fa20575b8615f47078238e6596db4 100644
--- a/mvd/CbmMvdDetector.h
+++ b/mvd/CbmMvdDetector.h
@@ -1,4 +1,4 @@
-/* Copyright (C) 2014-2020 Institut für Kernphysik, Goethe-Universitaet Frankfurt, Frankfurt
+/* Copyright (C) 2014-2020 Institut fuer Kernphysik, Goethe-Universitaet Frankfurt, Frankfurt
SPDX-License-Identifier: GPL-3.0-only
Authors: Michael Deveaux, Philipp Sitzmann [committer] */
diff --git a/mvd/CbmMvdDigiToHit.cxx b/mvd/CbmMvdDigiToHit.cxx
index 4be32f706ca310b6c067f89769afa2f0a79d513d..b40b9cd2c4a7cb81a7295e0f3d3972bdd307a711 100644
--- a/mvd/CbmMvdDigiToHit.cxx
+++ b/mvd/CbmMvdDigiToHit.cxx
@@ -1,6 +1,6 @@
/* Copyright (C) 2019 Frankfurt Institute for Advanced Studies, Goethe-Universität Frankfurt, Frankfurt
SPDX-License-Identifier: GPL-3.0-only
- Authors: Florian Uhlig */
+ Authors: Andreas Redelbach [committer] */
// -------------------------------------------------------------------------
// ----- CbmMvdDigiToHit source file -----
diff --git a/mvd/CbmMvdDigiToHit.h b/mvd/CbmMvdDigiToHit.h
index 6fea9446f2c189d5778f82f4c01cc453e1c7d315..39726b1501968bcd0bf803e7e63916f03909c01f 100644
--- a/mvd/CbmMvdDigiToHit.h
+++ b/mvd/CbmMvdDigiToHit.h
@@ -1,6 +1,6 @@
/* Copyright (C) 2019 Frankfurt Institute for Advanced Studies, Goethe-Universitaet Frankfurt, Frankfurt
SPDX-License-Identifier: GPL-3.0-only
- Authors: */
+ Authors: Andreas Redelbach [committer] */
// ----------------------------------------------------------------------------
// ----- CbmMvdDigiToHit header file -----
diff --git a/mvd/CbmMvdDigiToHitTB.cxx b/mvd/CbmMvdDigiToHitTB.cxx
index c8c50f4c531bc5ec16619744f68ca9f0e5356f53..ae289816b88e5bcc536cb0dfb0f03c6a7bf4fca2 100644
--- a/mvd/CbmMvdDigiToHitTB.cxx
+++ b/mvd/CbmMvdDigiToHitTB.cxx
@@ -1,6 +1,6 @@
/* Copyright (C) 2019-2020 Frankfurt Institute for Advanced Studies, Goethe-Universität Frankfurt, Frankfurt
SPDX-License-Identifier: GPL-3.0-only
- Authors: Florian Uhlig */
+ Authors: Andreas Redelbach [committer] */
// -------------------------------------------------------------------------
// ----- CbmMvdDigiToHitTB source file -----
diff --git a/mvd/CbmMvdDigiToHitTB.h b/mvd/CbmMvdDigiToHitTB.h
index 4eb12e28ac1e840bb3a9c4fa04a7b2d2711dee0b..628822b4e8ce42eabcd2a893581719cce99bde49 100644
--- a/mvd/CbmMvdDigiToHitTB.h
+++ b/mvd/CbmMvdDigiToHitTB.h
@@ -1,6 +1,6 @@
/* Copyright (C) 2019 Frankfurt Institute for Advanced Studies, Goethe-Universitaet Frankfurt, Frankfurt
SPDX-License-Identifier: GPL-3.0-only
- Authors: */
+ Authors: Andreas Redelbach [committer] */
// ----------------------------------------------------------------------------
// ----- CbmMvdDigiToHitTB header file -----
diff --git a/mvd/CbmMvdDigitizer.h b/mvd/CbmMvdDigitizer.h
index c365b0808867dce459356c1b4ae0d575026dc9fd..c5ea494d58f0f1cdfb8a1e0114855f8956a7861c 100644
--- a/mvd/CbmMvdDigitizer.h
+++ b/mvd/CbmMvdDigitizer.h
@@ -1,4 +1,4 @@
-/* Copyright (C) 2014-2020 Institut für Kernphysik, Goethe-Universitaet Frankfurt, Frankfurt
+/* Copyright (C) 2014-2020 Institut fuer Kernphysik, Goethe-Universitaet Frankfurt, Frankfurt
SPDX-License-Identifier: GPL-3.0-only
Authors: Philipp Sitzmann [committer], Florian Uhlig */
diff --git a/mvd/CbmMvdDigitizerTB.h b/mvd/CbmMvdDigitizerTB.h
index 101000dd90d33ca46ace6eb9b7bca83bf8776c8d..3e2d2981ff666fe14255df165541ea3dc85770f7 100644
--- a/mvd/CbmMvdDigitizerTB.h
+++ b/mvd/CbmMvdDigitizerTB.h
@@ -1,4 +1,4 @@
-/* Copyright (C) 2017 Institut für Kernphysik, Goethe-Universitaet Frankfurt, Frankfurt
+/* Copyright (C) 2017 Institut fuer Kernphysik, Goethe-Universitaet Frankfurt, Frankfurt
SPDX-License-Identifier: GPL-3.0-only
Authors: Philipp Sitzmann [committer] */
diff --git a/mvd/CbmMvdHitfinder.h b/mvd/CbmMvdHitfinder.h
index d76a73e4033906596d4115273afca839b04334cc..1a628d99df5e8d0834ddf89980177139aac05c41 100644
--- a/mvd/CbmMvdHitfinder.h
+++ b/mvd/CbmMvdHitfinder.h
@@ -1,4 +1,4 @@
-/* Copyright (C) 2014-2020 Institut für Kernphysik, Goethe-Universitaet Frankfurt, Frankfurt
+/* Copyright (C) 2014-2020 Institut fuer Kernphysik, Goethe-Universitaet Frankfurt, Frankfurt
SPDX-License-Identifier: GPL-3.0-only
Authors: Philipp Sitzmann [committer] */
diff --git a/mvd/CbmMvdHitfinderTB.h b/mvd/CbmMvdHitfinderTB.h
index 0e45c7ae1f5b28217b49b12486abaedeb492507f..5d22d293ba599f5f16fefe3a398043a4189eeab0 100644
--- a/mvd/CbmMvdHitfinderTB.h
+++ b/mvd/CbmMvdHitfinderTB.h
@@ -1,4 +1,4 @@
-/* Copyright (C) 2017 Institut für Kernphysik, Goethe-Universitaet Frankfurt, Frankfurt
+/* Copyright (C) 2017 Institut fuer Kernphysik, Goethe-Universitaet Frankfurt, Frankfurt
SPDX-License-Identifier: GPL-3.0-only
Authors: Philipp Sitzmann [committer] */
diff --git a/mvd/CbmMvdReadout.h b/mvd/CbmMvdReadout.h
index d4f86ff122637f861fa691a03247a1ce3426aeff..cf200aafd2f3691835025f3e355f86745715f165 100644
--- a/mvd/CbmMvdReadout.h
+++ b/mvd/CbmMvdReadout.h
@@ -1,4 +1,4 @@
-/* Copyright (C) 2017-2020 Institut für Kernphysik, Goethe-Universitaet Frankfurt, Frankfurt
+/* Copyright (C) 2017-2020 Institut fuer Kernphysik, Goethe-Universitaet Frankfurt, Frankfurt
SPDX-License-Identifier: GPL-3.0-only
Authors: Philipp Sitzmann [committer] */
diff --git a/mvd/CbmMvdSensor.cxx b/mvd/CbmMvdSensor.cxx
index 8154470dd3b47e001652f6b166e242eb52e579e9..ca6cd870bc5793219db6b343a4b552ba904baace 100644
--- a/mvd/CbmMvdSensor.cxx
+++ b/mvd/CbmMvdSensor.cxx
@@ -1,4 +1,4 @@
-/* Copyright (C) 2011-2021 Institut für Kernphysik, Goethe-Universitaet Frankfurt, Frankfurt
+/* Copyright (C) 2011-2021 Institut fuer Kernphysik, Goethe-Universitaet Frankfurt, Frankfurt
SPDX-License-Identifier: GPL-3.0-only
Authors: Michael Deveaux, Philipp Sitzmann [committer] */
diff --git a/mvd/CbmMvdSensor.h b/mvd/CbmMvdSensor.h
index 14c780f7c11fb777b1bbd1d951e1674afe7ab905..5b1f3eda2216bb986cc2642b389ef181f9b0c54f 100644
--- a/mvd/CbmMvdSensor.h
+++ b/mvd/CbmMvdSensor.h
@@ -1,4 +1,4 @@
-/* Copyright (C) 2014-2019 Institut für Kernphysik, Goethe-Universitaet Frankfurt, Frankfurt
+/* Copyright (C) 2014-2019 Institut fuer Kernphysik, Goethe-Universitaet Frankfurt, Frankfurt
SPDX-License-Identifier: GPL-3.0-only
Authors: Michael Deveaux, Philipp Sitzmann [committer] */
diff --git a/mvd/CbmMvdStationPar.cxx b/mvd/CbmMvdStationPar.cxx
index 5eabb73c5b9bf457248dc91c165fe52f9cbcb9aa..97056bf6b0c7bd2fd08b1473be7bcf7fd4b5e4ec 100644
--- a/mvd/CbmMvdStationPar.cxx
+++ b/mvd/CbmMvdStationPar.cxx
@@ -1,4 +1,4 @@
-/* Copyright (C) 2014-2020 Institut für Kernphysik, Goethe-Universitaet Frankfurt, Frankfurt
+/* Copyright (C) 2014-2020 Institut fuer Kernphysik, Goethe-Universitaet Frankfurt, Frankfurt
SPDX-License-Identifier: GPL-3.0-only
Authors: Philipp Sitzmann [committer] */
diff --git a/mvd/CbmMvdStationPar.h b/mvd/CbmMvdStationPar.h
index 4e3fadfcb4e04b6391f03e810bfbaeb759926702..ad6c59543cd3c3d8c82b0414f8034ab4a70625d4 100644
--- a/mvd/CbmMvdStationPar.h
+++ b/mvd/CbmMvdStationPar.h
@@ -1,4 +1,4 @@
-/* Copyright (C) 2014-2017 Institut für Kernphysik, Goethe-Universitaet Frankfurt, Frankfurt
+/* Copyright (C) 2014-2017 Institut fuer Kernphysik, Goethe-Universitaet Frankfurt, Frankfurt
SPDX-License-Identifier: GPL-3.0-only
Authors: Philipp Sitzmann [committer], Florian Uhlig */
diff --git a/mvd/SensorDataSheets/CbmMvdMimosa26AHR.cxx b/mvd/SensorDataSheets/CbmMvdMimosa26AHR.cxx
index c11dd395e72294b4a39700f23bba8335b87e4847..04bf5cc8c0200cc2638227fa9bb841bc26315195 100644
--- a/mvd/SensorDataSheets/CbmMvdMimosa26AHR.cxx
+++ b/mvd/SensorDataSheets/CbmMvdMimosa26AHR.cxx
@@ -1,4 +1,4 @@
-/* Copyright (C) 2014-2015 Institut für Kernphysik, Goethe-Universitaet Frankfurt, Frankfurt
+/* Copyright (C) 2014-2015 Institut fuer Kernphysik, Goethe-Universitaet Frankfurt, Frankfurt
SPDX-License-Identifier: GPL-3.0-only
Authors: Philipp Sitzmann [committer] */
diff --git a/mvd/SensorDataSheets/CbmMvdMimosa26AHR.h b/mvd/SensorDataSheets/CbmMvdMimosa26AHR.h
index f43936054117647e00ebc6342c5e502d347cffce..43d0c3478538f91ea3c02238fff34fe61d6e9357 100644
--- a/mvd/SensorDataSheets/CbmMvdMimosa26AHR.h
+++ b/mvd/SensorDataSheets/CbmMvdMimosa26AHR.h
@@ -1,4 +1,4 @@
-/* Copyright (C) 2014 Institut für Kernphysik, Goethe-Universitaet Frankfurt, Frankfurt
+/* Copyright (C) 2014 Institut fuer Kernphysik, Goethe-Universitaet Frankfurt, Frankfurt
SPDX-License-Identifier: GPL-3.0-only
Authors: Michael Deveaux, Philipp Sitzmann [committer] */
diff --git a/mvd/SensorDataSheets/CbmMvdMimosa34.cxx b/mvd/SensorDataSheets/CbmMvdMimosa34.cxx
index d7ff8abde7e6ab3dd14cf4eef3403b3db63ea18d..9f8ec7b2bc30fd753c179883c4465d205c913609 100644
--- a/mvd/SensorDataSheets/CbmMvdMimosa34.cxx
+++ b/mvd/SensorDataSheets/CbmMvdMimosa34.cxx
@@ -1,4 +1,4 @@
-/* Copyright (C) 2014 Institut für Kernphysik, Goethe-Universitaet Frankfurt, Frankfurt
+/* Copyright (C) 2014 Institut fuer Kernphysik, Goethe-Universitaet Frankfurt, Frankfurt
SPDX-License-Identifier: GPL-3.0-only
Authors: Philipp Sitzmann [committer] */
diff --git a/mvd/SensorDataSheets/CbmMvdMimosa34.h b/mvd/SensorDataSheets/CbmMvdMimosa34.h
index 19a4fc5d4daedddb27c1619a615c1642bf573e5f..52b92d34f95bb014e102ca687135590d1f9dd104 100644
--- a/mvd/SensorDataSheets/CbmMvdMimosa34.h
+++ b/mvd/SensorDataSheets/CbmMvdMimosa34.h
@@ -1,4 +1,4 @@
-/* Copyright (C) 2014 Institut für Kernphysik, Goethe-Universitaet Frankfurt, Frankfurt
+/* Copyright (C) 2014 Institut fuer Kernphysik, Goethe-Universitaet Frankfurt, Frankfurt
SPDX-License-Identifier: GPL-3.0-only
Authors: Philipp Sitzmann [committer] */
diff --git a/mvd/SensorDataSheets/CbmMvdSensorDataSheet.cxx b/mvd/SensorDataSheets/CbmMvdSensorDataSheet.cxx
index acce35f19bca2d1f7b8e7e9df1291425780b2460..6d424bd9e5e6356d572a4317e0a8e949fa46d082 100644
--- a/mvd/SensorDataSheets/CbmMvdSensorDataSheet.cxx
+++ b/mvd/SensorDataSheets/CbmMvdSensorDataSheet.cxx
@@ -1,4 +1,4 @@
-/* Copyright (C) 2011-2016 Institut für Kernphysik, Goethe-Universitaet Frankfurt, Frankfurt
+/* Copyright (C) 2011-2016 Institut fuer Kernphysik, Goethe-Universitaet Frankfurt, Frankfurt
SPDX-License-Identifier: GPL-3.0-only
Authors: Michael Deveaux, Philipp Sitzmann [committer], Florian Uhlig */
diff --git a/mvd/SensorDataSheets/CbmMvdSensorDataSheet.h b/mvd/SensorDataSheets/CbmMvdSensorDataSheet.h
index 3b81c169fb15c1e315a10f5944933fd2d997ceb4..7e977ed63d74cb75e5d880527f8c08d04650c083 100644
--- a/mvd/SensorDataSheets/CbmMvdSensorDataSheet.h
+++ b/mvd/SensorDataSheets/CbmMvdSensorDataSheet.h
@@ -1,4 +1,4 @@
-/* Copyright (C) 2014-2015 Institut für Kernphysik, Goethe-Universitaet Frankfurt, Frankfurt
+/* Copyright (C) 2014-2015 Institut fuer Kernphysik, Goethe-Universitaet Frankfurt, Frankfurt
SPDX-License-Identifier: GPL-3.0-only
Authors: Michael Deveaux, Philipp Sitzmann [committer] */
diff --git a/mvd/plugins/CbmMvdSensorPlugin.cxx b/mvd/plugins/CbmMvdSensorPlugin.cxx
index 32ab2646d52ae120f5967b63068fc77a47a91df7..9f5bcae6b7be3e3b09e2220baa01beb36aa52755 100644
--- a/mvd/plugins/CbmMvdSensorPlugin.cxx
+++ b/mvd/plugins/CbmMvdSensorPlugin.cxx
@@ -1,4 +1,4 @@
-/* Copyright (C) 2012-2015 Institut für Kernphysik, Goethe-Universitaet Frankfurt, Frankfurt
+/* Copyright (C) 2012-2015 Institut fuer Kernphysik, Goethe-Universitaet Frankfurt, Frankfurt
SPDX-License-Identifier: GPL-3.0-only
Authors: Michael Deveaux, Philipp Sitzmann [committer], Florian Uhlig */
diff --git a/mvd/plugins/CbmMvdSensorPlugin.h b/mvd/plugins/CbmMvdSensorPlugin.h
index 2a6b092c2162b2672554f4696f6ae2ec7b416174..86a6f2d31411d83ddd3b7b2fc402106c180cd321 100644
--- a/mvd/plugins/CbmMvdSensorPlugin.h
+++ b/mvd/plugins/CbmMvdSensorPlugin.h
@@ -1,4 +1,4 @@
-/* Copyright (C) 2014-2016 Institut für Kernphysik, Goethe-Universitaet Frankfurt, Frankfurt
+/* Copyright (C) 2014-2016 Institut fuer Kernphysik, Goethe-Universitaet Frankfurt, Frankfurt
SPDX-License-Identifier: GPL-3.0-only
Authors: Michael Deveaux, Philipp Sitzmann [committer], Florian Uhlig */
diff --git a/mvd/plugins/buffers/CbmMvdSensorBuffer.cxx b/mvd/plugins/buffers/CbmMvdSensorBuffer.cxx
index 49f2ac6fb1c5fc3bf25cefa67f6d2432a975f457..da8c7de17ef17a9b38067b5f68c2fabf96b3a2ff 100644
--- a/mvd/plugins/buffers/CbmMvdSensorBuffer.cxx
+++ b/mvd/plugins/buffers/CbmMvdSensorBuffer.cxx
@@ -1,4 +1,4 @@
-/* Copyright (C) 2012-2015 Institut für Kernphysik, Goethe-Universitaet Frankfurt, Frankfurt
+/* Copyright (C) 2012-2015 Institut fuer Kernphysik, Goethe-Universitaet Frankfurt, Frankfurt
SPDX-License-Identifier: GPL-3.0-only
Authors: Michael Deveaux, Philipp Sitzmann [committer], Florian Uhlig */
diff --git a/mvd/plugins/buffers/CbmMvdSensorBuffer.h b/mvd/plugins/buffers/CbmMvdSensorBuffer.h
index f562e40058b25c918c4f6d675a987f55310ded1f..88fbc0d661d4f2f97edd0d93bb5a6a18b676546e 100644
--- a/mvd/plugins/buffers/CbmMvdSensorBuffer.h
+++ b/mvd/plugins/buffers/CbmMvdSensorBuffer.h
@@ -1,4 +1,4 @@
-/* Copyright (C) 2014-2016 Institut für Kernphysik, Goethe-Universitaet Frankfurt, Frankfurt
+/* Copyright (C) 2014-2016 Institut fuer Kernphysik, Goethe-Universitaet Frankfurt, Frankfurt
SPDX-License-Identifier: GPL-3.0-only
Authors: Michael Deveaux, Philipp Sitzmann [committer], Florian Uhlig */
diff --git a/mvd/plugins/buffers/CbmMvdSensorFrameBuffer.cxx b/mvd/plugins/buffers/CbmMvdSensorFrameBuffer.cxx
index 923b50df09902a785425a3fd27e17a69cca66116..0dd965e412842511461116aced71fc8a9cbc3ce4 100644
--- a/mvd/plugins/buffers/CbmMvdSensorFrameBuffer.cxx
+++ b/mvd/plugins/buffers/CbmMvdSensorFrameBuffer.cxx
@@ -1,4 +1,4 @@
-/* Copyright (C) 2014-2015 Institut für Kernphysik, Goethe-Universitaet Frankfurt, Frankfurt
+/* Copyright (C) 2014-2015 Institut fuer Kernphysik, Goethe-Universitaet Frankfurt, Frankfurt
SPDX-License-Identifier: GPL-3.0-only
Authors: Philipp Sitzmann [committer] */
diff --git a/mvd/plugins/buffers/CbmMvdSensorFrameBuffer.h b/mvd/plugins/buffers/CbmMvdSensorFrameBuffer.h
index 0d76ea0b0eef5aa78b345ac9251f66f6c3fa95e7..583ca5f45ff72fffa4f9cc7f79169c51d4022f57 100644
--- a/mvd/plugins/buffers/CbmMvdSensorFrameBuffer.h
+++ b/mvd/plugins/buffers/CbmMvdSensorFrameBuffer.h
@@ -1,4 +1,4 @@
-/* Copyright (C) 2014-2016 Institut für Kernphysik, Goethe-Universitaet Frankfurt, Frankfurt
+/* Copyright (C) 2014-2016 Institut fuer Kernphysik, Goethe-Universitaet Frankfurt, Frankfurt
SPDX-License-Identifier: GPL-3.0-only
Authors: Michael Deveaux, Philipp Sitzmann [committer] */
diff --git a/mvd/plugins/buffers/CbmMvdSensorTrackingBuffer.cxx b/mvd/plugins/buffers/CbmMvdSensorTrackingBuffer.cxx
index 7031d1ecb14eb4bff590b0cd8df0d66f0d0df5c3..2ee48ecc7d2f5106283787404890cf97cf66305d 100644
--- a/mvd/plugins/buffers/CbmMvdSensorTrackingBuffer.cxx
+++ b/mvd/plugins/buffers/CbmMvdSensorTrackingBuffer.cxx
@@ -1,4 +1,4 @@
-/* Copyright (C) 2012-2015 Institut für Kernphysik, Goethe-Universitaet Frankfurt, Frankfurt
+/* Copyright (C) 2012-2015 Institut fuer Kernphysik, Goethe-Universitaet Frankfurt, Frankfurt
SPDX-License-Identifier: GPL-3.0-only
Authors: Philipp Sitzmann [committer] */
diff --git a/mvd/plugins/buffers/CbmMvdSensorTrackingBuffer.h b/mvd/plugins/buffers/CbmMvdSensorTrackingBuffer.h
index 5f60b77d776ebec4ed87b69f97c6da1ad8f22e73..f8c160f63ddaf9d2b2649a3d6e8c4bc3b1c61e8c 100644
--- a/mvd/plugins/buffers/CbmMvdSensorTrackingBuffer.h
+++ b/mvd/plugins/buffers/CbmMvdSensorTrackingBuffer.h
@@ -1,4 +1,4 @@
-/* Copyright (C) 2014-2015 Institut für Kernphysik, Goethe-Universitaet Frankfurt, Frankfurt
+/* Copyright (C) 2014-2015 Institut fuer Kernphysik, Goethe-Universitaet Frankfurt, Frankfurt
SPDX-License-Identifier: GPL-3.0-only
Authors: Philipp Sitzmann [committer] */
diff --git a/mvd/plugins/tasks/CbmMvdSensorClusterfinderTask.cxx b/mvd/plugins/tasks/CbmMvdSensorClusterfinderTask.cxx
index b004662f19f1136156cbc7802f37caf54bf2fd8d..1948146c1502550e290931e5b13b2daf125f3693 100644
--- a/mvd/plugins/tasks/CbmMvdSensorClusterfinderTask.cxx
+++ b/mvd/plugins/tasks/CbmMvdSensorClusterfinderTask.cxx
@@ -1,4 +1,4 @@
-/* Copyright (C) 2014-2020 Institut für Kernphysik, Goethe-Universitaet Frankfurt, Frankfurt
+/* Copyright (C) 2014-2020 Institut fuer Kernphysik, Goethe-Universitaet Frankfurt, Frankfurt
SPDX-License-Identifier: GPL-3.0-only
Authors: Philipp Sitzmann [committer] */
diff --git a/mvd/plugins/tasks/CbmMvdSensorClusterfinderTask.h b/mvd/plugins/tasks/CbmMvdSensorClusterfinderTask.h
index 046324aad10fd0b113a75752e453293007f2a60a..e5f8f2bc284b7a247fdf8de89a6a54518593f65a 100644
--- a/mvd/plugins/tasks/CbmMvdSensorClusterfinderTask.h
+++ b/mvd/plugins/tasks/CbmMvdSensorClusterfinderTask.h
@@ -1,4 +1,4 @@
-/* Copyright (C) 2014-2017 Institut für Kernphysik, Goethe-Universitaet Frankfurt, Frankfurt
+/* Copyright (C) 2014-2017 Institut fuer Kernphysik, Goethe-Universitaet Frankfurt, Frankfurt
SPDX-License-Identifier: GPL-3.0-only
Authors: Philipp Sitzmann [committer] */
diff --git a/mvd/plugins/tasks/CbmMvdSensorDigiToHitTask.cxx b/mvd/plugins/tasks/CbmMvdSensorDigiToHitTask.cxx
index bd28382c009d35cdf2cbfd2810b9198e692f05b3..09b344b31edfc689018c354563462c6f39b3f551 100644
--- a/mvd/plugins/tasks/CbmMvdSensorDigiToHitTask.cxx
+++ b/mvd/plugins/tasks/CbmMvdSensorDigiToHitTask.cxx
@@ -1,12 +1,6 @@
/* Copyright (C) 2019-2020 Frankfurt Institute for Advanced Studies, Goethe-Universität Frankfurt, Frankfurt
SPDX-License-Identifier: GPL-3.0-only
- Authors: Florian Uhlig */
-
-// -------------------------------------------------------------------------
-// ----- CbmMvdSensorDigiToHitTask source file -----
-// ----- 27.11.18 Edited by K. Hunold -----
-// -------------------------------------------------------------------------
-
+ Authors: Andreas Redelbach [committer] */
#include "CbmMvdSensorDigiToHitTask.h"
diff --git a/mvd/plugins/tasks/CbmMvdSensorDigiToHitTask.h b/mvd/plugins/tasks/CbmMvdSensorDigiToHitTask.h
index a785cb8dc9e0c786508dd9002fde56c05ce8ffe3..a7322c3d2ebad65c5ae0dd07152b470e265ce849 100644
--- a/mvd/plugins/tasks/CbmMvdSensorDigiToHitTask.h
+++ b/mvd/plugins/tasks/CbmMvdSensorDigiToHitTask.h
@@ -1,12 +1,6 @@
/* Copyright (C) 2019 Frankfurt Institute for Advanced Studies, Goethe-Universität Frankfurt, Frankfurt
SPDX-License-Identifier: GPL-3.0-only
- Authors: */
-
-// -------------------------------------------------------------------------
-// ----- CbmMvdSensorClusterfinderTask header file -----
-// ----- 27.11.18 Edited by K. Hunold -----
-// -------------------------------------------------------------------------
-
+ Authors: Andreas Redelbach [committer] */
#ifndef CBMMVDSENSORDIGITOHITTASK_H
#define CBMMVDSENSORDIGITOHITTASK_H 1
diff --git a/mvd/plugins/tasks/CbmMvdSensorFindHitTask.cxx b/mvd/plugins/tasks/CbmMvdSensorFindHitTask.cxx
index 594b8dac19b00df7056dd6b03283f0ce6c4b7b5f..1c559d242c558e7370d1cca79c15196f124df93e 100644
--- a/mvd/plugins/tasks/CbmMvdSensorFindHitTask.cxx
+++ b/mvd/plugins/tasks/CbmMvdSensorFindHitTask.cxx
@@ -1,4 +1,4 @@
-/* Copyright (C) 2013-2019 Institut für Kernphysik, Goethe-Universitaet Frankfurt, Frankfurt
+/* Copyright (C) 2013-2019 Institut fuer Kernphysik, Goethe-Universitaet Frankfurt, Frankfurt
SPDX-License-Identifier: GPL-3.0-only
Authors: Philipp Sitzmann [committer], Florian Uhlig */
diff --git a/mvd/plugins/tasks/CbmMvdSensorFindHitTask.h b/mvd/plugins/tasks/CbmMvdSensorFindHitTask.h
index cedeafab63651dd0b2c3e3b72755aa2112ba86e0..ba1a3c7c8e02aace34c3382e7185a4de425c1922 100644
--- a/mvd/plugins/tasks/CbmMvdSensorFindHitTask.h
+++ b/mvd/plugins/tasks/CbmMvdSensorFindHitTask.h
@@ -1,4 +1,4 @@
-/* Copyright (C) 2014-2017 Institut für Kernphysik, Goethe-Universitaet Frankfurt, Frankfurt
+/* Copyright (C) 2014-2017 Institut fuer Kernphysik, Goethe-Universitaet Frankfurt, Frankfurt
SPDX-License-Identifier: GPL-3.0-only
Authors: Philipp Sitzmann [committer] */
diff --git a/mvd/plugins/tasks/CbmMvdSensorHitfinderTask.cxx b/mvd/plugins/tasks/CbmMvdSensorHitfinderTask.cxx
index 72a19bb0f360294aaf0c7284eebba53648d0257e..3181d6248a99f88c58f280cbd340d97b87b500cd 100644
--- a/mvd/plugins/tasks/CbmMvdSensorHitfinderTask.cxx
+++ b/mvd/plugins/tasks/CbmMvdSensorHitfinderTask.cxx
@@ -1,4 +1,4 @@
-/* Copyright (C) 2013-2020 Institut für Kernphysik, Goethe-Universitaet Frankfurt, Frankfurt
+/* Copyright (C) 2013-2020 Institut fuer Kernphysik, Goethe-Universitaet Frankfurt, Frankfurt
SPDX-License-Identifier: GPL-3.0-only
Authors: Philipp Sitzmann [committer], Samir Amar-Youcef, Florian Uhlig */
diff --git a/mvd/plugins/tasks/CbmMvdSensorHitfinderTask.h b/mvd/plugins/tasks/CbmMvdSensorHitfinderTask.h
index 8263c13d00aaae47d65af193630cc93f1a06ffb9..f94476bc03981b052a187dfb4fc8d905b11b42b1 100644
--- a/mvd/plugins/tasks/CbmMvdSensorHitfinderTask.h
+++ b/mvd/plugins/tasks/CbmMvdSensorHitfinderTask.h
@@ -1,4 +1,4 @@
-/* Copyright (C) 2014-2016 Institut für Kernphysik, Goethe-Universitaet Frankfurt, Frankfurt
+/* Copyright (C) 2014-2016 Institut fuer Kernphysik, Goethe-Universitaet Frankfurt, Frankfurt
SPDX-License-Identifier: GPL-3.0-only
Authors: Philipp Sitzmann [committer] */
diff --git a/mvd/plugins/tasks/CbmMvdSensorReadoutTask.cxx b/mvd/plugins/tasks/CbmMvdSensorReadoutTask.cxx
index 0f3180a4cf5a7731c2ec3664013c1c357e696143..9e3584fc1d48b55836cabc4af0a382bbf4dd76ec 100644
--- a/mvd/plugins/tasks/CbmMvdSensorReadoutTask.cxx
+++ b/mvd/plugins/tasks/CbmMvdSensorReadoutTask.cxx
@@ -1,4 +1,4 @@
-/* Copyright (C) 2017-2019 Institut für Kernphysik, Goethe-Universitaet Frankfurt, Frankfurt
+/* Copyright (C) 2017-2019 Institut fuer Kernphysik, Goethe-Universitaet Frankfurt, Frankfurt
SPDX-License-Identifier: GPL-3.0-only
Authors: Philipp Sitzmann [committer] */
diff --git a/mvd/plugins/tasks/CbmMvdSensorReadoutTask.h b/mvd/plugins/tasks/CbmMvdSensorReadoutTask.h
index f52a9b4b9e9beb0ad06115f712f246da9a25d992..4dd64d2d607187c0ec6ff6dfbe8af0ee1d5e8703 100644
--- a/mvd/plugins/tasks/CbmMvdSensorReadoutTask.h
+++ b/mvd/plugins/tasks/CbmMvdSensorReadoutTask.h
@@ -1,4 +1,4 @@
-/* Copyright (C) 2017-2019 Institut für Kernphysik, Goethe-Universitaet Frankfurt, Frankfurt
+/* Copyright (C) 2017-2019 Institut fuer Kernphysik, Goethe-Universitaet Frankfurt, Frankfurt
SPDX-License-Identifier: GPL-3.0-only
Authors: Philipp Sitzmann [committer] */
diff --git a/mvd/plugins/tasks/CbmMvdSensorTask.cxx b/mvd/plugins/tasks/CbmMvdSensorTask.cxx
index 72b09b00f6ae77a9e6ecf5851afd78ee208e5390..9101dcda2d860a2b964f4e2d8b9274a4e0a44d39 100644
--- a/mvd/plugins/tasks/CbmMvdSensorTask.cxx
+++ b/mvd/plugins/tasks/CbmMvdSensorTask.cxx
@@ -1,4 +1,4 @@
-/* Copyright (C) 2012-2015 Institut für Kernphysik, Goethe-Universitaet Frankfurt, Frankfurt
+/* Copyright (C) 2012-2015 Institut fuer Kernphysik, Goethe-Universitaet Frankfurt, Frankfurt
SPDX-License-Identifier: GPL-3.0-only
Authors: Michael Deveaux, Philipp Sitzmann [committer], Florian Uhlig */
diff --git a/mvd/plugins/tasks/CbmMvdSensorTask.h b/mvd/plugins/tasks/CbmMvdSensorTask.h
index 9c4ebb4c3165fac92aabbf129ade424c9f696cc6..8dfc2320eda9d7b2af26a565f515b824b6b352de 100644
--- a/mvd/plugins/tasks/CbmMvdSensorTask.h
+++ b/mvd/plugins/tasks/CbmMvdSensorTask.h
@@ -1,4 +1,4 @@
-/* Copyright (C) 2014-2017 Institut für Kernphysik, Goethe-Universitaet Frankfurt, Frankfurt
+/* Copyright (C) 2014-2017 Institut fuer Kernphysik, Goethe-Universitaet Frankfurt, Frankfurt
SPDX-License-Identifier: GPL-3.0-only
Authors: Michael Deveaux, Philipp Sitzmann [committer] */
diff --git a/mvd/qa/CbmMvdClusterAna.cxx b/mvd/qa/CbmMvdClusterAna.cxx
index b80d2082beb9a3b603c183483a13403b7f0c5f53..2a41e3c65b8c34142683a84344529367ec1a6373 100644
--- a/mvd/qa/CbmMvdClusterAna.cxx
+++ b/mvd/qa/CbmMvdClusterAna.cxx
@@ -1,4 +1,4 @@
-/* Copyright (C) 2015-2019 IKF-UFrac
+/* Copyright (C) 2015-2019 Institut fuer Kernphysik, Goethe-Universitaet Frankfurt, Frankfurt
SPDX-License-Identifier: GPL-3.0-only
Authors: Samir Amar-Youcef [committer] */
diff --git a/mvd/qa/CbmMvdClusterAna.h b/mvd/qa/CbmMvdClusterAna.h
index d9df70d20e4a790b58ab19d367c3b363e010ac6f..ff0c7848e07e7ffe28566fd9d0e607976b217cb4 100644
--- a/mvd/qa/CbmMvdClusterAna.h
+++ b/mvd/qa/CbmMvdClusterAna.h
@@ -1,4 +1,4 @@
-/* Copyright (C) 2015-2017 IKF-UFrac
+/* Copyright (C) 2015-2017 Institut fuer Kernphysik, Goethe-Universitaet Frankfurt, Frankfurt
SPDX-License-Identifier: GPL-3.0-only
Authors: Samir Amar-Youcef [committer] */
diff --git a/mvd/qa/CbmMvdQa.cxx b/mvd/qa/CbmMvdQa.cxx
index 5192e65cc530dd27ea3d48639daaf42166795822..c30c3caa8cc01cc227767c34188942337be32d75 100644
--- a/mvd/qa/CbmMvdQa.cxx
+++ b/mvd/qa/CbmMvdQa.cxx
@@ -1,4 +1,4 @@
-/* Copyright (C) 2015-2019 Institut für Kernphysik, Goethe-Universitaet Frankfurt, Frankfurt
+/* Copyright (C) 2015-2019 Institut fuer Kernphysik, Goethe-Universitaet Frankfurt, Frankfurt
SPDX-License-Identifier: GPL-3.0-only
Authors: Philipp Sitzmann [committer] */
diff --git a/mvd/qa/CbmMvdQa.h b/mvd/qa/CbmMvdQa.h
index d038d1c0f969a208f37e097bf309b053214f480b..48c47b611d2601fbc5df22c33f61ac79ac78b8af 100644
--- a/mvd/qa/CbmMvdQa.h
+++ b/mvd/qa/CbmMvdQa.h
@@ -1,4 +1,4 @@
-/* Copyright (C) 2015-2017 Institut für Kernphysik, Goethe-Universitaet Frankfurt, Frankfurt
+/* Copyright (C) 2015-2017 Institut fuer Kernphysik, Goethe-Universitaet Frankfurt, Frankfurt
SPDX-License-Identifier: GPL-3.0-only
Authors: Philipp Sitzmann [committer] */
diff --git a/mvd/tools/CbmMvdGeoHandler.cxx b/mvd/tools/CbmMvdGeoHandler.cxx
index 9292d81269301e7e12fc194945a997886b46e6a7..d0171c79c31f48e45d6bbf73dc29f805dbad50a4 100644
--- a/mvd/tools/CbmMvdGeoHandler.cxx
+++ b/mvd/tools/CbmMvdGeoHandler.cxx
@@ -1,4 +1,4 @@
-/* Copyright (C) 2014-2020 Institut für Kernphysik, Goethe-Universitaet Frankfurt, Frankfurt
+/* Copyright (C) 2014-2020 Institut fuer Kernphysik, Goethe-Universitaet Frankfurt, Frankfurt
SPDX-License-Identifier: GPL-3.0-only
Authors: Philipp Sitzmann [committer], Florian Uhlig */
diff --git a/mvd/tools/CbmMvdGeoHandler.h b/mvd/tools/CbmMvdGeoHandler.h
index 374955c5562eb6b827240f8fbe7f519fc360bee1..b746a58965f56e31ddfda50bd09410763cad92a8 100644
--- a/mvd/tools/CbmMvdGeoHandler.h
+++ b/mvd/tools/CbmMvdGeoHandler.h
@@ -1,4 +1,4 @@
-/* Copyright (C) 2014-2017 Institut für Kernphysik, Goethe-Universitaet Frankfurt, Frankfurt
+/* Copyright (C) 2014-2017 Institut fuer Kernphysik, Goethe-Universitaet Frankfurt, Frankfurt
SPDX-License-Identifier: GPL-3.0-only
Authors: Philipp Sitzmann [committer] */
diff --git a/mvd/tools/readout/CbmMvdReadoutCluster.cxx b/mvd/tools/readout/CbmMvdReadoutCluster.cxx
index 98d331c5cc96ad5e1e61a8b6be82d54384283eb5..5ddf056b2db62387db701d44dd6850573bc88790 100644
--- a/mvd/tools/readout/CbmMvdReadoutCluster.cxx
+++ b/mvd/tools/readout/CbmMvdReadoutCluster.cxx
@@ -1,4 +1,4 @@
-/* Copyright (C) 2016-2021 Institut für Kernphysik, Goethe-Universitaet Frankfurt, Frankfurt
+/* Copyright (C) 2016-2021 Institut furr Kernphysik, Goethe-Universitaet Frankfurt, Frankfurt
SPDX-License-Identifier: GPL-3.0-only
Authors: Philipp Sitzmann [committer] */
diff --git a/mvd/tools/readout/CbmMvdReadoutCluster.h b/mvd/tools/readout/CbmMvdReadoutCluster.h
index 52cea7eefdf7827217295fd1272fe7c201efdce9..2eaa0dc3b3350c6a3a5a9d113f5094158503e2f9 100644
--- a/mvd/tools/readout/CbmMvdReadoutCluster.h
+++ b/mvd/tools/readout/CbmMvdReadoutCluster.h
@@ -1,4 +1,4 @@
-/* Copyright (C) 2017 Institut für Kernphysik, Goethe-Universitaet Frankfurt, Frankfurt
+/* Copyright (C) 2017 Institut fuer Kernphysik, Goethe-Universitaet Frankfurt, Frankfurt
SPDX-License-Identifier: GPL-3.0-only
Authors: Philipp Sitzmann [committer] */
diff --git a/mvd/tools/readout/CbmMvdReadoutSimple.cxx b/mvd/tools/readout/CbmMvdReadoutSimple.cxx
index 062bfee27aacb2c49ed81624d06fcf881404490a..346e4e5454c1d2dd12be333cada1b257458a2b9a 100644
--- a/mvd/tools/readout/CbmMvdReadoutSimple.cxx
+++ b/mvd/tools/readout/CbmMvdReadoutSimple.cxx
@@ -1,4 +1,4 @@
-/* Copyright (C) 2016-2021 Institut für Kernphysik, Goethe-Universitaet Frankfurt, Frankfurt
+/* Copyright (C) 2016-2021 Institut fuer Kernphysik, Goethe-Universitaet Frankfurt, Frankfurt
SPDX-License-Identifier: GPL-3.0-only
Authors: Philipp Sitzmann [committer] */
diff --git a/mvd/tools/readout/CbmMvdReadoutSimple.h b/mvd/tools/readout/CbmMvdReadoutSimple.h
index 8b444c97eae8f4f08520fe8b4fcb6fc2ae84d687..7119ae56706ae993e4de80a1690a3ab998ffdf33 100644
--- a/mvd/tools/readout/CbmMvdReadoutSimple.h
+++ b/mvd/tools/readout/CbmMvdReadoutSimple.h
@@ -1,4 +1,4 @@
-/* Copyright (C) 2016-2017 Institut für Kernphysik, Goethe-Universitaet Frankfurt, Frankfurt
+/* Copyright (C) 2016-2017 Institut furr Kernphysik, Goethe-Universitaet Frankfurt, Frankfurt
SPDX-License-Identifier: GPL-3.0-only
Authors: Philipp Sitzmann [committer] */