diff --git a/config/automation/garage_entry_light.yaml b/config/automation/garage_entry_light.yaml
index 1fa1b4bb..fa89e0a2 100755
--- a/config/automation/garage_entry_light.yaml
+++ b/config/automation/garage_entry_light.yaml
@@ -8,7 +8,7 @@
   hide_entity: True
   trigger:
     - platform: state
-      entity_id: binary_sensor.kitchen_door_opened
+      entity_id: binary_sensor.kitchen_door
       to: 'on'
     - platform: state
       entity_id: binary_sensor.mcu1_gpio12
@@ -34,7 +34,7 @@
       for:
         seconds: 15
     - platform: state
-      entity_id: binary_sensor.kitchen_door_opened
+      entity_id: binary_sensor.kitchen_door
       to: 'off'
       for:
         seconds: 15
@@ -44,7 +44,7 @@
       entity_id: binary_sensor.mcu1_gpio12
       state: 'off'
     - condition: state
-      entity_id: binary_sensor.kitchen_door_opened
+      entity_id: binary_sensor.kitchen_door
       state: 'off'
     - condition: state
       entity_id: light.garage_hallway
@@ -63,10 +63,10 @@
       to: 'on'
       for: '00:20:00'
     - platform: state
-      entity_id: binary_sensor.hallway_pantry_opened
+      entity_id: binary_sensor.hallway_pantry
       to: 'off'
     - platform: state
-      entity_id: binary_sensor.hallway_linen_opened
+      entity_id: binary_sensor.hallway_linen
       to: 'off'
 
   condition:
diff --git a/config/automation/zwave_hallway_door_sensor.yaml b/config/automation/zwave_hallway_door_sensor.yaml
index 9a935554..283e8e9e 100755
--- a/config/automation/zwave_hallway_door_sensor.yaml
+++ b/config/automation/zwave_hallway_door_sensor.yaml
@@ -8,10 +8,10 @@
   hide_entity: True
   trigger:
     - platform: state
-      entity_id: binary_sensor.hallway_pantry_opened
+      entity_id: binary_sensor.hallway_pantry
       to: 'on'
     - platform: state
-      entity_id: binary_sensor.hallway_linen_opened
+      entity_id: binary_sensor.hallway_linen
       to: 'on'
 
   condition:
@@ -38,10 +38,10 @@
   hide_entity: True
   trigger:
     - platform: state
-      entity_id: binary_sensor.hallway_pantry_opened
+      entity_id: binary_sensor.hallway_pantry
       to: 'off'
     - platform: state
-      entity_id: binary_sensor.hallway_linen_opened
+      entity_id: binary_sensor.hallway_linen
       to: 'off'
 
   action:
@@ -57,10 +57,10 @@
       to: 'on'
       for: '00:20:00'
     - platform: state
-      entity_id: binary_sensor.hallway_pantry_opened
+      entity_id: binary_sensor.hallway_pantry
       to: 'off'
     - platform: state
-      entity_id: binary_sensor.hallway_linen_opened
+      entity_id: binary_sensor.hallway_linen
       to: 'off'
 
   condition:
diff --git a/config/customize/binary_sensors.yaml b/config/customize/binary_sensors.yaml
index 4f131aa4..5cbc2f59 100755
--- a/config/customize/binary_sensors.yaml
+++ b/config/customize/binary_sensors.yaml
@@ -70,7 +70,7 @@ binary_sensor.entry_alarm_panel:
 
 
 
-binary_sensor.hallway_linen_opened:
+binary_sensor.hallway_linen:
   friendly_name: 'Hallway Linen Door'
   
   hidden: False
@@ -88,7 +88,7 @@ binary_sensor.hallway_nest_protect_kids_hallway_online:
 
 
 
-binary_sensor.hallway_pantry_opened:
+binary_sensor.hallway_pantry:
   friendly_name: 'Hallway Pantry Door'
   
   hidden: False
@@ -115,7 +115,7 @@ binary_sensor.justins_room_nest_protect_online:
 
 
 
-binary_sensor.kitchen_door_opened:
+binary_sensor.kitchen_door:
   friendly_name: 'Kitchen Door'
   
   hidden: False
diff --git a/config/group/doors.yaml b/config/group/doors.yaml
index 18128d61..6e298b4d 100755
--- a/config/group/doors.yaml
+++ b/config/group/doors.yaml
@@ -1,8 +1,8 @@
 doors:
   name: Doors
   entities:
-    - binary_sensor.hallway_linen_opened
-    - binary_sensor.hallway_pantry_opened
-    - binary_sensor.kitchen_door_opened
+    - binary_sensor.hallway_linen
+    - binary_sensor.hallway_pantry
+    - binary_sensor.kitchen_door
     - binary_sensor.MCU2_GPIO12 # Main Slider
     - binary_sensor.MCU3_Light  # Alarm Door
diff --git a/config/packages/alarm.yaml b/config/packages/alarm.yaml
index 00e2ab01..ba195515 100755
--- a/config/packages/alarm.yaml
+++ b/config/packages/alarm.yaml
@@ -202,7 +202,7 @@ group:
       - binary_sensor.MCU3_GPIO14
   # interior_door: - Moved out to Doors Group.
   #   entities:
-  #     - binary_sensor.kitchen_door_opened
+  #     - binary_sensor.kitchen_door
   #     - binary_sensor.MCU3_Light
 #-------------------------------------------#-------------------------------------------
 automation:
diff --git a/config/www/custom_ui/floorplan/alarm.svg b/config/www/custom_ui/floorplan/alarm.svg
index d07a16e0..6824d212 100755
--- a/config/www/custom_ui/floorplan/alarm.svg
+++ b/config/www/custom_ui/floorplan/alarm.svg
@@ -725,7 +725,7 @@
 			M775.4,283.4h-1.7c-1.1,0-2-1.5-2-3.4v-28.8c0-1.9,0.9-3.4,2-3.4h1.7c1.1,0,2,1.5,2,3.4V280C777.4,281.9,776.5,283.4,775.4,283.4z
 			"/>
 		
-			<path id="binary_sensor.kitchen_door_opened" inkscape:connector-curvature="0" inkscape:label="#rect449" style="fill:#29D9C2;" d="
+			<path id="binary_sensor.kitchen_door" inkscape:connector-curvature="0" inkscape:label="#rect449" style="fill:#29D9C2;" d="
 			M647.2,243.6h-1.7c-1.1,0-2-0.7-2-1.5v-13c0-0.8,0.9-1.5,2-1.5h1.7c1.1,0,2,0.7,2,1.5v13C649.2,242.9,648.3,243.6,647.2,243.6z"/>
 		<path id="binary_sensor.mcu1_gpio12" inkscape:connector-curvature="0" inkscape:label="#rect449" style="fill:#29D9C2;" d="
 			M647.8,182.7V181c0-1.1,0.8-2,1.8-2H665c1,0,1.8,0.9,1.8,2v1.7c0,1.1-0.8,2-1.8,2h-15.4C648.6,184.8,647.8,183.9,647.8,182.7z"/>
diff --git a/config/www/custom_ui/floorplan/alarm.yaml b/config/www/custom_ui/floorplan/alarm.yaml
index 788ef3fb..fa895fab 100755
--- a/config/www/custom_ui/floorplan/alarm.yaml
+++ b/config/www/custom_ui/floorplan/alarm.yaml
@@ -203,7 +203,7 @@ rules:
       - binary_sensor.mcu3_gpio5
       - binary_sensor.mcu3_gpio10
       - binary_sensor.mcu3_gpio14
-      - binary_sensor.kitchen_door_opened
+      - binary_sensor.kitchen_door
       - binary_sensor.mcu3_light
     states:
       - state: 'off'
diff --git a/config/www/custom_ui/floorplan/floorplan_original.svg b/config/www/custom_ui/floorplan/floorplan_original.svg
index 295d47d2..c0f75f46 100755
--- a/config/www/custom_ui/floorplan/floorplan_original.svg
+++ b/config/www/custom_ui/floorplan/floorplan_original.svg
@@ -5933,7 +5933,7 @@
        inkscape:label="#rect1241" />
     <rect
        style="fill:#00ffff;fill-opacity:1;stroke-width:0.35783061"
-       id="binary_sensor.kitchen_door_opened"
+       id="binary_sensor.kitchen_door"
        width="5.8747706"
        height="22.748257"
        x="24.94154"