Index: firmware/App/Modes/ModeStandby.c
===================================================================
diff -u -r16219f68040cc257728be31ce24f7e23e2769f48 -r285b5d82539c96524c93703d52a66fff76fb64fc
--- firmware/App/Modes/ModeStandby.c	(.../ModeStandby.c)	(revision 16219f68040cc257728be31ce24f7e23e2769f48)
+++ firmware/App/Modes/ModeStandby.c	(.../ModeStandby.c)	(revision 285b5d82539c96524c93703d52a66fff76fb64fc)
@@ -30,13 +30,13 @@
 
 // ********** private data **********
 
-static HD_STANDBY_STATE_T currentStandbyState;                                                 ///< Current state (sub-mode) of standby mode.
+static TD_STANDBY_STATE_T currentStandbyState;                                                 ///< Current state (sub-mode) of standby mode.
 static BOOL treatStartReqReceived;                                                             ///< Flag indicates user has requested initiation of a treatment.
 
 // ********** private function prototypes **********
 
-static HD_STANDBY_STATE_T handleStandbyModeStartState( void );
-static HD_STANDBY_STATE_T handleStandbyModeWaitForTreatmentState( void );
+static TD_STANDBY_STATE_T handleStandbyModeStartState( void );
+static TD_STANDBY_STATE_T handleStandbyModeWaitForTreatmentState( void );
 
 /*********************************************************************//**
  * @brief
@@ -79,7 +79,7 @@
 //    stopSyringePump();
 
     // Set valves to default positions
-//    setValveAirTrap( STATE_CLOSED );
+//    setValveAirTrap( VALVE_3WAY_COMMON_TO_CLOSED_STATE );
 //    setValvePosition( H1_VALV, VALVE_POSITION_A_INSERT_EJECT );
 //    setValvePosition( H19, VALVE_POSITION_A_INSERT_EJECT );
 
@@ -133,9 +133,9 @@
  * @details \b Outputs:
  * @return next state of the standby mode state machine
  *************************************************************************/
-static HD_STANDBY_STATE_T handleStandbyModeStartState( void )
+static TD_STANDBY_STATE_T handleStandbyModeStartState( void )
 {
-    HD_STANDBY_STATE_T state = STANDBY_WAIT_FOR_TREATMENT_STATE;
+    TD_STANDBY_STATE_T state = STANDBY_WAIT_FOR_TREATMENT_STATE;
 
     // Wait for door to be closed so we can home actuators
 //    if ( STATE_CLOSED == getSwitchState( H9_SWCH ) )
@@ -190,9 +190,9 @@
  * @details \b Outputs: treatStartReqReceived
  * @return next state of the standby mode state machine
  *************************************************************************/
-static HD_STANDBY_STATE_T handleStandbyModeWaitForTreatmentState( void )
+static TD_STANDBY_STATE_T handleStandbyModeWaitForTreatmentState( void )
 {
-    HD_STANDBY_STATE_T state     = STANDBY_WAIT_FOR_TREATMENT_STATE;
+    TD_STANDBY_STATE_T state     = STANDBY_WAIT_FOR_TREATMENT_STATE;
 //    DG_OP_MODE_T dgOperationMode = getDDOpMode();
 
 //    switch ( dgOperationMode )