@switchbot/homebridge-switchbot 3.5.0-beta.59 → 3.5.0-beta.60

package/src/device/hub.ts

@@ -53,7 +53,7 @@ export class Hub extends deviceBase {
       accessory.removeService(this.TemperatureSensor!.Service);
     } else {
       this.TemperatureSensor = {
-        Name: accessory.context.TemperatureSensor.Name ?? `${accessory.displayName} Temperature Sensor`,
+        Name: accessory.context.TemperatureSensorName ?? `${accessory.displayName} Temperature Sensor`,
         Service: accessory.getService(this.hap.Service.TemperatureSensor) ?? this.accessory.addService(this.hap.Service.TemperatureSensor) as Service,
         CurrentTemperature: accessory.context.CurrentTemperature ?? 0,
       };
@@ -72,7 +72,7 @@ export class Hub extends deviceBase {
         .onGet(() => {
           return this.TemperatureSensor!.CurrentTemperature;
         });
-      accessory.context.TemperatureSensor.Name = this.TemperatureSensor.Name;
+      accessory.context.TemperatureSensorName = this.TemperatureSensor.Name;
     }
 
     // Initialize Humidity Sensor Service
@@ -82,7 +82,7 @@ export class Hub extends deviceBase {
       accessory.removeService(this.HumiditySensor!.Service);
     } else {
       this.HumiditySensor = {
-        Name: accessory.context.HumiditySensor.Name ?? `${accessory.displayName} Humidity Sensor`,
+        Name: accessory.context.HumiditySensorName ?? `${accessory.displayName} Humidity Sensor`,
         Service: accessory.getService(this.hap.Service.HumiditySensor) ?? this.accessory.addService(this.hap.Service.HumiditySensor) as Service,
         CurrentRelativeHumidity: accessory.context.CurrentRelativeHumidity ?? 0,
       };
@@ -97,7 +97,7 @@ export class Hub extends deviceBase {
         .onGet(() => {
           return this.HumiditySensor!.CurrentRelativeHumidity;
         });
-      accessory.context.HumiditySensor.Name = this.HumiditySensor.Name;
+      accessory.context.HumiditySensorName = this.HumiditySensor.Name;
     }
 
     // Initialize Light Sensor Service
@@ -107,7 +107,7 @@ export class Hub extends deviceBase {
       accessory.removeService(this.LightSensor!.Service);
     } else {
       this.LightSensor = {
-        Name: accessory.context.LightSensor.Name ?? `${accessory.displayName} Light Sensor`,
+        Name: accessory.context.LightSensorName ?? `${accessory.displayName} Light Sensor`,
         Service: accessory.getService(this.hap.Service.LightSensor) ?? this.accessory.addService(this.hap.Service.LightSensor) as Service,
         CurrentAmbientLightLevel: accessory.context.CurrentAmbientLightLevel ?? 0.0001,
       };
@@ -122,7 +122,7 @@ export class Hub extends deviceBase {
         .onGet(() => {
           return this.LightSensor!.CurrentAmbientLightLevel;
         });
-      accessory.context.LightSensor.Name = this.LightSensor.Name;
+      accessory.context.LightSensorName = this.LightSensor.Name;
     }
 
     // Retrieve initial values and updateHomekit

package/src/device/humidifier.ts

@@ -49,7 +49,7 @@ export class Humidifier extends deviceBase {
 
     // Initialize the HumidifierDehumidifier Service
     this.HumidifierDehumidifier = {
-      Name: accessory.context.HumidifierDehumidifier.Name ?? accessory.displayName,
+      Name: accessory.context.HumidifierDehumidifierName ?? accessory.displayName,
       Service: accessory.getService(this.hap.Service.HumidifierDehumidifier)
         ?? accessory.addService(this.hap.Service.HumidifierDehumidifier) as Service,
       Active: accessory.context.Active ?? this.hap.Characteristic.Active.ACTIVE,
@@ -98,7 +98,7 @@ export class Humidifier extends deviceBase {
         return this.HumidifierDehumidifier.RelativeHumidityHumidifierThreshold;
       })
       .onSet(this.RelativeHumidityHumidifierThresholdSet.bind(this));
-    accessory.context.HumidifierDehumidifier.Name = this.HumidifierDehumidifier.Name;
+    accessory.context.HumidifierDehumidifierName = this.HumidifierDehumidifier.Name;
 
     // Initialize the Temperature Sensor Service
     if (device.humidifier?.hide_temperature) {
@@ -107,7 +107,7 @@ export class Humidifier extends deviceBase {
       accessory.removeService(this.TemperatureSensor!.Service);
     } else {
       this.TemperatureSensor = {
-        Name: accessory.context.TemperatureSensor.Name ?? `${accessory.displayName} Temperature Sensor`,
+        Name: accessory.context.TemperatureSensorName ?? `${accessory.displayName} Temperature Sensor`,
         Service: accessory.getService(this.hap.Service.TemperatureSensor) ?? this.accessory.addService(this.hap.Service.TemperatureSensor) as Service,
         CurrentTemperature: accessory.context.CurrentTemperature || 30,
       };
@@ -125,7 +125,7 @@ export class Humidifier extends deviceBase {
         .onGet(() => {
           return this.TemperatureSensor!.CurrentTemperature;
         });
-      accessory.context.TemperatureSensor.Name = this.TemperatureSensor.Name;
+      accessory.context.TemperatureSensorName = this.TemperatureSensor.Name;
     }
 
     // Retrieve initial values and updateHomekit

package/src/device/iosensor.ts

@@ -54,7 +54,7 @@ export class IOSensor extends deviceBase {
 
     // Initialize Battery property
     this.Battery = {
-      Name: accessory.context.Battery.Name ?? `${accessory.displayName} Battery`,
+      Name: accessory.context.BatteryName ?? `${accessory.displayName} Battery`,
       Service: accessory.getService(this.hap.Service.Battery) ?? accessory.addService(this.hap.Service.Battery) as Service,
       BatteryLevel: accessory.context.BatteryLevel ?? 100,
       StatusLowBattery: accessory.context.StatusLowBattery ?? this.hap.Characteristic.StatusLowBattery.BATTERY_LEVEL_NORMAL,
@@ -74,7 +74,7 @@ export class IOSensor extends deviceBase {
       .onGet(() => {
         return this.Battery.StatusLowBattery;
       });
-    accessory.context.Battery.Name = this.Battery.Name;
+    accessory.context.BatteryName = this.Battery.Name;
 
     // InitializeTemperature Sensor Service
     if (device.iosensor?.hide_temperature) {
@@ -83,7 +83,7 @@ export class IOSensor extends deviceBase {
       accessory.removeService(this.TemperatureSensor!.Service);
     } else {
       this.TemperatureSensor = {
-        Name: accessory.context.TemperatureSensor.Name ?? `${accessory.displayName} Temperature Sensor`,
+        Name: accessory.context.TemperatureSensorName ?? `${accessory.displayName} Temperature Sensor`,
         Service: accessory.getService(this.hap.Service.TemperatureSensor) ?? this.accessory.addService(this.hap.Service.TemperatureSensor) as Service,
         CurrentTemperature: accessory.context.CurrentTemperature ?? 30,
       };
@@ -102,7 +102,7 @@ export class IOSensor extends deviceBase {
         .onGet(() => {
           return this.TemperatureSensor!.CurrentTemperature;
         });
-      accessory.context.TemperatureSensor.Name = this.TemperatureSensor.Name;
+      accessory.context.TemperatureSensorName = this.TemperatureSensor.Name;
     }
 
     // Initialize Humidity Sensor Service
@@ -112,7 +112,7 @@ export class IOSensor extends deviceBase {
       accessory.removeService(this.HumiditySensor!.Service);
     } else {
       this.HumiditySensor = {
-        Name: accessory.context.HumiditySensor.Name ?? `${accessory.displayName} Humidity Sensor`,
+        Name: accessory.context.HumiditySensorName ?? `${accessory.displayName} Humidity Sensor`,
         Service: accessory.getService(this.hap.Service.HumiditySensor) ?? this.accessory.addService(this.hap.Service.HumiditySensor) as Service,
         CurrentRelativeHumidity: accessory.context.CurrentRelativeHumidity ?? 50,
       };
@@ -127,7 +127,7 @@ export class IOSensor extends deviceBase {
         .onGet(() => {
           return this.HumiditySensor!.CurrentRelativeHumidity;
         });
-      accessory.context.HumiditySensor.Name = this.HumiditySensor.Name;
+      accessory.context.HumiditySensorName = this.HumiditySensor.Name;
     }
 
     // Retrieve initial values and updateHomekit

package/src/device/lightstrip.ts

@@ -47,7 +47,7 @@ export class StripLight extends deviceBase {
 
     // Initialize the LightBulb Service
     this.LightBulb = {
-      Name: accessory.context.LightBulb.Name ?? accessory.displayName,
+      Name: accessory.context.LightBulbName ?? accessory.displayName,
       Service: accessory.getService(this.hap.Service.Lightbulb) ?? accessory.addService(this.hap.Service.Lightbulb) as Service,
       On: accessory.context.On ?? false,
       Hue: accessory.context.Hue ?? 0,
@@ -137,7 +137,7 @@ export class StripLight extends deviceBase {
         return this.LightBulb.Saturation;
       })
       .onSet(this.SaturationSet.bind(this));
-    accessory.context.LightBulb.Name = this.LightBulb.Name;
+    accessory.context.LightBulbName = this.LightBulb.Name;
 
     // Retrieve initial values and updateHomekit
     this.refreshStatus();

package/src/device/lock.ts

@@ -52,7 +52,7 @@ export class Lock extends deviceBase {
 
     // Initialize LockMechanism Service
     this.LockMechanism = {
-      Name: accessory.context.LockMechanism.Name ?? accessory.displayName,
+      Name: accessory.context.LockMechanismName ?? accessory.displayName,
       Service: accessory.getService(this.hap.Service.LockMechanism) ?? accessory.addService(this.hap.Service.LockMechanism) as Service,
       LockTargetState: accessory.context.LockTargetState ?? this.hap.Characteristic.LockTargetState.SECURED,
       LockCurrentState: accessory.context.LockCurrentState ?? this.hap.Characteristic.LockCurrentState.SECURED,
@@ -66,11 +66,11 @@ export class Lock extends deviceBase {
         return this.LockMechanism.LockTargetState;
       })
       .onSet(this.LockTargetStateSet.bind(this));
-    accessory.context.LockMechanism.Name = this.LockMechanism.Name;
+    accessory.context.LockMechanismName = this.LockMechanism.Name;
 
     // Initialize Battery property
     this.Battery = {
-      Name: accessory.context.Battery.Name ?? `${accessory.displayName} Battery`,
+      Name: accessory.context.BatteryName ?? `${accessory.displayName} Battery`,
       Service: accessory.getService(this.hap.Service.Battery) ?? accessory.addService(this.hap.Service.Battery) as Service,
       BatteryLevel: accessory.context.BatteryLevel ?? 100,
       StatusLowBattery: accessory.context.StatusLowBattery ?? this.hap.Characteristic.StatusLowBattery.BATTERY_LEVEL_NORMAL,
@@ -90,7 +90,7 @@ export class Lock extends deviceBase {
       .onGet(() => {
         return this.Battery.StatusLowBattery;
       });
-    accessory.context.Battery.Name = this.Battery.Name;
+    accessory.context.BatteryName = this.Battery.Name;
 
     // Contact Sensor Service
     if (device.lock?.hide_contactsensor) {
@@ -99,7 +99,7 @@ export class Lock extends deviceBase {
       accessory.removeService(this.ContactSensor!.Service);
     } else {
       this.ContactSensor = {
-        Name: accessory.context.ContactSensor.Name ?? `${accessory.displayName} Contact Sensor`,
+        Name: accessory.context.ContactSensorName ?? `${accessory.displayName} Contact Sensor`,
         Service: accessory.getService(this.hap.Service.ContactSensor) ?? this.accessory.addService(this.hap.Service.ContactSensor) as Service,
         ContactSensorState: accessory.context.ContactSensorState ?? this.hap.Characteristic.ContactSensorState.CONTACT_DETECTED,
       };
@@ -112,7 +112,7 @@ export class Lock extends deviceBase {
         .onGet(() => {
           return this.ContactSensor!.ContactSensorState;
         });
-      accessory.context.ContactSensor.Name = this.ContactSensor.Name;
+      accessory.context.ContactSensorName = this.ContactSensor.Name;
     }
 
     // Initialize Latch Button Service
@@ -122,7 +122,7 @@ export class Lock extends deviceBase {
       accessory.removeService(this.Switch!.Service);
     } else {
       this.Switch = {
-        Name: accessory.context.Switch.Name ?? `${accessory.displayName} Latch`,
+        Name: accessory.context.SwitchName ?? `${accessory.displayName} Latch`,
         Service: accessory.getService(this.hap.Service.Switch) ?? accessory.addService(this.hap.Service.Switch) as Service,
         On: accessory.context.On ?? false,
       };
@@ -135,7 +135,7 @@ export class Lock extends deviceBase {
           return this.Switch!.On;
         })
         .onSet(this.OnSet.bind(this));
-      accessory.context.Switch.Name = this.Switch.Name;
+      accessory.context.SwitchName = this.Switch.Name;
     }
 
     // Retrieve initial values and updateHomekit

package/src/device/meter.ts

@@ -49,7 +49,7 @@ export class Meter extends deviceBase {
 
     // Initialize Battery Service
     this.Battery = {
-      Name: accessory.context.Battery.Name ?? `${accessory.displayName} Battery`,
+      Name: accessory.context.BatteryName ?? `${accessory.displayName} Battery`,
       Service: accessory.getService(this.hap.Service.Battery) ?? accessory.addService(this.hap.Service.Battery) as Service,
       BatteryLevel: accessory.context.BatteryLevel ?? 100,
       StatusLowBattery: accessory.context.StatusLowBattery ?? this.hap.Characteristic.StatusLowBattery.BATTERY_LEVEL_NORMAL,
@@ -69,7 +69,7 @@ export class Meter extends deviceBase {
       .onGet(() => {
         return this.Battery.StatusLowBattery;
       });
-    accessory.context.Battery.Name = this.Battery.Name;
+    accessory.context.BatteryName = this.Battery.Name;
 
     // Initialize Temperature Sensor Service
     if (device.meter?.hide_temperature) {
@@ -78,7 +78,7 @@ export class Meter extends deviceBase {
       accessory.removeService(this.TemperatureSensor!.Service);
     } else {
       this.TemperatureSensor = {
-        Name: accessory.context.TemperatureSensor.Name ?? `${accessory.displayName} Temperature Sensor`,
+        Name: accessory.context.TemperatureSensorName ?? `${accessory.displayName} Temperature Sensor`,
         Service: accessory.getService(this.hap.Service.TemperatureSensor) ?? this.accessory.addService(this.hap.Service.TemperatureSensor) as Service,
         CurrentTemperature: accessory.context.CurrentTemperature ?? 30,
       };
@@ -97,7 +97,7 @@ export class Meter extends deviceBase {
         .onGet(() => {
           return this.TemperatureSensor!.CurrentTemperature!;
         });
-      accessory.context.TemperatureSensor.Name = this.TemperatureSensor.Name;
+      accessory.context.TemperatureSensorName = this.TemperatureSensor.Name;
     }
     // Initialize Humidity Sensor Service
     if (device.meter?.hide_humidity) {
@@ -106,7 +106,7 @@ export class Meter extends deviceBase {
       accessory.removeService(this.HumiditySensor!.Service);
     } else {
       this.HumiditySensor = {
-        Name: accessory.context.HumiditySensor.Name ?? `${accessory.displayName} Humidity Sensor`,
+        Name: accessory.context.HumiditySensorName ?? `${accessory.displayName} Humidity Sensor`,
         Service: accessory.getService(this.hap.Service.HumiditySensor) ?? this.accessory.addService(this.hap.Service.HumiditySensor) as Service,
         CurrentRelativeHumidity: accessory.context.CurrentRelativeHumidity ?? 50,
       };
@@ -121,7 +121,7 @@ export class Meter extends deviceBase {
         .onGet(() => {
           return this.HumiditySensor!.CurrentRelativeHumidity!;
         });
-      accessory.context.HumiditySensor.Name = this.HumiditySensor.Name;
+      accessory.context.HumiditySensorName = this.HumiditySensor.Name;
     }
 
     // Retrieve initial values and updateHomekit

package/src/device/meterplus.ts

@@ -53,7 +53,7 @@ export class MeterPlus extends deviceBase {
 
     // Initialize Battery Service
     this.Battery = {
-      Name: accessory.context.Battery.Name ?? `${accessory.displayName} Battery`,
+      Name: accessory.context.BatteryName ?? `${accessory.displayName} Battery`,
       Service: accessory.getService(this.hap.Service.Battery) ?? accessory.addService(this.hap.Service.Battery) as Service,
       BatteryLevel: accessory.context.BatteryLevel ?? 100,
       StatusLowBattery: accessory.context.StatusLowBattery ?? this.hap.Characteristic.StatusLowBattery.BATTERY_LEVEL_NORMAL,
@@ -73,7 +73,7 @@ export class MeterPlus extends deviceBase {
       .onGet(() => {
         return this.Battery.StatusLowBattery;
       });
-    accessory.context.Battery.Name = this.Battery.Name;
+    accessory.context.BatteryName = this.Battery.Name;
 
     // Initialize Temperature Sensor Service
     if (device.meter?.hide_temperature) {
@@ -82,7 +82,7 @@ export class MeterPlus extends deviceBase {
       accessory.removeService(this.TemperatureSensor!.Service);
     } else {
       this.TemperatureSensor = {
-        Name: accessory.context.TemperatureSensor.Name ?? `${accessory.displayName} Temperature Sensor`,
+        Name: accessory.context.TemperatureSensorName ?? `${accessory.displayName} Temperature Sensor`,
         Service: accessory.getService(this.hap.Service.TemperatureSensor) ?? this.accessory.addService(this.hap.Service.TemperatureSensor) as Service,
         CurrentTemperature: accessory.context.CurrentTemperature ?? 30,
       };
@@ -101,7 +101,7 @@ export class MeterPlus extends deviceBase {
         .onGet(() => {
           return this.TemperatureSensor!.CurrentTemperature!;
         });
-      accessory.context.TemperatureSensor.Name = this.TemperatureSensor.Name;
+      accessory.context.TemperatureSensorName = this.TemperatureSensor.Name;
     }
     // Initialize Humidity Sensor Service
     if (device.meter?.hide_humidity) {
@@ -110,7 +110,7 @@ export class MeterPlus extends deviceBase {
       accessory.removeService(this.HumiditySensor!.Service);
     } else {
       this.HumiditySensor = {
-        Name: accessory.context.HumiditySensor.Name ?? `${accessory.displayName} Humidity Sensor`,
+        Name: accessory.context.HumiditySensorName ?? `${accessory.displayName} Humidity Sensor`,
         Service: accessory.getService(this.hap.Service.HumiditySensor) ?? this.accessory.addService(this.hap.Service.HumiditySensor) as Service,
         CurrentRelativeHumidity: accessory.context.CurrentRelativeHumidity ?? 50,
       };
@@ -125,7 +125,7 @@ export class MeterPlus extends deviceBase {
         .onGet(() => {
           return this.HumiditySensor!.CurrentRelativeHumidity!;
         });
-      accessory.context.HumiditySensor.Name = this.HumiditySensor.Name;
+      accessory.context.HumiditySensorName = this.HumiditySensor.Name;
     }
 
     // Retrieve initial values and updateHomekit

package/src/device/motion.ts

@@ -53,7 +53,7 @@ export class Motion extends deviceBase {
 
     // Initialize Motion Sensor property
     this.MotionSensor = {
-      Name: accessory.context.MotionSensor.Name ?? `${accessory.displayName} Motion Sensor`,
+      Name: accessory.context.MotionSensorName ?? `${accessory.displayName} Motion Sensor`,
       Service: accessory.getService(this.hap.Service.MotionSensor) ?? accessory.addService(this.hap.Service.MotionSensor) as Service,
       MotionDetected: accessory.context.MotionDetected ?? false,
     };
@@ -66,11 +66,11 @@ export class Motion extends deviceBase {
       .onGet(() => {
         return this.MotionSensor.MotionDetected;
       });
-    accessory.context.MotionSensor.Name = this.MotionSensor.Name;
+    accessory.context.MotionSensorName = this.MotionSensor.Name;
 
     // Initialize Battery Service
     this.Battery = {
-      Name: accessory.context.Battery.Name ?? `${accessory.displayName} Battery`,
+      Name: accessory.context.BatteryName ?? `${accessory.displayName} Battery`,
       Service: accessory.getService(this.hap.Service.Battery) ?? accessory.addService(this.hap.Service.Battery) as Service,
       BatteryLevel: accessory.context.BatteryLevel ?? 100,
       StatusLowBattery: accessory.context.StatusLowBattery ?? this.hap.Characteristic.StatusLowBattery.BATTERY_LEVEL_NORMAL,
@@ -91,7 +91,7 @@ export class Motion extends deviceBase {
       .onGet(() => {
         return this.Battery.StatusLowBattery;
       });
-    accessory.context.Battery.Name = this.Battery.Name;
+    accessory.context.BatteryName = this.Battery.Name;
 
     // Initialize Light Sensor Service
     if (device.motion?.hide_lightsensor) {
@@ -100,7 +100,7 @@ export class Motion extends deviceBase {
       accessory.removeService(this.LightSensor!.Service);
     } else {
       this.LightSensor = {
-        Name: accessory.context.LightSensor.Name ?? `${accessory.displayName} Light Sensor`,
+        Name: accessory.context.LightSensorName ?? `${accessory.displayName} Light Sensor`,
         Service: accessory.getService(this.hap.Service.LightSensor) ?? this.accessory.addService(this.hap.Service.LightSensor) as Service,
         CurrentAmbientLightLevel: accessory.context.CurrentAmbientLightLevel ?? 0,
       };
@@ -113,7 +113,7 @@ export class Motion extends deviceBase {
         .onGet(() => {
           return this.LightSensor!.CurrentAmbientLightLevel;
         });
-      accessory.context.LightSensor.Name = this.LightSensor.Name;
+      accessory.context.LightSensorName = this.LightSensor.Name;
     };
 
 

package/src/device/plug.ts

@@ -34,7 +34,7 @@ export class Plug extends deviceBase {
 
     // Initialize Outlet Service
     this.Outlet = {
-      Name: accessory.context.Outlet.Name ?? accessory.displayName,
+      Name: accessory.context.OutletName ?? accessory.displayName,
       Service: accessory.getService(this.hap.Service.Outlet) ?? accessory.addService(this.hap.Service.Outlet) as Service,
       On: accessory.context.On || false,
     };
@@ -47,7 +47,7 @@ export class Plug extends deviceBase {
         return this.Outlet.On;
       })
       .onSet(this.OnSet.bind(this));
-    accessory.context.Outlet.Name = this.Outlet.Name;
+    accessory.context.OutletName = this.Outlet.Name;
 
     // Retrieve initial values and updateHomekit
     this.refreshStatus();

package/src/device/robotvacuumcleaner.ts

@@ -45,7 +45,7 @@ export class RobotVacuumCleaner extends deviceBase {
 
     // Initialize Lightbulb Service
     this.LightBulb = {
-      Name: accessory.context.LightBulb.Name ?? accessory.displayName,
+      Name: accessory.context.LightBulbName ?? accessory.displayName,
       Service: accessory.getService(this.hap.Service.Lightbulb) ?? accessory.addService(this.hap.Service.Lightbulb) as Service,
       On: accessory.context.On ?? false,
       Brightness: accessory.context.Brightness ?? 0,
@@ -74,11 +74,11 @@ export class RobotVacuumCleaner extends deviceBase {
         return this.LightBulb.Brightness;
       })
       .onSet(this.BrightnessSet.bind(this));
-    accessory.context.LightBulb.Name = this.LightBulb.Name;
+    accessory.context.LightBulbName = this.LightBulb.Name;
 
     // Initialize Battery Service
     this.Battery = {
-      Name: accessory.context.Battery.Name ?? `${accessory.displayName} Battery`,
+      Name: accessory.context.BatteryName ?? `${accessory.displayName} Battery`,
       Service: accessory.getService(this.hap.Service.Battery) ?? accessory.addService(this.hap.Service.Battery) as Service,
       BatteryLevel: accessory.context.BatteryLevel ?? 100,
       StatusLowBattery: accessory.context.StatusLowBattery ?? this.hap.Characteristic.StatusLowBattery.BATTERY_LEVEL_NORMAL,
@@ -104,7 +104,7 @@ export class RobotVacuumCleaner extends deviceBase {
       .onGet(() => {
         return this.Battery.ChargingState;
       });
-    accessory.context.Battery.Name = this.Battery.Name;
+    accessory.context.BatteryName = this.Battery.Name;
 
     // Retrieve initial values and updateHomekit
     this.refreshStatus();

package/src/device/waterdetector.ts

@@ -52,7 +52,7 @@ export class WaterDetector extends deviceBase {
 
     // Initialize Battery Service
     this.Battery = {
-      Name: accessory.context.Battery.Name ?? `${accessory.displayName} Battery`,
+      Name: accessory.context.BatteryName ?? `${accessory.displayName} Battery`,
       Service: accessory.getService(this.hap.Service.Battery) ?? accessory.addService(this.hap.Service.Battery) as Service,
       BatteryLevel: accessory.context.BatteryLevel ?? 100,
       StatusLowBattery: accessory.context.StatusLowBattery ?? this.hap.Characteristic.StatusLowBattery.BATTERY_LEVEL_NORMAL,
@@ -73,7 +73,7 @@ export class WaterDetector extends deviceBase {
       .onGet(() => {
         return this.Battery.StatusLowBattery;
       });
-    accessory.context.Battery.Name = this.Battery.Name;
+    accessory.context.BatteryName = this.Battery.Name;
 
     // Initialize Leak Sensor Service
     if (device.waterdetector?.hide_leak) {
@@ -82,7 +82,7 @@ export class WaterDetector extends deviceBase {
       accessory.removeService(this.LeakSensor!.Service);
     } else {
       this.LeakSensor = {
-        Name: accessory.context.LeakSensor.Name ?? `${accessory.displayName} Leak Sensor`,
+        Name: accessory.context.LeakSensorName ?? `${accessory.displayName} Leak Sensor`,
         Service: accessory.getService(this.hap.Service.LeakSensor) ?? this.accessory.addService(this.hap.Service.LeakSensor) as Service,
         StatusActive: accessory.context.StatusActive ?? false,
         LeakDetected: accessory.context.LeakDetected ?? this.hap.Characteristic.LeakDetected.LEAK_NOT_DETECTED,
@@ -96,7 +96,7 @@ export class WaterDetector extends deviceBase {
         .onGet(() => {
           return this.LeakSensor!.LeakDetected;
         });
-      accessory.context.LeakSensor.Name = this.LeakSensor.Name;
+      accessory.context.LeakSensorName = this.LeakSensor.Name;
     }
 
     // Retrieve initial values and updateHomekit