Index: firmware/App/Controllers/RinsePump.c
===================================================================
diff -u -ra6109e69046323d34c8d92e590a07d8d4a71eb91 -rd6d33f24b37947f0590effb2d42a5eb3e6f3028b
--- firmware/App/Controllers/RinsePump.c	(.../RinsePump.c)	(revision a6109e69046323d34c8d92e590a07d8d4a71eb91)
+++ firmware/App/Controllers/RinsePump.c	(.../RinsePump.c)	(revision d6d33f24b37947f0590effb2d42a5eb3e6f3028b)
@@ -274,15 +274,15 @@
 
     rinsePumpTargetSpeedRPM = 0;
 
-    if ( TRUE == getTestConfigStatus( TEST_CONFIG_DD_FP_ENABLE_BETA_1_9_HW ) )
+    if ( TRUE == getTestConfigStatus( TEST_CONFIG_DD_FP_ENABLE_BETA_2_0_HW ) )
     {
-        // Current Beta 1.9 system uses on/off bit
-        setValveState( D88_79_VALV, VALVE_STATE_CLOSED );
+        // Set PWM count zero to stop the logical rinse pump
+        setRinsePumpPwmCount( D79_RINSE_PUMP, RINSE_PUMP_OFF_COUNT );
     }
     else
     {
-        // Set PWM count zero to stop the logical rinse pump
-        setRinsePumpPwmCount( D79_RINSE_PUMP, RINSE_PUMP_OFF_COUNT );
+        // Current Beta 1.9 system uses on/off bit
+        setValveState( D88_79_VALV, VALVE_STATE_CLOSED );
     }
 
     return state;
@@ -299,13 +299,8 @@
 {
     RINSE_PUMP_STATE_T state = RINSE_PUMP_STATE_ON;
 
-    if ( TRUE == getTestConfigStatus( TEST_CONFIG_DD_FP_ENABLE_BETA_1_9_HW ) )
+    if ( TRUE == getTestConfigStatus( TEST_CONFIG_DD_FP_ENABLE_BETA_2_0_HW ) )
     {
-        // Current Beat 1.9 system uses on/off bit
-        setValveState( D88_79_VALV, VALVE_STATE_OPEN );
-    }
-    else
-    {
         F32 pwmPercent   = getF32OverrideValue( &rinsePumpPwmPercentage );     // TODO should this conversion happen in setPWMCount function?
         U32 pwmInCount   = (U32)( ( pwmPercent / RINSE_PUMP_MAX_PWM_PERCENT ) * RINSE_PUMP_PWM_IN_COUNT_MAX );
 
@@ -314,6 +309,11 @@
         // Turn on logical rinse pump with given PWM value
         setRinsePumpPwmCount( D79_RINSE_PUMP, (U32)pwmInCount );
     }
+    else
+    {
+        // Current Beat 1.9 system uses on/off bit
+        setValveState( D88_79_VALV, VALVE_STATE_OPEN );
+    }
 
     return state;
 }