Index: leahi_dialin/common/dd_defs.py
===================================================================
diff -u -r55d97b27c73f8e08994328881d3f56cbc7f00e29 -r17b02f26012e7378daf831057c6f62c4ecdcfff0
--- leahi_dialin/common/dd_defs.py	(.../dd_defs.py)	(revision 55d97b27c73f8e08994328881d3f56cbc7f00e29)
+++ leahi_dialin/common/dd_defs.py	(.../dd_defs.py)	(revision 17b02f26012e7378daf831057c6f62c4ecdcfff0)
@@ -34,7 +34,7 @@
         DDPreGenDialysateStates: DialinEnum
         DDGenDialysateModeStates: DialinEnum
         DDPostGenDialysateStates: DialinEnum
-        DDHeatDisinfectState: DialinEnum
+        DDHeatDisinfectStates: DialinEnum
         DDHeaterCoolingStates: DialinEnum
         DDROPermeateStates: DialinEnum
         DDNotLegalStates: DialinEnum
@@ -76,7 +76,7 @@
         'DDPreGenDialysateStates': '_create_dd_pregen_states',
         'DDGenDialysateModeStates': '_create_dd_gen_states',
         'DDPostGenDialysateStates': '_create_dd_postgen_states',
-        'DDHeatDisinfectState': '_create_dd_heat_disinfect_states',
+        'DDHeatDisinfectStates': '_create_dd_heat_disinfect_states',
         'DDHeaterCoolingStates': '_create_dd_heater_cooling_states',
         'DDROPermeateStates': '_create_dd_ro_permeate_states',
         'DDNotLegalStates': '_create_dd_not_legal_states',
@@ -125,9 +125,12 @@
 
 
     def update_enums(self) -> None:
-        for prop in self._properties:
-            self.__dict__.pop(prop, None)
-            self.__getattr__(prop)
+        for prop_name in self._properties:
+            # Cleans the cached value
+            self.__dict__.pop(prop_name, None)
+            
+            # Reinitializing the enum as it's not in the cache
+            self.__getattr__(prop_name)
 
 
 
@@ -250,7 +253,7 @@
             'DD_HEAT_DISINFECT_STATE_COMPLETE': 1,                      # Heat disinfect, complete state
             'NUM_OF_DD_HEAT_DISINFECT_STATES': 2                        # Number of heat disinfect mode states
         }
-        return DialinEnum('DDHeatDisinfectState', members)
+        return DialinEnum('DDHeatDisinfectStates', members)
 
 
     def _create_dd_heater_cooling_states(self):
@@ -445,9 +448,9 @@
 
         # Add aliases
         extend_enum(created_enum, 'FIRST_PRESSURE_SENSOR', created_enum.D9_TEMP.value)
-        extend_enum(created_enum, 'LAST_PRESSURE_SENSOR', created_enum.D87_TEMP.value if GlobalVariables.NEXT_GEN_HW == True else created_enum.D41_TEMP.value)
+        extend_enum(created_enum, 'LAST_PRESSURE_SENSOR', created_enum.D87_TEMP.value if GlobalVariables().NEXT_GEN_HW == True else created_enum.D41_TEMP.value)
         extend_enum(created_enum, 'FIRST_CONDUCTIVITY_SENSOR', created_enum.D16_TEMP.value)
-        extend_enum(created_enum, 'LAST_CONDUCTIVITY_SENSOR', created_enum.D99_TEMP.value if GlobalVariables.NEXT_GEN_HW == True else created_enum.D75_TEMP.value)
+        extend_enum(created_enum, 'LAST_CONDUCTIVITY_SENSOR', created_enum.D99_TEMP.value if GlobalVariables().NEXT_GEN_HW == True else created_enum.D75_TEMP.value)
 
         # Add aliases to be searchable (listed when pressed TAB)
         created_enum._member_names_.append('FIRST_PRESSURE_SENSOR')