diff --git a/config/default_ci_lab_msgids.h b/config/default_ci_lab_msgids.h
index 18f841a..5cced65 100644
--- a/config/default_ci_lab_msgids.h
+++ b/config/default_ci_lab_msgids.h
@@ -26,8 +26,8 @@
 #include "cfe_core_api_base_msgids.h"
 #include "ci_lab_topicids.h"
 
-#define CI_LAB_CMD_MID     CFE_PLATFORM_CMD_TOPICID_TO_MIDV(CI_LAB_CMD_TOPICID)
-#define CI_LAB_SEND_HK_MID CFE_PLATFORM_CMD_TOPICID_TO_MIDV(CI_LAB_SEND_HK_TOPICID)
-#define CI_LAB_HK_TLM_MID  CFE_PLATFORM_TLM_TOPICID_TO_MIDV(CI_LAB_HK_TLM_TOPICID)
+#define CI_LAB_CMD_MID     CFE_PLATFORM_CMD_TOPICID_TO_MIDV(CFE_MISSION_CI_LAB_CMD_TOPICID)
+#define CI_LAB_SEND_HK_MID CFE_PLATFORM_CMD_TOPICID_TO_MIDV(CFE_MISSION_CI_LAB_SEND_HK_TOPICID)
+#define CI_LAB_HK_TLM_MID  CFE_PLATFORM_TLM_TOPICID_TO_MIDV(CFE_MISSION_CI_LAB_HK_TLM_TOPICID)
 
 #endif
diff --git a/config/default_ci_lab_topicids.h b/config/default_ci_lab_topicids.h
index 24f2ad5..09abe9e 100644
--- a/config/default_ci_lab_topicids.h
+++ b/config/default_ci_lab_topicids.h
@@ -23,8 +23,8 @@
 #ifndef CI_LAB_TOPICIDS_H
 #define CI_LAB_TOPICIDS_H
 
-#define CI_LAB_CMD_TOPICID     0x84
-#define CI_LAB_SEND_HK_TOPICID 0x85
-#define CI_LAB_HK_TLM_TOPICID  0x84
+#define CFE_MISSION_CI_LAB_CMD_TOPICID     0x84
+#define CFE_MISSION_CI_LAB_SEND_HK_TOPICID 0x85
+#define CFE_MISSION_CI_LAB_HK_TLM_TOPICID  0x84
 
 #endif