diff --git a/.gitattributes b/.gitattributes
index 7a48e57c..a2dc0df6 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -1,4 +1,6 @@
+# SPDX-License-Identifier: MPL-2.0
 # Copyright 2023 CARIAD SE.
+# Copyright 2024 ASAM e.V.
 #
 # This Source Code Form is subject to the terms of the Mozilla
 # Public License, v. 2.0. If a copy of the MPL was not distributed
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 5afec7db..5155d241 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,4 +1,6 @@
+# SPDX-License-Identifier: MPL-2.0
 # Copyright 2023 CARIAD SE.
+# Copyright 2024 ASAM e.V.
 #
 # This Source Code Form is subject to the terms of the Mozilla
 # Public License, v. 2.0. If a copy of the MPL was not distributed
diff --git a/LICENSE b/LICENSE
index a612ad98..5af7f5fa 100644
--- a/LICENSE
+++ b/LICENSE
@@ -1,6 +1,9 @@
 Mozilla Public License Version 2.0
 ==================================
 
+Copyright (C) 2023 CARIAD SE
+Copyright (C) 2024 ASAM e.V.
+
 1. Definitions
 --------------
 
diff --git a/demo_pipeline/configuration_generator.py b/demo_pipeline/configuration_generator.py
index be1d162b..0f83022b 100644
--- a/demo_pipeline/configuration_generator.py
+++ b/demo_pipeline/configuration_generator.py
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: MPL-2.0
 # Copyright 2024, ASAM e.V.
 # This Source Code Form is subject to the terms of the Mozilla
 # Public License, v. 2.0. If a copy of the MPL was not distributed
diff --git a/demo_pipeline/run_pipeline.sh b/demo_pipeline/run_pipeline.sh
index 72dda2df..a9666180 100755
--- a/demo_pipeline/run_pipeline.sh
+++ b/demo_pipeline/run_pipeline.sh
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: MPL-2.0
 # Copyright 2024, ASAM e.V.
 # This Source Code Form is subject to the terms of the Mozilla
 # Public License, v. 2.0. If a copy of the MPL was not distributed
diff --git a/doc/CMakeLists.txt b/doc/CMakeLists.txt
index b2993e13..baad0db7 100644
--- a/doc/CMakeLists.txt
+++ b/doc/CMakeLists.txt
@@ -1,4 +1,6 @@
+# SPDX-License-Identifier: MPL-2.0
 # Copyright 2023 CARIAD SE.
+# Copyright 2024 ASAM e.V.
 #
 # This Source Code Form is subject to the terms of the Mozilla
 # Public License, v. 2.0. If a copy of the MPL was not distributed
diff --git a/doc/schema/CMakeLists.txt b/doc/schema/CMakeLists.txt
index 9704f9d2..c5758d57 100644
--- a/doc/schema/CMakeLists.txt
+++ b/doc/schema/CMakeLists.txt
@@ -1,4 +1,6 @@
+# SPDX-License-Identifier: MPL-2.0
 # Copyright 2023 CARIAD SE.
+# Copyright 2024 ASAM e.V.
 #
 # This Source Code Form is subject to the terms of the Mozilla
 # Public License, v. 2.0. If a copy of the MPL was not distributed
diff --git a/docker/test_runtime.sh b/docker/test_runtime.sh
index 236f7870..01f9c61b 100755
--- a/docker/test_runtime.sh
+++ b/docker/test_runtime.sh
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: MPL-2.0
 # Copyright 2024, ASAM e.V.
 # This Source Code Form is subject to the terms of the Mozilla
 # Public License, v. 2.0. If a copy of the MPL was not distributed
diff --git a/examples/CMakeLists.txt b/examples/CMakeLists.txt
index 56a8acf6..6100b293 100644
--- a/examples/CMakeLists.txt
+++ b/examples/CMakeLists.txt
@@ -1,4 +1,6 @@
+# SPDX-License-Identifier: MPL-2.0
 # Copyright 2023 CARIAD SE.
+# Copyright 2024 ASAM e.V.
 #
 # This Source Code Form is subject to the terms of the Mozilla
 # Public License, v. 2.0. If a copy of the MPL was not distributed
diff --git a/examples/checker_bundle_example/CMakeLists.txt b/examples/checker_bundle_example/CMakeLists.txt
index 1d28a8f9..dbe806b8 100644
--- a/examples/checker_bundle_example/CMakeLists.txt
+++ b/examples/checker_bundle_example/CMakeLists.txt
@@ -1,4 +1,6 @@
+# SPDX-License-Identifier: MPL-2.0
 # Copyright 2023 CARIAD SE.
+# Copyright 2024 ASAM e.V.
 #
 # This Source Code Form is subject to the terms of the Mozilla
 # Public License, v. 2.0. If a copy of the MPL was not distributed
diff --git a/examples/checker_bundle_example/src/main.cpp b/examples/checker_bundle_example/src/main.cpp
index 5720411b..baa09d99 100644
--- a/examples/checker_bundle_example/src/main.cpp
+++ b/examples/checker_bundle_example/src/main.cpp
@@ -1,5 +1,7 @@
+// SPDX-License-Identifier: MPL-2.0
 /*
  * Copyright 2023 CARIAD SE.
+ * Copyright 2024 ASAM e.V.
  *
  * This Source Code Form is subject to the terms of the Mozilla
  * Public License, v. 2.0. If a copy of the MPL was not distributed
diff --git a/examples/checker_bundle_example/src/main.h b/examples/checker_bundle_example/src/main.h
index 1f45ff64..4b16232c 100644
--- a/examples/checker_bundle_example/src/main.h
+++ b/examples/checker_bundle_example/src/main.h
@@ -1,5 +1,7 @@
+// SPDX-License-Identifier: MPL-2.0
 /*
  * Copyright 2023 CARIAD SE.
+ * Copyright 2024 ASAM e.V.
  *
  * This Source Code Form is subject to the terms of the Mozilla
  * Public License, v. 2.0. If a copy of the MPL was not distributed
diff --git a/examples/checker_bundle_example/src/stdafx.cpp b/examples/checker_bundle_example/src/stdafx.cpp
index 75048a9a..af860174 100644
--- a/examples/checker_bundle_example/src/stdafx.cpp
+++ b/examples/checker_bundle_example/src/stdafx.cpp
@@ -1,5 +1,7 @@
+// SPDX-License-Identifier: MPL-2.0
 /*
  * Copyright 2023 CARIAD SE.
+ * Copyright 2024 ASAM e.V.
  *
  * This Source Code Form is subject to the terms of the Mozilla
  * Public License, v. 2.0. If a copy of the MPL was not distributed
diff --git a/examples/checker_bundle_example/src/stdafx.h b/examples/checker_bundle_example/src/stdafx.h
index 4d65a490..8aedbf1a 100644
--- a/examples/checker_bundle_example/src/stdafx.h
+++ b/examples/checker_bundle_example/src/stdafx.h
@@ -1,5 +1,7 @@
+// SPDX-License-Identifier: MPL-2.0
 /*
  * Copyright 2023 CARIAD SE.
+ * Copyright 2024 ASAM e.V.
  *
  * This Source Code Form is subject to the terms of the Mozilla
  * Public License, v. 2.0. If a copy of the MPL was not distributed
diff --git a/examples/esmini_viewer/CMakeLists.txt b/examples/esmini_viewer/CMakeLists.txt
index c146d1ef..a5ce035e 100644
--- a/examples/esmini_viewer/CMakeLists.txt
+++ b/examples/esmini_viewer/CMakeLists.txt
@@ -1,4 +1,6 @@
+# SPDX-License-Identifier: MPL-2.0
 # Copyright 2023 CARIAD SE.
+# Copyright 2024 ASAM e.V.
 #
 # This Source Code Form is subject to the terms of the Mozilla
 # Public License, v. 2.0. If a copy of the MPL was not distributed
diff --git a/examples/esmini_viewer/esmini_viewer.cpp b/examples/esmini_viewer/esmini_viewer.cpp
index 1e9a53d3..919ca187 100644
--- a/examples/esmini_viewer/esmini_viewer.cpp
+++ b/examples/esmini_viewer/esmini_viewer.cpp
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: MPL-2.0
 /**
  * Copyright 2024, ASAM e.V.
  *
diff --git a/examples/esmini_viewer/xml_util.h b/examples/esmini_viewer/xml_util.h
index f8cd5d61..278f5728 100644
--- a/examples/esmini_viewer/xml_util.h
+++ b/examples/esmini_viewer/xml_util.h
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: MPL-2.0
 /**
  * Copyright 2024, ASAM e.V.
  *
diff --git a/examples/viewer_example/CMakeLists.txt b/examples/viewer_example/CMakeLists.txt
index 2e713763..d47d6d26 100644
--- a/examples/viewer_example/CMakeLists.txt
+++ b/examples/viewer_example/CMakeLists.txt
@@ -1,4 +1,6 @@
+# SPDX-License-Identifier: MPL-2.0
 # Copyright 2023 CARIAD SE.
+# Copyright 2024 ASAM e.V.
 #
 # This Source Code Form is subject to the terms of the Mozilla
 # Public License, v. 2.0. If a copy of the MPL was not distributed
diff --git a/examples/viewer_example/viewer_example.cpp b/examples/viewer_example/viewer_example.cpp
index faba1cda..0d475a9e 100644
--- a/examples/viewer_example/viewer_example.cpp
+++ b/examples/viewer_example/viewer_example.cpp
@@ -1,5 +1,7 @@
+// SPDX-License-Identifier: MPL-2.0
 /*
  * Copyright 2023 CARIAD SE.
+ * Copyright 2024 ASAM e.V.
  *
  * This Source Code Form is subject to the terms of the Mozilla
  * Public License, v. 2.0. If a copy of the MPL was not distributed
diff --git a/include/common/config_format/c_configuration.h b/include/common/config_format/c_configuration.h
index 71bb24a9..04494fce 100644
--- a/include/common/config_format/c_configuration.h
+++ b/include/common/config_format/c_configuration.h
@@ -1,5 +1,7 @@
+// SPDX-License-Identifier: MPL-2.0
 /**
  * Copyright 2023 CARIAD SE.
+ * Copyright 2024 ASAM e.V.
  *
  * This Source Code Form is subject to the terms of the Mozilla
  * Public License, v. 2.0. If a copy of the MPL was not distributed
diff --git a/include/common/config_format/c_configuration_checker.h b/include/common/config_format/c_configuration_checker.h
index 80a15261..da4b1828 100644
--- a/include/common/config_format/c_configuration_checker.h
+++ b/include/common/config_format/c_configuration_checker.h
@@ -1,5 +1,7 @@
+// SPDX-License-Identifier: MPL-2.0
 /**
  * Copyright 2023 CARIAD SE.
+ * Copyright 2024 ASAM e.V.
  *
  * This Source Code Form is subject to the terms of the Mozilla
  * Public License, v. 2.0. If a copy of the MPL was not distributed
diff --git a/include/common/config_format/c_configuration_checker_bundle.h b/include/common/config_format/c_configuration_checker_bundle.h
index 30b2212e..4a7ff02f 100644
--- a/include/common/config_format/c_configuration_checker_bundle.h
+++ b/include/common/config_format/c_configuration_checker_bundle.h
@@ -1,5 +1,7 @@
+// SPDX-License-Identifier: MPL-2.0
 /**
  * Copyright 2023 CARIAD SE.
+ * Copyright 2024 ASAM e.V.
  *
  * This Source Code Form is subject to the terms of the Mozilla
  * Public License, v. 2.0. If a copy of the MPL was not distributed
diff --git a/include/common/config_format/c_configuration_report_module.h b/include/common/config_format/c_configuration_report_module.h
index 6d4c5a8b..6e5cdd0d 100644
--- a/include/common/config_format/c_configuration_report_module.h
+++ b/include/common/config_format/c_configuration_report_module.h
@@ -1,5 +1,7 @@
+// SPDX-License-Identifier: MPL-2.0
 /**
  * Copyright 2023 CARIAD SE.
+ * Copyright 2024 ASAM e.V.
  *
  * This Source Code Form is subject to the terms of the Mozilla
  * Public License, v. 2.0. If a copy of the MPL was not distributed
diff --git a/include/common/qc4openx_filesystem.h b/include/common/qc4openx_filesystem.h
index f82be48d..0854de99 100644
--- a/include/common/qc4openx_filesystem.h
+++ b/include/common/qc4openx_filesystem.h
@@ -1,5 +1,7 @@
+// SPDX-License-Identifier: MPL-2.0
 /**
  * Copyright 2023 CARIAD SE.
+ * Copyright 2024 ASAM e.V.
  *
  * This Source Code Form is subject to the terms of the Mozilla
  * Public License, v. 2.0. If a copy of the MPL was not distributed
diff --git a/include/common/result_format/c_checker.h b/include/common/result_format/c_checker.h
index de9ac293..de51b9a8 100644
--- a/include/common/result_format/c_checker.h
+++ b/include/common/result_format/c_checker.h
@@ -1,5 +1,7 @@
+// SPDX-License-Identifier: MPL-2.0
 /**
  * Copyright 2023 CARIAD SE.
+ * Copyright 2024 ASAM e.V.
  *
  * This Source Code Form is subject to the terms of the Mozilla
  * Public License, v. 2.0. If a copy of the MPL was not distributed
diff --git a/include/common/result_format/c_checker_bundle.h b/include/common/result_format/c_checker_bundle.h
index 7ff8f34d..8de39a07 100644
--- a/include/common/result_format/c_checker_bundle.h
+++ b/include/common/result_format/c_checker_bundle.h
@@ -1,5 +1,7 @@
+// SPDX-License-Identifier: MPL-2.0
 /**
  * Copyright 2023 CARIAD SE.
+ * Copyright 2024 ASAM e.V.
  *
  * This Source Code Form is subject to the terms of the Mozilla
  * Public License, v. 2.0. If a copy of the MPL was not distributed
diff --git a/include/common/result_format/c_domain_specific_info.h b/include/common/result_format/c_domain_specific_info.h
index 3963b9cd..824af487 100644
--- a/include/common/result_format/c_domain_specific_info.h
+++ b/include/common/result_format/c_domain_specific_info.h
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: MPL-2.0
 /**
  * Copyright 2024, ASAM e.V.
  *
diff --git a/include/common/result_format/c_extended_information.h b/include/common/result_format/c_extended_information.h
index a01102cf..f78493a7 100644
--- a/include/common/result_format/c_extended_information.h
+++ b/include/common/result_format/c_extended_information.h
@@ -1,5 +1,7 @@
+// SPDX-License-Identifier: MPL-2.0
 /**
  * Copyright 2023 CARIAD SE.
+ * Copyright 2024 ASAM e.V.
  *
  * This Source Code Form is subject to the terms of the Mozilla
  * Public License, v. 2.0. If a copy of the MPL was not distributed
diff --git a/include/common/result_format/c_file_location.h b/include/common/result_format/c_file_location.h
index a4c3d258..94d1dc1f 100644
--- a/include/common/result_format/c_file_location.h
+++ b/include/common/result_format/c_file_location.h
@@ -1,5 +1,7 @@
+// SPDX-License-Identifier: MPL-2.0
 /**
  * Copyright 2023 CARIAD SE.
+ * Copyright 2024 ASAM e.V.
  *
  * This Source Code Form is subject to the terms of the Mozilla
  * Public License, v. 2.0. If a copy of the MPL was not distributed
diff --git a/include/common/result_format/c_inertial_location.h b/include/common/result_format/c_inertial_location.h
index c0230b87..5aeaf59d 100644
--- a/include/common/result_format/c_inertial_location.h
+++ b/include/common/result_format/c_inertial_location.h
@@ -1,5 +1,7 @@
+// SPDX-License-Identifier: MPL-2.0
 /**
  * Copyright 2023 CARIAD SE.
+ * Copyright 2024 ASAM e.V.
  *
  * This Source Code Form is subject to the terms of the Mozilla
  * Public License, v. 2.0. If a copy of the MPL was not distributed
@@ -32,8 +34,7 @@ class cInertialLocation : public cExtendedInformation
      * \param z: Z of the position in inertial coordinate system
      * \param description: Additional description
      */
-    cInertialLocation(double x, double y, double z)
-        : cExtendedInformation("InertialLocation"), m_X(x), m_Y(y), m_Z(z)
+    cInertialLocation(double x, double y, double z) : cExtendedInformation("InertialLocation"), m_X(x), m_Y(y), m_Z(z)
     {
     }
 
@@ -53,8 +54,6 @@ class cInertialLocation : public cExtendedInformation
     // Returns the Z
     double GetZ() const;
 
-  
-
   protected:
     double m_X, m_Y, m_Z;
 
diff --git a/include/common/result_format/c_issue.h b/include/common/result_format/c_issue.h
index df840b5f..1d3f049c 100644
--- a/include/common/result_format/c_issue.h
+++ b/include/common/result_format/c_issue.h
@@ -1,5 +1,7 @@
+// SPDX-License-Identifier: MPL-2.0
 /**
  * Copyright 2023 CARIAD SE.
+ * Copyright 2024 ASAM e.V.
  *
  * This Source Code Form is subject to the terms of the Mozilla
  * Public License, v. 2.0. If a copy of the MPL was not distributed
diff --git a/include/common/result_format/c_locations_container.h b/include/common/result_format/c_locations_container.h
index e3c4df61..7639fc4a 100644
--- a/include/common/result_format/c_locations_container.h
+++ b/include/common/result_format/c_locations_container.h
@@ -1,5 +1,7 @@
+// SPDX-License-Identifier: MPL-2.0
 /**
  * Copyright 2023 CARIAD SE.
+ * Copyright 2024 ASAM e.V.
  *
  * This Source Code Form is subject to the terms of the Mozilla
  * Public License, v. 2.0. If a copy of the MPL was not distributed
diff --git a/include/common/result_format/c_metadata.h b/include/common/result_format/c_metadata.h
index f44baaf3..b5c03269 100644
--- a/include/common/result_format/c_metadata.h
+++ b/include/common/result_format/c_metadata.h
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: MPL-2.0
 /**
  * Copyright 2024, ASAM e.V.
  *
diff --git a/include/common/result_format/c_parameter_container.h b/include/common/result_format/c_parameter_container.h
index cd47d9f8..32aaeb48 100644
--- a/include/common/result_format/c_parameter_container.h
+++ b/include/common/result_format/c_parameter_container.h
@@ -1,5 +1,7 @@
+// SPDX-License-Identifier: MPL-2.0
 /**
  * Copyright 2023 CARIAD SE.
+ * Copyright 2024 ASAM e.V.
  *
  * This Source Code Form is subject to the terms of the Mozilla
  * Public License, v. 2.0. If a copy of the MPL was not distributed
diff --git a/include/common/result_format/c_result_container.h b/include/common/result_format/c_result_container.h
index a10baa17..beb062f4 100644
--- a/include/common/result_format/c_result_container.h
+++ b/include/common/result_format/c_result_container.h
@@ -1,5 +1,7 @@
+// SPDX-License-Identifier: MPL-2.0
 /**
  * Copyright 2023 CARIAD SE.
+ * Copyright 2024 ASAM e.V.
  *
  * This Source Code Form is subject to the terms of the Mozilla
  * Public License, v. 2.0. If a copy of the MPL was not distributed
diff --git a/include/common/result_format/c_rule.h b/include/common/result_format/c_rule.h
index 2e3bf79d..ecb83bbc 100644
--- a/include/common/result_format/c_rule.h
+++ b/include/common/result_format/c_rule.h
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: MPL-2.0
 /**
  * Copyright 2024, ASAM e.V.
  *
diff --git a/include/common/result_format/c_xml_location.h b/include/common/result_format/c_xml_location.h
index 9490c707..cdc93a9d 100644
--- a/include/common/result_format/c_xml_location.h
+++ b/include/common/result_format/c_xml_location.h
@@ -1,5 +1,7 @@
+// SPDX-License-Identifier: MPL-2.0
 /**
  * Copyright 2023 CARIAD SE.
+ * Copyright 2024 ASAM e.V.
  *
  * This Source Code Form is subject to the terms of the Mozilla
  * Public License, v. 2.0. If a copy of the MPL was not distributed
diff --git a/include/common/result_format/i_result.h b/include/common/result_format/i_result.h
index 863b5559..f593be3a 100644
--- a/include/common/result_format/i_result.h
+++ b/include/common/result_format/i_result.h
@@ -1,5 +1,7 @@
+// SPDX-License-Identifier: MPL-2.0
 /**
  * Copyright 2023 CARIAD SE.
+ * Copyright 2024 ASAM e.V.
  *
  * This Source Code Form is subject to the terms of the Mozilla
  * Public License, v. 2.0. If a copy of the MPL was not distributed
diff --git a/include/common/util.h b/include/common/util.h
index e6c1d250..381ba4a6 100644
--- a/include/common/util.h
+++ b/include/common/util.h
@@ -1,5 +1,7 @@
+// SPDX-License-Identifier: MPL-2.0
 /**
  * Copyright 2023 CARIAD SE.
+ * Copyright 2024 ASAM e.V.
  *
  * This Source Code Form is subject to the terms of the Mozilla
  * Public License, v. 2.0. If a copy of the MPL was not distributed
diff --git a/include/common/xml/c_x_path_evaluator.h b/include/common/xml/c_x_path_evaluator.h
index 9760316c..b75e14c8 100644
--- a/include/common/xml/c_x_path_evaluator.h
+++ b/include/common/xml/c_x_path_evaluator.h
@@ -1,5 +1,7 @@
+// SPDX-License-Identifier: MPL-2.0
 /**
  * Copyright 2023 CARIAD SE.
+ * Copyright 2024 ASAM e.V.
  *
  * This Source Code Form is subject to the terms of the Mozilla
  * Public License, v. 2.0. If a copy of the MPL was not distributed
diff --git a/include/common/xml/util_xerces.h b/include/common/xml/util_xerces.h
index c0fc3797..24469851 100644
--- a/include/common/xml/util_xerces.h
+++ b/include/common/xml/util_xerces.h
@@ -1,5 +1,7 @@
+// SPDX-License-Identifier: MPL-2.0
 /**
  * Copyright 2023 CARIAD SE.
+ * Copyright 2024 ASAM e.V.
  *
  * This Source Code Form is subject to the terms of the Mozilla
  * Public License, v. 2.0. If a copy of the MPL was not distributed
diff --git a/include/viewer/i_connector.h b/include/viewer/i_connector.h
index 11e03295..aa10412b 100644
--- a/include/viewer/i_connector.h
+++ b/include/viewer/i_connector.h
@@ -1,5 +1,7 @@
+// SPDX-License-Identifier: MPL-2.0
 /**
  * Copyright 2023 CARIAD SE.
+ * Copyright 2024 ASAM e.V.
  *
  * This Source Code Form is subject to the terms of the Mozilla
  * Public License, v. 2.0. If a copy of the MPL was not distributed
diff --git a/qc_framework/qc_framework/__init__.py b/qc_framework/qc_framework/__init__.py
index 093437a3..d230334a 100644
--- a/qc_framework/qc_framework/__init__.py
+++ b/qc_framework/qc_framework/__init__.py
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: MPL-2.0
 # Copyright 2024, ASAM e.V.
 # This Source Code Form is subject to the terms of the Mozilla
 # Public License, v. 2.0. If a copy of the MPL was not distributed
diff --git a/qc_framework/qc_framework/__main__.py b/qc_framework/qc_framework/__main__.py
index 7e9ac126..08e7b239 100644
--- a/qc_framework/qc_framework/__main__.py
+++ b/qc_framework/qc_framework/__main__.py
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: MPL-2.0
 # Copyright 2024, ASAM e.V.
 # This Source Code Form is subject to the terms of the Mozilla
 # Public License, v. 2.0. If a copy of the MPL was not distributed
diff --git a/qc_framework/qc_framework/runtime/__init__.py b/qc_framework/qc_framework/runtime/__init__.py
index 56bb8a9d..4c779817 100644
--- a/qc_framework/qc_framework/runtime/__init__.py
+++ b/qc_framework/qc_framework/runtime/__init__.py
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: MPL-2.0
 # Copyright 2024, ASAM e.V.
 # This Source Code Form is subject to the terms of the Mozilla
 # Public License, v. 2.0. If a copy of the MPL was not distributed
diff --git a/qc_framework/qc_framework/runtime/models.py b/qc_framework/qc_framework/runtime/models.py
index 844e0cd6..c6010a60 100644
--- a/qc_framework/qc_framework/runtime/models.py
+++ b/qc_framework/qc_framework/runtime/models.py
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: MPL-2.0
 # Copyright 2024, ASAM e.V.
 # This Source Code Form is subject to the terms of the Mozilla
 # Public License, v. 2.0. If a copy of the MPL was not distributed
diff --git a/qc_framework/qc_framework/runtime/runtime.py b/qc_framework/qc_framework/runtime/runtime.py
index e9ae5b5e..82740eef 100644
--- a/qc_framework/qc_framework/runtime/runtime.py
+++ b/qc_framework/qc_framework/runtime/runtime.py
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: MPL-2.0
 # Copyright 2024, ASAM e.V.
 # This Source Code Form is subject to the terms of the Mozilla
 # Public License, v. 2.0. If a copy of the MPL was not distributed
diff --git a/qc_framework/tests/__init__.py b/qc_framework/tests/__init__.py
index 093437a3..d230334a 100644
--- a/qc_framework/tests/__init__.py
+++ b/qc_framework/tests/__init__.py
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: MPL-2.0
 # Copyright 2024, ASAM e.V.
 # This Source Code Form is subject to the terms of the Mozilla
 # Public License, v. 2.0. If a copy of the MPL was not distributed
diff --git a/qc_framework/tests/test_runtime.py b/qc_framework/tests/test_runtime.py
index 8f08eee0..cae2e944 100644
--- a/qc_framework/tests/test_runtime.py
+++ b/qc_framework/tests/test_runtime.py
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: MPL-2.0
 # Copyright 2024, ASAM e.V.
 # This Source Code Form is subject to the terms of the Mozilla
 # Public License, v. 2.0. If a copy of the MPL was not distributed
diff --git a/scripts/cmake/qc4openx-config.cmake b/scripts/cmake/qc4openx-config.cmake
index c2fddc4b..4287713f 100644
--- a/scripts/cmake/qc4openx-config.cmake
+++ b/scripts/cmake/qc4openx-config.cmake
@@ -1,4 +1,5 @@
 # Copyright 2023 CARIAD SE.
+# Copyright 2024 ASAM e.V.
 #
 # This Source Code Form is subject to the terms of the Mozilla
 # Public License, v. 2.0. If a copy of the MPL was not distributed
diff --git a/scripts/cmake/qt_macros.cmake b/scripts/cmake/qt_macros.cmake
index 83a2fe89..16234ec5 100644
--- a/scripts/cmake/qt_macros.cmake
+++ b/scripts/cmake/qt_macros.cmake
@@ -1,4 +1,5 @@
 # Copyright 2023 CARIAD SE.
+# Copyright 2024 ASAM e.V.
 #
 # This Source Code Form is subject to the terms of the Mozilla
 # Public License, v. 2.0. If a copy of the MPL was not distributed
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 3a47b7c0..e52d0267 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -1,4 +1,6 @@
+# SPDX-License-Identifier: MPL-2.0
 # Copyright 2023 CARIAD SE.
+# Copyright 2024 ASAM e.V.
 #
 # This Source Code Form is subject to the terms of the Mozilla
 # Public License, v. 2.0. If a copy of the MPL was not distributed
diff --git a/src/common/CMakeLists.txt b/src/common/CMakeLists.txt
index 9cfe7b49..f813d944 100644
--- a/src/common/CMakeLists.txt
+++ b/src/common/CMakeLists.txt
@@ -1,4 +1,6 @@
+# SPDX-License-Identifier: MPL-2.0
 # Copyright 2023 CARIAD SE.
+# Copyright 2024 ASAM e.V.
 #
 # This Source Code Form is subject to the terms of the Mozilla
 # Public License, v. 2.0. If a copy of the MPL was not distributed
diff --git a/src/common/softwareVersion.h.in b/src/common/softwareVersion.h.in
index 744f1a9f..f18aafd0 100644
--- a/src/common/softwareVersion.h.in
+++ b/src/common/softwareVersion.h.in
@@ -1,5 +1,6 @@
 /*
  * Copyright 2023 CARIAD SE.
+ * Copyright 2024 ASAM e.V.
  *
  * This Source Code Form is subject to the terms of the Mozilla
  * Public License, v. 2.0. If a copy of the MPL was not distributed
@@ -9,16 +10,16 @@
 #ifndef _SOFTWARE_VERSION_H__
 #define _SOFTWARE_VERSION_H__
 
-// Softwareversion. 
+// Softwareversion.
 // Diese Version wird aus dem Buildsystem (CMake) automatisch erzeugt.
-static const char* const BUILD_VERSION = "@QC4OPENX_VERSION@";
+static const char *const BUILD_VERSION = "@QC4OPENX_VERSION@";
 
-// Softwarerevision. 
+// Softwarerevision.
 // Diese Version wird aus dem Buildsystem (CMake) automatisch erzeugt.
-static const char* const BUILD_REVISION = "@SCM_REVISION@";
+static const char *const BUILD_REVISION = "@SCM_REVISION@";
 
-// Software build time. 
+// Software build time.
 // Diese Version wird aus dem Buildsystem (CMake) automatisch erzeugt.
-static const char* const BUILD_DATE = "@BUILD_DATE@";
+static const char *const BUILD_DATE = "@BUILD_DATE@";
 
-#endif
\ No newline at end of file
+#endif
diff --git a/src/common/src/config_format/c_configuration.cpp b/src/common/src/config_format/c_configuration.cpp
index 6b2d9222..2b7a5db9 100644
--- a/src/common/src/config_format/c_configuration.cpp
+++ b/src/common/src/config_format/c_configuration.cpp
@@ -1,5 +1,7 @@
+// SPDX-License-Identifier: MPL-2.0
 /*
  * Copyright 2023 CARIAD SE.
+ * Copyright 2024 ASAM e.V.
  *
  * This Source Code Form is subject to the terms of the Mozilla
  * Public License, v. 2.0. If a copy of the MPL was not distributed
diff --git a/src/common/src/config_format/c_configuration_checker.cpp b/src/common/src/config_format/c_configuration_checker.cpp
index 94fa1eef..6c6cef66 100644
--- a/src/common/src/config_format/c_configuration_checker.cpp
+++ b/src/common/src/config_format/c_configuration_checker.cpp
@@ -1,5 +1,7 @@
+// SPDX-License-Identifier: MPL-2.0
 /*
  * Copyright 2023 CARIAD SE.
+ * Copyright 2024 ASAM e.V.
  *
  * This Source Code Form is subject to the terms of the Mozilla
  * Public License, v. 2.0. If a copy of the MPL was not distributed
diff --git a/src/common/src/config_format/c_configuration_checker_bundle.cpp b/src/common/src/config_format/c_configuration_checker_bundle.cpp
index 16789252..1cba1d57 100644
--- a/src/common/src/config_format/c_configuration_checker_bundle.cpp
+++ b/src/common/src/config_format/c_configuration_checker_bundle.cpp
@@ -1,5 +1,7 @@
+// SPDX-License-Identifier: MPL-2.0
 /*
  * Copyright 2023 CARIAD SE.
+ * Copyright 2024 ASAM e.V.
  *
  * This Source Code Form is subject to the terms of the Mozilla
  * Public License, v. 2.0. If a copy of the MPL was not distributed
diff --git a/src/common/src/config_format/c_configuration_report_module.cpp b/src/common/src/config_format/c_configuration_report_module.cpp
index 2c16ea73..4692213b 100644
--- a/src/common/src/config_format/c_configuration_report_module.cpp
+++ b/src/common/src/config_format/c_configuration_report_module.cpp
@@ -1,5 +1,7 @@
+// SPDX-License-Identifier: MPL-2.0
 /*
  * Copyright 2023 CARIAD SE.
+ * Copyright 2024 ASAM e.V.
  *
  * This Source Code Form is subject to the terms of the Mozilla
  * Public License, v. 2.0. If a copy of the MPL was not distributed
diff --git a/src/common/src/result_format/c_checker.cpp b/src/common/src/result_format/c_checker.cpp
index deee9148..384e981b 100644
--- a/src/common/src/result_format/c_checker.cpp
+++ b/src/common/src/result_format/c_checker.cpp
@@ -1,5 +1,7 @@
+// SPDX-License-Identifier: MPL-2.0
 /*
  * Copyright 2023 CARIAD SE.
+ * Copyright 2024 ASAM e.V.
  *
  * This Source Code Form is subject to the terms of the Mozilla
  * Public License, v. 2.0. If a copy of the MPL was not distributed
diff --git a/src/common/src/result_format/c_checker_bundle.cpp b/src/common/src/result_format/c_checker_bundle.cpp
index e385fe95..43acc026 100644
--- a/src/common/src/result_format/c_checker_bundle.cpp
+++ b/src/common/src/result_format/c_checker_bundle.cpp
@@ -1,5 +1,7 @@
+// SPDX-License-Identifier: MPL-2.0
 /*
  * Copyright 2023 CARIAD SE.
+ * Copyright 2024 ASAM e.V.
  *
  * This Source Code Form is subject to the terms of the Mozilla
  * Public License, v. 2.0. If a copy of the MPL was not distributed
diff --git a/src/common/src/result_format/c_domain_specific_info.cpp b/src/common/src/result_format/c_domain_specific_info.cpp
index ac34e38d..bfb64157 100644
--- a/src/common/src/result_format/c_domain_specific_info.cpp
+++ b/src/common/src/result_format/c_domain_specific_info.cpp
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: MPL-2.0
 /**
  * Copyright 2024, ASAM e.V.
  *
diff --git a/src/common/src/result_format/c_extended_information.cpp b/src/common/src/result_format/c_extended_information.cpp
index 29e22f66..17563aa5 100644
--- a/src/common/src/result_format/c_extended_information.cpp
+++ b/src/common/src/result_format/c_extended_information.cpp
@@ -1,5 +1,7 @@
+// SPDX-License-Identifier: MPL-2.0
 /*
  * Copyright 2023 CARIAD SE.
+ * Copyright 2024 ASAM e.V.
  *
  * This Source Code Form is subject to the terms of the Mozilla
  * Public License, v. 2.0. If a copy of the MPL was not distributed
diff --git a/src/common/src/result_format/c_file_location.cpp b/src/common/src/result_format/c_file_location.cpp
index b323fdad..d01c2820 100644
--- a/src/common/src/result_format/c_file_location.cpp
+++ b/src/common/src/result_format/c_file_location.cpp
@@ -1,5 +1,7 @@
+// SPDX-License-Identifier: MPL-2.0
 /*
  * Copyright 2023 CARIAD SE.
+ * Copyright 2024 ASAM e.V.
  *
  * This Source Code Form is subject to the terms of the Mozilla
  * Public License, v. 2.0. If a copy of the MPL was not distributed
diff --git a/src/common/src/result_format/c_inertial_location.cpp b/src/common/src/result_format/c_inertial_location.cpp
index 3697ed78..175722cf 100644
--- a/src/common/src/result_format/c_inertial_location.cpp
+++ b/src/common/src/result_format/c_inertial_location.cpp
@@ -1,5 +1,7 @@
+// SPDX-License-Identifier: MPL-2.0
 /*
  * Copyright 2023 CARIAD SE.
+ * Copyright 2024 ASAM e.V.
  *
  * This Source Code Form is subject to the terms of the Mozilla
  * Public License, v. 2.0. If a copy of the MPL was not distributed
@@ -61,4 +63,3 @@ double cInertialLocation::GetZ() const
 {
     return m_Z;
 }
-
diff --git a/src/common/src/result_format/c_issue.cpp b/src/common/src/result_format/c_issue.cpp
index 1764ce03..e2e410b1 100644
--- a/src/common/src/result_format/c_issue.cpp
+++ b/src/common/src/result_format/c_issue.cpp
@@ -1,5 +1,7 @@
+// SPDX-License-Identifier: MPL-2.0
 /*
  * Copyright 2023 CARIAD SE.
+ * Copyright 2024 ASAM e.V.
  *
  * This Source Code Form is subject to the terms of the Mozilla
  * Public License, v. 2.0. If a copy of the MPL was not distributed
diff --git a/src/common/src/result_format/c_locations_container.cpp b/src/common/src/result_format/c_locations_container.cpp
index 2a691cd5..3a9d56b8 100644
--- a/src/common/src/result_format/c_locations_container.cpp
+++ b/src/common/src/result_format/c_locations_container.cpp
@@ -1,5 +1,7 @@
+// SPDX-License-Identifier: MPL-2.0
 /*
  * Copyright 2023 CARIAD SE.
+ * Copyright 2024 ASAM e.V.
  *
  * This Source Code Form is subject to the terms of the Mozilla
  * Public License, v. 2.0. If a copy of the MPL was not distributed
diff --git a/src/common/src/result_format/c_metadata.cpp b/src/common/src/result_format/c_metadata.cpp
index 1ef12638..d9d59cde 100644
--- a/src/common/src/result_format/c_metadata.cpp
+++ b/src/common/src/result_format/c_metadata.cpp
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: MPL-2.0
 /**
  * Copyright 2024, ASAM e.V.
  *
diff --git a/src/common/src/result_format/c_parameter_container.cpp b/src/common/src/result_format/c_parameter_container.cpp
index 4c762ac4..25583d2e 100644
--- a/src/common/src/result_format/c_parameter_container.cpp
+++ b/src/common/src/result_format/c_parameter_container.cpp
@@ -1,5 +1,7 @@
+// SPDX-License-Identifier: MPL-2.0
 /*
  * Copyright 2023 CARIAD SE.
+ * Copyright 2024 ASAM e.V.
  *
  * This Source Code Form is subject to the terms of the Mozilla
  * Public License, v. 2.0. If a copy of the MPL was not distributed
diff --git a/src/common/src/result_format/c_result_container.cpp b/src/common/src/result_format/c_result_container.cpp
index 2ae11ad7..fc9649f4 100644
--- a/src/common/src/result_format/c_result_container.cpp
+++ b/src/common/src/result_format/c_result_container.cpp
@@ -1,5 +1,7 @@
+// SPDX-License-Identifier: MPL-2.0
 /*
  * Copyright 2023 CARIAD SE.
+ * Copyright 2024 ASAM e.V.
  *
  * This Source Code Form is subject to the terms of the Mozilla
  * Public License, v. 2.0. If a copy of the MPL was not distributed
diff --git a/src/common/src/result_format/c_rule.cpp b/src/common/src/result_format/c_rule.cpp
index d6b4b1ef..eed57201 100644
--- a/src/common/src/result_format/c_rule.cpp
+++ b/src/common/src/result_format/c_rule.cpp
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: MPL-2.0
 /**
  * Copyright 2024, ASAM e.V.
  *
diff --git a/src/common/src/result_format/c_xml_location.cpp b/src/common/src/result_format/c_xml_location.cpp
index 48d9200e..6c9c8761 100644
--- a/src/common/src/result_format/c_xml_location.cpp
+++ b/src/common/src/result_format/c_xml_location.cpp
@@ -1,5 +1,7 @@
+// SPDX-License-Identifier: MPL-2.0
 /*
  * Copyright 2023 CARIAD SE.
+ * Copyright 2024 ASAM e.V.
  *
  * This Source Code Form is subject to the terms of the Mozilla
  * Public License, v. 2.0. If a copy of the MPL was not distributed
diff --git a/src/common/src/util.cpp b/src/common/src/util.cpp
index a29af432..8c44a27e 100644
--- a/src/common/src/util.cpp
+++ b/src/common/src/util.cpp
@@ -1,5 +1,7 @@
+// SPDX-License-Identifier: MPL-2.0
 /*
  * Copyright 2023 CARIAD SE.
+ * Copyright 2024 ASAM e.V.
  *
  * This Source Code Form is subject to the terms of the Mozilla
  * Public License, v. 2.0. If a copy of the MPL was not distributed
diff --git a/src/common/src/xml/c_x_path_evaluator.cpp b/src/common/src/xml/c_x_path_evaluator.cpp
index 5cb48a68..5ba285dc 100644
--- a/src/common/src/xml/c_x_path_evaluator.cpp
+++ b/src/common/src/xml/c_x_path_evaluator.cpp
@@ -1,5 +1,7 @@
+// SPDX-License-Identifier: MPL-2.0
 /*
  * Copyright 2023 CARIAD SE.
+ * Copyright 2024 ASAM e.V.
  *
  * This Source Code Form is subject to the terms of the Mozilla
  * Public License, v. 2.0. If a copy of the MPL was not distributed
diff --git a/src/report_modules/CMakeLists.txt b/src/report_modules/CMakeLists.txt
index 05e1aa9a..bc166292 100644
--- a/src/report_modules/CMakeLists.txt
+++ b/src/report_modules/CMakeLists.txt
@@ -1,4 +1,6 @@
+# SPDX-License-Identifier: MPL-2.0
 # Copyright 2023 CARIAD SE.
+# Copyright 2024 ASAM e.V.
 #
 # This Source Code Form is subject to the terms of the Mozilla
 # Public License, v. 2.0. If a copy of the MPL was not distributed
diff --git a/src/report_modules/report_module_github_ci/CMakeLists.txt b/src/report_modules/report_module_github_ci/CMakeLists.txt
index 81b97875..54be39f8 100644
--- a/src/report_modules/report_module_github_ci/CMakeLists.txt
+++ b/src/report_modules/report_module_github_ci/CMakeLists.txt
@@ -1,4 +1,6 @@
+# SPDX-License-Identifier: MPL-2.0
 # Copyright 2023 CARIAD SE.
+# Copyright 2024 ASAM e.V.
 # Copyright 2024 BMW AG
 #
 # This Source Code Form is subject to the terms of the Mozilla
diff --git a/src/report_modules/report_module_github_ci/src/report_format_github_ci.cpp b/src/report_modules/report_module_github_ci/src/report_format_github_ci.cpp
index 7c0cc936..db1b29da 100644
--- a/src/report_modules/report_module_github_ci/src/report_format_github_ci.cpp
+++ b/src/report_modules/report_module_github_ci/src/report_format_github_ci.cpp
@@ -1,5 +1,7 @@
+// SPDX-License-Identifier: MPL-2.0
 /*
  * Copyright 2023 CARIAD SE.
+ * Copyright 2024 ASAM e.V.
  * Copyright 2024 BMW AG
  *
  * This Source Code Form is subject to the terms of the Mozilla
diff --git a/src/report_modules/report_module_github_ci/src/report_format_github_ci.h b/src/report_modules/report_module_github_ci/src/report_format_github_ci.h
index 93a7fed1..77b5705a 100644
--- a/src/report_modules/report_module_github_ci/src/report_format_github_ci.h
+++ b/src/report_modules/report_module_github_ci/src/report_format_github_ci.h
@@ -1,5 +1,7 @@
+// SPDX-License-Identifier: MPL-2.0
 /*
  * Copyright 2023 CARIAD SE.
+ * Copyright 2024 ASAM e.V.
  * Copyright 2024 BMW AG
  *
  * This Source Code Form is subject to the terms of the Mozilla
@@ -68,4 +70,3 @@ bool PrintResults(std::unique_ptr<cResultContainer> &pResultContainer);
  * @param issueToProcess The issue to update the description for.
  */
 void AddPrefixForDescriptionIssueProcessor(cChecker *checker, cIssue *issueToProcess);
-
diff --git a/src/report_modules/report_module_github_ci/src/stdafx.cpp b/src/report_modules/report_module_github_ci/src/stdafx.cpp
index 75048a9a..af860174 100644
--- a/src/report_modules/report_module_github_ci/src/stdafx.cpp
+++ b/src/report_modules/report_module_github_ci/src/stdafx.cpp
@@ -1,5 +1,7 @@
+// SPDX-License-Identifier: MPL-2.0
 /*
  * Copyright 2023 CARIAD SE.
+ * Copyright 2024 ASAM e.V.
  *
  * This Source Code Form is subject to the terms of the Mozilla
  * Public License, v. 2.0. If a copy of the MPL was not distributed
diff --git a/src/report_modules/report_module_github_ci/src/stdafx.h b/src/report_modules/report_module_github_ci/src/stdafx.h
index 80bf8468..780ae67d 100644
--- a/src/report_modules/report_module_github_ci/src/stdafx.h
+++ b/src/report_modules/report_module_github_ci/src/stdafx.h
@@ -1,5 +1,7 @@
+// SPDX-License-Identifier: MPL-2.0
 /*
  * Copyright 2023 CARIAD SE.
+ * Copyright 2024 ASAM e.V.
  *
  * This Source Code Form is subject to the terms of the Mozilla
  * Public License, v. 2.0. If a copy of the MPL was not distributed
diff --git a/src/report_modules/report_module_gui/CMakeLists.txt b/src/report_modules/report_module_gui/CMakeLists.txt
index f3d6fc0d..0e36ca9b 100644
--- a/src/report_modules/report_module_gui/CMakeLists.txt
+++ b/src/report_modules/report_module_gui/CMakeLists.txt
@@ -1,4 +1,6 @@
+# SPDX-License-Identifier: MPL-2.0
 # Copyright 2023 CARIAD SE.
+# Copyright 2024 ASAM e.V.
 #
 # This Source Code Form is subject to the terms of the Mozilla
 # Public License, v. 2.0. If a copy of the MPL was not distributed
diff --git a/src/report_modules/report_module_gui/src/qrc/poc__report_module_gui__qrc.cpp b/src/report_modules/report_module_gui/src/qrc/poc__report_module_gui__qrc.cpp
index c6538c08..40916f58 100644
--- a/src/report_modules/report_module_gui/src/qrc/poc__report_module_gui__qrc.cpp
+++ b/src/report_modules/report_module_gui/src/qrc/poc__report_module_gui__qrc.cpp
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: MPL-2.0
 /****************************************************************************
 ** Resource object code
 **
diff --git a/src/report_modules/report_module_gui/src/report_format_ui.cpp b/src/report_modules/report_module_gui/src/report_format_ui.cpp
index fc9b94bf..2dcbeaef 100644
--- a/src/report_modules/report_module_gui/src/report_format_ui.cpp
+++ b/src/report_modules/report_module_gui/src/report_format_ui.cpp
@@ -1,5 +1,7 @@
+// SPDX-License-Identifier: MPL-2.0
 /*
  * Copyright 2023 CARIAD SE.
+ * Copyright 2024 ASAM e.V.
  *
  * This Source Code Form is subject to the terms of the Mozilla
  * Public License, v. 2.0. If a copy of the MPL was not distributed
diff --git a/src/report_modules/report_module_gui/src/report_format_ui.h b/src/report_modules/report_module_gui/src/report_format_ui.h
index 3a7db233..b5802cbc 100644
--- a/src/report_modules/report_module_gui/src/report_format_ui.h
+++ b/src/report_modules/report_module_gui/src/report_format_ui.h
@@ -1,5 +1,7 @@
+// SPDX-License-Identifier: MPL-2.0
 /*
  * Copyright 2023 CARIAD SE.
+ * Copyright 2024 ASAM e.V.
  *
  * This Source Code Form is subject to the terms of the Mozilla
  * Public License, v. 2.0. If a copy of the MPL was not distributed
diff --git a/src/report_modules/report_module_gui/src/ui/c_checker_widget.cpp b/src/report_modules/report_module_gui/src/ui/c_checker_widget.cpp
index a735ef73..bf9ac4b0 100644
--- a/src/report_modules/report_module_gui/src/ui/c_checker_widget.cpp
+++ b/src/report_modules/report_module_gui/src/ui/c_checker_widget.cpp
@@ -1,5 +1,7 @@
+// SPDX-License-Identifier: MPL-2.0
 /*
  * Copyright 2023 CARIAD SE.
+ * Copyright 2024 ASAM e.V.
  *
  * This Source Code Form is subject to the terms of the Mozilla
  * Public License, v. 2.0. If a copy of the MPL was not distributed
diff --git a/src/report_modules/report_module_gui/src/ui/c_checker_widget.h b/src/report_modules/report_module_gui/src/ui/c_checker_widget.h
index b0dc6e0d..31504882 100644
--- a/src/report_modules/report_module_gui/src/ui/c_checker_widget.h
+++ b/src/report_modules/report_module_gui/src/ui/c_checker_widget.h
@@ -1,5 +1,7 @@
+// SPDX-License-Identifier: MPL-2.0
 /*
  * Copyright 2023 CARIAD SE.
+ * Copyright 2024 ASAM e.V.
  *
  * This Source Code Form is subject to the terms of the Mozilla
  * Public License, v. 2.0. If a copy of the MPL was not distributed
diff --git a/src/report_modules/report_module_gui/src/ui/c_line_highlighter.cpp b/src/report_modules/report_module_gui/src/ui/c_line_highlighter.cpp
index 490247fb..527cec62 100644
--- a/src/report_modules/report_module_gui/src/ui/c_line_highlighter.cpp
+++ b/src/report_modules/report_module_gui/src/ui/c_line_highlighter.cpp
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: MPL-2.0
 /*
  * Copyright 2024, ASAM e.V.
  *
diff --git a/src/report_modules/report_module_gui/src/ui/c_line_highlighter.h b/src/report_modules/report_module_gui/src/ui/c_line_highlighter.h
index b0ed75c9..9088c269 100644
--- a/src/report_modules/report_module_gui/src/ui/c_line_highlighter.h
+++ b/src/report_modules/report_module_gui/src/ui/c_line_highlighter.h
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: MPL-2.0
 /*
  * Copyright 2024, ASAM e.V.
  *
diff --git a/src/report_modules/report_module_gui/src/ui/c_report_module_window.cpp b/src/report_modules/report_module_gui/src/ui/c_report_module_window.cpp
index 99574e3e..379f7015 100644
--- a/src/report_modules/report_module_gui/src/ui/c_report_module_window.cpp
+++ b/src/report_modules/report_module_gui/src/ui/c_report_module_window.cpp
@@ -1,5 +1,7 @@
+// SPDX-License-Identifier: MPL-2.0
 /*
  * Copyright 2023 CARIAD SE.
+ * Copyright 2024 ASAM e.V.
  *
  * This Source Code Form is subject to the terms of the Mozilla
  * Public License, v. 2.0. If a copy of the MPL was not distributed
diff --git a/src/report_modules/report_module_gui/src/ui/c_report_module_window.h b/src/report_modules/report_module_gui/src/ui/c_report_module_window.h
index 6b4ec648..ef80554f 100644
--- a/src/report_modules/report_module_gui/src/ui/c_report_module_window.h
+++ b/src/report_modules/report_module_gui/src/ui/c_report_module_window.h
@@ -1,5 +1,7 @@
+// SPDX-License-Identifier: MPL-2.0
 /*
  * Copyright 2023 CARIAD SE.
+ * Copyright 2024 ASAM e.V.
  *
  * This Source Code Form is subject to the terms of the Mozilla
  * Public License, v. 2.0. If a copy of the MPL was not distributed
diff --git a/src/report_modules/report_module_text/CMakeLists.txt b/src/report_modules/report_module_text/CMakeLists.txt
index 623c32c0..4a4d839b 100644
--- a/src/report_modules/report_module_text/CMakeLists.txt
+++ b/src/report_modules/report_module_text/CMakeLists.txt
@@ -1,4 +1,6 @@
+# SPDX-License-Identifier: MPL-2.0
 # Copyright 2023 CARIAD SE.
+# Copyright 2024 ASAM e.V.
 #
 # This Source Code Form is subject to the terms of the Mozilla
 # Public License, v. 2.0. If a copy of the MPL was not distributed
diff --git a/src/report_modules/report_module_text/src/report_format_text.cpp b/src/report_modules/report_module_text/src/report_format_text.cpp
index 298b9e06..8efb9e87 100644
--- a/src/report_modules/report_module_text/src/report_format_text.cpp
+++ b/src/report_modules/report_module_text/src/report_format_text.cpp
@@ -1,5 +1,7 @@
+// SPDX-License-Identifier: MPL-2.0
 /*
  * Copyright 2023 CARIAD SE.
+ * Copyright 2024 ASAM e.V.
  *
  * This Source Code Form is subject to the terms of the Mozilla
  * Public License, v. 2.0. If a copy of the MPL was not distributed
@@ -348,8 +350,7 @@ void WriteResults(const char *file, cResultContainer *ptrResultContainer)
 
                         if ((*it_Issue)->GetRuleUID() != "")
                         {
-                            ss << "\n                       "
-                               << "ruleUID: " << (*it_Issue)->GetRuleUID();
+                            ss << "\n                       " << "ruleUID: " << (*it_Issue)->GetRuleUID();
                         }
 
                         PrintExtendedInformationIntoStream((*it_Issue), &ss);
@@ -452,14 +453,10 @@ void WriteResults(const char *file, cResultContainer *ptrResultContainer)
 
         ss << BASIC_SEPARATOR_LINE << "\n";
 
-        ss << "Note"
-           << "\n\n";
-        ss << "Rule UID format:"
-           << "\n";
-        ss << "    <emanating-entity>:<standard>:x.y.z:rule_set.for_rules.rule_name"
-           << "\n\n";
-        ss << "where    "
-           << "\n";
+        ss << "Note" << "\n\n";
+        ss << "Rule UID format:" << "\n";
+        ss << "    <emanating-entity>:<standard>:x.y.z:rule_set.for_rules.rule_name" << "\n\n";
+        ss << "where    " << "\n";
         ss << "    Emanating Entity: a domain name for the entity (organization or company) that declares the rule UID"
            << "\n";
         ss << "    Standard: a short string that represents the standard or the domain to which the rule is applied"
@@ -467,18 +464,12 @@ void WriteResults(const char *file, cResultContainer *ptrResultContainer)
         ss << "    Definition Setting: the version of the standard or the domain to which the rule appears or is "
               "applied for the first time"
            << "\n";
-        ss << "    Rule Full Name: the full name of the rule, as dot separated, snake lower case string. "
-           << "\n";
-        ss << "        The full name of a rule is composed by the rule set, a categorization for the rule, "
-           << "\n";
-        ss << "        and the rule name, a unique string inside the categorization. "
-           << "\n";
-        ss << "        The rule set can be nested (meaning that can be defined as an "
-           << "\n";
-        ss << "        arbitrary sequence of dot separated names, while the name is the snake "
-           << "\n";
-        ss << "        case string after the last dot of the full name)"
-           << "\n";
+        ss << "    Rule Full Name: the full name of the rule, as dot separated, snake lower case string. " << "\n";
+        ss << "        The full name of a rule is composed by the rule set, a categorization for the rule, " << "\n";
+        ss << "        and the rule name, a unique string inside the categorization. " << "\n";
+        ss << "        The rule set can be nested (meaning that can be defined as an " << "\n";
+        ss << "        arbitrary sequence of dot separated names, while the name is the snake " << "\n";
+        ss << "        case string after the last dot of the full name)" << "\n";
 
         ss << "\n" << BASIC_SEPARATOR_LINE << "\n";
 
@@ -511,21 +502,19 @@ void PrintExtendedInformationIntoStream(cIssue *issue, std::stringstream *ssStre
             if ((*extIt)->IsType<cFileLocation *>())
             {
                 cFileLocation *fileLoc = (cFileLocation *)(*extIt);
-                *ssStream << "\n                    "
-                          << "   File: row=" << fileLoc->GetRow() << " column=" << fileLoc->GetColumn();
+                *ssStream << "\n                    " << "   File: row=" << fileLoc->GetRow()
+                          << " column=" << fileLoc->GetColumn();
             }
             else if ((*extIt)->IsType<cXMLLocation *>())
             {
                 cXMLLocation *xmlLoc = (cXMLLocation *)(*extIt);
-                *ssStream << "\n                    "
-                          << "   XPath: " << xmlLoc->GetXPath();
+                *ssStream << "\n                    " << "   XPath: " << xmlLoc->GetXPath();
             }
             else if ((*extIt)->IsType<cInertialLocation *>())
             {
                 cInertialLocation *inertialLoc = (cInertialLocation *)(*extIt);
-                *ssStream << "\n                    "
-                          << "   Location: x=" << inertialLoc->GetX() << " y=" << inertialLoc->GetY()
-                          << " z=" << inertialLoc->GetZ();
+                *ssStream << "\n                    " << "   Location: x=" << inertialLoc->GetX()
+                          << " y=" << inertialLoc->GetY() << " z=" << inertialLoc->GetZ();
             }
         }
     }
diff --git a/src/report_modules/report_module_text/src/report_format_text.h b/src/report_modules/report_module_text/src/report_format_text.h
index 54eb7cbc..1b0928a6 100644
--- a/src/report_modules/report_module_text/src/report_format_text.h
+++ b/src/report_modules/report_module_text/src/report_format_text.h
@@ -1,5 +1,7 @@
+// SPDX-License-Identifier: MPL-2.0
 /*
  * Copyright 2023 CARIAD SE.
+ * Copyright 2024 ASAM e.V.
  *
  * This Source Code Form is subject to the terms of the Mozilla
  * Public License, v. 2.0. If a copy of the MPL was not distributed
diff --git a/src/report_modules/report_module_text/src/stdafx.cpp b/src/report_modules/report_module_text/src/stdafx.cpp
index 75048a9a..af860174 100644
--- a/src/report_modules/report_module_text/src/stdafx.cpp
+++ b/src/report_modules/report_module_text/src/stdafx.cpp
@@ -1,5 +1,7 @@
+// SPDX-License-Identifier: MPL-2.0
 /*
  * Copyright 2023 CARIAD SE.
+ * Copyright 2024 ASAM e.V.
  *
  * This Source Code Form is subject to the terms of the Mozilla
  * Public License, v. 2.0. If a copy of the MPL was not distributed
diff --git a/src/report_modules/report_module_text/src/stdafx.h b/src/report_modules/report_module_text/src/stdafx.h
index 80bf8468..780ae67d 100644
--- a/src/report_modules/report_module_text/src/stdafx.h
+++ b/src/report_modules/report_module_text/src/stdafx.h
@@ -1,5 +1,7 @@
+// SPDX-License-Identifier: MPL-2.0
 /*
  * Copyright 2023 CARIAD SE.
+ * Copyright 2024 ASAM e.V.
  *
  * This Source Code Form is subject to the terms of the Mozilla
  * Public License, v. 2.0. If a copy of the MPL was not distributed
diff --git a/src/result_pooling/CMakeLists.txt b/src/result_pooling/CMakeLists.txt
index 5ca662a8..c1dc951b 100644
--- a/src/result_pooling/CMakeLists.txt
+++ b/src/result_pooling/CMakeLists.txt
@@ -1,4 +1,6 @@
+# SPDX-License-Identifier: MPL-2.0
 # Copyright 2023 CARIAD SE.
+# Copyright 2024 ASAM e.V.
 #
 # This Source Code Form is subject to the terms of the Mozilla
 # Public License, v. 2.0. If a copy of the MPL was not distributed
diff --git a/src/result_pooling/src/result_pooling.cpp b/src/result_pooling/src/result_pooling.cpp
index 073a09a4..b00c3e61 100644
--- a/src/result_pooling/src/result_pooling.cpp
+++ b/src/result_pooling/src/result_pooling.cpp
@@ -1,5 +1,7 @@
+// SPDX-License-Identifier: MPL-2.0
 /*
  * Copyright 2023 CARIAD SE.
+ * Copyright 2024 ASAM e.V.
  *
  * This Source Code Form is subject to the terms of the Mozilla
  * Public License, v. 2.0. If a copy of the MPL was not distributed
diff --git a/src/result_pooling/src/result_pooling.h b/src/result_pooling/src/result_pooling.h
index 456fe23e..c673c365 100644
--- a/src/result_pooling/src/result_pooling.h
+++ b/src/result_pooling/src/result_pooling.h
@@ -1,5 +1,7 @@
+// SPDX-License-Identifier: MPL-2.0
 /*
  * Copyright 2023 CARIAD SE.
+ * Copyright 2024 ASAM e.V.
  *
  * This Source Code Form is subject to the terms of the Mozilla
  * Public License, v. 2.0. If a copy of the MPL was not distributed
diff --git a/src/result_pooling/src/stdafx.cpp b/src/result_pooling/src/stdafx.cpp
index 75048a9a..af860174 100644
--- a/src/result_pooling/src/stdafx.cpp
+++ b/src/result_pooling/src/stdafx.cpp
@@ -1,5 +1,7 @@
+// SPDX-License-Identifier: MPL-2.0
 /*
  * Copyright 2023 CARIAD SE.
+ * Copyright 2024 ASAM e.V.
  *
  * This Source Code Form is subject to the terms of the Mozilla
  * Public License, v. 2.0. If a copy of the MPL was not distributed
diff --git a/src/result_pooling/src/stdafx.h b/src/result_pooling/src/stdafx.h
index 80bf8468..780ae67d 100644
--- a/src/result_pooling/src/stdafx.h
+++ b/src/result_pooling/src/stdafx.h
@@ -1,5 +1,7 @@
+// SPDX-License-Identifier: MPL-2.0
 /*
  * Copyright 2023 CARIAD SE.
+ * Copyright 2024 ASAM e.V.
  *
  * This Source Code Form is subject to the terms of the Mozilla
  * Public License, v. 2.0. If a copy of the MPL was not distributed
diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
index 2168c10a..08c33915 100644
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -1,4 +1,6 @@
+# SPDX-License-Identifier: MPL-2.0
 # Copyright 2023 CARIAD SE.
+# Copyright 2024 ASAM e.V.
 #
 # This Source Code Form is subject to the terms of the Mozilla
 # Public License, v. 2.0. If a copy of the MPL was not distributed
diff --git a/test/function/CMakeLists.txt b/test/function/CMakeLists.txt
index d5291155..d22934c2 100644
--- a/test/function/CMakeLists.txt
+++ b/test/function/CMakeLists.txt
@@ -1,4 +1,6 @@
+# SPDX-License-Identifier: MPL-2.0
 # Copyright 2023 CARIAD SE.
+# Copyright 2024 ASAM e.V.
 #
 # This Source Code Form is subject to the terms of the Mozilla
 # Public License, v. 2.0. If a copy of the MPL was not distributed
diff --git a/test/function/_common/helper.cpp b/test/function/_common/helper.cpp
index 0a325d5f..3b54c356 100644
--- a/test/function/_common/helper.cpp
+++ b/test/function/_common/helper.cpp
@@ -1,5 +1,7 @@
+// SPDX-License-Identifier: MPL-2.0
 /*
  * Copyright 2023 CARIAD SE.
+ * Copyright 2024 ASAM e.V.
  *
  * This Source Code Form is subject to the terms of the Mozilla
  * Public License, v. 2.0. If a copy of the MPL was not distributed
diff --git a/test/function/_common/helper.h b/test/function/_common/helper.h
index 1efd7f88..8d77df91 100644
--- a/test/function/_common/helper.h
+++ b/test/function/_common/helper.h
@@ -1,5 +1,7 @@
+// SPDX-License-Identifier: MPL-2.0
 /*
  * Copyright 2023 CARIAD SE.
+ * Copyright 2024 ASAM e.V.
  *
  * This Source Code Form is subject to the terms of the Mozilla
  * Public License, v. 2.0. If a copy of the MPL was not distributed
diff --git a/test/function/_common/qc4openx_errors.h b/test/function/_common/qc4openx_errors.h
index dc3ab3ea..a0dfe584 100644
--- a/test/function/_common/qc4openx_errors.h
+++ b/test/function/_common/qc4openx_errors.h
@@ -1,5 +1,7 @@
+// SPDX-License-Identifier: MPL-2.0
 /*
  * Copyright 2023 CARIAD SE.
+ * Copyright 2024 ASAM e.V.
  *
  * This Source Code Form is subject to the terms of the Mozilla
  * Public License, v. 2.0. If a copy of the MPL was not distributed
diff --git a/test/function/_common/qc4openx_filesystem.h b/test/function/_common/qc4openx_filesystem.h
index f82be48d..0854de99 100644
--- a/test/function/_common/qc4openx_filesystem.h
+++ b/test/function/_common/qc4openx_filesystem.h
@@ -1,5 +1,7 @@
+// SPDX-License-Identifier: MPL-2.0
 /**
  * Copyright 2023 CARIAD SE.
+ * Copyright 2024 ASAM e.V.
  *
  * This Source Code Form is subject to the terms of the Mozilla
  * Public License, v. 2.0. If a copy of the MPL was not distributed
diff --git a/test/function/examples/CMakeLists.txt b/test/function/examples/CMakeLists.txt
index 99fadb54..99d8ce4f 100644
--- a/test/function/examples/CMakeLists.txt
+++ b/test/function/examples/CMakeLists.txt
@@ -1,4 +1,6 @@
+# SPDX-License-Identifier: MPL-2.0
 # Copyright 2023 CARIAD SE.
+# Copyright 2024 ASAM e.V.
 #
 # This Source Code Form is subject to the terms of the Mozilla
 # Public License, v. 2.0. If a copy of the MPL was not distributed
diff --git a/test/function/examples/example_checker_bundle/src/CMakeLists.txt b/test/function/examples/example_checker_bundle/src/CMakeLists.txt
index 3248b889..e65296ad 100644
--- a/test/function/examples/example_checker_bundle/src/CMakeLists.txt
+++ b/test/function/examples/example_checker_bundle/src/CMakeLists.txt
@@ -1,4 +1,6 @@
+# SPDX-License-Identifier: MPL-2.0
 # Copyright 2023 CARIAD SE.
+# Copyright 2024 ASAM e.V.
 #
 # This Source Code Form is subject to the terms of the Mozilla
 # Public License, v. 2.0. If a copy of the MPL was not distributed
diff --git a/test/function/examples/example_checker_bundle/src/example_checker_bundle_tester.cpp b/test/function/examples/example_checker_bundle/src/example_checker_bundle_tester.cpp
index 57478c75..bb13795c 100644
--- a/test/function/examples/example_checker_bundle/src/example_checker_bundle_tester.cpp
+++ b/test/function/examples/example_checker_bundle/src/example_checker_bundle_tester.cpp
@@ -1,5 +1,7 @@
+// SPDX-License-Identifier: MPL-2.0
 /*
  * Copyright 2023 CARIAD SE.
+ * Copyright 2024 ASAM e.V.
  *
  * This Source Code Form is subject to the terms of the Mozilla
  * Public License, v. 2.0. If a copy of the MPL was not distributed
diff --git a/test/function/report_modules/CMakeLists.txt b/test/function/report_modules/CMakeLists.txt
index 457923ee..665d7618 100644
--- a/test/function/report_modules/CMakeLists.txt
+++ b/test/function/report_modules/CMakeLists.txt
@@ -1,4 +1,6 @@
+# SPDX-License-Identifier: MPL-2.0
 # Copyright 2023 CARIAD SE.
+# Copyright 2024 ASAM e.V.
 #
 # This Source Code Form is subject to the terms of the Mozilla
 # Public License, v. 2.0. If a copy of the MPL was not distributed
diff --git a/test/function/report_modules/report_module_gui/src/CMakeLists.txt b/test/function/report_modules/report_module_gui/src/CMakeLists.txt
index 0a9e129f..24889a26 100644
--- a/test/function/report_modules/report_module_gui/src/CMakeLists.txt
+++ b/test/function/report_modules/report_module_gui/src/CMakeLists.txt
@@ -1,4 +1,6 @@
+# SPDX-License-Identifier: MPL-2.0
 # Copyright 2023 CARIAD SE.
+# Copyright 2024 ASAM e.V.
 #
 # This Source Code Form is subject to the terms of the Mozilla
 # Public License, v. 2.0. If a copy of the MPL was not distributed
diff --git a/test/function/report_modules/report_module_gui/src/report_module_gui_tester.cpp b/test/function/report_modules/report_module_gui/src/report_module_gui_tester.cpp
index 7ea02485..456e4a82 100644
--- a/test/function/report_modules/report_module_gui/src/report_module_gui_tester.cpp
+++ b/test/function/report_modules/report_module_gui/src/report_module_gui_tester.cpp
@@ -1,5 +1,7 @@
+// SPDX-License-Identifier: MPL-2.0
 /*
  * Copyright 2023 CARIAD SE.
+ * Copyright 2024 ASAM e.V.
  *
  * This Source Code Form is subject to the terms of the Mozilla
  * Public License, v. 2.0. If a copy of the MPL was not distributed
diff --git a/test/function/report_modules/report_module_text/src/CMakeLists.txt b/test/function/report_modules/report_module_text/src/CMakeLists.txt
index ab0f3006..6ca43de1 100644
--- a/test/function/report_modules/report_module_text/src/CMakeLists.txt
+++ b/test/function/report_modules/report_module_text/src/CMakeLists.txt
@@ -1,4 +1,6 @@
+# SPDX-License-Identifier: MPL-2.0
 # Copyright 2023 CARIAD SE.
+# Copyright 2024 ASAM e.V.
 #
 # This Source Code Form is subject to the terms of the Mozilla
 # Public License, v. 2.0. If a copy of the MPL was not distributed
diff --git a/test/function/report_modules/report_module_text/src/report_module_text_tester.cpp b/test/function/report_modules/report_module_text/src/report_module_text_tester.cpp
index a214740a..58ce4c41 100644
--- a/test/function/report_modules/report_module_text/src/report_module_text_tester.cpp
+++ b/test/function/report_modules/report_module_text/src/report_module_text_tester.cpp
@@ -1,5 +1,7 @@
+// SPDX-License-Identifier: MPL-2.0
 /*
  * Copyright 2023 CARIAD SE.
+ * Copyright 2024 ASAM e.V.
  *
  * This Source Code Form is subject to the terms of the Mozilla
  * Public License, v. 2.0. If a copy of the MPL was not distributed
diff --git a/test/function/result_format/src/CMakeLists.txt b/test/function/result_format/src/CMakeLists.txt
index 757d48b7..33fa2f67 100644
--- a/test/function/result_format/src/CMakeLists.txt
+++ b/test/function/result_format/src/CMakeLists.txt
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: MPL-2.0
 # Copyright 2024, ASAM e.V.
 # This Source Code Form is subject to the terms of the Mozilla
 # Public License, v. 2.0. If a copy of the MPL was not distributed
diff --git a/test/function/result_format/src/result_format_tester.cpp b/test/function/result_format/src/result_format_tester.cpp
index 6dd5df7c..b31cfc11 100644
--- a/test/function/result_format/src/result_format_tester.cpp
+++ b/test/function/result_format/src/result_format_tester.cpp
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: MPL-2.0
 /**
  * Copyright 2024, ASAM e.V.
  *
diff --git a/test/function/result_pooling/src/CMakeLists.txt b/test/function/result_pooling/src/CMakeLists.txt
index 38db4805..44e241af 100644
--- a/test/function/result_pooling/src/CMakeLists.txt
+++ b/test/function/result_pooling/src/CMakeLists.txt
@@ -1,4 +1,6 @@
+# SPDX-License-Identifier: MPL-2.0
 # Copyright 2023 CARIAD SE.
+# Copyright 2024 ASAM e.V.
 #
 # This Source Code Form is subject to the terms of the Mozilla
 # Public License, v. 2.0. If a copy of the MPL was not distributed
diff --git a/test/function/result_pooling/src/result_pooling_tester.cpp b/test/function/result_pooling/src/result_pooling_tester.cpp
index 02f70dbc..216b0957 100644
--- a/test/function/result_pooling/src/result_pooling_tester.cpp
+++ b/test/function/result_pooling/src/result_pooling_tester.cpp
@@ -1,5 +1,7 @@
+// SPDX-License-Identifier: MPL-2.0
 /*
  * Copyright 2023 CARIAD SE.
+ * Copyright 2024 ASAM e.V.
  *
  * This Source Code Form is subject to the terms of the Mozilla
  * Public License, v. 2.0. If a copy of the MPL was not distributed
diff --git a/test/stimuli/CMakeLists.txt b/test/stimuli/CMakeLists.txt
index 807b1127..c6cddc51 100644
--- a/test/stimuli/CMakeLists.txt
+++ b/test/stimuli/CMakeLists.txt
@@ -1,4 +1,6 @@
+# SPDX-License-Identifier: MPL-2.0
 # Copyright 2023 CARIAD SE.
+# Copyright 2024 ASAM e.V.
 #
 # This Source Code Form is subject to the terms of the Mozilla
 # Public License, v. 2.0. If a copy of the MPL was not distributed