diff --git a/homeassistant/components/device_sun_light_trigger.py b/homeassistant/components/device_sun_light_trigger.py
index a8f8fd11519..a5dc5b2e302 100644
--- a/homeassistant/components/device_sun_light_trigger.py
+++ b/homeassistant/components/device_sun_light_trigger.py
@@ -31,11 +31,12 @@ def setup(hass, config):
     disable_turn_off = 'disable_turn_off' in config[DOMAIN]
 
     light_group = config[DOMAIN].get(CONF_LIGHT_GROUP,
-                                     light.GROUP_NAME_ALL_LIGHTS)
+                                     'group.' + light.GROUP_NAME_ALL_LIGHTS)
 
     light_profile = config[DOMAIN].get(CONF_LIGHT_PROFILE, LIGHT_PROFILE)
 
-    device_group = config[DOMAIN].get(CONF_LIGHT_GROUP,
+    device_group = config[DOMAIN].get(CONF_DEVICE_GROUP,
+                                      'group.' +
                                       device_tracker.GROUP_NAME_ALL_DEVICES)
 
     logger = logging.getLogger(__name__)