Index: leahi_dialin/common/fp_defs.py
===================================================================
diff -u -r894abd4d8e62d20ba65ca78e443ffb5ea00c07ea -re60ad12bcc58d5905d7268bbeaae139d8233e023
--- leahi_dialin/common/fp_defs.py	(.../fp_defs.py)	(revision 894abd4d8e62d20ba65ca78e443ffb5ea00c07ea)
+++ leahi_dialin/common/fp_defs.py	(.../fp_defs.py)	(revision e60ad12bcc58d5905d7268bbeaae139d8233e023)
@@ -45,10 +45,7 @@
         FPFlowSensorNames: DialinEnum
         FPFloaterLevelSensorNames: DialinEnum
         FPPressureSensorNames: DialinEnum
-        ROPumpNames: DialinEnum
-        ROPumpNames: DialinEnum
-        ROPumpNames: DialinEnum
-        ROPumpNames: DialinEnum
+        FPROPumpNames: DialinEnum
         FPTemperatureSensorNames: DialinEnum
         FPValveNames: DialinEnum
         FPAllPumpNames: DialinEnum
@@ -81,7 +78,7 @@
         'FPFlowSensorNames': '_create_fp_flow_sensor_names',
         'FPFloaterLevelSensorNames': '_create_fp_floater_sensor_names',
         'FPPressureSensorNames': '_create_fp_pressure_sensor_names',
-        'ROPumpNames': '_create_fp_ro_pump_names',
+        'FPROPumpNames': '_create_fp_ro_pump_names',
         'FPValveNames': '_create_fp_valve_names',
         'FPAllPumpNames': '_create_fp_all_pump_names',
         'FPTemperatureSensorNames': '_create_fp_temperature_sensor_names',
@@ -401,9 +398,9 @@
         }
 
         # Create the enum
-        ROPumpNames = DialinEnum('ROPumpNames', members)
+        FPROPumpNames = DialinEnum('FPROPumpNames', members)
         
-        return ROPumpNames
+        return FPROPumpNames
 
 
     def _create_fp_temperature_sensor_names(self):
Index: leahi_dialin/fp/modules/alarms.py
===================================================================
diff -u -rec8a2600b9e8cf6fe7e02c200a1c24221ca86863 -re60ad12bcc58d5905d7268bbeaae139d8233e023
--- leahi_dialin/fp/modules/alarms.py	(.../alarms.py)	(revision ec8a2600b9e8cf6fe7e02c200a1c24221ca86863)
+++ leahi_dialin/fp/modules/alarms.py	(.../alarms.py)	(revision e60ad12bcc58d5905d7268bbeaae139d8233e023)
@@ -17,7 +17,7 @@
 from logging import Logger
 
 from .constants import RESET, NO_RESET
-from leahi_dialin.common.fp_defs import FPEventDataType
+from leahi_dialin.common.fp_defs import fp_enum_repository
 from leahi_dialin.common.msg_defs import MsgIds, MsgFieldPositions
 from leahi_dialin.protocols.CAN import DenaliMessage, DenaliChannels
 from leahi_dialin.utils.base import AbstractSubSystem, publish, DialinEnum
@@ -67,8 +67,8 @@
         self.alarm_data_type = dict()
 
         # Loop through the list of the event data type enum and update the dictionary
-        for data_type in FPEventDataType:
-            event_data_type = FPEventDataType(data_type).name
+        for data_type in fp_enum_repository.FPEventDataTypes:
+            event_data_type = fp_enum_repository.FPEventDataTypes(data_type).name
             struct_unpack_type = None
 
             # If U32 is in the data type enum (i.e. EVENT_DATA_TYPE_U32), then the key is the enum and the value is
@@ -97,13 +97,13 @@
 
         data_typ_1 = struct.unpack('i', bytearray(message['message'][MsgFieldPositions.START_POS_FIELD_2:MsgFieldPositions.END_POS_FIELD_2]))
         # Get the corresponding structure format
-        struct_data_type_1 = self.alarm_data_type[FPEventDataType(data_typ_1[0]).name]
+        struct_data_type_1 = self.alarm_data_type[fp_enum_repository.FPEventDataTypes(data_typ_1[0]).name]
         # Get the data value by unpacking the data type
         data_1 = struct.unpack(struct_data_type_1, bytearray(message['message'][MsgFieldPositions.START_POS_FIELD_3:MsgFieldPositions.END_POS_FIELD_3]))
 
         data_typ_2 = struct.unpack('i', bytearray(message['message'][MsgFieldPositions.START_POS_FIELD_4:MsgFieldPositions.END_POS_FIELD_4]))
         # Get the corresponding structure format
-        struct_data_type_2 = self.alarm_data_type[FPEventDataType(data_typ_2[0]).name]
+        struct_data_type_2 = self.alarm_data_type[fp_enum_repository.FPEventDataTypes(data_typ_2[0]).name]
         # Get the data value by unpacking the data type
         data_2 = struct.unpack(struct_data_type_2, bytearray(message['message'][MsgFieldPositions.START_POS_FIELD_5:MsgFieldPositions.END_POS_FIELD_5]))
 
Index: leahi_dialin/fp/modules/boost_pump.py
===================================================================
diff -u -rec8a2600b9e8cf6fe7e02c200a1c24221ca86863 -re60ad12bcc58d5905d7268bbeaae139d8233e023
--- leahi_dialin/fp/modules/boost_pump.py	(.../boost_pump.py)	(revision ec8a2600b9e8cf6fe7e02c200a1c24221ca86863)
+++ leahi_dialin/fp/modules/boost_pump.py	(.../boost_pump.py)	(revision e60ad12bcc58d5905d7268bbeaae139d8233e023)
@@ -21,7 +21,7 @@
 from leahi_dialin.utils.base import DialinEnum
 from .constants import RESET, NO_RESET
 from leahi_dialin.common.msg_defs import MsgIds, MsgFieldPositions
-from leahi_dialin.common.fp_defs import FPBoostPumpNames, FPPumpAttributes
+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
@@ -47,16 +47,16 @@
                                                                        self._handler_pump_sync)
         self.boost_pump_timestamp = 0.0
         self.boost_pump = {
-            FPBoostPumpNames.P40_PUMP.name: {
-                FPPumpAttributes.STATE.name: 0,
-                FPPumpAttributes.DUTY_CYCLE.name: 0,
-                FPPumpAttributes.FB_DUTY_CYCLE.name: 0,
-                FPPumpAttributes.SPEED.name: 0.0,
-                FPPumpAttributes.TARGET_PRES.name: 0.0,
-                FPPumpAttributes.TARGET_FLOW.name: 0.0,
-                FPPumpAttributes.TARGET_DUTY_CYCLE.name: 0.0,
-                FPPumpAttributes.DUTY_CYCLE_PCT.name: 0.0,
-                FPPumpAttributes.FB_DUTY_CYCLE_PCT.name: 0.0
+            fp_enum_repository.FPBoostPumpNames.P40_PUMP.name: {
+                fp_enum_repository.FPPumpAttributes.STATE.name: 0,
+                fp_enum_repository.FPPumpAttributes.DUTY_CYCLE.name: 0,
+                fp_enum_repository.FPPumpAttributes.FB_DUTY_CYCLE.name: 0,
+                fp_enum_repository.FPPumpAttributes.SPEED.name: 0.0,
+                fp_enum_repository.FPPumpAttributes.TARGET_PRES.name: 0.0,
+                fp_enum_repository.FPPumpAttributes.TARGET_FLOW.name: 0.0,
+                fp_enum_repository.FPPumpAttributes.TARGET_DUTY_CYCLE.name: 0.0,
+                fp_enum_repository.FPPumpAttributes.DUTY_CYCLE_PCT.name: 0.0,
+                fp_enum_repository.FPPumpAttributes.FB_DUTY_CYCLE_PCT.name: 0.0
             }
         }
 
@@ -70,23 +70,23 @@
         @return: none
         """
 
-        self.boost_pump[FPBoostPumpNames.P40_PUMP.name][FPPumpAttributes.STATE.name] = struct.unpack('i', bytearray(
+        self.boost_pump[fp_enum_repository.FPBoostPumpNames.P40_PUMP.name][fp_enum_repository.FPPumpAttributes.STATE.name] = struct.unpack('i', bytearray(
             message['message'][MsgFieldPositions.START_POS_FIELD_1:MsgFieldPositions.END_POS_FIELD_1]))[0]
-        self.boost_pump[FPBoostPumpNames.P40_PUMP.name][FPPumpAttributes.DUTY_CYCLE.name] = struct.unpack('i', bytearray(
+        self.boost_pump[fp_enum_repository.FPBoostPumpNames.P40_PUMP.name][fp_enum_repository.FPPumpAttributes.DUTY_CYCLE.name] = struct.unpack('i', bytearray(
             message['message'][MsgFieldPositions.START_POS_FIELD_2:MsgFieldPositions.END_POS_FIELD_2]))[0]
-        self.boost_pump[FPBoostPumpNames.P40_PUMP.name][FPPumpAttributes.FB_DUTY_CYCLE.name] = struct.unpack('i', bytearray(
+        self.boost_pump[fp_enum_repository.FPBoostPumpNames.P40_PUMP.name][fp_enum_repository.FPPumpAttributes.FB_DUTY_CYCLE.name] = struct.unpack('i', bytearray(
             message['message'][MsgFieldPositions.START_POS_FIELD_3:MsgFieldPositions.END_POS_FIELD_3]))[0]
-        self.boost_pump[FPBoostPumpNames.P40_PUMP.name][FPPumpAttributes.SPEED.name] = struct.unpack('f', bytearray(
+        self.boost_pump[fp_enum_repository.FPBoostPumpNames.P40_PUMP.name][fp_enum_repository.FPPumpAttributes.SPEED.name] = struct.unpack('f', bytearray(
             message['message'][MsgFieldPositions.START_POS_FIELD_4:MsgFieldPositions.END_POS_FIELD_4]))[0]
-        self.boost_pump[FPBoostPumpNames.P40_PUMP.name][FPPumpAttributes.TARGET_PRESSURE.name] = struct.unpack('f', bytearray(
+        self.boost_pump[fp_enum_repository.FPBoostPumpNames.P40_PUMP.name][fp_enum_repository.FPPumpAttributes.TARGET_PRESSURE.name] = struct.unpack('f', bytearray(
             message['message'][MsgFieldPositions.START_POS_FIELD_5:MsgFieldPositions.END_POS_FIELD_5]))[0]
-        self.boost_pump[FPBoostPumpNames.P40_PUMP.name][FPPumpAttributes.TARGET_FLOW.name] = struct.unpack('f', bytearray(
+        self.boost_pump[fp_enum_repository.FPBoostPumpNames.P40_PUMP.name][fp_enum_repository.FPPumpAttributes.TARGET_FLOW.name] = struct.unpack('f', bytearray(
             message['message'][MsgFieldPositions.START_POS_FIELD_6:MsgFieldPositions.END_POS_FIELD_6]))[0]
-        self.boost_pump[FPBoostPumpNames.P40_PUMP.name][FPPumpAttributes.TARGET_DUTY_CYCLE.name] = struct.unpack('f', bytearray(
+        self.boost_pump[fp_enum_repository.FPBoostPumpNames.P40_PUMP.name][fp_enum_repository.FPPumpAttributes.TARGET_DUTY_CYCLE.name] = struct.unpack('f', bytearray(
             message['message'][MsgFieldPositions.START_POS_FIELD_7:MsgFieldPositions.END_POS_FIELD_7]))[0]
-        self.boost_pump[FPBoostPumpNames.P40_PUMP.name][FPPumpAttributes.DUTY_CYCLE_PCT.name] = struct.unpack('f', bytearray(
+        self.boost_pump[fp_enum_repository.FPBoostPumpNames.P40_PUMP.name][fp_enum_repository.FPPumpAttributes.DUTY_CYCLE_PCT.name] = struct.unpack('f', bytearray(
             message['message'][MsgFieldPositions.START_POS_FIELD_8:MsgFieldPositions.END_POS_FIELD_8]))[0]
-        self.boost_pump[FPBoostPumpNames.P40_PUMP.name][FPPumpAttributes.FB_DUTY_CYCLE_PCT.name] = struct.unpack('f', bytearray(
+        self.boost_pump[fp_enum_repository.FPBoostPumpNames.P40_PUMP.name][fp_enum_repository.FPPumpAttributes.FB_DUTY_CYCLE_PCT.name] = struct.unpack('f', bytearray(
             message['message'][MsgFieldPositions.START_POS_FIELD_9:MsgFieldPositions.END_POS_FIELD_9]))[0]
 
         self.boost_pump_timestamp = timestamp
Index: leahi_dialin/fp/modules/conductivity_sensors.py
===================================================================
diff -u -r1f6d8db8a800b32a70eb1176fcbd5263550a7180 -re60ad12bcc58d5905d7268bbeaae139d8233e023
--- leahi_dialin/fp/modules/conductivity_sensors.py	(.../conductivity_sensors.py)	(revision 1f6d8db8a800b32a70eb1176fcbd5263550a7180)
+++ leahi_dialin/fp/modules/conductivity_sensors.py	(.../conductivity_sensors.py)	(revision e60ad12bcc58d5905d7268bbeaae139d8233e023)
@@ -18,7 +18,7 @@
 
 from .constants import RESET, NO_RESET
 from leahi_dialin.common.msg_defs import MsgIds, MsgFieldPositions
-from leahi_dialin.common.fp_defs import FPConductivitySensorsEnum, FPRORejectionRatioEnum
+from leahi_dialin.common.fp_defs import fp_enum_repository
 from leahi_dialin.common.override_templates import cmd_generic_broadcast_interval_override
 from leahi_dialin.protocols.CAN import DenaliMessage, DenaliChannels
 from leahi_dialin.utils.base import AbstractSubSystem, publish
@@ -51,16 +51,16 @@
         self.ro_rejection_ratio_timestamp = 0.0
 
         self.fp_conductivity = {
-            FPConductivitySensorsEnum.P9_COND.name: 0.0,
-            FPConductivitySensorsEnum.P18_COND.name: 0.0
+            fp_enum_repository.FPConductivitySensorNames.P9_COND.name: 0.0,
+            fp_enum_repository.FPConductivitySensorNames.P18_COND.name: 0.0
         }
 
         self.ro_rejection_ratio = {
-            FPRORejectionRatioEnum.RAW_RO_REJECTION_RATIO.name: 0.0,
-            FPRORejectionRatioEnum.RAW_RO_REJECTION_RATIO_TANK_FILL.name: 0.0,
-            FPRORejectionRatioEnum.AVG_RO_REJECTION_RATIO.name: 0.0,
-            FPRORejectionRatioEnum.AVG_RO_REJECTION_RATIO_TANK_FILL.name: 0.0,
-            FPRORejectionRatioEnum.GEN_PERMEATE_STATE.name: 0
+            fp_enum_repository.FPRORejectionRatioNames.RAW_RO_REJECTION_RATIO.name: 0.0,
+            fp_enum_repository.FPRORejectionRatioNames.RAW_RO_REJECTION_RATIO_TANK_FILL.name: 0.0,
+            fp_enum_repository.FPRORejectionRatioNames.AVG_RO_REJECTION_RATIO.name: 0.0,
+            fp_enum_repository.FPRORejectionRatioNames.AVG_RO_REJECTION_RATIO_TANK_FILL.name: 0.0,
+            fp_enum_repository.FPRORejectionRatioNames.GEN_PERMEATE_STATE.name: 0
         }
 
 
@@ -74,9 +74,9 @@
         @return: None
         """
 
-        self.fp_conductivity[FPConductivitySensorsEnum.P9_COND.name] = struct.unpack('f', bytearray(
+        self.fp_conductivity[fp_enum_repository.FPConductivitySensorNames.P9_COND.name] = struct.unpack('f', bytearray(
             message['message'][MsgFieldPositions.START_POS_FIELD_1:MsgFieldPositions.END_POS_FIELD_1]))[0]
-        self.fp_conductivity[FPConductivitySensorsEnum.P18_COND.name] = struct.unpack('f', bytearray(
+        self.fp_conductivity[fp_enum_repository.FPConductivitySensorNames.P18_COND.name] = struct.unpack('f', bytearray(
             message['message'][MsgFieldPositions.START_POS_FIELD_2:MsgFieldPositions.END_POS_FIELD_2]))[0]
 
         self.fp_conductivity_timestamp = timestamp
@@ -92,15 +92,15 @@
         @return: None
         """
 
-        self.ro_rejection_ratio[FPRORejectionRatioEnum.RAW_RO_REJECTION_RATIO.name] = struct.unpack('f', bytearray(
+        self.ro_rejection_ratio[fp_enum_repository.FPRORejectionRatioNames.RAW_RO_REJECTION_RATIO.name] = struct.unpack('f', bytearray(
             message['message'][MsgFieldPositions.START_POS_FIELD_1:MsgFieldPositions.END_POS_FIELD_1]))[0]
-        self.ro_rejection_ratio[FPRORejectionRatioEnum.RAW_RO_REJECTION_RATIO_TANK_FILL.name] = struct.unpack('f', bytearray(
+        self.ro_rejection_ratio[fp_enum_repository.FPRORejectionRatioNames.RAW_RO_REJECTION_RATIO_TANK_FILL.name] = struct.unpack('f', bytearray(
             message['message'][MsgFieldPositions.START_POS_FIELD_2:MsgFieldPositions.END_POS_FIELD_2]))[0]
-        self.ro_rejection_ratio[FPRORejectionRatioEnum.AVG_RO_REJECTION_RATIO.name] = struct.unpack('f', bytearray(
+        self.ro_rejection_ratio[fp_enum_repository.FPRORejectionRatioNames.AVG_RO_REJECTION_RATIO.name] = struct.unpack('f', bytearray(
             message['message'][MsgFieldPositions.START_POS_FIELD_3:MsgFieldPositions.END_POS_FIELD_3]))[0]
-        self.ro_rejection_ratio[FPRORejectionRatioEnum.AVG_RO_REJECTION_RATIO_TANK_FILL.name] = struct.unpack('f', bytearray(
+        self.ro_rejection_ratio[fp_enum_repository.FPRORejectionRatioNames.AVG_RO_REJECTION_RATIO_TANK_FILL.name] = struct.unpack('f', bytearray(
             message['message'][MsgFieldPositions.START_POS_FIELD_4:MsgFieldPositions.END_POS_FIELD_4]))[0]
-        self.ro_rejection_ratio[FPRORejectionRatioEnum.GEN_PERMEATE_STATE.name] = struct.unpack('i', bytearray(
+        self.ro_rejection_ratio[fp_enum_repository.FPRORejectionRatioNames.GEN_PERMEATE_STATE.name] = struct.unpack('i', bytearray(
             message['message'][MsgFieldPositions.START_POS_FIELD_5:MsgFieldPositions.END_POS_FIELD_5]))[0]
 
         self.ro_rejection_ratio_timestamp = timestamp
Index: leahi_dialin/fp/modules/events.py
===================================================================
diff -u -r7d9d004527efeccb91958b440abdff08c2c52648 -re60ad12bcc58d5905d7268bbeaae139d8233e023
--- leahi_dialin/fp/modules/events.py	(.../events.py)	(revision 7d9d004527efeccb91958b440abdff08c2c52648)
+++ leahi_dialin/fp/modules/events.py	(.../events.py)	(revision e60ad12bcc58d5905d7268bbeaae139d8233e023)
@@ -16,7 +16,7 @@
 
 import struct
 from logging import Logger
-from leahi_dialin.common import *
+from leahi_dialin.common.fp_defs import fp_enum_repository
 from leahi_dialin.common.msg_defs import MsgIds, MsgFieldPositions
 from leahi_dialin.protocols.CAN import DenaliChannels
 from leahi_dialin.utils.base import AbstractSubSystem, publish
@@ -59,24 +59,24 @@
         self._fp_event_data_type = dict()
 
         # Dictionary of the mode as key and the sub mode states enum class as the value
-        self._fp_op_mode_2_sub_mode = {FPOpModes.MODE_FAUL.name: FPFaultStates,
-                                       FPOpModes.MODE_SERV.name: FPServiceStates,
-                                       FPOpModes.MODE_INIT.name: FPPostStates,
-                                       FPOpModes.MODE_STAN.name: FPStandbyStates,
-                                       FPOpModes.MODE_PRE_GENP.name: FPPreGenPermeateStates,
-                                       FPOpModes.MODE_GENP.name: FPGenPermeateStates,
-                                       FPOpModes.MODE_DPGP.name: FPPreGenPDefStates,
-                                       FPOpModes.MODE_DEGP.name: FPGenPermeateDefStates,
-                                       FPOpModes.MODE_NLEG.name: FPNotLegalStates}
+        self._fp_op_mode_2_sub_mode = {fp_enum_repository.FPOpModes.MODE_FAUL.name: fp_enum_repository.FPFaultStates,
+                                       fp_enum_repository.FPOpModes.MODE_SERV.name: fp_enum_repository.FPServiceStates,
+                                       fp_enum_repository.FPOpModes.MODE_INIT.name: fp_enum_repository.FPPostStates,
+                                       fp_enum_repository.FPOpModes.MODE_STAN.name: fp_enum_repository.FPStandbyStates,
+                                       fp_enum_repository.FPOpModes.MODE_PRE_GENP.name: fp_enum_repository.FPPreGenPermeateStates,
+                                       fp_enum_repository.FPOpModes.MODE_GENP.name: fp_enum_repository.FPGenPermeateStates,
+                                       fp_enum_repository.FPOpModes.MODE_DPGP.name: fp_enum_repository.FPPreGenPDefStates,
+                                       fp_enum_repository.FPOpModes.MODE_DEGP.name: fp_enum_repository.FPGenPermeateDefStates,
+                                       fp_enum_repository.FPOpModes.MODE_NLEG.name: fp_enum_repository.FPNotLegalStates}
 
         # Loop through the list of the FP events enums and initial the event dictionary. Each event is a key in the
         # dictionary and the value is a list.
-        for event in FPEventList:
-            self._fp_event_dictionary[FPEventList(event).name] = []
+        for event in fp_enum_repository.FPEventList:
+            self._fp_event_dictionary[fp_enum_repository.FPEventList(event).name] = []
 
         # Loop through the list of the event data type enum and update the dictionary
-        for data_type in FPEventDataType:
-            event_data_type = FPEventDataType(data_type).name
+        for data_type in fp_enum_repository.FPEventDataTypes:
+            event_data_type = fp_enum_repository.FPEventDataTypes(data_type).name
             struct_unpack_type = None
 
             # If U32 is in the data type enum (i.e. EVENT_DATA_TYPE_U32), then the key is the enum and the value is
@@ -99,14 +99,14 @@
 
         @returns the requested FP event number
         """
-        list_length = len(self._fp_event_dictionary[FPEventList(event_id).name])
+        list_length = len(self._fp_event_dictionary[fp_enum_repository.FPEventList(event_id).name])
 
         if list_length == 0:
             event = []
         elif event_number > list_length:
-            event = self._fp_event_dictionary[FPEventList(event_id).name][list_length - 1]
+            event = self._fp_event_dictionary[fp_enum_repository.FPEventList(event_id).name][list_length - 1]
         else:
-            event = self._fp_event_dictionary[FPEventList(event_id).name][list_length - event_number - 1]
+            event = self._fp_event_dictionary[fp_enum_repository.FPEventList(event_id).name][list_length - event_number - 1]
 
         return event
 
@@ -131,18 +131,18 @@
         list_of_events = []
 
         # If there are not enough event lists send all the events that are available
-        if len(self._fp_event_dictionary[FPEventList(event_id).name]) <= number_of_events:
-            list_of_events = self._fp_event_dictionary[FPEventList(event_id).name]
+        if len(self._fp_event_dictionary[fp_enum_repository.FPEventList(event_id).name]) <= number_of_events:
+            list_of_events = self._fp_event_dictionary[fp_enum_repository.FPEventList(event_id).name]
         else:
             # Get the all the events
-            complete_list = self._fp_event_dictionary[FPEventList(event_id).name]
+            complete_list = self._fp_event_dictionary[fp_enum_repository.FPEventList(event_id).name]
             # Since the last <number_of_message> are located at the end of the list, iterate backwards for the defined
             # event messages
             for i in range(len(complete_list) - 1, len(complete_list) - number_of_events - 1, -1):
                 list_of_events.append(complete_list[i])
 
         if number_of_events == 0:
-            list_of_events = self._fp_event_dictionary[FPEventList(event_id).name]
+            list_of_events = self._fp_event_dictionary[fp_enum_repository.FPEventList(event_id).name]
 
         return list_of_events
 
@@ -164,11 +164,11 @@
         event_id = struct.unpack('i', bytearray(
             message['message'][MsgFieldPositions.START_POS_FIELD_1:MsgFieldPositions.END_POS_FIELD_1]))[0]
 
-        if event_id == FPEventList.FP_EVENT_OPERATION_STATUS.value:
+        if event_id == fp_enum_repository.FPEventList.FP_EVENT_OPERATION_STATUS.value:
             # Get the data type
             event_data_type_1 = struct.unpack('i', bytearray(
                 message['message'][MsgFieldPositions.START_POS_FIELD_2:MsgFieldPositions.END_POS_FIELD_2]))[0]
-            struct_data_type = self._fp_event_data_type[FPEventDataType(event_data_type_1).name]
+            struct_data_type = self._fp_event_data_type[fp_enum_repository.FPEventDataType(event_data_type_1).name]
             op_mode = struct.unpack('<B', bytearray(
                 message['message'][MsgFieldPositions.START_POS_FIELD_3:MsgFieldPositions.START_POS_FIELD_3+1]))[0]
             sub_mode = struct.unpack('<B', bytearray(
@@ -177,7 +177,7 @@
                 message['message'][MsgFieldPositions.START_POS_FIELD_3+2:MsgFieldPositions.START_POS_FIELD_3+3]))[0]
             event_data_type_2 = struct.unpack('i', bytearray(
                 message['message'][MsgFieldPositions.START_POS_FIELD_4:MsgFieldPositions.END_POS_FIELD_4]))[0]
-            struct_data_type = self._fp_event_data_type[FPEventDataType(event_data_type_2).name]
+            struct_data_type = self._fp_event_data_type[fp_enum_repository.FPEventDataType(event_data_type_2).name]
             event_data_2 = struct.unpack(struct_data_type, bytearray(
                 message['message'][MsgFieldPositions.START_POS_FIELD_5:MsgFieldPositions.END_POS_FIELD_5]))[0]
 
@@ -186,53 +186,53 @@
             event_data_type_1 = struct.unpack('i', bytearray(
                 message['message'][MsgFieldPositions.START_POS_FIELD_2:MsgFieldPositions.END_POS_FIELD_2]))[0]
             # Get the corresponding structure format
-            struct_data_type = self._fp_event_data_type[FPEventDataType(event_data_type_1).name]
+            struct_data_type = self._fp_event_data_type[fp_enum_repository.FPEventDataType(event_data_type_1).name]
             # Get the data value by unpacking the data type
             event_data_1 = struct.unpack(struct_data_type, bytearray(
                 message['message'][MsgFieldPositions.START_POS_FIELD_3:MsgFieldPositions.END_POS_FIELD_3]))[0]
 
             event_data_type_2 = struct.unpack('i', bytearray(
                 message['message'][MsgFieldPositions.START_POS_FIELD_4:MsgFieldPositions.END_POS_FIELD_4]))[0]
 
-            struct_data_type = self._fp_event_data_type[FPEventDataType(event_data_type_2).name]
+            struct_data_type = self._fp_event_data_type[fp_enum_repository.FPEventDataType(event_data_type_2).name]
             event_data_2 = struct.unpack(struct_data_type, bytearray(
                 message['message'][MsgFieldPositions.START_POS_FIELD_5:MsgFieldPositions.END_POS_FIELD_5]))[0]
 
         # Convert the event ID to enum
-        event_state_name = FPEventList(event_id).name
+        event_state_name = fp_enum_repository.FPEventList(event_id).name
         # Get the current timestamp and create a tuple of the current events
         event_tuple = (datetime.now().astimezone().strftime('%Y-%m-%d %H:%M:%S.%f'), event_state_name, event_data_1, event_data_2)
         # Check if the event state name is operation mode change. If it is, get the name of the operation modes
         # from the op modes enum class
-        if event_state_name == FPEventList.FP_EVENT_OP_MODE_CHANGE.name:
-            event_data_1 = FPOpModes(event_data_1).name
-            event_data_2 = FPOpModes(event_data_2).name
+        if event_state_name == fp_enum_repository.FPEventList.FP_EVENT_OP_MODE_CHANGE.name:
+            event_data_1 = fp_enum_repository.FPOpModes(event_data_1).name
+            event_data_2 = fp_enum_repository.FPOpModes(event_data_2).name
             event_tuple = (datetime.now().astimezone().strftime('%Y-%m-%d %H:%M:%S.%f'), event_state_name, event_data_1, event_data_2)
         # Check if the event state name is sub mode change.
-        elif event_state_name == FPEventList.FP_EVENT_OP_MODE_CHANGE.name:
+        elif event_state_name == fp_enum_repository.FPEventList.FP_EVENT_OP_MODE_CHANGE.name:
             # Get the length of the list of the op mode list
-            op_list_len = len(self._fp_event_dictionary[FPEventList.FP_EVENT_OP_MODE_CHANGE.name])
+            op_list_len = len(self._fp_event_dictionary[fp_enum_repository.FPEventList.FP_EVENT_OP_MODE_CHANGE.name])
             # Get the last tuple of the op mode
             # It is a list of tuples that each tuple is (timestamp, event type, prev op mode, current op mode)
             if op_list_len != 0:
-                last_op_tuple = self._fp_event_dictionary[FPEventList.FP_EVENT_OP_MODE_CHANGE.name][op_list_len - 1]
+                last_op_tuple = self._fp_event_dictionary[fp_enum_repository.FPEventList.FP_EVENT_OP_MODE_CHANGE.name][op_list_len - 1]
 
             else:
                 # No op mode event has been received before the submode event was received. Use broadcast messages to
                 # determine current op mode. Previous mode can not be known
                 last_op_tuple = (datetime.now().astimezone().strftime('%Y-%m-%d %H:%M:%S.%f'),
-                                 FPEventList.FP_EVENT_OP_MODE_CHANGE.name, FPEvents.UNKNOWN_STATE,
-                                 FPOpModes(self.fp_event_op_mode).name)
+                                 fp_enum_repository.FPEventList.FP_EVENT_OP_MODE_CHANGE.name, FPEvents.UNKNOWN_STATE,
+                                 fp_enum_repository.FPOpModes(self.fp_event_op_mode).name)
             # Get the current and previous operation modes of the last tuple in the list of the sub modes
             # i.e. (timestamp, event type, prev, current)
             current_op_mode = last_op_tuple[len(last_op_tuple) - 1]
             current_op_mode_timestamp = datetime.strptime(last_op_tuple[0], '%Y-%m-%d %H:%M:%S.%f')
 
-            sub_mode_list_len = len(self._fp_event_dictionary[FPEventList.FP_EVENT_SUB_MODE_CHANGE.name])
+            sub_mode_list_len = len(self._fp_event_dictionary[fp_enum_repository.FPEventList.FP_EVENT_SUB_MODE_CHANGE.name])
 
             if sub_mode_list_len != 0:
                 # Get the tuple prior to the last tuple and get its previous and current operation modes
-                current_sub_tuple = self._fp_event_dictionary[FPEventList.FP_EVENT_SUB_MODE_CHANGE.name][
+                current_sub_tuple = self._fp_event_dictionary[fp_enum_repository.FPEventList.FP_EVENT_SUB_MODE_CHANGE.name][
                     sub_mode_list_len - 1]
 
                 current_sub_mode_timestamp = datetime.strptime(current_sub_tuple[0], '%Y-%m-%d %H:%M:%S.%f')
@@ -278,7 +278,7 @@
                     event_data_2 = current_sub_mode_enum_class(event_data_2).name
             event_tuple = (datetime.now().astimezone().strftime('%Y-%m-%d %H:%M:%S.%f'), event_state_name, event_data_1, event_data_2)
 
-        elif event_state_name == FPEventList.FP_EVENT_OPERATION_STATUS.name:
+        elif event_state_name == fp_enum_repository.FPEventList.FP_EVENT_OPERATION_STATUS.name:
             event_tuple = (time(), op_mode, sub_mode, sub_state)
 
         # Update event dictionary
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
Index: leahi_dialin/fp/modules/fp_test_configs.py
===================================================================
diff -u -r894abd4d8e62d20ba65ca78e443ffb5ea00c07ea -re60ad12bcc58d5905d7268bbeaae139d8233e023
--- leahi_dialin/fp/modules/fp_test_configs.py	(.../fp_test_configs.py)	(revision 894abd4d8e62d20ba65ca78e443ffb5ea00c07ea)
+++ leahi_dialin/fp/modules/fp_test_configs.py	(.../fp_test_configs.py)	(revision e60ad12bcc58d5905d7268bbeaae139d8233e023)
@@ -19,7 +19,7 @@
 from leahi_dialin.common.constants import NO_RESET
 from leahi_dialin.common.global_vars import GlobalVariables
 from leahi_dialin.common.msg_defs import MsgIds, MsgFieldPositions
-from leahi_dialin.common.test_config_defs import DDFPTestConfigOptions
+from leahi_dialin.common.test_config_defs import FPTestConfigOptions
 from leahi_dialin.protocols.CAN import DenaliMessage, DenaliChannels
 from .constants import NO_RESET
 from leahi_dialin.utils.conversions import integer_to_bytearray, bytearray_to_integer
@@ -59,7 +59,7 @@
         @param config: (int) Test config to set
         @return: the status of a test config
         """
-        return self.fp_test_configs[DDFPTestConfigOptions(config).name]
+        return self.fp_test_configs[FPTestConfigOptions(config).name]
 
 
     @publish(['msg_id_fp_send_test_config', 'fp_test_configs', 'fp_test_configs_response_timestamp'])
@@ -73,11 +73,11 @@
         payload = message['message']
         index = MsgFieldPositions.START_POS_FIELD_1
 
-        for config in DDFPTestConfigOptions.__members__:
+        for config in FPTestConfigOptions.__members__:
             config_value, index = bytearray_to_integer(payload, index, False)
             if 'NUM_OF_TEST_CONFIGS' not in config:
                 self.fp_test_configs[config] = config_value
-            if DDFPTestConfigOptions.TEST_CONFIG_ENABLE_BETA_1_9_HW.name in config:
+            if FPTestConfigOptions.TEST_CONFIG_ENABLE_BETA_1_9_HW.name in config:
                 GlobalVariables().NEXT_GEN_HW = config_value == 1
 
         self.fp_test_configs_response_timestamp = timestamp
@@ -102,9 +102,9 @@
                                               payload=payload)
 
         if reset == NO_RESET:
-            self.logger.debug("Setting {}".format(DDFPTestConfigOptions(config).name))
+            self.logger.debug("Setting {}".format(FPTestConfigOptions(config).name))
         else:
-            self.logger.debug("Resetting {}".format(DDFPTestConfigOptions(config).name))
+            self.logger.debug("Resetting {}".format(FPTestConfigOptions(config).name))
 
         # Send message
         received_message = self.can_interface.send(message)
@@ -175,7 +175,7 @@
 
         @return: None
         """
-        for config in DDFPTestConfigOptions.__members__:
+        for config in FPTestConfigOptions.__members__:
             # Loop through the list of the test configuration and set the values to 0xFFFFFFFF
             if 'NUM_OF_TEST_CONFIGS' not in config:
                 self.fp_test_configs[config] = 0xFFFFFFFF
Index: leahi_dialin/fp/modules/levels.py
===================================================================
diff -u -rec8a2600b9e8cf6fe7e02c200a1c24221ca86863 -re60ad12bcc58d5905d7268bbeaae139d8233e023
--- leahi_dialin/fp/modules/levels.py	(.../levels.py)	(revision ec8a2600b9e8cf6fe7e02c200a1c24221ca86863)
+++ leahi_dialin/fp/modules/levels.py	(.../levels.py)	(revision e60ad12bcc58d5905d7268bbeaae139d8233e023)
@@ -20,7 +20,7 @@
 
 from .constants import NO_RESET
 from leahi_dialin.common.msg_defs import MsgIds, MsgFieldPositions
-from leahi_dialin.common.fp_defs import FPFloaterLevels, FPFloaterLevelSensorNames
+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
@@ -50,7 +50,7 @@
             self.can_interface.register_receiving_publication_function(channel_id, self.msg_id_fp_level_data, self._handler_levels_sync)
 
         self.fp_levels = {
-            FPFloaterLevelSensorNames.P25_LEVEL.name: 0
+            fp_enum_repository.FPFloaterLevelSensorNames.P25_LEVEL.name: 0
         }
         self.fp_levels_timestamp = 0
 
@@ -64,7 +64,7 @@
         @param message:  published levels data message
         @returns none
         """
-        self.fp_levels[FPFloaterLevelSensorNames.P25_LEVEL.name] = struct.unpack('i', bytearray(
+        self.fp_levels[fp_enum_repository.FPFloaterLevelSensorNames.P25_LEVEL.name] = struct.unpack('i', bytearray(
             message['message'][MsgFieldPositions.START_POS_FIELD_1:MsgFieldPositions.END_POS_FIELD_1]))[0]
 
         self.fp_levels_timestamp = timestamp
Index: leahi_dialin/fp/modules/pressure_sensors.py
===================================================================
diff -u -rd2774cbe954e861f6ec31d44134e74c8e9d66f22 -re60ad12bcc58d5905d7268bbeaae139d8233e023
--- leahi_dialin/fp/modules/pressure_sensors.py	(.../pressure_sensors.py)	(revision d2774cbe954e861f6ec31d44134e74c8e9d66f22)
+++ leahi_dialin/fp/modules/pressure_sensors.py	(.../pressure_sensors.py)	(revision e60ad12bcc58d5905d7268bbeaae139d8233e023)
@@ -18,8 +18,9 @@
 from logging import Logger
 
 from .constants import RESET, NO_RESET
+from leahi_dialin.common.fp_defs import fp_enum_repository
+from leahi_dialin.common.global_vars import GlobalVariables
 from leahi_dialin.common.msg_defs import MsgIds, MsgFieldPositions
-from leahi_dialin.common.fp_defs import FPPressureSensorNames
 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
@@ -47,12 +48,13 @@
                                                                        self._handler_pressure_sync)
 
         self.fp_pressures = {
-            FPPressureSensorNames.M3_PRES.name: 0.0,
-            FPPressureSensorNames.P8_PRES.name: 0.0,
-            FPPressureSensorNames.P13_PRES.name: 0.0,
-            FPPressureSensorNames.P17_PRES.name: 0.0,
-            FPPressureSensorNames.P46_PRES.name: 0.0
+            fp_enum_repository.FPPressureSensorNames.M3_PRES.name: 0.0,
+            fp_enum_repository.FPPressureSensorNames.P8_PRES.name: 0.0,
+            fp_enum_repository.FPPressureSensorNames.P13_PRES.name: 0.0,
+            fp_enum_repository.FPPressureSensorNames.P17_PRES.name: 0.0
         }
+        if GlobalVariables.NEXT_GEN_HW:
+            self.fp_temperatures[fp_enum_repository.FPTemperatureSensorNames.P46_PRES.name] = 0.0
 
         self.fp_pressure_timestamp = 0.0
 
@@ -66,16 +68,17 @@
         @return: none
         """
 
-        self.fp_pressures[FPPressureSensorNames.M3_PRES.name] = struct.unpack('f', bytearray(
+        self.fp_pressures[fp_enum_repository.FPPressureSensorNames.M3_PRES.name] = struct.unpack('f', bytearray(
             message['message'][MsgFieldPositions.START_POS_FIELD_1:MsgFieldPositions.END_POS_FIELD_1]))[0]
-        self.fp_pressures[FPPressureSensorNames.P8_PRES.name] = struct.unpack('f', bytearray(
+        self.fp_pressures[fp_enum_repository.FPPressureSensorNames.P8_PRES.name] = struct.unpack('f', bytearray(
             message['message'][MsgFieldPositions.START_POS_FIELD_2:MsgFieldPositions.END_POS_FIELD_2]))[0]
-        self.fp_pressures[FPPressureSensorNames.P13_PRES.name] = struct.unpack('f', bytearray(
+        self.fp_pressures[fp_enum_repository.FPPressureSensorNames.P13_PRES.name] = struct.unpack('f', bytearray(
             message['message'][MsgFieldPositions.START_POS_FIELD_3:MsgFieldPositions.END_POS_FIELD_3]))[0]
-        self.fp_pressures[FPPressureSensorNames.P17_PRES.name] = struct.unpack('f', bytearray(
+        self.fp_pressures[fp_enum_repository.FPPressureSensorNames.P17_PRES.name] = struct.unpack('f', bytearray(
             message['message'][MsgFieldPositions.START_POS_FIELD_4:MsgFieldPositions.END_POS_FIELD_4]))[0]
-        self.fp_pressures[FPPressureSensorNames.P46_PRES.name] = struct.unpack('f', bytearray(
-            message['message'][MsgFieldPositions.START_POS_FIELD_5:MsgFieldPositions.END_POS_FIELD_5]))[0]
+        if GlobalVariables.NEXT_GEN_HW:
+            self.fp_pressures[fp_enum_repository.FPPressureSensorNames.P46_PRES.name] = struct.unpack('f', bytearray(
+                message['message'][MsgFieldPositions.START_POS_FIELD_5:MsgFieldPositions.END_POS_FIELD_5]))[0]
 
         self.fp_pressure_timestamp = timestamp
 
Index: leahi_dialin/fp/modules/ro_pump.py
===================================================================
diff -u -rec8a2600b9e8cf6fe7e02c200a1c24221ca86863 -re60ad12bcc58d5905d7268bbeaae139d8233e023
--- leahi_dialin/fp/modules/ro_pump.py	(.../ro_pump.py)	(revision ec8a2600b9e8cf6fe7e02c200a1c24221ca86863)
+++ leahi_dialin/fp/modules/ro_pump.py	(.../ro_pump.py)	(revision e60ad12bcc58d5905d7268bbeaae139d8233e023)
@@ -16,12 +16,10 @@
 import struct
 from enum import unique
 from logging import Logger
-from enum import unique
 
-from leahi_dialin.utils.base import DialinEnum
 from .constants import RESET, NO_RESET
 from leahi_dialin.common.msg_defs import MsgIds, MsgFieldPositions
-from leahi_dialin.common.fp_defs import ROPumpNames, FPPumpAttributes
+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
@@ -47,16 +45,16 @@
                                                                        self._handler_pump_sync)
 
         self.ro_pump = {
-            ROPumpNames.P12_PUMP.name: {
-                FPPumpAttributes.STATE.name: 0,
-                FPPumpAttributes.DUTY_CYCLE.name: 0,
-                FPPumpAttributes.FB_DUTY_CYCLE.name: 0,
-                FPPumpAttributes.SPEED.name: 0.0,
-                FPPumpAttributes.TARGET_PRES.name: 0.0,
-                FPPumpAttributes.TARGET_FLOW.name: 0.0,
-                FPPumpAttributes.TARGET_DUTY_CYCLE.name: 0.0,
-                FPPumpAttributes.DUTY_CYCLE_PCT.name: 0.0,
-                FPPumpAttributes.FB_DUTY_CYCLE_PCT.name: 0.0
+            fp_enum_repository.FPROPumpNames.P12_PUMP.name: {
+                fp_enum_repository.FPPumpAttributes.STATE.name: 0,
+                fp_enum_repository.FPPumpAttributes.DUTY_CYCLE.name: 0,
+                fp_enum_repository.FPPumpAttributes.FB_DUTY_CYCLE.name: 0,
+                fp_enum_repository.FPPumpAttributes.SPEED.name: 0.0,
+                fp_enum_repository.FPPumpAttributes.TARGET_PRES.name: 0.0,
+                fp_enum_repository.FPPumpAttributes.TARGET_FLOW.name: 0.0,
+                fp_enum_repository.FPPumpAttributes.TARGET_DUTY_CYCLE.name: 0.0,
+                fp_enum_repository.FPPumpAttributes.DUTY_CYCLE_PCT.name: 0.0,
+                fp_enum_repository.FPPumpAttributes.FB_DUTY_CYCLE_PCT.name: 0.0
             }
         }
 
@@ -72,23 +70,23 @@
         @return: none
         """
 
-        self.ro_pump[ROPumpNames.P12_PUMP.name][FPPumpAttributes.STATE.name] = struct.unpack('i', bytearray(
+        self.ro_pump[fp_enum_repository.FPROPumpNames.P12_PUMP.name][fp_enum_repository.FPPumpAttributes.STATE.name] = struct.unpack('i', bytearray(
             message['message'][MsgFieldPositions.START_POS_FIELD_1:MsgFieldPositions.END_POS_FIELD_1]))[0]
-        self.ro_pump[ROPumpNames.P12_PUMP.name][FPPumpAttributes.DUTY_CYCLE.name] = struct.unpack('i', bytearray(
+        self.ro_pump[fp_enum_repository.FPROPumpNames.P12_PUMP.name][fp_enum_repository.FPPumpAttributes.DUTY_CYCLE.name] = struct.unpack('i', bytearray(
             message['message'][MsgFieldPositions.START_POS_FIELD_2:MsgFieldPositions.END_POS_FIELD_2]))[0]
-        self.ro_pump[ROPumpNames.P12_PUMP.name][FPPumpAttributes.FB_DUTY_CYCLE.name] = struct.unpack('i', bytearray(
+        self.ro_pump[fp_enum_repository.FPROPumpNames.P12_PUMP.name][fp_enum_repository.FPPumpAttributes.FB_DUTY_CYCLE.name] = struct.unpack('i', bytearray(
             message['message'][MsgFieldPositions.START_POS_FIELD_3:MsgFieldPositions.END_POS_FIELD_3]))[0]
-        self.ro_pump[ROPumpNames.P12_PUMP.name][FPPumpAttributes.SPEED.name] = struct.unpack('f', bytearray(
+        self.ro_pump[fp_enum_repository.FPROPumpNames.P12_PUMP.name][fp_enum_repository.FPPumpAttributes.SPEED.name] = struct.unpack('f', bytearray(
             message['message'][MsgFieldPositions.START_POS_FIELD_4:MsgFieldPositions.END_POS_FIELD_4]))[0]
-        self.ro_pump[ROPumpNames.P12_PUMP.name][FPPumpAttributes.TARGET_PRES.name] = struct.unpack('f', bytearray(
+        self.ro_pump[fp_enum_repository.FPROPumpNames.P12_PUMP.name][fp_enum_repository.FPPumpAttributes.TARGET_PRES.name] = struct.unpack('f', bytearray(
             message['message'][MsgFieldPositions.START_POS_FIELD_5:MsgFieldPositions.END_POS_FIELD_5]))[0]
-        self.ro_pump[ROPumpNames.P12_PUMP.name][FPPumpAttributes.TARGET_FLOW.name] = struct.unpack('f', bytearray(
+        self.ro_pump[fp_enum_repository.FPROPumpNames.P12_PUMP.name][fp_enum_repository.FPPumpAttributes.TARGET_FLOW.name] = struct.unpack('f', bytearray(
             message['message'][MsgFieldPositions.START_POS_FIELD_6:MsgFieldPositions.END_POS_FIELD_6]))[0]
-        self.ro_pump[ROPumpNames.P12_PUMP.name][FPPumpAttributes.TARGET_DUTY_CYCLE.name] = struct.unpack('f', bytearray(
+        self.ro_pump[fp_enum_repository.FPROPumpNames.P12_PUMP.name][fp_enum_repository.FPPumpAttributes.TARGET_DUTY_CYCLE.name] = struct.unpack('f', bytearray(
             message['message'][MsgFieldPositions.START_POS_FIELD_7:MsgFieldPositions.END_POS_FIELD_7]))[0]
-        self.ro_pump[ROPumpNames.P12_PUMP.name][FPPumpAttributes.DUTY_CYCLE_PCT.name] = struct.unpack('f', bytearray(
+        self.ro_pump[fp_enum_repository.FPROPumpNames.P12_PUMP.name][fp_enum_repository.FPPumpAttributes.DUTY_CYCLE_PCT.name] = struct.unpack('f', bytearray(
             message['message'][MsgFieldPositions.START_POS_FIELD_8:MsgFieldPositions.END_POS_FIELD_8]))[0]
-        self.ro_pump[ROPumpNames.P12_PUMP.name][FPPumpAttributes.FB_DUTY_CYCLE_PCT.name] = struct.unpack('f', bytearray(
+        self.ro_pump[fp_enum_repository.FPROPumpNames.P12_PUMP.name][fp_enum_repository.FPPumpAttributes.FB_DUTY_CYCLE_PCT.name] = struct.unpack('f', bytearray(
             message['message'][MsgFieldPositions.START_POS_FIELD_9:MsgFieldPositions.END_POS_FIELD_9]))[0]
 
         self.ro_pump_timestamp = timestamp
Index: leahi_dialin/fp/modules/temperatures.py
===================================================================
diff -u -r894abd4d8e62d20ba65ca78e443ffb5ea00c07ea -re60ad12bcc58d5905d7268bbeaae139d8233e023
--- leahi_dialin/fp/modules/temperatures.py	(.../temperatures.py)	(revision 894abd4d8e62d20ba65ca78e443ffb5ea00c07ea)
+++ leahi_dialin/fp/modules/temperatures.py	(.../temperatures.py)	(revision e60ad12bcc58d5905d7268bbeaae139d8233e023)
@@ -44,17 +44,17 @@
 
         self.fp_temperature_sensors_timestamp = 0
         self.fp_temperatures = {
-            fp_enum_repository.FPTemperaturesNames.M3_TEMP.name: 0.0,
-            fp_enum_repository.FPTemperaturesNames.P8_TEMP.name: 0.0,
-            fp_enum_repository.FPTemperaturesNames.P13_TEMP.name: 0.0,
-            fp_enum_repository.FPTemperaturesNames.P17_TEMP.name: 0.0,
-            fp_enum_repository.FPTemperaturesNames.P10_TEMP.name: 0.0,
-            fp_enum_repository.FPTemperaturesNames.P19_TEMP.name: 0.0,
-            fp_enum_repository.FPTemperaturesNames.P7_TEMP.name: 0.0,
-            fp_enum_repository.FPTemperaturesNames.P16_TEMP.name: 0.0,
+            fp_enum_repository.FPTemperatureSensorNames.M3_TEMP.name: 0.0,
+            fp_enum_repository.FPTemperatureSensorNames.P8_TEMP.name: 0.0,
+            fp_enum_repository.FPTemperatureSensorNames.P13_TEMP.name: 0.0,
+            fp_enum_repository.FPTemperatureSensorNames.P17_TEMP.name: 0.0,
+            fp_enum_repository.FPTemperatureSensorNames.P10_TEMP.name: 0.0,
+            fp_enum_repository.FPTemperatureSensorNames.P19_TEMP.name: 0.0,
+            fp_enum_repository.FPTemperatureSensorNames.P7_TEMP.name: 0.0,
+            fp_enum_repository.FPTemperatureSensorNames.P16_TEMP.name: 0.0,
         }
         if GlobalVariables.NEXT_GEN_HW:
-            self.fp_temperatures[fp_enum_repository.FPTemperaturesNames.P46_TEMP.name] = 0.0
+            self.fp_temperatures[fp_enum_repository.FPTemperatureSensorNames.P46_TEMP.name] = 0.0
 
 
     @publish(["msg_id_fp_temperature_data", "fp_temperatures", "fp_temperatures_timestamp"])
@@ -65,32 +65,32 @@
         @param message:  published FP temperature sensors data message
         @returns none
         """
-        self.fp_temperatures[fp_enum_repository.FPTemperaturesNames.M3_TEMP.name] = struct.unpack('f', bytearray(
+        self.fp_temperatures[fp_enum_repository.FPTemperatureSensorNames.M3_TEMP.name] = struct.unpack('f', bytearray(
             message['message'][MsgFieldPositions.START_POS_FIELD_1:MsgFieldPositions.END_POS_FIELD_1]))[0]
 
-        self.fp_temperatures[fp_enum_repository.FPTemperaturesNames.P10_TEMP.name] = struct.unpack('f', bytearray(
+        self.fp_temperatures[fp_enum_repository.FPTemperatureSensorNames.P10_TEMP.name] = struct.unpack('f', bytearray(
             message['message'][MsgFieldPositions.START_POS_FIELD_2:MsgFieldPositions.END_POS_FIELD_2]))[0]
 
-        self.fp_temperatures[fp_enum_repository.FPTemperaturesNames.P19_TEMP.name] = struct.unpack('f', bytearray(
+        self.fp_temperatures[fp_enum_repository.FPTemperatureSensorNames.P19_TEMP.name] = struct.unpack('f', bytearray(
             message['message'][MsgFieldPositions.START_POS_FIELD_3:MsgFieldPositions.END_POS_FIELD_3]))[0]
 
-        self.fp_temperatures[fp_enum_repository.FPTemperaturesNames.P8_TEMP.name] = struct.unpack('f', bytearray(
+        self.fp_temperatures[fp_enum_repository.FPTemperatureSensorNames.P8_TEMP.name] = struct.unpack('f', bytearray(
             message['message'][MsgFieldPositions.START_POS_FIELD_4:MsgFieldPositions.END_POS_FIELD_4]))[0]
 
-        self.fp_temperatures[fp_enum_repository.FPTemperaturesNames.P13_TEMP.name] = struct.unpack('f', bytearray(
+        self.fp_temperatures[fp_enum_repository.FPTemperatureSensorNames.P13_TEMP.name] = struct.unpack('f', bytearray(
             message['message'][MsgFieldPositions.START_POS_FIELD_5:MsgFieldPositions.END_POS_FIELD_5]))[0]
 
-        self.fp_temperatures[fp_enum_repository.FPTemperaturesNames.P17_TEMP.name] = struct.unpack('f', bytearray(
+        self.fp_temperatures[fp_enum_repository.FPTemperatureSensorNames.P17_TEMP.name] = struct.unpack('f', bytearray(
             message['message'][MsgFieldPositions.START_POS_FIELD_6:MsgFieldPositions.END_POS_FIELD_6]))[0]
 
-        self.fp_temperatures[fp_enum_repository.FPTemperaturesNames.P7_TEMP.name] = struct.unpack('f', bytearray(
+        self.fp_temperatures[fp_enum_repository.FPTemperatureSensorNames.P7_TEMP.name] = struct.unpack('f', bytearray(
             message['message'][MsgFieldPositions.START_POS_FIELD_7:MsgFieldPositions.END_POS_FIELD_7]))[0]
 
-        self.fp_temperatures[fp_enum_repository.FPTemperaturesNames.P16_TEMP.name] = struct.unpack('f', bytearray(
+        self.fp_temperatures[fp_enum_repository.FPTemperatureSensorNames.P16_TEMP.name] = struct.unpack('f', bytearray(
             message['message'][MsgFieldPositions.START_POS_FIELD_8:MsgFieldPositions.END_POS_FIELD_8]))[0]
 
         if GlobalVariables.NEXT_GEN_HW:
-            self.fp_temperatures[fp_enum_repository.FPTemperaturesNames.P46_TEMP.name] = struct.unpack('f', bytearray(
+            self.fp_temperatures[fp_enum_repository.FPTemperatureSensorNames.P46_TEMP.name] = struct.unpack('f', bytearray(
                 message['message'][MsgFieldPositions.START_POS_FIELD_9:MsgFieldPositions.END_POS_FIELD_9]))[0]
 
         self.fp_temperature_sensors_timestamp = timestamp
@@ -147,31 +147,31 @@
         value = float_to_bytearray(sensor_value)
 
          # FP Conductivity Sensors' Temperature Override
-        if fp_enum_repository.FPTemperaturesNames.FIRST_CONDUCTIVITY_SENSOR.value <= sensor_index <= fp_enum_repository.FPTemperaturesNames.LAST_CONDUCTIVITY_SENSOR.value:
-            modified_index = sensor_index - fp_enum_repository.FPTemperaturesNames.FIRST_CONDUCTIVITY_SENSOR.value + BETA_IOFP_COND_SENSOR_OFFSET
+        if fp_enum_repository.FPTemperatureSensorNames.FIRST_CONDUCTIVITY_SENSOR.value <= sensor_index <= fp_enum_repository.FPTemperatureSensorNames.LAST_CONDUCTIVITY_SENSOR.value:
+            modified_index = sensor_index - fp_enum_repository.FPTemperatureSensorNames.FIRST_CONDUCTIVITY_SENSOR.value + BETA_IOFP_COND_SENSOR_OFFSET
             msg_id = MsgIds.MSG_ID_FP_CONDUCTIVITY_TEMP_OVERRIDE_REQUEST
 
         # FP Flow Sensors' Temperature Override
-        elif fp_enum_repository.FPTemperaturesNames.FIRST_FLOW_SENSOR.value <= sensor_index <= fp_enum_repository.FPTemperaturesNames.LAST_FLOW_SENSOR.value:
-            modified_index = sensor_index - fp_enum_repository.FPTemperaturesNames.FIRST_FLOW_SENSOR.value
+        elif fp_enum_repository.FPTemperatureSensorNames.FIRST_FLOW_SENSOR.value <= sensor_index <= fp_enum_repository.FPTemperatureSensorNames.LAST_FLOW_SENSOR.value:
+            modified_index = sensor_index - fp_enum_repository.FPTemperatureSensorNames.FIRST_FLOW_SENSOR.value
             msg_id = MsgIds.MSG_ID_FP_FLOW_TEMP_OVERRIDE_REQUEST
 
         # FP Pressure Sensors' Temperature Override
         else:
-            modified_index = sensor_index - fp_enum_repository.FPTemperaturesNames.FIRST_PRESSURE_SENSOR.value + BETA_IOFP_PRES_SENSOR_OFFSET
+            modified_index = sensor_index - fp_enum_repository.FPTemperatureSensorNames.FIRST_PRESSURE_SENSOR.value + BETA_IOFP_PRES_SENSOR_OFFSET
             msg_id = MsgIds.MSG_ID_FP_PRESSURE_TEMP_OVERRIDE_REQUEST
         
         index = integer_to_bytearray(modified_index)
         rst = integer_to_bytearray(reset)
         value = float_to_bytearray(sensor_value)
         payload = rst + value + index
            
-        sensor_name = fp_enum_repository.FPTemperaturesNames(sensor_index).name.split('_')[0]
+        sensor_name = fp_enum_repository.FPTemperatureSensorNames(sensor_index).name.split('_')[0]
         message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_fp_ch_id,
                                                   message_id=msg_id.value,
                                                   payload=payload)
 
-        self.logger.debug("Setting sensor {} to {} C".format(fp_enum_repository.FPTemperaturesNames[str(sensor_index)].name, sensor_value))
+        self.logger.debug("Setting sensor {} to {} C".format(fp_enum_repository.FPTemperatureSensorNames[str(sensor_index)].name, sensor_value))
 
         # Send message
         received_message = self.can_interface.send(message)
Index: leahi_dialin/fp/modules/valves.py
===================================================================
diff -u -ree0ca62a34e13183d43fb3830b774f3fed9989b6 -re60ad12bcc58d5905d7268bbeaae139d8233e023
--- leahi_dialin/fp/modules/valves.py	(.../valves.py)	(revision ee0ca62a34e13183d43fb3830b774f3fed9989b6)
+++ leahi_dialin/fp/modules/valves.py	(.../valves.py)	(revision e60ad12bcc58d5905d7268bbeaae139d8233e023)
@@ -20,7 +20,7 @@
 from collections import OrderedDict
 
 from .constants import NO_RESET
-from leahi_dialin.common.fp_defs import FPValveStates, FPValveNames, BETA_IOFP_VALVE_OFFSET
+from leahi_dialin.common.fp_defs import fp_enum_repository, BETA_IOFP_VALVE_OFFSET
 from leahi_dialin.common.msg_defs import MsgIds
 from leahi_dialin.protocols.CAN import DenaliMessage, DenaliChannels
 from leahi_dialin.utils.base import AbstractSubSystem, publish, DialinEnum
@@ -62,19 +62,19 @@
             self.can_interface.register_receiving_publication_function(channel_id, self.msg_id_fp_valves_states_data, self._handler_valves_sync)
 
         self.valve_states_all = 0x0000
-        self.m4_valv = {"id": FPValveNames.M4_VALV.value, "state": DEENERGIZED}
-        self.m12_valv = {"id": FPValveNames.M12_VALV.value, "state": DEENERGIZED}
-        self.p11_valv = {"id": FPValveNames.P11_VALV.value, "state": DEENERGIZED}
-        self.p33_valv = {"id": FPValveNames.P33_VALV.value, "state": DEENERGIZED}
-        self.p34_valv = {"id": FPValveNames.P34_VALV.value, "state": DEENERGIZED}
-        self.p37_valv = {"id": FPValveNames.P37_VALV.value, "state": DEENERGIZED}
-        self.p39_valv = {"id": FPValveNames.P39_VALV.value, "state": DEENERGIZED}
-        self.p6_valv = {"id": FPValveNames.P6_VALV.value, "state": DEENERGIZED}
+        self.m4_valv = {"id": fp_enum_repository.FPValveNames.M4_VALV.value, "state": DEENERGIZED}
+        self.m12_valv = {"id": fp_enum_repository.FPValveNames.M12_VALV.value, "state": DEENERGIZED}
+        self.p11_valv = {"id": fp_enum_repository.FPValveNames.P11_VALV.value, "state": DEENERGIZED}
+        self.p33_valv = {"id": fp_enum_repository.FPValveNames.P33_VALV.value, "state": DEENERGIZED}
+        self.p34_valv = {"id": fp_enum_repository.FPValveNames.P34_VALV.value, "state": DEENERGIZED}
+        self.p37_valv = {"id": fp_enum_repository.FPValveNames.P37_VALV.value, "state": DEENERGIZED}
+        self.p39_valv = {"id": fp_enum_repository.FPValveNames.P39_VALV.value, "state": DEENERGIZED}
+        self.p6_valv = {"id": fp_enum_repository.FPValveNames.P6_VALV.value, "state": DEENERGIZED}
 
         # NOTE: The len function counts the enums with the same number only once.
-        self.valve_states_enum = [0 for _ in range(len(FPValveNames))]
+        self.valve_states_enum = [0 for _ in range(len(fp_enum_repository.FPValveNames))]
 
-        for valve in FPValveNames.__members__:
+        for valve in fp_enum_repository.FPValveNames.__members__:
             self.valves_sensed_states[valve] = ''
 
     def get_valve_states(self):
@@ -137,7 +137,7 @@
         end = start + 1
         for valve_id in self.valves_sensed_states:
             valve_state_number = struct.unpack('B', bytearray(message['message'][start:end]))[0]
-            self.valves_sensed_states[valve_id] = FPValveStates(valve_state_number).name
+            self.valves_sensed_states[valve_id] = fp_enum_repository.FPValveStates(valve_state_number).name
             start = end
             end += 1