diff --git a/config/sensors/batteries.yaml b/config/sensors/batteries.yaml
index cdd859f..82ea6b2 100755
--- a/config/sensors/batteries.yaml
+++ b/config/sensors/batteries.yaml
@@ -1,62 +1,66 @@
 - platform: mqtt
-  name: "Front Door Battery"
-  state_topic: "zwave2mqtt/front_door/128/1/0"
+  name: "Battery Front Door Sensor"
+  state_topic: "zwave2mqtt/front_door_sensor/128/1/0"
   unit_of_measurement: "%"
   device_class: battery
   value_template: "{{ value }}"
-  json_attributes_topic: "zwave2mqtt/front_door/128/1/0"
+  json_attributes_topic: "zwave2mqtt/front_door_sensor/128/1/0"
 - platform: mqtt
-  name: "Laundry Door Battery"
-  state_topic: "zwave2mqtt/laundry_room/128/1/0"
+  name: "Battery Laundry Door Sensor"
+  state_topic: "zwave2mqtt/laundry_door_sensor/128/1/0"
   unit_of_measurement: "%"
   device_class: battery
   value_template: "{{ value }}"
-  json_attributes_topic: "zwave2mqtt/laundry_room/128/1/0"
+  json_attributes_topic: "zwave2mqtt/laundry_door_sensor/128/1/0"
 - platform: mqtt
-  name: "Kitchen Smoke Battery"
-  state_topic: "zwave2mqtt/nodeID_19/128/1/0"
+  name: "Battery Kitchen Smoke Detector"
+  state_topic: "zwave2mqtt/kitchen_detector/128/1/0"
   unit_of_measurement: "%"
   device_class: battery
   value_template: "{{ value }}"
-  json_attributes_topic: "zwave2mqtt/nodeID_19/128/1/0"
+  json_attributes_topic: "zwave2mqtt/kitchen_detector/128/1/0"
 - platform: mqtt
-  name: "Attic Door Battery"
+  name: "Battery Garage Smoke Detector"
+  state_topic: "zwave2mqtt/garage_detector/128/1/0"
+  unit_of_measurement: "%"
+  device_class: battery
+  value_template: "{{ value }}"
+  json_attributes_topic: "zwave2mqtt/garage_detector/128/1/0"
+- platform: mqtt
+  name: "Battery Attic Door Sensor"
   state_topic: "zwave2mqtt/attic_door/128/1/0"
   unit_of_measurement: "%"
   device_class: battery
   value_template: "{{ value }}"
   json_attributes_topic: "zwave2mqtt/attic_door/128/1/0"
 - platform: mqtt
-  name: "Washer Door Battery"
-  state_topic: "zwave2mqtt/washer_door/128/1/0"
+  name: "Battery Washer Door Sensor"
+  state_topic: "zwave2mqtt/washer_door_sensor/128/1/0"
   unit_of_measurement: "%"
   device_class: battery
   value_template: "{{ value }}"
-  json_attributes_topic: "zwave2mqtt/washer_door/128/1/0"
+  json_attributes_topic: "zwave2mqtt/washer_door_sensor/128/1/0"
 - platform: mqtt
-  name: "Back Door Battery"
-  state_topic: "zwave2mqtt/back_door/128/1/0"
+  name: "Battery Back Door Sensor"
+  state_topic: "zwave2mqtt/back_door_sensor/128/1/0"
   unit_of_measurement: "%"
   device_class: battery
   value_template: "{{ value }}"
-  json_attributes_topic: "zwave2mqtt/back_door/128/1/0"
+  json_attributes_topic: "zwave2mqtt/back_door_sensor/128/1/0"
 - platform: mqtt
-  name: "Side Door Battery"
-  state_topic: "zwave2mqtt/side_door/128/1/0"
+  name: "Battery Side Door Sensor"
+  state_topic: "zwave2mqtt/side_door_sensor/128/1/0"
   unit_of_measurement: "%"
   device_class: battery
   value_template: "{{ value }}"
-  json_attributes_topic: "zwave2mqtt/side_door/128/1/0"
+  json_attributes_topic: "zwave2mqtt/side_door_sensor/128/1/0"
 - platform: mqtt
-  name: "Garage Door Battery"
+  name: "Battery Garage Door Sensor"
   state_topic: "zwave2mqtt/garage_door/128/1/0"
   unit_of_measurement: "%"
   device_class: battery
   value_template: "{{ value }}"
   json_attributes_topic: "zwave2mqtt/garage_door/128/1/0"
 - platform: mqtt 
-  name: "Garage Motion Battery"
+  name: "Battery Garage Motion Sensor"
   state_topic: "zwave2mqtt/garage_motion/128/1/0"
-- platform: mqtt
-  name: "Dome Alarm"
-  state_topic: "zwave2mqtt/dome_alarm/128/1/0"
\ No newline at end of file