Index: hd/HemodialysisDevice.py
===================================================================
diff -u -r619cd8f345bf168dc37bb12befef3db0290e5329 -rfbe34d9683ed520cb11bc56fa4f93c8d99883d2f
--- hd/HemodialysisDevice.py	(.../HemodialysisDevice.py)	(revision 619cd8f345bf168dc37bb12befef3db0290e5329)
+++ hd/HemodialysisDevice.py	(.../HemodialysisDevice.py)	(revision fbe34d9683ed520cb11bc56fa4f93c8d99883d2f)
@@ -15,22 +15,22 @@
 #
 ############################################################################
 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 blood_flow import HDBloodFlow
+from dialysate_inlet_flow import HDDialysateInletFlow
+from dialysate_outlet_flow import HDDialysateOutletFlow
+from treatment import HDTreatment
+from basics import HDBasics
+from pressure_occlusion import HDPressureOcclusion
 from utils.conversions import integer_to_bytearray
 from constants import RESET, NO_RESET
-from protocols.CoreCANProtocol import (DenaliMessage,
-                                       DenaliCanMessenger,
-                                       DenaliChannels)
+from protocols.CAN import (DenaliMessage,
+                           DenaliCanMessenger,
+                           DenaliChannels)
 
 
 class HD: