diff --git a/group/views.yaml b/group/views.yaml
index 6603b9df..1870f8ae 100755
--- a/group/views.yaml
+++ b/group/views.yaml
@@ -9,17 +9,18 @@ default_view:
     - group.weather
     - group.amps
     - group.holiday
-    - group.Bedroom
-    - group.Kitchen
-    - group.Dinette
-    - group.living_room
+    - group.Bedroom_lights
+    - group.Kitchen_lights
+    - group.Dinette_lights
+    - group.living_room_lights
     - group.living_room_accents
-    - group.dining_room
-    - group.foyer
-    - group.upstairs
-    - group.den
-    - group.office
-    - group.garage
+    - group.dining_room_lights
+    - group.foyer_lights
+    - group.upstairs_lights
+    - group.den_lights
+    - group.office_lights
+    - group.garage_lights
+    - group.outside_pool_lights
 
 Lights:
   view: yes
@@ -27,18 +28,19 @@ Lights:
   entities:
     - group.home_modes
     - group.amps
-    - group.holiday
-    - group.Bedroom
-    - group.Kitchen
-    - group.Dinette
-    - group.living_room
+    - group.holiday_lights
+    - group.Bedroom_lights
+    - group.Kitchen_lights
+    - group.Dinette_lights
+    - group.living_room_lights
     - group.living_room_accents
-    - group.dining_room
-    - group.foyer
-    - group.upstairs
-    - group.den
-    - group.office
-    - group.garage
+    - group.dining_room_lights
+    - group.foyer_lights
+    - group.upstairs_lights
+    - group.den_lights
+    - group.office_lights
+    - group.garage_lights
+    - group.outside_pool_lights
     
 Info:
   view: yes