Index: firmware/App/Modes/ModeFault.c
===================================================================
diff -u -r48ca7fd644c67920acc29a80b7af379d0a134d1a -rbc30c54270ec51f947b129da3c7daad54ec4eb5f
--- firmware/App/Modes/ModeFault.c	(.../ModeFault.c)	(revision 48ca7fd644c67920acc29a80b7af379d0a134d1a)
+++ firmware/App/Modes/ModeFault.c	(.../ModeFault.c)	(revision bc30c54270ec51f947b129da3c7daad54ec4eb5f)
@@ -146,20 +146,20 @@
 
     // De-energize all the hydraulics valves
     // TODO : valve state name needs to be updated
-    setValveStateDelayed( VDR, VALVE_STATE_CLOSED, DELAY_VALVE_MS );
-    setValveStateDelayed( VTD, VALVE_STATE_CLOSED, DELAY_VALVE_MS );
-    setValveStateDelayed( VHB, VALVE_STATE_CLOSED, DELAY_VALVE_MS );
-    setValveStateDelayed( VRP, VALVE_STATE_CLOSED, DELAY_VALVE_MS );
-    setValveStateDelayed( VHO, VALVE_STATE_CLOSED, DELAY_VALVE_MS );
-    setValveStateDelayed( VDB1, VALVE_STATE_CLOSED, DELAY_VALVE_MS );
-    setValveStateDelayed( VP1, VALVE_STATE_CLOSED, DELAY_VALVE_MS );
-    setValveStateDelayed( VPT, VALVE_STATE_CLOSED, DELAY_VALVE_MS );
-    setValveStateDelayed( VDB2, VALVE_STATE_CLOSED, DELAY_VALVE_MS );
-    setValveStateDelayed( VDI, VALVE_STATE_CLOSED, DELAY_VALVE_MS );
-    setValveStateDelayed( VDO, VALVE_STATE_CLOSED, DELAY_VALVE_MS );
-    setValveStateDelayed( VP2, VALVE_STATE_CLOSED, DELAY_VALVE_MS );
-    setValveStateDelayed( VHI, VALVE_STATE_CLOSED, DELAY_VALVE_MS );
-    setValveStateDelayed( VWI, VALVE_STATE_CLOSED, DELAY_VALVE_MS );
+    setValveStateDelayed( D53_VALV, VALVE_STATE_CLOSED, DELAY_VALVE_MS );
+    setValveStateDelayed( D52_VALV, VALVE_STATE_CLOSED, DELAY_VALVE_MS );
+    setValveStateDelayed( D8_VALV, VALVE_STATE_CLOSED, DELAY_VALVE_MS );
+    setValveStateDelayed( D54_VALV, VALVE_STATE_CLOSED, DELAY_VALVE_MS );
+    setValveStateDelayed( D14_VALV, VALVE_STATE_CLOSED, DELAY_VALVE_MS );
+    setValveStateDelayed( D65_VALV, VALVE_STATE_CLOSED, DELAY_VALVE_MS );
+    setValveStateDelayed( D64_VALV, VALVE_STATE_CLOSED, DELAY_VALVE_MS );
+    setValveStateDelayed( D31_VALV, VALVE_STATE_CLOSED, DELAY_VALVE_MS );
+    setValveStateDelayed( D34_VALV, VALVE_STATE_CLOSED, DELAY_VALVE_MS );
+    setValveStateDelayed( D35_VALV, VALVE_STATE_CLOSED, DELAY_VALVE_MS );
+    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 );
 
     // De-energize Balancing chamber and Ultrafiltration valves
     for ( i = FIRST_BC_VALVE; i <= LAST_BC_VALVE; i++ )
@@ -172,12 +172,12 @@
         setValveStateDelayed( (VALVES_T)i, VALVE_STATE_CLOSED, DELAY_VALVE_MS );
     }
 
-    requestConcentratePumpOff( CONCENTRATEPUMPS_CP1_ACID, parkPumps );
-    requestConcentratePumpOff( CONCENTRATEPUMPS_CP2_BICARB, parkPumps );
-    signalDialysatePumpHardStop( FRESH_DIALYSATE_PUMP );
-    signalDialysatePumpHardStop( SPENT_DIALYSATE_PUMP );
-    stopHeater( DD_PRIMARY_HEATER );
-    stopHeater( DD_TRIMMER_HEATER );
+    requestConcentratePumpOff( D11_PUMP, parkPumps );
+    requestConcentratePumpOff( D10_PUMP, parkPumps );
+    signalDialysatePumpHardStop( D12_PUMP );
+    signalDialysatePumpHardStop( D48_PUMP );
+    stopHeater( D5_HEAT );
+    stopHeater( D45_HEAT );
 }
 
 /*********************************************************************//**