diff --git a/arch/arm/src/common/Toolchain.defs b/arch/arm/src/common/Toolchain.defs
index fb2b45ecf1e..f5c8c65fe1a 100644
--- a/arch/arm/src/common/Toolchain.defs
+++ b/arch/arm/src/common/Toolchain.defs
@@ -1,5 +1,5 @@
 ############################################################################
-# arch/arm/src/armv8-m/Toolchain.defs
+# arch/arm/src/common/Toolchain.defs
 #
 # Licensed to the Apache Software Foundation (ASF) under one or more
 # contributor license agreements.  See the NOTICE file distributed with
diff --git a/arch/arm/src/tlsr82/Make.defs b/arch/arm/src/tlsr82/Make.defs
index a300f2c1837..9ae20870550 100644
--- a/arch/arm/src/tlsr82/Make.defs
+++ b/arch/arm/src/tlsr82/Make.defs
@@ -1,5 +1,5 @@
 ############################################################################
-# arch/tc32/src/tlsr82/Make.defs
+# arch/arm/src/tlsr82/Make.defs
 #
 # Licensed to the Apache Software Foundation (ASF) under one or more
 # contributor license agreements.  See the NOTICE file distributed with
diff --git a/arch/risc-v/src/common/Make.defs b/arch/risc-v/src/common/Make.defs
index 0662395a9a4..e7d7940e691 100644
--- a/arch/risc-v/src/common/Make.defs
+++ b/arch/risc-v/src/common/Make.defs
@@ -1,5 +1,5 @@
 ############################################################################
-# nuttx/arch/risc-v/src/common/Make.defs
+# arch/risc-v/src/common/Make.defs
 #
 # Licensed to the Apache Software Foundation (ASF) under one or more
 # contributor license agreements.  See the NOTICE file distributed with
diff --git a/arch/sparc/src/sparc_v8/Toolchain.defs b/arch/sparc/src/sparc_v8/Toolchain.defs
index f47a43a4f9f..df20e561474 100644
--- a/arch/sparc/src/sparc_v8/Toolchain.defs
+++ b/arch/sparc/src/sparc_v8/Toolchain.defs
@@ -1,5 +1,5 @@
 ############################################################################
-# arch/sparc/src/sparc/Toolchain.defs
+# arch/sparc/src/sparc_v8/Toolchain.defs
 #
 # Licensed to the Apache Software Foundation (ASF) under one or more
 # contributor license agreements.  See the NOTICE file distributed with
diff --git a/arch/xtensa/src/common/Make.defs b/arch/xtensa/src/common/Make.defs
index 1b15e05aa5a..3685ae9f45e 100644
--- a/arch/xtensa/src/common/Make.defs
+++ b/arch/xtensa/src/common/Make.defs
@@ -1,5 +1,5 @@
 ############################################################################
-# nuttx/arch/xtensa/src/common/Make.defs
+# arch/xtensa/src/common/Make.defs
 #
 # Licensed to the Apache Software Foundation (ASF) under one or more
 # contributor license agreements.  See the NOTICE file distributed with
diff --git a/boards/arm/phy62xx/phy6222/scripts/Make.defs b/boards/arm/phy62xx/phy6222/scripts/Make.defs
index f37b3e96e14..5c57efbbe71 100644
--- a/boards/arm/phy62xx/phy6222/scripts/Make.defs
+++ b/boards/arm/phy62xx/phy6222/scripts/Make.defs
@@ -1,5 +1,5 @@
 ############################################################################
-# boards/arm/stm32f0l0g0/stm32f051-discovery/scripts/Make.defs
+# boards/arm/phy62xx/phy6222/scripts/Make.defs
 #
 # Licensed to the Apache Software Foundation (ASF) under one or more
 # contributor license agreements.  See the NOTICE file distributed with
diff --git a/boards/arm/stm32/b-g431b-esc1/src/Make.defs b/boards/arm/stm32/b-g431b-esc1/src/Make.defs
index c4f79a661fc..2b85d533f77 100644
--- a/boards/arm/stm32/b-g431b-esc1/src/Make.defs
+++ b/boards/arm/stm32/b-g431b-esc1/src/Make.defs
@@ -1,5 +1,5 @@
 ############################################################################
-# boards/arm/stm32/nucleo-g431rb/src/Make.defs
+# boards/arm/stm32/b-g431b-esc1/src/Make.defs
 #
 # Licensed to the Apache Software Foundation (ASF) under one or more
 # contributor license agreements.  See the NOTICE file distributed with
diff --git a/boards/arm/stm32l5/stm32l562e-dk/scripts/Make.defs b/boards/arm/stm32l5/stm32l562e-dk/scripts/Make.defs
index 2a7870ee7cf..e05f94968bc 100644
--- a/boards/arm/stm32l5/stm32l562e-dk/scripts/Make.defs
+++ b/boards/arm/stm32l5/stm32l562e-dk/scripts/Make.defs
@@ -1,5 +1,5 @@
 ##############################################################################
-# boards/arm/stm32l5/stm32l562e-dk-ns/scripts/Make.defs
+# boards/arm/stm32l5/stm32l562e-dk/scripts/Make.defs
 #
 # Licensed to the Apache Software Foundation (ASF) under one or more
 # contributor license agreements.  See the NOTICE file distributed with
diff --git a/boards/arm/stm32u5/b-u585i-iot02a/scripts/Make.defs b/boards/arm/stm32u5/b-u585i-iot02a/scripts/Make.defs
index 9af4047455b..c368f3902b2 100644
--- a/boards/arm/stm32u5/b-u585i-iot02a/scripts/Make.defs
+++ b/boards/arm/stm32u5/b-u585i-iot02a/scripts/Make.defs
@@ -1,5 +1,5 @@
 ##############################################################################
-# boards/arm/stm32u5/nucleo-l552ze/scripts/Make.defs
+# boards/arm/stm32u5/b-u585i-iot02a/scripts/Make.defs
 #
 # Licensed to the Apache Software Foundation (ASF) under one or more
 # contributor license agreements.  See the NOTICE file distributed with