From cd67e6d6b65235eddb10e6b8d535888637f80ae7 Mon Sep 17 00:00:00 2001
From: Allen Porter <allen@thebends.org>
Date: Sat, 21 Oct 2023 22:41:55 +0000
Subject: [PATCH] Use entity names for existing battery sensors

---
 homeassistant/components/fitbit/sensor.py    | 6 ++----
 homeassistant/components/fitbit/strings.json | 3 +++
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/homeassistant/components/fitbit/sensor.py b/homeassistant/components/fitbit/sensor.py
index 4a32c3418a2..d7d6a6e1563 100644
--- a/homeassistant/components/fitbit/sensor.py
+++ b/homeassistant/components/fitbit/sensor.py
@@ -504,15 +504,15 @@ SLEEP_START_TIME_12HR = FitbitSensorEntityDescription(
 
 FITBIT_RESOURCE_BATTERY = FitbitSensorEntityDescription(
     key="devices/battery",
-    name="Battery",
+    translation_key="battery",
     icon="mdi:battery",
     scope=FitbitScope.DEVICE,
     entity_category=EntityCategory.DIAGNOSTIC,
+    has_entity_name=True,
 )
 FITBIT_RESOURCE_BATTERY_LEVEL = FitbitSensorEntityDescription(
     key="devices/battery_level",
     translation_key="battery_level",
-    name="Battery Level",
     icon="mdi:battery",
     scope=FitbitScope.DEVICE,
     entity_category=EntityCategory.DIAGNOSTIC,
@@ -753,7 +753,6 @@ class FitbitBatterySensor(CoordinatorEntity, SensorEntity):
         super().__init__(coordinator)
         self.entity_description = description
         self.device = device
-        self._attr_name = f"{device.device_version} Battery"
         self._attr_unique_id = f"{user_profile_id}_{description.key}_{device.id}"
         self._attr_device_info = DeviceInfo(
             identifiers={(DOMAIN, f"{user_profile_id}_{device.id}")},
@@ -797,7 +796,6 @@ class FitbitBatteryLevelSensor(CoordinatorEntity, SensorEntity):
 
     entity_description: FitbitSensorEntityDescription
     _attr_attribution = ATTRIBUTION
-    _attr_has_entity_name = True
 
     def __init__(
         self,
diff --git a/homeassistant/components/fitbit/strings.json b/homeassistant/components/fitbit/strings.json
index 470144d2075..26668f8c227 100644
--- a/homeassistant/components/fitbit/strings.json
+++ b/homeassistant/components/fitbit/strings.json
@@ -29,6 +29,9 @@
   },
   "entity": {
     "sensor": {
+      "battery": {
+        "name": "Battery"
+      },
       "battery_level": {
         "name": "Battery Level"
       }