Index: TDDefs.h
===================================================================
diff -u -r3b70414bfb8e8cc3a5648305b3f09ca740c1cb60 -r2c1b884ffa2b9fafeea0025b8c4ac3f46bc2e8f0
--- TDDefs.h	(.../TDDefs.h)	(revision 3b70414bfb8e8cc3a5648305b3f09ca740c1cb60)
+++ TDDefs.h	(.../TDDefs.h)	(revision 2c1b884ffa2b9fafeea0025b8c4ac3f46bc2e8f0)
@@ -412,8 +412,7 @@
 {
     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
+    FLUID_BOLUS_IN_PROGRESS_STATE,                     ///< A fluid bolus delivery is in progress
     NUM_OF_FLUID_BOLUS_STATES                          ///< Number of fluid bolus states
 };
 typedef enum Fluid_Bolus_States FLUID_BOLUS_STATE_T;   ///< Type for fluid bolus state enumeration
@@ -880,6 +879,16 @@
 };
 typedef enum Confirmation_Status CONFIRMATION_REQUEST_STATUS_T;
 
+///< Enumeration of tube set types.
+enum Tube_Set_Types
+{
+    TUBE_SET_TYPE_HD,                                                   ///< HD tubing set
+    TUBE_SET_TYPE_HDF,                                                  ///< HDF tubing set
+    NUM_OF_TUBE_SET_TYPES                                               ///< Number of tube set types
+};
+///< Type for tube set types enumeration
+typedef enum Tube_Set_Types TUBE_SET_TYPE_T;
+
 /**@}*/
 
 #endif