Index: firmware/App/Controllers/SubstitutionPump.c
===================================================================
diff -u -r4a1f0518f867d1bc5d27d452a8306e43159e9a51 -r656b372dbbede6a2836a0375c71193c6d0122554
--- firmware/App/Controllers/SubstitutionPump.c	(.../SubstitutionPump.c)	(revision 4a1f0518f867d1bc5d27d452a8306e43159e9a51)
+++ firmware/App/Controllers/SubstitutionPump.c	(.../SubstitutionPump.c)	(revision 656b372dbbede6a2836a0375c71193c6d0122554)
@@ -91,7 +91,7 @@
     U32 controlTimerCounter;                                                                                    ///< Timer counter to perform control on Substitution pump.
     SUBSTITUTION_PUMP_STATE_T execState;                                                                        ///< Substitution pump execute current state.
     BOOL hasTurnOnPumpsBeenRequested;                                                                           ///< Flag indicates a request to turn Substitution pumps on.
-    F32 currentPumpSpeed;                                                                                       ///< Current controlled Substitution pumps' speed (mL/min).
+    F32 currentPumpSpeed;                                                                                       ///< Current controlled Substitution pumps' speed rpm.
     U32 togglePeriodCount;                                                                                      ///< Converted pump speed (mL/min) to toggle period counts (0.5 uS increment counts per step).
     U08 direction;                                                                                              ///< Substitution pump motor direction.
     U08 controlSet;                                                                                             ///< Substitution pump control set.
@@ -103,14 +103,14 @@
 {
     U32 pumpID;                                                                                                 ///< Substitution pump ID
     U32 startStop;                                                                                              ///< Substitution pump start:1,stop :0.
-    F32 speed;                                                                                                  ///< Speed in ml/min
+    F32 rate;                                                                                                  ///< rate in ml/min
 } SUB_PUMP_START_STOP_CMD_PAYLOAD_T;
 
 // ********** private data **********
 
 static OVERRIDE_U32_T substitutionPumpDataPublishInterval;                                                      ///< Substitution pump data publish interval.
 static SUBSTITUTION_PUMP_T substitutionPumps[ NUM_OF_SUB_PUMPS ];                                               ///< Array of Substitution pumps' data structure.
-static OVERRIDE_F32_T pumpTargetRate[ NUM_OF_SUB_PUMPS ];                                                      ///< Target substitution pumps' speed (mL/min).
+static OVERRIDE_F32_T pumpTargetRate[ NUM_OF_SUB_PUMPS ];                                                       ///< Target substitution pumps' rate (mL/min).
 static U32 substitutionPumpPublishTimerCounter;                                                                 ///< Substitution pump data publication counter.
 
 // ********** private function prototypes **********
@@ -266,22 +266,14 @@
         stepSubstitutionPumpToTargetRate( pumpId );
     }
 
-    if ( currentToTargetDiff >= SUBSTITUTION_PUMP_TRANS_TO_RAMP_SPEED_THRESHOLD_MLPM )
-    {
-        // If the requested target speed is greater than the threshold, transition back to ramp state regardless of the status of the
-        // control interval
-        stepSubstitutionPumpToTargetRate( pumpId );
-        //TODO: Transition to ramp state if feature requires ramping state.
-
-    }
-
     //Stop the pump if requested.
     if ( FALSE == substitutionPumps[ pumpId ].hasTurnOnPumpsBeenRequested )
     {
         state = SUBSTITUTION_PUMP_OFF_STATE;
         stopSubstitutionPump( pumpId );
     }
 
+    //TODO: Transition to ramp state if feature requires ramping state.
     return state;
 }
 
@@ -590,7 +582,7 @@
                 // Handle start command
                 if ( TRUE == payload.startStop )
                 {
-                    setSubstitutionPumpTargetRate( (SUBSTITUTION_PUMPS_T)payload.pumpID, payload.speed );
+                    setSubstitutionPumpTargetRate( (SUBSTITUTION_PUMPS_T)payload.pumpID, payload.rate );
                     requestSubstitutionPumpOn ( (SUBSTITUTION_PUMPS_T)payload.pumpID );
                     result = TRUE;
                 }