diff --git a/config/lights.yaml b/config/lights.yaml
index d78c178..bd6f843 100644
--- a/config/lights.yaml
+++ b/config/lights.yaml
@@ -38,10 +38,10 @@
 # Outside
 - platform: mqtt
   name: "Side Door Light"
-  command_topic: "zwave2mqtt/nodeID_29/38/1/0/set"    
-  brightness_command_topic: "zwave2mqtt/nodeID_29/38/1/0/set"
+  command_topic: "zwave2mqtt/side_door_light/38/1/0/set"    
+  brightness_command_topic: "zwave2mqtt/side_door_light/38/1/0/set"
   brightness_scale: 99
-  brightness_state_topic: "zwave2mqtt/nodeID_29/38/1/0"
+  brightness_state_topic: "zwave2mqtt/side_door_light/38/1/0"
   on_command_type: "brightness"
   payload_off: 0
 
diff --git a/config/switches.yaml b/config/switches.yaml
index 98fe738..f2452df 100644
--- a/config/switches.yaml
+++ b/config/switches.yaml
@@ -9,8 +9,8 @@
 
 - platform: mqtt
   name: "Living Room Fan"
-  state_topic: "zwave2mqtt/livingroom_fan/37/1/0"
-  command_topic: "zwave2mqtt/livingroom_fan/37/1/0/set"
+  state_topic: "zwave2mqtt/living_room_fan/37/1/0"
+  command_topic: "zwave2mqtt/living_room_fan/37/1/0/set"
   payload_on: "true"
   payload_off: "false"