Index: firmware/App/Controllers/SubstitutionPump.c
===================================================================
diff -u -r7ef41d90338528f3e8c0ef801fc17fa1ec4b34ea -r2c1a0857ad6987f387bdb8434c6498ab88cd1db8
--- firmware/App/Controllers/SubstitutionPump.c	(.../SubstitutionPump.c)	(revision 7ef41d90338528f3e8c0ef801fc17fa1ec4b34ea)
+++ firmware/App/Controllers/SubstitutionPump.c	(.../SubstitutionPump.c)	(revision 2c1a0857ad6987f387bdb8434c6498ab88cd1db8)
@@ -248,9 +248,9 @@
  * @brief
  * The handleSubstitutionPumpControlTargetSpeedState function turns off given
  * substitution pumps switch to off state upon request. While in on state,
- * the function controls substitution pumps to a target step speed.
+ * the function controls substitution pumps to a target rate.
  * @details \b Inputs: currentPumpSpeed[]
- * @details \b Outputs: control given substitution pumps to target step speed
+ * @details \b Outputs: control given substitution pumps to target rate
  * @param pumpId ID of the substitution pump
  * @return state
  *************************************************************************/
@@ -273,7 +273,7 @@
         state = SUBSTITUTION_PUMP_RAMP_TO_TARGET_SPEED_STATE;
     }
 
-    //Stop the pump if measured rev count reaches zero
+    //Stop the pump if requested.
     if ( FALSE == substitutionPumps[ pumpId ].hasTurnOnPumpsBeenRequested )
     {
         state = SUBSTITUTION_PUMP_OFF_STATE;
@@ -460,16 +460,16 @@
 
 /*********************************************************************//**
  * @brief
- * The setSubstitutionPumpTargetSpeed function sets the target step speed based on
+ * The setSubstitutionPumpTargetRate function sets the target rate based on
  * given speed in mL/min to specified substitution pump.
  * @details \b Inputs: none
  * @details \b Outputs: substitutionPumps[]
  * @details \b Alarms: ALARM_ID_DD_SOFTWARE_FAULT when invalid pump ID is seen.
- * @param pumpId pump id to set step speed
- * @param targetRate_ml_min target speed in mL/min
+ * @param pumpId pump id to set target rate
+ * @param targetRate_ml_min target rate in mL/min
  * @return none
  *************************************************************************/
-void setSubstitutionPumpTargetSpeed( SUBSTITUTION_PUMPS_T pumpId, F32 targetRate_ml_min )
+void setSubstitutionPumpTargetRate( SUBSTITUTION_PUMPS_T pumpId, F32 targetRate_ml_min )
 {
     if ( pumpId < NUM_OF_SUB_PUMPS )
     {
@@ -543,16 +543,16 @@
 
 /*********************************************************************//**
  * @brief
- * The testSubstitutionPumpTargetSpeedOverride function overrides the target
- * speed value of given substitution pump id.
+ * The testSubstitutionPumpTargetRateOverride function overrides the target
+ * rate value of given substitution pump id.
  * @details \b Inputs: none
- * @details \b Outputs: pumpTargetSpeed
+ * @details \b Outputs: pumpTargetRate
  * @param message Override message from Dialin which includes an ID of
  * the pump to override and the state to override the pump to.
  * @return TRUE if override successful, FALSE if not
- * @note pump traget speed range should be between 3.0F and 45.0F.
+ * @note pump target rate range should be between 0.0F and 200.0F
  *************************************************************************/
-BOOL testSubstitutionPumpTargetSpeedOverride( MESSAGE_T *message )
+BOOL testSubstitutionPumpTargetRateOverride( MESSAGE_T *message )
 {
     BOOL result = f32ArrayOverride( message, &pumpTargetRate[ 0 ], NUM_OF_SUB_PUMPS - 1 );
 
@@ -588,7 +588,7 @@
                 // Handle start command
                 if ( TRUE == payload.startStop )
                 {
-                    setSubstitutionPumpTargetSpeed( (SUBSTITUTION_PUMPS_T)payload.pumpID, payload.speed );
+                    setSubstitutionPumpTargetRate( (SUBSTITUTION_PUMPS_T)payload.pumpID, payload.speed );
                     requestSubstitutionPumpOn ( (SUBSTITUTION_PUMPS_T)payload.pumpID );
                     result = TRUE;
                 }
Index: firmware/App/Controllers/SubstitutionPump.h
===================================================================
diff -u -r7ef41d90338528f3e8c0ef801fc17fa1ec4b34ea -r2c1a0857ad6987f387bdb8434c6498ab88cd1db8
--- firmware/App/Controllers/SubstitutionPump.h	(.../SubstitutionPump.h)	(revision 7ef41d90338528f3e8c0ef801fc17fa1ec4b34ea)
+++ firmware/App/Controllers/SubstitutionPump.h	(.../SubstitutionPump.h)	(revision 2c1a0857ad6987f387bdb8434c6498ab88cd1db8)
@@ -62,10 +62,10 @@
 void requestSubstitutionPumpOn( SUBSTITUTION_PUMPS_T pumpId );
 void requestSubstitutionPumpOff( SUBSTITUTION_PUMPS_T pumpId );
 F32 getSubstitutionPumpTargetRate( SUBSTITUTION_PUMPS_T pumpId );
-void setSubstitutionPumpTargetSpeed( SUBSTITUTION_PUMPS_T pumpId, F32 targetSpeed_ml_min );
+void setSubstitutionPumpTargetRate( SUBSTITUTION_PUMPS_T pumpId, F32 targetSpeed_ml_min );
 
 BOOL testSubstitutionPumpDataPublishIntervalOverride( MESSAGE_T *message );
-BOOL testSubstitutionPumpTargetSpeedOverride( MESSAGE_T *message );
+BOOL testSubstitutionPumpTargetRateOverride( MESSAGE_T *message );
 BOOL testSubstitutionPumpStartStopOverride( MESSAGE_T *message );
 /**@}*/
 
Index: firmware/App/Services/Messaging.c
===================================================================
diff -u -rd71d8f2e7d1b4fe070ff6494db6559c1235c7fa6 -r2c1a0857ad6987f387bdb8434c6498ab88cd1db8
--- firmware/App/Services/Messaging.c	(.../Messaging.c)	(revision d71d8f2e7d1b4fe070ff6494db6559c1235c7fa6)
+++ firmware/App/Services/Messaging.c	(.../Messaging.c)	(revision 2c1a0857ad6987f387bdb8434c6498ab88cd1db8)
@@ -293,7 +293,7 @@
     { MSG_ID_FP_SET_RECOVERY_VALVES_REQUEST,                                        &testIOFPSetValveRecoveryConfig },
     { MSG_ID_DD_SUBSTITUTION_PUMP_START_STOP_OVERRIDE_REQUEST,                      &testSubstitutionPumpStartStopOverride },
     { MSG_ID_DD_SUBSTITUTION_PUMP_BROADCAST_INTERVAL_OVERRIDE_REQUEST,              &testSubstitutionPumpDataPublishIntervalOverride },
-    { MSG_ID_DD_SUBSTITUTION_PUMP_TARGET_SPEED_OVERRIDE_REQUEST,                    &testSubstitutionPumpTargetSpeedOverride },
+    { MSG_ID_DD_SUBSTITUTION_PUMP_TARGET_SPEED_OVERRIDE_REQUEST,                    &testSubstitutionPumpTargetRateOverride },
 };
 
 /// Calculation for number of entries in the incoming message function handler look-up table.
Index: firmware/App/Services/TDInterface.c
===================================================================
diff -u -rb93fd36af5af02e88044107d4331125b11a9bc0e -r2c1a0857ad6987f387bdb8434c6498ab88cd1db8
--- firmware/App/Services/TDInterface.c	(.../TDInterface.c)	(revision b93fd36af5af02e88044107d4331125b11a9bc0e)
+++ firmware/App/Services/TDInterface.c	(.../TDInterface.c)	(revision 2c1a0857ad6987f387bdb8434c6498ab88cd1db8)
@@ -563,7 +563,7 @@
                                     startTxRequest.sodium, startTxRequest.bicarbonate );
             setTDDialyzerBypass( startTxRequest.bypassDialyzer );
             tdSubstitutionFlowRate.data = startTxRequest.substitutionrate;
-            setSubstitutionPumpTargetSpeed( D92_PUMP,  getTDSubstitutionFlowRate() );
+            setSubstitutionPumpTargetRate( D92_PUMP,  getTDSubstitutionFlowRate() );
 
             // start dialysate generation
             result = requestDDGenDialStart();
@@ -594,7 +594,7 @@
                                         startTxRequest.sodium, startTxRequest.bicarbonate );
                 setTDDialyzerBypass( startTxRequest.bypassDialyzer );
                 tdSubstitutionFlowRate.data = startTxRequest.substitutionrate;
-                setSubstitutionPumpTargetSpeed( D92_PUMP,  getTDSubstitutionFlowRate() );
+                setSubstitutionPumpTargetRate( D92_PUMP,  getTDSubstitutionFlowRate() );
 
                 // Signal to update treatement parameters
                 setTreatmentParamUpdate();
@@ -658,7 +658,7 @@
 
             case TD_TREATMENT_OVERRIDE_SUB_FLOWRATE:
                 result = f32Override( message, &tdSubstitutionFlowRate);
-                setSubstitutionPumpTargetSpeed( D92_PUMP, getTDSubstitutionFlowRate() );
+                setSubstitutionPumpTargetRate( D92_PUMP, getTDSubstitutionFlowRate() );
                 break;
 
             default: