Index: leahi_dialin/fp/modules/flow_sensors.py
===================================================================
diff -u -r070dbb7a7bbd42c2879768f1eb592bcb188db1c9 -re60ad12bcc58d5905d7268bbeaae139d8233e023
--- leahi_dialin/fp/modules/flow_sensors.py	(.../flow_sensors.py)	(revision 070dbb7a7bbd42c2879768f1eb592bcb188db1c9)
+++ leahi_dialin/fp/modules/flow_sensors.py	(.../flow_sensors.py)	(revision e60ad12bcc58d5905d7268bbeaae139d8233e023)
@@ -19,7 +19,7 @@
 
 from .constants import RESET, NO_RESET
 from leahi_dialin.common.msg_defs import MsgIds, MsgFieldPositions
-from leahi_dialin.common.fp_defs import FPFlowSensorNames
+from leahi_dialin.common.fp_defs import fp_enum_repository
 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
@@ -49,8 +49,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
@@ -63,9 +63,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