diff --git a/custom_components/webastoconnect/binary_sensor.py b/custom_components/webastoconnect/binary_sensor.py
index 5ead607..3fbe6de 100644
--- a/custom_components/webastoconnect/binary_sensor.py
+++ b/custom_components/webastoconnect/binary_sensor.py
@@ -82,7 +82,7 @@ def __init__(
 
         self._attr_device_info = {
             "identifiers": {(DOMAIN, self.coordinator.cloud.device_id)},
-            "name": self.name,
+            "name": self.coordinator.cloud.name,
             "model": "ThermoConnect",
             "manufacturer": "Webasto",
         }
diff --git a/custom_components/webastoconnect/number.py b/custom_components/webastoconnect/number.py
index fe495d7..6e14988 100644
--- a/custom_components/webastoconnect/number.py
+++ b/custom_components/webastoconnect/number.py
@@ -90,7 +90,7 @@ def __init__(
         self._attr_should_poll = False
         self._attr_device_info = {
             "identifiers": {(DOMAIN, self.coordinator.cloud.device_id)},
-            "name": self.name,
+            "name": self.coordinator.cloud.name,
             "model": "ThermoConnect",
             "manufacturer": "Webasto",
         }
diff --git a/custom_components/webastoconnect/sensor.py b/custom_components/webastoconnect/sensor.py
index d32bb4b..205d7d9 100644
--- a/custom_components/webastoconnect/sensor.py
+++ b/custom_components/webastoconnect/sensor.py
@@ -108,7 +108,7 @@ def __init__(
 
         self._attr_device_info = {
             "identifiers": {(DOMAIN, self.coordinator.cloud.device_id)},
-            "name": self.name,
+            "name": self.coordinator.cloud.name,
             "model": "ThermoConnect",
             "manufacturer": "Webasto",
         }