From 942faf412f1de27a39faac74133c0866a8b02b8a Mon Sep 17 00:00:00 2001
From: Koen Kanters <koenkanters94@gmail.com>
Date: Wed, 22 Feb 2023 20:34:39 +0100
Subject: [PATCH] Revert "Capitalize entity name in Home Assistant (#16702)"

This reverts commit f5cceb1719b24157304f16f71c7f52f251c7c808.
---
 lib/extension/homeassistant.ts | 9 +++------
 test/homeassistant.test.js     | 4 ++--
 2 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/lib/extension/homeassistant.ts b/lib/extension/homeassistant.ts
index d9840ea5d..e9e8a45d3 100644
--- a/lib/extension/homeassistant.ts
+++ b/lib/extension/homeassistant.ts
@@ -1192,16 +1192,13 @@ export default class HomeAssistant extends Extension {
 
             const devicePayload = this.getDevicePayload(entity);
 
-            // Set (unique) name, separate and change case according to name of the device.
+            // Set (unique) name, separate by space if device name contains space.
             const nameSeparator = devicePayload.name.includes('_') ? '_' : ' ';
-            const isNameCapitalize = devicePayload.name[0] === devicePayload.name[0].toUpperCase();
             payload.name = devicePayload.name;
             if (config.object_id.startsWith(config.type) && config.object_id.includes('_')) {
-                const name = config.object_id.split(/_(.+)/)[1];
-                payload.name += `${nameSeparator}${isNameCapitalize ? utils.capitalize(name) : name}`;
+                payload.name += `${nameSeparator}${config.object_id.split(/_(.+)/)[1]}`;
             } else if (!config.object_id.startsWith(config.type)) {
-                const name = config.object_id.replace(/_/g, nameSeparator);
-                payload.name += `${nameSeparator}${isNameCapitalize ? utils.capitalize(name) : name}`;
+                payload.name += `${nameSeparator}${config.object_id.replace(/_/g, nameSeparator)}`;
             }
 
             // Set unique_id
diff --git a/test/homeassistant.test.js b/test/homeassistant.test.js
index 08dc4ffb4..499e59d5f 100644
--- a/test/homeassistant.test.js
+++ b/test/homeassistant.test.js
@@ -584,7 +584,7 @@ describe('HomeAssistant extension', () => {
             'value_template': '{{ value_json.temperature }}',
             'state_topic': 'zigbee2mqtt/weather_sensor',
             'json_attributes_topic': 'zigbee2mqtt/weather_sensor',
-            'name': 'Weather Sensor Temperature',
+            'name': 'Weather Sensor temperature',
             'unique_id': '0x0017880104e45522_temperature_zigbee2mqtt',
             'device': {
                 'identifiers': ['zigbee2mqtt_0x0017880104e45522'],
@@ -611,7 +611,7 @@ describe('HomeAssistant extension', () => {
             'value_template': '{{ value_json.humidity }}',
             'state_topic': 'zigbee2mqtt/weather_sensor',
             'json_attributes_topic': 'zigbee2mqtt/weather_sensor',
-            'name': 'Weather Sensor Humidity',
+            'name': 'Weather Sensor humidity',
             'unique_id': '0x0017880104e45522_humidity_zigbee2mqtt',
             'enabled_by_default': true,
             'device': {