diff --git a/arch/arm/src/ra4/CMakeLists.txt b/arch/arm/src/ra4/CMakeLists.txt
index d7323dff886..40fb63b3051 100644
--- a/arch/arm/src/ra4/CMakeLists.txt
+++ b/arch/arm/src/ra4/CMakeLists.txt
@@ -1,5 +1,5 @@
 # ##############################################################################
-# arch/arm/src/nrf53/CMakeLists.txt
+# arch/arm/src/ra4/CMakeLists.txt
 #
 # Licensed to the Apache Software Foundation (ASF) under one or more contributor
 # license agreements.  See the NOTICE file distributed with this work for
diff --git a/arch/risc-v/src/nuttsbi/Kconfig b/arch/risc-v/src/nuttsbi/Kconfig
index 94ac9dd44a1..bb602b1587c 100644
--- a/arch/risc-v/src/nuttsbi/Kconfig
+++ b/arch/risc-v/src/nuttsbi/Kconfig
@@ -1,3 +1,8 @@
+#
+# For a description of the syntax of this configuration file,
+# see the file kconfig-language.txt in the NuttX tools repository.
+#
+
 
 # S-mode requires a Supervisor Binary Interface (SBI) in order to access
 # M-mode ISA. A minimalistic SBI is provided here natively.
diff --git a/boards/arm/mcx-nxxx/frdm-mcxn236/src/CMakeLists.txt b/boards/arm/mcx-nxxx/frdm-mcxn236/src/CMakeLists.txt
index 97384ae25b4..d48fb5c901d 100644
--- a/boards/arm/mcx-nxxx/frdm-mcxn236/src/CMakeLists.txt
+++ b/boards/arm/mcx-nxxx/frdm-mcxn236/src/CMakeLists.txt
@@ -1,5 +1,5 @@
 # ##############################################################################
-# boards/arm/n23x/frdm-mcxn236/src/CMakeLists.txt
+# boards/arm/mcx-nxxx/frdm-mcxn236/src/CMakeLists.txt
 #
 # SPDX-License-Identifier: Apache-2.0
 #
diff --git a/boards/arm/ra4/arduino-r4-minima/CMakeLists.txt b/boards/arm/ra4/arduino-r4-minima/CMakeLists.txt
index e37293135ec..b1315edc2ca 100644
--- a/boards/arm/ra4/arduino-r4-minima/CMakeLists.txt
+++ b/boards/arm/ra4/arduino-r4-minima/CMakeLists.txt
@@ -1,5 +1,5 @@
 # ##############################################################################
-# boards/arm/nrf52/nrf52-feather/CMakeLists.txt
+# boards/arm/ra4/arduino-r4-minima/CMakeLists.txt
 #
 # Licensed to the Apache Software Foundation (ASF) under one or more contributor
 # license agreements.  See the NOTICE file distributed with this work for
diff --git a/boards/arm/ra4/arduino-r4-minima/src/CMakeLists.txt b/boards/arm/ra4/arduino-r4-minima/src/CMakeLists.txt
index e1ca1ca5145..0c0d602d26b 100644
--- a/boards/arm/ra4/arduino-r4-minima/src/CMakeLists.txt
+++ b/boards/arm/ra4/arduino-r4-minima/src/CMakeLists.txt
@@ -1,5 +1,5 @@
 # ##############################################################################
-# boards/arm/nrf52/thingy91-nrf52/src/CMakeLists.txt
+# boards/arm/ra4/arduino-r4-minima/src/CMakeLists.txt
 #
 # Licensed to the Apache Software Foundation (ASF) under one or more contributor
 # license agreements.  See the NOTICE file distributed with this work for