diff --git a/packages/notification/notification.yaml b/packages/notification/notification.yaml
index 306e646..67b5e39 100644
--- a/packages/notification/notification.yaml
+++ b/packages/notification/notification.yaml
@@ -23,7 +23,7 @@ notify:
   - name: security
     platform: group
     services:
-      - service: mobile_app_jp_iphone
+      - service: mobile_app_j_p_s_iphone
         data:
           title: Home Security
           data:
@@ -33,7 +33,7 @@ notify:
   - name: general
     platform: group
     services:
-      - service: mobile_app_jp_iphone
+      - service: mobile_app_j_p_s_iphone
         data:
           title: Home Assistant
 
@@ -41,4 +41,4 @@ notify:
     platform: group
     services:
       - service: mobile_app_jennifer_s_iphone
-      - service: mobile_app_jp_iphone
+      - service: mobile_app_j_p_s_iphone
diff --git a/packages/presence/presence.yaml b/packages/presence/presence.yaml
index ef48b4f..965789f 100644
--- a/packages/presence/presence.yaml
+++ b/packages/presence/presence.yaml
@@ -20,13 +20,13 @@ proximity:
   home:
     devices:
       - device_tracker.jen_iphone
-      - device_tracker.jp_iphone
+      - device_tracker.j_p_s_iphone
     tolerance: 50
     unit_of_measurement: km
 
   jpk:
     devices:
-      - device_tracker.jp_iphone
+      - device_tracker.j_p_s_iphone
     tolerance: 50
     unit_of_measurement: km