Index: leahi_dialin/common/fp_defs.py
===================================================================
diff -u -r20c821bd230fc7689a0275a2918981669ff5cc19 -r70ede35f42770305f04b251b3372ef42a9cecbf5
--- leahi_dialin/common/fp_defs.py	(.../fp_defs.py)	(revision 20c821bd230fc7689a0275a2918981669ff5cc19)
+++ leahi_dialin/common/fp_defs.py	(.../fp_defs.py)	(revision 70ede35f42770305f04b251b3372ef42a9cecbf5)
@@ -16,15 +16,15 @@
 
 from enum import unique
 
-from .dd_defs import dd_enum_repository
+from .dd_defs import DDConductivitySensorNames, DDPressureSensorNames, DDValveNames
 from ..utils.base import DialinEnum
 
 
 
 # ================================================== Constants ==================================================
-BETA_IOFP_COND_SENSOR_OFFSET = dd_enum_repository.DDConductivitySensorNames.NUM_OF_CONDUCTIVITY_SENSORS.value          # Offset to translate Dialin FPTemperaturesNames to DD firmware DD Conductivity Sensors enum
-BETA_IOFP_PRES_SENSOR_OFFSET = dd_enum_repository.DDPressureSensorNames.NUM_OF_PRESSURE_SENSORS.value                  # Offset to translate Dialin FPTemperaturesNames to DD firmware DD Pressure Sensors enum
-BETA_IOFP_VALVE_OFFSET = dd_enum_repository.DDValveNames.NUM_OF_DD_VALVES.value                                        # Offset to translate Dialin FPValveNames to DD firmware DD_Valves
+BETA_IOFP_COND_SENSOR_OFFSET = DDConductivitySensorNames.NUM_OF_CONDUCTIVITY_SENSORS.value          # Offset to translate Dialin FPTemperaturesNames to DD firmware DD Conductivity Sensors enum
+BETA_IOFP_PRES_SENSOR_OFFSET = DDPressureSensorNames.NUM_OF_PRESSURE_SENSORS.value                  # Offset to translate Dialin FPTemperaturesNames to DD firmware DD Pressure Sensors enum
+BETA_IOFP_VALVE_OFFSET = DDValveNames.NUM_OF_DD_VALVES.value                                        # Offset to translate Dialin FPValveNames to DD firmware DD_Valves
 
 # ================================================== Enum Creators: Operations ==================================================
 @unique
Index: leahi_dialin/fp/modules/conductivity_sensors.py
===================================================================
diff -u -r20c821bd230fc7689a0275a2918981669ff5cc19 -r70ede35f42770305f04b251b3372ef42a9cecbf5
--- leahi_dialin/fp/modules/conductivity_sensors.py	(.../conductivity_sensors.py)	(revision 20c821bd230fc7689a0275a2918981669ff5cc19)
+++ leahi_dialin/fp/modules/conductivity_sensors.py	(.../conductivity_sensors.py)	(revision 70ede35f42770305f04b251b3372ef42a9cecbf5)
@@ -18,7 +18,8 @@
 from logging import Logger
 
 from leahi_dialin.common.constants import NO_RESET
-from leahi_dialin.common import fp_enum_repository, BETA_IOFP_COND_SENSOR_OFFSET
+from leahi_dialin.common import fp_enum_repository
+from leahi_dialin.common.fp_defs import BETA_IOFP_COND_SENSOR_OFFSET
 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
Index: leahi_dialin/fp/modules/pressure_sensors.py
===================================================================
diff -u -r20c821bd230fc7689a0275a2918981669ff5cc19 -r70ede35f42770305f04b251b3372ef42a9cecbf5
--- leahi_dialin/fp/modules/pressure_sensors.py	(.../pressure_sensors.py)	(revision 20c821bd230fc7689a0275a2918981669ff5cc19)
+++ leahi_dialin/fp/modules/pressure_sensors.py	(.../pressure_sensors.py)	(revision 70ede35f42770305f04b251b3372ef42a9cecbf5)
@@ -18,7 +18,8 @@
 from logging import Logger
 
 from leahi_dialin.common.constants import NO_RESET
-from leahi_dialin.common import fp_enum_repository, BETA_IOFP_PRES_SENSOR_OFFSET
+from leahi_dialin.common import fp_enum_repository
+from leahi_dialin.common.fp_defs import BETA_IOFP_PRES_SENSOR_OFFSET
 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
Index: leahi_dialin/fp/modules/temperatures.py
===================================================================
diff -u -r20c821bd230fc7689a0275a2918981669ff5cc19 -r70ede35f42770305f04b251b3372ef42a9cecbf5
--- leahi_dialin/fp/modules/temperatures.py	(.../temperatures.py)	(revision 20c821bd230fc7689a0275a2918981669ff5cc19)
+++ leahi_dialin/fp/modules/temperatures.py	(.../temperatures.py)	(revision 70ede35f42770305f04b251b3372ef42a9cecbf5)
@@ -18,7 +18,8 @@
 from logging import Logger
 
 from leahi_dialin.common.constants import NO_RESET
-from leahi_dialin.common import fp_enum_repository, BETA_IOFP_COND_SENSOR_OFFSET, BETA_IOFP_PRES_SENSOR_OFFSET
+from leahi_dialin.common import fp_enum_repository
+from leahi_dialin.common.fp_defs import BETA_IOFP_COND_SENSOR_OFFSET, BETA_IOFP_PRES_SENSOR_OFFSET
 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
Index: leahi_dialin/fp/modules/valves.py
===================================================================
diff -u -r20c821bd230fc7689a0275a2918981669ff5cc19 -r70ede35f42770305f04b251b3372ef42a9cecbf5
--- leahi_dialin/fp/modules/valves.py	(.../valves.py)	(revision 20c821bd230fc7689a0275a2918981669ff5cc19)
+++ leahi_dialin/fp/modules/valves.py	(.../valves.py)	(revision 70ede35f42770305f04b251b3372ef42a9cecbf5)
@@ -19,7 +19,8 @@
 from collections import OrderedDict
 
 from leahi_dialin.common.constants import NO_RESET
-from leahi_dialin.common import fp_enum_repository, BETA_IOFP_VALVE_OFFSET
+from leahi_dialin.common import fp_enum_repository
+from leahi_dialin.common.fp_defs import BETA_IOFP_VALVE_OFFSET
 from leahi_dialin.common.msg_defs import MsgIds
 from leahi_dialin.common.override_templates import cmd_generic_broadcast_interval_override, cmd_generic_override
 from leahi_dialin.protocols.CAN import DenaliMessage, DenaliChannels