From 4080d2b0dabeae322f42b34b8eb553f5d2a300b9 Mon Sep 17 00:00:00 2001
From: Joakim Plate <elupus@ecce.se>
Date: Sat, 9 Jul 2022 19:34:51 +0200
Subject: [PATCH] Convert philips_js to entity naming (#74721)

Co-authored-by: Franck Nijhof <frenck@frenck.nl>
---
 homeassistant/components/philips_js/light.py        | 4 +++-
 homeassistant/components/philips_js/media_player.py | 2 +-
 homeassistant/components/philips_js/remote.py       | 4 +++-
 homeassistant/components/philips_js/switch.py       | 4 +++-
 4 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/homeassistant/components/philips_js/light.py b/homeassistant/components/philips_js/light.py
index ab4f04a8ddc..4fa3b066214 100644
--- a/homeassistant/components/philips_js/light.py
+++ b/homeassistant/components/philips_js/light.py
@@ -137,6 +137,8 @@ class PhilipsTVLightEntity(
 ):
     """Representation of a Philips TV exposing the JointSpace API."""
 
+    _attr_has_entity_name = True
+
     def __init__(
         self,
         coordinator: PhilipsTVDataUpdateCoordinator,
@@ -151,7 +153,7 @@ class PhilipsTVLightEntity(
 
         self._attr_supported_color_modes = {ColorMode.HS, ColorMode.ONOFF}
         self._attr_supported_features = LightEntityFeature.EFFECT
-        self._attr_name = f"{coordinator.system['name']} Ambilight"
+        self._attr_name = "Ambilight"
         self._attr_unique_id = coordinator.unique_id
         self._attr_icon = "mdi:television-ambient-light"
         self._attr_device_info = DeviceInfo(
diff --git a/homeassistant/components/philips_js/media_player.py b/homeassistant/components/philips_js/media_player.py
index 3d63865fe31..8d864436ac5 100644
--- a/homeassistant/components/philips_js/media_player.py
+++ b/homeassistant/components/philips_js/media_player.py
@@ -73,6 +73,7 @@ class PhilipsTVMediaPlayer(
     """Representation of a Philips TV exposing the JointSpace API."""
 
     _attr_device_class = MediaPlayerDeviceClass.TV
+    _attr_has_entity_name = True
 
     def __init__(
         self,
@@ -83,7 +84,6 @@ class PhilipsTVMediaPlayer(
         self._sources: dict[str, str] = {}
         self._supports = SUPPORT_PHILIPS_JS
         self._system = coordinator.system
-        self._attr_name = coordinator.system["name"]
         self._attr_unique_id = coordinator.unique_id
         self._attr_device_info = DeviceInfo(
             identifiers={
diff --git a/homeassistant/components/philips_js/remote.py b/homeassistant/components/philips_js/remote.py
index 38851964427..7e8c5448cca 100644
--- a/homeassistant/components/philips_js/remote.py
+++ b/homeassistant/components/philips_js/remote.py
@@ -30,6 +30,8 @@ async def async_setup_entry(
 class PhilipsTVRemote(CoordinatorEntity[PhilipsTVDataUpdateCoordinator], RemoteEntity):
     """Device that sends commands."""
 
+    _attr_has_entity_name = True
+
     def __init__(
         self,
         coordinator: PhilipsTVDataUpdateCoordinator,
@@ -37,7 +39,7 @@ class PhilipsTVRemote(CoordinatorEntity[PhilipsTVDataUpdateCoordinator], RemoteE
         """Initialize the Philips TV."""
         super().__init__(coordinator)
         self._tv = coordinator.api
-        self._attr_name = f"{coordinator.system['name']} Remote"
+        self._attr_name = "Remote"
         self._attr_unique_id = coordinator.unique_id
         self._attr_device_info = DeviceInfo(
             identifiers={
diff --git a/homeassistant/components/philips_js/switch.py b/homeassistant/components/philips_js/switch.py
index bf1e83b0ec1..b66fd3296d9 100644
--- a/homeassistant/components/philips_js/switch.py
+++ b/homeassistant/components/philips_js/switch.py
@@ -38,6 +38,8 @@ class PhilipsTVScreenSwitch(
 ):
     """A Philips TV screen state switch."""
 
+    _attr_has_entity_name = True
+
     def __init__(
         self,
         coordinator: PhilipsTVDataUpdateCoordinator,
@@ -46,7 +48,7 @@ class PhilipsTVScreenSwitch(
 
         super().__init__(coordinator)
 
-        self._attr_name = f"{coordinator.system['name']} Screen State"
+        self._attr_name = "Screen state"
         self._attr_icon = "mdi:television-shimmer"
         self._attr_unique_id = f"{coordinator.unique_id}_screenstate"
         self._attr_device_info = DeviceInfo(