diff --git a/config/automation/System/watchdog_light.yaml b/config/automation/System/watchdog_light.yaml
index 2788eb06..c273a4a2 100755
--- a/config/automation/System/watchdog_light.yaml
+++ b/config/automation/System/watchdog_light.yaml
@@ -8,7 +8,7 @@
     - platform: state
       entity_id:
         - light.hallway_lights
-        - light.foyer_lights
+        - light.foyer
       to: 'on'
       for: '00:20:00'
 
@@ -52,4 +52,4 @@
           - light.flood_2
           - light.hallway
           - light.hallway_lights
-          - light.foyer_lights
+          - light.foyer
diff --git a/config/configuration.yaml b/config/configuration.yaml
index 977de21c..05009d7d 100755
--- a/config/configuration.yaml
+++ b/config/configuration.yaml
@@ -40,7 +40,7 @@ cloud:
         - light.den_lights
         - light.dinette_lights
         - light.dining_room_lights
-        - light.foyer_lights
+        - light.foyer
         - light.garage_lights
         - light.hallway_lights
         - light.living_room_accents
diff --git a/config/group/Indoor_Outdoor.yaml b/config/group/Indoor_Outdoor.yaml
index 6a749c84..8078cb2e 100755
--- a/config/group/Indoor_Outdoor.yaml
+++ b/config/group/Indoor_Outdoor.yaml
@@ -8,7 +8,7 @@ Interior_Lights:
     - light.den1
     - light.dinette_lights
     - light.dining_room_lights
-    - light.foyer_lights
+    - light.foyer
     - light.garage_lights
     - light.hallway_lights
     - light.kitchen_lights
diff --git a/config/homekit.yaml b/config/homekit.yaml
index 9880b57f..f037ec0a 100755
--- a/config/homekit.yaml
+++ b/config/homekit.yaml
@@ -35,7 +35,7 @@ filter:
     - light.den_lights
     - light.dinette_lights
     - light.dining_room_lights
-    - light.foyer_lights
+    - light.foyer
     - light.garage_lights
     - light.hallway_lights
     - light.kitchen_lights
diff --git a/config/light_groups.yaml b/config/light_groups.yaml
index e6822cae..26f4d942 100755
--- a/config/light_groups.yaml
+++ b/config/light_groups.yaml
@@ -57,7 +57,7 @@
 #     - light.den_lamp
 
 - platform: group
-  name: Foyer lights
+  name: Foyer
   entities:
     - light.f1
     - light.f2