Index: firmware/App/Controllers/ROPump.c
===================================================================
diff -u -rf565edd6de62272b1c18fe425e37bc2128aa5832 -r28b75f379e9751083f8a72744023b3cef94cffdb
--- firmware/App/Controllers/ROPump.c	(.../ROPump.c)	(revision f565edd6de62272b1c18fe425e37bc2128aa5832)
+++ firmware/App/Controllers/ROPump.c	(.../ROPump.c)	(revision 28b75f379e9751083f8a72744023b3cef94cffdb)
@@ -544,7 +544,7 @@
  * @details Outputs: none
  * @return ro pump feedback duty cycle
  *************************************************************************/
-static F32 getROFeedbackDutyCyle( void )
+static F32 getROFeedbackDutyCycle( void )
 {
     F32 feedbackdutyCycle = getF32OverrideValue( &roPumpFeedbackDutyCyclePct );
 
Index: firmware/App/Controllers/ROPump.h
===================================================================
diff -u -re832be54a818fe1af79b225e4b43cd148be89fa4 -r28b75f379e9751083f8a72744023b3cef94cffdb
--- firmware/App/Controllers/ROPump.h	(.../ROPump.h)	(revision e832be54a818fe1af79b225e4b43cd148be89fa4)
+++ firmware/App/Controllers/ROPump.h	(.../ROPump.h)	(revision 28b75f379e9751083f8a72744023b3cef94cffdb)
@@ -86,8 +86,8 @@
 
 BOOL testSetTargetDutyCycle( F32 value );
 
-BOOL testSetROPumpMeasuredFeedbackVoltageOverride( F32 value );
-BOOL testResetROPumpMeasuredFeedbackVoltageOverride( void );
+BOOL testSetROPumpMeasuredFeedbackDutyCycleOverride( F32 value );
+BOOL testResetROPumpMeasuredFeedbackDutyCycleOverride( void );
 
 /**@}*/
 
Index: firmware/App/Modes/ModeFill.c
===================================================================
diff -u -rf565edd6de62272b1c18fe425e37bc2128aa5832 -r28b75f379e9751083f8a72744023b3cef94cffdb
--- firmware/App/Modes/ModeFill.c	(.../ModeFill.c)	(revision f565edd6de62272b1c18fe425e37bc2128aa5832)
+++ firmware/App/Modes/ModeFill.c	(.../ModeFill.c)	(revision 28b75f379e9751083f8a72744023b3cef94cffdb)
@@ -806,7 +806,7 @@
     if ( TRUE == hasTargetFillVolumeBeenReached( inactiveRsrvr ) )
     {
         F32 filledVolumeML                           = getReservoirWeight( inactiveRsrvr ) - reservoirBaseWeight;
-        F32 integratedVolumeToLoadCellReadingPercent = fabs( 1.0F - ( filledVolumeML / integratedVolumeML ) );
+        F32 integratedVolumeToLoadCellReadingPercent = fabs( 1.0F - ( filledVolumeML / getIntegratedVolumeML() ) );
         F32 avgAcidConductivity                      = acidConductivityTotal / conductivitySampleCount;
         F32 avgBicarbConductivity                    = bicarbConductivityTotal / conductivitySampleCount;
         F32 acidNormalConductivity                   = acid.acidConcentrate[ CAL_DATA_ACID_CONCENTRATE_1 ].acidConductivityUSPerCM;
Index: firmware/App/Modes/ModeGenIdle.c
===================================================================
diff -u -r256d5cb05f1ef09e19e2f2733a111f600c73a7ee -r28b75f379e9751083f8a72744023b3cef94cffdb
--- firmware/App/Modes/ModeGenIdle.c	(.../ModeGenIdle.c)	(revision 256d5cb05f1ef09e19e2f2733a111f600c73a7ee)
+++ firmware/App/Modes/ModeGenIdle.c	(.../ModeGenIdle.c)	(revision 28b75f379e9751083f8a72744023b3cef94cffdb)
@@ -464,7 +464,7 @@
  * @param: value override bad fill sub-states publish interval with (in ms)
  * @return TRUE if override successful, FALSE if not
  *************************************************************************/
-BOOL testSetBadFillSubstatesPublishIntervalOverride( U32 value )
+BOOL testSetGenIdleSubstatesPublishIntervalOverride( U32 value )
 {
     BOOL result = FALSE;
 
@@ -487,7 +487,7 @@
  * @details Outputs: badFillSubstatesPublishInterval
  * @return TRUE if override reset successful, FALSE if not
  *************************************************************************/
-BOOL testResetBadFillSubstatesPublishIntervalOverride( void )
+BOOL testResetGenIdleSubstatesPublishIntervalOverride( void )
 {
     BOOL result = FALSE;