Index: leahi_dialin/common/msg_ids.py
===================================================================
diff -u -r4c6191b3a68f1167a0e443c975c51f3cb00b8000 -rc587268b85d4b16b4102869d2841be84f3a2a23f
--- leahi_dialin/common/msg_ids.py	(.../msg_ids.py)	(revision 4c6191b3a68f1167a0e443c975c51f3cb00b8000)
+++ leahi_dialin/common/msg_ids.py	(.../msg_ids.py)	(revision c587268b85d4b16b4102869d2841be84f3a2a23f)
@@ -34,8 +34,8 @@
     MSG_ID_UI_SET_ALARM_AUDIO_VOLUME_LEVEL_CMD_REQUEST = 0xB    
     MSG_ID_TD_ALARM_AUDIO_VOLUME_SET_RESPONSE = 0xC             
     MSG_ID_FW_VERSIONS_REQUEST = 0xD                            
-    MSG_ID_TD_VERSION_REPONSE = 0xE                             
-    MSG_ID_DD_VERSION_REPONSE = 0xF                             
+    MSG_ID_TD_VERSION_RESPONSE = 0xE
+    MSG_ID_DD_VERSION_RESPONSE = 0xF
     MSG_ID_UI_CHECK_IN = 0x10                                   
     MSG_ID_TD_BLOOD_PUMP_DATA = 0x11                            
     MSG_ID_TD_OP_MODE_DATA = 0x12                               
Index: leahi_dialin/dd/dialysate_delivery.py
===================================================================
diff -u -r4c6191b3a68f1167a0e443c975c51f3cb00b8000 -rc587268b85d4b16b4102869d2841be84f3a2a23f
--- leahi_dialin/dd/dialysate_delivery.py	(.../dialysate_delivery.py)	(revision 4c6191b3a68f1167a0e443c975c51f3cb00b8000)
+++ leahi_dialin/dd/dialysate_delivery.py	(.../dialysate_delivery.py)	(revision c587268b85d4b16b4102869d2841be84f3a2a23f)
@@ -85,7 +85,7 @@
                                                                        self._handler_dd_op_mode_sync)
 
             self.can_interface.register_receiving_publication_function(channel_id,
-                                                                       MsgIds.MSG_ID_DD_VERSION_REPONSE.value,
+                                                                       MsgIds.MSG_ID_DD_VERSION_RESPONSE.value,
                                                                        self._handler_dd_version_response_sync)
 
             self.can_interface.register_receiving_publication_function(channel_id,
Index: leahi_dialin/dd/proxies/ro_proxy.py
===================================================================
diff -u -r68422d08c4141999a13496343264483a32314d37 -rc587268b85d4b16b4102869d2841be84f3a2a23f
--- leahi_dialin/dd/proxies/ro_proxy.py	(.../ro_proxy.py)	(revision 68422d08c4141999a13496343264483a32314d37)
+++ leahi_dialin/dd/proxies/ro_proxy.py	(.../ro_proxy.py)	(revision c587268b85d4b16b4102869d2841be84f3a2a23f)
@@ -54,7 +54,7 @@
         rtt = float_to_bytearray(ro_rate)
         payload = cmd + stt + rtt
         message = DenaliMessage.build_message(channel_id=DenaliChannels.dd_to_ro_ch_id,
-                                              message_id=MsgIds.MSG_ID_DD_RO_START_STOP_CMD_REQUEST.value,
+                                              message_id=MsgIds.MSG_ID_DD_FP_START_STOP_CMD_REQUEST.value,
                                               payload=payload)
 
         self.logger.debug("Sending DD start stop request to RO.")
Index: leahi_dialin/fp/filtration_purification.py
===================================================================
diff -u -r4c6191b3a68f1167a0e443c975c51f3cb00b8000 -rc587268b85d4b16b4102869d2841be84f3a2a23f
--- leahi_dialin/fp/filtration_purification.py	(.../filtration_purification.py)	(revision 4c6191b3a68f1167a0e443c975c51f3cb00b8000)
+++ leahi_dialin/fp/filtration_purification.py	(.../filtration_purification.py)	(revision c587268b85d4b16b4102869d2841be84f3a2a23f)
@@ -81,7 +81,7 @@
                                                                        self._handler_fp_op_mode_sync)
 
             self.can_interface.register_receiving_publication_function(channel_id,
-                                                                       MsgIds.MSG_ID_FP_VERSION_REPONSE.value,
+                                                                       MsgIds.MSG_ID_FP_VERSION_RESPONSE.value,
                                                                        self._handler_fp_version_response_sync)
 
             self.can_interface.register_receiving_publication_function(channel_id,
Index: leahi_dialin/td/treatment_delivery.py
===================================================================
diff -u -r4c6191b3a68f1167a0e443c975c51f3cb00b8000 -rc587268b85d4b16b4102869d2841be84f3a2a23f
--- leahi_dialin/td/treatment_delivery.py	(.../treatment_delivery.py)	(revision 4c6191b3a68f1167a0e443c975c51f3cb00b8000)
+++ leahi_dialin/td/treatment_delivery.py	(.../treatment_delivery.py)	(revision c587268b85d4b16b4102869d2841be84f3a2a23f)
@@ -87,7 +87,7 @@
                                                                        self._handler_td_debug_event_sync)
 
             self.can_interface.register_receiving_publication_function(channel_id,
-                                                                       MsgIds.MSG_ID_TD_VERSION_REPONSE.value,
+                                                                       MsgIds.MSG_ID_TD_VERSION_RESPONSE.value,
                                                                        self._handler_td_version_response_sync)
 
             self.can_interface.register_receiving_publication_function(DenaliChannels.ui_to_td_ch_id,
Index: leahi_dialin/ui/dd_messaging.py
===================================================================
diff -u -r22edb3e32e00966918269e87c949b87496a718ea -rc587268b85d4b16b4102869d2841be84f3a2a23f
--- leahi_dialin/ui/dd_messaging.py	(.../dd_messaging.py)	(revision 22edb3e32e00966918269e87c949b87496a718ea)
+++ leahi_dialin/ui/dd_messaging.py	(.../dd_messaging.py)	(revision c587268b85d4b16b4102869d2841be84f3a2a23f)
@@ -129,7 +129,7 @@
 
         message = CAN.DenaliMessage.build_message(
                                             channel_id=CAN.DenaliChannels.dd_sync_broadcast_ch_id,
-                                            message_id=msg_ids.MsgIds.MSG_ID_DD_VERSION_REPONSE.value,
+                                            message_id=msg_ids.MsgIds.MSG_ID_DD_VERSION_RESPONSE.value,
                                             payload=payload)
 
         self.can_interface.send(message, 0)
Index: leahi_dialin/ui/td_messaging.py
===================================================================
diff -u -rb98dcb8a6118a4b06328b4f96bb9aa54ff7b077a -rc587268b85d4b16b4102869d2841be84f3a2a23f
--- leahi_dialin/ui/td_messaging.py	(.../td_messaging.py)	(revision b98dcb8a6118a4b06328b4f96bb9aa54ff7b077a)
+++ leahi_dialin/ui/td_messaging.py	(.../td_messaging.py)	(revision c587268b85d4b16b4102869d2841be84f3a2a23f)
@@ -487,7 +487,7 @@
 
         message = CAN.DenaliMessage.build_message(
                                             channel_id=CAN.DenaliChannels.td_sync_broadcast_ch_id,
-                                            message_id=msg_ids.MsgIds.MSG_ID_TD_VERSION_REPONSE.value,
+                                            message_id=msg_ids.MsgIds.MSG_ID_TD_VERSION_RESPONSE.value,
                                             payload=payload)
 
         self.can_interface.send(message, 0)