diff --git a/MQ/hitbuilder/runHitBuilderTof.cxx b/MQ/hitbuilder/runHitBuilderTof.cxx
index 1301ab41589c5fe2ac8056a05b7d4ced4c43a91f..17acd516fac40fa578a6389619360d135f02f2ef 100644
--- a/MQ/hitbuilder/runHitBuilderTof.cxx
+++ b/MQ/hitbuilder/runHitBuilderTof.cxx
@@ -1,6 +1,6 @@
 /* Copyright (C) 2018-2019 PI-UHd, GSI
    SPDX-License-Identifier: GPL-3.0-only
-   Authors: Norbert Herrmann [orginator] */
+   Authors: Norbert Herrmann */
 
 #include "CbmDeviceHitBuilderTof.h"
 
diff --git a/MQ/mcbm/CbmDeviceBuildRawEvents.cxx b/MQ/mcbm/CbmDeviceBuildRawEvents.cxx
index c32fb711d296e5c835defef55297fbc529bf5c0c..ce5318c1010cc11ddd7a102d561664765303bd38 100644
--- a/MQ/mcbm/CbmDeviceBuildRawEvents.cxx
+++ b/MQ/mcbm/CbmDeviceBuildRawEvents.cxx
@@ -1,6 +1,6 @@
 /* Copyright (C) 2020-2021 Facility for Antiproton and Ion Research in Europe, Darmstadt
    SPDX-License-Identifier: GPL-3.0-only
-   Authors: P.-A. Loizeau, Dominik Smith [committer] */
+   Authors: Pierre-Alain Loizeau, Dominik Smith [committer] */
 
 /**
  * CbmDeviceBuildRawEvents.cxx
diff --git a/MQ/mcbm/CbmDeviceBuildRawEvents.h b/MQ/mcbm/CbmDeviceBuildRawEvents.h
index ac443d264e71fbf6313d3efb997ebb3ada278f20..252c11bd0a1c97d5df6d53bad68dd2ec9d750704 100644
--- a/MQ/mcbm/CbmDeviceBuildRawEvents.h
+++ b/MQ/mcbm/CbmDeviceBuildRawEvents.h
@@ -1,6 +1,6 @@
 /* Copyright (C) 2020-2021 Facility for Antiproton and Ion Research in Europe, Darmstadt
    SPDX-License-Identifier: GPL-3.0-only
-   Authors: P.-A. Loizeau, Dominik Smith [committer] */
+   Authors: Pierre-Alain Loizeau, Dominik Smith [committer] */
 
 /**
  * CbmDeviceBuildRawEvents.h
diff --git a/MQ/mcbm/CbmDeviceMcbmMonitorPulser.cxx b/MQ/mcbm/CbmDeviceMcbmMonitorPulser.cxx
index 230c1269089f239d6de5d1fc1605e1c5744cf81a..b3a615d8a8ad790827c6ec38de3fe2328ddc87f4 100644
--- a/MQ/mcbm/CbmDeviceMcbmMonitorPulser.cxx
+++ b/MQ/mcbm/CbmDeviceMcbmMonitorPulser.cxx
@@ -1,6 +1,6 @@
 /* Copyright (C) 2020 Facility for Antiproton and Ion Research in Europe, Darmstadt
    SPDX-License-Identifier: GPL-3.0-only
-   Authors: P.-A Loizeau, Pierre-Alain Loizeau [committer] */
+   Authors: Pierre-Alain Loizeau */
 
 /**
  * CbmDeviceMcbmMonitorPulser.cxx
diff --git a/MQ/mcbm/CbmDeviceMcbmMonitorPulser.h b/MQ/mcbm/CbmDeviceMcbmMonitorPulser.h
index 34c47e2d905f77e7c0a8b088d4b7f93ba26e21c7..f4bdfdc16ff63d5d039aada0ec613e9a4598fab4 100644
--- a/MQ/mcbm/CbmDeviceMcbmMonitorPulser.h
+++ b/MQ/mcbm/CbmDeviceMcbmMonitorPulser.h
@@ -1,6 +1,6 @@
 /* Copyright (C) 2020 Facility for Antiproton and Ion Research in Europe, Darmstadt
    SPDX-License-Identifier: GPL-3.0-only
-   Authors: P.-A Loizeau, Pierre-Alain Loizeau [committer] */
+   Authors: Pierre-Alain Loizeau */
 
 /**
  * CbmDeviceMcbmMonitorPulser.h
diff --git a/MQ/monitor/CbmDeviceMonitorTof.cxx b/MQ/monitor/CbmDeviceMonitorTof.cxx
index 243add13855423fbb6bbd5cd5fb6c1bb7222fd1f..d98b93649b66e819c4d5b10629d860ceeb89fedb 100644
--- a/MQ/monitor/CbmDeviceMonitorTof.cxx
+++ b/MQ/monitor/CbmDeviceMonitorTof.cxx
@@ -1,6 +1,6 @@
 /* Copyright (C) 2020 Facility for Antiproton and Ion Research in Europe, Darmstadt
    SPDX-License-Identifier: GPL-3.0-only
-   Authors: P.-A Loizeau, Pierre-Alain Loizeau [committer] */
+   Authors: Pierre-Alain Loizeau */
 
 /**
  * CbmDeviceMonitorTof.cxx
diff --git a/MQ/monitor/CbmDeviceMonitorTof.h b/MQ/monitor/CbmDeviceMonitorTof.h
index 3290dcf1723d5f327617dd9b5c3a2ba6ef2575a7..46d629955b188b03234cf4160acaad0ab21d45a2 100644
--- a/MQ/monitor/CbmDeviceMonitorTof.h
+++ b/MQ/monitor/CbmDeviceMonitorTof.h
@@ -1,6 +1,6 @@
 /* Copyright (C) 2020 Facility for Antiproton and Ion Research in Europe, Darmstadt
    SPDX-License-Identifier: GPL-3.0-only
-   Authors: P.-A Loizeau, Pierre-Alain Loizeau [committer] */
+   Authors: Pierre-Alain Loizeau */
 
 /**
  * CbmDeviceMonitorTof.h
diff --git a/MQ/unpacker/CbmDeviceUnpackTofMcbm2018.cxx b/MQ/unpacker/CbmDeviceUnpackTofMcbm2018.cxx
index 6742c054d28ac78ef264b83a52eaab9104b3b75b..29587f627b09f25572554e78dc54cc8749578866 100644
--- a/MQ/unpacker/CbmDeviceUnpackTofMcbm2018.cxx
+++ b/MQ/unpacker/CbmDeviceUnpackTofMcbm2018.cxx
@@ -1,6 +1,6 @@
 /* Copyright (C) 2018-2020 PI-UHd, GSI
    SPDX-License-Identifier: GPL-3.0-only
-   Authors: F. Uhlig, Norbert Herrmann [committer] */
+   Authors: Florian Uhlig, Norbert Herrmann [committer] */
 
 /**
  * CbmDeviceUnpackTofMcbm2018.cxx
diff --git a/MQ/unpacker/CbmDeviceUnpackTofMcbm2018.h b/MQ/unpacker/CbmDeviceUnpackTofMcbm2018.h
index 27dd076e25ded906849590092a43bc82fd305ef5..835d0b816d8d96f7e0e60235d1ada773e22f9163 100644
--- a/MQ/unpacker/CbmDeviceUnpackTofMcbm2018.h
+++ b/MQ/unpacker/CbmDeviceUnpackTofMcbm2018.h
@@ -1,6 +1,6 @@
 /* Copyright (C) 2018-2020 PI-UHd, GSI
    SPDX-License-Identifier: GPL-3.0-only
-   Authors: F. Uhlig, Norbert Herrmann [committer] */
+   Authors: Florian Uhlig, Norbert Herrmann [committer] */
 
 /**
  * CbmDeviceUnpackTofMcbm2018.h
diff --git a/analysis/PWGC2F/femtoscopy/nicafemto/format/NicaCbmFormatLinkDef.h b/analysis/PWGC2F/femtoscopy/nicafemto/format/NicaCbmFormatLinkDef.h
index 895c2d2af7011fd771a9377ab39b5a127c30a200..d5ff6a1111bf2e9da1afa7fffe6d1ff56f37186c 100644
--- a/analysis/PWGC2F/femtoscopy/nicafemto/format/NicaCbmFormatLinkDef.h
+++ b/analysis/PWGC2F/femtoscopy/nicafemto/format/NicaCbmFormatLinkDef.h
@@ -1,6 +1,6 @@
 /* Copyright (C) 2018-2021 Faculty of Physics, Warsaw University of Technology, Warsaw
    SPDX-License-Identifier: GPL-3.0-only
-   Authors: Daniel Wielanek [committer], Daniel Wielanek [committer] */
+   Authors: Daniel Wielanek */
 
 /*
  * NicaBmnFormatLinkDef.h
diff --git a/analysis/PWGC2F/femtoscopy/nicafemto/format/unigen/NicaGeneratorReadUnigen.cxx b/analysis/PWGC2F/femtoscopy/nicafemto/format/unigen/NicaGeneratorReadUnigen.cxx
index 5437ebf1cb79cdad5e7ebaf5b0d16d1bf0dc5781..dc7a0632059253fec5972fc9a7561e68bf27e5f3 100644
--- a/analysis/PWGC2F/femtoscopy/nicafemto/format/unigen/NicaGeneratorReadUnigen.cxx
+++ b/analysis/PWGC2F/femtoscopy/nicafemto/format/unigen/NicaGeneratorReadUnigen.cxx
@@ -1,6 +1,6 @@
 /* Copyright (C) 2015-2021 Faculty of Physics, Warsaw University of Technology, Warsaw
    SPDX-License-Identifier: GPL-3.0-only
-   Authors: Daniel Wielanek [committer], Daniel Wielanek [committer] */
+   Authors: Daniel Wielanek */
 
 /*
  * NicaGeneratorReadUnigen.cxx
diff --git a/analysis/PWGC2F/femtoscopy/nicafemto/format/unigen/NicaGeneratorWriteUnigen.cxx b/analysis/PWGC2F/femtoscopy/nicafemto/format/unigen/NicaGeneratorWriteUnigen.cxx
index eef2b66cad80aa239a0cd5b337b267d58fb4b8f2..5666a162c3694cf14eccc313b66d0ed1811aa4e2 100644
--- a/analysis/PWGC2F/femtoscopy/nicafemto/format/unigen/NicaGeneratorWriteUnigen.cxx
+++ b/analysis/PWGC2F/femtoscopy/nicafemto/format/unigen/NicaGeneratorWriteUnigen.cxx
@@ -1,6 +1,6 @@
 /* Copyright (C) 2015-2021 Faculty of Physics, Warsaw University of Technology, Warsaw
    SPDX-License-Identifier: GPL-3.0-only
-   Authors: Daniel Wielanek [committer], Daniel Wielanek [committer] */
+   Authors: Daniel Wielanek */
 
 /*
  * NicaGeneratorWriteUnigen.cxx
diff --git a/analysis/PWGC2F/femtoscopy/nicafemto/format/unigen/NicaUnigenEvent.cxx b/analysis/PWGC2F/femtoscopy/nicafemto/format/unigen/NicaUnigenEvent.cxx
index 5152235b92cee7c992edf885485b67895636cefc..0e0555261ea87e1915fcc1566b59bd4dc2bdc355 100644
--- a/analysis/PWGC2F/femtoscopy/nicafemto/format/unigen/NicaUnigenEvent.cxx
+++ b/analysis/PWGC2F/femtoscopy/nicafemto/format/unigen/NicaUnigenEvent.cxx
@@ -1,6 +1,6 @@
 /* Copyright (C) 2014-2021 Faculty of Physics, Warsaw University of Technology, Warsaw
    SPDX-License-Identifier: GPL-3.0-only
-   Authors: Daniel Wielanek [committer], Daniel Wielanek [committer] */
+   Authors: Daniel Wielanek */
 
 /*
  * NicaUnigen.cxx
diff --git a/analysis/PWGC2F/femtoscopy/nicafemto/format/unigen/NicaUnigenEventInterface.cxx b/analysis/PWGC2F/femtoscopy/nicafemto/format/unigen/NicaUnigenEventInterface.cxx
index 3330937690f6b389ebd9127274ba3f82f7a50d5a..e055637f116bf7333bbb5444e883bbad82a55fc8 100644
--- a/analysis/PWGC2F/femtoscopy/nicafemto/format/unigen/NicaUnigenEventInterface.cxx
+++ b/analysis/PWGC2F/femtoscopy/nicafemto/format/unigen/NicaUnigenEventInterface.cxx
@@ -1,6 +1,6 @@
 /* Copyright (C) 2017-2021 Faculty of Physics, Warsaw University of Technology, Warsaw
    SPDX-License-Identifier: GPL-3.0-only
-   Authors: Daniel Wielanek [committer], Daniel Wielanek [committer] */
+   Authors: Daniel Wielanek */
 
 /*
  * NicaUnigenSource.cxx
diff --git a/analysis/PWGC2F/femtoscopy/nicafemto/format/unigen/NicaUnigenSource.cxx b/analysis/PWGC2F/femtoscopy/nicafemto/format/unigen/NicaUnigenSource.cxx
index e46ffcdd5d6771e907eaff6c7648dfd9bbd0f84d..9cdf1cb17ef28f62c925842d728a66ff25b9dffd 100644
--- a/analysis/PWGC2F/femtoscopy/nicafemto/format/unigen/NicaUnigenSource.cxx
+++ b/analysis/PWGC2F/femtoscopy/nicafemto/format/unigen/NicaUnigenSource.cxx
@@ -1,6 +1,6 @@
 /* Copyright (C) 2017-2021 Faculty of Physics, Warsaw University of Technology, Warsaw
    SPDX-License-Identifier: GPL-3.0-only
-   Authors: Daniel Wielanek [committer], Daniel Wielanek [committer] */
+   Authors: Daniel Wielanek */
 
 /*
  * NicaUnigenSource.cxx
diff --git a/analysis/PWGC2F/femtoscopy/nicafemto/format/unigen/NicaUnigenSource.h b/analysis/PWGC2F/femtoscopy/nicafemto/format/unigen/NicaUnigenSource.h
index 074fac306e2ec6f5a9cdea7da394db5792b3b1c1..944be7e31f68c35af57dd95427213e270fe2354a 100644
--- a/analysis/PWGC2F/femtoscopy/nicafemto/format/unigen/NicaUnigenSource.h
+++ b/analysis/PWGC2F/femtoscopy/nicafemto/format/unigen/NicaUnigenSource.h
@@ -1,6 +1,6 @@
 /* Copyright (C) 2017-2021 Faculty of Physics, Warsaw University of Technology, Warsaw
    SPDX-License-Identifier: GPL-3.0-only
-   Authors: Daniel Wielanek [committer], Daniel Wielanek [committer] */
+   Authors: Daniel Wielanek */
 
 /*
  * NicaUnigenSource.h
diff --git a/analysis/PWGC2F/femtoscopy/nicafemto/helpers/CbmDetectorID.h b/analysis/PWGC2F/femtoscopy/nicafemto/helpers/CbmDetectorID.h
index 26068d162c91ce32ae17b88b89257881c03d4818..5fef9b4e88690fd2f035c487d66a21db91856498 100644
--- a/analysis/PWGC2F/femtoscopy/nicafemto/helpers/CbmDetectorID.h
+++ b/analysis/PWGC2F/femtoscopy/nicafemto/helpers/CbmDetectorID.h
@@ -1,6 +1,6 @@
 /* Copyright (C) 2018-2021 Faculty of Physics, Warsaw University of Technology, Warsaw
    SPDX-License-Identifier: GPL-3.0-only
-   Authors: Daniel Wielanek [committer], Daniel Wielanek [committer] */
+   Authors: Daniel Wielanek */
 
 /*
  * CbmDetectorID.h
diff --git a/analysis/PWGC2F/femtoscopy/nicafemto/helpers/CbmHelix.cxx b/analysis/PWGC2F/femtoscopy/nicafemto/helpers/CbmHelix.cxx
index 1330a28eee142eea6b9b507d2daaf03f5e798e97..89b4d38df431a95acc23d392b54adca2651956fb 100644
--- a/analysis/PWGC2F/femtoscopy/nicafemto/helpers/CbmHelix.cxx
+++ b/analysis/PWGC2F/femtoscopy/nicafemto/helpers/CbmHelix.cxx
@@ -1,6 +1,6 @@
 /* Copyright (C) 2019-2020 Faculty of Physics, Warsaw University of Technology, Warsaw
    SPDX-License-Identifier: GPL-3.0-only
-   Authors: Daniel Wielanek [committer], Daniel Wielanek [committer] */
+   Authors: Daniel Wielanek */
 
 /*
  * CbmHelix.cxx
diff --git a/analysis/PWGC2F/femtoscopy/nicafemto/helpers/NicaCbmFirstTask.cxx b/analysis/PWGC2F/femtoscopy/nicafemto/helpers/NicaCbmFirstTask.cxx
index 5dfc0cd8fbc5b7d9c3b735ecb928c428670b56ed..171f770ea4236fafa532efcfb3e2f4994e6d84f7 100644
--- a/analysis/PWGC2F/femtoscopy/nicafemto/helpers/NicaCbmFirstTask.cxx
+++ b/analysis/PWGC2F/femtoscopy/nicafemto/helpers/NicaCbmFirstTask.cxx
@@ -1,6 +1,6 @@
 /* Copyright (C) 2019-2020 Faculty of Physics, Warsaw University of Technology, Warsaw
    SPDX-License-Identifier: GPL-3.0-only
-   Authors: Daniel Wielanek [committer], Daniel Wielanek [committer] */
+   Authors: Daniel Wielanek */
 
 /*
  * NicaCbmFirstTask.cxx
diff --git a/analysis/PWGC2F/femtoscopy/nicafemto/helpers/NicaCbmFirstTask.h b/analysis/PWGC2F/femtoscopy/nicafemto/helpers/NicaCbmFirstTask.h
index 0e321e19daea4675cf39f71d2b4a4224ab65077a..f5a910216c7740fbd5b8f356f31285b9bfa554eb 100644
--- a/analysis/PWGC2F/femtoscopy/nicafemto/helpers/NicaCbmFirstTask.h
+++ b/analysis/PWGC2F/femtoscopy/nicafemto/helpers/NicaCbmFirstTask.h
@@ -1,6 +1,6 @@
 /* Copyright (C) 2019-2020 Faculty of Physics, Warsaw University of Technology, Warsaw
    SPDX-License-Identifier: GPL-3.0-only
-   Authors: Daniel Wielanek [committer], Daniel Wielanek [committer] */
+   Authors: Daniel Wielanek */
 
 /*
  * NicaCbmFirstTask.h
diff --git a/analysis/PWGCHA/jpsi/CbmAnaJpsiCandidate.cxx b/analysis/PWGCHA/jpsi/CbmAnaJpsiCandidate.cxx
index 6a8a52901fae37587fc15cd8d61131e4b961a59b..d704e8af53b6d8158dfb581d0f0218280c32c234 100644
--- a/analysis/PWGCHA/jpsi/CbmAnaJpsiCandidate.cxx
+++ b/analysis/PWGCHA/jpsi/CbmAnaJpsiCandidate.cxx
@@ -1,6 +1,6 @@
 /* Copyright (C) 2015 UGiessen, JINR-LIT
    SPDX-License-Identifier: GPL-3.0-only
-   Authors: slebedev, Semen Lebedev [committer] */
+   Authors: Semen Lebedev */
 
 /*
  * CbmAnaJpsiCandidate.cxx
diff --git a/analysis/PWGCHA/jpsi/CbmAnaJpsiSuperEvent.cxx b/analysis/PWGCHA/jpsi/CbmAnaJpsiSuperEvent.cxx
index 58b637805f3ac7500b46a16a7c353a9ac1ffbc12..0b509ab66b091bb2933f6bf93e8c0f72268a041e 100644
--- a/analysis/PWGCHA/jpsi/CbmAnaJpsiSuperEvent.cxx
+++ b/analysis/PWGCHA/jpsi/CbmAnaJpsiSuperEvent.cxx
@@ -1,6 +1,6 @@
 /* Copyright (C) 2015-2021 UGiessen, JINR-LIT
    SPDX-License-Identifier: GPL-3.0-only
-   Authors: slebedev, Adrian Amatus Weber, Semen Lebedev [committer] */
+   Authors: Semen Lebedev [committer], Adrian Amatus Weber */
 
 /*
  * CbmAnaJpsiSuperEvent.cxx
diff --git a/analysis/PWGCHA/jpsi/CbmAnaJpsiSuperEvent.h b/analysis/PWGCHA/jpsi/CbmAnaJpsiSuperEvent.h
index e1db505e7a0bd6c288bc4dae7e5a88a5180f9958..4219bcf18310416309d9a1a0608c90913e97b0ba 100644
--- a/analysis/PWGCHA/jpsi/CbmAnaJpsiSuperEvent.h
+++ b/analysis/PWGCHA/jpsi/CbmAnaJpsiSuperEvent.h
@@ -1,6 +1,6 @@
 /* Copyright (C) 2015-2016 UGiessen, JINR-LIT
    SPDX-License-Identifier: GPL-3.0-only
-   Authors: slebedev, Semen Lebedev [committer], Florian Uhlig, Adrian Amatus Weber */
+   Authors: Semen Lebedev [committer], Florian Uhlig, Adrian Amatus Weber */
 
 /*
  * CbmAnaJpsiSuperEvent.h
diff --git a/analysis/PWGDIL/dielectron/conversion/CbmAnaConversionCutSettings.h b/analysis/PWGDIL/dielectron/conversion/CbmAnaConversionCutSettings.h
index 11c38296d0d7e498feac99c27c2be80c4f643214..00682573a11ce78c46bf75bc081e331cdde58638 100644
--- a/analysis/PWGDIL/dielectron/conversion/CbmAnaConversionCutSettings.h
+++ b/analysis/PWGDIL/dielectron/conversion/CbmAnaConversionCutSettings.h
@@ -1,6 +1,6 @@
 /* Copyright (C) 2015-2016 Fakultaet fuer Mathematik und Naturwissenschaften, Bergische Universitaet Wuppertal, Wuppertal
    SPDX-License-Identifier: GPL-3.0-only
-   Authors: S. Reinecke, Florian Uhlig */
+   Authors: Sascha Reinecke, Florian Uhlig */
 
 /**
  * @author S. Reinecke <reinecke@uni-wuppertal.de>
diff --git a/analysis/PWGDIL/dielectron/conversion/CbmAnaConversionGlobalFunctions.h b/analysis/PWGDIL/dielectron/conversion/CbmAnaConversionGlobalFunctions.h
index a89d48f133e5ec8cf7793bf2a4a7503e63ae7d5a..5b8f24a405cf0fc5dfcc2cdcc1d511d96461f22b 100644
--- a/analysis/PWGDIL/dielectron/conversion/CbmAnaConversionGlobalFunctions.h
+++ b/analysis/PWGDIL/dielectron/conversion/CbmAnaConversionGlobalFunctions.h
@@ -1,6 +1,6 @@
 /* Copyright (C) 2016-2017 Fakultaet fuer Mathematik und Naturwissenschaften, Bergische Universitaet Wuppertal, Wuppertal
    SPDX-License-Identifier: GPL-3.0-only
-   Authors: S. Reinecke, Andrey Lebedev */
+   Authors: Sascha Reinecke, Andrey Lebedev */
 
 /**
  * @author S. Reinecke <reinecke@uni-wuppertal.de>
diff --git a/analysis/PWGDIL/dielectron/conversion/CbmAnaConversionKinematicParams.h b/analysis/PWGDIL/dielectron/conversion/CbmAnaConversionKinematicParams.h
index 0b44b5f07f61c3b19a6f1f09062df6869ba4c9aa..464ab7573dc0589ec61b5302f8a1fc646f16e917 100644
--- a/analysis/PWGDIL/dielectron/conversion/CbmAnaConversionKinematicParams.h
+++ b/analysis/PWGDIL/dielectron/conversion/CbmAnaConversionKinematicParams.h
@@ -1,6 +1,6 @@
 /* Copyright (C) 2015-2016 Fakultaet fuer Mathematik und Naturwissenschaften, Bergische Universitaet Wuppertal, Wuppertal
    SPDX-License-Identifier: GPL-3.0-only
-   Authors: S. Reinecke,  */
+   Authors: Sascha Reinecke,  */
 
 /**
  * @author S. Reinecke <reinecke@uni-wuppertal.de>
diff --git a/analysis/PWGHAD/hadron/CbmHadronAnalysis.cxx b/analysis/PWGHAD/hadron/CbmHadronAnalysis.cxx
index 952fe671f3e2694ebf6d7cc72c6dda53f26b8573..dcf526b7d329ce1add546df9ad7e4ce0e7ccc703 100644
--- a/analysis/PWGHAD/hadron/CbmHadronAnalysis.cxx
+++ b/analysis/PWGHAD/hadron/CbmHadronAnalysis.cxx
@@ -1,6 +1,6 @@
 /* Copyright (C) 2012-2021 PI-UHd, GSI
    SPDX-License-Identifier: GPL-3.0-only
-   Authors: nh, Norbert Herrmann [committer], Florian Uhlig */
+   Authors: Norbert Herrmann [committer], Florian Uhlig */
 
 // ------------------------------------------------------------------
 // -----                     CbmHadronAnalysis                  -----
diff --git a/analysis/common/analysis_tree_converter/CbmAnalysisTreeInterfaceLinkDef.h b/analysis/common/analysis_tree_converter/CbmAnalysisTreeInterfaceLinkDef.h
index b28861797bb00d56ce45dd60cf7f5cdaae7761ba..e877d0d187a19748f30ed70a2c1149eab6b158be 100644
--- a/analysis/common/analysis_tree_converter/CbmAnalysisTreeInterfaceLinkDef.h
+++ b/analysis/common/analysis_tree_converter/CbmAnalysisTreeInterfaceLinkDef.h
@@ -1,6 +1,6 @@
 /* Copyright (C) 2020-2021 Physikalisches Institut, Eberhard Karls Universitaet Tuebingen, Tuebingen
    SPDX-License-Identifier: GPL-3.0-only
-   Authors: Viktor Klochkov [committer], Viktor Klochkov [committer] */
+   Authors: Viktor Klochkov */
 
 #ifdef __CINT__
 
diff --git a/analysis/common/analysis_tree_converter/CbmConverterManager.h b/analysis/common/analysis_tree_converter/CbmConverterManager.h
index de37bb2f67621e4306753e6a1357a044cce61c82..6fc139b202d495ab825a77c801cc691b2a41e4e4 100644
--- a/analysis/common/analysis_tree_converter/CbmConverterManager.h
+++ b/analysis/common/analysis_tree_converter/CbmConverterManager.h
@@ -1,6 +1,6 @@
 /* Copyright (C) 2020-2021 Physikalisches Institut, Eberhard Karls Universitaet Tuebingen, Tuebingen
    SPDX-License-Identifier: GPL-3.0-only
-   Authors: Viktor Klochkov [committer], Viktor Klochkov [committer] */
+   Authors: Viktor Klochkov */
 
 #ifndef ANALYSIS_TREE_CONVERTERMANAGER_H_
 #define ANALYSIS_TREE_CONVERTERMANAGER_H_
diff --git a/analysis/common/analysis_tree_converter/CbmPsdModulesConverter.cxx b/analysis/common/analysis_tree_converter/CbmPsdModulesConverter.cxx
index 1fa59491d150ded08959174ca3a8f0323a1a4b1d..0a39620934f4fafeced385da7df3fcbfc9040e8c 100644
--- a/analysis/common/analysis_tree_converter/CbmPsdModulesConverter.cxx
+++ b/analysis/common/analysis_tree_converter/CbmPsdModulesConverter.cxx
@@ -1,6 +1,6 @@
 /* Copyright (C) 2020-2021 Physikalisches Institut, Eberhard Karls Universität Tuebingen, Tuebingen
    SPDX-License-Identifier: GPL-3.0-only
-   Authors: Viktor Klochkov [committer], Viktor Klochkov [committer] */
+   Authors: Viktor Klochkov */
 
 #include "CbmPsdModulesConverter.h"
 
diff --git a/analysis/common/analysis_tree_converter/CbmRecEventHeaderConverter.cxx b/analysis/common/analysis_tree_converter/CbmRecEventHeaderConverter.cxx
index d67b15a77be7bdf35a9a98f8ec9458e89801e7f7..1edac123d1344080e5a9d7936458d824e0ea81a2 100644
--- a/analysis/common/analysis_tree_converter/CbmRecEventHeaderConverter.cxx
+++ b/analysis/common/analysis_tree_converter/CbmRecEventHeaderConverter.cxx
@@ -1,6 +1,6 @@
 /* Copyright (C) 2020-2021 Physikalisches Institut, Eberhard Karls Universitaet Tuebingen, Tuebingen
    SPDX-License-Identifier: GPL-3.0-only
-   Authors: Viktor Klochkov [committer], Viktor Klochkov [committer] */
+   Authors: Viktor Klochkov */
 
 #include "CbmRecEventHeaderConverter.h"
 
diff --git a/analysis/common/analysis_tree_converter/CbmStsTracksConverter.cxx b/analysis/common/analysis_tree_converter/CbmStsTracksConverter.cxx
index f5d38b52f693ac993c7d4ac085dd5fa650149355..fe6886defffcb6aaebd8c51db57c739d7d3caa33 100644
--- a/analysis/common/analysis_tree_converter/CbmStsTracksConverter.cxx
+++ b/analysis/common/analysis_tree_converter/CbmStsTracksConverter.cxx
@@ -1,6 +1,6 @@
 /* Copyright (C) 2020-2021 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
    SPDX-License-Identifier: GPL-3.0-only
-   Authors: Viktor Klochkov, Viktor Klochkov */
+   Authors: Viktor Klochkov */
 
 #include "CbmStsTracksConverter.h"
 
diff --git a/analysis/common/analysis_tree_converter/CbmTofHitsConverter.cxx b/analysis/common/analysis_tree_converter/CbmTofHitsConverter.cxx
index 5b543f49ceca046fdd319b7bab1ed929462968ee..b172d4decd3050396c7f005f8bfac95b0f0b1734 100644
--- a/analysis/common/analysis_tree_converter/CbmTofHitsConverter.cxx
+++ b/analysis/common/analysis_tree_converter/CbmTofHitsConverter.cxx
@@ -1,6 +1,6 @@
 /* Copyright (C) 2020-2021 Physikalisches Institut, Eberhard Karls Universitaet Tuebingen, Tuebingen
    SPDX-License-Identifier: GPL-3.0-only
-   Authors: Viktor Klochkov [committer], Viktor Klochkov [committer] */
+   Authors: Viktor Klochkov */
 
 #include "CbmTofHitsConverter.h"
 
diff --git a/analysis/common/at_kfpf_interface/CutsContainer.h b/analysis/common/at_kfpf_interface/CutsContainer.h
index c979690b5730a361a4c22b81c20969ad935a355c..38dee3cfa46a2493c3ce1a6b3eb9000920b696ec 100644
--- a/analysis/common/at_kfpf_interface/CutsContainer.h
+++ b/analysis/common/at_kfpf_interface/CutsContainer.h
@@ -1,6 +1,6 @@
 /* Copyright (C) 2020-2021 GSI, IKF-UFra
    SPDX-License-Identifier: GPL-3.0-only
-   Authors: Oleksii Lubynets [committer] Viktor Klochkov, Ilya Selyuzhenkov */
+   Authors: Oleksii Lubynets [committer], Viktor Klochkov, Ilya Selyuzhenkov */
 
 //
 // @class CutsContainer
diff --git a/analysis/detectors/sts/CbmStsWkn.cxx b/analysis/detectors/sts/CbmStsWkn.cxx
index 010ac0f1d92f2dbd8137a136f36eb3532f5f7acc..edee45d60e42231530d3797b24f89e762213eaec 100644
--- a/analysis/detectors/sts/CbmStsWkn.cxx
+++ b/analysis/detectors/sts/CbmStsWkn.cxx
@@ -1,6 +1,6 @@
 /* Copyright (C) 2019 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
    SPDX-License-Identifier: GPL-3.0-only
-   Authors: Olga Derenovskaia, Volker Friese [committer] */
+   Authors: Olga Derenovskaya, Volker Friese [committer] */
 
 /**
  * \file CbmStsWkn.h
diff --git a/analysis/detectors/sts/CbmStsWkn.h b/analysis/detectors/sts/CbmStsWkn.h
index eea525d9bca789ed9cc801ab18cb88ae8f88f8a6..fba4d431f7ed8c3549c964043f059dab528bfba9 100644
--- a/analysis/detectors/sts/CbmStsWkn.h
+++ b/analysis/detectors/sts/CbmStsWkn.h
@@ -1,6 +1,6 @@
 /* Copyright (C) 2019 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
    SPDX-License-Identifier: GPL-3.0-only
-   Authors: Olga Derenovskaia, Volker Friese [committer] */
+   Authors: Olga Derenovskaya, Volker Friese [committer] */
 
 /**
  * \file CbmStsWkn.h
diff --git a/analysis/detectors/tof/CbmTofTests.cxx b/analysis/detectors/tof/CbmTofTests.cxx
index f38e51115ae63fa7f0ba781c8cf6164eca3b27f2..1be23f917c3dca8bf2444f1c564672d6501c6452 100644
--- a/analysis/detectors/tof/CbmTofTests.cxx
+++ b/analysis/detectors/tof/CbmTofTests.cxx
@@ -1,6 +1,6 @@
 /* Copyright (C) 2013-2021 Facility for Antiproton and Ion Research in Europe, Darmstadt
    SPDX-License-Identifier: GPL-3.0-only
-   Authors: pal, Pierre-Alain Loizeau [committer], Florian Uhlig */
+   Authors: Pierre-Alain Loizeau, Pierre-Alain Loizeau [committer], Florian Uhlig */
 
 // ------------------------------------------------------------------
 // -----                     CbmTofTests                        -----
diff --git a/core/base/CbmMCDataArray.cxx b/core/base/CbmMCDataArray.cxx
index c82181ac984bb6e6585b656f12cc6fd028148a26..f5176f512cfffcfe8dcc78463261679bf94ddd13 100644
--- a/core/base/CbmMCDataArray.cxx
+++ b/core/base/CbmMCDataArray.cxx
@@ -1,6 +1,6 @@
 /* Copyright (C) 2015-2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
    SPDX-License-Identifier: GPL-3.0-only
-   Authors: //Dr.Sys, Volker Friese [committer], Florian Uhlig */
+   Authors: Mikhail Prokudin, Volker Friese [committer], Florian Uhlig */
 
 /** @file  CbmMCDataArray.cxx
  ** @author //Dr.Sys <mikhail.prokudin@cern.ch>
diff --git a/core/base/CbmMCDataArray.h b/core/base/CbmMCDataArray.h
index 0a4090f52a4bd3ddb10ef67b2b4ea0ce79af0d1e..7384dc45308dc8c949792d7b89c67bae0b5944a9 100644
--- a/core/base/CbmMCDataArray.h
+++ b/core/base/CbmMCDataArray.h
@@ -1,6 +1,6 @@
 /* Copyright (C) 2015-2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
    SPDX-License-Identifier: GPL-3.0-only
-   Authors: //Dr.Sys, Volker Friese [committer], Florian Uhlig */
+   Authors: Mikhail Prokudin, Volker Friese [committer], Florian Uhlig */
 
 /** @file  CbmMCDataArray.h
  ** @author //Dr.Sys <mikhail.prokudin@cern.ch>
diff --git a/core/base/CbmMCDataManager.h b/core/base/CbmMCDataManager.h
index a346435f22ffaec7a2bf2f105d287ae91afaae47..90cfa4c161afbb4f551071f17df3d9eb7dbe62c2 100644
--- a/core/base/CbmMCDataManager.h
+++ b/core/base/CbmMCDataManager.h
@@ -1,6 +1,6 @@
 /* Copyright (C) 2015-2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
    SPDX-License-Identifier: GPL-3.0-only
-   Authors: //Dr.Sys, Volker Friese [committer], Florian Uhlig */
+   Authors: Mikhail Prokudin, Volker Friese [committer], Florian Uhlig */
 
 /** @file  CbmMCDataManager
  ** @brief An entry point for time-based analysis
diff --git a/core/base/CbmMCDataObject.cxx b/core/base/CbmMCDataObject.cxx
index e65cb6d5e324fad248e8cb8f0f77e8dabe634f3a..c550f0171742c373a941e835c43aa3d70af5aaa8 100644
--- a/core/base/CbmMCDataObject.cxx
+++ b/core/base/CbmMCDataObject.cxx
@@ -1,6 +1,6 @@
 /* Copyright (C) 2017-2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
    SPDX-License-Identifier: GPL-3.0-only
-   Authors: //Dr.Sys, Volker Friese [committer], Florian Uhlig */
+   Authors: Mikhail Prokudin, Volker Friese [committer], Florian Uhlig */
 
 /** @file  CbmMCDataObject.cxx
  ** @author //Dr.Sys <mikhail.prokudin@cern.ch>
diff --git a/core/base/CbmMCDataObject.h b/core/base/CbmMCDataObject.h
index e7e9acc7d4f8b6f4c3ace050dfc8824a708f6d9c..9c1e2a58a4f2abb352ac9db050d1e154f1b667c0 100644
--- a/core/base/CbmMCDataObject.h
+++ b/core/base/CbmMCDataObject.h
@@ -1,6 +1,6 @@
 /* Copyright (C) 2017-2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
    SPDX-License-Identifier: GPL-3.0-only
-   Authors: //Dr.Sys, Volker Friese [committer] */
+   Authors: Mikhail Prokudin, Volker Friese [committer] */
 
 /** @file  CbmMCDataObject.h
  ** @author //Dr.Sys <mikhail.prokudin@cern.ch>
diff --git a/core/base/CbmMatchRecoToMC.cxx b/core/base/CbmMatchRecoToMC.cxx
index bdb508944fc871531401f48010946f321206a332..73ef69bbcfe3425d3e225b38da7dc4f993f09228 100644
--- a/core/base/CbmMatchRecoToMC.cxx
+++ b/core/base/CbmMatchRecoToMC.cxx
@@ -1,6 +1,6 @@
 /* Copyright (C) 2013-2021 GSI/JINR-LIT
    SPDX-License-Identifier: GPL-3.0-only
-   Authors: andrey, Andrey Lebedev [committer], Florian Uhlig, Volker Friese, Pierre-Alain Loizeau */
+   Authors: Andrey Lebedev [committer], Florian Uhlig, Volker Friese, Pierre-Alain Loizeau */
 
 /*
  * CbmMatchRecoToMC.cxx
diff --git a/core/base/CbmReadoutBuffer.h b/core/base/CbmReadoutBuffer.h
index 6d01af59a00fc1937131cc22a38d720d2b62bbba..84e8a6c5ce5698a6c73bc858bc5a10246dc2bf28 100644
--- a/core/base/CbmReadoutBuffer.h
+++ b/core/base/CbmReadoutBuffer.h
@@ -1,6 +1,6 @@
 /* Copyright (C) 2015-2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
    SPDX-License-Identifier: GPL-3.0-only
-   Authors: vfriese, Volker Friese [committer], Florian Uhlig */
+   Authors: Volker Friese [committer], Florian Uhlig */
 
 /*
  * CbmReadoutBuffer.h
diff --git a/core/data/CbmTimeSlice.cxx b/core/data/CbmTimeSlice.cxx
index 28642351360f4c7b5e3fe999f04395ced6bd9a3e..5da4a5ade3271660f1b3eec6e0533672e3195bcf 100644
--- a/core/data/CbmTimeSlice.cxx
+++ b/core/data/CbmTimeSlice.cxx
@@ -1,6 +1,6 @@
 /* Copyright (C) 2012-2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
    SPDX-License-Identifier: GPL-3.0-only
-   Authors: friese, Volker Friese [committer], Florian Uhlig */
+   Authors: Volker Friese [committer], Florian Uhlig */
 
 /*
  * CbmTimeSlice.cxx
diff --git a/core/data/base/CbmDigiBranchBase.cxx b/core/data/base/CbmDigiBranchBase.cxx
index 35ec6a81951dad1923f9de21c6c4d0766a88456f..1988c01ca923940369f955176622f1bdf0de3ce1 100644
--- a/core/data/base/CbmDigiBranchBase.cxx
+++ b/core/data/base/CbmDigiBranchBase.cxx
@@ -1,6 +1,6 @@
 /* Copyright (C) 2019-2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
    SPDX-License-Identifier: GPL-3.0-only
-   Authors: vfriese, Volker Friese [committer], Florian Uhlig */
+   Authors: Volker Friese [committer], Florian Uhlig */
 
 /*
  * CbmDigiBranchBase.cxx
diff --git a/core/data/global/CbmGlobalTrack.cxx b/core/data/global/CbmGlobalTrack.cxx
index fa4128ff91b225d84d4d692cfa956925e7cb5ea2..edd13de3f66e2beea91f9a519c1c9629a496a7ea 100644
--- a/core/data/global/CbmGlobalTrack.cxx
+++ b/core/data/global/CbmGlobalTrack.cxx
@@ -1,6 +1,6 @@
 /* Copyright (C) 2005-2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
    SPDX-License-Identifier: GPL-3.0-only
-   Authors: V. Friese, Florian Uhlig, Denis Bertini [committer] */
+   Authors: Volker Friese, Florian Uhlig, Denis Bertini [committer] */
 
 // -------------------------------------------------------------------------
 // -----                    CbmGlobalTrack source file                 -----
diff --git a/core/data/global/CbmGlobalTrack.h b/core/data/global/CbmGlobalTrack.h
index cc91030a5e06e32648a0ead3fa686324e7a554e2..eb583ccde32f49c9808deaef6249e0f20d525eda 100644
--- a/core/data/global/CbmGlobalTrack.h
+++ b/core/data/global/CbmGlobalTrack.h
@@ -1,6 +1,6 @@
 /* Copyright (C) 2006-2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
    SPDX-License-Identifier: GPL-3.0-only
-   Authors: V.Friese, Denis Bertini [committer], Florian Uhlig */
+   Authors: Volker Friese, Denis Bertini [committer], Florian Uhlig */
 
 // -------------------------------------------------------------------------
 // -----                    CbmGlobalTrack header file                 -----
diff --git a/core/data/global/CbmTrackParam.cxx b/core/data/global/CbmTrackParam.cxx
index 705d631405c19fd1d66b05915f890bce2b977d53..dd678063450e667b89ada5e198e8ffcdd0698b75 100644
--- a/core/data/global/CbmTrackParam.cxx
+++ b/core/data/global/CbmTrackParam.cxx
@@ -1,6 +1,6 @@
 /* Copyright (C) 2016-2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
    SPDX-License-Identifier: GPL-3.0-only
-   Authors: T. Ablyazimov, Florian Uhlig [committer] */
+   Authors: Timur Ablyazimov, Florian Uhlig [committer] */
 
 // -------------------------------------------------------------------------
 // -----                    CbmTrackParam source file                 -----
diff --git a/core/data/global/CbmTrackParam.h b/core/data/global/CbmTrackParam.h
index c28ed22e305750bc83630dd7233273746759e162..95f1efe18b25143f9ac6420fd44bdda46fd594ff 100644
--- a/core/data/global/CbmTrackParam.h
+++ b/core/data/global/CbmTrackParam.h
@@ -1,6 +1,6 @@
 /* Copyright (C) 2019-2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
    SPDX-License-Identifier: GPL-3.0-only
-   Authors: T.Ablyazimov, Florian Uhlig [committer] */
+   Authors: Timur Ablyazimov, Florian Uhlig [committer] */
 
 // -------------------------------------------------------------------------
 // -----                    CbmTrackParam header file                 -----
diff --git a/core/data/global/CbmVertex.cxx b/core/data/global/CbmVertex.cxx
index 9ee881880fe284a07a466d027bb640041980b763..c7ac1992a508e1138b5125022cc6971f1b0e299c 100644
--- a/core/data/global/CbmVertex.cxx
+++ b/core/data/global/CbmVertex.cxx
@@ -1,6 +1,6 @@
 /* Copyright (C) 2005-2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
    SPDX-License-Identifier: GPL-3.0-only
-   Authors: V. Friese, Florian Uhlig, Denis Bertini [committer] */
+   Authors: Volker Friese, Florian Uhlig, Denis Bertini [committer] */
 
 // -------------------------------------------------------------------------
 // -----                       CbmVertex source file                   -----
diff --git a/core/data/global/CbmVertex.h b/core/data/global/CbmVertex.h
index 04d9513a23623b123ecaae4bb321894a5611ad70..e4d18c36fb329a109165e5bdfbd60d8dfe0fd39d 100644
--- a/core/data/global/CbmVertex.h
+++ b/core/data/global/CbmVertex.h
@@ -1,6 +1,6 @@
 /* Copyright (C) 2006-2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
    SPDX-License-Identifier: GPL-3.0-only
-   Authors: V.Friese, Florian Uhlig, Denis Bertini [committer] */
+   Authors: Volker Friese, Florian Uhlig, Denis Bertini [committer] */
 
 // -------------------------------------------------------------------------
 // -----                      CbmVertex header file                    -----
diff --git a/core/data/much/CbmMuchBeamTimeDigi.cxx b/core/data/much/CbmMuchBeamTimeDigi.cxx
index 36ad97ab284730c88e61ee71931ca72a1097a32e..a178c03b51f7d2fbfb23673aa8f5a59c5cb8a23f 100644
--- a/core/data/much/CbmMuchBeamTimeDigi.cxx
+++ b/core/data/much/CbmMuchBeamTimeDigi.cxx
@@ -1,6 +1,6 @@
 /* Copyright (C) 2014-2019 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
    SPDX-License-Identifier: GPL-3.0-only
-   Authors: M.Ryzhinskiy, Florian Uhlig [committer], Volker Friese, David Emschermann */
+   Authors: Mikhail Ryzhinskiy, Florian Uhlig [committer], Volker Friese, David Emschermann */
 
 // TODO comment to be changed
 /** CbmMuchBeamTimeDigi.cxx
diff --git a/core/data/much/CbmMuchBeamTimeDigi.h b/core/data/much/CbmMuchBeamTimeDigi.h
index af9031a8bc83584cba726f31649f8125fecfaf39..422d5b2f69834812f62b8f47c39f690b48763ee1 100644
--- a/core/data/much/CbmMuchBeamTimeDigi.h
+++ b/core/data/much/CbmMuchBeamTimeDigi.h
@@ -1,6 +1,6 @@
 /* Copyright (C) 2014-2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
    SPDX-License-Identifier: GPL-3.0-only
-   Authors: M.Ryzhinskiy, Florian Uhlig [committer], Volker Friese, Pierre-Alain Loizeau, David Emschermann */
+   Authors: Mikhail Ryzhinskiy, Florian Uhlig [committer], Volker Friese, Pierre-Alain Loizeau, David Emschermann */
 
 // TODO comment to be changed
 /** CbmMuchBeamTimeDigi.h
diff --git a/core/data/much/CbmMuchDigi.cxx b/core/data/much/CbmMuchDigi.cxx
index d1ae336b5dd108a18dcdc81972f55582f4a9ee28..fccdf1795a4abcbd851d48042269ee6fffe27940 100644
--- a/core/data/much/CbmMuchDigi.cxx
+++ b/core/data/much/CbmMuchDigi.cxx
@@ -1,6 +1,6 @@
 /* Copyright (C) 2007-2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
    SPDX-License-Identifier: GPL-3.0-only
-   Authors: M.Ryzhinskiy, Florian Uhlig, Volker Friese [committer], Evgeny Kryshen */
+   Authors: Mikhail Ryzhinskiy, Florian Uhlig, Volker Friese [committer], Evgeny Kryshen */
 
 /** CbmMuchDigi.cxx
  **@author M.Ryzhinskiy <m.ryzhinskiy@gsi.de>
diff --git a/core/data/much/CbmMuchDigi.h b/core/data/much/CbmMuchDigi.h
index 4200daf9d0db1222667f8354896cb7044d3292e9..d462d441c7ca126e2507e71e0ee5e8421adc0702 100644
--- a/core/data/much/CbmMuchDigi.h
+++ b/core/data/much/CbmMuchDigi.h
@@ -1,6 +1,6 @@
 /* Copyright (C) 2007-2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
    SPDX-License-Identifier: GPL-3.0-only
-   Authors: M.Ryzhinskiy, Florian Uhlig, Volker Friese [committer], Pierre-Alain Loizeau */
+   Authors: Mikhail Ryzhinskiy, Florian Uhlig, Volker Friese [committer], Pierre-Alain Loizeau */
 
 /** CbmMuchDigi.h
  **@author M.Ryzhinskiy <m.ryzhinskiy@gsi.de>
diff --git a/core/data/much/CbmMuchPoint.cxx b/core/data/much/CbmMuchPoint.cxx
index 4b0bb1c98a67684a817bdb6cb9f5986fc653a58b..aa6e4ab847e9c41f23656c7a359bb9bff29e4a11 100644
--- a/core/data/much/CbmMuchPoint.cxx
+++ b/core/data/much/CbmMuchPoint.cxx
@@ -1,6 +1,6 @@
 /* Copyright (C) 2006-2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
    SPDX-License-Identifier: GPL-3.0-only
-   Authors: M.Ryzhinskiy, Volker Friese, Florian Uhlig, Denis Bertini [committer] */
+   Authors: Mikhail Ryzhinskiy, Volker Friese, Florian Uhlig, Denis Bertini [committer] */
 
 /** CbmMuchPoint.cxx
  *
diff --git a/core/data/mvd/CbmMvdHitMatch.cxx b/core/data/mvd/CbmMvdHitMatch.cxx
index 2508c5997e6cb9fb53fcea351e491d58c96fca12..203e1e2aed86ffe5e530dc2ccdf7123b58491ac6 100644
--- a/core/data/mvd/CbmMvdHitMatch.cxx
+++ b/core/data/mvd/CbmMvdHitMatch.cxx
@@ -1,6 +1,6 @@
 /* Copyright (C) 2006-2017 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
    SPDX-License-Identifier: GPL-3.0-only
-   Authors: V. Friese, Florian Uhlig [committer] */
+   Authors: Volker Friese, Florian Uhlig [committer] */
 
 // -------------------------------------------------------------------------
 // -----                    CbmMvdHitMatch source file                 -----
diff --git a/core/data/raw/PsdGbtDataFormat.h b/core/data/raw/PsdGbtDataFormat.h
index 7b53b768dd1613aa01156827a701ec3f7c166c2a..4694e697a6f6f649b530e495960e9c6034efe58a 100644
--- a/core/data/raw/PsdGbtDataFormat.h
+++ b/core/data/raw/PsdGbtDataFormat.h
@@ -1,6 +1,6 @@
 /* Copyright (C) 2019 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
    SPDX-License-Identifier: GPL-3.0-only
-   Authors: N.Karpushkin, David Emschermann [committer] */
+   Authors: Nikolay Karpushkin, David Emschermann [committer] */
 
 // -----------------------------------------------------------------------------
 // -----                                                                   -----
diff --git a/core/data/raw/PsdGbtReader.cxx b/core/data/raw/PsdGbtReader.cxx
index b82bfdb12ad4815188be8cac08d48112d7ee0fa4..b38e96f00cbe6dcd34f302b46f35774e2322cb14 100644
--- a/core/data/raw/PsdGbtReader.cxx
+++ b/core/data/raw/PsdGbtReader.cxx
@@ -1,6 +1,6 @@
 /* Copyright (C) 2019-2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
    SPDX-License-Identifier: GPL-3.0-only
-   Authors: N.Karpushkin, David Emschermann [committer], Pierre-Alain Loizeau */
+   Authors: Nikolay Karpushkin, David Emschermann [committer], Pierre-Alain Loizeau */
 
 // -----------------------------------------------------------------------------
 // -----                                                                   -----
diff --git a/core/data/raw/PsdGbtReader.h b/core/data/raw/PsdGbtReader.h
index 6ae863bc5c7b4b1c9d8c188ddb77282de7d87b04..ce26922030c3ead66ce849a69b9c3d17c44dd295 100644
--- a/core/data/raw/PsdGbtReader.h
+++ b/core/data/raw/PsdGbtReader.h
@@ -1,6 +1,6 @@
 /* Copyright (C) 2019-2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
    SPDX-License-Identifier: GPL-3.0-only
-   Authors: N.Karpushkin, David Emschermann [committer], Pierre-Alain Loizeau */
+   Authors: Nikolay Karpushkin, David Emschermann [committer], Pierre-Alain Loizeau */
 
 // -----------------------------------------------------------------------------
 // -----                                                                   -----
diff --git a/core/data/rich/CbmRichDigi.cxx b/core/data/rich/CbmRichDigi.cxx
index ae2fe290638f3c0c2b56b0026a2a9da0cd4216d3..88ba2eabc9c87cb4179b883bdb6bc85457e68f2b 100644
--- a/core/data/rich/CbmRichDigi.cxx
+++ b/core/data/rich/CbmRichDigi.cxx
@@ -1,6 +1,6 @@
 /* Copyright (C) 2015-2019 GSI/JINR-LIT
    SPDX-License-Identifier: GPL-3.0-only
-   Authors: slebedev, Andrey Lebedev [committer], Volker Friese */
+   Authors: Semen Lebedev, Andrey Lebedev [committer], Volker Friese */
 
 /*
  * CbmRichDigi.cxx
diff --git a/core/data/rich/CbmRichDigi.h b/core/data/rich/CbmRichDigi.h
index e32fbdd135b3409f1c0df42c3625c4ade514bc79..4b6ac8e6eb9bb45a3e0ba517b2d573a72c29b8dc 100644
--- a/core/data/rich/CbmRichDigi.h
+++ b/core/data/rich/CbmRichDigi.h
@@ -1,6 +1,6 @@
 /* Copyright (C) 2015-2020 GSI/JINR-LIT
    SPDX-License-Identifier: GPL-3.0-only
-   Authors: slebedev, Volker Friese, Andrey Lebedev [committer], Florian Uhlig */
+   Authors: Semen Lebedev, Volker Friese, Andrey Lebedev [committer], Florian Uhlig */
 
 /*
  * CbmRichDigi.h
diff --git a/core/data/rich/CbmRichRing.h b/core/data/rich/CbmRichRing.h
index 7649056d162f936d7130012b9b2ba1f4aa73803c..bda0fb4a3ef350b5aad42ae38351fdcf691d732c 100644
--- a/core/data/rich/CbmRichRing.h
+++ b/core/data/rich/CbmRichRing.h
@@ -1,6 +1,6 @@
 /* Copyright (C) 2004-2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
    SPDX-License-Identifier: GPL-3.0-only
-   Authors: A. Soloviev, Florian Uhlig, Denis Bertini [committer], Semen Lebedev */
+   Authors: Florian Uhlig, Denis Bertini [committer], Semen Lebedev */
 
 #ifndef CBM_RICH_RING_H
 #define CBM_RICH_RING_H
diff --git a/core/data/tof/CbmTofDetectorId_v14a.cxx b/core/data/tof/CbmTofDetectorId_v14a.cxx
index 12eafb83ea182ca892411b6b06ceddcd7785af70..5917e882b702e40dffef7722567364c135236139 100644
--- a/core/data/tof/CbmTofDetectorId_v14a.cxx
+++ b/core/data/tof/CbmTofDetectorId_v14a.cxx
@@ -1,6 +1,6 @@
 /* Copyright (C) 2012-2015 PI-UHd, GSI
    SPDX-License-Identifier: GPL-3.0-only
-   Authors: F. Uhlig, Norbert Herrmann [committer], Pierre-Alain Loizeau */
+   Authors: Florian Uhlig, Norbert Herrmann [committer], Pierre-Alain Loizeau */
 
 // -------------------------------------------------------------------------
 // -----                   CbmTofDetectorId source file                -----
diff --git a/core/data/tof/CbmTofDetectorId_v14a.h b/core/data/tof/CbmTofDetectorId_v14a.h
index ad897e208a59b0a795a06016d8c59e0668f1ae5d..b64f25a07730d6b93120ff96da7e231b71a56658 100644
--- a/core/data/tof/CbmTofDetectorId_v14a.h
+++ b/core/data/tof/CbmTofDetectorId_v14a.h
@@ -1,6 +1,6 @@
 /* Copyright (C) 2014-2020 PI-UHd, GSI
    SPDX-License-Identifier: GPL-3.0-only
-   Authors: F. Uhlig, Norbert Herrmann [committer], Pierre-Alain Loizeau */
+   Authors: Florian Uhlig, Norbert Herrmann [committer], Pierre-Alain Loizeau */
 
 // -------------------------------------------------------------------------
 // -----               CbmTofDetectorId_v12b header file               -----
diff --git a/core/data/tof/CbmTofDetectorId_v21a.cxx b/core/data/tof/CbmTofDetectorId_v21a.cxx
index afe16b27f4caa91333c669fe30c7f8bdbc652d6d..d496ba013e72e2f2720bbbf25f48656a58e7d1cd 100644
--- a/core/data/tof/CbmTofDetectorId_v21a.cxx
+++ b/core/data/tof/CbmTofDetectorId_v21a.cxx
@@ -1,6 +1,6 @@
 /* Copyright (C) 2012-2021 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
    SPDX-License-Identifier: GPL-3.0-only
-   Authors: F. Uhlig, Norbert Herrmann, Norbert Herrmann */
+   Authors: Florian Uhlig, Norbert Herrmann [committer] */
 
 // -------------------------------------------------------------------------
 // -----                   CbmTofDetectorId source file                -----
diff --git a/core/data/tof/CbmTofDetectorId_v21a.h b/core/data/tof/CbmTofDetectorId_v21a.h
index 0fb393587fae976f84e992ef94d47340c794786e..d6c6c09ae27294cc8779ede4c67e3fdef3da2076 100644
--- a/core/data/tof/CbmTofDetectorId_v21a.h
+++ b/core/data/tof/CbmTofDetectorId_v21a.h
@@ -1,6 +1,6 @@
 /* Copyright (C) 2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
    SPDX-License-Identifier: GPL-3.0-only
-   Authors: F. Uhlig, Norbert Herrmann, Norbert Herrmann */
+   Authors: Florian Uhlig, Norbert Herrmann [committer] */
 
 // -------------------------------------------------------------------------
 // -----               CbmTofDetectorId_v12b header file               -----
diff --git a/core/data/tof/CbmTofTracklet.cxx b/core/data/tof/CbmTofTracklet.cxx
index bb56206e5e38c8e5b7fd8a146245a695b10517c1..f87097d0f9236f8b155c960c97b48bc4b37fef00 100644
--- a/core/data/tof/CbmTofTracklet.cxx
+++ b/core/data/tof/CbmTofTracklet.cxx
@@ -1,6 +1,6 @@
 /* Copyright (C) 2015-2020 PI-UHd, GSI
    SPDX-License-Identifier: GPL-3.0-only
-   Authors: nh, Norbert Herrmann [committer], Florian Uhlig */
+   Authors: Norbert Herrmann [committer], Florian Uhlig */
 
 /** @file CbmTofTracklet.cxx
  ** @author nh
diff --git a/core/data/tof/CbmTofTracklet.h b/core/data/tof/CbmTofTracklet.h
index 49ce917d56a2cf61c0464a883cd91f9718961ee3..5f18e4055a8ed236f3561b23d845425e7acecfc5 100644
--- a/core/data/tof/CbmTofTracklet.h
+++ b/core/data/tof/CbmTofTracklet.h
@@ -1,6 +1,6 @@
 /* Copyright (C) 2015-2020 PI-UHd, GSI
    SPDX-License-Identifier: GPL-3.0-only
-   Authors: nh, Norbert Herrmann [committer], Florian Uhlig */
+   Authors: Norbert Herrmann [committer], Florian Uhlig */
 
 /** @file CbmTofTracklet.h
  ** @author nh <N.Herrmann@gsi.de>
diff --git a/core/data/tof/CbmTofTrackletParam.cxx b/core/data/tof/CbmTofTrackletParam.cxx
index 6eba4e69888d0cb3e5f4ae1ef4719e42622a7d2d..91b3959bbffde5a260e553306024e839bc3e83e0 100644
--- a/core/data/tof/CbmTofTrackletParam.cxx
+++ b/core/data/tof/CbmTofTrackletParam.cxx
@@ -1,6 +1,6 @@
 /* Copyright (C) 2005-2020 PI-UHd, GSI
    SPDX-License-Identifier: GPL-3.0-only
-   Authors: V. Friese, Norbert Herrmann [committer], Florian Uhlig */
+   Authors: Volker Friese, Norbert Herrmann [committer], Florian Uhlig */
 
 // -------------------------------------------------------------------------
 // -----                     FairTrackParam source file                 -----
diff --git a/core/data/trd/CbmTrdAddress.cxx b/core/data/trd/CbmTrdAddress.cxx
index 68dd7aab92ba131c50afdfed38db58abb9e53430..507162fb615a4e2e7ced300cb8940b55e1d2408a 100644
--- a/core/data/trd/CbmTrdAddress.cxx
+++ b/core/data/trd/CbmTrdAddress.cxx
@@ -1,6 +1,6 @@
 /* Copyright (C) 2013 GSI/JINR-LIT
    SPDX-License-Identifier: GPL-3.0-only
-   Authors: F. Uhlig, Andrey Lebedev [committer] */
+   Authors: Florian Uhlig, Andrey Lebedev [committer] */
 
 /**
  * \file CbmTrdAddress.cxx
diff --git a/core/data/trd/CbmTrdPoint.cxx b/core/data/trd/CbmTrdPoint.cxx
index 9f12e34ec276910c444bcc7da23a4c126f014288..fa68747beac7d44974e55b7bd79a8abe99e5dadc 100644
--- a/core/data/trd/CbmTrdPoint.cxx
+++ b/core/data/trd/CbmTrdPoint.cxx
@@ -1,6 +1,6 @@
 /* Copyright (C) 2004-2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
    SPDX-License-Identifier: GPL-3.0-only
-   Authors: V. Friese, Florian Uhlig, Denis Bertini [committer] */
+   Authors: Volker Friese, Florian Uhlig, Denis Bertini [committer] */
 
 // -------------------------------------------------------------------------
 // -----                      CbmTrdPoint source file                  -----
diff --git a/core/data/trd/CbmTrdPoint.h b/core/data/trd/CbmTrdPoint.h
index f2b92b9b7b805aff2645bc6128a626511de5297f..28ff85145fab5a4fbc369a5244f5f64fac9235d9 100644
--- a/core/data/trd/CbmTrdPoint.h
+++ b/core/data/trd/CbmTrdPoint.h
@@ -1,6 +1,6 @@
 /* Copyright (C) 2006-2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
    SPDX-License-Identifier: GPL-3.0-only
-   Authors: V. Friese, Denis Bertini [committer], Florian Uhlig */
+   Authors: Volker Friese, Denis Bertini [committer], Florian Uhlig */
 
 // -------------------------------------------------------------------------
 // -----                     CbmTrdPoint header file                   -----
diff --git a/core/data/trd/CbmTrdTrack.cxx b/core/data/trd/CbmTrdTrack.cxx
index 50e9e3687edc852e45b457028b92c9ecfce2f552..008fec2d8309ae5a5b942a24c34b3a8debed6349 100644
--- a/core/data/trd/CbmTrdTrack.cxx
+++ b/core/data/trd/CbmTrdTrack.cxx
@@ -1,6 +1,6 @@
 /* Copyright (C) 2005-2019 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
    SPDX-License-Identifier: GPL-3.0-only
-   Authors: M. Kalisky, Florian Uhlig, Denis Bertini [committer] */
+   Authors: Matus Kalisky, Florian Uhlig, Denis Bertini [committer] */
 
 // -------------------------------------------------------------------------
 // -----                      CbmStsTrack source file                  -----
diff --git a/core/data/trd/CbmTrdTrack.h b/core/data/trd/CbmTrdTrack.h
index da50854824c47df7d225586bf4cec2d42ea588b5..8269bcc8fec29d5e4c71b64c31d94ad8758ab47d 100644
--- a/core/data/trd/CbmTrdTrack.h
+++ b/core/data/trd/CbmTrdTrack.h
@@ -1,6 +1,6 @@
 /* Copyright (C) 2006-2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
    SPDX-License-Identifier: GPL-3.0-only
-   Authors: M.Kalisky, Florian Uhlig, Denis Bertini [committer] */
+   Authors: Matus Kalisky, Florian Uhlig, Denis Bertini [committer] */
 
 // -------------------------------------------------------------------------
 // -----                      CbmTrdTrack header file                  -----
diff --git a/core/detectors/much/CbmGeoMuchPar.cxx b/core/detectors/much/CbmGeoMuchPar.cxx
index 5f08a069194347d679d00be05e5462224ce9e331..485ffca986c6138a10c5531fb6f6df644fe61001 100644
--- a/core/detectors/much/CbmGeoMuchPar.cxx
+++ b/core/detectors/much/CbmGeoMuchPar.cxx
@@ -1,6 +1,6 @@
 /* Copyright (C) 2006-2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
    SPDX-License-Identifier: GPL-3.0-only
-   Authors: E.Kryshen, Denis Bertini [committer], Florian Uhlig, Mohammad Al-Turany, Mikhail Ryzhinskiy */
+   Authors: Evgeny Kryshen, Denis Bertini [committer], Florian Uhlig, Mohammad Al-Turany, Mikhail Ryzhinskiy */
 
 /** CbmGeoMuchPar class
  * @author  E.Kryshen
diff --git a/core/detectors/much/CbmGeoMuchPar.h b/core/detectors/much/CbmGeoMuchPar.h
index bdcb704b5e10907c7742a85849bba41272395d78..58d87bea132832e6c87d81cfa4b3eab038c27991 100644
--- a/core/detectors/much/CbmGeoMuchPar.h
+++ b/core/detectors/much/CbmGeoMuchPar.h
@@ -1,6 +1,6 @@
 /* Copyright (C) 2006-2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
    SPDX-License-Identifier: GPL-3.0-only
-   Authors: E.Kryshen, Denis Bertini [committer], Florian Uhlig, Mikhail Ryzhinskiy, Mohammad Al-Turany */
+   Authors: Evgeny Kryshen, Denis Bertini [committer], Florian Uhlig, Mikhail Ryzhinskiy, Mohammad Al-Turany */
 
 /** CbmGeoMuchPar class
  * @author  E.Kryshen <e.kryshen@gsi.de>
diff --git a/core/detectors/much/CbmMcbm2018MuchPar.cxx b/core/detectors/much/CbmMcbm2018MuchPar.cxx
index a92a6bd9bbcc5bdc8f6e8d00d36143d5f432d490..53deff5725decb089afd60c4d45cd367021fc7f7 100644
--- a/core/detectors/much/CbmMcbm2018MuchPar.cxx
+++ b/core/detectors/much/CbmMcbm2018MuchPar.cxx
@@ -1,6 +1,6 @@
 /* Copyright (C) 2017-2021 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
    SPDX-License-Identifier: GPL-3.0-only
-   Authors: P.-A. Loizeau, Ajit Kumar, Florian Uhlig [committer] */
+   Authors: Pierre-Alain Loizeau, Ajit Kumar, Florian Uhlig [committer] */
 
 #include "CbmMcbm2018MuchPar.h"
 
diff --git a/core/detectors/much/CbmMuchContFact.cxx b/core/detectors/much/CbmMuchContFact.cxx
index 5e09140603667160bf8c7894aab99be4bf09c4d9..3853f52cd021c015881b9212a6b59f6a5c7b083a 100644
--- a/core/detectors/much/CbmMuchContFact.cxx
+++ b/core/detectors/much/CbmMuchContFact.cxx
@@ -1,6 +1,6 @@
 /* Copyright (C) 2006-2021 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
    SPDX-License-Identifier: GPL-3.0-only
-   Authors: M. Ryzhinskiy, Denis Bertini [committer], Florian Uhlig, Volker Friese, Mohammad Al-Turany */
+   Authors: Mikhail Ryzhinskiy, Denis Bertini [committer], Florian Uhlig, Volker Friese, Mohammad Al-Turany */
 
 /** CbmMuchContFact.cxx
  *
diff --git a/core/detectors/much/CbmMuchContFact.h b/core/detectors/much/CbmMuchContFact.h
index 1c423a5d1046484a10a2d749e42d45c29a4489b8..a7b031de10cb68cedc56cb153ffa1840bdf2eb19 100644
--- a/core/detectors/much/CbmMuchContFact.h
+++ b/core/detectors/much/CbmMuchContFact.h
@@ -1,6 +1,6 @@
 /* Copyright (C) 2006-2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
    SPDX-License-Identifier: GPL-3.0-only
-   Authors: M. Ryzhinskiy, Denis Bertini [committer], Florian Uhlig, Mohammad Al-Turany */
+   Authors: Mikhail Ryzhinskiy, Denis Bertini [committer], Florian Uhlig, Mohammad Al-Turany */
 
 /** CbmMuchContFact.h
  *
diff --git a/core/detectors/much/CbmMuchModuleGemRectangular.cxx b/core/detectors/much/CbmMuchModuleGemRectangular.cxx
index fe60737a48892574c02aefcb3c4656a253958553..c4ed6c1162478dbd7d10a11cf5a178b9c23b0188 100644
--- a/core/detectors/much/CbmMuchModuleGemRectangular.cxx
+++ b/core/detectors/much/CbmMuchModuleGemRectangular.cxx
@@ -1,6 +1,6 @@
 /* Copyright (C) 2012-2020 Petersburg Nuclear Physics Institute named by B.P.Konstantinov of National Research Centre "Kurchatov Institute", Gatchina
    SPDX-License-Identifier: GPL-3.0-only
-   Authors: M.Ryzhinskiy, Evgeny Kryshen [committer] */
+   Authors: Mikhail Ryzhinskiy, Evgeny Kryshen [committer] */
 
 /** CbmMuchModuleGemRectangular.cxx
  *@author  M.Ryzhinskiy <m.ryzhinskiy@gsi.de>
diff --git a/core/detectors/much/CbmMuchPointInfo.cxx b/core/detectors/much/CbmMuchPointInfo.cxx
index e6968cd4819144fcf4132d950c1d5ca2cfa4f989..76158ba30abe7d7291204132533e4769f336e9c7 100644
--- a/core/detectors/much/CbmMuchPointInfo.cxx
+++ b/core/detectors/much/CbmMuchPointInfo.cxx
@@ -1,6 +1,6 @@
 /* Copyright (C) 2007-2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
    SPDX-License-Identifier: GPL-3.0-only
-   Authors: E. Kryshen, Florian Uhlig [committer] */
+   Authors: Evgeny Kryshen, Florian Uhlig [committer] */
 
 // -------------------------------------------------------------------------
 // -----                    CbmMuchPointInfo source file               -----
diff --git a/core/detectors/much/CbmMuchPointInfo.h b/core/detectors/much/CbmMuchPointInfo.h
index 7886f5ab1168e3237220a303fe71e03504ea2a69..2d32f4206f8beafc71be7b6d1a27d90d5dbe1e37 100644
--- a/core/detectors/much/CbmMuchPointInfo.h
+++ b/core/detectors/much/CbmMuchPointInfo.h
@@ -1,6 +1,6 @@
 /* Copyright (C) 2007-2021 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
    SPDX-License-Identifier: GPL-3.0-only
-   Authors: E. Kryshen, Sergey Gorbunov [committer] */
+   Authors: Evgeny Kryshen, Sergey Gorbunov [committer] */
 
 // -------------------------------------------------------------------------
 // -----                   CbmMuchPointInfo header file                -----
diff --git a/core/detectors/much/CbmMuchStation.cxx b/core/detectors/much/CbmMuchStation.cxx
index db63da170921933157807d700bc291be4a564de1..cf163edbb51268c7662fb01c449a0623b1bc4911 100644
--- a/core/detectors/much/CbmMuchStation.cxx
+++ b/core/detectors/much/CbmMuchStation.cxx
@@ -1,6 +1,6 @@
 /* Copyright (C) 2007-2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
    SPDX-License-Identifier: GPL-3.0-only
-   Authors: M.Ryzhinskiy, Florian Uhlig, Volker Friese [committer], Evgeny Kryshen */
+   Authors: Mikhail Ryzhinskiy, Florian Uhlig, Volker Friese [committer], Evgeny Kryshen */
 
 /** CbmMuchStation.cxx
  *@author  M.Ryzhinskiy <m.ryzhinskiy@gsi.de>
diff --git a/core/detectors/psd/CbmMcbm2018PsdPar.cxx b/core/detectors/psd/CbmMcbm2018PsdPar.cxx
index 416cbf8d258f9d5c4c833b8d3d08d88c0fe74dae..e8bc4af6f6e5e505d6ba537112a82aa803e028cb 100644
--- a/core/detectors/psd/CbmMcbm2018PsdPar.cxx
+++ b/core/detectors/psd/CbmMcbm2018PsdPar.cxx
@@ -1,6 +1,6 @@
 /* Copyright (C) 2019-2021 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
    SPDX-License-Identifier: GPL-3.0-only
-   Authors: N.Karpushkin, Florian Uhlig [committer] */
+   Authors: Nikolay Karpushkin, Florian Uhlig [committer] */
 
 // -------------------------------------------------------------------------
 // -----                 CbmMcbm2018PsdPar header file                 -----
diff --git a/core/detectors/psd/PronyFitter.h b/core/detectors/psd/PronyFitter.h
index 9c104584dca58ddc604163b06e8c3bed6d0f7548..84164908f9a15fc3f0cbad1ebcb46e0cd09090c8 100644
--- a/core/detectors/psd/PronyFitter.h
+++ b/core/detectors/psd/PronyFitter.h
@@ -1,6 +1,6 @@
 /* Copyright (C) 2020 Facility for Antiproton and Ion Research in Europe, Darmstadt
    SPDX-License-Identifier: GPL-3.0-only
-   Authors: Nikolay Karpushkin (nkarpushkin@mail.ru), Pierre-Alain Loizeau [committer] */
+   Authors: Nikolay Karpushkin, Pierre-Alain Loizeau [committer] */
 
 /** @file   PronyFitter.h
     @class  PronyFitter
diff --git a/core/detectors/rich/CbmRichDetectorData.h b/core/detectors/rich/CbmRichDetectorData.h
index 6b3ac5cf8ff87dd070c5e3e84f2d851ce6ad8283..66e05cdd7f9880ea1e6203c13b05bb6b87f5268c 100644
--- a/core/detectors/rich/CbmRichDetectorData.h
+++ b/core/detectors/rich/CbmRichDetectorData.h
@@ -1,6 +1,6 @@
 /* Copyright (C) 2015-2020 GSI/JINR-LIT
    SPDX-License-Identifier: GPL-3.0-only
-   Authors: slebedev, Semen Lebedev, Andrey Lebedev [committer], Florian Uhlig */
+   Authors: Semen Lebedev, Andrey Lebedev [committer], Florian Uhlig */
 
 /*detector
  * CbmRichData.h
diff --git a/core/detectors/rich/CbmRichDigiMapManager.cxx b/core/detectors/rich/CbmRichDigiMapManager.cxx
index e55867b8929534ff1d1bf99724c42f3c84768453..537481f3942fc205f14c631fdf21488215c1079e 100644
--- a/core/detectors/rich/CbmRichDigiMapManager.cxx
+++ b/core/detectors/rich/CbmRichDigiMapManager.cxx
@@ -1,6 +1,6 @@
 /* Copyright (C) 2015-2020 GSI/JINR-LIT
    SPDX-License-Identifier: GPL-3.0-only
-   Authors: slebedev, Adrian Amatus Weber, Semen Lebedev, Andrey Lebedev [committer], Florian Uhlig */
+   Authors: Semen Lebedev, Adrian Amatus Weber, Andrey Lebedev [committer], Florian Uhlig */
 
 /*
  * CbmRichDigiMapManager.cxx
diff --git a/core/detectors/rich/CbmRichDigiMapManager.h b/core/detectors/rich/CbmRichDigiMapManager.h
index 9a182bfa17b18c6f80f874992989251ad19ef659..f07b7b73439019ccc20a25d559ddc7af118c6c76 100644
--- a/core/detectors/rich/CbmRichDigiMapManager.h
+++ b/core/detectors/rich/CbmRichDigiMapManager.h
@@ -1,6 +1,6 @@
 /* Copyright (C) 2015-2020 GSI/JINR-LIT
    SPDX-License-Identifier: GPL-3.0-only
-   Authors: slebedev, Andrey Lebedev [committer], Florian Uhlig, Semen Lebedev */
+   Authors: Semen Lebedev, Andrey Lebedev [committer], Florian Uhlig */
 
 /*
  * CbmRichDigiMap.h
diff --git a/core/detectors/rich/CbmRichGeoManager.cxx b/core/detectors/rich/CbmRichGeoManager.cxx
index 1295f11a4e32348c92dea312a677e72cd68d5a51..b8ef9735d0d27b4d64b1221a5ef956ee43f91d39 100644
--- a/core/detectors/rich/CbmRichGeoManager.cxx
+++ b/core/detectors/rich/CbmRichGeoManager.cxx
@@ -1,6 +1,6 @@
 /* Copyright (C) 2015-2020 GSI/JINR-LIT
    SPDX-License-Identifier: GPL-3.0-only
-   Authors: slebedev, Semen Lebedev, Andrey Lebedev [committer] */
+   Authors: Semen Lebedev, Andrey Lebedev [committer] */
 
 /*
  * CbmRichGeoManager.cxx
diff --git a/core/detectors/rich/CbmRichGeoManager.h b/core/detectors/rich/CbmRichGeoManager.h
index c3b67799ecd8632f06df695a9aa379c36fed4dcb..c1eb2cda67d8562cc514f3bb8699690ca63f06c0 100644
--- a/core/detectors/rich/CbmRichGeoManager.h
+++ b/core/detectors/rich/CbmRichGeoManager.h
@@ -1,6 +1,6 @@
 /* Copyright (C) 2015-2020 GSI/JINR-LIT
    SPDX-License-Identifier: GPL-3.0-only
-   Authors: slebedev, Semen Lebedev, Andrey Lebedev [committer] */
+   Authors: Semen Lebedev, Andrey Lebedev [committer] */
 
 /*
  * CbmRichGeoManager.h
diff --git a/core/detectors/rich/CbmRichMCbmDigiMapManager.cxx b/core/detectors/rich/CbmRichMCbmDigiMapManager.cxx
index 69465f69179266f60e97b08818c5c6219a533d92..99730384b357e93cfe39597d853983bcb72470de 100644
--- a/core/detectors/rich/CbmRichMCbmDigiMapManager.cxx
+++ b/core/detectors/rich/CbmRichMCbmDigiMapManager.cxx
@@ -1,6 +1,6 @@
 /* Copyright (C) 2019-2020 Justus-Liebig-Universitaet Giessen, Giessen
    SPDX-License-Identifier: GPL-3.0-only
-   Authors: aweber, Adrian Amatus Weber [committer], Florian Uhlig */
+   Authors: Adrian Amatus Weber [committer], Florian Uhlig */
 
 /*
  * CbmRichMCbmDigiMapManager.cxx
diff --git a/core/detectors/rich/CbmRichMCbmDigiMapManager.h b/core/detectors/rich/CbmRichMCbmDigiMapManager.h
index c3e9fc783a71ad9dac820a3901a6ddb376f6200b..c908e0aa71f606f0ae8dc01fc664bc5790120608 100644
--- a/core/detectors/rich/CbmRichMCbmDigiMapManager.h
+++ b/core/detectors/rich/CbmRichMCbmDigiMapManager.h
@@ -1,6 +1,6 @@
 /* Copyright (C) 2015-2020 Justus-Liebig-Universitaet Giessen, Giessen
    SPDX-License-Identifier: GPL-3.0-only
-   Authors: slebedev, Adrian Amatus Weber [committer], Florian Uhlig */
+   Authors: Semen Lebedev, Adrian Amatus Weber [committer], Florian Uhlig */
 
 /*
  * CbmRichDigiMap.h
diff --git a/core/detectors/rich/CbmRichPmt.cxx b/core/detectors/rich/CbmRichPmt.cxx
index 8ea65c28ff140f35a90c0794141f08fad909262e..7280b8f063b7cdf7ebcc42c7341b0289ef267be9 100644
--- a/core/detectors/rich/CbmRichPmt.cxx
+++ b/core/detectors/rich/CbmRichPmt.cxx
@@ -1,6 +1,6 @@
 /* Copyright (C) 2015-2020 GSI/JINR-LIT
    SPDX-License-Identifier: GPL-3.0-only
-   Authors: slebedev, Semen Lebedev, Andrey Lebedev [committer] */
+   Authors: Semen Lebedev, Andrey Lebedev [committer] */
 
 /*
  * CbmRichPmt.cxx
diff --git a/core/detectors/rich/CbmRichPmt.h b/core/detectors/rich/CbmRichPmt.h
index caed9fb2883ab90b7d46f869eb9d88f1acccce25..8c226ec79d64e5639171052b19fd8ed6d6736db3 100644
--- a/core/detectors/rich/CbmRichPmt.h
+++ b/core/detectors/rich/CbmRichPmt.h
@@ -1,6 +1,6 @@
 /* Copyright (C) 2015-2020 GSI/JINR-LIT
    SPDX-License-Identifier: GPL-3.0-only
-   Authors: slebedev, Andrey Lebedev [committer], Semen Lebedev, Florian Uhlig */
+   Authors: Semen Lebedev, Andrey Lebedev [committer], Florian Uhlig */
 
 /*
  * CbmRichPmt.h
diff --git a/core/detectors/rich/CbmRichPmtType.h b/core/detectors/rich/CbmRichPmtType.h
index 9f6fed2866128a0585258516c6df29ee5b1ef59f..782a949d124c4203a9c90a58be93cbfea26fa169 100644
--- a/core/detectors/rich/CbmRichPmtType.h
+++ b/core/detectors/rich/CbmRichPmtType.h
@@ -1,6 +1,6 @@
 /* Copyright (C) 2017 UGiessen, JINR-LIT
    SPDX-License-Identifier: GPL-3.0-only
-   Authors: slebedev, Semen Lebedev [committer] */
+   Authors: Semen Lebedev */
 
 /*
  * CbmRichPmtType.h
diff --git a/core/detectors/rich/CbmRichRecGeoPar.h b/core/detectors/rich/CbmRichRecGeoPar.h
index 323ce859bae3b9e324fa47db016501c7d84c43ce..97fe955eaeac0f5a6fe8bbbb875ba9a12e735fc2 100644
--- a/core/detectors/rich/CbmRichRecGeoPar.h
+++ b/core/detectors/rich/CbmRichRecGeoPar.h
@@ -1,6 +1,6 @@
 /* Copyright (C) 2013-2020 GSI/JINR-LIT
    SPDX-License-Identifier: GPL-3.0-only
-   Authors: Lebedev Semen, Semen Lebedev, Andrey Lebedev [committer], Florian Uhlig */
+   Authors: Semen Lebedev, Andrey Lebedev [committer], Florian Uhlig */
 
 /**
  * \file CbmRichRecGeoPar.h
diff --git a/core/detectors/sts/CbmMcbm2018StsPar.cxx b/core/detectors/sts/CbmMcbm2018StsPar.cxx
index 52f3e137030b32f21a39986cf99bdddcd2f1c51a..52715e5b430dfaaf07c1ed6403712211a4069914 100644
--- a/core/detectors/sts/CbmMcbm2018StsPar.cxx
+++ b/core/detectors/sts/CbmMcbm2018StsPar.cxx
@@ -1,6 +1,6 @@
 /* Copyright (C) 2017-2021 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
    SPDX-License-Identifier: GPL-3.0-only
-   Authors: P.-A. Loizeau, Florian Uhlig [committer] */
+   Authors: Pierre-Alain Loizeau, Florian Uhlig [committer] */
 
 // -------------------------------------------------------------------------
 // -----            CbmMcbm2018StsPar source file                      -----
diff --git a/core/detectors/tof/CbmMcbm2018TofPar.cxx b/core/detectors/tof/CbmMcbm2018TofPar.cxx
index ea838f7ec3fb5693d083359869367c7c075240f0..4fbb4484a59257ecdb5f6be5d69e7569e4a38dd3 100644
--- a/core/detectors/tof/CbmMcbm2018TofPar.cxx
+++ b/core/detectors/tof/CbmMcbm2018TofPar.cxx
@@ -1,6 +1,6 @@
 /* Copyright (C) 2018-2021 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
    SPDX-License-Identifier: GPL-3.0-only
-   Authors: P.-A. Loizeau, Florian Uhlig [committer] */
+   Authors: Pierre-Alain Loizeau, Florian Uhlig [committer] */
 
 // -------------------------------------------------------------------------
 // -----                CbmMcbm2018TofPar source file                  -----
diff --git a/core/detectors/trd/CbmTrdRadiator.cxx b/core/detectors/trd/CbmTrdRadiator.cxx
index 7d74e1f77e3f1b0afe8f5da6ed8ec659ea4ea6c8..4aa9a4429a59c56f80a053ad87d7d2a357fcf6ca 100644
--- a/core/detectors/trd/CbmTrdRadiator.cxx
+++ b/core/detectors/trd/CbmTrdRadiator.cxx
@@ -1,6 +1,6 @@
 /* Copyright (C) 2004-2021 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
    SPDX-License-Identifier: GPL-3.0-only
-   Authors: M.Kalisky, Cyrano Bergmann, Adrian Meyer-Ahrens, David Emschermann, Florian Uhlig */
+   Authors: Matus Kalisky, Cyrano Bergmann, Adrian Meyer-Ahrens, David Emschermann, Florian Uhlig */
 
 // ------------------------------------------------------------------------
 // -----                       CbmTrdRadiator source file             -----
diff --git a/core/detectors/trd/CbmTrdRadiator.h b/core/detectors/trd/CbmTrdRadiator.h
index 77b2bdfb14548668f72c282d6863253d74c30543..d8f1104cec2e0f7503dbcdf5a20b709229a94afa 100644
--- a/core/detectors/trd/CbmTrdRadiator.h
+++ b/core/detectors/trd/CbmTrdRadiator.h
@@ -1,6 +1,6 @@
 /* Copyright (C) 2006-2021 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
    SPDX-License-Identifier: GPL-3.0-only
-   Authors: M.Kalisky, Adrian Meyer-Ahrens, Denis Bertini [committer], Cyrano Bergmann, Florian Uhlig */
+   Authors: Matus Kalisky, Adrian Meyer-Ahrens, Denis Bertini [committer], Cyrano Bergmann, Florian Uhlig */
 
 // -------------------------------------------------------------------------
 // -----                         CbmTrdRadiator header file       -----
diff --git a/core/eventdisplay/CbmEvDisTracks.cxx b/core/eventdisplay/CbmEvDisTracks.cxx
index 155c40dcca34c5d1986e3b70f7403af50b96ec84..b3d9f8d151089facff2624bc0927d036dafc20a7 100644
--- a/core/eventdisplay/CbmEvDisTracks.cxx
+++ b/core/eventdisplay/CbmEvDisTracks.cxx
@@ -1,6 +1,6 @@
 /* Copyright (C) 2007-2021 PI-UHd, GSI
    SPDX-License-Identifier: GPL-3.0-only
-   Authors: M. Al-Turany, Norbert Herrmann [committer], Florian Uhlig */
+   Authors: Mohammad Al-Turany, Norbert Herrmann [committer], Florian Uhlig */
 
 #// -------------------------------------------------------------------------
 // -----                  following FairMCTracks source file           -----
diff --git a/core/eventdisplay/CbmEvDisTracks.h b/core/eventdisplay/CbmEvDisTracks.h
index 779327bb23457d2eeb16f182086730dc7a1ea0b0..554cb6b04d29690c53464a88ad44392ae3408ba0 100644
--- a/core/eventdisplay/CbmEvDisTracks.h
+++ b/core/eventdisplay/CbmEvDisTracks.h
@@ -1,6 +1,6 @@
 /* Copyright (C) 2015-2020 PI-UHd, GSI
    SPDX-License-Identifier: GPL-3.0-only
-   Authors: M. Al-Turany, Norbert Herrmann [committer], Florian Uhlig */
+   Authors: Mohammad Al-Turany, Norbert Herrmann [committer], Florian Uhlig */
 
 // -------------------------------------------------------------------------
 // -----                      FairMCTracks header file                 -----
diff --git a/core/eventdisplay/CbmTrdDigiDraw.cxx b/core/eventdisplay/CbmTrdDigiDraw.cxx
index 193670f8a4f8699b64fd7f6a59e022b7b7baa6cb..150677d18d095a428c3c72809dcf381929f293f1 100644
--- a/core/eventdisplay/CbmTrdDigiDraw.cxx
+++ b/core/eventdisplay/CbmTrdDigiDraw.cxx
@@ -1,6 +1,6 @@
 /* Copyright (C) 2008-2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
    SPDX-License-Identifier: GPL-3.0-only
-   Authors: M. Al-Turany, Florian Uhlig [committer] */
+   Authors: Mohammad Al-Turany, Florian Uhlig [committer] */
 
 // -------------------------------------------------------------------------
 // -----                        CbmTrdDigiDraw source file                  -----
diff --git a/core/eventdisplay/CbmTrdDigiDraw.h b/core/eventdisplay/CbmTrdDigiDraw.h
index c630e7004aada32a315ff058c36339055f3ab4e8..3340b4828c598f7e8460ea277a8b86531c7d95fc 100644
--- a/core/eventdisplay/CbmTrdDigiDraw.h
+++ b/core/eventdisplay/CbmTrdDigiDraw.h
@@ -1,6 +1,6 @@
 /* Copyright (C) 2009-2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
    SPDX-License-Identifier: GPL-3.0-only
-   Authors: M. Al-Turany, Florian Uhlig [committer] */
+   Authors: Mohammad Al-Turany, Florian Uhlig [committer] */
 
 // -------------------------------------------------------------------------
 // -----                      CbmTrdDigiDraw header file                  -----
diff --git a/core/field/CbmBsField.cxx b/core/field/CbmBsField.cxx
index adb29ee2191cf5f38298534b988d062def2788aa..6ad133f3379fee9b7f1640438073221bdc5ea7cf 100644
--- a/core/field/CbmBsField.cxx
+++ b/core/field/CbmBsField.cxx
@@ -1,6 +1,6 @@
 /* Copyright (C) 2006-2021 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
    SPDX-License-Identifier: GPL-3.0-only
-   Authors: E.I.Litvinenko, Denis Bertini [committer], Florian Uhlig */
+   Authors: Elena Litvinenko, Denis Bertini [committer], Florian Uhlig */
 
 // -------------------------------------------------------------------------
 // -----                      CbmBsField  source file                  -----
diff --git a/core/field/CbmBsField.h b/core/field/CbmBsField.h
index fa801d2cd0a19d1f8779f5748a66e02733512953..7e5c62e59713b5c958f7efbd925b8b4dec2d2d6d 100644
--- a/core/field/CbmBsField.h
+++ b/core/field/CbmBsField.h
@@ -1,6 +1,6 @@
 /* Copyright (C) 2006-2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
    SPDX-License-Identifier: GPL-3.0-only
-   Authors: E.I.Litvinenko, Denis Bertini [committer], Florian Uhlig */
+   Authors: Elena Litvinenko, Denis Bertini [committer], Florian Uhlig */
 
 // -------------------------------------------------------------------------
 // -----                      CbmBsField  header file                  -----
diff --git a/core/field/CbmFieldConst.cxx b/core/field/CbmFieldConst.cxx
index 0efa78ff8d437d938b7ea959b5930435f0adca47..a47e839a47ec125da51dacf1a649905c1cda3fae 100644
--- a/core/field/CbmFieldConst.cxx
+++ b/core/field/CbmFieldConst.cxx
@@ -1,6 +1,6 @@
 /* Copyright (C) 2004-2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
    SPDX-License-Identifier: GPL-3.0-only
-   Authors: M. Al/Turany, Denis Bertini [committer], Florian Uhlig */
+   Authors: Mohammad Al-Turany, Denis Bertini [committer], Florian Uhlig */
 
 // -------------------------------------------------------------------------
 // -----                    CbmFieldConst source file                  -----
diff --git a/core/field/CbmFieldConst.h b/core/field/CbmFieldConst.h
index 4eee00cf59a22200d967e6004c6c80236e16f131..43991c7a3b979ea9660e25290ac6df23296a5c43 100644
--- a/core/field/CbmFieldConst.h
+++ b/core/field/CbmFieldConst.h
@@ -1,6 +1,6 @@
 /* Copyright (C) 2004-2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
    SPDX-License-Identifier: GPL-3.0-only
-   Authors: M.Al-Turany, Denis Bertini [committer] */
+   Authors: Mohammad Al-Turany, Denis Bertini [committer] */
 
 // -------------------------------------------------------------------------
 // -----                    CbmFieldConst header file                  -----
diff --git a/core/field/CbmFieldContFact.cxx b/core/field/CbmFieldContFact.cxx
index 3303522a5bb7a3e05f8cf10ae73ea295ffc7fecc..e931863bb4e386aef08b7314c4c55e998ca15719 100644
--- a/core/field/CbmFieldContFact.cxx
+++ b/core/field/CbmFieldContFact.cxx
@@ -1,6 +1,6 @@
 /* Copyright (C) 2006-2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
    SPDX-License-Identifier: GPL-3.0-only
-   Authors: V. Friese, Denis Bertini [committer], Florian Uhlig */
+   Authors: Volker Friese, Denis Bertini [committer], Florian Uhlig */
 
 // -------------------------------------------------------------------------
 // -----                    CbmFieldContFact source file               -----
diff --git a/core/field/CbmFieldContFact.h b/core/field/CbmFieldContFact.h
index 9519abe2d49da08fff6895054695ab772aa55f9f..a0193516a32ff86be549f19be4c4d4d3f5e5bb0b 100644
--- a/core/field/CbmFieldContFact.h
+++ b/core/field/CbmFieldContFact.h
@@ -1,6 +1,6 @@
 /* Copyright (C) 2006-2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
    SPDX-License-Identifier: GPL-3.0-only
-   Authors: V.Friese, Denis Bertini [committer] */
+   Authors: Volker Friese, Denis Bertini [committer] */
 
 // -------------------------------------------------------------------------
 // -----                    CbmFieldContFact header file               -----
diff --git a/core/field/CbmFieldMap.cxx b/core/field/CbmFieldMap.cxx
index 8f9f2818bcfcb681a3e9e82b15fc8f79f7fdb648..a674c8d0cc6219db448d5b308e904a41b4b57a84 100644
--- a/core/field/CbmFieldMap.cxx
+++ b/core/field/CbmFieldMap.cxx
@@ -1,6 +1,6 @@
 /* Copyright (C) 2004-2021 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
    SPDX-License-Identifier: GPL-3.0-only
-   Authors: M. Al/Turany (CbmField.cxx), Denis Bertini [committer], Florian Uhlig, Volker Friese */
+   Authors: Mohammad Al-Turany, Denis Bertini [committer], Florian Uhlig, Volker Friese */
 
 // -------------------------------------------------------------------------
 // -----                      CbmFieldMap source file                  -----
diff --git a/core/field/CbmFieldMap.h b/core/field/CbmFieldMap.h
index 4d9e0c6276b2f9b9cdaca3f4752886ccb0838d71..cc286e09562af5497fbace09bed0fad9f9902d49 100644
--- a/core/field/CbmFieldMap.h
+++ b/core/field/CbmFieldMap.h
@@ -1,6 +1,6 @@
 /* Copyright (C) 2004-2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
    SPDX-License-Identifier: GPL-3.0-only
-   Authors: M.Al/Turany, Denis Bertini [committer], Volker Friese */
+   Authors: Mohammad Al-Turany, Denis Bertini [committer], Volker Friese */
 
 // -------------------------------------------------------------------------
 // -----                      CbmFieldMap header file                  -----
diff --git a/core/field/CbmFieldMapData.h b/core/field/CbmFieldMapData.h
index 0ddbbee4cbda0f5803f26396775dc58f7880dd8f..1f7b4d2ca08bc4d32c8a6fc0c3d94ea5ff0b8e7e 100644
--- a/core/field/CbmFieldMapData.h
+++ b/core/field/CbmFieldMapData.h
@@ -1,6 +1,6 @@
 /* Copyright (C) 2006-2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
    SPDX-License-Identifier: GPL-3.0-only
-   Authors: V.Friese, Denis Bertini [committer] */
+   Authors: Volker Friese, Denis Bertini [committer] */
 
 // -------------------------------------------------------------------------
 // -----                    CbmFieldMapData header file                -----
diff --git a/core/field/CbmFieldMapDistorted.cxx b/core/field/CbmFieldMapDistorted.cxx
index 7c16319f59df3b19eb7e3db183361d508bebf024..d0fe3184b266ee70bd12a3fc3b272cbfd6ef6db2 100644
--- a/core/field/CbmFieldMapDistorted.cxx
+++ b/core/field/CbmFieldMapDistorted.cxx
@@ -1,6 +1,6 @@
 /* Copyright (C) 2008-2021 Justus-Liebig-Universitaet Giessen, Giessen
    SPDX-License-Identifier: GPL-3.0-only
-   Authors: E.Litvinenko, Elena Lebdeva [committer], Florian Uhlig */
+   Authors: Elena Litvinenko, Elena Lebedeva [committer], Florian Uhlig */
 
 // -------------------------------------------------------------------------
 // -----               CbmFieldMapDistorted source file         -----
diff --git a/core/field/CbmFieldMapDistorted.h b/core/field/CbmFieldMapDistorted.h
index 8e9444ba5487bf93fd12099e8f067e1b35f76d1c..4ed3522d8569ace67c7d85c83a0debc8cec653de 100644
--- a/core/field/CbmFieldMapDistorted.h
+++ b/core/field/CbmFieldMapDistorted.h
@@ -1,6 +1,6 @@
 /* Copyright (C) 2008-2020 Justus-Liebig-Universitaet Giessen, Giessen
    SPDX-License-Identifier: GPL-3.0-only
-   Authors: Elena Lebdeva [committer], Florian Uhlig */
+   Authors: Elena Lebedeva [committer], Florian Uhlig */
 
 // -------------------------------------------------------------------------
 // -----               CbmFieldMapSym3Distorted header              -----
diff --git a/core/field/CbmFieldMapSym1.cxx b/core/field/CbmFieldMapSym1.cxx
index 405814ef42fd9e78237980c2c913bcdc47ddc47b..3b400d641c4fa22f1981dc64447ae40bdeedde4b 100644
--- a/core/field/CbmFieldMapSym1.cxx
+++ b/core/field/CbmFieldMapSym1.cxx
@@ -1,6 +1,6 @@
 /* Copyright (C) 2008-2020 Justus-Liebig-Universitaet Giessen, Giessen
    SPDX-License-Identifier: GPL-3.0-only
-   Authors: E.Litvinenko, Elena Lebdeva [committer] */
+   Authors: Elena Litvinenko, Elena Lebedeva [committer] */
 
 // -------------------------------------------------------------------------
 // -----                  CbmFieldMapSym1 source file                  -----
diff --git a/core/field/CbmFieldMapSym1.h b/core/field/CbmFieldMapSym1.h
index 182584d16abd6cdfb23f373c0e8256c82e0a84ec..e8d7a4977e0a499186cb8afc4e931a191e61f364 100644
--- a/core/field/CbmFieldMapSym1.h
+++ b/core/field/CbmFieldMapSym1.h
@@ -1,6 +1,6 @@
 /* Copyright (C) 2008-2020 Justus-Liebig-Universitaet Giessen, Giessen
    SPDX-License-Identifier: GPL-3.0-only
-   Authors: E. Litvinenko, Elena Lebdeva [committer] */
+   Authors: Elena Litvinenko, Elena Lebedeva [committer] */
 
 // -------------------------------------------------------------------------
 // -----                    CbmFieldMapSym1 header file                -----
diff --git a/core/field/CbmFieldMapSym2.cxx b/core/field/CbmFieldMapSym2.cxx
index 8000d3584c0bb27c2dd9e51afad71971f6479171..b2e37ab96380e528ccf9f0c45e05312bac7463b6 100644
--- a/core/field/CbmFieldMapSym2.cxx
+++ b/core/field/CbmFieldMapSym2.cxx
@@ -1,6 +1,6 @@
 /* Copyright (C) 2005-2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
    SPDX-License-Identifier: GPL-3.0-only
-   Authors: E. Litvinenko (CbmFieldMapLIT.cxx), Denis Bertini [committer] */
+   Authors: Elena Litvinenko, Denis Bertini [committer] */
 
 // -------------------------------------------------------------------------
 // -----                  CbmFieldMapSym2 source file               -----
diff --git a/core/field/CbmFieldMapSym2.h b/core/field/CbmFieldMapSym2.h
index 88b80cdf174e86dc8a581301a5c2e539dabc63a0..0adbb0b5b1eccbf23468ce439c74444faf22525a 100644
--- a/core/field/CbmFieldMapSym2.h
+++ b/core/field/CbmFieldMapSym2.h
@@ -1,6 +1,6 @@
 /* Copyright (C) 2005-2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
    SPDX-License-Identifier: GPL-3.0-only
-   Authors: E. Litvinenko, Denis Bertini [committer] */
+   Authors: Elena Litvinenko, Denis Bertini [committer] */
 
 // -------------------------------------------------------------------------
 // -----                    CbmFieldMapSym2 header file                -----
diff --git a/core/field/CbmFieldMapSym3.cxx b/core/field/CbmFieldMapSym3.cxx
index 50941177929d8799c4c51edfb2339af25979f372..1cb5f1d587df281415587bac8808823525a902ef 100644
--- a/core/field/CbmFieldMapSym3.cxx
+++ b/core/field/CbmFieldMapSym3.cxx
@@ -1,6 +1,6 @@
 /* Copyright (C) 2004-2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
    SPDX-License-Identifier: GPL-3.0-only
-   Authors: M. Al/Turany (CbmField.cxx), Denis Bertini [committer] */
+   Authors: Mohammad Al-Turany, Denis Bertini [committer] */
 
 // -------------------------------------------------------------------------
 // -----                    CbmFieldMapSym3 source file                -----
diff --git a/core/field/CbmFieldMapSym3.h b/core/field/CbmFieldMapSym3.h
index be52a5357b3e66574a899c297d3253b73e370304..72caee21b51374b9fcb119caed71ede114d2be44 100644
--- a/core/field/CbmFieldMapSym3.h
+++ b/core/field/CbmFieldMapSym3.h
@@ -1,6 +1,6 @@
 /* Copyright (C) 2004-2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
    SPDX-License-Identifier: GPL-3.0-only
-   Authors: M.Al/Turany, Denis Bertini [committer] */
+   Authors: Mohammad Al-Turany, Denis Bertini [committer] */
 
 // -------------------------------------------------------------------------
 // -----                    CbmFieldMapSym3 header file                -----
diff --git a/core/field/CbmFieldPar.cxx b/core/field/CbmFieldPar.cxx
index 82608f040bdcd5ab9d2fc9e86c12c847eee02d23..48f5091e3265b5117a1669f26a5572502db5ea36 100644
--- a/core/field/CbmFieldPar.cxx
+++ b/core/field/CbmFieldPar.cxx
@@ -1,6 +1,6 @@
 /* Copyright (C) 2006-2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
    SPDX-License-Identifier: GPL-3.0-only
-   Authors: V. Friese, Denis Bertini [committer], Florian Uhlig, Elena Lebdeva */
+   Authors: Volker Friese, Denis Bertini [committer], Florian Uhlig, Elena Lebedeva */
 
 // -------------------------------------------------------------------------
 // -----                      CbmFieldPar source file                  -----
diff --git a/core/field/CbmFieldPar.h b/core/field/CbmFieldPar.h
index 2915d3101c06f3b92bc263e4c96e0a1a46054606..5d93237b1f4b52d21f34999f1b04ba4778a7d170 100644
--- a/core/field/CbmFieldPar.h
+++ b/core/field/CbmFieldPar.h
@@ -1,6 +1,6 @@
 /* Copyright (C) 2006-2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
    SPDX-License-Identifier: GPL-3.0-only
-   Authors: V.Friese, Denis Bertini [committer], Elena Lebdeva */
+   Authors: Volker Friese, Denis Bertini [committer], Elena Lebedeva */
 
 // -------------------------------------------------------------------------
 // -----                      CbmFieldPar header file                  -----
diff --git a/fles/cosy2019/monitor/CbmCosy2019MonitorAlgoHodo.cxx b/fles/cosy2019/monitor/CbmCosy2019MonitorAlgoHodo.cxx
index 92eb9fba2d2d2fd23bb0007730118cd6ca886369..0d188195a2f9b8749a1cf92541d8634bd7897602 100644
--- a/fles/cosy2019/monitor/CbmCosy2019MonitorAlgoHodo.cxx
+++ b/fles/cosy2019/monitor/CbmCosy2019MonitorAlgoHodo.cxx
@@ -1,6 +1,6 @@
 /* Copyright (C) 2019-2021 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
    SPDX-License-Identifier: GPL-3.0-only
-   Authors: P.-A. Loizeau, Florian Uhlig [committer] */
+   Authors: Pierre-Alain Loizeau, Florian Uhlig [committer] */
 
 // -----------------------------------------------------------------------------
 // -----                                                                   -----
diff --git a/fles/cosy2019/monitor/CbmCosy2019MonitorAlgoHodo.h b/fles/cosy2019/monitor/CbmCosy2019MonitorAlgoHodo.h
index 8df6118b841cfedcbfdabd8a25b8ef34c03ab513..61c3c2b08defffbfb4cad938e60b0f86b9580736 100644
--- a/fles/cosy2019/monitor/CbmCosy2019MonitorAlgoHodo.h
+++ b/fles/cosy2019/monitor/CbmCosy2019MonitorAlgoHodo.h
@@ -1,6 +1,6 @@
 /* Copyright (C) 2019-2021 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
    SPDX-License-Identifier: GPL-3.0-only
-   Authors: P.-A. Loizeau, Florian Uhlig [committer] */
+   Authors: Pierre-Alain Loizeau, Florian Uhlig [committer] */
 
 // -----------------------------------------------------------------------------
 // -----                                                                   -----
diff --git a/fles/cosy2019/monitor/CbmCosy2019MonitorTaskHodo.cxx b/fles/cosy2019/monitor/CbmCosy2019MonitorTaskHodo.cxx
index 9741fc92aa411026660cd79319ca3c950e4abc63..ed29c7f217351a10153bf8073733420f90fdf54a 100644
--- a/fles/cosy2019/monitor/CbmCosy2019MonitorTaskHodo.cxx
+++ b/fles/cosy2019/monitor/CbmCosy2019MonitorTaskHodo.cxx
@@ -1,6 +1,6 @@
 /* Copyright (C) 2019-2021 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
    SPDX-License-Identifier: GPL-3.0-only
-   Authors: P.-A. Loizeau, Florian Uhlig [committer] */
+   Authors: Pierre-Alain Loizeau, Florian Uhlig [committer] */
 
 // -----------------------------------------------------------------------------
 // -----                                                                   -----
diff --git a/fles/cosy2019/monitor/CbmCosy2019MonitorTaskHodo.h b/fles/cosy2019/monitor/CbmCosy2019MonitorTaskHodo.h
index 1709a4cfdb2caabe1e8aee85e2ed9170eb7d6a7c..aa099112c12c66a3b89fd42e244058a8e45febd8 100644
--- a/fles/cosy2019/monitor/CbmCosy2019MonitorTaskHodo.h
+++ b/fles/cosy2019/monitor/CbmCosy2019MonitorTaskHodo.h
@@ -1,6 +1,6 @@
 /* Copyright (C) 2019-2021 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
    SPDX-License-Identifier: GPL-3.0-only
-   Authors: P.-A. Loizeau, Florian Uhlig [committer] */
+   Authors: Pierre-Alain Loizeau, Florian Uhlig [committer] */
 
 // -----------------------------------------------------------------------------
 // -----                                                                   -----
diff --git a/fles/cosy2019/parameter/CbmCosy2019HodoPar.cxx b/fles/cosy2019/parameter/CbmCosy2019HodoPar.cxx
index 61b336c540b77f7a587406069d8252d10c8400cf..67a6280d32b4b393ffd3d2f0652af3cf93dfb55b 100644
--- a/fles/cosy2019/parameter/CbmCosy2019HodoPar.cxx
+++ b/fles/cosy2019/parameter/CbmCosy2019HodoPar.cxx
@@ -1,6 +1,6 @@
 /* Copyright (C) 2019-2021 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
    SPDX-License-Identifier: GPL-3.0-only
-   Authors: P.-A. Loizeau, Florian Uhlig [committer] */
+   Authors: Pierre-Alain Loizeau, Florian Uhlig [committer] */
 
 // -------------------------------------------------------------------------
 // -----            CbmCosy2019HodoPar source file                      -----
diff --git a/fles/cosy2019/unpacker/CbmCosy2019UnpackerAlgoHodo.cxx b/fles/cosy2019/unpacker/CbmCosy2019UnpackerAlgoHodo.cxx
index ea75bbcb2e1fbd7915b950a65a327380a0fa832f..ea0d77b0781837e97c1f548dbafb0987d2d19944 100644
--- a/fles/cosy2019/unpacker/CbmCosy2019UnpackerAlgoHodo.cxx
+++ b/fles/cosy2019/unpacker/CbmCosy2019UnpackerAlgoHodo.cxx
@@ -1,6 +1,6 @@
 /* Copyright (C) 2019-2021 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
    SPDX-License-Identifier: GPL-3.0-only
-   Authors: P.-A. Loizeau, Florian Uhlig [committer] */
+   Authors: Pierre-Alain Loizeau, Florian Uhlig [committer] */
 
 // -----------------------------------------------------------------------------
 // -----                                                                   -----
diff --git a/fles/cosy2019/unpacker/CbmCosy2019UnpackerAlgoHodo.h b/fles/cosy2019/unpacker/CbmCosy2019UnpackerAlgoHodo.h
index 0ac2f656934e8ea7b02709bfdc20d9ae0556382c..227c3478cfcac46ec5e2f93d96b3762da5851e65 100644
--- a/fles/cosy2019/unpacker/CbmCosy2019UnpackerAlgoHodo.h
+++ b/fles/cosy2019/unpacker/CbmCosy2019UnpackerAlgoHodo.h
@@ -1,6 +1,6 @@
 /* Copyright (C) 2019-2021 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
    SPDX-License-Identifier: GPL-3.0-only
-   Authors: P.-A. Loizeau, Florian Uhlig [committer] */
+   Authors: Pierre-Alain Loizeau, Florian Uhlig [committer] */
 
 // -----------------------------------------------------------------------------
 // -----                                                                   -----
diff --git a/fles/cosy2019/unpacker/CbmCosy2019UnpackerTaskHodo.cxx b/fles/cosy2019/unpacker/CbmCosy2019UnpackerTaskHodo.cxx
index 8648b2080599eb5e41306cd75e1f1528975d931b..16bb02164e87794b25a1aa4533c8a63138a9aaaa 100644
--- a/fles/cosy2019/unpacker/CbmCosy2019UnpackerTaskHodo.cxx
+++ b/fles/cosy2019/unpacker/CbmCosy2019UnpackerTaskHodo.cxx
@@ -1,6 +1,6 @@
 /* Copyright (C) 2019-2021 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
    SPDX-License-Identifier: GPL-3.0-only
-   Authors: P.-A. Loizeau, Florian Uhlig [committer] */
+   Authors: Pierre-Alain Loizeau, Florian Uhlig [committer] */
 
 // -----------------------------------------------------------------------------
 // -----                                                                   -----
diff --git a/fles/cosy2019/unpacker/CbmCosy2019UnpackerTaskHodo.h b/fles/cosy2019/unpacker/CbmCosy2019UnpackerTaskHodo.h
index c4aa3c2b65fd43d03610484515acf9523aeb4507..e8a994f1a54a5e531b887408cc7567a7fcef25d7 100644
--- a/fles/cosy2019/unpacker/CbmCosy2019UnpackerTaskHodo.h
+++ b/fles/cosy2019/unpacker/CbmCosy2019UnpackerTaskHodo.h
@@ -1,6 +1,6 @@
 /* Copyright (C) 2019-2021 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
    SPDX-License-Identifier: GPL-3.0-only
-   Authors: P.-A. Loizeau, Florian Uhlig [committer] */
+   Authors: Pierre-Alain Loizeau, Florian Uhlig [committer] */
 
 // -----------------------------------------------------------------------------
 // -----                                                                   -----
diff --git a/fles/mcbm2018/commonMQ/CbmStar2019Algo.h b/fles/mcbm2018/commonMQ/CbmStar2019Algo.h
index fb77a90c8ea3519a39def6b64f62dcfb4b4ed872..b958d352d0f15d565e9b923bd1fc38a062ff5b65 100644
--- a/fles/mcbm2018/commonMQ/CbmStar2019Algo.h
+++ b/fles/mcbm2018/commonMQ/CbmStar2019Algo.h
@@ -1,6 +1,6 @@
 /* Copyright (C) 2018-2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
    SPDX-License-Identifier: GPL-3.0-only
-   Authors: P.-A. Loizeau, Florian Uhlig [committer] */
+   Authors: Pierre-Alain Loizeau, Florian Uhlig [committer] */
 
 // -----------------------------------------------------------------------------
 // -----                                                                   -----
diff --git a/fles/mcbm2018/monitor/CbmMcbm2018MonitorAlgoPsd.h b/fles/mcbm2018/monitor/CbmMcbm2018MonitorAlgoPsd.h
index edc987a86b9335fd26ee0b4f6e6aee088779aa10..52d4f02a79e865bcb1bac407efb23590ff752fb2 100644
--- a/fles/mcbm2018/monitor/CbmMcbm2018MonitorAlgoPsd.h
+++ b/fles/mcbm2018/monitor/CbmMcbm2018MonitorAlgoPsd.h
@@ -1,6 +1,6 @@
 /* Copyright (C) 2019-2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
    SPDX-License-Identifier: GPL-3.0-only
-   Authors: N.Karpushkin, David Emschermann [committer] */
+   Authors: Nikolay Karpushkin, David Emschermann [committer] */
 
 // -----------------------------------------------------------------------------
 // -----                                                                   -----
diff --git a/fles/mcbm2018/monitor/CbmMcbm2018MonitorMuch.cxx b/fles/mcbm2018/monitor/CbmMcbm2018MonitorMuch.cxx
index 0715118a606a778bad49537fda4f4e1681def143..c8af561e68b06c89fe4a29b82182dc71064c5ccb 100644
--- a/fles/mcbm2018/monitor/CbmMcbm2018MonitorMuch.cxx
+++ b/fles/mcbm2018/monitor/CbmMcbm2018MonitorMuch.cxx
@@ -1,6 +1,6 @@
 /* Copyright (C) 2018-2020 Variable Energy Cyclotron Centre, Kolkata
    SPDX-License-Identifier: GPL-3.0-only
-   Authors: P.-A. Loizeau, Vikas Singhal [committer] */
+   Authors: Pierre-Alain Loizeau, Vikas Singhal [committer] */
 
 // -----------------------------------------------------------------------------
 // -----                                                                   -----
diff --git a/fles/mcbm2018/monitor/CbmMcbm2018MonitorTaskPsd.cxx b/fles/mcbm2018/monitor/CbmMcbm2018MonitorTaskPsd.cxx
index e1087df67ef1522c96f06f84597e548474872399..9acd8e1aaf5b125a2db3fa5271608fee6134c463 100644
--- a/fles/mcbm2018/monitor/CbmMcbm2018MonitorTaskPsd.cxx
+++ b/fles/mcbm2018/monitor/CbmMcbm2018MonitorTaskPsd.cxx
@@ -1,6 +1,6 @@
 /* Copyright (C) 2019-2021 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
    SPDX-License-Identifier: GPL-3.0-only
-   Authors: N.Karpushkin, David Emschermann [committer] */
+   Authors: Nikolay Karpushkin, David Emschermann [committer] */
 
 // -----------------------------------------------------------------------------
 // -----                                                                   -----
diff --git a/fles/mcbm2018/monitor/CbmMcbm2018MonitorTaskPsd.h b/fles/mcbm2018/monitor/CbmMcbm2018MonitorTaskPsd.h
index 76ba0bc0590a0215c77509f398e6790abda8e959..454071ca92eb4d8ee418a1c8e7e51f1c8141417f 100644
--- a/fles/mcbm2018/monitor/CbmMcbm2018MonitorTaskPsd.h
+++ b/fles/mcbm2018/monitor/CbmMcbm2018MonitorTaskPsd.h
@@ -1,6 +1,6 @@
 /* Copyright (C) 2019-2021 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
    SPDX-License-Identifier: GPL-3.0-only
-   Authors: N.Karpushkin, David Emschermann [committer] */
+   Authors: Nikolay Karpushkin, David Emschermann [committer] */
 
 // -----------------------------------------------------------------------------
 // -----                                                                   -----
diff --git a/fles/mcbm2018/unpacker/CbmMcbm2018UnpackerAlgoPsd.cxx b/fles/mcbm2018/unpacker/CbmMcbm2018UnpackerAlgoPsd.cxx
index 1e61f743bf1f521ac14cabae0be6cfedbf52b22a..095e636758996320ad78670a32300244ed9b27c9 100644
--- a/fles/mcbm2018/unpacker/CbmMcbm2018UnpackerAlgoPsd.cxx
+++ b/fles/mcbm2018/unpacker/CbmMcbm2018UnpackerAlgoPsd.cxx
@@ -1,6 +1,6 @@
 /* Copyright (C) 2019-2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
    SPDX-License-Identifier: GPL-3.0-only
-   Authors: N.Karpushkin, David Emschermann [committer], Pierre-Alain Loizeau */
+   Authors: Nikolay Karpushkin, David Emschermann [committer], Pierre-Alain Loizeau */
 
 // -----------------------------------------------------------------------------
 // -----                                                                   -----
diff --git a/fles/mcbm2018/unpacker/CbmMcbm2018UnpackerAlgoPsd.h b/fles/mcbm2018/unpacker/CbmMcbm2018UnpackerAlgoPsd.h
index 5891c7b1c643d508eb61134851c6f5006dc4f17b..56966a76a2f994070b065ceaeade760d2db5d38a 100644
--- a/fles/mcbm2018/unpacker/CbmMcbm2018UnpackerAlgoPsd.h
+++ b/fles/mcbm2018/unpacker/CbmMcbm2018UnpackerAlgoPsd.h
@@ -1,6 +1,6 @@
 /* Copyright (C) 2019-2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
    SPDX-License-Identifier: GPL-3.0-only
-   Authors: N.Karpushkin, David Emschermann [committer] */
+   Authors: Nikolay Karpushkin, David Emschermann [committer] */
 
 // -----------------------------------------------------------------------------
 // -----                                                                   -----
diff --git a/fles/mcbm2018/unpacker/CbmMcbm2018UnpackerTaskPsd.cxx b/fles/mcbm2018/unpacker/CbmMcbm2018UnpackerTaskPsd.cxx
index 9d3529b80d6681bd035ab713ccebd1ef38216eb0..8f5715dcdcae11078186de351f9103587e454759 100644
--- a/fles/mcbm2018/unpacker/CbmMcbm2018UnpackerTaskPsd.cxx
+++ b/fles/mcbm2018/unpacker/CbmMcbm2018UnpackerTaskPsd.cxx
@@ -1,6 +1,6 @@
 /* Copyright (C) 2019-2021 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
    SPDX-License-Identifier: GPL-3.0-only
-   Authors: N.Karpushkin, David Emschermann [committer] */
+   Authors: Nikolay Karpushkin, David Emschermann [committer] */
 
 // -----------------------------------------------------------------------------
 // -----                                                                   -----
diff --git a/fles/mcbm2018/unpacker/CbmMcbm2018UnpackerTaskPsd.h b/fles/mcbm2018/unpacker/CbmMcbm2018UnpackerTaskPsd.h
index ef3a109ec5ca712f61f0112a31c9dd3493543884..b47181320043ebd7c2ef1f032e1db548d43d985f 100644
--- a/fles/mcbm2018/unpacker/CbmMcbm2018UnpackerTaskPsd.h
+++ b/fles/mcbm2018/unpacker/CbmMcbm2018UnpackerTaskPsd.h
@@ -1,6 +1,6 @@
 /* Copyright (C) 2019-2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
    SPDX-License-Identifier: GPL-3.0-only
-   Authors: N.Karpushkin, David Emschermann [committer] */
+   Authors: Nikolay Karpushkin, David Emschermann [committer] */
 
 // -----------------------------------------------------------------------------
 // -----                                                                   -----
diff --git a/mvd/CbmMvdDetector.h b/mvd/CbmMvdDetector.h
index e208faa90be36f0cd2a7848e322a2d46f84f3412..edc576bae41b8b751f98f83c82c6dc9d1f2b6e8c 100644
--- a/mvd/CbmMvdDetector.h
+++ b/mvd/CbmMvdDetector.h
@@ -1,6 +1,6 @@
 /* Copyright (C) 2014-2020 Institut für Kernphysik, Goethe-Universitaet Frankfurt, Frankfurt
    SPDX-License-Identifier: GPL-3.0-only
-   Authors: M.Deveaux, Philipp Sitzmann [committer] */
+   Authors: Michael Deveaux, Philipp Sitzmann [committer] */
 
 // -------------------------------------------------------------------------
 // -----                      CbmMvdDetector header file              -----
diff --git a/mvd/CbmMvdSensor.cxx b/mvd/CbmMvdSensor.cxx
index f0c7fdd03ce812d65cf5c77e1432d0d865dcdeef..8154470dd3b47e001652f6b166e242eb52e579e9 100644
--- a/mvd/CbmMvdSensor.cxx
+++ b/mvd/CbmMvdSensor.cxx
@@ -1,6 +1,6 @@
 /* Copyright (C) 2011-2021 Institut für Kernphysik, Goethe-Universitaet Frankfurt, Frankfurt
    SPDX-License-Identifier: GPL-3.0-only
-   Authors: M. Deveaux, Philipp Sitzmann [committer] */
+   Authors: Michael Deveaux, Philipp Sitzmann [committer] */
 
 // -------------------------------------------------------------------------
 // -----                     CbmMvdSensor source file                  -----
diff --git a/mvd/CbmMvdSensor.h b/mvd/CbmMvdSensor.h
index 59d96e398865c1786fdaa670073b31a62dc3fd96..14c780f7c11fb777b1bbd1d951e1674afe7ab905 100644
--- a/mvd/CbmMvdSensor.h
+++ b/mvd/CbmMvdSensor.h
@@ -1,6 +1,6 @@
 /* Copyright (C) 2014-2019 Institut für Kernphysik, Goethe-Universitaet Frankfurt, Frankfurt
    SPDX-License-Identifier: GPL-3.0-only
-   Authors: M.Deveaux, Philipp Sitzmann [committer] */
+   Authors: Michael Deveaux, Philipp Sitzmann [committer] */
 
 // -------------------------------------------------------------------------
 // -----                      CbmMvdSensor header file                -----
diff --git a/mvd/SensorDataSheets/CbmMvdMimosa26AHR.h b/mvd/SensorDataSheets/CbmMvdMimosa26AHR.h
index b23587e2393e0dc3b579081d2ad7d36b6e0aecf6..f43936054117647e00ebc6342c5e502d347cffce 100644
--- a/mvd/SensorDataSheets/CbmMvdMimosa26AHR.h
+++ b/mvd/SensorDataSheets/CbmMvdMimosa26AHR.h
@@ -1,6 +1,6 @@
 /* Copyright (C) 2014 Institut für Kernphysik, Goethe-Universitaet Frankfurt, Frankfurt
    SPDX-License-Identifier: GPL-3.0-only
-   Authors: M.Deveaux, Philipp Sitzmann [committer] */
+   Authors: Michael Deveaux, Philipp Sitzmann [committer] */
 
 // -------------------------------------------------------------------------
 // -----                      CbmMvdMimosa26AHR header file                -----
diff --git a/mvd/SensorDataSheets/CbmMvdSensorDataSheet.cxx b/mvd/SensorDataSheets/CbmMvdSensorDataSheet.cxx
index 1f96e7478dccffe2f8ed96205f0e2d7be3c21bef..acce35f19bca2d1f7b8e7e9df1291425780b2460 100644
--- a/mvd/SensorDataSheets/CbmMvdSensorDataSheet.cxx
+++ b/mvd/SensorDataSheets/CbmMvdSensorDataSheet.cxx
@@ -1,6 +1,6 @@
 /* Copyright (C) 2011-2016 Institut für Kernphysik, Goethe-Universitaet Frankfurt, Frankfurt
    SPDX-License-Identifier: GPL-3.0-only
-   Authors: M. Deveaux, Philipp Sitzmann [committer], Florian Uhlig */
+   Authors: Michael Deveaux, Philipp Sitzmann [committer], Florian Uhlig */
 
 // -------------------------------------------------------------------------
 // -----                     CbmMvdSensorDataSheet source file                  -----
diff --git a/mvd/SensorDataSheets/CbmMvdSensorDataSheet.h b/mvd/SensorDataSheets/CbmMvdSensorDataSheet.h
index de4bea7c6de2c5baeaddec7db8a06f21f5cba28a..3b81c169fb15c1e315a10f5944933fd2d997ceb4 100644
--- a/mvd/SensorDataSheets/CbmMvdSensorDataSheet.h
+++ b/mvd/SensorDataSheets/CbmMvdSensorDataSheet.h
@@ -1,6 +1,6 @@
 /* Copyright (C) 2014-2015 Institut für Kernphysik, Goethe-Universitaet Frankfurt, Frankfurt
    SPDX-License-Identifier: GPL-3.0-only
-   Authors: M.Deveaux, Philipp Sitzmann [committer] */
+   Authors: Michael Deveaux, Philipp Sitzmann [committer] */
 
 // -------------------------------------------------------------------------
 // -----                      CbmMvdSensorDataSheet header file                -----
diff --git a/mvd/plugins/CbmMvdSensorPlugin.cxx b/mvd/plugins/CbmMvdSensorPlugin.cxx
index 626a878d20ade20bcdabb10cea4b8e13454def9a..32ab2646d52ae120f5967b63068fc77a47a91df7 100644
--- a/mvd/plugins/CbmMvdSensorPlugin.cxx
+++ b/mvd/plugins/CbmMvdSensorPlugin.cxx
@@ -1,6 +1,6 @@
 /* Copyright (C) 2012-2015 Institut für Kernphysik, Goethe-Universitaet Frankfurt, Frankfurt
    SPDX-License-Identifier: GPL-3.0-only
-   Authors: M. Deveaux, Philipp Sitzmann [committer], Florian Uhlig */
+   Authors: Michael Deveaux, Philipp Sitzmann [committer], Florian Uhlig */
 
 // -------------------------------------------------------------------------
 // -----                  CbmMvdSensorPlugin source file              -----
diff --git a/mvd/plugins/CbmMvdSensorPlugin.h b/mvd/plugins/CbmMvdSensorPlugin.h
index afb3855ee82298ddc19bf049282fb3fc23b4f0f1..2a6b092c2162b2672554f4696f6ae2ec7b416174 100644
--- a/mvd/plugins/CbmMvdSensorPlugin.h
+++ b/mvd/plugins/CbmMvdSensorPlugin.h
@@ -1,6 +1,6 @@
 /* Copyright (C) 2014-2016 Institut für Kernphysik, Goethe-Universitaet Frankfurt, Frankfurt
    SPDX-License-Identifier: GPL-3.0-only
-   Authors: M.Deveaux, Philipp Sitzmann [committer], Florian Uhlig */
+   Authors: Michael Deveaux, Philipp Sitzmann [committer], Florian Uhlig */
 
 // ------------------------------------------------------------------------
 // -----                  CbmMvdSensorPlugin header file              -----
diff --git a/mvd/plugins/buffers/CbmMvdSensorBuffer.cxx b/mvd/plugins/buffers/CbmMvdSensorBuffer.cxx
index e66afa30102053377b5d84737fe0bddd6a2f7836..49f2ac6fb1c5fc3bf25cefa67f6d2432a975f457 100644
--- a/mvd/plugins/buffers/CbmMvdSensorBuffer.cxx
+++ b/mvd/plugins/buffers/CbmMvdSensorBuffer.cxx
@@ -1,6 +1,6 @@
 /* Copyright (C) 2012-2015 Institut für Kernphysik, Goethe-Universitaet Frankfurt, Frankfurt
    SPDX-License-Identifier: GPL-3.0-only
-   Authors: M. Deveaux, Philipp Sitzmann [committer], Florian Uhlig */
+   Authors: Michael Deveaux, Philipp Sitzmann [committer], Florian Uhlig */
 
 // -------------------------------------------------------------------------
 // -----                  CbmMvdSensorBuffer source file              -----
diff --git a/mvd/plugins/buffers/CbmMvdSensorBuffer.h b/mvd/plugins/buffers/CbmMvdSensorBuffer.h
index d1d818cada17020535b2f42753ea074fc077197d..f562e40058b25c918c4f6d675a987f55310ded1f 100644
--- a/mvd/plugins/buffers/CbmMvdSensorBuffer.h
+++ b/mvd/plugins/buffers/CbmMvdSensorBuffer.h
@@ -1,6 +1,6 @@
 /* Copyright (C) 2014-2016 Institut für Kernphysik, Goethe-Universitaet Frankfurt, Frankfurt
    SPDX-License-Identifier: GPL-3.0-only
-   Authors: M.Deveaux, Philipp Sitzmann [committer], Florian Uhlig */
+   Authors: Michael Deveaux, Philipp Sitzmann [committer], Florian Uhlig */
 
 // ------------------------------------------------------------------------
 // -----                  CbmMvdSensorBuffer header file              -----
diff --git a/mvd/plugins/buffers/CbmMvdSensorFrameBuffer.h b/mvd/plugins/buffers/CbmMvdSensorFrameBuffer.h
index 4cb09d01aa4a5336db2d0ec5ceb9cc7733638b84..0d76ea0b0eef5aa78b345ac9251f66f6c3fa95e7 100644
--- a/mvd/plugins/buffers/CbmMvdSensorFrameBuffer.h
+++ b/mvd/plugins/buffers/CbmMvdSensorFrameBuffer.h
@@ -1,6 +1,6 @@
 /* Copyright (C) 2014-2016 Institut für Kernphysik, Goethe-Universitaet Frankfurt, Frankfurt
    SPDX-License-Identifier: GPL-3.0-only
-   Authors: M.Deveaux, Philipp Sitzmann [committer] */
+   Authors: Michael Deveaux, Philipp Sitzmann [committer] */
 
 // ------------------------------------------------------------------------
 // -----                  CbmMvdSensorFrameBuffer header file              -----
diff --git a/mvd/plugins/tasks/CbmMvdSensorDigitizerTBTask.h b/mvd/plugins/tasks/CbmMvdSensorDigitizerTBTask.h
index a9a4971d498d4870430e37d4381919f8b1d3aaa2..4ba0073ab53d40acb46df62faf73749ac41b69fc 100644
--- a/mvd/plugins/tasks/CbmMvdSensorDigitizerTBTask.h
+++ b/mvd/plugins/tasks/CbmMvdSensorDigitizerTBTask.h
@@ -1,6 +1,6 @@
 /* Copyright (C) 2017 Institut für Kernphysik, Goethe-Universitaet Frankfurt, Frankfurt
    SPDX-License-Identifier: GPL-3.0-only
-   Authors: M.Deveaux, Philipp Sitzmann [committer] */
+   Authors: Michael Deveaux, Philipp Sitzmann [committer] */
 
 // ------------------------------------------------------------------------
 // -----                  CbmMvdSensorDigitizerTBTask header file       -----
diff --git a/mvd/plugins/tasks/CbmMvdSensorDigitizerTask.h b/mvd/plugins/tasks/CbmMvdSensorDigitizerTask.h
index 5b47a789b2e25e3ad2fe14c40db593ab9516514c..e7e687d8344e20110e3490fd4b1bf71298e28eb5 100644
--- a/mvd/plugins/tasks/CbmMvdSensorDigitizerTask.h
+++ b/mvd/plugins/tasks/CbmMvdSensorDigitizerTask.h
@@ -1,6 +1,6 @@
 /* Copyright (C) 2014-2017 Institut für Kernphysik, Goethe-Universitaet Frankfurt, Frankfurt
    SPDX-License-Identifier: GPL-3.0-only
-   Authors: M.Deveaux, Philipp Sitzmann [committer] */
+   Authors: Michael Deveaux, Philipp Sitzmann [committer] */
 
 // ------------------------------------------------------------------------
 // -----                  CbmMvdSensorDigitizerTask header file       -----
diff --git a/mvd/plugins/tasks/CbmMvdSensorTask.cxx b/mvd/plugins/tasks/CbmMvdSensorTask.cxx
index 621edc3ea84874cf9c67e58408ea96337ff4d8dd..72b09b00f6ae77a9e6ecf5851afd78ee208e5390 100644
--- a/mvd/plugins/tasks/CbmMvdSensorTask.cxx
+++ b/mvd/plugins/tasks/CbmMvdSensorTask.cxx
@@ -1,6 +1,6 @@
 /* Copyright (C) 2012-2015 Institut für Kernphysik, Goethe-Universitaet Frankfurt, Frankfurt
    SPDX-License-Identifier: GPL-3.0-only
-   Authors: M. Deveaux, Philipp Sitzmann [committer], Florian Uhlig */
+   Authors: Michael Deveaux, Philipp Sitzmann [committer], Florian Uhlig */
 
 // -------------------------------------------------------------------------
 // -----                  CbmMvdSensorTask source file              -----
diff --git a/mvd/plugins/tasks/CbmMvdSensorTask.h b/mvd/plugins/tasks/CbmMvdSensorTask.h
index 82e7342c30b7c62420b949d56421c70e425f5048..9c4ebb4c3165fac92aabbf129ade424c9f696cc6 100644
--- a/mvd/plugins/tasks/CbmMvdSensorTask.h
+++ b/mvd/plugins/tasks/CbmMvdSensorTask.h
@@ -1,6 +1,6 @@
 /* Copyright (C) 2014-2017 Institut für Kernphysik, Goethe-Universitaet Frankfurt, Frankfurt
    SPDX-License-Identifier: GPL-3.0-only
-   Authors: M.Deveaux, Philipp Sitzmann [committer] */
+   Authors: Michael Deveaux, Philipp Sitzmann [committer] */
 
 // ------------------------------------------------------------------------
 // -----                  CbmMvdSensorTask header file              -----
diff --git a/reco/KF/CbmKFFieldMath.h b/reco/KF/CbmKFFieldMath.h
index 7f2f221d3e0d508139372869ac12152d7ec65cd9..a4851633c0c4ac148631e439817635fb42078a4c 100644
--- a/reco/KF/CbmKFFieldMath.h
+++ b/reco/KF/CbmKFFieldMath.h
@@ -1,6 +1,6 @@
 /* Copyright (C) 2006-2009 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
    SPDX-License-Identifier: GPL-3.0-only
-   Authors: S.Gorbunov, Denis Bertini [committer] */
+   Authors: Sergey Gorbunov, Denis Bertini [committer] */
 
 /** Collection of mathematical routines for track extrapolation in magnetic field
  *
diff --git a/reco/KF/CbmKFHit.h b/reco/KF/CbmKFHit.h
index b372eec83ca9531e60e02ecac73d4091cc99597d..8dadf16597df89194bd2e995e83592a454bd4941 100644
--- a/reco/KF/CbmKFHit.h
+++ b/reco/KF/CbmKFHit.h
@@ -1,6 +1,6 @@
 /* Copyright (C) 2006-2012 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
    SPDX-License-Identifier: GPL-3.0-only
-   Authors: S.Gorbunov, Denis Bertini [committer] */
+   Authors: Sergey Gorbunov, Denis Bertini [committer] */
 
 /** Abstract base class for hit is being used by the CbmKF Kalman Filter 
  *
diff --git a/reco/KF/CbmKFMath.h b/reco/KF/CbmKFMath.h
index c2c3068f19a52fb19bff968640dcf2e2ec552253..be68cc2b7daff312a04d9c5a11ca48b851c3f24a 100644
--- a/reco/KF/CbmKFMath.h
+++ b/reco/KF/CbmKFMath.h
@@ -1,6 +1,6 @@
 /* Copyright (C) 2006-2013 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
    SPDX-License-Identifier: GPL-3.0-only
-   Authors: S.Gorbunov, Denis Bertini [committer] */
+   Authors: Sergey Gorbunov, Denis Bertini [committer] */
 
 /** Collection of mathematical routines for the CbmKF Kalman Filter 
  *
diff --git a/reco/KF/CbmKFParticle.cxx b/reco/KF/CbmKFParticle.cxx
index fe0a5a19e3ad1ff29fdb6fa6ef20b6ce7bec82df..7dbcd6afa93ea84d453e511bbdace109e34214a3 100644
--- a/reco/KF/CbmKFParticle.cxx
+++ b/reco/KF/CbmKFParticle.cxx
@@ -1,6 +1,6 @@
 /* Copyright (C) 2008-2012 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
    SPDX-License-Identifier: GPL-3.0-only
-   Authors: S.Gorbunov, I.Kisel, Mohammad Al-Turany [committer], Maxim Zyzak */
+   Authors: Sergey Gorbunov, Ivan Kisel, Mohammad Al-Turany [committer], Maksym Zyzak */
 
 //3456789012345678901234567890123456789012345678901234567890123456789012
 /** Implementation of the CbmKFParticle class
diff --git a/reco/KF/CbmKFParticle.h b/reco/KF/CbmKFParticle.h
index b69b824499ac034edd53ad2ea9616a6eab2cd854..f76c4978994190e8b6a5a37c506ddbb6441599ad 100644
--- a/reco/KF/CbmKFParticle.h
+++ b/reco/KF/CbmKFParticle.h
@@ -1,6 +1,6 @@
 /* Copyright (C) 2008-2016 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
    SPDX-License-Identifier: GPL-3.0-only
-   Authors: S.Gorbunov, I.Kisel, Maxim Zyzak, Mohammad Al-Turany [committer], Igor Kulakov */
+   Authors: Sergey Gorbunov, Ivan Kisel, Maksym Zyzak, Mohammad Al-Turany [committer], Igor Kulakov */
 
 /** The CbmKFParticle class
  *
diff --git a/reco/KF/CbmKFParticleFinder.cxx b/reco/KF/CbmKFParticleFinder.cxx
index f128506baea93473245690c71a47b8caa8ca7027..0d53795e85217bb6f220d63c0b994c8f574f3ab6 100644
--- a/reco/KF/CbmKFParticleFinder.cxx
+++ b/reco/KF/CbmKFParticleFinder.cxx
@@ -1,6 +1,6 @@
 /* Copyright (C) 2014-2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
    SPDX-License-Identifier: GPL-3.0-only
-   Authors: Maxim Zyzak, Volker Friese [committer] */
+   Authors: Maksym Zyzak, Volker Friese [committer] */
 
 //-----------------------------------------------------------
 //-----------------------------------------------------------
diff --git a/reco/KF/CbmKFParticleFinder.h b/reco/KF/CbmKFParticleFinder.h
index 6d35f1fd22d199cdd9de6d51fc9fb30e46c2fab9..0781b846ef682e451e49dc77f06528011c23c416 100644
--- a/reco/KF/CbmKFParticleFinder.h
+++ b/reco/KF/CbmKFParticleFinder.h
@@ -1,6 +1,6 @@
 /* Copyright (C) 2014-2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
    SPDX-License-Identifier: GPL-3.0-only
-   Authors: Maxim Zyzak, Volker Friese [committer] */
+   Authors: Maksym Zyzak, Volker Friese [committer] */
 
 //-----------------------------------------------------------
 //-----------------------------------------------------------
diff --git a/reco/KF/CbmKFParticleFinderPID.cxx b/reco/KF/CbmKFParticleFinderPID.cxx
index 2fb13f5d1da6474d6f604484b5b7f676b3716154..eb0106e609d59b2ee9fbc8fb20308fca17120ea6 100644
--- a/reco/KF/CbmKFParticleFinderPID.cxx
+++ b/reco/KF/CbmKFParticleFinderPID.cxx
@@ -1,6 +1,6 @@
 /* Copyright (C) 2014-2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
    SPDX-License-Identifier: GPL-3.0-only
-   Authors: Maxim Zyzak, Volker Friese [committer] */
+   Authors: Maksym Zyzak, Volker Friese [committer] */
 
 //-----------------------------------------------------------
 //-----------------------------------------------------------
diff --git a/reco/KF/CbmKFParticleFinderPID.h b/reco/KF/CbmKFParticleFinderPID.h
index 38a8860c2daedb2b30d853f192260050b0c99b66..670ec31537a8827e95859c07a8219b0a2bacae31 100644
--- a/reco/KF/CbmKFParticleFinderPID.h
+++ b/reco/KF/CbmKFParticleFinderPID.h
@@ -1,6 +1,6 @@
 /* Copyright (C) 2014-2019 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
    SPDX-License-Identifier: GPL-3.0-only
-   Authors: Maxim Zyzak, Volker Friese [committer] */
+   Authors: Maksym Zyzak, Volker Friese [committer] */
 
 //-----------------------------------------------------------
 //-----------------------------------------------------------
diff --git a/reco/KF/CbmKFParticleFinderQA.cxx b/reco/KF/CbmKFParticleFinderQA.cxx
index 747632feb3d9e0c9966290e831e7fa0f4369fc81..0749f6d6466112187c1faea663b841b4d6906c3f 100644
--- a/reco/KF/CbmKFParticleFinderQA.cxx
+++ b/reco/KF/CbmKFParticleFinderQA.cxx
@@ -1,6 +1,6 @@
 /* Copyright (C) 2014-2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
    SPDX-License-Identifier: GPL-3.0-only
-   Authors: Maxim Zyzak, Volker Friese [committer] */
+   Authors: Maksym Zyzak, Volker Friese [committer] */
 
 //-----------------------------------------------------------
 //-----------------------------------------------------------
diff --git a/reco/KF/CbmKFParticleFinderQA.h b/reco/KF/CbmKFParticleFinderQA.h
index 85c2b6ea23afe046fc1099602619adf24ef2e6ba..ab440b5ffda472c251248d49a6c75ca6cd3f0d1e 100644
--- a/reco/KF/CbmKFParticleFinderQA.h
+++ b/reco/KF/CbmKFParticleFinderQA.h
@@ -1,6 +1,6 @@
 /* Copyright (C) 2014-2018 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
    SPDX-License-Identifier: GPL-3.0-only
-   Authors: Volker Friese [committer], Maxim Zyzak */
+   Authors: Volker Friese [committer], Maksym Zyzak */
 
 //-----------------------------------------------------------
 //-----------------------------------------------------------
diff --git a/reco/KF/CbmKFParticleInterface.cxx b/reco/KF/CbmKFParticleInterface.cxx
index 5970adc6b42a0f1157a48e5ce25d73520a17e0f4..bffd2116a5e154ffccc41d0c2c9cbf43566412bd 100644
--- a/reco/KF/CbmKFParticleInterface.cxx
+++ b/reco/KF/CbmKFParticleInterface.cxx
@@ -1,6 +1,6 @@
 /* Copyright (C) 2014-2015 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
    SPDX-License-Identifier: GPL-3.0-only
-   Authors: Maxim Zyzak [committer] */
+   Authors: Maksym Zyzak [committer] */
 
 //-----------------------------------------------------------
 //-----------------------------------------------------------
diff --git a/reco/KF/CbmKFParticleInterface.h b/reco/KF/CbmKFParticleInterface.h
index 9f54708e721cf286a1e6b6a66bca655f4e466513..14b5ed7321f83ae47df9b793cb53946d5cf938c2 100644
--- a/reco/KF/CbmKFParticleInterface.h
+++ b/reco/KF/CbmKFParticleInterface.h
@@ -1,6 +1,6 @@
 /* Copyright (C) 2014-2015 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
    SPDX-License-Identifier: GPL-3.0-only
-   Authors: Maxim Zyzak [committer] */
+   Authors: Maksym Zyzak [committer] */
 
 //-----------------------------------------------------------
 //-----------------------------------------------------------
diff --git a/reco/KF/CbmKFPixelMeasurement.h b/reco/KF/CbmKFPixelMeasurement.h
index 2fd9082b7a1a3ad610bc68403b126be6866f6c22..a779ea5fd84f319561e0c88c723c13eec72f5d6e 100644
--- a/reco/KF/CbmKFPixelMeasurement.h
+++ b/reco/KF/CbmKFPixelMeasurement.h
@@ -1,6 +1,6 @@
 /* Copyright (C) 2006-2012 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
    SPDX-License-Identifier: GPL-3.0-only
-   Authors: S.Gorbunov, Denis Bertini [committer], Florian Uhlig */
+   Authors: Sergey Gorbunov, Denis Bertini [committer], Florian Uhlig */
 
 /** Class for Pixel-type measurement calculations for CbmKFHit hits 
  *
diff --git a/reco/KF/CbmKFPrimaryVertexFinder.cxx b/reco/KF/CbmKFPrimaryVertexFinder.cxx
index 51fcb22bdc8586d3bb3a8c35390067d0d1b90834..981a8f15856a342282a0aec031e73750b2171748 100644
--- a/reco/KF/CbmKFPrimaryVertexFinder.cxx
+++ b/reco/KF/CbmKFPrimaryVertexFinder.cxx
@@ -1,6 +1,6 @@
 /* Copyright (C) 2006-2016 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
    SPDX-License-Identifier: GPL-3.0-only
-   Authors: S.Gorbunov, I.Kisel, Denis Bertini [committer] */
+   Authors: Sergey Gorbunov, Ivan Kisel, Denis Bertini [committer] */
 
 /** Implementation of the CbmKFPrimaryVertexFinder class
  *
diff --git a/reco/KF/CbmKFPrimaryVertexFinder.h b/reco/KF/CbmKFPrimaryVertexFinder.h
index 97bb45bb030e2454776d59efe97d704ff137aa7b..6b615e18b324e20db83a4991ed617c4fdc54fba8 100644
--- a/reco/KF/CbmKFPrimaryVertexFinder.h
+++ b/reco/KF/CbmKFPrimaryVertexFinder.h
@@ -1,6 +1,6 @@
 /* Copyright (C) 2006-2015 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
    SPDX-License-Identifier: GPL-3.0-only
-   Authors: S.Gorbunov, I.Kisel, Denis Bertini [committer] */
+   Authors: Sergey Gorbunov, Ivan Kisel, Denis Bertini [committer] */
 
 /** The CbmKFPrimaryVertexFinder class
  *
diff --git a/reco/KF/CbmKFSecondaryVertexFinder.cxx b/reco/KF/CbmKFSecondaryVertexFinder.cxx
index 7ef07273b977b2e2090b0b72f47212eb9d0cc472..4c3a3a6de06669697c1305227af8ecad2b3f75db 100644
--- a/reco/KF/CbmKFSecondaryVertexFinder.cxx
+++ b/reco/KF/CbmKFSecondaryVertexFinder.cxx
@@ -1,6 +1,6 @@
 /* Copyright (C) 2006-2016 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
    SPDX-License-Identifier: GPL-3.0-only
-   Authors: S.Gorbunov, I.Kisel, Sergey Gorbunov, Denis Bertini [committer] */
+   Authors: Sergey Gorbunov, Ivan Kisel, Denis Bertini [committer] */
 
 /** Implementation of the CbmKFSecondaryVertexFinder class
  *
diff --git a/reco/KF/CbmKFSecondaryVertexFinder.h b/reco/KF/CbmKFSecondaryVertexFinder.h
index 98eb1a7024a6fcbbe390a9da2583fdab209f6f82..693994e188b944a01d4940f65daf9d38ce62f802 100644
--- a/reco/KF/CbmKFSecondaryVertexFinder.h
+++ b/reco/KF/CbmKFSecondaryVertexFinder.h
@@ -1,6 +1,6 @@
 /* Copyright (C) 2006-2015 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
    SPDX-License-Identifier: GPL-3.0-only
-   Authors: S.Gorbunov, I.Kisel, Denis Bertini [committer], Igor Kulakov */
+   Authors: Sergey Gorbunov, Ivan Kisel, Denis Bertini [committer], Igor Kulakov */
 
 /** The CbmKFSecondaryVertexFinder class
  *
diff --git a/reco/KF/CbmKFTrackInterface.h b/reco/KF/CbmKFTrackInterface.h
index 859203c37082a807d71f08cb0498d3a1c9de5dd7..6abf20dcb2ffa5b0ce66f69df53e53897f0e34dd 100644
--- a/reco/KF/CbmKFTrackInterface.h
+++ b/reco/KF/CbmKFTrackInterface.h
@@ -1,6 +1,6 @@
 /* Copyright (C) 2006-2015 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
    SPDX-License-Identifier: GPL-3.0-only
-   Authors: S.Gorbunov, Denis Bertini [committer] */
+   Authors: Sergey Gorbunov, Denis Bertini [committer] */
 
 /** Abstract base class for track is being used by the CbmKF Kalman Filter 
  *
diff --git a/reco/KF/CbmKFUMeasurement.cxx b/reco/KF/CbmKFUMeasurement.cxx
index 1b22fffd9839e84dfbcd82bba31dce80a3aba260..0066a67a200bbdda061b231c63fe2837ea269173 100644
--- a/reco/KF/CbmKFUMeasurement.cxx
+++ b/reco/KF/CbmKFUMeasurement.cxx
@@ -1,6 +1,6 @@
 /* Copyright (C) 2006-2010 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
    SPDX-License-Identifier: GPL-3.0-only
-   Authors: Denis Bertini [committer], Sergey Gorbunov, Maxim Zyzak */
+   Authors: Denis Bertini [committer], Sergey Gorbunov, Maksym Zyzak */
 
 #include "CbmKFUMeasurement.h"
 
diff --git a/reco/KF/CbmKFUMeasurement.h b/reco/KF/CbmKFUMeasurement.h
index a77f0308f14c3f8a5e1483f2b17bb15ff618a379..bfe1c91ac9b4d583fa0580996b4238b1b33eecc8 100644
--- a/reco/KF/CbmKFUMeasurement.h
+++ b/reco/KF/CbmKFUMeasurement.h
@@ -1,6 +1,6 @@
 /* Copyright (C) 2006-2012 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
    SPDX-License-Identifier: GPL-3.0-only
-   Authors: S.Gorbunov, Denis Bertini [committer], Igor Kulakov */
+   Authors: Sergey Gorbunov, Denis Bertini [committer], Igor Kulakov */
 
 /** Class for 1-D measurement calculations for CbmKFHit hits 
  *
diff --git a/reco/KF/CbmKFVertexInterface.cxx b/reco/KF/CbmKFVertexInterface.cxx
index 8600ba50ba52890568986dd654dae5cadf60311a..f62ad26526e56722e9d50fd16e6b7736090f8c83 100644
--- a/reco/KF/CbmKFVertexInterface.cxx
+++ b/reco/KF/CbmKFVertexInterface.cxx
@@ -1,6 +1,6 @@
 /* Copyright (C) 2006-2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
    SPDX-License-Identifier: GPL-3.0-only
-   Authors: S.Gorbunov, Denis Bertini [committer] */
+   Authors: Sergey Gorbunov, Denis Bertini [committer] */
 
 /** Abstract base class for vertex is being used by the CbmKF Kalman Filter 
  *
diff --git a/reco/KF/CbmKFVertexInterface.h b/reco/KF/CbmKFVertexInterface.h
index b0d43f875cf3b413d4425658fd4b4be8431c7b2e..362f322b69378215f35d63d47f7eb1956065ad29 100644
--- a/reco/KF/CbmKFVertexInterface.h
+++ b/reco/KF/CbmKFVertexInterface.h
@@ -1,6 +1,6 @@
 /* Copyright (C) 2006 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
    SPDX-License-Identifier: GPL-3.0-only
-   Authors: S.Gorbunov, Denis Bertini [committer] */
+   Authors: Sergey Gorbunov, Denis Bertini [committer] */
 
 /** Abstract base class for vertex is being used by the CbmKF Kalman Filter 
  *
diff --git a/reco/KF/Interface/CbmGlobalTrackFitterKF.h b/reco/KF/Interface/CbmGlobalTrackFitterKF.h
index 800c9268ed706c38455bca245127fcfcde5c6e57..7afdd10521c8267284b15f377da9a442a5f3fe1e 100644
--- a/reco/KF/Interface/CbmGlobalTrackFitterKF.h
+++ b/reco/KF/Interface/CbmGlobalTrackFitterKF.h
@@ -1,6 +1,6 @@
 /* Copyright (C) 2006-2012 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
    SPDX-License-Identifier: GPL-3.0-only
-   Authors: D.Kresan, Denis Bertini [committer], Igor Kulakov */
+   Authors: Dmytro Kresan, Denis Bertini [committer], Igor Kulakov */
 
 // ------------------------------------------------------------------
 // -----                  CbmGlobalTrackFitterKF                -----
diff --git a/reco/KF/Interface/CbmKFTofHit.cxx b/reco/KF/Interface/CbmKFTofHit.cxx
index 8e4e2cd2c19d58909c659a0eb6d19faf17f2bc75..b7d06519e0a01d76944518486cdc13d05d61be72 100644
--- a/reco/KF/Interface/CbmKFTofHit.cxx
+++ b/reco/KF/Interface/CbmKFTofHit.cxx
@@ -1,6 +1,6 @@
 /* Copyright (C) 2005-2016 PI-UHd, GSI
    SPDX-License-Identifier: GPL-3.0-only
-   Authors: D.Kresan, Norbert Herrmann [committer] */
+   Authors: Dmytro Kresan, Norbert Herrmann [committer] */
 
 //  ----------------------------------------------------------------------
 //  -----                         CbmKFTofHit                        -----
diff --git a/reco/KF/Interface/CbmKFTofHit.h b/reco/KF/Interface/CbmKFTofHit.h
index f3c8033a88ba7d79dc4d4889e8437c6d8c88d50d..073505b012d3c8c44316681b15510b3fdf43fce6 100644
--- a/reco/KF/Interface/CbmKFTofHit.h
+++ b/reco/KF/Interface/CbmKFTofHit.h
@@ -1,6 +1,6 @@
 /* Copyright (C) 2015 PI-UHd, GSI
    SPDX-License-Identifier: GPL-3.0-only
-   Authors: D.Kresan, Norbert Herrmann [committer] */
+   Authors: Dmytro Kresan, Norbert Herrmann [committer] */
 
 //  ----------------------------------------------------------------------
 //  -----                         CbmKFTofHit                        -----
diff --git a/reco/KF/Interface/CbmKFTrack.h b/reco/KF/Interface/CbmKFTrack.h
index 1a1087384767b37b948d72e8bced005df2778adf..fe3f4af26acfbfa4b0e3ed1402df6874eff8f07c 100644
--- a/reco/KF/Interface/CbmKFTrack.h
+++ b/reco/KF/Interface/CbmKFTrack.h
@@ -1,6 +1,6 @@
 /* Copyright (C) 2006-2013 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
    SPDX-License-Identifier: GPL-3.0-only
-   Authors: S.Gorbunov, Denis Bertini [committer] */
+   Authors: Sergey Gorbunov, Denis Bertini [committer] */
 
 /** 
  *
diff --git a/reco/KF/Interface/CbmKFTrdHit.cxx b/reco/KF/Interface/CbmKFTrdHit.cxx
index 8748665f5d7e286d910e51b62db336eb560ae76d..79ac92e0be7653c883df18d1b639ef2467792ae4 100644
--- a/reco/KF/Interface/CbmKFTrdHit.cxx
+++ b/reco/KF/Interface/CbmKFTrdHit.cxx
@@ -1,6 +1,6 @@
 /* Copyright (C) 2005-2016 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
    SPDX-License-Identifier: GPL-3.0-only
-   Authors: D.Kresan, Denis Bertini [committer], Florian Uhlig */
+   Authors: Dmytro Kresan, Denis Bertini [committer], Florian Uhlig */
 
 //  ----------------------------------------------------------------------
 //  -----                         CbmKFTrdHit                        -----
diff --git a/reco/KF/Interface/CbmKFTrdHit.h b/reco/KF/Interface/CbmKFTrdHit.h
index d67959c3bfe19131b682b71ff05331f7c66edf94..99815e90fafc825f399a847c1c23ba80a9af24a4 100644
--- a/reco/KF/Interface/CbmKFTrdHit.h
+++ b/reco/KF/Interface/CbmKFTrdHit.h
@@ -1,6 +1,6 @@
 /* Copyright (C) 2006-2012 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
    SPDX-License-Identifier: GPL-3.0-only
-   Authors: D.Kresan, Denis Bertini [committer], Igor Kulakov */
+   Authors: Dmytro Kresan, Denis Bertini [committer], Igor Kulakov */
 
 //  ----------------------------------------------------------------------
 //  -----                         CbmKFTrdHit                        -----
diff --git a/reco/KF/Interface/CbmPVFinderKF.h b/reco/KF/Interface/CbmPVFinderKF.h
index 82ca27bcea5fef04026d5455e85b01e7823b2269..eb08ecf882d5aa9b5d25ec8fae5aed944aa9f99b 100644
--- a/reco/KF/Interface/CbmPVFinderKF.h
+++ b/reco/KF/Interface/CbmPVFinderKF.h
@@ -1,6 +1,6 @@
 /* Copyright (C) 2006-2016 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
    SPDX-License-Identifier: GPL-3.0-only
-   Authors: S.Gorbunov, Denis Bertini [committer], Volker Friese */
+   Authors: Sergey Gorbunov, Denis Bertini [committer], Volker Friese */
 
 /** CbmPVFinderKF
  *@author S.Gorbunov
diff --git a/reco/KF/Interface/CbmStsFitPerformanceTask.cxx b/reco/KF/Interface/CbmStsFitPerformanceTask.cxx
index 95377b85a9af4850785475a3088995798ddc68b8..915984512f4b90ba73a2a1e5994fe31e18202fb5 100644
--- a/reco/KF/Interface/CbmStsFitPerformanceTask.cxx
+++ b/reco/KF/Interface/CbmStsFitPerformanceTask.cxx
@@ -1,6 +1,6 @@
 /* Copyright (C) 2005-2021 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
    SPDX-License-Identifier: GPL-3.0-only
-   Authors: E. Kryshen, Denis Bertini [committer], Florian Uhlig */
+   Authors: Evgeny Kryshen, Denis Bertini [committer], Florian Uhlig */
 
 // -------------------------------------------------------------------------
 // -----                 CbmStsFitPerformanceTask source file             -----
diff --git a/reco/KF/Interface/CbmStsFitPerformanceTask.h b/reco/KF/Interface/CbmStsFitPerformanceTask.h
index a3841ab5b4820f5632806f0a34570edf0f6a4aa0..a1c144ae4b5c22024a871f91a858168ff81cce17 100644
--- a/reco/KF/Interface/CbmStsFitPerformanceTask.h
+++ b/reco/KF/Interface/CbmStsFitPerformanceTask.h
@@ -1,6 +1,6 @@
 /* Copyright (C) 2006-2012 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
    SPDX-License-Identifier: GPL-3.0-only
-   Authors: S.Gorbunov, Denis Bertini [committer], Florian Uhlig */
+   Authors: Sergey Gorbunov, Denis Bertini [committer], Florian Uhlig */
 
 // -------------------------------------------------------------------------
 // -----              CbmStsFitPerformanceTask header file                -----
diff --git a/reco/KF/Interface/CbmStsKFSecondaryVertexFinder.cxx b/reco/KF/Interface/CbmStsKFSecondaryVertexFinder.cxx
index e1a1ff15bf9514d813fe748c06ef98dc67117c90..5daf1874811f439a5e68cc35b9300c019c1dce1c 100644
--- a/reco/KF/Interface/CbmStsKFSecondaryVertexFinder.cxx
+++ b/reco/KF/Interface/CbmStsKFSecondaryVertexFinder.cxx
@@ -1,6 +1,6 @@
 /* Copyright (C) 2006-2016 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
    SPDX-License-Identifier: GPL-3.0-only
-   Authors: S.Gorbunov, I.Kisel, Denis Bertini [committer] */
+   Authors: Sergey Gorbunov, Ivan Kisel, Denis Bertini [committer] */
 
 /** Implementation of the CbmKFSecondaryVertexFinder class
  *
diff --git a/reco/KF/Interface/CbmStsKFSecondaryVertexFinder.h b/reco/KF/Interface/CbmStsKFSecondaryVertexFinder.h
index f13d75a019ae073b83299d946552f48e94effeb8..4a0b279155162761b355f488b56776d0217a05cc 100644
--- a/reco/KF/Interface/CbmStsKFSecondaryVertexFinder.h
+++ b/reco/KF/Interface/CbmStsKFSecondaryVertexFinder.h
@@ -1,6 +1,6 @@
 /* Copyright (C) 2006-2015 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
    SPDX-License-Identifier: GPL-3.0-only
-   Authors: S.Gorbunov, I.Kisel, Denis Bertini [committer] */
+   Authors: Sergey Gorbunov, Ivan Kisel, Denis Bertini [committer] */
 
 /** The CbmStsKFSecondaryVertexFinder class
  *
diff --git a/reco/KF/Interface/CbmTofTrackFitterKF.cxx b/reco/KF/Interface/CbmTofTrackFitterKF.cxx
index 1ab41fa12cd04a10a442b44f6152446d8f44c4d4..f82622ac9e56b57f3d0ceb0c41b4eb36d31105d2 100644
--- a/reco/KF/Interface/CbmTofTrackFitterKF.cxx
+++ b/reco/KF/Interface/CbmTofTrackFitterKF.cxx
@@ -1,6 +1,6 @@
 /* Copyright (C) 2005-2019 PI-UHd, GSI
    SPDX-License-Identifier: GPL-3.0-only
-   Authors: D. Kresan, Norbert Herrmann [committer] */
+   Authors: Dmytro Kresan, Norbert Herrmann [committer] */
 
 // -----------------------------------------------------------------------
 // -----                  CbmTofTrackFitterKF                        -----
diff --git a/reco/KF/Interface/CbmTrdTrackFitterKF.cxx b/reco/KF/Interface/CbmTrdTrackFitterKF.cxx
index 7a59be78b0650f6499cc20179002cac1dd9ac608..c1df0ebcbea8e4f3eb71207dccda0f7471d86e30 100644
--- a/reco/KF/Interface/CbmTrdTrackFitterKF.cxx
+++ b/reco/KF/Interface/CbmTrdTrackFitterKF.cxx
@@ -1,6 +1,6 @@
 /* Copyright (C) 2005-2012 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
    SPDX-License-Identifier: GPL-3.0-only
-   Authors: D. Kresan, Denis Bertini [committer], Florian Uhlig */
+   Authors: Dmytro Kresan, Denis Bertini [committer], Florian Uhlig */
 
 // -----------------------------------------------------------------------
 // -----                  CbmTrdTrackFitterKF                        -----
diff --git a/reco/KF/Interface/CbmTrdTrackFitterKF.h b/reco/KF/Interface/CbmTrdTrackFitterKF.h
index ccd7b5b78d774f54b7510bf8f9912509ea5f9a1d..c895ddaa811fa606c41d1289eeb38889664366e2 100644
--- a/reco/KF/Interface/CbmTrdTrackFitterKF.h
+++ b/reco/KF/Interface/CbmTrdTrackFitterKF.h
@@ -1,6 +1,6 @@
 /* Copyright (C) 2005-2012 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
    SPDX-License-Identifier: GPL-3.0-only
-   Authors: D. Kresan, Denis Bertini [committer] */
+   Authors: Dmytro Kresan, Denis Bertini [committer] */
 
 // -----------------------------------------------------------------------
 // -----                  CbmTrdTrackFitterKF                        -----
diff --git a/reco/KF/KFLinkDef.h b/reco/KF/KFLinkDef.h
index a01300faf357b033182c6cc654a4fc69c9629c4c..e9b0e3fc5ebe70d423b5796c7a400730003edbe1 100644
--- a/reco/KF/KFLinkDef.h
+++ b/reco/KF/KFLinkDef.h
@@ -1,6 +1,6 @@
 /* Copyright (C) 2006-2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
    SPDX-License-Identifier: GPL-3.0-only
-   Authors: Denis Bertini [committer], Maxim Zyzak, Volodymyr Vovchenko, Florian Uhlig */
+   Authors: Denis Bertini [committer], Maksym Zyzak, Volodymyr Vovchenko, Florian Uhlig */
 
 #ifdef __CINT__
 
diff --git a/reco/KF/KFQA/CbmKFPartEfficiencies.h b/reco/KF/KFQA/CbmKFPartEfficiencies.h
index 4786de2c1dfde6a50ef5d3925b52afbc6b93368d..a4c5bfd4ff10ad33d6c17d8db5f4f580f491779e 100644
--- a/reco/KF/KFQA/CbmKFPartEfficiencies.h
+++ b/reco/KF/KFQA/CbmKFPartEfficiencies.h
@@ -1,6 +1,6 @@
 /* Copyright (C) 2012-2016 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
    SPDX-License-Identifier: GPL-3.0-only
-   Authors: Maxim Zyzak [committer] */
+   Authors: Maksym Zyzak [committer] */
 
 #ifndef CbmKFPartEfficiencies_H
 #define CbmKFPartEfficiencies_H
diff --git a/reco/KF/KFQA/CbmKFTrErrMCPoints.cxx b/reco/KF/KFQA/CbmKFTrErrMCPoints.cxx
index 1eb7a5ed36ab31a313afaace44d8348e1a785b9d..3f30e4fa882f79efc618e26ea97baa143054139c 100644
--- a/reco/KF/KFQA/CbmKFTrErrMCPoints.cxx
+++ b/reco/KF/KFQA/CbmKFTrErrMCPoints.cxx
@@ -1,6 +1,6 @@
 /* Copyright (C) 2011-2017 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
    SPDX-License-Identifier: GPL-3.0-only
-   Authors: Maxim Zyzak [committer] */
+   Authors: Maksym Zyzak [committer] */
 
 /*
  *====================================================================
diff --git a/reco/KF/KFQA/CbmKFTrErrMCPoints.h b/reco/KF/KFQA/CbmKFTrErrMCPoints.h
index 63f65a01b93cdfd76a682c7c0eed5ba9b5a97128..1d94de51eebac759d81a7b9eb5c7b6ab0d20738a 100644
--- a/reco/KF/KFQA/CbmKFTrErrMCPoints.h
+++ b/reco/KF/KFQA/CbmKFTrErrMCPoints.h
@@ -1,6 +1,6 @@
 /* Copyright (C) 2011-2016 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
    SPDX-License-Identifier: GPL-3.0-only
-   Authors: M.Zyzak, Maxim Zyzak [committer] */
+   Authors: Maksym Zyzak */
 
 /*
  *  KF Fit performance 
diff --git a/reco/KF/KFQA/CbmKFTrackFitQA.cxx b/reco/KF/KFQA/CbmKFTrackFitQA.cxx
index 4277e321279952b9b421e6e48cf947323aafc23d..76699f04063b95f753d3eb3a64dd8108c9a03715 100644
--- a/reco/KF/KFQA/CbmKFTrackFitQA.cxx
+++ b/reco/KF/KFQA/CbmKFTrackFitQA.cxx
@@ -1,6 +1,6 @@
 /* Copyright (C) 2011-2019 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
    SPDX-License-Identifier: GPL-3.0-only
-   Authors: Maxim Zyzak [committer] */
+   Authors: Maksym Zyzak [committer] */
 
 /*
  *====================================================================
diff --git a/reco/KF/KFQA/CbmKFTrackFitQA.h b/reco/KF/KFQA/CbmKFTrackFitQA.h
index cd52ba7c51138ffe6b606661c7a0fa4e2e213f16..68e1e5629886fef858b4273e52cc8977982052fc 100644
--- a/reco/KF/KFQA/CbmKFTrackFitQA.h
+++ b/reco/KF/KFQA/CbmKFTrackFitQA.h
@@ -1,6 +1,6 @@
 /* Copyright (C) 2011-2019 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
    SPDX-License-Identifier: GPL-3.0-only
-   Authors: Maxim Zyzak [committer] */
+   Authors: Maksym Zyzak [committer] */
 
 /*
  *====================================================================
diff --git a/reco/KF/KFQA/CbmKFTrackQA.cxx b/reco/KF/KFQA/CbmKFTrackQA.cxx
index b856c8a7c8f4c440f1ef4040b086a4ae1110a2e3..1779d2c931115e4006b8ced76dd2f0d341edf093 100644
--- a/reco/KF/KFQA/CbmKFTrackQA.cxx
+++ b/reco/KF/KFQA/CbmKFTrackQA.cxx
@@ -1,6 +1,6 @@
 /* Copyright (C) 2015-2018 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
    SPDX-License-Identifier: GPL-3.0-only
-   Authors: Maxim Zyzak [committer], Grigory Kozlov */
+   Authors: Maksym Zyzak [committer], Grigory Kozlov */
 
 //-----------------------------------------------------------
 //-----------------------------------------------------------
diff --git a/reco/KF/KFQA/CbmKFTrackQA.h b/reco/KF/KFQA/CbmKFTrackQA.h
index 619b7addbebeb4efbcb4c01c6a3e81d15db2a96b..3af2643cafbb21e1773b8b54042f4223897474c4 100644
--- a/reco/KF/KFQA/CbmKFTrackQA.h
+++ b/reco/KF/KFQA/CbmKFTrackQA.h
@@ -1,6 +1,6 @@
 /* Copyright (C) 2015-2018 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
    SPDX-License-Identifier: GPL-3.0-only
-   Authors: Maxim Zyzak [committer] */
+   Authors: Maksym Zyzak [committer] */
 
 //-----------------------------------------------------------
 //-----------------------------------------------------------
diff --git a/reco/KF/KFQA/KFParticleMatch.cxx b/reco/KF/KFQA/KFParticleMatch.cxx
index b3cebc4d285ff6fcc25ba681d34404c1fa86cd82..ff3fbaf77d3210609c22042319f3da4ef0845f00 100644
--- a/reco/KF/KFQA/KFParticleMatch.cxx
+++ b/reco/KF/KFQA/KFParticleMatch.cxx
@@ -1,6 +1,6 @@
 /* Copyright (C) 2013 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
    SPDX-License-Identifier: GPL-3.0-only
-   Authors: M.Zyzak, Maxim Zyzak [committer], Florian Uhlig */
+   Authors: Maksym Zyzak [committer], Florian Uhlig */
 
 /*
  *====================================================================
diff --git a/reco/KF/KFQA/KFParticleMatch.h b/reco/KF/KFQA/KFParticleMatch.h
index bb62b932a19b61e533011a8d0e827e418bee0ac0..b56e9bb1501ddd8d25989040dc3590a7a92b201e 100644
--- a/reco/KF/KFQA/KFParticleMatch.h
+++ b/reco/KF/KFQA/KFParticleMatch.h
@@ -1,6 +1,6 @@
 /* Copyright (C) 2013 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
    SPDX-License-Identifier: GPL-3.0-only
-   Authors: Maxim Zyzak [committer] */
+   Authors: Maksym Zyzak [committer] */
 
 /*
  *  CBM KF Track Quality
diff --git a/reco/L1/CbmL1.cxx b/reco/L1/CbmL1.cxx
index 4d4e891e4b71afe726c93991a14ed2befde4cfc4..2e64b389e81482795a98e2d2745850466cf23bea 100644
--- a/reco/L1/CbmL1.cxx
+++ b/reco/L1/CbmL1.cxx
@@ -1,6 +1,6 @@
 /* Copyright (C) 2006-2021 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
    SPDX-License-Identifier: GPL-3.0-only
-   Authors: I.Kisel, S.Gorbunov, Valentina Akishina, Igor Kulakov, Maxim Zyzak */
+   Authors: Ivan Kisel, Sergey Gorbunov, Valentina Akishina, Igor Kulakov, Maksym Zyzak */
 
 /*
  *====================================================================
diff --git a/reco/L1/CbmL1.h b/reco/L1/CbmL1.h
index b752db9c48b88c106a8de2ec13461559a6de6b2f..5ac4910d14c94f304f6d70e495f8cfc8db83ea88 100644
--- a/reco/L1/CbmL1.h
+++ b/reco/L1/CbmL1.h
@@ -1,6 +1,6 @@
 /* Copyright (C) 2006-2021 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
    SPDX-License-Identifier: GPL-3.0-only
-   Authors: I.Kisel,  S.Gorbunov, Maxim Zyzak, Valentina Akishina, Igor Kulakov, Denis Bertini [committer] */
+   Authors: Ivan Kisel,  Sergey Gorbunov, Maksym Zyzak, Valentina Akishina, Igor Kulakov, Denis Bertini [committer] */
 
 /*
  *====================================================================
diff --git a/reco/L1/CbmL1CATrdTrackFinderSA.h b/reco/L1/CbmL1CATrdTrackFinderSA.h
index 1097c6d23632ff8e6798c5256c95573c27441417..9c1d20c66a1881d5c60bf3185004253b1c6da7ae 100644
--- a/reco/L1/CbmL1CATrdTrackFinderSA.h
+++ b/reco/L1/CbmL1CATrdTrackFinderSA.h
@@ -1,6 +1,6 @@
 /* Copyright (C) 2006-2010 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
    SPDX-License-Identifier: GPL-3.0-only
-   Authors: A.Bubak & M.Krauze, Sergey Gorbunov, Denis Bertini [committer], Florian Uhlig */
+   Authors: Arkadiusz Bubak, M. Krauze, Sergey Gorbunov, Denis Bertini [committer], Florian Uhlig */
 
 // -----------------------------------------------------------------------
 // -----                    CbmL1CATrdTrackFinderSA                  -----
diff --git a/reco/L1/CbmL1Counters.h b/reco/L1/CbmL1Counters.h
index 73ae5c3bfb4b408604a4aced261644b7e0366625..4975bcadcc2b1ce5ba9bfc9dc006bef0312a40b9 100644
--- a/reco/L1/CbmL1Counters.h
+++ b/reco/L1/CbmL1Counters.h
@@ -1,6 +1,6 @@
 /* Copyright (C) 2010-2017 Frankfurt Institute for Advanced Studies, Goethe-Universität Frankfurt, Frankfurt
    SPDX-License-Identifier: GPL-3.0-only
-   Authors: Igor Kulakov [committer], Maxim Zyzak */
+   Authors: Igor Kulakov [committer], Maksym Zyzak */
 
 #ifndef CbmL1Counters_H
 #define CbmL1Counters_H
diff --git a/reco/L1/CbmL1Def.h b/reco/L1/CbmL1Def.h
index b8914e6177abc41bff53fdd38a206e5a186ae0fe..fc483056f9cc12d3314832f37a3ca4943612ddc8 100644
--- a/reco/L1/CbmL1Def.h
+++ b/reco/L1/CbmL1Def.h
@@ -1,6 +1,6 @@
 /* Copyright (C) 2010-2021 Frankfurt Institute for Advanced Studies, Goethe-Universität Frankfurt, Frankfurt
    SPDX-License-Identifier: GPL-3.0-only
-   Authors: Maxim Zyzak, Igor Kulakov [committer], Sergey Gorbunov */
+   Authors: Maksym Zyzak, Igor Kulakov [committer], Sergey Gorbunov */
 
 #ifndef CbmL1Def_h
 #define CbmL1Def_h 1
diff --git a/reco/L1/CbmL1MCPoint.h b/reco/L1/CbmL1MCPoint.h
index 86840bac864c2f8dbd0c7e9c47093fbc37305963..1ac480f0d05ef56c608896227d1759a5e4cf5040 100644
--- a/reco/L1/CbmL1MCPoint.h
+++ b/reco/L1/CbmL1MCPoint.h
@@ -1,6 +1,6 @@
 /* Copyright (C) 2010-2017 Frankfurt Institute for Advanced Studies, Goethe-Universitaet Frankfurt, Frankfurt
    SPDX-License-Identifier: GPL-3.0-only
-   Authors: I.Kisel,  S.Gorbunov, Igor Kulakov [committer], Maxim Zyzak */
+   Authors: Ivan Kisel,  Sergey Gorbunov, Igor Kulakov [committer], Maksym Zyzak */
 
 /*
  *====================================================================
diff --git a/reco/L1/CbmL1MCTrack.cxx b/reco/L1/CbmL1MCTrack.cxx
index a976784365bc8c0dec2db8f328436a85425de791..d9fcaad28103b7da56533d4c6d2130445a4a64e9 100644
--- a/reco/L1/CbmL1MCTrack.cxx
+++ b/reco/L1/CbmL1MCTrack.cxx
@@ -1,6 +1,6 @@
 /* Copyright (C) 2010-2020 Frankfurt Institute for Advanced Studies, Goethe-Universitaet Frankfurt, Frankfurt
    SPDX-License-Identifier: GPL-3.0-only
-   Authors: I.Kisel,  S.Gorbunov, Igor Kulakov [committer], Maxim Zyzak */
+   Authors: Ivan Kisel,  Sergey Gorbunov, Igor Kulakov [committer], Maksym Zyzak */
 
 /*
  *====================================================================
diff --git a/reco/L1/CbmL1MCTrack.h b/reco/L1/CbmL1MCTrack.h
index a82db69aaab9b71598ad06d03f100b8a9e4782d5..57e8523b2faf6047c45773eee43c0b076a722ad5 100644
--- a/reco/L1/CbmL1MCTrack.h
+++ b/reco/L1/CbmL1MCTrack.h
@@ -1,6 +1,6 @@
 /* Copyright (C) 2010-2017 Frankfurt Institute for Advanced Studies, Goethe-Universitaet Frankfurt, Frankfurt
    SPDX-License-Identifier: GPL-3.0-only
-   Authors: I.Kisel,  S.Gorbunov, Igor Kulakov [committer], Maxim Zyzak */
+   Authors: Ivan Kisel,  Sergey Gorbunov, Igor Kulakov [committer], Maksym Zyzak */
 
 /*
  *====================================================================
diff --git a/reco/L1/CbmL1Performance.cxx b/reco/L1/CbmL1Performance.cxx
index 3f40ae3359e16390c30f2f0c129056356a5acb55..b077730b0d85153337e2efdc199352794b280b21 100644
--- a/reco/L1/CbmL1Performance.cxx
+++ b/reco/L1/CbmL1Performance.cxx
@@ -1,6 +1,6 @@
 /* Copyright (C) 2006-2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
    SPDX-License-Identifier: GPL-3.0-only
-   Authors: I.Kisel,  S.Gorbunov, Igor Kulakov, Valentina Akishina, Grigory Kozlov */
+   Authors: Ivan Kisel,  Sergey Gorbunov, Igor Kulakov, Valentina Akishina, Grigory Kozlov */
 
 /*
  *====================================================================
diff --git a/reco/L1/CbmL1ReadEvent.cxx b/reco/L1/CbmL1ReadEvent.cxx
index 66e34b666ba5fcfd2d346342a7370eb5f04f76d9..ffe86377ff9e8e03f7f6cc71c9bd2e17b12b4000 100644
--- a/reco/L1/CbmL1ReadEvent.cxx
+++ b/reco/L1/CbmL1ReadEvent.cxx
@@ -1,6 +1,6 @@
 /* Copyright (C) 2006-2021 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
    SPDX-License-Identifier: GPL-3.0-only
-   Authors: I.Kisel,  S.Gorbunov, I. Rostovtseva (2016), Valentina Akishina, Maxim Zyzak */
+   Authors: Ivan Kisel,  Sergey Gorbunov, Irina Rostovtseva, Valentina Akishina, Maksym Zyzak */
 
 /*
  *====================================================================
diff --git a/reco/L1/CbmL1StsHit.h b/reco/L1/CbmL1StsHit.h
index 9631c66bc5d5f376f283822fc4a62f4466ba6813..ae654a5e3507302f4f1fb3a3baab2f6ec6002a72 100644
--- a/reco/L1/CbmL1StsHit.h
+++ b/reco/L1/CbmL1StsHit.h
@@ -1,6 +1,6 @@
 /* Copyright (C) 2010-2021 Frankfurt Institute for Advanced Studies, Goethe-Universität Frankfurt, Frankfurt
    SPDX-License-Identifier: GPL-3.0-only
-   Authors: Igor Kulakov [committer], Valentina Akishina, Maxim Zyzak */
+   Authors: Igor Kulakov [committer], Valentina Akishina, Maksym Zyzak */
 
 #ifndef _CbmL1StsHit_h_
 #define _CbmL1StsHit_h_
diff --git a/reco/L1/CbmL1Track.h b/reco/L1/CbmL1Track.h
index 7acfc26be4ac4492a4535a76303a6464ec55ad18..f774c3274f6599f31f8e9206578344bce8b07c0a 100644
--- a/reco/L1/CbmL1Track.h
+++ b/reco/L1/CbmL1Track.h
@@ -1,6 +1,6 @@
 /* Copyright (C) 2006-2021 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
    SPDX-License-Identifier: GPL-3.0-only
-   Authors: I.Kisel,  S.Gorbunov, Denis Bertini [committer], Igor Kulakov, Maxim Zyzak */
+   Authors: Ivan Kisel,  Sergey Gorbunov, Denis Bertini [committer], Igor Kulakov, Maksym Zyzak */
 
 /*
  *====================================================================
diff --git a/reco/L1/CbmL1TrackFitter.cxx b/reco/L1/CbmL1TrackFitter.cxx
index 1813f1b2c3e863a7676addff592da7da8cc1f01f..26564f93a88e098814593127c68364908d2f3c39 100644
--- a/reco/L1/CbmL1TrackFitter.cxx
+++ b/reco/L1/CbmL1TrackFitter.cxx
@@ -1,6 +1,6 @@
 /* Copyright (C) 2006-2007 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
    SPDX-License-Identifier: GPL-3.0-only
-   Authors: I.Kisel,  S.Gorbunov, Sergey Gorbunov, Denis Bertini [committer] */
+   Authors: Ivan Kisel,  Sergey Gorbunov, Denis Bertini [committer] */
 
 /*
  *=====================================================
diff --git a/reco/L1/CbmL1TrdHit.h b/reco/L1/CbmL1TrdHit.h
index 9e1b6e3e3289d78b49b31ee89e8d26fa101e82c8..1ae98230f9be793a053fc72cf6efa05fca797caf 100644
--- a/reco/L1/CbmL1TrdHit.h
+++ b/reco/L1/CbmL1TrdHit.h
@@ -1,6 +1,6 @@
 /* Copyright (C) 2006 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
    SPDX-License-Identifier: GPL-3.0-only
-   Authors: I.Kisel,  S.Gorbunov, Denis Bertini [committer] */
+   Authors: Ivan Kisel,  Sergey Gorbunov, Denis Bertini [committer] */
 
 /*
  *====================================================================
diff --git a/reco/L1/CbmL1Vtx.h b/reco/L1/CbmL1Vtx.h
index fa7144a3bc328216e2bad5e5742eb03138036250..288802829ee64960bf300103bc02ff4292cf54c3 100644
--- a/reco/L1/CbmL1Vtx.h
+++ b/reco/L1/CbmL1Vtx.h
@@ -1,6 +1,6 @@
 /* Copyright (C) 2006-2010 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
    SPDX-License-Identifier: GPL-3.0-only
-   Authors: I.Kisel, S.Gorbunov, Denis Bertini [committer], Igor Kulakov */
+   Authors: Ivan Kisel, Sergey Gorbunov, Denis Bertini [committer], Igor Kulakov */
 
 /*
  *====================================================================
diff --git a/reco/L1/L1Algo/L1Algo.cxx b/reco/L1/L1Algo/L1Algo.cxx
index 853ed3b35a9270c7eef3ab1b0aa046b6397443f0..ed2dd7c5764bff2beaac305d3a444acf8233712b 100644
--- a/reco/L1/L1Algo/L1Algo.cxx
+++ b/reco/L1/L1Algo/L1Algo.cxx
@@ -1,6 +1,6 @@
 /* Copyright (C) 2010-2021 Frankfurt Institute for Advanced Studies, Goethe-Universität Frankfurt, Frankfurt
    SPDX-License-Identifier: GPL-3.0-only
-   Authors: Igor Kulakov [committer], Maxim Zyzak, Valentina Akishina */
+   Authors: Igor Kulakov [committer], Maksym Zyzak, Valentina Akishina */
 
 #include "L1Algo.h"
 
diff --git a/reco/L1/L1Algo/L1Algo.h b/reco/L1/L1Algo/L1Algo.h
index b01db72734768ad7dc3681508aa3421741e7523f..135ef6a092db005683b4faa31b900ba7ad192a18 100644
--- a/reco/L1/L1Algo/L1Algo.h
+++ b/reco/L1/L1Algo/L1Algo.h
@@ -1,6 +1,6 @@
 /* Copyright (C) 2007-2021 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
    SPDX-License-Identifier: GPL-3.0-only
-   Authors: Maxim Zyzak, Valentina Akishina, Igor Kulakov */
+   Authors: Maksym Zyzak, Valentina Akishina, Igor Kulakov */
 
 #ifndef L1Algo_h
 #define L1Algo_h 1
diff --git a/reco/L1/L1Algo/L1Branch.h b/reco/L1/L1Algo/L1Branch.h
index 46cc82bad68d6f7bc2c17d02b4a3310c9662496a..10db5245a8f9e0526a6c75eddd530606c4502623 100644
--- a/reco/L1/L1Algo/L1Branch.h
+++ b/reco/L1/L1Algo/L1Branch.h
@@ -1,6 +1,6 @@
 /* Copyright (C) 2007-2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
    SPDX-License-Identifier: GPL-3.0-only
-   Authors: I.Kisel, S.Gorbunov, Maxim Zyzak, Sergey Gorbunov [committer], Valentina Akishina */
+   Authors: Ivan Kisel, Sergey Gorbunov [committer], Maksym Zyzak, Valentina Akishina */
 
 /*
  *====================================================================
diff --git a/reco/L1/L1Algo/L1CAMergeClones.cxx b/reco/L1/L1Algo/L1CAMergeClones.cxx
index d3ce73a2fa59d684c852b8ef787278526ff96a57..e196fdb414d1f4bbc01e6c9eacbb116945bd1ca5 100644
--- a/reco/L1/L1Algo/L1CAMergeClones.cxx
+++ b/reco/L1/L1Algo/L1CAMergeClones.cxx
@@ -1,6 +1,6 @@
 /* Copyright (C) 2010-2018 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
    SPDX-License-Identifier: GPL-3.0-only
-   Authors: M.Zyzak, Maxim Zyzak [committer] */
+   Authors: Maksym Zyzak */
 
 /*
  *=====================================================
diff --git a/reco/L1/L1Algo/L1CATrackFinder.cxx b/reco/L1/L1Algo/L1CATrackFinder.cxx
index e54d3975e246e719c06be502269d1e8f7aeb9df8..6a969def62eeef27598a118ef004575fc5638209 100644
--- a/reco/L1/L1Algo/L1CATrackFinder.cxx
+++ b/reco/L1/L1Algo/L1CATrackFinder.cxx
@@ -1,6 +1,6 @@
 /* Copyright (C) 2009-2021 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
    SPDX-License-Identifier: GPL-3.0-only
-   Authors: V.Akishina, I.Kisel, S.Gorbunov, I.Kulakov, M.Zyzak, Maxim Zyzak, Valentina Akishina, Igor Kulakov */
+   Authors: Valentina Akishina, Ivan Kisel, Sergey Gorbunov, Igor Kulakov, Maksym Zyzak */
 
 /*
  *=====================================================
diff --git a/reco/L1/L1Algo/L1Event.cxx b/reco/L1/L1Algo/L1Event.cxx
index 275648e210dd150a18f515306cffca0e8ec2bf12..0f5eb9de53114e70ce0ad98fb037370642946dfc 100644
--- a/reco/L1/L1Algo/L1Event.cxx
+++ b/reco/L1/L1Algo/L1Event.cxx
@@ -1,6 +1,6 @@
 /* Copyright (C) 2017 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
    SPDX-License-Identifier: GPL-3.0-only
-   Authors: Maxim Zyzak [committer] */
+   Authors: Maksym Zyzak [committer] */
 
 #include "L1Event.h"
 
diff --git a/reco/L1/L1Algo/L1EventEfficiencies.h b/reco/L1/L1Algo/L1EventEfficiencies.h
index a05ecb8c8f66d7b1393ceae153c848e41d574b95..6fb17225bb78d23e8644180b0fe1e46a5224e57d 100644
--- a/reco/L1/L1Algo/L1EventEfficiencies.h
+++ b/reco/L1/L1Algo/L1EventEfficiencies.h
@@ -1,6 +1,6 @@
 /* Copyright (C) 2017 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
    SPDX-License-Identifier: GPL-3.0-only
-   Authors: Maxim Zyzak [committer] */
+   Authors: Maksym Zyzak [committer] */
 
 #include "CbmL1Counters.h"
 
diff --git a/reco/L1/L1Algo/L1EventMatch.cxx b/reco/L1/L1Algo/L1EventMatch.cxx
index 9407dc967e83ac4399b6e9c2fab279f473455f09..9e57c874f8d8269c3ed9e90c1a3c5797b82b10fb 100644
--- a/reco/L1/L1Algo/L1EventMatch.cxx
+++ b/reco/L1/L1Algo/L1EventMatch.cxx
@@ -1,6 +1,6 @@
 /* Copyright (C) 2017 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
    SPDX-License-Identifier: GPL-3.0-only
-   Authors: Maxim Zyzak [committer] */
+   Authors: Maksym Zyzak [committer] */
 
 #include "L1EventMatch.h"
 
diff --git a/reco/L1/L1Algo/L1EventMatch.h b/reco/L1/L1Algo/L1EventMatch.h
index 572ccfb920beef81d97ba530f6949b26b670b1b3..95f6bd420f7fdd2e37025b510f81f3228e61ddf0 100644
--- a/reco/L1/L1Algo/L1EventMatch.h
+++ b/reco/L1/L1Algo/L1EventMatch.h
@@ -1,6 +1,6 @@
 /* Copyright (C) 2017 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
    SPDX-License-Identifier: GPL-3.0-only
-   Authors: Maxim Zyzak [committer] */
+   Authors: Maksym Zyzak [committer] */
 
 #ifndef L1EventMatch_H
 #define L1EventMatch_H
diff --git a/reco/L1/L1Algo/L1Extrapolation.h b/reco/L1/L1Algo/L1Extrapolation.h
index be8ce4950d5206b1b70e80304b37a5854330741f..87030095a81a452a362d3c067d268e5cf774f56a 100644
--- a/reco/L1/L1Algo/L1Extrapolation.h
+++ b/reco/L1/L1Algo/L1Extrapolation.h
@@ -1,6 +1,6 @@
 /* Copyright (C) 2007-2017 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
    SPDX-License-Identifier: GPL-3.0-only
-   Authors: Maxim Zyzak, Sergey Gorbunov [committer], Igor Kulakov */
+   Authors: Maksym Zyzak, Sergey Gorbunov [committer], Igor Kulakov */
 
 #ifndef L1Extrapolation_h
 #define L1Extrapolation_h
diff --git a/reco/L1/L1Algo/L1Field.h b/reco/L1/L1Algo/L1Field.h
index 043a3a6e8b9dd1c912179d80bfa9bc0548c08b67..674426eb8a0b4f55ff794b498cbbeb5685a3e8f9 100644
--- a/reco/L1/L1Algo/L1Field.h
+++ b/reco/L1/L1Algo/L1Field.h
@@ -1,6 +1,6 @@
 /* Copyright (C) 2007-2017 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
    SPDX-License-Identifier: GPL-3.0-only
-   Authors: Sergey Gorbunov [committer], Igor Kulakov, Maxim Zyzak */
+   Authors: Sergey Gorbunov [committer], Igor Kulakov, Maksym Zyzak */
 
 #ifndef L1Field_h
 #define L1Field_h 1
diff --git a/reco/L1/L1Algo/L1Filtration.h b/reco/L1/L1Algo/L1Filtration.h
index 31d85871e078eea7da4cdb0001c412d557e950a8..e3ecad8dc347eafe3f5132abdd84a75eb5337ee3 100644
--- a/reco/L1/L1Algo/L1Filtration.h
+++ b/reco/L1/L1Algo/L1Filtration.h
@@ -1,6 +1,6 @@
 /* Copyright (C) 2007-2018 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
    SPDX-License-Identifier: GPL-3.0-only
-   Authors: Sergey Gorbunov [committer], Maxim Zyzak, Igor Kulakov, Valentina Akishina */
+   Authors: Sergey Gorbunov [committer], Maksym Zyzak, Igor Kulakov, Valentina Akishina */
 
 #ifndef L1Filtration_h
 #define L1Filtration_h
diff --git a/reco/L1/L1Algo/L1Grid.cxx b/reco/L1/L1Algo/L1Grid.cxx
index 75e9009b942eb65787f10b9e0d5712e486374956..15e839ddc5b4146c3fb99f8dd5b77484aa66540d 100644
--- a/reco/L1/L1Algo/L1Grid.cxx
+++ b/reco/L1/L1Algo/L1Grid.cxx
@@ -1,6 +1,6 @@
 /* Copyright (C) 2017-2021 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
    SPDX-License-Identifier: GPL-3.0-only
-   Authors: Maxim Zyzak [committer], Valentina Akishina */
+   Authors: Maksym Zyzak [committer], Valentina Akishina */
 
 #include "L1Grid.h"
 
diff --git a/reco/L1/L1Algo/L1HitArea.h b/reco/L1/L1Algo/L1HitArea.h
index c7f09db9adbd0836d35a7694e530b0e40c7b306a..4e53fb5732b5e97429616c8c37799aa0a4428504 100644
--- a/reco/L1/L1Algo/L1HitArea.h
+++ b/reco/L1/L1Algo/L1HitArea.h
@@ -1,6 +1,6 @@
 /* Copyright (C) 2012-2020 Frankfurt Institute for Advanced Studies, Goethe-Universität Frankfurt, Frankfurt
    SPDX-License-Identifier: GPL-3.0-only
-   Authors: Maxim Zyzak, Igor Kulakov [committer] */
+   Authors: Maksym Zyzak, Igor Kulakov [committer] */
 
 #ifndef L1HitArea_H
 #define L1HitArea_H
diff --git a/reco/L1/L1Algo/L1HitPoint.h b/reco/L1/L1Algo/L1HitPoint.h
index 7b25912ccd739c74099c74c6611164cd93804bdb..c03eb6d67f1aeba4ae25b5bd96c8b1a57c722258 100644
--- a/reco/L1/L1Algo/L1HitPoint.h
+++ b/reco/L1/L1Algo/L1HitPoint.h
@@ -1,6 +1,6 @@
 /* Copyright (C) 2010-2020 Frankfurt Institute for Advanced Studies, Goethe-Universität Frankfurt, Frankfurt
    SPDX-License-Identifier: GPL-3.0-only
-   Authors: Valentina Akishina, Igor Kulakov [committer], Maxim Zyzak */
+   Authors: Valentina Akishina, Igor Kulakov [committer], Maksym Zyzak */
 
 #ifndef _L1HitPoint_h_
 #define _L1HitPoint_h_
diff --git a/reco/L1/L1Algo/L1HitsSortHelper.h b/reco/L1/L1Algo/L1HitsSortHelper.h
index f19d634ada26747a586973a0a65199b334786247..2dd50fe725ea29081e617d3c2fafaf45a2e54708 100644
--- a/reco/L1/L1Algo/L1HitsSortHelper.h
+++ b/reco/L1/L1Algo/L1HitsSortHelper.h
@@ -1,6 +1,6 @@
 /* Copyright (C) 2012-2020 Frankfurt Institute for Advanced Studies, Goethe-Universität Frankfurt, Frankfurt
    SPDX-License-Identifier: GPL-3.0-only
-   Authors: Igor Kulakov [committer], Maxim Zyzak */
+   Authors: Igor Kulakov [committer], Maksym Zyzak */
 
 #ifndef _L1HitsL1HitsSortHelper_h_
 #define _L1HitsL1HitsSortHelper_h_
diff --git a/reco/L1/L1Algo/L1MCEvent.cxx b/reco/L1/L1Algo/L1MCEvent.cxx
index 1a5e837f831d789a80d63ecfc420aaec0369f5ce..5ca0a866e227406b0b50124f42e5fc41f972011e 100644
--- a/reco/L1/L1Algo/L1MCEvent.cxx
+++ b/reco/L1/L1Algo/L1MCEvent.cxx
@@ -1,6 +1,6 @@
 /* Copyright (C) 2017-2021 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
    SPDX-License-Identifier: GPL-3.0-only
-   Authors: Maxim Zyzak [committer] */
+   Authors: Maksym Zyzak [committer] */
 
 #include "L1MCEvent.h"
 
diff --git a/reco/L1/L1Algo/L1MCEvent.h b/reco/L1/L1Algo/L1MCEvent.h
index 5f4299bd0335761ea918e32dbb1ae8ca1db3983c..6ac4761ce0139ec0866e7167238cd0485f49e2d2 100644
--- a/reco/L1/L1Algo/L1MCEvent.h
+++ b/reco/L1/L1Algo/L1MCEvent.h
@@ -1,6 +1,6 @@
 /* Copyright (C) 2017-2021 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
    SPDX-License-Identifier: GPL-3.0-only
-   Authors: Maxim Zyzak [committer] */
+   Authors: Maksym Zyzak [committer] */
 
 #ifndef L1MCEvent_H
 #define L1MCEvent_H
diff --git a/reco/L1/L1Algo/L1StsHit.h b/reco/L1/L1Algo/L1StsHit.h
index e90cb81361f1f10fd0d5302504ce4e83ba86b9fd..7b31bbcf6f583423e8145fb42e3eb6e9b2fc172c 100644
--- a/reco/L1/L1Algo/L1StsHit.h
+++ b/reco/L1/L1Algo/L1StsHit.h
@@ -1,6 +1,6 @@
 /* Copyright (C) 2007-2021 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
    SPDX-License-Identifier: GPL-3.0-only
-   Authors: Valentina Akishina, Igor Kulakov, Sergey Gorbunov [committer], Maxim Zyzak */
+   Authors: Valentina Akishina, Igor Kulakov, Sergey Gorbunov [committer], Maksym Zyzak */
 
 #ifndef _L1StsHit_h_
 #define _L1StsHit_h_
diff --git a/reco/L1/L1Algo/L1Timer.h b/reco/L1/L1Algo/L1Timer.h
index d0f49a33444a1d4a9ea0e1a54615802b9f5d2ef9..fb392b90942146e34904496c4bfeb244f90b88ea 100644
--- a/reco/L1/L1Algo/L1Timer.h
+++ b/reco/L1/L1Algo/L1Timer.h
@@ -1,6 +1,6 @@
 /* Copyright (C) 2012-2019 Frankfurt Institute for Advanced Studies, Goethe-Universitaet Frankfurt, Frankfurt
    SPDX-License-Identifier: GPL-3.0-only
-   Authors: Igor Kulakov [committer], Maxim Zyzak */
+   Authors: Igor Kulakov [committer], Maksym Zyzak */
 
 #ifndef _L1Timer_H
 #define _L1Timer_H
diff --git a/reco/L1/L1Algo/L1Track.h b/reco/L1/L1Algo/L1Track.h
index 623f10826c7978eea4dd887f3214650514749860..181b6b3aeba866c80f72a6da57ccd4797c64fb05 100644
--- a/reco/L1/L1Algo/L1Track.h
+++ b/reco/L1/L1Algo/L1Track.h
@@ -1,6 +1,6 @@
 /* Copyright (C) 2010-2017 Frankfurt Institute for Advanced Studies, Goethe-Universitaet Frankfurt, Frankfurt
    SPDX-License-Identifier: GPL-3.0-only
-   Authors: I.Kisel,  S.Gorbunov, Maxim Zyzak, Igor Kulakov [committer] */
+   Authors: Ivan Kisel,  Sergey Gorbunov, Maksym Zyzak, Igor Kulakov [committer] */
 
 /*
  *====================================================================
diff --git a/reco/L1/L1Algo/L1TrackExtender.cxx b/reco/L1/L1Algo/L1TrackExtender.cxx
index 2cee9c51bff30dce983a3695a1c12180739161c9..0a660b145fdb5f3f4c41b90964e99853834f425d 100644
--- a/reco/L1/L1Algo/L1TrackExtender.cxx
+++ b/reco/L1/L1Algo/L1TrackExtender.cxx
@@ -1,6 +1,6 @@
 /* Copyright (C) 2010-2021 Frankfurt Institute for Advanced Studies, Goethe-Universität Frankfurt, Frankfurt
    SPDX-License-Identifier: GPL-3.0-only
-   Authors: Igor Kulakov [committer], Maxim Zyzak, Valentina Akishina */
+   Authors: Igor Kulakov [committer], Maksym Zyzak, Valentina Akishina */
 
 #include <iostream>
 
diff --git a/reco/L1/L1Algo/L1TrackFitter.cxx b/reco/L1/L1Algo/L1TrackFitter.cxx
index 095e8be099ce7a42186366589ff529309eeebbab..070c3113ca78761270de35b157ecf3822bccff49 100644
--- a/reco/L1/L1Algo/L1TrackFitter.cxx
+++ b/reco/L1/L1Algo/L1TrackFitter.cxx
@@ -1,6 +1,6 @@
 /* Copyright (C) 2010-2020 Frankfurt Institute for Advanced Studies, Goethe-Universitaet Frankfurt, Frankfurt
    SPDX-License-Identifier: GPL-3.0-only
-   Authors: I.Kisel, S.Gorbunov, I.Kulakov, Valentina Akishina, Igor Kulakov [committer], Maxim Zyzak */
+   Authors: Ivan Kisel, Sergey Gorbunov, Igor Kulakov [committer], Valentina Akishina, Maksym Zyzak */
 
 #include <iostream>
 #include <vector>
diff --git a/reco/L1/L1Algo/L1TrackPar.h b/reco/L1/L1Algo/L1TrackPar.h
index 19fa7fa0c0d7be1dc7f5f10890ea44fc8968d8dc..03b713c31e59e96c0dbfe778f2214fd285337ed8 100644
--- a/reco/L1/L1Algo/L1TrackPar.h
+++ b/reco/L1/L1Algo/L1TrackPar.h
@@ -1,6 +1,6 @@
 /* Copyright (C) 2007-2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
    SPDX-License-Identifier: GPL-3.0-only
-   Authors: Igor Kulakov, Maxim Zyzak */
+   Authors: Igor Kulakov, Maksym Zyzak */
 
 #ifndef L1TrackPar_h
 #define L1TrackPar_h 1
diff --git a/reco/L1/L1Algo/L1TrackParFit.cxx b/reco/L1/L1Algo/L1TrackParFit.cxx
index 1544a2b33ada4a2df495a16ef07f6f1cb2a49a15..934a0c8f93aed7929ed4f7701a2f521eafe08d65 100644
--- a/reco/L1/L1Algo/L1TrackParFit.cxx
+++ b/reco/L1/L1Algo/L1TrackParFit.cxx
@@ -1,6 +1,6 @@
 /* Copyright (C) 2017-2021 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
    SPDX-License-Identifier: GPL-3.0-only
-   Authors: Maxim Zyzak [committer], Valentina Akishina */
+   Authors: Maksym Zyzak [committer], Valentina Akishina */
 
 #include "L1TrackParFit.h"
 
diff --git a/reco/L1/L1Algo/L1TrackParFit.h b/reco/L1/L1Algo/L1TrackParFit.h
index 1f025c7df22909626d41fd4a7471a2518aaaa3d3..9dceeb8911ba182e42af7be89578a474e5645bc5 100644
--- a/reco/L1/L1Algo/L1TrackParFit.h
+++ b/reco/L1/L1Algo/L1TrackParFit.h
@@ -1,6 +1,6 @@
 /* Copyright (C) 2017-2021 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
    SPDX-License-Identifier: GPL-3.0-only
-   Authors: Maxim Zyzak [committer], Sergey Gorbunov */
+   Authors: Maksym Zyzak [committer], Sergey Gorbunov */
 
 #ifndef L1TrackParFit_h
 #define L1TrackParFit_h
diff --git a/reco/L1/L1AlgoInputData.cxx b/reco/L1/L1AlgoInputData.cxx
index 01e546ceb8276a7de11de9a7807a697c3eb78459..45203ea1074295c262f113a8da161091ed05783e 100644
--- a/reco/L1/L1AlgoInputData.cxx
+++ b/reco/L1/L1AlgoInputData.cxx
@@ -1,6 +1,6 @@
 /* Copyright (C) 2017-2021 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
    SPDX-License-Identifier: GPL-3.0-only
-   Authors: Maxim Zyzak [committer] */
+   Authors: Maksym Zyzak [committer] */
 
 #include "L1AlgoInputData.h"
 
diff --git a/reco/L1/L1AlgoInputData.h b/reco/L1/L1AlgoInputData.h
index a36959830368cabaa69239b06490c53255fdc419..5185cd29eb367a387fc0ea55d74d706f02a4b3ae 100644
--- a/reco/L1/L1AlgoInputData.h
+++ b/reco/L1/L1AlgoInputData.h
@@ -1,6 +1,6 @@
 /* Copyright (C) 2017-2021 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
    SPDX-License-Identifier: GPL-3.0-only
-   Authors: Maxim Zyzak [committer], Valentina Akishina */
+   Authors: Maksym Zyzak [committer], Valentina Akishina */
 
 #ifndef _L1AlgoInputData_h
 #define _L1AlgoInputData_h
diff --git a/reco/L1/OffLineInterface/CbmL1RichENNRingFinder.cxx b/reco/L1/OffLineInterface/CbmL1RichENNRingFinder.cxx
index ab2d12515eba37c34b6196b09f6d8d5979ae2363..408608ec4ad1a9615eba5b61aeb372334eb4d352 100644
--- a/reco/L1/OffLineInterface/CbmL1RichENNRingFinder.cxx
+++ b/reco/L1/OffLineInterface/CbmL1RichENNRingFinder.cxx
@@ -1,6 +1,6 @@
 /* Copyright (C) 2006-2021 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
    SPDX-License-Identifier: GPL-3.0-only
-   Authors: I.Kisel, S.Gorbunov, Denis Bertini [committer], Semen Lebedev, Florian Uhlig, Igor Kulakov */
+   Authors: Ivan Kisel, Sergey Gorbunov, Denis Bertini [committer], Semen Lebedev, Florian Uhlig, Igor Kulakov */
 
 /*
  *====================================================================
diff --git a/reco/L1/OffLineInterface/CbmL1RichENNRingFinder.h b/reco/L1/OffLineInterface/CbmL1RichENNRingFinder.h
index e306d9894ace662a6ae981253ed7fef639811748..3c0807986a9ffc625c21fa25755d251882e55774 100644
--- a/reco/L1/OffLineInterface/CbmL1RichENNRingFinder.h
+++ b/reco/L1/OffLineInterface/CbmL1RichENNRingFinder.h
@@ -1,6 +1,6 @@
 /* Copyright (C) 2006-2021 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
    SPDX-License-Identifier: GPL-3.0-only
-   Authors: I.Kisel, S.Gorbunov, Denis Bertini [committer], Igor Kulakov */
+   Authors: Ivan Kisel, Sergey Gorbunov, Denis Bertini [committer], Igor Kulakov */
 
 /*
  *====================================================================
diff --git a/reco/L1/OffLineInterface/CbmL1RichENNRingFinderParallel.cxx b/reco/L1/OffLineInterface/CbmL1RichENNRingFinderParallel.cxx
index 0f901a1e8135fa18514700adcd396388f2e5db92..1307c9ac723dfdf68fc210b53396dcf129e22309 100644
--- a/reco/L1/OffLineInterface/CbmL1RichENNRingFinderParallel.cxx
+++ b/reco/L1/OffLineInterface/CbmL1RichENNRingFinderParallel.cxx
@@ -1,6 +1,6 @@
 /* Copyright (C) 2010-2021 Frankfurt Institute for Advanced Studies, Goethe-Universitaet Frankfurt, Frankfurt
    SPDX-License-Identifier: GPL-3.0-only
-   Authors: I.Kisel, S.Gorbunov, Igor Kulakov [committer] */
+   Authors: Ivan Kisel, Sergey Gorbunov, Igor Kulakov [committer] */
 
 /*
  *====================================================================
diff --git a/reco/L1/OffLineInterface/CbmL1RichENNRingFinderParallel.h b/reco/L1/OffLineInterface/CbmL1RichENNRingFinderParallel.h
index 53ff742317aebc259e72bf2e860878fb904b3df7..6ebb5ab0c43ae6a54649aa3273fa9aab83b86b88 100644
--- a/reco/L1/OffLineInterface/CbmL1RichENNRingFinderParallel.h
+++ b/reco/L1/OffLineInterface/CbmL1RichENNRingFinderParallel.h
@@ -1,6 +1,6 @@
 /* Copyright (C) 2010-2021 Frankfurt Institute for Advanced Studies, Goethe-Universitaet Frankfurt, Frankfurt
    SPDX-License-Identifier: GPL-3.0-only
-   Authors: I.Kisel, S.Gorbunov, Igor Kulakov [committer] */
+   Authors: Ivan Kisel, Sergey Gorbunov, Igor Kulakov [committer] */
 
 /*
  *====================================================================
diff --git a/reco/L1/OffLineInterface/CbmL1StsTrackFinder.cxx b/reco/L1/OffLineInterface/CbmL1StsTrackFinder.cxx
index 11715e4b4bee3ece0f96fe6324839322b6688792..128364d7730fe792027730fe020f0fa506f5db32 100644
--- a/reco/L1/OffLineInterface/CbmL1StsTrackFinder.cxx
+++ b/reco/L1/OffLineInterface/CbmL1StsTrackFinder.cxx
@@ -1,6 +1,6 @@
 /* Copyright (C) 2006-2021 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
    SPDX-License-Identifier: GPL-3.0-only
-   Authors: I.Kisel, S.Gorbunov, Volker Friese, Denis Bertini [committer], Sergey Gorbunov */
+   Authors: Ivan Kisel, Sergey Gorbunov, Volker Friese, Denis Bertini [committer] */
 
 /*
  *====================================================================
diff --git a/reco/L1/OffLineInterface/CbmL1StsTrackFinder.h b/reco/L1/OffLineInterface/CbmL1StsTrackFinder.h
index f3c758464f09bafa48dbf7eb2564c68da65cf546..d2155623228c5834d79f1c246082208320a98d4f 100644
--- a/reco/L1/OffLineInterface/CbmL1StsTrackFinder.h
+++ b/reco/L1/OffLineInterface/CbmL1StsTrackFinder.h
@@ -1,6 +1,6 @@
 /* Copyright (C) 2006-2021 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
    SPDX-License-Identifier: GPL-3.0-only
-   Authors: I.Kisel, S.Gorbunov, Denis Bertini [committer], Volker Friese */
+   Authors: Ivan Kisel, Sergey Gorbunov, Denis Bertini [committer], Volker Friese */
 
 /*
  *====================================================================
diff --git a/reco/L1/ParticleFinder/CbmL1PFFitter.cxx b/reco/L1/ParticleFinder/CbmL1PFFitter.cxx
index ff27175cd574162e7dbee06456202d7156bb8d33..0c45120ebecda04084d5f9998e158a588d67542b 100644
--- a/reco/L1/ParticleFinder/CbmL1PFFitter.cxx
+++ b/reco/L1/ParticleFinder/CbmL1PFFitter.cxx
@@ -1,6 +1,6 @@
 /* Copyright (C) 2011-2021 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
    SPDX-License-Identifier: GPL-3.0-only
-   Authors: M.Zyzak, Maxim Zyzak [committer] */
+   Authors: Maksym Zyzak */
 
 /*
  *=====================================================
diff --git a/reco/L1/ParticleFinder/CbmL1PFFitter.h b/reco/L1/ParticleFinder/CbmL1PFFitter.h
index e4fb3566266b97ba21171c4d3c770cec03d36913..8c7c40157ae4e4791439a526e61b03eed6afe482 100644
--- a/reco/L1/ParticleFinder/CbmL1PFFitter.h
+++ b/reco/L1/ParticleFinder/CbmL1PFFitter.h
@@ -1,6 +1,6 @@
 /* Copyright (C) 2011-2016 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
    SPDX-License-Identifier: GPL-3.0-only
-   Authors: M.Zyzak, Maxim Zyzak [committer] */
+   Authors: Maksym Zyzak */
 
 /*
  *=====================================================
diff --git a/reco/L1/ParticleFinder/CbmL1PFMCParticle.cxx b/reco/L1/ParticleFinder/CbmL1PFMCParticle.cxx
index f6afbff6e99c4aaaa0603d1c625bdad0c76feda2..ca3c1196a9ac203b211032885ec2c79a800f30f8 100644
--- a/reco/L1/ParticleFinder/CbmL1PFMCParticle.cxx
+++ b/reco/L1/ParticleFinder/CbmL1PFMCParticle.cxx
@@ -1,6 +1,6 @@
 /* Copyright (C) 2011 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
    SPDX-License-Identifier: GPL-3.0-only
-   Authors: M.Zyzak, Maxim Zyzak [committer] */
+   Authors: Maksym Zyzak */
 
 /*
  *=====================================================
diff --git a/reco/L1/ParticleFinder/CbmL1PFMCParticle.h b/reco/L1/ParticleFinder/CbmL1PFMCParticle.h
index 16baa1561067be9affaccd311307e20e2d9e3267..4b0e34a901f9125d19f2ca89d3e8c133b7ea8162 100644
--- a/reco/L1/ParticleFinder/CbmL1PFMCParticle.h
+++ b/reco/L1/ParticleFinder/CbmL1PFMCParticle.h
@@ -1,6 +1,6 @@
 /* Copyright (C) 2011-2017 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
    SPDX-License-Identifier: GPL-3.0-only
-   Authors: M.Zyzak, Maxim Zyzak [committer] */
+   Authors: Maksym Zyzak */
 
 /*
  *=====================================================
diff --git a/reco/L1/PerformanceConstants.h b/reco/L1/PerformanceConstants.h
index 54f34d2b4510df7ec8ff97f77d87e03eee9f8b81..476df0f8c7880ccc7cad3d5b12a6241bf14ee477 100644
--- a/reco/L1/PerformanceConstants.h
+++ b/reco/L1/PerformanceConstants.h
@@ -1,6 +1,6 @@
 /* Copyright (C) 2017 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
    SPDX-License-Identifier: GPL-3.0-only
-   Authors: Maxim Zyzak [committer] */
+   Authors: Maksym Zyzak [committer] */
 
 #ifndef _PerformanceConstants_h
 #define _PerformanceConstants_h
diff --git a/reco/L1/vectors/P4_F32vec4.h b/reco/L1/vectors/P4_F32vec4.h
index 88bee641f7ae6f2332009aa94df2daf7146113d7..6cf8ba662acb2489a937280e818188bbc1159495 100644
--- a/reco/L1/vectors/P4_F32vec4.h
+++ b/reco/L1/vectors/P4_F32vec4.h
@@ -1,6 +1,6 @@
 /* Copyright (C) 2010-2014 Frankfurt Institute for Advanced Studies, Goethe-Universität Frankfurt, Frankfurt
    SPDX-License-Identifier: GPL-3.0-only
-   Authors: Igor Kulakov [committer], Maxim Zyzak */
+   Authors: Igor Kulakov [committer], Maksym Zyzak */
 
 #ifndef L1Algo_F32vec4P4_H
 #define L1Algo_F32vec4P4_H
diff --git a/reco/L1/vectors/P4_F64vec2.h b/reco/L1/vectors/P4_F64vec2.h
index cc00c31a762c94079853f7eb79f076ac49b46128..9f114f928144c7dd9e043203566e744409fd07fc 100644
--- a/reco/L1/vectors/P4_F64vec2.h
+++ b/reco/L1/vectors/P4_F64vec2.h
@@ -1,6 +1,6 @@
 /* Copyright (C) 2012 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
    SPDX-License-Identifier: GPL-3.0-only
-   Authors: Maxim Zyzak [committer] */
+   Authors: Maksym Zyzak [committer] */
 
 #ifndef L1Algo_F64vec2P4_H
 #define L1Algo_F64vec2P4_H
diff --git a/reco/base/CbmGlobalTrackFitter.cxx b/reco/base/CbmGlobalTrackFitter.cxx
index 97a4fa923cf5aca8c69cda40bcf29d058e0dc5a8..550a6976d4b54e70651647cb00805d7d26f2acb3 100644
--- a/reco/base/CbmGlobalTrackFitter.cxx
+++ b/reco/base/CbmGlobalTrackFitter.cxx
@@ -1,6 +1,6 @@
 /* Copyright (C) 2006 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
    SPDX-License-Identifier: GPL-3.0-only
-   Authors: D.Kresan, Denis Bertini [committer] */
+   Authors: Dmytro Kresan, Denis Bertini [committer] */
 
 // ------------------------------------------------------------------
 // -----                    CbmGlobalTrackFitter                -----
diff --git a/reco/base/CbmGlobalTrackFitter.h b/reco/base/CbmGlobalTrackFitter.h
index e2391b0428a72a3f21ab1d0477af5202b6d3d9e3..d4e300d0a6f979f8db4c2ffbe6b68996f483f276 100644
--- a/reco/base/CbmGlobalTrackFitter.h
+++ b/reco/base/CbmGlobalTrackFitter.h
@@ -1,6 +1,6 @@
 /* Copyright (C) 2006-2012 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
    SPDX-License-Identifier: GPL-3.0-only
-   Authors: D.Kresan, Denis Bertini [committer] */
+   Authors: Dmytro Kresan, Denis Bertini [committer] */
 
 // ------------------------------------------------------------------
 // -----                    CbmGlobalTrackFitter                -----
diff --git a/reco/base/CbmMuchTrackFinder.cxx b/reco/base/CbmMuchTrackFinder.cxx
index 5a4967c676a3c1a971ed2ede596148b32f0b33b4..6d5612b8bb250404340592f17ea256a3447de846 100644
--- a/reco/base/CbmMuchTrackFinder.cxx
+++ b/reco/base/CbmMuchTrackFinder.cxx
@@ -1,6 +1,6 @@
 /* Copyright (C) 2007-2009 St. Petersburg Polytechnic University, St. Petersburg
    SPDX-License-Identifier: GPL-3.0-only
-   Authors: A.Lebedev, Florian Uhlig, Mikhail Ryzhinskiy [committer] */
+   Authors: Andrey Lebedev, Florian Uhlig, Mikhail Ryzhinskiy [committer] */
 
 /** CbmMuchTrackFinder.h
  *@author A.Lebedev <Andrey.Lebedev@gsi.de>
diff --git a/reco/base/CbmMuchTrackFinder.h b/reco/base/CbmMuchTrackFinder.h
index 2dd6532da001bd49cc21f2316eee78eb7787945b..b147b0afc179a5ddc2eb5cb9e48e397925acf59d 100644
--- a/reco/base/CbmMuchTrackFinder.h
+++ b/reco/base/CbmMuchTrackFinder.h
@@ -1,6 +1,6 @@
 /* Copyright (C) 2007-2009 St. Petersburg Polytechnic University, St. Petersburg
    SPDX-License-Identifier: GPL-3.0-only
-   Authors: A.Lebedev, Mikhail Ryzhinskiy [committer], Florian Uhlig */
+   Authors: Andrey Lebedev, Mikhail Ryzhinskiy [committer], Florian Uhlig */
 
 /** CbmMuchTrackFinder.h
  *@author A.Lebedev <Andrey.Lebedev@gsi.de>
diff --git a/reco/base/CbmPrimaryVertexFinder.cxx b/reco/base/CbmPrimaryVertexFinder.cxx
index 40ae21ef9c09837ef60bfc27b9d2f807c241e5b0..a05948e46433adab323e7b69fd72d44065055655 100644
--- a/reco/base/CbmPrimaryVertexFinder.cxx
+++ b/reco/base/CbmPrimaryVertexFinder.cxx
@@ -1,6 +1,6 @@
 /* Copyright (C) 2005-2006 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
    SPDX-License-Identifier: GPL-3.0-only
-   Authors: V. Friese, Denis Bertini [committer] */
+   Authors: Volker Friese, Denis Bertini [committer] */
 
 // -------------------------------------------------------------------------
 // -----                CbmPrimaryVertexFinder source file             -----
diff --git a/reco/base/CbmPrimaryVertexFinder.h b/reco/base/CbmPrimaryVertexFinder.h
index a5910033db7557faaf239ad13490e610e151e953..23f3c29726b4fdca22b9954201bbd70bfaf900de 100644
--- a/reco/base/CbmPrimaryVertexFinder.h
+++ b/reco/base/CbmPrimaryVertexFinder.h
@@ -1,6 +1,6 @@
 /* Copyright (C) 2006-2016 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
    SPDX-License-Identifier: GPL-3.0-only
-   Authors: V.Friese ,v.friese@gsi.de>, Denis Bertini [committer], Volker Friese */
+   Authors: Volker Friese, Denis Bertini [committer] */
 
 // -------------------------------------------------------------------------
 // -----                CbmPrimaryVertexFinder header file             -----
diff --git a/reco/base/CbmRichMerger.cxx b/reco/base/CbmRichMerger.cxx
index f6d80ff32941589a81ce0dfe48c114acd403456a..c92971f6f4c090f6480aa7d9b19a15ceaeb31aef 100644
--- a/reco/base/CbmRichMerger.cxx
+++ b/reco/base/CbmRichMerger.cxx
@@ -1,6 +1,6 @@
 /* Copyright (C) 2005-2006 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
    SPDX-License-Identifier: GPL-3.0-only
-   Authors: V. Friese, Denis Bertini [committer] */
+   Authors: Volker Friese, Denis Bertini [committer] */
 
 // -------------------------------------------------------------------------
 // -----                     CbmRichMerger source file                 -----
diff --git a/reco/base/CbmRichMerger.h b/reco/base/CbmRichMerger.h
index 78069a9382eb173d2382a60325e906eaebb7533a..6aca78d79ef131d69ee708c20627b13bf51fb869 100644
--- a/reco/base/CbmRichMerger.h
+++ b/reco/base/CbmRichMerger.h
@@ -1,6 +1,6 @@
 /* Copyright (C) 2006-2012 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
    SPDX-License-Identifier: GPL-3.0-only
-   Authors: v.friese@gsi.de, Denis Bertini [committer] */
+   Authors: Volker Friese, Denis Bertini [committer] */
 
 // -------------------------------------------------------------------------
 // -----                     CbmRichMerger header file                 -----
diff --git a/reco/base/CbmStsTrackFinder.cxx b/reco/base/CbmStsTrackFinder.cxx
index 579e0ebe2bc021a72a264331bb44e71ba06639c1..1672f9584a04d7ac7c5bada9dcfdb9bdab84025e 100644
--- a/reco/base/CbmStsTrackFinder.cxx
+++ b/reco/base/CbmStsTrackFinder.cxx
@@ -1,6 +1,6 @@
 /* Copyright (C) 2005-2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
    SPDX-License-Identifier: GPL-3.0-only
-   Authors: V. Friese, Evgeny Lavrik, Florian Uhlig */
+   Authors: Volker Friese, Evgeny Lavrik, Florian Uhlig */
 
 // -------------------------------------------------------------------------
 // -----                   CbmStsTrackFinder source file               -----
diff --git a/reco/base/CbmStsTrackFitter.cxx b/reco/base/CbmStsTrackFitter.cxx
index a466ae4d8bdfa9622edcf2ccf55b5fd25ed564d3..af8f8d84bd51505c07a0068ec6e81280f612a563 100644
--- a/reco/base/CbmStsTrackFitter.cxx
+++ b/reco/base/CbmStsTrackFitter.cxx
@@ -1,6 +1,6 @@
 /* Copyright (C) 2005-2006 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
    SPDX-License-Identifier: GPL-3.0-only
-   Authors: V. Friese, Denis Bertini [committer] */
+   Authors: Volker Friese, Denis Bertini [committer] */
 
 // -------------------------------------------------------------------------
 // -----                   CbmStsTrackFitter source file               -----
diff --git a/reco/base/CbmStsTrackFitter.h b/reco/base/CbmStsTrackFitter.h
index 942f85281931265b255d5dc8f576e700b31a53ff..302697f58f489e37deba0b8e0ffd9c3afebe6750 100644
--- a/reco/base/CbmStsTrackFitter.h
+++ b/reco/base/CbmStsTrackFitter.h
@@ -1,6 +1,6 @@
 /* Copyright (C) 2006-2011 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
    SPDX-License-Identifier: GPL-3.0-only
-   Authors: V.Friese, Denis Bertini [committer] */
+   Authors: Volker Friese, Denis Bertini [committer] */
 
 // -------------------------------------------------------------------------
 // -----                   CbmStsTrackFitter header file               -----
diff --git a/reco/base/CbmTofTrackFinder.cxx b/reco/base/CbmTofTrackFinder.cxx
index e95bb8b56e88b35bacf4a0c8f314e8b7d10b576f..0c8f7506fb1417e912e0884ad481d9dc2fcf30b5 100644
--- a/reco/base/CbmTofTrackFinder.cxx
+++ b/reco/base/CbmTofTrackFinder.cxx
@@ -1,6 +1,6 @@
 /* Copyright (C) 2005-2015 PI-UHd, GSI
    SPDX-License-Identifier: GPL-3.0-only
-   Authors: D. Kresan, Norbert Herrmann [committer] */
+   Authors: Dmytro Kresan, Norbert Herrmann [committer] */
 
 // -------------------------------------------------------------------------
 // -----                   CbmTrdTrackFinder source file               -----
diff --git a/reco/base/CbmTofTrackFinder.h b/reco/base/CbmTofTrackFinder.h
index ef6ef8bfec559a0dfb5f28e162e06817d888ddb1..ac25caf6f15b3ec804d267a46e8194ac293d7ac5 100644
--- a/reco/base/CbmTofTrackFinder.h
+++ b/reco/base/CbmTofTrackFinder.h
@@ -1,6 +1,6 @@
 /* Copyright (C) 2015-2020 PI-UHd, GSI
    SPDX-License-Identifier: GPL-3.0-only
-   Authors: D.Kresan, Norbert Herrmann [committer], Florian Uhlig */
+   Authors: Dmytro Kresan, Norbert Herrmann [committer], Florian Uhlig */
 
 // -------------------------------------------------------------------------
 // -----                   CbmTofTrackFinder header file               -----
diff --git a/reco/base/CbmTofTrackFitter.cxx b/reco/base/CbmTofTrackFitter.cxx
index 48bf86438460229d855fdb37e7b17f14e9db130e..2b60e57fb4ba6defc6ccf45c7813a971e4bd245e 100644
--- a/reco/base/CbmTofTrackFitter.cxx
+++ b/reco/base/CbmTofTrackFitter.cxx
@@ -1,6 +1,6 @@
 /* Copyright (C) 2005-2015 PI-UHd, GSI
    SPDX-License-Identifier: GPL-3.0-only
-   Authors: V. Friese, Norbert Herrmann [committer] */
+   Authors: Volker Friese, Norbert Herrmann [committer] */
 
 // -------------------------------------------------------------------------
 // -----                   CbmTofTrackFitter source file               -----
diff --git a/reco/base/CbmTofTrackFitter.h b/reco/base/CbmTofTrackFitter.h
index 899381393f43f1b7673a5a87c3ee5c35c72baee0..6d7b905e39603d6ce7d0cdc4f9a78bb9ae2bacfb 100644
--- a/reco/base/CbmTofTrackFitter.h
+++ b/reco/base/CbmTofTrackFitter.h
@@ -1,6 +1,6 @@
 /* Copyright (C) 2015 PI-UHd, GSI
    SPDX-License-Identifier: GPL-3.0-only
-   Authors: D.Kresan, Norbert Herrmann [committer] */
+   Authors: Dmytro Kresan, Norbert Herrmann [committer] */
 
 // -------------------------------------------------------------------------
 // -----                   CbmTofTrackFitter header file               -----
diff --git a/reco/base/CbmTrackMerger.cxx b/reco/base/CbmTrackMerger.cxx
index 527f0786d264acf32880b051b556b36619f3def5..062922c032ada48ec8db79baf90badb9a49638fd 100644
--- a/reco/base/CbmTrackMerger.cxx
+++ b/reco/base/CbmTrackMerger.cxx
@@ -1,6 +1,6 @@
 /* Copyright (C) 2005-2006 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
    SPDX-License-Identifier: GPL-3.0-only
-   Authors: V. Friese, Denis Bertini [committer] */
+   Authors: Volker Friese, Denis Bertini [committer] */
 
 // -------------------------------------------------------------------------
 // -----                    CbmTrackMerger source file                 -----
diff --git a/reco/base/CbmTrackMerger.h b/reco/base/CbmTrackMerger.h
index 51688dd06ab189f3ba96d5dde5edcddd12ea0aa9..6b661d2e5f10de1ada438664250228067495d9c2 100644
--- a/reco/base/CbmTrackMerger.h
+++ b/reco/base/CbmTrackMerger.h
@@ -1,6 +1,6 @@
 /* Copyright (C) 2006-2012 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
    SPDX-License-Identifier: GPL-3.0-only
-   Authors: v.friese@gsi.de, Denis Bertini [committer] */
+   Authors: Volker Friese, Denis Bertini [committer] */
 
 // -------------------------------------------------------------------------
 // -----                     CbmTrackMerger header file                -----
diff --git a/reco/base/CbmTrdTrackFinder.cxx b/reco/base/CbmTrdTrackFinder.cxx
index 9e8e262c742ff9305351641a385cfbeb332328d6..37ebedea5c150ea35269bd545322629c0f99ae41 100644
--- a/reco/base/CbmTrdTrackFinder.cxx
+++ b/reco/base/CbmTrdTrackFinder.cxx
@@ -1,6 +1,6 @@
 /* Copyright (C) 2005-2006 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
    SPDX-License-Identifier: GPL-3.0-only
-   Authors: D. Kresan, Denis Bertini [committer] */
+   Authors: Dmytro Kresan, Denis Bertini [committer] */
 
 // -------------------------------------------------------------------------
 // -----                   CbmTrdTrackFinder source file               -----
diff --git a/reco/base/CbmTrdTrackFinder.h b/reco/base/CbmTrdTrackFinder.h
index df9f0eb77e2cd55530308e81c7990f77d539684a..4ba1da44467e27ad43a3c33a7363792f13dbed15 100644
--- a/reco/base/CbmTrdTrackFinder.h
+++ b/reco/base/CbmTrdTrackFinder.h
@@ -1,6 +1,6 @@
 /* Copyright (C) 2006 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
    SPDX-License-Identifier: GPL-3.0-only
-   Authors: D.Kresan, Denis Bertini [committer] */
+   Authors: Dmytro Kresan, Denis Bertini [committer] */
 
 // -------------------------------------------------------------------------
 // -----                   CbmTrdTrackFinder header file               -----
diff --git a/reco/base/CbmTrdTrackFitter.cxx b/reco/base/CbmTrdTrackFitter.cxx
index 2c3dbf91c62927cc83b1a8fb701fcac0e4fb4eae..9ed8e3f4860b49762c86b8d9c2c2cc6062deb383 100644
--- a/reco/base/CbmTrdTrackFitter.cxx
+++ b/reco/base/CbmTrdTrackFitter.cxx
@@ -1,6 +1,6 @@
 /* Copyright (C) 2005-2006 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
    SPDX-License-Identifier: GPL-3.0-only
-   Authors: V. Friese, Denis Bertini [committer] */
+   Authors: Volker Friese, Denis Bertini [committer] */
 
 // -------------------------------------------------------------------------
 // -----                   CbmTrdTrackFitter source file               -----
diff --git a/reco/base/CbmTrdTrackFitter.h b/reco/base/CbmTrdTrackFitter.h
index d279315f11d346efda38c1177b8c9c0e089556ba..37b8bc3f82e470c2e588320b38f50108aa5b5f5b 100644
--- a/reco/base/CbmTrdTrackFitter.h
+++ b/reco/base/CbmTrdTrackFitter.h
@@ -1,6 +1,6 @@
 /* Copyright (C) 2006 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
    SPDX-License-Identifier: GPL-3.0-only
-   Authors: D.Kresan, Denis Bertini [committer] */
+   Authors: Dmytro Kresan, Denis Bertini [committer] */
 
 // -------------------------------------------------------------------------
 // -----                   CbmTrdTrackFitter header file               -----
diff --git a/reco/detectors/much/CbmMuchHitProducerIdeal.cxx b/reco/detectors/much/CbmMuchHitProducerIdeal.cxx
index b4af84e56225f259b5313319c04646380e92bc88..ef5ecb13b63e21676559838b55f060a650d66e2e 100644
--- a/reco/detectors/much/CbmMuchHitProducerIdeal.cxx
+++ b/reco/detectors/much/CbmMuchHitProducerIdeal.cxx
@@ -1,6 +1,6 @@
 /* Copyright (C) 2006-2021 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
    SPDX-License-Identifier: GPL-3.0-only
-   Authors: A.Kiseleva, Andrey Lebedev, Denis Bertini [committer], Florian Uhlig */
+   Authors: Anna Senger, Andrey Lebedev, Denis Bertini [committer], Florian Uhlig */
 
 /**
  * \file CbmMuchHitProducerIdeal.cxx
diff --git a/reco/detectors/much/CbmMuchHitProducerIdeal.h b/reco/detectors/much/CbmMuchHitProducerIdeal.h
index 6f33a6fc6817b8ee90ec87440d33e6b8a2b95e29..2c823d2519a3ee43f6b5e94e4f9af0fa7cb4acdf 100644
--- a/reco/detectors/much/CbmMuchHitProducerIdeal.h
+++ b/reco/detectors/much/CbmMuchHitProducerIdeal.h
@@ -1,6 +1,6 @@
 /* Copyright (C) 2006-2017 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
    SPDX-License-Identifier: GPL-3.0-only
-   Authors: A.Kiseleva, Andrey Lebedev, Denis Bertini [committer] */
+   Authors: Anna Senger, Andrey Lebedev, Denis Bertini [committer] */
 
 /**
  * \file CbmMuchHitProducerIdeal.h
diff --git a/reco/detectors/much/qa/CbmMuchHitFinderQa.cxx b/reco/detectors/much/qa/CbmMuchHitFinderQa.cxx
index 60a5de4ce9bfab8c87844c39cd84ff13d7aa4ff4..9c044402da08f2a5ec024d6d8132ba6c1f8d6fa1 100644
--- a/reco/detectors/much/qa/CbmMuchHitFinderQa.cxx
+++ b/reco/detectors/much/qa/CbmMuchHitFinderQa.cxx
@@ -1,6 +1,6 @@
 /* Copyright (C) 2007-2021 Facility for Antiproton and Ion Research in Europe, Darmstadt
    SPDX-License-Identifier: GPL-3.0-only
-   Authors: E. Kryshen, Dominik Smith [committer], Sergey Gorbunov */
+   Authors: Evgeny Kryshen, Dominik Smith [committer], Sergey Gorbunov */
 
 // -------------------------------------------------------------------------
 // -----                   CbmMuchHitProducerQa source file             -----
diff --git a/reco/detectors/much/qa/CbmMuchHitFinderQa.h b/reco/detectors/much/qa/CbmMuchHitFinderQa.h
index 2a843820dbc8eb04edbfd29777aaeb607694d849..dc821e2d06e630bf9a5f4cff2d8672f777ec8827 100644
--- a/reco/detectors/much/qa/CbmMuchHitFinderQa.h
+++ b/reco/detectors/much/qa/CbmMuchHitFinderQa.h
@@ -1,6 +1,6 @@
 /* Copyright (C) 2007-2021 Facility for Antiproton and Ion Research in Europe, Darmstadt
    SPDX-License-Identifier: GPL-3.0-only
-   Authors: E. Kryshen, Dominik Smith [committer], Sergey Gorbunov */
+   Authors: Evgeny Kryshen, Dominik Smith [committer], Sergey Gorbunov */
 
 // -------------------------------------------------------------------------
 // -----                  CbmMuchHitFinderQa header file               -----
diff --git a/reco/detectors/psd/CbmPsdHitProducer.cxx b/reco/detectors/psd/CbmPsdHitProducer.cxx
index f1b464bd7b99a4cdd28f53c4afa06d1b693339b6..3d084c869b296c47b155ab0b9fa4da1f5ea3d293 100644
--- a/reco/detectors/psd/CbmPsdHitProducer.cxx
+++ b/reco/detectors/psd/CbmPsdHitProducer.cxx
@@ -1,6 +1,6 @@
 /* Copyright (C) 2012-2021 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
    SPDX-License-Identifier: GPL-3.0-only
-   Authors: Alla & SELIM, Volker Friese [committer], Evgeny Kashirin */
+   Authors: Alla Maevskaya, Selim Seddiki, Volker Friese [committer], Evgeny Kashirin */
 
 // -------------------------------------------------------------------------
 // -----                CbmPsdHitProducer source file             -----
diff --git a/reco/detectors/rich/CbmRichReconstruction.cxx b/reco/detectors/rich/CbmRichReconstruction.cxx
index 899c08b97b360de410879ac2259fd583da61f6eb..e877840ef16f14fc4c45d9fc3e2681b2e8225c7b 100644
--- a/reco/detectors/rich/CbmRichReconstruction.cxx
+++ b/reco/detectors/rich/CbmRichReconstruction.cxx
@@ -1,6 +1,6 @@
 /* Copyright (C) 2012-2021 UGiessen, JINR-LIT
    SPDX-License-Identifier: GPL-3.0-only
-   Authors: Semen Lebedev [committer], Andrey Lebedev, Semen Lebedev [committer] */
+   Authors: Semen Lebedev [committer], Andrey Lebedev */
 
 /**
  * \file CbmRichReconstruction.cxx
diff --git a/reco/detectors/rich/CbmRichReconstruction.h b/reco/detectors/rich/CbmRichReconstruction.h
index 9305670f98bccb74d3d76d3b9df2b0e5fe8f80fa..8004e41fac74d8068f66acf0f36efd837ee370bc 100644
--- a/reco/detectors/rich/CbmRichReconstruction.h
+++ b/reco/detectors/rich/CbmRichReconstruction.h
@@ -1,6 +1,6 @@
 /* Copyright (C) 2012-2021 UGiessen, JINR-LIT
    SPDX-License-Identifier: GPL-3.0-only
-   Authors: Semen Lebedev [committer], Semen Lebedev [committer] */
+   Authors: Semen Lebedev [committer] */
 
 /**
 * \file CbmRichReconstruction.h
diff --git a/reco/detectors/rich/alignment/CbmRichProjectionProducerAnalytical.cxx b/reco/detectors/rich/alignment/CbmRichProjectionProducerAnalytical.cxx
index 3eb516bb88146c977fc8452b621f345b87742c5f..f3b7f1408a2de1b50b8527c7910d983e2edcf215 100644
--- a/reco/detectors/rich/alignment/CbmRichProjectionProducerAnalytical.cxx
+++ b/reco/detectors/rich/alignment/CbmRichProjectionProducerAnalytical.cxx
@@ -1,6 +1,6 @@
 /* Copyright (C) 2016-2019 Justus-Liebig-Universitaet Giessen, Giessen
    SPDX-License-Identifier: GPL-3.0-only
-   Authors: S.Lebedev (initial version by P.Stolpovsky (2005)), Jordan Bendarouach [committer] */
+   Authors: Semen Lebedev (initial version by P.Stolpovsky (2005)), Jordan Bendarouach [committer] */
 
 /**
  * \file CbmRichProjectionProducerAnalytical.cxx
diff --git a/reco/detectors/rich/alignment/CbmRichProjectionProducerAnalytical.h b/reco/detectors/rich/alignment/CbmRichProjectionProducerAnalytical.h
index 2f2191c42efb7943f62c7b9c1f16f294e1d828fb..53d4f7dcfb2fbb37af4968fd457a346883f26d07 100644
--- a/reco/detectors/rich/alignment/CbmRichProjectionProducerAnalytical.h
+++ b/reco/detectors/rich/alignment/CbmRichProjectionProducerAnalytical.h
@@ -1,6 +1,6 @@
 /* Copyright (C) 2016-2017 Justus-Liebig-Universitaet Giessen, Giessen
    SPDX-License-Identifier: GPL-3.0-only
-   Authors: S.Lebedev (initial version by P.Stolpovsky in 2005), Jordan Bendarouach [committer] */
+   Authors: Semen Lebedev (initial version by P.Stolpovsky in 2005), Jordan Bendarouach [committer] */
 
 /**
  * \file CbmRichProjectionProducerAnalytical.h
diff --git a/reco/detectors/rich/finder/CbmRichRingFinderHough.cxx b/reco/detectors/rich/finder/CbmRichRingFinderHough.cxx
index a5c11df8369742954c022d6750f10cb424341f56..0835f7727829e0a04a0bdbe1a0370e50f8cbbaa6 100644
--- a/reco/detectors/rich/finder/CbmRichRingFinderHough.cxx
+++ b/reco/detectors/rich/finder/CbmRichRingFinderHough.cxx
@@ -1,6 +1,6 @@
 /* Copyright (C) 2006-2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
    SPDX-License-Identifier: GPL-3.0-only
-   Authors: Semen Lebedev, Semen Lebedev, Andrey Lebedev */
+   Authors: Semen Lebedev, Andrey Lebedev */
 
 /**
 * \file CbmRichRingFinderHough.cxx
diff --git a/reco/detectors/rich/finder/CbmRichRingFinderHough.h b/reco/detectors/rich/finder/CbmRichRingFinderHough.h
index a78cbbd46fbe0d3ff8d849e6a0f984055a89f3a9..b0704d910bfafb0aa2e175f2cd6ea29816e01e1a 100644
--- a/reco/detectors/rich/finder/CbmRichRingFinderHough.h
+++ b/reco/detectors/rich/finder/CbmRichRingFinderHough.h
@@ -1,6 +1,6 @@
 /* Copyright (C) 2006-2021 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
    SPDX-License-Identifier: GPL-3.0-only
-   Authors: Semen Lebedev, Semen Lebedev */
+   Authors: Semen Lebedev */
 
 /**
 * \file CbmRichRingFinderHough.h
diff --git a/reco/detectors/rich/finder/CbmRichRingFinderIdeal.cxx b/reco/detectors/rich/finder/CbmRichRingFinderIdeal.cxx
index 9b0c14c6ece744f5e298a652e511feb0baf9cc02..7136f9eaa27afc1312d3b44d17c06b69dc230f88 100644
--- a/reco/detectors/rich/finder/CbmRichRingFinderIdeal.cxx
+++ b/reco/detectors/rich/finder/CbmRichRingFinderIdeal.cxx
@@ -1,6 +1,6 @@
 /* Copyright (C) 2006-2021 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
    SPDX-License-Identifier: GPL-3.0-only
-   Authors: S. Lebedev (2016) (Initial version Supriya Das (2005)), Semen Lebedev, Andrey Lebedev, Semen Lebedev, Florian Uhlig */
+   Authors: Semen Lebedev (2016) (Initial version Supriya Das (2005)), Andrey Lebedev, Florian Uhlig */
 
 /**
  *  $Id: CbmRichRingFinderIdeal.cxx,v 1.5 2006/02/01 13:16:58 hoehne Exp $
diff --git a/reco/detectors/rich/fitter/CbmRichRingFitterCOP.cxx b/reco/detectors/rich/fitter/CbmRichRingFitterCOP.cxx
index c161f447475c7f809d6a4913518868631166dba6..18db1fc4d0a2b06e1b3da389c2bc1e5576bd3188 100644
--- a/reco/detectors/rich/fitter/CbmRichRingFitterCOP.cxx
+++ b/reco/detectors/rich/fitter/CbmRichRingFitterCOP.cxx
@@ -1,6 +1,6 @@
 /* Copyright (C) 2005-2012 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
    SPDX-License-Identifier: GPL-3.0-only
-   Authors: Alexander Ayriyan, Gennadi Ososkov, Semen Lebedev, Semen Lebedev, Denis Bertini [committer] */
+   Authors: Alexander Ayriyan, Gennadi Ososkov, Semen Lebedev, Denis Bertini [committer] */
 
 /**
 * \file CbmRichRingFitterCOP.cxx
diff --git a/reco/detectors/rich/fitter/CbmRichRingFitterCOP.h b/reco/detectors/rich/fitter/CbmRichRingFitterCOP.h
index bb19f372bc6727d233f33f49aa178549f6df9b8a..ee348cd7372d2657f7a327190d3c534779069c81 100644
--- a/reco/detectors/rich/fitter/CbmRichRingFitterCOP.h
+++ b/reco/detectors/rich/fitter/CbmRichRingFitterCOP.h
@@ -1,6 +1,6 @@
 /* Copyright (C) 2005-2012 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
    SPDX-License-Identifier: GPL-3.0-only
-   Authors: Alexander Ayriyan, Gennadi Ososkov, Semen Lebedev, Semen Lebedev, Denis Bertini [committer] */
+   Authors: Alexander Ayriyan, Gennadi Ososkov, Semen Lebedev, Denis Bertini [committer] */
 
 /**
 * \file CbmRichRingFitterCOP.h
diff --git a/reco/detectors/rich/fitter/CbmRichRingFitterEllipseTau.cxx b/reco/detectors/rich/fitter/CbmRichRingFitterEllipseTau.cxx
index 6fc0837c594e6ee0f0732cb4f51ae4496b59789f..af4e031cc925eff5446e925d65c9707baae5b1a4 100644
--- a/reco/detectors/rich/fitter/CbmRichRingFitterEllipseTau.cxx
+++ b/reco/detectors/rich/fitter/CbmRichRingFitterEllipseTau.cxx
@@ -1,6 +1,6 @@
 /* Copyright (C) 2009-2016 UGiessen, JINR-LIT
    SPDX-License-Identifier: GPL-3.0-only
-   Authors: Alexander Ayriyan and Semen Lebedev, Semen Lebedev [committer] */
+   Authors: Alexander Ayriyan, Semen Lebedev [committer] */
 
 /**
 * \file CbmRichRingFitterEllipseTau.cxx
diff --git a/reco/detectors/rich/fitter/CbmRichRingFitterEllipseTau.h b/reco/detectors/rich/fitter/CbmRichRingFitterEllipseTau.h
index ee5115075a7b74859b6a9f579d64f8919c2d66e6..fc43dbc545fb5fd63c4721dbb1b6105614073adb 100644
--- a/reco/detectors/rich/fitter/CbmRichRingFitterEllipseTau.h
+++ b/reco/detectors/rich/fitter/CbmRichRingFitterEllipseTau.h
@@ -1,6 +1,6 @@
 /* Copyright (C) 2009-2012 UGiessen, JINR-LIT
    SPDX-License-Identifier: GPL-3.0-only
-   Authors: Alexander Ayriyan and Semen Lebedev, Semen Lebedev [committer] */
+   Authors: Alexander Ayriyan, Semen Lebedev */
 
 /**
 * \file CbmRichRingFitterEllipseTau.h
diff --git a/reco/detectors/rich/fitter/CbmRichRingFitterRobustCOP.cxx b/reco/detectors/rich/fitter/CbmRichRingFitterRobustCOP.cxx
index 658a429015ba4228c1ddd72b4bc3d8bef24582a0..e983734601e7126f3dd2678b61c8bcff661531b5 100644
--- a/reco/detectors/rich/fitter/CbmRichRingFitterRobustCOP.cxx
+++ b/reco/detectors/rich/fitter/CbmRichRingFitterRobustCOP.cxx
@@ -1,6 +1,6 @@
 /* Copyright (C) 2006-2012 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
    SPDX-License-Identifier: GPL-3.0-only
-   Authors: Alexander Ayriyan, Gennadi Ososkov, Claudia Hoehne, Semen Lebedev, Semen Lebedev, Denis Bertini [committer] */
+   Authors: Alexander Ayriyan, Gennadi Ososkov, Claudia Hoehne, Semen Lebedev, Denis Bertini [committer] */
 
 /**
 * \file CbmRichRingFitterRobustCOP.cxx
diff --git a/reco/detectors/rich/fitter/CbmRichRingFitterRobustCOP.h b/reco/detectors/rich/fitter/CbmRichRingFitterRobustCOP.h
index 10e6bd27e456846ce07891d60aa710eeddfc796f..67e0073ca456235fa6f5ef5102d3f0c265c69189 100644
--- a/reco/detectors/rich/fitter/CbmRichRingFitterRobustCOP.h
+++ b/reco/detectors/rich/fitter/CbmRichRingFitterRobustCOP.h
@@ -1,6 +1,6 @@
 /* Copyright (C) 2006-2012 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
    SPDX-License-Identifier: GPL-3.0-only
-   Authors: Alexander Ayriyan, Gennadi Ososkov, Claudia Hoehne, Semen Lebedev, Semen Lebedev, Denis Bertini [committer] */
+   Authors: Alexander Ayriyan, Gennadi Ososkov, Claudia Hoehne, Semen Lebedev, Denis Bertini [committer] */
 
 /**
 * \file CbmRichRingFitterRobustCOP.h
diff --git a/reco/detectors/rich/fitter/CbmRichRingFitterTAU.cxx b/reco/detectors/rich/fitter/CbmRichRingFitterTAU.cxx
index 9ce6049aa3d03c2fea22a3d3ca8c32105217d9b5..6dde947157181c331900eb3ad8e83ecf5b930f50 100644
--- a/reco/detectors/rich/fitter/CbmRichRingFitterTAU.cxx
+++ b/reco/detectors/rich/fitter/CbmRichRingFitterTAU.cxx
@@ -1,6 +1,6 @@
 /* Copyright (C) 2006-2016 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
    SPDX-License-Identifier: GPL-3.0-only
-   Authors: Alexander Ayriyan, Gennadi Ososkov, Claudia Hoehne, Semen Lebedev, Semen Lebedev, Denis Bertini [committer] */
+   Authors: Alexander Ayriyan, Gennadi Ososkov, Claudia Hoehne, Semen Lebedev, Denis Bertini [committer] */
 
 /**
 * \file CbmRichRingFitterTAU.cxx
diff --git a/reco/detectors/rich/fitter/CbmRichRingFitterTAU.h b/reco/detectors/rich/fitter/CbmRichRingFitterTAU.h
index 50f4cd6e2479e2067dd197d8a05b952cbbc230a0..ce44e956e19cea7a6053b535cf64d0360e5736b3 100644
--- a/reco/detectors/rich/fitter/CbmRichRingFitterTAU.h
+++ b/reco/detectors/rich/fitter/CbmRichRingFitterTAU.h
@@ -1,6 +1,6 @@
 /* Copyright (C) 2006-2012 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
    SPDX-License-Identifier: GPL-3.0-only
-   Authors: Alexander Ayriyan, Gennadi Ososkov, Claudia Hoehne, Semen Lebedev, Semen Lebedev, Denis Bertini [committer] */
+   Authors: Alexander Ayriyan, Gennadi Ososkov, Claudia Hoehne, Semen Lebedev, Denis Bertini [committer] */
 
 /**
 * \file CbmRichRingFitterTAU.h
diff --git a/reco/detectors/rich/tracks/CbmRichProjectionProducerAnalytical.cxx b/reco/detectors/rich/tracks/CbmRichProjectionProducerAnalytical.cxx
index 221b0835c1606b864348e37bf5f23843caee720f..0a67259dd3ded4e02b1ec4c7323391945ea02e9f 100644
--- a/reco/detectors/rich/tracks/CbmRichProjectionProducerAnalytical.cxx
+++ b/reco/detectors/rich/tracks/CbmRichProjectionProducerAnalytical.cxx
@@ -1,6 +1,6 @@
 /* Copyright (C) 2016-2021 GSI/JINR-LIT
    SPDX-License-Identifier: GPL-3.0-only
-   Authors: S.Lebedev (initial version by P.Stolpovsky (2005)), Andrey Lebedev [committer], Semen Lebedev, Semen Lebedev */
+   Authors: Semen Lebedev (initial version by P.Stolpovsky (2005)), Andrey Lebedev [committer] */
 
 /**
  * \file CbmRichProjectionProducerAnalytical.cxx
diff --git a/reco/detectors/rich/tracks/CbmRichProjectionProducerAnalytical.h b/reco/detectors/rich/tracks/CbmRichProjectionProducerAnalytical.h
index f4d5d518cfcafab83d940e7d5e8f74c04d94ee2c..c52cd8d4d9604c3c5a933437c8ffc909ac9ffbf3 100644
--- a/reco/detectors/rich/tracks/CbmRichProjectionProducerAnalytical.h
+++ b/reco/detectors/rich/tracks/CbmRichProjectionProducerAnalytical.h
@@ -1,6 +1,6 @@
 /* Copyright (C) 2016-2021 GSI/JINR-LIT
    SPDX-License-Identifier: GPL-3.0-only
-   Authors: S.Lebedev (initial version by P.Stolpovsky in 2005), Andrey Lebedev [committer], Semen Lebedev */
+   Authors: Semen Lebedev (initial version by P.Stolpovsky in 2005), Andrey Lebedev [committer] */
 
 /**
  * \file CbmRichProjectionProducerAnalytical.h
diff --git a/reco/detectors/rich/tracks/CbmRichProjectionProducerTGeo.h b/reco/detectors/rich/tracks/CbmRichProjectionProducerTGeo.h
index a4beb1b0163b7fe5b38ef5fd7426d674389c982a..90b4442067ea16a694e7efee855ad19a992ded3e 100644
--- a/reco/detectors/rich/tracks/CbmRichProjectionProducerTGeo.h
+++ b/reco/detectors/rich/tracks/CbmRichProjectionProducerTGeo.h
@@ -1,6 +1,6 @@
 /* Copyright (C) 2016-2021 GSI/JINR-LIT
    SPDX-License-Identifier: GPL-3.0-only
-   Authors: S.Lebedev, Andrey Lebedev [committer] */
+   Authors: Semen Lebedev, Andrey Lebedev [committer] */
 
 /**
  * \file CbmRichProjectionProducerTGeo.h
diff --git a/reco/detectors/rich/tracks/CbmRichRingTrackAssignClosestD.cxx b/reco/detectors/rich/tracks/CbmRichRingTrackAssignClosestD.cxx
index 7585edf419572310cb1cf5ca4b8e13d1ef190acd..3ef47022ed8bfd421cf2b3d6aa16217302eedf5a 100644
--- a/reco/detectors/rich/tracks/CbmRichRingTrackAssignClosestD.cxx
+++ b/reco/detectors/rich/tracks/CbmRichRingTrackAssignClosestD.cxx
@@ -1,6 +1,6 @@
 /* Copyright (C) 2006-2021 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
    SPDX-License-Identifier: GPL-3.0-only
-   Authors: Claudia Hoehne and Semen Lebedev, Semen Lebedev, Semen Lebedev */
+   Authors: Claudia Hoehne, Semen Lebedev */
 
 /**
 * \file CbmRichRingTrackAssignClosestD.cxx
diff --git a/reco/detectors/rich/tracks/CbmRichRingTrackAssignClosestD.h b/reco/detectors/rich/tracks/CbmRichRingTrackAssignClosestD.h
index aad45657bebf74c66ce9cafb38e0d17d12d32e95..cdfd87bf32a4eb9c27cd00d570e7992260dd7fd9 100644
--- a/reco/detectors/rich/tracks/CbmRichRingTrackAssignClosestD.h
+++ b/reco/detectors/rich/tracks/CbmRichRingTrackAssignClosestD.h
@@ -1,6 +1,6 @@
 /* Copyright (C) 2006-2021 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
    SPDX-License-Identifier: GPL-3.0-only
-   Authors: Claudia Hoehne and Semen Lebedev, Semen Lebedev, Denis Bertini [committer], Semen Lebedev */
+   Authors: Claudia Hoehne, Semen Lebedev, Denis Bertini [committer] */
 
 /**
 * \file CbmRichRingTrackAssignClosestD.h
diff --git a/reco/detectors/rich/tracks/CbmRichRingTrackAssignIdeal.cxx b/reco/detectors/rich/tracks/CbmRichRingTrackAssignIdeal.cxx
index 25b109dabe25e367a8ec6f2403130b3805dd7f2f..23f3916f755b182736cd78047a5db919f08ad164 100644
--- a/reco/detectors/rich/tracks/CbmRichRingTrackAssignIdeal.cxx
+++ b/reco/detectors/rich/tracks/CbmRichRingTrackAssignIdeal.cxx
@@ -1,6 +1,6 @@
 /* Copyright (C) 2006-2021 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
    SPDX-License-Identifier: GPL-3.0-only
-   Authors: Claudia Hoehne and Semen Lebedev, Semen Lebedev, Semen Lebedev, Denis Bertini [committer] */
+   Authors: Claudia Hoehne, Semen Lebedev, Denis Bertini [committer] */
 
 /**
 * \file CbmRichRingTrackAssignIdeal.cxx
diff --git a/reco/detectors/rich/tracks/CbmRichRingTrackAssignIdeal.h b/reco/detectors/rich/tracks/CbmRichRingTrackAssignIdeal.h
index 0a51ae0dbfb610043bb76c1000dac2bc2a620177..977f927299ba3556f0039047eb9a787bf6320e4a 100644
--- a/reco/detectors/rich/tracks/CbmRichRingTrackAssignIdeal.h
+++ b/reco/detectors/rich/tracks/CbmRichRingTrackAssignIdeal.h
@@ -1,6 +1,6 @@
 /* Copyright (C) 2006-2021 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
    SPDX-License-Identifier: GPL-3.0-only
-   Authors: Claudia Hoehne and Semen Lebedev, Semen Lebedev, Denis Bertini [committer] */
+   Authors: Claudia Hoehne, Semen Lebedev, Denis Bertini [committer] */
 
 /**
 * \file CbmRichRingTrackAssignIdeal.h
diff --git a/reco/detectors/rich/tracks/CbmRichTrackExtrapolationIdeal.cxx b/reco/detectors/rich/tracks/CbmRichTrackExtrapolationIdeal.cxx
index b2a3409f171f38544f73c22ce7b4924751ca9f5e..2981257a3861252e14964b6ce6ae6309de1902f1 100644
--- a/reco/detectors/rich/tracks/CbmRichTrackExtrapolationIdeal.cxx
+++ b/reco/detectors/rich/tracks/CbmRichTrackExtrapolationIdeal.cxx
@@ -1,6 +1,6 @@
 /* Copyright (C) 2006-2021 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
    SPDX-License-Identifier: GPL-3.0-only
-   Authors: Claudia Hoehne, Andrey Lebedev, Semen Lebedev, Semen Lebedev */
+   Authors: Claudia Hoehne, Andrey Lebedev, Semen Lebedev */
 
 /**
  * \file CbmRichTrackExtrapolationIdeal.cxx
diff --git a/reco/detectors/tof/CbmTofCalibrator.cxx b/reco/detectors/tof/CbmTofCalibrator.cxx
index 3f6c1ad1d74798a6dbc70045dc8430a73742c7c0..64769a720a6ffcab4e319dacf2b0be02a3bdb85a 100644
--- a/reco/detectors/tof/CbmTofCalibrator.cxx
+++ b/reco/detectors/tof/CbmTofCalibrator.cxx
@@ -1,6 +1,6 @@
 /* Copyright (C) 2020-2021 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
    SPDX-License-Identifier: GPL-3.0-only
-   Authors: nh, Florian Uhlig [committer], Norbert Herrmann */
+   Authors: Norbert Herrmann, Florian Uhlig [committer] */
 
 /** @file CbmTofCalibrator.cxx
  ** @author nh
diff --git a/reco/detectors/tof/CbmTofCalibrator.h b/reco/detectors/tof/CbmTofCalibrator.h
index 5392823082de25a495a06b47fb4fe64e2f6691a6..2018c59eb922c69efb7c64da277abefc8a6cf05a 100644
--- a/reco/detectors/tof/CbmTofCalibrator.h
+++ b/reco/detectors/tof/CbmTofCalibrator.h
@@ -1,6 +1,6 @@
 /* Copyright (C) 2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
    SPDX-License-Identifier: GPL-3.0-only
-   Authors: nh, Florian Uhlig [committer] */
+   Authors: Norbert Herrmann, Florian Uhlig [committer] */
 
 /** @file CbmTofCalibrator.h
  ** @author nh <N.Herrmann@gsi.de>
diff --git a/reco/detectors/tof/CbmTofCosmicClusterizer.cxx b/reco/detectors/tof/CbmTofCosmicClusterizer.cxx
index cb3979cb861420d5f17055d50d755b1b6b015c9b..6646c40adba77e17296c682cfae97539add0d1b2 100644
--- a/reco/detectors/tof/CbmTofCosmicClusterizer.cxx
+++ b/reco/detectors/tof/CbmTofCosmicClusterizer.cxx
@@ -1,6 +1,6 @@
 /* Copyright (C) 2013-2021 PI-UHd, GSI
    SPDX-License-Identifier: GPL-3.0-only
-   Authors: nh, Norbert Herrmann [committer] */
+   Authors: Norbert Herrmann */
 
 /** @file CbmTofCosmicClusterizer.cxx
  ** author nh
diff --git a/reco/detectors/tof/CbmTofCosmicClusterizer.h b/reco/detectors/tof/CbmTofCosmicClusterizer.h
index 1bfc3cf2862ce7f52f80d985ada253de800b0d99..f794bea786175d32bbb106ce3993a0cf18fca4f7 100644
--- a/reco/detectors/tof/CbmTofCosmicClusterizer.h
+++ b/reco/detectors/tof/CbmTofCosmicClusterizer.h
@@ -1,6 +1,6 @@
 /* Copyright (C) 2017-2020 PI-UHd, GSI
    SPDX-License-Identifier: GPL-3.0-only
-   Authors: nh adopted from CbmTofTestBeamClusterizer.h, Norbert Herrmann [committer] */
+   Authors: Norbert Herrmann */
 
 /** @file CbmTofCosmicClusterizer.h
  ** @author nh adopted from CbmTofTestBeamClusterizer.h
diff --git a/reco/detectors/tof/CbmTofEventClusterizer.cxx b/reco/detectors/tof/CbmTofEventClusterizer.cxx
index 1940a6c64ff874d846267babd5117b97e4b16434..f913bce89d45245f7c1fc0398a3dc45849f733b0 100644
--- a/reco/detectors/tof/CbmTofEventClusterizer.cxx
+++ b/reco/detectors/tof/CbmTofEventClusterizer.cxx
@@ -1,6 +1,6 @@
 /* Copyright (C) 2018-2021 PI-UHd, GSI
    SPDX-License-Identifier: GPL-3.0-only
-   Authors: nh, Norbert Herrmann [committer] */
+   Authors: Norbert Herrmann */
 
 /** @file CbmTofEventClusterizer.cxx
  ** @author nh
diff --git a/reco/detectors/tof/CbmTofEventClusterizer.h b/reco/detectors/tof/CbmTofEventClusterizer.h
index bdac3dc0addcff507ba6302f4212bde109472edc..ba8b96e97a5dcff056a35656878d9e017e2c521c 100644
--- a/reco/detectors/tof/CbmTofEventClusterizer.h
+++ b/reco/detectors/tof/CbmTofEventClusterizer.h
@@ -1,6 +1,6 @@
 /* Copyright (C) 2013-2021 PI-UHd, GSI
    SPDX-License-Identifier: GPL-3.0-only
-   Authors: nh adopted from, Norbert Herrmann [committer] */
+   Authors: Norbert Herrmann */
 
 /** @file CbmTofTestBeamClusterizer.h
  ** @author nh adopted from
diff --git a/reco/detectors/tof/CbmTofHitMaker.cxx b/reco/detectors/tof/CbmTofHitMaker.cxx
index 322b3b7806406192b206273be2df3618bdc0e535..e498e22991c9725123dae99193dec8dacf412b84 100644
--- a/reco/detectors/tof/CbmTofHitMaker.cxx
+++ b/reco/detectors/tof/CbmTofHitMaker.cxx
@@ -1,6 +1,6 @@
 /* Copyright (C) 2018-2021 PI-UHd, GSI
    SPDX-License-Identifier: GPL-3.0-only
-   Authors: nh, Norbert Herrmann [committer] */
+   Authors: Norbert Herrmann */
 
 /** @file CbmTofHitMaker.cxx
  ** @author nh
diff --git a/reco/detectors/tof/CbmTofHitMaker.h b/reco/detectors/tof/CbmTofHitMaker.h
index 4d3263994b6fb504572407631c8d5a549674d67b..1eda7abfb326afac9c545822cb3c18dd2504c916 100644
--- a/reco/detectors/tof/CbmTofHitMaker.h
+++ b/reco/detectors/tof/CbmTofHitMaker.h
@@ -1,6 +1,6 @@
 /* Copyright (C) 2020 PI-UHd, GSI
    SPDX-License-Identifier: GPL-3.0-only
-   Authors: nh adopted from, Norbert Herrmann [committer] */
+   Authors: Norbert Herrmann */
 
 /** @file CbmTofHitMaker.h
  ** @author nh adopted from
diff --git a/reco/detectors/tof/CbmTofTestBeamClusterizer.cxx b/reco/detectors/tof/CbmTofTestBeamClusterizer.cxx
index 08b9ecfacf8d6209c1d2517469e41fb37a988c1e..8424ecab28788c5a5b9e3c6a05d3eb7a6b7b01e2 100644
--- a/reco/detectors/tof/CbmTofTestBeamClusterizer.cxx
+++ b/reco/detectors/tof/CbmTofTestBeamClusterizer.cxx
@@ -1,6 +1,6 @@
 /* Copyright (C) 2013-2021 PI-UHd, GSI
    SPDX-License-Identifier: GPL-3.0-only
-   Authors: nh, Norbert Herrmann [committer], Pierre-Alain Loizeau */
+   Authors: Norbert Herrmann [committer], Pierre-Alain Loizeau */
 
 /** @file CbmTofTestBeamClusterizer.cxx
  ** author nh
diff --git a/reco/detectors/tof/CbmTofTestBeamClusterizer.h b/reco/detectors/tof/CbmTofTestBeamClusterizer.h
index 8fcb23acb20cd1476e16b822c47af9fec3d9b308..8cc27629522db96b527c844ed1df68e83932ba6e 100644
--- a/reco/detectors/tof/CbmTofTestBeamClusterizer.h
+++ b/reco/detectors/tof/CbmTofTestBeamClusterizer.h
@@ -1,6 +1,6 @@
 /* Copyright (C) 2013-2020 PI-UHd, GSI
    SPDX-License-Identifier: GPL-3.0-only
-   Authors: nh adopted from, Norbert Herrmann [committer], Pierre-Alain Loizeau */
+   Authors: Norbert Herrmann [committer], Pierre-Alain Loizeau */
 
 /** @file CbmTofTestBeamClusterizer.h
  ** @author nh adopted from
diff --git a/reco/detectors/tof/CbmTofTrackletTools.cxx b/reco/detectors/tof/CbmTofTrackletTools.cxx
index a47d99c4e141f28ead8d057d898f6a737ad9eb5b..41119cf73935f8ebb00cdc3442f035057eb2fa09 100644
--- a/reco/detectors/tof/CbmTofTrackletTools.cxx
+++ b/reco/detectors/tof/CbmTofTrackletTools.cxx
@@ -1,6 +1,6 @@
 /* Copyright (C) 2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
    SPDX-License-Identifier: GPL-3.0-only
-   Authors: nh, Florian Uhlig [committer] */
+   Authors: Norbert Herrmann, Florian Uhlig [committer] */
 
 /** @file CbmTofTrackletTools.cxx
  ** @author nh
diff --git a/reco/detectors/tof/CbmTofTrackletTools.h b/reco/detectors/tof/CbmTofTrackletTools.h
index 942f5fa90a9e516edf36f1c9d2ada12f12650461..d238d471ebcf2eaa6a52926f75a44dba4c0318f0 100644
--- a/reco/detectors/tof/CbmTofTrackletTools.h
+++ b/reco/detectors/tof/CbmTofTrackletTools.h
@@ -1,6 +1,6 @@
 /* Copyright (C) 2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
    SPDX-License-Identifier: GPL-3.0-only
-   Authors: nh, Florian Uhlig [committer] */
+   Authors: Norbert Herrmann, Florian Uhlig [committer] */
 
 /** @file CbmTofTracklet.h
  ** @author nh <N.Herrmann@gsi.de>
diff --git a/reco/detectors/tof/CbmTofTypes.h b/reco/detectors/tof/CbmTofTypes.h
index 3f2079e99c487cf044115d34d37b52bb04c8e7e8..7d515b83ba4a6a113cb6887366ee93574b2398d9 100644
--- a/reco/detectors/tof/CbmTofTypes.h
+++ b/reco/detectors/tof/CbmTofTypes.h
@@ -1,6 +1,6 @@
 /* Copyright (C) 2008-2016 PI-UHd, GSI
    SPDX-License-Identifier: GPL-3.0-only
-   Authors: A.Lebedev, Norbert Herrmann [committer], Florian Uhlig */
+   Authors: Andrey Lebedev, Norbert Herrmann [committer], Florian Uhlig */
 
 /**
  * \file CbmTOFTypes.h
diff --git a/reco/detectors/trd/CbmTrdTrackFinderIdeal.cxx b/reco/detectors/trd/CbmTrdTrackFinderIdeal.cxx
index cc3cc08a5b871d8db7e4a0e647958f269991d83a..6206cbf0b86681ce9eef3888ef39211ff41546ac 100644
--- a/reco/detectors/trd/CbmTrdTrackFinderIdeal.cxx
+++ b/reco/detectors/trd/CbmTrdTrackFinderIdeal.cxx
@@ -1,6 +1,6 @@
 /* Copyright (C) 2005-2019 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
    SPDX-License-Identifier: GPL-3.0-only
-   Authors: V. Friese, Semen Lebedev, Denis Bertini [committer], Florian Uhlig */
+   Authors: Volker Friese, Semen Lebedev, Denis Bertini [committer], Florian Uhlig */
 
 // -------------------------------------------------------------------------
 // -----                CbmTrdTrackFinderIdeal source file             -----
diff --git a/reco/detectors/trd/CbmTrdTrackFinderIdeal.h b/reco/detectors/trd/CbmTrdTrackFinderIdeal.h
index 372e48a51b5f95cf1ed3e19cc737644b1eed62cd..8fe130146276a83971d88d240d71192907e23516 100644
--- a/reco/detectors/trd/CbmTrdTrackFinderIdeal.h
+++ b/reco/detectors/trd/CbmTrdTrackFinderIdeal.h
@@ -1,6 +1,6 @@
 /* Copyright (C) 2006-2014 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
    SPDX-License-Identifier: GPL-3.0-only
-   Authors: D.Kresan, Denis Bertini [committer] */
+   Authors: Dmytro Kresan, Denis Bertini [committer] */
 
 // -------------------------------------------------------------------------
 // -----                 CbmTrdTrackFinderIdeal header file            -----
diff --git a/reco/detectors/trd/CbmTrdTrackFitterIdeal.cxx b/reco/detectors/trd/CbmTrdTrackFitterIdeal.cxx
index ae0b37541f0094c957aa67ffe12a584b5c5a7649..437f0ea2f853d65c39b4837a53bccb1fa7d63c9a 100644
--- a/reco/detectors/trd/CbmTrdTrackFitterIdeal.cxx
+++ b/reco/detectors/trd/CbmTrdTrackFitterIdeal.cxx
@@ -1,6 +1,6 @@
 /* Copyright (C) 2006-2012 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
    SPDX-License-Identifier: GPL-3.0-only
-   Authors: D. Kresan, Denis Bertini [committer], Florian Uhlig */
+   Authors: Dmytro Kresan, Denis Bertini [committer], Florian Uhlig */
 
 // -------------------------------------------------------------------------
 // -----                CbmTrdTrackFitterIdeal source file             -----
diff --git a/reco/detectors/trd/CbmTrdTrackFitterIdeal.h b/reco/detectors/trd/CbmTrdTrackFitterIdeal.h
index 402e12c58b23f17f7c80dfd80d525412efceaf05..0ae880f1e857a12b52a98f0db4f1a61ff11ec572 100644
--- a/reco/detectors/trd/CbmTrdTrackFitterIdeal.h
+++ b/reco/detectors/trd/CbmTrdTrackFitterIdeal.h
@@ -1,6 +1,6 @@
 /* Copyright (C) 2006-2012 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
    SPDX-License-Identifier: GPL-3.0-only
-   Authors: D. Kresan, Denis Bertini [committer] */
+   Authors: Dmytro Kresan, Denis Bertini [committer] */
 
 // -------------------------------------------------------------------------
 // -----                CbmTrdTrackFitterIdeal header file             -----
diff --git a/reco/detectors/trd/pid/CbmTrdElectronsTrainAnn.h b/reco/detectors/trd/pid/CbmTrdElectronsTrainAnn.h
index 1e7374396c87861140bb4bae93525e21f76d8c70..338bf67ad8294575e3e1a44ea950c70d333fc6d0 100644
--- a/reco/detectors/trd/pid/CbmTrdElectronsTrainAnn.h
+++ b/reco/detectors/trd/pid/CbmTrdElectronsTrainAnn.h
@@ -1,6 +1,6 @@
 /* Copyright (C) 2009-2018 UGiessen, JINR-LIT
    SPDX-License-Identifier: GPL-3.0-only
-   Authors: Semen Lebedev (S.Lebedev@gsi.de), Semen Lebedev [committer], Florian Uhlig */
+   Authors: Semen Lebedev [committer], Florian Uhlig */
 
 /** CbmTrdElectronsTrainAnn
  * Author: Semen Lebedev (S.Lebedev@gsi.de)
diff --git a/reco/detectors/trd/pid/CbmTrdSetTracksPidANN.cxx b/reco/detectors/trd/pid/CbmTrdSetTracksPidANN.cxx
index 2fb942bfde0bbbe646f7cda053587eb020f60f1d..3762d05b574faa48227a293f28c4db3dc2791bb3 100644
--- a/reco/detectors/trd/pid/CbmTrdSetTracksPidANN.cxx
+++ b/reco/detectors/trd/pid/CbmTrdSetTracksPidANN.cxx
@@ -1,6 +1,6 @@
 /* Copyright (C) 2007-2021 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
    SPDX-License-Identifier: GPL-3.0-only
-   Authors: Simeon Lebedev, Andrey Lebedev, Florian Uhlig [committer], Semen Lebedev */
+   Authors: Semen Lebedev, Andrey Lebedev, Florian Uhlig [committer] */
 
 // -------------------------------------------------------------------------
 // -----                    CbmTrdSetTracksPidANN source file          -----
diff --git a/reco/detectors/trd/pid/CbmTrdSetTracksPidANN.h b/reco/detectors/trd/pid/CbmTrdSetTracksPidANN.h
index 6c99f4626c9d90cfbb6a29169e195b270e2226bd..c31da580cd01d6bc954fd782dedf8100c42d57f5 100644
--- a/reco/detectors/trd/pid/CbmTrdSetTracksPidANN.h
+++ b/reco/detectors/trd/pid/CbmTrdSetTracksPidANN.h
@@ -1,6 +1,6 @@
 /* Copyright (C) 2007-2015 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
    SPDX-License-Identifier: GPL-3.0-only
-   Authors: Simeon Lebedev, Florian Uhlig [committer] */
+   Authors: Semen Lebedev, Florian Uhlig [committer] */
 
 // -------------------------------------------------------------------------
 // -----                    CbmTrdSetTracksPidANN header file                -----
diff --git a/reco/detectors/trd/qa/CbmTrdHitProducerQa.cxx b/reco/detectors/trd/qa/CbmTrdHitProducerQa.cxx
index b38d10e29cb08862d460559611a9fcdf6cfc690b..7d50671edf5126dfdf043b5ac258803fc15ae058 100644
--- a/reco/detectors/trd/qa/CbmTrdHitProducerQa.cxx
+++ b/reco/detectors/trd/qa/CbmTrdHitProducerQa.cxx
@@ -1,6 +1,6 @@
 /* Copyright (C) 2005-2019 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
    SPDX-License-Identifier: GPL-3.0-only
-   Authors: M. Kalisky, Florian Uhlig, Denis Bertini [committer] */
+   Authors: Matus Kalisky, Florian Uhlig, Denis Bertini [committer] */
 
 // -----------------------------------------------------------------------
 // -----                     CbmTrdHitProducerQa                     -----
diff --git a/reco/detectors/trd/qa/CbmTrdHitProducerQa.h b/reco/detectors/trd/qa/CbmTrdHitProducerQa.h
index 08949608b2cccacbf2cbd325e9508347f4b620a7..c8838185ed4a3af53a0ea87d22bd093c66d05a16 100644
--- a/reco/detectors/trd/qa/CbmTrdHitProducerQa.h
+++ b/reco/detectors/trd/qa/CbmTrdHitProducerQa.h
@@ -1,6 +1,6 @@
 /* Copyright (C) 2006-2014 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
    SPDX-License-Identifier: GPL-3.0-only
-   Authors: M.Kalisky, Denis Bertini [committer], Florian Uhlig */
+   Authors: Matus Kalisky, Denis Bertini [committer], Florian Uhlig */
 
 // -----------------------------------------------------------------------
 // -----                     CbmTrdHitProducerQa                     -----
diff --git a/reco/detectors/trd/qa/CbmTrdRecoQa.cxx b/reco/detectors/trd/qa/CbmTrdRecoQa.cxx
index 47c475ec0da981d3ffa69fbf0f785f2c38e6a25c..58b646fc4ea49ac04533ebb2ee11b0775c8843e7 100644
--- a/reco/detectors/trd/qa/CbmTrdRecoQa.cxx
+++ b/reco/detectors/trd/qa/CbmTrdRecoQa.cxx
@@ -1,6 +1,6 @@
 /* Copyright (C) 2007-2021 Institut fuer Kernphysik, Westfaelische Wilhelms-Universitaet Muenster, Muenster
    SPDX-License-Identifier: GPL-3.0-only
-   Authors: F. Uhlig, Cyrano Bergmann [committer] */
+   Authors: Florian Uhlig, Cyrano Bergmann [committer] */
 
 // -----------------------------------------------------------------------
 // -----                     CbmTrdRecoQa                        -----
diff --git a/reco/detectors/trd/qa/CbmTrdRecoQa.h b/reco/detectors/trd/qa/CbmTrdRecoQa.h
index 496be731b1fafe1f29004018ffd156fb1bd721aa..3f6d9402f6998435a0c9d16bfd1b82cc5b054695 100644
--- a/reco/detectors/trd/qa/CbmTrdRecoQa.h
+++ b/reco/detectors/trd/qa/CbmTrdRecoQa.h
@@ -1,6 +1,6 @@
 /* Copyright (C) 2013-2018 Institut fuer Kernphysik, Westfaelische Wilhelms-Universitaet Muenster, Muenster
    SPDX-License-Identifier: GPL-3.0-only
-   Authors: F.Uhlig, Cyrano Bergmann [committer] */
+   Authors: Florian Uhlig, Cyrano Bergmann [committer] */
 
 // -----------------------------------------------------------------------
 // -----                     CbmTrdRecoQa                       -----
diff --git a/reco/eventbuilder/CbmEventBuilderLinkDef.h b/reco/eventbuilder/CbmEventBuilderLinkDef.h
index f48cea38b7697a3094f6a4f4939fe95f420d7b85..f6743998e726cae0cb26d36259d71097d861b518 100644
--- a/reco/eventbuilder/CbmEventBuilderLinkDef.h
+++ b/reco/eventbuilder/CbmEventBuilderLinkDef.h
@@ -1,6 +1,6 @@
 /* Copyright (C) 2017-2021 IKF-UFra, GSI
    SPDX-License-Identifier: GPL-3.0-only
-   Authors: Valentina Akishina [orginator], Volker Friese, Dominik Smith */
+   Authors: Valentina Akishina [committer], Volker Friese, Dominik Smith */
 
 #ifdef __CINT__
 
diff --git a/reco/eventbuilder/digis/CbmBuildEventsSimple.cxx b/reco/eventbuilder/digis/CbmBuildEventsSimple.cxx
index b2d33f6aea8ab6366b3c82a6e44c202156f6e83f..0ebae439ff3fede8c7f8a2b2e8560b80e242d16c 100644
--- a/reco/eventbuilder/digis/CbmBuildEventsSimple.cxx
+++ b/reco/eventbuilder/digis/CbmBuildEventsSimple.cxx
@@ -1,6 +1,6 @@
 /* Copyright (C) 2014-2020 Institute for Theoretical and Experimental Physics named by A.I. Alikhanov of National Research Centre "Kurchatov Institute" (ITEP) in Moscow, Russia, Moscow
    SPDX-License-Identifier: GPL-3.0-only
-   Authors: //Dr.Sys, Volker Friese, Mikhail Prokudin [committer] */
+   Authors: Mikhail Prokudin [committer], Volker Friese */
 
 /** @file CbmBuildEventsSimple.cxx
  ** @author //Dr.Sys <Mikhail.Prokudin@cern.ch>
diff --git a/reco/eventbuilder/digis/CbmBuildEventsSimple.h b/reco/eventbuilder/digis/CbmBuildEventsSimple.h
index 8f4596628de2381fc01f76009df69c7ae1175275..ab963f7c58e2f6d10d325f7f1fae75499be77f2d 100644
--- a/reco/eventbuilder/digis/CbmBuildEventsSimple.h
+++ b/reco/eventbuilder/digis/CbmBuildEventsSimple.h
@@ -1,6 +1,6 @@
 /* Copyright (C) 2014-2017 Institute for Theoretical and Experimental Physics named by A.I. Alikhanov of National Research Centre "Kurchatov Institute" (ITEP) in Moscow, Russia, Moscow
    SPDX-License-Identifier: GPL-3.0-only
-   Authors: //Dr.Sys, Volker Friese, Mikhail Prokudin [committer] */
+   Authors: Volker Friese, Mikhail Prokudin [committer] */
 
 /** @file CbmBuildEventsSimple.h
  ** @author //Dr.Sys <Mikhail.Prokudin@cern.ch>
diff --git a/reco/eventbuilder/digis/CbmEvBuildSource.cxx b/reco/eventbuilder/digis/CbmEvBuildSource.cxx
index 964177fed6b9b4ae22d40881db20b589bbda9821..8e78c3a5934af1499d7878c08a323a20940f0d10 100644
--- a/reco/eventbuilder/digis/CbmEvBuildSource.cxx
+++ b/reco/eventbuilder/digis/CbmEvBuildSource.cxx
@@ -1,6 +1,6 @@
 /* Copyright (C) 2016-2021 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
    SPDX-License-Identifier: GPL-3.0-only
-   Authors: Volker Friese [orginator] */
+   Authors: Volker Friese */
 
 #include "CbmEvBuildSource.h"
 
diff --git a/reco/eventbuilder/digis/CbmEvBuildSource.h b/reco/eventbuilder/digis/CbmEvBuildSource.h
index 77bf6fef15f62d28ba8e7ccd6e593eedbbfea770..05954402bba054df2cb57bea07ed35b2b30e117d 100644
--- a/reco/eventbuilder/digis/CbmEvBuildSource.h
+++ b/reco/eventbuilder/digis/CbmEvBuildSource.h
@@ -1,6 +1,6 @@
 /* Copyright (C) 2016 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
    SPDX-License-Identifier: GPL-3.0-only
-   Authors: Volker Friese [orginator], Florian Uhlig */
+   Authors: Volker Friese [committer], Florian Uhlig */
 
 // FairSource which reads a time slice and creates events using a simple approach
 // Use the same approach as CbmBuildEventSimple
diff --git a/reco/global/CbmFindGlobalTracks.cxx b/reco/global/CbmFindGlobalTracks.cxx
index d6abe668de5b83a89568e02f95604c11cd8057a8..9106fdb12abe6d454b48a74d4107992721360c69 100644
--- a/reco/global/CbmFindGlobalTracks.cxx
+++ b/reco/global/CbmFindGlobalTracks.cxx
@@ -1,6 +1,6 @@
 /* Copyright (C) 2005-2016 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
    SPDX-License-Identifier: GPL-3.0-only
-   Authors: V. Friese, Denis Bertini [committer], Florian Uhlig */
+   Authors: Volker Friese, Denis Bertini [committer], Florian Uhlig */
 
 // -------------------------------------------------------------------------
 // -----                  CbmFindGlobalTracks source file              -----
diff --git a/reco/global/CbmFindGlobalTracks.h b/reco/global/CbmFindGlobalTracks.h
index 4cdafb0b38ef0973d669463f0d8b1bf5100cec50..03f10567f5c83bcb5a70b6e27fd54fc72cd40dcf 100644
--- a/reco/global/CbmFindGlobalTracks.h
+++ b/reco/global/CbmFindGlobalTracks.h
@@ -1,6 +1,6 @@
 /* Copyright (C) 2006-2012 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
    SPDX-License-Identifier: GPL-3.0-only
-   Authors: V.Friese, Denis Bertini [committer] */
+   Authors: Volker Friese, Denis Bertini [committer] */
 
 // -------------------------------------------------------------------------
 // -----                  CbmFindGlobalTracks header file              -----
diff --git a/reco/global/CbmFitGlobalTracks.cxx b/reco/global/CbmFitGlobalTracks.cxx
index f06622b2aeb363d0ca1ead1653d7c95f0a11181f..a4d1ea003b72700af4ecb7f5690c8ed0386ea003 100644
--- a/reco/global/CbmFitGlobalTracks.cxx
+++ b/reco/global/CbmFitGlobalTracks.cxx
@@ -1,6 +1,6 @@
 /* Copyright (C) 2006-2015 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
    SPDX-License-Identifier: GPL-3.0-only
-   Authors: D.Kresan, Denis Bertini [committer], Florian Uhlig */
+   Authors: Dmytro Kresan, Denis Bertini [committer], Florian Uhlig */
 
 // ------------------------------------------------------------------
 // -----                    CbmFitGlobalTracks                  -----
diff --git a/reco/global/CbmFitGlobalTracks.h b/reco/global/CbmFitGlobalTracks.h
index 1bf608d9f2a6db5dcc9eef189d68c857d28bc431..54de08be970fa1ea4aea913f2b39e8858fdd0af2 100644
--- a/reco/global/CbmFitGlobalTracks.h
+++ b/reco/global/CbmFitGlobalTracks.h
@@ -1,6 +1,6 @@
 /* Copyright (C) 2006-2012 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
    SPDX-License-Identifier: GPL-3.0-only
-   Authors: D.Kresan, Denis Bertini [committer] */
+   Authors: Dmytro Kresan, Denis Bertini [committer] */
 
 // ------------------------------------------------------------------
 // -----                    CbmFitGlobalTracks                  -----
diff --git a/reco/global/CbmFitGlobalTracksQa.cxx b/reco/global/CbmFitGlobalTracksQa.cxx
index 1efd33d6bcdbe839a3fcadfbc8037ba7c2a14477..48dab99d2ede716671911c3393b47d4d0a071f16 100644
--- a/reco/global/CbmFitGlobalTracksQa.cxx
+++ b/reco/global/CbmFitGlobalTracksQa.cxx
@@ -1,6 +1,6 @@
 /* Copyright (C) 2006-2015 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
    SPDX-License-Identifier: GPL-3.0-only
-   Authors: D. Kresan, Denis Bertini [committer], Florian Uhlig */
+   Authors: Dmytro Kresan, Denis Bertini [committer], Florian Uhlig */
 
 //-------------------------------------------------------------------------
 //-----                     CbmFitGlobalTracksQa                      -----
diff --git a/reco/global/CbmFitGlobalTracksQa.h b/reco/global/CbmFitGlobalTracksQa.h
index 405f4178ea1e17a8b335605160927535d80acc60..0911eb864015bef09e23ccf471651d0cf3efacbb 100644
--- a/reco/global/CbmFitGlobalTracksQa.h
+++ b/reco/global/CbmFitGlobalTracksQa.h
@@ -1,6 +1,6 @@
 /* Copyright (C) 2006-2012 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
    SPDX-License-Identifier: GPL-3.0-only
-   Authors: D. Kresan, Denis Bertini [committer] */
+   Authors: Dmytro Kresan, Denis Bertini [committer] */
 
 //-------------------------------------------------------------------------
 //-----                     CbmFitGlobalTracksQa                      -----
diff --git a/reco/global/CbmGlobalTrackFitterIdeal.cxx b/reco/global/CbmGlobalTrackFitterIdeal.cxx
index 7bbf060171e7b38bed4d730f33c584d29409dac6..a0d7782321abe9a31702405180f2a9624e517d5c 100644
--- a/reco/global/CbmGlobalTrackFitterIdeal.cxx
+++ b/reco/global/CbmGlobalTrackFitterIdeal.cxx
@@ -1,6 +1,6 @@
 /* Copyright (C) 2006-2012 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
    SPDX-License-Identifier: GPL-3.0-only
-   Authors: D.Kresan, Denis Bertini [committer], Florian Uhlig */
+   Authors: Dmytro Kresan, Denis Bertini [committer], Florian Uhlig */
 
 // ------------------------------------------------------------------
 // -----                  CbmGlobalTrackFitterIdeal             -----
diff --git a/reco/global/CbmGlobalTrackFitterIdeal.h b/reco/global/CbmGlobalTrackFitterIdeal.h
index f22866f6160e96f6267b27fca540e94e4f8c48c7..7efbf0da959ba4bf0d2aa5c7d7e8dd6bf1211f53 100644
--- a/reco/global/CbmGlobalTrackFitterIdeal.h
+++ b/reco/global/CbmGlobalTrackFitterIdeal.h
@@ -1,6 +1,6 @@
 /* Copyright (C) 2006-2012 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
    SPDX-License-Identifier: GPL-3.0-only
-   Authors: D.Kresan, Denis Bertini [committer] */
+   Authors: Dmytro Kresan, Denis Bertini [committer] */
 
 // ------------------------------------------------------------------
 // -----                  CbmGlobalTrackFitterIdeal             -----
diff --git a/reco/global/CbmTrackMergerIdeal.cxx b/reco/global/CbmTrackMergerIdeal.cxx
index 5e11f02a781e85af98e87710505d8eb217887fca..876cb4733f64536cae82a321cd262c32bb280c9f 100644
--- a/reco/global/CbmTrackMergerIdeal.cxx
+++ b/reco/global/CbmTrackMergerIdeal.cxx
@@ -1,6 +1,6 @@
 /* Copyright (C) 2005-2012 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
    SPDX-License-Identifier: GPL-3.0-only
-   Authors: V. Friese, Denis Bertini [committer], Florian Uhlig */
+   Authors: Volker Friese, Denis Bertini [committer], Florian Uhlig */
 
 // -------------------------------------------------------------------------
 // -----                  CbmTrackMergerIdeal source file              -----
diff --git a/reco/global/CbmTrackMergerIdeal.h b/reco/global/CbmTrackMergerIdeal.h
index 917fa9425d54f569711121ad54f91fe84e961e90..00f4719d249f2e183d9ceee38a681c93e24892cb 100644
--- a/reco/global/CbmTrackMergerIdeal.h
+++ b/reco/global/CbmTrackMergerIdeal.h
@@ -1,6 +1,6 @@
 /* Copyright (C) 2006-2012 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
    SPDX-License-Identifier: GPL-3.0-only
-   Authors: v.friese@gsi.de, Denis Bertini [committer] */
+   Authors: Volker Friese, Denis Bertini [committer] */
 
 // -------------------------------------------------------------------------
 // -----                  CbmTrackMergerIdeal header file              -----
diff --git a/reco/littrack/cbm/generators/CbmLitPolarizedGenerator.cxx b/reco/littrack/cbm/generators/CbmLitPolarizedGenerator.cxx
index b384259340b6eba4a6a7739f332560b049d05533..9eeffc1d8fc3fe2fb18c5d7cc745b45fa893eaa9 100644
--- a/reco/littrack/cbm/generators/CbmLitPolarizedGenerator.cxx
+++ b/reco/littrack/cbm/generators/CbmLitPolarizedGenerator.cxx
@@ -1,6 +1,6 @@
 /* Copyright (C) 2009-2011 GSI/JINR-LIT
    SPDX-License-Identifier: GPL-3.0-only
-   Authors: E. Kryshen, Andrey Lebedev [committer] */
+   Authors: Evgeny Kryshen, Andrey Lebedev [committer] */
 
 // -------------------------------------------------------------------------
 // -----         CbmLitPolarizedGenerator source file                     -----
diff --git a/reco/littrack/clustering/CbmClusteringA1.cxx b/reco/littrack/clustering/CbmClusteringA1.cxx
index b36b3d4b0ac1f7ad6204d59063ae861f0bf84e46..3c3eba93c58cd78912c5a7baf8d976154403f3be 100644
--- a/reco/littrack/clustering/CbmClusteringA1.cxx
+++ b/reco/littrack/clustering/CbmClusteringA1.cxx
@@ -1,6 +1,6 @@
 /* Copyright (C) 2012-2016 GSI/JINR-LIT
    SPDX-License-Identifier: GPL-3.0-only
-   Authors: kozlov, Andrey Lebedev [committer], Grigory Kozlov */
+   Authors: Grigory Kozlov, Andrey Lebedev [committer] */
 
 /*
  * CbmClusteringA1.cxx
diff --git a/reco/littrack/clustering/CbmClusteringA1.h b/reco/littrack/clustering/CbmClusteringA1.h
index 733317c3ab2ef9a7b58a6546692f642092da3abb..b34824a12c6175c0cfcc04ca3f952f0a3abdae0f 100644
--- a/reco/littrack/clustering/CbmClusteringA1.h
+++ b/reco/littrack/clustering/CbmClusteringA1.h
@@ -1,6 +1,6 @@
 /* Copyright (C) 2012-2016 GSI/JINR-LIT
    SPDX-License-Identifier: GPL-3.0-only
-   Authors: kozlov, Andrey Lebedev [committer], Grigory Kozlov, Florian Uhlig */
+   Authors: Grigory Kozlov, Andrey Lebedev [committer], Florian Uhlig */
 
 /*
  * CbmClusteringA1.h
diff --git a/reco/littrack/clustering/CbmClusteringGeometry.cxx b/reco/littrack/clustering/CbmClusteringGeometry.cxx
index 0a0f41630e2e62830c00f9e2fe06a04c62730bf6..d95a1ff3e12a45cf2484fa1abf11b428f85b13cb 100644
--- a/reco/littrack/clustering/CbmClusteringGeometry.cxx
+++ b/reco/littrack/clustering/CbmClusteringGeometry.cxx
@@ -1,6 +1,6 @@
 /* Copyright (C) 2012-2016 FIAS, JINR-LIT
    SPDX-License-Identifier: GPL-3.0-only
-   Authors: kozlov, Grigory Kozlov [committer] */
+   Authors: Grigory Kozlov */
 
 /*
  * CbmClusteringGeometry.cxx
diff --git a/reco/littrack/clustering/CbmClusteringGeometry.h b/reco/littrack/clustering/CbmClusteringGeometry.h
index 2286ac95f1e796d3265d5b3e5c8b843b9495e3d9..325a4901cd5441dc0a426c049d553eeedd5acceb 100644
--- a/reco/littrack/clustering/CbmClusteringGeometry.h
+++ b/reco/littrack/clustering/CbmClusteringGeometry.h
@@ -1,6 +1,6 @@
 /* Copyright (C) 2012-2016 FIAS, JINR-LIT
    SPDX-License-Identifier: GPL-3.0-only
-   Authors: kozlov, Grigory Kozlov [committer] */
+   Authors: Grigory Kozlov */
 
 /*
  * CbmClusteringGeometry.h
diff --git a/reco/littrack/clustering/CbmClusteringSL.cxx b/reco/littrack/clustering/CbmClusteringSL.cxx
index 781ac9cc80b72c245ae7443422f6a29f39b37a5d..4ea2460cf8d5da0d5fecefcf482a1c6bda1aed60 100644
--- a/reco/littrack/clustering/CbmClusteringSL.cxx
+++ b/reco/littrack/clustering/CbmClusteringSL.cxx
@@ -1,6 +1,6 @@
 /* Copyright (C) 2012-2013 GSI/JINR-LIT
    SPDX-License-Identifier: GPL-3.0-only
-   Authors: kozlov, Andrey Lebedev [committer], Grigory Kozlov */
+   Authors: Grigory Kozlov, Andrey Lebedev [committer] */
 
 /*
  * CbmClusteringSL.cxx
diff --git a/reco/littrack/clustering/CbmClusteringSL.h b/reco/littrack/clustering/CbmClusteringSL.h
index 586d719f3858512a8ecb96c6ccfbc0dd38c67c8e..6a7e92dbc361756fde43280cf2739ec2cc03e4bd 100644
--- a/reco/littrack/clustering/CbmClusteringSL.h
+++ b/reco/littrack/clustering/CbmClusteringSL.h
@@ -1,6 +1,6 @@
 /* Copyright (C) 2012-2016 GSI/JINR-LIT
    SPDX-License-Identifier: GPL-3.0-only
-   Authors: kozlov, Andrey Lebedev [committer], Grigory Kozlov, Florian Uhlig */
+   Authors: Grigory Kozlov, Andrey Lebedev [committer], Florian Uhlig */
 
 /*
  * CbmClusteringSL.h
diff --git a/reco/littrack/clustering/CbmClusteringWard.cxx b/reco/littrack/clustering/CbmClusteringWard.cxx
index a35a392ef2bb57b2f8b7f2bb6f52fa3071767ed3..c5b24bb9b83eba7f92d752ea7393d1e823bcbf06 100644
--- a/reco/littrack/clustering/CbmClusteringWard.cxx
+++ b/reco/littrack/clustering/CbmClusteringWard.cxx
@@ -1,6 +1,6 @@
 /* Copyright (C) 2012-2019 GSI/JINR-LIT
    SPDX-License-Identifier: GPL-3.0-only
-   Authors: kozlov, Andrey Lebedev [committer] */
+   Authors: Grigory Kozlov, Andrey Lebedev [committer] */
 
 /*
  * CbmClusteringWard.cxx
diff --git a/reco/littrack/clustering/CbmClusteringWard.h b/reco/littrack/clustering/CbmClusteringWard.h
index c230cb4c7fe541cdff07aafa7941e69f6ae0a064..ca7d82bfad2670e5f1dab06a766cf1157cca606c 100644
--- a/reco/littrack/clustering/CbmClusteringWard.h
+++ b/reco/littrack/clustering/CbmClusteringWard.h
@@ -1,6 +1,6 @@
 /* Copyright (C) 2012-2013 GSI/JINR-LIT
    SPDX-License-Identifier: GPL-3.0-only
-   Authors: kozlov, Andrey Lebedev [committer] */
+   Authors: Grigory Kozlov, Andrey Lebedev [committer] */
 
 /*
  * CbmClusteringWard.h
diff --git a/reco/littrack/clustering/CbmMuchClustering.cxx b/reco/littrack/clustering/CbmMuchClustering.cxx
index 7c370a461a45a92d9a2ee0801cce82f844655510..ea172ba1a8c099d65ab01e72e2399b77a6644dcc 100644
--- a/reco/littrack/clustering/CbmMuchClustering.cxx
+++ b/reco/littrack/clustering/CbmMuchClustering.cxx
@@ -1,6 +1,6 @@
 /* Copyright (C) 2012-2021 GSI/JINR-LIT
    SPDX-License-Identifier: GPL-3.0-only
-   Authors: kozlov, Grigory Kozlov, Andrey Lebedev [committer] */
+   Authors: Grigory Kozlov, Andrey Lebedev [committer] */
 
 /*
  * CbmMuchClustering.cxx
diff --git a/reco/littrack/clustering/CbmMuchClustering.h b/reco/littrack/clustering/CbmMuchClustering.h
index cb5d1c3db068a2f95dde65332ddb6978ac75cf40..2a6188e5e8c390552384b0b7adec8fa562abdf28 100644
--- a/reco/littrack/clustering/CbmMuchClustering.h
+++ b/reco/littrack/clustering/CbmMuchClustering.h
@@ -1,6 +1,6 @@
 /* Copyright (C) 2012-2020 GSI/JINR-LIT
    SPDX-License-Identifier: GPL-3.0-only
-   Authors: kozlov, Andrey Lebedev [committer], Grigory Kozlov, Florian Uhlig */
+   Authors: Grigory Kozlov, Andrey Lebedev [committer], Florian Uhlig */
 
 /*
  * CbmMuchClustering.h
diff --git a/reco/littrack/clustering/CbmMuchTest.cxx b/reco/littrack/clustering/CbmMuchTest.cxx
index 1133677cecfeda736ff1742f4726fa9dbb487a52..ada6ea0f1591e7dda745aa53cdedf7a03d9ae32e 100644
--- a/reco/littrack/clustering/CbmMuchTest.cxx
+++ b/reco/littrack/clustering/CbmMuchTest.cxx
@@ -1,6 +1,6 @@
 /* Copyright (C) 2012-2019 GSI/JINR-LIT
    SPDX-License-Identifier: GPL-3.0-only
-   Authors: kozlov, Andrey Lebedev [committer] */
+   Authors: Grigory Kozlov, Andrey Lebedev [committer] */
 
 /*
  * CbmMuchTest.cxx
diff --git a/reco/littrack/clustering/CbmMuchTest.h b/reco/littrack/clustering/CbmMuchTest.h
index 1a193c2ca4a61654fe27b24a01d75bda4167b387..ea744908496b71b8d371dd5c470e95b93b90a92a 100644
--- a/reco/littrack/clustering/CbmMuchTest.h
+++ b/reco/littrack/clustering/CbmMuchTest.h
@@ -1,6 +1,6 @@
 /* Copyright (C) 2012-2013 GSI/JINR-LIT
    SPDX-License-Identifier: GPL-3.0-only
-   Authors: kozlov, Andrey Lebedev [committer] */
+   Authors: Grigory Kozlov, Andrey Lebedev [committer] */
 
 /*
  * CbmMuchTest.h
diff --git a/reco/littrack/std/data/CbmLitTofTrack.h b/reco/littrack/std/data/CbmLitTofTrack.h
index 0543b6794ff48d4fad3b044fdecf2c9448a5f5eb..5365416a4706711e315642f857b11912bb4fd2e2 100644
--- a/reco/littrack/std/data/CbmLitTofTrack.h
+++ b/reco/littrack/std/data/CbmLitTofTrack.h
@@ -1,6 +1,6 @@
 /* Copyright (C) 2013-2017 GSI/JINR-LIT
    SPDX-License-Identifier: GPL-3.0-only
-   Authors: andrey, Andrey Lebedev [committer] */
+   Authors: Andrey Lebedev */
 
 /*
  * CbmLitTofTrack.h
diff --git a/sim/detectors/much/CbmGeoMuch.cxx b/sim/detectors/much/CbmGeoMuch.cxx
index bf41eac316c63373255e8052bde9e0c91b478e62..fa6f4b71296c690699fa7274249db548b7e6bcbb 100644
--- a/sim/detectors/much/CbmGeoMuch.cxx
+++ b/sim/detectors/much/CbmGeoMuch.cxx
@@ -1,6 +1,6 @@
 /* Copyright (C) 2006-2009 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
    SPDX-License-Identifier: GPL-3.0-only
-   Authors: A.Kiseleva, Denis Bertini [committer], Volker Friese */
+   Authors: Anna Senger, Denis Bertini [committer], Volker Friese */
 
 /** CbmGeoMuch class
  *
diff --git a/sim/detectors/much/CbmGeoMuch.h b/sim/detectors/much/CbmGeoMuch.h
index 6ea01fa309a0e18a9a0d50e5dca3f90dad13e7e6..a9d0c73c6b02ef30639216d36580c43aa590bf87 100644
--- a/sim/detectors/much/CbmGeoMuch.h
+++ b/sim/detectors/much/CbmGeoMuch.h
@@ -1,6 +1,6 @@
 /* Copyright (C) 2006-2009 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
    SPDX-License-Identifier: GPL-3.0-only
-   Authors: A.Kiseleva, Denis Bertini [committer] */
+   Authors: Anna Senger, Denis Bertini [committer] */
 
 /** CbmGeoMuch class
  *
diff --git a/sim/detectors/much/CbmMuchReadoutBuffer.cxx b/sim/detectors/much/CbmMuchReadoutBuffer.cxx
index 9537eeec850751752630477d5bcaed03b5d548de..4a1f1ea160f27c0c6b1470685161e4a46828b2ae 100644
--- a/sim/detectors/much/CbmMuchReadoutBuffer.cxx
+++ b/sim/detectors/much/CbmMuchReadoutBuffer.cxx
@@ -1,6 +1,6 @@
 /* Copyright (C) 2016-2019 Variable Energy Cyclotron Centre, Kolkata
    SPDX-License-Identifier: GPL-3.0-only
-   Authors: vikas@vecc.gov.in, Vikas Singhal [committer], Volker Friese */
+   Authors: Vikas Singhal [committer], Volker Friese */
 
 /*
  * CbmMuchReadoutBuffer.cxx
diff --git a/sim/detectors/much/CbmMuchReadoutBuffer.h b/sim/detectors/much/CbmMuchReadoutBuffer.h
index a39562e17ca6ac8e9e82e77aabefe0a9c7a05a92..ff4ff4220d49fed54fcf322faa36c64b151eb64b 100644
--- a/sim/detectors/much/CbmMuchReadoutBuffer.h
+++ b/sim/detectors/much/CbmMuchReadoutBuffer.h
@@ -1,6 +1,6 @@
 /* Copyright (C) 2016-2019 Variable Energy Cyclotron Centre, Kolkata
    SPDX-License-Identifier: GPL-3.0-only
-   Authors: vikas@vecc.gov.in, Vikas Singhal [committer] */
+   Authors: Vikas Singhal */
 
 /*
  * CbmMuchReadoutBuffer.h
diff --git a/sim/detectors/much/qa/CbmMuchDigitizerQa.h b/sim/detectors/much/qa/CbmMuchDigitizerQa.h
index 3d3db66c6b7e27053b06970c5c202949af266381..e5b73c36adf4d3584324e86e3c37e84a750a1b6a 100644
--- a/sim/detectors/much/qa/CbmMuchDigitizerQa.h
+++ b/sim/detectors/much/qa/CbmMuchDigitizerQa.h
@@ -1,6 +1,6 @@
 /* Copyright (C) 2020-2021 Facility for Antiproton and Ion Research in Europe, Darmstadt
    SPDX-License-Identifier: GPL-3.0-only
-   Authors: Eugeny Kryshen, Dominik Smith [committer], Sergey Gorbunov, Vikas Singhal, Ekata Nandy */
+   Authors: Evgeny Kryshen, Dominik Smith [committer], Sergey Gorbunov, Vikas Singhal, Ekata Nandy */
 
 /*** \brief  Definition of the CbmMuchDigitizerQa class
   * \date   25.09.2020 **/
diff --git a/sim/detectors/much/qa/CbmMuchTransportQa.h b/sim/detectors/much/qa/CbmMuchTransportQa.h
index 87bfebe4772095d6bbdd539c339d4d89c2d88b4c..54ee4d5a78a726abcdeec1742aa238cf84f7f0d5 100644
--- a/sim/detectors/much/qa/CbmMuchTransportQa.h
+++ b/sim/detectors/much/qa/CbmMuchTransportQa.h
@@ -1,6 +1,6 @@
 /* Copyright (C) 2020-2021 Facility for Antiproton and Ion Research in Europe, Darmstadt
    SPDX-License-Identifier: GPL-3.0-only
-   Authors: Sergey Gorbunov, Eugeny Kryshen, Vikas Singhal, Ekata Nandy, Dominik Smith [committer] */
+   Authors: Sergey Gorbunov, Evgeny Kryshen, Vikas Singhal, Ekata Nandy, Dominik Smith [committer] */
 
 /** @file   CbmMuchTransportQa.h
   * @brief  Definition of the CbmMuchTransportQa class
diff --git a/sim/detectors/psd/CbmPsdIdealDigitizer.cxx b/sim/detectors/psd/CbmPsdIdealDigitizer.cxx
index b2d1c33c79302333146b4ef80e80c67b94f27bd7..0ad41b1c9e365b40d075354dd37fa99cba03e955 100644
--- a/sim/detectors/psd/CbmPsdIdealDigitizer.cxx
+++ b/sim/detectors/psd/CbmPsdIdealDigitizer.cxx
@@ -1,6 +1,6 @@
 /* Copyright (C) 2012-2019 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
    SPDX-License-Identifier: GPL-3.0-only
-   Authors: Alla & SELIM & FLORIAN, Volker Friese [committer], Evgeny Kashirin */
+   Authors: Alla Maevskaya, Selim Seddiki, Volker Friese [committer], Evgeny Kashirin */
 
 // -------------------------------------------------------------------------
 // -----                CbmPsdIdealDigitizer source file             -----
diff --git a/sim/detectors/psd/CbmPsdSimpleDigitizer.cxx b/sim/detectors/psd/CbmPsdSimpleDigitizer.cxx
index b994e07c5cfddc1cbf87073975aecac84a5491b6..0a620643697d03584c475c27fd7d1078bd66357d 100644
--- a/sim/detectors/psd/CbmPsdSimpleDigitizer.cxx
+++ b/sim/detectors/psd/CbmPsdSimpleDigitizer.cxx
@@ -1,6 +1,6 @@
 /* Copyright (C) 2012-2020 Institute for Nuclear Research, Moscow
    SPDX-License-Identifier: GPL-3.0-only
-   Authors: Alla & SELIM & FLORIAN, Sergey Morozov [committer], Volker Friese, Evgeny Kashirin */
+   Authors: Alla Maevskaya, Selim Seddiki, Sergey Morozov [committer], Volker Friese, Evgeny Kashirin */
 
 // -------------------------------------------------------------------------
 // -----                CbmPsdSimpleDigitizer source file              -----
diff --git a/sim/detectors/rich/CbmRichDigitizer.h b/sim/detectors/rich/CbmRichDigitizer.h
index c2cbfe17ef45ecac2bd8129ac92e7eb57642f8f0..f77ccde3a2b9d21a407038da7a66a558f40a10c8 100644
--- a/sim/detectors/rich/CbmRichDigitizer.h
+++ b/sim/detectors/rich/CbmRichDigitizer.h
@@ -1,6 +1,6 @@
 /* Copyright (C) 2015-2020 GSI/JINR-LIT
    SPDX-License-Identifier: GPL-3.0-only
-   Authors: S.Lebedev, Andrey Lebedev [committer] */
+   Authors: Semen Lebedev, Andrey Lebedev [committer] */
 
 /**
 * \file CbmRichDigitizer.h
diff --git a/sim/detectors/tof/CbmTof.cxx b/sim/detectors/tof/CbmTof.cxx
index 3040d80c7c29417bf6feb6ec743c126da3469ed7..c9eba6624f3379840a4f9c6871c86246895dc338 100644
--- a/sim/detectors/tof/CbmTof.cxx
+++ b/sim/detectors/tof/CbmTof.cxx
@@ -1,6 +1,6 @@
 /* Copyright (C) 2004-2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
    SPDX-License-Identifier: GPL-3.0-only
-   Authors: V. Friese, Christian Simon, Denis Bertini [committer], Florian Uhlig */
+   Authors: Volker Friese, Christian Simon, Denis Bertini [committer], Florian Uhlig */
 
 // -------------------------------------------------------------------------
 // -----                       CbmTof source file                      -----
diff --git a/sim/detectors/tof/CbmTof.h b/sim/detectors/tof/CbmTof.h
index 96901e2918e57df4f4d86ecd13951923c7aa6a7c..1b415d1d6da1a5807f66db2d2b3bd850baa821d4 100644
--- a/sim/detectors/tof/CbmTof.h
+++ b/sim/detectors/tof/CbmTof.h
@@ -1,6 +1,6 @@
 /* Copyright (C) 2006-2019 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
    SPDX-License-Identifier: GPL-3.0-only
-   Authors: V.Friese, Denis Bertini [committer], Christian Simon */
+   Authors: Volker Friese, Denis Bertini [committer], Christian Simon */
 
 // -------------------------------------------------------------------------
 // -----                         CbmTof header file                    -----
diff --git a/sim/detectors/trd/CbmTrd.cxx b/sim/detectors/trd/CbmTrd.cxx
index 7b20be275d4be714ac941e23556194a1a8685498..a512f5e57b0ad1ea4cc4cb5f783b0226c8e07939 100644
--- a/sim/detectors/trd/CbmTrd.cxx
+++ b/sim/detectors/trd/CbmTrd.cxx
@@ -1,6 +1,6 @@
 /* Copyright (C) 2004-2021 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
    SPDX-License-Identifier: GPL-3.0-only
-   Authors: V.Friese, Florian Uhlig [committer], Andrey Lebedev, Adrian Meyer-Ahrens, David Emschermann */
+   Authors: Volker Friese, Florian Uhlig [committer], Andrey Lebedev, Adrian Meyer-Ahrens, David Emschermann */
 
 /**
  * \file CbmTrd.cxx
diff --git a/sim/detectors/trd/CbmTrd.h b/sim/detectors/trd/CbmTrd.h
index e57b70960b52696bdd1b041c25bf66b82a9ffc9d..a14eca8790234f064b17b458da60949bd26534c1 100644
--- a/sim/detectors/trd/CbmTrd.h
+++ b/sim/detectors/trd/CbmTrd.h
@@ -1,6 +1,6 @@
 /* Copyright (C) 2004-2019 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
    SPDX-License-Identifier: GPL-3.0-only
-   Authors: V.Friese, Andrey Lebedev, Denis Bertini [committer], Florian Uhlig */
+   Authors: Volker Friese, Andrey Lebedev, Denis Bertini [committer], Florian Uhlig */
 
 /**
  * \file CbmTrd.h
diff --git a/sim/detectors/trd/CbmTrdModuleSimT.h b/sim/detectors/trd/CbmTrdModuleSimT.h
index 089dc0580f5c187a417d08949fd720064da4557b..dd4a581c725d5b34b26cd364bb90afcc17670b77 100644
--- a/sim/detectors/trd/CbmTrdModuleSimT.h
+++ b/sim/detectors/trd/CbmTrdModuleSimT.h
@@ -1,6 +1,6 @@
 /* Copyright (C) 2018-2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
    SPDX-License-Identifier: GPL-3.0-only
-   Authors: Alex Bercuci, Florian Uhlig [committer], Alexandru Bercuci */
+   Authors: Alexandru Bercuci, Florian Uhlig [committer] */
 
 #ifndef CBMTRDMODULESIMT_H
 #define CBMTRDMODULESIMT_H
diff --git a/sim/detectors/trd/CbmTrdTrianglePRF.cxx b/sim/detectors/trd/CbmTrdTrianglePRF.cxx
index 21e1524df73c150a67faa0bf648f445966fb73dc..e4be08e6e8fd9ed7aafd1f11c04b5459f8882b84 100644
--- a/sim/detectors/trd/CbmTrdTrianglePRF.cxx
+++ b/sim/detectors/trd/CbmTrdTrianglePRF.cxx
@@ -1,6 +1,6 @@
 /* Copyright (C) 2017-2018 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
    SPDX-License-Identifier: GPL-3.0-only
-   Authors: Alex Bercuci, Florian Uhlig [committer] */
+   Authors: Alexandru Bercuci, Florian Uhlig [committer] */
 
 /**
  * \file CbmTrdTrianglePRF.cxx
diff --git a/sim/response/base/CbmDigitizationSource.cxx b/sim/response/base/CbmDigitizationSource.cxx
index 59cc0a513561b2c10d5ee8e5b1ef2907ac92c364..b8b6b9026f4bcd782f48cc135f8afcf3a885aa5d 100644
--- a/sim/response/base/CbmDigitizationSource.cxx
+++ b/sim/response/base/CbmDigitizationSource.cxx
@@ -1,6 +1,6 @@
 /* Copyright (C) 2018-2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
    SPDX-License-Identifier: GPL-3.0-only
-   Authors: vfriese, Volker Friese [committer], Florian Uhlig */
+   Authors: Volker Friese [committer], Florian Uhlig */
 
 /*
  * CbmDigitizationSource.cxx
diff --git a/sim/response/base/CbmRunAna.cxx b/sim/response/base/CbmRunAna.cxx
index f600bcd9ad59aea382ebfef0e4c7a1cd6e8e3168..4fd421cf11ed1494ed1869e524d8f2c047acf403 100644
--- a/sim/response/base/CbmRunAna.cxx
+++ b/sim/response/base/CbmRunAna.cxx
@@ -1,6 +1,6 @@
 /* Copyright (C) 2009-2016 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
    SPDX-License-Identifier: GPL-3.0-only
-   Authors: Volker Friese v.friese@gsi.de, Volker Friese [committer], Florian Uhlig */
+   Authors: Volker Friese [committer], Florian Uhlig */
 
 /** CbmRunAna.cxx
  *@author Volker Friese v.friese@gsi.de
diff --git a/sim/response/base/CbmRunAna.h b/sim/response/base/CbmRunAna.h
index 94645e57c35726395b329038098ef1644a66a100..a4b7557ec37cfdb8571de69b52a132a56de817f2 100644
--- a/sim/response/base/CbmRunAna.h
+++ b/sim/response/base/CbmRunAna.h
@@ -1,6 +1,6 @@
 /* Copyright (C) 2009-2016 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
    SPDX-License-Identifier: GPL-3.0-only
-   Authors: Volker Friese v.friese@gsi.de, Volker Friese [committer] */
+   Authors: Volker Friese [committer] */
 
 /** CbmRunAna.h
  *@author Volker Friese v.friese@gsi.de
diff --git a/sim/transport/base/CbmStack.cxx b/sim/transport/base/CbmStack.cxx
index 31e4029c65ba1dc18760e45b6285e94fb64074f1..331496716d847aea5fb1040a612b88503507e2e3 100644
--- a/sim/transport/base/CbmStack.cxx
+++ b/sim/transport/base/CbmStack.cxx
@@ -1,6 +1,6 @@
 /* Copyright (C) 2004-2021 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
    SPDX-License-Identifier: GPL-3.0-only
-   Authors: D. Bertini / V. Friese, Denis Bertini [committer], Florian Uhlig, Volker Friese */
+   Authors: Volker Friese, Denis Bertini [committer], Florian Uhlig */
 
 // -------------------------------------------------------------------------
 // -----                       CbmStack source file                    -----
diff --git a/sim/transport/base/CbmStack.h b/sim/transport/base/CbmStack.h
index c3263e78302232b381b0b3998522c7fd8ff7bcfc..059e2c67ffd63d535294203579649b0554f72640 100644
--- a/sim/transport/base/CbmStack.h
+++ b/sim/transport/base/CbmStack.h
@@ -1,6 +1,6 @@
 /* Copyright (C) 2009-2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
    SPDX-License-Identifier: GPL-3.0-only
-   Authors: D.Bertini, Florian Uhlig [committer], Volker Friese */
+   Authors: Denis Bertini, Florian Uhlig [committer], Volker Friese */
 
 // -------------------------------------------------------------------------
 // -----                       CbmStack header file                    -----
diff --git a/sim/transport/generators/CbmPhsdGenerator.cxx b/sim/transport/generators/CbmPhsdGenerator.cxx
index 2270f54959a02bde5ac99825628f785ac692801a..5703dec95a9d25e58ccc177213b72179602af2a2 100644
--- a/sim/transport/generators/CbmPhsdGenerator.cxx
+++ b/sim/transport/generators/CbmPhsdGenerator.cxx
@@ -1,6 +1,6 @@
 /* Copyright (C) 2014-2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
    SPDX-License-Identifier: GPL-3.0-only
-   Authors: V. Vovchenko, Florian Uhlig [committer] */
+   Authors: Volodymyr Vovchenko, Florian Uhlig [committer] */
 
 // -------------------------------------------------------------------------
 // -----                FairUrqmdGenerator source file                  -----
diff --git a/sim/transport/generators/CbmPhsdGenerator.h b/sim/transport/generators/CbmPhsdGenerator.h
index 8c211d4364081a505c5bbe72ba79a7e5392ca4be..9ad33ffca8f4dc0e3cd56d0f339c4e48edd34bd6 100644
--- a/sim/transport/generators/CbmPhsdGenerator.h
+++ b/sim/transport/generators/CbmPhsdGenerator.h
@@ -1,6 +1,6 @@
 /* Copyright (C) 2019-2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
    SPDX-License-Identifier: GPL-3.0-only
-   Authors: V.Vovchenko, Florian Uhlig [committer] */
+   Authors: Volodymyr Vovchenko, Florian Uhlig [committer] */
 
 // -------------------------------------------------------------------------
 // -----                CbmPHSDGenerator header file                  -----
diff --git a/sim/transport/generators/CbmPlutoGenerator.cxx b/sim/transport/generators/CbmPlutoGenerator.cxx
index bb665d9a6fa89c39e15cc11bd3ac901b8c4bb8ff..b903be7c237230d2e3a61c9fd32bc5d0cf346cbd 100644
--- a/sim/transport/generators/CbmPlutoGenerator.cxx
+++ b/sim/transport/generators/CbmPlutoGenerator.cxx
@@ -1,6 +1,6 @@
 /* Copyright (C) 2004-2021 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
    SPDX-License-Identifier: GPL-3.0-only
-   Authors: V. Friese / D.Bertini, Florian Uhlig [committer] */
+   Authors: Volker Friese / Denis Bertini, Florian Uhlig [committer] */
 
 // -------------------------------------------------------------------------
 // -----                CbmPlutoGenerator source file                  -----
diff --git a/sim/transport/generators/CbmPlutoGenerator.h b/sim/transport/generators/CbmPlutoGenerator.h
index 4e6b42e472513525279966eeb81e31d1e055fbfe..f9778d9951ec7d0097277689fe97f0dffaf641db 100644
--- a/sim/transport/generators/CbmPlutoGenerator.h
+++ b/sim/transport/generators/CbmPlutoGenerator.h
@@ -1,6 +1,6 @@
 /* Copyright (C) 2015-2018 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
    SPDX-License-Identifier: GPL-3.0-only
-   Authors: V.Friese, Florian Uhlig [committer] */
+   Authors: Volker Friese, Florian Uhlig [committer] */
 
 // -------------------------------------------------------------------------
 // -----                 CbmPlutoGenerator header file                 -----
diff --git a/sim/transport/generators/CbmUnigenGenerator.cxx b/sim/transport/generators/CbmUnigenGenerator.cxx
index 00a38a9c88ce20fe1922587b73bcd1c5bd55c828..6aada9e763481a41d907b4ee3581472e2d788de7 100644
--- a/sim/transport/generators/CbmUnigenGenerator.cxx
+++ b/sim/transport/generators/CbmUnigenGenerator.cxx
@@ -1,6 +1,6 @@
 /* Copyright (C) 2006-2021 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
    SPDX-License-Identifier: GPL-3.0-only
-   Authors: D. Kresan, Volker Friese, Florian Uhlig [committer] */
+   Authors: Dmytro Kresan, Volker Friese, Florian Uhlig [committer] */
 
 /** @file CbmUnigenGenerator.h
  ** @author D. Kresan <d.kresan@gsi.de>
diff --git a/sim/transport/generators/CbmUnigenGenerator.h b/sim/transport/generators/CbmUnigenGenerator.h
index a1b12faba77e591a4658f2f201a27e718c00cdfa..135c7ec372769a98eba2fb8a34c1306d48594fae 100644
--- a/sim/transport/generators/CbmUnigenGenerator.h
+++ b/sim/transport/generators/CbmUnigenGenerator.h
@@ -1,6 +1,6 @@
 /* Copyright (C) 2006-2019 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
    SPDX-License-Identifier: GPL-3.0-only
-   Authors: D. Kresan, Volker Friese */
+   Authors: Dmytro Kresan, Volker Friese */
 
 /** @file CbmUnigenGenerator.h
  ** @author D. Kresan <d.kresan@gsi.de>
diff --git a/tutorials/TaskToAlgo/CbmStsHitProducerIdealWrapper.cxx b/tutorials/TaskToAlgo/CbmStsHitProducerIdealWrapper.cxx
index 805a730cdb401ee2b0edd22578fa4383dc614d5e..6cd060205233a86d8b48d846ac3d23a1f5fc8919 100644
--- a/tutorials/TaskToAlgo/CbmStsHitProducerIdealWrapper.cxx
+++ b/tutorials/TaskToAlgo/CbmStsHitProducerIdealWrapper.cxx
@@ -1,6 +1,6 @@
 /* Copyright (C) 2006-2021 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
    SPDX-License-Identifier: GPL-3.0-only
-   Authors: V. Friese, Florian Uhlig [committer] */
+   Authors: Volker Friese, Florian Uhlig [committer] */
 
 // -------------------------------------------------------------------------
 // -----                CbmStsHitProducerIdealWrapper source file             -----
diff --git a/tutorials/TaskToAlgo/CbmStsHitProducerTaskIdeal.cxx b/tutorials/TaskToAlgo/CbmStsHitProducerTaskIdeal.cxx
index 1864246a44d6ad6329c532d8eb854fcb0f2b3bf1..70db9d68126064f97d2dfb847368e858ca4e3ca2 100644
--- a/tutorials/TaskToAlgo/CbmStsHitProducerTaskIdeal.cxx
+++ b/tutorials/TaskToAlgo/CbmStsHitProducerTaskIdeal.cxx
@@ -1,6 +1,6 @@
 /* Copyright (C) 2006-2021 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
    SPDX-License-Identifier: GPL-3.0-only
-   Authors: V. Friese, Florian Uhlig [committer] */
+   Authors: Volker Friese, Florian Uhlig [committer] */
 
 // -------------------------------------------------------------------------
 // -----                CbmStsHitProducerTaskIdeal source file             -----
diff --git a/tutorials/TaskToAlgo/CbmStsHitProducerTaskIdeal.h b/tutorials/TaskToAlgo/CbmStsHitProducerTaskIdeal.h
index be7f096709e69ee7ccdcc5abccebd101a509c6b7..195d91747faf6e47debb9caeed0d6be566d823ae 100644
--- a/tutorials/TaskToAlgo/CbmStsHitProducerTaskIdeal.h
+++ b/tutorials/TaskToAlgo/CbmStsHitProducerTaskIdeal.h
@@ -1,6 +1,6 @@
 /* Copyright (C) 2019 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
    SPDX-License-Identifier: GPL-3.0-only
-   Authors: V.Friese, Florian Uhlig [committer] */
+   Authors: Volker Friese, Florian Uhlig [committer] */
 
 // -------------------------------------------------------------------------
 // -----            CbmStsHitProducerTaskIdeal header file             -----