From a6059ad0c9ff043654235dab4318771878dc2708 Mon Sep 17 00:00:00 2001
From: Mark Hannon <mark.hannon@gmail.com>
Date: Tue, 13 May 2025 21:31:13 +0000
Subject: [PATCH] Default naming for sensors

---
 homeassistant/components/zimi/entity.py | 7 +++++--
 homeassistant/components/zimi/sensor.py | 2 +-
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/homeassistant/components/zimi/entity.py b/homeassistant/components/zimi/entity.py
index 68911992014..12d8f336bf0 100644
--- a/homeassistant/components/zimi/entity.py
+++ b/homeassistant/components/zimi/entity.py
@@ -21,7 +21,9 @@ class ZimiEntity(Entity):
     _attr_should_poll = False
     _attr_has_entity_name = True
 
-    def __init__(self, device: ControlPointDevice, api: ControlPoint) -> None:
+    def __init__(
+        self, device: ControlPointDevice, api: ControlPoint, use_device_name=True
+    ) -> None:
         """Initialize an HA Entity which is a ZimiDevice."""
 
         self._device = device
@@ -36,7 +38,8 @@ class ZimiEntity(Entity):
             suggested_area=device.room,
             via_device=(DOMAIN, api.mac),
         )
-        self._attr_name = device.name.strip()
+        if use_device_name:
+            self._attr_name = device.name.strip()
         self._attr_suggested_area = device.room
 
     @property
diff --git a/homeassistant/components/zimi/sensor.py b/homeassistant/components/zimi/sensor.py
index fb13f00b5d9..4d854fe251a 100644
--- a/homeassistant/components/zimi/sensor.py
+++ b/homeassistant/components/zimi/sensor.py
@@ -94,7 +94,7 @@ class ZimiSensor(ZimiEntity, SensorEntity):
     ) -> None:
         """Initialize an ZimiSensor with specified type."""
 
-        super().__init__(device, api)
+        super().__init__(device, api, use_device_name=False)
 
         self.entity_description = description
         self._attr_unique_id = device.identifier + "." + self.entity_description.key