diff --git a/homeassistant/components/lutron_caseta/__init__.py b/homeassistant/components/lutron_caseta/__init__.py index 3daa45d30ee..dd64ed4ec6f 100644 --- a/homeassistant/components/lutron_caseta/__init__.py +++ b/homeassistant/components/lutron_caseta/__init__.py @@ -197,15 +197,15 @@ def _async_register_button_devices( if "serial" not in device or device["serial"] in seen: continue seen.add(device["serial"]) + area, name = _area_and_name_from_name(device["name"]) device_args = { - "name": device["name"], + "name": f"{area} {name}", "manufacturer": MANUFACTURER, "config_entry_id": config_entry_id, "identifiers": {(DOMAIN, device["serial"])}, "model": f"{device['model']} ({device['type']})", "via_device": (DOMAIN, bridge_device["serial"]), } - area, _ = _area_and_name_from_name(device["name"]) if area != UNASSIGNED_AREA: device_args["suggested_area"] = area @@ -312,15 +312,16 @@ class LutronCasetaDevice(Entity): self._bridge_device = bridge_device if "serial" not in self._device: return + area, name = _area_and_name_from_name(device["name"]) + self._attr_name = full_name = f"{area} {name}" info = DeviceInfo( identifiers={(DOMAIN, self.serial)}, manufacturer=MANUFACTURER, model=f"{device['model']} ({device['type']})", - name=self.name, + name=full_name, via_device=(DOMAIN, self._bridge_device["serial"]), configuration_url=CONFIG_URL, ) - area, _ = _area_and_name_from_name(device["name"]) if area != UNASSIGNED_AREA: info[ATTR_SUGGESTED_AREA] = area self._attr_device_info = info @@ -334,11 +335,6 @@ class LutronCasetaDevice(Entity): """Return the device ID used for calling pylutron_caseta.""" return self._device["device_id"] - @property - def name(self): - """Return the name of the device.""" - return self._device["name"] - @property def serial(self): """Return the serial number of the device.""" diff --git a/homeassistant/components/lutron_caseta/scene.py b/homeassistant/components/lutron_caseta/scene.py index bb932c61316..d73d8011481 100644 --- a/homeassistant/components/lutron_caseta/scene.py +++ b/homeassistant/components/lutron_caseta/scene.py @@ -30,15 +30,10 @@ class LutronCasetaScene(Scene): def __init__(self, scene, bridge): """Initialize the Lutron Caseta scene.""" - self._scene_name = scene["name"] + self._attr_name = scene["name"] self._scene_id = scene["scene_id"] self._bridge = bridge - @property - def name(self): - """Return the name of the scene.""" - return self._scene_name - async def async_activate(self, **kwargs: Any) -> None: """Activate the scene.""" await self._bridge.activate_scene(self._scene_id)