diff --git a/apps/room_control b/apps/room_control
index 4513437..8a5431a 160000
--- a/apps/room_control
+++ b/apps/room_control
@@ -1 +1 @@
-Subproject commit 4513437bf4e982b603c61b3e5c0136fb872d17c4
+Subproject commit 8a5431a72bc8f0ef5ae2f1c98d97db55bd670523
diff --git a/apps/rooms/bathroom.yaml b/apps/rooms/bathroom.yaml
index e4b71db..df8c701 100644
--- a/apps/rooms/bathroom.yaml
+++ b/apps/rooms/bathroom.yaml
@@ -33,7 +33,7 @@ bathroom:
 
 bathroom_button:
   module: button
-  class: ButtonController
+  class: Button
   app: bathroom
   ref_entity: light.bathroom
   button: Bathroom Button
diff --git a/apps/rooms/bedroom.yaml b/apps/rooms/bedroom.yaml
index efff443..19ea792 100644
--- a/apps/rooms/bedroom.yaml
+++ b/apps/rooms/bedroom.yaml
@@ -75,7 +75,7 @@ bedroom:
 
 bedroom_buttons:
   module: button
-  class: ButtonController
+  class: Button
   app: bedroom
   ref_entity: light.bedroom
   button:
diff --git a/apps/rooms/kitchen.yaml b/apps/rooms/kitchen.yaml
index ffd5479..91063d9 100755
--- a/apps/rooms/kitchen.yaml
+++ b/apps/rooms/kitchen.yaml
@@ -38,7 +38,7 @@ kitchen:
 
 kitchen_button:
   module: button
-  class: ButtonController
+  class: Button
   app: kitchen
   ref_entity: light.kitchen
   button: Kitchen Button
diff --git a/apps/rooms/living_room.yaml b/apps/rooms/living_room.yaml
index df9a4a2..867eddd 100644
--- a/apps/rooms/living_room.yaml
+++ b/apps/rooms/living_room.yaml
@@ -67,13 +67,13 @@ living_room:
 
 front_door:
   module: door
-  class: DoorControl
+  class: Door
   app: living_room
   door: binary_sensor.front_contact
 
 living_room_button:
   module: button
-  class: ButtonController
+  class: Button
   app: living_room
   button: Living Room Button
   ref_entity: light.living_room