Index: firmware/App/Modes/FilterFlush.c
===================================================================
diff -u -rcd1aa72cf45af72e12e47f61df2b218e5683cd64 -r4ab396a72f02cd64728bb37b6085cfd5b9ad8184
--- firmware/App/Modes/FilterFlush.c	(.../FilterFlush.c)	(revision cd1aa72cf45af72e12e47f61df2b218e5683cd64)
+++ firmware/App/Modes/FilterFlush.c	(.../FilterFlush.c)	(revision 4ab396a72f02cd64728bb37b6085cfd5b9ad8184)
@@ -42,8 +42,8 @@
 // ********** private function prototypes **********
 
 static void publishFilterFlushData( void );
-static RO_GENW_MODE_STATE_T handleFilterFlushProgressState( void );
-static RO_GENW_MODE_STATE_T handleFilterFlushPausedState( void );
+static FP_FILTER_FLUSH_STATE_T handleFilterFlushProgressState( void );
+static FP_FILTER_FLUSH_STATE_T handleFilterFlushPausedState( void );
 static void setModeGenWTransition( FP_FILTER_FLUSH_STATE_T state );
 
 /*********************************************************************//**
@@ -70,9 +70,9 @@
  * filter flush.
  * @details \b Inputs: filterFlushState
  * @details \b Outputs: filterFlushState
- * @return the current state of gen water mode
+ * @return the current state of filter flush
  *************************************************************************/
-RO_GENW_MODE_STATE_T getCurrentFilterFlushState( void )
+FP_FILTER_FLUSH_STATE_T getCurrentFilterFlushState( void )
 {
     return filterFlushState;
 }
@@ -83,7 +83,7 @@
  * mode data publish interval.
  * @details \b Inputs: filterFlushDataPublishInterval
  * @details \b Outputs: none
- * @return the interval at generate water mode data being published.
+ * @return the interval at filter flush mode data being published.
  *************************************************************************/
 static U32 getFilterFlushPublishInterval( void )
 {
@@ -94,12 +94,12 @@
 
 /*********************************************************************//**
  * @brief
- * The publishGenWModeData function broadcasts the generate water
+ * The publishGenWModeData function broadcasts the filter flush
  * mode data at defined interval.
- * @details \b Inputs: genDialysateDataPublicationTimerCounter
- * @details \b Outputs: DD generate water data broadcast message sent
+ * @details \b Inputs: filterFlushDataPublicationTimerCounter
+ * @details \b Outputs: fp filter flush data broadcast message sent
  * @details \b Message \Sent: MSG_ID_RO_GEN_WATER_MODE_DATA to publish the
- * generate water mode data.
+ * filter flush mode data.
  * @return none
  *************************************************************************/
 static void publishFilterFlushData( void )
@@ -110,7 +110,7 @@
 
         data.filterFlushExecState              = (U32)getCurrentGenWaterState();
 
-        broadcastData( MSG_ID_FP_GEN_WATER_MODE_DATA, COMM_BUFFER_OUT_CAN_RO_BROADCAST, (U08*)&data, sizeof( GEN_WATER_MODE_DATA_T ) );
+        broadcastData( MSG_ID_FP_GEN_WATER_MODE_DATA, COMM_BUFFER_OUT_CAN_RO_BROADCAST, (U08*)&data, sizeof( FILTER_FLUSH_DATA_T ) );
 
         filterFlushDataPublicationTimerCounter = 0;
     }
@@ -123,12 +123,12 @@
 
 /*********************************************************************//**
  * @brief
- * The testROGenWaterDataPublishIntervalOverride function overrides the
- * DD generate water mode data publish interval.
- * @details \b Inputs: genWaterDataPublishInterval
- * @details \b Outputs: genWaterDataPublishInterval
+ * The testFilterFlushDataPublishIntervalOverride function overrides the
+ * FP filter flush mode data publish interval.
+ * @details \b Inputs: filterFlushDataPublishInterval
+ * @details \b Outputs: filterFlushDataPublishInterval
  * @param Override message from Dialin which includes the interval
- * (in ms) to override the RO generate water data publish interval to.
+ * (in ms) to override the FP filter flush data publish interval to.
  * @return TRUE if override successful, FALSE if not
  *************************************************************************/
 BOOL testFilterFlushDataPublishIntervalOverride( MESSAGE_T *message )