Index: firmware/App/Modes/ModeFault.c
===================================================================
diff -u -ra85a030e1a424b6546c57e5e80f21500103e13ea -r200dfbd12ee14a4dbe5ee1daaece7bfce9e8a104
--- firmware/App/Modes/ModeFault.c	(.../ModeFault.c)	(revision a85a030e1a424b6546c57e5e80f21500103e13ea)
+++ firmware/App/Modes/ModeFault.c	(.../ModeFault.c)	(revision 200dfbd12ee14a4dbe5ee1daaece7bfce9e8a104)
@@ -188,18 +188,18 @@
     setValveStateDelayed( D40_VALV, VALVE_STATE_CLOSED, DELAY_VALVE_MS );
     setValveStateDelayed( D47_VALV, VALVE_STATE_CLOSED, DELAY_VALVE_MS );
     setValveStateDelayed( D3_VALV, VALVE_STATE_CLOSED, DELAY_VALVE_MS );
-    setValveStateDelayed( M4_VALV, VALVE_STATE_CLOSED, DELAY_VALVE_MS );
+    setValveStateDelayed( DD_M4_VALV, VALVE_STATE_CLOSED, DELAY_VALVE_MS );
 
     // De-energize Balancing chamber and Ultrafiltration valves
     for ( i = FIRST_BC_VALVE; i <= LAST_BC_VALVE; i++ )
     {
-        setValveStateDelayed( (VALVES_T)i, VALVE_STATE_CLOSED, DELAY_VALVE_MS );
+        setValveStateDelayed( (DD_VALVES_T)i, VALVE_STATE_CLOSED, DELAY_VALVE_MS );
     }
 
     // TODO: To be removed once HDD clean up is done
     for ( i = FIRST_UF_VALVE; i <= FIRST_UF_VALVE; i++ )
     {
-        setValveStateDelayed( (VALVES_T)i, VALVE_STATE_CLOSED, DELAY_VALVE_MS );
+        setValveStateDelayed( (DD_VALVES_T)i, VALVE_STATE_CLOSED, DELAY_VALVE_MS );
     }
 
     requestConcentratePumpOff( D11_PUMP, parkPumps );
@@ -245,7 +245,7 @@
     setValveStateDelayed( D40_VALV, VALVE_STATE_CLOSED, DELAY_VALVE_MS );
     setValveStateDelayed( D47_VALV, VALVE_STATE_CLOSED, DELAY_VALVE_MS );
     setValveStateDelayed( D3_VALV, VALVE_STATE_CLOSED, DELAY_VALVE_MS );
-    setValveStateDelayed( M4_VALV, VALVE_STATE_CLOSED, DELAY_VALVE_MS );
+    setValveStateDelayed( DD_M4_VALV, VALVE_STATE_CLOSED, DELAY_VALVE_MS );
 
     // De-energize portion of balancing chamber valves.
     setValveStateDelayed( D19_VALV, VALVE_STATE_CLOSED, DELAY_VALVE_MS );
@@ -257,7 +257,7 @@
     // De-energize Ultrafiltration valves
     for ( i = FIRST_UF_VALVE; i <= FIRST_UF_VALVE; i++ )
     {
-        setValveStateDelayed( (VALVES_T)i, VALVE_STATE_CLOSED, DELAY_VALVE_MS );
+        setValveStateDelayed( (DD_VALVES_T)i, VALVE_STATE_CLOSED, DELAY_VALVE_MS );
     }
 
     requestConcentratePumpOff( D11_PUMP, parkPumps );