Index: firmware/App/Modes/OperationModes.c
===================================================================
diff -u -reff7b1575f008f81b29ef906f6346fac6012d3ab -rfd0e359b0ee4b3efdf25ac1fd619f85fffef67b7
--- firmware/App/Modes/OperationModes.c	(.../OperationModes.c)	(revision eff7b1575f008f81b29ef906f6346fac6012d3ab)
+++ firmware/App/Modes/OperationModes.c	(.../OperationModes.c)	(revision fd0e359b0ee4b3efdf25ac1fd619f85fffef67b7)
@@ -14,20 +14,21 @@
  *
  **************************************************************************/
 
+#include <ModeFill.h>
 #include "gio.h"
 
 #include "Common.h"
 #include "OperationModes.h"
 
-#include "ModeInitPOST.h"
-#include "ModeService.h"
 #include "ModeFault.h"
-#include "ModeStandby.h"
-#include "ModePrescription.h"
+#include "ModeFill.h"
+#include "ModeInitPOST.h"
 #include "ModeOpParams.h"
+#include "ModePostTreat.h"
 #include "ModePreTreat.h"
+#include "ModeService.h"
+#include "ModeStandby.h"
 #include "ModeTreatment.h"
-#include "ModePostTreat.h"
 
 // ********** private data **********
 
@@ -36,18 +37,19 @@
 
 // this matrix determines legal transitions from one mode to another
 static const OP_MODE MODE_TRANSITION_TABLE[NUM_OF_MODES - 1][NUM_OF_MODES - 1] = {
-// from     to->    FAULT    SERVICE      INIT      STANBY   PRESCRIP.  OP.PARAMS  PRE-TREAT  TREATMENT  POST_TREA
+// from     to->        FAULT      SERVICE    INIT       STANBY     FILL       OP.PARAMS  PRE-TREAT  TREATMENT
+//                      POST_TREA
         /* FAUL     */{ MODE_FAUL, MODE_SERV, MODE_NLEG, MODE_NLEG, MODE_NLEG, MODE_NLEG, MODE_NLEG, MODE_NLEG,
                         MODE_NLEG, },
         /* SERV     */{ MODE_FAUL, MODE_SERV, MODE_NLEG, MODE_NLEG, MODE_NLEG, MODE_NLEG, MODE_NLEG, MODE_NLEG,
                         MODE_NLEG, },
         /* INIT     */{ MODE_FAUL, MODE_NLEG, MODE_INIT, MODE_STAN, MODE_NLEG, MODE_NLEG, MODE_NLEG, MODE_NLEG,
                         MODE_NLEG, },
-        /* STAN     */{ MODE_FAUL, MODE_SERV, MODE_NLEG, MODE_STAN, MODE_PRES, MODE_NLEG, MODE_NLEG, MODE_NLEG,
+        /* STAN     */{ MODE_FAUL, MODE_SERV, MODE_NLEG, MODE_STAN, MODE_FILL, MODE_NLEG, MODE_NLEG, MODE_NLEG,
                         MODE_NLEG, },
-        /* PRES     */{ MODE_FAUL, MODE_NLEG, MODE_NLEG, MODE_NLEG, MODE_PRES, MODE_OPAR, MODE_NLEG, MODE_NLEG,
+        /* FILL     */{ MODE_FAUL, MODE_NLEG, MODE_NLEG, MODE_STAN, MODE_FILL, MODE_NLEG, MODE_NLEG, MODE_NLEG,
                         MODE_NLEG, },
-        /* OPAR     */{ MODE_FAUL, MODE_NLEG, MODE_NLEG, MODE_NLEG, MODE_PRES, MODE_OPAR, MODE_PRET, MODE_NLEG,
+        /* OPAR     */{ MODE_FAUL, MODE_NLEG, MODE_NLEG, MODE_NLEG, MODE_FILL, MODE_OPAR, MODE_PRET, MODE_NLEG,
                         MODE_NLEG, },
         /* PRET     */{ MODE_FAUL, MODE_NLEG, MODE_NLEG, MODE_NLEG, MODE_NLEG, MODE_NLEG, MODE_PRET, MODE_TREA,
                         MODE_NLEG, },
@@ -89,7 +91,7 @@
     initServiceMode();
     initInitAndPOSTMode();
     initStandbyMode();
-    initPrescriptionMode();
+    initFillMode();
     initOpParamsMode();
     initPreTreatmentMode();
     initTreatmentMode();
@@ -147,8 +149,8 @@
             execStandbyMode();
             break;
 
-        case MODE_PRES:
-            execPrescriptionMode();
+        case MODE_FILL:
+            execFillMode();
             break;
 
         case MODE_OPAR:
@@ -276,8 +278,8 @@
         case MODE_STAN:
             transitionToStandbyMode();
             break;
-        case MODE_PRES:
-            transitionToPrescriptionMode();
+        case MODE_FILL:
+            transitionToFillMode();
             break;
         case MODE_OPAR:
             transitionToOpParamsMode();