diff --git a/homeassistant/components/skybell/camera.py b/homeassistant/components/skybell/camera.py index 499f1f3bfca..5bbcea833c2 100644 --- a/homeassistant/components/skybell/camera.py +++ b/homeassistant/components/skybell/camera.py @@ -41,7 +41,7 @@ PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend( ) CAMERA_TYPES: tuple[CameraEntityDescription, ...] = ( - CameraEntityDescription(key="activity", name="Last Activity"), + CameraEntityDescription(key="activity", name="Last activity"), CameraEntityDescription(key="avatar", name="Camera"), ) diff --git a/homeassistant/components/skybell/entity.py b/homeassistant/components/skybell/entity.py index 0e5c246a8ed..29c7167b02b 100644 --- a/homeassistant/components/skybell/entity.py +++ b/homeassistant/components/skybell/entity.py @@ -16,6 +16,7 @@ class SkybellEntity(CoordinatorEntity[SkybellDataUpdateCoordinator]): """An HA implementation for Skybell entity.""" _attr_attribution = "Data provided by Skybell.com" + _attr_has_entity_name = True def __init__( self, coordinator: SkybellDataUpdateCoordinator, description: EntityDescription @@ -23,14 +24,12 @@ class SkybellEntity(CoordinatorEntity[SkybellDataUpdateCoordinator]): """Initialize a SkyBell entity.""" super().__init__(coordinator) self.entity_description = description - if description.name != coordinator.device.name: - self._attr_name = f"{self._device.name} {description.name}" self._attr_unique_id = f"{self._device.device_id}_{description.key}" self._attr_device_info = DeviceInfo( identifiers={(DOMAIN, self._device.device_id)}, manufacturer=DEFAULT_NAME, model=self._device.type, - name=self._device.name, + name=self._device.name.capitalize(), sw_version=self._device.firmware_ver, ) if self._device.mac: diff --git a/homeassistant/components/skybell/light.py b/homeassistant/components/skybell/light.py index 845be44a34b..2b3066a8827 100644 --- a/homeassistant/components/skybell/light.py +++ b/homeassistant/components/skybell/light.py @@ -23,13 +23,7 @@ async def async_setup_entry( ) -> None: """Set up Skybell switch.""" async_add_entities( - SkybellLight( - coordinator, - LightEntityDescription( - key=coordinator.device.name, - name=coordinator.device.name, - ), - ) + SkybellLight(coordinator, LightEntityDescription(key="light")) for coordinator in hass.data[DOMAIN][entry.entry_id] ) diff --git a/homeassistant/components/skybell/sensor.py b/homeassistant/components/skybell/sensor.py index eeb81e07aaf..352d29bd793 100644 --- a/homeassistant/components/skybell/sensor.py +++ b/homeassistant/components/skybell/sensor.py @@ -35,27 +35,27 @@ class SkybellSensorEntityDescription(SensorEntityDescription): SENSOR_TYPES: tuple[SkybellSensorEntityDescription, ...] = ( SkybellSensorEntityDescription( key="chime_level", - name="Chime Level", + name="Chime level", icon="mdi:bell-ring", value_fn=lambda device: device.outdoor_chime_level, ), SkybellSensorEntityDescription( key="last_button_event", - name="Last Button Event", + name="Last button event", icon="mdi:clock", device_class=SensorDeviceClass.TIMESTAMP, value_fn=lambda device: device.latest("button").get(CONST.CREATED_AT), ), SkybellSensorEntityDescription( key="last_motion_event", - name="Last Motion Event", + name="Last motion event", icon="mdi:clock", device_class=SensorDeviceClass.TIMESTAMP, value_fn=lambda device: device.latest("motion").get(CONST.CREATED_AT), ), SkybellSensorEntityDescription( key=CONST.ATTR_LAST_CHECK_IN, - name="Last Check in", + name="Last check in", icon="mdi:clock", entity_registry_enabled_default=False, device_class=SensorDeviceClass.TIMESTAMP, @@ -64,7 +64,7 @@ SENSOR_TYPES: tuple[SkybellSensorEntityDescription, ...] = ( ), SkybellSensorEntityDescription( key="motion_threshold", - name="Motion Threshold", + name="Motion threshold", icon="mdi:walk", entity_registry_enabled_default=False, entity_category=EntityCategory.DIAGNOSTIC, @@ -72,7 +72,7 @@ SENSOR_TYPES: tuple[SkybellSensorEntityDescription, ...] = ( ), SkybellSensorEntityDescription( key="video_profile", - name="Video Profile", + name="Video profile", entity_registry_enabled_default=False, entity_category=EntityCategory.DIAGNOSTIC, value_fn=lambda device: device.video_profile, @@ -87,7 +87,7 @@ SENSOR_TYPES: tuple[SkybellSensorEntityDescription, ...] = ( ), SkybellSensorEntityDescription( key=CONST.ATTR_WIFI_STATUS, - name="Wifi Status", + name="Wifi status", icon="mdi:wifi-strength-3", entity_registry_enabled_default=False, entity_category=EntityCategory.DIAGNOSTIC, diff --git a/homeassistant/components/skybell/switch.py b/homeassistant/components/skybell/switch.py index d4f2817141c..529be94f1ac 100644 --- a/homeassistant/components/skybell/switch.py +++ b/homeassistant/components/skybell/switch.py @@ -22,15 +22,15 @@ from .entity import SkybellEntity SWITCH_TYPES: tuple[SwitchEntityDescription, ...] = ( SwitchEntityDescription( key="do_not_disturb", - name="Do Not Disturb", + name="Do not disturb", ), SwitchEntityDescription( key="do_not_ring", - name="Do Not Ring", + name="Do not ring", ), SwitchEntityDescription( key="motion_sensor", - name="Motion Sensor", + name="Motion sensor", ), )