From 9fae638f6587087ea9ff708cc0d79d131b079302 Mon Sep 17 00:00:00 2001
From: Glenn Waters <glenn@watrs.ca>
Date: Sun, 24 Jul 2022 14:40:42 -0400
Subject: [PATCH] Migrate ElkM1 to new entity naming style (#75023)

---
 homeassistant/components/elkm1/__init__.py | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/homeassistant/components/elkm1/__init__.py b/homeassistant/components/elkm1/__init__.py
index 472d31ccb93..2ce0e726fc4 100644
--- a/homeassistant/components/elkm1/__init__.py
+++ b/homeassistant/components/elkm1/__init__.py
@@ -443,13 +443,14 @@ def create_elk_entities(
 class ElkEntity(Entity):
     """Base class for all Elk entities."""
 
+    _attr_has_entity_name = True
+
     def __init__(self, element: Element, elk: Elk, elk_data: dict[str, Any]) -> None:
         """Initialize the base of all Elk devices."""
         self._elk = elk
         self._element = element
         self._mac = elk_data["mac"]
         self._prefix = elk_data["prefix"]
-        self._name_prefix = f"{self._prefix} " if self._prefix else ""
         self._temperature_unit: str = elk_data["config"]["temperature_unit"]
         # unique_id starts with elkm1_ iff there is no prefix
         # it starts with elkm1m_{prefix} iff there is a prefix
@@ -464,11 +465,7 @@ class ElkEntity(Entity):
         else:
             uid_start = "elkm1"
         self._unique_id = f"{uid_start}_{self._element.default_name('_')}".lower()
-
-    @property
-    def name(self) -> str:
-        """Name of the element."""
-        return f"{self._name_prefix}{self._element.name}"
+        self._attr_name = element.name
 
     @property
     def unique_id(self) -> str: