Index: sources/model/fp/data/MFPTemperatureData.h
===================================================================
diff -u -rb80f8f84f21f86ad4c962a2c690447c572498e0b -ra7719c04d88da7ba4046e5c24c3ba22d632bedad
--- sources/model/fp/data/MFPTemperatureData.h	(.../MFPTemperatureData.h)	(revision b80f8f84f21f86ad4c962a2c690447c572498e0b)
+++ sources/model/fp/data/MFPTemperatureData.h	(.../MFPTemperatureData.h)	(revision a7719c04d88da7ba4046e5c24c3ba22d632bedad)
@@ -36,19 +36,17 @@
  *
  * | Payload  ||
  * |          ||
- * | #01:(U32) | \ref Data::mInletConductivityTemp         |
- * | #02:(U32) | \ref Data::mOutletConductivityTemp        |
- * | #03:(U32) | \ref Data::mBeforePressureRegulatorTemp   |
- * | #04:(F32) | \ref Data::mAfterPressureRegulatorTemp    |
- * | #05:(F32) | \ref Data::mBeforeInletConductivityTemp   |
- * | #06:(F32) | \ref Data::mBeforeROFilterTemp            |
- * | #07:(F32) | \ref Data::mAfterROFilterTemp             |
- * | #08:(F32) | \ref Data::mBeforeROPumpTemp              |
- * | #09:(F32) | \ref Data::mROConcentrateTemp             |
- * | #11:(F32) | \ref Data::mROConcentratePumpTemp         |
- * | #12:(F32) | \ref Data::mDrainDropTemp                 |
- * | #13:(F32) | \ref Data::mROInletTemp                   |
- * | #14:(F32) | \ref Data::mROOutletTemp                  |
+ * | #01:(U32) | \ref Data::mM3Temp          |
+ * | #02:(U32) | \ref Data::mP8Temp          |
+ * | #03:(U32) | \ref Data::mP13Temp         |
+ * | #04:(F32) | \ref Data::mP17Temp         |
+ * | #05:(F32) | \ref Data::mP46Temp         |
+ * | #06:(F32) | \ref Data::mP10Temp         |
+ * | #07:(F32) | \ref Data::mP19Temp         |
+ * | #08:(F32) | \ref Data::mP7Temp          |
+ * | #09:(F32) | \ref Data::mP16Temp         |
+ * | #10:(F32) | \ref Data::mP7InternalTemp  |
+ * | #11:(F32) | \ref Data::mP16InternalTemp |
  *
  * \sa Data
  *
@@ -68,19 +66,18 @@
     QVariantList parameters() const override;
 
     struct {
-        Types::F32   mP10Temp   ;   ///< P10 temperature from inlet conductivity sensor.
-        Types::F32   mP19Temp   ;   ///< P19 temperature from outlet conductivity sensor.
-        Types::F32   mM1Temp    ;   ///< Temperature before pressure regulator (M1)
-        Types::F32   mM3Temp    ;   ///< Temperature after pressure regulator (M3)
-        Types::F32   mP8Temp    ;   ///< Temperature before inlet conductivity sensor (P8)
-        Types::F32   mP13Temp   ;   ///< Temperature before RO filter (P13)
-        Types::F32   mP17Temp   ;   ///< Temperature after RO filter (P17)
-        Types::F32   mX1Temp    ;   ///< Temperature before RO pump (X1)
-        Types::F32   mX2Temp    ;   ///< Temperature RO Concentrate
-        Types::F32   mX3Temp    ;   ///< Temperature RO Concentrate drop
-        Types::F32   mX4Temp    ;   ///< Temperature drain drop
-        Types::F32   mP7Temp    ;   ///< Temperature RO inlet
-        Types::F32   mP16Temp   ;   ///< Temperature RO outlet
+
+        Types::F32   mM3Temp            ;   ///< Temperature after pressure regulator (M3)
+        Types::F32   mP8Temp            ;   ///< Temperature before inlet conductivity sensor (P8)
+        Types::F32   mP13Temp           ;   ///< Temperature before RO filter (P13)
+        Types::F32   mP17Temp           ;   ///< Temperature after RO filter (P17)
+        Types::F32   mP46Temp           ;   ///< P19 temperature from outlet conductivity sensor.
+        Types::F32   mP10Temp           ;   ///< P10 temperature from inlet conductivity sensor.
+        Types::F32   mP19Temp           ;   ///< P10 temperature from inlet conductivity sensor.
+        Types::F32   mP7Temp            ;   ///< Temperature RO inlet
+        Types::F32   mP16Temp           ;   ///< Temperature RO outlet
+        Types::F32   mP7InternalTemp    ;   ///< Temperature before RO pump (X1)
+        Types::F32   mP16InternalTemp   ;   ///< Temperature RO Concentrate
     } _data;
 
 public:
@@ -90,19 +87,17 @@
     QString      infoText  () const override { return QString("Temperature")   ; }
 
     struct Data {
-        float       mInletConductivityTemp          = 0;  ///< P10 temperature from inlet conductivity sensor.
-        float       mOutletConductivityTemp         = 0;  ///< P19 temperature from outlet conductivity sensor.
-        float       mBeforePressureRegulatorTemp    = 0;  ///< Temperature before pressure regulator (M1)
-        float       mAfterPressureRegulatorTemp     = 0;  ///< Temperature after pressure regulator (M3)
-        float       mBeforeInletConductivityTemp    = 0;  ///< Temperature before inlet conductivity sensor (P8)
-        float       mBeforeROFilterTemp             = 0;  ///< Temperature before RO filter (P13)
-        float       mAfterROFilterTemp              = 0;  ///< Temperature after RO filter (P17)
-        float       mBeforeROPumpTemp               = 0;  ///< Temperature before RO pump (X1)
-        float       mROConcentrateTemp              = 0;  ///< Temperature RO Concentrate
-        float       mROConcentratePumpTemp          = 0;  ///< Temperature RO Concentrate drop
-        float       mDrainDropTemp                  = 0;  ///< Temperature drain drop
-        float       mROInletTemp                    = 0;  ///< Temperature RO inlet
-        float       mROOutletTemp                   = 0;  ///< Temperature RO outlet
+        float       mM3Temp             = 0;  ///< P10 temperature from inlet conductivity sensor.
+        float       mP8Temp             = 0;  ///< P19 temperature from outlet conductivity sensor.
+        float       mP13Temp            = 0;  ///< Temperature before pressure regulator (M1)
+        float       mP17Temp            = 0;  ///< Temperature after pressure regulator (M3)
+        float       mP46Temp            = 0;  ///< Temperature before inlet conductivity sensor (P8)
+        float       mP10Temp            = 0;  ///< Temperature before RO filter (P13)
+        float       mP19Temp            = 0;  ///< Temperature after RO filter (P17)
+        float       mP7Temp             = 0;  ///< Temperature before RO pump (X1)
+        float       mP16Temp            = 0;  ///< Temperature RO Concentrate
+        float       mP7InternalTemp     = 0;  ///< Temperature RO Concentrate drop
+        float       mP16InternalTemp    = 0;  ///< Temperature drain drop
     };
 
     MFPTemperature () {}