Index: leahi_dialin/dd/modules/heaters.py
===================================================================
diff -u -r956757fac807b52aec078e84127089db5dff069f -r52aa7af16b98730ba59fc2577dbe8f73b5959775
--- leahi_dialin/dd/modules/heaters.py	(.../heaters.py)	(revision 956757fac807b52aec078e84127089db5dff069f)
+++ leahi_dialin/dd/modules/heaters.py	(.../heaters.py)	(revision 52aa7af16b98730ba59fc2577dbe8f73b5959775)
@@ -20,7 +20,7 @@
 
 from .constants import NO_RESET
 from leahi_dialin.common.msg_defs import MsgIds, MsgFieldPositions
-from leahi_dialin.common.dd_defs import HeatersStartStop, HeatersState, HeatersNames, HeatersAttributesEnum
+from leahi_dialin.common.dd_defs import DDHeatersStartStop, DDHeatersState, DDHeatersNames, DDHeatersAttributesEnum
 from leahi_dialin.protocols.CAN import DenaliMessage, DenaliChannels
 from leahi_dialin.utils.base import AbstractSubSystem, publish, DialinEnum
 from leahi_dialin.utils.checks import check_broadcast_interval_override_ms
@@ -45,23 +45,23 @@
         self.logger = logger
 
         self.dd_heaters = {
-            HeatersNames.D5_HEAT.name: {
-                HeatersAttributesEnum.HEAT_DUTY_CYCLE.name: 0.0,
-                HeatersAttributesEnum.HEAT_TARGET_TEMP.name: 0.0,
-                HeatersAttributesEnum.HEAT_STATE.name: 0,
-                HeatersAttributesEnum.DUTY_CYCLE_COUNT.name: 0.0,
-                HeatersAttributesEnum.PWM_PERIOD.name: 0.0,
-                HeatersAttributesEnum.ADJUSTED_TARGET_TEMP.name: 0.0,
-                HeatersAttributesEnum.TARGET_TEMP_TD.name: 0.0
+            DDHeatersNames.D5_HEAT.name: {
+                DDHeatersAttributesEnum.HEAT_DUTY_CYCLE.name: 0.0,
+                DDHeatersAttributesEnum.HEAT_TARGET_TEMP.name: 0.0,
+                DDHeatersAttributesEnum.HEAT_STATE.name: 0,
+                DDHeatersAttributesEnum.DUTY_CYCLE_COUNT.name: 0.0,
+                DDHeatersAttributesEnum.PWM_PERIOD.name: 0.0,
+                DDHeatersAttributesEnum.ADJUSTED_TARGET_TEMP.name: 0.0,
+                DDHeatersAttributesEnum.TARGET_TEMP_TD.name: 0.0
             },
-            HeatersNames.D45_HEAT.name: {
-                HeatersAttributesEnum.HEAT_DUTY_CYCLE.name: 0.0,
-                HeatersAttributesEnum.HEAT_TARGET_TEMP.name: 0.0,
-                HeatersAttributesEnum.HEAT_STATE.name: 0,
-                HeatersAttributesEnum.DUTY_CYCLE_COUNT.name: None,          # D45 Heater doesn't use this attribute
-                HeatersAttributesEnum.PWM_PERIOD.name: None,                # D45 Heater doesn't use this attribute
-                HeatersAttributesEnum.ADJUSTED_TARGET_TEMP.name: None,      # D45 Heater doesn't use this attribute
-                HeatersAttributesEnum.TARGET_TEMP_TD.name: None             # D45 Heater doesn't use this attribute
+            DDHeatersNames.D45_HEAT.name: {
+                DDHeatersAttributesEnum.HEAT_DUTY_CYCLE.name: 0.0,
+                DDHeatersAttributesEnum.HEAT_TARGET_TEMP.name: 0.0,
+                DDHeatersAttributesEnum.HEAT_STATE.name: 0,
+                DDHeatersAttributesEnum.DUTY_CYCLE_COUNT.name: None,          # D45 Heater doesn't use this attribute
+                DDHeatersAttributesEnum.PWM_PERIOD.name: None,                # D45 Heater doesn't use this attribute
+                DDHeatersAttributesEnum.ADJUSTED_TARGET_TEMP.name: None,      # D45 Heater doesn't use this attribute
+                DDHeatersAttributesEnum.TARGET_TEMP_TD.name: None             # D45 Heater doesn't use this attribute
             }
         }
 
@@ -91,25 +91,25 @@
         @param message:  published DD heaters data message
         @returns none
         """
-        self.dd_heaters[HeatersNames.D5_HEAT.name][HeatersAttributesEnum.HEAT_DUTY_CYCLE.name] = (
+        self.dd_heaters[DDHeatersNames.D5_HEAT.name][DDHeatersAttributesEnum.HEAT_DUTY_CYCLE.name] = (
             struct.unpack('f', bytearray(message['message'][MsgFieldPositions.START_POS_FIELD_1:MsgFieldPositions.END_POS_FIELD_1])))[0]
-        self.dd_heaters[HeatersNames.D45_HEAT.name][HeatersAttributesEnum.HEAT_DUTY_CYCLE.name] = (
+        self.dd_heaters[DDHeatersNames.D45_HEAT.name][DDHeatersAttributesEnum.HEAT_DUTY_CYCLE.name] = (
             struct.unpack('f', bytearray(message['message'][MsgFieldPositions.START_POS_FIELD_2:MsgFieldPositions.END_POS_FIELD_2])))[0]
-        self.dd_heaters[HeatersNames.D5_HEAT.name][HeatersAttributesEnum.HEAT_TARGET_TEMP.name] = (
+        self.dd_heaters[DDHeatersNames.D5_HEAT.name][DDHeatersAttributesEnum.HEAT_TARGET_TEMP.name] = (
             struct.unpack('f', bytearray(message['message'][MsgFieldPositions.START_POS_FIELD_3:MsgFieldPositions.END_POS_FIELD_3])))[0]
-        self.dd_heaters[HeatersNames.D45_HEAT.name][HeatersAttributesEnum.HEAT_TARGET_TEMP.name] = (
+        self.dd_heaters[DDHeatersNames.D45_HEAT.name][DDHeatersAttributesEnum.HEAT_TARGET_TEMP.name] = (
             struct.unpack('f', bytearray(message['message'][MsgFieldPositions.START_POS_FIELD_4:MsgFieldPositions.END_POS_FIELD_4])))[0]
-        self.dd_heaters[HeatersNames.D5_HEAT.name][HeatersAttributesEnum.HEAT_STATE.name] = (
+        self.dd_heaters[DDHeatersNames.D5_HEAT.name][DDHeatersAttributesEnum.HEAT_STATE.name] = (
             struct.unpack('i', bytearray(message['message'][MsgFieldPositions.START_POS_FIELD_5:MsgFieldPositions.END_POS_FIELD_5])))[0]
-        self.dd_heaters[HeatersNames.D45_HEAT.name][HeatersAttributesEnum.HEAT_STATE.name] = (
+        self.dd_heaters[DDHeatersNames.D45_HEAT.name][DDHeatersAttributesEnum.HEAT_STATE.name] = (
             struct.unpack('i', bytearray(message['message'][MsgFieldPositions.START_POS_FIELD_6:MsgFieldPositions.END_POS_FIELD_6])))[0]
-        self.dd_heaters[HeatersNames.D5_HEAT.name][HeatersAttributesEnum.DUTY_CYCLE_COUNT.name] = (
+        self.dd_heaters[DDHeatersNames.D5_HEAT.name][DDHeatersAttributesEnum.DUTY_CYCLE_COUNT.name] = (
             struct.unpack('f', bytearray(message['message'][MsgFieldPositions.START_POS_FIELD_7:MsgFieldPositions.END_POS_FIELD_7])))[0]
-        self.dd_heaters[HeatersNames.D5_HEAT.name][HeatersAttributesEnum.PWM_PERIOD.name] = (
+        self.dd_heaters[DDHeatersNames.D5_HEAT.name][DDHeatersAttributesEnum.PWM_PERIOD.name] = (
             struct.unpack('f', bytearray(message['message'][MsgFieldPositions.START_POS_FIELD_8:MsgFieldPositions.END_POS_FIELD_8])))[0]
-        self.dd_heaters[HeatersNames.D5_HEAT.name][HeatersAttributesEnum.ADJUSTED_TARGET_TEMP.name] = (
+        self.dd_heaters[DDHeatersNames.D5_HEAT.name][DDHeatersAttributesEnum.ADJUSTED_TARGET_TEMP.name] = (
             struct.unpack('f', bytearray(message['message'][MsgFieldPositions.START_POS_FIELD_9:MsgFieldPositions.END_POS_FIELD_9])))[0]
-        self.dd_heaters[HeatersNames.D5_HEAT.name][HeatersAttributesEnum.TARGET_TEMP_TD.name] = (
+        self.dd_heaters[DDHeatersNames.D5_HEAT.name][DDHeatersAttributesEnum.TARGET_TEMP_TD.name] = (
             struct.unpack('f', bytearray(message['message'][MsgFieldPositions.START_POS_FIELD_10:MsgFieldPositions.END_POS_FIELD_10])))[0]
 
         self.dbg1 = struct.unpack('f', bytearray(
@@ -185,7 +185,7 @@
                                               message_id=MsgIds.MSG_ID_DD_HEATERS_DUTY_CYCLE_OVERRIDE_REQUEST.value,
                                               payload=payload)
 
-        self.logger.debug("Overriding {} heater's duty cycle to {:5.3f} %".format(HeatersNames(heater).name, duty_cycle))
+        self.logger.debug("Overriding {} heater's duty cycle to {:5.3f} %".format(DDHeatersNames(heater).name, duty_cycle))
         # Send message
         received_message = self.can_interface.send(message)