Index: PIControllers.c
===================================================================
diff -u -r6632d86cc172130ade1a940e038426737f5e4584 -r21fa2beca5bf5f6e97bbb4c3729b05f5d25b2f2f
--- PIControllers.c	(.../PIControllers.c)	(revision 6632d86cc172130ade1a940e038426737f5e4584)
+++ PIControllers.c	(.../PIControllers.c)	(revision 21fa2beca5bf5f6e97bbb4c3729b05f5d25b2f2f)
@@ -73,6 +73,8 @@
 #ifdef _RO_
     { 0.0, 0.0, 1.0,  0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.5,  CONTROLLER_UNIDIRECTIONAL, FALSE, 0.0 },  // PI_CONTROLLER_ID_RO_PUMP
     { 0.0, 0.0, 1.0,  0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.1,  CONTROLLER_UNIDIRECTIONAL, FALSE, 0.0 },  // PI_CONTROLLER_ID_RO_PUMP_MAX_PRES
+    { 0.0, 0.0, 1.0,  0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.5,  CONTROLLER_UNIDIRECTIONAL, FALSE, 0.0 },  // PI_CONTROLLER_ID_BOOST_PUMP_FLOW
+    { 0.0, 0.0, 1.0,  0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.1,  CONTROLLER_UNIDIRECTIONAL, FALSE, 0.0 },  // PI_CONTROLLER_ID_BOOST_PUMP_PRES
 #endif
 };
 
@@ -124,7 +126,7 @@
         SET_ALARM_WITH_2_U32_DATA( ALARM_ID_DD_SOFTWARE_FAULT, SW_FAULT_ID_PI_CTRL_INVALID_CONTROLLER, (U32)controllerID )
 #endif
 #ifdef _RO_
-        SET_ALARM_WITH_2_U32_DATA( ALARM_ID_RO_SOFTWARE_FAULT, SW_FAULT_ID_PI_CTRL_INVALID_CONTROLLER, (U32)controllerID )
+        SET_ALARM_WITH_2_U32_DATA( ALARM_ID_FP_SOFTWARE_FAULT, SW_FAULT_ID_PI_CTRL_INVALID_CONTROLLER, (U32)controllerID )
 #endif
     }
 }
@@ -163,7 +165,7 @@
         SET_ALARM_WITH_2_U32_DATA( ALARM_ID_DD_SOFTWARE_FAULT, SW_FAULT_ID_PI_CTRL_INVALID_CONTROLLER, (U32)controllerID )
 #endif
 #ifdef _RO_
-        SET_ALARM_WITH_2_U32_DATA( ALARM_ID_RO_SOFTWARE_FAULT, SW_FAULT_ID_PI_CTRL_INVALID_CONTROLLER, (U32)controllerID )
+        SET_ALARM_WITH_2_U32_DATA( ALARM_ID_FP_SOFTWARE_FAULT, SW_FAULT_ID_PI_CTRL_INVALID_CONTROLLER, (U32)controllerID )
 #endif
     }
 }
@@ -263,7 +265,7 @@
         SET_ALARM_WITH_2_U32_DATA( ALARM_ID_DD_SOFTWARE_FAULT, SW_FAULT_ID_PI_CTRL_INVALID_CONTROLLER, (U32)controllerID )
 #endif
 #ifdef _RO_
-        SET_ALARM_WITH_2_U32_DATA( ALARM_ID_RO_SOFTWARE_FAULT, SW_FAULT_ID_PI_CTRL_INVALID_CONTROLLER, (U32)controllerID )
+        SET_ALARM_WITH_2_U32_DATA( ALARM_ID_FP_SOFTWARE_FAULT, SW_FAULT_ID_PI_CTRL_INVALID_CONTROLLER, (U32)controllerID )
 #endif
     }
 
@@ -335,7 +337,7 @@
                 SET_ALARM_WITH_2_U32_DATA( ALARM_ID_DD_SOFTWARE_FAULT, SW_FAULT_ID_PI_CTRL_INVALID_SIGNAL, (U32)signalID )
 #endif
 #ifdef _RO_
-                SET_ALARM_WITH_2_U32_DATA( ALARM_ID_RO_SOFTWARE_FAULT, SW_FAULT_ID_PI_CTRL_INVALID_SIGNAL, (U32)signalID )
+                SET_ALARM_WITH_2_U32_DATA( ALARM_ID_FP_SOFTWARE_FAULT, SW_FAULT_ID_PI_CTRL_INVALID_SIGNAL, (U32)signalID )
 #endif
                 break;
         } // End of switch
@@ -346,7 +348,7 @@
         SET_ALARM_WITH_2_U32_DATA( ALARM_ID_DD_SOFTWARE_FAULT, SW_FAULT_ID_PI_CTRL_INVALID_CONTROLLER, (U32)controllerID )
 #endif
 #ifdef _RO_
-        SET_ALARM_WITH_2_U32_DATA( ALARM_ID_RO_SOFTWARE_FAULT, SW_FAULT_ID_PI_CTRL_INVALID_CONTROLLER, (U32)controllerID )
+        SET_ALARM_WITH_2_U32_DATA( ALARM_ID_FP_SOFTWARE_FAULT, SW_FAULT_ID_PI_CTRL_INVALID_CONTROLLER, (U32)controllerID )
 #endif
     }
 
@@ -383,7 +385,7 @@
             SET_ALARM_WITH_2_U32_DATA( ALARM_ID_DD_SOFTWARE_FAULT, SW_FAULT_ID_PI_CTRL_INVALID_STEP_LIMIT, (U32)stepLimit )
 #endif
 #ifdef _RO_
-            SET_ALARM_WITH_2_U32_DATA( ALARM_ID_RO_SOFTWARE_FAULT, SW_FAULT_ID_PI_CTRL_INVALID_STEP_LIMIT, (U32)stepLimit )
+            SET_ALARM_WITH_2_U32_DATA( ALARM_ID_FP_SOFTWARE_FAULT, SW_FAULT_ID_PI_CTRL_INVALID_STEP_LIMIT, (U32)stepLimit )
 #endif
         }
 
@@ -396,7 +398,7 @@
 #endif
 #ifdef _RO_
         // Invalid controller given
-        SET_ALARM_WITH_2_U32_DATA( ALARM_ID_RO_SOFTWARE_FAULT, SW_FAULT_ID_PI_CTRL_INVALID_CONTROLLER, (U32)controllerID )
+        SET_ALARM_WITH_2_U32_DATA( ALARM_ID_FP_SOFTWARE_FAULT, SW_FAULT_ID_PI_CTRL_INVALID_CONTROLLER, (U32)controllerID )
 #endif
     }
 }
Index: PIControllers.h
===================================================================
diff -u -r6d6aeca98fc8593725cba4bb1c7a6d065f6f6e26 -r21fa2beca5bf5f6e97bbb4c3729b05f5d25b2f2f
--- PIControllers.h	(.../PIControllers.h)	(revision 6d6aeca98fc8593725cba4bb1c7a6d065f6f6e26)
+++ PIControllers.h	(.../PIControllers.h)	(revision 21fa2beca5bf5f6e97bbb4c3729b05f5d25b2f2f)
@@ -25,7 +25,7 @@
 #include "DDCommon.h"
 #endif
 #ifdef _RO_
-#include "ROCommon.h"
+#include "FPCommon.h"
 #endif
 
 /**
@@ -48,8 +48,10 @@
     PI_CONTROLLER_ID_D45_HEAT,                      ///< Trimmer heater controller
 #endif
 #ifdef _RO_
-    PI_CONTROLLER_ID_RO_PUMP_FLOW = 0,              ///< RO Pump controller to flow
-    PI_CONTROLLER_ID_RO_PUMP_MAX_PRES,              ///< RO pump controller to maximum pressure
+    PI_CONTROLLER_ID_RO_PUMP_FLOW,                  ///< RO Pump controller to flow
+    PI_CONTROLLER_ID_RO_PUMP_PRES,                  ///< RO pump controller to maximum pressure
+    PI_CONTROLLER_ID_BOOST_PUMP_FLOW,               ///< Boost pump controller to flow
+    PI_CONTROLLER_ID_BOOST_PUMP_PRES,               ///< Boost pump controller to maximum pressure
 #endif
     NUM_OF_PI_CONTROLLERS_IDS                       ///< Number of PI controllers
 } PI_CONTROLLER_ID_T;