Index: TDDefs.h
===================================================================
diff -u -rbf926947342bad2327352d878c681401a6b2d994 -rf621619a1a439b97d9744c34bf3ef317e4499cc5
--- TDDefs.h	(.../TDDefs.h)	(revision bf926947342bad2327352d878c681401a6b2d994)
+++ TDDefs.h	(.../TDDefs.h)	(revision f621619a1a439b97d9744c34bf3ef317e4499cc5)
@@ -386,24 +386,25 @@
 };
 typedef enum Dialysis_States DIALYSIS_STATE_T;          ///< Type for dialysis states enumeration
 
-/// Enumeration of saline bolus states.
-enum Saline_Bolus_States
+/// Enumeration of fluid bolus states.
+enum Fluid_Bolus_States
 {
-    SALINE_BOLUS_STATE_IDLE = 0,                        ///< No saline bolus delivery is in progress
-    SALINE_BOLUS_STATE_WAIT_FOR_PUMPS_STOP,             ///< Wait for pumps to stop before starting bolus
-    SALINE_BOLUS_STATE_IN_PROGRESS,                     ///< A saline bolus delivery is in progress
-    NUM_OF_SALINE_BOLUS_STATES                          ///< Number of saline bolus states
+    FLUID_BOLUS_IDLE_STATE = 0,                        ///< No fluid bolus delivery is in progress
+    FLUID_BOLUS_WAIT_FOR_PUMPS_STOP_STATE,             ///< Wait for pumps to stop before starting bolus
+    FLUID_BOLUS_SALINE_IN_PROGRESS_STATE,              ///< A saline bolus delivery is in progress
+    FLUID_BOLUS_SUBSITUTE_IN_PROGRESS_STATE,           ///< A substitute bolus delivery is in progress
+    NUM_OF_FLUID_BOLUS_STATES                          ///< Number of fluid bolus states
 };
-typedef enum Saline_Bolus_States SALINE_BOLUS_STATE_T;  ///< Type for saline bolus state enumeration
+typedef enum Fluid_Bolus_States FLUID_BOLUS_STATE_T;   ///< Type for fluid bolus state enumeration
 
-/// Enumeration of saline bolus command parameters.
-enum Saline_Commands
+/// Enumeration of fluid bolus command parameters.
+enum Fluid_Bolus_Commands
 {
-    SALINE_CMD_STOP = 0,                                ///< Stop saline bolus command
-    SALINE_CMD_START,                                   ///< Start saline bolus command
-    NUM_OF_SALINE_CMDS                                  ///< Number of saline bolus command parameters
+    FLUID_BOLUS_CMD_STOP = 0,                          ///< Stop fluid bolus command
+    FLUID_BOLUS_CMD_START,                             ///< Start fluid bolus command
+    NUM_OF_FLUID_BOLUS_CMDS                            ///< Number of fluid bolus command parameters
 };
-typedef enum Saline_Commands SALINE_CMD_T;              ///< Type for saline command enum.
+typedef enum Fluid_Bolus_Commands FLUID_BOLUS_CMD_T;   ///< Type for fluid bolus command enum.
 
 /// Enumeration of ultrafiltration command IDs.
 enum UF_Commands
@@ -468,6 +469,7 @@
     TREATMENT_PAUSED_RECIRC_BLOOD_ONLY_STATE,                             ///< Re-circulate Blood only state of the treatment paused sub-mode state machine
     TREATMENT_PAUSED_NO_RECIRC_STATE,                                     ///< No re-circulation state of the treatment paused sub-mode state machine
     TREATMENT_PAUSED_RECOVER_BLOOD_DETECT_STATE,                          ///< Treatment paused recover blood detect state
+    TREATMENT_PAUSED_FLUID_BOLUS_STATE,                                   ///< Fluid Bolus state of the treatment paused sub-mode state machine
     NUM_OF_TREATMENT_PAUSED_STATES                                        ///< Number of treatment paused sub-mode states
 };
 /// Type for treatment paused states enumeration.
@@ -486,6 +488,7 @@
     BLOOD_PRIME_RAMP_STATE = 0,                                         ///< Ramp state of the blood prime sub-mode state machine
     BLOOD_PRIME_RUN_STATE,                                              ///< Run state of the blood prime sub-mode state machine
     BLOOD_PRIME_PAUSED_STATE,                                           ///< Paused state of the blood prime sub-mode state machine
+    BLOOD_PRIME_FLUID_BOLUS_STATE,                                      ///< Fluid Bolus state of the blood prime sub-mode state machine
     NUM_OF_BLOOD_PRIME_STATES                                           ///< Number of blood prime sub-mode states
 };
 /// Type for treatment end states enumeration.
@@ -746,7 +749,7 @@
     HEPARIN_BOLUS_END_EVENT,                                            ///< Heparin bolus end event
     HEPARIN_START_RESUME_EVENT,                                         ///< Heparin start or resume event
     HEPARIN_STOP_PAUSE_EVENT,                                           ///< Heparin stop or pause event
-    SALINE_BOLUSES_CHANGE_EVENT,                                        ///< Saline boluses change event
+    FLUID_BOLUSES_CHANGE_EVENT,                                         ///< Fluid boluses change event
     NUM_OF_TX_EVENT_IDS                                                 ///< Total number of treatment events
 };
 typedef enum Tx_Event_List TX_EVENT_ID_T;                               ///< Type for treatment event list enumeration