Will pushing from the server break anything?

automations/cameras/frigate_recordings.yaml

@@ -40,8 +40,8 @@ action:
                 - switch.frigate_cam07_recordings
                 - switch.frigate_cam08_recordings
                 - switch.frigate_cam12_recordings
-                - switch.frigate_cam13_recordings
-                - switch.frigate_cam14_recordings
+                # - switch.frigate_cam13_recordings
+                # - switch.frigate_cam14_recordings
                 - switch.frigate_cam18_recordings
                 - switch.frigate_cam19_recordings
 
@@ -61,7 +61,7 @@ action:
                 - switch.frigate_cam07_recordings
                 - switch.frigate_cam08_recordings
                 - switch.frigate_cam12_recordings
-                - switch.frigate_cam13_recordings
+                # - switch.frigate_cam13_recordings
       - conditions:
           - condition: state
             entity_id: input_boolean.indoor_recordings
@@ -77,7 +77,7 @@ action:
                 - switch.frigate_cam07_recordings
                 - switch.frigate_cam08_recordings
                 - switch.frigate_cam12_recordings
-                - switch.frigate_cam13_recordings
+                # - switch.frigate_cam13_recordings
 
   - choose:
       - conditions:
@@ -90,7 +90,7 @@ action:
             target:
               entity_id:
                 - switch.frigate_cam04_recordings
-                - switch.frigate_cam14_recordings
+                # - switch.frigate_cam14_recordings
                 - switch.frigate_cam18_recordings
                 - switch.frigate_cam19_recordings
       - conditions:
@@ -103,6 +103,6 @@ action:
             target:
               entity_id:
                 - switch.frigate_cam04_recordings
-                - switch.frigate_cam14_recordings
+                # - switch.frigate_cam14_recordings
                 - switch.frigate_cam18_recordings
                 - switch.frigate_cam19_recordings

automations/cameras/frigate_snapshots.yaml

@@ -40,8 +40,8 @@ action:
                 - switch.frigate_cam07_snapshots
                 - switch.frigate_cam08_snapshots
                 - switch.frigate_cam12_snapshots
-                - switch.frigate_cam13_snapshots
-                - switch.frigate_cam14_snapshots
+                # - switch.frigate_cam13_snapshots
+                # - switch.frigate_cam14_snapshots
                 - switch.frigate_cam18_snapshots
                 - switch.frigate_cam19_snapshots
 
@@ -61,7 +61,7 @@ action:
                 - switch.frigate_cam07_snapshots
                 - switch.frigate_cam08_snapshots
                 - switch.frigate_cam12_snapshots
-                - switch.frigate_cam13_snapshots
+                # - switch.frigate_cam13_snapshots
       - conditions:
           - condition: state
             entity_id: input_boolean.indoor_snapshots
@@ -77,7 +77,7 @@ action:
                 - switch.frigate_cam07_snapshots
                 - switch.frigate_cam08_snapshots
                 - switch.frigate_cam12_snapshots
-                - switch.frigate_cam13_snapshots
+                # - switch.frigate_cam13_snapshots
 
   - choose:
       - conditions:
@@ -90,7 +90,7 @@ action:
             target:
               entity_id:
                 - switch.frigate_cam04_snapshots
-                - switch.frigate_cam14_snapshots
+                # - switch.frigate_cam14_snapshots
                 - switch.frigate_cam18_snapshots
                 - switch.frigate_cam19_snapshots
       - conditions:
@@ -103,6 +103,6 @@ action:
             target:
               entity_id:
                 - switch.frigate_cam04_snapshots
-                - switch.frigate_cam14_snapshots
+                # - switch.frigate_cam14_snapshots
                 - switch.frigate_cam18_snapshots
                 - switch.frigate_cam19_snapshots

automations/frigate/frigate_person_front_porch.yaml

@@ -39,7 +39,7 @@ condition:
   - '{{ is_state("binary_sensor.front_door_contact","off") }}'
   - '{{ is_state("binary_sensor.patio_door_contact","off") }}'
   - '{{ is_state("binary_sensor.front_porch_motion","off") }}'
-  - '{{ is_state("binary_sensor.garage_motion_switch_home_security_motion_detection","off") }}'
+  - '{{ is_state("binary_sensor.garage_motion_switch_motion_detection","off") }}'
   - "{{ is_state('input_boolean.outdoor_snapshots','on') }}"
 action:
   - choose:

automations/people/adults_away_something_open.yaml

@@ -20,7 +20,7 @@ action:
     data:
       message: >-
         {% if as_timestamp(states.input_boolean.kristy_home.last_updated) > as_timestamp(states.input_boolean.clint_home.last_updated) %}
-          The following are open: {{ dict((states|selectattr('entity_id', 'in', state_attr('group.my_exterior_windows', 'entity_id') + state_attr('group.my_exterior_doors', 'entity_id'))|list)|groupby('state'))['on']|map(attribute='name')|list|join(', ') }}
+          The following are open: {{ dict((states|selectattr('entity_id', 'in', state_attr('group.my_exterior_windows', 'entity_id') + state_attr('binary_sensor.exterior_doors', 'entity_id'))|list)|groupby('state'))['on']|map(attribute='name')|list|join(', ') }}
         {% else %}
-          The following are open: {{ dict((states|selectattr('entity_id', 'in', state_attr('group.my_exterior_windows', 'entity_id') + state_attr('group.my_exterior_doors', 'entity_id'))|list)|groupby('state'))['on']|map(attribute='name')|list|join(', ') }}
+          The following are open: {{ dict((states|selectattr('entity_id', 'in', state_attr('group.my_exterior_windows', 'entity_id') + state_attr('binary_sensor.exterior_doors', 'entity_id'))|list)|groupby('state'))['on']|map(attribute='name')|list|join(', ') }}
         {% endif %}

automations/people/bedtime_something_open.yaml

@@ -32,4 +32,4 @@ action:
       media_player_entity_id: media_player.ma_home_assistant_voice_097b44_media_player
       message: >-
         The following are open:
-        {{ dict((states|selectattr('entity_id', 'in', state_attr('group.my_exterior_windows', 'entity_id') + state_attr('group.my_exterior_doors', 'entity_id'))|list)|groupby('state'))['on']|map(attribute='name')|list|join(', ') }}
+        {{ dict((states|selectattr('entity_id', 'in', state_attr('group.my_exterior_windows', 'entity_id') + state_attr('binary_sensor.exterior_doors', 'entity_id'))|list)|groupby('state'))['on']|map(attribute='name')|list|join(', ') }}

automations/people/nearly_home.yaml

@@ -13,7 +13,7 @@ condition:
     state: "off"
     for: "00:10:00"
   - condition: numeric_state
-    entity_id: sensor.deck_light_level
+    entity_id: sensor.deck_hue_motion_sensor_illuminance
     below: 25
   - condition: numeric_state
     entity_id: sensor.sun_elevation

automations/people/returned_home.yaml

@@ -38,7 +38,7 @@ condition:
       state: "on"
     # It's getting dark
     - condition: numeric_state
-      entity_id: sensor.bar_light_level
+      entity_id: sensor.bar_hue_motion_sensor_illuminance
       below: 15
     # Somebody is nearly home, or just arrived
     - condition: or

automations/rooms/boys_room/boys_room_out_of_bed.yaml

@@ -95,13 +95,31 @@ action:
             entity_id: binary_sensor.computer_area_occupied
             state: "on"
         sequence:
-          - action: webrtc.dash_cast
-            data:
+          - action: media_player.play_media
+            target:
               entity_id: media_player.computer_area_hub
-              url: cam01_sub_opus
-              force: true
-              extra:
-                mode: webrtc
+            data:
+              media:
+                media_content_id: media-source://camera/camera.frigate_cam01
+                media_content_type: image/jpeg
+                metadata:
+                  title: Frigate Cam01
+                  thumbnail: /api/camera_proxy/camera.frigate_cam01
+                  media_class: video
+                  children_media_class: null
+                  navigateIds:
+                    - {}
+                    - media_content_type: app
+                      media_content_id: media-source://camera
+                  browse_entity_id: media_player.computer_area_hub
+
+          # - action: webrtc.dash_cast
+          #   data:
+          #     entity_id: media_player.computer_area_hub
+          #     url: cam01_sub
+          #     force: true
+          #     extra:
+          #       mode: webrtc
 
   - choose:
       - conditions:
@@ -109,13 +127,31 @@ action:
             entity_id: binary_sensor.front_room_occupied
             state: "on"
         sequence:
-          - action: webrtc.dash_cast
-            data:
+          - action: media_player.play_media
+            target:
               entity_id: media_player.front_room_hub
-              url: cam01_sub_opus
-              force: true
-              extra:
-                mode: webrtc
+            data:
+              media:
+                media_content_id: media-source://camera/camera.frigate_cam01
+                media_content_type: image/jpeg
+                metadata:
+                  title: Frigate Cam01
+                  thumbnail: /api/camera_proxy/camera.frigate_cam01
+                  media_class: video
+                  children_media_class: null
+                  navigateIds:
+                    - {}
+                    - media_content_type: app
+                      media_content_id: media-source://camera
+                  browse_entity_id: media_player.front_room_hub
+
+          # - action: webrtc.dash_cast
+          #   data:
+          #     entity_id: media_player.front_room_hub
+          #     url: cam01_sub
+          #     force: true
+          #     extra:
+          #       mode: webrtc
 
   - delay: "00:10:00"
 

automations/rooms/computer_area/computer_area_lights_to_on.yaml

@@ -26,7 +26,7 @@ trigger:
 
   # - platform: state
   #   id: motion
-  #   entity_id: group.computer_area_motion
+  #   entity_id: binary_sensor.computer_area_motion
   #   to: "on"
 
 condition:

automations/rooms/dining_room/dining_room_lights_to_on.yaml

@@ -24,7 +24,7 @@ trigger:
 
   # - platform: state
   #   id: motion
-  #   entity_id: group.dining_room_motion
+  #   entity_id: binary_sensor.dining_room_motion
   #   to: "on"
 
 condition:

automations/rooms/front_room/front_room_lights_to_on.yaml

@@ -20,7 +20,7 @@ trigger:
 
   # - platform: state
   #   id: motion
-  #   entity_id: group.front_room_motion
+  #   entity_id: binary_sensor.front_room_motion
   #   to: "on"
 
   - platform: state
@@ -119,7 +119,7 @@ action:
             condition: state
             entity_id: light.front_room_hue
             state: "on"
-          - "{{ states('sensor.front_room_light_level') | float(default=0) < states('input_number.front_room_light_level_trigger') | float(default=0) }}"
+          - "{{ states('sensor.front_room_hue_motion_sensor_illuminance') | float(default=0) < states('input_number.front_room_light_level_trigger') | float(default=0) }}"
         sequence:
           - action: scene.turn_on
             data:
@@ -137,7 +137,7 @@ action:
             condition: state
             entity_id: light.front_room_hue
             state: "off"
-          - "{{ states('sensor.front_room_light_level') | float(default=0) < states('input_number.front_room_light_level_trigger') | float(default=0) }}"
+          - "{{ states('sensor.front_room_hue_motion_sensor_illuminance') | float(default=0) < states('input_number.front_room_light_level_trigger') | float(default=0) }}"
         sequence:
           - action: scene.turn_on
             target:
@@ -149,7 +149,7 @@ action:
             condition: state
             entity_id: light.front_room_hue
             state: "on"
-          - "{{ states('sensor.front_room_light_level') | float(default=0) < states('input_number.front_room_light_level_trigger') | float(default=0) }}"
+          - "{{ states('sensor.front_room_hue_motion_sensor_illuminance') | float(default=0) < states('input_number.front_room_light_level_trigger') | float(default=0) }}"
         sequence:
           - action: scene.turn_on
             data:
@@ -163,7 +163,7 @@ action:
             condition: state
             entity_id: light.front_room_hue
             state: "off"
-          - "{{ states('sensor.front_room_light_level') | float(default=0) < states('input_number.front_room_light_level_trigger') | float(default=0) }}"
+          - "{{ states('sensor.front_room_hue_motion_sensor_illuminance') | float(default=0) < states('input_number.front_room_light_level_trigger') | float(default=0) }}"
         sequence:
           - action: scene.turn_on
             target:

automations/rooms/furnace_room/furnace_room_water_sensor_on.yaml

@@ -3,7 +3,7 @@ id: automation_front_room_water_sensor_on
 
 trigger:
   - platform: state
-    entity_id: binary_sensor.furnace_room_water_sensor_water_alarm_water_leak_detected
+    entity_id: binary_sensor.furnace_room_water_sensor_leak
     to: "on"
     for: "00:00:10"
 

automations/rooms/furnace_room_lights.yaml

@@ -18,7 +18,7 @@ triggers:
     trigger: state
     alias: When the furnace room door has been closed for 10 minutes
   - id: motion_off
-    entity_id: binary_sensor.furnace_room_motion_switch_home_security_motion_detection
+    entity_id: binary_sensor.furnace_room_motion_switch_motion_detection
     to: "off"
     for: "00:15:00"
     trigger: state
@@ -40,7 +40,7 @@ actions:
             id: door_closed
           - condition: state
             entity_id: >-
-              binary_sensor.furnace_room_motion_switch_home_security_motion_detection
+              binary_sensor.furnace_room_motion_switch_motion_detection
             state: "off"
           - condition: state
             entity_id: light.furnace_room

automations/rooms/garage/garage_lights_to_on.yaml

@@ -18,7 +18,7 @@ trigger:
 
   # - platform: state
   #   id: "motion"
-  #   entity_id: group.garage_motion
+  #   entity_id: binary_sensor.garage_motion
   #   from: "off"
   #   to: "on"
 
@@ -56,7 +56,7 @@ trigger:
 
   - platform: state
     id: "workshop_motion"
-    entity_id: group.workshop_motion
+    entity_id: binary_sensor.workshop_motion
     from: "off"
     to: "on"
 

automations/rooms/girls_room/girls_room_lights_to_on.yaml

@@ -70,7 +70,7 @@ condition:
             state: "on"
 
 variables:
-  switch_name: girls_room_fan_light_switch_light
+  switch_name: light.girls_room_fan_light_switch_light
   light_name: girls_room_hue
   mode_name: input_select.girls_room_mode
   automatic_profile: input_select.automatic_light_profile
@@ -89,7 +89,7 @@ action:
         sequence:
           - action: light.turn_on
             target:
-              entity_id: light.girls_room_hue
+              entity_id: light.girls_room_fan_light_switch_light
 
       - alias: "If the room is set to auto, the lights are on, and the automatic profile is set to Nightlight, change to the Automatic Light Profile scene with a short transition"
         conditions:
@@ -99,7 +99,7 @@ action:
             state: Auto
           - alias: "Lights are on"
             condition: state
-            entity_id: light.girls_room_hue
+            entity_id: light.girls_room_fan_light_switch_light
             state: "on"
           - alias: "Automatic light profile set to Nightlight"
             condition: state
@@ -120,7 +120,7 @@ action:
             state: Auto
           - alias: "Lights are on"
             condition: state
-            entity_id: light.girls_room_hue
+            entity_id: light.girls_room_fan_light_switch_light
             state: "on"
         sequence:
           - action: scene.turn_on
@@ -137,7 +137,7 @@ action:
             state: Auto
           - alias: "Lights are off"
             condition: state
-            entity_id: light.girls_room_hue
+            entity_id: light.girls_room_fan_light_switch_light
             state: "off"
         sequence:
           - action: scene.turn_on
@@ -148,7 +148,7 @@ action:
         conditions:
           - alias: "Room not manual or auto and lights are on"
             condition: state
-            entity_id: light.girls_room_hue
+            entity_id: light.girls_room_fan_light_switch_light
             state: "on"
           - alias: "Room set to Nightlight"
             condition: state
@@ -165,7 +165,7 @@ action:
         conditions:
           - alias: "Room not manual or auto and lights are on"
             condition: state
-            entity_id: light.girls_room_hue
+            entity_id: light.girls_room_fan_light_switch_light
             state: "on"
         sequence:
           - action: scene.turn_on
@@ -178,7 +178,7 @@ action:
         conditions:
           - alias: "Room not manual or auto and lights are off"
             condition: state
-            entity_id: light.girls_room_hue
+            entity_id: light.girls_room_fan_light_switch_light
             state: "off"
         sequence:
           - action: scene.turn_on

automations/rooms/girls_room/girls_room_out_of_bed.yaml

@@ -103,7 +103,7 @@ action:
           - action: webrtc.dash_cast
             data:
               entity_id: media_player.computer_area_hub
-              url: cam08_sub_opus
+              url: cam08_sub
               force: true
               extra:
                 mode: webrtc
@@ -117,7 +117,7 @@ action:
           - action: webrtc.dash_cast
             data:
               entity_id: media_player.front_room_hub
-              url: cam08_sub_opus
+              url: cam08_sub
               force: true
               extra:
                 mode: webrtc

automations/rooms/great_room/great_room_lights_to_on.yaml

@@ -26,7 +26,7 @@ trigger:
 
   # - platform: state
   #   id: motion
-  #   entity_id: group.great_room_motion
+  #   entity_id: binary_sensor.great_room_motion
   #   to: "on"
 
 condition:

automations/rooms/kitchen/kitchen_lights_to_off.yaml

@@ -62,7 +62,7 @@ action:
                       - condition: state
                         entity_id: input_select.kitchen_mode
                         state: "Manual"
-              - "{{ states('sensor.bar_light_level') | float(default=0) >= states('input_number.kitchen_light_level_trigger') | float(default=0) }}"
+              - "{{ states('sensor.bar_hue_motion_sensor_illuminance') | float(default=0) >= states('input_number.kitchen_light_level_trigger') | float(default=0) }}"
         sequence:
           - action: scene.turn_on
             data:

automations/rooms/kitchen/kitchen_lights_to_on.yaml

@@ -26,7 +26,7 @@ trigger:
 
   # - platform: state
   #   id: motion
-  #   entity_id: group.kitchen_motion
+  #   entity_id: binary_sensor.kitchen_motion
   #   to: "on"
 
 condition:

automations/rooms/mancave_lights.yaml

@@ -18,7 +18,7 @@ triggers:
 
   - trigger: state
     id: motion_off
-    entity_id: binary_sensor.mancave_motion_switch_home_security_motion_detection
+    entity_id: binary_sensor.mancave_motion_switch_motion_detection
     to: "off"
     for: "00:15:00"
 
@@ -38,7 +38,7 @@ action:
           - condition: trigger
             id: "door_closed"
           - condition: state
-            entity_id: binary_sensor.mancave_motion_switch_home_security_motion_detection
+            entity_id: binary_sensor.mancave_motion_switch_motion_detection
             state: "off"
           - condition: state
             entity_id: light.mancave

automations/rooms/master_bathroom/master_bathroom_lights_to_off.yaml

@@ -7,7 +7,7 @@ trigger:
     entity_id: input_select.master_bathroom_mode
 
   - platform: state
-    entity_id: input_boolean.master_bathroom_occupied
+    entity_id: input_boolean.bathroom_occupied
     to: "off"
 
   #- platform: time_pattern
@@ -26,7 +26,7 @@ condition:
         entity_id: input_select.master_bathroom_mode
         state: "Off"
       - condition: state
-        entity_id: input_boolean.master_bathroom_occupied
+        entity_id: input_boolean.bathroom_occupied
         state: "off"
 action:
   - choose:
@@ -40,7 +40,7 @@ action:
                 entity_id: input_select.master_bathroom_mode
                 state: "Off"
               - condition: state
-                entity_id: input_boolean.master_bathroom_occupied
+                entity_id: input_boolean.bathroom_occupied
                 state: "off"
           - condition: not
             conditions:
@@ -62,4 +62,4 @@ action:
                   - alias: "Turn off z-wave switch since all lights are off"
                     action: homeassistant.turn_off
                     target:
-                      entity_id: switch.master_bathroom_motion_switch, switch.shower_switch
+                      entity_id: switch.master_bathroom_motion_switch, switch.master_bathroom_switch

automations/rooms/master_bathroom/master_bathroom_lights_to_on.yaml

@@ -10,7 +10,7 @@ trigger:
       - input_select.master_bathroom_mode
       - input_select.automatic_light_profile
   - platform: state
-    entity_id: input_boolean.master_bathroom_occupied
+    entity_id: input_boolean.bathroom_occupied
     to: "on"
 
 # Only turn on the lights when necessary
@@ -19,7 +19,7 @@ condition:
     conditions:
       # Either when motion is detected
       - condition: template
-        value_template: "{{ trigger.entity_id == 'input_boolean.master_bathroom_occupied' }}"
+        value_template: "{{ trigger.entity_id == 'input_boolean.bathroom_occupied' }}"
         # Or when the scene changes while the lights are already on
       - condition: and
         conditions:
@@ -30,7 +30,7 @@ condition:
               - condition: template
                 value_template: "{{ trigger.entity_id == 'input_select.automatic_light_profile' }}"
           - condition: state
-            entity_id: input_boolean.master_bathroom_occupied
+            entity_id: input_boolean.bathroom_occupied
             state: "on"
 
 variables:
@@ -44,7 +44,7 @@ action:
     target:
       entity_id:
         - switch.master_bathroom_motion_switch
-        - switch.shower_switch
+        - switch.master_bathroom_switch
   - choose:
       - alias: "If the room is set to manual, just turn the lights on"
         conditions:

automations/rooms/master_bathroom/master_bathroom_not_occupied.yaml

@@ -10,7 +10,7 @@ trigger:
   - platform: state
     entity_id:
       - input_boolean.home_occupied
-      - binary_sensor.master_bathroom_occupied
+      - binary_sensor.bathroom_occupied
     to: "off"
     for: "00:10:00"
 
@@ -26,10 +26,10 @@ condition:
       - condition: and
         conditions:
           - condition: state
-            entity_id: input_boolean.master_bathroom_occupied
+            entity_id: input_boolean.bathroom_occupied
             state: "on"
           - condition: state
-            entity_id: binary_sensor.master_bathroom_occupied
+            entity_id: binary_sensor.bathroom_occupied
             state: "off"
             for: "00:10:00"
 
@@ -41,7 +41,7 @@ action:
             state: "off"
         sequence:
           - action: homeassistant.turn_off
-            entity_id: input_boolean.master_bathroom_occupied
+            entity_id: input_boolean.bathroom_occupied
       - conditions:
           - condition: not
             conditions:
@@ -50,4 +50,4 @@ action:
                 state: "Manual"
         sequence:
           - action: homeassistant.turn_off
-            entity_id: input_boolean.master_bathroom_occupied
+            entity_id: input_boolean.bathroom_occupied

automations/rooms/master_bathroom/master_bathroom_occupied.yaml

@@ -5,14 +5,14 @@ mode: restart
 trigger:
   - platform: state
     entity_id:
-      - binary_sensor.master_bathroom_occupied
+      - binary_sensor.bathroom_occupied
     to: "on"
 
 condition:
   - condition: state
-    entity_id: input_boolean.master_bathroom_occupied
+    entity_id: input_boolean.bathroom_occupied
     state: "off"
 
 action:
   - action: input_boolean.turn_on
-    entity_id: input_boolean.master_bathroom_occupied
+    entity_id: input_boolean.bathroom_occupied

automations/rooms/master_bedroom/master_bedroom_lights_to_off.yaml

@@ -9,7 +9,7 @@ trigger:
     entity_id: input_select.master_bedroom_mode
 
   - platform: state
-    entity_id: input_boolean.master_bedroom_occupied
+    entity_id: input_boolean.bedroom_occupied
     to: "off"
 
   - platform: state
@@ -48,7 +48,7 @@ condition:
         entity_id: input_select.master_bedroom_mode
         state: "Off"
       - condition: state
-        entity_id: input_boolean.master_bedroom_occupied
+        entity_id: input_boolean.bedroom_occupied
         state: "off"
       - condition: state
         entity_id: input_select.master_bedroom_mode
@@ -66,7 +66,7 @@ action:
                 entity_id: input_select.master_bedroom_mode
                 state: "Off"
               - condition: state
-                entity_id: input_boolean.master_bedroom_occupied
+                entity_id: input_boolean.bedroom_occupied
                 state: "off"
           - condition: not
             conditions:

automations/rooms/master_bedroom/master_bedroom_lights_to_on.yaml

@@ -18,17 +18,17 @@ trigger:
     to: "off"
 
   - platform: state
-    entity_id: input_boolean.master_bedroom_occupied
+    entity_id: input_boolean.bedroom_occupied
     to: "on"
 
   - platform: state
     id: occupied
-    entity_id: binary_sensor.master_bedroom_occupied
+    entity_id: binary_sensor.bedroom_occupied
     to: "on"
 
   # - platform: state
   #   id: motion
-  #   entity_id: group.master_bedroom_motion
+  #   entity_id: binary_sensor.master_bedroom_motion
   #   to: "on"
 
 condition:
@@ -73,7 +73,7 @@ condition:
           - condition: trigger
             id: "mode_change"
           - condition: state
-            entity_id: input_boolean.master_bedroom_occupied
+            entity_id: input_boolean.bedroom_occupied
             state: "on"
 
 variables:

automations/rooms/master_bedroom/master_bedroom_not_occupied.yaml

@@ -10,7 +10,7 @@ trigger:
   - platform: state
     entity_id:
       - input_boolean.home_occupied
-      - binary_sensor.master_bedroom_occupied
+      - binary_sensor.bedroom_occupied
     to: "off"
     for: "00:05:00"
 
@@ -29,7 +29,7 @@ condition:
       - "unavailable"
 
   - condition: state
-    entity_id: input_boolean.master_bedroom_occupied
+    entity_id: input_boolean.bedroom_occupied
     state: "on"
 
   - condition: or
@@ -45,7 +45,7 @@ condition:
             for:
               minutes: 5
           - condition: state
-            entity_id: binary_sensor.master_bedroom_occupied
+            entity_id: binary_sensor.bedroom_occupied
             state: "off"
             for:
               minutes: 5
@@ -57,7 +57,7 @@ action:
             state: "off"
         sequence:
           - action: homeassistant.turn_off
-            entity_id: input_boolean.master_bedroom_occupied
+            entity_id: input_boolean.bedroom_occupied
       - conditions:
           - condition: not
             conditions:
@@ -66,4 +66,4 @@ action:
                 state: "Manual"
         sequence:
           - action: homeassistant.turn_off
-            entity_id: input_boolean.master_bedroom_occupied
+            entity_id: input_boolean.bedroom_occupied

automations/rooms/master_bedroom/master_bedroom_occupied.yaml

@@ -5,14 +5,14 @@ mode: restart
 trigger:
   - platform: state
     entity_id:
-      - binary_sensor.master_bedroom_occupied
+      - binary_sensor.bedroom_occupied
     to: "on"
 
 condition:
   - condition: state
-    entity_id: input_boolean.master_bedroom_occupied
+    entity_id: input_boolean.bedroom_occupied
     state: "off"
 
 action:
   - action: input_boolean.turn_on
-    entity_id: input_boolean.master_bedroom_occupied
+    entity_id: input_boolean.bedroom_occupied

automations/things/automatic_fan_speeds.yaml

@@ -56,7 +56,7 @@ triggers:
     entity_id: input_boolean.girls_room_occupied
 
   - trigger: state
-    entity_id: input_boolean.master_bedroom_occupied
+    entity_id: input_boolean.bedroom_occupied
 
   - trigger: state
     entity_id: input_boolean.girls_room_asleep
@@ -210,7 +210,7 @@ action:
       - conditions:
           - alias: "Master Bedroom not occupied"
             condition: state
-            entity_id: input_boolean.master_bedroom_occupied
+            entity_id: input_boolean.bedroom_occupied
             state: "off"
           - alias: "Master Bedroom not asleep"
             condition: state
@@ -248,7 +248,7 @@ action:
       - conditions:
           - alias: "Master Bedroom is occupied"
             condition: state
-            entity_id: input_boolean.master_bedroom_occupied
+            entity_id: input_boolean.bedroom_occupied
             state: "on"
           - alias: "Master Bedroom above high"
             condition: template
@@ -265,7 +265,7 @@ action:
       - conditions:
           - alias: "Master Bedroom is occupied"
             condition: state
-            entity_id: input_boolean.master_bedroom_occupied
+            entity_id: input_boolean.bedroom_occupied
             state: "on"
           - alias: "Master Bedroom above medium"
             condition: template
@@ -282,7 +282,7 @@ action:
       - conditions:
           - alias: "Master Bedroom is occupied"
             condition: state
-            entity_id: input_boolean.master_bedroom_occupied
+            entity_id: input_boolean.bedroom_occupied
             state: "on"
           - alias: "Master Bedroom above low"
             condition: template