Index: leahi_dialin/common/dd_defs.py
===================================================================
diff -u -r0beb68574b597dad8edefcc5f46e0c8beb698222 -r40186f183b0331f4c76c24c1e5385539ce603402
--- leahi_dialin/common/dd_defs.py	(.../dd_defs.py)	(revision 0beb68574b597dad8edefcc5f46e0c8beb698222)
+++ leahi_dialin/common/dd_defs.py	(.../dd_defs.py)	(revision 40186f183b0331f4c76c24c1e5385539ce603402)
@@ -372,7 +372,7 @@
 
 
     def _create_dd_pressure_sensor_names(self):
-        if GlobalVariables().NEXT_GEN_HW == True:
+        if GlobalVariables().HW_BETA_1_9 == True:
             members = {
                 'D9_PRES': 0,                                           # Hydraulics outlet pressure (PHo/Pn)
                 'D66_PRES': 1,                                          # Dry Bicarb pressure (PDB/PCb)
@@ -395,7 +395,7 @@
 
 
     def _create_dd_temperature_sensor_names(self):
-        if GlobalVariables().NEXT_GEN_HW == True:
+        if GlobalVariables().HW_BETA_1_9 == True:
             members = {
                 'D1_TEMP': 0,                                           # Heat exchanger Inlet temperature sensor
                 'D78_TEMP': 1,                                          # Heat exchanger Outlet temperature sensor
@@ -448,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().HW_BETA_1_9 == 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().HW_BETA_1_9 == True else created_enum.D75_TEMP.value)
 
         # Add aliases to be searchable (listed when pressed TAB)
         created_enum._member_names_.append('FIRST_PRESSURE_SENSOR')