Index: leahi_dialin/fp/modules/temperatures.py
===================================================================
diff -u -r894abd4d8e62d20ba65ca78e443ffb5ea00c07ea -re60ad12bcc58d5905d7268bbeaae139d8233e023
--- leahi_dialin/fp/modules/temperatures.py	(.../temperatures.py)	(revision 894abd4d8e62d20ba65ca78e443ffb5ea00c07ea)
+++ leahi_dialin/fp/modules/temperatures.py	(.../temperatures.py)	(revision e60ad12bcc58d5905d7268bbeaae139d8233e023)
@@ -44,17 +44,17 @@
 
         self.fp_temperature_sensors_timestamp = 0
         self.fp_temperatures = {
-            fp_enum_repository.FPTemperaturesNames.M3_TEMP.name: 0.0,
-            fp_enum_repository.FPTemperaturesNames.P8_TEMP.name: 0.0,
-            fp_enum_repository.FPTemperaturesNames.P13_TEMP.name: 0.0,
-            fp_enum_repository.FPTemperaturesNames.P17_TEMP.name: 0.0,
-            fp_enum_repository.FPTemperaturesNames.P10_TEMP.name: 0.0,
-            fp_enum_repository.FPTemperaturesNames.P19_TEMP.name: 0.0,
-            fp_enum_repository.FPTemperaturesNames.P7_TEMP.name: 0.0,
-            fp_enum_repository.FPTemperaturesNames.P16_TEMP.name: 0.0,
+            fp_enum_repository.FPTemperatureSensorNames.M3_TEMP.name: 0.0,
+            fp_enum_repository.FPTemperatureSensorNames.P8_TEMP.name: 0.0,
+            fp_enum_repository.FPTemperatureSensorNames.P13_TEMP.name: 0.0,
+            fp_enum_repository.FPTemperatureSensorNames.P17_TEMP.name: 0.0,
+            fp_enum_repository.FPTemperatureSensorNames.P10_TEMP.name: 0.0,
+            fp_enum_repository.FPTemperatureSensorNames.P19_TEMP.name: 0.0,
+            fp_enum_repository.FPTemperatureSensorNames.P7_TEMP.name: 0.0,
+            fp_enum_repository.FPTemperatureSensorNames.P16_TEMP.name: 0.0,
         }
         if GlobalVariables.NEXT_GEN_HW:
-            self.fp_temperatures[fp_enum_repository.FPTemperaturesNames.P46_TEMP.name] = 0.0
+            self.fp_temperatures[fp_enum_repository.FPTemperatureSensorNames.P46_TEMP.name] = 0.0
 
 
     @publish(["msg_id_fp_temperature_data", "fp_temperatures", "fp_temperatures_timestamp"])
@@ -65,32 +65,32 @@
         @param message:  published FP temperature sensors data message
         @returns none
         """
-        self.fp_temperatures[fp_enum_repository.FPTemperaturesNames.M3_TEMP.name] = struct.unpack('f', bytearray(
+        self.fp_temperatures[fp_enum_repository.FPTemperatureSensorNames.M3_TEMP.name] = struct.unpack('f', bytearray(
             message['message'][MsgFieldPositions.START_POS_FIELD_1:MsgFieldPositions.END_POS_FIELD_1]))[0]
 
-        self.fp_temperatures[fp_enum_repository.FPTemperaturesNames.P10_TEMP.name] = struct.unpack('f', bytearray(
+        self.fp_temperatures[fp_enum_repository.FPTemperatureSensorNames.P10_TEMP.name] = struct.unpack('f', bytearray(
             message['message'][MsgFieldPositions.START_POS_FIELD_2:MsgFieldPositions.END_POS_FIELD_2]))[0]
 
-        self.fp_temperatures[fp_enum_repository.FPTemperaturesNames.P19_TEMP.name] = struct.unpack('f', bytearray(
+        self.fp_temperatures[fp_enum_repository.FPTemperatureSensorNames.P19_TEMP.name] = struct.unpack('f', bytearray(
             message['message'][MsgFieldPositions.START_POS_FIELD_3:MsgFieldPositions.END_POS_FIELD_3]))[0]
 
-        self.fp_temperatures[fp_enum_repository.FPTemperaturesNames.P8_TEMP.name] = struct.unpack('f', bytearray(
+        self.fp_temperatures[fp_enum_repository.FPTemperatureSensorNames.P8_TEMP.name] = struct.unpack('f', bytearray(
             message['message'][MsgFieldPositions.START_POS_FIELD_4:MsgFieldPositions.END_POS_FIELD_4]))[0]
 
-        self.fp_temperatures[fp_enum_repository.FPTemperaturesNames.P13_TEMP.name] = struct.unpack('f', bytearray(
+        self.fp_temperatures[fp_enum_repository.FPTemperatureSensorNames.P13_TEMP.name] = struct.unpack('f', bytearray(
             message['message'][MsgFieldPositions.START_POS_FIELD_5:MsgFieldPositions.END_POS_FIELD_5]))[0]
 
-        self.fp_temperatures[fp_enum_repository.FPTemperaturesNames.P17_TEMP.name] = struct.unpack('f', bytearray(
+        self.fp_temperatures[fp_enum_repository.FPTemperatureSensorNames.P17_TEMP.name] = struct.unpack('f', bytearray(
             message['message'][MsgFieldPositions.START_POS_FIELD_6:MsgFieldPositions.END_POS_FIELD_6]))[0]
 
-        self.fp_temperatures[fp_enum_repository.FPTemperaturesNames.P7_TEMP.name] = struct.unpack('f', bytearray(
+        self.fp_temperatures[fp_enum_repository.FPTemperatureSensorNames.P7_TEMP.name] = struct.unpack('f', bytearray(
             message['message'][MsgFieldPositions.START_POS_FIELD_7:MsgFieldPositions.END_POS_FIELD_7]))[0]
 
-        self.fp_temperatures[fp_enum_repository.FPTemperaturesNames.P16_TEMP.name] = struct.unpack('f', bytearray(
+        self.fp_temperatures[fp_enum_repository.FPTemperatureSensorNames.P16_TEMP.name] = struct.unpack('f', bytearray(
             message['message'][MsgFieldPositions.START_POS_FIELD_8:MsgFieldPositions.END_POS_FIELD_8]))[0]
 
         if GlobalVariables.NEXT_GEN_HW:
-            self.fp_temperatures[fp_enum_repository.FPTemperaturesNames.P46_TEMP.name] = struct.unpack('f', bytearray(
+            self.fp_temperatures[fp_enum_repository.FPTemperatureSensorNames.P46_TEMP.name] = struct.unpack('f', bytearray(
                 message['message'][MsgFieldPositions.START_POS_FIELD_9:MsgFieldPositions.END_POS_FIELD_9]))[0]
 
         self.fp_temperature_sensors_timestamp = timestamp
@@ -147,31 +147,31 @@
         value = float_to_bytearray(sensor_value)
 
          # FP Conductivity Sensors' Temperature Override
-        if fp_enum_repository.FPTemperaturesNames.FIRST_CONDUCTIVITY_SENSOR.value <= sensor_index <= fp_enum_repository.FPTemperaturesNames.LAST_CONDUCTIVITY_SENSOR.value:
-            modified_index = sensor_index - fp_enum_repository.FPTemperaturesNames.FIRST_CONDUCTIVITY_SENSOR.value + BETA_IOFP_COND_SENSOR_OFFSET
+        if fp_enum_repository.FPTemperatureSensorNames.FIRST_CONDUCTIVITY_SENSOR.value <= sensor_index <= fp_enum_repository.FPTemperatureSensorNames.LAST_CONDUCTIVITY_SENSOR.value:
+            modified_index = sensor_index - fp_enum_repository.FPTemperatureSensorNames.FIRST_CONDUCTIVITY_SENSOR.value + BETA_IOFP_COND_SENSOR_OFFSET
             msg_id = MsgIds.MSG_ID_FP_CONDUCTIVITY_TEMP_OVERRIDE_REQUEST
 
         # FP Flow Sensors' Temperature Override
-        elif fp_enum_repository.FPTemperaturesNames.FIRST_FLOW_SENSOR.value <= sensor_index <= fp_enum_repository.FPTemperaturesNames.LAST_FLOW_SENSOR.value:
-            modified_index = sensor_index - fp_enum_repository.FPTemperaturesNames.FIRST_FLOW_SENSOR.value
+        elif fp_enum_repository.FPTemperatureSensorNames.FIRST_FLOW_SENSOR.value <= sensor_index <= fp_enum_repository.FPTemperatureSensorNames.LAST_FLOW_SENSOR.value:
+            modified_index = sensor_index - fp_enum_repository.FPTemperatureSensorNames.FIRST_FLOW_SENSOR.value
             msg_id = MsgIds.MSG_ID_FP_FLOW_TEMP_OVERRIDE_REQUEST
 
         # FP Pressure Sensors' Temperature Override
         else:
-            modified_index = sensor_index - fp_enum_repository.FPTemperaturesNames.FIRST_PRESSURE_SENSOR.value + BETA_IOFP_PRES_SENSOR_OFFSET
+            modified_index = sensor_index - fp_enum_repository.FPTemperatureSensorNames.FIRST_PRESSURE_SENSOR.value + BETA_IOFP_PRES_SENSOR_OFFSET
             msg_id = MsgIds.MSG_ID_FP_PRESSURE_TEMP_OVERRIDE_REQUEST
         
         index = integer_to_bytearray(modified_index)
         rst = integer_to_bytearray(reset)
         value = float_to_bytearray(sensor_value)
         payload = rst + value + index
            
-        sensor_name = fp_enum_repository.FPTemperaturesNames(sensor_index).name.split('_')[0]
+        sensor_name = fp_enum_repository.FPTemperatureSensorNames(sensor_index).name.split('_')[0]
         message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_fp_ch_id,
                                                   message_id=msg_id.value,
                                                   payload=payload)
 
-        self.logger.debug("Setting sensor {} to {} C".format(fp_enum_repository.FPTemperaturesNames[str(sensor_index)].name, sensor_value))
+        self.logger.debug("Setting sensor {} to {} C".format(fp_enum_repository.FPTemperatureSensorNames[str(sensor_index)].name, sensor_value))
 
         # Send message
         received_message = self.can_interface.send(message)