Index: HDDefs.h
===================================================================
diff -u -r744569f5f158194d189dfdf139c45b18fb6f6bd4 -r471475164013e4daf755b1dc2f2f3b9489f1f91e
--- HDDefs.h	(.../HDDefs.h)	(revision 744569f5f158194d189dfdf139c45b18fb6f6bd4)
+++ HDDefs.h	(.../HDDefs.h)	(revision 471475164013e4daf755b1dc2f2f3b9489f1f91e)
@@ -127,23 +127,13 @@
  *  @{
  */
 
-/// Enumeration of pre-treatment mode states (sub-mode).
-enum Pre_Treatment_Mode_States
+/// Enumeration of pre-treatment mode states.
+enum HD_Pre_Treatment_Mode_States
 {
-    PRE_TREATMENT_START_STATE = 0,                                       ///< Start pre-treatment mode state
-    PRE_TREATMENT_WATER_SAMPLE_STATE,                                    ///< Water sample state
-    PRE_TREATMENT_SELF_TEST_NO_CART_STATE,                               ///< Self tests with no cartridge state
-    PRE_TREATMENT_CART_INSTALL_STATE,                                    ///< Consumable and cartridge installation state
-    PRE_TREATMENT_SELF_TEST_DRY_STATE,                                   ///< Self tests dry-run state
-    PRE_TREATMENT_PRIME_STATE,                                           ///< Prime both blood and dialysate circuits state
-    PRE_TREATMENT_SELF_TEST_WET_STATE,                                   ///< Self tests wet-run state
-    PRE_TREATMENT_RECIRC_STATE,                                          ///< Re-circulate blood and dialysate circuits state
-    PRE_TREATMENT_PATIENT_CONNECTION_STATE,                              ///< Patient connection state
-    NUM_OF_PRE_TREATMENT_STATES                                          ///< Number of pre-treatment mode states
+    HD_PRE_TREATMENT_STATE_START = 0,                                       ///< Start pre-treatment mode state
+    NUM_OF_HD_PRE_TREATMENT_STATES                                          ///< Number of pre-treatment mode states
 };
-typedef enum Pre_Treatment_Mode_States PRE_TREATMENT_MODE_STATE_T;       ///< Type for HD pre-treatment mode states enumeration
-
-
+typedef enum HD_Pre_Treatment_Mode_States HD_PRE_TREATMENT_MODE_STATE_T;    ///< Type for HD pre-treatment mode states enumeration
 
 /**@}*/