Index: firmware/App/Controllers/Valves.c
===================================================================
diff -u -r5aa0b08cb09b06af807687fe03db5137e388da82 -rf5baeac6a5f000705cd51e4779a967acf4088981
--- firmware/App/Controllers/Valves.c	(.../Valves.c)	(revision 5aa0b08cb09b06af807687fe03db5137e388da82)
+++ firmware/App/Controllers/Valves.c	(.../Valves.c)	(revision f5baeac6a5f000705cd51e4779a967acf4088981)
@@ -227,15 +227,15 @@
     {
         case VALVE_STATE_OPEN:
         case VALVE_STATE_CLOSED:
-            if ( ( VDR == valveID )  || ( VTD == valveID )  || ( VHB == valveID )  || ( VRP == valveID )  || ( VHO == valveID )  ||
-                 ( VDB1 == valveID ) || ( VP1 == valveID )  || ( VPT == valveID )  || ( VDB2 == valveID ) || ( VDI == valveID )  ||
-                 ( VDO == valveID )  || ( VP2 == valveID )  || ( VHI == valveID )  || ( VWI == valveID )  || ( BCV1 == valveID ) ||
+            if ( ( D53_VALV == valveID )  || ( D52_VALV == valveID )  || ( D8_VALV == valveID )  || ( D54_VALV == valveID )  || ( D14_VALV == valveID )  ||
+                 ( D65_VALV == valveID ) || ( D64_VALV == valveID )  || ( D31_VALV == valveID )  || ( D34_VALV == valveID ) || ( D35_VALV == valveID )  ||
+                 ( D40_VALV == valveID )  || ( D47_VALV == valveID )  || ( D3_VALV == valveID )  || ( M4_VALV == valveID )  || ( D23_VALV == valveID ) ||
 #ifdef __PUMPTEST__
                  ( UF1 == valveID )  || ( UF2 == valveID )  ||
 #endif
-                 ( BCV2 == valveID ) || ( BCV3 == valveID ) || ( BCV4 == valveID ) || ( BCV5 == valveID ) || ( BCV6 == valveID ) ||
-                 ( BCV7 == valveID ) || ( BCV8 == valveID ) || ( UFI1 == valveID ) || ( UFO1 == valveID ) || ( UFI2 == valveID ) ||
-                 ( UFO2 == valveID ) )
+                 ( D19_VALV == valveID ) || ( D25_VALV == valveID ) || ( D21_VALV == valveID ) || ( D24_VALV == valveID ) || ( D20_VALV == valveID ) ||
+                 ( D26_VALV == valveID ) || ( D22_VALV == valveID ) || ( D69_VALV == valveID ) || ( D70_VALV == valveID ) || ( D71_VALV == valveID ) ||
+                 ( D72_VALV == valveID ) )
             {
                 result = TRUE;
             }