diff --git a/custom_components/georide/binary_sensor.py b/custom_components/georide/binary_sensor.py
index c7ac729..6a19f9d 100644
--- a/custom_components/georide/binary_sensor.py
+++ b/custom_components/georide/binary_sensor.py
@@ -151,7 +151,7 @@ class GeoRideActiveSubscriptionBinarySensorEntity(GeoRideBinarySensorEntity):
                  tracker_device: Device):
         """Set up Georide entity."""
         super().__init__(coordinator, tracker_device)
-        self.entity_id = f"{ENTITY_ID_FORMAT.format('is_active_subscription_')}_{tracker_device.tracker.tracker_id}"# pylint: disable=C0301
+        self.entity_id = f"{ENTITY_ID_FORMAT.format('is_active_subscription')}_{tracker_device.tracker.tracker_id}"# pylint: disable=C0301
 
     @property
     def entity_category(self):
diff --git a/custom_components/georide/device.py b/custom_components/georide/device.py
index 08c71f4..ab512c7 100644
--- a/custom_components/georide/device.py
+++ b/custom_components/georide/device.py
@@ -52,7 +52,7 @@ class Device:
         elif self._tracker.version == 3:
             if self._tracker.model == 'georide-3':
                 name = "GeoRide 3"
-            else if self._tracker.model == 'georide-3s':
+            elif self._tracker.model == 'georide-3s':
                 name = "GeoRide 3S"
             else:
                 name = "GeoRide Mini"
diff --git a/custom_components/georide/manifest.json b/custom_components/georide/manifest.json
index 55ee38e..c44617c 100644
--- a/custom_components/georide/manifest.json
+++ b/custom_components/georide/manifest.json
@@ -11,5 +11,5 @@
   ],
   "dependencies": [],
   "codeowners": ["ptimatth"],
-  "version": "1.1.1"
+  "version": "1.1.2"
 }
\ No newline at end of file