Index: leahi_dialin/td/modules/treatment.py
===================================================================
diff -u -r956757fac807b52aec078e84127089db5dff069f -r6fa8a72c463310fd943270135aebfcb10d7a1210
--- leahi_dialin/td/modules/treatment.py	(.../treatment.py)	(revision 956757fac807b52aec078e84127089db5dff069f)
+++ leahi_dialin/td/modules/treatment.py	(.../treatment.py)	(revision 6fa8a72c463310fd943270135aebfcb10d7a1210)
@@ -41,23 +41,23 @@
 
         if self.can_interface is not None:
             channel_id = DenaliChannels.td_sync_broadcast_ch_id
-            msg_id = MsgIds.MSG_ID_TD_TREATMENT_PARAM_RANGES.value
-            self.can_interface.register_receiving_publication_function(channel_id, msg_id,
+            self.msg_id_td_treatment_param_ranges = MsgIds.MSG_ID_TD_TREATMENT_PARAM_RANGES.value
+            self.can_interface.register_receiving_publication_function(channel_id, self.msg_id_td_treatment_param_ranges,
                                                                        self._handler_treatment_param_ranges_sync)
-            msg_id = MsgIds.MSG_ID_TD_SALINE_BOLUS_DATA.value
-            self.can_interface.register_receiving_publication_function(channel_id, msg_id,
+            self.msg_id_td_saline_bolus_data = MsgIds.MSG_ID_TD_SALINE_BOLUS_DATA.value
+            self.can_interface.register_receiving_publication_function(channel_id, self.msg_id_td_saline_bolus_data,
                                                                        self._handler_saline_bolus_sync)
-            msg_id = MsgIds.MSG_ID_TD_ULTRAFILTRATION_DATA.value
-            self.can_interface.register_receiving_publication_function(channel_id, msg_id,
+            self.msg_id_td_uf_data = MsgIds.MSG_ID_TD_ULTRAFILTRATION_DATA.value
+            self.can_interface.register_receiving_publication_function(channel_id, self.msg_id_td_uf_data,
                                                                        self._handler_uf_sync)
-            msg_id = MsgIds.MSG_ID_TD_TREATMENT_TIME_DATA.value
-            self.can_interface.register_receiving_publication_function(channel_id, msg_id,
+            self.msg_id_td_treatment_time_data = MsgIds.MSG_ID_TD_TREATMENT_TIME_DATA.value
+            self.can_interface.register_receiving_publication_function(channel_id, self.msg_id_td_treatment_time_data,
                                                                        self._handler_treatment_time_sync)
-            msg_id = MsgIds.MSG_ID_TD_TREATMENT_STATE_DATA.value
-            self.can_interface.register_receiving_publication_function(channel_id, msg_id,
+            self.msg_id_td_treatment_state_data = MsgIds.MSG_ID_TD_TREATMENT_STATE_DATA.value
+            self.can_interface.register_receiving_publication_function(channel_id, self.msg_id_td_treatment_state_data,
                                                                        self._handler_treatment_state_sync)
-            msg_id = MsgIds.MSG_ID_TD_RSP_CURRENT_TREATMENT_PARAMETERS.value
-            self.can_interface.register_receiving_publication_function(channel_id, msg_id,
+            self.msg_id_td_rsp_current_treatment_parameters = MsgIds.MSG_ID_TD_RSP_CURRENT_TREATMENT_PARAMETERS.value
+            self.can_interface.register_receiving_publication_function(channel_id, self.msg_id_td_rsp_current_treatment_parameters,
                                                                        self._handler_resp_treatment_parameters_sync)
 
         # Treatment param ranges data
@@ -123,7 +123,7 @@
         self.uf_vol = 0.0
         self.tx_param_req_timestamp = 0
 
-    @publish(["min_tx_time","max_tx_time","min_uf_volume","max_uf_volume",
+    @publish(["msg_id_td_treatment_param_ranges", "min_tx_time","max_tx_time","min_uf_volume","max_uf_volume",
               "min_dial_rate","max_dial_rate","tx_params_timestamp"])
     def _handler_treatment_param_ranges_sync(self, message, timestamp=0.0):
         """
@@ -148,7 +148,7 @@
 
         self.tx_params_timestamp = timestamp
 
-    @publish(["tgt_saline_volume","cum_saline_volume","bol_saline_volume",
+    @publish(["msg_id_td_saline_bolus_data", "tgt_saline_volume","cum_saline_volume","bol_saline_volume",
               "saline_bolus_state","saline_bolus_timestamp"])
     def _handler_saline_bolus_sync(self, message, timestamp=0.0):
         """
@@ -169,7 +169,7 @@
 
         self.saline_bolus_timestamp = timestamp
 
-    @publish(["set_uf_volume","tgt_uf_rate","uf_volume_delivered",
+    @publish(["msg_id_td_uf_data", "set_uf_volume","tgt_uf_rate","uf_volume_delivered",
               "uf_state","uf_timestamp"])
     def _handler_uf_sync(self, message, timestamp=0.0):
         """
@@ -190,7 +190,7 @@
 
         self.uf_timestamp = timestamp
 
-    @publish(["tx_time_prescribed","tx_time_elapsed","tx_time_remaining",
+    @publish(["msg_id_td_treatment_time_data", "tx_time_prescribed","tx_time_elapsed","tx_time_remaining",
               "tx_time_timestamp"])
     def _handler_treatment_time_sync(self, message, timestamp=0.0):
         """
@@ -209,7 +209,7 @@
 
         self.tx_time_timestamp = timestamp
 
-    @publish(["tx_sub_mode","blood_prime_state","dialysis_state","isolated_uf_state",
+    @publish(["msg_id_td_treatment_state_data", "tx_sub_mode","blood_prime_state","dialysis_state","isolated_uf_state",
               "tx_stop_state","rinseback_state","tx_recirc_state","tx_end_state","tx_state_timestamp"])
     def _handler_treatment_state_sync(self, message, timestamp=0.0):
         """
@@ -238,8 +238,8 @@
 
         self.tx_state_timestamp = timestamp
 
-    @publish(["blood_flow_rate", "dialysate_flow_rate", "tx_duration", "saline_bolus_volume",
-              "hep_stop_time", "hep_time", "acid_con", "bicarb_con",
+    @publish(["msg_id_td_rsp_current_treatment_parameters", "blood_flow_rate", "dialysate_flow_rate", "tx_duration",
+              "saline_bolus_volume", "hep_stop_time", "hep_time", "acid_con", "bicarb_con",
               "dialyzer_type", "bp_interval", "rb_flow_rate", "rb_volume",
               "art_pressure_window","venous_pressure_window","venous_asymm_window","tmp_limit_window",
               "dialysate_temp", "hep_dispense_rate", "hep_bolus_vol", "uf_vol"])