Index: leahi_dialin/common/dd_defs.py
===================================================================
diff -u -r9a97e1f14f267d899b1604a9584284d6074f9224 -r27ee509d072faa466186ebe4d1f105c76fb8c62b
--- leahi_dialin/common/dd_defs.py	(.../dd_defs.py)	(revision 9a97e1f14f267d899b1604a9584284d6074f9224)
+++ leahi_dialin/common/dd_defs.py	(.../dd_defs.py)	(revision 27ee509d072faa466186ebe4d1f105c76fb8c62b)
@@ -462,15 +462,15 @@
         extend_enum(created_enum, 'FIRST_CONDUCTIVITY_SENSOR', created_enum.D16_TEMP.value)
         extend_enum(created_enum, 'LAST_CONDUCTIVITY_SENSOR', created_enum.D75_TEMP.value)
         extend_enum(created_enum, 'FIRST_AVERAGE_SENSOR', created_enum.D4_AVG_TEMP.value)
-        extend_enum(created_enum, 'LAST_AVR_CONDUCTIVITY_SENSOR', created_enum.D30_AVG_TEMP.value)
+        extend_enum(created_enum, 'LAST_AVERAGE_SENSOR', created_enum.D30_AVG_TEMP.value)
 
         # Add aliases to be searchable (listed when pressed TAB)
         created_enum._member_names_.append('FIRST_PRESSURE_SENSOR')
         created_enum._member_names_.append('LAST_PRESSURE_SENSOR')
         created_enum._member_names_.append('FIRST_CONDUCTIVITY_SENSOR')
         created_enum._member_names_.append('LAST_CONDUCTIVITY_SENSOR')
-        created_enum._member_names_.append('FIRST_AVR_CONDUCTIVITY_SENSOR')
-        created_enum._member_names_.append('LAST_AVR_CONDUCTIVITY_SENSOR')
+        created_enum._member_names_.append('FIRST_AVERAGE_SENSOR')
+        created_enum._member_names_.append('FIRST_AVERAGE_SENSOR')
 
         return created_enum
 
Index: leahi_dialin/dd/modules/temperature_sensors.py
===================================================================
diff -u -r9a97e1f14f267d899b1604a9584284d6074f9224 -r27ee509d072faa466186ebe4d1f105c76fb8c62b
--- leahi_dialin/dd/modules/temperature_sensors.py	(.../temperature_sensors.py)	(revision 9a97e1f14f267d899b1604a9584284d6074f9224)
+++ leahi_dialin/dd/modules/temperature_sensors.py	(.../temperature_sensors.py)	(revision 27ee509d072faa466186ebe4d1f105c76fb8c62b)
@@ -148,8 +148,8 @@
             message_id = MsgIds.MSG_ID_DD_CONDUCTIVITY_SENSOR_TEMPERATURE_OVERRIDE_REQUEST
 
         # DD Conductivity Sensors' Average Temperature Reading Override
-        elif dd_enum_repository.DDTemperatureSensorNames.FIRST_AVR_CONDUCTIVITY_SENSOR.value <= sensor_index <= dd_enum_repository.DDTemperatureSensorNames.LAST_AVR_CONDUCTIVITY_SENSOR.value:
-            modified_index= sensor_index - dd_enum_repository.DDTemperatureSensorNames.FIRST_AVR_CONDUCTIVITY_SENSOR.value
+        elif dd_enum_repository.DDTemperatureSensorNames.FIRST_AVERAGE_SENSOR.value <= sensor_index <= dd_enum_repository.DDTemperatureSensorNames.LAST_AVERAGE_SENSOR.value:
+            modified_index= sensor_index - dd_enum_repository.DDTemperatureSensorNames.FIRST_AVERAGE_SENSOR.value
             message_id = 'Unknown'
             self.logger.info('No Msg ID is present for Conductivity sensor Average override! Skipping...')
             return False