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