diff --git a/analysis/detectors/tof/CbmTofTests.cxx b/analysis/detectors/tof/CbmTofTests.cxx
index 1be23f917c3dca8bf2444f1c564672d6501c6452..9adeff9a42e2c90630f3aeb8b37495d60e064542 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: Pierre-Alain Loizeau, Pierre-Alain Loizeau [committer], Florian Uhlig */
+   Authors: Pierre-Alain Loizeau [committer], Florian Uhlig */
 
 // ------------------------------------------------------------------
 // -----                     CbmTofTests                        -----
diff --git a/core/data/rich/CbmRichHit.cxx b/core/data/rich/CbmRichHit.cxx
index 5d14999ee5eac3a893e689e0371f850995914d44..59711e00aefd31bc6f8d860532fae62ab2727a57 100644
--- a/core/data/rich/CbmRichHit.cxx
+++ b/core/data/rich/CbmRichHit.cxx
@@ -1,6 +1,6 @@
 /* Copyright (C) 2006-2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
    SPDX-License-Identifier: GPL-3.0-only
-   Authors: B. Polichtchouk, Florian Uhlig, Andrey Lebedev, Denis Bertini [committer] */
+   Authors: Boris Polichtchouk, Florian Uhlig, Andrey Lebedev, Denis Bertini [committer] */
 
 /**
  * \file CbmRichHit.cxx
diff --git a/core/data/rich/CbmRichHit.h b/core/data/rich/CbmRichHit.h
index 74a16269a784c1b6e8a5cea42ea4d1e649a85fc3..1b98f303583fb384e4b7cc085c1ec409de226884 100644
--- a/core/data/rich/CbmRichHit.h
+++ b/core/data/rich/CbmRichHit.h
@@ -1,6 +1,6 @@
 /* Copyright (C) 2006-2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
    SPDX-License-Identifier: GPL-3.0-only
-   Authors: B. Polichtchouk, Andrey Lebedev, Florian Uhlig, Denis Bertini [committer] */
+   Authors: Boris Polichtchouk, Andrey Lebedev, Florian Uhlig, Denis Bertini [committer] */
 
 /**
  * \file CbmRichHit.h
diff --git a/core/data/rich/CbmRichPoint.cxx b/core/data/rich/CbmRichPoint.cxx
index fbd2634484d757766b127c6386770794c4309712..852b41dbc9d04a9dcf3ce43b804aad8be4472d59 100644
--- a/core/data/rich/CbmRichPoint.cxx
+++ b/core/data/rich/CbmRichPoint.cxx
@@ -1,6 +1,6 @@
 /* Copyright (C) 2004-2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
    SPDX-License-Identifier: GPL-3.0-only
-   Authors: B. Polichtchouk, Denis Bertini [committer], Florian Uhlig */
+   Authors: Boris Polichtchouk, Denis Bertini [committer], Florian Uhlig */
 
 // -------------------------------------------------------------------------
 // -----                      CbmRichPoint source file                 -----
diff --git a/core/data/rich/CbmRichPoint.h b/core/data/rich/CbmRichPoint.h
index d0b336e85a38c3c8e529cc17c399e4545912cd1c..460387eac828b92898f429b464cee7444e92811e 100644
--- a/core/data/rich/CbmRichPoint.h
+++ b/core/data/rich/CbmRichPoint.h
@@ -1,6 +1,6 @@
 /* Copyright (C) 2006-2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
    SPDX-License-Identifier: GPL-3.0-only
-   Authors: B. Polichtchouk, Denis Bertini [committer], Florian Uhlig */
+   Authors: Boris Polichtchouk, Denis Bertini [committer], Florian Uhlig */
 
 // -------------------------------------------------------------------------
 // -----                     CbmRichPoint header file                  -----
diff --git a/reco/detectors/rich/CbmRichHitProducer.cxx b/reco/detectors/rich/CbmRichHitProducer.cxx
index 2cf5051577116a1f633ec682159123a6b46c24d1..4ab56ca7075e1107f7239c818b816cb7c4b262b4 100644
--- a/reco/detectors/rich/CbmRichHitProducer.cxx
+++ b/reco/detectors/rich/CbmRichHitProducer.cxx
@@ -1,6 +1,6 @@
 /* Copyright (C) 2004-2021 GSI/JINR-LIT
    SPDX-License-Identifier: GPL-3.0-only
-   Authors: B. Polichtchouk, Andrey Lebedev [committer], Volker Friese */
+   Authors: Boris Polichtchouk, Andrey Lebedev [committer], Volker Friese */
 
 /**
  * \file CbmRichHitProducer.cxx
diff --git a/reco/detectors/rich/CbmRichHitProducer.h b/reco/detectors/rich/CbmRichHitProducer.h
index 6903d0b892522b44c56be869b989b88ff63ff110..d8a83d614e95f4d7f7faecc2e4968047189b9225 100644
--- a/reco/detectors/rich/CbmRichHitProducer.h
+++ b/reco/detectors/rich/CbmRichHitProducer.h
@@ -1,6 +1,6 @@
 /* Copyright (C) 2004-2021 GSI/JINR-LIT
    SPDX-License-Identifier: GPL-3.0-only
-   Authors: B. Polichtchouk, Semen Lebedev, Andrey Lebedev [committer], Volker Friese */
+   Authors: Boris Polichtchouk, Semen Lebedev, Andrey Lebedev [committer], Volker Friese */
 
 /**
  * \file CbmRichHitProducer.h
diff --git a/reco/detectors/rich/alignment/CbmRichProjectionProducerAnalytical.cxx b/reco/detectors/rich/alignment/CbmRichProjectionProducerAnalytical.cxx
index f3b7f1408a2de1b50b8527c7910d983e2edcf215..4a971f01931933c7267b3bf35daed56e0623a2cf 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: Semen Lebedev (initial version by P.Stolpovsky (2005)), Jordan Bendarouach [committer] */
+   Authors: Petr Stolpovsky, Semen Lebedev, Jordan Bendarouach [committer] */
 
 /**
  * \file CbmRichProjectionProducerAnalytical.cxx
diff --git a/reco/detectors/rich/alignment/CbmRichProjectionProducerAnalytical.h b/reco/detectors/rich/alignment/CbmRichProjectionProducerAnalytical.h
index 53d4f7dcfb2fbb37af4968fd457a346883f26d07..eba148da06a773917387ad398b682a94281ce7d5 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: Semen Lebedev (initial version by P.Stolpovsky in 2005), Jordan Bendarouach [committer] */
+   Authors: Petr Stolpovsky, Semen Lebedev, Jordan Bendarouach [committer] */
 
 /**
  * \file CbmRichProjectionProducerAnalytical.h
diff --git a/reco/detectors/rich/tracks/CbmRichProjectionProducerAnalytical.cxx b/reco/detectors/rich/tracks/CbmRichProjectionProducerAnalytical.cxx
index 0a67259dd3ded4e02b1ec4c7323391945ea02e9f..e73f76c9329c74e449cfcf2b58e9976bc4da4ab3 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: Semen Lebedev (initial version by P.Stolpovsky (2005)), Andrey Lebedev [committer] */
+   Authors: Petr Stolpovsky, Semen Lebedev, Andrey Lebedev [committer] */
 
 /**
  * \file CbmRichProjectionProducerAnalytical.cxx
diff --git a/reco/detectors/rich/tracks/CbmRichProjectionProducerAnalytical.h b/reco/detectors/rich/tracks/CbmRichProjectionProducerAnalytical.h
index c52cd8d4d9604c3c5a933437c8ffc909ac9ffbf3..f6b3ab7a9697040204aaaa02fcbd2c9599c484ec 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: Semen Lebedev (initial version by P.Stolpovsky in 2005), Andrey Lebedev [committer] */
+   Authors: Petr Stolpovsky, Semen Lebedev, Andrey Lebedev [committer] */
 
 /**
  * \file CbmRichProjectionProducerAnalytical.h
diff --git a/reco/detectors/rich/tracks/CbmRichProjectionProducerTGeo.cxx b/reco/detectors/rich/tracks/CbmRichProjectionProducerTGeo.cxx
index 25df3c14c172c29f5cb41bdea03c65351ddcfb1d..2fe384f75fd6ff122a2e2e0709385668b3106c4f 100644
--- a/reco/detectors/rich/tracks/CbmRichProjectionProducerTGeo.cxx
+++ b/reco/detectors/rich/tracks/CbmRichProjectionProducerTGeo.cxx
@@ -1,6 +1,6 @@
 /* Copyright (C) 2005-2021 GSI/JINR-LIT
    SPDX-License-Identifier: GPL-3.0-only
-   Authors: P.Stolpovsky, Andrey Lebedev [committer], Semen Lebedev */
+   Authors: Petr Stolpovsky, Andrey Lebedev [committer], Semen Lebedev */
 
 /**
  * \file CbmRichProjectionProducer.cxx