Index: leahi_dialin/dd/modules/piston_pump.py
===================================================================
diff -u -ra286de55ce0a6fd3388ddcd68d6c9aecd00a2500 -rf0f1a6557cb07e31eb26bb8f8c70e87902f30626
--- leahi_dialin/dd/modules/piston_pump.py	(.../piston_pump.py)	(revision a286de55ce0a6fd3388ddcd68d6c9aecd00a2500)
+++ leahi_dialin/dd/modules/piston_pump.py	(.../piston_pump.py)	(revision f0f1a6557cb07e31eb26bb8f8c70e87902f30626)
@@ -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/fp/modules/levels.py
===================================================================
diff -u -ra286de55ce0a6fd3388ddcd68d6c9aecd00a2500 -rf0f1a6557cb07e31eb26bb8f8c70e87902f30626
--- leahi_dialin/fp/modules/levels.py	(.../levels.py)	(revision a286de55ce0a6fd3388ddcd68d6c9aecd00a2500)
+++ leahi_dialin/fp/modules/levels.py	(.../levels.py)	(revision f0f1a6557cb07e31eb26bb8f8c70e87902f30626)
@@ -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/temperatures.py
===================================================================
diff -u -ra286de55ce0a6fd3388ddcd68d6c9aecd00a2500 -rf0f1a6557cb07e31eb26bb8f8c70e87902f30626
--- leahi_dialin/fp/modules/temperatures.py	(.../temperatures.py)	(revision a286de55ce0a6fd3388ddcd68d6c9aecd00a2500)
+++ leahi_dialin/fp/modules/temperatures.py	(.../temperatures.py)	(revision f0f1a6557cb07e31eb26bb8f8c70e87902f30626)
@@ -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 -ra286de55ce0a6fd3388ddcd68d6c9aecd00a2500 -rf0f1a6557cb07e31eb26bb8f8c70e87902f30626
--- leahi_dialin/fp/modules/valves.py	(.../valves.py)	(revision a286de55ce0a6fd3388ddcd68d6c9aecd00a2500)
+++ leahi_dialin/fp/modules/valves.py	(.../valves.py)	(revision f0f1a6557cb07e31eb26bb8f8c70e87902f30626)
@@ -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_trap.py
===================================================================
diff -u -r7f2603fa456a499fd7b835a6cf1714422d2e85e7 -rf0f1a6557cb07e31eb26bb8f8c70e87902f30626
--- leahi_dialin/td/modules/air_trap.py	(.../air_trap.py)	(revision 7f2603fa456a499fd7b835a6cf1714422d2e85e7)
+++ leahi_dialin/td/modules/air_trap.py	(.../air_trap.py)	(revision f0f1a6557cb07e31eb26bb8f8c70e87902f30626)
@@ -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