Index: DG/DialysateGenerator.py
===================================================================
diff -u -r082ea4c8b0c6a3c804453308990d0bb98a0a2156 -r0da0106eca868b9144298c60911710b3414a5837
--- DG/DialysateGenerator.py	(.../DialysateGenerator.py)	(revision 082ea4c8b0c6a3c804453308990d0bb98a0a2156)
+++ DG/DialysateGenerator.py	(.../DialysateGenerator.py)	(revision 0da0106eca868b9144298c60911710b3414a5837)
@@ -101,8 +101,8 @@
         TODO: This is built based on HD but needs more infrastructure made for DG before being operational
         """
 
-        rst = self.outer_instance.integer2ByteArray(reset)
-        cur = self.outer_instance.float2ByteArray(adc_raw)
+        rst = self.outer_instance.integer_to_byte_array(reset)
+        cur = self.outer_instance.float_to_byte_array(adc_raw)
         payload = rst + cur
 
         message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_hd_ch_id,
@@ -141,8 +141,8 @@
     TODO: This is built based on HD but needs more infrastructure made for DG before being operational
     """
 
-    rst = self.outer_instance.integer2ByteArray(reset)
-    cur = self.outer_instance.float2ByteArray(adc_raw)
+    rst = self.outer_instance.integer_to_byte_array(reset)
+    cur = self.outer_instance.float_to_byte_array(adc_raw)
     payload = rst + cur
 
     message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_hd_ch_id,
@@ -181,8 +181,8 @@
     TODO: This is built based on HD but needs more infrastructure made for DG before being operational
     """
 
-    rst = self.outer_instance.integer2ByteArray(reset)
-    cur = self.outer_instance.float2ByteArray(adc_raw)
+    rst = self.outer_instance.integer_to_byte_array(reset)
+    cur = self.outer_instance.float_to_byte_array(adc_raw)
     payload = rst + cur
 
     message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_hd_ch_id,
@@ -221,8 +221,8 @@
     TODO: This is built based on HD but needs more infrastructure made for DG before being operational
     """
 
-    rst = self.outer_instance.integer2ByteArray(reset)
-    cur = self.outer_instance.float2ByteArray(adc_raw)
+    rst = self.outer_instance.integer_to_byte_array(reset)
+    cur = self.outer_instance.float_to_byte_array(adc_raw)
     payload = rst + cur
 
     message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_hd_ch_id,
Index: HD/Alarms.py
===================================================================
diff -u -r082ea4c8b0c6a3c804453308990d0bb98a0a2156 -r0da0106eca868b9144298c60911710b3414a5837
--- HD/Alarms.py	(.../Alarms.py)	(revision 082ea4c8b0c6a3c804453308990d0bb98a0a2156)
+++ HD/Alarms.py	(.../Alarms.py)	(revision 0da0106eca868b9144298c60911710b3414a5837)
@@ -1,18 +1,17 @@
 from DialIn.CoreCANProtocol import (DenaliMessage,
                                     DenaliChannels)
 import struct
-from .utils import integer2ByteArray
-from .HemodialysisDevice import HD
+from utils import integer_to_byte_array, RESET
 
 
 class HDAlarms:
     """
-        \class HD_Alarms
+    \class HD_Alarms
 
-        \brief Hemodialysis Device (HD) Dialin API sub-class for alarm related commands.
+    \brief Hemodialysis Device (HD) Dialin API sub-class for alarm related commands.
     """
 
-    # Alarms message IDs
+    # alarms message IDs
     MSG_ID_HD_ALARMS_PUBLISHED_STATUS = 0x0002
     MSG_ID_HD_ALARM_ACTIVATE = 0x0003
     MSG_ID_HD_ALARM_CLEAR = 0x0004
@@ -46,11 +45,11 @@
 
     def __init__(self, can_interface):
         """
-            HD_Alarms constructor
+        HD_Alarms constructor
 
-            \param outer_instance: reference to the HD (outer) class.
+        \param outer_instance: reference to the HD (outer) class.
 
-            \returns HD_Alarms object.
+        \returns HD_Alarms object.
         """
         self.can_interface = can_interface
 
@@ -70,76 +69,75 @@
                                                                        self.handler_alarm_clear)
 
         # composite alarm status based on latest HD alarm status broadcast message
-        self.alarmsState = 0
-        self.alarmTop = 0
-        self.alarmsSilenceExpiresIn = 0
-        self.alarmsEscalatesIn = 0
-        self.alarmsFlags = 0
+        self.alarms_state = 0
+        self.alarm_top = 0
+        self.alarms_silence_expires_in = 0
+        self.alarms_escalates_in = 0
+        self.alarms_flags = 0
 
         # alarm states based on received HD alarm activation and alarm clear messages
-        self.alarmStates = [False] * 50
+        self.alarm_states = [False] * 50
 
-
     def handler_alarms_status_sync(self, message):
         """
-            Handles published alarms status messages.  Alarms status data are captured
-            for reference.
+        Handles published alarms status messages.  alarms status data are captured
+        for reference.
 
-            \param message:  published blood flow data message
-            \returns none
+        \param message:  published blood flow data message
+        \returns none
         """
 
-        self.alarmsState = int.from_bytes(bytearray(
+        self.alarms_state = int.from_bytes(bytearray(
             message['message'][self.START_POS_ALARM_STATE:self.END_POS_ALARM_STATE]),
             byteorder=DenaliMessage.BYTE_ORDER)
-        self.alarmTop = int.from_bytes(bytearray(
+        self.alarm_top = int.from_bytes(bytearray(
             message['message'][self.START_POS_ALARM_TOP:self.END_POS_ALARM_TOP]),
             byteorder=DenaliMessage.BYTE_ORDER)
-        self.alarmsSilenceExpiresIn = int.from_bytes(bytearray(
+        self.alarms_silence_expires_in = int.from_bytes(bytearray(
             message['message'][self.START_POS_ALARM_SILENCE_EXPIRES_IN:self.END_POS_ALARM_SILENCE_EXPIRES_IN]),
             byteorder=DenaliMessage.BYTE_ORDER)
-        self.alarmsEscalatesIn = int.from_bytes(bytearray(
+        self.alarms_escalates_in = int.from_bytes(bytearray(
             message['message'][self.START_POS_ALARM_ESCALATES_IN:self.END_POS_ALARM_ESCALATES_IN]),
             byteorder=DenaliMessage.BYTE_ORDER)
-        self.alarmsFlags = int.from_bytes(bytearray(
+        self.alarms_flags = int.from_bytes(bytearray(
             message['message'][self.START_POS_ALARMS_FLAGS:self.END_POS_ALARMS_FLAGS]),
             byteorder=DenaliMessage.BYTE_ORDER)
 
     def handler_alarm_activate(self, message):
         """
-            Handles published HD alarm activation messages.
+        Handles published HD alarm activation messages.
 
-            \param message:  published HD alarm activation message
-            \returns none
+        \param message:  published HD alarm activation message
+        \returns none
         """
 
-        alarmID = struct.unpack('<H', bytearray(message['message'][self.START_POS_ALARM_ID:self.END_POS_ALARM_ID]))
-        self.alarmStates[alarmID[0]] = True
+        alarm_id = struct.unpack('<H', bytearray(message['message'][self.START_POS_ALARM_ID:self.END_POS_ALARM_ID]))
+        self.alarm_states[alarm_id[0]] = True
 
     def handler_alarm_clear(self, message):
         """
-            Handles published HD alarm clear messages.
+        Handles published HD alarm clear messages.
 
-            \param message:  published HD alarm clear message
-            \returns none
+        \param message:  published HD alarm clear message
+        \returns none
         """
 
-        alarmID = struct.unpack('<H', bytearray(message['message'][self.START_POS_ALARM_ID:self.END_POS_ALARM_ID]))
-        self.alarmStates[alarmID[0]] = False
+        alarm_id = struct.unpack('<H', bytearray(message['message'][self.START_POS_ALARM_ID:self.END_POS_ALARM_ID]))
+        self.alarm_states[alarm_id[0]] = False
 
     def cmd_alarm_state_override(self, reset, state, alarm):
         """
-            Constructs and sends the alarm state override command
+        Constructs and sends the alarm state override command
 
-            \param reset:  integer - 1 to reset a previous override, 0 to override
-            \param state:  integer - 1 for alarm active, 0 for alarm inactive
-            \param alarm:  integer - ID of alarm to override
-            \returns 1 if successful, zero otherwise
+        \param reset:  integer - 1 to reset a previous override, 0 to override
+        \param state:  integer - 1 for alarm active, 0 for alarm inactive
+        \param alarm:  integer - ID of alarm to override
+        \returns 1 if successful, zero otherwise
         """
 
-        rst = integer2ByteArray(reset)
-        sta = integer2ByteArray(state)
-        alm = integer2ByteArray(alarm)
+        rst = integer_to_byte_array(reset)
+        sta = integer_to_byte_array(state)
+        alm = integer_to_byte_array(alarm)
         payload = rst + sta + alm
 
         message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_hd_ch_id,
@@ -154,7 +152,7 @@
         # If there is content...
         if received_message is not None:
             # print(received_message)
-            if reset == HD.RESET:
+            if reset == RESET:
                 str_res = "reset back to normal"
             else:
                 str_res = ("active" if state != 0 else "inactive")
@@ -168,17 +166,17 @@
 
     def cmd_alarm_time_override(self, reset, time_ms, alarm):
         """
-            Constructs and sends the alarm time override command
+        Constructs and sends the alarm time override command
 
-            \param reset:  integer - 1 to reset a previous override, 0 to override
-            \param time_ms:  integer - time (in ms) since alarm was activated
-            \param alarm:  integer - ID of alarm to override
-            \returns 1 if successful, zero otherwise
+        \param reset:  integer - 1 to reset a previous override, 0 to override
+        \param time_ms:  integer - time (in ms) since alarm was activated
+        \param alarm:  integer - ID of alarm to override
+        \returns 1 if successful, zero otherwise
         """
 
-        rst = integer2ByteArray(reset)
-        ms = integer2ByteArray(time_ms)
-        alm = integer2ByteArray(alarm)
+        rst = integer_to_byte_array(reset)
+        ms = integer_to_byte_array(time_ms)
+        alm = integer_to_byte_array(alarm)
         payload = rst + ms + alm
 
         message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_hd_ch_id,
@@ -193,7 +191,7 @@
         # If there is content...
         if received_message is not None:
             # print(received_message)
-            if reset == HD.RESET:
+            if reset == RESET:
                 str_res = "reset back to normal"
             else:
                 str_res = str(time_ms)
@@ -207,23 +205,23 @@
 
     def cmd_alarm_lamp_pattern_override(self, reset, pattern):
         """
-            Constructs and sends the alarm lamp pattern override command.
+        Constructs and sends the alarm lamp pattern override command.
 
-            \param reset:  integer - 1 to reset a previous override, 0 to override
-            \param pattern:  integer - ID of alarm lamp pattern to override with
-            \returns 1 if successful, zero otherwise
+        \param reset:  integer - 1 to reset a previous override, 0 to override
+        \param pattern:  integer - ID of alarm lamp pattern to override with
+        \returns 1 if successful, zero otherwise
 
-            \details Patterns: \n
-                0 = off \n
-                1 = ok \n
-                2 = fault \n
-                3 = high \n
-                4 = medium \n
-                5 = low \n
-                6 = manual
+        \details Patterns: \n
+            0 = off \n
+            1 = ok \n
+            2 = fault \n
+            3 = high \n
+            4 = medium \n
+            5 = low \n
+            6 = manual
         """
-        rst = integer2ByteArray(reset)
-        pat = integer2ByteArray(pattern)
+        rst = integer_to_byte_array(reset)
+        pat = integer_to_byte_array(pattern)
         payload = rst + pat
 
         message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_hd_ch_id,
@@ -238,7 +236,7 @@
         # If there is content...
         if received_message is not None:
             print(received_message)
-            if reset == HD.RESET:
+            if reset == RESET:
                 str_pat = "reset back to normal"
             elif pattern == self.HD_ALARM_LAMP_PATTERN_OFF:
                 str_pat = "off"
Index: HD/Basics.py
===================================================================
diff -u -r082ea4c8b0c6a3c804453308990d0bb98a0a2156 -r0da0106eca868b9144298c60911710b3414a5837
--- HD/Basics.py	(.../Basics.py)	(revision 082ea4c8b0c6a3c804453308990d0bb98a0a2156)
+++ HD/Basics.py	(.../Basics.py)	(revision 0da0106eca868b9144298c60911710b3414a5837)
@@ -1,3 +1,19 @@
+###########################################################################
+#
+#  Copyright (c) 2019-2020 Diality Inc. - All Rights Reserved.
+#
+#  THIS CODE MAY NOT BE COPIED OR REPRODUCED IN ANY FORM, IN PART OR IN
+#  WHOLE, WITHOUT THE EXPLICIT PERMISSION OF THE COPYRIGHT OWNER.
+#
+#  @file PressureOcclusion.py
+#
+#  @date 1-Apr-2020
+#  @author P. Lucia
+#
+#  @brief
+#
+#
+############################################################################
 from DialIn.CoreCANProtocol import (DenaliMessage,
                                     DenaliChannels)
 
Index: HD/BloodFlow.py
===================================================================
diff -u -rc5826238ca4b80671231a9c564af3ea01b9be06f -r0da0106eca868b9144298c60911710b3414a5837
--- HD/BloodFlow.py	(.../BloodFlow.py)	(revision c5826238ca4b80671231a9c564af3ea01b9be06f)
+++ HD/BloodFlow.py	(.../BloodFlow.py)	(revision 0da0106eca868b9144298c60911710b3414a5837)
@@ -5,7 +5,7 @@
 #  THIS CODE MAY NOT BE COPIED OR REPRODUCED IN ANY FORM, IN PART OR IN
 #  WHOLE, WITHOUT THE EXPLICIT PERMISSION OF THE COPYRIGHT OWNER.
 #
-#  @file BloodFlow.py
+#  @file bloodflow.py
 #
 #  @date 31-Mar-2020
 #  @author P. Lucia
@@ -16,10 +16,10 @@
 ############################################################################
 from DialIn.CoreCANProtocol import (DenaliMessage,
                                     DenaliChannels)
-from .utils import integer2ByteArray, float2ByteArray
-from .HemodialysisDevice import HD
+from utils import integer_to_byte_array, float_to_byte_array, RESET
 import struct
 
+
 class HDBloodFlow:
     """
         \class HD_BloodFlow
@@ -28,7 +28,7 @@
 
     """
 
-    # BloodFlow message IDs
+    # bloodflow message IDs
     MSG_ID_HD_BLOOD_FLOW_PUBLISHED_DATA = 0x0005
     MSG_ID_HD_BLOOD_FLOW_SET_RATE_OVERRIDE = 0x8008
     MSG_ID_HD_BLOOD_FLOW_MEAS_RATE_OVERRIDE = 0x8009
@@ -38,7 +38,7 @@
     MSG_ID_HD_BLOOD_PUMP_MEAS_SPEED_OVERRIDE = 0x800E
     MSG_ID_HD_BLOOD_PUMP_ROTOR_MEAS_SPEED_OVERRIDE = 0x800F
 
-    # BloodFlow broadcast message field positions
+    # bloodflow broadcast message field positions
     START_POS_SET_PT = DenaliMessage.PAYLOAD_START_INDEX
     END_POS_SET_PT = START_POS_SET_PT + 4
     START_POS_MEAS_FLOW = END_POS_SET_PT
@@ -56,38 +56,36 @@
 
     def __init__(self, can_interface=None):
         """
-            HD_BloodFlow constructor
+        HD_BloodFlow constructor
 
-            \param outer_instance: reference to the HD (outer) class.
-
-            \returns HD_BloodFlow object.
+        \param outer_instance: reference to the HD (outer) class.
         """
         self.can_interface = can_interface
 
         if self.can_interface is not None:
             channel_id = DenaliChannels.hd_sync_broadcast_ch_id
             msg_id = self.MSG_ID_HD_BLOOD_FLOW_PUBLISHED_DATA
             self.can_interface.register_receiving_publication_function(channel_id, msg_id,
-                                                                  self.handlerBloodFlowSyncFunction)
+                                                                       self.handler_blood_flow_sync)
 
-        self.TargetBloodFlowRate = 0
-        self.MeasuredBloodFlowRate = 0.0
-        self.MeasuredBloodPumpRotorSpeed = 0.0
-        self.MeasuredBloodPumpSpeed = 0.0
-        self.MeasuredBloodPumpMCSpeed = 0.0
-        self.MeasuredBloodPumpMCCurrent = 0.0
-        self.PWMDutyCyclePct = 0.0
+        self.target_blood_flow_rate = 0
+        self.measured_blood_flow_rate = 0.0
+        self.measured_blood_pump_rotor_speed = 0.0
+        self.measured_blood_pump_speed = 0.0
+        self.measured_blood_pump_mc_speed = 0.0
+        self.measured_blood_pump_mc_current = 0.0
+        self.pwm_duty_cycle_pct = 0.0
 
-    def handlerBloodFlowSyncFunction(self, message):
+    def handler_blood_flow_sync(self, message):
         """
-            Handles published blood flow data messages.  Blood flow data are captured
-            for reference.
+        Handles published blood flow data messages.  Blood flow data are captured
+        for reference.
 
-            \param message:  published blood flow data message
-            \returns none
+        \param message:  published blood flow data message
+        \returns none
         """
 
-        # self.TargetBloodFlowRate = int.from_bytes(bytearray(
+        # self.target_blood_flow_rate = int.from_bytes(bytearray(
         #    message['message'][self.START_POS_SET_PT:self.END_POS_SET_PT]),
         #    byteorder=DenaliMessage.BYTE_ORDER)
         tgt = struct.unpack('i', bytearray(
@@ -106,25 +104,25 @@
         pwm = struct.unpack('f', bytearray(
             message['message'][self.START_POS_PWM_DC:self.END_POS_PWM_DC]))
 
-        self.TargetBloodFlowRate = tgt[0]
-        self.MeasuredBloodFlowRate = flow[0]
-        self.MeasuredBloodPumpRotorSpeed = rotor[0]
-        self.MeasuredBloodPumpSpeed = speed[0]
-        self.MeasuredBloodPumpMCSpeed = mcspeed[0]
-        self.MeasuredBloodPumpMCCurrent = mccurr[0]
-        self.PWMDutyCyclePct = pwm[0]
+        self.target_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_mc_speed = mcspeed[0]
+        self.measured_blood_pump_mc_current = mccurr[0]
+        self.pwm_duty_cycle_pct = pwm[0]
 
-    def CmdBloodFlowSetPointOverride(self, reset, flow):
+    def cmd_blood_flow_set_point_override(self, reset, flow):
         """
-            Constructs and sends the blood flow set point override command
+        Constructs and sends the blood flow set point override command
 
-            \param reset:  integer - 1 to reset a previous override, 0 to override
-            \param flow:  integer - flow set point (in mL/min) to override with (negative for reverse direction)
-            \returns 1 if successful, zero otherwise
+        \param reset:  integer - 1 to reset a previous override, 0 to override
+        \param flow:  integer - flow set point (in mL/min) to override with (negative for reverse direction)
+        \returns 1 if successful, zero otherwise
         """
 
-        rst = integer2ByteArray(reset)
-        flo = integer2ByteArray(flow)
+        rst = integer_to_byte_array(reset)
+        flo = integer_to_byte_array(flow)
         payload = rst + flo
 
         message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_hd_ch_id,
@@ -139,7 +137,7 @@
         # If there is content...
         if received_message is not None:
             # print(received_message)
-            if reset == HD.RESET:
+            if reset == RESET:
                 str_res = "reset back to normal"
             else:
                 str_res = str(flow)
@@ -152,17 +150,17 @@
             print("Timeout!!!!")
             return False
 
-    def CmdBloodFlowMeasuredOverride(self, reset, flow):
+    def cmd_blood_flow_measured_override(self, reset, flow):
         """
-            Constructs and sends the measured blood flow override command
+        Constructs and sends the measured blood flow override command
 
-            \param reset:  integer - 1 to reset a previous override, 0 to override
-            \param flow:  integer - measured flow (in mL/min) to override with
-            \returns 1 if successful, zero otherwise
+        \param reset:  integer - 1 to reset a previous override, 0 to override
+        \param flow:  integer - measured flow (in mL/min) to override with
+        \returns 1 if successful, zero otherwise
         """
 
-        rst = integer2ByteArray(reset)
-        flo = float2ByteArray(flow)
+        rst = integer_to_byte_array(reset)
+        flo = float_to_byte_array(flow)
         payload = rst + flo
 
         message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_hd_ch_id,
@@ -177,7 +175,7 @@
         # If there is content...
         if received_message is not None:
             # print(received_message)
-            if reset == HD.RESET:
+            if reset == RESET:
                 str_res = "reset back to normal"
             else:
                 str_res = str(flow)
@@ -189,18 +187,18 @@
             print("Timeout!!!!")
             return False
 
-    def CmdBloodPumpMCMeasuredSpeedOverride(self, reset, speed):
+    def cmd_blood_pump_mc_measured_speed_override(self, reset, speed):
         """
-            Constructs and sends the measured blood pump motor controller speed \n
-            override command.
+        Constructs and sends the measured blood pump motor controller speed \n
+        override command.
 
-            \param reset:  integer - 1 to reset a previous override, 0 to override
-            \param speed:  integer - speed (in RPM) to override with
-            \returns 1 if successful, zero otherwise
+        \param reset:  integer - 1 to reset a previous override, 0 to override
+        \param speed:  integer - speed (in RPM) to override with
+        \returns 1 if successful, zero otherwise
         """
 
-        rst = integer2ByteArray(reset)
-        spd = float2ByteArray(speed)
+        rst = integer_to_byte_array(reset)
+        spd = float_to_byte_array(speed)
         payload = rst + spd
 
         message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_hd_ch_id,
@@ -215,7 +213,7 @@
         # If there is content...
         if received_message is not None:
             # print(received_message)
-            if reset == HD.RESET:
+            if reset == RESET:
                 str_res = "reset back to normal"
             else:
                 str_res = str(speed)
@@ -227,17 +225,17 @@
             print("Timeout!!!!")
             return False
 
-    def CmdBloodPumpMeasuredCurrentOverride(self, reset, curr):
+    def cmd_blood_pump_measured_current_override(self, reset, curr):
         """
-            Constructs and sends the measured blood pump motor current override command
+        Constructs and sends the measured blood pump motor current override command
 
-            \param reset:  integer - 1 to reset a previous override, 0 to override
-            \param curr:  float - current (in mA) to override with
-            \returns 1 if successful, zero otherwise
+        \param reset:  integer - 1 to reset a previous override, 0 to override
+        \param curr:  float - current (in mA) to override with
+        \returns 1 if successful, zero otherwise
         """
 
-        rst = integer2ByteArray(reset)
-        cur = float2ByteArray(curr)
+        rst = integer_to_byte_array(reset)
+        cur = float_to_byte_array(curr)
         payload = rst + cur
 
         message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_hd_ch_id,
@@ -252,7 +250,7 @@
         # If there is content...
         if received_message is not None:
             # print(received_message)
-            if reset == HD.RESET:
+            if reset == RESET:
                 str_res = "reset back to normal"
             else:
                 str_res = str(curr)
@@ -264,18 +262,18 @@
             print("Timeout!!!!")
             return False
 
-    def CmdBloodPumpMeasuredSpeedOverride(self, reset, speed):
+    def cmd_blood_pump_measured_speed_override(self, reset, speed):
         """
-            Constructs and sends the measured blood pump motor  speed override \n
-            command.
+        Constructs and sends the measured blood pump motor  speed override \n
+        command.
 
-            \param reset:  integer - 1 to reset a previous override, 0 to override
-            \param speed:  integer - speed (in RPM) to override with
-            \returns 1 if successful, zero otherwise
+        \param reset:  integer - 1 to reset a previous override, 0 to override
+        \param speed:  integer - speed (in RPM) to override with
+        \returns 1 if successful, zero otherwise
         """
 
-        rst = integer2ByteArray(reset)
-        spd = float2ByteArray(speed)
+        rst = integer_to_byte_array(reset)
+        spd = float_to_byte_array(speed)
         payload = rst + spd
 
         message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_hd_ch_id,
@@ -290,7 +288,7 @@
         # If there is content...
         if received_message is not None:
             # print(received_message)
-            if reset == HD.RESET:
+            if reset == RESET:
                 str_res = "reset back to normal"
             else:
                 str_res = str(speed)
@@ -302,7 +300,7 @@
             print("Timeout!!!!")
             return False
 
-    def CmdBloodPumpRotorMeasuredSpeedOverride(self, reset, speed):
+    def cmd_blood_pump_rotor_measured_speed_override(self, reset, speed):
         """
             Constructs and sends the measured blood pump rotor speed override \n
             command.
@@ -312,8 +310,8 @@
             \returns 1 if successful, zero otherwise
         """
 
-        rst = integer2ByteArray(reset)
-        spd = float2ByteArray(speed)
+        rst = integer_to_byte_array(reset)
+        spd = float_to_byte_array(speed)
         payload = rst + spd
 
         message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_hd_ch_id,
@@ -328,7 +326,7 @@
         # If there is content...
         if received_message is not None:
             # print(received_message)
-            if reset == HD.RESET:
+            if reset == RESET:
                 str_res = "reset back to normal"
             else:
                 str_res = str(speed)
@@ -340,17 +338,17 @@
             print("Timeout!!!!")
             return False
 
-    def CmdBloodFlowBroadcastIntervalOverride(self, reset, ms):
+    def cmd_blood_flow_broadcast_interval_override(self, reset, ms):
         """
-            Constructs and sends the measured blood flow broadcast interval override command
+        Constructs and sends the measured blood flow broadcast interval override command
 
-            \param reset:  integer - 1 to reset a previous override, 0 to override
-            \param ms:  integer - interval (in ms) to override with
-            \returns 1 if successful, zero otherwise
+        \param reset:  integer - 1 to reset a previous override, 0 to override
+        \param ms:  integer - interval (in ms) to override with
+        \returns 1 if successful, zero otherwise
         """
 
-        rst = integer2ByteArray(reset)
-        mis = integer2ByteArray(ms)
+        rst = integer_to_byte_array(reset)
+        mis = integer_to_byte_array(ms)
         payload = rst + mis
 
         message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_hd_ch_id,
@@ -365,7 +363,7 @@
         # If there is content...
         if received_message is not None:
             # print(received_message)
-            if reset == HD.RESET:
+            if reset == RESET:
                 str_res = "reset back to normal: "
             else:
                 str_res = str(ms) + " ms: "
Index: HD/Buttons.py
===================================================================
diff -u -r082ea4c8b0c6a3c804453308990d0bb98a0a2156 -r0da0106eca868b9144298c60911710b3414a5837
--- HD/Buttons.py	(.../Buttons.py)	(revision 082ea4c8b0c6a3c804453308990d0bb98a0a2156)
+++ HD/Buttons.py	(.../Buttons.py)	(revision 0da0106eca868b9144298c60911710b3414a5837)
@@ -1,8 +1,7 @@
 from DialIn.CoreCANProtocol import (DenaliMessage,
                                     DenaliChannels)
 
-from .utils import integer2ByteArray
-from .HemodialysisDevice import HD
+from utils import integer_to_byte_array, RESET
 
 
 class HDButtons:
@@ -12,7 +11,7 @@
     \brief Hemodialysis Device (HD) Dialin API sub-class for button related commands.
     """
 
-    # Buttons message IDs
+    # buttons message IDs
     MSG_ID_HD_OFF_BUTTON_OVERRIDE = 0x8002
     MSG_ID_HD_STOP_BUTTON_OVERRIDE = 0x8003
 
@@ -22,6 +21,7 @@
 
         \param can_interface: the denali can interface object
         """
+
         self.can_interface = can_interface
 
     def cmd_off_button_override(self, reset, state):
@@ -33,8 +33,8 @@
         \returns 1 if successful, zero otherwise
         """
 
-        rst = integer2ByteArray(reset)
-        sta = integer2ByteArray(state)
+        rst = integer_to_byte_array(reset)
+        sta = integer_to_byte_array(state)
         payload = rst + sta
 
         message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_hd_ch_id,
@@ -48,7 +48,7 @@
 
         # If there is content...
         if received_message is not None:
-            if reset == HD.RESET:
+            if reset == RESET:
                 str_res = "reset back to normal"
             else:
                 str_res = ("pressed" if state != 0 else "released")
@@ -70,8 +70,8 @@
         \returns 1 if successful, zero otherwise
         """
 
-        rst = integer2ByteArray(reset)
-        sta = integer2ByteArray(state)
+        rst = integer_to_byte_array(reset)
+        sta = integer_to_byte_array(state)
         payload = rst + sta
 
         message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_hd_ch_id,
@@ -85,7 +85,7 @@
 
         # If there is content...
         if received_message is not None:
-            if reset == HD.RESET:
+            if reset == RESET:
                 str_res = "reset back to normal"
             else:
                 str_res = ("pressed" if state != 0 else "released")
Index: HD/DialysateInletFlow.py
===================================================================
diff -u -rc5826238ca4b80671231a9c564af3ea01b9be06f -r0da0106eca868b9144298c60911710b3414a5837
--- HD/DialysateInletFlow.py	(.../DialysateInletFlow.py)	(revision c5826238ca4b80671231a9c564af3ea01b9be06f)
+++ HD/DialysateInletFlow.py	(.../DialysateInletFlow.py)	(revision 0da0106eca868b9144298c60911710b3414a5837)
@@ -5,7 +5,7 @@
 #  THIS CODE MAY NOT BE COPIED OR REPRODUCED IN ANY FORM, IN PART OR IN
 #  WHOLE, WITHOUT THE EXPLICIT PERMISSION OF THE COPYRIGHT OWNER.
 #
-#  @file DialysateInletFlow.py
+#  @file dialysate_inlet_flow.py
 #
 #  @date 31-Mar-2020
 #  @author P. Lucia
@@ -16,8 +16,7 @@
 ############################################################################
 from DialIn.CoreCANProtocol import (DenaliMessage,
                                     DenaliChannels)
-from .utils import integer2ByteArray, float2ByteArray
-from .HemodialysisDevice import HD
+from utils import integer_to_byte_array, float_to_byte_array, RESET, NO_RESET
 import struct
 
 
@@ -39,7 +38,7 @@
     MSG_ID_HD_DIAL_IN_PUMP_MEAS_SPEED_OVERRIDE = 0x8015
     MSG_ID_HD_DIAL_IN_PUMP_ROTOR_MEAS_SPEED_OVERRIDE = 0x8016
 
-    # BloodFlow broadcast message field positions
+    # bloodflow broadcast message field positions
     START_POS_SET_PT = DenaliMessage.PAYLOAD_START_INDEX
     END_POS_SET_PT = START_POS_SET_PT + 4
     START_POS_MEAS_FLOW = END_POS_SET_PT
@@ -66,17 +65,17 @@
             channel_id = DenaliChannels.hd_sync_broadcast_ch_id
             msg_id = self.MSG_ID_HD_DIAL_IN_FLOW_PUBLISHED_DATA
             self.can_interface.register_receiving_publication_function(channel_id, msg_id,
-                                                                       self.handlerDialysateInletFlowSyncFunction)
+                                                                       self.handler_dialysate_inlet_flow_sync)
 
-        self.TargetDialysateInletFlowRate = 0
-        self.MeasuredDialysateInletFlowRate = 0.0
-        self.MeasuredDialysateInletPumpRotorSpeed = 0.0
-        self.MeasuredDialysateInletPumpSpeed = 0.0
-        self.MeasuredDialysateInletPumpMCSpeed = 0.0
-        self.MeasuredDialysateInletPumpMCCurrent = 0.0
-        self.PWMDutyCyclePct = 0.0
+        self.target_dialysate_inlet_flow_rate = 0
+        self.measured_dialysate_inlet_flow_rate = 0.0
+        self.measured_dialysate_inlet_pump_rotor_speed = 0.0
+        self.measured_dialysate_inlet_pump_speed = 0.0
+        self.measured_dialysate_inlet_pump_mc_speed = 0.0
+        self.measured_dialysate_inlet_pump_mc_current = 0.0
+        self.pwm_duty_cycle_pct = 0.0
 
-    def handlerDialysateInletFlowSyncFunction(self, message):
+    def handler_dialysate_inlet_flow_sync(self, message):
         """
             Handles published dialysate inlet flow data messages.  Dialysate flow data are captured
             for reference.
@@ -85,7 +84,7 @@
             \returns none
         """
 
-        self.TargetDialysateInletFlowRate = int.from_bytes(bytearray(
+        self.target_dialysate_inlet_flow_rate = int.from_bytes(bytearray(
             message['message'][self.START_POS_SET_PT:self.END_POS_SET_PT]),
             byteorder=DenaliMessage.BYTE_ORDER)
         flow = struct.unpack('f', bytearray(
@@ -101,14 +100,14 @@
         pwm = struct.unpack('f', bytearray(
             message['message'][self.START_POS_PWM_DC:self.END_POS_PWM_DC]))
 
-        self.MeasuredDialysateInletFlowRate = flow[0]
-        self.MeasuredDialysateInletPumpRotorSpeed = rotor[0]
-        self.MeasuredDialysateInletPumpSpeed = speed[0]
-        self.MeasuredDialysateInletPumpMCSpeed = mcspeed[0]
-        self.MeasuredDialysateInletPumpMCCurrent = mccurr[0]
-        self.PWMDutyCyclePct = pwm[0]
+        self.measured_dialysate_inlet_flow_rate = flow[0]
+        self.measured_dialysate_inlet_pump_rotor_speed = rotor[0]
+        self.measured_dialysate_inlet_pump_speed = speed[0]
+        self.measured_dialysate_inlet_pump_mc_speed = mcspeed[0]
+        self.measured_dialysate_inlet_pump_mc_current = mccurr[0]
+        self.pwm_duty_cycle_pct = pwm[0]
 
-    def CmdDialysateInletFlowSetPointOverride(self, reset, flow):
+    def cmd_dialysate_inlet_flow_set_point_override(self, reset, flow):
         """
             Constructs and sends the dialysate flow set point override command
 
@@ -117,8 +116,8 @@
             \returns 1 if successful, zero otherwise
         """
 
-        rst = integer2ByteArray(reset)
-        flo = integer2ByteArray(flow)
+        rst = integer_to_byte_array(reset)
+        flo = integer_to_byte_array(flow)
         payload = rst + flo
 
         message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_hd_ch_id,
@@ -133,7 +132,7 @@
         # If there is content...
         if received_message is not None:
             # print(received_message)
-            if reset == HD.RESET:
+            if reset == RESET:
                 str_res = "reset back to normal"
             else:
                 str_res = str(flow)
@@ -146,7 +145,7 @@
             print("Timeout!!!!")
             return False
 
-    def CmdDialysateInletFlowMeasuredOverride(self, reset, flow):
+    def cmd_dialysate_inlet_flow_measured_override(self, reset, flow):
         """
             Constructs and sends the measured dialysate flow override command
 
@@ -155,8 +154,8 @@
             \returns 1 if successful, zero otherwise
         """
 
-        rst = integer2ByteArray(reset)
-        flo = float2ByteArray(flow)
+        rst = integer_to_byte_array(reset)
+        flo = float_to_byte_array(flow)
         payload = rst + flo
 
         message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_hd_ch_id,
@@ -171,7 +170,7 @@
         # If there is content...
         if received_message is not None:
             # print(received_message)
-            if reset == HD.RESET:
+            if reset == RESET:
                 str_res = "reset back to normal"
             else:
                 str_res = str(flow)
@@ -183,7 +182,7 @@
             print("Timeout!!!!")
             return False
 
-    def CmdDialysateInletPumpMCMeasuredSpeedOverride(self, reset, speed):
+    def cmd_dialysate_inlet_pump_mc_measured_speed_override(self, reset, speed):
         """
             Constructs and sends the measured dialysate inlet pump motor controller speed \n
             override command.
@@ -193,8 +192,8 @@
             \returns 1 if successful, zero otherwise
         """
 
-        rst = integer2ByteArray(reset)
-        spd = float2ByteArray(speed)
+        rst = integer_to_byte_array(reset)
+        spd = float_to_byte_array(speed)
         payload = rst + spd
 
         message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_hd_ch_id,
@@ -209,7 +208,7 @@
         # If there is content...
         if received_message is not None:
             # print(received_message)
-            if reset == HD.RESET:
+            if reset == RESET:
                 str_res = "reset back to normal"
             else:
                 str_res = str(speed)
@@ -221,7 +220,7 @@
             print("Timeout!!!!")
             return False
 
-    def CmdDialysateInletPumpMeasuredCurrentOverride(self, reset, curr):
+    def cmd_dialysate_inlet_pump_measured_current_override(self, reset, curr):
         """
             Constructs and sends the measured dialysate inlet pump motor current override command
 
@@ -230,8 +229,8 @@
             \returns 1 if successful, zero otherwise
         """
 
-        rst = integer2ByteArray(reset)
-        cur = float2ByteArray(curr)
+        rst = integer_to_byte_array(reset)
+        cur = float_to_byte_array(curr)
         payload = rst + cur
 
         message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_hd_ch_id,
@@ -246,7 +245,7 @@
         # If there is content...
         if received_message is not None:
             # print(received_message)
-            if reset == HD.RESET:
+            if reset == RESET:
                 str_res = "reset back to normal"
             else:
                 str_res = str(curr)
@@ -258,7 +257,7 @@
             print("Timeout!!!!")
             return False
 
-    def CmdDialysateInletPumpMeasuredSpeedOverride(self, reset, speed):
+    def cmd_dialysate_inlet_pump_measured_speed_override(self, reset, speed):
         """
             Constructs and sends the measured dialysate inlet pump motor speed override \n
             command.
@@ -268,8 +267,8 @@
             \returns 1 if successful, zero otherwise
         """
 
-        rst = integer2ByteArray(reset)
-        spd = float2ByteArray(speed)
+        rst = integer_to_byte_array(reset)
+        spd = float_to_byte_array(speed)
         payload = rst + spd
 
         message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_hd_ch_id,
@@ -284,7 +283,7 @@
         # If there is content...
         if received_message is not None:
             # print(received_message)
-            if reset == HD.RESET:
+            if reset == RESET:
                 str_res = "reset back to normal"
             else:
                 str_res = str(speed)
@@ -296,7 +295,7 @@
             print("Timeout!!!!")
             return False
 
-    def CmdDialysateInletPumpRotorMeasuredSpeedOverride(self, reset, speed):
+    def cmd_dialysate_inlet_pump_rotor_measured_speed_override(self, reset, speed):
         """
             Constructs and sends the measured dialysate inlet pump rotor speed override \n
             command.
@@ -306,8 +305,8 @@
             \returns 1 if successful, zero otherwise
         """
 
-        rst = integer2ByteArray(reset)
-        spd = float2ByteArray(speed)
+        rst = integer_to_byte_array(reset)
+        spd = float_to_byte_array(speed)
         payload = rst + spd
 
         message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_hd_ch_id,
@@ -322,7 +321,7 @@
         # If there is content...
         if received_message is not None:
             # print(received_message)
-            if reset == HD.RESET:
+            if reset == RESET:
                 str_res = "reset back to normal"
             else:
                 str_res = str(speed)
@@ -334,7 +333,7 @@
             print("Timeout!!!!")
             return False
 
-    def CmdDialysateInletFlowBroadcastIntervalOverride(self, reset, ms):
+    def cmd_dialysate_inlet_flow_broadcast_interval_override(self, reset, ms):
         """
             Constructs and sends the measured dialysate inlet flow broadcast interval override command
 
@@ -343,8 +342,8 @@
             \returns 1 if successful, zero otherwise
         """
 
-        rst = integer2ByteArray(reset)
-        mis = integer2ByteArray(ms)
+        rst = integer_to_byte_array(reset)
+        mis = integer_to_byte_array(ms)
         payload = rst + mis
 
         message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_hd_ch_id,
@@ -358,7 +357,7 @@
 
         # If there is content...
         if received_message is not None:
-            if reset == HD.RESET:
+            if reset == RESET:
                 str_res = "reset back to normal: "
             else:
                 str_res = str(ms) + " ms: "
Index: HD/DialysateOutletFlow.py
===================================================================
diff -u -rc5826238ca4b80671231a9c564af3ea01b9be06f -r0da0106eca868b9144298c60911710b3414a5837
--- HD/DialysateOutletFlow.py	(.../DialysateOutletFlow.py)	(revision c5826238ca4b80671231a9c564af3ea01b9be06f)
+++ HD/DialysateOutletFlow.py	(.../DialysateOutletFlow.py)	(revision 0da0106eca868b9144298c60911710b3414a5837)
@@ -5,7 +5,7 @@
 #  THIS CODE MAY NOT BE COPIED OR REPRODUCED IN ANY FORM, IN PART OR IN
 #  WHOLE, WITHOUT THE EXPLICIT PERMISSION OF THE COPYRIGHT OWNER.
 #
-#  @file DialysateOutletFlow.py
+#  @file dialysate_outlet_flow.py
 #
 #  @date 31-Mar-2020
 #  @author P. Lucia
@@ -16,10 +16,10 @@
 ############################################################################
 from DialIn.CoreCANProtocol import (DenaliMessage,
                                     DenaliChannels)
-from .utils import integer2ByteArray, float2ByteArray
-from .HemodialysisDevice import HD
+from utils import integer_to_byte_array, float_to_byte_array, RESET
 import struct
 
+
 class HDDialysateOutletFlow:
     """
     \class HD_DialysateOutletFlow
@@ -40,7 +40,7 @@
     MSG_ID_HD_DIAL_OUT_PUMP_ROTOR_MEAS_SPEED_OVERRIDE = 0x8024
     MSG_ID_HD_DIAL_OUT_LOAD_CELL_WEIGHT_OVERRIDE = 0x8025
 
-    # BloodFlow broadcast message field positions
+    # bloodflow broadcast message field positions
     START_POS_REF_VOL = DenaliMessage.PAYLOAD_START_INDEX
     END_POS_REF_VOL = START_POS_REF_VOL + 4
     START_POS_MEAS_VOL = END_POS_REF_VOL
@@ -66,17 +66,17 @@
             channel_id = DenaliChannels.hd_sync_broadcast_ch_id
             msg_id = self.MSG_ID_HD_DIAL_OUT_FLOW_PUBLISHED_DATA
             self.can_interface.register_receiving_publication_function(channel_id, msg_id,
-                                                                  self.handlerDialysateOutletFlowSyncFunction)
+                                                                       self.handler_dialysate_outlet_flow_sync)
 
-        self.ReferenceDialysateOutletUFVolume = 0.0
-        self.MeasuredDialysateOutletUFVolume = 0.0
-        self.MeasuredDialysateOutletPumpRotorSpeed = 0.0
-        self.MeasuredDialysateOutletPumpSpeed = 0.0
-        self.MeasuredDialysateOutletPumpMCSpeed = 0.0
-        self.MeasuredDialysateOutletPumpMCCurrent = 0.0
-        self.PWMDutyCyclePct = 0.0
+        self.reference_dialysate_outlet_uf_volume = 0.0
+        self.measured_dialysate_outlet_uf_volume = 0.0
+        self.measured_dialysate_outlet_pump_rotor_speed = 0.0
+        self.measured_dialysate_outlet_pump_speed = 0.0
+        self.measured_dialysate_outlet_pump_mc_speed = 0.0
+        self.measured_dialysate_outlet_pump_mc_current = 0.0
+        self.pwm_duty_cycle_pct = 0.0
 
-    def handlerDialysateOutletFlowSyncFunction(self, message):
+    def handler_dialysate_outlet_flow_sync(self, message):
         """
             Handles published dialysate outlet flow data messages.  Dialysate flow data are captured
             for reference.
@@ -100,15 +100,15 @@
         pwm = struct.unpack('f', bytearray(
             message['message'][self.START_POS_PWM_DC:self.END_POS_PWM_DC]))
 
-        self.ReferenceDialysateOutletUFVolume = refVol[0]
-        self.MeasuredDialysateOutletUFVolume = measVol[0]
-        self.MeasuredDialysateOutletPumpRotorSpeed = rotor[0]
-        self.MeasuredDialysateOutletPumpSpeed = speed[0]
-        self.MeasuredDialysateOutletPumpMCSpeed = mcspeed[0]
-        self.MeasuredDialysateOutletPumpMCCurrent = mccurr[0]
-        self.PWMDutyCyclePct = pwm[0]
+        self.reference_dialysate_outlet_uf_volume = refVol[0]
+        self.measured_dialysate_outlet_uf_volume = measVol[0]
+        self.measured_dialysate_outlet_pump_rotor_speed = rotor[0]
+        self.measured_dialysate_outlet_pump_speed = speed[0]
+        self.measured_dialysate_outlet_pump_mc_speed = mcspeed[0]
+        self.measured_dialysate_outlet_pump_mc_current = mccurr[0]
+        self.pwm_duty_cycle_pct = pwm[0]
 
-    def CmdDialysateOutletReferenceUFVolumeOverride(self, reset, refVol):
+    def cmd_dialysate_outlet_reference_uf_volume_override(self, reset, refVol):
         """
         Constructs and sends the UF reference volume override command
 
@@ -117,8 +117,8 @@
         \returns 1 if successful, zero otherwise
         """
 
-        rst = integer2ByteArray(reset)
-        vol = float2ByteArray(refVol)
+        rst = integer_to_byte_array(reset)
+        vol = float_to_byte_array(refVol)
         payload = rst + vol
 
         message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_hd_ch_id,
@@ -133,7 +133,7 @@
         # If there is content...
         if received_message is not None:
             # print(received_message)
-            if reset == HD.RESET:
+            if reset == RESET:
                 str_res = "reset back to normal.  "
             else:
                 str_res = "overridden to " + str(refVol) + " mL.  "
@@ -146,7 +146,7 @@
             print("Timeout!!!!")
             return False
 
-    def CmdDialysateOutletMeasuredUFVolumeOverride(self, reset, measVol):
+    def cmd_dialysate_outlet_measured_uf_volume_override(self, reset, measVol):
         """
         Constructs and sends the measured UF volume override command
 
@@ -155,8 +155,8 @@
         \returns 1 if successful, zero otherwise
         """
 
-        rst = integer2ByteArray(reset)
-        vol = float2ByteArray(measVol)
+        rst = integer_to_byte_array(reset)
+        vol = float_to_byte_array(measVol)
         payload = rst + vol
 
         message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_hd_ch_id,
@@ -171,7 +171,7 @@
         # If there is content...
         if received_message is not None:
             # print(received_message)
-            if reset == HD.RESET:
+            if reset == RESET:
                 str_res = "reset back to normal.  "
             else:
                 str_res = "overridden to " + str(measVol) + " mL.  "
@@ -183,7 +183,7 @@
             print("Timeout!!!!")
             return False
 
-    def CmdDialysateOutletPumpMCMeasuredSpeedOverride(self, reset, speed):
+    def cmd_dialysate_outlet_pump_mc_measured_speed_override(self, reset, speed):
         """
             Constructs and sends the measured dialysate outlet pump motor controller speed \n
             override command.
@@ -193,12 +193,12 @@
             \returns 1 if successful, zero otherwise
         """
 
-        rst = integer2ByteArray(reset)
-        spd = float2ByteArray(speed)
+        rst = integer_to_byte_array(reset)
+        spd = float_to_byte_array(speed)
         payload = rst + spd
 
         message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_hd_ch_id,
-                                              message_id=self.MeasuredDialysateOutletPumpMCSpeed,
+                                              message_id=self.measured_dialysate_outlet_pump_mc_speed,
                                               payload=payload)
 
         print("override measured dialysate outlet pump motor controller speed to " + str(spd) + " RPM.")
@@ -209,7 +209,7 @@
         # If there is content...
         if received_message is not None:
             # print(received_message)
-            if reset == HD.RESET:
+            if reset == RESET:
                 str_res = "reset back to normal.  "
             else:
                 str_res = "overridden to " + str(speed) + " RPM.  "
@@ -221,7 +221,7 @@
             print("Timeout!!!!")
             return False
 
-    def CmdDialysateOutletPumpMeasuredCurrentOverride(self, reset, curr):
+    def cmd_dialysate_outlet_pump_measured_current_override(self, reset, curr):
         """
         Constructs and sends the measured dialysate outlet pump motor current override command
 
@@ -230,8 +230,8 @@
         \returns 1 if successful, zero otherwise
         """
 
-        rst = integer2ByteArray(reset)
-        cur = float2ByteArray(curr)
+        rst = integer_to_byte_array(reset)
+        cur = float_to_byte_array(curr)
         payload = rst + cur
 
         message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_hd_ch_id,
@@ -246,7 +246,7 @@
         # If there is content...
         if received_message is not None:
             # print(received_message)
-            if reset == HD.RESET:
+            if reset == RESET:
                 str_res = "reset back to normal.  "
             else:
                 str_res = "overridden to " + str(curr) + " mA.  "
@@ -258,7 +258,7 @@
             print("Timeout!!!!")
             return False
 
-    def CmdDialysateOutletPumpMeasuredSpeedOverride(self, reset, speed):
+    def cmd_dialysate_outlet_pump_measured_speed_override(self, reset, speed):
         """
         Constructs and sends the measured dialysate outlet pump motor speed override \n
         command.
@@ -268,8 +268,8 @@
         \returns 1 if successful, zero otherwise
         """
 
-        rst = integer2ByteArray(reset)
-        spd = float2ByteArray(speed)
+        rst = integer_to_byte_array(reset)
+        spd = float_to_byte_array(speed)
         payload = rst + spd
 
         message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_hd_ch_id,
@@ -284,7 +284,7 @@
         # If there is content...
         if received_message is not None:
             # print(received_message)
-            if reset == HD.RESET:
+            if reset == RESET:
                 str_res = "reset back to normal.  "
             else:
                 str_res = "overridden to " + str(speed) + " RPM.  "
@@ -296,7 +296,7 @@
             print("Timeout!!!!")
             return False
 
-    def CmdDialysateOutletPumpRotorMeasuredSpeedOverride(self, reset, speed):
+    def cmd_dialysate_outlet_pump_rotor_measured_speed_override(self, reset, speed):
         """
         Constructs and sends the measured dialysate outlet pump rotor speed override \n
         command.
@@ -306,8 +306,8 @@
         \returns 1 if successful, zero otherwise
         """
 
-        rst = integer2ByteArray(reset)
-        spd = float2ByteArray(speed)
+        rst = integer_to_byte_array(reset)
+        spd = float_to_byte_array(speed)
         payload = rst + spd
 
         message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_hd_ch_id,
@@ -322,7 +322,7 @@
         # If there is content...
         if received_message is not None:
             # print(received_message)
-            if reset == HD.RESET:
+            if reset == RESET:
                 str_res = "reset back to normal.  "
             else:
                 str_res = "overridden to " + str(speed) + " RPM.  "
@@ -334,7 +334,7 @@
             print("Timeout!!!!")
             return False
 
-    def CmdDialysateOutletFlowBroadcastIntervalOverride(self, reset, ms):
+    def cmd_dialysate_outlet_flow_broadcast_interval_override(self, reset, ms):
         """
         Constructs and sends the measured dialysate outlet flow broadcast interval override command
 
@@ -343,8 +343,8 @@
         \returns 1 if successful, zero otherwise
         """
 
-        rst = integer2ByteArray(reset)
-        mis = integer2ByteArray(ms)
+        rst = integer_to_byte_array(reset)
+        mis = integer_to_byte_array(ms)
         payload = rst + mis
 
         message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_hd_ch_id,
@@ -359,7 +359,7 @@
         # If there is content...
         if received_message is not None:
             # print(received_message)
-            if reset == HD.RESET:
+            if reset == RESET:
                 str_res = "reset back to normal. "
             else:
                 str_res = "overridden to " + str(ms) + " ms.  "
@@ -371,7 +371,7 @@
             print("Timeout!!!!")
             return False
 
-    def CmdDialysateOutletPumpLoadCellWeightOverride(self, reset, weight, sensor):
+    def cmd_dialysate_outlet_pump_load_cell_weight_override(self, reset, weight, sensor):
         """
         Constructs and sends the measured load cell weight override command.
 
@@ -387,9 +387,9 @@
             3 = reservoir 2 backup \n
         """
 
-        rst = integer2ByteArray(reset)
-        spd = float2ByteArray(weight)
-        sen = integer2ByteArray(sensor)
+        rst = integer_to_byte_array(reset)
+        spd = float_to_byte_array(weight)
+        sen = integer_to_byte_array(sensor)
         payload = rst + spd + sen
 
         message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_hd_ch_id,
@@ -404,7 +404,7 @@
         # If there is content...
         if received_message is not None:
             # print(received_message)
-            if reset == HD.RESET:
+            if reset == RESET:
                 str_res = "reset back to normal.  "
             else:
                 str_res = "overridden to " + str(weight) + " grams.  "
@@ -416,7 +416,7 @@
             print("Timeout!!!!")
             return False
 
-    def CmdSetLoadCellWeights(self, r1p, r1b, r2p, r2b):
+    def cmd_set_load_cell_weights(self, r1p, r1b, r2p, r2b):
         """
         Constructs and sends the set load cell weights command.
 
@@ -427,10 +427,10 @@
         \returns 0 - no response will come from HD for this message
         """
 
-        r1pb = float2ByteArray(r1p)
-        r1bb = float2ByteArray(r1b)
-        r2pb = float2ByteArray(r2p)
-        r2bb = float2ByteArray(r2b)
+        r1pb = float_to_byte_array(r1p)
+        r1bb = float_to_byte_array(r1b)
+        r2pb = float_to_byte_array(r2p)
+        r2bb = float_to_byte_array(r2b)
         payload = r1pb + r1bb + r2pb + r2bb
 
         message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_hd_ch_id,
@@ -440,6 +440,6 @@
         print("measured load cell weights set.")
 
         # Send message
-        received_message = self.can_interface.send(message, 0)
+        self.can_interface.send(message, 0)
 
         return 0
Index: HD/HD_DialOutFlow.py
===================================================================
diff -u -rc5826238ca4b80671231a9c564af3ea01b9be06f -r0da0106eca868b9144298c60911710b3414a5837
--- HD/HD_DialOutFlow.py	(.../HD_DialOutFlow.py)	(revision c5826238ca4b80671231a9c564af3ea01b9be06f)
+++ HD/HD_DialOutFlow.py	(.../HD_DialOutFlow.py)	(revision 0da0106eca868b9144298c60911710b3414a5837)
@@ -25,7 +25,7 @@
 
 class DialOutStates(Enum):
     """
-        Defines dialout states, i.e., STOP, RUN and PAUSE
+    Defines dialout states, i.e., STOP, RUN and PAUSE
     """
     STOP = 0
     RUN = 1
@@ -34,7 +34,7 @@
 
 class HDDialOut:
     """
-        Encapsulates command for testing dialout flow module.
+    Encapsulates command for testing dialout flow module.
     """
     can = None
 
@@ -50,14 +50,14 @@
 
     def __init__(self, can_interface):
         """
-            Constructor for the HDDialOut class
+        Constructor for the HDDialOut class
 
-            \param can_interface:  reference to DenaliMessenger
+        \param can_interface:  reference to DenaliMessenger
         """
         self.can_interface = can_interface
         self.can_interface.register_receiving_publication_function(channel_id=DenaliChannels.hd_sync_broadcast_ch_id,
                                                                    message_id=self.MSG_ID_DIALYSATE_UF_DATA,
-                                                                   function=self.receiveDialysateUFDataHandler)
+                                                                   function=self.handler_receive_dialysate_uf_data)
         ## DialOutBroadcast a dictionary storing latest broadcast values of the following keys:
         # state, target_volume, measured_volume, pwm, motor_current, motor_speed.
         self.DialOutBroadcast = {'target_volume': 0,
@@ -76,9 +76,9 @@
         #                           'pwm': []}
         #self.__time = 0
 
-    def setUFState(self, new_state):
+    def set_uf_state(self, new_state):
         """
-        setUFState function sets the new states to STOP, RUN or PAUSE
+        set_uf_state function sets the new states to STOP, RUN or PAUSE
         \param new_state: from DialOutStates.STOP, DialOutStates.RUN or DialoutStates.PAUSE
         \return: TRUE if confirmed, FALSE if HD had error or None for time out or incorrect parameters
         """
@@ -92,16 +92,16 @@
                                               payload=payload)
             received_msg = self.can_interface.send(msg)
         else:
-            print("Argument to setUFState method are incorrect", file=sys.stderr)
+            print("Argument to set_uf_state method are incorrect", file=sys.stderr)
 
         if received_msg is not None:
             return_value = True if DenaliMessage.get_payload(received_msg)[0] == 1 else False
 
         return return_value
 
-    def setUFRx(self, rx_total_volume_ml, rx_time_min, rx_flow_rate):
+    def set_uf_rx(self, rx_total_volume_ml, rx_time_min, rx_flow_rate):
         """
-        setUFRx function sets prescription for UF.  Total Volume, time in minutes and flow rate
+        set_uf_rx function sets prescription for UF.  Total Volume, time in minutes and flow rate
         \param rx_total_volume_ml (integer) is total volume in ml
         \param rx_time_min (integer) is rx time
         \param rx_flow_rate (integer) is described flow rate
@@ -123,14 +123,14 @@
             received_msg = self.can_interface.send(msg)
             print(received_msg)
         else:
-            print("Arguments to setUFRx are incorrect", file=sys.stderr)
+            print("Arguments to set_uf_rx are incorrect", file=sys.stderr)
 
         if received_msg is not None:
             return_value = True if DenaliMessage.get_payload(received_msg)[0] == 1 else False
 
         return return_value
 
-    def receiveDialysateUFDataHandler(self, message):
+    def handler_receive_dialysate_uf_data(self, message):
         """
             Receiver method that handles UF broadcast data from the HD.
         \param message: Denali message received
@@ -162,7 +162,7 @@
         #self.__BroadCastSignals['pwm'].append(self.DialOutBroadcast['pwm'])
         #self.__time += 1
 
-    def plotBroadCastSignals(self):
+    def plot_broadcast_signals(self):
         """
             Temporary method to demo STOP, PLAY and PAUSE behavior with simulator.
         \return: None
Index: HD/HD_TestScript.py
===================================================================
diff -u -r082ea4c8b0c6a3c804453308990d0bb98a0a2156 -r0da0106eca868b9144298c60911710b3414a5837
--- HD/HD_TestScript.py	(.../HD_TestScript.py)	(revision 082ea4c8b0c6a3c804453308990d0bb98a0a2156)
+++ HD/HD_TestScript.py	(.../HD_TestScript.py)	(revision 0da0106eca868b9144298c60911710b3414a5837)
@@ -16,46 +16,46 @@
 # TODO: Use .format or f" {varname}" instead of casting to string.
 # TODO: Break while loops on some condition, shouldn't rely on Ctrl-C.
 
-from .HemodialysisDevice import HD
+from HemodialysisDevice import HD
 from time import sleep
 
 if __name__ == "__main__":
-    hd = HD()
+    hd = HD(can_interface_name="vcan0")
     sleep(2)
 
-    if hd.Basics.cmd_log_in_to_hd() == 0:
+    if hd.basics.cmd_log_in_to_hd() == 0:
         exit(1)
 
-    hd.BloodFlow.CmdBloodFlowBroadcastIntervalOverride(hd.RESET, 0)
+    hd.bloodflow.cmd_blood_flow_broadcast_interval_override(hd.RESET, 0)
 
     sleep(2)
-    print("Blood Flow Target = " + str(hd.BloodFlow.TargetBloodFlowRate))
-    print("Blood Pump Current= " + str(hd.BloodFlow.MeasuredBloodPumpMCCurrent))
+    print("Blood Flow Target = " + str(hd.bloodflow.TargetBloodFlowRate))
+    print("Blood Pump Current= " + str(hd.bloodflow.MeasuredBloodPumpMCCurrent))
     sleep(5)
-    print("Blood Pump Current= " + str(hd.BloodFlow.MeasuredBloodPumpMCCurrent))
+    print("Blood Pump Current= " + str(hd.bloodflow.MeasuredBloodPumpMCCurrent))
 
-    hd.BloodFlow.CmdBloodPumpMeasuredCurrentOverride(hd.NO_RESET, 140)
+    hd.bloodflow.cmd_blood_pump_measured_current_override(hd.NO_RESET, 140)
 
     sleep(1)
-    print("Blood Pump Current= " + str(hd.BloodFlow.MeasuredBloodPumpMCCurrent))
+    print("Blood Pump Current= " + str(hd.bloodflow.MeasuredBloodPumpMCCurrent))
     sleep(5)
-    hd.BloodFlow.CmdBloodPumpMeasuredCurrentOverride(hd.RESET, 0)
+    hd.bloodflow.cmd_blood_pump_measured_current_override(hd.RESET, 0)
 
     while True:
         sleep(0.5)
-        print("Measured Flow = " + str(hd.BloodFlow.MeasuredBloodFlowRate) + " mL/min")
+        print("Measured Flow = " + str(hd.bloodflow.MeasuredBloodFlowRate) + " mL/min")
     tgtRate = 0
-    hd.BloodFlow.CmdBloodFlowBroadcastIntervalOverride(hd.NO_RESET, 2000)
+    hd.BloodFlow.cmd_blood_flow_broadcast_interval_override(hd.NO_RESET, 2000)
 
     while True:
         if hd.BloodFlow.TargetBloodFlowRate == 0:
             if tgtRate != 0:
-                hd.BloodFlow.CmdBloodFlowBroadcastIntervalOverride(hd.NO_RESET, 2000)
+                hd.BloodFlow.cmd_blood_flow_broadcast_interval_override(hd.NO_RESET, 2000)
                 tgtRate = 0
         else:
             if tgtRate == 0:
-                hd.BloodFlow.CmdBloodFlowBroadcastIntervalOverride(hd.NO_RESET, 200)
+                hd.BloodFlow.cmd_blood_flow_broadcast_interval_override(hd.NO_RESET, 200)
                 tgtRate = hd.BloodFlow.TargetBloodFlowRate
 
-#    hd.BloodFlow.CmdBloodFlowBroadcastIntervalOverride(hd.RESET,0)
+#    hd.bloodflow.cmd_blood_flow_broadcast_interval_override(hd.RESET,0)
 
Index: HD/HemodialysisDevice.py
===================================================================
diff -u -r082ea4c8b0c6a3c804453308990d0bb98a0a2156 -r0da0106eca868b9144298c60911710b3414a5837
--- HD/HemodialysisDevice.py	(.../HemodialysisDevice.py)	(revision 082ea4c8b0c6a3c804453308990d0bb98a0a2156)
+++ HD/HemodialysisDevice.py	(.../HemodialysisDevice.py)	(revision 0da0106eca868b9144298c60911710b3414a5837)
@@ -16,23 +16,24 @@
 ############################################################################
 from DialIn.CoreCANProtocol import (DenaliCanMessenger)
 from time import sleep
-from .Alarms import HDAlarms
-from .Buttons import HDButtons
-from .UI import HDUI
-from .Watchdog import HDWatchdog
-from .RTC import HDRTC
-from .BloodFlow import HDBloodFlow
-from .DialysateInletFlow import HDDialysateInletFlow
-from .DialysateOutletFlow import HDDialysateOutletFlow
-from .Treatment import HDTreatment
-from .Basics import HDBasics
-from .PressureOcclusion import HDPressureOcclusion
+from Alarms import HDAlarms
+from Buttons import HDButtons
+from UI import HDUI
+from Watchdog import HDWatchdog
+from RTC import HDRTC
+from BloodFlow import HDBloodFlow
+from DialysateInletFlow import HDDialysateInletFlow
+from DialysateOutletFlow import HDDialysateOutletFlow
+from Treatment import HDTreatment
+from Basics import HDBasics
+from PressureOcclusion import HDPressureOcclusion
+from utils import integer_to_byte_array, RESET, NO_RESET
+from DialIn.CoreCANProtocol import (DenaliMessage,
+                                    DenaliChannels)
 
 
+
 class HD:
-    # for reset param in override commands
-    NO_RESET = 0
-    RESET = 1
 
     def __init__(self, can_interface_name="can0"):
         """
@@ -50,59 +51,78 @@
         self.can_interface.start()
 
         # Create command groups
-        self.Basics = HDBasics(self.can_interface)
-        self.Alarms = HDAlarms(self.can_interface)
-        self.Buttons = HDButtons(self.can_interface)
-        self.UI = HDUI(self.can_interface)
-        self.RTC = HDRTC(self.can_interface)
-        self.Watchdog = HDWatchdog(self.can_interface)
-        self.BloodFlow = HDBloodFlow(self.can_interface)
-        self.DialysateInletFlow = HDDialysateInletFlow(self.can_interface)
-        self.DialysateOutletFlow = HDDialysateOutletFlow(self.can_interface)
-        self.Treatment = HDTreatment(self.can_interface)
-        self.Pressure_Occlusion = HDPressureOcclusion(self.can_interface)
+        self.basics = HDBasics(self.can_interface)
+        self.alarms = HDAlarms(self.can_interface)
+        self.buttons = HDButtons(self.can_interface)
+        self.ui = HDUI(self.can_interface)
+        self.rtc = HDRTC(self.can_interface)
+        self.watchdog = HDWatchdog(self.can_interface)
+        self.bloodflow = HDBloodFlow(self.can_interface)
+        self.dialysate_inlet_flow = HDDialysateInletFlow(self.can_interface)
+        self.dialysate_outlet_flow = HDDialysateOutletFlow(self.can_interface)
+        self.treatment = HDTreatment(self.can_interface)
+        self.pressure_occlusion = HDPressureOcclusion(self.can_interface)
 
+    def test_can_message(self, seq):
+        """
+        Sends a test can message
+        \param seq: the starting integer of the sequence
+        """
+        zero = integer_to_byte_array(0)
+        seq1 = integer_to_byte_array(seq)
+        seq2 = integer_to_byte_array(seq + 1)
+        seq3 = integer_to_byte_array(seq + 2)
+        seq4 = integer_to_byte_array(seq + 3)
+        seq5 = integer_to_byte_array(seq + 4)
 
+        payload = seq1 + zero + seq2 + zero + seq3 + zero + seq4 + zero + seq5
+
+        message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_hd_ch_id,
+                                              message_id=6,
+                                              payload=payload)
+
+        self.can_interface.send(message, 0)
+
+
 if __name__ == "__main__":
     # create an HD object called hd
     hd = HD()
 
     while True:
         sleep(1)
-        print(hd.Alarms.alarmStates)
+        print(hd.alarms.alarm_states)
 
     # wait 2 seconds and then login to HD as a tester
     sleep(2)
     hd.Basics.cmd_log_in_to_hd()
 
     # FIXME: Delete commented code:
-    # hd.RTC.CmdSetRTCTimeAndDate(0, 2, 1, 5, 1, 2020)
+    # hd.rtc.cmd_set_rtc_time_and_date(0, 2, 1, 5, 1, 2020)
 
     while True:
         print(hd.RTC.RTCEpoch)
         sleep(1)
 
-
 # FIXME: This should either be deleted or moved to a file:
 """"
-    hd.BloodFlow.CmdBloodPumpMeasuredCurrentOverride(hd.NO_RESET,149)
+    hd.bloodflow.cmd_blood_pump_measured_current_override(NO_RESET,149)
     totalVolumeInMl = 2400
     rxTimeInMins = 30
     flowRateMlmin = 100
 
     sleep(2)
-    resp = hd.DialOut.setUFRx(totalVolumeInMl, rxTimeInMins, flowRateMlmin)
+    resp = hd.DialOut.set_uf_rx(totalVolumeInMl, rxTimeInMins, flowRateMlmin)
     print("Set TotalVolume(mL): {}, TotalTime(mins): {} and flowrate (ml/min): {}, resp: {}".format(totalVolumeInMl,
                                                                                           rxTimeInMins, flowRateMlmin, resp))
 
     sleep(2)
     rxTimeInMins = 60
-    resp = hd.DialOut.setUFRx(totalVolumeInMl, rxTimeInMins, flowRateMlmin)
+    resp = hd.DialOut.set_uf_rx(totalVolumeInMl, rxTimeInMins, flowRateMlmin)
     print("Set TotalVolume(mL): {}, TotalTime(mins): {} and flowrate (ml/min): {}, resp: {}".format(totalVolumeInMl,
                                                                                           rxTimeInMins, flowRateMlmin, resp))
 
     sleep(5)
-    hd.DialOut.setUFState(DialOutStates.RUN)
+    hd.DialOut.set_uf_state(DialOutStates.RUN)
     state_run = hd.DialOut.DialOutBroadcast['state']
     sleep(2)
     print("After RUN: {}".format(hd.DialOut.DialOutBroadcast))
@@ -113,48 +133,48 @@
     sleep(20)
     print("After 40 secs RUN: {}".format(hd.DialOut.DialOutBroadcast))
 
-    hd.DialOut.setUFState(DialOutStates.PAUSE)
+    hd.DialOut.set_uf_state(DialOutStates.PAUSE)
     sleep(2)
     print("After PAUSE: {}".format(hd.DialOut.DialOutBroadcast))
     state_pause = hd.DialOut.DialOutBroadcast['state']
 
     sleep(10)
-    hd.DialOut.setUFState(DialOutStates.STOP)
+    hd.DialOut.set_uf_state(DialOutStates.STOP)
     sleep(2)
     print("---> After STOP:{} <---".format(hd.DialOut.DialOutBroadcast))
 
     sleep(3)
-    hd.DialOut.setUFState(DialOutStates.RUN)
+    hd.DialOut.set_uf_state(DialOutStates.RUN)
     sleep(2)
     state_stop = hd.DialOut.DialOutBroadcast['state']
     print("After RUN again: {}".format(hd.DialOut.DialOutBroadcast))
 
     sleep(3)
-    hd.DialOut.setUFState(DialOutStates.STOP)
+    hd.DialOut.set_uf_state(DialOutStates.STOP)
     sleep(2)
     state_stop = hd.DialOut.DialOutBroadcast['state']
     print("After STOP: {}".format(hd.DialOut.DialOutBroadcast))
 
     sleep(5)
-    hd.DialOut.plotBroadCastSignals()
+    hd.DialOut.plot_broadcast_signals()
 
     exit()
     tgtRate = 0
-    hd.BloodFlow.CmdBloodFlowBroadcastIntervalOverride(hd.NO_RESET, 2000)
+    hd.bloodflow.cmd_blood_flow_broadcast_interval_override(NO_RESET, 2000)
 
     while True:
-        if hd.BloodFlow.TargetBloodFlowRate == 0:
+        if hd.bloodflow.target_blood_flow_rate == 0:
             if tgtRate != 0:
-                hd.BloodFlow.CmdBloodFlowBroadcastIntervalOverride(hd.NO_RESET, 2000)
+                hd.bloodflow.cmd_blood_flow_broadcast_interval_override(NO_RESET, 2000)
                 tgtRate = 0
         else:
             if tgtRate == 0:
-                hd.BloodFlow.CmdBloodFlowBroadcastIntervalOverride(hd.NO_RESET, 200)
-                tgtRate = hd.BloodFlow.TargetBloodFlowRate
+                hd.bloodflow.cmd_blood_flow_broadcast_interval_override(NO_RESET, 200)
+                tgtRate = hd.bloodflow.target_blood_flow_rate
 
         sleep(1)
 
-        print(hd.BloodFlow.MeasuredBloodFlowRate)
+        print(hd.bloodflow.measured_blood_flow_rate)
 
-#    hd.BloodFlow.CmdBloodFlowBroadcastIntervalOverride(hd.RESET,0)
+#    hd.bloodflow.cmd_blood_flow_broadcast_interval_override(RESET,0)
 """
Index: HD/PressureOcclusion.py
===================================================================
diff -u -rc5826238ca4b80671231a9c564af3ea01b9be06f -r0da0106eca868b9144298c60911710b3414a5837
--- HD/PressureOcclusion.py	(.../PressureOcclusion.py)	(revision c5826238ca4b80671231a9c564af3ea01b9be06f)
+++ HD/PressureOcclusion.py	(.../PressureOcclusion.py)	(revision 0da0106eca868b9144298c60911710b3414a5837)
@@ -16,8 +16,7 @@
 ############################################################################
 from DialIn.CoreCANProtocol import (DenaliMessage,
                                     DenaliChannels)
-from .utils import integer2ByteArray, float2ByteArray
-from .HemodialysisDevice import HD
+from utils import integer_to_byte_array, float_to_byte_array, RESET
 import struct
 
 
@@ -63,37 +62,21 @@
             channel_id = DenaliChannels.hd_sync_broadcast_ch_id
             msg_id = self.MSG_ID_HD_PRESSURE_OCCLUSION_DATA
             self.can_interface.register_receiving_publication_function(channel_id, msg_id,
-                                                                  self.handlerPresOcclSyncFunction)
+                                                                       self.handler_pressure_occlusion_sync)
 
         self.arterialPressure = 0
         self.venousPressure = 0.0
         self.bloodPumpOcclusion = 0.0
         self.dialysateInletPumpOcclusion = 0.0
         self.dialysateOutletPumpOcclusion = 0.0
 
-    def test_can_message(self, seq):
-        zero = integer2ByteArray(0)
-        seq1 = integer2ByteArray(seq)
-        seq2 = integer2ByteArray(seq+1)
-        seq3 = integer2ByteArray(seq+2)
-        seq4 = integer2ByteArray(seq+3)
-        seq5 = integer2ByteArray(seq+4)
-
-        payload = seq1 + zero + seq2 + zero + seq3 + zero + seq4 + zero + seq5
-
-        message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_hd_ch_id,
-                                              message_id=6,
-                                              payload=payload)
-
-        self.can_interface.send(message, 0)
-
-    def handlerPresOcclSyncFunction(self, message):
+    def handler_pressure_occlusion_sync(self, message):
         """
-            Handles published pressure & occlusion data messages.  Pressure data are captured
-            for reference.
+        Handles published pressure & occlusion data messages.  Pressure data are captured
+        for reference.
 
-            \param message:  published pressure & occlusion data message
-            \returns none
+        \param message:  published pressure & occlusion data message
+        \returns none
         """
 
         art = struct.unpack('f', bytearray(
@@ -113,7 +96,7 @@
         self.dialysateInletPumpOcclusion = dpi[0]
         self.dialysateOutletPumpOcclusion = dpo[0]
 
-    def CmdArterialPressureMeasuredOverride(self, reset, pres):
+    def cmd_arterial_pressure_measured_override(self, reset, pres):
         """
         Constructs and sends the measured arterial pressure override command
 
@@ -122,8 +105,8 @@
         \returns 1 if successful, zero otherwise
         """
 
-        rst = integer2ByteArray(reset)
-        prs = float2ByteArray(pres)
+        rst = integer_to_byte_array(reset)
+        prs = float_to_byte_array(pres)
         payload = rst + prs
 
         message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_hd_ch_id,
@@ -137,7 +120,7 @@
 
         # If there is content...
         if received_message is not None:
-            if reset == HD.RESET:
+            if reset == RESET:
                 str_res = "reset back to normal.  "
             else:
                 str_res = str(pres) + " mmHg.  "
@@ -149,9 +132,7 @@
             print("Timeout!!!!")
             return False
 
-
-
-    def CmdVenousPressureMeasuredOverride(self, reset, pres):
+    def cmd_venous_pressure_measured_override(self, reset, pres):
         """
         Constructs and sends the measured venous pressure \n
         override command.
@@ -161,8 +142,8 @@
         \returns 1 if successful, zero otherwise
         """
 
-        rst = integer2ByteArray(reset)
-        prs = float2ByteArray(pres)
+        rst = integer_to_byte_array(reset)
+        prs = float_to_byte_array(pres)
         payload = rst + prs
 
         message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_hd_ch_id,
@@ -176,7 +157,7 @@
 
         # If there is content...
         if received_message is not None:
-            if reset == HD.RESET:
+            if reset == RESET:
                 str_res = "reset back to normal.  "
             else:
                 str_res = str(pres) + " mmHg.  "
@@ -188,7 +169,7 @@
             print("Timeout!!!!")
             return False
 
-    def CmdBloodPumpMeasuredOcclusionOverride(self, reset, occl):
+    def cmd_blood_pump_measured_occlusion_override(self, reset, occl):
         """
             Constructs and sends the measured blood pump occlusion pressure override command
 
@@ -197,8 +178,8 @@
             \returns 1 if successful, zero otherwise
         """
 
-        rst = integer2ByteArray(reset)
-        occ = float2ByteArray(occl)
+        rst = integer_to_byte_array(reset)
+        occ = float_to_byte_array(occl)
         payload = rst + occ
 
         message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_hd_ch_id,
@@ -212,7 +193,7 @@
 
         # If there is content...
         if received_message is not None:
-            if reset == HD.RESET:
+            if reset == RESET:
                 str_res = "reset back to normal.  "
             else:
                 str_res = str(occl) + " mmHg.  "
@@ -224,7 +205,7 @@
             print("Timeout!!!!")
             return False
 
-    def CmdDialysateInletPumpMeasuredOcclusionOverride(self, reset, occl):
+    def cmd_dialysate_inlet_pump_measured_occlusion_override(self, reset, occl):
         """
         Constructs and sends the measured dialysate inlet pump occlusion pressure override \n
         command.
@@ -234,8 +215,8 @@
         \returns 1 if successful, zero otherwise
         """
 
-        rst = integer2ByteArray(reset)
-        occ = float2ByteArray(occl)
+        rst = integer_to_byte_array(reset)
+        occ = float_to_byte_array(occl)
         payload = rst + occ
 
         message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_hd_ch_id,
@@ -249,7 +230,7 @@
 
         # If there is content...
         if received_message is not None:
-            if reset == HD.RESET:
+            if reset == RESET:
                 str_res = "reset back to normal.  "
             else:
                 str_res = str(occl) + " mmHg.  "
@@ -261,7 +242,7 @@
             print("Timeout!!!!")
             return False
 
-    def CmdDialysateOutletPumpMeasuredOcclusionOverride(self, reset, occl):
+    def cmd_dialysate_outlet_pump_measured_occlusion_override(self, reset, occl):
         """
         Constructs and sends the measured dialysate outlet pump occlusion pressure override \n
         command.
@@ -271,8 +252,8 @@
         \returns 1 if successful, zero otherwise
         """
 
-        rst = integer2ByteArray(reset)
-        occ = float2ByteArray(occl)
+        rst = integer_to_byte_array(reset)
+        occ = float_to_byte_array(occl)
         payload = rst + occ
 
         message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_hd_ch_id,
@@ -286,7 +267,7 @@
 
         # If there is content...
         if received_message is not None:
-            if reset == HD.RESET:
+            if reset == RESET:
                 str_res = "reset back to normal.  "
             else:
                 str_res = str(occl) + " mmHg.  "
@@ -298,7 +279,7 @@
             print("Timeout!!!!")
             return False
 
-    def CmdPressureOcclusionBroadcastIntervalOverride(self, reset, ms):
+    def cmd_pressure_occlusion_broadcast_interval_override(self, reset, ms):
         """
             Constructs and sends the pressure/occlusion broadcast interval override command
 
@@ -307,8 +288,8 @@
             \returns 1 if successful, zero otherwise
         """
 
-        rst = integer2ByteArray(reset)
-        mis = integer2ByteArray(ms)
+        rst = integer_to_byte_array(reset)
+        mis = integer_to_byte_array(ms)
         payload = rst + mis
 
         message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_hd_ch_id,
@@ -322,7 +303,7 @@
 
         # If there is content...
         if received_message is not None:
-            if reset == HD.RESET:
+            if reset == RESET:
                 str_res = "reset back to normal: "
             else:
                 str_res = str(ms) + " ms: "
Index: HD/RTC.py
===================================================================
diff -u -rc5826238ca4b80671231a9c564af3ea01b9be06f -r0da0106eca868b9144298c60911710b3414a5837
--- HD/RTC.py	(.../RTC.py)	(revision c5826238ca4b80671231a9c564af3ea01b9be06f)
+++ HD/RTC.py	(.../RTC.py)	(revision 0da0106eca868b9144298c60911710b3414a5837)
@@ -5,7 +5,7 @@
 #  THIS CODE MAY NOT BE COPIED OR REPRODUCED IN ANY FORM, IN PART OR IN
 #  WHOLE, WITHOUT THE EXPLICIT PERMISSION OF THE COPYRIGHT OWNER.
 #
-#  @file RTC.py
+#  @file rtc.py
 #
 #  @date 31-Mar-2020
 #  @author P. Lucia
@@ -16,14 +16,15 @@
 ############################################################################
 from DialIn.CoreCANProtocol import (DenaliMessage,
                                     DenaliChannels)
-from .utils import integer2ByteArray, float2ByteArray
+from utils import integer_to_byte_array, float_to_byte_array
 import ctypes
 
+
 class HDRTC:
     """
-        \class HDRTC
+    \class HDRTC
 
-        \brief Hemodialysis Device (HD) Dialin API sub-class for RTC commands.
+    \brief Hemodialysis Device (HD) Dialin API sub-class for rtc commands.
     """
 
     MSG_ID_SET_RTC_DATE_TIME = 0x801D
@@ -46,24 +47,24 @@
             channel_id = DenaliChannels.hd_sync_broadcast_ch_id
             msg_id = self.MSG_ID_RTC_EPOCH
             self.can_interface.register_receiving_publication_function(channel_id, msg_id,
-                                                                  self.handlerRTCEpoch)
-        self.RTCEpoch = 0
+                                                                       self.handler_rtc_epoch)
+        self.rtc_epoch = 0
 
-    def handlerRTCEpoch(self, message):
+    def handler_rtc_epoch(self, message):
         """
-            Publishes the RTC time in epoch
+            Publishes the rtc time in epoch
 
-            \param message:  published RTC epoch message
+            \param message:  published rtc epoch message
             \returns none
         """
         epoch = int.from_bytes(bytearray(
             message['message'][self.START_POS_SET_PT:self.END_POS_SET_PT]),
             byteorder=DenaliMessage.BYTE_ORDER)
-        self.RTCEpoch = ctypes.c_uint32(epoch)
+        self.rtc_epoch = ctypes.c_uint32(epoch)
 
-    def CmdSetRTCTimeAndDate(self, secs, mins, hours, days, months, years):
+    def cmd_set_rtc_time_and_date(self, secs, mins, hours, days, months, years):
         """
-            Constructs and sends the time and date to be written to RTC
+            Constructs and sends the time and date to be written to rtc
 
             \returns 1 if successful, zero otherwise
         """
@@ -72,14 +73,14 @@
         hour = bytes([hours])
         day = bytes([days])
         month = bytes([months])
-        year = integer2ByteArray(years)
+        year = integer_to_byte_array(years)
         payload = sec + min + hour + day + month + year
 
         message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_hd_ch_id,
                                               message_id=self.MSG_ID_SET_RTC_DATE_TIME,
                                               payload=payload)
 
-        print("Setting time and date to RTC")
+        print("Setting time and date to rtc")
 
         # Send message
         received_message = self.can_interface.send(message)
@@ -88,7 +89,7 @@
         if received_message is not None:
             print(received_message)
             # str_res = str(flow)
-            print("Time and Date in RTC set to seconds: " + str(sec) + " minutes: " + str(min) + " hours: " +
+            print("Time and Date in rtc set to seconds: " + str(sec) + " minutes: " + str(min) + " hours: " +
                   str(hour) + " days: " + str(day) + " months: " + str(month) + " years: " + str(year) +
                   str(received_message['message'][DenaliMessage.PAYLOAD_START_INDEX]))
             # response payload is OK or not OK
Index: HD/Treatment.py
===================================================================
diff -u -rc5826238ca4b80671231a9c564af3ea01b9be06f -r0da0106eca868b9144298c60911710b3414a5837
--- HD/Treatment.py	(.../Treatment.py)	(revision c5826238ca4b80671231a9c564af3ea01b9be06f)
+++ HD/Treatment.py	(.../Treatment.py)	(revision 0da0106eca868b9144298c60911710b3414a5837)
@@ -5,7 +5,7 @@
 #  THIS CODE MAY NOT BE COPIED OR REPRODUCED IN ANY FORM, IN PART OR IN
 #  WHOLE, WITHOUT THE EXPLICIT PERMISSION OF THE COPYRIGHT OWNER.
 #
-#  @file Treatment.py
+#  @file treatment.py
 #
 #  @date 31-Mar-2020
 #  @author P. Lucia
@@ -27,19 +27,19 @@
 
     """
 
-    # Treatment message IDs
+    # treatment message IDs
     MSG_ID_HD_TREATMENT_TIME_PUBLISHED_DATA = 0x000D
     MSG_ID_HD_TREATMENT_STATE_PUBLISHED_DATA = 0X000F
 
-    # Treatment time broadcast message field positions
+    # treatment time broadcast message field positions
     START_POS_TIME_PRES = DenaliMessage.PAYLOAD_START_INDEX
     END_POS_TIME_PRES = START_POS_TIME_PRES + 4
     START_POS_TIME_ELAPSED = END_POS_TIME_PRES
     END_POS_TIME_ELAPSED = START_POS_TIME_ELAPSED + 4
     START_POS_TIME_REMAINING = END_POS_TIME_ELAPSED
     END_POS_TIME_REMAINING = START_POS_TIME_REMAINING + 4
 
-    # Treatment state broadcast message field positions
+    # treatment state broadcast message field positions
     START_POS_TREATMENT_STATE = DenaliMessage.PAYLOAD_START_INDEX
     END_POS_TREATMENT_STATE = START_POS_TREATMENT_STATE + 4
     START_POS_UF_STATE = END_POS_TREATMENT_STATE
@@ -57,25 +57,25 @@
             channel_id = DenaliChannels.hd_sync_broadcast_ch_id
             msg_id = self.MSG_ID_HD_TREATMENT_TIME_PUBLISHED_DATA
             self.can_interface.register_receiving_publication_function(channel_id, msg_id,
-                                                                  self.handlerTreatmentTimeSyncFunction)
+                                                                       self.handler_treatment_time_sync)
             msg_id = self.MSG_ID_HD_TREATMENT_STATE_PUBLISHED_DATA
             self.can_interface.register_receiving_publication_function(channel_id, msg_id,
-                                                                  self.handlerTreatmentStateSyncFunction)
+                                                                       self.handler_treatment_state_sync)
 
-        self.TreatmentTimePrescribed = 0
-        self.TreatmentTimeElapsed = 0
-        self.TreatmentTimeRemaining = 0
-        self.TreatmentState = 0
-        self.TreatmentUFState = 0
-        self.SalineBolusInProgress = False
+        self.treatment_time_prescribed = 0
+        self.treatment_time_elapsed = 0
+        self.treatment_time_remaining = 0
+        self.treatment_state = 0
+        self.treatment_uf_state = 0
+        self.saline_bolus_in_progress = False
 
-    def handlerTreatmentTimeSyncFunction(self, message):
+    def handler_treatment_time_sync(self, message):
         """
-            Handles published treatment time data messages.  Treatment time data are captured
-            for reference.
+        Handles published treatment time data messages.  treatment time data are captured
+        for reference.
 
-            \param message:  published treatment time data message
-            \returns none
+        \param message:  published treatment time data message
+        \returns none
         """
 
         tot = struct.unpack('i', bytearray(
@@ -85,17 +85,17 @@
         rem = struct.unpack('i', bytearray(
             message['message'][self.START_POS_TIME_REMAINING:self.END_POS_TIME_REMAINING]))
 
-        self.TreatmentTimePrescribed = tot[0]
-        self.TreatmentTimeElapsed = ela[0]
-        self.TreatmentTimeRemaining = rem[0]
+        self.treatment_time_prescribed = tot[0]
+        self.treatment_time_elapsed = ela[0]
+        self.treatment_time_remaining = rem[0]
 
-    def handlerTreatmentStateSyncFunction(self, message):
+    def handler_treatment_state_sync(self, message):
         """
-            Handles published treatment state data messages.  Treatment state data are captured
-            for reference.
+        Handles published treatment state data messages.  treatment state data are captured
+        for reference.
 
-            \param message:  published treatment state data message
-            \returns none
+        \param message:  published treatment state data message
+        \returns none
         """
 
         tst = struct.unpack('i', bytearray(
@@ -105,9 +105,9 @@
         bol = struct.unpack('i', bytearray(
             message['message'][self.START_POS_SALINE_BOLUS_IN_PROGRESS:self.END_POS_SALINE_BOLUS_IN_PROGRESS]))
 
-        self.TreatmentState = tst[0]
-        self.TreatmentUFState = ufs[0]
+        self.treatment_state = tst[0]
+        self.treatment_uf_state = ufs[0]
         if bol[0] == 1:
-            self.SalineBolusInProgress = True
+            self.saline_bolus_in_progress = True
         else:
-            self.SalineBolusInProgress = False
+            self.saline_bolus_in_progress = False
Index: HD/UI.py
===================================================================
diff -u -rc5826238ca4b80671231a9c564af3ea01b9be06f -r0da0106eca868b9144298c60911710b3414a5837
--- HD/UI.py	(.../UI.py)	(revision c5826238ca4b80671231a9c564af3ea01b9be06f)
+++ HD/UI.py	(.../UI.py)	(revision 0da0106eca868b9144298c60911710b3414a5837)
@@ -5,7 +5,7 @@
 #  THIS CODE MAY NOT BE COPIED OR REPRODUCED IN ANY FORM, IN PART OR IN
 #  WHOLE, WITHOUT THE EXPLICIT PERMISSION OF THE COPYRIGHT OWNER.
 #
-#  @file UI.py
+#  @file ui.py
 #
 #  @date 31-Mar-2020
 #  @author P. Lucia
@@ -16,18 +16,18 @@
 ############################################################################
 from DialIn.CoreCANProtocol import (DenaliMessage,
                                     DenaliChannels)
-from .utils import integer2ByteArray, float2ByteArray
+from utils import integer_to_byte_array, float_to_byte_array
 import struct
 
 
 class HDUI:
     """
     \class HD_UI
 
-    \brief Hemodialysis Device (HD) Dialin API sub-class for UI commands.
+    \brief Hemodialysis Device (HD) Dialin API sub-class for ui commands.
     """
 
-    # UI message IDs
+    # ui message IDs
     MSG_ID_UI_CHECKIN_WITH_HD = 0x0007
     MSG_ID_HD_UF_PAUSE_RESUME_REQUEST = 0x0010
     MSG_ID_HD_TREATMENT_PARAMS_RANGES = 0x001A
@@ -187,7 +187,7 @@
         \param message:  response message from HD regarding treatment duration change.\n
             BOOL Accepted \n
             U32  Reject reason (if not accepted) \n
-            U32  Treatment duration (min) \n
+            U32  treatment duration (min) \n
             U32  UF volue (mL) \n
 
         \returns none
@@ -244,8 +244,8 @@
             BOOL Accepted \n
             U32  RejectReason (if not accepted)
             F32  UF Volume (mL) - converted to Liters \n
-            U32  Treatment Time (min) \n
-            S32  Treatment Time Change (min) \n
+            U32  treatment Time (min) \n
+            S32  treatment Time Change (min) \n
             F32  UF Rate (mL/min) \n
             F32  UF Rate Change (mL/min)
 
@@ -280,30 +280,30 @@
 
     def cmd_ui_checkin_with_hd(self):
         """
-        Constructs and sends the UI check-in message
+        Constructs and sends the ui check-in message
 
         \returns 0
         """
 
         message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_hd_ch_id,
                                               message_id=self.MSG_ID_UI_CHECKIN_WITH_HD)
 
-        print("Sending UI checkin w/ HD")
+        print("Sending ui checkin w/ HD")
 
         self.can_interface.send(message, 0)
 
         return 0
 
     def cmd_ui_uf_pause_resume(self, cmd=UF_CMD_PAUSE):
         """
-        Constructs and sends a UI UF command message
+        Constructs and sends a ui UF command message
 
         \param cmd: 0 for pause, 1 for resume
 
         \returns none
         """
 
-        payload = integer2ByteArray(cmd)
+        payload = integer_to_byte_array(cmd)
         message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_hd_ch_id,
                                               message_id=self.MSG_ID_HD_UF_PAUSE_RESUME_REQUEST,
                                               payload=payload)
@@ -320,7 +320,7 @@
 
     def cmd_ui_uf_settings_change_request(self, vol=0.0):
         """
-        Constructs and sends a UI UF change settings command message
+        Constructs and sends a ui UF change settings command message
 
         \param vol (float): new ultrafiltration volume setting (in L)
 
@@ -330,7 +330,7 @@
         # reset response to this command so we can tell when response is received
         self.UFChangeResponse = None
         # build command message
-        volume = float2ByteArray(vol * self.LITER_TO_ML_CONVERSION_FACTOR)
+        volume = float_to_byte_array(vol * self.LITER_TO_ML_CONVERSION_FACTOR)
         message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_hd_ch_id,
                                               message_id=self.MSG_ID_UF_SETTINGS_CHANGE_REQUEST_BY_USER,
                                               payload=volume)
@@ -343,7 +343,7 @@
 
     def cmd_ui_uf_settings_change_confirm(self, vol=0.0, adj=UF_CMD_CHANGE_TIME_TO_ADJUST):
         """
-        Constructs and sends a UI UF change settings command message
+        Constructs and sends a ui UF change settings command message
 
         \param vol (float): new ultrafiltration volume setting (in L)
         \param adj (int): 0 for adjust time, 1 for adjust rate
@@ -355,8 +355,8 @@
         self.UFChangeResponse = None
 
         # build command message
-        volume = float2ByteArray(vol * self.LITER_TO_ML_CONVERSION_FACTOR)
-        adjust = integer2ByteArray(adj)
+        volume = float_to_byte_array(vol * self.LITER_TO_ML_CONVERSION_FACTOR)
+        adjust = integer_to_byte_array(adj)
         payload = volume + adjust
         message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_hd_ch_id,
                                               message_id=self.MSG_ID_UF_SETTINGS_CHANGE_REQUEST_BY_USER,
@@ -370,7 +370,7 @@
 
     def cmd_ui_uf_change_settings_confirmed_by_user(self, response=RESPONSE_REJECTED, vol=0.0, tm=0, rate=0.0):
         """
-        Constructs and sends a UI UF change settings confirmed by user message
+        Constructs and sends a ui UF change settings confirmed by user message
 
         \param response (int): 0 for rejected, 1 for confirmed
         \param vol (float): volume (in L) that was confirmed
@@ -380,10 +380,10 @@
         \returns none
         """
 
-        resp = integer2ByteArray(response)
-        volume = float2ByteArray(vol * self.LITER_TO_ML_CONVERSION_FACTOR)
-        min = integer2ByteArray(tm)
-        ufRate = float2ByteArray(rate)
+        resp = integer_to_byte_array(response)
+        volume = float_to_byte_array(vol * self.LITER_TO_ML_CONVERSION_FACTOR)
+        min = integer_to_byte_array(tm)
+        ufRate = float_to_byte_array(rate)
         payload = resp + volume + min + ufRate
         message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_hd_ch_id,
                                               message_id=self.MSG_ID_UF_SETTINGS_CHANGE_CONFIRMED_BY_USER,
@@ -397,14 +397,14 @@
 
     def cmd_ui_treatment_duration_setting_change_request(self, timeMin=0):
         """
-            Constructs and sends a UI UF change settings confirmed by user message
+            Constructs and sends a ui UF change settings confirmed by user message
 
             \param timeMin (int): treatment time (in min).
 
             \returns none
         """
 
-        payload = integer2ByteArray(timeMin)
+        payload = integer_to_byte_array(timeMin)
         message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_hd_ch_id,
                                               message_id=self.MSG_ID_TREATMENT_DURATION_SETTING_CHANGE_REQUEST,
                                               payload=payload)
@@ -418,16 +418,16 @@
 
     def cmd_ui_blood_and_dialysate_flow_settings_change_request(self, bloodFlow, dialFlow):
         """
-        Constructs and sends a UI blood & dialysate flow settings change request by user message
+        Constructs and sends a ui blood & dialysate flow settings change request by user message
 
         \param bloodFlow (int): blood flow rate set point (in mL/min).
         \param dialFlow (int): dialysate flow rate set point (in mL/min).
 
         \returns none
         """
 
-        bld = integer2ByteArray(bloodFlow)
-        dial = integer2ByteArray(dialFlow)
+        bld = integer_to_byte_array(bloodFlow)
+        dial = integer_to_byte_array(dialFlow)
         payload = bld + dial
         message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_hd_ch_id,
                                               message_id=self.MSG_ID_BLOOD_DIALYSATE_FLOW_SETTING_CHANGE_REQUEST_BY_USER,
Index: HD/Watchdog.py
===================================================================
diff -u -rc5826238ca4b80671231a9c564af3ea01b9be06f -r0da0106eca868b9144298c60911710b3414a5837
--- HD/Watchdog.py	(.../Watchdog.py)	(revision c5826238ca4b80671231a9c564af3ea01b9be06f)
+++ HD/Watchdog.py	(.../Watchdog.py)	(revision 0da0106eca868b9144298c60911710b3414a5837)
@@ -5,7 +5,7 @@
 #  THIS CODE MAY NOT BE COPIED OR REPRODUCED IN ANY FORM, IN PART OR IN
 #  WHOLE, WITHOUT THE EXPLICIT PERMISSION OF THE COPYRIGHT OWNER.
 #
-#  @file Watchdog.py
+#  @file watchdog.py
 #
 #  @date 31-Mar-2020
 #  @author P. Lucia
@@ -16,31 +16,31 @@
 ############################################################################
 from DialIn.CoreCANProtocol import (DenaliMessage,
                                     DenaliChannels)
-from .utils import integer2ByteArray
-from .HemodialysisDevice import HD
+from utils import integer_to_byte_array, RESET
 
+
 class HDWatchdog:
     """
-        \class HD_Watchdog
+    \class HD_Watchdog
 
-        \brief Hemodialysis Device (HD) Dialin API sub-class for watchdog related commands.
+    \brief Hemodialysis Device (HD) Dialin API sub-class for watchdog related commands.
     """
 
-    # Watchdog message IDs
+    # watchdog message IDs
     MSG_ID_HD_WD_CHECKIN_OVERRIDE = 0x8005
 
     def __init__(self, can_interface):
-
         """
         HD_Watchdog constructor
 
         \param outer_instance: reference to the HD (outer) class.
 
         \returns HD_Watchdog object.
         """
+
         self.can_interface = can_interface
 
-    def CmdWatchdogTaskCheckinOverride(self, reset, state, task):
+    def cmd_watchdog_task_check_in_override(self, reset, state, task):
         """
         Constructs and sends the watchdog task check-in override command
 
@@ -50,9 +50,9 @@
         \returns 1 if successful, zero otherwise
         """
 
-        rst = integer2ByteArray(reset)
-        sta = integer2ByteArray(state)
-        tsk = integer2ByteArray(task)
+        rst = integer_to_byte_array(reset)
+        sta = integer_to_byte_array(state)
+        tsk = integer_to_byte_array(task)
         payload = rst + sta + tsk
 
         message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_hd_ch_id,
@@ -67,11 +67,11 @@
         # If there is content...
         if received_message is not None:
             # print(received_message)
-            if reset == HD.RESET:
+            if reset == RESET:
                 str_res = "reset back to normal"
             else:
                 str_res = ("checked in" if state != 0 else "not checked in")
-            print("Watchdog task check-in overridden to " + str_res + ":" +
+            print("watchdog task check-in overridden to " + str_res + ":" +
                   str(received_message['message'][DenaliMessage.PAYLOAD_START_INDEX]))
             # response payload is OK or not OK
             return received_message['message'][DenaliMessage.PAYLOAD_START_INDEX]
Index: HD/utils.py
===================================================================
diff -u -r082ea4c8b0c6a3c804453308990d0bb98a0a2156 -r0da0106eca868b9144298c60911710b3414a5837
--- HD/utils.py	(.../utils.py)	(revision 082ea4c8b0c6a3c804453308990d0bb98a0a2156)
+++ HD/utils.py	(.../utils.py)	(revision 0da0106eca868b9144298c60911710b3414a5837)
@@ -1,7 +1,11 @@
 import struct
 from binascii import unhexlify
 
-def integer2ByteArray(val):
+NO_RESET = 0
+RESET = 1
+
+
+def integer_to_byte_array(val):
     """
     Converts an integer value into a byte array (little endian)
 
@@ -14,7 +18,7 @@
     return b
 
 
-def float2ByteArray(val):
+def float_to_byte_array(val):
     """
     Converts a float value into a byte array (little endian)