diff --git a/configs/pepe/home-assistant/light-control.nix b/configs/pepe/home-assistant/light-control.nix
index 4f5fcc3..cf3cca9 100644
--- a/configs/pepe/home-assistant/light-control.nix
+++ b/configs/pepe/home-assistant/light-control.nix
@@ -58,7 +58,7 @@
       })
       (motion {
         topic = "zigbee2mqtt/motion_sensor_1";
-        room = "kitchen_room";
+        room = "kitchen";
       })
       (motion {
         topic = "zigbee2mqtt/motion_sensor_3";
@@ -76,13 +76,17 @@
         topic = "zigbee2mqtt/motion_sensor_8";
         room = "bath_room";
       })
+      (motion {
+        topic = "zigbee2mqtt/motion_sensor_6";
+        room = "floor";
+      })
       (door {
         topic = "zigbee2mqtt/door_sensor_2";
-        room = "floor_room";
+        room = "floor";
       })
       (door {
         topic = "zigbee2mqtt/door_sensor_4";
-        room = "floor_room";
+        room = "floor";
       })
     ];
     switches = let
@@ -114,11 +118,11 @@
     in [
       (light {
         topic = "zigbee2mqtt/light_1";
-        rooms = [ "floor_room" ];
+        rooms = [ "floor" ];
       })
       (light {
         topic = "zigbee2mqtt/light_2";
-        rooms = [ "floor_room" ];
+        rooms = [ "floor" ];
       })
       (light {
         topic = "zigbee2mqtt/light_3";
@@ -148,7 +152,7 @@
       })
       (sonoff {
         id = "PAL06";
-        rooms = [ "kitchen_room" ];
+        rooms = [ "kitchen" ];
       })
       # monitor and speakers
       (sonoff {