Index: firmware/App/Modes/ModePreGenDialysate.c
===================================================================
diff -u -rde4b330865ad6f9966c76f3b335d5b3966f8a1b2 -r6408d79e3a9a543e90b2fa7ab823be348befd391
--- firmware/App/Modes/ModePreGenDialysate.c	(.../ModePreGenDialysate.c)	(revision de4b330865ad6f9966c76f3b335d5b3966f8a1b2)
+++ firmware/App/Modes/ModePreGenDialysate.c	(.../ModePreGenDialysate.c)	(revision 6408d79e3a9a543e90b2fa7ab823be348befd391)
@@ -111,26 +111,28 @@
         requestNewOperationMode( DD_MODE_GEND );
     }
     //TODO: Transition to post gen dialysate if concentrate priming has been started
-    if ( TRUE == getU32OverrideValue( &pendingStopDDPreGenDialRequest ) )
+    else if ( TRUE == getU32OverrideValue( &pendingStopDDPreGenDialRequest ) )
     {
         pendingStopDDPreGenDialRequest.data = FALSE;
         requestNewOperationMode( DD_MODE_STAN );
     }
-
-    // execute current pre-gen dialysate state
-    switch ( preGenDialysateState )
+    else
     {
-        case DD_PRE_GEN_DIALYSATE_HYD_CHAMBER_FILL_CHECK:
-            preGenDialysateState = handlePreGenDialysateFillCompleteCheckState();
-            break;
+        // execute current pre-gen dialysate state
+        switch ( preGenDialysateState )
+        {
+            case DD_PRE_GEN_DIALYSATE_HYD_CHAMBER_FILL_CHECK:
+                preGenDialysateState = handlePreGenDialysateFillCompleteCheckState();
+                break;
 
-        case DD_PRE_GEN_DIALYSATE_WAIT_FOR_GEND:
-            // TODO : handle wait for Gen dialysate
-            break;
+            case DD_PRE_GEN_DIALYSATE_WAIT_FOR_GEND:
+                // TODO : handle wait for Gen dialysate
+                break;
 
-        default:
-            SET_ALARM_WITH_2_U32_DATA( ALARM_ID_DD_SOFTWARE_FAULT, SW_FAULT_ID_PRE_GEND_MODE_INVALID_EXEC_STATE, preGenDialysateState )
-            break;
+            default:
+                SET_ALARM_WITH_2_U32_DATA( ALARM_ID_DD_SOFTWARE_FAULT, SW_FAULT_ID_PRE_GEND_MODE_INVALID_EXEC_STATE, preGenDialysateState )
+                break;
+        }
     }
 
     publishPreGenDialysateState();
@@ -258,15 +260,15 @@
 
 /*********************************************************************//**
  * @brief
- * The testDDstartGenDialysateOverride function sets the override value
+ * The testDDStartGenDialysateOverride function sets the override value
  * to start the gen dialysate operation mode.
  * @details Inputs: pendingStartDDGenDialRequest
  * @details Outputs: pendingStartDDGenDialRequest
  * @param message Override message from Dialin which includes the flag
  * to override the operation mode.
  * @return TRUE if override successful, FALSE if not
  *************************************************************************/
-BOOL testDDstartGenDialysateOverride( MESSAGE_T *message )
+BOOL testDDStartGenDialysateOverride( MESSAGE_T *message )
 {
     BOOL result = u32Override( message, &pendingStartDDGenDialRequest, FALSE, TRUE );
 
@@ -275,15 +277,15 @@
 
 /*********************************************************************//**
  * @brief
- * The testDDstopPreGenDialysateOverride function sets the override value
+ * The testDDStopPreGenDialysateOverride function sets the override value
  * to stop the pre gen dialysate operation mode.
  * @details Inputs: pendingStopDDPreGenDialRequest
  * @details Outputs: pendingStopDDPreGenDialRequest
  * @param message Override message from Dialin which includes the flag
  * to override the operation mode.
  * @return TRUE if override successful, FALSE if not
  *************************************************************************/
-BOOL testDDstopPreGenDialysateOverride( MESSAGE_T *message )
+BOOL testDDStopPreGenDialysateOverride( MESSAGE_T *message )
 {
     BOOL result = u32Override( message, &pendingStopDDPreGenDialRequest, FALSE, TRUE );