Index: firmware/App/Modes/ModeFill.c
===================================================================
diff -u -ref46e2aa7eba74dabd99bfcd9e6b38b8ce77820c -r486713fc443f635ac6e071020df1ec5478547a23
--- firmware/App/Modes/ModeFill.c	(.../ModeFill.c)	(revision ef46e2aa7eba74dabd99bfcd9e6b38b8ce77820c)
+++ firmware/App/Modes/ModeFill.c	(.../ModeFill.c)	(revision 486713fc443f635ac6e071020df1ec5478547a23)
@@ -1032,7 +1032,7 @@
 
 /*********************************************************************//**
  * @brief
- * The publishFillModeData function publishes dialysate fill data
+ * The publishFillModeData function publishes fill mode data
  * at the set interval.
  * @details Inputs: fillModeDataPublicationTimerCounter
  * @details Outputs: fillModeDataPublicationTimerCounter
@@ -1061,12 +1061,11 @@
 
 /*********************************************************************//**
  * @brief
- * The testSetHeprinBolusTargetRateOverride function overrides the
- * heprine bolus target rate.
- * @details Inputs: heprinBolusTargetRate
- * @details Outputs: heprinBolusTargetRate
- * @param: value : override heprinBolusTargetRate (in mL/hour)
- * @param: value : override heprinBolusTargetRate (in mL/hour)
+ * The testSetUsedAcidVolumeMLOverride function overrides the
+ * acid volume.
+ * @details Inputs: used acid volume
+ * @details Outputs: used acid volume
+ * @param: value : override used acid volume in mL
  * @return TRUE if override successful, FALSE if not
  *************************************************************************/
 BOOL testSetUsedAcidVolumeMLOverride( F32 value )
@@ -1086,10 +1085,10 @@
 
 /*********************************************************************//**
  * @brief
- * The testResetHeprinBolusTargetRateOverride function resets the override
- * of the heprin bolus target rate.
- * @details Inputs: heprinBolusTargetRate
- * @details Outputs: heprinBolusTargetRate
+ * The testResetUsedAcidVolumeMLOverride function resets the override
+ * of the used acid volume.
+ * @details Inputs: used acid volume
+ * @details Outputs: used acid volume
  * @return TRUE if override successful, FALSE if not
  *************************************************************************/
 BOOL testResetUsedAcidVolumeMLOverride( void )
@@ -1110,12 +1109,11 @@
 
 /*********************************************************************//**
  * @brief
- * The testSetHeprinBolusTargetRateOverride function overrides the
- * heprine bolus target rate.
- * @details Inputs: heprinBolusTargetRate
- * @details Outputs: heprinBolusTargetRate
- * @param: value : override heprinBolusTargetRate (in mL/hour)
- * @param: value : override heprinBolusTargetRate (in mL/hour)
+ * The testSetUsedBicarbVolumeMLOverride function overrides the
+ * bicarb volume.
+ * @details Inputs: used bicard volume
+ * @details Outputs: used bicard volume
+ * @param: value : override used bicard volume in mL
  * @return TRUE if override successful, FALSE if not
  *************************************************************************/
 BOOL testSetUsedBicarbVolumeMLOverride( F32 value )
@@ -1135,10 +1133,10 @@
 
 /*********************************************************************//**
  * @brief
- * The testResetHeprinBolusTargetRateOverride function resets the override
- * of the heprin bolus target rate.
- * @details Inputs: heprinBolusTargetRate
- * @details Outputs: heprinBolusTargetRate
+ * The testResetUsedBicarbVolumeMLOverride function resets the override
+ * of the used bicard volume.
+ * @details Inputs: used bicard volume
+ * @details Outputs: used bicard volume
  * @return TRUE if override successful, FALSE if not
  *************************************************************************/
 BOOL testResetUsedBicarbVolumeMLOverride( void )
@@ -1159,11 +1157,11 @@
 
 /*********************************************************************//**
  * @brief
- * The testSetDialysateFlowDataPublishIntervalOverride function overrides the
- * Dialysate flow data publish interval.
- * @details Inputs: dialysateFlowDataPublishInterval
- * @details Outputs: dialysateFlowDataPublishInterval
- * @param: value override Dialysate flow data publish interval with (in ms)
+ * The testSetFillModeDataPublishIntervalOverride function overrides the
+ * fill mode data publish interval.
+ * @details Inputs: FillModeDataPublishInterval
+ * @details Outputs: FillModeDataPublishInterval
+ * @param: value override fill mode data publish interval with (in ms)
  * @return TRUE if override successful, FALSE if not
  *************************************************************************/
 BOOL testSetFillModeDataPublishIntervalOverride( U32 value )
@@ -1183,10 +1181,10 @@
 
 /*********************************************************************//**
  * @brief
- * The testResetDialysateFlowDataPublishIntervalOverride function resets the
- * override of the dialysate flow data publish interval.
- * @details Inputs: dialysateFlowDataPublishInterval
- * @details Outputs: dialysateFlowDataPublishInterval
+ * The testResetFillModeDataPublishIntervalOverride function resets the
+ * override of the fill mode data publish interval.
+ * @details Inputs: FillModeDataPublishInterval
+ * @details Outputs: FillModeDataPublishInterval
  * @return TRUE if override reset successful, FALSE if not
  *************************************************************************/
 BOOL testResetFillModeDataPublishIntervalOverride( void )