diff --git a/corsika/detail/framework/random/random_iterator/Stream.hpp b/corsika/detail/framework/random/random_iterator/Stream.hpp
index 9fb36c846d1ecd5a7668643adfa44e18a4c710e3..c8522db2371c9cba74012f9cde36e085893ec48d 100644
--- a/corsika/detail/framework/random/random_iterator/Stream.hpp
+++ b/corsika/detail/framework/random/random_iterator/Stream.hpp
@@ -1,23 +1,11 @@
-/*----------------------------------------------------------------------------
- *
- *   Copyright (C) 2021 Antonio Augusto Alves Junior
- *
- *   This file is part of RandomIterator.
- *
- *   RandomIterator is free software: you can redistribute it and/or modify
- *   it under the terms of the GNU General Public License as published by
- *   the Free Software Foundation, either version 3 of the License, or
- *   (at your option) any later version.
- *
- *   RandomIterator is distributed in the hope that it will be useful,
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *   GNU General Public License for more details.
- *
- *   You should have received a copy of the GNU General Public License
- *   along with RandomIterator.  If not, see <http://www.gnu.org/licenses/>.
+/*
+ * (c) Copyright 2021 CORSIKA Project, corsika-project@lists.kit.edu
  *
- *---------------------------------------------------------------------------*/
+ * This software is distributed under the terms of the GNU General Public
+ * Licence version 3 (GPL Version 3). See file LICENSE for a full version of
+ * the license.
+ */
+
 /*
  * Stream.hpp
  *
diff --git a/corsika/detail/framework/random/random_iterator/detail/Engine.hpp b/corsika/detail/framework/random/random_iterator/detail/Engine.hpp
index b8f3e0f0a667fc75d678c72d9bc2583da2f93a70..f4a0c8c3ec03a9c9ce6e6f3ff614670f702fae4d 100644
--- a/corsika/detail/framework/random/random_iterator/detail/Engine.hpp
+++ b/corsika/detail/framework/random/random_iterator/detail/Engine.hpp
@@ -1,23 +1,10 @@
-/*----------------------------------------------------------------------------
- *
- *   Copyright (C) 2021 Antonio Augusto Alves Junior
- *
- *   This file is part of RandomIterator.
- *
- *   RandomIterator is free software: you can redistribute it and/or modify
- *   it under the terms of the GNU General Public License as published by
- *   the Free Software Foundation, either version 3 of the License, or
- *   (at your option) any later version.
- *
- *   RandomIterator is distributed in the hope that it will be useful,
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *   GNU General Public License for more details.
- *
- *   You should have received a copy of the GNU General Public License
- *   along with RandomIterator.  If not, see <http://www.gnu.org/licenses/>.
+/*
+ * (c) Copyright 2021 CORSIKA Project, corsika-project@lists.kit.edu
  *
- *---------------------------------------------------------------------------*/
+ * This software is distributed under the terms of the GNU General Public
+ * Licence version 3 (GPL Version 3). See file LICENSE for a full version of
+ * the license.
+ */
 
 /*
  * Engine.hpp
diff --git a/corsika/detail/framework/random/random_iterator/detail/EngineTraits.hpp b/corsika/detail/framework/random/random_iterator/detail/EngineTraits.hpp
index 4c285fcebbf1917e099db69b2b9cc1842fce2d24..e4a328be7d4dbc904d4de78241b9fb33b1794d22 100644
--- a/corsika/detail/framework/random/random_iterator/detail/EngineTraits.hpp
+++ b/corsika/detail/framework/random/random_iterator/detail/EngineTraits.hpp
@@ -1,23 +1,10 @@
-/*----------------------------------------------------------------------------
- *
- *   Copyright (C) 2021 Antonio Augusto Alves Junior
- *
- *   This file is part of RandomIterator.
- *
- *   RandomIterator is free software: you can redistribute it and/or modify
- *   it under the terms of the GNU General Public License as published by
- *   the Free Software Foundation, either version 3 of the License, or
- *   (at your option) any later version.
- *
- *   RandomIterator is distributed in the hope that it will be useful,
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *   GNU General Public License for more details.
- *
- *   You should have received a copy of the GNU General Public License
- *   along with RandomIterator.  If not, see <http://www.gnu.org/licenses/>.
+/*
+ * (c) Copyright 2021 CORSIKA Project, corsika-project@lists.kit.edu
  *
- *---------------------------------------------------------------------------*/
+ * This software is distributed under the terms of the GNU General Public
+ * Licence version 3 (GPL Version 3). See file LICENSE for a full version of
+ * the license.
+ */
 
 /*
  * EngineTraits.hpp
diff --git a/corsika/detail/framework/random/random_iterator/detail/SplitMix.hpp b/corsika/detail/framework/random/random_iterator/detail/SplitMix.hpp
index 03a6b152f21ed4db7d9c912e1a6571ca2722d243..c0909668616cc012d073f6f6dba5f5e008e5055d 100644
--- a/corsika/detail/framework/random/random_iterator/detail/SplitMix.hpp
+++ b/corsika/detail/framework/random/random_iterator/detail/SplitMix.hpp
@@ -1,23 +1,11 @@
-/*----------------------------------------------------------------------------
- *
- *   Copyright (C) 2021 Antonio Augusto Alves Junior
- *
- *   This file is part of RandomIterator.
- *
- *   RandomIterator is free software: you can redistribute it and/or modify
- *   it under the terms of the GNU General Public License as published by
- *   the Free Software Foundation, either version 3 of the License, or
- *   (at your option) any later version.
- *
- *   RandomIterator is distributed in the hope that it will be useful,
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *   GNU General Public License for more details.
- *
- *   You should have received a copy of the GNU General Public License
- *   along with RandomIterator.  If not, see <http://www.gnu.org/licenses/>.
+/*
+ * (c) Copyright 2021 CORSIKA Project, corsika-project@lists.kit.edu
  *
- *---------------------------------------------------------------------------*/
+ * This software is distributed under the terms of the GNU General Public
+ * Licence version 3 (GPL Version 3). See file LICENSE for a full version of
+ * the license.
+ */
+
 /*
  * SplitMix.hpp
  *
diff --git a/corsika/detail/framework/random/random_iterator/detail/Squares3_128.hpp b/corsika/detail/framework/random/random_iterator/detail/Squares3_128.hpp
index fa62c8c8b805149d5cd6a0eda5524a36159f8567..56b9fe16a3ab483601bb3f9aa4ceb744e6a49a6b 100644
--- a/corsika/detail/framework/random/random_iterator/detail/Squares3_128.hpp
+++ b/corsika/detail/framework/random/random_iterator/detail/Squares3_128.hpp
@@ -1,23 +1,11 @@
-/*----------------------------------------------------------------------------
- *
- *   Copyright (C) 2021 Antonio Augusto Alves Junior
- *
- *   This file is part of RandomIterator.
- *
- *   RandomIterator is free software: you can redistribute it and/or modify
- *   it under the terms of the GNU General Public License as published by
- *   the Free Software Foundation, either version 3 of the License, or
- *   (at your option) any later version.
- *
- *   RandomIterator is distributed in the hope that it will be useful,
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *   GNU General Public License for more details.
- *
- *   You should have received a copy of the GNU General Public License
- *   along with RandomIterator.  If not, see <http://www.gnu.org/licenses/>.
+/*
+ * (c) Copyright 2021 CORSIKA Project, corsika-project@lists.kit.edu
  *
- *---------------------------------------------------------------------------*/
+ * This software is distributed under the terms of the GNU General Public
+ * Licence version 3 (GPL Version 3). See file LICENSE for a full version of
+ * the license.
+ */
+
 /*
  * Squares3_128.hpp
  *
diff --git a/corsika/detail/framework/random/random_iterator/detail/Squares3_64.hpp b/corsika/detail/framework/random/random_iterator/detail/Squares3_64.hpp
index fa76bb25f763ef27555dcb471355b76e885e288f..44e958059386acf4a5df5ce5ba4410f7edc7c55c 100644
--- a/corsika/detail/framework/random/random_iterator/detail/Squares3_64.hpp
+++ b/corsika/detail/framework/random/random_iterator/detail/Squares3_64.hpp
@@ -1,23 +1,11 @@
-/*----------------------------------------------------------------------------
- *
- *   Copyright (C) 2021 Antonio Augusto Alves Junior
- *
- *   This file is part of RandomIterator.
- *
- *   RandomIterator is free software: you can redistribute it and/or modify
- *   it under the terms of the GNU General Public License as published by
- *   the Free Software Foundation, either version 3 of the License, or
- *   (at your option) any later version.
- *
- *   RandomIterator is distributed in the hope that it will be useful,
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *   GNU General Public License for more details.
- *
- *   You should have received a copy of the GNU General Public License
- *   along with RandomIterator.  If not, see <http://www.gnu.org/licenses/>.
+/*
+ * (c) Copyright 2021 CORSIKA Project, corsika-project@lists.kit.edu
  *
- *---------------------------------------------------------------------------*/
+ * This software is distributed under the terms of the GNU General Public
+ * Licence version 3 (GPL Version 3). See file LICENSE for a full version of
+ * the license.
+ */
+
 /*
  * Squares3.hpp
  *
diff --git a/corsika/detail/framework/random/random_iterator/detail/Squares4_128.hpp b/corsika/detail/framework/random/random_iterator/detail/Squares4_128.hpp
index 86db25011c1ac46f67caadc74716723fbba54f26..9f83fee4811a1d65b0fe19dfdc10a7f9e730db16 100644
--- a/corsika/detail/framework/random/random_iterator/detail/Squares4_128.hpp
+++ b/corsika/detail/framework/random/random_iterator/detail/Squares4_128.hpp
@@ -1,23 +1,11 @@
-/*----------------------------------------------------------------------------
- *
- *   Copyright (C) 2021 Antonio Augusto Alves Junior
- *
- *   This file is part of RandomIterator.
- *
- *   RandomIterator is free software: you can redistribute it and/or modify
- *   it under the terms of the GNU General Public License as published by
- *   the Free Software Foundation, either version 3 of the License, or
- *   (at your option) any later version.
- *
- *   RandomIterator is distributed in the hope that it will be useful,
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *   GNU General Public License for more details.
- *
- *   You should have received a copy of the GNU General Public License
- *   along with RandomIterator.  If not, see <http://www.gnu.org/licenses/>.
+/*
+ * (c) Copyright 2021 CORSIKA Project, corsika-project@lists.kit.edu
  *
- *---------------------------------------------------------------------------*/
+ * This software is distributed under the terms of the GNU General Public
+ * Licence version 3 (GPL Version 3). See file LICENSE for a full version of
+ * the license.
+ */
+
 /*
  * Squares4_128.hpp
  *
diff --git a/corsika/detail/framework/random/random_iterator/detail/Squares4_64.hpp b/corsika/detail/framework/random/random_iterator/detail/Squares4_64.hpp
index b40c4abf332de665f6e98d8a092a997da0757800..5381b846ea1ba593fe5ad0637d4234564818266d 100644
--- a/corsika/detail/framework/random/random_iterator/detail/Squares4_64.hpp
+++ b/corsika/detail/framework/random/random_iterator/detail/Squares4_64.hpp
@@ -1,23 +1,11 @@
-/*----------------------------------------------------------------------------
- *
- *   Copyright (C) 2021 Antonio Augusto Alves Junior
- *
- *   This file is part of RandomIterator.
- *
- *   RandomIterator is free software: you can redistribute it and/or modify
- *   it under the terms of the GNU General Public License as published by
- *   the Free Software Foundation, either version 3 of the License, or
- *   (at your option) any later version.
- *
- *   RandomIterator is distributed in the hope that it will be useful,
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *   GNU General Public License for more details.
- *
- *   You should have received a copy of the GNU General Public License
- *   along with RandomIterator.  If not, see <http://www.gnu.org/licenses/>.
+/*
+ * (c) Copyright 2021 CORSIKA Project, corsika-project@lists.kit.edu
  *
- *---------------------------------------------------------------------------*/
+ * This software is distributed under the terms of the GNU General Public
+ * Licence version 3 (GPL Version 3). See file LICENSE for a full version of
+ * the license.
+ */
+
 /*
  * Squares4.hpp
  *
diff --git a/corsika/detail/framework/random/random_iterator/detail/SquaresKeys.hpp b/corsika/detail/framework/random/random_iterator/detail/SquaresKeys.hpp
index 0f4d871d281c99a9881c98090acf116e20b60eff..c8a84a00a48bfd2ca86d6985a76543c027dbf455 100644
--- a/corsika/detail/framework/random/random_iterator/detail/SquaresKeys.hpp
+++ b/corsika/detail/framework/random/random_iterator/detail/SquaresKeys.hpp
@@ -1,23 +1,11 @@
-/*----------------------------------------------------------------------------
- *
- *   Copyright (C) 2021 Antonio Augusto Alves Junior
- *
- *   This file is part of RandomIterator.
- *
- *   RandomIterator is free software: you can redistribute it and/or modify
- *   it under the terms of the GNU General Public License as published by
- *   the Free Software Foundation, either version 3 of the License, or
- *   (at your option) any later version.
- *
- *   RandomIterator is distributed in the hope that it will be useful,
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *   GNU General Public License for more details.
- *
- *   You should have received a copy of the GNU General Public License
- *   along with RandomIterator.  If not, see <http://www.gnu.org/licenses/>.
+/*
+ * (c) Copyright 2021 CORSIKA Project, corsika-project@lists.kit.edu
  *
- *---------------------------------------------------------------------------*/
+ * This software is distributed under the terms of the GNU General Public
+ * Licence version 3 (GPL Version 3). See file LICENSE for a full version of
+ * the license.
+ */
+
 /*
  * SquaresKeys.hpp
  *
diff --git a/corsika/detail/framework/random/random_iterator/detail/functors/EngineCaller.hpp b/corsika/detail/framework/random/random_iterator/detail/functors/EngineCaller.hpp
index b20ede7fd3a925e2bee0588b18297718e2a6888a..61e67fe97ef60497714dddd257a48d4bf5e1e31d 100644
--- a/corsika/detail/framework/random/random_iterator/detail/functors/EngineCaller.hpp
+++ b/corsika/detail/framework/random/random_iterator/detail/functors/EngineCaller.hpp
@@ -1,23 +1,11 @@
-/*----------------------------------------------------------------------------
- *
- *   Copyright (C) 2021 Antonio Augusto Alves Junior
- *
- *   This file is part of RandomIterator.
- *
- *   RandomIterator is free software: you can redistribute it and/or modify
- *   it under the terms of the GNU General Public License as published by
- *   the Free Software Foundation, either version 3 of the License, or
- *   (at your option) any later version.
- *
- *   RandomIterator is distributed in the hope that it will be useful,
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *   GNU General Public License for more details.
- *
- *   You should have received a copy of the GNU General Public License
- *   along with RandomIterator.  If not, see <http://www.gnu.org/licenses/>.
+/*
+ * (c) Copyright 2021 CORSIKA Project, corsika-project@lists.kit.edu
  *
- *---------------------------------------------------------------------------*/
+ * This software is distributed under the terms of the GNU General Public
+ * Licence version 3 (GPL Version 3). See file LICENSE for a full version of
+ * the license.
+ */
+
 /*
  * EngineCaller.hpp
  *
diff --git a/corsika/detail/framework/random/random_iterator/detail/uint128.hpp b/corsika/detail/framework/random/random_iterator/detail/uint128.hpp
index 863fc100b546a5a7755fb322bb15725ef85a26be..a191e6fa6e86c3ad18cbd389b228a96319d7358d 100644
--- a/corsika/detail/framework/random/random_iterator/detail/uint128.hpp
+++ b/corsika/detail/framework/random/random_iterator/detail/uint128.hpp
@@ -1,23 +1,11 @@
-/*----------------------------------------------------------------------------
- *
- *   Copyright (C) 2021 Antonio Augusto Alves Junior
- *
- *   This file is part of RandomIterator.
- *
- *   RandomIterator is free software: you can redistribute it and/or modify
- *   it under the terms of the GNU General Public License as published by
- *   the Free Software Foundation, either version 3 of the License, or
- *   (at your option) any later version.
- *
- *   RandomIterator is distributed in the hope that it will be useful,
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *   GNU General Public License for more details.
- *
- *   You should have received a copy of the GNU General Public License
- *   along with RandomIterator.  If not, see <http://www.gnu.org/licenses/>.
+/*
+ * (c) Copyright 2021 CORSIKA Project, corsika-project@lists.kit.edu
  *
- *---------------------------------------------------------------------------*/
+ * This software is distributed under the terms of the GNU General Public
+ * Licence version 3 (GPL Version 3). See file LICENSE for a full version of
+ * the license.
+ */
+
 /*
  * uint128_t.hpp
  *
diff --git a/corsika/detail/framework/random/random_iterator/detail/uint128.inl b/corsika/detail/framework/random/random_iterator/detail/uint128.inl
index 281b948bde616925d1305b27660def0de1b5017f..aa6d348741dc808d4b750dd2dba003f937b8d768 100644
--- a/corsika/detail/framework/random/random_iterator/detail/uint128.inl
+++ b/corsika/detail/framework/random/random_iterator/detail/uint128.inl
@@ -1,23 +1,11 @@
-/*----------------------------------------------------------------------------
- *
- *   Copyright (C) 2021 Antonio Augusto Alves Junior
- *
- *   This file is part of RandomIterator.
- *
- *   RandomIterator is free software: you can redistribute it and/or modify
- *   it under the terms of the GNU General Public License as published by
- *   the Free Software Foundation, either version 3 of the License, or
- *   (at your option) any later version.
- *
- *   RandomIterator is distributed in the hope that it will be useful,
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *   GNU General Public License for more details.
- *
- *   You should have received a copy of the GNU General Public License
- *   along with RandomIterator.  If not, see <http://www.gnu.org/licenses/>.
+/*
+ * (c) Copyright 2021 CORSIKA Project, corsika-project@lists.kit.edu
  *
- *---------------------------------------------------------------------------*/
+ * This software is distributed under the terms of the GNU General Public
+ * Licence version 3 (GPL Version 3). See file LICENSE for a full version of
+ * the license.
+ */
+
 /*
  * uint128_t.inl
  *
diff --git a/do-copyright.py b/do-copyright.py
index 7e0caf2d12af351f224dacb91a3cb0f45516ead5..b2da9fc14923dc3c4776274e64ded4d9317230ed 100755
--- a/do-copyright.py
+++ b/do-copyright.py
@@ -21,7 +21,7 @@ Debug settings are 0: nothing, 1: checking, 2: filesystem
 """
 Debug = 0 
 
-excludeDirs = ["./modules", "./externals", "build", "install", "git", "framework/units"]
+excludeDirs = ["./modules", "./externals", "build", "install", "git", "framework/units", "Random123"]
 excludeFiles = ['PhysicalConstants.h','CorsikaFenvOSX.cc', 'sgn.h', 'quartic.h']
 
 extensions = [".cpp", ".inl", ".hpp"]