Index: firmware/App/Controllers/Valves.h
===================================================================
diff -u -rae36722cb762a069233685bb62a63107fd80338e -r7b9a8c0cb9986368e1e38fcdb9daaf3cf707dfd2
--- firmware/App/Controllers/Valves.h	(.../Valves.h)	(revision ae36722cb762a069233685bb62a63107fd80338e)
+++ firmware/App/Controllers/Valves.h	(.../Valves.h)	(revision 7b9a8c0cb9986368e1e38fcdb9daaf3cf707dfd2)
@@ -31,16 +31,16 @@
 /// Enumeration of valves.
 typedef enum Valves
 {
-    VWI = 0,                                      ///< Valve (M4 VWi)
-    FIRST_VALVE = VWI,                            ///< First valve
-    VROD,                                         ///< Valve (P39 VROd)
-    VFF,                                          ///< Valve (P6 VFF)
-    VPI,                                          ///< Valve (P11 VPi)
-    VCR,                                          ///< Valve (P33 VCr)
-    VCB,                                          ///< Valve (P34 VCb)
-    VCD,                                          ///< Valve (P37 VCd)
-    VFB,                                          ///< Valve (M7 VFB)
-    SPP,                                          ///< Valve (P20 SPP)
+    M4_VALV = 0,                                  ///< Valve (M4)
+    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)
     NUM_OF_VALVES                                 ///< Number of valves
 } VALVES_T;