Index: firmware/App/Modes/ModeFault.c
===================================================================
diff -u -r090cfb22a7c0b4738299c3fb411ca77aaba8d968 -r4fb1e15d35f6b968bab5620909c30baec98bfd4e
--- firmware/App/Modes/ModeFault.c	(.../ModeFault.c)	(revision 090cfb22a7c0b4738299c3fb411ca77aaba8d968)
+++ firmware/App/Modes/ModeFault.c	(.../ModeFault.c)	(revision 4fb1e15d35f6b968bab5620909c30baec98bfd4e)
@@ -23,7 +23,7 @@
 
 
 /**
- *  @addtogroup DGFaultMode
+ *  @addtogroup DDFaultMode
  *  @{
  */
 
@@ -33,13 +33,13 @@
 
 // ********** private data **********
 
-static DG_FAULT_STATE_T faultState;                                 ///< Currently active fault state.
+static DD_FAULT_STATE_T faultState;                                 ///< Currently active fault state.
 static SELF_TEST_STATUS_T faultPOSTSelfTestResult;                  ///< Fault POST self test result.
 
 // ********** private function prototypes **********
 
-static DG_FAULT_STATE_T handleFaultStartState( void );
-static DG_FAULT_STATE_T handleFaultRunNVPOSTsState( void );
+static DD_FAULT_STATE_T handleFaultStartState( void );
+static DD_FAULT_STATE_T handleFaultRunNVPOSTsState( void );
 
 /*********************************************************************//**
  * @brief
@@ -50,7 +50,7 @@
  *************************************************************************/
 void initFaultMode( void )
 {
-    faultState              = DG_FAULT_STATE_START;
+    faultState              = DD_FAULT_STATE_START;
     faultPOSTSelfTestResult = SELF_TEST_STATUS_IN_PROGRESS;
 }
 
@@ -103,15 +103,15 @@
     // execute current fault state
     switch ( faultState )
     {
-        case DG_FAULT_STATE_START:
+        case DD_FAULT_STATE_START:
             faultState = handleFaultStartState();
             break;
 
-        case DG_FAULT_STATE_RUN_NV_POSTS:
+        case DD_FAULT_STATE_RUN_NV_POSTS:
             faultState = handleFaultRunNVPOSTsState();
             break;
 
-        case DG_FAULT_STATE_COMPLETE:
+        case DD_FAULT_STATE_COMPLETE:
             // Do nothing unless the test configuration to recover treatment is enabled
             if ( ( TRUE == getTestConfigStatus( TEST_CONFIG_RECOVER_TREATMENT ) ) && ( TRUE == hasRecoverFromFaultModeBeenSet() ) )
             {
@@ -122,7 +122,7 @@
             break;
 
         default:
-            faultState = DG_FAULT_STATE_COMPLETE;
+            faultState = DD_FAULT_STATE_COMPLETE;
             break;
     }
 
@@ -136,7 +136,7 @@
  * @details \b Outputs: none
  * @return current state of fault mode
  *************************************************************************/
-DG_FAULT_STATE_T getCurrentFaultState( void )
+DD_FAULT_STATE_T getCurrentFaultState( void )
 {
     return faultState;
 }
@@ -174,8 +174,8 @@
 //    requestConcentratePumpOff( CONCENTRATEPUMPS_CP2_BICARB, parkPumps );
 //    signalROPumpHardStop();
 //    signalDrainPumpHardStop();
-//    stopHeater( DG_PRIMARY_HEATER );
-//    stopHeater( DG_TRIMMER_HEATER );
+//    stopHeater( DD_PRIMARY_HEATER );
+//    stopHeater( DD_TRIMMER_HEATER );
 }
 
 /*********************************************************************//**
@@ -185,9 +185,9 @@
  * @details \b Outputs: none
  * @return next state
  *************************************************************************/
-static DG_FAULT_STATE_T handleFaultStartState( void )
+static DD_FAULT_STATE_T handleFaultStartState( void )
 {
-    DG_FAULT_STATE_T state                  = DG_FAULT_STATE_START;
+    DD_FAULT_STATE_T state                  = DD_FAULT_STATE_START;
     //NVDATAMGMT_RECORDS_READ_STATUS_T status = getNVRecordsReadStatus();
 
 //    switch ( status )
@@ -196,12 +196,12 @@
 //        // their CRCs.
 //        case NVDATAMGMT_RECORDS_QUEUED:
 //        case NVDATAMGMT_RECORDS_READ:
-//            state = DG_FAULT_STATE_RUN_NV_POSTS;
+//            state = DD_FAULT_STATE_RUN_NV_POSTS;
 //            break;
 //
 //        // If the NV post was completed prior to transitioning to fault mode, do nothing
 //        case NVDATAMGMT_RECORDS_CRC_CHECKED:
-//            state = DG_FAULT_STATE_COMPLETE;
+//            state = DD_FAULT_STATE_COMPLETE;
 //            break;
 //    }
 
@@ -215,16 +215,16 @@
  * @details \b Outputs: faultPOSTSelfTestResult
  * @return next state
  *************************************************************************/
-static DG_FAULT_STATE_T handleFaultRunNVPOSTsState( void )
+static DD_FAULT_STATE_T handleFaultRunNVPOSTsState( void )
 {
-    DG_FAULT_STATE_T state = DG_FAULT_STATE_RUN_NV_POSTS;
+    DD_FAULT_STATE_T state = DD_FAULT_STATE_RUN_NV_POSTS;
 
 //    faultPOSTSelfTestResult = execNVDataMgmtSelfTest();
 //
 //    // Regardless of the status of the NV POST transition to the complete state.
 //    if ( ( SELF_TEST_STATUS_PASSED == faultPOSTSelfTestResult ) || ( SELF_TEST_STATUS_FAILED == faultPOSTSelfTestResult ) )
 //    {
-//        state = DG_FAULT_STATE_COMPLETE;
+//        state = DD_FAULT_STATE_COMPLETE;
 //    }
 
     return state;