Index: leahi_dialin/common/msg_ids.py
===================================================================
diff -u -r8c823851a48f72a6ac2a26cc691063d214288231 -rb3774ad1df35c613de1c09bef40a55eb0ce4af36
--- leahi_dialin/common/msg_ids.py	(.../msg_ids.py)	(revision 8c823851a48f72a6ac2a26cc691063d214288231)
+++ leahi_dialin/common/msg_ids.py	(.../msg_ids.py)	(revision b3774ad1df35c613de1c09bef40a55eb0ce4af36)
@@ -102,7 +102,7 @@
 
     MSG_ID_DD_PISTON_PUMP_CONTROL_DATA = 0xF0
 
-    MSG_ID_TESTER_LOGIN_REQUEST = 0x8000
+    MSG_ID_TD_TESTER_LOGIN_REQUEST = 0x8000
     MSG_ID_TD_SOFTWARE_RESET_REQUEST = 0x8001
     MSG_ID_TD_SEND_TEST_CONFIGURATION = 0x8002
     MSG_ID_TD_BUBBLE_OVERRIDE_REQUEST = 0x8003
@@ -226,7 +226,7 @@
     MSG_ID_DD_PISTON_PUMP_START_STOP_OVERRIDE_REQUEST = 0xAF01
     MSG_ID_DD_PISTON_PUMP_FILL_AFTER_DISPENSE_OVERRIDE_REQUEST = 0xAF02
 
-    MSG_ID_FIRST_RO_TESTER_MESSAGE = 0xB000
+    MSG_ID_RO_TESTER_LOGIN_REQUEST = 0xB000
     MSG_ID_RO_SOFTWARE_RESET_REQUEST = 0xB001
     MSG_ID_RO_SEND_TEST_CONFIGURATION = 0xB002
     MSG_ID_RO_VALVE_PUBLISH_INTERVAL_OVERRIDE_REQUEST = 0xB003