diff --git a/configuration/automations/hallway-doorbell.yaml b/configuration/automations/front-door-doorbell.yaml
similarity index 82%
rename from configuration/automations/hallway-doorbell.yaml
rename to configuration/automations/front-door-doorbell.yaml
index 17dc3a1..5e408f2 100644
--- a/configuration/automations/hallway-doorbell.yaml
+++ b/configuration/automations/front-door-doorbell.yaml
@@ -1,5 +1,5 @@
 - id: front-door-doorbell
-  alias: '[Hallway] Doorbell'
+  alias: '[Front door] Doorbell'
   mode: restart
   trigger:
     - platform: state
@@ -17,8 +17,8 @@
             - action: UNLOCK_DOOR
               title: Unlock door
 
-- id: hallway-doorbell-bell-burn-prevention
-  alias: '[Hallway] Doorbell bell burn prevention'
+- id: font-door-doorbell-bell-burn-prevention
+  alias: '[Front door] Doorbell bell burn prevention'
   mode: restart
   trigger:
     - platform: state
diff --git a/configuration/automations/front-door.yaml b/configuration/automations/front-door.yaml
index af1f185..79588ba 100644
--- a/configuration/automations/front-door.yaml
+++ b/configuration/automations/front-door.yaml
@@ -44,3 +44,15 @@
               title: Lock door
     - service: script.turn_on
       entity_id: script.doorbell_bell
+
+- id: front-door-open-close
+  alias: '[Front Door] Open door'
+  mode: single
+  trigger:
+    - type: opened
+      platform: device
+      device_id: 671a24524db60c56b0a182ac816faf20
+      entity_id: binary_sensor.front_door_open_close
+      domain: binary_sensor
+  action:
+    - service: script.hallway_lights_on
diff --git a/configuration/automations/hallway.yaml b/configuration/automations/hallway.yaml
index dded2c4..485e60a 100644
--- a/configuration/automations/hallway.yaml
+++ b/configuration/automations/hallway.yaml
@@ -86,14 +86,3 @@
   action:
     - service: script.hallway_lights_off
 
-- id: hallway-open-close
-  alias: '[Hallway] Open door'
-  mode: single
-  trigger:
-    - type: opened
-      platform: device
-      device_id: 671a24524db60c56b0a182ac816faf20
-      entity_id: binary_sensor.front_door_open_close
-      domain: binary_sensor
-  action:
-    - service: script.hallway_lights_on
diff --git a/configuration/automations/notify-slow-internet.yaml b/configuration/automations/info-slow-link.yaml
similarity index 92%
rename from configuration/automations/notify-slow-internet.yaml
rename to configuration/automations/info-slow-link.yaml
index a416984..9053d53 100644
--- a/configuration/automations/notify-slow-internet.yaml
+++ b/configuration/automations/info-slow-link.yaml
@@ -1,4 +1,4 @@
-- id: notify-slow-eth0
+- id: info-slow-eth0
   alias: '[Notify] Slow eth0 link'
   mode: single
   trigger:
@@ -10,7 +10,7 @@
       data:
         message: Internet link fell down to 100 Mbit
 
-- id: notify-slow-eth4
+- id: info-slow-eth4
   alias: '[Notify] Slow eth4 link - WiFi'
   mode: single
   trigger:
diff --git a/configuration/automations/tv-automations.yaml b/configuration/automations/living-room-tv-automations.yaml
similarity index 76%
rename from configuration/automations/tv-automations.yaml
rename to configuration/automations/living-room-tv-automations.yaml
index 4155224..735374b 100644
--- a/configuration/automations/tv-automations.yaml
+++ b/configuration/automations/living-room-tv-automations.yaml
@@ -1,5 +1,5 @@
-- id: tv-volume-notification
-  alias: '[TV] Volume notification'
+- id: living-room-tv-volume-notification
+  alias: '[Living Room][TV] Volume notification'
   mode: single
   trigger:
    - platform: state
@@ -19,8 +19,8 @@
           duration: 1
           color: black
 
-- id: tv-suspend-pc
-  alias: '[TV] When turned on suspend PC'
+- id: living-room-tv-suspend-pc
+  alias: '[Living Room][TV] When turned on suspend PC'
   description: ''
   mode: single
   trigger:
@@ -31,8 +31,8 @@
   action:
     - service: script.pc_sleep
 
-- id: tv-update-harmony-mode
-  alias: '[TV] Update harmony mode'
+- id: living-room-tv-update-harmony-mode
+  alias: '[Living Room][TV] Update harmony mode'
   mode: single
   trigger:
     - platform: state
diff --git a/configuration/automations/computer.yaml b/configuration/automations/office-computer.yaml
similarity index 100%
rename from configuration/automations/computer.yaml
rename to configuration/automations/office-computer.yaml
diff --git a/configuration/automations/alarm-vacation-disarm-andrzej.yaml b/configuration/automations/vacation-alarm-disarm-andrzej.yaml
similarity index 100%
rename from configuration/automations/alarm-vacation-disarm-andrzej.yaml
rename to configuration/automations/vacation-alarm-disarm-andrzej.yaml