Index: firmware/App/Services/SystemComm.c
===================================================================
diff -u -rb135150a91ea70889433dd23420fdbe91745fc91 -r479cebb3c254ed13bca26f361c8b5266f8eae408
--- firmware/App/Services/SystemComm.c	(.../SystemComm.c)	(revision b135150a91ea70889433dd23420fdbe91745fc91)
+++ firmware/App/Services/SystemComm.c	(.../SystemComm.c)	(revision 479cebb3c254ed13bca26f361c8b5266f8eae408)
@@ -1028,7 +1028,7 @@
     // handle any messages from other sub-systems
     switch ( msgID )
     {
-        case MSG_ID_TESTER_LOGIN_REQUEST:
+        case MSG_ID_DG_TESTER_LOGIN_REQUEST:
             handleTesterLogInRequest( message );
             break;
 
@@ -1038,23 +1038,23 @@
     }
 
     // handle any test messages if tester has logged in successfully
-    if ( ( msgID > MSG_ID_FIRST_TESTER_MESSAGE ) && ( msgID <= END_OF_MSG_IDS ) && ( TRUE == isTestingActivated() ) )
+    if ( ( msgID > MSG_ID_FIRST_DG_TESTER_MESSAGE ) && ( msgID <= END_OF_MSG_IDS ) && ( TRUE == isTestingActivated() ) )
     {
         switch ( msgID )
         {
             case MSG_ID_DG_MESSAGE:
                 handleTestDGMessageRequest( message );
                 break;
 
-            case MSG_ID_WATCHDOG_TASK_CHECKIN_OVERRIDE:
+            case MSG_ID_DG_WATCHDOG_TASK_CHECKIN_OVERRIDE:
                 handleTestWatchdogCheckInStateOverrideRequest( message );
                 break;
 
             case MSG_ID_ALARM_STATE_OVERRIDE:
                 handleTestAlarmStateOverrideRequest( message );
                 break;
 
-            case MSG_ID_SET_RTC_DATE_TIME:
+            case MSG_ID_DG_SET_RTC_DATE_TIME:
                 handleSetRTCTimestamp( message );
                 break;