Index: firmware/App/Modes/ModeInitPOST.c
===================================================================
diff -u -r8fc97ad09c8cbdf76dc19929c4751df3feacb40d -r851ee579efc2add1f16a5012bdaac93658e760ea
--- firmware/App/Modes/ModeInitPOST.c	(.../ModeInitPOST.c)	(revision 8fc97ad09c8cbdf76dc19929c4751df3feacb40d)
+++ firmware/App/Modes/ModeInitPOST.c	(.../ModeInitPOST.c)	(revision 851ee579efc2add1f16a5012bdaac93658e760ea)
@@ -19,9 +19,9 @@
 #include "ConcentratePumps.h"
 #include "ConductivitySensors.h"
 #include "CPLD.h"
-#include "DialysateFlow.h"
 #include "DrainPump.h"
 #include "Fans.h"
+#include "FlowSensors.h"
 #include "FPGA.h"
 #include "Integrity.h"
 #include "LoadCell.h"
@@ -30,7 +30,6 @@
 #include "OperationModes.h"
 #include "Pressures.h"
 #include "Reservoirs.h"
-#include "ROPump.h"
 #include "RTC.h"
 #include "SafetyShutdown.h"
 #include "SystemCommMessages.h"
@@ -177,11 +176,6 @@
             postState = handlePOSTStatus( testStatus );
             break;
 
-        case DG_POST_STATE_RO_PUMP:
-            testStatus = execROPumpSelfTest();
-            postState = handlePOSTStatus( testStatus );
-            break;
-
         case DG_POST_STATE_DRAIN_PUMP:
             testStatus = execDrainPumpSelfTest();
             postState = handlePOSTStatus( testStatus );
@@ -228,8 +222,8 @@
             postState = handlePOSTStatus( testStatus );
             break;
 
-        case DG_POST_STATE_DIALYSATE_FLOW_SENSOR:
-            testStatus = execDialysateFlowMeterSelfTest();
+        case DG_POST_STATE_FLOW_SENSORS:
+            testStatus = execFlowSensorsSelfTest();
             postState = handlePOSTStatus( testStatus );
             break;