Index: leahi_dialin/common/fp_defs.py
===================================================================
diff -u -r5c4a3b41a159d0e882fd41286d63e479a5aba08c -r95a7bdcce8c5ffed0de3fbfb09f7f6999ad0f1bd
--- leahi_dialin/common/fp_defs.py	(.../fp_defs.py)	(revision 5c4a3b41a159d0e882fd41286d63e479a5aba08c)
+++ leahi_dialin/common/fp_defs.py	(.../fp_defs.py)	(revision 95a7bdcce8c5ffed0de3fbfb09f7f6999ad0f1bd)
@@ -46,7 +46,7 @@
     'MODE_SERV': ['service'],
     'MODE_INIT': ['initialization'],
     'MODE_STAN': ['standby'],
-    'MODE_PRE_GENP': ['pre-gen', 'pre-generate permeate'],
+    'MODE_PRE_GENP': ['pre-gen', 'pre-generate', 'pre-generate permeate'],
     'MODE_GENP': ['generate permeate'],
     'MODE_DPGP': ['defeatured pre-generate permeate', 'defeatured pre-gen'],
     'MODE_DEGP': ['defeatured generate permeate'],
Index: leahi_dialin/dd/modules/valves.py
===================================================================
diff -u -r396e5d3fdfdcdabca9cc7434de0fcee52036aaa1 -r95a7bdcce8c5ffed0de3fbfb09f7f6999ad0f1bd
--- leahi_dialin/dd/modules/valves.py	(.../valves.py)	(revision 396e5d3fdfdcdabca9cc7434de0fcee52036aaa1)
+++ leahi_dialin/dd/modules/valves.py	(.../valves.py)	(revision 95a7bdcce8c5ffed0de3fbfb09f7f6999ad0f1bd)
@@ -83,10 +83,10 @@
         self.d23_valv = {"id": dd_enum_repository.DDValveNames.D23_VALV.value, "state": DEENERGIZED}
         self.d19_valv = {"id": dd_enum_repository.DDValveNames.D19_VALV.value, "state": DEENERGIZED}
         self.d25_valv = {"id": dd_enum_repository.DDValveNames.D25_VALV.value, "state": DEENERGIZED}
-        self.d21_valv = {"id": dd_enum_repository.DDValveNames.D26_VALV.value, "state": DEENERGIZED}
+        self.d21_valv = {"id": dd_enum_repository.DDValveNames.D21_VALV.value, "state": DEENERGIZED}
         self.d24_valv = {"id": dd_enum_repository.DDValveNames.D24_VALV.value, "state": DEENERGIZED}
         self.d20_valv = {"id": dd_enum_repository.DDValveNames.D20_VALV.value, "state": DEENERGIZED}
-        self.d26_valv = {"id": dd_enum_repository.DDValveNames.D21_VALV.value, "state": DEENERGIZED}
+        self.d26_valv = {"id": dd_enum_repository.DDValveNames.D26_VALV.value, "state": DEENERGIZED}
         self.d22_valv = {"id": dd_enum_repository.DDValveNames.D22_VALV.value, "state": DEENERGIZED}
 
         self.d79_pmp_valv = {"id": dd_enum_repository.DDValveNames.D79_PMP_VALV.value, "state": DEENERGIZED}
Index: leahi_dialin/utils/base.py
===================================================================
diff -u -rdefe59974cd16b0f1c825bfc61aae7c3862f812e -r95a7bdcce8c5ffed0de3fbfb09f7f6999ad0f1bd
--- leahi_dialin/utils/base.py	(.../base.py)	(revision defe59974cd16b0f1c825bfc61aae7c3862f812e)
+++ leahi_dialin/utils/base.py	(.../base.py)	(revision 95a7bdcce8c5ffed0de3fbfb09f7f6999ad0f1bd)
@@ -293,6 +293,9 @@
             # Replace _ with ' ' and check the list again
             elif label.lower().replace('_', ' ') in cls._str_list[enum_member.name]:
                 return enum_member
+            # Replace _ with ' ' and check the list again with _ with ' '
+            elif label.lower().replace('_', ' ') in [enum_mem.lower().replace('_', ' ') for enum_mem in cls._str_list[enum_member.name] ]:
+                return enum_member
             # If the enum is the NUM_ collector, then return stop as after that only aliases are present
             elif enum_member.name.lower().startswith('num_'):
                 return None