Will pushing from the server break anything?

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