diff --git a/configuration/automations/alarm-door-relock.yaml b/configuration/automations/alarm-door-relock.yaml
index 63c1e4d..835feb8 100644
--- a/configuration/automations/alarm-door-relock.yaml
+++ b/configuration/automations/alarm-door-relock.yaml
@@ -3,7 +3,7 @@
   trigger:
     - platform: state
       entity_id:
-        - lock.front_door_25f246fe_door_lock
+        - lock.front_door_lock_doorlock
       to: unlocked
   condition:
     - condition: not
@@ -29,12 +29,12 @@
     - repeat:
         until:
           - condition: state
-            entity_id: lock.front_door_25f246fe_door_lock
+            entity_id: lock.front_door_lock_doorlock
             state: locked
         sequence:
           - service: lock.lock
             target:
-              entity_id: lock.front_door_25f246fe_door_lock
+              entity_id: lock.front_door_lock_doorlock
     - service: notify.mobile_app_iphone
       data:
         title: "Door locked back"
diff --git a/configuration/automations/alarm.yaml b/configuration/automations/alarm.yaml
index bdb5a1a..95d7372 100644
--- a/configuration/automations/alarm.yaml
+++ b/configuration/automations/alarm.yaml
@@ -50,7 +50,7 @@
       to: 'on'
 # Use lock
     - platform: state
-      entity_id: lock.front_door_25f246fe_door_lock
+      entity_id: lock.front_door_lock_doorlock
       to: 'unlocked'
   condition:
     - condition: state
diff --git a/configuration/automations/front-door.yaml b/configuration/automations/front-door.yaml
index 56bea08..61b58d2 100644
--- a/configuration/automations/front-door.yaml
+++ b/configuration/automations/front-door.yaml
@@ -4,7 +4,7 @@
   mode: single
   trigger:
     - platform: state
-      entity_id: lock.front_door_25f246fe_door_lock
+      entity_id: lock.front_door_lock_doorlock
       to: unlocked
       for:
         hours: 0
diff --git a/configuration/automations/hallway-lock-button.yaml b/configuration/automations/hallway-lock-button.yaml
index fa3fcf5..735a20f 100644
--- a/configuration/automations/hallway-lock-button.yaml
+++ b/configuration/automations/hallway-lock-button.yaml
@@ -19,7 +19,7 @@
                   to: 'off'
     - service: lock.lock
       target:
-        entity_id: lock.front_door_25f246fe_door_lock
+        entity_id: lock.front_door_lock_doorlock
 
 - id: hallway-front-door-button-unlock
   alias: '[Front Door] Button Unlock'
@@ -38,4 +38,4 @@
   action:
     - service: lock.unlock
       target:
-        entity_id: lock.front_door_25f246fe_door_lock
+        entity_id: lock.front_door_lock_doorlock
diff --git a/configuration/automations/ios.yaml b/configuration/automations/ios.yaml
index ee415cf..ef80835 100644
--- a/configuration/automations/ios.yaml
+++ b/configuration/automations/ios.yaml
@@ -10,20 +10,20 @@
     - choose:
       - conditions:
           - condition: state
-            entity_id: lock.front_door_25f246fe_door_lock
+            entity_id: lock.front_door_lock_doorlock
             state: locked
         sequence:
           - service: lock.unlock
             target:
-              entity_id: lock.front_door_25f246fe_door_lock
+              entity_id: lock.front_door_lock_doorlock
       - conditions:
           - condition: state
-            entity_id: lock.front_door_25f246fe_door_lock
+            entity_id: lock.front_door_lock_doorlock
             state: unlocked
         sequence:
           - service: lock.lock
             target:
-              entity_id: lock.front_door_25f246fe_door_lock
+              entity_id: lock.front_door_lock_doorlock
 
 - id: ios-good-night
   alias: '[ios] Good Night'
diff --git a/configuration/automations/mobile-actions.yaml b/configuration/automations/mobile-actions.yaml
index 7003924..7d4be0a 100644
--- a/configuration/automations/mobile-actions.yaml
+++ b/configuration/automations/mobile-actions.yaml
@@ -10,7 +10,7 @@
   action:
     - service: lock.lock
       target:
-        entity_id: lock.front_door_25f246fe_door_lock
+        entity_id: lock.front_door_lock_doorlock
 
 - id: mobile_action-unlock_door
   alias: '[Mobile-action] Unlock door'
@@ -24,7 +24,7 @@
   action:
     - service: lock.unlock
       target:
-        entity_id: lock.front_door_25f246fe_door_lock
+        entity_id: lock.front_door_lock_doorlock
 
 - id: mobile_action-leave_home
   alias: '[Mobile-action] Leave home automation'
diff --git a/configuration/automations/nfc.yaml b/configuration/automations/nfc.yaml
index 97629f0..6104563 100644
--- a/configuration/automations/nfc.yaml
+++ b/configuration/automations/nfc.yaml
@@ -7,20 +7,20 @@
     - choose:
         - conditions:
             - condition: state
-              entity_id: lock.front_door_25f246fe_door_lock
+              entity_id: lock.front_door_lock_doorlock
               state: unlocked
           sequence:
             - service: lock.lock
               target:
-                entity_id: lock.front_door_25f246fe_door_lock
+                entity_id: lock.front_door_lock_doorlock
             - service: script.leave_home
         - conditions:
             - condition: state
-              entity_id: lock.front_door_25f246fe_door_lock
+              entity_id: lock.front_door_lock_doorlock
               state: locked
           sequence:
             - service: lock.unlock
               target:
-                entity_id: lock.front_door_25f246fe_door_lock
+                entity_id: lock.front_door_lock_doorlock
             - service: script.arrive_home
   mode: single
diff --git a/scripts/10.modes.yaml b/scripts/10.modes.yaml
index cdc8f9c..37362c7 100644
--- a/scripts/10.modes.yaml
+++ b/scripts/10.modes.yaml
@@ -44,7 +44,7 @@ good_night:
         - cover.office_blinds
     - service: lock.lock
       target:
-        entity_id: lock.front_door_25f246fe_door_lock
+        entity_id: lock.front_door_lock_doorlock
     - choose:
         - conditions:
             - condition: numeric_state
@@ -138,7 +138,7 @@ leave_home:
     - service: script.pc_sleep
     - service: lock.lock
       target:
-        entity_id: lock.front_door_25f246fe_door_lock
+        entity_id: lock.front_door_lock_doorlock
     - service: script.tv_off
     - service: climate.turn_off
       target: