Index: leahi_dialin/td/modules/bubble_detector.py
===================================================================
diff -u -r18c90a1b2b6c7339bdd192a2d2fac32f2b8a35df -rc5bfcf84ed942ca5841bf9de155aa0f495b4d28d
--- leahi_dialin/td/modules/bubble_detector.py	(.../bubble_detector.py)	(revision 18c90a1b2b6c7339bdd192a2d2fac32f2b8a35df)
+++ leahi_dialin/td/modules/bubble_detector.py	(.../bubble_detector.py)	(revision c5bfcf84ed942ca5841bf9de155aa0f495b4d28d)
@@ -20,7 +20,7 @@
 from leahi_dialin.common.constants import NO_RESET
 from leahi_dialin.common.msg_defs import MsgIds, MsgFieldPositions
 from leahi_dialin.common.override_templates import cmd_generic_broadcast_interval_override, cmd_generic_override
-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 DenaliChannels
 from leahi_dialin.utils.base import AbstractSubSystem, publish
 from leahi_dialin.utils.conversions import integer_to_bytearray
@@ -62,11 +62,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
             }
         }
 
@@ -79,9 +79,9 @@
         @param message:  published air bubbles data message as: h18 bubble status, h18 bubble state
         @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
@@ -125,7 +125,7 @@
         stat = integer_to_bytearray(status)
         payload = rst + stat + i
 
-        sensor_name = TDAirBubbleDetectorNames(index).name.split('_')[0]
+        sensor_name = td_enum_repository.TDAirBubbleDetectorNames(index).name.split('_')[0]
         return cmd_generic_override(
             payload = payload,
             reset = reset,