Index: leahi_dialin/dd/modules/valves.py
===================================================================
diff -u -rd99912ad9a9c4e6374ea022248a237a478501f3f -rd28c8c54ba1f74adf348d1db6f5bfe034628c812
--- leahi_dialin/dd/modules/valves.py	(.../valves.py)	(revision d99912ad9a9c4e6374ea022248a237a478501f3f)
+++ leahi_dialin/dd/modules/valves.py	(.../valves.py)	(revision d28c8c54ba1f74adf348d1db6f5bfe034628c812)
@@ -93,7 +93,7 @@
         self.can_interface = can_interface
         self.logger = logger
         self.valves_sensed_states = OrderedDict()
-        self.dg_valves_states_timestamp = 0.0
+        self.dd_valves_states_timestamp = 0.0
 
         if self.can_interface is not None:
             channel_id = DenaliChannels.dd_sync_broadcast_ch_id
@@ -294,7 +294,7 @@
             start = end
             end += 1
 
-        self.dg_valves_states_timestamp = timestamp
+        self.dd_valves_states_timestamp = timestamp
 
     def cmd_valve_sensed_state_override(self, valve: int, state: bool, reset: int = NO_RESET) -> int:
         """
Index: leahi_dialin/fp/modules/flow_sensors.py
===================================================================
diff -u -r0f08c28544b557b2bbd8c04b10cff284f41e4fb9 -rd28c8c54ba1f74adf348d1db6f5bfe034628c812
--- leahi_dialin/fp/modules/flow_sensors.py	(.../flow_sensors.py)	(revision 0f08c28544b557b2bbd8c04b10cff284f41e4fb9)
+++ leahi_dialin/fp/modules/flow_sensors.py	(.../flow_sensors.py)	(revision d28c8c54ba1f74adf348d1db6f5bfe034628c812)
@@ -34,7 +34,7 @@
 class FPFlowSensors(AbstractSubSystem):
     """
 
-        Dialin API sub-class for flow sensor related commands.
+         API sub-class for FP flow sensor related commands.
     """
 
     def __init__(self, can_interface, logger: Logger):
@@ -61,7 +61,7 @@
 
         self.fp_flow_timestamp = 0
 
-    @publish(["fp_levels_timestamp",
+    @publish(["fp_flows_timestamp",
                 "p7_flowFMS", "p16_flowFMP",
                 "p7_tempFMS", "p16_tempFMP"])
     def _handler_flow_sensor_sync(self, message, timestamp=0.0):
@@ -80,7 +80,7 @@
         self.p16_tempFMP = struct.unpack('f', bytearray(
             message['message'][MsgFieldPositions.START_POS_FIELD_4:MsgFieldPositions.END_POS_FIELD_4]))[0]
 
-        self.fp_flow_timestamp = timestamp
+        self.fp_flows_timestamp = timestamp
 
     def cmd_flow_sensor_broadcast_interval_override(self, ms: int, reset: int = NO_RESET) -> int:
         """
Index: leahi_dialin/td/modules/blood_flow.py
===================================================================
diff -u -rd0d72ba74208cb43073ec38c7bbfebb2d32dcc66 -rd28c8c54ba1f74adf348d1db6f5bfe034628c812
--- leahi_dialin/td/modules/blood_flow.py	(.../blood_flow.py)	(revision d0d72ba74208cb43073ec38c7bbfebb2d32dcc66)
+++ leahi_dialin/td/modules/blood_flow.py	(.../blood_flow.py)	(revision d28c8c54ba1f74adf348d1db6f5bfe034628c812)
@@ -55,9 +55,9 @@
         self.h4_rotor_hall_state = 0
 
 
-    @publish(["td_blood_flow_timestamp", "set_blood_flow_rate", "measured_blood_flow_rate", "measured_blood_pump_rotor_speed",
-              "measured_blood_pump_speed", "measured_blood_pump_motor_current", "set_rpm",
-              "rotor_count", "pres_blood_flow_rate", "rotor_hall_state"])
+    @publish(["td_blood_flow_timestamp", "set_blood_flow_rate", "h4_measured_blood_flow_rate", "h4_measured_blood_pump_rotor_speed",
+              "h4_measured_blood_pump_speed", "h4_measured_blood_pump_motor_current", "h4_set_rpm",
+              "h4_rotor_count", "h4_pres_blood_flow_rate", "h4_rotor_hall_state"])
     def _handler_blood_flow_sync(self, message, timestamp=0.0):
         """
         Handles published blood flow data messages.  Blood flow data are captured
@@ -86,15 +86,15 @@
         hal = struct.unpack('I', bytearray(
             message['message'][MsgFieldPositions.START_POS_FIELD_9:MsgFieldPositions.END_POS_FIELD_9]))
 
-        self.set_blood_flow_rate = tgt[0]
-        self.measured_blood_flow_rate = flow[0]
-        self.measured_blood_pump_rotor_speed = rotor[0]
-        self.measured_blood_pump_speed = speed[0]
-        self.measured_blood_pump_motor_current = mccurr[0]
-        self.set_rpm = rpm[0]
-        self.rotor_count = rot[0]
-        self.pres_blood_flow_rate = pres[0]
-        self.rotor_hall_state = hal[0]
+        self.h4_set_blood_flow_rate = tgt[0]
+        self.h4_measured_blood_flow_rate = flow[0]
+        self.h4_measured_blood_pump_rotor_speed = rotor[0]
+        self.h4_measured_blood_pump_speed = speed[0]
+        self.h4_measured_blood_pump_motor_current = mccurr[0]
+        self.h4_set_rpm = rpm[0]
+        self.h4_rotor_count = rot[0]
+        self.h4_pres_blood_flow_rate = pres[0]
+        self.h4_rotor_hall_state = hal[0]
         self.td_blood_flow_timestamp = timestamp
 
     def cmd_blood_flow_set_flow_rate_request(self, flow: int, mode: int = PUMP_CONTROL_MODE_CLOSED_LOOP) -> int:
Index: leahi_dialin/td/modules/bubble_detector.py
===================================================================
diff -u -rd0d72ba74208cb43073ec38c7bbfebb2d32dcc66 -rd28c8c54ba1f74adf348d1db6f5bfe034628c812
--- leahi_dialin/td/modules/bubble_detector.py	(.../bubble_detector.py)	(revision d0d72ba74208cb43073ec38c7bbfebb2d32dcc66)
+++ leahi_dialin/td/modules/bubble_detector.py	(.../bubble_detector.py)	(revision d28c8c54ba1f74adf348d1db6f5bfe034628c812)
@@ -65,7 +65,7 @@
         # Initialize state of ADV air bubble detectors state machine to normal
         self.h18_air_bubbles_state = [self.AIR_BUBBLE_NORMAL_STATE]
 
-    @publish(["td_air_bubbles_timestamp", "air_bubbles_status", "air_bubbles_state"])
+    @publish(["td_air_bubbles_timestamp", "h18_air_bubbles_status", "h18_air_bubbles_state"])
     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/voltages.py
===================================================================
diff -u -rafe332fec54d9d0432dfc0d54aef1debaa92b066 -rd28c8c54ba1f74adf348d1db6f5bfe034628c812
--- leahi_dialin/td/modules/voltages.py	(.../voltages.py)	(revision afe332fec54d9d0432dfc0d54aef1debaa92b066)
+++ leahi_dialin/td/modules/voltages.py	(.../voltages.py)	(revision d28c8c54ba1f74adf348d1db6f5bfe034628c812)
@@ -61,7 +61,7 @@
             self.can_interface.register_receiving_publication_function(channel_id, msg_id,
                                                                        self._handler_monitored_voltages_sync)
         self.monitored_voltages = [0.0] * TDMonitoredVoltages.NUM_OF_MONITORED_VOLTAGE_LINES.value
-        self.TD_voltages_timestamp = 0.0
+        self.td_voltages_timestamp = 0.0
 
 
     @publish(["td_voltages_timestamp","monitored_voltages"])