Index: AlarmDefs.h
===================================================================
diff -u -rdf0b360f1a0f5a23ac46b4baaddf7103791cc920 -re52ae91c25ddb6b6b5ab6aefa2bbaec3477c1d2b
--- AlarmDefs.h	(.../AlarmDefs.h)	(revision df0b360f1a0f5a23ac46b4baaddf7103791cc920)
+++ AlarmDefs.h	(.../AlarmDefs.h)	(revision e52ae91c25ddb6b6b5ab6aefa2bbaec3477c1d2b)
@@ -488,9 +488,9 @@
     { ALARM_PRIORITY_HIGH,   110,  TRUE,  FALSE, TRUE , FALSE, FALSE, TRUE , FALSE, FALSE, FALSE, FALSE, TRUE , TRUE , FALSE, FALSE, FALSE, ALARM_ID_FP_GEN_PERMEATE_TANK_FULL_TIMEOUT                   },
     { ALARM_PRIORITY_HIGH,   110,  FALSE, TRUE , TRUE , TRUE , FALSE, TRUE , FALSE, FALSE, FALSE, TRUE,  FALSE, TRUE , FALSE, FALSE, FALSE, ALARM_ID_DD_DIALYSATE_TEMPERATURE_SENSORS_OUT_OF_RANGE       },
     { ALARM_PRIORITY_HIGH,   150,  FALSE, FALSE, TRUE , TRUE , FALSE, FALSE, TRUE , FALSE, TRUE , TRUE , FALSE, FALSE, FALSE, TRUE , TRUE , ALARM_ID_DD_BLOOD_LEAK_DETECTED                              },
-    { ALARM_PRIORITY_HIGH,     1,  TRUE , FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, FALSE, FALSE, FALSE, TRUE , FALSE, ALARM_ID_DD_BLOOD_LEAK_INVALID_CAL_RECORD                    },
-    { ALARM_PRIORITY_HIGH,     1,  TRUE , FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, FALSE, FALSE, FALSE, TRUE , FALSE, ALARM_ID_DD_BLOOD_LEAK_SENSOR_EMBEDDED_MODE_FAILURE          },
-    { ALARM_PRIORITY_HIGH,     1,  TRUE , FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, FALSE, FALSE, FALSE, TRUE , FALSE, ALARM_ID_DD_BLOOD_LEAK_SENSOR_SET_POINT_SET_FAILURE          },
+    { ALARM_PRIORITY_HIGH,     1,  TRUE , FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, ALARM_ID_DD_BLOOD_LEAK_INVALID_CAL_RECORD                    },
+    { ALARM_PRIORITY_HIGH,     1,  TRUE , FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, ALARM_ID_DD_BLOOD_LEAK_SENSOR_EMBEDDED_MODE_FAILURE          },
+    { ALARM_PRIORITY_HIGH,     1,  TRUE , FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, ALARM_ID_DD_BLOOD_LEAK_SENSOR_SET_POINT_SET_FAILURE          },
     { ALARM_PRIORITY_MEDIUM, 698,  FALSE, FALSE, TRUE , FALSE, FALSE, FALSE, TRUE , FALSE, TRUE , TRUE , FALSE, FALSE, FALSE, FALSE, FALSE, ALARM_ID_DD_BLOOD_LEAK_RECOVERING_PLEASE_WAIT,               },
 };  //   Priority            Rank  Fault DDFault Stops  ClrIm  NoClr  NoRes  NoRin  NoEnd  BlkRB  BlkET  NoBRcr NoDRcr AutoRes ClrOnly TxLog  ID
 
Index: MsgDefs.h
===================================================================
diff -u -re1b03e2d68efd1673b34227fd7f2f414a9bd1369 -re52ae91c25ddb6b6b5ab6aefa2bbaec3477c1d2b
--- MsgDefs.h	(.../MsgDefs.h)	(revision e1b03e2d68efd1673b34227fd7f2f414a9bd1369)
+++ MsgDefs.h	(.../MsgDefs.h)	(revision e52ae91c25ddb6b6b5ab6aefa2bbaec3477c1d2b)
@@ -123,8 +123,8 @@
     MSG_ID_TD_TREATMENT_PAUSED_TIMER_DATA = 0x5B,                                   ///< TD treatment paused timer data.
     MSG_ID_DD_UF_DATA = 0x5C,                                                       ///< DD ultrafiltration data
     MSG_ID_FP_PERMEATE_TANK_DATA = 0x5D,                                            ///< FP Permeate tank broadcast data
-    MSG_ID_UI_SALINE_BOLUS_REQUEST = 0x5E,                                          ///< UI saline bolus request
-    MSG_ID_TD_SALINE_BOLUS_RESPONSE = 0x5F,                                         ///< TD saline bolus response
+    MSG_ID_UI_SOLUTION_INFUSION_REQUEST = 0x5E,                                     ///< UI solution infusion request
+    MSG_ID_TD_SOLUTION_INFUSION_RESPONSE = 0x5F,                                    ///< TD solution infusion response
     MSG_ID_DD_BLOOD_LEAK_DATA = 0x60,                                               ///< DD blood leak data
 
 #ifdef __PUMPTEST__