Index: leahi_dialin/dd/modules/heaters.py
===================================================================
diff -u -r20c821bd230fc7689a0275a2918981669ff5cc19 -rd089b54d2fde7f8c36acce41a47d7acee4ef5da6
--- leahi_dialin/dd/modules/heaters.py	(.../heaters.py)	(revision 20c821bd230fc7689a0275a2918981669ff5cc19)
+++ leahi_dialin/dd/modules/heaters.py	(.../heaters.py)	(revision d089b54d2fde7f8c36acce41a47d7acee4ef5da6)
@@ -186,7 +186,6 @@
         """
         Constructs and sends heater start stop override
 
-
         @param heater the heater to override its value
         @param command the heater to start or stop
         @param temperature: float - temp to set to
Index: leahi_dialin/dd/modules/valves.py
===================================================================
diff -u -r9f947930678d5b13aa8f788f4e3d58cd1370a541 -rd089b54d2fde7f8c36acce41a47d7acee4ef5da6
--- leahi_dialin/dd/modules/valves.py	(.../valves.py)	(revision 9f947930678d5b13aa8f788f4e3d58cd1370a541)
+++ leahi_dialin/dd/modules/valves.py	(.../valves.py)	(revision d089b54d2fde7f8c36acce41a47d7acee4ef5da6)
@@ -101,7 +101,7 @@
         #: States of all the vales in list format
         self.valve_states_enum = {}
         for i in range(0, dd_enum_repository.DDValveNames.NUM_OF_DD_VALVES.value):
-            valve_name = dd_enum_repository.DDValveNames(i).name.split('_')[0]
+            valve_name = dd_enum_repository.DDValveNames(i).name
             self.valve_states_enum[valve_name] = 0
             self.valves_sensed_states[valve_name] = ''
 
@@ -269,8 +269,8 @@
 
         # Updating Valve_states_enum
         for i in range(0, dd_enum_repository.DDValveNames.NUM_OF_DD_VALVES.value):
-            valve_name = dd_enum_repository.DDValveNames(i).name.split('_')[0]
-            self.valve_states_enum[valve_name] = eval(f'self.{dd_enum_repository.DDValveNames(i).name.lower()}["state"]')
+            valve_name = dd_enum_repository.DDValveNames(i).name
+            self.valve_states_enum[valve_name] = eval(f'self.{valve_name.lower()}["state"]')
 
         start = self.END_POS_SPARE_VALVES_STATES
         end = start + 1
Index: leahi_dialin/fp/modules/valves.py
===================================================================
diff -u -r9f947930678d5b13aa8f788f4e3d58cd1370a541 -rd089b54d2fde7f8c36acce41a47d7acee4ef5da6
--- leahi_dialin/fp/modules/valves.py	(.../valves.py)	(revision 9f947930678d5b13aa8f788f4e3d58cd1370a541)
+++ leahi_dialin/fp/modules/valves.py	(.../valves.py)	(revision d089b54d2fde7f8c36acce41a47d7acee4ef5da6)
@@ -72,7 +72,7 @@
         #: States of all the vales in list format
         self.valve_states_enum = {}
         for i in range(0, fp_enum_repository.FPValveNames.NUM_OF_FP_VALVES.value):
-            valve_name = fp_enum_repository.FPValveNames(i).name.split('_')[0]
+            valve_name = fp_enum_repository.FPValveNames(i).name
             self.valve_states_enum[valve_name] = 0
             self.valves_sensed_states[valve_name] = ''
     
@@ -146,8 +146,8 @@
 
         # Updating Valve_states_enum
         for i in range(0, fp_enum_repository.FPValveNames.NUM_OF_FP_VALVES.value):
-            valve_name = fp_enum_repository.FPValveNames(i).name.split('_')[0]
-            self.valve_states_enum[valve_name] = eval(f'self.{fp_enum_repository.FPValveNames(i).name.lower()}["state"]')
+            valve_name = fp_enum_repository.FPValveNames(i).name
+            self.valve_states_enum[valve_name] = eval(f'self.{valve_name.lower()}["state"]')
         
         # Extract each valve sensed state from U08 valves states using bit-masking
         start = self.END_FP_VALVES_STATES