Index: leahi_dialin/dd/dialysate_delivery.py
===================================================================
diff -u -rba2793fd2b970fc89af085f1dfe4e8b6fe408353 -r63d26c9e41e02f8a4c0ad59dab9cc6575e501357
--- leahi_dialin/dd/dialysate_delivery.py	(.../dialysate_delivery.py)	(revision ba2793fd2b970fc89af085f1dfe4e8b6fe408353)
+++ leahi_dialin/dd/dialysate_delivery.py	(.../dialysate_delivery.py)	(revision 63d26c9e41e02f8a4c0ad59dab9cc6575e501357)
@@ -85,16 +85,18 @@
         # register handler for DD operation mode broadcast messages
         if self.can_interface is not None:
             channel_id = DenaliChannels.dd_sync_broadcast_ch_id
-            msg_id = MsgIds.MSG_ID_DD_OP_MODE_DATA.value
-            self.can_interface.register_receiving_publication_function(channel_id, msg_id,
+            self.msg_id_dd_op_mode_data = MsgIds.MSG_ID_DD_OP_MODE_DATA.value
+            self.can_interface.register_receiving_publication_function(channel_id, self.msg_id_dd_op_mode_data,
                                                                        self._handler_dd_op_mode_sync)
 
+            self.msg_id_dd_version_response = MsgIds.MSG_ID_DD_VERSION_RESPONSE.value
             self.can_interface.register_receiving_publication_function(channel_id,
-                                                                       MsgIds.MSG_ID_DD_VERSION_RESPONSE.value,
+                                                                       self.msg_id_dd_version_response,
                                                                        self._handler_dd_version_response_sync)
 
+            self.msg_id_dd_debug_event = MsgIds.MSG_ID_DD_DEBUG_EVENT.value
             self.can_interface.register_receiving_publication_function(channel_id,
-                                                                       MsgIds.MSG_ID_DD_DEBUG_EVENT.value,
+                                                                       self.msg_id_dd_debug_event,
                                                                        self._handler_dd_debug_event_sync)
 
         # create properties
@@ -135,7 +137,7 @@
         self.td_proxy = TDProxy(self.can_interface, self.logger)
 
 
-    @publish(["dd_debug_events_timestamp","dd_debug_events"])
+    @publish(["msg_id_dd_debug_event", "dd_debug_events_timestamp","dd_debug_events"])
     def _handler_dd_debug_event_sync(self, message, timestamp = 0.0):
 
         payload = message['message']
@@ -166,7 +168,7 @@
         """
         self.dd_logged_in = logged_in
 
-    @publish(["dd_op_mode_timestamp","dd_operation_mode", "dd_operation_sub_mode"])
+    @publish(["msg_id_dd_op_mode_data", "dd_op_mode_timestamp","dd_operation_mode", "dd_operation_sub_mode"])
     def _handler_dd_op_mode_sync(self, message, timestamp = 0.0):
         """
         Handles published DD operation mode messages.  Current DD operation mode
@@ -184,7 +186,7 @@
         self.dd_operation_sub_mode = smode[0]
         self.dd_op_mode_timestamp = timestamp
 
-    @publish(["dd_version, dd_fpga_version"])
+    @publish(["msg_id_dd_version_response", "dd_version, dd_fpga_version"])
     def _handler_dd_version_response_sync(self,message, timestamp = 0.0):
         """
         Handler for response from DD regarding its version.
Index: leahi_dialin/dd/modules/balancing_chamber.py
===================================================================
diff -u -r6fa8a72c463310fd943270135aebfcb10d7a1210 -r63d26c9e41e02f8a4c0ad59dab9cc6575e501357
--- leahi_dialin/dd/modules/balancing_chamber.py	(.../balancing_chamber.py)	(revision 6fa8a72c463310fd943270135aebfcb10d7a1210)
+++ leahi_dialin/dd/modules/balancing_chamber.py	(.../balancing_chamber.py)	(revision 63d26c9e41e02f8a4c0ad59dab9cc6575e501357)
@@ -43,8 +43,8 @@
 
         if self.can_interface is not None:
             channel_id = DenaliChannels.dd_sync_broadcast_ch_id
-            self.msg_id_dd_bal_chamber = MsgIds.MSG_ID_DD_BAL_CHAMBER_DATA.value
-            self.can_interface.register_receiving_publication_function(channel_id, self.msg_id_dd_bal_chamber,
+            self.msg_id_dd_bal_chamber_data = MsgIds.MSG_ID_DD_BAL_CHAMBER_DATA.value
+            self.can_interface.register_receiving_publication_function(channel_id, self.msg_id_dd_bal_chamber_data,
                                                                        self._handler_balancing_chamber_sync)
 
         self.execution_state = 0
@@ -57,7 +57,7 @@
         self.bal_chamber_switch_only_state = 0
         self.dd_bal_chamber_timestamp = 0
 
-    @publish(["msg_id_dd_bal_chamber",
+    @publish(["msg_id_dd_bal_chamber_data",
               "dd_bal_chamber_timestamp",
               "execution_state", "switching_state",
               "switching_frequency",
Index: leahi_dialin/fp/filtration_purification.py
===================================================================
diff -u -r592d7ab1f37bc69648bd75f3e0886a6fc6f5043e -r63d26c9e41e02f8a4c0ad59dab9cc6575e501357
--- leahi_dialin/fp/filtration_purification.py	(.../filtration_purification.py)	(revision 592d7ab1f37bc69648bd75f3e0886a6fc6f5043e)
+++ leahi_dialin/fp/filtration_purification.py	(.../filtration_purification.py)	(revision 63d26c9e41e02f8a4c0ad59dab9cc6575e501357)
@@ -21,6 +21,7 @@
 from .modules.constants import NO_RESET, RESET
 from .modules.flow_sensors import FPFlowSensors
 from .modules.levels import FPLevels
+from .modules.permeate_tank import FPPermeateTank
 from .modules.pressure_sensors import FPPressureSensors
 from .modules.ro_pump import FPROPump
 from .modules.temperatures import FPTemperatureSensors
@@ -77,16 +78,18 @@
         # register handler for FP operation mode broadcast messages
         if self.can_interface is not None:
             channel_id = DenaliChannels.fp_sync_broadcast_ch_id
-            msg_id = MsgIds.MSG_ID_FP_OP_MODE_DATA.value
-            self.can_interface.register_receiving_publication_function(channel_id, msg_id,
+            self.msg_id_fp_op_mode_data = MsgIds.MSG_ID_FP_OP_MODE_DATA.value
+            self.can_interface.register_receiving_publication_function(channel_id, self.msg_id_fp_op_mode_data,
                                                                        self._handler_fp_op_mode_sync)
 
+            self.msg_id_fp_version_response = MsgIds.MSG_ID_FP_VERSION_RESPONSE.value
             self.can_interface.register_receiving_publication_function(channel_id,
-                                                                       MsgIds.MSG_ID_FP_VERSION_RESPONSE.value,
+                                                                       self.msg_id_fp_version_response,
                                                                        self._handler_fp_version_response_sync)
 
+            self.msg_id_fp_debug_event = MsgIds.MSG_ID_FP_DEBUG_EVENT.value
             self.can_interface.register_receiving_publication_function(channel_id,
-                                                                       MsgIds.MSG_ID_FP_DEBUG_EVENT.value,
+                                                                       self.msg_id_fp_debug_event,
                                                                        self._handler_fp_debug_event_sync)
 
         # create properties
@@ -110,14 +113,15 @@
         self.flows = FPFlowSensors(self.can_interface, self.logger)
         self.fluid_pumps = FPPumps(self.can_interface, self.logger)
         self.levels = FPLevels(self.can_interface, self.logger)
+        self.permeate_tank = FPPermeateTank(self.can_interface, self.logger)
         self.pressures = FPPressureSensors(self.can_interface, self.logger)
         self.ro_pump = FPROPump(self.can_interface, self.logger)
         self.temperatures = FPTemperatureSensors(self.can_interface, self.logger)
         self.test_configs = FPTestConfig(self.can_interface, self.logger)
         self.valves = FPValves(self.can_interface, self.logger)
         self.dd_proxy = DDProxy(self.can_interface, self.logger)
 
-    @publish(["fp_debug_events_timestamp","fp_debug_events"])
+    @publish(["msg_id_fp_debug_event", "fp_debug_events_timestamp","fp_debug_events"])
     def _handler_fp_debug_event_sync(self, message, timestamp = 0.0):
         """
         Callback for fp debug event messages
@@ -153,7 +157,7 @@
         """
         self.fp_logged_in = logged_in
 
-    @publish(["fp_version, fp_fpga_version"])
+    @publish(["msg_id_fp_version_response", "fp_version, fp_fpga_version"])
     def _handler_fp_version_response_sync(self,message, timestamp = 0.0):
         """
         Handler for response from FP regarding its version.
@@ -191,7 +195,7 @@
 
         self.fp_version_response_timestamp = timestamp
 
-    @publish(["fp_op_mode_timestamp","fp_operation_mode", "fp_operation_sub_mode"])
+    @publish(["msg_id_fp_op_mode_data", "fp_op_mode_timestamp","fp_operation_mode", "fp_operation_sub_mode"])
     def _handler_fp_op_mode_sync(self, message, timestamp = 0.0):
         """
         Handles published FP operation mode messages.  Current FP operation mode
Index: leahi_dialin/td/modules/buttons.py
===================================================================
diff -u -rafe332fec54d9d0432dfc0d54aef1debaa92b066 -r63d26c9e41e02f8a4c0ad59dab9cc6575e501357
--- leahi_dialin/td/modules/buttons.py	(.../buttons.py)	(revision afe332fec54d9d0432dfc0d54aef1debaa92b066)
+++ leahi_dialin/td/modules/buttons.py	(.../buttons.py)	(revision 63d26c9e41e02f8a4c0ad59dab9cc6575e501357)
@@ -41,8 +41,9 @@
         self.poweroff_timeout_expired = False
 
         if self.can_interface is not None:
+            self.msg_id_off_button_press_request = MsgIds.MSG_ID_OFF_BUTTON_PRESS_REQUEST.value
             self.can_interface.register_receiving_publication_function(DenaliChannels.td_to_ui_ch_id,
-                                                                       MsgIds.MSG_ID_OFF_BUTTON_PRESS_REQUEST.value,
+                                                                       self.msg_id_off_button_press_request,
                                                                        self._handler_poweroff_timeout_occurred)
         self.td_power_off_timestamp = 0.0
 
@@ -55,7 +56,7 @@
 
         self.poweroff_timeout_expired = False
 
-    @publish(['td_power_off_timestamp', "poweroff_timeout_expired"])
+    @publish(['msg_id_off_button_press_request', 'td_power_off_timestamp', "poweroff_timeout_expired"])
     def _handler_poweroff_timeout_occurred(self, message, timestamp=0.0):
         """
         Poweroff timeout occurred handler
Index: leahi_dialin/td/treatment_delivery.py
===================================================================
diff -u -r592d7ab1f37bc69648bd75f3e0886a6fc6f5043e -r63d26c9e41e02f8a4c0ad59dab9cc6575e501357
--- leahi_dialin/td/treatment_delivery.py	(.../treatment_delivery.py)	(revision 592d7ab1f37bc69648bd75f3e0886a6fc6f5043e)
+++ leahi_dialin/td/treatment_delivery.py	(.../treatment_delivery.py)	(revision 63d26c9e41e02f8a4c0ad59dab9cc6575e501357)
@@ -80,20 +80,23 @@
         # register handler for TD operation mode broadcast messages
         if self.can_interface is not None:
             channel_id = DenaliChannels.td_sync_broadcast_ch_id
-            msg_id = MsgIds.MSG_ID_TD_OP_MODE_DATA.value
-            self.can_interface.register_receiving_publication_function(channel_id, msg_id,
+            self.msg_id_td_op_mode_data = MsgIds.MSG_ID_TD_OP_MODE_DATA.value
+            self.can_interface.register_receiving_publication_function(channel_id, self.msg_id_td_op_mode_data,
                                                                        self._handler_td_op_mode_sync)
 
+            self.msg_id_td_debug_event = MsgIds.MSG_ID_TD_DEBUG_EVENT.value
             self.can_interface.register_receiving_publication_function(channel_id,
-                                                                       MsgIds.MSG_ID_TD_DEBUG_EVENT.value,
+                                                                       self.msg_id_td_debug_event,
                                                                        self._handler_td_debug_event_sync)
 
+            self.msg_id_td_version_response = MsgIds.MSG_ID_TD_VERSION_RESPONSE.value
             self.can_interface.register_receiving_publication_function(channel_id,
-                                                                       MsgIds.MSG_ID_TD_VERSION_RESPONSE.value,
+                                                                       self.msg_id_td_version_response,
                                                                        self._handler_td_version_response_sync)
 
+            self.msg_id_ui_version_info_response = MsgIds.MSG_ID_UI_VERSION_INFO_RESPONSE.value
             self.can_interface.register_receiving_publication_function(DenaliChannels.ui_to_td_ch_id,
-                                                                       MsgIds.MSG_ID_UI_VERSION_INFO_RESPONSE.value,
+                                                                       self.msg_id_ui_version_info_response,
                                                                        self._handler_ui_version_response_sync)
 
         # create properties
@@ -131,7 +134,7 @@
         self.dd_proxy = DDProxy(self.can_interface, self.logger)
         self.ui_proxy = UIProxy(self.can_interface, self.logger)
 
-    @publish(["td_debug_events_timestamp","td_debug_events"])
+    @publish(["msg_id_td_debug_event", "td_debug_events_timestamp","td_debug_events"])
     def _handler_td_debug_event_sync(self, message, timestamp = 0.0):
 
         payload = message['message']
@@ -162,7 +165,7 @@
         """
         self.td_logged_in = logged_in
 
-    @publish(["td_op_mode_timestamp","td_operation_mode", "td_operation_sub_mode"])
+    @publish(["msg_id_td_op_mode_data", "td_op_mode_timestamp","td_operation_mode", "td_operation_sub_mode"])
     def _handler_td_op_mode_sync(self, message, timestamp = 0.0):
         """
         Handles published TD operation mode messages.  Current TD operation mode
@@ -180,7 +183,7 @@
         self.td_operation_sub_mode = smode[0]
         self.td_op_mode_timestamp = timestamp
 
-    @publish(["td_version, td_fpga_version"])
+    @publish(["msg_id_td_version_response", "td_version, td_fpga_version"])
     def _handler_td_version_response_sync(self,message, timestamp = 0.0):
         """
         Handler for response from TD regarding its version.
@@ -218,7 +221,7 @@
 
         self.td_version_response_timestamp = timestamp
 
-
+    @publish(["msg_id_ui_version_info_response", "ui_version", "ui_version_info_response_timestamp"])
     def _handler_ui_version_response_sync(self,message, timestamp = 0.0):
         """
         Handler for response from TD regarding its version.