diff --git a/examples/abntcodi/CMakeLists.txt b/examples/abntcodi/CMakeLists.txt
index 935284a6e..b1d9eb4b6 100644
--- a/examples/abntcodi/CMakeLists.txt
+++ b/examples/abntcodi/CMakeLists.txt
@@ -1,5 +1,5 @@
 # ##############################################################################
-# apps/examples/adntcodi/CMakeLists.txt
+# apps/examples/abntcodi/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/examples/hdc1008_demo/CMakeLists.txt b/examples/hdc1008_demo/CMakeLists.txt
index 3138f7da6..1bf7ce4da 100644
--- a/examples/hdc1008_demo/CMakeLists.txt
+++ b/examples/hdc1008_demo/CMakeLists.txt
@@ -1,5 +1,5 @@
 # ##############################################################################
-# apps/examples/hdc1008/CMakeLists.txt
+# apps/examples/hdc1008_demo/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/system/dhcp6c/CMakeLists.txt b/system/dhcp6c/CMakeLists.txt
index 0eb36276a..4db36c901 100644
--- a/system/dhcp6c/CMakeLists.txt
+++ b/system/dhcp6c/CMakeLists.txt
@@ -1,5 +1,5 @@
 # ##############################################################################
-# apps/system/dhcpc/CMakeLists.txt
+# apps/system/dhcp6c/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/testing/testsuites/Makefile b/testing/testsuites/Makefile
index 76037dc7e..728b66d0b 100644
--- a/testing/testsuites/Makefile
+++ b/testing/testsuites/Makefile
@@ -1,16 +1,22 @@
+############################################################################
 # apps/testing/testsuites/Makefile
 #
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-
-#     http://www.apache.org/licenses/LICENSE-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
+# ASF licenses this file to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance with the
+# License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
 # Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
+# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the
+# License for the specific language governing permissions and limitations
+# under the License.
+#
+############################################################################
 
 include $(APPDIR)/Make.defs
 
diff --git a/wireless/CMakeLists.txt b/wireless/CMakeLists.txt
index bf1036719..b0962a4ec 100644
--- a/wireless/CMakeLists.txt
+++ b/wireless/CMakeLists.txt
@@ -1,5 +1,5 @@
 # ##############################################################################
-# apps/wireless/CMakeLists.txt
+# apps/wireless/wapi/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/wireless/ieee802154/i8shark/CMakeLists.txt b/wireless/ieee802154/i8shark/CMakeLists.txt
index cb360a97e..6c43fa9eb 100644
--- a/wireless/ieee802154/i8shark/CMakeLists.txt
+++ b/wireless/ieee802154/i8shark/CMakeLists.txt
@@ -1,5 +1,5 @@
 # ##############################################################################
-# apps/wireless/bluetooth/i8shark/CMakeLists.txt
+# apps/wireless/ieee802154/i8shark/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/wireless/ieee802154/libmac/CMakeLists.txt b/wireless/ieee802154/libmac/CMakeLists.txt
index 97ddca9ef..fe2c964c2 100644
--- a/wireless/ieee802154/libmac/CMakeLists.txt
+++ b/wireless/ieee802154/libmac/CMakeLists.txt
@@ -1,5 +1,5 @@
 # ##############################################################################
-# apps/wireless/bluetooth/libmac/CMakeLists.txt
+# apps/wireless/ieee802154/libmac/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/wireless/ieee802154/libutils/CMakeLists.txt b/wireless/ieee802154/libutils/CMakeLists.txt
index a9b43c224..0a09e76af 100644
--- a/wireless/ieee802154/libutils/CMakeLists.txt
+++ b/wireless/ieee802154/libutils/CMakeLists.txt
@@ -1,5 +1,5 @@
 # ##############################################################################
-# apps/wireless/bluetooth/libutils/CMakeLists.txt
+# apps/wireless/ieee802154/libutils/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