Index: firmware/App/Modes/ModeFault.c
===================================================================
diff -u -r961784c895cb8f551a2623cd02dcbfe42d04b7c2 -r285b5d82539c96524c93703d52a66fff76fb64fc
--- firmware/App/Modes/ModeFault.c	(.../ModeFault.c)	(revision 961784c895cb8f551a2623cd02dcbfe42d04b7c2)
+++ firmware/App/Modes/ModeFault.c	(.../ModeFault.c)	(revision 285b5d82539c96524c93703d52a66fff76fb64fc)
@@ -27,13 +27,13 @@
 
 // ********** private data **********
 
-static HD_FAULT_STATE_T faultState;                     ///< Currently active fault state.
+static TD_FAULT_STATE_T faultState;                     ///< Currently active fault state.
 static SELF_TEST_STATUS_T faultPOSTSelfTestResult;      ///< Fault POST self test result.
 
 // ********** private function prototypes **********
 
-static HD_FAULT_STATE_T handleFaultStartState( void );
-static HD_FAULT_STATE_T handleFaultRunNVPOSTsState( void );
+static TD_FAULT_STATE_T handleFaultStartState( void );
+static TD_FAULT_STATE_T handleFaultRunNVPOSTsState( void );
 
 /*********************************************************************//**
  * @brief
@@ -44,7 +44,7 @@
  *************************************************************************/
 void initFaultMode( void )
 {
-    faultState              = HD_FAULT_STATE_START;
+    faultState              = TD_FAULT_STATE_START;
     faultPOSTSelfTestResult = SELF_TEST_STATUS_IN_PROGRESS;
 }
 
@@ -108,7 +108,7 @@
 //    setAirPumpState( AIR_PUMP_STATE_OFF );
 
     // Ensure all valves are in safe position
-//    setValveAirTrap( STATE_CLOSED );
+//    setValveAirTrap( VALVE_3WAY_COMMON_TO_CLOSED_STATE );
 //    setValvePosition( H1_VALV, VALVE_POSITION_C_CLOSE );
 //    setValvePosition( H19, VALVE_POSITION_C_CLOSE );
 
@@ -120,15 +120,15 @@
 
     switch( faultState )
     {
-        case HD_FAULT_STATE_START:
+        case TD_FAULT_STATE_START:
             faultState = handleFaultStartState();
             break;
 
-        case HD_FAULT_STATE_RUN_NV_POSTS:
+        case TD_FAULT_STATE_RUN_NV_POSTS:
             faultState = handleFaultRunNVPOSTsState();
             break;
 
-        case HD_FAULT_STATE_COMPLETE:
+        case TD_FAULT_STATE_COMPLETE:
             // Do nothing unless the test configuration to recover treatment is enabled
 //            if ( ( TRUE == getTestConfigStatus( TEST_CONFIG_RECOVER_TREATMENT ) ) && ( TRUE == hasRecoverFromFaultModeBeenSet() ) )
 //            {
@@ -139,7 +139,7 @@
             break;
 
         default:
-            faultState = HD_FAULT_STATE_COMPLETE;
+            faultState = TD_FAULT_STATE_COMPLETE;
             break;
     }
 
@@ -167,9 +167,9 @@
  * @details \b Outputs: none
  * @return next state
  *************************************************************************/
-static HD_FAULT_STATE_T handleFaultStartState( void )
+static TD_FAULT_STATE_T handleFaultStartState( void )
 {
-    HD_FAULT_STATE_T state                  = HD_FAULT_STATE_COMPLETE;
+    TD_FAULT_STATE_T state                  = TD_FAULT_STATE_COMPLETE;
 //    NVDATAMGMT_RECORDS_READ_STATUS_T status = getNVRecordsReadStatus();
 //
 //    switch ( status )
@@ -197,9 +197,9 @@
  * @details \b Outputs: faultPOSTSelfTestResult
  * @return next state
  *************************************************************************/
-static HD_FAULT_STATE_T handleFaultRunNVPOSTsState( void )
+static TD_FAULT_STATE_T handleFaultRunNVPOSTsState( void )
 {
-    HD_FAULT_STATE_T state  = HD_FAULT_STATE_RUN_NV_POSTS;
+    TD_FAULT_STATE_T state  = TD_FAULT_STATE_RUN_NV_POSTS;
 //    faultPOSTSelfTestResult = execNVDataMgmtSelfTest();
 //
 //    // Regardless of the status of the NV POST transition to the complete state.