Index: firmware/App/Modes/Prime.c
===================================================================
diff -u -rc7ffa13e306681a647ad25513a89250c6918e6a4 -r351ae8d56096982a68f7df1b69a3bf4dd5785094
--- firmware/App/Modes/Prime.c	(.../Prime.c)	(revision c7ffa13e306681a647ad25513a89250c6918e6a4)
+++ firmware/App/Modes/Prime.c	(.../Prime.c)	(revision 351ae8d56096982a68f7df1b69a3bf4dd5785094)
@@ -52,7 +52,7 @@
 
 // ********** private data **********
 
-static PRE_TREATMENT_PRIME_STATE_T currentPrimeState;                                           ///< Current state of the prime sub-mode state machine.
+static HD_PRE_TREATMENT_PRIME_STATE_T currentPrimeState;                                        ///< Current state of the prime sub-mode state machine.
 static PRIME_RESERVOIR_MGMT_STATE_T currentReservoirMgmtState;                                  ///< Current reservoir management state.
 
 static BOOL isPrimeCompleted;                                                                   ///< Status if prime sequence has been completed.
@@ -66,11 +66,11 @@
 static void execPreTreatmentReservoirMgmt( void );
 static void purgeAirValvesBloodPumpControl( void );
 
-static PRE_TREATMENT_PRIME_STATE_T handlePrimeSalineSetupState( void );
-static PRE_TREATMENT_PRIME_STATE_T handlePrimePurgeAirState( void );
-static PRE_TREATMENT_PRIME_STATE_T handlePrimeCircBloodCircuitState( void );
-static PRE_TREATMENT_PRIME_STATE_T handlePrimeReservoirOneFillCompleteState( void );
-static PRE_TREATMENT_PRIME_STATE_T handlePrimeDialysateDialyzerState( void );
+static HD_PRE_TREATMENT_PRIME_STATE_T handlePrimeSalineSetupState( void );
+static HD_PRE_TREATMENT_PRIME_STATE_T handlePrimePurgeAirState( void );
+static HD_PRE_TREATMENT_PRIME_STATE_T handlePrimeCircBloodCircuitState( void );
+static HD_PRE_TREATMENT_PRIME_STATE_T handlePrimeReservoirOneFillCompleteState( void );
+static HD_PRE_TREATMENT_PRIME_STATE_T handlePrimeDialysateDialyzerState( void );
 
 /*********************************************************************//**
  * @brief
@@ -95,7 +95,7 @@
  *************************************************************************/
 void transitionToPrime( void )
 {
-    currentPrimeState = PRIME_START_STATE;
+    currentPrimeState = HD_PRIME_START_STATE;
     currentReservoirMgmtState = PRIME_RESERVOIR_MGMT_START_STATE;
     isPrimeCompleted = FALSE;
     // TODO: set to false after integration with UI
@@ -118,33 +118,33 @@
     // execute prime sub-mode state machine
     switch ( currentPrimeState )
     {
-        case PRIME_START_STATE:
+        case HD_PRIME_START_STATE:
             cmdSetDGActiveReservoir( DG_RESERVOIR_2 );
-            currentPrimeState = PRIME_SALINE_SETUP_STATE;
+            currentPrimeState = HD_PRIME_SALINE_SETUP_STATE;
             break;
 
-        case PRIME_SALINE_SETUP_STATE:
+        case HD_PRIME_SALINE_SETUP_STATE:
             currentPrimeState = handlePrimeSalineSetupState();
             break;
 
-        case PRIME_SALINE_PURGE_AIR_STATE:
+        case HD_PRIME_SALINE_PURGE_AIR_STATE:
             currentPrimeState = handlePrimePurgeAirState();
             break;
 
-        case PRIME_SALINE_CIRC_BLOOD_CIRCUIT_STATE:
+        case HD_PRIME_SALINE_CIRC_BLOOD_CIRCUIT_STATE:
             currentPrimeState = handlePrimeCircBloodCircuitState();
             break;
 
-        case PRIME_RESERVOIR_ONE_FILL_COMPLETE_STATE:
+        case HD_PRIME_RESERVOIR_ONE_FILL_COMPLETE_STATE:
             currentPrimeState = handlePrimeReservoirOneFillCompleteState();
             break;
 
-        case PRIME_DIALYSATE_DIALYZER_STATE:
+        case HD_PRIME_DIALYSATE_DIALYZER_STATE:
             currentPrimeState = handlePrimeDialysateDialyzerState();
             break;
 
         default:
-            currentPrimeState = PRIME_START_STATE;
+            currentPrimeState = HD_PRIME_START_STATE;
             SET_ALARM_WITH_2_U32_DATA( ALARM_ID_HD_SOFTWARE_FAULT, SW_FAULT_ID_MODE_PRE_TREATMENT_PRIME_INVALID_STATE, (U32)currentReservoirMgmtState );
             break;
     }
@@ -277,15 +277,15 @@
  * @details Outputs: control valves to purge air
  * @return current state
  *************************************************************************/
-static PRE_TREATMENT_PRIME_STATE_T handlePrimeSalineSetupState( void )
+static HD_PRE_TREATMENT_PRIME_STATE_T handlePrimeSalineSetupState( void )
 {
-    PRE_TREATMENT_PRIME_STATE_T state = PRIME_SALINE_SETUP_STATE;
+    HD_PRE_TREATMENT_PRIME_STATE_T state = HD_PRIME_SALINE_SETUP_STATE;
 
     if ( TRUE == primeStartReqReceived )
     {
         purgeAirValvesBloodPumpControl();
         purgeAirTimeOutTimerCount = 0;
-        state = PRIME_SALINE_PURGE_AIR_STATE;
+        state = HD_PRIME_SALINE_PURGE_AIR_STATE;
     }
 
     return state;
@@ -299,9 +299,9 @@
  * @details Outputs: runs blood pump, control valves to trap air
  * @return current state
  *************************************************************************/
-static PRE_TREATMENT_PRIME_STATE_T handlePrimePurgeAirState( void )
+static HD_PRE_TREATMENT_PRIME_STATE_T handlePrimePurgeAirState( void )
 {
-    PRE_TREATMENT_PRIME_STATE_T state = PRIME_SALINE_PURGE_AIR_STATE;
+    HD_PRE_TREATMENT_PRIME_STATE_T state = HD_PRIME_SALINE_PURGE_AIR_STATE;
 
     if ( ++purgeAirTimeOutTimerCount > PURGE_AIR_TIME_OUT_COUNT )
     {
@@ -318,7 +318,7 @@
 
         setBloodPumpTargetFlowRate( BLOOD_PUMP_FLOW_RATE_CIRC_BLOOD_CIRCUIT, MOTOR_DIR_FORWARD, PUMP_CONTROL_MODE_OPEN_LOOP );
         noAirDetectedTimerCounter = 0;
-        state = PRIME_SALINE_CIRC_BLOOD_CIRCUIT_STATE;
+        state = HD_PRIME_SALINE_CIRC_BLOOD_CIRCUIT_STATE;
     }
 
     return state;
@@ -333,21 +333,21 @@
  * @details Outputs: stop blood pump, control valves to purge air
  * @return current state
  *************************************************************************/
-static PRE_TREATMENT_PRIME_STATE_T handlePrimeCircBloodCircuitState( void )
+static HD_PRE_TREATMENT_PRIME_STATE_T handlePrimeCircBloodCircuitState( void )
 {
-    PRE_TREATMENT_PRIME_STATE_T state = PRIME_SALINE_CIRC_BLOOD_CIRCUIT_STATE;
+    HD_PRE_TREATMENT_PRIME_STATE_T state = HD_PRIME_SALINE_CIRC_BLOOD_CIRCUIT_STATE;
 
     if ( AIR_TRAP_LEVEL_AIR == getAirTrapLevel( AIR_TRAP_LEVEL_SENSOR_LOWER ) )
     {
         purgeAirValvesBloodPumpControl();
         purgeAirTimeOutTimerCount = 0;
-        state = PRIME_SALINE_PURGE_AIR_STATE;
+        state = HD_PRIME_SALINE_PURGE_AIR_STATE;
     }
 
     if ( ++noAirDetectedTimerCounter > NO_AIR_DETECTED_COUNT )
     {
         signalBloodPumpHardStop();
-        state = PRIME_RESERVOIR_ONE_FILL_COMPLETE_STATE;
+        state = HD_PRIME_RESERVOIR_ONE_FILL_COMPLETE_STATE;
     }
 
     return state;
@@ -361,13 +361,13 @@
  * @details Outputs: none
  * @return current state
  *************************************************************************/
-static PRE_TREATMENT_PRIME_STATE_T handlePrimeReservoirOneFillCompleteState( void )
+static HD_PRE_TREATMENT_PRIME_STATE_T handlePrimeReservoirOneFillCompleteState( void )
 {
-    PRE_TREATMENT_PRIME_STATE_T state = PRIME_RESERVOIR_ONE_FILL_COMPLETE_STATE;
+    HD_PRE_TREATMENT_PRIME_STATE_T state = HD_PRIME_RESERVOIR_ONE_FILL_COMPLETE_STATE;
 
     if ( TRUE == reservoirFilledStatus[ DG_RESERVOIR_1 ] )
     {
-        state = PRIME_DIALYSATE_DIALYZER_STATE;
+        state = HD_PRIME_DIALYSATE_DIALYZER_STATE;
     }
 
     return state;
@@ -381,11 +381,11 @@
  * @details Outputs: isPrimeCompleted
  * @return current state
  *************************************************************************/
-static PRE_TREATMENT_PRIME_STATE_T handlePrimeDialysateDialyzerState( void )
+static HD_PRE_TREATMENT_PRIME_STATE_T handlePrimeDialysateDialyzerState( void )
 {
     // TODO: Add priming for dialysate circuit
     isPrimeCompleted = TRUE;
-    return PRIME_DIALYSATE_DIALYZER_STATE;
+    return HD_PRIME_DIALYSATE_DIALYZER_STATE;
 }
 
 /**@}*/