Index: leahi_dialin/common/__init__.py
===================================================================
diff -u -r3715028b608b10e1d440a8a738c8a4f70d3d411b -rc0bd3c89009d0faaf5cb51b3f7da5bdaee7908c8
--- leahi_dialin/common/__init__.py	(.../__init__.py)	(revision 3715028b608b10e1d440a8a738c8a4f70d3d411b)
+++ leahi_dialin/common/__init__.py	(.../__init__.py)	(revision c0bd3c89009d0faaf5cb51b3f7da5bdaee7908c8)
@@ -21,7 +21,7 @@
 else:
     from .alarm_defs        import *
     from .alarm_priorities  import *
-    from .td_defs           import *
-    from .dd_defs           import *
-    from .fp_defs           import *
+    from .td_defs           import td_enum_repository
+    from .dd_defs           import dd_enum_repository
+    from .fp_defs           import fp_enum_repository
     from .ui_defs           import *
Index: leahi_dialin/dd/modules/valves.py
===================================================================
diff -u -r95a7bdcce8c5ffed0de3fbfb09f7f6999ad0f1bd -rc0bd3c89009d0faaf5cb51b3f7da5bdaee7908c8
--- leahi_dialin/dd/modules/valves.py	(.../valves.py)	(revision 95a7bdcce8c5ffed0de3fbfb09f7f6999ad0f1bd)
+++ leahi_dialin/dd/modules/valves.py	(.../valves.py)	(revision c0bd3c89009d0faaf5cb51b3f7da5bdaee7908c8)
@@ -100,7 +100,7 @@
 
         # NOTE: The len function counts the enums with the same number only once. This is not the case in the DD valves
         # class because each valve must have a unique ID.
-        self.valve_states_enum = [0 for _ in range(len(dd_enum_repository.DDValveNames))]
+        self.valve_states_enum = [0 for _ in range(dd_enum_repository.DDValveNames.NUM_OF_DD_VALVES.value - 1)]
 
         for valve in dd_enum_repository.DDValveNames.__members__:
             self.valves_sensed_states[valve] = ''
@@ -207,12 +207,12 @@
         "d26_valv",
         "d22_valv",
         "d79_pmp_valv",
-        "D83_valv",
-        "D91_valv",
+        "d83_valv",
+        "d91_valv",
         "spare3_valv",
         "spare4_valv",
         "spare5_valv",
-        "D100_valv",
+        "d100_valv",
         "spare7_valv",
         "valve_states_enum",
         "valves_sensed_states",
@@ -267,11 +267,15 @@
         self.d100_valv["state"] = self._binary_to_valve_state(spv[0] & 64)
         self.spare7_valv["state"] = self._binary_to_valve_state(spv[0] & 128)
 
+        # Updating Valve_states_enum
+        for i in range(0, dd_enum_repository.DDValveNames.NUM_OF_DD_VALVES.value - 1):
+            self.valve_states_enum[i] = eval(f'self.{dd_enum_repository.DDValveNames(i).name.lower()}["state"]')
+
         start = self.END_POS_SPARE_VALVES_STATES
         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] = dd_enum_repository.DDValveNames(valve_state_number).name
+            self.valves_sensed_states[valve_id] = valve_state_number
             start = end
             end += 1