Index: leahi_dialin/dd/modules/alarms.py
===================================================================
diff -u -r6fa8a72c463310fd943270135aebfcb10d7a1210 -rec8a2600b9e8cf6fe7e02c200a1c24221ca86863
--- leahi_dialin/dd/modules/alarms.py	(.../alarms.py)	(revision 6fa8a72c463310fd943270135aebfcb10d7a1210)
+++ leahi_dialin/dd/modules/alarms.py	(.../alarms.py)	(revision ec8a2600b9e8cf6fe7e02c200a1c24221ca86863)
@@ -82,8 +82,8 @@
 
             self.alarm_data_type[event_data_type] = struct_unpack_type
 
-    @publish(["msg_id_dd_alarm_triggered", "dd_alarm_triggered_timestamp", "alarm_states", "alarm_conditions", "alarm_data",
-              "alarm_priorities", "alarm_ranks", "alarm_clear_top_only_flags"])
+    @publish(["msg_id_dd_alarm_triggered", "alarm_states", "alarm_conditions", "alarm_data",
+              "alarm_priorities", "alarm_ranks", "alarm_clear_top_only_flags", "dd_alarm_triggered_timestamp"])
     def _handler_alarm_triggered(self, message, timestamp = 0.0):
         """
         Handles published DD alarm activation messages.
Index: leahi_dialin/dd/modules/balancing_chamber.py
===================================================================
diff -u -r63d26c9e41e02f8a4c0ad59dab9cc6575e501357 -rec8a2600b9e8cf6fe7e02c200a1c24221ca86863
--- leahi_dialin/dd/modules/balancing_chamber.py	(.../balancing_chamber.py)	(revision 63d26c9e41e02f8a4c0ad59dab9cc6575e501357)
+++ leahi_dialin/dd/modules/balancing_chamber.py	(.../balancing_chamber.py)	(revision ec8a2600b9e8cf6fe7e02c200a1c24221ca86863)
@@ -58,12 +58,12 @@
         self.dd_bal_chamber_timestamp = 0
 
     @publish(["msg_id_dd_bal_chamber_data",
-              "dd_bal_chamber_timestamp",
               "execution_state", "switching_state",
               "switching_frequency",
               "switching_period", "bal_chamber_fill_in_progress",
               "current_bal_chamber_switching_counter",
-              "is_pressure_stabilized_during_fill", "bal_chamber_switch_only_state"])
+              "is_pressure_stabilized_during_fill", "bal_chamber_switch_only_state",
+              "dd_bal_chamber_timestamp"])
     def _handler_balancing_chamber_sync(self, message, timestamp=0.0):
         """
         Handles published balancing chamber data messages.
Index: leahi_dialin/dd/modules/blood_leak.py
===================================================================
diff -u -r6fa8a72c463310fd943270135aebfcb10d7a1210 -rec8a2600b9e8cf6fe7e02c200a1c24221ca86863
--- leahi_dialin/dd/modules/blood_leak.py	(.../blood_leak.py)	(revision 6fa8a72c463310fd943270135aebfcb10d7a1210)
+++ leahi_dialin/dd/modules/blood_leak.py	(.../blood_leak.py)	(revision ec8a2600b9e8cf6fe7e02c200a1c24221ca86863)
@@ -57,8 +57,8 @@
             self.can_interface.register_receiving_publication_function(channel_id, self.msg_id_dd_send_blood_leak_emb_mode_response,
                                                                        self._handler_blood_leak_emb_mode_cmd_resp)
 
-        self.hd_blood_leak_status_timestamp = 0.0
-        self.hd_blood_leak_emb_mode_response_timestamp = 0.0
+        self.dd_blood_leak_status_timestamp = 0.0
+        self.dd_blood_leak_emb_mode_response_timestamp = 0.0
         self.blood_leak_status = self.NO_BLOOD_LEAK_DETECTED
         self.blood_leak_state = DDBloodLeakStates.BLOOD_LEAK_INIT_STATE.value
         self.blood_leak_emb_mode_cmds = dict()
@@ -106,10 +106,11 @@
         else:
             self.logger.debug("Invalid command!")
 
-    @publish(['msg_id_dd_blood_leak_data', 'hd_blood_leak_status_timestamp', 'blood_leak_status', 'blood_leak_state',
+    @publish(['msg_id_dd_blood_leak_data', 'blood_leak_status', 'blood_leak_state',
               'blood_leak_error_persistent_ctr', 'blood_leak_serial_comm_state', 'blood_leak_intensity',
               'blood_leak_blood_detect', 'blood_leak_intensity_moving_average', 'blood_leak_time_since_last_zero_ms',
-              'blood_leak_in_range_drift_status', 'blood_leak_upper_range_drift_status'])
+              'blood_leak_in_range_drift_status', 'blood_leak_upper_range_drift_status',
+              'dd_blood_leak_status_timestamp',])
     def _handler_blood_leak_sync(self, message, timestamp=0.0):
         """
         Handles published blood leak status messages.  Blood leak status is captured
@@ -138,7 +139,7 @@
             message['message'][MsgFieldPositions.START_POS_FIELD_9:MsgFieldPositions.END_POS_FIELD_9]))[0]
         self.blood_leak_upper_range_drift_status = struct.unpack('i', bytearray(
             message['message'][MsgFieldPositions.START_POS_FIELD_10:MsgFieldPositions.END_POS_FIELD_10]))[0]
-        self.hd_blood_leak_status_timestamp = timestamp
+        self.dd_blood_leak_status_timestamp = timestamp
 
     def cmd_blood_leak_detector_override(self, detected: int, reset=NO_RESET):
         """
@@ -295,7 +296,8 @@
         else:
             self.logger.debug("Invalid command!")
 
-    @publish(['msg_id_dd_send_blood_leak_emb_mode_response', 'hd_blood_leak_emb_mode_response_timestamp', 'blood_leak_emb_mode_cmd_response'])
+    @publish(['msg_id_dd_send_blood_leak_emb_mode_response', 'blood_leak_emb_mode_cmd_response',
+              'dd_blood_leak_emb_mode_response_timestamp'])
     def _handler_blood_leak_emb_mode_cmd_resp(self, message, timestamp=0.0):
         """
         Handles published blood leak status messages.  Blood leak status is captured
@@ -317,7 +319,7 @@
             blood_leak_emb_mode_cmd_response += chr(char)
 
         self.blood_leak_emb_mode_cmds[EmbModeCommands(cmd).name] = blood_leak_emb_mode_cmd_response
-        self.hd_blood_leak_emb_mode_response_timestamp = timestamp
+        self.dd_blood_leak_emb_mode_response_timestamp = timestamp
 
     def cmd_blood_leak_emb_mode_info_cmds_override(self, cmd: int, value_to_override: int, reset=NO_RESET):
         """
Index: leahi_dialin/dd/modules/concentrate_pump.py
===================================================================
diff -u -r6fa8a72c463310fd943270135aebfcb10d7a1210 -rec8a2600b9e8cf6fe7e02c200a1c24221ca86863
--- leahi_dialin/dd/modules/concentrate_pump.py	(.../concentrate_pump.py)	(revision 6fa8a72c463310fd943270135aebfcb10d7a1210)
+++ leahi_dialin/dd/modules/concentrate_pump.py	(.../concentrate_pump.py)	(revision ec8a2600b9e8cf6fe7e02c200a1c24221ca86863)
@@ -85,7 +85,7 @@
 
         self.dd_concentrate_pump_timestamp = 0.0
 
-    @publish(["msg_id_dd_conc_pump_data", "dd_concentrate_pump_timestamp", "dd_concentrate_pumps"])
+    @publish(["msg_id_dd_conc_pump_data", "dd_concentrate_pumps", "dd_concentrate_pump_timestamp"])
     def _handler_concentrate_pumps_sync(self, message, timestamp=0.0):
         """
         Handles published concentrate pumps' data messages. Concentrate pumps' speed data are captured
Index: leahi_dialin/dd/modules/conductivity_sensors.py
===================================================================
diff -u -r6fa8a72c463310fd943270135aebfcb10d7a1210 -rec8a2600b9e8cf6fe7e02c200a1c24221ca86863
--- leahi_dialin/dd/modules/conductivity_sensors.py	(.../conductivity_sensors.py)	(revision 6fa8a72c463310fd943270135aebfcb10d7a1210)
+++ leahi_dialin/dd/modules/conductivity_sensors.py	(.../conductivity_sensors.py)	(revision ec8a2600b9e8cf6fe7e02c200a1c24221ca86863)
@@ -59,7 +59,7 @@
 
         self.dd_conductivity_timestamp = 0.0
 
-    @publish(["msg_id_dd_conductivity_data", "dd_conductivity_timestamp", "dd_conductivity"])
+    @publish(["msg_id_dd_conductivity_data", "dd_conductivity", "dd_conductivity_timestamp"])
     def _handler_conductivity_sensors_sync(self, message, timestamp=0.0):
         """
         Handles published DD conductivity sensor data messages. DD Conductivity sensor data are captured
Index: leahi_dialin/dd/modules/dd_test_configs.py
===================================================================
diff -u -r6fa8a72c463310fd943270135aebfcb10d7a1210 -rec8a2600b9e8cf6fe7e02c200a1c24221ca86863
--- leahi_dialin/dd/modules/dd_test_configs.py	(.../dd_test_configs.py)	(revision 6fa8a72c463310fd943270135aebfcb10d7a1210)
+++ leahi_dialin/dd/modules/dd_test_configs.py	(.../dd_test_configs.py)	(revision ec8a2600b9e8cf6fe7e02c200a1c24221ca86863)
@@ -145,7 +145,7 @@
             self.logger.debug("Timeout!!!!")
             return False
 
-    @publish(['msg_id_dd_send_test_config', 'dd_test_configs'])
+    @publish(['msg_id_dd_send_test_config', 'dd_test_configs', 'dd_test_configs_response_timestamp'])
     def _handler_dd_test_config_sync(self, message, timestamp=0.0):
         """
         Handles published test configuration status messages.
Index: leahi_dialin/dd/modules/dialysate_pump.py
===================================================================
diff -u -r6fa8a72c463310fd943270135aebfcb10d7a1210 -rec8a2600b9e8cf6fe7e02c200a1c24221ca86863
--- leahi_dialin/dd/modules/dialysate_pump.py	(.../dialysate_pump.py)	(revision 6fa8a72c463310fd943270135aebfcb10d7a1210)
+++ leahi_dialin/dd/modules/dialysate_pump.py	(.../dialysate_pump.py)	(revision ec8a2600b9e8cf6fe7e02c200a1c24221ca86863)
@@ -78,7 +78,7 @@
 
         self.dd_dialysate_pump_timestamp = 0
 
-    @publish(["msg_id_dd_dialysate_pumps_data", "dd_dialysate_pump_timestamp", "dd_dialysate_pumps"])
+    @publish(["msg_id_dd_dialysate_pumps_data", "dd_dialysate_pumps", "dd_dialysate_pump_timestamp",])
     def _handler_dialysate_pumps_sync(self, message, timestamp=0.0):
         """
         Handles published dialysate pumps' data messages. Dialysate pumps' speed data are captured
Index: leahi_dialin/dd/modules/gen_dialysate.py
===================================================================
diff -u -r6fa8a72c463310fd943270135aebfcb10d7a1210 -rec8a2600b9e8cf6fe7e02c200a1c24221ca86863
--- leahi_dialin/dd/modules/gen_dialysate.py	(.../gen_dialysate.py)	(revision 6fa8a72c463310fd943270135aebfcb10d7a1210)
+++ leahi_dialin/dd/modules/gen_dialysate.py	(.../gen_dialysate.py)	(revision ec8a2600b9e8cf6fe7e02c200a1c24221ca86863)
@@ -59,13 +59,13 @@
         self.dd_gen_dialysate_timestamp = 0
 
     @publish(["msg_id_dd_gen_dialysate_mode_data",
-              "dd_gen_dialysate_timestamp",
               "execution_state", "dialysate_delivery_in_progress",
               "d6_level",
               "d63_level", "d46_level",
               "d9_pressure",
               "d18_pressure", "d51_pressure",
-              "dialysate_good_to_deliver"])
+              "dialysate_good_to_deliver",
+              "dd_gen_dialysate_timestamp"])
     def _handler_gen_dialysate_sync(self, message, timestamp=0.0):
         """
         Handles published gen dialysate data messages.
Index: leahi_dialin/dd/modules/heaters.py
===================================================================
diff -u -r6fa8a72c463310fd943270135aebfcb10d7a1210 -rec8a2600b9e8cf6fe7e02c200a1c24221ca86863
--- leahi_dialin/dd/modules/heaters.py	(.../heaters.py)	(revision 6fa8a72c463310fd943270135aebfcb10d7a1210)
+++ leahi_dialin/dd/modules/heaters.py	(.../heaters.py)	(revision ec8a2600b9e8cf6fe7e02c200a1c24221ca86863)
@@ -83,7 +83,9 @@
             self.msg_id_dd_heaters_data = MsgIds.MSG_ID_DD_HEATERS_DATA.value
             self.can_interface.register_receiving_publication_function(channel_id, self.msg_id_dd_heaters_data, self._handler_heaters_sync)
 
-    @publish(["msg_id_dd_heaters_data", "dd_heaters_timestamp", "dd_heaters"])
+    @publish(["msg_id_dd_heaters_data", "dd_heaters",
+              "dbg1", "dbg2", "dbg3", "dbg4", "dbg5", "dbg6", "dbg7", "dbg8", "dbg9",
+              "dd_heaters_timestamp"])
     def _handler_heaters_sync(self, message, timestamp=0.0):
         """
         Handles published DD heaters message
@@ -131,7 +133,7 @@
         self.dbg9 = struct.unpack('f', bytearray(
             message['message'][MsgFieldPositions.START_POS_FIELD_19:MsgFieldPositions.END_POS_FIELD_19]))[0]
 
-        self.dg_heaters_timestamp = timestamp
+        self.dd_heaters_timestamp = timestamp
 
     def cmd_heaters_broadcast_interval_override(self, ms: int, reset: int = NO_RESET) -> int:
         """
Index: leahi_dialin/dd/modules/levels.py
===================================================================
diff -u -r6fa8a72c463310fd943270135aebfcb10d7a1210 -rec8a2600b9e8cf6fe7e02c200a1c24221ca86863
--- leahi_dialin/dd/modules/levels.py	(.../levels.py)	(revision 6fa8a72c463310fd943270135aebfcb10d7a1210)
+++ leahi_dialin/dd/modules/levels.py	(.../levels.py)	(revision ec8a2600b9e8cf6fe7e02c200a1c24221ca86863)
@@ -58,7 +58,7 @@
         self.dd_levels_timestamp = 0
 
 
-    @publish(["msg_id_dd_level_data", "dd_levels_timestamp", "dd_level_sensor"])
+    @publish(["msg_id_dd_level_data", "dd_level_sensor", "dd_levels_timestamp"])
     def _handler_levels_sync(self, message, timestamp=0.0):
         """
         Handles published levels message
Index: leahi_dialin/dd/modules/piston_pump.py
===================================================================
diff -u -r6fa8a72c463310fd943270135aebfcb10d7a1210 -rec8a2600b9e8cf6fe7e02c200a1c24221ca86863
--- leahi_dialin/dd/modules/piston_pump.py	(.../piston_pump.py)	(revision 6fa8a72c463310fd943270135aebfcb10d7a1210)
+++ leahi_dialin/dd/modules/piston_pump.py	(.../piston_pump.py)	(revision ec8a2600b9e8cf6fe7e02c200a1c24221ca86863)
@@ -70,7 +70,7 @@
         self.dd_piston_pump_timestamp = 0.0
 
 
-    @publish(["msg_id_dd_piston_pump_control_data", "dd_piston_pump_timestamp", "dd_piston_pumps"])
+    @publish(["msg_id_dd_piston_pump_control_data", "dd_piston_pumps", "dd_piston_pump_timestamp"])
     def _handler_piston_pumps_sync(self, message, timestamp=0.0):
         """
         Handles published piston pumps' data messages. Piston pumps' data are captured
Index: leahi_dialin/dd/modules/pre_gen_dialysate.py
===================================================================
diff -u -r6fa8a72c463310fd943270135aebfcb10d7a1210 -rec8a2600b9e8cf6fe7e02c200a1c24221ca86863
--- leahi_dialin/dd/modules/pre_gen_dialysate.py	(.../pre_gen_dialysate.py)	(revision 6fa8a72c463310fd943270135aebfcb10d7a1210)
+++ leahi_dialin/dd/modules/pre_gen_dialysate.py	(.../pre_gen_dialysate.py)	(revision ec8a2600b9e8cf6fe7e02c200a1c24221ca86863)
@@ -76,9 +76,10 @@
 
         self.pre_gen_state_timestamp = timestamp
 
-    @publish(["msg_id_dd_pre_gen_dialysate_request_data", "pre_gen_request_timestamp",
+    @publish(["msg_id_dd_pre_gen_dialysate_request_data",
               "pre_gen_start", "pre_gen_dial_rate", "pre_gen_dial_temp",
-              "pre_gen_acid", "pre_gen_bicarb"])
+              "pre_gen_acid", "pre_gen_bicarb",
+              "pre_gen_request_timestamp"])
     def _handler_pre_gen_request_sync(self, message, timestamp=0.0):
         """
         Handles published pre gen dialysate request messages.
Index: leahi_dialin/dd/modules/pressure_sensors.py
===================================================================
diff -u -r6fa8a72c463310fd943270135aebfcb10d7a1210 -rec8a2600b9e8cf6fe7e02c200a1c24221ca86863
--- leahi_dialin/dd/modules/pressure_sensors.py	(.../pressure_sensors.py)	(revision 6fa8a72c463310fd943270135aebfcb10d7a1210)
+++ leahi_dialin/dd/modules/pressure_sensors.py	(.../pressure_sensors.py)	(revision ec8a2600b9e8cf6fe7e02c200a1c24221ca86863)
@@ -81,7 +81,7 @@
 
         self.dd_pressures_timestamp = 0
 
-    @publish(["msg_id_dd_pressures_data", "dd_pressures_timestamp", "dd_pressures"])
+    @publish(["msg_id_dd_pressures_data", "dd_pressures", "dd_pressures_timestamp"])
     def _handler_pressures_sync(self, message,timestamp=0.0):
         """
         Handles published DD pressure data messages. DD Pressure data are captured
Index: leahi_dialin/dd/modules/spent_chamber_fill.py
===================================================================
diff -u -r6fa8a72c463310fd943270135aebfcb10d7a1210 -rec8a2600b9e8cf6fe7e02c200a1c24221ca86863
--- leahi_dialin/dd/modules/spent_chamber_fill.py	(.../spent_chamber_fill.py)	(revision 6fa8a72c463310fd943270135aebfcb10d7a1210)
+++ leahi_dialin/dd/modules/spent_chamber_fill.py	(.../spent_chamber_fill.py)	(revision ec8a2600b9e8cf6fe7e02c200a1c24221ca86863)
@@ -51,9 +51,9 @@
         self.dd_spent_chamber_timestamp = 0
 
     @publish(["msg_id_dd_spent_chamber_fill_data",
-              "dd_spent_chamber_timestamp",
               "execution_state", "switching_period",
-              "total_spent_chamber_fill_counter"])
+              "total_spent_chamber_fill_counter",
+              "dd_spent_chamber_timestamp",])
     def _handler_spent_chamber_fill_sync(self, message, timestamp=0.0):
         """
         Handles published spent chamber fill data messages.
Index: leahi_dialin/dd/modules/temperature_sensors.py
===================================================================
diff -u -r6fa8a72c463310fd943270135aebfcb10d7a1210 -rec8a2600b9e8cf6fe7e02c200a1c24221ca86863
--- leahi_dialin/dd/modules/temperature_sensors.py	(.../temperature_sensors.py)	(revision 6fa8a72c463310fd943270135aebfcb10d7a1210)
+++ leahi_dialin/dd/modules/temperature_sensors.py	(.../temperature_sensors.py)	(revision ec8a2600b9e8cf6fe7e02c200a1c24221ca86863)
@@ -60,7 +60,7 @@
             self.can_interface.register_receiving_publication_function(channel_id, self.msg_id_dd_temperature_data,
                                                                        self._handler_temperature_sensors_sync)
 
-    @publish(["msg_id_dd_temperature_data", "dd_temperatures_timestamp", "dd_temperatures"])
+    @publish(["msg_id_dd_temperature_data", "dd_temperatures", "dd_temperatures_timestamp"])
     def _handler_temperature_sensors_sync(self, message,timestamp=0.0):
         """
         Handles published DD temperature sensors message
Index: leahi_dialin/dd/modules/ultrafiltration.py
===================================================================
diff -u -r6fa8a72c463310fd943270135aebfcb10d7a1210 -rec8a2600b9e8cf6fe7e02c200a1c24221ca86863
--- leahi_dialin/dd/modules/ultrafiltration.py	(.../ultrafiltration.py)	(revision 6fa8a72c463310fd943270135aebfcb10d7a1210)
+++ leahi_dialin/dd/modules/ultrafiltration.py	(.../ultrafiltration.py)	(revision ec8a2600b9e8cf6fe7e02c200a1c24221ca86863)
@@ -53,7 +53,9 @@
         self.is_uf_requested = 0
         self.uf_timestamp = 0.0
 
-    @publish(["msg_id_dd_uf_data", "uf_timestamp", "uf_exec_state","uf_rate","compensated_uf_rate","is_uf_requested"])
+    @publish(["msg_id_dd_uf_data", "uf_exec_state","uf_rate",
+              "compensated_uf_rate", "is_uf_requested",
+              "uf_timestamp"])
     def _handler_ultrafiltration_sync(self, message, timestamp=0.0):
         """
         Handles published ultrafiltration data messages.
Index: leahi_dialin/dd/modules/valves.py
===================================================================
diff -u -r6fa8a72c463310fd943270135aebfcb10d7a1210 -rec8a2600b9e8cf6fe7e02c200a1c24221ca86863
--- leahi_dialin/dd/modules/valves.py	(.../valves.py)	(revision 6fa8a72c463310fd943270135aebfcb10d7a1210)
+++ leahi_dialin/dd/modules/valves.py	(.../valves.py)	(revision ec8a2600b9e8cf6fe7e02c200a1c24221ca86863)
@@ -172,7 +172,6 @@
             return DEENERGIZED
 
     @publish(["msg_id_dd_valves_states_data",
-        "dd_valves_states_timestamp",
         "valve_states_all",
         "d14_valv",
         "d52_valv",
@@ -202,7 +201,8 @@
         "d71_valv",
         "d70_valv",
         "d72_valv",
-        "valve_states_enum"
+        "valve_states_enum",
+        "dd_valves_states_timestamp"
     ])
     def _handler_valves_sync(self, message, timestamp=0.0):
         """
Index: leahi_dialin/fp/modules/alarms.py
===================================================================
diff -u -r6fa8a72c463310fd943270135aebfcb10d7a1210 -rec8a2600b9e8cf6fe7e02c200a1c24221ca86863
--- leahi_dialin/fp/modules/alarms.py	(.../alarms.py)	(revision 6fa8a72c463310fd943270135aebfcb10d7a1210)
+++ leahi_dialin/fp/modules/alarms.py	(.../alarms.py)	(revision ec8a2600b9e8cf6fe7e02c200a1c24221ca86863)
@@ -82,8 +82,9 @@
 
             self.alarm_data_type[event_data_type] = struct_unpack_type
 
-    @publish(["msg_id_fp_alarm_triggered", "fp_alarm_triggered_timestamp", "alarm_states", "alarm_conditions",
-              "alarm_data", "alarm_priorities", "alarm_ranks", "alarm_clear_top_only_flags"])
+    @publish(["msg_id_fp_alarm_triggered", "alarm_states", "alarm_conditions",
+              "alarm_data", "alarm_priorities", "alarm_ranks", "alarm_clear_top_only_flags",
+              "fp_alarm_triggered_timestamp"])
     def _handler_alarm_triggered(self, message, timestamp = 0.0):
         """
         Handles published FP alarm activation messages.
Index: leahi_dialin/fp/modules/boost_pump.py
===================================================================
diff -u -r6fa8a72c463310fd943270135aebfcb10d7a1210 -rec8a2600b9e8cf6fe7e02c200a1c24221ca86863
--- leahi_dialin/fp/modules/boost_pump.py	(.../boost_pump.py)	(revision 6fa8a72c463310fd943270135aebfcb10d7a1210)
+++ leahi_dialin/fp/modules/boost_pump.py	(.../boost_pump.py)	(revision ec8a2600b9e8cf6fe7e02c200a1c24221ca86863)
@@ -60,7 +60,7 @@
             }
         }
 
-    @publish(["msg_id_fp_boost_pump_data", "boost_pump_timestamp", "boost_pump" ])
+    @publish(["msg_id_fp_boost_pump_data", "boost_pump", "boost_pump_timestamp"])
     def _handler_pump_sync(self, message, timestamp=0.0):
         """
         Handles published FP ro pump data messages.  FP ro pump data is captured
Index: leahi_dialin/fp/modules/conductivity_sensors.py
===================================================================
diff -u -r6fa8a72c463310fd943270135aebfcb10d7a1210 -rec8a2600b9e8cf6fe7e02c200a1c24221ca86863
--- leahi_dialin/fp/modules/conductivity_sensors.py	(.../conductivity_sensors.py)	(revision 6fa8a72c463310fd943270135aebfcb10d7a1210)
+++ leahi_dialin/fp/modules/conductivity_sensors.py	(.../conductivity_sensors.py)	(revision ec8a2600b9e8cf6fe7e02c200a1c24221ca86863)
@@ -53,7 +53,7 @@
             FPConductivitySensorsEnum.P18_COND.name: 0.0
         }
 
-    @publish(["msg_id_fp_conductivity_data", "fp_conductivity_timestamp", "fp_conductivity"])
+    @publish(["msg_id_fp_conductivity_data", "fp_conductivity", "fp_conductivity_timestamp"])
     def _handler_conductivity_sensors_sync(self, message, timestamp=0.0):
         """
         Handles published FP conductivity sensor data messages.  Conductivity sensor data are captured
Index: leahi_dialin/fp/modules/flow_sensors.py
===================================================================
diff -u -r6fa8a72c463310fd943270135aebfcb10d7a1210 -rec8a2600b9e8cf6fe7e02c200a1c24221ca86863
--- leahi_dialin/fp/modules/flow_sensors.py	(.../flow_sensors.py)	(revision 6fa8a72c463310fd943270135aebfcb10d7a1210)
+++ leahi_dialin/fp/modules/flow_sensors.py	(.../flow_sensors.py)	(revision ec8a2600b9e8cf6fe7e02c200a1c24221ca86863)
@@ -61,7 +61,7 @@
 
         self.fp_flow_timestamp = 0
 
-    @publish(["msg_id_fp_flow_data", "fp_flows_timestamp", "fp_flows"])
+    @publish(["msg_id_fp_flow_data", "fp_flows", "fp_flows_timestamp"])
     def _handler_flow_sensor_sync(self, message, timestamp=0.0):
         """
         Handles published flow sensor message
Index: leahi_dialin/fp/modules/fp_test_configs.py
===================================================================
diff -u -r6fa8a72c463310fd943270135aebfcb10d7a1210 -rec8a2600b9e8cf6fe7e02c200a1c24221ca86863
--- leahi_dialin/fp/modules/fp_test_configs.py	(.../fp_test_configs.py)	(revision 6fa8a72c463310fd943270135aebfcb10d7a1210)
+++ leahi_dialin/fp/modules/fp_test_configs.py	(.../fp_test_configs.py)	(revision ec8a2600b9e8cf6fe7e02c200a1c24221ca86863)
@@ -146,7 +146,7 @@
             self.logger.debug("Timeout!!!!")
             return False
 
-    @publish(['msg_id_fp_send_test_config', 'fp_test_configs'])
+    @publish(['msg_id_fp_send_test_config', 'fp_test_configs', 'fp_test_configs_response_timestamp'])
     def _handler_fp_test_config_sync(self, message, timestamp=0.0):
         """
         Handles published test configuration status messages.
Index: leahi_dialin/fp/modules/levels.py
===================================================================
diff -u -r6fa8a72c463310fd943270135aebfcb10d7a1210 -rec8a2600b9e8cf6fe7e02c200a1c24221ca86863
--- leahi_dialin/fp/modules/levels.py	(.../levels.py)	(revision 6fa8a72c463310fd943270135aebfcb10d7a1210)
+++ leahi_dialin/fp/modules/levels.py	(.../levels.py)	(revision ec8a2600b9e8cf6fe7e02c200a1c24221ca86863)
@@ -54,8 +54,9 @@
         }
         self.fp_levels_timestamp = 0
 
-    @publish(["msg_id_fp_level_data", "fp_levels_timestamp",
-                "fp_levels",])
+    @publish(["msg_id_fp_level_data",
+              "fp_levels",
+              "fp_levels_timestamp"])
     def _handler_levels_sync(self, message, timestamp=0.0):
         """
         Handles published levels message
Index: leahi_dialin/fp/modules/permeate_tank.py
===================================================================
diff -u -r6fa8a72c463310fd943270135aebfcb10d7a1210 -rec8a2600b9e8cf6fe7e02c200a1c24221ca86863
--- leahi_dialin/fp/modules/permeate_tank.py	(.../permeate_tank.py)	(revision 6fa8a72c463310fd943270135aebfcb10d7a1210)
+++ leahi_dialin/fp/modules/permeate_tank.py	(.../permeate_tank.py)	(revision ec8a2600b9e8cf6fe7e02c200a1c24221ca86863)
@@ -50,7 +50,7 @@
         self.permeate_tank_state = 0
         self.permeate_tank_timestamp = 0.0
 
-    @publish(["msg_id_fp_permeate_tank_data", "permeate_tank_state", "permeate_tank_timestamp", ])
+    @publish(["msg_id_fp_permeate_tank_data", "permeate_tank_state", "permeate_tank_timestamp"])
     def _handler_permeate_tank_sync(self, message, timestamp=0.0):
         """
         Handles permeate tank data messages.
Index: leahi_dialin/fp/modules/pressure_sensors.py
===================================================================
diff -u -r6fa8a72c463310fd943270135aebfcb10d7a1210 -rec8a2600b9e8cf6fe7e02c200a1c24221ca86863
--- leahi_dialin/fp/modules/pressure_sensors.py	(.../pressure_sensors.py)	(revision 6fa8a72c463310fd943270135aebfcb10d7a1210)
+++ leahi_dialin/fp/modules/pressure_sensors.py	(.../pressure_sensors.py)	(revision ec8a2600b9e8cf6fe7e02c200a1c24221ca86863)
@@ -60,7 +60,7 @@
 
         self.fp_pressure_timestamp = 0.0
 
-    @publish(["msg_id_fp_pressures_data", "fp_pressure_timestamp", "fp_pressures"])
+    @publish(["msg_id_fp_pressures_data", "fp_pressures", "fp_pressure_timestamp"])
     def _handler_pressure_sync(self, message, timestamp=0.0):
         """
         Handles published FP pressure sensor data messages.  Pressure data are captured
Index: leahi_dialin/fp/modules/ro_pump.py
===================================================================
diff -u -r6fa8a72c463310fd943270135aebfcb10d7a1210 -rec8a2600b9e8cf6fe7e02c200a1c24221ca86863
--- leahi_dialin/fp/modules/ro_pump.py	(.../ro_pump.py)	(revision 6fa8a72c463310fd943270135aebfcb10d7a1210)
+++ leahi_dialin/fp/modules/ro_pump.py	(.../ro_pump.py)	(revision ec8a2600b9e8cf6fe7e02c200a1c24221ca86863)
@@ -62,7 +62,7 @@
 
         self.ro_pump_timestamp = 0.0
 
-    @publish(["msg_id_fp_ro_pump_data", "ro_pump_timestamp", "ro_pump" ])
+    @publish(["msg_id_fp_ro_pump_data", "ro_pump", "ro_pump_timestamp" ])
     def _handler_pump_sync(self, message, timestamp=0.0):
         """
         Handles published FP ro pump data messages.  FP ro pump data is captured
Index: leahi_dialin/fp/modules/temperatures.py
===================================================================
diff -u -r6fa8a72c463310fd943270135aebfcb10d7a1210 -rec8a2600b9e8cf6fe7e02c200a1c24221ca86863
--- leahi_dialin/fp/modules/temperatures.py	(.../temperatures.py)	(revision 6fa8a72c463310fd943270135aebfcb10d7a1210)
+++ leahi_dialin/fp/modules/temperatures.py	(.../temperatures.py)	(revision ec8a2600b9e8cf6fe7e02c200a1c24221ca86863)
@@ -57,7 +57,7 @@
                             FPTemperaturesNames.P16_TEMP.name: 0.0,
                                 }
 
-    @publish(["msg_id_fp_temperature_data", "fp_temperatures_timestamp", "fp_temperatures"])
+    @publish(["msg_id_fp_temperature_data", "fp_temperatures", "fp_temperatures_timestamp"])
     def _handler_temperature_sensors_sync(self, message,timestamp=0.0):
         """
         Handles published FP temperature sensors message
Index: leahi_dialin/fp/modules/valves.py
===================================================================
diff -u -r6fa8a72c463310fd943270135aebfcb10d7a1210 -rec8a2600b9e8cf6fe7e02c200a1c24221ca86863
--- leahi_dialin/fp/modules/valves.py	(.../valves.py)	(revision 6fa8a72c463310fd943270135aebfcb10d7a1210)
+++ leahi_dialin/fp/modules/valves.py	(.../valves.py)	(revision ec8a2600b9e8cf6fe7e02c200a1c24221ca86863)
@@ -128,7 +128,6 @@
 
     @publish([
         "msg_id_fp_valves_states_data",
-        "fp_valves_states_timestamp",
         "valve_states_all",
         "m4_valv",
         "m7_valv",
@@ -140,7 +139,8 @@
         "p39_valv",
         "p20_valv",
         "p43_valv",
-        "valve_states_enum"
+        "valve_states_enum",
+        "fp_valves_states_timestamp"
     ])
     def _handler_valves_sync(self, message, timestamp=0.0):
         """
Index: leahi_dialin/td/modules/air_pump.py
===================================================================
diff -u -r6fa8a72c463310fd943270135aebfcb10d7a1210 -rec8a2600b9e8cf6fe7e02c200a1c24221ca86863
--- leahi_dialin/td/modules/air_pump.py	(.../air_pump.py)	(revision 6fa8a72c463310fd943270135aebfcb10d7a1210)
+++ leahi_dialin/td/modules/air_pump.py	(.../air_pump.py)	(revision ec8a2600b9e8cf6fe7e02c200a1c24221ca86863)
@@ -57,7 +57,7 @@
 
         self.td_air_pump_timestamp = 0.0
 
-    @publish(["msg_id_td_air_pump_data", "td_air_pump_timestamp", "td_air_pump"])
+    @publish(["msg_id_td_air_pump_data", "td_air_pump", "td_air_pump_timestamp"])
     def _handler_air_pump_sync(self, message, timestamp=0.0):
         """
         Handles published air pump data messages.
Index: leahi_dialin/td/modules/air_trap.py
===================================================================
diff -u -r6fa8a72c463310fd943270135aebfcb10d7a1210 -rec8a2600b9e8cf6fe7e02c200a1c24221ca86863
--- leahi_dialin/td/modules/air_trap.py	(.../air_trap.py)	(revision 6fa8a72c463310fd943270135aebfcb10d7a1210)
+++ leahi_dialin/td/modules/air_trap.py	(.../air_trap.py)	(revision ec8a2600b9e8cf6fe7e02c200a1c24221ca86863)
@@ -70,10 +70,10 @@
         self.td_air_trap_timestamp = 0.0
 
     @publish(["msg_id_td_air_trap_data",
-              "td_air_trap_timestamp",
               "air_trap_level_sensors",
               "air_trap_valve_states",
-              "air_control"])
+              "air_control",
+              "td_air_trap_timestamp"])
     def _handler_air_trap_sync(self, message, timestamp=0.0):
         """
         Handles published air trap data messages.  Air trap data are captured
Index: leahi_dialin/td/modules/alarms.py
===================================================================
diff -u -r6fa8a72c463310fd943270135aebfcb10d7a1210 -rec8a2600b9e8cf6fe7e02c200a1c24221ca86863
--- leahi_dialin/td/modules/alarms.py	(.../alarms.py)	(revision 6fa8a72c463310fd943270135aebfcb10d7a1210)
+++ leahi_dialin/td/modules/alarms.py	(.../alarms.py)	(revision ec8a2600b9e8cf6fe7e02c200a1c24221ca86863)
@@ -161,7 +161,9 @@
         for x in range(500):
             self.alarm_states[x] = False
 
-    @publish(["msg_id_td_alarm_status_data", "td_alarm_status_timestamp", "alarms_priority_state", "alarm_top", "alarms_silence_expires_in", "alarms_escalates_in", "alarms_flags"])
+    @publish(["msg_id_td_alarm_status_data", "alarms_priority_state", "alarm_top",
+              "alarms_silence_expires_in", "alarms_escalates_in", "alarms_flags",
+              "td_alarm_status_timestamp"])
     def _handler_alarms_status_sync(self, message, timestamp=0.0):
         """
         Handles published alarms status messages.  alarms status data are captured
@@ -178,8 +180,9 @@
 
         self.td_alarm_status_timestamp = timestamp
 
-    @publish(["msg_id_td_alarm_triggered", "td_alarm_triggered_timestamp", "alarm_states", "alarm_conditions",
-              "alarm_data", "alarm_priorities", "alarm_ranks", "alarm_clear_top_only_flags"])
+    @publish(["msg_id_td_alarm_triggered", "alarm_states", "alarm_conditions",
+              "alarm_data", "alarm_priorities", "alarm_ranks", "alarm_clear_top_only_flags",
+              "td_alarm_triggered_timestamp"])
     def _handler_alarm_trigger(self, message, timestamp=0.0):
         """
         Handles published TD alarm activation messages.
@@ -218,7 +221,7 @@
         self.last_alarm_data_2 = data_2[0]
         self.td_alarm_triggered_timestamp = timestamp
 
-    @publish(["msg_id_td_alarm_cleared", "TD_alarm_cleared_timestamp", "alarm_states", "alarm_conditions"])
+    @publish(["msg_id_td_alarm_cleared", "alarm_states", "alarm_conditions", "TD_alarm_cleared_timestamp"])
     def _handler_alarm_clear(self, message, timestamp=0.0):
         """
         Handles published TD alarm clear messages.
@@ -231,7 +234,7 @@
         self.alarm_conditions[alarm_id[0]] = False
         self.td_alarm_cleared_timestamp = timestamp
 
-    @publish(["msg_id_td_alarm_condition_cleared", "td_alarm_clr_condition_timestamp", "alarm_conditions", "alarm_conditions"])
+    @publish(["msg_id_td_alarm_condition_cleared", "alarm_conditions", "alarm_conditions", "td_alarm_clr_condition_timestamp"])
     def _handler_alarm_condition_clear(self, message, timestamp=0.0):
         """
         Handles published TD alarm clear alarm condition messages.
@@ -243,9 +246,10 @@
         self.alarm_conditions[alarm_id[0]] = False
         self.td_alarm_clr_condition_timestamp = timestamp
 
-    @publish(["msg_id_td_alarm_info_data", "td_alarm_information_timestamp", "alarm_volume", "alarm_audio_curr_hg",
+    @publish(["msg_id_td_alarm_info_data", "alarm_volume", "alarm_audio_curr_hg",
               "alarm_audio_curr_lg", "alarm_backup_audio_curr", "safety_shutdown_active", "ac_power_lost",
-              "alarm_table_button_blockers", "alarm_state_button_blockers"])
+              "alarm_table_button_blockers", "alarm_state_button_blockers",
+              "td_alarm_information_timestamp"])
     def _handler_alarm_information_sync(self, message, timestamp=0.0):
         """
         Handles published TD alarm information broadcast messages.
Index: leahi_dialin/td/modules/blood_flow.py
===================================================================
diff -u -r6fa8a72c463310fd943270135aebfcb10d7a1210 -rec8a2600b9e8cf6fe7e02c200a1c24221ca86863
--- leahi_dialin/td/modules/blood_flow.py	(.../blood_flow.py)	(revision 6fa8a72c463310fd943270135aebfcb10d7a1210)
+++ leahi_dialin/td/modules/blood_flow.py	(.../blood_flow.py)	(revision ec8a2600b9e8cf6fe7e02c200a1c24221ca86863)
@@ -57,7 +57,7 @@
             TDBloodFlowMotorAttributes.ROTOR_HALL_STATE.name: 0
         }
 
-    @publish(["msg_id_td_blood_pump_data", "td_blood_flow_timestamp", "h4_motor"])
+    @publish(["msg_id_td_blood_pump_data", "h4_motor", "td_blood_flow_timestamp"])
     def _handler_blood_flow_sync(self, message, timestamp=0.0):
         """
         Handles published blood flow data messages.  Blood flow data are captured
Index: leahi_dialin/td/modules/bubble_detector.py
===================================================================
diff -u -r6fa8a72c463310fd943270135aebfcb10d7a1210 -rec8a2600b9e8cf6fe7e02c200a1c24221ca86863
--- leahi_dialin/td/modules/bubble_detector.py	(.../bubble_detector.py)	(revision 6fa8a72c463310fd943270135aebfcb10d7a1210)
+++ leahi_dialin/td/modules/bubble_detector.py	(.../bubble_detector.py)	(revision ec8a2600b9e8cf6fe7e02c200a1c24221ca86863)
@@ -69,7 +69,7 @@
             }
         }
 
-    @publish(["msg_id_td_bubbles_data", "td_air_bubbles_timestamp", "h18_bubble_detector"])
+    @publish(["msg_id_td_bubbles_data", "h18_bubble_detector", "td_air_bubbles_timestamp"])
     def _handler_air_bubbles_data_sync(self, message, timestamp=0.0):
         """
         Handles published air bubbles data messages. Air bubble status and state are captured.
Index: leahi_dialin/td/modules/buttons.py
===================================================================
diff -u -r63d26c9e41e02f8a4c0ad59dab9cc6575e501357 -rec8a2600b9e8cf6fe7e02c200a1c24221ca86863
--- leahi_dialin/td/modules/buttons.py	(.../buttons.py)	(revision 63d26c9e41e02f8a4c0ad59dab9cc6575e501357)
+++ leahi_dialin/td/modules/buttons.py	(.../buttons.py)	(revision ec8a2600b9e8cf6fe7e02c200a1c24221ca86863)
@@ -56,7 +56,7 @@
 
         self.poweroff_timeout_expired = False
 
-    @publish(['msg_id_off_button_press_request', 'td_power_off_timestamp', "poweroff_timeout_expired"])
+    @publish(['msg_id_off_button_press_request', 'poweroff_timeout_expired', 'td_power_off_timestamp'])
     def _handler_poweroff_timeout_occurred(self, message, timestamp=0.0):
         """
         Poweroff timeout occurred handler
Index: leahi_dialin/td/modules/ejector.py
===================================================================
diff -u -r6fa8a72c463310fd943270135aebfcb10d7a1210 -rec8a2600b9e8cf6fe7e02c200a1c24221ca86863
--- leahi_dialin/td/modules/ejector.py	(.../ejector.py)	(revision 6fa8a72c463310fd943270135aebfcb10d7a1210)
+++ leahi_dialin/td/modules/ejector.py	(.../ejector.py)	(revision ec8a2600b9e8cf6fe7e02c200a1c24221ca86863)
@@ -56,7 +56,7 @@
         }
         self.td_ejector_timestamp = 0
 
-    @publish(["msg_id_td_ejector_data", "td_ejector_timestamp", "h5_motor"])
+    @publish(["msg_id_td_ejector_data", "h5_motor", "td_ejector_timestamp"])
     def _handler_ejector_sync(self, message, timestamp=0.0):
         """
         Handles published ejector data messages.
Index: leahi_dialin/td/modules/pressure_sensors.py
===================================================================
diff -u -r6fa8a72c463310fd943270135aebfcb10d7a1210 -rec8a2600b9e8cf6fe7e02c200a1c24221ca86863
--- leahi_dialin/td/modules/pressure_sensors.py	(.../pressure_sensors.py)	(revision 6fa8a72c463310fd943270135aebfcb10d7a1210)
+++ leahi_dialin/td/modules/pressure_sensors.py	(.../pressure_sensors.py)	(revision ec8a2600b9e8cf6fe7e02c200a1c24221ca86863)
@@ -67,12 +67,12 @@
 
     @publish([
         "msg_id_td_pressure_data",
-        "td_pressure_timestamp",
         "td_pressure_sensors",
         "pressure_limits_state",
         "tmp_pressure",
         "tmp_min_limit",
         "tmp_max_limit",
+        "td_pressure_timestamp"
     ])
     def _handler_pressure_sync(self, message, timestamp=0.0):
         """
Index: leahi_dialin/td/modules/switches.py
===================================================================
diff -u -r6fa8a72c463310fd943270135aebfcb10d7a1210 -rec8a2600b9e8cf6fe7e02c200a1c24221ca86863
--- leahi_dialin/td/modules/switches.py	(.../switches.py)	(revision 6fa8a72c463310fd943270135aebfcb10d7a1210)
+++ leahi_dialin/td/modules/switches.py	(.../switches.py)	(revision ec8a2600b9e8cf6fe7e02c200a1c24221ca86863)
@@ -51,7 +51,7 @@
         self.td_switches_status = {TDSwitchesNames.H9_FRONT_DOOR.name: TDSwitchStatus.CLOSED.value}
         self.td_switches_timestamp = 0.0
 
-    @publish(["msg_id_td_switches_data", "td_switches_timestamp", "td_switches_status"])
+    @publish(["msg_id_td_switches_data", "td_switches_status", "td_switches_timestamp"])
     def _handler_switches_sync(self, message, timestamp=0.0):
         """
         Handles published TD switches data messages. Switches data are captured for reference.
Index: leahi_dialin/td/modules/td_test_configs.py
===================================================================
diff -u -r6fa8a72c463310fd943270135aebfcb10d7a1210 -rec8a2600b9e8cf6fe7e02c200a1c24221ca86863
--- leahi_dialin/td/modules/td_test_configs.py	(.../td_test_configs.py)	(revision 6fa8a72c463310fd943270135aebfcb10d7a1210)
+++ leahi_dialin/td/modules/td_test_configs.py	(.../td_test_configs.py)	(revision ec8a2600b9e8cf6fe7e02c200a1c24221ca86863)
@@ -146,7 +146,7 @@
             self.logger.debug("Timeout!!!!")
             return False
 
-    @publish(['msg_id_td_send_test_config', 'td_test_configs'])
+    @publish(['msg_id_td_send_test_config', 'td_test_configs', 'td_test_configs_response_timestamp'])
     def _handler_td_test_config_sync(self, message, timestamp=0.0):
         """
         Handles published test configuration status messages.
Index: leahi_dialin/td/modules/treatment.py
===================================================================
diff -u -r6fa8a72c463310fd943270135aebfcb10d7a1210 -rec8a2600b9e8cf6fe7e02c200a1c24221ca86863
--- leahi_dialin/td/modules/treatment.py	(.../treatment.py)	(revision 6fa8a72c463310fd943270135aebfcb10d7a1210)
+++ leahi_dialin/td/modules/treatment.py	(.../treatment.py)	(revision ec8a2600b9e8cf6fe7e02c200a1c24221ca86863)
@@ -242,7 +242,7 @@
               "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"])
+              "dialysate_temp", "hep_dispense_rate", "hep_bolus_vol", "uf_vol","tx_param_req_timestamp"])
     def _handler_resp_treatment_parameters_sync(self, message, timestamp=0.0):
         """
         Handles published treatment parameter response data messages.
Index: leahi_dialin/td/modules/valves.py
===================================================================
diff -u -r6fa8a72c463310fd943270135aebfcb10d7a1210 -rec8a2600b9e8cf6fe7e02c200a1c24221ca86863
--- leahi_dialin/td/modules/valves.py	(.../valves.py)	(revision 6fa8a72c463310fd943270135aebfcb10d7a1210)
+++ leahi_dialin/td/modules/valves.py	(.../valves.py)	(revision ec8a2600b9e8cf6fe7e02c200a1c24221ca86863)
@@ -73,7 +73,7 @@
         self.valves_status = {TDValvesEnum.H1_VALV.name: {},
                               TDValvesEnum.H19_VALV.name: {}}
 
-    @publish(["msg_id_td_valves_data", "td_valves_timestamp","valves_status"])
+    @publish(["msg_id_td_valves_data", "valves_status", "td_valves_timestamp"])
     def _handler_valves_sync(self, message: dict, timestamp=0.0) -> None:
         """
         Handles published valves data messages.  TD valves data are captured
Index: leahi_dialin/td/modules/voltages.py
===================================================================
diff -u -r6fa8a72c463310fd943270135aebfcb10d7a1210 -rec8a2600b9e8cf6fe7e02c200a1c24221ca86863
--- leahi_dialin/td/modules/voltages.py	(.../voltages.py)	(revision 6fa8a72c463310fd943270135aebfcb10d7a1210)
+++ leahi_dialin/td/modules/voltages.py	(.../voltages.py)	(revision ec8a2600b9e8cf6fe7e02c200a1c24221ca86863)
@@ -49,7 +49,7 @@
         self.td_voltages_timestamp = 0.0
 
 
-    @publish(["msg_id_td_voltages_data", "td_voltages_timestamp","monitored_voltages"])
+    @publish(["msg_id_td_voltages_data", "monitored_voltages", "td_voltages_timestamp"])
     def _handler_monitored_voltages_sync(self, message, timestamp=0.0):
         """
         Handles published TD monitored voltages data messages.  Voltage data are captured