Index: MsgDefs.h
===================================================================
diff -u -rdabc6da0de0a2a4c7d92384a95032573f9965aee -r0be4645ebc81baa6f1553473185ff06ee42d06f8
--- MsgDefs.h	(.../MsgDefs.h)	(revision dabc6da0de0a2a4c7d92384a95032573f9965aee)
+++ MsgDefs.h	(.../MsgDefs.h)	(revision 0be4645ebc81baa6f1553473185ff06ee42d06f8)
@@ -137,15 +137,15 @@
     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
+    MSG_ID___AVAILABLE_16 = 0x78,                                       ///< This msg ID is available for use
     MSG_ID_DG_START_STOP_FLUSH = 0x79,                                  ///< DG start/stop flush mode
     MSG_ID_DG_FLUSH_DATA = 0x7A,                                        ///< DG flush data publish
 
@@ -226,15 +226,14 @@
     MSG_ID_HD_SET_SERVICE_RECORD = 0x8044,                              ///< HD set service record that is received from Dialin
     MSG_ID_HD_SEND_SERVICE_RECORD = 0x8045,                             ///< HD send service record to CAN bus to be received in Dialin (equivalent to publish)
     MSG_ID_HD_SET_OP_MODE_REQUEST = 0x8046,                             ///< HD set operation mode request
-    MSG_ID_HD_FLUID_LEAK_SEND_INTERVAL_OVERRIDE = 0x8047,               ///< HD fluid leak state broadcast interval override request
-    MSG_ID_HD_FLUID_LEAK_STATE_DETECTOR_OVERRIDE = 0x8048,              ///< HD fluid leak state detector override request
+    MSG_ID_HD_FLUID_LEAK_SEND_INTERVAL_OVERRIDE = 0x8047,               ///< HD fluid leak detector state broadcast interval override request
+    MSG_ID_HD_FLUID_LEAK_STATE_OVERRIDE = 0x8048,                       ///< HD fluid leak detector state override request
     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 detector data broadcast interval override request
+    MSG_ID_HD_BLOOD_LEAK_STATUS_OVERRIDE = 0x804D,                      ///< HD blood leak detector status override request
+    MSG_ID_HD_BLOOD_LEAK_STATE_OVERRIDE = 0x804E,                       ///< HD blood leak detector state 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