Index: leahi_dialin/td/modules/bubble_detector.py
===================================================================
diff -u -rec8a2600b9e8cf6fe7e02c200a1c24221ca86863 -rd27c40205e18118f4689f62463a266da1f91dba6
--- leahi_dialin/td/modules/bubble_detector.py	(.../bubble_detector.py)	(revision ec8a2600b9e8cf6fe7e02c200a1c24221ca86863)
+++ leahi_dialin/td/modules/bubble_detector.py	(.../bubble_detector.py)	(revision d27c40205e18118f4689f62463a266da1f91dba6)
@@ -18,7 +18,7 @@
 
 from .constants import RESET, NO_RESET
 from leahi_dialin.common.msg_defs import MsgIds, MsgFieldPositions
-from leahi_dialin.common.td_defs import TDAirBubbleDetectorNames, TDAirBubbleDetectorAttributes
+from leahi_dialin.common.td_defs import td_enum_repository
 from leahi_dialin.protocols.CAN import DenaliMessage, DenaliChannels
 from leahi_dialin.utils.base import AbstractSubSystem, publish
 from leahi_dialin.utils.conversions import integer_to_bytearray
@@ -61,11 +61,11 @@
 
         self.td_air_bubbles_timestamp = 0.0
         self.h18_bubble_detector = {
-            TDAirBubbleDetectorNames.H18_ADV.name: {
+            td_enum_repository.TDAirBubbleDetectorNames.H18_ADV.name: {
                 # Initialize status of ADV air bubble detectors to fluid (no air bubble) detected
-                TDAirBubbleDetectorAttributes.STATUS.name: self.FLUID_DETECTED_STATUS,
+                td_enum_repository.TDAirBubbleDetectorAttributes.STATUS.name: self.FLUID_DETECTED_STATUS,
                 # Initialize state of ADV air bubble detectors state machine to normal
-                TDAirBubbleDetectorAttributes.STATE.name: self.AIR_BUBBLE_NORMAL_STATE
+                td_enum_repository.TDAirBubbleDetectorAttributes.STATE.name: self.AIR_BUBBLE_NORMAL_STATE
             }
         }
 
@@ -78,9 +78,9 @@
         @return: None
         """
 
-        self.h18_bubble_detector[TDAirBubbleDetectorNames.H18_ADV.name][TDAirBubbleDetectorAttributes.STATUS.name] = (
+        self.h18_bubble_detector[td_enum_repository.TDAirBubbleDetectorNames.H18_ADV.name][td_enum_repository.TDAirBubbleDetectorAttributes.STATUS.name] = (
             struct.unpack('i', bytearray(message['message'][MsgFieldPositions.START_POS_FIELD_1:MsgFieldPositions.END_POS_FIELD_1])))[0]
-        self.h18_bubble_detector[TDAirBubbleDetectorNames.H18_ADV.name][TDAirBubbleDetectorAttributes.STATE.name] = (
+        self.h18_bubble_detector[td_enum_repository.TDAirBubbleDetectorNames.H18_ADV.name][td_enum_repository.TDAirBubbleDetectorAttributes.STATE.name] = (
             struct.unpack('i', bytearray(message['message'][MsgFieldPositions.START_POS_FIELD_2:MsgFieldPositions.END_POS_FIELD_2])))[0]
 
         self.td_air_bubbles_timestamp = timestamp