diff --git a/fsw/inc/cfe_psp.h b/fsw/inc/cfe_psp.h
index 21e9b911..66fa24ad 100644
--- a/fsw/inc/cfe_psp.h
+++ b/fsw/inc/cfe_psp.h
@@ -19,8 +19,6 @@
 */
 
 /*
-**  File Name:  cfe_psp.h
-**
 **  Author:  A. Cudmore
 **
 **  Purpose:  This file contains the cFE Platform Support Package(PSP)
@@ -33,8 +31,8 @@
 **
 */
 
-#ifndef _cfe_psp_
-#define _cfe_psp_
+#ifndef CFE_PSP_H
+#define CFE_PSP_H
 
 /*
 ** Include Files
@@ -490,4 +488,4 @@ void CFE_PSP_GetVersionNumber(uint8 VersionNumbers[4]);
  */
 uint32 CFE_PSP_GetBuildNumber(void);
 
-#endif /* _cfe_psp_ */
+#endif
diff --git a/fsw/mcp750-vxworks/inc/cfe_psp_config.h b/fsw/mcp750-vxworks/inc/cfe_psp_config.h
index 5b9901a4..b5ff5f89 100644
--- a/fsw/mcp750-vxworks/inc/cfe_psp_config.h
+++ b/fsw/mcp750-vxworks/inc/cfe_psp_config.h
@@ -18,13 +18,8 @@
 **  limitations under the License.
 */
 
-/*
-** cfe_psp_config.h
-**
-*/
-
-#ifndef _cfe_psp_config_
-#define _cfe_psp_config_
+#ifndef CFE_PSP_CONFIG_H
+#define CFE_PSP_CONFIG_H
 
 #include "common_types.h"
 
diff --git a/fsw/mcp750-vxworks/inc/psp_version.h b/fsw/mcp750-vxworks/inc/psp_version.h
index bc40c244..e0a3a320 100644
--- a/fsw/mcp750-vxworks/inc/psp_version.h
+++ b/fsw/mcp750-vxworks/inc/psp_version.h
@@ -18,13 +18,13 @@
 **  limitations under the License.
 */
 
-/*! @file mcp750-vxworks/inc/psp_version.h
+/*! @file
  *  @brief Purpose:
  *  @details Provide version identifiers for the cFE Platform Support Packages (PSP).
  *  See @ref cfsversions for version and build number and description
  */
-#ifndef _psp_version_
-#define _psp_version_
+#ifndef PSP_VERSION_H
+#define PSP_VERSION_H
 
 /*
  * Development Build Macro Definitions
@@ -70,4 +70,4 @@
     " PSP DEVELOPMENT BUILD " CFE_PSP_IMPL_VERSION \
     ", Last Official Release: psp v1.4.0" /* For full support please use this version */
 
-#endif /* _psp_version_ */
+#endif
diff --git a/fsw/pc-linux/inc/cfe_psp_config.h b/fsw/pc-linux/inc/cfe_psp_config.h
index 719b4d13..4095b713 100644
--- a/fsw/pc-linux/inc/cfe_psp_config.h
+++ b/fsw/pc-linux/inc/cfe_psp_config.h
@@ -18,12 +18,8 @@
 **  limitations under the License.
 */
 
-/*
-** cfe_psp_config.h
-*/
-
-#ifndef _cfe_psp_config_
-#define _cfe_psp_config_
+#ifndef CFE_PSP_CONFIG_H
+#define CFE_PSP_CONFIG_H
 
 #include "common_types.h"
 
diff --git a/fsw/pc-linux/inc/psp_version.h b/fsw/pc-linux/inc/psp_version.h
index 8f9671d4..e0a3a320 100644
--- a/fsw/pc-linux/inc/psp_version.h
+++ b/fsw/pc-linux/inc/psp_version.h
@@ -18,13 +18,13 @@
 **  limitations under the License.
 */
 
-/*! @file pc-linux/inc/psp_version.h
+/*! @file
  *  @brief Purpose:
  *  @details Provide version identifiers for the cFE Platform Support Packages (PSP).
  *  See @ref cfsversions for version and build number and description
  */
-#ifndef _psp_version_
-#define _psp_version_
+#ifndef PSP_VERSION_H
+#define PSP_VERSION_H
 
 /*
  * Development Build Macro Definitions
@@ -70,4 +70,4 @@
     " PSP DEVELOPMENT BUILD " CFE_PSP_IMPL_VERSION \
     ", Last Official Release: psp v1.4.0" /* For full support please use this version */
 
-#endif /* _psp_version_ */
+#endif
diff --git a/fsw/pc-rtems/inc/cfe_psp_config.h b/fsw/pc-rtems/inc/cfe_psp_config.h
index 02ae9e1d..8ec95617 100644
--- a/fsw/pc-rtems/inc/cfe_psp_config.h
+++ b/fsw/pc-rtems/inc/cfe_psp_config.h
@@ -18,13 +18,8 @@
 **  limitations under the License.
 */
 
-/*
-** cfe_psp_config.h
-**
-*/
-
-#ifndef _cfe_psp_config_
-#define _cfe_psp_config_
+#ifndef CFE_PSP_CONFIG_H
+#define CFE_PSP_CONFIG_H
 
 #include "common_types.h"
 #include <rtems.h>
diff --git a/fsw/pc-rtems/inc/psp_version.h b/fsw/pc-rtems/inc/psp_version.h
index 3a4e611c..e0a3a320 100644
--- a/fsw/pc-rtems/inc/psp_version.h
+++ b/fsw/pc-rtems/inc/psp_version.h
@@ -18,13 +18,13 @@
 **  limitations under the License.
 */
 
-/*! @file pc-rtems/inc/psp_version.h
+/*! @file
  *  @brief Purpose:
  *  @details Provide version identifiers for the cFE Platform Support Packages (PSP).
  *  See @ref cfsversions for version and build number and description
  */
-#ifndef _psp_version_
-#define _psp_version_
+#ifndef PSP_VERSION_H
+#define PSP_VERSION_H
 
 /*
  * Development Build Macro Definitions
@@ -70,4 +70,4 @@
     " PSP DEVELOPMENT BUILD " CFE_PSP_IMPL_VERSION \
     ", Last Official Release: psp v1.4.0" /* For full support please use this version */
 
-#endif /* _psp_version_ */
\ No newline at end of file
+#endif
diff --git a/fsw/shared/inc/cfe_psp_memory.h b/fsw/shared/inc/cfe_psp_memory.h
index 77559216..8dcc43f0 100644
--- a/fsw/shared/inc/cfe_psp_memory.h
+++ b/fsw/shared/inc/cfe_psp_memory.h
@@ -19,8 +19,6 @@
 */
 
 /*
-**  File Name:  cfe_psp_memory.h
-**
 **  Author:  A. Cudmore
 **
 **  Purpose:  This file contains PSP support routine internal prototypes
@@ -31,8 +29,8 @@
 **
 */
 
-#ifndef _cfe_psp_memory_
-#define _cfe_psp_memory_
+#ifndef CFE_PSP_MEMORY_H
+#define CFE_PSP_MEMORY_H
 
 /*
 ** Include Files
@@ -120,4 +118,4 @@ extern void CFE_PSP_DeleteProcessorReservedMemory(void);
 */
 extern CFE_PSP_ReservedMemoryMap_t CFE_PSP_ReservedMemoryMap;
 
-#endif /* _cfe_psp_memory_ */
+#endif
diff --git a/unit-test-coverage/mcp750-vxworks/adaptors/inc/ut-adaptor-bootrec.h b/unit-test-coverage/mcp750-vxworks/adaptors/inc/ut-adaptor-bootrec.h
index 54b0d0db..df53394a 100644
--- a/unit-test-coverage/mcp750-vxworks/adaptors/inc/ut-adaptor-bootrec.h
+++ b/unit-test-coverage/mcp750-vxworks/adaptors/inc/ut-adaptor-bootrec.h
@@ -11,14 +11,14 @@
  */
 
 /**
- * \file     ut-adaptor-bootrec.h
+ * \file
  * \ingroup  adaptors
  * \author   joseph.p.hickey@nasa.gov
  *
  */
 
-#ifndef INCLUDE_UT_ADAPTOR_BOOTREC_H_
-#define INCLUDE_UT_ADAPTOR_BOOTREC_H_
+#ifndef UT_ADAPTOR_BOOTREC_H
+#define UT_ADAPTOR_BOOTREC_H
 
 #include "common_types.h"
 
@@ -26,4 +26,4 @@ void   UT_Setup_ReservedMem_BootRec(void);
 uint32 UT_Get_ReservedMem_BootType(void);
 void   UT_Set_ReservedMem_BootType(uint32 reset_type);
 
-#endif /* INCLUDE_UT_ADAPTOR_BOOTREC_H_ */
+#endif
diff --git a/unit-test-coverage/mcp750-vxworks/src/coveragetest-psp-mcp750-vxworks.h b/unit-test-coverage/mcp750-vxworks/src/coveragetest-psp-mcp750-vxworks.h
index ef7dc7ae..800462fa 100644
--- a/unit-test-coverage/mcp750-vxworks/src/coveragetest-psp-mcp750-vxworks.h
+++ b/unit-test-coverage/mcp750-vxworks/src/coveragetest-psp-mcp750-vxworks.h
@@ -11,14 +11,14 @@
  */
 
 /**
- * \file     psp-mcp750-vxworks-coveragetest.h
+ * \file
  * \ingroup  vxworks
  * \author   joseph.p.hickey@nasa.gov
  *
  */
 
-#ifndef INCLUDE_PSP_MCP750_VXWORKS_COVERAGETEST_H_
-#define INCLUDE_PSP_MCP750_VXWORKS_COVERAGETEST_H_
+#ifndef COVERAGETEST_PSP_MCP750_VXWORKS_H
+#define COVERAGETEST_PSP_MCP750_VXWORKS_H
 
 #include "utassert.h"
 #include "uttest.h"
@@ -48,4 +48,4 @@ void Test_CFE_PSP_GetSpacecraftId(void);
 void Test_OS_Application_Startup(void);
 void Test_OS_Application_Run(void);
 
-#endif /* INCLUDE_PSP_MCP750_VXWORKS_COVERAGETEST_H_ */
+#endif
diff --git a/unit-test-coverage/modules/timebase_vxworks/inc/cfe_psp_config.h b/unit-test-coverage/modules/timebase_vxworks/inc/cfe_psp_config.h
index 55d3294b..1aaaeffb 100644
--- a/unit-test-coverage/modules/timebase_vxworks/inc/cfe_psp_config.h
+++ b/unit-test-coverage/modules/timebase_vxworks/inc/cfe_psp_config.h
@@ -17,8 +17,8 @@
  * Stub for "cfe_psp_config.h" to use with coverage testing
  */
 
-#ifndef COVERAGETEST_CFE_PSP_CONFIG_H
-#define COVERAGETEST_CFE_PSP_CONFIG_H
+#ifndef CFE_PSP_CONFIG_H
+#define CFE_PSP_CONFIG_H
 
 #define CFE_PSP_VX_TIMEBASE_PERIOD_NUMERATOR   (UT_PSP_TIMEBASE_VXWORKS_TESTCONFIG.PeriodNumerator)
 #define CFE_PSP_VX_TIMEBASE_PERIOD_DENOMINATOR (UT_PSP_TIMEBASE_VXWORKS_TESTCONFIG.PeriodDenominator)
@@ -32,4 +32,4 @@ typedef struct
 
 extern UT_PSP_TimeBase_VxWorks_TestConfig_t UT_PSP_TIMEBASE_VXWORKS_TESTCONFIG;
 
-#endif /* COVERAGETEST_CFE_PSP_CONFIG_H */
+#endif
diff --git a/unit-test-coverage/modules/timebase_vxworks/inc/coveragetest-timebase_vxworks.h b/unit-test-coverage/modules/timebase_vxworks/inc/coveragetest-timebase_vxworks.h
index 5a499ee7..cff88437 100644
--- a/unit-test-coverage/modules/timebase_vxworks/inc/coveragetest-timebase_vxworks.h
+++ b/unit-test-coverage/modules/timebase_vxworks/inc/coveragetest-timebase_vxworks.h
@@ -11,14 +11,14 @@
  */
 
 /**
- * \file     psp-shared-coveragetest.h
+ * \file
  * \ingroup  vxworks
  * \author   joseph.p.hickey@nasa.gov
  *
  */
 
-#ifndef INCLUDE_PSP_SHARED_COVERAGETEST_H_
-#define INCLUDE_PSP_SHARED_COVERAGETEST_H_
+#ifndef COVERAGETEST_TIMEBASE_VXWORKS_H
+#define COVERAGETEST_TIMEBASE_VXWORKS_H
 
 #include "utassert.h"
 #include "uttest.h"
@@ -26,4 +26,4 @@
 
 void Test_CFE_PSP_Timebase_Vxworks_Init(void);
 
-#endif /* INCLUDE_PSP_SHARED_COVERAGETEST_H_ */
+#endif
diff --git a/unit-test-coverage/shared/adaptors/inc/ut-adaptor-exceptions.h b/unit-test-coverage/shared/adaptors/inc/ut-adaptor-exceptions.h
index 139a9bc2..ec6b8f8b 100644
--- a/unit-test-coverage/shared/adaptors/inc/ut-adaptor-exceptions.h
+++ b/unit-test-coverage/shared/adaptors/inc/ut-adaptor-exceptions.h
@@ -11,14 +11,14 @@
  */
 
 /**
- * \file     ut-adaptor-exceptions.h
+ * \file
  * \ingroup  adaptors
  * \author   joseph.p.hickey@nasa.gov
  *
  */
 
-#ifndef INCLUDE_UT_ADAPTOR_EXCEPTIONS_H_
-#define INCLUDE_UT_ADAPTOR_EXCEPTIONS_H_
+#ifndef UT_ADAPTOR_EXCEPTIONS_H
+#define UT_ADAPTOR_EXCEPTIONS_H
 
 #include "common_types.h"
 #include "cfe_psp_exceptionstorage_api.h"
@@ -28,4 +28,4 @@ size_t UT_Get_Exception_Size(void);
 uint32 UT_Get_Exception_Id(struct CFE_PSP_Exception_LogData *Buffer);
 void   UT_Generate_Exception_Context(struct CFE_PSP_Exception_LogData *Buffer, size_t Size);
 
-#endif /* INCLUDE_UT_ADAPTOR_EXCEPTIONS_H_ */
+#endif
diff --git a/unit-test-coverage/shared/inc/coveragetest-psp-shared.h b/unit-test-coverage/shared/inc/coveragetest-psp-shared.h
index e56851f6..d44eb4d5 100644
--- a/unit-test-coverage/shared/inc/coveragetest-psp-shared.h
+++ b/unit-test-coverage/shared/inc/coveragetest-psp-shared.h
@@ -11,14 +11,14 @@
  */
 
 /**
- * \file     psp-shared-coveragetest.h
+ * \file
  * \ingroup  vxworks
  * \author   joseph.p.hickey@nasa.gov
  *
  */
 
-#ifndef INCLUDE_PSP_SHARED_COVERAGETEST_H_
-#define INCLUDE_PSP_SHARED_COVERAGETEST_H_
+#ifndef COVERAGETEST_PSP_SHARED_H
+#define COVERAGETEST_PSP_SHARED_H
 
 #include "utassert.h"
 #include "uttest.h"
@@ -29,4 +29,4 @@ void Test_CFE_PSP_Exception_GetNextContextBuffer(void);
 void Test_CFE_PSP_Exception_GetSummary(void);
 void Test_CFE_PSP_Exception_CopyContext(void);
 
-#endif /* INCLUDE_PSP_SHARED_COVERAGETEST_H_ */
+#endif
diff --git a/unit-test-coverage/ut-stubs/inc/PCS_arch_ppc_esfPpc.h b/unit-test-coverage/ut-stubs/inc/PCS_arch_ppc_esfPpc.h
index 0c7bfdb7..85fee39c 100644
--- a/unit-test-coverage/ut-stubs/inc/PCS_arch_ppc_esfPpc.h
+++ b/unit-test-coverage/ut-stubs/inc/PCS_arch_ppc_esfPpc.h
@@ -1,6 +1,6 @@
 /* PSP coverage stub replacement for esfPpc.h */
-#ifndef _PSP_STUB_ESFPPC_H_
-#define _PSP_STUB_ESFPPC_H_
+#ifndef PCS_ARCH_PPC_ESFPPC_H
+#define PCS_ARCH_PPC_ESFPPC_H
 
 #include "PCS_basetypes.h"
 
@@ -21,4 +21,4 @@ typedef struct
     uint32_t pad[32];
 } PCS_ESFPPC;
 
-#endif /* _PSP_STUB_ESFPPC_H_ */
+#endif
diff --git a/unit-test-coverage/ut-stubs/inc/PCS_arch_ppc_vxPpcLib.h b/unit-test-coverage/ut-stubs/inc/PCS_arch_ppc_vxPpcLib.h
index 7ac39e79..5ea28fb8 100644
--- a/unit-test-coverage/ut-stubs/inc/PCS_arch_ppc_vxPpcLib.h
+++ b/unit-test-coverage/ut-stubs/inc/PCS_arch_ppc_vxPpcLib.h
@@ -1,6 +1,6 @@
 /* PSP coverage stub replacement for vxPpcLib.h */
-#ifndef _PSP_STUB_VXPPCLIB_H_
-#define _PSP_STUB_VXPPCLIB_H_
+#ifndef PCS_ARCH_PPC_VXPPCLIB_H
+#define PCS_ARCH_PPC_VXPPCLIB_H
 
 #include "PCS_basetypes.h"
 
@@ -61,4 +61,4 @@ extern void     PCS_vxFpscrSet(uint32_t);
 extern uint32_t PCS_vxFpscrGet(void);
 extern uint32_t PCS_vxDecGet(void);
 
-#endif /* _PSP_STUB_VXPPCLIB_H_ */
+#endif
diff --git a/unit-test-coverage/ut-stubs/inc/PCS_basetypes.h b/unit-test-coverage/ut-stubs/inc/PCS_basetypes.h
index 291df083..9ffe53bc 100644
--- a/unit-test-coverage/ut-stubs/inc/PCS_basetypes.h
+++ b/unit-test-coverage/ut-stubs/inc/PCS_basetypes.h
@@ -9,8 +9,8 @@
  */
 
 /* PSP coverage stub basic data types */
-#ifndef _PSP_STUB_BASETYPES_H_
-#define _PSP_STUB_BASETYPES_H_
+#ifndef PCS_BASETYPES_H
+#define PCS_BASETYPES_H
 
 /*
  * NOTE: These header files are intentionally _not_ overridden
@@ -26,4 +26,4 @@
 #include <limits.h>  /* for correct INT_MAX, etc. */
 #include <stdbool.h> /* for correct boolean semantics */
 
-#endif /* _PSP_STUB_BASETYPES_H_ */
+#endif
diff --git a/unit-test-coverage/ut-stubs/inc/PCS_blkIo.h b/unit-test-coverage/ut-stubs/inc/PCS_blkIo.h
index 9ef1779f..c2aa5e5b 100644
--- a/unit-test-coverage/ut-stubs/inc/PCS_blkIo.h
+++ b/unit-test-coverage/ut-stubs/inc/PCS_blkIo.h
@@ -9,8 +9,8 @@
  */
 
 /* PSP coverage stub basic data types */
-#ifndef _PSP_STUB_BLKIO_H_
-#define _PSP_STUB_BLKIO_H_
+#ifndef PCS_BLKIO_H
+#define PCS_BLKIO_H
 
 #include "PCS_basetypes.h"
 #include "PCS_vxWorks.h"
@@ -22,4 +22,4 @@ typedef struct PCS_BLK_DEV
 } PCS_BLK_DEV;
 typedef PCS_BLK_DEV *PCS_BLK_DEV_ID;
 
-#endif /* _PSP_STUB_BLKIO_H_ */
+#endif
diff --git a/unit-test-coverage/ut-stubs/inc/PCS_cacheLib.h b/unit-test-coverage/ut-stubs/inc/PCS_cacheLib.h
index 6ddfa76b..2fffb0d1 100644
--- a/unit-test-coverage/ut-stubs/inc/PCS_cacheLib.h
+++ b/unit-test-coverage/ut-stubs/inc/PCS_cacheLib.h
@@ -1,6 +1,6 @@
 /* PSP coverage stub replacement for cacheLib.h */
-#ifndef _PSP_STUB_CACHELIB_H_
-#define _PSP_STUB_CACHELIB_H_
+#ifndef PCS_CACHELIB_H
+#define PCS_CACHELIB_H
 
 #include "PCS_basetypes.h"
 #include "PCS_vxWorks.h"
@@ -18,4 +18,4 @@
 /* ----------------------------------------- */
 extern PCS_STATUS PCS_cacheTextUpdate(void *adrs, size_t bytes);
 
-#endif /* _PSP_STUB_CACHELIB_H_ */
+#endif
diff --git a/unit-test-coverage/ut-stubs/inc/PCS_cfe_configdata.h b/unit-test-coverage/ut-stubs/inc/PCS_cfe_configdata.h
index b78573f5..6dcb6703 100644
--- a/unit-test-coverage/ut-stubs/inc/PCS_cfe_configdata.h
+++ b/unit-test-coverage/ut-stubs/inc/PCS_cfe_configdata.h
@@ -1,5 +1,5 @@
-#ifndef _PSP_STUB_CFE_CONFIGDATA_H_
-#define _PSP_STUB_CFE_CONFIGDATA_H_
+#ifndef PCS_CFE_CONFIGDATA_H
+#define PCS_CFE_CONFIGDATA_H
 
 #include "PCS_basetypes.h"
 
@@ -28,4 +28,4 @@ void PCS_System1HzISR(void);
  */
 void PCS_SystemNotify(void);
 
-#endif /* _PSP_STUB_CFE_CONFIGDATA_H_ */
+#endif
diff --git a/unit-test-coverage/ut-stubs/inc/PCS_dosFsLib.h b/unit-test-coverage/ut-stubs/inc/PCS_dosFsLib.h
index 4bb5a321..b1574cd5 100644
--- a/unit-test-coverage/ut-stubs/inc/PCS_dosFsLib.h
+++ b/unit-test-coverage/ut-stubs/inc/PCS_dosFsLib.h
@@ -1,6 +1,6 @@
 /* PSP coverage stub replacement for dosFsLib.h */
-#ifndef _PSP_STUB_DOSFSLIB_H_
-#define _PSP_STUB_DOSFSLIB_H_
+#ifndef PCS_DOSFSLIB_H
+#define PCS_DOSFSLIB_H
 
 #include "PCS_basetypes.h"
 #include "PCS_vxWorks.h"
@@ -23,4 +23,4 @@
 /* ----------------------------------------- */
 extern PCS_STATUS PCS_dosFsVolFormat(char *path, int opt, PCS_FUNCPTR pPromptFunc);
 
-#endif /* _PSP_STUB_DOSFSLIB_H_ */
+#endif
diff --git a/unit-test-coverage/ut-stubs/inc/PCS_drv_hdisk_ataDrv.h b/unit-test-coverage/ut-stubs/inc/PCS_drv_hdisk_ataDrv.h
index 5918c8a9..3ac67e75 100644
--- a/unit-test-coverage/ut-stubs/inc/PCS_drv_hdisk_ataDrv.h
+++ b/unit-test-coverage/ut-stubs/inc/PCS_drv_hdisk_ataDrv.h
@@ -1,6 +1,6 @@
 /* PSP coverage stub replacement for drv/hdisk/ataDrv.h */
-#ifndef _PSP_STUB_DRV_HDISK_ATADRV_H_
-#define _PSP_STUB_DRV_HDISK_ATADRV_H_
+#ifndef PCS_DRV_HDISK_ATADRV_H
+#define PCS_DRV_HDISK_ATADRV_H
 
 #include "PCS_basetypes.h"
 #include "PCS_vxWorks.h"
@@ -20,4 +20,4 @@
 /* ----------------------------------------- */
 extern PCS_device_t PCS_ataXbdDevCreate(int ctrl, int drive, unsigned int nBlks, unsigned int offset, const char *);
 
-#endif /* _PSP_STUB_DRV_HDISK_ATADRV_H_ */
+#endif
diff --git a/unit-test-coverage/ut-stubs/inc/PCS_errnoLib.h b/unit-test-coverage/ut-stubs/inc/PCS_errnoLib.h
index 2d5e8ac8..187ee090 100644
--- a/unit-test-coverage/ut-stubs/inc/PCS_errnoLib.h
+++ b/unit-test-coverage/ut-stubs/inc/PCS_errnoLib.h
@@ -1,6 +1,6 @@
 /* PSP coverage stub replacement for errnoLib.h */
-#ifndef _PSP_STUB_ERRNOLIB_H_
-#define _PSP_STUB_ERRNOLIB_H_
+#ifndef PCS_ERRNOLIB_H
+#define PCS_ERRNOLIB_H
 
 #include "PCS_basetypes.h"
 #include "PCS_vxWorks.h"
@@ -19,4 +19,4 @@
 
 extern int PCS_errnoGet(void);
 
-#endif /* _PSP_STUB_ERRNOLIB_H_ */
+#endif
diff --git a/unit-test-coverage/ut-stubs/inc/PCS_excLib.h b/unit-test-coverage/ut-stubs/inc/PCS_excLib.h
index 14ed9c65..3c4e307f 100644
--- a/unit-test-coverage/ut-stubs/inc/PCS_excLib.h
+++ b/unit-test-coverage/ut-stubs/inc/PCS_excLib.h
@@ -1,6 +1,6 @@
 /* PSP coverage stub replacement for excLib.h */
-#ifndef _PSP_STUB_EXCLIB_H_
-#define _PSP_STUB_EXCLIB_H_
+#ifndef PCS_EXCLIB_H
+#define PCS_EXCLIB_H
 
 #include "PCS_basetypes.h"
 #include "PCS_taskLib.h"
@@ -19,4 +19,4 @@
 
 extern void PCS_excHookAdd(void (*Hook)(PCS_TASK_ID, int, void *));
 
-#endif /* _PSP_STUB_EXCLIB_H_ */
+#endif
diff --git a/unit-test-coverage/ut-stubs/inc/PCS_fppLib.h b/unit-test-coverage/ut-stubs/inc/PCS_fppLib.h
index 54ffc02a..7d2408f8 100644
--- a/unit-test-coverage/ut-stubs/inc/PCS_fppLib.h
+++ b/unit-test-coverage/ut-stubs/inc/PCS_fppLib.h
@@ -1,6 +1,6 @@
 /* PSP coverage stub replacement for fppLib.h */
-#ifndef _PSP_STUB_FPPLIB_H_
-#define _PSP_STUB_FPPLIB_H_
+#ifndef PCS_FPPLIB_H
+#define PCS_FPPLIB_H
 
 #include "PCS_basetypes.h"
 
@@ -22,4 +22,4 @@ typedef struct
 /* ----------------------------------------- */
 extern void PCS_fppSave(PCS_FP_CONTEXT *fpc);
 
-#endif /* _PSP_STUB_FPPLIB_H_ */
+#endif
diff --git a/unit-test-coverage/ut-stubs/inc/PCS_mcpx750.h b/unit-test-coverage/ut-stubs/inc/PCS_mcpx750.h
index 50e9f2f8..e3b651f7 100644
--- a/unit-test-coverage/ut-stubs/inc/PCS_mcpx750.h
+++ b/unit-test-coverage/ut-stubs/inc/PCS_mcpx750.h
@@ -1,6 +1,6 @@
 /* PSP coverage stub replacement for mcpx750.h */
-#ifndef _PSP_STUB_MCPX750_H_
-#define _PSP_STUB_MCPX750_H_
+#ifndef PCS_MCPX750_H
+#define PCS_MCPX750_H
 
 #include "PCS_basetypes.h"
 
@@ -24,4 +24,4 @@ extern uint32_t *PCS_SYS_REG_BLRR;
 /* prototypes normally declared in mcpx750.h */
 /* ----------------------------------------- */
 
-#endif /* _PSP_STUB_MCPX750_H_ */
+#endif
diff --git a/unit-test-coverage/ut-stubs/inc/PCS_moduleLib.h b/unit-test-coverage/ut-stubs/inc/PCS_moduleLib.h
index 7872acca..27ce7b8a 100644
--- a/unit-test-coverage/ut-stubs/inc/PCS_moduleLib.h
+++ b/unit-test-coverage/ut-stubs/inc/PCS_moduleLib.h
@@ -1,6 +1,6 @@
 /* PSP coverage stub replacement for moduleLib.h */
-#ifndef _PSP_STUB_MODULELIB_H_
-#define _PSP_STUB_MODULELIB_H_
+#ifndef PCS_MODULELIB_H
+#define PCS_MODULELIB_H
 
 #include "PCS_basetypes.h"
 #include "PCS_vxWorks.h"
@@ -39,4 +39,4 @@ typedef struct PCS_MODULE_INFO
 extern PCS_STATUS    PCS_moduleInfoGet(PCS_MODULE_ID moduleId, PCS_MODULE_INFO *pModuleInfo);
 extern PCS_MODULE_ID PCS_moduleFindByName(const char *moduleName);
 
-#endif /* _PSP_STUB_MODULELIB_H_ */
+#endif
diff --git a/unit-test-coverage/ut-stubs/inc/PCS_ramDrv.h b/unit-test-coverage/ut-stubs/inc/PCS_ramDrv.h
index 5db51e75..cee7bacd 100644
--- a/unit-test-coverage/ut-stubs/inc/PCS_ramDrv.h
+++ b/unit-test-coverage/ut-stubs/inc/PCS_ramDrv.h
@@ -1,6 +1,6 @@
 /* PSP coverage stub replacement for ramDrv.h */
-#ifndef _PSP_STUB_RAMDRV_H_
-#define _PSP_STUB_RAMDRV_H_
+#ifndef PCS_RAMDRV_H
+#define PCS_RAMDRV_H
 
 #include "PCS_basetypes.h"
 #include "PCS_vxWorks.h"
@@ -19,4 +19,4 @@
 /* ----------------------------------------- */
 extern PCS_BLK_DEV *PCS_ramDevCreate(char *ramAddr, int bytesPerSec, int secPerTrack, int nSectors, int secOffset);
 
-#endif /* _PSP_STUB_RAMDRV_H_ */
+#endif
diff --git a/unit-test-coverage/ut-stubs/inc/PCS_rebootLib.h b/unit-test-coverage/ut-stubs/inc/PCS_rebootLib.h
index 91b644c9..20c4dbfd 100644
--- a/unit-test-coverage/ut-stubs/inc/PCS_rebootLib.h
+++ b/unit-test-coverage/ut-stubs/inc/PCS_rebootLib.h
@@ -1,6 +1,6 @@
 /* PSP coverage stub replacement for rebootLib.h */
-#ifndef _PSP_STUB_REBOOTLIB_H_
-#define _PSP_STUB_REBOOTLIB_H_
+#ifndef PCS_REBOOTLIB_H
+#define PCS_REBOOTLIB_H
 
 #include "PCS_basetypes.h"
 
@@ -19,4 +19,4 @@
 /* ----------------------------------------- */
 extern void PCS_reboot(int);
 
-#endif /* _PSP_STUB_REBOOTLIB_H_ */
+#endif
diff --git a/unit-test-coverage/ut-stubs/inc/PCS_stdarg.h b/unit-test-coverage/ut-stubs/inc/PCS_stdarg.h
index eb547226..5217ca86 100644
--- a/unit-test-coverage/ut-stubs/inc/PCS_stdarg.h
+++ b/unit-test-coverage/ut-stubs/inc/PCS_stdarg.h
@@ -1,6 +1,6 @@
 /* PSP coverage stub replacement for stdarg.h */
-#ifndef _PSP_STUB_STDARG_H_
-#define _PSP_STUB_STDARG_H_
+#ifndef PCS_STDARG_H
+#define PCS_STDARG_H
 
 #include "PCS_basetypes.h"
 
@@ -23,4 +23,4 @@ typedef struct
 #define PCS_va_start(ap, last) ap.p = &last
 #define PCS_va_end(ap)
 
-#endif /* _PSP_STUB_STDARG_H_ */
+#endif
diff --git a/unit-test-coverage/ut-stubs/inc/PCS_stdio.h b/unit-test-coverage/ut-stubs/inc/PCS_stdio.h
index d2c6db0a..d3079c01 100644
--- a/unit-test-coverage/ut-stubs/inc/PCS_stdio.h
+++ b/unit-test-coverage/ut-stubs/inc/PCS_stdio.h
@@ -1,6 +1,6 @@
 /* PSP coverage stub replacement for stdio.h */
-#ifndef _PSP_STUB_STDIO_H_
-#define _PSP_STUB_STDIO_H_
+#ifndef PCS_STDIO_H
+#define PCS_STDIO_H
 
 #include "PCS_basetypes.h"
 #include "PCS_stdarg.h"
@@ -33,4 +33,4 @@ extern PCS_FILE *PCS_stdin;
 extern PCS_FILE *PCS_stdout;
 extern PCS_FILE *PCS_stderr;
 
-#endif /* _PSP_STUB_STDIO_H_ */
+#endif
diff --git a/unit-test-coverage/ut-stubs/inc/PCS_stdlib.h b/unit-test-coverage/ut-stubs/inc/PCS_stdlib.h
index 03ae7935..180831b9 100644
--- a/unit-test-coverage/ut-stubs/inc/PCS_stdlib.h
+++ b/unit-test-coverage/ut-stubs/inc/PCS_stdlib.h
@@ -1,6 +1,6 @@
 /* PSP coverage stub replacement for stdlib.h */
-#ifndef _PSP_STUB_STDLIB_H_
-#define _PSP_STUB_STDLIB_H_
+#ifndef PCS_STDLIB_H
+#define PCS_STDLIB_H
 
 #include "PCS_basetypes.h"
 
@@ -25,4 +25,4 @@ extern int               PCS_system(const char *command);
 extern void *            PCS_malloc(size_t sz);
 extern void              PCS_free(void *ptr);
 
-#endif /* _PSP_STUB_STDLIB_H_ */
+#endif
diff --git a/unit-test-coverage/ut-stubs/inc/PCS_string.h b/unit-test-coverage/ut-stubs/inc/PCS_string.h
index 045519dd..a24d5a7c 100644
--- a/unit-test-coverage/ut-stubs/inc/PCS_string.h
+++ b/unit-test-coverage/ut-stubs/inc/PCS_string.h
@@ -1,6 +1,6 @@
 /* PSP coverage stub replacement for string.h */
-#ifndef _PSP_STUB_STRING_H_
-#define _PSP_STUB_STRING_H_
+#ifndef PCS_STRING_H
+#define PCS_STRING_H
 
 #include "PCS_basetypes.h"
 
@@ -29,4 +29,4 @@ extern char * PCS_strcat(char *dest, const char *src);
 extern char * PCS_strncat(char *dest, const char *src, size_t n);
 extern char * PCS_strerror(int errnum);
 
-#endif /* _PSP_STUB_STRING_H_ */
+#endif
diff --git a/unit-test-coverage/ut-stubs/inc/PCS_sysLib.h b/unit-test-coverage/ut-stubs/inc/PCS_sysLib.h
index 35390da2..62c69762 100644
--- a/unit-test-coverage/ut-stubs/inc/PCS_sysLib.h
+++ b/unit-test-coverage/ut-stubs/inc/PCS_sysLib.h
@@ -1,6 +1,6 @@
 /* PSP coverage stub replacement for sysLib.h */
-#ifndef _PSP_STUB_SYSLIB_H_
-#define _PSP_STUB_SYSLIB_H_
+#ifndef PCS_SYSLIB_H
+#define PCS_SYSLIB_H
 
 #include "PCS_basetypes.h"
 #include "PCS_vxWorks.h"
@@ -27,4 +27,4 @@ extern void PCS_sysPciRead32(uint32_t address, uint32_t *data);
 extern unsigned int PCS_GetWrsKernelTextStart(void);
 extern unsigned int PCS_GetWrsKernelTextEnd(void);
 
-#endif /* _PSP_STUB_SYSLIB_H_ */
+#endif
diff --git a/unit-test-coverage/ut-stubs/inc/PCS_sys_types.h b/unit-test-coverage/ut-stubs/inc/PCS_sys_types.h
index 68395021..66b2c429 100644
--- a/unit-test-coverage/ut-stubs/inc/PCS_sys_types.h
+++ b/unit-test-coverage/ut-stubs/inc/PCS_sys_types.h
@@ -1,6 +1,6 @@
 /* PSP coverage stub replacement for sys/types.h */
-#ifndef _PSP_STUB_SYS_TYPES_H_
-#define _PSP_STUB_SYS_TYPES_H_
+#ifndef PCS_SYS_TYPES_H
+#define PCS_SYS_TYPES_H
 
 #include "PCS_basetypes.h"
 
@@ -23,4 +23,4 @@ typedef int          PCS_uid_t;
 /* prototypes normally declared in sys/types.h */
 /* ----------------------------------------- */
 
-#endif /* _PSP_STUB_SYS_TYPES_H_ */
+#endif
diff --git a/unit-test-coverage/ut-stubs/inc/PCS_taskLib.h b/unit-test-coverage/ut-stubs/inc/PCS_taskLib.h
index 81c778e6..4c4c8a81 100644
--- a/unit-test-coverage/ut-stubs/inc/PCS_taskLib.h
+++ b/unit-test-coverage/ut-stubs/inc/PCS_taskLib.h
@@ -1,6 +1,6 @@
 /* PSP coverage stub replacement for taskLib.h */
-#ifndef _PSP_STUB_TASKLIB_H_
-#define _PSP_STUB_TASKLIB_H_
+#ifndef PCS_TASKLIB_H
+#define PCS_TASKLIB_H
 
 #include "PCS_basetypes.h"
 #include "PCS_vxWorks.h"
@@ -59,4 +59,4 @@ PCS_STATUS PCS_taskInit(PCS_WIND_TCB *pTcb, char *name, int priority, int option
 
 PCS_WIND_TCB *PCS_taskTcb(PCS_TASK_ID tid);
 
-#endif /* _PSP_STUB_TASKLIB_H_ */
+#endif
diff --git a/unit-test-coverage/ut-stubs/inc/PCS_time.h b/unit-test-coverage/ut-stubs/inc/PCS_time.h
index 5cd9ee08..027b3e48 100644
--- a/unit-test-coverage/ut-stubs/inc/PCS_time.h
+++ b/unit-test-coverage/ut-stubs/inc/PCS_time.h
@@ -1,6 +1,6 @@
 /* PSP coverage stub replacement for time.h */
-#ifndef PSP_STUB_TIME_H
-#define PSP_STUB_TIME_H
+#ifndef PCS_TIME_H
+#define PCS_TIME_H
 
 #include "PCS_basetypes.h"
 
@@ -16,4 +16,4 @@
 /* prototypes normally declared in time.h */
 /* ----------------------------------------- */
 
-#endif /* PSP_STUB_TIME_H */
+#endif
diff --git a/unit-test-coverage/ut-stubs/inc/PCS_unistd.h b/unit-test-coverage/ut-stubs/inc/PCS_unistd.h
index 93ed9101..7afa6a3c 100644
--- a/unit-test-coverage/ut-stubs/inc/PCS_unistd.h
+++ b/unit-test-coverage/ut-stubs/inc/PCS_unistd.h
@@ -1,6 +1,6 @@
 /* PSP coverage stub replacement for unistd.h */
-#ifndef _PSP_STUB_UNISTD_H_
-#define _PSP_STUB_UNISTD_H_
+#ifndef PCS_UNISTD_H
+#define PCS_UNISTD_H
 
 #include "PCS_basetypes.h"
 #include "PCS_sys_types.h"
@@ -36,4 +36,4 @@ extern int         PCS_rmdir(const char *path);
 extern long int    PCS_sysconf(int name);
 extern PCS_ssize_t PCS_write(int fd, const void *buf, size_t n);
 
-#endif /* _PSP_STUB_UNISTD_H_ */
+#endif
diff --git a/unit-test-coverage/ut-stubs/inc/PCS_usrLib.h b/unit-test-coverage/ut-stubs/inc/PCS_usrLib.h
index bd966013..1f4ccaa4 100644
--- a/unit-test-coverage/ut-stubs/inc/PCS_usrLib.h
+++ b/unit-test-coverage/ut-stubs/inc/PCS_usrLib.h
@@ -1,6 +1,6 @@
 /* PSP coverage stub replacement for usrLib.h */
-#ifndef _PSP_STUB_USRLIB_H_
-#define _PSP_STUB_USRLIB_H_
+#ifndef PCS_USRLIB_H
+#define PCS_USRLIB_H
 
 #include "PCS_basetypes.h"
 #include "PCS_vxWorks.h"
@@ -17,4 +17,4 @@
 /* prototypes normally declared in usrLib.h */
 /* ----------------------------------------- */
 
-#endif /* _PSP_STUB_USRLIB_H_ */
+#endif
diff --git a/unit-test-coverage/ut-stubs/inc/PCS_vxLib.h b/unit-test-coverage/ut-stubs/inc/PCS_vxLib.h
index e797053a..1d321e10 100644
--- a/unit-test-coverage/ut-stubs/inc/PCS_vxLib.h
+++ b/unit-test-coverage/ut-stubs/inc/PCS_vxLib.h
@@ -1,6 +1,6 @@
 /* PSP coverage stub replacement for vxLib.h */
-#ifndef _PSP_STUB_VXLIB_H_
-#define _PSP_STUB_VXLIB_H_
+#ifndef PCS_VXLIB_H
+#define PCS_VXLIB_H
 
 #include "PCS_basetypes.h"
 
@@ -16,4 +16,4 @@
 /* prototypes normally declared in vxLib.h */
 /* ----------------------------------------- */
 
-#endif /* _PSP_STUB_VXLIB_H_ */
+#endif
diff --git a/unit-test-coverage/ut-stubs/inc/PCS_vxWorks.h b/unit-test-coverage/ut-stubs/inc/PCS_vxWorks.h
index 15ceacd4..8cfe1ee6 100644
--- a/unit-test-coverage/ut-stubs/inc/PCS_vxWorks.h
+++ b/unit-test-coverage/ut-stubs/inc/PCS_vxWorks.h
@@ -11,14 +11,14 @@
  */
 
 /**
- * \file     PCS_vxWorks.h
+ * \file
  * \ingroup  ut-stubs
  * \author   joseph.p.hickey@nasa.gov
  * PSP coverage stub replacement for vxWorks.h
  */
 
-#ifndef INCLUDE_OCS_VXWORKS_H_
-#define INCLUDE_OCS_VXWORKS_H_
+#ifndef PCS_VXWORKS_H
+#define PCS_VXWORKS_H
 
 #include "PCS_basetypes.h"
 
@@ -68,4 +68,4 @@ typedef void (*PCS_VOIDFUNCPTR)(void);
 /* prototypes normally declared in vxWorks.h */
 /* ----------------------------------------- */
 
-#endif /* INCLUDE_OCS_VXWORKS_H_ */
+#endif
diff --git a/unit-test-coverage/ut-stubs/inc/PCS_xbdBlkDev.h b/unit-test-coverage/ut-stubs/inc/PCS_xbdBlkDev.h
index 2d9b6cca..6f546775 100644
--- a/unit-test-coverage/ut-stubs/inc/PCS_xbdBlkDev.h
+++ b/unit-test-coverage/ut-stubs/inc/PCS_xbdBlkDev.h
@@ -1,6 +1,6 @@
 /* PSP coverage stub replacement for xbdBlkDev.h */
-#ifndef _PSP_STUB_XBDBLKDEV_H_
-#define _PSP_STUB_XBDBLKDEV_H_
+#ifndef PCS_XBDBLKDEV_H
+#define PCS_XBDBLKDEV_H
 
 #include "PCS_basetypes.h"
 #include "PCS_vxWorks.h"
@@ -22,4 +22,4 @@ typedef int PCS_device_t;
 extern PCS_device_t PCS_xbdBlkDevCreateSync(PCS_BLK_DEV *bd, const char *name);
 extern PCS_STATUS   PCS_xbdBlkDevDelete(PCS_device_t dev, PCS_BLK_DEV **ppbd);
 
-#endif /* _PSP_STUB_XBDBLKDEV_H_ */
+#endif
diff --git a/unit-test-coverage/ut-stubs/inc/PCS_xbdRamDisk.h b/unit-test-coverage/ut-stubs/inc/PCS_xbdRamDisk.h
index a432a8af..7847103a 100644
--- a/unit-test-coverage/ut-stubs/inc/PCS_xbdRamDisk.h
+++ b/unit-test-coverage/ut-stubs/inc/PCS_xbdRamDisk.h
@@ -1,6 +1,6 @@
 /* PSP coverage stub replacement for xbdRamDisk.h */
-#ifndef _PSP_STUB_XBDRAMDISK_H_
-#define _PSP_STUB_XBDRAMDISK_H_
+#ifndef PCS_XBDRAMDISK_H
+#define PCS_XBDRAMDISK_H
 
 #include "PCS_basetypes.h"
 #include "PCS_vxWorks.h"
@@ -17,4 +17,4 @@
 /* prototypes normally declared in xbdRamDisk.h */
 /* ----------------------------------------- */
 
-#endif /* _PSP_STUB_XBDRAMDISK_H_ */
+#endif
diff --git a/unit-test-coverage/ut-stubs/override_inc/arch/ppc/esfPpc.h b/unit-test-coverage/ut-stubs/override_inc/arch/ppc/esfPpc.h
index 4ffcc65f..65900c10 100644
--- a/unit-test-coverage/ut-stubs/override_inc/arch/ppc/esfPpc.h
+++ b/unit-test-coverage/ut-stubs/override_inc/arch/ppc/esfPpc.h
@@ -9,8 +9,8 @@
  */
 
 /* PSP coverage stub replacement for fenv.h */
-#ifndef _PSP_OVERRIDE_ESFPPC_H_
-#define _PSP_OVERRIDE_ESFPPC_H_
+#ifndef OVERRIDE_ESFPPC_H
+#define OVERRIDE_ESFPPC_H
 
 #include "PCS_arch_ppc_esfPpc.h"
 
@@ -19,4 +19,4 @@
 /* ----------------------------------------- */
 #define ESFPPC PCS_ESFPPC
 
-#endif /* _PSP_OVERRIDE_ESFPPC_H_ */
+#endif
diff --git a/unit-test-coverage/ut-stubs/override_inc/arch/ppc/vxPpcLib.h b/unit-test-coverage/ut-stubs/override_inc/arch/ppc/vxPpcLib.h
index e10e3adf..0c43eae0 100644
--- a/unit-test-coverage/ut-stubs/override_inc/arch/ppc/vxPpcLib.h
+++ b/unit-test-coverage/ut-stubs/override_inc/arch/ppc/vxPpcLib.h
@@ -9,8 +9,8 @@
  */
 
 /* PSP coverage stub replacement for vxPpcLib.h */
-#ifndef _PSP_OVERRIDE_VXPPCLIB_H_
-#define _PSP_OVERRIDE_VXPPCLIB_H_
+#ifndef OVERRIDE_VXPPCLIB_H
+#define OVERRIDE_VXPPCLIB_H
 
 #include "PCS_arch_ppc_vxPpcLib.h"
 
@@ -48,4 +48,4 @@
 #define vxFpscrGet PCS_vxFpscrGet
 #define vxDecGet   PCS_vxDecGet
 
-#endif /* _PSP_OVERRIDE_VXPPCLIB_H_ */
+#endif
diff --git a/unit-test-coverage/ut-stubs/override_inc/blkIo.h b/unit-test-coverage/ut-stubs/override_inc/blkIo.h
index 6b15ce02..d73db1d9 100644
--- a/unit-test-coverage/ut-stubs/override_inc/blkIo.h
+++ b/unit-test-coverage/ut-stubs/override_inc/blkIo.h
@@ -9,8 +9,8 @@
  */
 
 /* PSP coverage stub replacement for blkIo.h */
-#ifndef _PSP_OVERRIDE_BLKIO_H_
-#define _PSP_OVERRIDE_BLKIO_H_
+#ifndef OVERRIDE_BLKIO_H
+#define OVERRIDE_BLKIO_H
 
 #include "PCS_blkIo.h"
 #include <vxWorks.h>
@@ -22,4 +22,4 @@
 #define BLK_DEV    PCS_BLK_DEV
 #define BLK_DEV_ID PCS_BLK_DEV_ID
 
-#endif /* _PSP_OVERRIDE_BLKIO_H_ */
+#endif
diff --git a/unit-test-coverage/ut-stubs/override_inc/cacheLib.h b/unit-test-coverage/ut-stubs/override_inc/cacheLib.h
index fd22e447..502db130 100644
--- a/unit-test-coverage/ut-stubs/override_inc/cacheLib.h
+++ b/unit-test-coverage/ut-stubs/override_inc/cacheLib.h
@@ -9,8 +9,8 @@
  */
 
 /* PSP coverage stub replacement for cacheLib.h */
-#ifndef _PSP_OVERRIDE_CACHELIB_H_
-#define _PSP_OVERRIDE_CACHELIB_H_
+#ifndef OVERRIDE_CACHELIB_H
+#define OVERRIDE_CACHELIB_H
 
 #include "PCS_cacheLib.h"
 
@@ -19,4 +19,4 @@
 /* ----------------------------------------- */
 #define cacheTextUpdate PCS_cacheTextUpdate
 
-#endif /* _PSP_OVERRIDE_CACHELIB_H_ */
+#endif
diff --git a/unit-test-coverage/ut-stubs/override_inc/dosFsLib.h b/unit-test-coverage/ut-stubs/override_inc/dosFsLib.h
index a477443e..6ce1a5db 100644
--- a/unit-test-coverage/ut-stubs/override_inc/dosFsLib.h
+++ b/unit-test-coverage/ut-stubs/override_inc/dosFsLib.h
@@ -9,8 +9,8 @@
  */
 
 /* PSP coverage stub replacement for dosFsLib.h */
-#ifndef _PSP_OVERRIDE_DOSFSLIB_H_
-#define _PSP_OVERRIDE_DOSFSLIB_H_
+#ifndef OVERRIDE_DOSFSLIB_H
+#define OVERRIDE_DOSFSLIB_H
 
 #include "PCS_dosFsLib.h"
 #include <vxWorks.h>
@@ -26,4 +26,4 @@
 
 #define dosFsVolFormat PCS_dosFsVolFormat
 
-#endif /* _PSP_OVERRIDE_DOSFSLIB_H_ */
+#endif
diff --git a/unit-test-coverage/ut-stubs/override_inc/drv/hdisk/ataDrv.h b/unit-test-coverage/ut-stubs/override_inc/drv/hdisk/ataDrv.h
index bdf21555..3e0c3eff 100644
--- a/unit-test-coverage/ut-stubs/override_inc/drv/hdisk/ataDrv.h
+++ b/unit-test-coverage/ut-stubs/override_inc/drv/hdisk/ataDrv.h
@@ -9,8 +9,8 @@
  */
 
 /* PSP coverage stub replacement for drv/hdisk/ataDrv.h */
-#ifndef _PSP_OVERRIDE_DRV_HDISK_ATADRV_H_
-#define _PSP_OVERRIDE_DRV_HDISK_ATADRV_H_
+#ifndef OVERRIDE_DRV_HDISK_ATADRV_H
+#define OVERRIDE_DRV_HDISK_ATADRV_H
 
 #include "PCS_drv_hdisk_ataDrv.h"
 #include <vxWorks.h>
@@ -22,4 +22,4 @@
 #define ataDevCreate    PCS_ataDevCreate
 #define ataXbdDevCreate PCS_ataXbdDevCreate
 
-#endif /* _PSP_OVERRIDE_DRV_HDISK_ATADRV_H_ */
+#endif
diff --git a/unit-test-coverage/ut-stubs/override_inc/errnoLib.h b/unit-test-coverage/ut-stubs/override_inc/errnoLib.h
index 06ec500b..c6c5f5d8 100644
--- a/unit-test-coverage/ut-stubs/override_inc/errnoLib.h
+++ b/unit-test-coverage/ut-stubs/override_inc/errnoLib.h
@@ -9,8 +9,8 @@
  */
 
 /* PSP coverage stub replacement for errnoLib.h */
-#ifndef _PSP_OVERRIDE_ERRNOLIB_H_
-#define _PSP_OVERRIDE_ERRNOLIB_H_
+#ifndef OVERRIDE_ERRNOLIB_H
+#define OVERRIDE_ERRNOLIB_H
 
 #include "PCS_errnoLib.h"
 #include <vxWorks.h>
@@ -20,4 +20,4 @@
 /* -----------------------------------------  */
 #define errnoGet PCS_errnoGet
 
-#endif /* _PSP_OVERRIDE_ERRNOLIB_H_ */
+#endif
diff --git a/unit-test-coverage/ut-stubs/override_inc/excLib.h b/unit-test-coverage/ut-stubs/override_inc/excLib.h
index e259f5e6..1f248e56 100644
--- a/unit-test-coverage/ut-stubs/override_inc/excLib.h
+++ b/unit-test-coverage/ut-stubs/override_inc/excLib.h
@@ -9,8 +9,8 @@
  */
 
 /* PSP coverage stub replacement for excLib.h */
-#ifndef _PSP_OVERRIDE_EXCLIB_H_
-#define _PSP_OVERRIDE_EXCLIB_H_
+#ifndef OVERRIDE_EXCLIB_H
+#define OVERRIDE_EXCLIB_H
 
 #include <vxWorks.h>
 #include "PCS_excLib.h"
@@ -20,4 +20,4 @@
 /* -----------------------------------------  */
 #define excHookAdd PCS_excHookAdd
 
-#endif /* _PSP_OVERRIDE_EXCLIB_H_ */
+#endif
diff --git a/unit-test-coverage/ut-stubs/override_inc/fppLib.h b/unit-test-coverage/ut-stubs/override_inc/fppLib.h
index 9aa92bfd..71403166 100644
--- a/unit-test-coverage/ut-stubs/override_inc/fppLib.h
+++ b/unit-test-coverage/ut-stubs/override_inc/fppLib.h
@@ -9,8 +9,8 @@
  */
 
 /* PSP coverage stub replacement for fppLib.h */
-#ifndef _PSP_OVERRIDE_FPPLIB_H_
-#define _PSP_OVERRIDE_FPPLIB_H_
+#ifndef OVERRIDE_FPPLIB_H
+#define OVERRIDE_FPPLIB_H
 
 #include "PCS_fppLib.h"
 
@@ -20,4 +20,4 @@
 #define FP_CONTEXT PCS_FP_CONTEXT
 #define fppSave    PCS_fppSave
 
-#endif /* _PSP_OVERRIDE_FPPLIB_H_ */
+#endif
diff --git a/unit-test-coverage/ut-stubs/override_inc/mcpx750.h b/unit-test-coverage/ut-stubs/override_inc/mcpx750.h
index 0bc3eca4..c68c113d 100644
--- a/unit-test-coverage/ut-stubs/override_inc/mcpx750.h
+++ b/unit-test-coverage/ut-stubs/override_inc/mcpx750.h
@@ -9,8 +9,8 @@
  */
 
 /* PSP coverage stub replacement for mcpx750.h */
-#ifndef _PSP_OVERRIDE_MCPX750_H_
-#define _PSP_OVERRIDE_MCPX750_H_
+#ifndef OVERRIDE_MCPX750_H
+#define OVERRIDE_MCPX750_H
 
 #include "PCS_mcpx750.h"
 
@@ -30,4 +30,4 @@
 #define sysPciWrite32 PCS_sysPciWrite32
 #define sysPciRead32  PCS_sysPciRead32
 
-#endif /* _PSP_OVERRIDE_MCPX750_H_ */
+#endif
diff --git a/unit-test-coverage/ut-stubs/override_inc/moduleLib.h b/unit-test-coverage/ut-stubs/override_inc/moduleLib.h
index ac4b1944..3d50e87f 100644
--- a/unit-test-coverage/ut-stubs/override_inc/moduleLib.h
+++ b/unit-test-coverage/ut-stubs/override_inc/moduleLib.h
@@ -9,8 +9,8 @@
  */
 
 /* PSP coverage stub replacement for moduleLib.h */
-#ifndef _PSP_OVERRIDE_MODULELIB_H_
-#define _PSP_OVERRIDE_MODULELIB_H_
+#ifndef OVERRIDE_MODULELIB_H
+#define OVERRIDE_MODULELIB_H
 
 #include "PCS_moduleLib.h"
 #include <vxWorks.h>
@@ -25,4 +25,4 @@
 #define moduleInfoGet    PCS_moduleInfoGet
 #define moduleFindByName PCS_moduleFindByName
 
-#endif /* _PSP_OVERRIDE_MODULELIB_H_ */
+#endif
diff --git a/unit-test-coverage/ut-stubs/override_inc/ramDrv.h b/unit-test-coverage/ut-stubs/override_inc/ramDrv.h
index 417c4edb..2acfee26 100644
--- a/unit-test-coverage/ut-stubs/override_inc/ramDrv.h
+++ b/unit-test-coverage/ut-stubs/override_inc/ramDrv.h
@@ -9,8 +9,8 @@
  */
 
 /* PSP coverage stub replacement for ramDrv.h */
-#ifndef _PSP_OVERRIDE_RAMDRV_H_
-#define _PSP_OVERRIDE_RAMDRV_H_
+#ifndef OVERRIDE_RAMDRV_H
+#define OVERRIDE_RAMDRV_H
 
 #include "PCS_ramDrv.h"
 #include <vxWorks.h>
@@ -22,4 +22,4 @@
 
 #define ramDevCreate PCS_ramDevCreate
 
-#endif /* _PSP_OVERRIDE_RAMDRV_H_ */
+#endif
diff --git a/unit-test-coverage/ut-stubs/override_inc/rebootLib.h b/unit-test-coverage/ut-stubs/override_inc/rebootLib.h
index a94756c1..21af929f 100644
--- a/unit-test-coverage/ut-stubs/override_inc/rebootLib.h
+++ b/unit-test-coverage/ut-stubs/override_inc/rebootLib.h
@@ -9,8 +9,8 @@
  */
 
 /* PSP coverage stub replacement for rebootLib.h */
-#ifndef _PSP_OVERRIDE_REBOOTLIB_H_
-#define _PSP_OVERRIDE_REBOOTLIB_H_
+#ifndef OVERRIDE_REBOOTLIB_H
+#define OVERRIDE_REBOOTLIB_H
 
 #include "PCS_rebootLib.h"
 
@@ -22,4 +22,4 @@
 
 #define reboot PCS_reboot
 
-#endif /* _PSP_OVERRIDE_REBOOTLIB_H_ */
+#endif
diff --git a/unit-test-coverage/ut-stubs/override_inc/stdarg.h b/unit-test-coverage/ut-stubs/override_inc/stdarg.h
index 24d38d28..e0721fc5 100644
--- a/unit-test-coverage/ut-stubs/override_inc/stdarg.h
+++ b/unit-test-coverage/ut-stubs/override_inc/stdarg.h
@@ -9,8 +9,8 @@
  */
 
 /* PSP coverage stub replacement for stdarg.h */
-#ifndef _PSP_OVERRIDE_STDARG_H_
-#define _PSP_OVERRIDE_STDARG_H_
+#ifndef OVERRIDE_STDARG_H
+#define OVERRIDE_STDARG_H
 
 #include "PCS_stdarg.h"
 
@@ -22,4 +22,4 @@
 #define va_start(ap, last) PCS_va_start(ap, last)
 #define va_end(ap)         PCS_va_end(ap)
 
-#endif /* _PSP_OVERRIDE_STDARG_H_ */
+#endif
diff --git a/unit-test-coverage/ut-stubs/override_inc/stdio.h b/unit-test-coverage/ut-stubs/override_inc/stdio.h
index cf8fc7a3..dce46ac2 100644
--- a/unit-test-coverage/ut-stubs/override_inc/stdio.h
+++ b/unit-test-coverage/ut-stubs/override_inc/stdio.h
@@ -9,8 +9,8 @@
  */
 
 /* PSP coverage stub replacement for stdio.h */
-#ifndef _PSP_OVERRIDE_STDIO_H_
-#define _PSP_OVERRIDE_STDIO_H_
+#ifndef OVERRIDE_STDIO_H
+#define OVERRIDE_STDIO_H
 
 #include "PCS_stdio.h"
 
@@ -34,4 +34,4 @@
 #define stdout PCS_stdout
 #define stderr PCS_stderr
 
-#endif /* _PSP_OVERRIDE_STDIO_H_ */
+#endif
diff --git a/unit-test-coverage/ut-stubs/override_inc/stdlib.h b/unit-test-coverage/ut-stubs/override_inc/stdlib.h
index b4b1940a..d1f9801d 100644
--- a/unit-test-coverage/ut-stubs/override_inc/stdlib.h
+++ b/unit-test-coverage/ut-stubs/override_inc/stdlib.h
@@ -9,8 +9,8 @@
  */
 
 /* PSP coverage stub replacement for stdlib.h */
-#ifndef _PSP_OVERRIDE_STDLIB_H_
-#define _PSP_OVERRIDE_STDLIB_H_
+#ifndef OVERRIDE_STDLIB_H
+#define OVERRIDE_STDLIB_H
 
 #include "PCS_stdlib.h"
 
@@ -26,4 +26,4 @@
 #define malloc       PCS_malloc
 #define free         PCS_free
 
-#endif /* _PSP_OVERRIDE_STDLIB_H_ */
+#endif
diff --git a/unit-test-coverage/ut-stubs/override_inc/string.h b/unit-test-coverage/ut-stubs/override_inc/string.h
index 633eee02..08b30ba6 100644
--- a/unit-test-coverage/ut-stubs/override_inc/string.h
+++ b/unit-test-coverage/ut-stubs/override_inc/string.h
@@ -9,8 +9,8 @@
  */
 
 /* PSP coverage stub replacement for string.h */
-#ifndef _PSP_OVERRIDE_STRING_H_
-#define _PSP_OVERRIDE_STRING_H_
+#ifndef OVERRIDE_STRING_H
+#define OVERRIDE_STRING_H
 
 #include "PCS_string.h"
 
@@ -30,4 +30,4 @@
 #define strncat  PCS_strncat
 #define strerror PCS_strerror
 
-#endif /* _PSP_OVERRIDE_STRING_H_ */
+#endif
diff --git a/unit-test-coverage/ut-stubs/override_inc/sys/types.h b/unit-test-coverage/ut-stubs/override_inc/sys/types.h
index f0d52329..3bfcf26d 100644
--- a/unit-test-coverage/ut-stubs/override_inc/sys/types.h
+++ b/unit-test-coverage/ut-stubs/override_inc/sys/types.h
@@ -9,8 +9,8 @@
  */
 
 /* PSP coverage stub replacement for sys/types.h */
-#ifndef _PSP_OVERRIDE_SYS_TYPES_H_
-#define _PSP_OVERRIDE_SYS_TYPES_H_
+#ifndef OVERRIDE_SYS_TYPES_H
+#define OVERRIDE_SYS_TYPES_H
 
 #include "PCS_sys_types.h"
 
@@ -24,4 +24,4 @@
 #define gid_t   PCS_gid_t
 #define uid_t   PCS_uid_t
 
-#endif /* _PSP_OVERRIDE_SYS_TYPES_H_ */
+#endif
diff --git a/unit-test-coverage/ut-stubs/override_inc/sysLib.h b/unit-test-coverage/ut-stubs/override_inc/sysLib.h
index 35425528..635a27dd 100644
--- a/unit-test-coverage/ut-stubs/override_inc/sysLib.h
+++ b/unit-test-coverage/ut-stubs/override_inc/sysLib.h
@@ -9,8 +9,8 @@
  */
 
 /* PSP coverage stub replacement for sysLib.h */
-#ifndef _PSP_OVERRIDE_SYSLIB_H_
-#define _PSP_OVERRIDE_SYSLIB_H_
+#ifndef OVERRIDE_SYSLIB_H
+#define OVERRIDE_SYSLIB_H
 
 #include "PCS_sysLib.h"
 #include <vxWorks.h>
@@ -35,4 +35,4 @@
 #define GetWrsKernelTextStart PCS_GetWrsKernelTextStart
 #define GetWrsKernelTextEnd   PCS_GetWrsKernelTextEnd
 
-#endif /* _PSP_OVERRIDE_SYSLIB_H_ */
+#endif
diff --git a/unit-test-coverage/ut-stubs/override_inc/taskLib.h b/unit-test-coverage/ut-stubs/override_inc/taskLib.h
index f982a687..b054b3c6 100644
--- a/unit-test-coverage/ut-stubs/override_inc/taskLib.h
+++ b/unit-test-coverage/ut-stubs/override_inc/taskLib.h
@@ -9,8 +9,8 @@
  */
 
 /* PSP coverage stub replacement for taskLib.h */
-#ifndef _PSP_OVERRIDE_TASKLIB_H_
-#define _PSP_OVERRIDE_TASKLIB_H_
+#ifndef OVERRIDE_TASKLIB_H
+#define OVERRIDE_TASKLIB_H
 
 #include "PCS_taskLib.h"
 #include <vxWorks.h>
@@ -43,4 +43,4 @@
 #define taskInit        PCS_taskInit
 #define taskTcb         PCS_taskTcb
 
-#endif /* _PSP_OVERRIDE_TASKLIB_H_ */
+#endif
diff --git a/unit-test-coverage/ut-stubs/override_inc/time.h b/unit-test-coverage/ut-stubs/override_inc/time.h
index 10f78f10..b23e9e78 100644
--- a/unit-test-coverage/ut-stubs/override_inc/time.h
+++ b/unit-test-coverage/ut-stubs/override_inc/time.h
@@ -9,9 +9,9 @@
  */
 
 /* PSP coverage stub replacement for time.h */
-#ifndef _PSP_OVERRIDE_TIME_H_
-#define _PSP_OVERRIDE_TIME_H_
+#ifndef OVERRIDE_TIME_H
+#define OVERRIDE_TIME_H
 
 #include "PCS_time.h"
 
-#endif /* _PSP_OVERRIDE_TIME_H_ */
+#endif
diff --git a/unit-test-coverage/ut-stubs/override_inc/unistd.h b/unit-test-coverage/ut-stubs/override_inc/unistd.h
index 4fb81368..b4c4ef4d 100644
--- a/unit-test-coverage/ut-stubs/override_inc/unistd.h
+++ b/unit-test-coverage/ut-stubs/override_inc/unistd.h
@@ -9,8 +9,8 @@
  */
 
 /* PSP coverage stub replacement for unistd.h */
-#ifndef _PSP_OVERRIDE_UNISTD_H_
-#define _PSP_OVERRIDE_UNISTD_H_
+#ifndef OVERRIDE_UNISTD_H
+#define OVERRIDE_UNISTD_H
 
 #include "PCS_unistd.h"
 
@@ -37,4 +37,4 @@
 #define sysconf     PCS_sysconf
 #define write       PCS_write
 
-#endif /* _PSP_OVERRIDE_UNISTD_H_ */
+#endif
diff --git a/unit-test-coverage/ut-stubs/override_inc/usrLib.h b/unit-test-coverage/ut-stubs/override_inc/usrLib.h
index a8d368c0..0b200482 100644
--- a/unit-test-coverage/ut-stubs/override_inc/usrLib.h
+++ b/unit-test-coverage/ut-stubs/override_inc/usrLib.h
@@ -9,8 +9,8 @@
  */
 
 /* PSP coverage stub replacement for usrLib.h */
-#ifndef _PSP_OVERRIDE_USRLIB_H_
-#define _PSP_OVERRIDE_USRLIB_H_
+#ifndef OVERRIDE_USRLIB_H
+#define OVERRIDE_USRLIB_H
 
 #include "PCS_usrLib.h"
 #include <vxWorks.h>
@@ -19,4 +19,4 @@
 /* mappings for declarations in usrLib.h */
 /* ----------------------------------------- */
 
-#endif /* _PSP_OVERRIDE_USRLIB_H_ */
+#endif
diff --git a/unit-test-coverage/ut-stubs/override_inc/vxLib.h b/unit-test-coverage/ut-stubs/override_inc/vxLib.h
index 43ac89d7..389ce0d4 100644
--- a/unit-test-coverage/ut-stubs/override_inc/vxLib.h
+++ b/unit-test-coverage/ut-stubs/override_inc/vxLib.h
@@ -9,8 +9,8 @@
  */
 
 /* PSP coverage stub replacement for vxLib.h */
-#ifndef _PSP_OVERRIDE_VXLIB_H_
-#define _PSP_OVERRIDE_VXLIB_H_
+#ifndef OVERRIDE_VXLIB_H
+#define OVERRIDE_VXLIB_H
 
 #include "PCS_vxLib.h"
 #include <arch/ppc/vxPpcLib.h>
@@ -19,4 +19,4 @@
 /* mappings for declarations in vxLib.h */
 /* ----------------------------------------- */
 
-#endif /* _PSP_OVERRIDE_VXLIB_H_ */
+#endif
diff --git a/unit-test-coverage/ut-stubs/override_inc/vxWorks.h b/unit-test-coverage/ut-stubs/override_inc/vxWorks.h
index 8aac88aa..f3863c67 100644
--- a/unit-test-coverage/ut-stubs/override_inc/vxWorks.h
+++ b/unit-test-coverage/ut-stubs/override_inc/vxWorks.h
@@ -11,14 +11,14 @@
  */
 
 /**
- * \file     vxWorks.h
+ * \file
  * \ingroup  ut-stubs
  * \author   joseph.p.hickey@nasa.gov
  *
  */
 
-#ifndef INCLUDE_VXWORKS_H_
-#define INCLUDE_VXWORKS_H_
+#ifndef OVERRIDE_VXWORKS_H
+#define OVERRIDE_VXWORKS_H
 
 #include "PCS_vxWorks.h"
 
@@ -47,4 +47,4 @@
 
 #define _Vx_usr_arg_t PCS_Vx_usr_arg_t
 
-#endif /* INCLUDE_VXWORKS_H_ */
+#endif
diff --git a/unit-test-coverage/ut-stubs/override_inc/xbdBlkDev.h b/unit-test-coverage/ut-stubs/override_inc/xbdBlkDev.h
index 4dcbefbe..93307a82 100644
--- a/unit-test-coverage/ut-stubs/override_inc/xbdBlkDev.h
+++ b/unit-test-coverage/ut-stubs/override_inc/xbdBlkDev.h
@@ -9,8 +9,8 @@
  */
 
 /* PSP coverage stub replacement for xbdBlkDev.h */
-#ifndef _PSP_OVERRIDE_XBDBLKDEV_H_
-#define _PSP_OVERRIDE_XBDBLKDEV_H_
+#ifndef OVERRIDE_XBDBLKDEV_H
+#define OVERRIDE_XBDBLKDEV_H
 
 #include "PCS_xbdBlkDev.h"
 #include <vxWorks.h>
@@ -25,4 +25,4 @@
 #define xbdBlkDevCreateSync PCS_xbdBlkDevCreateSync
 #define xbdBlkDevDelete     PCS_xbdBlkDevDelete
 
-#endif /* _PSP_OVERRIDE_XBDBLKDEV_H_ */
+#endif
diff --git a/unit-test-coverage/ut-stubs/override_inc/xbdRamDisk.h b/unit-test-coverage/ut-stubs/override_inc/xbdRamDisk.h
index 0313cbfa..3849791f 100644
--- a/unit-test-coverage/ut-stubs/override_inc/xbdRamDisk.h
+++ b/unit-test-coverage/ut-stubs/override_inc/xbdRamDisk.h
@@ -9,8 +9,8 @@
  */
 
 /* PSP coverage stub replacement for xbdRamDisk.h */
-#ifndef _PSP_OVERRIDE_XBDRAMDISK_H_
-#define _PSP_OVERRIDE_XBDRAMDISK_H_
+#ifndef OVERRIDE_XBDRAMDISK_H
+#define OVERRIDE_XBDRAMDISK_H
 
 #include "PCS_xbdRamDisk.h"
 #include <vxWorks.h>
@@ -19,4 +19,4 @@
 /* mappings for declarations in xbdRamDisk.h */
 /* ----------------------------------------- */
 
-#endif /* _PSP_OVERRIDE_XBDRAMDISK_H_ */
+#endif