Index: firmware/App/Modes/ModeGenDialysate.c
===================================================================
diff -u -r788a88e8e9f58c60d3b753ef0ae32b6c7a0757e6 -r1f3075c2434f33fe481429e762b78f864db2cc30
--- firmware/App/Modes/ModeGenDialysate.c	(.../ModeGenDialysate.c)	(revision 788a88e8e9f58c60d3b753ef0ae32b6c7a0757e6)
+++ firmware/App/Modes/ModeGenDialysate.c	(.../ModeGenDialysate.c)	(revision 1f3075c2434f33fe481429e762b78f864db2cc30)
@@ -112,7 +112,7 @@
 static void checkDialysateTemperature( void );
 static void monitorChamberLevelStatus( void );
 static void publishGenDialysateModeData( void );
-static U32 getFreshDialPumpRpm( void );
+static U32 getFreshDialPumpInitialRpm( void );
 
 /*********************************************************************//**
  * @brief
@@ -209,13 +209,13 @@
 
 /*********************************************************************//**
  * @brief
- * The getFreshDialPumpRpm function returns fresh dialysate pump initial
+ * The getFreshDialPumpInitialRpm function returns fresh dialysate pump initial
  * rpm based on hardwawre configuration.
- * @details Inputs: TEST_CONFIG_DD_FP_ENABLE_BETA_1_0_HW
+ * @details Inputs: FRESH_DIAL_PUMP_INITIAL_RPM, FRESH_DIAL_PUMP_INITIAL_RPM_B1_9_B2_0
  * @details Outputs: none
  * @return fresh dialysate pump initial RPM for the active hardware variant
  *************************************************************************/
-static U32 getFreshDialPumpRpm( void )
+static U32 getFreshDialPumpInitialRpm( void )
 {
     U32 rpm = FRESH_DIAL_PUMP_INITIAL_RPM_B1_9_B2_0;
 
@@ -276,7 +276,7 @@
 
             //Testing : Enable close loop once testing is complete
             //setDialysatePumpTargetRPM( D12_PUMP, FRESH_DIAL_PUMP_INITIAL_RPM, FALSE );
-            setDialysatePumpTargetRPM( D12_PUMP, getFreshDialPumpRpm(), TRUE );
+            setDialysatePumpTargetRPM( D12_PUMP, getFreshDialPumpInitialRpm(), TRUE );
             //setDialysatePumpTargetRPM( D48_PUMP, SPENT_DIAL_PUMP_INITIAL_RPM, FALSE );
             setDialysatePumpTargetRPM( D48_PUMP, d48PumpSpeed, TRUE );
 
@@ -312,7 +312,7 @@
             startHeater( D45_HEAT );
 
             //setDialysatePumpTargetRPM( D12_PUMP, FRESH_DIAL_PUMP_INITIAL_RPM, FALSE );
-            setDialysatePumpTargetRPM( D12_PUMP, getFreshDialPumpRpm(), TRUE );
+            setDialysatePumpTargetRPM( D12_PUMP, getFreshDialPumpInitialRpm(), TRUE );
             //setDialysatePumpTargetRPM( D48_PUMP, SPENT_DIAL_PUMP_INITIAL_RPM, FALSE );
             setDialysatePumpTargetRPM( D48_PUMP, d48PumpSpeed, TRUE );
 
@@ -364,7 +364,7 @@
             // Stop trimmer heater
             stopHeater( D45_HEAT );
 
-            setDialysatePumpTargetRPM( D12_PUMP, getFreshDialPumpRpm(), TRUE );
+            setDialysatePumpTargetRPM( D12_PUMP, getFreshDialPumpInitialRpm(), TRUE );
             setDialysatePumpTargetRPM( D48_PUMP, SPENT_DIAL_PUMP_FILL_RPM, TRUE );
 
             //Rinse pump On
@@ -406,12 +406,12 @@
             //Rinse pump On
             setRinsePumpState( RINSE_PUMP_STATE_ON );
 
-            setDialysatePumpTargetRPM( D12_PUMP, getFreshDialPumpRpm(), TRUE );
+            setDialysatePumpTargetRPM( D12_PUMP, getFreshDialPumpInitialRpm(), TRUE );
             setDialysatePumpTargetRPM( D48_PUMP, d48PumpSpeed, TRUE );
             break;
 
         case DD_GEND_DIALYSATE_DELIVERY_PAUSE:
-            setDialysatePumpTargetRPM( D12_PUMP, getFreshDialPumpRpm(), TRUE );
+            setDialysatePumpTargetRPM( D12_PUMP, getFreshDialPumpInitialRpm(), TRUE );
             signalDialysatePumpHardStop( D48_PUMP );
             requestConcentratePumpOff( D11_PUMP, FALSE );
             requestConcentratePumpOff( D10_PUMP, FALSE );