diff --git a/custom_components/dirigera_platform/base_classes.py b/custom_components/dirigera_platform/base_classes.py
index fd26dcf..a355c72 100644
--- a/custom_components/dirigera_platform/base_classes.py
+++ b/custom_components/dirigera_platform/base_classes.py
@@ -129,9 +129,10 @@ def device_info(self) -> DeviceInfo:
         
     @property
     def name(self):
+    
         if self._name is None or len(self._name) == 0:
             return self._device.name
-        return self._name
+        return f"{self._device.name} {self._name}"
     
     @property
     def entity_category(self):