diff --git a/apps/rooms/rooms.yaml b/apps/rooms/rooms.yaml
index 18efc51..9be6655 100755
--- a/apps/rooms/rooms.yaml
+++ b/apps/rooms/rooms.yaml
@@ -39,7 +39,7 @@ closet:
   module: basic_motion
   class: MotionLight
   entity: light.closet
-  sensor: binary_sensor.motion_closet
+  sensor: binary_sensor.closet_motion_occupancy
   off_duration: '00:02:00'
   scene:
     - time: 'sunrise - 03:00:00'
@@ -67,7 +67,7 @@ bedroom:
   module: basic_motion
   class: MotionLight
   entity: light.bedroom
-  sensor: binary_sensor.motion_bedroom
+  sensor: binary_sensor.bedroom_motion_occupancy
   off_duration: '00:05:00'
   button:
     - bedroom
@@ -204,7 +204,7 @@ kitchen:
   module: basic_motion
   class: MotionLight
   entity: light.kitchen
-  sensor: binary_sensor.motion_kitchen
+  sensor: binary_sensor.kitchen_motion_occupancy
   off_duration: '00:10:00'
   button: kitchen
   scene: