diff --git a/arch/arm/src/fvp-v8r-aarch32/Make.defs b/arch/arm/src/fvp-v8r-aarch32/Make.defs
index f27c3aa36d..00030a2a88 100644
--- a/arch/arm/src/fvp-v8r-aarch32/Make.defs
+++ b/arch/arm/src/fvp-v8r-aarch32/Make.defs
@@ -1,5 +1,5 @@
 ############################################################################
-# arch/arm/src/fvp-v8r/Make.defs
+# arch/arm/src/fvp-v8r-aarch32/Make.defs
 #
 # Licensed to the Apache Software Foundation (ASF) under one or more
 # contributor license agreements.  See the NOTICE file distributed with
@@ -21,4 +21,4 @@
 include armv8-r/Make.defs
 
 # fvp-specific C source files
-CHIP_CSRCS  = fvp_boot.c fvp_serial.c
+CHIP_CSRCS = fvp_boot.c fvp_serial.c
diff --git a/arch/arm64/src/goldfish/Make.defs b/arch/arm64/src/goldfish/Make.defs
index fb50c61239..67bae71105 100644
--- a/arch/arm64/src/goldfish/Make.defs
+++ b/arch/arm64/src/goldfish/Make.defs
@@ -1,5 +1,5 @@
 ############################################################################
-# arch/arm64/src/qemu/Make.defs
+# arch/arm64/src/goldfish/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/avr/src/at32uc3/at32uc3b_pinmux.h b/arch/avr/src/at32uc3/at32uc3b_pinmux.h
index 4c5c51f50b..087bc0f5f7 100644
--- a/arch/avr/src/at32uc3/at32uc3b_pinmux.h
+++ b/arch/avr/src/at32uc3/at32uc3b_pinmux.h
@@ -1,5 +1,4 @@
 /****************************************************************************
-
  * arch/avr/src/at32uc3/at32uc3b_pinmux.h
  *
  * Licensed to the Apache Software Foundation (ASF) under one or more
diff --git a/boards/arm/at32/at32f437-mini/src/Makefile b/boards/arm/at32/at32f437-mini/src/Makefile
index 5361ac2129..c714d8ed9a 100644
--- a/boards/arm/at32/at32f437-mini/src/Makefile
+++ b/boards/arm/at32/at32f437-mini/src/Makefile
@@ -1,5 +1,5 @@
 ############################################################################
-# boards/arm/at32/at32f437-mini/src/Make.defs
+# boards/arm/at32/at32f437-mini/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/gd32f4/gd32f450zk-aiotbox/scripts/Make.defs b/boards/arm/gd32f4/gd32f450zk-aiotbox/scripts/Make.defs
index 347dcfd2d0..c890b87cc5 100644
--- a/boards/arm/gd32f4/gd32f450zk-aiotbox/scripts/Make.defs
+++ b/boards/arm/gd32f4/gd32f450zk-aiotbox/scripts/Make.defs
@@ -1,5 +1,5 @@
 ############################################################################
-# boards/arm/gd32f4/gd32f450zk-eval/scripts/Make.defs
+# boards/arm/gd32f4/gd32f450zk-aiotbox/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/gd32f4/gd32f450zk-aiotbox/src/Makefile b/boards/arm/gd32f4/gd32f450zk-aiotbox/src/Makefile
index a20313af23..14f92dd753 100644
--- a/boards/arm/gd32f4/gd32f450zk-aiotbox/src/Makefile
+++ b/boards/arm/gd32f4/gd32f450zk-aiotbox/src/Makefile
@@ -1,5 +1,5 @@
 ############################################################################
-# boards/arm/gd32f4/gd32f450zk-aiotbox/src/Make.defs
+# boards/arm/gd32f4/gd32f450zk-aiotbox/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/gd32f4/gd32f450zk-eval/src/Makefile b/boards/arm/gd32f4/gd32f450zk-eval/src/Makefile
index ffe587ebd6..78d608d6b2 100644
--- a/boards/arm/gd32f4/gd32f450zk-eval/src/Makefile
+++ b/boards/arm/gd32f4/gd32f450zk-eval/src/Makefile
@@ -1,5 +1,5 @@
 ############################################################################
-# boards/arm/gd32f4/gd32f450zk-eval/src/Make.defs
+# boards/arm/gd32f4/gd32f450zk-eval/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/gd32f4/gd32f470ik-eval/scripts/Make.defs b/boards/arm/gd32f4/gd32f470ik-eval/scripts/Make.defs
index 068515ee40..f0d61cb1d0 100644
--- a/boards/arm/gd32f4/gd32f470ik-eval/scripts/Make.defs
+++ b/boards/arm/gd32f4/gd32f470ik-eval/scripts/Make.defs
@@ -1,5 +1,5 @@
 ############################################################################
-# boards/arm/gd32f4/gd32f470zk-eval/scripts/Make.defs
+# boards/arm/gd32f4/gd32f470ik-eval/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/gd32f4/gd32f470ik-eval/src/Makefile b/boards/arm/gd32f4/gd32f470ik-eval/src/Makefile
index 32355d720c..21fd692512 100644
--- a/boards/arm/gd32f4/gd32f470ik-eval/src/Makefile
+++ b/boards/arm/gd32f4/gd32f470ik-eval/src/Makefile
@@ -1,5 +1,5 @@
 ############################################################################
-# boards/arm/gd32f4/gd32f470zk-eval/src/Make.defs
+# boards/arm/gd32f4/gd32f470zk-eval/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/gd32f4/gd32f470zk-aiotbox/scripts/Make.defs b/boards/arm/gd32f4/gd32f470zk-aiotbox/scripts/Make.defs
index 068515ee40..4c8edf0c30 100644
--- a/boards/arm/gd32f4/gd32f470zk-aiotbox/scripts/Make.defs
+++ b/boards/arm/gd32f4/gd32f470zk-aiotbox/scripts/Make.defs
@@ -1,5 +1,5 @@
 ############################################################################
-# boards/arm/gd32f4/gd32f470zk-eval/scripts/Make.defs
+# boards/arm/gd32f4/gd32f470zk-aiotbox/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/gd32f4/gd32f470zk-aiotbox/src/Makefile b/boards/arm/gd32f4/gd32f470zk-aiotbox/src/Makefile
index a8e28f8b1e..b3c71590d4 100644
--- a/boards/arm/gd32f4/gd32f470zk-aiotbox/src/Makefile
+++ b/boards/arm/gd32f4/gd32f470zk-aiotbox/src/Makefile
@@ -1,5 +1,5 @@
 ############################################################################
-# boards/arm/gd32f4/gd32f470zk-eval/src/Make.defs
+# boards/arm/gd32f4/gd32f470zk-aiotbox/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/imxrt/imxrt1064-evk/configs/knsh/Make.defs b/boards/arm/imxrt/imxrt1064-evk/configs/knsh/Make.defs
index 81d5f340ec..ae463b76ec 100644
--- a/boards/arm/imxrt/imxrt1064-evk/configs/knsh/Make.defs
+++ b/boards/arm/imxrt/imxrt1064-evk/configs/knsh/Make.defs
@@ -1,5 +1,5 @@
 ############################################################################
-# boards/arm/imxrt/imxrt1060-evk/configs/knsh/Make.defs
+# boards/arm/imxrt/imxrt1064-evk/configs/knsh/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/imxrt/imxrt1170-evk/configs/knsh/Make.defs b/boards/arm/imxrt/imxrt1170-evk/configs/knsh/Make.defs
index 81d5f340ec..cc76a9bf22 100644
--- a/boards/arm/imxrt/imxrt1170-evk/configs/knsh/Make.defs
+++ b/boards/arm/imxrt/imxrt1170-evk/configs/knsh/Make.defs
@@ -1,5 +1,5 @@
 ############################################################################
-# boards/arm/imxrt/imxrt1060-evk/configs/knsh/Make.defs
+# boards/arm/imxrt/imxrt1170-evk/configs/knsh/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/src/Makefile b/boards/arm/phy62xx/phy6222/src/Makefile
index 613f1e9e31..77a66b5df0 100644
--- a/boards/arm/phy62xx/phy6222/src/Makefile
+++ b/boards/arm/phy62xx/phy6222/src/Makefile
@@ -1,5 +1,5 @@
 ############################################################################
-# boards/arm/stm32f0l0g0/stm32f051-discovery/src/Makefile
+# boards/arm/phy62xx/phy6222/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/rp2040/raspberrypi-pico-w/src/Make.defs b/boards/arm/rp2040/raspberrypi-pico-w/src/Make.defs
index ab19f20657..c7e70ef9da 100644
--- a/boards/arm/rp2040/raspberrypi-pico-w/src/Make.defs
+++ b/boards/arm/rp2040/raspberrypi-pico-w/src/Make.defs
@@ -1,5 +1,5 @@
 ############################################################################
-# boards/arm/rp2040/raspberrypi-pico/src/Make.defs
+# boards/arm/rp2040/raspberrypi-pico-w/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/rp2040/waveshare-rp2040-lcd-1.28/scripts/Make.defs b/boards/arm/rp2040/waveshare-rp2040-lcd-1.28/scripts/Make.defs
index 1ed7684fca..76024c0da4 100644
--- a/boards/arm/rp2040/waveshare-rp2040-lcd-1.28/scripts/Make.defs
+++ b/boards/arm/rp2040/waveshare-rp2040-lcd-1.28/scripts/Make.defs
@@ -1,5 +1,5 @@
 ############################################################################
-# boards/arm/rp2040/raspberrypi-pico/scripts/Make.defs
+# boards/arm/rp2040/waveshare-rp2040-lcd-1.28/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/rp2040/waveshare-rp2040-lcd-1.28/src/Make.defs b/boards/arm/rp2040/waveshare-rp2040-lcd-1.28/src/Make.defs
index 212f994e83..b901b1c6da 100644
--- a/boards/arm/rp2040/waveshare-rp2040-lcd-1.28/src/Make.defs
+++ b/boards/arm/rp2040/waveshare-rp2040-lcd-1.28/src/Make.defs
@@ -1,5 +1,5 @@
 ############################################################################
-# boards/arm/rp2040/raspberrypi-pico/src/Make.defs
+# boards/arm/rp2040/waveshare-rp2040-lcd-1.28/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/sama5/jupiter-nano/scripts/Make.defs b/boards/arm/sama5/jupiter-nano/scripts/Make.defs
index 0204f78fed..38983443df 100644
--- a/boards/arm/sama5/jupiter-nano/scripts/Make.defs
+++ b/boards/arm/sama5/jupiter-nano/scripts/Make.defs
@@ -1,5 +1,5 @@
 ############################################################################
-# boards/arm/sama5/sama5d2-xult/scripts/Make.defs
+# boards/arm/sama5/jupiter-nano/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/esp32s3-box/src/esp32s3_board_lcd_st7789.c b/boards/xtensa/esp32s3/esp32s3-box/src/esp32s3_board_lcd_st7789.c
index ecdb50f964..5c42132d22 100644
--- a/boards/xtensa/esp32s3/esp32s3-box/src/esp32s3_board_lcd_st7789.c
+++ b/boards/xtensa/esp32s3/esp32s3-box/src/esp32s3_board_lcd_st7789.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * boards/xtensa/esp32s3/esp32s3-box/src/esp32s3_board_lcd.c
+ * boards/xtensa/esp32s3/esp32s3-box/src/esp32s3_board_lcd_st7789.c
  *
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with