From ea1fc6b5d3fbaed043ec2ad576a9e91120ca271c Mon Sep 17 00:00:00 2001
From: Aaron Bach <bachya1208@gmail.com>
Date: Sat, 9 Jul 2022 11:59:36 -0600
Subject: [PATCH] Migrate SimpliSafe to new entity naming style (#74763)

---
 homeassistant/components/simplisafe/__init__.py     | 13 ++++++-------
 .../components/simplisafe/binary_sensor.py          |  2 +-
 2 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/homeassistant/components/simplisafe/__init__.py b/homeassistant/components/simplisafe/__init__.py
index 14a0d6dd8e9..716163c4957 100644
--- a/homeassistant/components/simplisafe/__init__.py
+++ b/homeassistant/components/simplisafe/__init__.py
@@ -113,8 +113,7 @@ ATTR_SYSTEM_ID = "system_id"
 ATTR_TIMESTAMP = "timestamp"
 
 DEFAULT_CONFIG_URL = "https://webapp.simplisafe.com/new/#/dashboard"
-DEFAULT_ENTITY_MODEL = "alarm_control_panel"
-DEFAULT_ENTITY_NAME = "Alarm Control Panel"
+DEFAULT_ENTITY_MODEL = "Alarm control panel"
 DEFAULT_ERROR_THRESHOLD = 2
 DEFAULT_SCAN_INTERVAL = timedelta(seconds=30)
 DEFAULT_SOCKET_MIN_RETRY = 15
@@ -660,6 +659,8 @@ class SimpliSafe:
 class SimpliSafeEntity(CoordinatorEntity):
     """Define a base SimpliSafe entity."""
 
+    _attr_has_entity_name = True
+
     def __init__(
         self,
         simplisafe: SimpliSafe,
@@ -679,12 +680,11 @@ class SimpliSafeEntity(CoordinatorEntity):
         self._error_count = 0
 
         if device:
-            model = device.type.name
-            device_name = device.name
+            model = device.type.name.capitalize().replace("_", " ")
+            device_name = f"{device.name.capitalize()} {model}"
             serial = device.serial
         else:
-            model = DEFAULT_ENTITY_MODEL
-            device_name = DEFAULT_ENTITY_NAME
+            model = device_name = DEFAULT_ENTITY_MODEL
             serial = system.serial
 
         event = simplisafe.initial_event_to_use[system.system_id]
@@ -714,7 +714,6 @@ class SimpliSafeEntity(CoordinatorEntity):
             via_device=(DOMAIN, system.system_id),
         )
 
-        self._attr_name = f"{system.address} {device_name} {' '.join([w.title() for w in model.split('_')])}"
         self._attr_unique_id = serial
         self._device = device
         self._online = True
diff --git a/homeassistant/components/simplisafe/binary_sensor.py b/homeassistant/components/simplisafe/binary_sensor.py
index 3e4c64e8658..239f5468cb3 100644
--- a/homeassistant/components/simplisafe/binary_sensor.py
+++ b/homeassistant/components/simplisafe/binary_sensor.py
@@ -103,7 +103,7 @@ class BatteryBinarySensor(SimpliSafeEntity, BinarySensorEntity):
         """Initialize."""
         super().__init__(simplisafe, system, device=sensor)
 
-        self._attr_name = f"{super().name} Battery"
+        self._attr_name = "Battery"
         self._attr_unique_id = f"{super().unique_id}-battery"
         self._device: SensorV3