diff --git a/homeassistant/components/chromecast.py b/homeassistant/components/chromecast.py
index 27b7b81196e..1604e72f950 100644
--- a/homeassistant/components/chromecast.py
+++ b/homeassistant/components/chromecast.py
@@ -15,7 +15,7 @@ DEPENDENCIES = []
 SERVICE_YOUTUBE_VIDEO = 'play_youtube_video'
 
 ENTITY_ID_FORMAT = DOMAIN + '.{}'
-STATE_NO_APP = 'no_app'
+STATE_NO_APP = 'idle'
 
 ATTR_STATE = 'state'
 ATTR_OPTIONS = 'options'
diff --git a/homeassistant/components/device_tracker.py b/homeassistant/components/device_tracker.py
index df2fbb99de6..83fa1f176fb 100644
--- a/homeassistant/components/device_tracker.py
+++ b/homeassistant/components/device_tracker.py
@@ -25,7 +25,7 @@ DEPENDENCIES = []
 
 SERVICE_DEVICE_TRACKER_RELOAD = "reload_devices_csv"
 
-GROUP_NAME_ALL_DEVICES = 'all_tracked_devices'
+GROUP_NAME_ALL_DEVICES = 'all_devices'
 ENTITY_ID_ALL_DEVICES = group.ENTITY_ID_FORMAT.format(
     GROUP_NAME_ALL_DEVICES)