diff --git a/Resources/Prototypes/Entities/Structures/Doors/Airlocks/access.yml b/Resources/Prototypes/Entities/Structures/Doors/Airlocks/access.yml
index 7c6fbea9c57..46e84a67532 100644
--- a/Resources/Prototypes/Entities/Structures/Doors/Airlocks/access.yml
+++ b/Resources/Prototypes/Entities/Structures/Doors/Airlocks/access.yml
@@ -1225,11 +1225,11 @@
 
 #Airtight hatch
 
-- type: entity
-  parent: AirlockHatch
-  id: AirlockHatchSyndicate
-  suffix: Syndicate, Locked
-  components:
-  - type: ContainerFill
-    containers:
-      board: [ DoorElectronicsSyndicateAgent ]
+#- type: entity edited by Sunrise, look _Sunrise/Entityes/Structures/Doors/
+#  parent: AirlockHatch
+#  id: AirlockHatchSyndicate
+#  suffix: Syndicate, Locked
+#  components:
+#  - type: ContainerFill
+#    containers:
+#      board: [ DoorElectronicsSyndicateAgent ]
diff --git a/Resources/Prototypes/_Sunrise/Entities/Structures/Doors/Airlocks/Hatches/hatches.yml b/Resources/Prototypes/_Sunrise/Entities/Structures/Doors/Airlocks/Hatches/hatches.yml
index 1bfb7e057cd..5df28faeff1 100644
--- a/Resources/Prototypes/_Sunrise/Entities/Structures/Doors/Airlocks/Hatches/hatches.yml
+++ b/Resources/Prototypes/_Sunrise/Entities/Structures/Doors/Airlocks/Hatches/hatches.yml
@@ -1,5 +1,5 @@
 - type: entity
-  id: AirlockHatchMaint
+  id: AirlockHatchMaintenance
   parent: HighSecDoor
   name: Maintenance Hatch
   description: Protects maintenance tunnels.
@@ -12,14 +12,14 @@
     time: 10
     
 - type: entity
-  id: AirlockHatchCentcomm
+  id: AirlockHatch
   parent: HighSecDoor
-  name: CentCom Hatch
+  name: Hatch
   description: Keeps the bad out and keeps the good in.
   placement:
     mode: SnapgridCenter
   components:
   - type: Sprite
-    sprite: _Sunrise/Structures/Doors/Airlocks/Hatches/centcom_hatch.rsi
+    sprite: _Sunrise/Structures/Doors/Airlocks/Hatches/hatch.rsi
   - type: Weldable
     time: 10
\ No newline at end of file
diff --git a/Resources/Prototypes/_Sunrise/Entities/Structures/Doors/Airlocks/access.yml b/Resources/Prototypes/_Sunrise/Entities/Structures/Doors/Airlocks/access.yml
index d53deee593b..5f347f209f0 100644
--- a/Resources/Prototypes/_Sunrise/Entities/Structures/Doors/Airlocks/access.yml
+++ b/Resources/Prototypes/_Sunrise/Entities/Structures/Doors/Airlocks/access.yml
@@ -27,7 +27,7 @@
       
 #Hatches
 - type: entity
-  parent: AirlockHatchCentcomm
+  parent: AirlockHatch
   id: AirlockHatchCentcommLocked
   name: CentCom Hatch
   suffix: CentCom, Locked
@@ -37,7 +37,7 @@
       
 - type: entity
   parent: AirlockHatchMaint
-  id: AirlockHatchMaintLocked
+  id: AirlockHatchMaintenanceLocked
   name: Maintenance Hatch
   suffix: Maint, Locked
   components:
@@ -45,7 +45,7 @@
       access: [["Maintenance"]]
       
 - type: entity
-  parent: AirlockHatchCentcomm
+  parent: AirlockHatch
   id: AirlockHatchSyndicateLocked
   name: Syndicate Hatch
   suffix: Syndicate, Locked
diff --git a/Resources/Textures/_Sunrise/Structures/Doors/Airlocks/Hatches/centcom_hatch.rsi/assembly.png b/Resources/Textures/_Sunrise/Structures/Doors/Airlocks/Hatches/hatch.rsi/assembly.png
similarity index 100%
rename from Resources/Textures/_Sunrise/Structures/Doors/Airlocks/Hatches/centcom_hatch.rsi/assembly.png
rename to Resources/Textures/_Sunrise/Structures/Doors/Airlocks/Hatches/hatch.rsi/assembly.png
diff --git a/Resources/Textures/_Sunrise/Structures/Doors/Airlocks/Hatches/centcom_hatch.rsi/bolted_open_unlit.png b/Resources/Textures/_Sunrise/Structures/Doors/Airlocks/Hatches/hatch.rsi/bolted_open_unlit.png
similarity index 100%
rename from Resources/Textures/_Sunrise/Structures/Doors/Airlocks/Hatches/centcom_hatch.rsi/bolted_open_unlit.png
rename to Resources/Textures/_Sunrise/Structures/Doors/Airlocks/Hatches/hatch.rsi/bolted_open_unlit.png
diff --git a/Resources/Textures/_Sunrise/Structures/Doors/Airlocks/Hatches/centcom_hatch.rsi/bolted_unlit.png b/Resources/Textures/_Sunrise/Structures/Doors/Airlocks/Hatches/hatch.rsi/bolted_unlit.png
similarity index 100%
rename from Resources/Textures/_Sunrise/Structures/Doors/Airlocks/Hatches/centcom_hatch.rsi/bolted_unlit.png
rename to Resources/Textures/_Sunrise/Structures/Doors/Airlocks/Hatches/hatch.rsi/bolted_unlit.png
diff --git a/Resources/Textures/_Sunrise/Structures/Doors/Airlocks/Hatches/centcom_hatch.rsi/closed.png b/Resources/Textures/_Sunrise/Structures/Doors/Airlocks/Hatches/hatch.rsi/closed.png
similarity index 100%
rename from Resources/Textures/_Sunrise/Structures/Doors/Airlocks/Hatches/centcom_hatch.rsi/closed.png
rename to Resources/Textures/_Sunrise/Structures/Doors/Airlocks/Hatches/hatch.rsi/closed.png
diff --git a/Resources/Textures/_Sunrise/Structures/Doors/Airlocks/Hatches/centcom_hatch.rsi/closed_unlit.png b/Resources/Textures/_Sunrise/Structures/Doors/Airlocks/Hatches/hatch.rsi/closed_unlit.png
similarity index 100%
rename from Resources/Textures/_Sunrise/Structures/Doors/Airlocks/Hatches/centcom_hatch.rsi/closed_unlit.png
rename to Resources/Textures/_Sunrise/Structures/Doors/Airlocks/Hatches/hatch.rsi/closed_unlit.png
diff --git a/Resources/Textures/_Sunrise/Structures/Doors/Airlocks/Hatches/centcom_hatch.rsi/closing.png b/Resources/Textures/_Sunrise/Structures/Doors/Airlocks/Hatches/hatch.rsi/closing.png
similarity index 100%
rename from Resources/Textures/_Sunrise/Structures/Doors/Airlocks/Hatches/centcom_hatch.rsi/closing.png
rename to Resources/Textures/_Sunrise/Structures/Doors/Airlocks/Hatches/hatch.rsi/closing.png
diff --git a/Resources/Textures/_Sunrise/Structures/Doors/Airlocks/Hatches/centcom_hatch.rsi/closing_unlit.png b/Resources/Textures/_Sunrise/Structures/Doors/Airlocks/Hatches/hatch.rsi/closing_unlit.png
similarity index 100%
rename from Resources/Textures/_Sunrise/Structures/Doors/Airlocks/Hatches/centcom_hatch.rsi/closing_unlit.png
rename to Resources/Textures/_Sunrise/Structures/Doors/Airlocks/Hatches/hatch.rsi/closing_unlit.png
diff --git a/Resources/Textures/_Sunrise/Structures/Doors/Airlocks/Hatches/centcom_hatch.rsi/deny_unlit.png b/Resources/Textures/_Sunrise/Structures/Doors/Airlocks/Hatches/hatch.rsi/deny_unlit.png
similarity index 100%
rename from Resources/Textures/_Sunrise/Structures/Doors/Airlocks/Hatches/centcom_hatch.rsi/deny_unlit.png
rename to Resources/Textures/_Sunrise/Structures/Doors/Airlocks/Hatches/hatch.rsi/deny_unlit.png
diff --git a/Resources/Textures/_Sunrise/Structures/Doors/Airlocks/Hatches/centcom_hatch.rsi/emergency_open_unlit.png b/Resources/Textures/_Sunrise/Structures/Doors/Airlocks/Hatches/hatch.rsi/emergency_open_unlit.png
similarity index 100%
rename from Resources/Textures/_Sunrise/Structures/Doors/Airlocks/Hatches/centcom_hatch.rsi/emergency_open_unlit.png
rename to Resources/Textures/_Sunrise/Structures/Doors/Airlocks/Hatches/hatch.rsi/emergency_open_unlit.png
diff --git a/Resources/Textures/_Sunrise/Structures/Doors/Airlocks/Hatches/centcom_hatch.rsi/emergency_unlit.png b/Resources/Textures/_Sunrise/Structures/Doors/Airlocks/Hatches/hatch.rsi/emergency_unlit.png
similarity index 100%
rename from Resources/Textures/_Sunrise/Structures/Doors/Airlocks/Hatches/centcom_hatch.rsi/emergency_unlit.png
rename to Resources/Textures/_Sunrise/Structures/Doors/Airlocks/Hatches/hatch.rsi/emergency_unlit.png
diff --git a/Resources/Textures/_Sunrise/Structures/Doors/Airlocks/Hatches/centcom_hatch.rsi/meta.json b/Resources/Textures/_Sunrise/Structures/Doors/Airlocks/Hatches/hatch.rsi/meta.json
similarity index 100%
rename from Resources/Textures/_Sunrise/Structures/Doors/Airlocks/Hatches/centcom_hatch.rsi/meta.json
rename to Resources/Textures/_Sunrise/Structures/Doors/Airlocks/Hatches/hatch.rsi/meta.json
diff --git a/Resources/Textures/_Sunrise/Structures/Doors/Airlocks/Hatches/centcom_hatch.rsi/open.png b/Resources/Textures/_Sunrise/Structures/Doors/Airlocks/Hatches/hatch.rsi/open.png
similarity index 100%
rename from Resources/Textures/_Sunrise/Structures/Doors/Airlocks/Hatches/centcom_hatch.rsi/open.png
rename to Resources/Textures/_Sunrise/Structures/Doors/Airlocks/Hatches/hatch.rsi/open.png
diff --git a/Resources/Textures/_Sunrise/Structures/Doors/Airlocks/Hatches/centcom_hatch.rsi/open_unlit.png b/Resources/Textures/_Sunrise/Structures/Doors/Airlocks/Hatches/hatch.rsi/open_unlit.png
similarity index 100%
rename from Resources/Textures/_Sunrise/Structures/Doors/Airlocks/Hatches/centcom_hatch.rsi/open_unlit.png
rename to Resources/Textures/_Sunrise/Structures/Doors/Airlocks/Hatches/hatch.rsi/open_unlit.png
diff --git a/Resources/Textures/_Sunrise/Structures/Doors/Airlocks/Hatches/centcom_hatch.rsi/opening.png b/Resources/Textures/_Sunrise/Structures/Doors/Airlocks/Hatches/hatch.rsi/opening.png
similarity index 100%
rename from Resources/Textures/_Sunrise/Structures/Doors/Airlocks/Hatches/centcom_hatch.rsi/opening.png
rename to Resources/Textures/_Sunrise/Structures/Doors/Airlocks/Hatches/hatch.rsi/opening.png
diff --git a/Resources/Textures/_Sunrise/Structures/Doors/Airlocks/Hatches/centcom_hatch.rsi/opening_unlit.png b/Resources/Textures/_Sunrise/Structures/Doors/Airlocks/Hatches/hatch.rsi/opening_unlit.png
similarity index 100%
rename from Resources/Textures/_Sunrise/Structures/Doors/Airlocks/Hatches/centcom_hatch.rsi/opening_unlit.png
rename to Resources/Textures/_Sunrise/Structures/Doors/Airlocks/Hatches/hatch.rsi/opening_unlit.png
diff --git a/Resources/Textures/_Sunrise/Structures/Doors/Airlocks/Hatches/centcom_hatch.rsi/panel_closed.png b/Resources/Textures/_Sunrise/Structures/Doors/Airlocks/Hatches/hatch.rsi/panel_closed.png
similarity index 100%
rename from Resources/Textures/_Sunrise/Structures/Doors/Airlocks/Hatches/centcom_hatch.rsi/panel_closed.png
rename to Resources/Textures/_Sunrise/Structures/Doors/Airlocks/Hatches/hatch.rsi/panel_closed.png
diff --git a/Resources/Textures/_Sunrise/Structures/Doors/Airlocks/Hatches/centcom_hatch.rsi/panel_closing.png b/Resources/Textures/_Sunrise/Structures/Doors/Airlocks/Hatches/hatch.rsi/panel_closing.png
similarity index 100%
rename from Resources/Textures/_Sunrise/Structures/Doors/Airlocks/Hatches/centcom_hatch.rsi/panel_closing.png
rename to Resources/Textures/_Sunrise/Structures/Doors/Airlocks/Hatches/hatch.rsi/panel_closing.png
diff --git a/Resources/Textures/_Sunrise/Structures/Doors/Airlocks/Hatches/centcom_hatch.rsi/panel_open.png b/Resources/Textures/_Sunrise/Structures/Doors/Airlocks/Hatches/hatch.rsi/panel_open.png
similarity index 100%
rename from Resources/Textures/_Sunrise/Structures/Doors/Airlocks/Hatches/centcom_hatch.rsi/panel_open.png
rename to Resources/Textures/_Sunrise/Structures/Doors/Airlocks/Hatches/hatch.rsi/panel_open.png
diff --git a/Resources/Textures/_Sunrise/Structures/Doors/Airlocks/Hatches/centcom_hatch.rsi/panel_opening.png b/Resources/Textures/_Sunrise/Structures/Doors/Airlocks/Hatches/hatch.rsi/panel_opening.png
similarity index 100%
rename from Resources/Textures/_Sunrise/Structures/Doors/Airlocks/Hatches/centcom_hatch.rsi/panel_opening.png
rename to Resources/Textures/_Sunrise/Structures/Doors/Airlocks/Hatches/hatch.rsi/panel_opening.png
diff --git a/Resources/Textures/_Sunrise/Structures/Doors/Airlocks/Hatches/centcom_hatch.rsi/sparks.png b/Resources/Textures/_Sunrise/Structures/Doors/Airlocks/Hatches/hatch.rsi/sparks.png
similarity index 100%
rename from Resources/Textures/_Sunrise/Structures/Doors/Airlocks/Hatches/centcom_hatch.rsi/sparks.png
rename to Resources/Textures/_Sunrise/Structures/Doors/Airlocks/Hatches/hatch.rsi/sparks.png
diff --git a/Resources/Textures/_Sunrise/Structures/Doors/Airlocks/Hatches/centcom_hatch.rsi/sparks_broken.png b/Resources/Textures/_Sunrise/Structures/Doors/Airlocks/Hatches/hatch.rsi/sparks_broken.png
similarity index 100%
rename from Resources/Textures/_Sunrise/Structures/Doors/Airlocks/Hatches/centcom_hatch.rsi/sparks_broken.png
rename to Resources/Textures/_Sunrise/Structures/Doors/Airlocks/Hatches/hatch.rsi/sparks_broken.png
diff --git a/Resources/Textures/_Sunrise/Structures/Doors/Airlocks/Hatches/centcom_hatch.rsi/sparks_damaged.png b/Resources/Textures/_Sunrise/Structures/Doors/Airlocks/Hatches/hatch.rsi/sparks_damaged.png
similarity index 100%
rename from Resources/Textures/_Sunrise/Structures/Doors/Airlocks/Hatches/centcom_hatch.rsi/sparks_damaged.png
rename to Resources/Textures/_Sunrise/Structures/Doors/Airlocks/Hatches/hatch.rsi/sparks_damaged.png
diff --git a/Resources/Textures/_Sunrise/Structures/Doors/Airlocks/Hatches/centcom_hatch.rsi/sparks_open.png b/Resources/Textures/_Sunrise/Structures/Doors/Airlocks/Hatches/hatch.rsi/sparks_open.png
similarity index 100%
rename from Resources/Textures/_Sunrise/Structures/Doors/Airlocks/Hatches/centcom_hatch.rsi/sparks_open.png
rename to Resources/Textures/_Sunrise/Structures/Doors/Airlocks/Hatches/hatch.rsi/sparks_open.png
diff --git a/Resources/Textures/_Sunrise/Structures/Doors/Airlocks/Hatches/centcom_hatch.rsi/welded.png b/Resources/Textures/_Sunrise/Structures/Doors/Airlocks/Hatches/hatch.rsi/welded.png
similarity index 100%
rename from Resources/Textures/_Sunrise/Structures/Doors/Airlocks/Hatches/centcom_hatch.rsi/welded.png
rename to Resources/Textures/_Sunrise/Structures/Doors/Airlocks/Hatches/hatch.rsi/welded.png