diff --git a/src/devices/thermostat.cpp b/src/devices/thermostat.cpp
index eaa09ad3a..c05e10a3f 100644
--- a/src/devices/thermostat.cpp
+++ b/src/devices/thermostat.cpp
@@ -550,8 +550,8 @@ void Thermostat::publish_values() {
             dataThermostat["heatingtype"] = hc->heatingtype;
         }
 
-        if (Helpers::hasValue(hc->circuitcalctemp)) {
-            dataThermostat["circuitcalctemp"] = hc->circuitcalctemp;
+        if (Helpers::hasValue(hc->targetflowtemp)) {
+            dataThermostat["targetflowtemp"] = hc->targetflowtemp;
         }
 
         if (Helpers::hasValue(hc->offsettemp)) {
@@ -940,8 +940,8 @@ void Thermostat::show_values(uuid::console::Shell & shell) {
             print_value(shell, 4, F("Summer temperature"), hc->summertemp, F_(degrees), 0);
         }
         // show flow temp if we have it
-        if (Helpers::hasValue(hc->circuitcalctemp)) {
-            print_value(shell, 4, F("Calculated flow temperature"), hc->circuitcalctemp, F_(degrees), 1);
+        if (Helpers::hasValue(hc->targetflowtemp)) {
+            print_value(shell, 4, F("Target flow temperature"), hc->targetflowtemp, F_(degrees), 1);
         }
     }
 }
@@ -1066,12 +1066,12 @@ void Thermostat::process_RC300Monitor(std::shared_ptr<const Telegram> telegram)
     // if auto, take the next setpoint temp at pos 7
     // pos 3 is the current target temp and sometimes can be 0
     // see https://github.com/proddy/EMS-ESP/issues/256#issuecomment-585171426
-    // pos 3 actual setpoint (optmized), i.e. changes with temporary change, summer/holiday-modes
+    // pos 3 actual setpoint (optimized), i.e. changes with temporary change, summer/holiday-modes
     // pos 6 actual setpoint according to programmed changes eco/comfort
     // pos 7 next setpoint in the future, time to next setpoint in pos 8/9
     telegram->read_value(hc->setpoint_roomTemp, 3, 1); // is * 2, force as single byte
     telegram->read_bitvalue(hc->summer_mode, 2, 4);
-    telegram->read_value(hc->circuitcalctemp, 4);
+    telegram->read_value(hc->targetflowtemp, 4);
 }
 
 // type 0x02B9 EMS+ for reading from RC300/RC310 thermostat
@@ -1136,7 +1136,7 @@ void Thermostat::process_RC35Monitor(std::shared_ptr<const Telegram> telegram) {
     telegram->read_bitvalue(hc->summer_mode, 1, 0);
     telegram->read_bitvalue(hc->holiday_mode, 0, 5);
 
-    telegram->read_value(hc->circuitcalctemp, 14);
+    telegram->read_value(hc->targetflowtemp, 14);
 }
 
 // type 0x3D (HC1), 0x47 (HC2), 0x51 (HC3), 0x5B (HC4) - Working Mode Heating - for reading the mode from the RC35 thermostat (0x10)
diff --git a/src/devices/thermostat.h b/src/devices/thermostat.h
index 1fac23fbd..e806e134f 100644
--- a/src/devices/thermostat.h
+++ b/src/devices/thermostat.h
@@ -56,7 +56,7 @@ class Thermostat : public EMSdevice {
         uint8_t nighttemp         = EMS_VALUE_UINT_NOTSET;
         uint8_t holidaytemp       = EMS_VALUE_UINT_NOTSET;
         uint8_t heatingtype       = EMS_VALUE_UINT_NOTSET; // type of heating: 1 radiator, 2 convectors, 3 floors, 4 room supply
-        uint8_t circuitcalctemp   = EMS_VALUE_UINT_NOTSET;
+        uint8_t targetflowtemp    = EMS_VALUE_UINT_NOTSET;
         uint8_t summertemp        = EMS_VALUE_UINT_NOTSET;
         uint8_t nofrosttemp       = EMS_VALUE_UINT_NOTSET;
         uint8_t designtemp        = EMS_VALUE_UINT_NOTSET; // heatingcurve design temp at MinExtTemp
@@ -165,7 +165,7 @@ class Thermostat : public EMSdevice {
     static constexpr uint8_t EMS_OFFSET_RC35Set_temp_night         = 1;  // position of thermostat setpoint temperature for night time
     static constexpr uint8_t EMS_OFFSET_RC35Set_temp_holiday       = 3;  // temp during holiday mode
     static constexpr uint8_t EMS_OFFSET_RC35Set_heatingtype        = 0;  // e.g. floor heating = 3
-    static constexpr uint8_t EMS_OFFSET_RC35Set_circuitcalctemp    = 14; // calculated circuit temperature
+    static constexpr uint8_t EMS_OFFSET_RC35Set_targetflowtemp     = 14; // target flow temperature
     static constexpr uint8_t EMS_OFFSET_RC35Set_seltemp            = 37; // selected temp
     static constexpr uint8_t EMS_OFFSET_RC35Set_temp_offset        = 6;
     static constexpr uint8_t EMS_OFFSET_RC35Set_temp_design        = 17;