Index: MsgDefs.h
===================================================================
diff -u -rbf926947342bad2327352d878c681401a6b2d994 -rf621619a1a439b97d9744c34bf3ef317e4499cc5
--- MsgDefs.h	(.../MsgDefs.h)	(revision bf926947342bad2327352d878c681401a6b2d994)
+++ MsgDefs.h	(.../MsgDefs.h)	(revision f621619a1a439b97d9744c34bf3ef317e4499cc5)
@@ -90,7 +90,7 @@
     MSG_ID_FP_HEATER_DATA = 0x3A,                                                   ///< FP heater data broadcast
     MSG_ID_TD_TREATMENT_TIME_DATA = 0x3B,                                           ///< TD treatment time data broadcast
     MSG_ID_TD_TREATMENT_STATE_DATA = 0x3C,                                          ///< TD treatment state data broadcast
-    MSG_ID_TD_SALINE_BOLUS_DATA = 0x3D,                                             ///< TD saline bolus status data broadcast
+    MSG_ID_TD_FLUID_BOLUS_DATA = 0x3D,                                              ///< TD fluid bolus status data broadcast
     MSG_ID_TD_ULTRAFILTRATION_DATA = 0x3E,                                          ///< TD ultrafiltration status data broadcast
     MSG_ID_UI_TREATMENT_PARAMS_TO_VALIDATE = 0x3F,                                  ///< UI treatment parameters to be validated by TD
     MSG_ID_TD_RESP_TREATMENT_PARAMS_TO_VALIDATE = 0x40,                             ///< TD response to treatment parameter validation request
@@ -124,8 +124,8 @@
     MSG_ID_DD_UF_DATA = 0x5C,                                                       ///< DD ultrafiltration data
     MSG_ID_FP_PERMEATE_TANK_DATA = 0x5D,                                            ///< FP Permeate tank broadcast data
     MSG_ID_DD_SPENT_CHAMBER_FILL_DATA = 0x5E,                                       ///< DD spent chamber fill broadcast data
-    MSG_ID_UI_SOLUTION_INFUSION_REQUEST = 0x5F,                                     ///< UI solution infusion request
-    MSG_ID_TD_SOLUTION_INFUSION_RESPONSE = 0x60,                                    ///< TD solution infusion response
+    MSG_ID_UI_FLUID_BOLUS_REQUEST = 0x5F,                                           ///< UI Fluid Bolus request
+    MSG_ID_TD_FLUID_BOLUS_RESPONSE = 0x60,                                          ///< TD Fluid Bolus response
     MSG_ID_DD_BLOOD_LEAK_DATA = 0x61,                                               ///< DD blood leak data
     MSG_ID_FP_INLET_PRESSURE_CHECK_DATA = 0x62,                                     ///< FP Inlet Pressure Check broadcast data
     MSG_ID_UI_BLOOD_PRESSURE_REQUEST = 0x63,                                        ///< UI request to initiate a blood pressure reading
@@ -490,11 +490,11 @@
     REQUEST_REJECT_REASON_TREATMENT_TIME_LESS_THAN_MINIMUM = 13,                    ///< Treatment time change is less than minimum treatment time
     REQUEST_REJECT_REASON_UF_NOT_IN_PROGESS = 14,                                   ///< Ultrafiltration is not currently in progress
     REQUEST_REJECT_REASON_UF_NOT_PAUSED = 15,                                       ///< Ultrafiltration is not currently paused
-    REQUEST_REJECT_REASON_SALINE_BOLUS_IN_PROGRESS = 16,                            ///< A saline bolus is in progress
+    REQUEST_REJECT_REASON_FLUID_BOLUS_IN_PROGRESS = 16,                            ///< A fluid bolus is in progress
     REQUEST_REJECT_REASON_PARAM_OUT_OF_RANGE = 17,                                  ///< A treatment parameter is out of range
     REQUEST_REJECT_REASON_FILTER_FLUSH_HAS_BEEN_EXPIRED = 18,                       ///< Filter flush time has been expired
     REQUEST_REJECT_REASON_SALINE_MAX_VOLUME_REACHED = 19,                           ///< Saline bolus volume maximum has been reached - no more saline allowed
-    REQUEST_REJECT_REASON_SALINE_BOLUS_NOT_IN_PROGRESS = 20,                        ///< A saline bolus is not in progress
+    REQUEST_REJECT_REASON_FLUID_BOLUS_NOT_IN_PROGRESS = 20,                         ///< A fluid bolus is not in progress
     REQUEST_REJECT_REASON_ACTION_DISABLED_IN_CURRENT_STATE = 21,                    ///< Requested user action is disabled in current state
     REQUEST_REJECT_REASON_ALARM_IS_ACTIVE = 22,                                     ///< Requested user action not allowed while alarm is active
     REQUEST_REJECT_REASON_INVALID_COMMAND = 23,                                     ///< Requested user action invalid
@@ -517,7 +517,7 @@
     REQUEST_REJECT_REASON_TD_SERVICE_IS_DUE = 40,                                   ///< TD service is due
     REQUEST_REJECT_REASON_RO_FILTER_TEMPERATURE_OUT_OF_RANGE = 41,                  ///< RO filter temperature out of range
     REQUEST_REJECT_REASON_DD_INCOMPATIBLE = 42,                                     ///< DD firmware version is not compatible with TD firmware
-    REQUEST_REJECT_REASON_DIALYZER_REPRIME_IN_PROGRESS = 43,                        ///< Saline bolus is not allowed during dialyzer reprime
+    REQUEST_REJECT_REASON_DIALYZER_REPRIME_IN_PROGRESS = 43,                        ///< Fluid bolus is not allowed during dialyzer reprime
     REQUEST_REJECT_REASON_RO_ONLY_MODE_DD_BUSY = 44,                                ///< RO only mode DD is busy
     REQUEST_REJECT_REASON_RO_ONLY_MODE_INVALID_PARAMETER = 45,                      ///< RO only mode invalid parameter
     REQUEST_REJECT_REASON_RO_ONLY_MODE_INVALID_PAYLOAD_LENGTH = 46,                 ///< RO only mode invalid payload length