Index: leahi_dialin/common/fp_defs.py
===================================================================
diff -u -r17b02f26012e7378daf831057c6f62c4ecdcfff0 -r40186f183b0331f4c76c24c1e5385539ce603402
--- leahi_dialin/common/fp_defs.py	(.../fp_defs.py)	(revision 17b02f26012e7378daf831057c6f62c4ecdcfff0)
+++ leahi_dialin/common/fp_defs.py	(.../fp_defs.py)	(revision 40186f183b0331f4c76c24c1e5385539ce603402)
@@ -300,7 +300,7 @@
 
 
     def _create_fp_pressure_sensor_names(self):
-        if GlobalVariables().NEXT_GEN_HW == True:
+        if GlobalVariables().HW_BETA_1_9 == True:
             members = {
                 'M3_PRES'                              : 0,         # Water inlet pressure before regulator
                 'P8_PRES'                              : 1,         # Water inlet pressure after regulator
@@ -329,7 +329,7 @@
 
 
     def _create_fp_temperature_sensor_names(self):
-        if GlobalVariables().NEXT_GEN_HW == True:
+        if GlobalVariables().HW_BETA_1_9 == True:
             members = {
                 'M3_TEMP'                              : 0,         # Temperature after pressure regulator (M3)
                 'P8_TEMP'                              : 1,         # Temperature before inlet conductivity sensor (P8)
@@ -360,7 +360,7 @@
 
         # Add aliases
         extend_enum(created_enum, 'FIRST_PRESSURE_SENSOR', created_enum.M3_TEMP.value)
-        extend_enum(created_enum, 'LAST_PRESSURE_SENSOR', created_enum.P46_TEMP.value if GlobalVariables().NEXT_GEN_HW == True else created_enum.P17_TEMP.value)
+        extend_enum(created_enum, 'LAST_PRESSURE_SENSOR', created_enum.P46_TEMP.value if GlobalVariables().HW_BETA_1_9 == True else created_enum.P17_TEMP.value)
         extend_enum(created_enum, 'FIRST_CONDUCTIVITY_SENSOR', created_enum.P10_TEMP.value)
         extend_enum(created_enum, 'LAST_CONDUCTIVITY_SENSOR', created_enum.P19_TEMP.value)
         extend_enum(created_enum, 'FIRST_FLOW_SENSOR', created_enum.P7_TEMP.value)