diff --git a/automations.yaml b/automations.yaml
index a3e56fd..4f5d051 100644
--- a/automations.yaml
+++ b/automations.yaml
@@ -597,7 +597,7 @@
           volume_level: '{{ states(''input_number.emma_bedroom_google_speaker_night_volume'')
             }}'
         target:
-          entity_id: media_player.emma_bedroom_speaker
+          entity_id: media_player.emma_bedroom_google_speaker
     - conditions:
       - condition: trigger
         id: basement-on
@@ -617,7 +617,7 @@
           volume_level: '{{ states(''input_number.kallen_bedroom_google_speaker_night_volume'')
             }}'
         target:
-          entity_id: media_player.kallen_bedroom_speaker
+          entity_id: media_player.kallen_bedroom_google_speaker
     - conditions:
       - condition: trigger
         id: emma-off
@@ -634,7 +634,7 @@
               }}\n{% else %}\n  {{ states('input_number.emma_bedroom_google_speaker_day_volume')
               }}\n{% endif %}\n"
           target:
-            entity_id: media_player.emma_bedroom_speaker
+            entity_id: media_player.emma_bedroom_google_speaker
     - conditions:
       - condition: trigger
         id: basement-off
@@ -668,7 +668,7 @@
               }}\n{% else %}\n  {{ states('input_number.kallen_bedroom_google_speaker_day_volume')
               }}\n{% endif %}\n"
           target:
-            entity_id: media_player.kallen_bedroom_speaker
+            entity_id: media_player.kallen_bedroom_google_speaker
   mode: parallel
   max: 10
 - id: '1671584633378'
diff --git a/configuration.yaml b/configuration.yaml
index a07e609..165eb66 100644
--- a/configuration.yaml
+++ b/configuration.yaml
@@ -124,8 +124,8 @@ recorder:
       - media_player.basement_echo_dot
       - media_player.living_room_echo_dot
       - media_player.master_bedroom_echo_dot
-      - media_player.kallen_bedroom_speaker
-      - media_player.emma_bedroom_speaker
+      - media_player.kallen_bedroom_google_speaker
+      - media_player.emma_bedroom_google_speaker
       - media_player.spotify_iron_nerd
       - media_player.xia_desktop
       - media_player.tony_asus
diff --git a/packages/notify.yaml b/packages/notify.yaml
index 83ca6bf..70e1162 100644
--- a/packages/notify.yaml
+++ b/packages/notify.yaml
@@ -226,13 +226,13 @@ group:
   kids_bedroom_speakers:
     name: Kids Bedroom Speakers
     entities:
-      - media_player.kallen_bedroom_speaker
-      - media_player.emma_bedroom_speaker
+      - media_player.kallen_bedroom_google_speaker
+      - media_player.emma_bedroom_google_speaker
   all_bedroom_speakers:
     name: All Bedroom Speakers
     entities:
-      - media_player.kallen_bedroom_speaker
-      - media_player.emma_bedroom_speaker
+      - media_player.kallen_bedroom_google_speaker
+      - media_player.emma_bedroom_google_speaker
       - media_player.master_bedroom_echo_dot
 
 notify:
@@ -458,21 +458,21 @@ script:
       then:
       - if:
         - condition: template
-          value_template: "{{ is_state('media_player.kallen_bedroom_speaker','off') }}"
+          value_template: "{{ is_state('media_player.kallen_bedroom_google_speaker','off') }}"
         then:
         - service: media_player.volume_mute
           target:
-            entity_id: media_player.kallen_bedroom_speaker
+            entity_id: media_player.kallen_bedroom_google_speaker
           data:
             is_volume_muted: true
         - service: media_player.turn_on
           target:
-            entity_id: media_player.kallen_bedroom_speaker
-      - wait_template: "{{ states('media_player.kallen_bedroom_speaker') in ['idle','playing','paused','standby'] }}"
+            entity_id: media_player.kallen_bedroom_google_speaker
+      - wait_template: "{{ states('media_player.kallen_bedroom_google_speaker') in ['idle','playing','paused','standby'] }}"
       - if:
         - condition: template
           value_template: >
-            {% set current = state_attr('media_player.kallen_bedroom_speaker','volume_level') | float %}
+            {% set current = state_attr('media_player.kallen_bedroom_google_speaker','volume_level') | float %}
             {% set night = states('input_number.kallen_bedroom_google_speaker_night_volume') | float %}
             {% set day = states('input_number.kallen_bedroom_google_speaker_day_volume') | float %}
             {% if is_state('input_boolean.give_me_darkness','on') %}
@@ -483,7 +483,7 @@ script:
         then:
         - service: media_player.volume_set
           target:
-            entity_id: media_player.kallen_bedroom_speaker
+            entity_id: media_player.kallen_bedroom_google_speaker
           data:
             volume_level: >
               {% if is_state('input_boolean.give_me_darkness','on') %}
@@ -493,7 +493,7 @@ script:
               {% endif %}
       - service: media_player.volume_mute
         target:
-          entity_id: media_player.kallen_bedroom_speaker
+          entity_id: media_player.kallen_bedroom_google_speaker
         data:
           is_volume_muted: false
 # Emma Bedroom Speaker
@@ -509,21 +509,21 @@ script:
       then:
       - if:
         - condition: template
-          value_template: "{{ is_state('media_player.emma_bedroom_speaker','off') }}"
+          value_template: "{{ is_state('media_player.emma_bedroom_google_speaker','off') }}"
         then:
         - service: media_player.volume_mute
           target:
-            entity_id: media_player.emma_bedroom_speaker
+            entity_id: media_player.emma_bedroom_google_speaker
           data:
             is_volume_muted: true
         - service: media_player.turn_on
           target:
-            entity_id: media_player.emma_bedroom_speaker
-      - wait_template: "{{ states('media_player.emma_bedroom_speaker') in ['idle','playing','paused','standby'] }}"
+            entity_id: media_player.emma_bedroom_google_speaker
+      - wait_template: "{{ states('media_player.emma_bedroom_google_speaker') in ['idle','playing','paused','standby'] }}"
       - if:
         - condition: template
           value_template: >
-            {% set current = state_attr('media_player.emma_bedroom_speaker','volume_level') | float %}
+            {% set current = state_attr('media_player.emma_bedroom_google_speaker','volume_level') | float %}
             {% set night = states('input_number.emma_bedroom_google_speaker_night_volume') | float %}
             {% set day = states('input_number.emma_bedroom_google_speaker_day_volume') | float %}
             {% if is_state('input_boolean.give_me_darkness','on') %}
@@ -534,7 +534,7 @@ script:
         then:
         - service: media_player.volume_set
           target:
-            entity_id: media_player.emma_bedroom_speaker
+            entity_id: media_player.emma_bedroom_google_speaker
           data:
             volume_level: >
               {% if is_state('input_boolean.give_me_darkness','on') %}
@@ -544,7 +544,7 @@ script:
               {% endif %}
       - service: media_player.volume_mute
         target:
-          entity_id: media_player.emma_bedroom_speaker
+          entity_id: media_player.emma_bedroom_google_speaker
         data:
           is_volume_muted: false
 
@@ -844,8 +844,8 @@ script:
     - service: media_player.turn_on
       data:
         entity_id: >
-          {% if who in ['kallen_bedroom','media_player.kallen_bedroom_speaker'] %}
-            media_player.kallen_bedroom_speaker
+          {% if who in ['kallen_bedroom','media_player.kallen_bedroom_google_speaker'] %}
+            media_player.kallen_bedroom_google_speaker
           {% else %}
             {% if states.input_boolean.audible_notifications.state == 'on' %}
             media_player.living_room_tv
@@ -856,8 +856,8 @@ script:
     - service: media_player.volume_set
       data:
         entity_id: >
-          {% if who in ['kallen_bedroom','media_player.kallen_bedroom_speaker'] %}
-            media_player.kallen_bedroom_speaker
+          {% if who in ['kallen_bedroom','media_player.kallen_bedroom_google_speaker'] %}
+            media_player.kallen_bedroom_google_speaker
           {% else %}
             {% if states.input_boolean.audible_notifications.state == 'on' %}
             media_player.living_room_tv
@@ -878,8 +878,8 @@ script:
     - service: tts.amazon_polly_say
       data:
         entity_id: >
-          {% if who in ['kallen_bedroom','media_player.kallen_bedroom_speaker'] %}
-            media_player.kallen_bedroom_speaker
+          {% if who in ['kallen_bedroom','media_player.kallen_bedroom_google_speaker'] %}
+            media_player.kallen_bedroom_google_speaker
           {% else %}
             {% if states.input_boolean.audible_notifications.state == 'on' %}
             media_player.living_room_tv
@@ -1016,13 +1016,13 @@ script:
             script.nabu_voice      
           {% elif who in ['living_room_echo_dot', 'media_player.living_room_echo_dot','living_room','Living Room Echo Dot','Living Room']  %}
             script.alexa_voice
-          {% elif who in ['kallen_bedroom','media_player.kallen_bedroom_speaker','Kallen Bedroom']  %}
+          {% elif who in ['kallen_bedroom','Kallen Bedroom']  %}
             {% if is_state('input_boolean.kallen_sleeping','on') and type not in ['critical','Critical'] %}
               script.alexa_voice
             {% else %}
               script.jarvis_voice
             {% endif %}
-          {% elif who in ['emma_bedroom','Emma Bedroom','media_player.emma_bedroom_speaker'] %}
+          {% elif who in ['emma_bedroom','Emma Bedroom'] %}
             {% if is_state('input_boolean.emma_sleeping','on') and type not in ['critical','Critical'] %}
               script.alexa_voice
             {% else %}
@@ -1055,13 +1055,13 @@ script:
           who: >
             {% if who in ['living_room_echo_dot', 'media_player.living_room_echo_dot','living_room','Living Room Echo Dot','Living Room']  %}
               living_room
-            {% elif who in ['kallen_bedroom','media_player.kallen_bedroom_speaker','Kallen Bedroom']  %}
+            {% elif who in ['kallen_bedroom','media_player.kallen_bedroom_google_speaker','Kallen Bedroom']  %}
               {% if is_state('input_boolean.kallen_sleeping','on') and type not in ['critical','Critical'] %}
                 living_room
               {% else %}
                 kallen_bedroom
               {% endif %}
-            {% elif who in ['emma_bedroom','Emma Bedroom','media_player.emma_bedroom_speaker'] %}
+            {% elif who in ['emma_bedroom','Emma Bedroom','media_player.emma_bedroom_google_speaker'] %}
               {% if is_state('input_boolean.emma_sleeping','on') and type not in ['critical','Critical'] %}
                 living_room
               {% else %}
@@ -1113,9 +1113,9 @@ script:
           message: >
             {% if who in ['Basement','basement','basement_echo_dot','media_player.basement_echo_dot','Basement Echo Dot','Basement Google','basement_google'] and is_state('input_boolean.studio_quiet','on') and type not in ['critical','Critical'] %}
               'I cannot play notifications in the basement right now, because quiet has been requested'
-            {% elif who in ['emma_bedroom','Emma Bedroom','media_player.emma_bedroom_speaker'] and is_state('input_boolean.emma_sleeping','on') and type not in ['critical','Critical'] %}
+            {% elif who in ['emma_bedroom','Emma Bedroom','media_player.emma_bedroom_google_speaker'] and is_state('input_boolean.emma_sleeping','on') and type not in ['critical','Critical'] %}
               'I cannot play notifications in Emma Bedroom right now, because Emma is sleeping and you would not like what happens if I wake her up'
-            {% elif who in ['kallen_bedroom','Kallen Bedroom','media_player.kallen_bedroom_speaker'] and is_state('input_boolean.kallen_sleeping','on') and type not in ['critical','Critical'] %}
+            {% elif who in ['kallen_bedroom','Kallen Bedroom','media_player.kallen_bedroom_google_speaker'] and is_state('input_boolean.kallen_sleeping','on') and type not in ['critical','Critical'] %}
               'I cannot play notifications in Collin Bedroom right now, because Collin is sleeping'
             {% elif who in ['master_bedroom','master_bedroom_echo_dot','media_player.master_bedroom_echo_dot','Master Bedroom Echo Dot','Master Bedroom'] and is_state('input_boolean.master_bedroom_sleeping','on') and type not in ['critical','Critical'] %}
               'I cannot play notifications in Master Bedroom right now, because someone is sleeping and I do not want to wake them up'
@@ -1266,9 +1266,9 @@ script:
           {% set kallen_wakeup = state_attr('input_datetime.kallen_wakeup_time','timestamp') %}
           {% if type in ['critical','Critical'] %}
             false
-          {% elif who in ['emma_bedroom','Emma Bedroom','media_player.emma_bedroom_speaker'] %}
+          {% elif who in ['emma_bedroom','Emma Bedroom','media_player.emma_bedroom_google_speaker'] %}
             {{ is_state('binary_sensor.people_sleeping','on') }}
-          {% elif who in ['kallen_bedroom','media_player.kallen_bedroom_speaker','Kallen Bedroom'] %}
+          {% elif who in ['kallen_bedroom','media_player.kallen_bedroom_google_speaker','Kallen Bedroom'] %}
             {% if is_state('input_boolean.kallen_school_today','on') and (kallen_wakeup - 900) < ct < (kallen_wakeup + 3600) %}
               false
             {% else %}
@@ -1284,16 +1284,16 @@ script:
         entity_id: >-
           {% if who in ['Everywhere','everywhere','kids_bedrooms','all_bedrooms'] %}
             {% if is_state('input_boolean.emma_sleeping','on') and is_state('input_boolean.kallen_sleeping','off') %}
-              media_player.kallen_bedroom_speaker
+              media_player.kallen_bedroom_google_speaker
             {% elif is_state('input_boolean.kallen_sleeping','on') and is_state('input_boolean.emma_sleeping','off') %}
-              media_player.emma_bedroom_speaker
+              media_player.emma_bedroom_google_speaker
             {% else %}
               group.kids_bedroom_speakers
             {% endif %}
-          {% elif who in ['kallen_bedroom','media_player.kallen_bedroom_speaker'] %}
-            media_player.kallen_bedroom_speaker
-          {% elif who in ['emma_bedroom','media_player.emma_bedroom_speaker'] %}
-            media_player.emma_bedroom_speaker
+          {% elif who in ['kallen_bedroom','media_player.kallen_bedroom_google_speaker'] %}
+            media_player.kallen_bedroom_google_speaker
+          {% elif who in ['emma_bedroom','media_player.emma_bedroom_google_speaker'] %}
+            media_player.emma_bedroom_google_speaker
           {% elif who in ['Basement Google','basement_google'] %}
             media_player.basement_google_speaker
           {% endif %}
@@ -1302,16 +1302,16 @@ script:
         entity_id: >-
           {% if who in ['Everywhere','everywhere','kids_bedrooms','all_bedrooms'] %}
             {% if is_state('input_boolean.emma_sleeping','on') and is_state('input_boolean.kallen_sleeping','off') %}
-              media_player.kallen_bedroom_speaker
+              media_player.kallen_bedroom_google_speaker
             {% elif is_state('input_boolean.kallen_sleeping','on') and is_state('input_boolean.emma_sleeping','off') %}
-              media_player.emma_bedroom_speaker
+              media_player.emma_bedroom_google_speaker
             {% else %}
               group.kids_bedroom_speakers
             {% endif %}
-          {% elif who in ['kallen_bedroom','media_player.kallen_bedroom_speaker'] %}
-            media_player.kallen_bedroom_speaker
-          {% elif who in ['emma_bedroom','media_player.emma_bedroom_speaker'] %}
-            media_player.emma_bedroom_speaker
+          {% elif who in ['kallen_bedroom','media_player.kallen_bedroom_google_speaker'] %}
+            media_player.kallen_bedroom_google_speaker
+          {% elif who in ['emma_bedroom','media_player.emma_bedroom_google_speaker'] %}
+            media_player.emma_bedroom_google_speaker
           {% elif who in ['Basement Google','basement_google'] %}
             media_player.basement_google_speaker
           {% endif %}
@@ -1337,9 +1337,9 @@ script:
               {% else %}
                 {{ kidsgroup_night }}
               {% endif %}
-            {% elif who in ['kallen_bedroom','media_player.kallen_bedroom_speaker'] %}
+            {% elif who in ['kallen_bedroom','media_player.kallen_bedroom_google_speaker'] %}
               {{ states('input_number.kallen_bedroom_google_speaker_night_volume') }}
-            {% elif who in ['emma_bedroom','media_player.emma_bedroom_speaker'] %}
+            {% elif who in ['emma_bedroom','media_player.emma_bedroom_google_speaker'] %}
               {{ states('input_number.emma_bedroom_google_speaker_night_volume') }}
             {% elif who in ['Basement Google','basement_google'] %}
               {{ states('input_number.basement_google_speaker_night_volume') }}
@@ -1355,9 +1355,9 @@ script:
               {% else %}
                 {{ kidsgroup_day }}
               {% endif %}
-            {% elif who in ['kallen_bedroom','media_player.kallen_bedroom_speaker'] %}
+            {% elif who in ['kallen_bedroom','media_player.kallen_bedroom_google_speaker'] %}
               {{ states('input_number.kallen_bedroom_google_speaker_day_volume') }}
-            {% elif who in ['emma_bedroom','media_player.emma_bedroom_speaker'] %}
+            {% elif who in ['emma_bedroom','media_player.emma_bedroom_google_speaker'] %}
               {{ states('input_number.emma_bedroom_google_speaker_day_volume') }}
             {% elif who in ['Basement Google','basement_google'] %}
               {{ states('input_number.basement_google_speaker_day_volume') }}
@@ -1370,16 +1370,16 @@ script:
         entity_id: >-
           {% if who in ['Everywhere','everywhere','kids_bedrooms','all_bedrooms'] %}
             {% if is_state('input_boolean.emma_sleeping','on') and is_state('input_boolean.kallen_sleeping','off') %}
-              media_player.kallen_bedroom_speaker
+              media_player.kallen_bedroom_google_speaker
             {% elif is_state('input_boolean.kallen_sleeping','on') and is_state('input_boolean.emma_sleeping','off') %}
-              media_player.emma_bedroom_speaker
+              media_player.emma_bedroom_google_speaker
             {% else %}
               group.kids_bedroom_speakers
             {% endif %}
-          {% elif who in ['kallen_bedroom','media_player.kallen_bedroom_speaker'] %}
-            media_player.kallen_bedroom_speaker
-          {% elif who in ['emma_bedroom','media_player.emma_bedroom_speaker'] %}
-            media_player.emma_bedroom_speaker
+          {% elif who in ['kallen_bedroom','media_player.kallen_bedroom_google_speaker'] %}
+            media_player.kallen_bedroom_google_speaker
+          {% elif who in ['emma_bedroom','media_player.emma_bedroom_google_speaker'] %}
+            media_player.emma_bedroom_google_speaker
           {% elif who in ['Basement Google','basement_google'] %}
             media_player.basement_google_speaker
           {% endif %}
@@ -1395,8 +1395,8 @@ script:
     - service: media_player.turn_on
       data:
         entity_id: >
-          {% if who in ['kallen_bedroom','media_player.kallen_bedroom_speaker'] %}
-            media_player.kallen_bedroom_speaker
+          {% if who in ['kallen_bedroom','media_player.kallen_bedroom_google_speaker'] %}
+            media_player.kallen_bedroom_google_speaker
           {% else %}
             {% if states.input_boolean.audible_notifications.state == 'on' %}
             media_player.living_room_tv
@@ -1407,8 +1407,8 @@ script:
     - service: media_player.volume_set
       data:
         entity_id: >
-          {% if who in ['kallen_bedroom','media_player.kallen_bedroom_speaker'] %}
-            media_player.kallen_bedroom_speaker
+          {% if who in ['kallen_bedroom','media_player.kallen_bedroom_google_speaker'] %}
+            media_player.kallen_bedroom_google_speaker
           {% else %}
             {% if states.input_boolean.audible_notifications.state == 'on' %}
             media_player.living_room_tv
@@ -1425,8 +1425,8 @@ script:
     - service: tts.cloud_say
       data:
         entity_id: >
-          {% if who in ['kallen_bedroom','media_player.kallen_bedroom_speaker'] %}
-            media_player.kallen_bedroom_speaker
+          {% if who in ['kallen_bedroom','media_player.kallen_bedroom_google_speaker'] %}
+            media_player.kallen_bedroom_google_speaker
           {% else %}
             {% if states.input_boolean.audible_notifications.state == 'on' %}
             media_player.living_room_tv