Index: firmware/App/Controllers/Valves.h
===================================================================
diff -u -r5aa0b08cb09b06af807687fe03db5137e388da82 -rf5baeac6a5f000705cd51e4779a967acf4088981
--- firmware/App/Controllers/Valves.h	(.../Valves.h)	(revision 5aa0b08cb09b06af807687fe03db5137e388da82)
+++ firmware/App/Controllers/Valves.h	(.../Valves.h)	(revision f5baeac6a5f000705cd51e4779a967acf4088981)
@@ -33,45 +33,45 @@
 typedef enum Valves
 {
     FIRST_HYD_VALVE = 0,                          ///< Start of Hydraulics valve group
-    VHO = FIRST_HYD_VALVE,                        ///< Valve Hydraulics Outlet (D14)
-    VTD,                                          ///< Valve Thermal Disinfect (D52)
-    VHB,                                          ///< Valve Hydraulics Bypass (D8)
-    VRP,                                          ///< Valve Rinse Port (D54)
-    VDR,                                          ///< Valve Drain (D53)
-    VDB2,                                         ///< Valve Dialyzer Bypass (D34)
-    VP1,                                          ///< Valve Purge 1 (D64)
-    VPT,                                          ///< Valve Pressure Test (D31)
-    VDB1,                                         ///< Valve DryBcarb Inlet (D65)
-    VDI,                                          ///< Valve Dialyzer Inlet (D35)
-    VDO,                                          ///< Valve Dialyzer Outlet (D40)
-    VP2,                                          ///< Valve Dialysate Out Purge 2 (D47)
-    VHI,                                          ///< Valve Hydraulics Inlet (D3)
-    VWI,                                          ///< Valve Water Inlet (M4)
+    D14_VALV = FIRST_HYD_VALVE,                   ///< Valve Hydraulics Outlet (D14)
+    D52_VALV,                                     ///< Valve Thermal Disinfect (D52)
+    D8_VALV,                                      ///< Valve Hydraulics Bypass (D8)
+    D54_VALV,                                     ///< Valve Rinse Port (D54)
+    D53_VALV,                                     ///< Valve Drain (D53)
+    D34_VALV,                                     ///< Valve Dialyzer Bypass (D34)
+    D64_VALV,                                     ///< Valve Purge 1 (D64)
+    D31_VALV,                                     ///< Valve Pressure Test (D31)
+    D65_VALV,                                     ///< Valve DryBcarb Inlet (D65)
+    D35_VALV,                                     ///< Valve Dialyzer Inlet (D35)
+    D40_VALV,                                     ///< Valve Dialyzer Outlet (D40)
+    D47_VALV,                                     ///< Valve Dialysate Out Purge 2 (D47)
+    D3_VALV,                                      ///< Valve Hydraulics Inlet (D3)
+    M4_VALV,                                      ///< Valve Water Inlet (M4)
 #ifdef __PUMPTEST__
     UF1,                                          ///< UF1 valve
     UF2,                                          ///< UF2 valve
     LAST_HYD_VALVE = UF2,                         ///< End of Hydraulics valve of group
 #else
-    LAST_HYD_VALVE = VWI,                         ///< End of Hydraulics valve of group
+    LAST_HYD_VALVE = M4_VALV,                     ///< End of Hydraulics valve of group
     RSRVD_SPACE1,                                 ///< This space has been reserved
     RSRVD_SPACE2,                                 ///< This space has been reserved
 #endif
     FIRST_BC_VALVE,                               ///< Start of Balancing Chamber valve group
-    BCV1 = FIRST_BC_VALVE,                        ///< Balancing chamber Valve 1 (D23)
-    BCV2,                                         ///< Balancing chamber Valve 2 (D19)
-    BCV3,                                         ///< Balancing chamber Valve 3 (D25)
-    BCV7,                                         ///< Balancing chamber Valve 7 (D26)
-    BCV5,                                         ///< Balancing chamber Valve 5 (D24)
-    BCV6,                                         ///< Balancing chamber Valve 6 (D20)
-    BCV4,                                         ///< Balancing chamber Valve 4 (D21)
-    BCV8,                                         ///< Balancing chamber Valve 8 (D22)
-    LAST_BC_VALVE = BCV8,                         ///< End of Balancing Chamber valve group
+    D23_VALV = FIRST_BC_VALVE,                    ///< Balancing chamber Valve 1 (D23)
+    D19_VALV,                                     ///< Balancing chamber Valve 2 (D19)
+    D25_VALV,                                     ///< Balancing chamber Valve 3 (D25)
+    D26_VALV,                                     ///< Balancing chamber Valve 7 (D26)
+    D24_VALV,                                     ///< Balancing chamber Valve 5 (D24)
+    D20_VALV,                                     ///< Balancing chamber Valve 6 (D20)
+    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
-    UFI1 = FIRST_UF_VALVE,                        ///< Ultrafiltration Valve 1 Inlet (D69)
-    UFI2,                                         ///< Ultrafiltration Valve 2 Inlet (D71)
-    UFO1,                                         ///< Ultrafiltration Valve 1 Outlet (D70)
-    UFO2,                                         ///< Ultrafiltration Valve 2 Outlet (D72)
-    LAST_UF_VALVE = UFO2,                         ///< End 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
     NUM_OF_VALVES                                 ///< Number of valves
 } VALVES_T;