diff --git a/Network.cpp b/Network.cpp
index c371833..e50f9eb 100644
--- a/Network.cpp
+++ b/Network.cpp
@@ -795,7 +795,7 @@ void Network::publishHASSConfig(char* deviceType, const char* baseTopic, char* n
                          "battery_low",
                          uidString,
                          "_battery_low",
-                         "battery low",
+                         "Battery low",
                          name,
                          baseTopic,
                          String("~") + mqtt_topic_battery_critical,
@@ -814,7 +814,7 @@ void Network::publishHASSConfig(char* deviceType, const char* baseTopic, char* n
                              "keypad_battery_low",
                              uidString,
                              "_keypad_battery_low",
-                             "keypad battery low",
+                             "Keypad battery low",
                              name,
                              baseTopic,
                              String("~") + mqtt_topic_battery_keypad_critical,
@@ -836,7 +836,7 @@ void Network::publishHASSConfig(char* deviceType, const char* baseTopic, char* n
                          "battery_voltage",
                          uidString,
                          "_battery_voltage",
-                         "battery voltage",
+                         "Battery voltage",
                          name,
                          baseTopic,
                          String("~") + mqtt_topic_battery_voltage,
@@ -852,7 +852,7 @@ void Network::publishHASSConfig(char* deviceType, const char* baseTopic, char* n
                          "trigger",
                          uidString,
                          "_trigger",
-                         "trigger",
+                         "Trigger",
                          name,
                          baseTopic,
                          String("~") + mqtt_topic_lock_trigger,
@@ -886,7 +886,7 @@ void Network::publishHASSConfig(char* deviceType, const char* baseTopic, char* n
                          "reset",
                          uidString,
                          "_reset",
-                         "Restart NUKI Hub",
+                         "Restart Nuki Hub",
                          name,
                          baseTopic,
                          String("~") + mqtt_topic_reset,
@@ -940,7 +940,7 @@ void Network::publishHASSConfig(char* deviceType, const char* baseTopic, char* n
                          "nuki_hub_version",
                          uidString,
                          "_nuki_hub_version",
-                         "NUKI Hub version",
+                         "Nuki Hub version",
                          name,
                          baseTopic,
                          _lockPath + mqtt_topic_info_nuki_hub_version,
@@ -1005,7 +1005,7 @@ void Network::publishHASSConfig(char* deviceType, const char* baseTopic, char* n
                          "nuki_hub_ip",
                          uidString,
                          "_nuki_hub_ip",
-                         "NUKI Hub IP",
+                         "Nuki Hub IP",
                          name,
                          baseTopic,
                          _lockPath + mqtt_topic_info_nuki_hub_ip,
@@ -1125,7 +1125,7 @@ void Network::publishHASSConfigBatLevel(char *deviceType, const char *baseTopic,
                          "battery_level",
                          uidString,
                          "_battery_level",
-                         "battery level",
+                         "Battery level",
                          name,
                          baseTopic,
                          String("~") + mqtt_topic_battery_level,
@@ -1150,7 +1150,7 @@ void Network::publishHASSConfigDoorSensor(char *deviceType, const char *baseTopi
                          "door_sensor",
                          uidString,
                          "_door_sensor",
-                         "door sensor",
+                         "Door sensor",
                          name,
                          baseTopic,
                          String("~") + mqtt_topic_lock_door_sensor_state,
@@ -1175,7 +1175,7 @@ void Network::publishHASSConfigRingDetect(char *deviceType, const char *baseTopi
                          "ring",
                          uidString,
                          "_ring_detect",
-                         "ring detect",
+                         "Ring detect",
                          name,
                          baseTopic,
                          String("~") + mqtt_topic_lock_state,
@@ -1286,7 +1286,7 @@ void Network::publishHASSWifiRssiConfig(char *deviceType, const char *baseTopic,
                          "wifi_signal_strength",
                          uidString,
                          "_wifi_signal_strength",
-                         "wifi signal strength",
+                         "WIFI signal strength",
                          name,
                          baseTopic,
                          _lockPath + mqtt_topic_wifi_rssi,
@@ -1309,7 +1309,7 @@ void Network::publishHASSBleRssiConfig(char *deviceType, const char *baseTopic,
                          "bluetooth_signal_strength",
                          uidString,
                          "_bluetooth_signal_strength",
-                         "bluetooth signal strength",
+                         "Bluetooth signal strength",
                          name,
                          baseTopic,
                          String("~") + mqtt_topic_lock_rssi,