diff --git a/custom_components/mikrotik_router/device_tracker.py b/custom_components/mikrotik_router/device_tracker.py
index 169a0ef..90345cb 100644
--- a/custom_components/mikrotik_router/device_tracker.py
+++ b/custom_components/mikrotik_router/device_tracker.py
@@ -126,7 +126,7 @@ class MikrotikControllerPortDeviceTracker(ScannerEntity):
     @property
     def name(self) -> str:
         """Return the name of the port."""
-        return self.mikrotik_controller.data['interface'][self._uid]['default-name']
+        return f"{self._name} {self.mikrotik_controller.data['interface'][self._uid]['default-name']}"
     
     @property
     def unique_id(self) -> str:
@@ -157,7 +157,7 @@ class MikrotikControllerPortDeviceTracker(ScannerEntity):
         info = {
             "connections": {(CONNECTION_NETWORK_MAC, self.mikrotik_controller.data['interface'][self._uid]['port-mac-address'])},
             "manufacturer": self.mikrotik_controller.data['resource']['platform'],
-            "model": "Port",
+            "model": self.mikrotik_controller.data['resource']['board-name'],
             "name": self.mikrotik_controller.data['interface'][self._uid]['default-name'],
         }
         return info
diff --git a/custom_components/mikrotik_router/sensor.py b/custom_components/mikrotik_router/sensor.py
index b1d6221..38f6df7 100644
--- a/custom_components/mikrotik_router/sensor.py
+++ b/custom_components/mikrotik_router/sensor.py
@@ -108,7 +108,6 @@ class MikrotikControllerSensor(Entity):
     def __init__(self, mikrotik_controller, name, kind, uid=''):
         """Initialize."""
         self.mikrotik_controller = mikrotik_controller
-        self.data = mikrotik_controller.data
         self._name = name
         self.kind = kind
         self.uid = uid
@@ -172,9 +171,9 @@ class MikrotikControllerSensor(Entity):
     def device_info(self):
         """Return a port description for device registry."""
         info = {
-            "identifiers": {(DOMAIN, "serial-number", self.data['routerboard']['serial-number'])},
+            "identifiers": {(DOMAIN, "serial-number", self.mikrotik_controller.data['routerboard']['serial-number'], "switch", "PORT")},
             "manufacturer": self.mikrotik_controller.data['resource']['platform'],
-            "model": SENSOR_TYPES[self.kind]['group'],
+            "model": self.mikrotik_controller.data['resource']['board-name'],
             "name": SENSOR_TYPES[self.kind]['group'],
         }
         return info