Index: firmware/App/Modes/ModeUpdate.c
===================================================================
diff -u -r838bd7060d127e6967559bc2b3998eac201bf738 -r16013c6c8623dee0c0be848262b6b7f664cb11ea
--- firmware/App/Modes/ModeUpdate.c	(.../ModeUpdate.c)	(revision 838bd7060d127e6967559bc2b3998eac201bf738)
+++ firmware/App/Modes/ModeUpdate.c	(.../ModeUpdate.c)	(revision 16013c6c8623dee0c0be848262b6b7f664cb11ea)
@@ -33,7 +33,7 @@
  *************************************************************************/
 void initUpdateMode( void )
 {
-    currentUpdateState    = UPDATE_INIT_STATE;
+    currentUpdateState    = TD_UPDATE_INIT_STATE;
     modeUpdateStartTimeMS = 0;
 }
 
@@ -65,17 +65,17 @@
 {
     switch ( currentUpdateState )
     {
-        case UPDATE_INIT_STATE:
+        case TD_UPDATE_INIT_STATE:
             currentUpdateState = handleUpdateModeStartState();
             break;
 
-        case UPDATE_RESET_MCU_STATE:
+        case TD_UPDATE_RESET_MCU_STATE:
             currentUpdateState = handleUpdateModeResetMCUState();
             break;
 
         default:
             SET_ALARM_WITH_2_U32_DATA( ALARM_ID_TD_SOFTWARE_FAULT, SW_FAULT_ID_MODE_UPDATE_INVALID_STATE, currentUpdateState );
-            currentUpdateState = UPDATE_INIT_STATE;
+            currentUpdateState = TD_UPDATE_INIT_STATE;
             break;
     }
 
@@ -93,11 +93,11 @@
  *************************************************************************/
 static TD_UPDATE_STATE_T handleUpdateModeStartState( void )
 {
-    TD_UPDATE_STATE_T state = UPDATE_INIT_STATE;
+    TD_UPDATE_STATE_T state = TD_UPDATE_INIT_STATE;
 
     if ( TRUE == didTimeout( modeUpdateStartTimeMS, BEFORE_MCU_RESET_TIMEOUT_MS ) )
     {
-        state = UPDATE_RESET_MCU_STATE;
+        state = TD_UPDATE_RESET_MCU_STATE;
     }
 
     return state;
@@ -113,7 +113,7 @@
  *************************************************************************/
 static TD_UPDATE_STATE_T handleUpdateModeResetMCUState( void )
 {
-    TD_UPDATE_STATE_T state = UPDATE_RESET_MCU_STATE;
+    TD_UPDATE_STATE_T state = TD_UPDATE_RESET_MCU_STATE;
 
     resetMicroControllerUnit();