diff --git a/config/default_sample_app_msgids.h b/config/default_sample_app_msgids.h
index 652c544..d3c0c16 100644
--- a/config/default_sample_app_msgids.h
+++ b/config/default_sample_app_msgids.h
@@ -26,8 +26,8 @@
 #include "cfe_core_api_base_msgids.h"
 #include "sample_app_topicids.h"
 
-#define SAMPLE_APP_CMD_MID     CFE_PLATFORM_CMD_TOPICID_TO_MIDV(SAMPLE_APP_CMD_TOPICID)
-#define SAMPLE_APP_SEND_HK_MID CFE_PLATFORM_CMD_TOPICID_TO_MIDV(SAMPLE_APP_SEND_HK_TOPICID)
-#define SAMPLE_APP_HK_TLM_MID  CFE_PLATFORM_TLM_TOPICID_TO_MIDV(SAMPLE_APP_HK_TLM_TOPICID)
+#define SAMPLE_APP_CMD_MID     CFE_PLATFORM_CMD_TOPICID_TO_MIDV(CFE_MISSION_SAMPLE_APP_CMD_TOPICID)
+#define SAMPLE_APP_SEND_HK_MID CFE_PLATFORM_CMD_TOPICID_TO_MIDV(CFE_MISSION_SAMPLE_APP_SEND_HK_TOPICID)
+#define SAMPLE_APP_HK_TLM_MID  CFE_PLATFORM_TLM_TOPICID_TO_MIDV(CFE_MISSION_SAMPLE_APP_HK_TLM_TOPICID)
 
 #endif
diff --git a/config/default_sample_app_topicids.h b/config/default_sample_app_topicids.h
index cfb25b0..c78676e 100644
--- a/config/default_sample_app_topicids.h
+++ b/config/default_sample_app_topicids.h
@@ -23,8 +23,8 @@
 #ifndef SAMPLE_APP_TOPICIDS_H
 #define SAMPLE_APP_TOPICIDS_H
 
-#define SAMPLE_APP_CMD_TOPICID       0x82
-#define SAMPLE_APP_SEND_HK_TOPICID   0x83
-#define SAMPLE_APP_HK_TLM_TOPICID    0x83
+#define CFE_MISSION_SAMPLE_APP_CMD_TOPICID       0x82
+#define CFE_MISSION_SAMPLE_APP_SEND_HK_TOPICID   0x83
+#define CFE_MISSION_SAMPLE_APP_HK_TLM_TOPICID    0x83
 
 #endif