diff --git a/packages/notify.yaml b/packages/notify.yaml
index 69230d8..7f63844 100644
--- a/packages/notify.yaml
+++ b/packages/notify.yaml
@@ -602,19 +602,14 @@ script:
           {% elif who in ['basement','basement_echo_dot'] %}
             media_player.basement_echo_dot
           {% elif who in ['common'] %}
-            media_player.common_areas
+            group.common_areas
           {% elif who in ['Everywhere','everywhere'] %}
-            media_player.everywhere
+            group.alexa_everywhere
           {% else %}
             media_player.living_room_echo_dot
           {% endif %}
         data:
-          type: >
-            {% if who in ['common','Everywhere','everywhere'] %}
-              announce
-            {% else %}
-              tts
-            {% endif %}
+          type: tts
 
   # Default audible notifications. Notifcations play on the google devices. 
   jarvis_voice: