diff --git a/custom_components/mikrotik_router/binary_sensor.py b/custom_components/mikrotik_router/binary_sensor.py
index 9f8caf3..ebc4ecd 100644
--- a/custom_components/mikrotik_router/binary_sensor.py
+++ b/custom_components/mikrotik_router/binary_sensor.py
@@ -213,8 +213,8 @@ class MikrotikControllerBinarySensor(BinarySensorEntity):
             connections={(dev_connection, f"{dev_connection_value}")},
             identifiers={(dev_connection, f"{dev_connection_value}")},
             default_name=f"{self._inst} {dev_group}",
-            model=f"{self._ctrl.data['resource']['board-name']}",
-            manufacturer=f"{self._ctrl.data['resource']['platform']}",
+            default_model=f"{self._ctrl.data['resource']['board-name']}",
+            default_manufacturer=f"{self._ctrl.data['resource']['platform']}",
             sw_version=f"{self._ctrl.data['resource']['version']}",
             configuration_url=f"http://{self._ctrl.config_entry.data[CONF_HOST]}",
             via_device=(DOMAIN, f"{self._ctrl.data['routerboard']['serial-number']}"),
@@ -232,7 +232,7 @@ class MikrotikControllerBinarySensor(BinarySensorEntity):
             info = DeviceInfo(
                 connections={(dev_connection, f"{dev_connection_value}")},
                 default_name=f"{dev_group}",
-                manufacturer=f"{dev_manufacturer}",
+                deafult_manufacturer=f"{dev_manufacturer}",
                 via_device=(
                     DOMAIN,
                     f"{self._ctrl.data['routerboard']['serial-number']}",
diff --git a/custom_components/mikrotik_router/device_tracker.py b/custom_components/mikrotik_router/device_tracker.py
index bd60698..010a2f0 100644
--- a/custom_components/mikrotik_router/device_tracker.py
+++ b/custom_components/mikrotik_router/device_tracker.py
@@ -170,9 +170,9 @@ class MikrotikControllerDeviceTracker(ScannerEntity):
             "connections": {
                 (CONNECTION_NETWORK_MAC, self._data[self._sid_data["sid_ref"]])
             },
-            "manufacturer": self._ctrl.data["resource"]["platform"],
-            "model": self._ctrl.data["resource"]["board-name"],
-            "name": self._data[self._sid_data["sid_name"]],
+            "default_manufacturer": self._ctrl.data["resource"]["platform"],
+            "default_model": self._ctrl.data["resource"]["board-name"],
+            "default_name": self._data[self._sid_data["sid_name"]],
         }
         if self._sid_data["sid"] == "interface":
             info["name"] = f"{self._inst} {self._data[self._sid_data['sid_name']]}"
@@ -208,8 +208,8 @@ class MikrotikControllerDeviceTracker(ScannerEntity):
             connections={(dev_connection, f"{dev_connection_value}")},
             identifiers={(dev_connection, f"{dev_connection_value}")},
             default_name=f"{self._inst} {dev_group}",
-            model=f"{self._ctrl.data['resource']['board-name']}",
-            manufacturer=f"{self._ctrl.data['resource']['platform']}",
+            default_model=f"{self._ctrl.data['resource']['board-name']}",
+            default_manufacturer=f"{self._ctrl.data['resource']['platform']}",
             sw_version=f"{self._ctrl.data['resource']['version']}",
             configuration_url=f"http://{self._ctrl.config_entry.data[CONF_HOST]}",
             via_device=(DOMAIN, f"{self._ctrl.data['routerboard']['serial-number']}"),
@@ -227,7 +227,7 @@ class MikrotikControllerDeviceTracker(ScannerEntity):
             info = DeviceInfo(
                 connections={(dev_connection, f"{dev_connection_value}")},
                 default_name=f"{dev_group}",
-                manufacturer=f"{dev_manufacturer}",
+                default_manufacturer=f"{dev_manufacturer}",
                 via_device=(
                     DOMAIN,
                     f"{self._ctrl.data['routerboard']['serial-number']}",
diff --git a/custom_components/mikrotik_router/sensor.py b/custom_components/mikrotik_router/sensor.py
index ee4dfcd..ea6cb78 100644
--- a/custom_components/mikrotik_router/sensor.py
+++ b/custom_components/mikrotik_router/sensor.py
@@ -255,8 +255,8 @@ class MikrotikControllerSensor(SensorEntity):
             connections={(dev_connection, f"{dev_connection_value}")},
             identifiers={(dev_connection, f"{dev_connection_value}")},
             default_name=f"{self._inst} {dev_group}",
-            model=f"{self._ctrl.data['resource']['board-name']}",
-            manufacturer=f"{self._ctrl.data['resource']['platform']}",
+            default_model=f"{self._ctrl.data['resource']['board-name']}",
+            deafult_manufacturer=f"{self._ctrl.data['resource']['platform']}",
             sw_version=f"{self._ctrl.data['resource']['version']}",
             configuration_url=f"http://{self._ctrl.config_entry.data[CONF_HOST]}",
             via_device=(DOMAIN, f"{self._ctrl.data['routerboard']['serial-number']}"),
@@ -274,7 +274,7 @@ class MikrotikControllerSensor(SensorEntity):
             info = DeviceInfo(
                 connections={(dev_connection, f"{dev_connection_value}")},
                 default_name=f"{dev_group}",
-                manufacturer=f"{dev_manufacturer}",
+                default_manufacturer=f"{dev_manufacturer}",
                 via_device=(
                     DOMAIN,
                     f"{self._ctrl.data['routerboard']['serial-number']}",
diff --git a/custom_components/mikrotik_router/switch.py b/custom_components/mikrotik_router/switch.py
index d535829..ad8b38f 100644
--- a/custom_components/mikrotik_router/switch.py
+++ b/custom_components/mikrotik_router/switch.py
@@ -212,8 +212,8 @@ class MikrotikControllerSwitch(SwitchEntity, RestoreEntity):
             connections={(dev_connection, f"{dev_connection_value}")},
             identifiers={(dev_connection, f"{dev_connection_value}")},
             default_name=f"{self._inst} {dev_group}",
-            model=f"{self._ctrl.data['resource']['board-name']}",
-            manufacturer=f"{self._ctrl.data['resource']['platform']}",
+            default_model=f"{self._ctrl.data['resource']['board-name']}",
+            default_manufacturer=f"{self._ctrl.data['resource']['platform']}",
             sw_version=f"{self._ctrl.data['resource']['version']}",
             configuration_url=f"http://{self._ctrl.config_entry.data[CONF_HOST]}",
             via_device=(DOMAIN, f"{self._ctrl.data['routerboard']['serial-number']}"),