Index: leahi_dialin/dd/modules/dialysate_pump.py
===================================================================
diff -u -r9466b5c6b5867f392104a42608aa9542a7ff0358 -r6d6d2d7c80f38f207ec41ad9ce053030e7317169
--- leahi_dialin/dd/modules/dialysate_pump.py	(.../dialysate_pump.py)	(revision 9466b5c6b5867f392104a42608aa9542a7ff0358)
+++ leahi_dialin/dd/modules/dialysate_pump.py	(.../dialysate_pump.py)	(revision 6d6d2d7c80f38f207ec41ad9ce053030e7317169)
@@ -105,45 +105,45 @@
         @return: None
         """
 
-        self.dial_pump_target_rpm_fresh = struct.unpack('f', bytearray(
+        self.d12_pump_target_rpm_fresh = struct.unpack('f', bytearray(
             message['message'][MsgFieldPositions.START_POS_FIELD_1:MsgFieldPositions.END_POS_FIELD_1]))[0]
-        self.dial_pump_target_rpm_spent = struct.unpack('f', bytearray(
+        self.d48_pump_target_rpm_spent = struct.unpack('f', bytearray(
             message['message'][MsgFieldPositions.START_POS_FIELD_2:MsgFieldPositions.END_POS_FIELD_2]))[0]
-        self.dial_pump_measured_spd_fresh = struct.unpack('f', bytearray(
+        self.d12_pump_measured_spd_fresh = struct.unpack('f', bytearray(
             message['message'][MsgFieldPositions.START_POS_FIELD_3:MsgFieldPositions.END_POS_FIELD_3]))[0]
-        self.dial_pump_measured_spd_spent = struct.unpack('f', bytearray(
+        self.d48_pump_measured_spd_spent = struct.unpack('f', bytearray(
             message['message'][MsgFieldPositions.START_POS_FIELD_4:MsgFieldPositions.END_POS_FIELD_4]))[0]
-        self.dial_pump_current_spd_fresh = struct.unpack('f', bytearray(
+        self.d12_pump_current_spd_fresh = struct.unpack('f', bytearray(
             message['message'][MsgFieldPositions.START_POS_FIELD_5:MsgFieldPositions.END_POS_FIELD_5]))[0]
-        self.dial_pump_current_spd_spent = struct.unpack('f', bytearray(
+        self.d48_pump_current_spd_spent = struct.unpack('f', bytearray(
             message['message'][MsgFieldPositions.START_POS_FIELD_6:MsgFieldPositions.END_POS_FIELD_6]))[0]
-        self.dial_pump_state_fresh = struct.unpack('i', bytearray(
+        self.d12_pump_state_fresh = struct.unpack('i', bytearray(
             message['message'][MsgFieldPositions.START_POS_FIELD_7:MsgFieldPositions.END_POS_FIELD_7]))[0]
-        self.dial_pump_state_spent = struct.unpack('i', bytearray(
+        self.d48_pump_state_spent = struct.unpack('i', bytearray(
             message['message'][MsgFieldPositions.START_POS_FIELD_8:MsgFieldPositions.END_POS_FIELD_8]))[0]
-        self.dial_pump_tgt_pressure_fresh = struct.unpack('f', bytearray(
+        self.d12_pump_tgt_pressure_fresh = struct.unpack('f', bytearray(
             message['message'][MsgFieldPositions.START_POS_FIELD_9:MsgFieldPositions.END_POS_FIELD_9]))[0]
-        self.dial_pump_tgt_pressure_spent = struct.unpack('f', bytearray(
+        self.d48_pump_tgt_pressure_spent = struct.unpack('f', bytearray(
             message['message'][MsgFieldPositions.START_POS_FIELD_10:MsgFieldPositions.END_POS_FIELD_10]))[0]
-        self.dial_pump_measured_pressure_fresh = struct.unpack('f', bytearray(
+        self.d12_pump_measured_pressure_fresh = struct.unpack('f', bytearray(
             message['message'][MsgFieldPositions.START_POS_FIELD_11:MsgFieldPositions.END_POS_FIELD_11]))[0]
-        self.dial_pump_measured_pressure_spent = struct.unpack('f', bytearray(
+        self.d48_pump_measured_pressure_spent = struct.unpack('f', bytearray(
             message['message'][MsgFieldPositions.START_POS_FIELD_12:MsgFieldPositions.END_POS_FIELD_12]))[0]
-        self.dial_pump_measured_current_fresh = struct.unpack('f', bytearray(
+        self.d12_pump_measured_current_fresh = struct.unpack('f', bytearray(
             message['message'][MsgFieldPositions.START_POS_FIELD_13:MsgFieldPositions.END_POS_FIELD_13]))[0]
-        self.dial_pump_measured_current_spent = struct.unpack('f', bytearray(
+        self.d48_pump_measured_current_spent = struct.unpack('f', bytearray(
             message['message'][MsgFieldPositions.START_POS_FIELD_14:MsgFieldPositions.END_POS_FIELD_14]))[0]
-        self.dial_pump_control_fresh = struct.unpack('i', bytearray(
+        self.d12_pump_control_fresh = struct.unpack('i', bytearray(
             message['message'][MsgFieldPositions.START_POS_FIELD_15:MsgFieldPositions.END_POS_FIELD_15]))[0]
-        self.dial_pump_control_spent = struct.unpack('i', bytearray(
+        self.d48_pump_control_spent = struct.unpack('i', bytearray(
             message['message'][MsgFieldPositions.START_POS_FIELD_16:MsgFieldPositions.END_POS_FIELD_16]))[0]
-        self.dial_pump_dir_err_cnt_fresh = struct.unpack('i', bytearray(
+        self.d12_pump_dir_err_cnt_fresh = struct.unpack('i', bytearray(
             message['message'][MsgFieldPositions.START_POS_FIELD_17:MsgFieldPositions.END_POS_FIELD_17]))[0]
-        self.dial_pump_dir_err_cnt_spent = struct.unpack('i', bytearray(
+        self.d48_pump_dir_err_cnt_spent = struct.unpack('i', bytearray(
             message['message'][MsgFieldPositions.START_POS_FIELD_18:MsgFieldPositions.END_POS_FIELD_18]))[0]
-        self.dial_pump_measured_dir_fresh = struct.unpack('i', bytearray(
+        self.d12_pump_measured_dir_fresh = struct.unpack('i', bytearray(
             message['message'][MsgFieldPositions.START_POS_FIELD_19:MsgFieldPositions.END_POS_FIELD_19]))[0]
-        self.dial_pump_measured_dir_spent = struct.unpack('i', bytearray(
+        self.d48_pump_measured_dir_spent = struct.unpack('i', bytearray(
             message['message'][MsgFieldPositions.START_POS_FIELD_20:MsgFieldPositions.END_POS_FIELD_20]))[0]
 
         self.dd_dialysate_pump_timestamp = timestamp