diff --git a/mqtt_client.py b/mqtt_client.py
index 0188da9..72b51a8 100644
--- a/mqtt_client.py
+++ b/mqtt_client.py
@@ -106,9 +106,9 @@ class MqttClient:
             },
             "entity_category": category,
             "icon": icon,
-            "name": name,
-            "unique_id": self.device_id + "_" + unique_id,
-            "object_id": safe_name + "_" + unique_id
+            "name": f"{self.device_name} {name}",
+            "unique_id": f"{self.device_id} {unique_id}",
+            "object_id": f"{safe_name} {unique_id}"
         }
         if additional_data:
             payload.update(additional_data)