Index: leahi_dialin/dd/modules/piston_pump.py
===================================================================
diff -u -ra286de55ce0a6fd3388ddcd68d6c9aecd00a2500 -r9b804a28f38e083b5c4b0cd163cd82098511a55c
--- leahi_dialin/dd/modules/piston_pump.py	(.../piston_pump.py)	(revision a286de55ce0a6fd3388ddcd68d6c9aecd00a2500)
+++ leahi_dialin/dd/modules/piston_pump.py	(.../piston_pump.py)	(revision 9b804a28f38e083b5c4b0cd163cd82098511a55c)
@@ -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/pressure_sensors.py
===================================================================
diff -u -r3af9042c602ef6e8df53552bcb42c88ac79b5ae7 -r9b804a28f38e083b5c4b0cd163cd82098511a55c
--- leahi_dialin/dd/modules/pressure_sensors.py	(.../pressure_sensors.py)	(revision 3af9042c602ef6e8df53552bcb42c88ac79b5ae7)
+++ leahi_dialin/dd/modules/pressure_sensors.py	(.../pressure_sensors.py)	(revision 9b804a28f38e083b5c4b0cd163cd82098511a55c)
@@ -58,7 +58,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/temperature_sensors.py
===================================================================
diff -u -ra0e7107b30e4d6fc631784e249f59038aefeb04f -r9b804a28f38e083b5c4b0cd163cd82098511a55c
--- leahi_dialin/dd/modules/temperature_sensors.py	(.../temperature_sensors.py)	(revision a0e7107b30e4d6fc631784e249f59038aefeb04f)
+++ leahi_dialin/dd/modules/temperature_sensors.py	(.../temperature_sensors.py)	(revision 9b804a28f38e083b5c4b0cd163cd82098511a55c)
@@ -66,7 +66,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/valves.py
===================================================================
diff -u -ra0e7107b30e4d6fc631784e249f59038aefeb04f -r9b804a28f38e083b5c4b0cd163cd82098511a55c
--- leahi_dialin/dd/modules/valves.py	(.../valves.py)	(revision a0e7107b30e4d6fc631784e249f59038aefeb04f)
+++ leahi_dialin/dd/modules/valves.py	(.../valves.py)	(revision 9b804a28f38e083b5c4b0cd163cd82098511a55c)
@@ -161,7 +161,6 @@
             return DEENERGIZED
 
     @publish(["msg_id_dd_valves_states_data",
-        "dd_valves_states_timestamp",
         "valve_states_all",
         "d14_valv",
         "d52_valv",
@@ -187,7 +186,8 @@
         "d20_valv",
         "d21_valv",
         "d22_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/levels.py
===================================================================
diff -u -ra286de55ce0a6fd3388ddcd68d6c9aecd00a2500 -r9b804a28f38e083b5c4b0cd163cd82098511a55c
--- leahi_dialin/fp/modules/levels.py	(.../levels.py)	(revision a286de55ce0a6fd3388ddcd68d6c9aecd00a2500)
+++ leahi_dialin/fp/modules/levels.py	(.../levels.py)	(revision 9b804a28f38e083b5c4b0cd163cd82098511a55c)
@@ -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/pressure_sensors.py
===================================================================
diff -u -ra0e7107b30e4d6fc631784e249f59038aefeb04f -r9b804a28f38e083b5c4b0cd163cd82098511a55c
--- leahi_dialin/fp/modules/pressure_sensors.py	(.../pressure_sensors.py)	(revision a0e7107b30e4d6fc631784e249f59038aefeb04f)
+++ leahi_dialin/fp/modules/pressure_sensors.py	(.../pressure_sensors.py)	(revision 9b804a28f38e083b5c4b0cd163cd82098511a55c)
@@ -56,7 +56,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/temperatures.py
===================================================================
diff -u -ra0e7107b30e4d6fc631784e249f59038aefeb04f -r9b804a28f38e083b5c4b0cd163cd82098511a55c
--- leahi_dialin/fp/modules/temperatures.py	(.../temperatures.py)	(revision a0e7107b30e4d6fc631784e249f59038aefeb04f)
+++ leahi_dialin/fp/modules/temperatures.py	(.../temperatures.py)	(revision 9b804a28f38e083b5c4b0cd163cd82098511a55c)
@@ -54,7 +54,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 -ra0e7107b30e4d6fc631784e249f59038aefeb04f -r9b804a28f38e083b5c4b0cd163cd82098511a55c
--- leahi_dialin/fp/modules/valves.py	(.../valves.py)	(revision a0e7107b30e4d6fc631784e249f59038aefeb04f)
+++ leahi_dialin/fp/modules/valves.py	(.../valves.py)	(revision 9b804a28f38e083b5c4b0cd163cd82098511a55c)
@@ -124,7 +124,6 @@
 
     @publish([
         "msg_id_fp_valves_states_data",
-        "fp_valves_states_timestamp",
         "valve_states_all",
         "m4_valv",
         "p11_valv",
@@ -134,7 +133,8 @@
         "p39_valv",
         "p43_valv",
         "p6_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_trap.py
===================================================================
diff -u -r7f2603fa456a499fd7b835a6cf1714422d2e85e7 -r9b804a28f38e083b5c4b0cd163cd82098511a55c
--- leahi_dialin/td/modules/air_trap.py	(.../air_trap.py)	(revision 7f2603fa456a499fd7b835a6cf1714422d2e85e7)
+++ leahi_dialin/td/modules/air_trap.py	(.../air_trap.py)	(revision 9b804a28f38e083b5c4b0cd163cd82098511a55c)
@@ -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