Sync with upstream

1bd621b1

automations/maybe-an-earthquake.yaml

@@ -27,7 +27,7 @@ action:
       - scene.da_bright
       - scene.lr_bright
       - scene.office_bright
-      - scene.ericks_desk_lamp_relax
+      - scene.erick_s_desk_lamp_relax
       - scene.master_bedroom_bright
       - scene.master_bath_bright
       - scene.balcony_bright

automations/scenes-ericks-desk-lamp.yaml

@@ -28,17 +28,17 @@ action:
     data_template:
       entity_id: >
         {% if is_state( "input_select.scene_ericks_desk_lamp", "Nightlight" ) %}
-          scene.ericks_desk_lamp_nightlight
+          scene.erick_s_desk_lamp_nightlight
         {%-elif is_state( "input_select.scene_ericks_desk_lamp", "Dimmed" ) %}
-          scene.ericks_desk_lamp_dimmed
+          scene.erick_s_desk_lamp_dimmed
         {%-elif is_state( "input_select.scene_ericks_desk_lamp", "Relax" ) %}
-          scene.ericks_desk_lamp_relax
+          scene.erick_s_desk_lamp_relax
         {%-elif is_state( "input_select.scene_ericks_desk_lamp", "Read" ) %}
-          scene.ericks_desk_lamp_read
+          scene.erick_s_desk_lamp_read
         {%-elif is_state( "input_select.scene_ericks_desk_lamp", "Bright" ) %}
-          scene.ericks_desk_lamp_concentrate
+          scene.erick_s_desk_lamp_concentrate
         {%-elif is_state( "input_select.scene_ericks_desk_lamp", "Off" ) %}
-          scene.ericks_desk_lamp_off
+          scene.erick_s_desk_lamp_off
         {% endif %}
   - service: input_select.select_option
     data:

customizations/scenes.yaml

@@ -88,13 +88,13 @@ scene.office_concentrate:
 scene.office_off:
   friendly_name: 'Off'
   icon: mdi:flashlight-off
-scene.ericks_desk_lamp_nightlight:
+scene.erick_s_desk_lamp_nightlight:
   friendly_name: 'Desk Lamp Dim'
   icon: mdi:brightness-3
-scene.ericks_desk_lamp_relax:
+scene.erick_s_desk_lamp_relax:
   friendly_name: 'Desk Lamp Bright'
   icon: mdi:brightness-1
-scene.ericks_desk_lamp_off:
+scene.erick_s_desk_lamp_off:
   friendly_name: 'Desk Lamp Off'
   icon: mdi:flashlight-off
 scene.balcony_nightlight: