diff --git a/apps/homeassistant/xaal/bridge.py b/apps/homeassistant/xaal/bridge.py
index 1b668c86e5ea3b6834dd986bfc82efc53f99d783..084840ccdbdccad73cce909268b04a575b88e17d 100644
--- a/apps/homeassistant/xaal/bridge.py
+++ b/apps/homeassistant/xaal/bridge.py
@@ -111,7 +111,7 @@ class XAALEntity(Entity):
         db_name = self._dev.db.get('ha_name')
         dev_name = self._dev.db.get('ha_dev_name')
         if dev_name and db_name:
-            db_name = db_name.removeprefix(dev_name)
+            db_name = db_name.removeprefix(f"{dev_name} ")
 
         force_name = getattr(self, '_force_name', None)
         name = db_name or force_name or self.device_class or self.short_type()
@@ -396,7 +396,7 @@ class Bridge(object):
         entity = self.get_entity_by_id(entity_id)
         if entity:
             name = entity.registry_entry.name
-            if 'name' not in event.data.get('changes',{}).keys():
+            if 'name' not in event.data.get('changes', {}).keys():
                 return
             kv = {'ha_name': name}
             body = {'device': entity.address, 'map': kv}
diff --git a/apps/homeassistant/xaal/sensor.py b/apps/homeassistant/xaal/sensor.py
index 9f10b32dda5ba1c636311573569362b7ce500216..c8521f1030206e479a7ddafe4b57aa9d6e8175ec 100644
--- a/apps/homeassistant/xaal/sensor.py
+++ b/apps/homeassistant/xaal/sensor.py
@@ -58,7 +58,7 @@ class Hygrometer(XAALSensorEntity):
 
 class Barometer(XAALSensorEntity):
     _attr_device_class = SensorDeviceClass.PRESSURE
-    _attr_native_unit_of_measurement = const.PRESSURE_HPA
+    _attr_native_unit_of_measurement = const.UnitOfPressure.HPA
     _xaal_attribute = 'pressure'
 
 
@@ -71,7 +71,7 @@ class Battery(XAALSensorEntity):
 
 class PowerMeter(XAALSensorEntity):
     _attr_device_class = SensorDeviceClass.POWER
-    _attr_native_unit_of_measurement = const.POWER_WATT
+    _attr_native_unit_of_measurement = const.UnitOfPower.WATT
     _xaal_attribute = 'power'