diff --git a/configuration/automations/alarm.yaml b/configuration/automations/alarm.yaml
index 12da4c1..733f582 100644
--- a/configuration/automations/alarm.yaml
+++ b/configuration/automations/alarm.yaml
@@ -201,7 +201,7 @@
 #      entity_id: binary_sensor.bedroom_motion_occupancy
 #      to: 'on'
     - platform: state
-      entity_id: binary_sensor.shower_motion
+      entity_id: binary_sensor.bathroom_shower_sensor_motion
       to: 'on'
     # Use open/close sensors
 #    - platform: state
diff --git a/configuration/automations/bathroom-lights.yaml b/configuration/automations/bathroom-lights.yaml
index 37f12fa..0ceb9a8 100644
--- a/configuration/automations/bathroom-lights.yaml
+++ b/configuration/automations/bathroom-lights.yaml
@@ -21,7 +21,7 @@
       from: 'on'
       to: 'off'
     - platform: state
-      entity_id: binary_sensor.shower_motion
+      entity_id: binary_sensor.bathroom_shower_sensor_motion
       for: '0:02:00'
       from: 'on'
       to: 'off'
@@ -31,7 +31,7 @@
       for: '0:05:00'
       state: 'off'
     - condition: state
-      entity_id: binary_sensor.shower_motion
+      entity_id: binary_sensor.bathroom_shower_sensor_motion
       for: '0:02:00'
       state: 'off'
   action:
diff --git a/configuration/automations/bathroom-shower-motion.yaml b/configuration/automations/bathroom-shower-motion.yaml
index 7b4e861..12ffc63 100644
--- a/configuration/automations/bathroom-shower-motion.yaml
+++ b/configuration/automations/bathroom-shower-motion.yaml
@@ -3,7 +3,7 @@
   mode: restart
   trigger:
     - platform: state
-      entity_id: binary_sensor.shower_motion
+      entity_id: binary_sensor.bathroom_shower_sensor_motion
       from: 'off'
       to: 'on'
   action:
@@ -29,7 +29,7 @@
   mode: restart
   trigger:
     - platform: state
-      entity_id: binary_sensor.shower_motion
+      entity_id: binary_sensor.bathroom_shower_sensor_motion
       for: '0:02:00'
       from: 'on'
       to: 'off'
@@ -40,7 +40,7 @@
       to: 'off'
   condition:
     - condition: state
-      entity_id: binary_sensor.shower_motion
+      entity_id: binary_sensor.bathroom_shower_sensor_motion
       for: '0:02:00'
       state: 'off'
   action:
diff --git a/configuration/automations/info-battery.yaml b/configuration/automations/info-battery.yaml
index a65a8f0..bfe3324 100644
--- a/configuration/automations/info-battery.yaml
+++ b/configuration/automations/info-battery.yaml
@@ -175,7 +175,7 @@
       entity_id: sensor.rack_smoke_sensor_battery
     - platform: numeric_state
       below: '10'
-      entity_id: sensor.shower_motion_battery
+      entity_id: sensor.bathroom_shower_sensor_battery
     - platform: numeric_state
       below: '10'
       entity_id: sensor.siren_alarm_battery_level
diff --git a/scripts/40.pause-all-media.yaml b/scripts/40.pause-all-media.yaml
index 6c893e4..6910472 100644
--- a/scripts/40.pause-all-media.yaml
+++ b/scripts/40.pause-all-media.yaml
@@ -32,7 +32,7 @@ bathroom_music_on:
     - choose:
         - conditions:
             - condition: state
-              entity_id: binary_sensor.shower_motion
+              entity_id: binary_sensor.bathroom_shower_sensor_motion
               state: 'on'
           sequence:
             - service: media_player.volume_set
@@ -42,7 +42,7 @@ bathroom_music_on:
                 entity_id: media_player.bathroom
         - conditions:
             - condition: state
-              entity_id: binary_sensor.shower_motion
+              entity_id: binary_sensor.bathroom_shower_sensor_motion
               state: 'off'
           sequence:
             - service: media_player.volume_set