diff --git a/boards/arm/stm32/stm32f401rc-rs485/src/Make.defs b/boards/arm/stm32/stm32f401rc-rs485/src/Make.defs
index 5eff56f7be..3deb39c3b9 100644
--- a/boards/arm/stm32/stm32f401rc-rs485/src/Make.defs
+++ b/boards/arm/stm32/stm32f401rc-rs485/src/Make.defs
@@ -1,5 +1,5 @@
 ############################################################################
-# boards/arm/stm32/smt32f401rc-rs485/src/Make.defs
+# boards/arm/stm32/stm32f401rc-rs485/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/stm32f7/nucleo-144/configs/f722-can/Make.defs b/boards/arm/stm32f7/nucleo-144/configs/f722-can/Make.defs
index 1978eced60..d8197ae04d 100644
--- a/boards/arm/stm32f7/nucleo-144/configs/f722-can/Make.defs
+++ b/boards/arm/stm32f7/nucleo-144/configs/f722-can/Make.defs
@@ -1,5 +1,5 @@
 ############################################################################
-# boards/arm/stm32f7/nucleo-144/configs/f746-can/Make.defs
+# boards/arm/stm32f7/nucleo-144/configs/f722-can/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/stm32f7/nucleo-144/configs/f722-cansock/Make.defs b/boards/arm/stm32f7/nucleo-144/configs/f722-cansock/Make.defs
index cf600c7fa1..7f82a0478f 100644
--- a/boards/arm/stm32f7/nucleo-144/configs/f722-cansock/Make.defs
+++ b/boards/arm/stm32f7/nucleo-144/configs/f722-cansock/Make.defs
@@ -1,5 +1,5 @@
 ############################################################################
-# boards/arm/stm32f7/nucleo-144/configs/f746-cansock/Make.defs
+# boards/arm/stm32f7/nucleo-144/configs/f722-cansock/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/stm32h7/nucleo-h743zi2/src/Makefile b/boards/arm/stm32h7/nucleo-h743zi2/src/Makefile
index 34f044927a..6decb4738f 100644
--- a/boards/arm/stm32h7/nucleo-h743zi2/src/Makefile
+++ b/boards/arm/stm32h7/nucleo-h743zi2/src/Makefile
@@ -1,5 +1,5 @@
 ############################################################################
-# boards/arm/stm32h7/nucleo-h743zi/src/Makefile
+# boards/arm/stm32h7/nucleo-h743zi2/src/Makefile
 #
 # 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/nucleo-u5a5zj-q/scripts/Make.defs b/boards/arm/stm32u5/nucleo-u5a5zj-q/scripts/Make.defs
index c368f3902b..9476b26687 100644
--- a/boards/arm/stm32u5/nucleo-u5a5zj-q/scripts/Make.defs
+++ b/boards/arm/stm32u5/nucleo-u5a5zj-q/scripts/Make.defs
@@ -1,5 +1,5 @@
 ##############################################################################
-# boards/arm/stm32u5/b-u585i-iot02a/scripts/Make.defs
+# boards/arm/stm32u5/nucleo-u5a5zj-q/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/arm64/imx8/imx8qm-mek/src/Makefile b/boards/arm64/imx8/imx8qm-mek/src/Makefile
index 7c5990d74f..3c1c8afa97 100644
--- a/boards/arm64/imx8/imx8qm-mek/src/Makefile
+++ b/boards/arm64/imx8/imx8qm-mek/src/Makefile
@@ -1,5 +1,5 @@
 ############################################################################
-# boards/arm/imx6/sabre-6quad/src/Makefile
+# boards/arm64/imx8/imx8qm-mek/src/Makefile
 #
 # Licensed to the Apache Software Foundation (ASF) under one or more
 # contributor license agreements.  See the NOTICE file distributed with
diff --git a/boards/arm64/imx9/imx93-evk/src/Makefile b/boards/arm64/imx9/imx93-evk/src/Makefile
index 13b8bf445a..fc2ce19a0c 100644
--- a/boards/arm64/imx9/imx93-evk/src/Makefile
+++ b/boards/arm64/imx9/imx93-evk/src/Makefile
@@ -1,5 +1,5 @@
 ############################################################################
-# boards/arm64/imx9/emx93-evk/src/Makefile
+# boards/arm64/imx9/imx93-evk/src/Makefile
 #
 # Licensed to the Apache Software Foundation (ASF) under one or more
 # contributor license agreements.  See the NOTICE file distributed with
diff --git a/boards/arm64/rk3399/pinephonepro/src/Makefile b/boards/arm64/rk3399/pinephonepro/src/Makefile
index 376c850d4d..c8d544bbc4 100644
--- a/boards/arm64/rk3399/pinephonepro/src/Makefile
+++ b/boards/arm64/rk3399/pinephonepro/src/Makefile
@@ -1,5 +1,5 @@
 ############################################################################
-# boards/arm64/a64/pinephone/src/Makefile
+# boards/arm64/rk3399/pinephonepro/src/Makefile
 #
 # Licensed to the Apache Software Foundation (ASF) under one or more
 # contributor license agreements.  See the NOTICE file distributed with
diff --git a/boards/risc-v/esp32c3-legacy/common/kernel/Makefile b/boards/risc-v/esp32c3-legacy/common/kernel/Makefile
index f3a2d84b0f..340b2d8790 100644
--- a/boards/risc-v/esp32c3-legacy/common/kernel/Makefile
+++ b/boards/risc-v/esp32c3-legacy/common/kernel/Makefile
@@ -1,5 +1,5 @@
 ############################################################################
-# boards/risc-v/esp32c3-legacy/esp32c3-devkit/kernel/Makefile
+# boards/risc-v/esp32c3-legacy/common/kernel/Makefile
 #
 # Licensed to the Apache Software Foundation (ASF) under one or more
 # contributor license agreements.  See the NOTICE file distributed with
diff --git a/boards/risc-v/esp32c3-legacy/esp32c3-devkit-rust-1/src/Make.defs b/boards/risc-v/esp32c3-legacy/esp32c3-devkit-rust-1/src/Make.defs
index 64711f659b..ab11c05ed2 100644
--- a/boards/risc-v/esp32c3-legacy/esp32c3-devkit-rust-1/src/Make.defs
+++ b/boards/risc-v/esp32c3-legacy/esp32c3-devkit-rust-1/src/Make.defs
@@ -1,5 +1,5 @@
 #############################################################################
-# boards/risc-v/esp32c3-legacy/esp32c3-devkit-rust-1/src/Makefile
+# boards/risc-v/esp32c3-legacy/esp32c3-devkit-rust-1/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/risc-v/esp32c3-legacy/esp32c3-devkit/src/Make.defs b/boards/risc-v/esp32c3-legacy/esp32c3-devkit/src/Make.defs
index 854d2652f3..92dcab25f9 100644
--- a/boards/risc-v/esp32c3-legacy/esp32c3-devkit/src/Make.defs
+++ b/boards/risc-v/esp32c3-legacy/esp32c3-devkit/src/Make.defs
@@ -1,5 +1,5 @@
 #############################################################################
-# boards/risc-v/esp32c3-legacy/esp32c3-devkit/src/Makefile
+# boards/risc-v/esp32c3-legacy/esp32c3-devkit/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/risc-v/esp32h2/esp32h2-devkit/scripts/Make.defs b/boards/risc-v/esp32h2/esp32h2-devkit/scripts/Make.defs
index bfd78f79ac..eb5773bfae 100644
--- a/boards/risc-v/esp32h2/esp32h2-devkit/scripts/Make.defs
+++ b/boards/risc-v/esp32h2/esp32h2-devkit/scripts/Make.defs
@@ -1,5 +1,5 @@
 ############################################################################
-# boards/risc-v/esp32h2/esp32h2-generic/scripts/Make.defs
+# boards/risc-v/esp32h2/esp32h2-devkit/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/risc-v/esp32h2/esp32h2-devkit/src/Make.defs b/boards/risc-v/esp32h2/esp32h2-devkit/src/Make.defs
index 48538c5362..66102c2e47 100644
--- a/boards/risc-v/esp32h2/esp32h2-devkit/src/Make.defs
+++ b/boards/risc-v/esp32h2/esp32h2-devkit/src/Make.defs
@@ -1,5 +1,5 @@
 #############################################################################
-# boards/risc-v/esp32h2/esp32h2-generic/src/Make.defs
+# boards/risc-v/esp32h2/esp32h2-devkit/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/risc-v/hpm6000/hpm6360evk/scripts/Make.defs b/boards/risc-v/hpm6000/hpm6360evk/scripts/Make.defs
index 10271ede91..a57179aa6f 100644
--- a/boards/risc-v/hpm6000/hpm6360evk/scripts/Make.defs
+++ b/boards/risc-v/hpm6000/hpm6360evk/scripts/Make.defs
@@ -1,5 +1,5 @@
 ############################################################################
-# boards/risc-v/hpm6750/hpm6750evk2/scripts/Make.defs
+# boards/risc-v/hpm6000/hpm6360evk/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/risc-v/hpm6000/hpm6360evk/src/Makefile b/boards/risc-v/hpm6000/hpm6360evk/src/Makefile
index f36a503843..0ed94a7ed7 100644
--- a/boards/risc-v/hpm6000/hpm6360evk/src/Makefile
+++ b/boards/risc-v/hpm6000/hpm6360evk/src/Makefile
@@ -1,5 +1,5 @@
 ############################################################################
-# boards/risc-v/hpm6750/hpm6750evk2/src/Makefile
+# boards/risc-v/hpm6000/hpm6360evk/src/Makefile
 #
 # Licensed to the Apache Software Foundation (ASF) under one or more
 # contributor license agreements.  See the NOTICE file distributed with
diff --git a/boards/sparc/s698pm/s698pm-dkit/scripts/Make.defs b/boards/sparc/s698pm/s698pm-dkit/scripts/Make.defs
index 45f2dc1244..c42a985bb3 100644
--- a/boards/sparc/s698pm/s698pm-dkit/scripts/Make.defs
+++ b/boards/sparc/s698pm/s698pm-dkit/scripts/Make.defs
@@ -1,5 +1,5 @@
 ############################################################################
-# boards/sparc/s698pm/s698pm_dkit/scripts/Make.defs
+# boards/sparc/s698pm/s698pm-dkit/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/xtensa/esp32/lilygo_tbeam_lora_gps/scripts/Make.defs b/boards/xtensa/esp32/lilygo_tbeam_lora_gps/scripts/Make.defs
index cac88f8f74..b85e6a7196 100644
--- a/boards/xtensa/esp32/lilygo_tbeam_lora_gps/scripts/Make.defs
+++ b/boards/xtensa/esp32/lilygo_tbeam_lora_gps/scripts/Make.defs
@@ -1,5 +1,5 @@
 ############################################################################
-# boards/xtensa/esp32/ttgo_lora_esp32/scripts/Make.defs
+# boards/xtensa/esp32/lilygo_tbeam_lora_gps/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/xtensa/esp32/lilygo_tbeam_lora_gps/src/Make.defs b/boards/xtensa/esp32/lilygo_tbeam_lora_gps/src/Make.defs
index 9c57b91e10..9852cc7b3f 100644
--- a/boards/xtensa/esp32/lilygo_tbeam_lora_gps/src/Make.defs
+++ b/boards/xtensa/esp32/lilygo_tbeam_lora_gps/src/Make.defs
@@ -1,5 +1,5 @@
 ############################################################################
-# boards/xtensa/esp32/ttgo_lora_esp32/src/Make.defs
+# boards/xtensa/esp32/lilygo_tbeam_lora_gps/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/xtensa/esp32s2/esp32s2-saola-1/scripts/Make.defs b/boards/xtensa/esp32s2/esp32s2-saola-1/scripts/Make.defs
index dbcc0add21..f4386876f5 100644
--- a/boards/xtensa/esp32s2/esp32s2-saola-1/scripts/Make.defs
+++ b/boards/xtensa/esp32s2/esp32s2-saola-1/scripts/Make.defs
@@ -1,5 +1,5 @@
 ############################################################################
-# boards/xtensa/esp32s2/esp32s2-devkitc/scripts/Make.defs
+# boards/xtensa/esp32s2/esp32s2-saola-1/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/xtensa/esp32s3/common/kernel/Makefile b/boards/xtensa/esp32s3/common/kernel/Makefile
index 05a0355e19..676bebe804 100644
--- a/boards/xtensa/esp32s3/common/kernel/Makefile
+++ b/boards/xtensa/esp32s3/common/kernel/Makefile
@@ -1,5 +1,5 @@
 ############################################################################
-# boards/xtensa/esp32s3/esp32s3-devkit/kernel/Makefile
+# boards/xtensa/esp32s3/common/kernel/Makefile
 #
 # Licensed to the Apache Software Foundation (ASF) under one or more
 # contributor license agreements.  See the NOTICE file distributed with
diff --git a/drivers/rpmsg/Make.defs b/drivers/rpmsg/Make.defs
index 1d5a52e874..64595ca252 100644
--- a/drivers/rpmsg/Make.defs
+++ b/drivers/rpmsg/Make.defs
@@ -1,5 +1,5 @@
 ############################################################################
-# drivers/rptun/Make.defs
+# drivers/rpmsg/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/libs/libc/machine/arm64/Make.defs b/libs/libc/machine/arm64/Make.defs
index f4ff27d46e..c9c085d732 100644
--- a/libs/libc/machine/arm64/Make.defs
+++ b/libs/libc/machine/arm64/Make.defs
@@ -1,5 +1,5 @@
 ############################################################################
-# libs/libc/machine/ARM64/Make.defs
+# libs/libc/machine/arm64/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/libs/libm/openlibm/Make.defs b/libs/libm/openlibm/Make.defs
index 0517312e96..1494863f03 100644
--- a/libs/libm/openlibm/Make.defs
+++ b/libs/libm/openlibm/Make.defs
@@ -1,4 +1,3 @@
-
 ############################################################################
 # libs/libm/openlibm/Make.defs
 #