Index: firmware/App/Drivers/Valve3Way.c
===================================================================
diff -u -r552a7de419344b43a3307c61141c99bfbbee7345 -r285b5d82539c96524c93703d52a66fff76fb64fc
--- firmware/App/Drivers/Valve3Way.c	(.../Valve3Way.c)	(revision 552a7de419344b43a3307c61141c99bfbbee7345)
+++ firmware/App/Drivers/Valve3Way.c	(.../Valve3Way.c)	(revision 285b5d82539c96524c93703d52a66fff76fb64fc)
@@ -28,7 +28,7 @@
 
 // ********** private definitions **********
 
-/// Payload record structure for 2-way valve set request
+/// Payload record structure for 3-way valve set request
 typedef struct
 {
     U32 valve;          ///< which 3-way valve to set (0=H13, 1=H20)
@@ -37,7 +37,7 @@
 
 // ********** private data **********
 
-static OPN_CLS_STATE_T current3WayValveStates[ NUM_OF_3_WAY_VALVES ];             ///< Current 3-way valve states (open/closed).
+static VALVE_3WAY_STATE_T current3WayValveStates[ NUM_OF_3_WAY_VALVES ];             ///< Current 3-way valve states (open/closed).
 
 // ********** private function prototypes **********
 
@@ -51,9 +51,9 @@
 void init3WayValves(void)
 {
     // Close all 3-way valves
-    current3WayValveStates[ H13_VALV ] = STATE_CLOSED;
-    current3WayValveStates[ H20_VALV ] = STATE_CLOSED;
-    setH13ValveState( STATE_CLOSED );
+    current3WayValveStates[ H13_VALV ] = VALVE_3WAY_COMMON_TO_CLOSED_STATE;
+    current3WayValveStates[ H20_VALV ] = VALVE_3WAY_COMMON_TO_CLOSED_STATE;
+    setH13ValveState( VALVE_3WAY_COMMON_TO_CLOSED_STATE );
 }
 
 /*********************************************************************//**
@@ -67,7 +67,7 @@
  * @param state ID of state to set valve to
  * @return none.
  *************************************************************************/
-void set3WayValveState( VALVE_3_WAY_T valve, OPN_CLS_STATE_T state )
+void set3WayValveState( VALVE_3_WAY_T valve, VALVE_3WAY_STATE_T state )
 {
     if ( ( valve < NUM_OF_3_WAY_VALVES ) && ( state < NUM_OF_OPN_CLS_STATES ) )
     {
@@ -101,9 +101,9 @@
  * @details \b Outputs: none
  * @return Current state of the given 3-way valve.
  *************************************************************************/
-OPN_CLS_STATE_T get3WayValveState( VALVE_3_WAY_T valve )
+VALVE_3WAY_STATE_T get3WayValveState( VALVE_3_WAY_T valve )
 {
-    OPN_CLS_STATE_T result = STATE_CLOSED;
+    VALVE_3WAY_STATE_T result = VALVE_3WAY_COMMON_TO_CLOSED_STATE;
 
     if ( valve < NUM_OF_3_WAY_VALVES )
     {
@@ -146,9 +146,9 @@
             VALVE_3_WAY_SET_CMD_PAYLOAD_T payload;
 
             memcpy( &payload, message->payload, sizeof(VALVE_3_WAY_SET_CMD_PAYLOAD_T) );
-            if ( ( (VALVE_3_WAY_T)payload.valve < NUM_OF_3_WAY_VALVES ) && ( (OPN_CLS_STATE_T)payload.state < NUM_OF_OPN_CLS_STATES ) )
+            if ( ( (VALVE_3_WAY_T)payload.valve < NUM_OF_3_WAY_VALVES ) && ( (VALVE_3WAY_STATE_T)payload.state < NUM_OF_OPN_CLS_STATES ) )
             {
-                set3WayValveState( (VALVE_3_WAY_T)payload.valve, (OPN_CLS_STATE_T)payload.state );
+                set3WayValveState( (VALVE_3_WAY_T)payload.valve, (VALVE_3WAY_STATE_T)payload.state );
                 result = TRUE;
             }
         }