Index: FPDefs.h
===================================================================
diff -u -r7c45995a5ce9cecb723eeb99d85642112e884683 -r6b3a22a1e257b60d8af56c12108d255c9c6bbdb4
--- FPDefs.h	(.../FPDefs.h)	(revision 7c45995a5ce9cecb723eeb99d85642112e884683)
+++ FPDefs.h	(.../FPDefs.h)	(revision 6b3a22a1e257b60d8af56c12108d255c9c6bbdb4)
@@ -18,8 +18,8 @@
     FP_MODE_STAN,                                           ///< Standby mode
     FP_MODE_PGEN,                                           ///< Pre Generate Permeate mode ( RO Featured )
     FP_MODE_GENP,                                           ///< Generate Permeate mode ( RO Featured )
-    FP_MODE_DPGW,                                           ///< Defeatured Pre-Generate Permeate mode
-    FP_MODE_DEGW,                                           ///< Defeatured Generate Permeate mode
+    FP_MODE_DPGP,                                           ///< Defeatured Pre-Generate Permeate mode
+    FP_MODE_DEGP,                                           ///< Defeatured Generate Permeate mode
     FP_MODE_NLEG,                                           ///< Not legal - an illegal mode transition occurred
     NUM_OF_FP_MODES                                         ///< Number of FP operation modes
 };
@@ -234,8 +234,8 @@
 /// Enumeration of valves.
 typedef enum FP_Valves
 {
-    M4_VALV = 0,                                  ///< Valve (M4)
-    FP_FIRST_VALVE = M4_VALV,                     ///< First valve
+    P43_VALV = 0,                                  ///< Valve (M4)
+    FP_FIRST_VALVE = P43_VALV,                     ///< First valve
     P39_VALV,                                     ///< Valve (P39)
     P6_VALV,                                      ///< Valve (P6)
     P11_VALV,                                     ///< Valve (P11)
@@ -244,7 +244,7 @@
     P37_VALV,                                     ///< Valve (P37)
     M7_VALV,                                      ///< Valve (M7)
     P20_VALV,                                     ///< Valve (P20)
-    P43_VALV,                                     ///< Valve (P43)
+    M4_VALV,                                     ///< Valve (P43)
     FP_NUM_OF_VALVES                              ///< Number of valves
 } FP_VALVES_T;