diff --git a/custom_components/georide/binary_sensor.py b/custom_components/georide/binary_sensor.py
index 346717c..8bef3dd 100644
--- a/custom_components/georide/binary_sensor.py
+++ b/custom_components/georide/binary_sensor.py
@@ -279,7 +279,7 @@ class GeoRideBeaconUpdatedBinarySensorEntity(GeoRideBeaconBinarySensorEntity):
     def __init__(self, coordinator: DataUpdateCoordinator[Mapping[str, Any]],
                  tracker_beacon_device: DeviceBeacon):
         """Set up Georide entity."""
-        super().__init__(coordinator, tracker_device)
+        super().__init__(coordinator, tracker_beacon_device)
         self.entity_id = f"{ENTITY_ID_FORMAT.format('update')}.{tracker_beacon_device.tracker_beacon.beacon_id}"# pylint: disable=C0301
 
     @property
diff --git a/custom_components/georide/sensor.py b/custom_components/georide/sensor.py
index c787639..4653637 100644
--- a/custom_components/georide/sensor.py
+++ b/custom_components/georide/sensor.py
@@ -40,7 +40,7 @@ async def async_setup_entry(hass, config_entry, async_add_entities): # pylint: d
     for coordoned_beacon in coordoned_beacons:
         tracker_beacon = coordoned_beacon['tracker_beacon']
         coordinator = coordoned_beacon['coordinator']
-        entities.append(GeoRideBeaconUpdatedBinarySensorEntity(coordinator, tracker_beacon))
+        entities.append(GeoRideBeaconBatterySensorEntity(coordinator, tracker_beacon))
         hass.data[GEORIDE_DOMAIN]["devices"][tracker_device.beacon.beacon_id] = coordinator
 
     async_add_entities(entities)