diff --git a/fsw/src/cf_verify.h b/fsw/src/cf_verify.h
index 06d50b4f..1330290c 100644
--- a/fsw/src/cf_verify.h
+++ b/fsw/src/cf_verify.h
@@ -24,8 +24,8 @@
 **
 *************************************************************************/
 
-#ifndef CF_VERIFY__H
-#define CF_VERIFY__H
+#ifndef CF_VERIFY_H
+#define CF_VERIFY_H
 
 #include "cfe.h"
 #include "cf_platform_cfg.h"
@@ -64,4 +64,4 @@
 #error Collision between CF_PERF_ID_PDURCVD and CF_PERF_ID_PDUSENT given number of channels
 #endif
 
-#endif /* !CF_VERIFY__H */
+#endif /* !CF_VERIFY_H */
diff --git a/fsw/src/cf_version.h b/fsw/src/cf_version.h
index b780a9de..209284c4 100644
--- a/fsw/src/cf_version.h
+++ b/fsw/src/cf_version.h
@@ -23,14 +23,14 @@
 **
 **
 *************************************************************************/
-#ifndef _cf_version_h_
-#define _cf_version_h_
+#ifndef CF_VERSION_H
+#define CF_VERSION_H
 
 #define CF_MAJOR_VERSION 3
 #define CF_MINOR_VERSION 0
 #define CF_REVISION      0
 
-#endif /* _cf_version_h_ */
+#endif /* CF_VERSION_H */
 
 /************************/
 /*  End of File Comment */