Fix entity cleanup and naming bugs in ISY994 (#86023)

homeassistant/components/isy994/button.py

@@ -74,7 +74,7 @@ async def async_setup_entry(
         ISYNodeQueryButtonEntity(
             node=isy,
             name="Query",
-            unique_id=isy.uuid,
+            unique_id=f"{isy.uuid}_query",
             device_info=DeviceInfo(identifiers={(DOMAIN, isy.uuid)}),
             entity_category=EntityCategory.DIAGNOSTIC,
         )

homeassistant/components/isy994/entity.py

@@ -94,7 +94,7 @@ class ISYNodeEntity(ISYEntity):
     ) -> None:
         """Initialize the ISY/IoX node entity."""
         super().__init__(node, device_info=device_info)
-        if node.address == node.primary_node:
+        if hasattr(node, "parent_node") and node.parent_node is None:
             self._attr_has_entity_name = True
             self._attr_name = None