diff --git a/alexa/intents.yaml b/alexa/intents.yaml
index 469c4bc..f7032e5 100644
--- a/alexa/intents.yaml
+++ b/alexa/intents.yaml
@@ -3,11 +3,11 @@ intents:
       speech:
         type: plaintext
         text: >
-          {%- if is_state('device_tracker.jarvis_jeffreysphone', 'home') and
+          {%- if is_state('device_tracker.owntracks_jeffreysphone', 'home') and
                  is_state('device_tracker.katheriesiphone', 'home') -%}
             You are both home
           {%- else -%}
-            Jeff is at {{ states("device_tracker.jarvis_jeffreysiphone") }}
+            Jeff is at {{ states("device_tracker.owntracks_jeffreysiphone") }}
             and Kat is at {{ states("device_tracker.katheriesiphone") }}
           {% endif %}
 
@@ -15,13 +15,13 @@ intents:
       speech:
         type: plaintext
         text: >
-          {%- if is_state('device_tracker.jarvis_jeffreysphone', 'home') -%}
+          {%- if is_state('device_tracker.owntracks_jeffreysphone', 'home') -%}
             It appears Jeff is here somewhere
           {%- else -%}
-            {%- if is_state('device_tracker.jarvis_jeffreysphone', 'not_home') -%}
+            {%- if is_state('device_tracker.owntracks_jeffreysphone', 'not_home') -%}
               Jeff is not here
             {%- else -%}
-              Jeff is at {{ states("device_tracker.jarvis_jeffreysphone") }}
+              Jeff is at {{ states("device_tracker.owntracks_jeffreysphone") }}
             {% endif %}
           {% endif %}
 
diff --git a/customize.yaml b/customize.yaml
index d10657b..7bcda32 100644
--- a/customize.yaml
+++ b/customize.yaml
@@ -63,7 +63,7 @@ sensor.dark_sky_visability:
 
 # Devices #
 
-device_tracker.jarvis_jeffreysphone:
+device_tracker.owntracks_jeffreysphone:
   #icon: mdi:human-male
   entity_picture: !secret JEFF_ICON
   friendly_name: Jeff
diff --git a/groups.yaml b/groups.yaml
index 9ae3c3d..2f45343 100644
--- a/groups.yaml
+++ b/groups.yaml
@@ -35,11 +35,11 @@ environment:
 
 ### Grops ###
 Family:
-    - device_tracker.jarvis_jeffreysphone
+    - device_tracker.owntracks_jeffreysphone
     - device_tracker.katheriesiphone
 
 Jeffrey:
-    - device_tracker.jarvis_jeffreysphone
+    - device_tracker.owntracks_jeffreysphone
     - device_tracker.jeffreyonesipad
     - device_tracker.jeffreysmbp
     - device_tracker.jstonemac