Index: firmware/App/Controllers/Valves.c
===================================================================
diff -u -r7bca5e2d4ac41cc8e0d239314e5f0781976626de -rdc3485eb476a2b2a3be335b179e087beeee8e8fe
--- firmware/App/Controllers/Valves.c	(.../Valves.c)	(revision 7bca5e2d4ac41cc8e0d239314e5f0781976626de)
+++ firmware/App/Controllers/Valves.c	(.../Valves.c)	(revision dc3485eb476a2b2a3be335b179e087beeee8e8fe)
@@ -378,9 +378,7 @@
     {
         U32 valveState = getU32OverrideValue( &valveSensedStates[ valveID ] );
 
-        // THis was a temporary change for broadcasting the valves values as open to 0 and close to 1.
-        // DEENERGIZED(0) -> VALVE_STATE_OPEN(0), ENERGIZED(1) -> VALVE_STATE_CLOSED(1)
-        name = ( DEENERGIZED == valveState ? VALVE_STATE_OPEN : VALVE_STATE_CLOSED );
+        name = ( DEENERGIZED == valveState ? VALVE_STATE_CLOSED : VALVE_STATE_OPEN );
     }
     else
     {
Index: firmware/App/Controllers/Valves.h
===================================================================
diff -u -rdc4b4fddff7b3ceb6de191eed9c181d2508544ee -rdc3485eb476a2b2a3be335b179e087beeee8e8fe
--- firmware/App/Controllers/Valves.h	(.../Valves.h)	(revision dc4b4fddff7b3ceb6de191eed9c181d2508544ee)
+++ firmware/App/Controllers/Valves.h	(.../Valves.h)	(revision dc3485eb476a2b2a3be335b179e087beeee8e8fe)
@@ -32,8 +32,8 @@
 /// Enumeration of available valve state names per valve type (from SA and DD SRS documents).
 typedef enum ValveStateNames
 {
-    VALVE_STATE_OPEN = 0,                         ///< Open valve state,
-    VALVE_STATE_CLOSED,                           ///< Closed valve state,
+    VALVE_STATE_CLOSED = 0,                       ///< Closed valve state,
+    VALVE_STATE_OPEN,                             ///< Open valve state,
     NUM_OF_VALVE_STATES                           ///< number of valve states
 } VALVE_STATE_NAMES_T;