diff --git a/modules/cfe_assert/src/cfe_assert_init.c b/modules/cfe_assert/src/cfe_assert_init.c
index 9d77196a3..83822bf96 100644
--- a/modules/cfe_assert/src/cfe_assert_init.c
+++ b/modules/cfe_assert/src/cfe_assert_init.c
@@ -18,7 +18,7 @@
 **      See the License for the specific language governing permissions and
 **      limitations under the License.
 **
-** File: cfe_assert_main.c
+** File: cfe_assert_init.c
 **
 ** Purpose:
 **   Implementation of the CFE assert (UT assert wrapper) functions.
diff --git a/modules/cfe_assert/src/cfe_assert_priv.h b/modules/cfe_assert/src/cfe_assert_priv.h
index 33a2da2a6..c90539eb5 100644
--- a/modules/cfe_assert/src/cfe_assert_priv.h
+++ b/modules/cfe_assert/src/cfe_assert_priv.h
@@ -18,7 +18,7 @@
 **      See the License for the specific language governing permissions and
 **      limitations under the License.
 **
-** File: cfe_assert.h
+** File: cfe_assert_priv.h
 **
 ** Purpose:
 **   Specification for the CFE assert (UT assert wrapper) functions.
diff --git a/modules/cfe_assert/src/cfe_assert_runner.c b/modules/cfe_assert/src/cfe_assert_runner.c
index cb8ff5796..879b37d78 100644
--- a/modules/cfe_assert/src/cfe_assert_runner.c
+++ b/modules/cfe_assert/src/cfe_assert_runner.c
@@ -18,7 +18,7 @@
 **      See the License for the specific language governing permissions and
 **      limitations under the License.
 **
-** File: cfe_testrunner_main.c
+** File: cfe_assert_runner.c
 **
 ** Purpose:
 **   Implementation of the CFE testrunner (UT testrunner wrapper) functions.
diff --git a/modules/cfe_testcase/src/cfe_test.h b/modules/cfe_testcase/src/cfe_test.h
index 0d8a77058..06aef9f84 100644
--- a/modules/cfe_testcase/src/cfe_test.h
+++ b/modules/cfe_testcase/src/cfe_test.h
@@ -18,7 +18,7 @@
 **      See the License for the specific language governing permissions and
 **      limitations under the License.
 **
-** File: cfe_test.c
+** File: cfe_test.h
 **
 ** Purpose:
 **   Initialization routine for CFE functional test
diff --git a/modules/cfe_testcase/src/es_cds_test.c b/modules/cfe_testcase/src/es_cds_test.c
index 8520dd4fb..95ffe7e68 100644
--- a/modules/cfe_testcase/src/es_cds_test.c
+++ b/modules/cfe_testcase/src/es_cds_test.c
@@ -18,7 +18,7 @@
 **      See the License for the specific language governing permissions and
 **      limitations under the License.
 **
-** File: es_info_test.c
+** File: es_cds_test.c
 **
 ** Purpose:
 **   Functional test of basic ES Critical Data Store APIs
diff --git a/modules/cfe_testcase/src/es_mempool_test.c b/modules/cfe_testcase/src/es_mempool_test.c
index f6542eaf6..02d90c35e 100644
--- a/modules/cfe_testcase/src/es_mempool_test.c
+++ b/modules/cfe_testcase/src/es_mempool_test.c
@@ -18,7 +18,7 @@
 **      See the License for the specific language governing permissions and
 **      limitations under the License.
 **
-** File: es_info_test.c
+** File: es_mempool_test.c
 **
 ** Purpose:
 **   Functional test of basic ES Mempool APIs
diff --git a/modules/cfe_testcase/src/fs_header_test.c b/modules/cfe_testcase/src/fs_header_test.c
index ef7499891..e7965c4d2 100644
--- a/modules/cfe_testcase/src/fs_header_test.c
+++ b/modules/cfe_testcase/src/fs_header_test.c
@@ -18,7 +18,7 @@
 **      See the License for the specific language governing permissions and
 **      limitations under the License.
 **
-** File: es_info_test.c
+** File: fs_header_test.c
 **
 ** Purpose:
 **   Functional test of basic FS Header APIs
diff --git a/modules/cfe_testcase/src/sb_pipe_mang_test.c b/modules/cfe_testcase/src/sb_pipe_mang_test.c
index ab8d8963c..3ca613df5 100644
--- a/modules/cfe_testcase/src/sb_pipe_mang_test.c
+++ b/modules/cfe_testcase/src/sb_pipe_mang_test.c
@@ -18,7 +18,7 @@
 **      See the License for the specific language governing permissions and
 **      limitations under the License.
 **
-** File: es_info_test.c
+** File: sb_pipe_mang_test.c
 **
 ** Purpose:
 **   Functional test of Sb Pipe Managment APIs
diff --git a/modules/cfe_testcase/src/time_current_test.c b/modules/cfe_testcase/src/time_current_test.c
index e37ec7fad..901e6ca7c 100644
--- a/modules/cfe_testcase/src/time_current_test.c
+++ b/modules/cfe_testcase/src/time_current_test.c
@@ -18,7 +18,7 @@
 **      See the License for the specific language governing permissions and
 **      limitations under the License.
 **
-** File: es_info_test.c
+** File: time_current_test.c
 **
 ** Purpose:
 **   Functional test of basic Time Current APIs
diff --git a/modules/core_private/ut-stubs/src/cfe_es_core_internal_handlers.c b/modules/core_private/ut-stubs/src/cfe_es_core_internal_handlers.c
index b4830665e..7905f1f61 100644
--- a/modules/core_private/ut-stubs/src/cfe_es_core_internal_handlers.c
+++ b/modules/core_private/ut-stubs/src/cfe_es_core_internal_handlers.c
@@ -19,7 +19,7 @@
 */
 
 /*
-** File: ut_es_stubs.c
+** File: cfe_es_core_internal_handlers.c
 **
 ** Purpose:
 ** Unit test stubs for Executive Service routines
diff --git a/modules/core_private/ut-stubs/src/cfe_fs_core_internal_handlers.c b/modules/core_private/ut-stubs/src/cfe_fs_core_internal_handlers.c
index c4dd9a96b..8d8dd46ea 100644
--- a/modules/core_private/ut-stubs/src/cfe_fs_core_internal_handlers.c
+++ b/modules/core_private/ut-stubs/src/cfe_fs_core_internal_handlers.c
@@ -19,7 +19,7 @@
 */
 
 /*
-** File: ut_es_stubs.c
+** File: cfe_fs_core_internal_handlers.c
 **
 ** Purpose:
 ** Unit test stubs for Executive Service routines
diff --git a/modules/resourceid/fsw/src/cfe_resourceid_api.c b/modules/resourceid/fsw/src/cfe_resourceid_api.c
index 47e4f7403..022bb9b86 100644
--- a/modules/resourceid/fsw/src/cfe_resourceid_api.c
+++ b/modules/resourceid/fsw/src/cfe_resourceid_api.c
@@ -20,7 +20,7 @@
 
 /*
 **  File:
-**  cfe_resource_api.c
+**      cfe_resource_api.c
 **
 **  Purpose:
 **      Function definitions related to CFE resource management