Merge mess cleanup causing namechange

Author: CoMPaTech

custom_components/plugwise-beta/binary_sensor.py

@@ -122,10 +122,6 @@ def state(self):
     @property
     def device_info(self) -> Dict[str, any]:
         """Return the device information."""
-        via_device = None
-        dev_name = f"{self._name.split('_')[0]} Sensors"
-        if self._dev_id is not self._api.gateway_id:
-            via_device = (DOMAIN, self._api.gateway_id)
         return {
             "identifiers": {(DOMAIN, self._dev_id)},
             "name": self._name,

custom_components/plugwise-beta/sensor.py

@@ -254,13 +254,9 @@ def state(self):
     @property
     def device_info(self) -> Dict[str, any]:
         """Return the device information."""
-        via_device = None
-        dev_name = f"{self._name.split('_')[0]} Sensors"
-        if self._dev_id is not self._api.gateway_id:
-            via_device = (DOMAIN, self._api.gateway_id)
         return {
             "identifiers": {(DOMAIN, self._dev_id)},
-            "name": dev_name,
+            "name": self._name,
             "manufacturer": "Plugwise",
             "via_device": (DOMAIN, self._via_id),
         }