Index: TDDefs.h
===================================================================
diff -u -r0c69056085d4fbbfc3c42652cc68656c97cf4d34 -rd5435daa3ccfc3199c1fc6965924453bab46b438
--- TDDefs.h	(.../TDDefs.h)	(revision 0c69056085d4fbbfc3c42652cc68656c97cf4d34)
+++ TDDefs.h	(.../TDDefs.h)	(revision d5435daa3ccfc3199c1fc6965924453bab46b438)
@@ -603,7 +603,7 @@
     TREATMENT_PARAM_TREATMENT_DURATION,                                 ///< Treatment duration (in minutes)
     TREATMENT_PARAM_HEPARIN_DELIVERY_DURATION,                          ///< Heparin delivery duration (in minutes)
     TREATMENT_PARAM_HEPARIN_TYPE,                                       ///< Heparin type (enum)
-    TREATMENT_PARAM_DRY_BICARB_CART,                                    ///< Dry bicarb cartrideg size (enum)
+    TREATMENT_PARAM_DRY_BICARB_CART_SIZE,                               ///< Dry bicarb cartrideg size (enum)
     TREATMENT_PARAM_SODIUM,                                             ///< Sodium concentrate (mEq/L)
     TREATMENT_PARAM_BICARBONATE,                                        ///< Bicarbonate concentrate (mEq/L)
     TREATMENT_PARAM_DIALYZER_TYPE,                                      ///< Dialysate type (enum)
@@ -614,7 +614,7 @@
     TREATMENT_PARAM_TMP_PRES_LIMIT_WINDOW,                              ///< TMP alarm limit window (in mmHg)
     TREATMENT_PARAM_BP_MEAS_INTERVAL,                                   ///< Blood pressure measurement interval (in minutes)
     TREATMENT_PARAM_PRIME_DISCARD_VOLUME,                               ///< Prime discard volume (in mL)
-    TREATMENT_PARAM_RINSEBACK_VOLUME,                                   ///< Prime rinseback volume (in mL)
+    TREATMENT_PARAM_PRIME_RINSEBACK_VOLUME,                             ///< Prime rinseback volume (in mL)
     TREATMENT_PARAM_RINSEBACK_FLOW_RATE,                                ///< Rinseback flow rate (in mL/min)
     TREATMENT_PARAM_HEPATITIS_B,                                        ///< Hepatitis B status (enum)
     TREATMENT_PARAM_SYSTOLIC_BP_LOW_ALARM_LIMIT,                        ///< Systolic BP low alarm limit (in mmHg)
@@ -630,7 +630,7 @@
     TREATMENT_PARAM_SUBST_FLUID_VOLUME,                                 ///< Substitution fluid volume (in liters)
     TREATMENT_PARAM_FIRST_F32 = TREATMENT_PARAM_SUBST_FLUID_VOLUME,     ///< First floating point treatment parameter
     TREATMENT_PARAM_HEPARIN_BOLUS_VOLUME,                               ///< Heparin bolus volume (in mL)
-    TREATMENT_PARAM_HEPARIN_DISPENSE_RATE,                              ///< Heparin dispense rate (in mL/hr)
+    TREATMENT_PARAM_HEPARIN_DELIVERY_RATE,                              ///< Heparin delivery rate (in mL/hr)
     TREATMENT_PARAM_DIALYSATE_TEMPERATURE,                              ///< Dialysate temperature (in degC)
     TREATMENT_PARAM_ACID_K_PLUS,                                        ///< Acid concentration for Potassium (K+) (mEq/L)
     TREATMENT_PARAM_ACID_CA2_PLUS,                                      ///< Acid concentration for Calcium (Ca2+) (mEq/L)
@@ -639,16 +639,39 @@
 };
 typedef enum Treatment_Params TREATMENT_PARAM_T;                        ///< Type for treatment parameters enumeration
 
-/// Enumeration of Treatment Modality type
+/// Enumeration of treatment modality type
 enum Treatment_Modality_Types
 {
     TREATMENT_MODALITY_HD = 0,                                          ///< Treatment modality Hemodialysis
     TREATMENT_MODALITY_HDF,                                             ///< Treatment modality Hemodiafiltration
     TREATMENT_MODALITY_ISOLATED_UF,                                     ///< Treatment modality Isolated UF
     NUM_OF_TREATMENT_MODALITY_TYPES                                     ///< Total number of treatment modality types
 };
-typedef enum Treatment_Modality_Types TREATMENT_TYPE_T;
+typedef enum Treatment_Modality_Types TREATMENT_TYPE_T;                 ///< Type for treatment modality type enumeration
 
+/// Enumeration of HDF treatment mode
+enum HDF_Treatment_Modes
+{
+    HDF_NOT_APPLICABLE = 0,                                             ///< Treatment HDF not applicable
+    HDF_PRE_DILUTION,                                                   ///< Treatment HDF pre-dilution
+    HDF_POST_DILUTION,                                                  ///< Treatment HDF post-dilution
+    NUM_OF_TREATMENT_HDF_TYPES                                          ///< Total number of HDF modes
+};
+typedef enum HDF_Treatment_Modes HDF_MODE_T;                            ///< Type for HDF treatment mode enumeration
+
+/// Enumeration of dry bicarb cartridge size.
+enum Dry_Bicarb_Cart_Size
+{
+    DRY_BICARB_650_G = 0,                                               ///< Dry bicarb cartridge of size 650 g
+    DRY_BICARB_720_G,                                                   ///< Dry bicarb cartridge of size 720 g
+    DRY_BICARB_760_G,                                                   ///< Dry bicarb cartridge of size 760 g
+    DRY_BICARB_900_G,                                                   ///< Dry bicarb cartridge of size 900 g
+    DRY_BICARB_1100_G,                                                  ///< Dry bicarb cartridge of size 1100 g
+    DRY_BICARB_1250_G,                                                  ///< Dry bicarb cartridge of size 1250 g
+    NUM_OF_DRY_BICARB_CART_SIZES                                        ///< Number of dry bicarb cartridge sizes
+};
+typedef enum Dry_Bicarb_Cart_Size DRY_BICARB_CART_SIZE_T;               ///< Type for dry bicarb cartridge size enumeration
+
 /// Enumeration of dialyzer types.
 enum Dialyzer_Types
 {
@@ -663,6 +686,18 @@
 };
 typedef enum Dialyzer_Types DIALYZER_TYPE_T;                            ///< Type for dialyzer types enumeration
 
+/// Enumeration of Hepatitis B Status
+enum Hepatitis_B_Status
+{
+    HEPATITIS_B_NOT_APPLICABLE = 0,                                     ///< Hepatitis B status not applicable
+    HEPATITIS_B_UNKNOWN,                                                ///< Hepatitis B status unknowm
+    HEPATITIS_B_POSITIVE,                                               ///< Hepatitis B status positive
+    HEPATITIS_B_NEGATIVE,                                               ///< Hepatitis B status negative
+    NUM_OF_HEPATITIS_B_STATUS                                           ///< Total number of Hepatitis status types
+};
+typedef enum Hepatitis_B_Status HEPATITIS_B_STATUS_T;                   ///< Type for hepatitis B status enumeration
+
+//TODO remove
 /// Enumeration of acid concentrates.
 enum Acid_Concentrates
 {
@@ -673,6 +708,7 @@
 };
 typedef enum Acid_Concentrates ACID_CONCENTRATE_TYPE_T;                 ///< Type for acid concentrates enumeration
 
+//TODO remove
 /// Enumeration of bicarbonate concentrates.
 enum Bicarb_Concentrates
 {