diff --git a/fsw/public_inc/sample_lib.h b/fsw/public_inc/sample_lib.h
index 4e596d6..e5ee276 100644
--- a/fsw/public_inc/sample_lib.h
+++ b/fsw/public_inc/sample_lib.h
@@ -24,8 +24,8 @@
 **   Specification for the sample library functions.
 **
 *************************************************************************/
-#ifndef _sample_lib_h_
-#define _sample_lib_h_
+#ifndef SAMPLE_LIB_H
+#define SAMPLE_LIB_H
 
 /************************************************************************
 ** Includes
@@ -73,8 +73,4 @@ int32 SAMPLE_LIB_Init(void);
 *************************************************************************/
 int32 SAMPLE_LIB_Function(void);
 
-#endif /* _sample_lib_h_ */
-
-/************************/
-/*  End of File Comment */
-/************************/
+#endif
diff --git a/fsw/src/sample_lib_internal.h b/fsw/src/sample_lib_internal.h
index d9f065f..71136fa 100644
--- a/fsw/src/sample_lib_internal.h
+++ b/fsw/src/sample_lib_internal.h
@@ -26,8 +26,8 @@
 ** Notes:
 **
 *************************************************************************/
-#ifndef _sample_lib_internal_h_
-#define _sample_lib_internal_h_
+#ifndef SAMPLE_LIB_INTERNAL_H
+#define SAMPLE_LIB_INTERNAL_H
 
 /* Include all external/public definitions */
 #include "sample_lib.h"
@@ -52,8 +52,4 @@ extern char SAMPLE_LIB_Buffer[SAMPLE_LIB_BUFFER_SIZE];
  */
 int32 SAMPLE_LIB_Init(void);
 
-#endif /* _sample_lib_internal_h_ */
-
-/************************/
-/*  End of File Comment */
-/************************/
+#endif
diff --git a/unit-test/coveragetest/sample_lib_coveragetest_common.h b/unit-test/coveragetest/sample_lib_coveragetest_common.h
index 38ffe9f..793d7d2 100644
--- a/unit-test/coveragetest/sample_lib_coveragetest_common.h
+++ b/unit-test/coveragetest/sample_lib_coveragetest_common.h
@@ -25,8 +25,8 @@
 ** Common definitions for all sample_lib coverage tests
 */
 
-#ifndef _SAMPLE_LIB_COVERAGETEST_COMMON_H_
-#define _SAMPLE_LIB_COVERAGETEST_COMMON_H_
+#ifndef SAMPLE_LIB_COVERAGETEST_COMMON_H
+#define SAMPLE_LIB_COVERAGETEST_COMMON_H
 
 /*
  * Includes
diff --git a/unit-test/inc/OCS_string.h b/unit-test/inc/OCS_string.h
index 8e85b98..d94f15c 100644
--- a/unit-test/inc/OCS_string.h
+++ b/unit-test/inc/OCS_string.h
@@ -30,8 +30,8 @@
 ** strncpy().
 */
 
-#ifndef _STUB_STRING_H_
-#define _STUB_STRING_H_
+#ifndef OSC_STRING_H
+#define OSC_STRING_H
 
 /* ----------------------------------------- */
 /* prototypes normally declared in string.h */
@@ -39,4 +39,4 @@
 
 extern char *OCS_strncpy(char *dest, const char *src, unsigned long size);
 
-#endif /* _STUB_STRING_H_ */
+#endif
diff --git a/unit-test/override_inc/string.h b/unit-test/override_inc/string.h
index 0dcf24d..adb1bbf 100644
--- a/unit-test/override_inc/string.h
+++ b/unit-test/override_inc/string.h
@@ -30,8 +30,8 @@
 ** strncpy().
 */
 
-#ifndef _OVERRIDE_STRING_H_
-#define _OVERRIDE_STRING_H_
+#ifndef OVERRIDE_STRING_H
+#define OVERRIDE_STRING_H
 
 #include "OCS_string.h"
 
@@ -41,4 +41,4 @@
 
 #define strncpy OCS_strncpy
 
-#endif /* _OVERRIDE_STRING_H_ */
+#endif