diff --git a/config/lovelace/advanced_dashboard/02_lights.yaml b/config/lovelace/advanced_dashboard/02_lights.yaml
index be7f2c2..0f17059 100644
--- a/config/lovelace/advanced_dashboard/02_lights.yaml
+++ b/config/lovelace/advanced_dashboard/02_lights.yaml
@@ -85,12 +85,12 @@ cards:
                 type: custom:decluttering-card
                 template: light_with_fade_and_switch
                 variables:
-                  - light: light.light_lohas_2
-                  - fade: switch.light_lohas_2
-                  - wifi: sensor.light_lohas_2_wifi
+                  - light: light.neo_1
+                  - fade: switch.neo_1
+                  - wifi: sensor.neo_1_wifi
               entities:
                 - type: custom:slider-entity-row
-                  entity: light.light_lohas_2
+                  entity: light.neo_1
                   name: Brightness
                   hide_state: true
                   step: 5
diff --git a/config/lovelace/home_dashboard/living_room_dashboard.yaml b/config/lovelace/home_dashboard/living_room_dashboard.yaml
index d2fc361..6b7fdf8 100644
--- a/config/lovelace/home_dashboard/living_room_dashboard.yaml
+++ b/config/lovelace/home_dashboard/living_room_dashboard.yaml
@@ -114,7 +114,7 @@
                 name: Ambient Main
               - type: custom:button-card
                 template: v3_button
-                entity: light.light_lohas_2
+                entity: light.neo_1
                 name: Ambient 2nd
           - type: horizontal-stack
             cards:
diff --git a/config/packages/modules/lighting/areas/living_room.yaml b/config/packages/modules/lighting/areas/living_room.yaml
index b41c6fa..07316b9 100644
--- a/config/packages/modules/lighting/areas/living_room.yaml
+++ b/config/packages/modules/lighting/areas/living_room.yaml
@@ -66,7 +66,7 @@ scene:
   - name: Living Room Ambient Christmas
     icon: mdi:pine-tree
     entities:
-      light.light_lohas_2:
+      light.neo_1:
         state: "on"
         rgb_color: [0, 255, 0]
         brightness_pct: 100
@@ -77,7 +77,7 @@ scene:
   - name: Living Room Ambient Neon
     icon: "mdi:weather-night"
     entities:
-      light.light_lohas_2:
+      light.neo_1:
         state: "on"
         xy_color: [0.668, 0.284]
         brightness_pct: 80
@@ -88,7 +88,7 @@ scene:
   - name: Living Room Ambient Default
     icon: "mdi:weather-sunny"
     entities:
-      light.light_lohas_2:
+      light.neo_1:
         state: "on"
         color_temp: 500
         brightness_pct: 100
diff --git a/config/packages/modules/lighting/color_mode.yaml b/config/packages/modules/lighting/color_mode.yaml
index f974865..885d3b6 100644
--- a/config/packages/modules/lighting/color_mode.yaml
+++ b/config/packages/modules/lighting/color_mode.yaml
@@ -64,7 +64,7 @@ automation:
           brightness_pct: 40
       - service: light.turn_on
         entity_id:
-          - light.light_lohas_2 # living room ambient Secondary
+          - light.neo_1 # living room ambient Secondary
           - light.hue_1 # Hallway
         data:
           rgb_color: [0, 0, 255]
diff --git a/config/packages/modules/lighting/setup/groups.yaml b/config/packages/modules/lighting/setup/groups.yaml
index 5f866df..bc610b9 100644
--- a/config/packages/modules/lighting/setup/groups.yaml
+++ b/config/packages/modules/lighting/setup/groups.yaml
@@ -12,7 +12,7 @@ light:
     name: Living room ambient
     entities:
       - light.living_room_ambient_main
-      - light.light_lohas_2
+      - light.neo_1
 
   - platform: group
     name: Living room
@@ -23,7 +23,7 @@ light:
       - light.light_le_4
       - light.hue_ambiance_7
       - light.living_room_ambient_main
-      - light.light_lohas_2
+      - light.neo_1
 
   # - platform: group
   #   name: Master bedroom main
@@ -97,7 +97,7 @@ light:
       - light.hue_ambiance_7
       # LR ambiance
       - light.living_room_ambient_main
-      - light.light_lohas_2
+      - light.neo_1
 
       - light.master_bedroom_main
       - light.bedside
@@ -116,7 +116,7 @@ script:
         - light.hue_ambiance_7
         # LR ambiance
         - light.living_room_ambient_main
-        - light.light_lohas_2
+        - light.neo_1
         - light.master_bedroom_main
         - light.bedside
 
@@ -135,7 +135,7 @@ script:
         - light.hue_ambiance_7
         # LR ambiance
         - light.living_room_ambient_main
-        - light.light_lohas_2
+        - light.neo_1
         - light.master_bedroom_main
         - light.bedside
 
@@ -158,7 +158,7 @@ homeassistant:
 
     light.living_room_ambient:
       icon: mdi:floor-lamp-dual
-    light.light_lohas_2:
+    light.neo_1:
       friendly_name: Living room ambient secondary
 
     # Master bedroom
diff --git a/config/packages/modules/media/plex.yaml b/config/packages/modules/media/plex.yaml
index 16a35cd..51a44f8 100644
--- a/config/packages/modules/media/plex.yaml
+++ b/config/packages/modules/media/plex.yaml
@@ -65,7 +65,7 @@ script:
             - light.living_room_main
             - light.hue_ambiance_7
             - light.living_room_ambient_main
-            - light.light_lohas_2
+            - light.neo_1
             - light.hallway
             - light.master_bedroom_main
             - light.kitchen
@@ -77,7 +77,7 @@ script:
         entity_id:
           - light.hue_ambiance_7
           - light.living_room_ambient_main
-          - light.light_lohas_2
+          - light.neo_1
       - service: light.turn_off
         entity_id:
           - light.master_bedroom_main