Index: firmware/App/Modes/Prime.c
===================================================================
diff -u -r9df8618dfd95d3af354e6cbb590ebe6f6fd7ccdd -rc83c2987e2665c22484eed45d8e514d08d48fb4b
--- firmware/App/Modes/Prime.c	(.../Prime.c)	(revision 9df8618dfd95d3af354e6cbb590ebe6f6fd7ccdd)
+++ firmware/App/Modes/Prime.c	(.../Prime.c)	(revision c83c2987e2665c22484eed45d8e514d08d48fb4b)
@@ -62,7 +62,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.
@@ -81,13 +81,13 @@
 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 PRE_TREATMENT_PRIME_STATE_T handlePrimeReservoirTwoFillCompleteState( void );
-static PRE_TREATMENT_PRIME_STATE_T handlePrimeDialysateBypassState( 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 );
+static HD_PRE_TREATMENT_PRIME_STATE_T handlePrimeReservoirTwoFillCompleteState( void );
+static HD_PRE_TREATMENT_PRIME_STATE_T handlePrimeDialysateBypassState( void );
 
 /*********************************************************************//**
  * @brief
@@ -112,7 +112,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
@@ -134,41 +134,41 @@
     // 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;
 
-        case PRIME_RESERVOIR_TWO_FILL_COMPLETE_STATE:
+        case HD_PRIME_RESERVOIR_TWO_FILL_COMPLETE_STATE:
             currentPrimeState = handlePrimeReservoirTwoFillCompleteState();
             break;
 
-        case PRIME_DIALYSATE_BYPASS_STATE:
+        case HD_PRIME_DIALYSATE_BYPASS_STATE:
             currentPrimeState = handlePrimeDialysateBypassState();
             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;
     }
@@ -301,15 +301,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();
         purgeAirTimeOutStartTime = getMSTimerCount();
-        state = PRIME_SALINE_PURGE_AIR_STATE;
+        state = HD_PRIME_SALINE_PURGE_AIR_STATE;
     }
 
     return state;
@@ -323,9 +323,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 ( TRUE == didTimeout( purgeAirTimeOutStartTime, PURGE_AIR_TIME_OUT_COUNT ) )
     {
@@ -342,7 +342,7 @@
 
         setBloodPumpTargetFlowRate( BLOOD_PUMP_FLOW_RATE_CIRC_BLOOD_CIRCUIT, MOTOR_DIR_FORWARD, PUMP_CONTROL_MODE_OPEN_LOOP );
         noAirDetectedStartTime = getMSTimerCount();
-        state = PRIME_SALINE_CIRC_BLOOD_CIRCUIT_STATE;
+        state = HD_PRIME_SALINE_CIRC_BLOOD_CIRCUIT_STATE;
     }
 
     return state;
@@ -357,21 +357,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();
         purgeAirTimeOutStartTime = getMSTimerCount();
-        state = PRIME_SALINE_PURGE_AIR_STATE;
+        state = HD_PRIME_SALINE_PURGE_AIR_STATE;
     }
 
     if ( TRUE == didTimeout( noAirDetectedStartTime, NO_AIR_DETECTED_COUNT ) )
     {
         signalBloodPumpHardStop();
-        state = PRIME_RESERVOIR_ONE_FILL_COMPLETE_STATE;
+        state = HD_PRIME_RESERVOIR_ONE_FILL_COMPLETE_STATE;
     }
 
     return state;
@@ -385,9 +385,9 @@
  * @details Outputs: update valves and pumps configuration on state change
  * @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 ] )
     {
@@ -403,7 +403,7 @@
         previousLoadCellReading = 0;
         loadcellSteadyVolumeStartTime = getMSTimerCount();
         primeDialysateDialyzerStartTime = getMSTimerCount();
-        state = PRIME_DIALYSATE_DIALYZER_STATE;
+        state = HD_PRIME_DIALYSATE_DIALYZER_STATE;
     }
 
     return state;
@@ -417,18 +417,18 @@
  * @details Outputs: primed dialysate dialyzer fluid path
  * @return current state
  *************************************************************************/
-static PRE_TREATMENT_PRIME_STATE_T handlePrimeDialysateDialyzerState( void )
+static HD_PRE_TREATMENT_PRIME_STATE_T handlePrimeDialysateDialyzerState( void )
 {
-    PRE_TREATMENT_PRIME_STATE_T state = PRIME_DIALYSATE_DIALYZER_STATE;
+    HD_PRE_TREATMENT_PRIME_STATE_T state = HD_PRIME_DIALYSATE_DIALYZER_STATE;
 
-    F32 const loadcellWeight = getReservoirWeightSmallFilter( LOAD_CELL_RESERVOIR_1_PRIMARY );
+    F32 const loadcellWeight = getReservoirWeightSmallFilter( DG_RESERVOIR_1 );
     F32 const weightChange = fabs( 1.0 - ( previousLoadCellReading / loadcellWeight ) );
 
     if ( weightChange < LOAD_CELL_VOLUME_NOISE_TOLERANCE )
     {
         if ( TRUE == didTimeout( loadcellSteadyVolumeStartTime, MIN_LOAD_CELL_STEADY_VOLUME_TIME ) )
         {
-            state = PRIME_RESERVOIR_TWO_FILL_COMPLETE_STATE;
+            state = HD_PRIME_RESERVOIR_TWO_FILL_COMPLETE_STATE;
         }
     }
     else
@@ -453,9 +453,9 @@
  * @details Outputs: update valves and pumps configuration on state change
  * @return current state
  *************************************************************************/
-static PRE_TREATMENT_PRIME_STATE_T handlePrimeReservoirTwoFillCompleteState( void )
+static HD_PRE_TREATMENT_PRIME_STATE_T handlePrimeReservoirTwoFillCompleteState( void )
 {
-    PRE_TREATMENT_PRIME_STATE_T state = PRIME_DIALYSATE_DIALYZER_STATE;
+    HD_PRE_TREATMENT_PRIME_STATE_T state = HD_PRIME_DIALYSATE_DIALYZER_STATE;
 
     if ( TRUE == reservoirFilledStatus[ DG_RESERVOIR_2 ] )
     {
@@ -471,7 +471,7 @@
         previousLoadCellReading = 0;
         primeDialysateBypassStartTime = getMSTimerCount();
         loadcellSteadyVolumeStartTime = getMSTimerCount();
-        state = PRIME_DIALYSATE_BYPASS_STATE;
+        state = HD_PRIME_DIALYSATE_BYPASS_STATE;
     }
 
     return state;
@@ -485,9 +485,9 @@
  * @details Outputs: primed dialysate bypass fluid path
  * @return current state
  *************************************************************************/
-static PRE_TREATMENT_PRIME_STATE_T handlePrimeDialysateBypassState( void )
+static HD_PRE_TREATMENT_PRIME_STATE_T handlePrimeDialysateBypassState( void )
 {
-    F32 const loadcellWeight = getReservoirWeightSmallFilter( LOAD_CELL_RESERVOIR_2_PRIMARY );
+    F32 const loadcellWeight = getReservoirWeightSmallFilter( DG_RESERVOIR_2 );
     F32 const weightChange = fabs( 1.0 - ( previousLoadCellReading / loadcellWeight ) );
 
     if ( weightChange < LOAD_CELL_VOLUME_NOISE_TOLERANCE )
@@ -505,7 +505,7 @@
         SET_ALARM_WITH_1_U32_DATA( ALARM_ID_PRIME_DIALYSATE_BYPASS_TIME_OUT, PRIME_DIALYSATE_BYPASS_TIME_LIMIT );
     }
 
-    return PRIME_DIALYSATE_BYPASS_STATE;
+    return HD_PRIME_DIALYSATE_BYPASS_STATE;
 }
 
 /**@}*/