Index: firmware/App/Modes/ModeStandby.c
===================================================================
diff -u -r3518e8a088c32e75c0c8960d5e629a7401095feb -r961784c895cb8f551a2623cd02dcbfe42d04b7c2
--- firmware/App/Modes/ModeStandby.c	(.../ModeStandby.c)	(revision 3518e8a088c32e75c0c8960d5e629a7401095feb)
+++ firmware/App/Modes/ModeStandby.c	(.../ModeStandby.c)	(revision 961784c895cb8f551a2623cd02dcbfe42d04b7c2)
@@ -15,7 +15,6 @@
 *
 ***************************************************************************/
 
-
 #include "DDInterface.h"
 #include "Messaging.h"
 #include "ModeStandby.h"
@@ -80,8 +79,8 @@
 
     // Set valves to default positions
 //    setValveAirTrap( STATE_CLOSED );
-//    setValvePosition( VBA, VALVE_POSITION_A_INSERT_EJECT );
-//    setValvePosition( VBV, VALVE_POSITION_A_INSERT_EJECT );
+//    setValvePosition( H1_VALV, VALVE_POSITION_A_INSERT_EJECT );
+//    setValvePosition( H19, VALVE_POSITION_A_INSERT_EJECT );
 
 //    doorClosedRequired( FALSE, FALSE );             // door no longer required to be closed in standby mode
 //    syringeDetectionRequired( FALSE );
@@ -138,7 +137,7 @@
     HD_STANDBY_STATE_T state = STANDBY_WAIT_FOR_TREATMENT_STATE;
 
     // Wait for door to be closed so we can home actuators
-//    if ( STATE_CLOSED == getSwitchStatus( FRONT_DOOR ) )
+//    if ( STATE_CLOSED == getSwitchState( H9_SWCH ) )
 //    {
 //        // If we haven't already initiated homing of actuators, initiate now
 //        if ( homingInitiated != TRUE )
@@ -279,8 +278,8 @@
 //
 //                // Set valves to safe positions
 //                setValveAirTrap( STATE_CLOSED );
-//                setValvePosition( VBA, VALVE_POSITION_C_CLOSE );
-//                setValvePosition( VBV, VALVE_POSITION_C_CLOSE );
+//                setValvePosition( H1_VALV, VALVE_POSITION_C_CLOSE );
+//                setValvePosition( H19, VALVE_POSITION_C_CLOSE );
 //            }
             break;