From dbefeb3f6b6edcd452ce11a064cca72b2bc76df4 Mon Sep 17 00:00:00 2001
From: Paulus Schoutsen <paulus@paulusschoutsen.nl>
Date: Mon, 19 Jan 2015 23:47:18 -0800
Subject: [PATCH] Fix group names for switch, light and devices

---
 homeassistant/components/device_tracker/__init__.py | 5 ++---
 homeassistant/components/light/__init__.py          | 5 ++---
 homeassistant/components/switch/__init__.py         | 5 ++---
 3 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/homeassistant/components/device_tracker/__init__.py b/homeassistant/components/device_tracker/__init__.py
index f7f4061a9c2..009cf15ad20 100644
--- a/homeassistant/components/device_tracker/__init__.py
+++ b/homeassistant/components/device_tracker/__init__.py
@@ -24,9 +24,8 @@ DEPENDENCIES = []
 
 SERVICE_DEVICE_TRACKER_RELOAD = "reload_devices_csv"
 
-GROUP_NAME_ALL_DEVICES = 'all_devices'
-ENTITY_ID_ALL_DEVICES = group.ENTITY_ID_FORMAT.format(
-    GROUP_NAME_ALL_DEVICES)
+GROUP_NAME_ALL_DEVICES = 'all devices'
+ENTITY_ID_ALL_DEVICES = group.ENTITY_ID_FORMAT.format('all_devices')
 
 ENTITY_ID_FORMAT = DOMAIN + '.{}'
 
diff --git a/homeassistant/components/light/__init__.py b/homeassistant/components/light/__init__.py
index 48e8f862fc7..8db57187331 100644
--- a/homeassistant/components/light/__init__.py
+++ b/homeassistant/components/light/__init__.py
@@ -64,9 +64,8 @@ from homeassistant.components import group, discovery, wink
 DOMAIN = "light"
 DEPENDENCIES = []
 
-GROUP_NAME_ALL_LIGHTS = 'all_lights'
-ENTITY_ID_ALL_LIGHTS = group.ENTITY_ID_FORMAT.format(
-    GROUP_NAME_ALL_LIGHTS)
+GROUP_NAME_ALL_LIGHTS = 'all lights'
+ENTITY_ID_ALL_LIGHTS = group.ENTITY_ID_FORMAT.format('all_lights')
 
 ENTITY_ID_FORMAT = DOMAIN + ".{}"
 
diff --git a/homeassistant/components/switch/__init__.py b/homeassistant/components/switch/__init__.py
index 0b9ca77a498..aa90f4c6148 100644
--- a/homeassistant/components/switch/__init__.py
+++ b/homeassistant/components/switch/__init__.py
@@ -17,9 +17,8 @@ from homeassistant.components import group, discovery, wink
 DOMAIN = 'switch'
 DEPENDENCIES = []
 
-GROUP_NAME_ALL_SWITCHES = 'all_switches'
-ENTITY_ID_ALL_SWITCHES = group.ENTITY_ID_FORMAT.format(
-    GROUP_NAME_ALL_SWITCHES)
+GROUP_NAME_ALL_SWITCHES = 'all switches'
+ENTITY_ID_ALL_SWITCHES = group.ENTITY_ID_FORMAT.format('all_switches')
 
 ENTITY_ID_FORMAT = DOMAIN + '.{}'