diff --git a/fles/mcbm2018/monitor/CbmMcbm2018MonitorAlgoPsd.cxx b/fles/mcbm2018/monitor/CbmMcbm2018MonitorAlgoPsd.cxx
index 95a46fa5ec5651e40c0a653cf1ff3c64844c4545..4e2c3a64ea6c1891547d3bf1222de534924c8b21 100644
--- a/fles/mcbm2018/monitor/CbmMcbm2018MonitorAlgoPsd.cxx
+++ b/fles/mcbm2018/monitor/CbmMcbm2018MonitorAlgoPsd.cxx
@@ -1,6 +1,6 @@
/* Copyright (C) 2019-2021 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
SPDX-License-Identifier: GPL-3.0-only
- Authors: David Emschermann [committer], Nikolay Karpushkin, Nikolay Karpushkin */
+ Authors: David Emschermann [committer], Nikolay Karpushkin */
// -----------------------------------------------------------------------------
// ----- -----
diff --git a/fles/mcbm2018/tasks/CbmMcbmCheckTimingAlgo.cxx b/fles/mcbm2018/tasks/CbmMcbmCheckTimingAlgo.cxx
index 5893090d1f07c0526bfcc70657358d441e2c0a55..1f564f179014e42ea0ebab4581b060f8d1120eaa 100644
--- a/fles/mcbm2018/tasks/CbmMcbmCheckTimingAlgo.cxx
+++ b/fles/mcbm2018/tasks/CbmMcbmCheckTimingAlgo.cxx
@@ -1,10 +1,7 @@
-/********************************************************************************
- * Copyright (C) 2014 GSI Helmholtzzentrum fuer Schwerionenforschung GmbH *
- * *
- * This software is distributed under the terms of the *
- * GNU Lesser General Public Licence (LGPL) version 3, *
- * copied verbatim in the file "LICENSE" *
- ********************************************************************************/
+/* Copyright (C) 2020-2021 Facility for Antiproton and Ion Research in Europe, Darmstadt
+ SPDX-License-Identifier: GPL-3.0-only
+ Authors: Pierre-Alain Loizeau [committer], Andreas Redelbach */
+
#include "CbmMcbmCheckTimingAlgo.h"
#include "CbmDigiManager.h"
diff --git a/fles/mcbm2018/tasks/CbmMcbmCheckTimingAlgo.h b/fles/mcbm2018/tasks/CbmMcbmCheckTimingAlgo.h
index de4feed550ca41c967ce320c506dbc02c4d7754f..22271c385ddf8ecad8cc895aaa9048bfd3d377d9 100644
--- a/fles/mcbm2018/tasks/CbmMcbmCheckTimingAlgo.h
+++ b/fles/mcbm2018/tasks/CbmMcbmCheckTimingAlgo.h
@@ -1,10 +1,7 @@
-/********************************************************************************
- * Copyright (C) 2014 GSI Helmholtzzentrum fuer Schwerionenforschung GmbH *
- * *
- * This software is distributed under the terms of the *
- * GNU Lesser General Public Licence (LGPL) version 3, *
- * copied verbatim in the file "LICENSE" *
- ********************************************************************************/
+/* Copyright (C) 2020-2021 Facility for Antiproton and Ion Research in Europe, Darmstadt
+ SPDX-License-Identifier: GPL-3.0-only
+ Authors: Pierre-Alain Loizeau [committer], Andreas Redelbach */
+
#ifndef CBMMCBMCHECKTIMINGALGO_H
#define CBMMCBMCHECKTIMINGALGO_H
diff --git a/fles/mcbm2018/unpacker/CbmMcbm2018UnpackerAlgoPsd.cxx b/fles/mcbm2018/unpacker/CbmMcbm2018UnpackerAlgoPsd.cxx
index c1cc589ad5c70d030d509cbf201977276c85e522..38a1ee02c8bb64ac7862dece45232fce66746c79 100644
--- a/fles/mcbm2018/unpacker/CbmMcbm2018UnpackerAlgoPsd.cxx
+++ b/fles/mcbm2018/unpacker/CbmMcbm2018UnpackerAlgoPsd.cxx
@@ -1,4 +1,4 @@
-/* Copyright (C) 2019-2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+/* Copyright (C) 2019-2021 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
SPDX-License-Identifier: GPL-3.0-only
Authors: Nikolay Karpushkin, David Emschermann [committer], Pierre-Alain Loizeau */
diff --git a/fles/mcbm2018/unpacker/CbmMcbm2018UnpackerAlgoPsd.h b/fles/mcbm2018/unpacker/CbmMcbm2018UnpackerAlgoPsd.h
index b149c706de84e584239152bb8e1030e9f8a2f3b4..5db70b54c63aa478263b84f8016d8523b4abf431 100644
--- a/fles/mcbm2018/unpacker/CbmMcbm2018UnpackerAlgoPsd.h
+++ b/fles/mcbm2018/unpacker/CbmMcbm2018UnpackerAlgoPsd.h
@@ -1,4 +1,4 @@
-/* Copyright (C) 2019-2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+/* Copyright (C) 2019-2021 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
SPDX-License-Identifier: GPL-3.0-only
Authors: Nikolay Karpushkin, David Emschermann [committer] */
diff --git a/fles/mcbm2018/unpacker/CbmMcbm2018UnpackerAlgoRich.cxx b/fles/mcbm2018/unpacker/CbmMcbm2018UnpackerAlgoRich.cxx
index 4c21a869dd0b21c3070cd9d918a11a1b66bc4f7e..8876857e658ddc04028321dc9abed662d3c07441 100644
--- a/fles/mcbm2018/unpacker/CbmMcbm2018UnpackerAlgoRich.cxx
+++ b/fles/mcbm2018/unpacker/CbmMcbm2018UnpackerAlgoRich.cxx
@@ -1,6 +1,6 @@
/* Copyright (C) 2019-2020 Justus-Liebig-Universitaet Giessen, Giessen
SPDX-License-Identifier: GPL-3.0-only
- Authors: Egor Ovcharenko [committer], Pierre-Alain Loizeau */
+ Authors: Egor Ovcharenko [committer], Semen Lebedev, Pierre-Alain Loizeau */
/**
* CbmMcbm2018UnpackerAlgoRich
diff --git a/fles/mcbm2018/unpacker/CbmMcbm2018UnpackerAlgoRich.h b/fles/mcbm2018/unpacker/CbmMcbm2018UnpackerAlgoRich.h
index 201091c1a8f2c03372012cc46c909dc595c1b2c0..4a3eebd25497e6cf827a138eb3c1ad4b556d57d7 100644
--- a/fles/mcbm2018/unpacker/CbmMcbm2018UnpackerAlgoRich.h
+++ b/fles/mcbm2018/unpacker/CbmMcbm2018UnpackerAlgoRich.h
@@ -1,6 +1,6 @@
/* Copyright (C) 2019-2020 Justus-Liebig-Universitaet Giessen, Giessen
SPDX-License-Identifier: GPL-3.0-only
- Authors: Egor Ovcharenko [committer] */
+ Authors: Egor Ovcharenko [committer], Semen Lebedev */
/**
* CbmMcbm2018UnpackerAlgoRich
diff --git a/fles/mcbm2018/unpacker/CbmMcbm2018UnpackerTaskPsd.h b/fles/mcbm2018/unpacker/CbmMcbm2018UnpackerTaskPsd.h
index 4ca6a9cb982beb8685536c9bf9d4270e08cb3468..be1e7c18e48318f21683542a64d3ea8a9aeb91cb 100644
--- a/fles/mcbm2018/unpacker/CbmMcbm2018UnpackerTaskPsd.h
+++ b/fles/mcbm2018/unpacker/CbmMcbm2018UnpackerTaskPsd.h
@@ -1,4 +1,4 @@
-/* Copyright (C) 2019-2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+/* Copyright (C) 2019-2021 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
SPDX-License-Identifier: GPL-3.0-only
Authors: Nikolay Karpushkin, David Emschermann [committer] */
diff --git a/macro/psd/event_data_struct.h b/macro/psd/event_data_struct.h
index cb1e28cb8cb570d3007cc48e0eedd1be9e4e933a..e42557ffddefd1c389a75baaa1af8d7e2791c903 100755
--- a/macro/psd/event_data_struct.h
+++ b/macro/psd/event_data_struct.h
@@ -1,3 +1,7 @@
+/* Copyright (C) 2021 Institute for Nuclear Research, Moscow
+ SPDX-License-Identifier: GPL-3.0-only
+ Authors: Nikolay Karpushkin [committer] */
+
#ifndef EVENT_DATA_STRUCT
#define EVENT_DATA_STRUCT
diff --git a/macro/trd/geometry/trd.v20/CbmTrdPads_v20a.h b/macro/trd/geometry/trd.v20/CbmTrdPads_v20a.h
index 204720f1c448bc899eeb4b6334d4fda2c987e571..0e19a08329de8013298b1540539a71dbad811560 100644
--- a/macro/trd/geometry/trd.v20/CbmTrdPads_v20a.h
+++ b/macro/trd/geometry/trd.v20/CbmTrdPads_v20a.h
@@ -1,4 +1,4 @@
-/* Copyright (C) 2020 Institut für Kernphysik, Goethe-Universitaet Frankfurt, Frankfurt
+/* Copyright (C) 2020 Institut fuer Kernphysik, Goethe-Universitaet Frankfurt, Frankfurt
SPDX-License-Identifier: GPL-3.0-only
Authors: Pascal Raisig [committer] */
diff --git a/macro/trd/geometry/trd.v20/CbmTrdPads_v20b.h b/macro/trd/geometry/trd.v20/CbmTrdPads_v20b.h
index d61eb32bfb54eb56a896fcd171b0bc19070ed03b..ec166694c3c5ead9d3414283e48c2bc3b48de3ba 100644
--- a/macro/trd/geometry/trd.v20/CbmTrdPads_v20b.h
+++ b/macro/trd/geometry/trd.v20/CbmTrdPads_v20b.h
@@ -1,4 +1,4 @@
-/* Copyright (C) 2020 Institut für Kernphysik, Goethe-Universitaet Frankfurt, Frankfurt
+/* Copyright (C) 2020 Institut fuer Kernphysik, Goethe-Universitaet Frankfurt, Frankfurt
SPDX-License-Identifier: GPL-3.0-only
Authors: Pascal Raisig [committer] */
diff --git a/reco/L1/L1Algo/L1Vector.h b/reco/L1/L1Algo/L1Vector.h
index 10a28b7a7ebc6249df67603bd611669d039c5a7d..4b691a8f27997509f89ead5690e317f4ea882f3c 100644
--- a/reco/L1/L1Algo/L1Vector.h
+++ b/reco/L1/L1Algo/L1Vector.h
@@ -1,4 +1,4 @@
-/* Copyright (C) 2021-2021 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+/* Copyright (C) 2021 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
SPDX-License-Identifier: GPL-3.0-only
Authors: Sergey Gorbunov [committer] */