diff --git a/automations/files/bathroom-button.yaml b/automations/files/bathroom-button.yaml
index 1433291..f2c1025 100644
--- a/automations/files/bathroom-button.yaml
+++ b/automations/files/bathroom-button.yaml
@@ -1,5 +1,5 @@
 - id: button-bathroom-on
-  alias: Button On computer cave
+  alias: '[Bathroom] Button On'
   trigger:
     - device_id: 800c754de6e6b10259f371adc123b909
       domain: zha
diff --git a/automations/files/bathroom-mirror-button.yaml b/automations/files/bathroom-mirror-button.yaml
index b75d888..53ead55 100644
--- a/automations/files/bathroom-mirror-button.yaml
+++ b/automations/files/bathroom-mirror-button.yaml
@@ -1,5 +1,5 @@
 - id: button-bathroom-mirror-on
-  alias: Button On computer cave
+  alias: '[Bathroom] Mirror Button On'
   trigger:
     - device_id: 4d5298037e93ba11438409bff01b5005
       domain: zha
@@ -16,7 +16,7 @@
           - light.mirror_right
   mode: single
 - id: button-bathroom-mirror-off
-  alias: Button Off computer cave
+  alias: '[Bathroom] Mirror Button Off'
   trigger:
     - device_id: 4d5298037e93ba11438409bff01b5005
       domain: zha
diff --git a/automations/files/bathroom-motion.yaml b/automations/files/bathroom-motion.yaml
index 0929dfa..3a2e5df 100644
--- a/automations/files/bathroom-motion.yaml
+++ b/automations/files/bathroom-motion.yaml
@@ -1,5 +1,5 @@
 - id: bathroom-motion-on
-  alias: Bathroom Motion On
+  alias: '[Bathroom] Motion On'
   mode: restart
   trigger:
     - platform: state
@@ -14,7 +14,7 @@
         - light.bathroom_3
         - light.bathroom_4
 - id: bathroom-motion-off
-  alias: Bathroom Motion Off
+  alias: '[Bathroom] Motion Off'
   mode: restart
   trigger:
     - platform: state
diff --git a/automations/files/bathroom-shower-motion.yaml b/automations/files/bathroom-shower-motion.yaml
index 32c6e96..ccfb6b8 100644
--- a/automations/files/bathroom-shower-motion.yaml
+++ b/automations/files/bathroom-shower-motion.yaml
@@ -1,5 +1,5 @@
 - id: bathroom-shower-motion-on
-  alias: Bathroom Shower Motion On
+  alias: '[Bathroom] Shower Motion On'
   mode: restart
   trigger:
     - platform: state
@@ -14,7 +14,7 @@
         - light.shower_3
         - light.shower_4
 - id: bathroom-shower-motion-off
-  alias: Bathroom Shower Motion Off
+  alias: '[Bathroom] Shower Motion Off'
   mode: restart
   trigger:
     - platform: state
diff --git a/automations/files/bedroom-humidifier.yaml b/automations/files/bedroom-humidifier.yaml
index 341c1a7..9d90f43 100644
--- a/automations/files/bedroom-humidifier.yaml
+++ b/automations/files/bedroom-humidifier.yaml
@@ -1,5 +1,5 @@
 - id: humidifier_on
-  alias: Turn on humidifier
+  alias: '[Bedroom] Turn on humidifier'
   trigger:
     - platform: numeric_state
       entity_id: sensor.ble_humidity_bedroom_sensor
@@ -11,7 +11,7 @@
   mode: single
 
 - id: humidifier_off
-  alias: Turn on humidifier
+  alias: '[Bedroom] Turn on humidifier'
   trigger:
     - platform: numeric_state
       entity_id: sensor.ble_humidity_bedroom_sensor
diff --git a/automations/files/computer-button.yaml b/automations/files/computer-button.yaml
index d3ddd7e..539ba0f 100644
--- a/automations/files/computer-button.yaml
+++ b/automations/files/computer-button.yaml
@@ -1,5 +1,5 @@
 - id: button-computer-cave-on
-  alias: Button On computer cave
+  alias: '[Computer Cave] Button On'
   trigger:
     - device_id: 5b972523e427721ec88e095994f7cc16
       domain: zha
@@ -13,7 +13,7 @@
         entity_id: light.desk_lamp
   mode: single
 - id: button-computer-cave-off
-  alias: Button Off computer cave
+  alias: '[Computer Cave] Button Off'
   trigger:
     - device_id: 5b972523e427721ec88e095994f7cc16
       domain: zha
@@ -27,7 +27,7 @@
         entity_id: light.desk_lamp
   mode: single
 - id: button-computer-cave-hold-on
-  alias: Button Hold On computer cave
+  alias: '[Computer Cave] Button Hold On'
   trigger:
     - platform: event
       event_type: zha_event
@@ -44,7 +44,7 @@
           - light.tv_right
   mode: single
 - id: button-computer-cave-hold-off
-  alias: Button Hold Off computer cave
+  alias: '[Computer Cave] Button Hold Off'
   trigger:
     - platform: event
       event_type: zha_event
diff --git a/automations/files/computer-lights.yaml b/automations/files/computer-lights.yaml
index 483572e..407a3bf 100644
--- a/automations/files/computer-lights.yaml
+++ b/automations/files/computer-lights.yaml
@@ -1,5 +1,5 @@
 - id: computer_off
-  alias: Turning computer off automation
+  alias: '[Computer Cave] Turning computer off automation'
   description: ''
   trigger:
     - platform: state
diff --git a/automations/files/kitchen-button.yaml b/automations/files/kitchen-button.yaml
index 91b2835..4b8f870 100644
--- a/automations/files/kitchen-button.yaml
+++ b/automations/files/kitchen-button.yaml
@@ -1,5 +1,5 @@
 - id: button-kitchen-on
-  alias: Button On computer cave
+  alias: '[Kitchen] Button On'
   trigger:
     - device_id: a47c928b108240ed8866f9f7a70bc844
       domain: zha
@@ -13,7 +13,7 @@
         entity_id: light.kitchen_sink_lighstrip
   mode: single
 - id: button-kitchen-off
-  alias: Button Off computer cave
+  alias: '[Kitchen] Button Off'
   trigger:
     - device_id: a47c928b108240ed8866f9f7a70bc844
       domain: zha
@@ -27,7 +27,7 @@
         entity_id: light.kitchen_sink_lighstrip
   mode: single
 - id: button-kitchen-hold-on
-  alias: Button Hold On computer cave
+  alias: '[Kitchen] Button Hold On'
   trigger:
     - platform: event
       event_type: zha_event
@@ -55,7 +55,7 @@
           - light.kitchen_14
   mode: single
 - id: button-kitchen-hold-off
-  alias: Button Hold Off computer cave
+  alias: '[Kitchen] Button Hold Off'
   trigger:
     - platform: event
       event_type: zha_event