diff --git a/examples/smf/CMakeLists.txt b/examples/smf/CMakeLists.txt
index bba48ca029a..2c21ff6535e 100644
--- a/examples/smf/CMakeLists.txt
+++ b/examples/smf/CMakeLists.txt
@@ -1,7 +1,23 @@
 # ##############################################################################
-# apps/examples/hsm_psicc2/CMakeLists.txt
+# apps/examples/smf/CMakeLists.txt
 #
 # SPDX-License-Identifier: Apache-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.
+#
 # ##############################################################################
 
 if(CONFIG_EXAMPLES_SMF)
diff --git a/examples/smf/Make.defs b/examples/smf/Make.defs
index 00be2807919..fe4423c17ff 100644
--- a/examples/smf/Make.defs
+++ b/examples/smf/Make.defs
@@ -1,5 +1,5 @@
 ############################################################################
-# apps/examples/hello/Make.defs
+# apps/examples/smf/Make.defs
 #
 # SPDX-License-Identifier: Apache-2.0
 #
diff --git a/examples/smf/Makefile b/examples/smf/Makefile
index 2fd9309c131..992cf09ece6 100644
--- a/examples/smf/Makefile
+++ b/examples/smf/Makefile
@@ -1,5 +1,5 @@
 ############################################################################
-# apps/examples/hsm_psicc2/Makefile
+# apps/examples/smf/Makefile
 #
 # SPDX-License-Identifier: Apache-2.0
 #
diff --git a/examples/xedge_demo/Makefile b/examples/xedge_demo/Makefile
index 720c880004b..42fa028581e 100644
--- a/examples/xedge_demo/Makefile
+++ b/examples/xedge_demo/Makefile
@@ -1,5 +1,5 @@
 # ##############################################################################
-# apps/examples/xedge_demo/CMakeLists.txt
+# apps/examples/xedge_demo/Makefile
 #
 # SPDX-License-Identifier: Apache-2.0
 #
diff --git a/industry/nxmodbus/Make.defs b/industry/nxmodbus/Make.defs
index 539b48d64e9..3803f4a9dcf 100644
--- a/industry/nxmodbus/Make.defs
+++ b/industry/nxmodbus/Make.defs
@@ -1,5 +1,5 @@
 ############################################################################
-# apps/modbus/nxmodbus/Make.defs
+# apps/industry/nxmodbus/Make.defs
 #
 # SPDX-License-Identifier: Apache-2.0
 #
diff --git a/interpreters/jimtcl/CMakeLists.txt b/interpreters/jimtcl/CMakeLists.txt
index ba3b646974a..c9df153f267 100644
--- a/interpreters/jimtcl/CMakeLists.txt
+++ b/interpreters/jimtcl/CMakeLists.txt
@@ -1,3 +1,25 @@
+# ##############################################################################
+# apps/interpreters/jimtcl/CMakeLists.txt
+#
+# SPDX-License-Identifier: Apache-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.
+#
+# ##############################################################################
+
 if(CONFIG_INTERPRETERS_JIMTCL)
   set(JIMTCL_VERSION 0.83)
   set(JIMTCL_TARBALL ${JIMTCL_VERSION}.tar.gz)
diff --git a/interpreters/jimtcl/Make.defs b/interpreters/jimtcl/Make.defs
index eb5a44b0c7b..2634e479a57 100644
--- a/interpreters/jimtcl/Make.defs
+++ b/interpreters/jimtcl/Make.defs
@@ -1,3 +1,25 @@
+############################################################################
+# apps/interpreters/jimtcl/Make.defs
+#
+# SPDX-License-Identifier: Apache-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.
+#
+############################################################################
+
 ifneq ($(CONFIG_INTERPRETERS_JIMTCL),)
 CONFIGURED_APPS += $(APPDIR)/interpreters/jimtcl
 endif
\ No newline at end of file
diff --git a/interpreters/jimtcl/Makefile b/interpreters/jimtcl/Makefile
index f470167f23d..b4645abab13 100644
--- a/interpreters/jimtcl/Makefile
+++ b/interpreters/jimtcl/Makefile
@@ -1,3 +1,25 @@
+############################################################################
+# apps/interpreters/jimtcl/Makefile
+#
+# SPDX-License-Identifier: Apache-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.
+#
+############################################################################
+
 include $(APPDIR)/Make.defs
 
 PROGNAME  = jimsh
diff --git a/system/adcscope/Make.defs b/system/adcscope/Make.defs
index 1e16190e443..3f617e6ccb4 100644
--- a/system/adcscope/Make.defs
+++ b/system/adcscope/Make.defs
@@ -1,5 +1,5 @@
 ############################################################################
-# apps/systen/adcscope/Make.defs
+# apps/system/adcscope/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/tee/optee_client/CMakeLists.txt b/tee/optee_client/CMakeLists.txt
index c711dd8378d..a1f8cde3618 100644
--- a/tee/optee_client/CMakeLists.txt
+++ b/tee/optee_client/CMakeLists.txt
@@ -1,5 +1,5 @@
 # ##############################################################################
-# apps/tee/libteec/CMakeLists.txt
+# apps/tee/optee_client/CMakeLists.txt
 #
 # SPDX-License-Identifier: Apache-2.0
 #