From 94e192db12723e2fd7d9ecbb5a9807ff80ea15f1 Mon Sep 17 00:00:00 2001
From: Raman Gupta <7243222+raman325@users.noreply.github.com>
Date: Sun, 29 Oct 2023 12:44:15 -0400
Subject: [PATCH] Fix zwave_js siren name (#103016)

* Fix zwave_js.siren name

* Fix test
---
 homeassistant/components/zwave_js/entity.py | 2 +-
 homeassistant/components/zwave_js/siren.py  | 2 ++
 tests/components/zwave_js/test_siren.py     | 2 +-
 3 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/homeassistant/components/zwave_js/entity.py b/homeassistant/components/zwave_js/entity.py
index 0b9c68e9664..e7e110e7db6 100644
--- a/homeassistant/components/zwave_js/entity.py
+++ b/homeassistant/components/zwave_js/entity.py
@@ -206,7 +206,7 @@ class ZWaveBaseEntity(Entity):
         ):
             name += f" ({primary_value.endpoint})"
 
-        return name
+        return name.strip()
 
     @property
     def available(self) -> bool:
diff --git a/homeassistant/components/zwave_js/siren.py b/homeassistant/components/zwave_js/siren.py
index 6de6b0f4e45..7df88f7dca4 100644
--- a/homeassistant/components/zwave_js/siren.py
+++ b/homeassistant/components/zwave_js/siren.py
@@ -72,6 +72,8 @@ class ZwaveSirenEntity(ZWaveBaseEntity, SirenEntity):
         if self._attr_available_tones:
             self._attr_supported_features |= SirenEntityFeature.TONES
 
+        self._attr_name = self.generate_name(include_value_name=True)
+
     @property
     def is_on(self) -> bool | None:
         """Return whether device is on."""
diff --git a/tests/components/zwave_js/test_siren.py b/tests/components/zwave_js/test_siren.py
index 210339e22d7..6df5881107a 100644
--- a/tests/components/zwave_js/test_siren.py
+++ b/tests/components/zwave_js/test_siren.py
@@ -9,7 +9,7 @@ from homeassistant.components.siren import (
 from homeassistant.const import STATE_OFF, STATE_ON, STATE_UNKNOWN
 from homeassistant.core import HomeAssistant
 
-SIREN_ENTITY = "siren.indoor_siren_6_2"
+SIREN_ENTITY = "siren.indoor_siren_6_play_tone_2"
 
 TONE_ID_VALUE_ID = {
     "endpoint": 2,