Index: firmware/App/Modes/ModeFill.c
===================================================================
diff -u -r9779d54c908734795f7b03b0ba8c409fc3115437 -r1c74566ff86f1df5e1929b8715d68715dc21a93b
--- firmware/App/Modes/ModeFill.c	(.../ModeFill.c)	(revision 9779d54c908734795f7b03b0ba8c409fc3115437)
+++ firmware/App/Modes/ModeFill.c	(.../ModeFill.c)	(revision 1c74566ff86f1df5e1929b8715d68715dc21a93b)
@@ -175,13 +175,13 @@
     if ( TRUE == didTimeout( dialysateFillStartTime, DIALYSATE_FILL_TIME_OUT ) )
     {
         activateAlarmNoData( ALARM_ID_DG_DIALYSATE_FILL_OUT_OF_TIME );
-        requestNewOperationMode( DG_MODE_CIRC );
+        requestNewOperationMode( DG_MODE_GENE );
     }
 
-    // Transition to re-circ mode when HD is not communicating
+    // Transition to generation idle mode when HD is not communicating
     if ( FALSE == isHDCommunicating() )
     {
-        requestNewOperationMode( DG_MODE_CIRC );
+        requestNewOperationMode( DG_MODE_GENE );
     }
 
     // Execute current Fill state
@@ -253,7 +253,7 @@
     if ( TRUE == didTimeout( waterQualityCheckStartTime, WATER_QUALITY_CHECK_TIME_OUT_MS ) )
     {
         activateAlarmNoData( ALARM_ID_DG_BAD_INLET_WATER_QUALITY );
-        requestNewOperationMode( DG_MODE_CIRC );
+        requestNewOperationMode( DG_MODE_GENE );
     }
 
     return result;
@@ -298,7 +298,7 @@
     if ( TRUE == didTimeout( concentrateTestStartTime, CONCENTRATE_TEST_TIME_OUT_MS ) )
     {
         SET_ALARM_WITH_1_F32_DATA( ALARM_ID_BICARB_CONDUCTIVITY_OUT_OF_RANGE, bicarbConductivity );
-        requestNewOperationMode( DG_MODE_CIRC );
+        requestNewOperationMode( DG_MODE_GENE );
     }
 
     return result;
@@ -339,7 +339,7 @@
     if ( TRUE == didTimeout( concentrateTestStartTime, CONCENTRATE_TEST_TIME_OUT_MS ) )
     {
         SET_ALARM_WITH_1_F32_DATA( ALARM_ID_ACID_CONDUCTIVITY_OUT_OF_RANGE, acidConductivity );
-        requestNewOperationMode( DG_MODE_CIRC );
+        requestNewOperationMode( DG_MODE_GENE );
     }
 
     return result;
@@ -446,7 +446,7 @@
         activateAlarmNoData( ALARM_ID_DG_BICARB_BOTTLE_LOW_VOLUME );
     }
 
-    // if we've reached our target fill to volume (by weight), we're done filling - go back to re-circ mode
+    // if we've reached our target fill to volume (by weight), we're done filling - go back to generation idle mode
     if ( ( TRUE == hasTargetFillVolumeBeenReached( inactiveReservoir ) ) || ( ( integratedVolume_mL - reservoirBaseWeight ) >= MAX_RESERVOIR_VOLUME_ML ) )
     {
         F32 const filledVolume_mL = getReservoirWeight( inactiveReservoir ) - reservoirBaseWeight;
@@ -469,7 +469,7 @@
         }
 #endif
 
-        requestNewOperationMode( DG_MODE_CIRC );
+        requestNewOperationMode( DG_MODE_GENE );
     }
 
     return result;