diff --git a/fsw/inc/ci_lab_eventids.h b/fsw/inc/ci_lab_eventids.h
index 7380bd4..6d25c11 100644
--- a/fsw/inc/ci_lab_eventids.h
+++ b/fsw/inc/ci_lab_eventids.h
@@ -26,14 +26,14 @@
 #define CI_LAB_RESERVED_EID         0
 #define CI_LAB_SOCKETCREATE_ERR_EID 1
 #define CI_LAB_SOCKETBIND_ERR_EID   2
-#define CI_LAB_STARTUP_INF_EID      3
-#define CI_LAB_COMMAND_ERR_EID      4
-#define CI_LAB_COMMANDNOP_INF_EID   5
-#define CI_LAB_COMMANDRST_INF_EID   6
+#define CI_LAB_INIT_INF_EID         3
+#define CI_LAB_MID_ERR_EID          4
+#define CI_LAB_NOOP_INF_EID         5
+#define CI_LAB_RESET_INF_EID        6
 #define CI_LAB_INGEST_INF_EID       7
 #define CI_LAB_INGEST_LEN_ERR_EID   8
 #define CI_LAB_INGEST_ALLOC_ERR_EID 9
 #define CI_LAB_INGEST_SEND_ERR_EID  10
-#define CI_LAB_LEN_ERR_EID          16
+#define CI_LAB_CMD_LEN_ERR_EID      16
 
 #endif
diff --git a/fsw/src/ci_lab_app.c b/fsw/src/ci_lab_app.c
index 11c9d0a..e191e07 100644
--- a/fsw/src/ci_lab_app.c
+++ b/fsw/src/ci_lab_app.c
@@ -148,7 +148,7 @@ void CI_LAB_TaskInit(void)
     CFE_MSG_Init(CFE_MSG_PTR(CI_LAB_Global.HkTlm.TelemetryHeader), CFE_SB_ValueToMsgId(CI_LAB_HK_TLM_MID),
                  sizeof(CI_LAB_Global.HkTlm));
 
-    CFE_EVS_SendEvent(CI_LAB_STARTUP_INF_EID, CFE_EVS_EventType_INFORMATION, "CI Lab Initialized.%s",
+    CFE_EVS_SendEvent(CI_LAB_INIT_INF_EID, CFE_EVS_EventType_INFORMATION, "CI Lab Initialized.%s",
                       CI_LAB_VERSION_STRING);
 }