Index: leahi_dialin/common/fp_defs.py
===================================================================
diff -u -r55d97b27c73f8e08994328881d3f56cbc7f00e29 -r89ad4ada524457a552b9afcde3828bda384d1765
--- leahi_dialin/common/fp_defs.py	(.../fp_defs.py)	(revision 55d97b27c73f8e08994328881d3f56cbc7f00e29)
+++ leahi_dialin/common/fp_defs.py	(.../fp_defs.py)	(revision 89ad4ada524457a552b9afcde3828bda384d1765)
@@ -17,7 +17,7 @@
 from aenum import extend_enum
 from typing import TYPE_CHECKING
 
-from .dd_defs import DDConductivitySensorsEnum, DDPressureNames, DDValveNames
+from .dd_defs import dd_enum_repository
 from .global_vars import GlobalVariables, test_config_change
 from ..utils.base import DialinEnum
 
@@ -60,7 +60,7 @@
         'FPOpModes': '_create_fp_operation_modes',
         'FPFaultStates': '_create_fp_fault_states',
         'FPServiceStates': '_create_fp_service_states',
-        'FPPostStates': '_create_fp_post_states',
+        'FPPostStates': '_create_fp_init_post_states',
         'FPStandbyStates': '_create_fp_standby_states',
         'FPPreGenPermeateStates': '_create_fp_pregen_states',
         'FPPreGenPDefStates': '_create_fp_pregen_defeatured_states',
@@ -447,6 +447,6 @@
 test_config_change.add_listener(fp_enum_repository.update_enums)
 
 
-BETA_IOFP_COND_SENSOR_OFFSET = DDConductivitySensorsEnum.NUM_OF_CONDUCTIVITY_SENSORS.value          # Offset to translate Dialin FPTemperaturesNames to DD firmware DD Conductivity Sensors enum
-BETA_IOFP_PRES_SENSOR_OFFSET = DDPressureNames.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
+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
Index: leahi_dialin/common/td_defs.py
===================================================================
diff -u -r55d97b27c73f8e08994328881d3f56cbc7f00e29 -r89ad4ada524457a552b9afcde3828bda384d1765
--- leahi_dialin/common/td_defs.py	(.../td_defs.py)	(revision 55d97b27c73f8e08994328881d3f56cbc7f00e29)
+++ leahi_dialin/common/td_defs.py	(.../td_defs.py)	(revision 89ad4ada524457a552b9afcde3828bda384d1765)
@@ -93,7 +93,7 @@
         'TDTemperatureSensorNames': '_create_td_temperature_sensor_names',
         'TDSwitchNames': '_create_td_switch_names',
         'TDValveNames': '_create_td_valve_names',
-        'TDMonitoredVoltages': '_create_dd_monitored_voltages',
+        'TDMonitoredVoltages': '_create_td_monitored_voltages',
 
         # Support enums
         'TDAirPumpAttributes': '_create_td_air_pump_attributes',
@@ -422,7 +422,7 @@
         return DialinEnum('TDTemperatureSensorNames', members)
 
 
-    def _create_td_switches_names(self):
+    def _create_td_switch_names(self):
         members = {
             'H9_FRONT_DOOR': 0,                                         # Front Door Switch for TD
             'NUM_OF_DOORS_AND_SWITCHES': 1,                             # Number of Doors and Switches
Index: leahi_dialin/td/modules/ejector.py
===================================================================
diff -u -r8bcac0e6e7960de5d9bdf925bbf5581cdc97df31 -r89ad4ada524457a552b9afcde3828bda384d1765
--- leahi_dialin/td/modules/ejector.py	(.../ejector.py)	(revision 8bcac0e6e7960de5d9bdf925bbf5581cdc97df31)
+++ leahi_dialin/td/modules/ejector.py	(.../ejector.py)	(revision 89ad4ada524457a552b9afcde3828bda384d1765)
@@ -19,7 +19,7 @@
 
 from .constants import RESET, NO_RESET
 from leahi_dialin.common.msg_defs import MsgIds, MsgFieldPositions
-from leahi_dialin.common.td_defs import TDEjectorNames, TDEjectorAttributes
+from leahi_dialin.common.td_defs import td_enum_repository
 from leahi_dialin.protocols.CAN import DenaliMessage, DenaliChannels
 from leahi_dialin.utils.base import AbstractSubSystem, publish
 from leahi_dialin.utils.checks import check_broadcast_interval_override_ms
@@ -49,11 +49,11 @@
                                                                        self._handler_ejector_sync)
 
         self.h5_motor = {
-            TDEjectorNames.H5_MOTOR.name: {
-                TDEjectorAttributes.STATE.name: 0,
-                TDEjectorAttributes.SET_SPEED.name: 0.0,
-                TDEjectorAttributes.OPT_SNSR_RETRACT: 0,
-                TDEjectorAttributes.OPT_SNSR_ENGAGE: 0
+            td_enum_repository.TDEjectorNames.H5_MOTOR.name: {
+                td_enum_repository.TDEjectorAttributes.STATE.name: 0,
+                td_enum_repository.TDEjectorAttributes.SET_SPEED.name: 0.0,
+                td_enum_repository.TDEjectorAttributes.OPT_SNSR_RETRACT: 0,
+                td_enum_repository.TDEjectorAttributes.OPT_SNSR_ENGAGE: 0
             }
         }
         self.td_ejector_timestamp = 0
@@ -66,13 +66,13 @@
         @param message:  published ejector data message as: ejector state
         @return: None
         """
-        self.h5_motor[TDEjectorNames.H5_MOTOR.name][TDEjectorAttributes.STATE.name] = struct.unpack('i', bytearray(
+        self.h5_motor[td_enum_repository.TDEjectorNames.H5_MOTOR.name][td_enum_repository.TDEjectorAttributes.STATE.name] = struct.unpack('i', bytearray(
             message['message'][MsgFieldPositions.START_POS_FIELD_1:MsgFieldPositions.END_POS_FIELD_1]))[0]
-        self.h5_motor[TDEjectorNames.H5_MOTOR.name][TDEjectorAttributes.SET_SPEED.name] = struct.unpack('f', bytearray(
+        self.h5_motor[td_enum_repository.TDEjectorNames.H5_MOTOR.name][td_enum_repository.TDEjectorAttributes.SET_SPEED.name] = struct.unpack('f', bytearray(
             message['message'][MsgFieldPositions.START_POS_FIELD_2:MsgFieldPositions.END_POS_FIELD_2]))[0]
-        self.h5_motor[TDEjectorNames.H5_MOTOR.name][TDEjectorAttributes.OPT_SNSR_RETRACT.name] = struct.unpack('i', bytearray(
+        self.h5_motor[td_enum_repository.TDEjectorNames.H5_MOTOR.name][td_enum_repository.TDEjectorAttributes.OPT_SNSR_RETRACT.name] = struct.unpack('i', bytearray(
             message['message'][MsgFieldPositions.START_POS_FIELD_3:MsgFieldPositions.END_POS_FIELD_3]))[0]
-        self.h5_motor[TDEjectorNames.H5_MOTOR.name][TDEjectorAttributes.OPT_SNSR_ENGAGE.name] = struct.unpack('i', bytearray(
+        self.h5_motor[td_enum_repository.TDEjectorNames.H5_MOTOR.name][td_enum_repository.TDEjectorAttributes.OPT_SNSR_ENGAGE.name] = struct.unpack('i', bytearray(
             message['message'][MsgFieldPositions.START_POS_FIELD_4:MsgFieldPositions.END_POS_FIELD_4]))[0]
 
         self.td_ejector_timestamp = timestamp