Index: firmware/App/Controllers/SyringePump.c
===================================================================
diff -u -rbf9a2a05483a188c075023bc3f3cbb93e8d2ca5f -r52761961d73cdc8f5f9c0c83ef420bcd43a27551
--- firmware/App/Controllers/SyringePump.c	(.../SyringePump.c)	(revision bf9a2a05483a188c075023bc3f3cbb93e8d2ca5f)
+++ firmware/App/Controllers/SyringePump.c	(.../SyringePump.c)	(revision 52761961d73cdc8f5f9c0c83ef420bcd43a27551)
@@ -707,7 +707,7 @@
  *************************************************************************/
 BOOL startHeparinContinuous( void )
 {
-    F32 flowRate = getTreatmentParameterF32( TREATMENT_PARAM_HEPARIN_DISPENSE_RATE );
+    F32 flowRate = getTreatmentParameterF32( TREATMENT_PARAM_HEPARIN_DELIVERY_RATE );
 
     if ( ( flowRate >= MIN_HEPARIN_CONTINUOUS_RATE ) && ( flowRate <= MAX_HEPARIN_CONTINUOUS_RATE ) && ( FALSE == isSyringePumpHome() ) )
     {
@@ -1114,7 +1114,7 @@
 #endif
     {
         F32 bolusVol = getTreatmentParameterF32( TREATMENT_PARAM_HEPARIN_BOLUS_VOLUME );
-        F32 hepRate  = getTreatmentParameterF32( TREATMENT_PARAM_HEPARIN_DISPENSE_RATE );
+        F32 hepRate  = getTreatmentParameterF32( TREATMENT_PARAM_HEPARIN_DELIVERY_RATE );
 
         // Syringe detection not required if not using Heparin in treatment
         if ( ( bolusVol > NEARLY_ZERO ) || ( hepRate > NEARLY_ZERO ) )
@@ -1511,8 +1511,8 @@
     BOOL stopPump = FALSE;
     S32  pos      = getSyringePumpPosition();
     F32  bolusVol = getTreatmentParameterF32( TREATMENT_PARAM_HEPARIN_BOLUS_VOLUME );
-    F32  contRate = getTreatmentParameterF32( TREATMENT_PARAM_HEPARIN_DISPENSE_RATE );
-    U32  preStop  = getTreatmentParameterU32( TREATMENT_PARAM_HEPARIN_STOP_TIME );
+    F32  contRate = getTreatmentParameterF32( TREATMENT_PARAM_HEPARIN_DELIVERY_RATE );
+    U32  preStop  = getTreatmentParameterU32( TREATMENT_PARAM_HEPARIN_DELIVERY_DURATION );
     U32  setTxDur = getTreatmentParameterU32( TREATMENT_PARAM_TREATMENT_DURATION );
     F32  hepDurHr = ( (F32)( setTxDur - preStop ) / (F32)MIN_PER_HOUR );
     F32  txVolumeReq = SYRINGE_PUMP_PRIME_VOLUME_ML + bolusVol + ( hepDurHr * contRate );
@@ -1567,8 +1567,8 @@
     BOOL stopPump = FALSE;
     S32  pos      = getSyringePumpPosition();
     F32  bolusVol = getTreatmentParameterF32( TREATMENT_PARAM_HEPARIN_BOLUS_VOLUME );
-    F32  contRate = getTreatmentParameterF32( TREATMENT_PARAM_HEPARIN_DISPENSE_RATE );
-    U32  preStop  = getTreatmentParameterU32( TREATMENT_PARAM_HEPARIN_STOP_TIME );
+    F32  contRate = getTreatmentParameterF32( TREATMENT_PARAM_HEPARIN_DELIVERY_RATE );
+    U32  preStop  = getTreatmentParameterU32( TREATMENT_PARAM_HEPARIN_DELIVERY_DURATION );
     U32  setTxDur = getTreatmentParameterU32( TREATMENT_PARAM_TREATMENT_DURATION );
     F32  hepDurHr = ( (F32)( setTxDur - preStop ) / (F32)MIN_PER_HOUR );
     F32  txVolume = SYRINGE_PUMP_PRIME_VOLUME_ML + bolusVol + ( hepDurHr * contRate );
@@ -2311,7 +2311,7 @@
                 break;
 
             case SYRINGE_PUMP_OP_CONTINUOUS:
-                setTreatmentParameterF32( TREATMENT_PARAM_HEPARIN_DISPENSE_RATE, opParams.rate );
+                setTreatmentParameterF32( TREATMENT_PARAM_HEPARIN_DELIVERY_RATE, opParams.rate );
                 result = startHeparinContinuous();
                 break;