diff --git a/gateway/include/ha.h b/gateway/include/ha.h
index a352558..d7d550c 100644
--- a/gateway/include/ha.h
+++ b/gateway/include/ha.h
@@ -185,11 +185,14 @@ namespace Ha {
             if (stateTopic[0]) jsonDoc["state_topic"] = stateTopic;
         }
 
+        Sensor* withDeviceName(const char* value) {
+            if (mainDevice) mainDevice->name = value;
+            return this;
+        }
     };
 
     struct TemperatureSensor : Sensor {
-        TemperatureSensor(const char* name, const char* id) : Sensor(name, id) {
-            name = "Temperature";
+        TemperatureSensor(const char* id) : Sensor("Temperature", id) {
             deviceClass = "temperature";
             unitMeasure = "°C";
             valueTemplate = "{{ value_json.sensor.temperature }}";
diff --git a/gateway/include/mqtt.h b/gateway/include/mqtt.h
index 4193864..0e9cd02 100644
--- a/gateway/include/mqtt.h
+++ b/gateway/include/mqtt.h
@@ -33,7 +33,7 @@ namespace Mqtt {
     }
 
     Ha::Sensor* sensors[] = {
-        (new Ha::TemperatureSensor{"Oil tank room1", "id4"})->withStateTopic()->copyFromDevice(atTinyDevice)->withArea("Basement")
+        (new Ha::TemperatureSensor{"id4"})->withStateTopic()->copyFromDevice(atTinyDevice)->withDeviceName("Oil tank room1")->withArea("Basement")
         // new Ha::TemperatureSensor{"Temperature", "temperature"},
         // new Ha::HumiditySensor{"Humidity", "humidity"},
         // new Ha::PressureSensor{"Pressure", "pressure"},