Index: leahi_dialin/fp/modules/flow_sensors.py
===================================================================
diff -u -ra291930ba38e329e2b373f6d2b2a7564a6b7a09a -rc5bfcf84ed942ca5841bf9de155aa0f495b4d28d
--- leahi_dialin/fp/modules/flow_sensors.py	(.../flow_sensors.py)	(revision a291930ba38e329e2b373f6d2b2a7564a6b7a09a)
+++ leahi_dialin/fp/modules/flow_sensors.py	(.../flow_sensors.py)	(revision c5bfcf84ed942ca5841bf9de155aa0f495b4d28d)
@@ -18,7 +18,7 @@
 from logging import Logger
 
 from leahi_dialin.common.constants import NO_RESET
-from leahi_dialin.common.fp_defs import FPFlowSensorNames
+from leahi_dialin.common.fp_defs import fp_enum_repository
 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
@@ -46,8 +46,8 @@
             self.can_interface.register_receiving_publication_function(channel_id, self.msg_id_fp_flow_data, self._handler_flow_sensor_sync)
 
         self.fp_flows = {
-            FPFlowSensorNames.P7_FLOW.name: 0.0,
-            FPFlowSensorNames.P16_FLOW.name: 0.0
+            fp_enum_repository.FPFlowSensorNames.P7_FLOW.name: 0.0,
+            fp_enum_repository.FPFlowSensorNames.P16_FLOW.name: 0.0
         }
 
         self.fp_flow_timestamp = 0
@@ -61,9 +61,9 @@
         @param message:  published flow sensor data message
         @returns none
         """
-        self.fp_flows[FPFlowSensorNames.P7_FLOW.name] = struct.unpack('f', bytearray(
+        self.fp_flows[fp_enum_repository.FPFlowSensorNames.P7_FLOW.name] = struct.unpack('f', bytearray(
             message['message'][MsgFieldPositions.START_POS_FIELD_1:MsgFieldPositions.END_POS_FIELD_1]))[0]
-        self.fp_flows[FPFlowSensorNames.P16_FLOW.name] = struct.unpack('f', bytearray(
+        self.fp_flows[fp_enum_repository.FPFlowSensorNames.P16_FLOW.name] = struct.unpack('f', bytearray(
             message['message'][MsgFieldPositions.START_POS_FIELD_2:MsgFieldPositions.END_POS_FIELD_2]))[0]
 
         self.fp_flow_timestamp = timestamp
@@ -105,7 +105,7 @@
         sts = integer_to_bytearray(rate)
         payload = reset_value + sts + lvl
 
-        sensor_name = FPFlowSensorNames(flow_sensor).name.split('_')[0]
+        sensor_name = fp_enum_repository.FPFlowSensorNames(flow_sensor).name.split('_')[0]
         return cmd_generic_override(
             payload = payload,
             reset = reset,
@@ -132,7 +132,7 @@
         sts = float_to_bytearray(temp)
         payload = reset_value + sts + lvl
 
-        sensor_name = FPFlowSensorNames(flow_sensor).name.split('_')[0]
+        sensor_name = fp_enum_repository.FPFlowSensorNames(flow_sensor).name.split('_')[0]
         return cmd_generic_override(
             payload = payload,
             reset = reset,
@@ -159,7 +159,7 @@
         sts = float_to_bytearray(rate)
         payload = reset_value + sts + lvl
 
-        sensor_name = FPFlowSensorNames(flow_sensor).name.split('_')[0]
+        sensor_name = fp_enum_repository.FPFlowSensorNames(flow_sensor).name.split('_')[0]
         return cmd_generic_override(
             payload = payload,
             reset = reset,
@@ -186,7 +186,7 @@
         sts = float_to_bytearray(temp)
         payload = reset_value + sts + lvl
 
-        sensor_name = FPFlowSensorNames(flow_sensor).name.split('_')[0]
+        sensor_name = fp_enum_repository.FPFlowSensorNames(flow_sensor).name.split('_')[0]
         return cmd_generic_override(
             payload = payload,
             reset = reset,