Index: firmware/App/Services/Reservoirs.c
===================================================================
diff -u -rcbc9f2ba6d1769716ac81ae45283575467f07e2c -r1c74566ff86f1df5e1929b8715d68715dc21a93b
--- firmware/App/Services/Reservoirs.c	(.../Reservoirs.c)	(revision cbc9f2ba6d1769716ac81ae45283575467f07e2c)
+++ firmware/App/Services/Reservoirs.c	(.../Reservoirs.c)	(revision 1c74566ff86f1df5e1929b8715d68715dc21a93b)
@@ -18,7 +18,7 @@
 #include <string.h>     // for memcpy()
 
 #include "LoadCell.h"
-#include "ModeRecirculate.h"
+#include "ModeGenIdle.h"
 #include "OperationModes.h"
 #include "Reservoirs.h"
 #include "SystemCommMessages.h"
@@ -121,8 +121,8 @@
     cmdResponse.rejected = TRUE;
     cmdResponse.rejectCode = DG_CMD_REQUEST_REJECT_REASON_NONE;
 
-    // switch reservoir command only valid in re-circulate mode
-    if ( DG_MODE_CIRC == getCurrentOperationMode() )
+    // switch reservoir command only valid in generation idle mode
+    if ( DG_MODE_GENE == getCurrentOperationMode() )
     {
         switch ( resID )
         {
@@ -179,8 +179,8 @@
     cmdResponse.rejected = TRUE;
     cmdResponse.rejectCode = DG_CMD_REQUEST_REJECT_REASON_NONE;
 
-    // valve setting command only valid in re-circulate mode
-    if ( DG_MODE_CIRC == getCurrentOperationMode() )
+    // valve setting command only valid in generation idle mode
+    if ( DG_MODE_GENE == getCurrentOperationMode() )
     {
         switch ( valveSettingID )
         {
@@ -226,9 +226,9 @@
     cmdResponse.rejected = TRUE;
     cmdResponse.rejectCode = DG_CMD_REQUEST_REJECT_REASON_NONE;
 
-    // fill command only valid in re-circulate mode
-    if ( ( DG_MODE_CIRC == getCurrentOperationMode() ) &&
-         ( DG_RECIRCULATE_MODE_STATE_RECIRC_WATER == getCurrentRecirculateState() ) )
+    // fill command only valid in generation idle mode
+    if ( ( DG_MODE_GENE == getCurrentOperationMode() ) &&
+         ( DG_GEN_IDLE_MODE_STATE_FLUSH_WATER == getCurrentGenIdleState() ) )
     {
         // validate parameters
         if ( fillToVolMl < MAX_FILL_VOLUME_ML )
@@ -254,7 +254,7 @@
  * @brief
  * The stopFillCmd function handles a stop fill command from the HD.
  * @details Inputs: none
- * @details Outputs: move to re-circulate mode
+ * @details Outputs: move to generation idle mode
  * @return none
  *************************************************************************/
 void stopFillCmd( void )
@@ -269,7 +269,7 @@
     if ( DG_MODE_FILL == getCurrentOperationMode() )
     {
         fillVolumeTargetMl.data = 0;
-        requestNewOperationMode( DG_MODE_CIRC );
+        requestNewOperationMode( DG_MODE_GENE );
         cmdResponse.rejected = FALSE;
     }
     else
@@ -284,7 +284,7 @@
  * @brief
  * The startDrainCmd function handles a drain command from the HD.
  * @details Inputs: none
- * @details Outputs: Start draining in re-circulate mode
+ * @details Outputs: Start draining in generation idle mode
  * @param drainCmd drain command data record
  * @return none
  *************************************************************************/
@@ -296,8 +296,8 @@
     cmdResponse.rejected = TRUE;
     cmdResponse.rejectCode = DG_CMD_REQUEST_REJECT_REASON_NONE;
 
-    // drain command only valid in re-circulate mode
-    if ( DG_MODE_CIRC == getCurrentOperationMode() )
+    // drain command only valid in generation idle mode
+    if ( DG_MODE_GENE == getCurrentOperationMode() )
     {
         // validate parameters
         if ( drainCmd.targetVolume <= MAX_DRAIN_VOLUME_ML )
@@ -324,7 +324,7 @@
  * @brief
  * The stopDrainCmd function handles a stop drain command from the HD.
  * @details Inputs: none
- * @details Outputs: move to re-circulate mode
+ * @details Outputs: move to generation idle mode
  * @return none
  *************************************************************************/
 void stopDrainCmd( void )
@@ -339,7 +339,7 @@
     if ( DG_MODE_DRAI == getCurrentOperationMode() )
     {
         drainVolumeTargetMl.data = 0;
-        requestNewOperationMode( DG_MODE_CIRC );
+        requestNewOperationMode( DG_MODE_GENE );
         cmdResponse.rejected = FALSE;
     }
     else