diff --git a/include/ha.h b/include/ha.h
index 0e6f790..3d955f0 100644
--- a/include/ha.h
+++ b/include/ha.h
@@ -49,6 +49,7 @@ namespace Ha {
     void buildDeviceConfig(JsonDocument& jsonDoc) {
         JsonObject device = jsonDoc.createNestedObject("device");
         device["name"] = "ESP Clock";
+        device["suggested_area"] = "Living room";
         JsonArray connections = device.createNestedArray("connections");
         JsonArray mac = connections.createNestedArray();
         mac.add("mac");
diff --git a/include/mqtt.h b/include/mqtt.h
index f4adbce..f9f1e92 100644
--- a/include/mqtt.h
+++ b/include/mqtt.h
@@ -46,19 +46,19 @@ namespace Mqtt {
 
     void publishTempConfig() {
         char message[JSON_SIZE];
-        Ha::buildSensorConfig(message, Ha::TemperatureConfig{"Livingroom Temperature", "livingroom_temperature", bmpTopic});
+        Ha::buildSensorConfig(message, Ha::TemperatureConfig{"Living room Temperature", "living_room_temperature", bmpTopic});
         client.publish("homeassistant/sensor/esp_clock/temperature/config", 0, true, message);
     }
 
     void publishPressureConfig() {
         char message[JSON_SIZE];
-        Ha::buildSensorConfig(message, Ha::PressureConfig{"Livingroom Pressure", "livingroom_pressure", bmpTopic});
+        Ha::buildSensorConfig(message, Ha::PressureConfig{"Living room Pressure", "living_room_pressure", bmpTopic});
         client.publish("homeassistant/sensor/esp_clock/pressure/config", 0, true, message);
     }
 
     void publishAltitudeConfig() {
         char message[JSON_SIZE];
-        Ha::buildSensorConfig(message, Ha::AltitudeConfig{"Livingroom Altitude", "livingroom_altitude", bmpTopic});
+        Ha::buildSensorConfig(message, Ha::AltitudeConfig{"Living room Altitude", "living_room_altitude", bmpTopic});
         client.publish("homeassistant/sensor/esp_clock/altitude/config", 0, true, message);
     }