Index: MsgDefs.h
===================================================================
diff -u -re4dee34da24914019a3cf84bebf762d8c4ebdc50 -r4c44e7d8b26cf54facde1a20875f9fca09358c39
--- MsgDefs.h	(.../MsgDefs.h)	(revision e4dee34da24914019a3cf84bebf762d8c4ebdc50)
+++ MsgDefs.h	(.../MsgDefs.h)	(revision 4c44e7d8b26cf54facde1a20875f9fca09358c39)
@@ -137,15 +137,14 @@
     MSG_ID_HD_SYRINGE_PUMP_DATA = 0x69,                                 ///< HD broadcast of syringe pump data
     MSG_ID_HD_FLUID_LEAK_STATE = 0x6A,                                  ///< HD broadcast of fluid leak state
     MSG_ID_DG_FLUID_LEAK_STATE = 0x6B,                                  ///< DG broadcast of fluid leak state
-    MSG_ID_HD_BLOOD_LEAK_STATUS = 0x6C,                                 ///< HD broadcast of blood leak status
+    MSG_ID_HD_BLOOD_LEAK_DATA = 0x6C,                                 ///< HD broadcast of blood leak data
     MSG_ID_UI_START_TREATMENT_REQUEST = 0x71,                           ///< UI user has requested to start treatment
     MSG_ID_HD_START_TREATMENT_RESPONSE = 0x72,                          ///< HD response to user request to start treatment
     MSG_ID_UI_DISPOSABLE_REMOVAL_CONFIRM = 0x73,                        ///< UI user has confirmed disposable removal
     MSG_ID_HD_DISPOSABLE_REMOVAL_CONFIRM_RESPONSE = 0x74,               ///< HD response to user confirmation of disposable removal
     MSG_ID_UI_TREATMENT_LOG_DATA_REQUEST = 0x75,                        ///< UI request treatment log data message
     MSG_ID_HD_TREATMENT_LOG_DATA_RESPONSE = 0x76,                       ///< HD response to UI treatment log data request
     MSG_ID_HD_POST_TREATMENT_STATE = 0x77,                              ///< HD broadcast of post-treatment state
-    MSG_ID_HD_BLOOD_LEAK_STATE = 0x78,                                  ///< HD broadcast of blood leak state
 
 #ifdef EMC_TEST_BUILD
     MSG_ID_CAN_ERROR_COUNT = 0x999,  // test code in support of EMC testing
@@ -229,10 +228,8 @@
     MSG_ID_HD_SYRINGE_PUMP_MEASURED_HOME_OVERRIDE = 0x8049,             ///< HD syringe pump measured home override request
     MSG_ID_HD_SYRINGE_PUMP_MEASURED_POSITION_OVERRIDE = 0x804A,         ///< HD syringe pump measured position override request
     MSG_ID_HD_SYRINGE_PUMP_MEASURED_VOLUME_OVERRIDE = 0x804B,           ///< HD syringe pump measured volume delivered override request
-    MSG_ID_HD_BLOOD_LEAK_STATUS_SEND_INTERVAL_OVERRIDE = 0x804C,        ///< HD blood leak status broadcast interval override request
-    MSG_ID_HD_BLOOD_LEAK_STATUS_DETECTOR_OVERRIDE = 0x804D,             ///< HD blood leak status detector override request
-    MSG_ID_HD_BLOOD_LEAK_STATE_SEND_INTERVAL_OVERRIDE = 0x804E,         ///< HD blood leak state broadcast interval override request
-    MSG_ID_HD_BLOOD_LEAK_STATE_DETECTOR_OVERRIDE = 0x804F,              ///< HD blood leak state detector override request
+    MSG_ID_HD_BLOOD_LEAK_DATA_SEND_INTERVAL_OVERRIDE = 0x804C,          ///< HD blood leak data broadcast interval override request
+    MSG_ID_HD_BLOOD_LEAK_DATA_DETECTOR_OVERRIDE = 0x804D,               ///< HD blood leak data detector override request
 
     MSG_ID_FIRST_DG_TESTER_MESSAGE = 0xA000,                            ///< First DG test message ID
     MSG_ID_DG_TESTER_LOGIN_REQUEST = MSG_ID_FIRST_DG_TESTER_MESSAGE,    ///< DG tester log-in