Cleaning up devices

customize.yaml

@@ -67,7 +67,7 @@ device_tracker.owntracks_jeffreysphone:
   #icon: mdi:human-male
   entity_picture: !secret JEFF_ICON
   friendly_name: Jeff
-device_tracker.jeffreysiphone:
+device_tracker.jeffreystonesiphone:
   #icon: mdi:human-male
   entity_picture: !secret JEFF_ICON
   friendly_name: Jeff

groups.yaml

@@ -45,12 +45,12 @@ environment:
 
 ### Grops ###
 Family:
-    - device_tracker.jeffreysiphone
+    - device_tracker.jeffreystonesiphone
     - device_tracker.katherinesiphone
 
 Jeffrey:
-    - device_tracker.jeffreysiphone
-    - sensor.jeff_phone_battery
+    - device_tracker.jeffreystonesiphone
+    - sensor.jeff_iphone_batt
     - sensor.jeff_ett_home
     - input_select.jeff_status
 

sensors/devices.yaml

@@ -71,8 +71,8 @@
       jeff_iphone_batt:
         unit_of_measurement: '%'
         value_template: >-
-            {%- if states.device_tracker.jeffreysiphone.attributes.battery %}
-                {{ states.device_tracker.jeffreysiphone.attributes.battery | round(1) }}
+            {%- if states.device_tracker.jeffreystonsiphone.attributes.battery %}
+                {{ states.device_tracker.jeffreystonesiphone.attributes.battery | round(1) }}
             {% else %}
                 {{ states.sensor.jeff_iphone_batt.state }}
             {%- endif %}