From b070bb8ef097cc221ae16c85722e6e0f8cf3e4b0 Mon Sep 17 00:00:00 2001
From: Franck Nijhof <git@frenck.dev>
Date: Sun, 10 Jul 2022 22:05:54 +0200
Subject: [PATCH] Migrate Supervisor integration to new entity naming style
 (#74906)

---
 homeassistant/components/hassio/binary_sensor.py |  2 +-
 homeassistant/components/hassio/entity.py        | 13 ++++++++-----
 homeassistant/components/hassio/sensor.py        |  6 +++---
 3 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/homeassistant/components/hassio/binary_sensor.py b/homeassistant/components/hassio/binary_sensor.py
index 85cb402b0ca..6ddc15e7725 100644
--- a/homeassistant/components/hassio/binary_sensor.py
+++ b/homeassistant/components/hassio/binary_sensor.py
@@ -36,7 +36,7 @@ COMMON_ENTITY_DESCRIPTIONS = (
         device_class=BinarySensorDeviceClass.UPDATE,
         entity_registry_enabled_default=False,
         key=ATTR_UPDATE_AVAILABLE,
-        name="Update Available",
+        name="Update available",
     ),
 )
 
diff --git a/homeassistant/components/hassio/entity.py b/homeassistant/components/hassio/entity.py
index c6bec04123c..dfa89ae911a 100644
--- a/homeassistant/components/hassio/entity.py
+++ b/homeassistant/components/hassio/entity.py
@@ -3,7 +3,6 @@ from __future__ import annotations
 
 from typing import Any
 
-from homeassistant.const import ATTR_NAME
 from homeassistant.helpers.entity import DeviceInfo, EntityDescription
 from homeassistant.helpers.update_coordinator import CoordinatorEntity
 
@@ -20,6 +19,8 @@ from .const import (
 class HassioAddonEntity(CoordinatorEntity[HassioDataUpdateCoordinator]):
     """Base entity for a Hass.io add-on."""
 
+    _attr_has_entity_name = True
+
     def __init__(
         self,
         coordinator: HassioDataUpdateCoordinator,
@@ -30,7 +31,6 @@ class HassioAddonEntity(CoordinatorEntity[HassioDataUpdateCoordinator]):
         super().__init__(coordinator)
         self.entity_description = entity_description
         self._addon_slug = addon[ATTR_SLUG]
-        self._attr_name = f"{addon[ATTR_NAME]}: {entity_description.name}"
         self._attr_unique_id = f"{addon[ATTR_SLUG]}_{entity_description.key}"
         self._attr_device_info = DeviceInfo(identifiers={(DOMAIN, addon[ATTR_SLUG])})
 
@@ -48,6 +48,8 @@ class HassioAddonEntity(CoordinatorEntity[HassioDataUpdateCoordinator]):
 class HassioOSEntity(CoordinatorEntity[HassioDataUpdateCoordinator]):
     """Base Entity for Hass.io OS."""
 
+    _attr_has_entity_name = True
+
     def __init__(
         self,
         coordinator: HassioDataUpdateCoordinator,
@@ -56,7 +58,6 @@ class HassioOSEntity(CoordinatorEntity[HassioDataUpdateCoordinator]):
         """Initialize base entity."""
         super().__init__(coordinator)
         self.entity_description = entity_description
-        self._attr_name = f"Home Assistant Operating System: {entity_description.name}"
         self._attr_unique_id = f"home_assistant_os_{entity_description.key}"
         self._attr_device_info = DeviceInfo(identifiers={(DOMAIN, "OS")})
 
@@ -73,6 +74,8 @@ class HassioOSEntity(CoordinatorEntity[HassioDataUpdateCoordinator]):
 class HassioSupervisorEntity(CoordinatorEntity[HassioDataUpdateCoordinator]):
     """Base Entity for Supervisor."""
 
+    _attr_has_entity_name = True
+
     def __init__(
         self,
         coordinator: HassioDataUpdateCoordinator,
@@ -81,7 +84,6 @@ class HassioSupervisorEntity(CoordinatorEntity[HassioDataUpdateCoordinator]):
         """Initialize base entity."""
         super().__init__(coordinator)
         self.entity_description = entity_description
-        self._attr_name = f"Home Assistant Supervisor: {entity_description.name}"
         self._attr_unique_id = f"home_assistant_supervisor_{entity_description.key}"
         self._attr_device_info = DeviceInfo(identifiers={(DOMAIN, "supervisor")})
 
@@ -99,6 +101,8 @@ class HassioSupervisorEntity(CoordinatorEntity[HassioDataUpdateCoordinator]):
 class HassioCoreEntity(CoordinatorEntity[HassioDataUpdateCoordinator]):
     """Base Entity for Core."""
 
+    _attr_has_entity_name = True
+
     def __init__(
         self,
         coordinator: HassioDataUpdateCoordinator,
@@ -107,7 +111,6 @@ class HassioCoreEntity(CoordinatorEntity[HassioDataUpdateCoordinator]):
         """Initialize base entity."""
         super().__init__(coordinator)
         self.entity_description = entity_description
-        self._attr_name = f"Home Assistant Core: {entity_description.name}"
         self._attr_unique_id = f"home_assistant_core_{entity_description.key}"
         self._attr_device_info = DeviceInfo(identifiers={(DOMAIN, "core")})
 
diff --git a/homeassistant/components/hassio/sensor.py b/homeassistant/components/hassio/sensor.py
index 55fcb0bcd28..31e728a9736 100644
--- a/homeassistant/components/hassio/sensor.py
+++ b/homeassistant/components/hassio/sensor.py
@@ -31,7 +31,7 @@ COMMON_ENTITY_DESCRIPTIONS = (
     SensorEntityDescription(
         entity_registry_enabled_default=False,
         key=ATTR_VERSION_LATEST,
-        name="Newest Version",
+        name="Newest version",
     ),
 )
 
@@ -39,7 +39,7 @@ ADDON_ENTITY_DESCRIPTIONS = COMMON_ENTITY_DESCRIPTIONS + (
     SensorEntityDescription(
         entity_registry_enabled_default=False,
         key=ATTR_CPU_PERCENT,
-        name="CPU Percent",
+        name="CPU percent",
         icon="mdi:cpu-64-bit",
         native_unit_of_measurement=PERCENTAGE,
         state_class=SensorStateClass.MEASUREMENT,
@@ -47,7 +47,7 @@ ADDON_ENTITY_DESCRIPTIONS = COMMON_ENTITY_DESCRIPTIONS + (
     SensorEntityDescription(
         entity_registry_enabled_default=False,
         key=ATTR_MEMORY_PERCENT,
-        name="Memory Percent",
+        name="Memory percent",
         icon="mdi:memory",
         native_unit_of_measurement=PERCENTAGE,
         state_class=SensorStateClass.MEASUREMENT,