Index: firmware/App/Drivers/BoostPump.c
===================================================================
diff -u -r834e2f1c57b828c546c56dea42a9757988e16314 -r3241c6b7f66889b6443e377ab1f5ecf2cedd2602
--- firmware/App/Drivers/BoostPump.c	(.../BoostPump.c)	(revision 834e2f1c57b828c546c56dea42a9757988e16314)
+++ firmware/App/Drivers/BoostPump.c	(.../BoostPump.c)	(revision 3241c6b7f66889b6443e377ab1f5ecf2cedd2602)
@@ -74,7 +74,7 @@
     }
 
     // set RO pump to stop
-    setROPumpPWM( 0 );
+    setFPGAP12PumpPWM( 0 );
 
     // TODO set boost pump to stop
 }
@@ -91,17 +91,17 @@
     U32 tach;
 
     // get latest RO pump duty cycle read back from FPGA
-    boostPumpReadDutyCycle[ RO_PUMP ].data = getROPumpPWM();
+    boostPumpReadDutyCycle[ P12_PUMP ].data = getFPGAP12PumpPWM();
 
     // get latest RO pump tachometer count from FPGA and convert to RPM
-    tach = (U32)getROPumpTachCount();
+    tach = (U32)getFPGAP12PumpTachCount();
     if ( ( tach != 0 ) && ( tach < BOOST_PUMP_COUNTS_FOR_STOPPED_PUMP ) )
     {
-        boostPumpMeasRPM[ RO_PUMP ].data = BOOST_PUMP_COUNTS_2_RPM_NUMERATOR / (F32)tach;
+        boostPumpMeasRPM[ P12_PUMP ].data = BOOST_PUMP_COUNTS_2_RPM_NUMERATOR / (F32)tach;
     }
     else
     {
-        boostPumpMeasRPM[ RO_PUMP ].data = 0.0F;
+        boostPumpMeasRPM[ P12_PUMP ].data = 0.0F;
     }
 
     // TODO - get latest for booster pump PWM and tach
@@ -127,19 +127,19 @@
         // enable/disable pump per given PWM
         if ( 0 == pwm )
         {
-            setROPumpEnable( FALSE );
+            setFPGAP12PumpEnable( FALSE );
         }
         else
         {
-            setROPumpEnable( TRUE );
+            setFPGAP12PumpEnable( TRUE );
         }
         // constrain given pwm magnitude to valid range
         pwm = MIN( pwm, MAX_BOOST_PUMP_PWM_DUTY_CYCLE );
         // set commanded duty cycle for given boost pump to given pwm magnitude
         boostPumpCmdDutyCycle[ pumpID ] = pwm;
-        if ( RO_PUMP == pumpID )
+        if ( P12_PUMP == pumpID )
         {
-            setROPumpPWM( pwm );
+            setFPGAP12PumpPWM( pwm );
         }
         else
         {