Index: firmware/App/Services/SystemComm.c
===================================================================
diff -u -r6c801cb0b32cba0e754cb6b1b57c1a8bd4e2bcf7 -r6fc5e3596bfb7f27e93e4bfbe4909b9f58c17b48
--- firmware/App/Services/SystemComm.c	(.../SystemComm.c)	(revision 6c801cb0b32cba0e754cb6b1b57c1a8bd4e2bcf7)
+++ firmware/App/Services/SystemComm.c	(.../SystemComm.c)	(revision 6fc5e3596bfb7f27e93e4bfbe4909b9f58c17b48)
@@ -669,8 +669,8 @@
                 handleTestAlarmStateOverrideRequest( message );
                 break;
 
-            case MSG_ID_ALARM_START_OVERRIDE:
-                handleTestAlarmStartOverrideRequest( message );
+            case MSG_ID_ALARM_TIME_OVERRIDE:
+                handleTestAlarmTimeOverrideRequest( message );
                 break;
 
             case MSG_ID_BLOOD_FLOW_SET_PT_OVERRIDE:
Index: firmware/App/Services/SystemCommMessages.c
===================================================================
diff -u -r51c6a24b30643c8ce296ebfe1d703f289ffafe97 -r6fc5e3596bfb7f27e93e4bfbe4909b9f58c17b48
--- firmware/App/Services/SystemCommMessages.c	(.../SystemCommMessages.c)	(revision 51c6a24b30643c8ce296ebfe1d703f289ffafe97)
+++ firmware/App/Services/SystemCommMessages.c	(.../SystemCommMessages.c)	(revision 6fc5e3596bfb7f27e93e4bfbe4909b9f58c17b48)
@@ -345,16 +345,16 @@
 DATA_ARRAY_OVERRIDE_HANDLER_FUNC( BOOL, handleTestAlarmStateOverrideRequest, testSetAlarmStateOverride, testResetAlarmStateOverride )
 
 /*************************************************************************
- * @brief handleTestAlarmStartOverrideRequest
- * The handleTestAlarmStartOverrideRequest function handles a request to \n
- * override the start time of a given alarm.
+ * @brief handleTestAlarmTimeOverrideRequest
+ * The handleTestAlarmTimeOverrideRequest function handles a request to \n
+ * override the time since activation of a given alarm.
  * @details
  * Inputs : none
  * Outputs : message handled
  * @param message : a pointer to the message to handle
  * @return none
  *************************************************************************/
-DATA_ARRAY_OVERRIDE_HANDLER_FUNC( U32, handleTestAlarmStartOverrideRequest, testSetAlarmStartOverride, testResetAlarmStartOverride )
+DATA_ARRAY_OVERRIDE_HANDLER_FUNC( U32, handleTestAlarmTimeOverrideRequest, testSetAlarmStartOverride, testResetAlarmStartOverride )
 
 /*************************************************************************
  * @brief handleTestBloodFlowSetPointOverrideRequest
Index: firmware/App/Services/SystemCommMessages.h
===================================================================
diff -u -r6c801cb0b32cba0e754cb6b1b57c1a8bd4e2bcf7 -r6fc5e3596bfb7f27e93e4bfbe4909b9f58c17b48
--- firmware/App/Services/SystemCommMessages.h	(.../SystemCommMessages.h)	(revision 6c801cb0b32cba0e754cb6b1b57c1a8bd4e2bcf7)
+++ firmware/App/Services/SystemCommMessages.h	(.../SystemCommMessages.h)	(revision 6fc5e3596bfb7f27e93e4bfbe4909b9f58c17b48)
@@ -34,7 +34,7 @@
     MSG_ID_ALARM_LAMP_PATTERN_OVERRIDE,         // 0x8004
     MSG_ID_WATCHDOG_TASK_CHECKIN_OVERRIDE,      // 0x8005
     MSG_ID_ALARM_STATE_OVERRIDE,                // 0x8006
-    MSG_ID_ALARM_START_OVERRIDE,                // 0x8007
+    MSG_ID_ALARM_TIME_OVERRIDE,                 // 0x8007
     MSG_ID_BLOOD_FLOW_SET_PT_OVERRIDE,          // 0x8008
     MSG_ID_BLOOD_FLOW_MEAS_OVERRIDE,            // 0x8009
     MSG_ID_BLOOD_PUMP_MEAS_SPEED_OVERRIDE,      // 0x800A
@@ -75,8 +75,8 @@
 // MSG_ID_ALARM_STATE_OVERRIDE
 void handleTestAlarmStateOverrideRequest( MESSAGE_T *message );
 
-// MSG_ID_ALARM_START_OVERRIDE
-void handleTestAlarmStartOverrideRequest( MESSAGE_T *message );
+// MSG_ID_ALARM_TIME_OVERRIDE
+void handleTestAlarmTimeOverrideRequest( MESSAGE_T *message );
 
 // MSG_ID_BLOOD_FLOW_SET_PT_OVERRIDE
 void handleTestBloodFlowSetPointOverrideRequest( MESSAGE_T *message );