Index: firmware/App/Modes/FPModes/FlushFilterDefeatured.c
===================================================================
diff -u -rfeffc616fe52aa0719cfabeb1d94f4d20b3d354b -r70cf903c053edbf91f91993ef320277269d31504
--- firmware/App/Modes/FPModes/FlushFilterDefeatured.c	(.../FlushFilterDefeatured.c)	(revision feffc616fe52aa0719cfabeb1d94f4d20b3d354b)
+++ firmware/App/Modes/FPModes/FlushFilterDefeatured.c	(.../FlushFilterDefeatured.c)	(revision 70cf903c053edbf91f91993ef320277269d31504)
@@ -388,10 +388,10 @@
 {
     if ( ++filterFlushDefDataPublicationTimerCounter >= getFilterFlushDefPublishInterval() )
     {
-        FILTER_FLUSH_DATA_T data;
+        FILTER_FLUSH_DEF_DATA_T data;
 
         data.filterFlushExecState              = (U32)getCurrentFilterFlushDefState();
-        broadcastData( MSG_ID_FP_FILTER_FLUSH_DATA, COMM_BUFFER_OUT_CAN_FP_BROADCAST, (U08*)&data, sizeof( FILTER_FLUSH_DATA_T ) );
+        broadcastData( MSG_ID_FP_FILTER_FLUSH_DATA, COMM_BUFFER_OUT_CAN_FP_BROADCAST, (U08*)&data, sizeof( FILTER_FLUSH_DEF_DATA_T ) );
 
         filterFlushDefDataPublicationTimerCounter = 0;
     }
Index: firmware/App/Modes/FPModes/FlushFilterDefeatured.h
===================================================================
diff -u -rfb0f180eb25dbcfd15d58ef584d535efd1c24e30 -r70cf903c053edbf91f91993ef320277269d31504
--- firmware/App/Modes/FPModes/FlushFilterDefeatured.h	(.../FlushFilterDefeatured.h)	(revision fb0f180eb25dbcfd15d58ef584d535efd1c24e30)
+++ firmware/App/Modes/FPModes/FlushFilterDefeatured.h	(.../FlushFilterDefeatured.h)	(revision 70cf903c053edbf91f91993ef320277269d31504)
@@ -36,7 +36,7 @@
 typedef struct
 {
     U32 filterFlushExecState;                                   ///< Filter Flush execution state
-} FILTER_FLUSH_DATA_T;
+} FILTER_FLUSH_DEF_DATA_T;
 
 // ********** public function prototypes **********
 
@@ -48,8 +48,8 @@
 void resetFilterFlushDefSignals( void );                                    // reset signals for de-featured flush
 FP_FILTER_FLUSH_STATE_T getCurrentFilterFlushState( void );                 // Get the current state of the de-featured Filter Flush
 
-BOOL testFilterFlushDataPublishIntervalOverride( MESSAGE_T *message );
-BOOL testFilterFlushTimerOverride( MESSAGE_T *message );
+BOOL testFilterFlushDefDataPublishIntervalOverride( MESSAGE_T *message );
+BOOL testFilterFlushDefTimerOverride( MESSAGE_T *message );
 
 /**@}*/
 
Index: firmware/App/Services/Messaging.c
===================================================================
diff -u -rbadf38264b5f9f238d46d860f165b1e1bb4311b7 -r70cf903c053edbf91f91993ef320277269d31504
--- firmware/App/Services/Messaging.c	(.../Messaging.c)	(revision badf38264b5f9f238d46d860f165b1e1bb4311b7)
+++ firmware/App/Services/Messaging.c	(.../Messaging.c)	(revision 70cf903c053edbf91f91993ef320277269d31504)
@@ -30,6 +30,7 @@
 #include "FluidPump.h"
 #include "FlushConcentrate.h"
 #include "FlushFilter.h"
+#include "FlushFilterDefeatured.h"
 #include "FlushPermeate.h"
 #include "FpgaDD.h"
 #include "FPModeFault.h"
@@ -252,6 +253,8 @@
     { MSG_ID_FP_FLUSH_PERMEATE_ALARM_TIMER_OVERRIDE_REQUEST,                        &testPermeateFlushAlarmTimerOverride },
     { MSG_ID_FP_FLUSH_CONCENTRATE_PUBLISH_INTERVAL_OVERRIDE_REQUEST,                &testConcentrateFlushDataPublishIntervalOverride },
     { MSG_ID_FP_FLUSH_CONCENTRATE_TIMER_OVERRIDE_REQUEST,                           &testConcentrateFlushTimerOverride },
+    { MSG_ID_FP_DEF_FLUSH_FILTER_PUBLISH_INTERVAL_OVERRIDE_REQUEST,                 &testFilterFlushDefDataPublishIntervalOverride },
+    { MSG_ID_FP_DEF_FLUSH_FILTER_TIMER_OVERRIDE_REQUEST,                            &testFilterFlushDefTimerOverride },
 };
 
 /// Calculation for number of entries in the incoming message function handler look-up table.