Index: firmware/App/Services/AlarmMgmtTD.c
===================================================================
diff -u -r380b0afc95467d0861ff3aa2cdcde5d5d7ac85e7 -r37d4284f56e175716ea13ae56c621110fa96e53c
--- firmware/App/Services/AlarmMgmtTD.c	(.../AlarmMgmtTD.c)	(revision 380b0afc95467d0861ff3aa2cdcde5d5d7ac85e7)
+++ firmware/App/Services/AlarmMgmtTD.c	(.../AlarmMgmtTD.c)	(revision 37d4284f56e175716ea13ae56c621110fa96e53c)
@@ -1266,17 +1266,17 @@
 {
     BOOL                          result = FALSE;
     TEST_OVERRIDE_ARRAY_PAYLOAD_T override;
-    OVERRIDE_TYPE_T               reset = getOverrideArrayPayloadFromMessage( message, &override );
+    OVERRIDE_TYPE_T               ovType = getOverrideArrayPayloadFromMessage( message, &override );
 
     // Verify tester has logged in with TD and override type is valid
-    if ( ( TRUE == isTestingActivated() ) && ( reset != OVERRIDE_INVALID ) && ( reset < NUM_OF_OVERRIDE_TYPES ) )
+    if ( ( TRUE == isTestingActivated() ) && ( ovType != OVERRIDE_INVALID ) && ( ovType < NUM_OF_OVERRIDE_TYPES ) )
     {
         U32 alarmID = override.index;
 
         // Verify alarm index of override
         if ( alarmID < NUM_OF_ALARM_IDS )
         {
-            if ( OVERRIDE_RESET_OVERRIDE == reset )
+            if ( OVERRIDE_OVERRIDE == ovType )
             {
                 U32 value = override.state.u32;
                 U32 tim   = getMSTimerCount();
@@ -1298,7 +1298,8 @@
     }
 
     return result;
-}
+}
+
 /*********************************************************************//**
  * @brief
  * The testClearAllAlarms function clears all active alarms, even if they