Index: leahi_dialin/dd/modules/conductivity_sensors.py
===================================================================
diff -u -r18c90a1b2b6c7339bdd192a2d2fac32f2b8a35df -ra291930ba38e329e2b373f6d2b2a7564a6b7a09a
--- leahi_dialin/dd/modules/conductivity_sensors.py	(.../conductivity_sensors.py)	(revision 18c90a1b2b6c7339bdd192a2d2fac32f2b8a35df)
+++ leahi_dialin/dd/modules/conductivity_sensors.py	(.../conductivity_sensors.py)	(revision a291930ba38e329e2b373f6d2b2a7564a6b7a09a)
@@ -19,7 +19,7 @@
 from logging import Logger
 
 from leahi_dialin.common.constants import NO_RESET
-from leahi_dialin.common.dd_defs import DDConductivitySensorsEnum
+from leahi_dialin.common.dd_defs import DDConductivitySensorNames
 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.protocols.CAN import DenaliChannels
@@ -50,11 +50,11 @@
                                                                        self._handler_conductivity_sensors_sync)
 
         self.dd_conductivity = {
-            DDConductivitySensorsEnum.D17_COND.name: 0.0,
-            DDConductivitySensorsEnum.D27_COND.name: 0.0,
-            DDConductivitySensorsEnum.D29_COND.name: 0.0,
-            DDConductivitySensorsEnum.D43_COND.name: 0.0,
-            DDConductivitySensorsEnum.D74_COND.name: 0.0
+            DDConductivitySensorNames.D17_COND.name: 0.0,
+            DDConductivitySensorNames.D27_COND.name: 0.0,
+            DDConductivitySensorNames.D29_COND.name: 0.0,
+            DDConductivitySensorNames.D43_COND.name: 0.0,
+            DDConductivitySensorNames.D74_COND.name: 0.0
         }
 
         self.dd_conductivity_timestamp = 0.0
@@ -69,19 +69,19 @@
         @param message:  published DD conductivity sensor data message
         @return: None
         """
-        self.dd_conductivity[DDConductivitySensorsEnum.D17_COND.name] = struct.unpack('f', bytearray(
+        self.dd_conductivity[DDConductivitySensorNames.D17_COND.name] = struct.unpack('f', bytearray(
             message['message'][MsgFieldPositions.START_POS_FIELD_1:MsgFieldPositions.END_POS_FIELD_1]))[0]
 
-        self.dd_conductivity[DDConductivitySensorsEnum.D27_COND.name] = struct.unpack('f', bytearray(
+        self.dd_conductivity[DDConductivitySensorNames.D27_COND.name] = struct.unpack('f', bytearray(
             message['message'][MsgFieldPositions.START_POS_FIELD_2:MsgFieldPositions.END_POS_FIELD_2]))[0]
 
-        self.dd_conductivity[DDConductivitySensorsEnum.D29_COND.name] = struct.unpack('f', bytearray(
+        self.dd_conductivity[DDConductivitySensorNames.D29_COND.name] = struct.unpack('f', bytearray(
             message['message'][MsgFieldPositions.START_POS_FIELD_3:MsgFieldPositions.END_POS_FIELD_3]))[0]
 
-        self.dd_conductivity[DDConductivitySensorsEnum.D43_COND.name] = struct.unpack('f', bytearray(
+        self.dd_conductivity[DDConductivitySensorNames.D43_COND.name] = struct.unpack('f', bytearray(
             message['message'][MsgFieldPositions.START_POS_FIELD_4:MsgFieldPositions.END_POS_FIELD_4]))[0]
 
-        self.dd_conductivity[DDConductivitySensorsEnum.D74_COND.name] = struct.unpack('f', bytearray(
+        self.dd_conductivity[DDConductivitySensorNames.D74_COND.name] = struct.unpack('f', bytearray(
             message['message'][MsgFieldPositions.START_POS_FIELD_5:MsgFieldPositions.END_POS_FIELD_5]))[0]
 
         self.dd_conductivity_timestamp = timestamp
@@ -125,7 +125,7 @@
         sensor_byte_array = integer_to_bytearray(sensor_index)
         payload = reset_byte_array + cond_byte_array + sensor_byte_array
 
-        sensor_name = DDConductivitySensorsEnum(sensor_index).name.split('_')[0]
+        sensor_name = DDConductivitySensorNames(sensor_index).name.split('_')[0]
         return cmd_generic_override(
             payload = payload,
             reset = reset,
@@ -154,7 +154,7 @@
         sensor_byte_array = integer_to_bytearray(sensor_index)
         payload = reset_byte_array + read_byte_array + sensor_byte_array
 
-        sensor_name = DDConductivitySensorsEnum(sensor_index).name.split('_')[0]
+        sensor_name = DDConductivitySensorNames(sensor_index).name.split('_')[0]
         return cmd_generic_override(
             payload = payload,
             reset = reset,
@@ -180,7 +180,7 @@
         sensor_byte_array = integer_to_bytearray(sensor_index)
         payload = reset_byte_array + error_byte_array + sensor_byte_array
 
-        sensor_name = DDConductivitySensorsEnum(sensor_index).name.split('_')[0]
+        sensor_name = DDConductivitySensorNames(sensor_index).name.split('_')[0]
         return cmd_generic_override(
             payload = payload,
             reset = reset,