diff --git a/configuration/automations/ac.yaml b/configuration/automations/ac.yaml
index fb3e467..d7b617f 100644
--- a/configuration/automations/ac.yaml
+++ b/configuration/automations/ac.yaml
@@ -13,13 +13,13 @@
       entity_id: input_select.home_mode
       state: Day
     - condition: state
-      entity_id: binary_sensor.computer_cave_window_1_open_close
+      entity_id: binary_sensor.dining_window_1_open_close
       state: 'off'
     - condition: state
-      entity_id: binary_sensor.computer_cave_window_2_open_close
+      entity_id: binary_sensor.dining_window_2_open_close
       state: 'off'
     - condition: state
-      entity_id: binary_sensor.living_room_window_open_close
+      entity_id: binary_sensor.office_window_open_close
       state: 'off'
   action:
     - service: climate.turn_on
@@ -37,17 +37,17 @@
   mode: single
   trigger:
     - platform: state
-      entity_id: binary_sensor.computer_cave_window_1_open_close
+      entity_id: binary_sensor.dining_window_1_open_close
       to: 'on'
       for:
         minutes: 1
     - platform: state
-      entity_id: binary_sensor.computer_cave_window_2_open_close
+      entity_id: binary_sensor.dining_window_2_open_close
       to: 'on'
       for:
         minutes: 1
     - platform: state
-      entity_id: binary_sensor.living_room_window_open_close
+      entity_id: binary_sensor.office_window_open_close
       to: 'on'
       for:
         minutes: 1
diff --git a/configuration/automations/alarm.yaml b/configuration/automations/alarm.yaml
index 62d6351..ddd9c66 100644
--- a/configuration/automations/alarm.yaml
+++ b/configuration/automations/alarm.yaml
@@ -25,10 +25,10 @@
       entity_id: binary_sensor.bedroom_window_open_close
       to: 'on'
     - platform: state
-      entity_id: binary_sensor.computer_cave_window_1_open_close
+      entity_id: binary_sensor.dining_window_1_open_close
       to: 'on'
     - platform: state
-      entity_id: binary_sensor.computer_cave_window_2_open_close
+      entity_id: binary_sensor.dining_window_2_open_close
       to: 'on'
     - platform: state
       entity_id: binary_sensor.freezer_door_on_off
@@ -37,7 +37,7 @@
       entity_id: binary_sensor.front_door_open_close
       to: 'on'
     - platform: state
-      entity_id: binary_sensor.living_room_window_open_close
+      entity_id: binary_sensor.office_window_open_close
       to: 'on'
 # Use lock
     - platform: state
@@ -58,10 +58,10 @@
       entity_id: binary_sensor.bedroom_window_open_close
       to: 'on'
     - platform: state
-      entity_id: binary_sensor.computer_cave_window_1_open_close
+      entity_id: binary_sensor.dining_window_1_open_close
       to: 'on'
     - platform: state
-      entity_id: binary_sensor.computer_cave_window_2_open_close
+      entity_id: binary_sensor.dining_window_2_open_close
       to: 'on'
     - platform: state
       entity_id: binary_sensor.freezer_door_on_off
@@ -70,7 +70,7 @@
       entity_id: binary_sensor.front_door_open_close
       to: 'on'
     - platform: state
-      entity_id: binary_sensor.living_room_window_open_close
+      entity_id: binary_sensor.office_window_open_close
       to: 'on'
   condition:
     - condition: state
diff --git a/configuration/automations/computer-button.yaml b/configuration/automations/computer-button.yaml
index 68e90a7..f31139c 100644
--- a/configuration/automations/computer-button.yaml
+++ b/configuration/automations/computer-button.yaml
@@ -1,5 +1,5 @@
-- id: button-computer-cave-living-room-table
-  alias: '[Computer Cave] Living Room Table'
+- id: button-office-table
+  alias: '[Office] Button Light'
   trigger:
     - device_id: 5b972523e427721ec88e095994f7cc16
       domain: zha
@@ -43,8 +43,8 @@
                         kelvin: 3200
   mode: single
 
-- id: button-computer-cave-desk
-  alias: '[Computer Cave] Button Desk'
+- id: button-office-desk
+  alias: '[Office] Button Desk'
   trigger:
     - device_id: 5b972523e427721ec88e095994f7cc16
       domain: zha
diff --git a/configuration/automations/computer-blinds.yaml b/configuration/automations/dining-blinds.yaml
similarity index 66%
rename from configuration/automations/computer-blinds.yaml
rename to configuration/automations/dining-blinds.yaml
index 5a1a498..ee354ae 100644
--- a/configuration/automations/computer-blinds.yaml
+++ b/configuration/automations/dining-blinds.yaml
@@ -1,5 +1,5 @@
-- id: button-computer-blinds-up
-  alias: '[Computer Blinds] Up'
+- id: button-dining-blinds-up
+  alias: '[Dining Blinds] Up'
   trigger:
     - device_id: 6818c2a8921603a8a04e6c6f4d45a8ec
       domain: zha
@@ -8,11 +8,11 @@
       subtype: turn_on
   action:
     - service: cover.close_cover
-      entity_id: cover.computer_cave_blinds
+      entity_id: cover.dining_blinds
   mode: single
 
-- id: button-computer-blinds-down
-  alias: '[Computer Blinds] Down'
+- id: button-dining-blinds-down
+  alias: '[Dining Blinds] Down'
   trigger:
     - device_id: 6818c2a8921603a8a04e6c6f4d45a8ec
       domain: zha
@@ -21,5 +21,5 @@
       subtype: turn_off
   action:
     - service: cover.open_cover
-      entity_id: cover.computer_cave_blinds
+      entity_id: cover.dining_blinds
   mode: single
diff --git a/configuration/automations/living-room-blinds.yaml b/configuration/automations/office-blinds.yaml
similarity index 66%
rename from configuration/automations/living-room-blinds.yaml
rename to configuration/automations/office-blinds.yaml
index 7c176a5..77fa3e4 100644
--- a/configuration/automations/living-room-blinds.yaml
+++ b/configuration/automations/office-blinds.yaml
@@ -1,5 +1,5 @@
-- id: living-room-blinds-button-up
-  alias: '[Living Room Blinds] Up'
+- id: office-blinds-button-up
+  alias: '[Office Blinds] Up'
   trigger:
     - device_id: a47c928b108240ed8866f9f7a70bc844
       domain: zha
@@ -8,11 +8,11 @@
       subtype: turn_on
   action:
     - service: cover.close_cover
-      entity_id: cover.living_room_blind
+      entity_id: cover.office_blind
   mode: single
 
-- id: living-room-blinds-button-down
-  alias: '[Living Room Blinds] Down'
+- id: office-blinds-button-down
+  alias: '[Office Blinds] Down'
   trigger:
     - device_id: a47c928b108240ed8866f9f7a70bc844
       domain: zha
@@ -21,5 +21,5 @@
       subtype: turn_off
   action:
     - service: cover.open_cover
-      entity_id: cover.living_room_blind
+      entity_id: cover.office_blind
   mode: single
diff --git a/configuration/configuration.yaml b/configuration/configuration.yaml
index fe82d3a..1c8029c 100644
--- a/configuration/configuration.yaml
+++ b/configuration/configuration.yaml
@@ -595,10 +595,10 @@ cover:
       - cover.bedroom_blind_left
       - cover.bedroom_blind_right
   - platform: group
-    name: Computer Cave Blinds
+    name: Dining Blinds
     entities:
-      - cover.computer_cave_blind_left
-      - cover.computer_cave_blind_right
+      - cover.dining_blind_left
+      - cover.dining_blind_right
 
 template:
   - sensor:
diff --git a/scripts/10.modes.yaml b/scripts/10.modes.yaml
index 6bb36cc..8400842 100644
--- a/scripts/10.modes.yaml
+++ b/scripts/10.modes.yaml
@@ -43,8 +43,8 @@ good_night:
     - service: cover.close_cover
       entity_id:
         - cover.bedroom_blinds
-        - cover.computer_cave_blinds
-        - cover.living_room_blind
+        - cover.dining_blinds
+        - cover.office_blind
     - service: lock.lock
       target:
         entity_id: lock.front_door_25f246fe_door_lock
@@ -61,8 +61,8 @@ good_morning:
     - service: cover.open_cover
       entity_id:
         - cover.bedroom_blinds
-        - cover.computer_cave_blinds
-        - cover.living_room_blind
+        - cover.dining_blinds
+        - cover.office_blind
     - service: alarm_control_panel.alarm_disarm
       entity_id: alarm_control_panel.ha_alarm
     - service: input_select.select_option