Index: firmware/App/Services/SystemComm.c
===================================================================
diff -u -r23ff586bf450a0fe6dd88bdac1fb433cfeb7e6e8 -r4979bda4723da492e500f380a0e2b33517843c28
--- firmware/App/Services/SystemComm.c	(.../SystemComm.c)	(revision 23ff586bf450a0fe6dd88bdac1fb433cfeb7e6e8)
+++ firmware/App/Services/SystemComm.c	(.../SystemComm.c)	(revision 4979bda4723da492e500f380a0e2b33517843c28)
@@ -7,8 +7,8 @@
 *
 * @file    SystemComm.c
 *
-* @author  (last)      Dara Navaei
-* @date    (last)      20-Mar-2023
+* @author  (last)      Michael Garthwaite
+* @date    (last)      17-Mar-2023
 *
 * @author  (original)  Dara Navaei
 * @date    (original)  05-Nov-2019
@@ -1163,6 +1163,18 @@
             handleSetHDServiceTime( message );
             break;
 
+        case MSG_ID_HD_SET_ENTER_BOOTLOADER:
+            handleSetBootloaderRequest( message );
+            break;
+
+        case MSG_ID_HD_ENTER_BOOTLOADER_NOW:
+            handleEnterBootloaderNowRequest( message );
+            break;
+
+        case MSG_ID_HD_REBOOT_NOW:
+            handleRebootNowRequest( message );
+            break;
+
         // NOTE: this always must be the last case
         case MSG_ID_TESTER_LOGIN_REQUEST:
             handleTesterLogInRequest( message );
@@ -1720,31 +1732,6 @@
                 handleBatteryI2CStatusOverrideRequest( message );
                 break;
 
-            case MSG_ID_HD_DIAL_IN_PUMP_HARD_STOP:
-                handleDialInPumpHardStopRequest( message );
-                break;
-
-            case MSG_ID_HD_DIAL_OUT_PUMP_HARD_STOP:
-                handleDialOutPumpHardStopRequest( message );
-                break;
-
-            case MSG_ID_HD_BLOOD_PUMP_HARD_STOP:
-                handleBloodPumpHardStopRequest( message );
-                break;
-
-
-            case MSG_ID_FW_SET_ENTER_BOOTLOADER:
-                handleSetBootloaderRequest( message );
-                break;
-
-            case MSG_ID_FW_ENTER_BOOTLOADER_NOW:
-                handleEnterBootloaderNowRequest( message );
-                break;
-
-            case MSG_ID_FW_REBOOT_NOW:
-                handleRebootNowRequest( message );
-                break;
-
             // The default cannot be reached in VectorCAST since the cases are run in a for loop
             default:
                 // Unrecognized message ID received - ignore