Index: tests/unit_tests/test_imports.py
===================================================================
diff -u -r72c423da1d07c40699f40b5da5bee6d992d3082c -r1f2bf6d939eb4033dbedb7d7005494cc12fccbc6
--- tests/unit_tests/test_imports.py	(.../test_imports.py)	(revision 72c423da1d07c40699f40b5da5bee6d992d3082c)
+++ tests/unit_tests/test_imports.py	(.../test_imports.py)	(revision 1f2bf6d939eb4033dbedb7d7005494cc12fccbc6)
@@ -27,7 +27,7 @@
         from leahi_dialin.td.modules.air_trap import TDAirTrap
         from leahi_dialin.td.modules.alarms import TDAlarms
         from leahi_dialin.td.modules.blood_flow import TDBloodFlow
-        from leahi_dialin.td.modules.bubble_detector import TDBubbleDectector
+        from leahi_dialin.td.modules.bubble_detector import TDBubbleDetector
         from leahi_dialin.td.modules.ejector import TDEjector
         from leahi_dialin.td.modules.pressure_sensors import TDPressureSensors
         from leahi_dialin.td.modules.switches import TDSwitches
@@ -47,7 +47,6 @@
         from leahi_dialin.dd.modules.gen_dialysate import DDGenDialysate
         from leahi_dialin.dd.modules.heaters import DDHeaters
         from leahi_dialin.dd.modules.levels import DDLevels
-        from leahi_dialin.dd.modules.piston_pump import DDPistonPumps
         from leahi_dialin.dd.modules.post_gen_dialysate import DDPostGenDialysate
         from leahi_dialin.dd.modules.pre_gen_dialysate import DDPreGenDialysate
         from leahi_dialin.dd.modules.pressure_sensors import DDPressureSensors
@@ -68,10 +67,10 @@
 
     def test_protocols_imports(self):
 
-        from leahi_dialin.protocols.CAN import (DenaliCanMessenger,
-                                          DenaliMessage,
-                                          DenaliChannels,
-                                          LongDenaliMessageBuilder)
+        from leahi_dialin.protocols.CAN import (CanMessenger,
+                                          CanMessage,
+                                          CanChannels,
+                                          LongMessageBuilder)
 
     def test_utils_imports(self):
 
@@ -91,7 +90,7 @@
         from leahi_dialin.td.modules.air_trap import TDAirTrap
         from leahi_dialin.td.modules.alarms import TDAlarms
         from leahi_dialin.td.modules.blood_flow import TDBloodFlow
-        from leahi_dialin.td.modules.bubble_detector import TDBubbleDectector
+        from leahi_dialin.td.modules.bubble_detector import TDBubbleDetector
         from leahi_dialin.td.modules.ejector import TDEjector
         from leahi_dialin.td.modules.pressure_sensors import TDPressureSensors
         from leahi_dialin.td.modules.switches import TDSwitches
@@ -109,7 +108,6 @@
         from leahi_dialin.dd.modules.gen_dialysate import DDGenDialysate
         from leahi_dialin.dd.modules.heaters import DDHeaters
         from leahi_dialin.dd.modules.levels import DDLevels
-        from leahi_dialin.dd.modules.piston_pump import DDPistonPumps
         from leahi_dialin.dd.modules.post_gen_dialysate import DDPostGenDialysate
         from leahi_dialin.dd.modules.pre_gen_dialysate import DDPreGenDialysate
         from leahi_dialin.dd.modules.pressure_sensors import DDPressureSensors