From 131d9ce25c1952f52e9af54ae76e52973205f68d Mon Sep 17 00:00:00 2001
From: Florian Uhlig <f.uhlig@gsi.de>
Date: Wed, 9 Jun 2021 10:24:31 +0200
Subject: [PATCH] Cleanup license headers

Unify user names in the license header authors list.
Remove duplicate users in the authors list.
Cleanupo of some other inor issues.
---
 MQ/hitbuilder/runHitBuilderTof.cxx                              | 2 +-
 MQ/mcbm/CbmDeviceBuildRawEvents.cxx                             | 2 +-
 MQ/mcbm/CbmDeviceBuildRawEvents.h                               | 2 +-
 MQ/mcbm/CbmDeviceMcbmMonitorPulser.cxx                          | 2 +-
 MQ/mcbm/CbmDeviceMcbmMonitorPulser.h                            | 2 +-
 MQ/monitor/CbmDeviceMonitorTof.cxx                              | 2 +-
 MQ/monitor/CbmDeviceMonitorTof.h                                | 2 +-
 MQ/unpacker/CbmDeviceUnpackTofMcbm2018.cxx                      | 2 +-
 MQ/unpacker/CbmDeviceUnpackTofMcbm2018.h                        | 2 +-
 .../PWGC2F/femtoscopy/nicafemto/format/NicaCbmFormatLinkDef.h   | 2 +-
 .../nicafemto/format/unigen/NicaGeneratorReadUnigen.cxx         | 2 +-
 .../nicafemto/format/unigen/NicaGeneratorWriteUnigen.cxx        | 2 +-
 .../femtoscopy/nicafemto/format/unigen/NicaUnigenEvent.cxx      | 2 +-
 .../nicafemto/format/unigen/NicaUnigenEventInterface.cxx        | 2 +-
 .../femtoscopy/nicafemto/format/unigen/NicaUnigenSource.cxx     | 2 +-
 .../femtoscopy/nicafemto/format/unigen/NicaUnigenSource.h       | 2 +-
 analysis/PWGC2F/femtoscopy/nicafemto/helpers/CbmDetectorID.h    | 2 +-
 analysis/PWGC2F/femtoscopy/nicafemto/helpers/CbmHelix.cxx       | 2 +-
 .../PWGC2F/femtoscopy/nicafemto/helpers/NicaCbmFirstTask.cxx    | 2 +-
 analysis/PWGC2F/femtoscopy/nicafemto/helpers/NicaCbmFirstTask.h | 2 +-
 analysis/PWGCHA/jpsi/CbmAnaJpsiCandidate.cxx                    | 2 +-
 analysis/PWGCHA/jpsi/CbmAnaJpsiSuperEvent.cxx                   | 2 +-
 analysis/PWGCHA/jpsi/CbmAnaJpsiSuperEvent.h                     | 2 +-
 .../PWGDIL/dielectron/conversion/CbmAnaConversionCutSettings.h  | 2 +-
 .../dielectron/conversion/CbmAnaConversionGlobalFunctions.h     | 2 +-
 .../dielectron/conversion/CbmAnaConversionKinematicParams.h     | 2 +-
 analysis/PWGHAD/hadron/CbmHadronAnalysis.cxx                    | 2 +-
 .../analysis_tree_converter/CbmAnalysisTreeInterfaceLinkDef.h   | 2 +-
 analysis/common/analysis_tree_converter/CbmConverterManager.h   | 2 +-
 .../common/analysis_tree_converter/CbmPsdModulesConverter.cxx   | 2 +-
 .../analysis_tree_converter/CbmRecEventHeaderConverter.cxx      | 2 +-
 .../common/analysis_tree_converter/CbmStsTracksConverter.cxx    | 2 +-
 analysis/common/analysis_tree_converter/CbmTofHitsConverter.cxx | 2 +-
 analysis/common/at_kfpf_interface/CutsContainer.h               | 2 +-
 analysis/detectors/sts/CbmStsWkn.cxx                            | 2 +-
 analysis/detectors/sts/CbmStsWkn.h                              | 2 +-
 analysis/detectors/tof/CbmTofTests.cxx                          | 2 +-
 core/base/CbmMCDataArray.cxx                                    | 2 +-
 core/base/CbmMCDataArray.h                                      | 2 +-
 core/base/CbmMCDataManager.h                                    | 2 +-
 core/base/CbmMCDataObject.cxx                                   | 2 +-
 core/base/CbmMCDataObject.h                                     | 2 +-
 core/base/CbmMatchRecoToMC.cxx                                  | 2 +-
 core/base/CbmReadoutBuffer.h                                    | 2 +-
 core/data/CbmTimeSlice.cxx                                      | 2 +-
 core/data/base/CbmDigiBranchBase.cxx                            | 2 +-
 core/data/global/CbmGlobalTrack.cxx                             | 2 +-
 core/data/global/CbmGlobalTrack.h                               | 2 +-
 core/data/global/CbmTrackParam.cxx                              | 2 +-
 core/data/global/CbmTrackParam.h                                | 2 +-
 core/data/global/CbmVertex.cxx                                  | 2 +-
 core/data/global/CbmVertex.h                                    | 2 +-
 core/data/much/CbmMuchBeamTimeDigi.cxx                          | 2 +-
 core/data/much/CbmMuchBeamTimeDigi.h                            | 2 +-
 core/data/much/CbmMuchDigi.cxx                                  | 2 +-
 core/data/much/CbmMuchDigi.h                                    | 2 +-
 core/data/much/CbmMuchPoint.cxx                                 | 2 +-
 core/data/mvd/CbmMvdHitMatch.cxx                                | 2 +-
 core/data/raw/PsdGbtDataFormat.h                                | 2 +-
 core/data/raw/PsdGbtReader.cxx                                  | 2 +-
 core/data/raw/PsdGbtReader.h                                    | 2 +-
 core/data/rich/CbmRichDigi.cxx                                  | 2 +-
 core/data/rich/CbmRichDigi.h                                    | 2 +-
 core/data/rich/CbmRichRing.h                                    | 2 +-
 core/data/tof/CbmTofDetectorId_v14a.cxx                         | 2 +-
 core/data/tof/CbmTofDetectorId_v14a.h                           | 2 +-
 core/data/tof/CbmTofDetectorId_v21a.cxx                         | 2 +-
 core/data/tof/CbmTofDetectorId_v21a.h                           | 2 +-
 core/data/tof/CbmTofTracklet.cxx                                | 2 +-
 core/data/tof/CbmTofTracklet.h                                  | 2 +-
 core/data/tof/CbmTofTrackletParam.cxx                           | 2 +-
 core/data/trd/CbmTrdAddress.cxx                                 | 2 +-
 core/data/trd/CbmTrdPoint.cxx                                   | 2 +-
 core/data/trd/CbmTrdPoint.h                                     | 2 +-
 core/data/trd/CbmTrdTrack.cxx                                   | 2 +-
 core/data/trd/CbmTrdTrack.h                                     | 2 +-
 core/detectors/much/CbmGeoMuchPar.cxx                           | 2 +-
 core/detectors/much/CbmGeoMuchPar.h                             | 2 +-
 core/detectors/much/CbmMcbm2018MuchPar.cxx                      | 2 +-
 core/detectors/much/CbmMuchContFact.cxx                         | 2 +-
 core/detectors/much/CbmMuchContFact.h                           | 2 +-
 core/detectors/much/CbmMuchModuleGemRectangular.cxx             | 2 +-
 core/detectors/much/CbmMuchPointInfo.cxx                        | 2 +-
 core/detectors/much/CbmMuchPointInfo.h                          | 2 +-
 core/detectors/much/CbmMuchStation.cxx                          | 2 +-
 core/detectors/psd/CbmMcbm2018PsdPar.cxx                        | 2 +-
 core/detectors/psd/PronyFitter.h                                | 2 +-
 core/detectors/rich/CbmRichDetectorData.h                       | 2 +-
 core/detectors/rich/CbmRichDigiMapManager.cxx                   | 2 +-
 core/detectors/rich/CbmRichDigiMapManager.h                     | 2 +-
 core/detectors/rich/CbmRichGeoManager.cxx                       | 2 +-
 core/detectors/rich/CbmRichGeoManager.h                         | 2 +-
 core/detectors/rich/CbmRichMCbmDigiMapManager.cxx               | 2 +-
 core/detectors/rich/CbmRichMCbmDigiMapManager.h                 | 2 +-
 core/detectors/rich/CbmRichPmt.cxx                              | 2 +-
 core/detectors/rich/CbmRichPmt.h                                | 2 +-
 core/detectors/rich/CbmRichPmtType.h                            | 2 +-
 core/detectors/rich/CbmRichRecGeoPar.h                          | 2 +-
 core/detectors/sts/CbmMcbm2018StsPar.cxx                        | 2 +-
 core/detectors/tof/CbmMcbm2018TofPar.cxx                        | 2 +-
 core/detectors/trd/CbmTrdRadiator.cxx                           | 2 +-
 core/detectors/trd/CbmTrdRadiator.h                             | 2 +-
 core/eventdisplay/CbmEvDisTracks.cxx                            | 2 +-
 core/eventdisplay/CbmEvDisTracks.h                              | 2 +-
 core/eventdisplay/CbmTrdDigiDraw.cxx                            | 2 +-
 core/eventdisplay/CbmTrdDigiDraw.h                              | 2 +-
 core/field/CbmBsField.cxx                                       | 2 +-
 core/field/CbmBsField.h                                         | 2 +-
 core/field/CbmFieldConst.cxx                                    | 2 +-
 core/field/CbmFieldConst.h                                      | 2 +-
 core/field/CbmFieldContFact.cxx                                 | 2 +-
 core/field/CbmFieldContFact.h                                   | 2 +-
 core/field/CbmFieldMap.cxx                                      | 2 +-
 core/field/CbmFieldMap.h                                        | 2 +-
 core/field/CbmFieldMapData.h                                    | 2 +-
 core/field/CbmFieldMapDistorted.cxx                             | 2 +-
 core/field/CbmFieldMapDistorted.h                               | 2 +-
 core/field/CbmFieldMapSym1.cxx                                  | 2 +-
 core/field/CbmFieldMapSym1.h                                    | 2 +-
 core/field/CbmFieldMapSym2.cxx                                  | 2 +-
 core/field/CbmFieldMapSym2.h                                    | 2 +-
 core/field/CbmFieldMapSym3.cxx                                  | 2 +-
 core/field/CbmFieldMapSym3.h                                    | 2 +-
 core/field/CbmFieldPar.cxx                                      | 2 +-
 core/field/CbmFieldPar.h                                        | 2 +-
 fles/cosy2019/monitor/CbmCosy2019MonitorAlgoHodo.cxx            | 2 +-
 fles/cosy2019/monitor/CbmCosy2019MonitorAlgoHodo.h              | 2 +-
 fles/cosy2019/monitor/CbmCosy2019MonitorTaskHodo.cxx            | 2 +-
 fles/cosy2019/monitor/CbmCosy2019MonitorTaskHodo.h              | 2 +-
 fles/cosy2019/parameter/CbmCosy2019HodoPar.cxx                  | 2 +-
 fles/cosy2019/unpacker/CbmCosy2019UnpackerAlgoHodo.cxx          | 2 +-
 fles/cosy2019/unpacker/CbmCosy2019UnpackerAlgoHodo.h            | 2 +-
 fles/cosy2019/unpacker/CbmCosy2019UnpackerTaskHodo.cxx          | 2 +-
 fles/cosy2019/unpacker/CbmCosy2019UnpackerTaskHodo.h            | 2 +-
 fles/mcbm2018/commonMQ/CbmStar2019Algo.h                        | 2 +-
 fles/mcbm2018/monitor/CbmMcbm2018MonitorAlgoPsd.h               | 2 +-
 fles/mcbm2018/monitor/CbmMcbm2018MonitorMuch.cxx                | 2 +-
 fles/mcbm2018/monitor/CbmMcbm2018MonitorTaskPsd.cxx             | 2 +-
 fles/mcbm2018/monitor/CbmMcbm2018MonitorTaskPsd.h               | 2 +-
 fles/mcbm2018/unpacker/CbmMcbm2018UnpackerAlgoPsd.cxx           | 2 +-
 fles/mcbm2018/unpacker/CbmMcbm2018UnpackerAlgoPsd.h             | 2 +-
 fles/mcbm2018/unpacker/CbmMcbm2018UnpackerTaskPsd.cxx           | 2 +-
 fles/mcbm2018/unpacker/CbmMcbm2018UnpackerTaskPsd.h             | 2 +-
 mvd/CbmMvdDetector.h                                            | 2 +-
 mvd/CbmMvdSensor.cxx                                            | 2 +-
 mvd/CbmMvdSensor.h                                              | 2 +-
 mvd/SensorDataSheets/CbmMvdMimosa26AHR.h                        | 2 +-
 mvd/SensorDataSheets/CbmMvdSensorDataSheet.cxx                  | 2 +-
 mvd/SensorDataSheets/CbmMvdSensorDataSheet.h                    | 2 +-
 mvd/plugins/CbmMvdSensorPlugin.cxx                              | 2 +-
 mvd/plugins/CbmMvdSensorPlugin.h                                | 2 +-
 mvd/plugins/buffers/CbmMvdSensorBuffer.cxx                      | 2 +-
 mvd/plugins/buffers/CbmMvdSensorBuffer.h                        | 2 +-
 mvd/plugins/buffers/CbmMvdSensorFrameBuffer.h                   | 2 +-
 mvd/plugins/tasks/CbmMvdSensorDigitizerTBTask.h                 | 2 +-
 mvd/plugins/tasks/CbmMvdSensorDigitizerTask.h                   | 2 +-
 mvd/plugins/tasks/CbmMvdSensorTask.cxx                          | 2 +-
 mvd/plugins/tasks/CbmMvdSensorTask.h                            | 2 +-
 reco/KF/CbmKFFieldMath.h                                        | 2 +-
 reco/KF/CbmKFHit.h                                              | 2 +-
 reco/KF/CbmKFMath.h                                             | 2 +-
 reco/KF/CbmKFParticle.cxx                                       | 2 +-
 reco/KF/CbmKFParticle.h                                         | 2 +-
 reco/KF/CbmKFParticleFinder.cxx                                 | 2 +-
 reco/KF/CbmKFParticleFinder.h                                   | 2 +-
 reco/KF/CbmKFParticleFinderPID.cxx                              | 2 +-
 reco/KF/CbmKFParticleFinderPID.h                                | 2 +-
 reco/KF/CbmKFParticleFinderQA.cxx                               | 2 +-
 reco/KF/CbmKFParticleFinderQA.h                                 | 2 +-
 reco/KF/CbmKFParticleInterface.cxx                              | 2 +-
 reco/KF/CbmKFParticleInterface.h                                | 2 +-
 reco/KF/CbmKFPixelMeasurement.h                                 | 2 +-
 reco/KF/CbmKFPrimaryVertexFinder.cxx                            | 2 +-
 reco/KF/CbmKFPrimaryVertexFinder.h                              | 2 +-
 reco/KF/CbmKFSecondaryVertexFinder.cxx                          | 2 +-
 reco/KF/CbmKFSecondaryVertexFinder.h                            | 2 +-
 reco/KF/CbmKFTrackInterface.h                                   | 2 +-
 reco/KF/CbmKFUMeasurement.cxx                                   | 2 +-
 reco/KF/CbmKFUMeasurement.h                                     | 2 +-
 reco/KF/CbmKFVertexInterface.cxx                                | 2 +-
 reco/KF/CbmKFVertexInterface.h                                  | 2 +-
 reco/KF/Interface/CbmGlobalTrackFitterKF.h                      | 2 +-
 reco/KF/Interface/CbmKFTofHit.cxx                               | 2 +-
 reco/KF/Interface/CbmKFTofHit.h                                 | 2 +-
 reco/KF/Interface/CbmKFTrack.h                                  | 2 +-
 reco/KF/Interface/CbmKFTrdHit.cxx                               | 2 +-
 reco/KF/Interface/CbmKFTrdHit.h                                 | 2 +-
 reco/KF/Interface/CbmPVFinderKF.h                               | 2 +-
 reco/KF/Interface/CbmStsFitPerformanceTask.cxx                  | 2 +-
 reco/KF/Interface/CbmStsFitPerformanceTask.h                    | 2 +-
 reco/KF/Interface/CbmStsKFSecondaryVertexFinder.cxx             | 2 +-
 reco/KF/Interface/CbmStsKFSecondaryVertexFinder.h               | 2 +-
 reco/KF/Interface/CbmTofTrackFitterKF.cxx                       | 2 +-
 reco/KF/Interface/CbmTrdTrackFitterKF.cxx                       | 2 +-
 reco/KF/Interface/CbmTrdTrackFitterKF.h                         | 2 +-
 reco/KF/KFLinkDef.h                                             | 2 +-
 reco/KF/KFQA/CbmKFPartEfficiencies.h                            | 2 +-
 reco/KF/KFQA/CbmKFTrErrMCPoints.cxx                             | 2 +-
 reco/KF/KFQA/CbmKFTrErrMCPoints.h                               | 2 +-
 reco/KF/KFQA/CbmKFTrackFitQA.cxx                                | 2 +-
 reco/KF/KFQA/CbmKFTrackFitQA.h                                  | 2 +-
 reco/KF/KFQA/CbmKFTrackQA.cxx                                   | 2 +-
 reco/KF/KFQA/CbmKFTrackQA.h                                     | 2 +-
 reco/KF/KFQA/KFParticleMatch.cxx                                | 2 +-
 reco/KF/KFQA/KFParticleMatch.h                                  | 2 +-
 reco/L1/CbmL1.cxx                                               | 2 +-
 reco/L1/CbmL1.h                                                 | 2 +-
 reco/L1/CbmL1CATrdTrackFinderSA.h                               | 2 +-
 reco/L1/CbmL1Counters.h                                         | 2 +-
 reco/L1/CbmL1Def.h                                              | 2 +-
 reco/L1/CbmL1MCPoint.h                                          | 2 +-
 reco/L1/CbmL1MCTrack.cxx                                        | 2 +-
 reco/L1/CbmL1MCTrack.h                                          | 2 +-
 reco/L1/CbmL1Performance.cxx                                    | 2 +-
 reco/L1/CbmL1ReadEvent.cxx                                      | 2 +-
 reco/L1/CbmL1StsHit.h                                           | 2 +-
 reco/L1/CbmL1Track.h                                            | 2 +-
 reco/L1/CbmL1TrackFitter.cxx                                    | 2 +-
 reco/L1/CbmL1TrdHit.h                                           | 2 +-
 reco/L1/CbmL1Vtx.h                                              | 2 +-
 reco/L1/L1Algo/L1Algo.cxx                                       | 2 +-
 reco/L1/L1Algo/L1Algo.h                                         | 2 +-
 reco/L1/L1Algo/L1Branch.h                                       | 2 +-
 reco/L1/L1Algo/L1CAMergeClones.cxx                              | 2 +-
 reco/L1/L1Algo/L1CATrackFinder.cxx                              | 2 +-
 reco/L1/L1Algo/L1Event.cxx                                      | 2 +-
 reco/L1/L1Algo/L1EventEfficiencies.h                            | 2 +-
 reco/L1/L1Algo/L1EventMatch.cxx                                 | 2 +-
 reco/L1/L1Algo/L1EventMatch.h                                   | 2 +-
 reco/L1/L1Algo/L1Extrapolation.h                                | 2 +-
 reco/L1/L1Algo/L1Field.h                                        | 2 +-
 reco/L1/L1Algo/L1Filtration.h                                   | 2 +-
 reco/L1/L1Algo/L1Grid.cxx                                       | 2 +-
 reco/L1/L1Algo/L1HitArea.h                                      | 2 +-
 reco/L1/L1Algo/L1HitPoint.h                                     | 2 +-
 reco/L1/L1Algo/L1HitsSortHelper.h                               | 2 +-
 reco/L1/L1Algo/L1MCEvent.cxx                                    | 2 +-
 reco/L1/L1Algo/L1MCEvent.h                                      | 2 +-
 reco/L1/L1Algo/L1StsHit.h                                       | 2 +-
 reco/L1/L1Algo/L1Timer.h                                        | 2 +-
 reco/L1/L1Algo/L1Track.h                                        | 2 +-
 reco/L1/L1Algo/L1TrackExtender.cxx                              | 2 +-
 reco/L1/L1Algo/L1TrackFitter.cxx                                | 2 +-
 reco/L1/L1Algo/L1TrackPar.h                                     | 2 +-
 reco/L1/L1Algo/L1TrackParFit.cxx                                | 2 +-
 reco/L1/L1Algo/L1TrackParFit.h                                  | 2 +-
 reco/L1/L1AlgoInputData.cxx                                     | 2 +-
 reco/L1/L1AlgoInputData.h                                       | 2 +-
 reco/L1/OffLineInterface/CbmL1RichENNRingFinder.cxx             | 2 +-
 reco/L1/OffLineInterface/CbmL1RichENNRingFinder.h               | 2 +-
 reco/L1/OffLineInterface/CbmL1RichENNRingFinderParallel.cxx     | 2 +-
 reco/L1/OffLineInterface/CbmL1RichENNRingFinderParallel.h       | 2 +-
 reco/L1/OffLineInterface/CbmL1StsTrackFinder.cxx                | 2 +-
 reco/L1/OffLineInterface/CbmL1StsTrackFinder.h                  | 2 +-
 reco/L1/ParticleFinder/CbmL1PFFitter.cxx                        | 2 +-
 reco/L1/ParticleFinder/CbmL1PFFitter.h                          | 2 +-
 reco/L1/ParticleFinder/CbmL1PFMCParticle.cxx                    | 2 +-
 reco/L1/ParticleFinder/CbmL1PFMCParticle.h                      | 2 +-
 reco/L1/PerformanceConstants.h                                  | 2 +-
 reco/L1/vectors/P4_F32vec4.h                                    | 2 +-
 reco/L1/vectors/P4_F64vec2.h                                    | 2 +-
 reco/base/CbmGlobalTrackFitter.cxx                              | 2 +-
 reco/base/CbmGlobalTrackFitter.h                                | 2 +-
 reco/base/CbmMuchTrackFinder.cxx                                | 2 +-
 reco/base/CbmMuchTrackFinder.h                                  | 2 +-
 reco/base/CbmPrimaryVertexFinder.cxx                            | 2 +-
 reco/base/CbmPrimaryVertexFinder.h                              | 2 +-
 reco/base/CbmRichMerger.cxx                                     | 2 +-
 reco/base/CbmRichMerger.h                                       | 2 +-
 reco/base/CbmStsTrackFinder.cxx                                 | 2 +-
 reco/base/CbmStsTrackFitter.cxx                                 | 2 +-
 reco/base/CbmStsTrackFitter.h                                   | 2 +-
 reco/base/CbmTofTrackFinder.cxx                                 | 2 +-
 reco/base/CbmTofTrackFinder.h                                   | 2 +-
 reco/base/CbmTofTrackFitter.cxx                                 | 2 +-
 reco/base/CbmTofTrackFitter.h                                   | 2 +-
 reco/base/CbmTrackMerger.cxx                                    | 2 +-
 reco/base/CbmTrackMerger.h                                      | 2 +-
 reco/base/CbmTrdTrackFinder.cxx                                 | 2 +-
 reco/base/CbmTrdTrackFinder.h                                   | 2 +-
 reco/base/CbmTrdTrackFitter.cxx                                 | 2 +-
 reco/base/CbmTrdTrackFitter.h                                   | 2 +-
 reco/detectors/much/CbmMuchHitProducerIdeal.cxx                 | 2 +-
 reco/detectors/much/CbmMuchHitProducerIdeal.h                   | 2 +-
 reco/detectors/much/qa/CbmMuchHitFinderQa.cxx                   | 2 +-
 reco/detectors/much/qa/CbmMuchHitFinderQa.h                     | 2 +-
 reco/detectors/psd/CbmPsdHitProducer.cxx                        | 2 +-
 reco/detectors/rich/CbmRichReconstruction.cxx                   | 2 +-
 reco/detectors/rich/CbmRichReconstruction.h                     | 2 +-
 .../rich/alignment/CbmRichProjectionProducerAnalytical.cxx      | 2 +-
 .../rich/alignment/CbmRichProjectionProducerAnalytical.h        | 2 +-
 reco/detectors/rich/finder/CbmRichRingFinderHough.cxx           | 2 +-
 reco/detectors/rich/finder/CbmRichRingFinderHough.h             | 2 +-
 reco/detectors/rich/finder/CbmRichRingFinderIdeal.cxx           | 2 +-
 reco/detectors/rich/fitter/CbmRichRingFitterCOP.cxx             | 2 +-
 reco/detectors/rich/fitter/CbmRichRingFitterCOP.h               | 2 +-
 reco/detectors/rich/fitter/CbmRichRingFitterEllipseTau.cxx      | 2 +-
 reco/detectors/rich/fitter/CbmRichRingFitterEllipseTau.h        | 2 +-
 reco/detectors/rich/fitter/CbmRichRingFitterRobustCOP.cxx       | 2 +-
 reco/detectors/rich/fitter/CbmRichRingFitterRobustCOP.h         | 2 +-
 reco/detectors/rich/fitter/CbmRichRingFitterTAU.cxx             | 2 +-
 reco/detectors/rich/fitter/CbmRichRingFitterTAU.h               | 2 +-
 .../rich/tracks/CbmRichProjectionProducerAnalytical.cxx         | 2 +-
 .../detectors/rich/tracks/CbmRichProjectionProducerAnalytical.h | 2 +-
 reco/detectors/rich/tracks/CbmRichProjectionProducerTGeo.h      | 2 +-
 reco/detectors/rich/tracks/CbmRichRingTrackAssignClosestD.cxx   | 2 +-
 reco/detectors/rich/tracks/CbmRichRingTrackAssignClosestD.h     | 2 +-
 reco/detectors/rich/tracks/CbmRichRingTrackAssignIdeal.cxx      | 2 +-
 reco/detectors/rich/tracks/CbmRichRingTrackAssignIdeal.h        | 2 +-
 reco/detectors/rich/tracks/CbmRichTrackExtrapolationIdeal.cxx   | 2 +-
 reco/detectors/tof/CbmTofCalibrator.cxx                         | 2 +-
 reco/detectors/tof/CbmTofCalibrator.h                           | 2 +-
 reco/detectors/tof/CbmTofCosmicClusterizer.cxx                  | 2 +-
 reco/detectors/tof/CbmTofCosmicClusterizer.h                    | 2 +-
 reco/detectors/tof/CbmTofEventClusterizer.cxx                   | 2 +-
 reco/detectors/tof/CbmTofEventClusterizer.h                     | 2 +-
 reco/detectors/tof/CbmTofHitMaker.cxx                           | 2 +-
 reco/detectors/tof/CbmTofHitMaker.h                             | 2 +-
 reco/detectors/tof/CbmTofTestBeamClusterizer.cxx                | 2 +-
 reco/detectors/tof/CbmTofTestBeamClusterizer.h                  | 2 +-
 reco/detectors/tof/CbmTofTrackletTools.cxx                      | 2 +-
 reco/detectors/tof/CbmTofTrackletTools.h                        | 2 +-
 reco/detectors/tof/CbmTofTypes.h                                | 2 +-
 reco/detectors/trd/CbmTrdTrackFinderIdeal.cxx                   | 2 +-
 reco/detectors/trd/CbmTrdTrackFinderIdeal.h                     | 2 +-
 reco/detectors/trd/CbmTrdTrackFitterIdeal.cxx                   | 2 +-
 reco/detectors/trd/CbmTrdTrackFitterIdeal.h                     | 2 +-
 reco/detectors/trd/pid/CbmTrdElectronsTrainAnn.h                | 2 +-
 reco/detectors/trd/pid/CbmTrdSetTracksPidANN.cxx                | 2 +-
 reco/detectors/trd/pid/CbmTrdSetTracksPidANN.h                  | 2 +-
 reco/detectors/trd/qa/CbmTrdHitProducerQa.cxx                   | 2 +-
 reco/detectors/trd/qa/CbmTrdHitProducerQa.h                     | 2 +-
 reco/detectors/trd/qa/CbmTrdRecoQa.cxx                          | 2 +-
 reco/detectors/trd/qa/CbmTrdRecoQa.h                            | 2 +-
 reco/eventbuilder/CbmEventBuilderLinkDef.h                      | 2 +-
 reco/eventbuilder/digis/CbmBuildEventsSimple.cxx                | 2 +-
 reco/eventbuilder/digis/CbmBuildEventsSimple.h                  | 2 +-
 reco/eventbuilder/digis/CbmEvBuildSource.cxx                    | 2 +-
 reco/eventbuilder/digis/CbmEvBuildSource.h                      | 2 +-
 reco/global/CbmFindGlobalTracks.cxx                             | 2 +-
 reco/global/CbmFindGlobalTracks.h                               | 2 +-
 reco/global/CbmFitGlobalTracks.cxx                              | 2 +-
 reco/global/CbmFitGlobalTracks.h                                | 2 +-
 reco/global/CbmFitGlobalTracksQa.cxx                            | 2 +-
 reco/global/CbmFitGlobalTracksQa.h                              | 2 +-
 reco/global/CbmGlobalTrackFitterIdeal.cxx                       | 2 +-
 reco/global/CbmGlobalTrackFitterIdeal.h                         | 2 +-
 reco/global/CbmTrackMergerIdeal.cxx                             | 2 +-
 reco/global/CbmTrackMergerIdeal.h                               | 2 +-
 reco/littrack/cbm/generators/CbmLitPolarizedGenerator.cxx       | 2 +-
 reco/littrack/clustering/CbmClusteringA1.cxx                    | 2 +-
 reco/littrack/clustering/CbmClusteringA1.h                      | 2 +-
 reco/littrack/clustering/CbmClusteringGeometry.cxx              | 2 +-
 reco/littrack/clustering/CbmClusteringGeometry.h                | 2 +-
 reco/littrack/clustering/CbmClusteringSL.cxx                    | 2 +-
 reco/littrack/clustering/CbmClusteringSL.h                      | 2 +-
 reco/littrack/clustering/CbmClusteringWard.cxx                  | 2 +-
 reco/littrack/clustering/CbmClusteringWard.h                    | 2 +-
 reco/littrack/clustering/CbmMuchClustering.cxx                  | 2 +-
 reco/littrack/clustering/CbmMuchClustering.h                    | 2 +-
 reco/littrack/clustering/CbmMuchTest.cxx                        | 2 +-
 reco/littrack/clustering/CbmMuchTest.h                          | 2 +-
 reco/littrack/std/data/CbmLitTofTrack.h                         | 2 +-
 sim/detectors/much/CbmGeoMuch.cxx                               | 2 +-
 sim/detectors/much/CbmGeoMuch.h                                 | 2 +-
 sim/detectors/much/CbmMuchReadoutBuffer.cxx                     | 2 +-
 sim/detectors/much/CbmMuchReadoutBuffer.h                       | 2 +-
 sim/detectors/much/qa/CbmMuchDigitizerQa.h                      | 2 +-
 sim/detectors/much/qa/CbmMuchTransportQa.h                      | 2 +-
 sim/detectors/psd/CbmPsdIdealDigitizer.cxx                      | 2 +-
 sim/detectors/psd/CbmPsdSimpleDigitizer.cxx                     | 2 +-
 sim/detectors/rich/CbmRichDigitizer.h                           | 2 +-
 sim/detectors/tof/CbmTof.cxx                                    | 2 +-
 sim/detectors/tof/CbmTof.h                                      | 2 +-
 sim/detectors/trd/CbmTrd.cxx                                    | 2 +-
 sim/detectors/trd/CbmTrd.h                                      | 2 +-
 sim/detectors/trd/CbmTrdModuleSimT.h                            | 2 +-
 sim/detectors/trd/CbmTrdTrianglePRF.cxx                         | 2 +-
 sim/response/base/CbmDigitizationSource.cxx                     | 2 +-
 sim/response/base/CbmRunAna.cxx                                 | 2 +-
 sim/response/base/CbmRunAna.h                                   | 2 +-
 sim/transport/base/CbmStack.cxx                                 | 2 +-
 sim/transport/base/CbmStack.h                                   | 2 +-
 sim/transport/generators/CbmPhsdGenerator.cxx                   | 2 +-
 sim/transport/generators/CbmPhsdGenerator.h                     | 2 +-
 sim/transport/generators/CbmPlutoGenerator.cxx                  | 2 +-
 sim/transport/generators/CbmPlutoGenerator.h                    | 2 +-
 sim/transport/generators/CbmUnigenGenerator.cxx                 | 2 +-
 sim/transport/generators/CbmUnigenGenerator.h                   | 2 +-
 tutorials/TaskToAlgo/CbmStsHitProducerIdealWrapper.cxx          | 2 +-
 tutorials/TaskToAlgo/CbmStsHitProducerTaskIdeal.cxx             | 2 +-
 tutorials/TaskToAlgo/CbmStsHitProducerTaskIdeal.h               | 2 +-
 392 files changed, 392 insertions(+), 392 deletions(-)

diff --git a/MQ/hitbuilder/runHitBuilderTof.cxx b/MQ/hitbuilder/runHitBuilderTof.cxx
index 1301ab4158..17acd516fa 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 c32fb711d2..ce5318c101 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 ac443d264e..252c11bd0a 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 230c126908..b3a615d8a8 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 34c47e2d90..f4bdfdc16f 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 243add1385..d98b93649b 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 3290dcf172..46d629955b 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 6742c054d2..29587f627b 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 27dd076e25..835d0b816d 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 895c2d2af7..d5ff6a1111 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 5437ebf1cb..dc7a063205 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 eef2b66cad..5666a162c3 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 5152235b92..0e0555261e 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 3330937690..e055637f11 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 e46ffcdd5d..9cdf1cb17e 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 074fac306e..944be7e31f 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 26068d162c..5fef9b4e88 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 1330a28eee..89b4d38df4 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 5dfc0cd8fb..171f770ea4 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 0e321e19da..f5a910216c 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 6a8a52901f..d704e8af53 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 58b637805f..0b509ab66b 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 e1db505e7a..4219bcf183 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 11c38296d0..00682573a1 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 a89d48f133..5b8f24a405 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 0b44b5f07f..464ab7573d 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 952fe671f3..dcf526b7d3 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 b28861797b..e877d0d187 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 de37bb2f67..6fc139b202 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 1fa59491d1..0a39620934 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 d67b15a77b..1edac123d1 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 f5d38b52f6..fe6886deff 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 5b543f49ce..b172d4decd 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 c979690b57..38dee3cfa4 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 010ac0f1d9..edee45d60e 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 eea525d9bc..fba4d431f7 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 f38e51115a..1be23f917c 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 c82181ac98..f5176f512c 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 0a4090f52a..7384dc4530 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 a346435f22..90cfa4c161 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 e65cb6d5e3..c550f01717 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 e7e9acc7d4..9c1e2a58a4 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 bdb508944f..73ef69bbcf 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 6d01af59a0..84e8a6c5ce 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 2864235136..5da4a5ade3 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 35ec6a8195..1988c01ca9 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 fa4128ff91..edd13de3f6 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 cc91030a5e..eb583ccde3 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 705d631405..dd67806345 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 c28ed22e30..95f1efe18b 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 9ee881880f..c7ac1992a5 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 04d9513a23..e4d18c36fb 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 36ad97ab28..a178c03b51 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 af9031a8bc..422d5b2f69 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 d1ae336b5d..fccdf1795a 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 4200daf9d0..d462d441c7 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 4b0bb1c98a..aa6e4ab847 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 2508c5997e..203e1e2aed 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 7b53b768dd..4694e697a6 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 b82bfdb12a..b38e96f00c 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 6ae863bc5c..ce26922030 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 ae2fe29063..88ba2eabc9 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 e32fbdd135..4b6ac8e6eb 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 7649056d16..bda0fb4a3e 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 12eafb83ea..5917e882b7 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 ad897e208a..b64f25a077 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 afe16b27f4..d496ba013e 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 0fb393587f..d6c6c09ae2 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 bb56206e5e..f87097d0f9 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 49ce917d56..5f18e4055a 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 6eba4e6988..91b3959bbf 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 68dd7aab92..507162fb61 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 9f12e34ec2..fa68747bea 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 f2b92b9b7b..28ff85145f 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 50e9e3687e..008fec2d83 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 da50854824..8269bcc8fe 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 5f08a06919..485ffca986 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 bdcb704b5e..58d87bea13 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 a92a6bd9bb..53deff5725 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 5e09140603..3853f52cd0 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 1c423a5d10..a7b031de10 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 fe60737a48..c4ed6c1162 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 e6968cd481..76158ba30a 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 7886f5ab11..2d32f4206f 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 db63da1709..cf163edbb5 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 416cbf8d25..e8bc4af6f6 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 9c104584dc..84164908f9 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 6b3ac5cf8f..66e05cdd7f 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 e55867b892..537481f394 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 9a182bfa17..f07b7b7343 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 1295f11a4e..b8ef9735d0 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 c3b67799ec..c1eb2cda67 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 69465f6917..99730384b3 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 c3e9fc783a..c908e0aa71 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 8ea65c28ff..7280b8f063 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 caed9fb288..8c226ec79d 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 9f6fed2866..782a949d12 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 323ce859ba..97fe955eae 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 52f3e13703..52715e5b43 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 ea838f7ec3..4fbb4484a5 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 7d74e1f77e..4aa9a4429a 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 77b2bdfb14..d8f1104cec 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 155c40dcca..b3d9f8d151 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 779327bb23..554cb6b04d 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 193670f8a4..150677d18d 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 c630e7004a..3340b4828c 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 adb29ee219..6ad133f337 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 fa801d2cd0..7e5c62e597 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 0efa78ff8d..a47e839a47 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 4eee00cf59..43991c7a3b 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 3303522a5b..e931863bb4 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 9519abe2d4..a0193516a3 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 8f9f2818bc..a674c8d0cc 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 4d9e0c6276..cc286e0956 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 0ddbbee4cb..1f7b4d2ca0 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 7c16319f59..d0fe3184b2 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 8e9444ba54..4ed3522d85 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 405814ef42..3b400d641c 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 182584d16a..e8d7a4977e 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 8000d3584c..b2e37ab963 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 88b80cdf17..0adbb0b5b1 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 5094117792..1cb5f1d587 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 be52a5357b..72caee21b5 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 82608f040b..48f5091e32 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 2915d3101c..5d93237b1f 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 92eb9fba2d..0d188195a2 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 8df6118b84..61c3c2b08d 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 9741fc92aa..ed29c7f217 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 1709a4cfdb..aa099112c1 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 61b336c540..67a6280d32 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 ea75bbcb2e..ea0d77b078 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 0ac2f65693..227c3478cf 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 8648b20805..16bb02164e 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 c4aa3c2b65..e8a994f1a5 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 fb77a90c8e..b958d352d0 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 edc987a86b..52d4f02a79 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 0715118a60..c8af561e68 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 e1087df67e..9acd8e1aaf 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 76ba0bc059..454071ca92 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 1e61f743bf..095e636758 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 5891c7b1c6..56966a76a2 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 9d3529b80d..8f5715dcdc 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 ef3a109ec5..b471813200 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 e208faa90b..edc576bae4 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 f0c7fdd03c..8154470dd3 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 59d96e3988..14c780f7c1 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 b23587e239..f439360541 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 1f96e7478d..acce35f19b 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 de4bea7c6d..3b81c169fb 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 626a878d20..32ab2646d5 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 afb3855ee8..2a6b092c21 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 e66afa3010..49f2ac6fb1 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 d1d818cada..f562e40058 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 4cb09d01aa..0d76ea0b0e 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 a9a4971d49..4ba0073ab5 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 5b47a789b2..e7e687d834 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 621edc3ea8..72b09b00f6 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 82e7342c30..9c4ebb4c31 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 7f2f221d3e..a4851633c0 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 b372eec83c..8dadf16597 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 c2c3068f19..be68cc2b7d 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 fe0a5a19e3..7dbcd6afa9 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 b69b824499..f76c497899 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 f128506bae..0d53795e85 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 6d35f1fd22..0781b846ef 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 2fb13f5d1d..eb0106e609 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 38a8860c2d..670ec31537 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 747632feb3..0749f6d646 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 85c2b6ea23..ab440b5ffd 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 5970adc6b4..bffd2116a5 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 9f54708e72..14b5ed7321 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 2fd9082b7a..a779ea5fd8 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 51fcb22bdc..981a8f1585 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 97bb45bb03..6b615e18b3 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 7ef07273b9..4c3a3a6de0 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 98eb1a7024..693994e188 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 859203c370..6abf20dcb2 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 1b22fffd98..0066a67a20 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 a77f0308f1..bfe1c91ac9 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 8600ba50ba..f62ad26526 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 b0d43f875c..362f322b69 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 800c9268ed..7afdd10521 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 8e4e2cd2c1..b7d06519e0 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 f3c8033a88..073505b012 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 1a10873847..fe3f4af26a 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 8748665f5d..79ac92e0be 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 d67959c3bf..99815e90fa 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 82ca27bcea..eb08ecf882 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 95377b85a9..915984512f 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 a3841ab5b4..a1c144ae4b 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 e1a1ff15bf..5daf187481 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 f13d75a019..4a0b279155 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 1ab41fa12c..f82622ac9e 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 7a59be78b0..c1df0ebcbe 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 ccd7b5b78d..c895ddaa81 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 a01300faf3..e9b0e3fc5e 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 4786de2c1d..a4c5bfd4ff 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 1eb7a5ed36..3f30e4fa88 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 63f65a01b9..1d94de51ee 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 4277e32127..76699f0406 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 cd52ba7c51..68e1e56298 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 b856c8a7c8..1779d2c931 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 619b7addbe..3af2643caf 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 b3cebc4d28..ff3fbaf77d 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 bb62b932a1..b56e9bb150 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 4d4e891e4b..2e64b389e8 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 b752db9c48..5ac4910d14 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 1097c6d236..9c1d20c66a 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 73ae5c3bfb..4975bcadcc 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 b8914e6177..fc483056f9 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 86840bac86..1ac480f0d0 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 a976784365..d9fcaad281 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 a82db69aaa..57e8523b2f 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 3f40ae3359..b077730b0d 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 66e34b666b..ffe86377ff 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 9631c66bc5..ae654a5e35 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 7acfc26be4..f774c3274f 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 1813f1b2c3..26564f93a8 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 9e1b6e3e32..1ae98230f9 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 fa7144a3bc..288802829e 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 853ed3b35a..ed2dd7c576 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 b01db72734..135ef6a092 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 46cc82bad6..10db5245a8 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 d3ce73a2fa..e196fdb414 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 e54d3975e2..6a969def62 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 275648e210..0f5eb9de53 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 a05ecb8c8f..6fb17225bb 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 9407dc967e..9e57c874f8 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 572ccfb920..95f6bd420f 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 be8ce4950d..87030095a8 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 043a3a6e8b..674426eb8a 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 31d85871e0..e3ecad8dc3 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 75e9009b94..15e839ddc5 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 c7f09db9ad..4e53fb5732 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 7b25912ccd..c03eb6d67f 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 f19d634ada..2dd50fe725 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 1a5e837f83..5ca0a866e2 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 5f4299bd03..6ac4761ce0 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 e90cb81361..7b31bbcf6f 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 d0f49a3344..fb392b9094 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 623f10826c..181b6b3aeb 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 2cee9c51bf..0a660b145f 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 095e8be099..070c3113ca 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 19fa7fa0c0..03b713c31e 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 1544a2b33a..934a0c8f93 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 1f025c7df2..9dceeb8911 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 01e546ceb8..45203ea107 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 a369598303..5185cd29eb 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 ab2d12515e..408608ec4a 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 e306d9894a..3c0807986a 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 0f901a1e81..1307c9ac72 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 53ff742317..6ebb5ab0c4 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 11715e4b4b..128364d773 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 f3c758464f..d215562322 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 ff27175cd5..0c45120ebe 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 e4fb356626..8c7c40157a 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 f6afbff6e9..ca3c1196a9 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 16baa15610..4b0e34a901 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 54f34d2b45..476df0f8c7 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 88bee641f7..6cf8ba662a 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 cc00c31a76..9f114f9281 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 97a4fa923c..550a6976d4 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 e2391b0428..d4e300d0a6 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 5a4967c676..6d5612b8bb 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 2dd6532da0..b147b0afc1 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 40ae21ef9c..a05948e464 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 a5910033db..23f3c29726 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 f6d80ff329..c92971f6f4 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 78069a9382..6aca78d79e 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 579e0ebe2b..1672f9584a 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 a466ae4d8b..af8f8d84bd 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 942f852819..302697f58f 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 e95bb8b56e..0c8f7506fb 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 ef6ef8bfec..ac25caf6f1 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 48bf864384..2b60e57fb4 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 899381393f..6d7b905e39 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 527f0786d2..062922c032 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 51688dd06a..6b661d2e5f 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 9e8e262c74..37ebedea5c 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 df9f0eb77e..4ba1da4446 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 2c3dbf91c6..9ed8e3f486 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 d279315f11..37b8bc3f82 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 b4af84e562..ef5ecb13b6 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 6f33a6fc68..2c823d2519 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 60a5de4ce9..9c044402da 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 2a843820db..dc821e2d06 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 f1b464bd7b..3d084c869b 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 899c08b97b..e877840ef1 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 9305670f98..8004e41fac 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 3eb516bb88..f3b7f1408a 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 2f2191c42e..53d4f7dcfb 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 a5c11df836..0835f77278 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 a78cbbd46f..b0704d910b 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 9b0c14c6ec..7136f9eaa2 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 c161f44747..18db1fc4d0 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 bb19f372bc..ee348cd737 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 6fc0837c59..af4e031cc9 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 ee5115075a..fc43dbc545 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 658a429015..e983734601 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 10e6bd27e4..67e0073ca4 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 9ce6049aa3..6dde947157 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 50f4cd6e24..ce44e956e1 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 221b0835c1..0a67259dd3 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 f4d5d518cf..c52cd8d4d9 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 a4beb1b016..90b4442067 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 7585edf419..3ef47022ed 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 aad45657be..cdfd87bf32 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 25b109dabe..23f3916f75 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 0a51ae0dbf..977f927299 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 b2a3409f17..2981257a38 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 3f6c1ad1d7..64769a720a 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 5392823082..2018c59eb9 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 cb3979cb86..6646c40adb 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 1bfc3cf286..f794bea786 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 1940a6c64f..f913bce89d 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 bdac3dc0ad..ba8b96e97a 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 322b3b7806..e498e22991 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 4d3263994b..1eda7abfb3 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 08b9ecfacf..8424ecab28 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 8fcb23acb2..8cc2762952 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 a47d99c4e1..41119cf739 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 942f5fa90a..d238d471eb 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 3f2079e99c..7d515b83ba 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 cc3cc08a5b..6206cbf0b8 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 372e48a51b..8fe1301462 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 ae0b37541f..437f0ea2f8 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 402e12c58b..0ae880f1e8 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 1e7374396c..338bf67ad8 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 2fb942bfde..3762d05b57 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 6c99f4626c..c31da580cd 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 b38d10e29c..7d50671edf 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 08949608b2..c8838185ed 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 47c475ec0d..58b646fc4e 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 496be731b1..3f6d9402f6 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 f48cea38b7..f6743998e7 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 b2d33f6aea..0ebae439ff 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 8f4596628d..ab963f7c58 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 964177fed6..8e78c3a593 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 77bf6fef15..05954402bb 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 d6abe668de..9106fdb12a 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 4cdafb0b38..03f10567f5 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 f06622b2ae..a4d1ea003b 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 1bf608d9f2..54de08be97 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 1efd33d6bc..48dab99d2e 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 405f4178ea..0911eb8640 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 7bbf060171..a0d7782321 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 f22866f616..7efbf0da95 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 5e11f02a78..876cb4733f 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 917fa9425d..00f4719d24 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 b384259340..9eeffc1d8f 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 b36b3d4b0a..3c3eba93c5 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 733317c3ab..b34824a12c 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 0a0f41630e..d95a1ff3e1 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 2286ac95f1..325a4901cd 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 781ac9cc80..4ea2460cf8 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 586d719f38..6a7e92dbc3 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 a35a392ef2..c5b24bb9b8 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 c230cb4c7f..ca7d82bfad 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 7c370a461a..ea172ba1a8 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 cb5d1c3db0..2a6188e5e8 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 1133677cec..ada6ea0f15 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 1a193c2ca4..ea74490849 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 0543b6794f..5365416a47 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 bf41eac316..fa6f4b7129 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 6ea01fa309..a9d0c73c6b 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 9537eeec85..4a1f1ea160 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 a39562e17c..ff4ff4220d 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 3d3db66c6b..e5b73c36ad 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 87bfebe477..54ee4d5a78 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 b2d1c33c79..0ad41b1c9e 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 b994e07c5c..0a62064369 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 c2cbfe17ef..f77ccde3a2 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 3040d80c7c..c9eba6624f 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 96901e2918..1b415d1d6d 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 7b20be275d..a512f5e57b 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 e57b70960b..a14eca8790 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 089dc0580f..dd4a581c72 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 21e1524df7..e4be08e6e8 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 59cc0a5135..b8b6b9026f 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 f600bcd9ad..4fd421cf11 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 94645e57c3..a4b7557ec3 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 31e4029c65..331496716d 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 c3263e7830..059e2c67ff 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 2270f54959..5703dec95a 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 8c211d4364..9ad33ffca8 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 bb665d9a6f..b903be7c23 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 4e6b42e472..f9778d9951 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 00a38a9c88..6aada9e763 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 a1b12faba7..135c7ec372 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 805a730cdb..6cd0602052 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 1864246a44..70db9d6812 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 be7f096709..195d91747f 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             -----
-- 
GitLab