diff --git a/arch/tricore/src/cmake/ToolchainGnuc.cmake b/arch/tricore/src/cmake/ToolchainGnuc.cmake
index d715bbb7abe..1469817b367 100644
--- a/arch/tricore/src/cmake/ToolchainGnuc.cmake
+++ b/arch/tricore/src/cmake/ToolchainGnuc.cmake
@@ -1,5 +1,5 @@
 # ##############################################################################
-# arch/tricore/src/cmake/Toolchain.cmake
+# arch/tricore/src/cmake/ToolchainGnuc.cmake
 #
 # SPDX-License-Identifier: Apache-2.0
 #
diff --git a/arch/tricore/src/cmake/ToolchainTasking.cmake b/arch/tricore/src/cmake/ToolchainTasking.cmake
index 610fa31bf79..e035017274f 100644
--- a/arch/tricore/src/cmake/ToolchainTasking.cmake
+++ b/arch/tricore/src/cmake/ToolchainTasking.cmake
@@ -1,5 +1,5 @@
 # ##############################################################################
-# arch/tricore/src/cmake/Toolchain.cmake
+# arch/tricore/src/cmake/ToolchainTasking.cmake
 #
 # SPDX-License-Identifier: Apache-2.0
 #
diff --git a/boards/arm/csk6/csk6011a-nano/src/Makefile b/boards/arm/csk6/csk6011a-nano/src/Makefile
index 59ffcb7c347..ccece7f7ad2 100644
--- a/boards/arm/csk6/csk6011a-nano/src/Makefile
+++ b/boards/arm/csk6/csk6011a-nano/src/Makefile
@@ -1,5 +1,5 @@
 ############################################################################
-# boards/arm/csk6011a/csk6011a-nano/src/Makefile
+# boards/arm/csk6/csk6011a-nano/src/Makefile
 #
 # SPDX-License-Identifier: Apache-2.0
 #
diff --git a/boards/arm/imx9/imx95-evk/scripts/Make.defs b/boards/arm/imx9/imx95-evk/scripts/Make.defs
index d4591a9eb92..a88c3e0b6b3 100644
--- a/boards/arm/imx9/imx95-evk/scripts/Make.defs
+++ b/boards/arm/imx9/imx95-evk/scripts/Make.defs
@@ -1,5 +1,5 @@
 ############################################################################
-# boards/arm/imx95/imx95-evk/scripts/Make.defs
+# boards/arm/imx9/imx95-evk/scripts/Make.defs
 #
 # SPDX-License-Identifier: Apache-2.0
 # SPDX-FileCopyrightText: 2024 NXP
diff --git a/boards/arm/imx9/imx95-evk/src/Makefile b/boards/arm/imx9/imx95-evk/src/Makefile
index 61503904188..ad36c4085c2 100644
--- a/boards/arm/imx9/imx95-evk/src/Makefile
+++ b/boards/arm/imx9/imx95-evk/src/Makefile
@@ -1,5 +1,5 @@
 ############################################################################
-# boards/arm/imx95/imx95-evk/src/Makefile
+# boards/arm/imx9/imx95-evk/src/Makefile
 #
 # SPDX-License-Identifier: Apache-2.0
 # SPDX-FileCopyrightText: 2024 NXP
diff --git a/libs/libc/machine/x86_64/gnu/CMakeLists.txt b/libs/libc/machine/x86_64/gnu/CMakeLists.txt
index 9c4ab0431b3..7d0715d9a2d 100644
--- a/libs/libc/machine/x86_64/gnu/CMakeLists.txt
+++ b/libs/libc/machine/x86_64/gnu/CMakeLists.txt
@@ -1,5 +1,5 @@
 # ##############################################################################
-# libs/libc/machine/X86_64/gnu/CMakeLists.txt
+# libs/libc/machine/x86_64/gnu/CMakeLists.txt
 #
 # SPDX-License-Identifier: Apache-2.0
 #
diff --git a/libs/libxx/uClibc++/system_configuration.h b/libs/libxx/uClibc++/system_configuration.h
index 9f560ff8047..11c246dc9ba 100644
--- a/libs/libxx/uClibc++/system_configuration.h
+++ b/libs/libxx/uClibc++/system_configuration.h
@@ -1,8 +1,8 @@
 /****************************************************************************
- * libs/libxx/system_configuration.h
+ * libs/libxx/uClibc++/system_configuration.h
+ *
+ * SPDX-License-Identifier: Apache-2.0
  *
-# SPDX-License-Identifier: Apache-2.0
-#
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
  * this work for additional information regarding copyright ownership.  The