Index: DDDefs.h
===================================================================
diff -u -r7fc2917f51b089d21122bfd4869039df8a13386f -raf7e2891be840d5d6ce88ec2d81237b79e49d055
--- DDDefs.h	(.../DDDefs.h)	(revision 7fc2917f51b089d21122bfd4869039df8a13386f)
+++ DDDefs.h	(.../DDDefs.h)	(revision af7e2891be840d5d6ce88ec2d81237b79e49d055)
@@ -359,8 +359,9 @@
 /// Enumeration of valves.
 enum DD_Valves
 {
-    FIRST_HYD_VALVE = 0,                          ///< Start of Hydraulics valve group
-    D14_VALV = FIRST_HYD_VALVE,                   ///< Valve Hydraulics Outlet (D14)
+    D14_VALV = 0,                                 ///< Valve Hydraulics Outlet (D14)
+    FIRST_DD_VALVE = D14_VALV,                    ///< First DD valve
+    FIRST_HYD_VALVE = D14_VALV,                   ///< Start of Hydraulics valve group
     D52_VALV,                                     ///< Valve Thermal Disinfect (D52)
     D8_VALV,                                      ///< Valve Hydraulics Bypass (D8)
     D54_VALV,                                     ///< Valve Rinse Port (D54)
@@ -373,9 +374,9 @@
     D40_VALV,                                     ///< Valve Dialyzer Outlet (D40)
     D47_VALV,                                     ///< Valve Dialysate Out Purge 2 (D47)
     D3_VALV,                                      ///< Valve Hydraulics Inlet (D3)
-    // For standalone DD system, may need to control IO valve.
-    DD_M4_VALV,                                   ///< Valve Water Inlet (M4)
-    LAST_HYD_VALVE = DD_M4_VALV,                  ///< End of Hydraulics valve of group
+    D80_VALV,                                     ///< Valve Dry Bicarb (D80)
+    D81_VALV,                                     ///< Valve De-scaler (D81)
+    LAST_HYD_VALVE = D3_VALV,                     ///< End of Hydraulics valve of group
     RSRVD_SPACE1,                                 ///< This space has been reserved
     RSRVD_SPACE2,                                 ///< This space has been reserved
     FIRST_BC_VALVE,                               ///< Start of Balancing Chamber valve group
@@ -388,12 +389,21 @@
     D21_VALV,                                     ///< Balancing chamber Valve 4 (D21)
     D22_VALV,                                     ///< Balancing chamber Valve 8 (D22)
     LAST_BC_VALVE = D22_VALV,                     ///< End of Balancing Chamber valve group
-    FIRST_UF_VALVE,                               ///< Start of Ultrafiltration valve group
-    D69_VALV = FIRST_UF_VALVE,                    ///< Ultrafiltration Valve 1 Inlet (D69)
-    D71_VALV,                                     ///< Ultrafiltration Valve 2 Inlet (D71)
-    D70_VALV,                                     ///< Ultrafiltration Valve 1 Outlet (D70)
-    D72_VALV,                                     ///< Ultrafiltration Valve 2 Outlet (D72)
-    LAST_UF_VALVE = D72_VALV,                     ///< End of Ultrafiltration valve group
+    LAST_DD_VALVE = D22_VALV,                     ///< Last DD valve
+    M4_VALV,                                      ///< Valve (M4)
+    FIRST_IO_VALVE = M4_VALV,                     ///< First IO valve
+    LAST_IO_VALVE = M4_VALV,                      ///< Last IO valve
+    P39_VALV,                                     ///< Valve (P39)
+    FIRST_FP_VALVE = P39_VALV,                    ///< First FP valve
+    P6_VALV,                                      ///< Valve (P6)
+    P11_VALV,                                     ///< Valve (P11)
+    P33_VALV,                                     ///< Valve (P33)
+    P34_VALV,                                     ///< Valve (P34)
+    P37_VALV,                                     ///< Valve (P37)
+    M7_VALV,                                      ///< Valve (M7)
+    P20_VALV,                                     ///< Valve (P20)
+    P43_VALV,                                     ///< Valve (P43)
+    LAST_FP_VALVE = P43_VALV,                     ///< Last FP valve
     DD_NUM_OF_VALVES                              ///< Number of valves
 };
 typedef enum DD_Valves DD_VALVES_T;
Index: FPDefs.h
===================================================================
diff -u -r193dbb4390b5cd6ab3adf0a9bd2f6e74c3a4b32c -raf7e2891be840d5d6ce88ec2d81237b79e49d055
--- FPDefs.h	(.../FPDefs.h)	(revision 193dbb4390b5cd6ab3adf0a9bd2f6e74c3a4b32c)
+++ FPDefs.h	(.../FPDefs.h)	(revision af7e2891be840d5d6ce88ec2d81237b79e49d055)
@@ -231,24 +231,6 @@
 };
 typedef enum FP_Event_List FP_EVENT_ID_T;                               ///< Type for FP event list enumeration
 
-/// Enumeration of valves.
-typedef enum FP_Valves
-{
-    M4_VALV = 0,                                  ///< Valve (M4)
-    FP_FIRST_VALVE = M4_VALV,                     ///< First valve
-    P39_VALV,                                     ///< Valve (P39)
-    P6_VALV,                                      ///< Valve (P6)
-    P11_VALV,                                     ///< Valve (P11)
-    P33_VALV,                                     ///< Valve (P33)
-    P34_VALV,                                     ///< Valve (P34)
-    P37_VALV,                                     ///< Valve (P37)
-    M7_VALV,                                      ///< Valve (M7)
-    P20_VALV,                                     ///< Valve (P20)
-    P43_VALV,                                     ///< Valve (P43)
-    FP_NUM_OF_VALVES                              ///< Number of valves
-} FP_VALVES_T;
-
-
 /**@}*/
 
 /**