diff --git a/fsw/modules/eeprom_mmap_file/cfe_psp_eeprom_mmap_file.c b/fsw/modules/eeprom_mmap_file/cfe_psp_eeprom_mmap_file.c
index 25e2fba9..b666f33c 100644
--- a/fsw/modules/eeprom_mmap_file/cfe_psp_eeprom_mmap_file.c
+++ b/fsw/modules/eeprom_mmap_file/cfe_psp_eeprom_mmap_file.c
@@ -19,7 +19,7 @@
 */
 
 /**
- * \file cfe_psp_eeprom_mmap_file.c
+ * \file
  *
  *  Created on: Jul 17, 2015
  *      Author: joseph.p.hickey@nasa.gov
diff --git a/fsw/modules/eeprom_notimpl/cfe_psp_eeprom_notimpl.c b/fsw/modules/eeprom_notimpl/cfe_psp_eeprom_notimpl.c
index b091bfca..b39ba23e 100644
--- a/fsw/modules/eeprom_notimpl/cfe_psp_eeprom_notimpl.c
+++ b/fsw/modules/eeprom_notimpl/cfe_psp_eeprom_notimpl.c
@@ -19,7 +19,7 @@
 */
 
 /**
- * \file cfe_psp_eeprom_notimpl.c
+ * \file
  *
  * A PSP module to satisfy the "EEPROM" API on systems which
  * do not have an EEPROM or otherwise cannot access it.
diff --git a/fsw/modules/port_direct/cfe_psp_port_direct.c b/fsw/modules/port_direct/cfe_psp_port_direct.c
index 8adbdd9b..56312c57 100644
--- a/fsw/modules/port_direct/cfe_psp_port_direct.c
+++ b/fsw/modules/port_direct/cfe_psp_port_direct.c
@@ -19,7 +19,7 @@
 */
 
 /**
- * \file cfe_psp_port_direct.c
+ * \file
  *
  * A PSP module to satisfy the "PORT" API on systems which
  * can access I/O ports directly via memory mapped addresses.
diff --git a/fsw/modules/port_notimpl/cfe_psp_port_notimpl.c b/fsw/modules/port_notimpl/cfe_psp_port_notimpl.c
index 5d63a339..d5a23605 100644
--- a/fsw/modules/port_notimpl/cfe_psp_port_notimpl.c
+++ b/fsw/modules/port_notimpl/cfe_psp_port_notimpl.c
@@ -19,7 +19,7 @@
 */
 
 /**
- * \file cfe_psp_port_notimpl.c
+ * \file
  *
  * A PSP module to satisfy the "Port" API on systems which
  * do not have or otherwise cannot access I/O ports.
diff --git a/fsw/modules/ram_direct/cfe_psp_ram_direct.c b/fsw/modules/ram_direct/cfe_psp_ram_direct.c
index ce9922a0..d0c7adf5 100644
--- a/fsw/modules/ram_direct/cfe_psp_ram_direct.c
+++ b/fsw/modules/ram_direct/cfe_psp_ram_direct.c
@@ -19,7 +19,7 @@
 */
 
 /**
- * \file cfe_psp_ram_direct.c
+ * \file
  *
  * A PSP module to satisfy the "RAM" API on systems which
  * can access physical memory directly.
diff --git a/fsw/modules/ram_notimpl/cfe_psp_ram_notimpl.c b/fsw/modules/ram_notimpl/cfe_psp_ram_notimpl.c
index 573d081d..089bbcb3 100644
--- a/fsw/modules/ram_notimpl/cfe_psp_ram_notimpl.c
+++ b/fsw/modules/ram_notimpl/cfe_psp_ram_notimpl.c
@@ -19,7 +19,7 @@
 */
 
 /**
- * \file cfe_psp_ram_notimpl.c
+ * \file
  *
  * A PSP module to satisfy the "RAM" API on systems which
  * cannot access physical memory directly.
diff --git a/fsw/modules/soft_timebase/cfe_psp_soft_timebase.c b/fsw/modules/soft_timebase/cfe_psp_soft_timebase.c
index b9d9e4fb..4af22d93 100644
--- a/fsw/modules/soft_timebase/cfe_psp_soft_timebase.c
+++ b/fsw/modules/soft_timebase/cfe_psp_soft_timebase.c
@@ -19,7 +19,7 @@
 */
 
 /**
- * \file cfe_psp_soft_timebase.c
+ * \file
  *
  * A PSP module that instantiates an RTOS-backed OSAL timebase to provide
  * various timing services.  This in turn may be used to drive CFE TIME 1Hz
diff --git a/fsw/modules/timebase_posix_clock/cfe_psp_timebase_posix_clock.c b/fsw/modules/timebase_posix_clock/cfe_psp_timebase_posix_clock.c
index 901d6aff..de647165 100644
--- a/fsw/modules/timebase_posix_clock/cfe_psp_timebase_posix_clock.c
+++ b/fsw/modules/timebase_posix_clock/cfe_psp_timebase_posix_clock.c
@@ -19,7 +19,7 @@
 */
 
 /**
- * \file cfe_psp_timebase_posix_clock.c
+ * \file
  *
  * A PSP module to satisfy the PSP time API on systems which
  * do not have a hardware clock register, but do provide a POSIX
diff --git a/fsw/modules/timebase_vxworks/cfe_psp_timebase_vxworks.c b/fsw/modules/timebase_vxworks/cfe_psp_timebase_vxworks.c
index 91bb66b5..cd9fc9c5 100644
--- a/fsw/modules/timebase_vxworks/cfe_psp_timebase_vxworks.c
+++ b/fsw/modules/timebase_vxworks/cfe_psp_timebase_vxworks.c
@@ -19,7 +19,7 @@
 */
 
 /**
- * \file cfe_psp_timebase_vxworks.c
+ * \file
  *
  * A PSP module to implement the PSP time API via the VxWorks
  * vxTimeBaseGet() routine.  The VxWorks timebase is a 64 bit
diff --git a/fsw/shared/inc/cfe_psp_exceptionstorage_api.h b/fsw/shared/inc/cfe_psp_exceptionstorage_api.h
index da2fc0dc..1309d6e6 100644
--- a/fsw/shared/inc/cfe_psp_exceptionstorage_api.h
+++ b/fsw/shared/inc/cfe_psp_exceptionstorage_api.h
@@ -19,7 +19,7 @@
 */
 
 /**
- * \file cfe_psp_exceptionstorage_api.h
+ * \file
  *
  * Provides a generic storage buffer ring for exceptions
  */
diff --git a/fsw/shared/inc/cfe_psp_exceptionstorage_types.h b/fsw/shared/inc/cfe_psp_exceptionstorage_types.h
index 062bc725..57922b54 100644
--- a/fsw/shared/inc/cfe_psp_exceptionstorage_types.h
+++ b/fsw/shared/inc/cfe_psp_exceptionstorage_types.h
@@ -19,7 +19,7 @@
 */
 
 /**
- * \file cfe_psp_exceptionstorage_types.h
+ * \file
  *
  * Provides a generic storage buffer ring for exceptions
  */
diff --git a/fsw/shared/inc/cfe_psp_module.h b/fsw/shared/inc/cfe_psp_module.h
index e8b7d0ef..6a779460 100644
--- a/fsw/shared/inc/cfe_psp_module.h
+++ b/fsw/shared/inc/cfe_psp_module.h
@@ -19,7 +19,7 @@
 */
 
 /**
- * \file cfe_psp_module.h
+ * \file
  *
  *  Created on: Jul 17, 2015
  *      Author: joseph.p.hickey@nasa.gov
diff --git a/fsw/shared/src/cfe_psp_module.c b/fsw/shared/src/cfe_psp_module.c
index 32be5ab5..f1671a6d 100644
--- a/fsw/shared/src/cfe_psp_module.c
+++ b/fsw/shared/src/cfe_psp_module.c
@@ -19,7 +19,7 @@
 */
 
 /**
- * \file cfe_psp_module.c
+ * \file
  *
  *  Created on: Jul 25, 2014
  *      Author: jphickey
diff --git a/fsw/shared/src/cfe_psp_version.c b/fsw/shared/src/cfe_psp_version.c
index c8f3f72f..09b16506 100644
--- a/fsw/shared/src/cfe_psp_version.c
+++ b/fsw/shared/src/cfe_psp_version.c
@@ -19,7 +19,7 @@
 */
 
 /**
- * \file cfe_psp_version.c
+ * \file
  *
  * Defines API that obtains the values of the various version identifiers
  */
diff --git a/unit-test-coverage/mcp750-vxworks/adaptors/src/ut-adaptor-bootrec.c b/unit-test-coverage/mcp750-vxworks/adaptors/src/ut-adaptor-bootrec.c
index ef5f99a1..17c3770c 100644
--- a/unit-test-coverage/mcp750-vxworks/adaptors/src/ut-adaptor-bootrec.c
+++ b/unit-test-coverage/mcp750-vxworks/adaptors/src/ut-adaptor-bootrec.c
@@ -11,7 +11,7 @@
  */
 
 /**
- * \file     ut-adaptor-bootrec.c
+ * \file
  * \ingroup  adaptors
  * \author   joseph.p.hickey@nasa.gov
  *
diff --git a/unit-test-coverage/mcp750-vxworks/src/coveragetest-cfe-psp-start.c b/unit-test-coverage/mcp750-vxworks/src/coveragetest-cfe-psp-start.c
index 80495276..0ae06a17 100644
--- a/unit-test-coverage/mcp750-vxworks/src/coveragetest-cfe-psp-start.c
+++ b/unit-test-coverage/mcp750-vxworks/src/coveragetest-cfe-psp-start.c
@@ -11,7 +11,7 @@
  */
 
 /**
- * \file     coveragetest-binsem.c
+ * \file
  * \ingroup  vxworks
  * \author   joseph.p.hickey@nasa.gov
  *
diff --git a/unit-test-coverage/mcp750-vxworks/src/coveragetest-cfe-psp-support.c b/unit-test-coverage/mcp750-vxworks/src/coveragetest-cfe-psp-support.c
index 7ddd4583..acae95e3 100644
--- a/unit-test-coverage/mcp750-vxworks/src/coveragetest-cfe-psp-support.c
+++ b/unit-test-coverage/mcp750-vxworks/src/coveragetest-cfe-psp-support.c
@@ -11,7 +11,7 @@
  */
 
 /**
- * \file     coveragetest-binsem.c
+ * \file
  * \ingroup  vxworks
  * \author   joseph.p.hickey@nasa.gov
  *
diff --git a/unit-test-coverage/mcp750-vxworks/src/coveragetest-psp-mcp750-vxworks.c b/unit-test-coverage/mcp750-vxworks/src/coveragetest-psp-mcp750-vxworks.c
index 214d6826..bd01ba6e 100644
--- a/unit-test-coverage/mcp750-vxworks/src/coveragetest-psp-mcp750-vxworks.c
+++ b/unit-test-coverage/mcp750-vxworks/src/coveragetest-psp-mcp750-vxworks.c
@@ -11,7 +11,7 @@
  */
 
 /**
- * \file     coveragetest-binsem.c
+ * \file
  * \ingroup  vxworks
  * \author   joseph.p.hickey@nasa.gov
  *
diff --git a/unit-test-coverage/shared/adaptors/src/ut-adaptor-exceptions.c b/unit-test-coverage/shared/adaptors/src/ut-adaptor-exceptions.c
index 6b92d5cc..555bcf4d 100644
--- a/unit-test-coverage/shared/adaptors/src/ut-adaptor-exceptions.c
+++ b/unit-test-coverage/shared/adaptors/src/ut-adaptor-exceptions.c
@@ -11,7 +11,7 @@
  */
 
 /**
- * \file     ut-adaptor-exceptions.c
+ * \file
  * \ingroup  adaptors
  * \author   joseph.p.hickey@nasa.gov
  *
diff --git a/unit-test-coverage/shared/src/coveragetest-cfe-psp-exceptionstorage.c b/unit-test-coverage/shared/src/coveragetest-cfe-psp-exceptionstorage.c
index 15b05fab..4171c38e 100644
--- a/unit-test-coverage/shared/src/coveragetest-cfe-psp-exceptionstorage.c
+++ b/unit-test-coverage/shared/src/coveragetest-cfe-psp-exceptionstorage.c
@@ -11,7 +11,7 @@
  */
 
 /**
- * \file     coveragetest-binsem.c
+ * \file
  * \ingroup  vxworks
  * \author   joseph.p.hickey@nasa.gov
  *