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
Index: leahi_dialin/dd/dialysate_delivery.py
===================================================================
diff -u -r2dc81a7a48da08c15dd26020a30d4401b00ded9b -rb3774ad1df35c613de1c09bef40a55eb0ce4af36
--- leahi_dialin/dd/dialysate_delivery.py	(.../dialysate_delivery.py)	(revision 2dc81a7a48da08c15dd26020a30d4401b00ded9b)
+++ leahi_dialin/dd/dialysate_delivery.py	(.../dialysate_delivery.py)	(revision b3774ad1df35c613de1c09bef40a55eb0ce4af36)
@@ -187,7 +187,7 @@
         """
 
         message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_dd_ch_id,
-                                              message_id=MsgIds.MSG_ID_TESTER_LOGIN_REQUEST.value,
+                                              message_id=MsgIds.MSG_ID_DD_TESTER_LOGIN_REQUEST.value,
                                               payload=list(map(int, map(ord, self.DD_LOGIN_PASSWORD))))
 
         self.logger.debug("Logging in...")
Index: leahi_dialin/fp/filtration_purification.py
===================================================================
diff -u -rc9eb704f8f1837fcf8d28e1010e01e5c4b27f984 -rb3774ad1df35c613de1c09bef40a55eb0ce4af36
--- leahi_dialin/fp/filtration_purification.py	(.../filtration_purification.py)	(revision c9eb704f8f1837fcf8d28e1010e01e5c4b27f984)
+++ leahi_dialin/fp/filtration_purification.py	(.../filtration_purification.py)	(revision b3774ad1df35c613de1c09bef40a55eb0ce4af36)
@@ -178,7 +178,7 @@
         """
 
         message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_fp_ch_id,
-                                              message_id=MsgIds.MSG_ID_FIRST_RO_TESTER_MESSAGE.value,
+                                              message_id=MsgIds.MSG_ID_RO_TESTER_LOGIN_REQUEST.value,
                                               payload=list(map(int, map(ord, self.FP_LOGIN_PASSWORD))))
 
         self.logger.debug("Logging in...")
Index: leahi_dialin/td/treatment_delivery.py
===================================================================
diff -u -r8c823851a48f72a6ac2a26cc691063d214288231 -rb3774ad1df35c613de1c09bef40a55eb0ce4af36
--- leahi_dialin/td/treatment_delivery.py	(.../treatment_delivery.py)	(revision 8c823851a48f72a6ac2a26cc691063d214288231)
+++ leahi_dialin/td/treatment_delivery.py	(.../treatment_delivery.py)	(revision b3774ad1df35c613de1c09bef40a55eb0ce4af36)
@@ -226,7 +226,7 @@
         """
 
         message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_td_ch_id,
-                                              message_id=MsgIds.MSG_ID_TESTER_LOGIN_REQUEST.value,
+                                              message_id=MsgIds.MSG_ID_TD_TESTER_LOGIN_REQUEST.value,
                                               payload=list(map(int, map(ord, self.TD_LOGIN_PASSWORD))))
 
         self.logger.debug("Logging in...")