diff --git a/Resources/Prototypes/Entities/Structures/Machines/vending_machines.yml b/Resources/Prototypes/Entities/Structures/Machines/vending_machines.yml
index c968816cbb..3812a3b67f 100644
--- a/Resources/Prototypes/Entities/Structures/Machines/vending_machines.yml
+++ b/Resources/Prototypes/Entities/Structures/Machines/vending_machines.yml
@@ -109,7 +109,7 @@
       broken: true
     - type: WiresVisualizer
   - type: AccessReader
-    access: [["Service"]]
+    access: [["Bar"]]
 
 - type: entity
   parent: VendingMachine
@@ -138,7 +138,7 @@
       broken: true
     - type: WiresVisualizer
   - type: AccessReader
-    access: [["Service"]]
+    access: [["Bar"]]
 
 - type: entity
   parent: VendingMachine
@@ -469,7 +469,7 @@
       broken: true
     - type: WiresVisualizer
   - type: AccessReader
-    access: [["Service"]]
+    access: [["Hydroponics"]]
   - type: PointLight
     radius: 1.5
     energy: 1.6
@@ -538,7 +538,7 @@
       broken: true
     - type: WiresVisualizer
   - type: AccessReader
-    access: [["Service"]]
+    access: [["Hydroponics"]]
   - type: PointLight
     radius: 1.5
     energy: 1.6
diff --git a/Resources/Prototypes/Entities/Structures/Storage/Closets/Lockers/lockers.yml b/Resources/Prototypes/Entities/Structures/Storage/Closets/Lockers/lockers.yml
index e2b05bd992..fd3ad1ec28 100644
--- a/Resources/Prototypes/Entities/Structures/Storage/Closets/Lockers/lockers.yml
+++ b/Resources/Prototypes/Entities/Structures/Storage/Closets/Lockers/lockers.yml
@@ -76,7 +76,7 @@
       state_open: ce_open
       state_closed: ce_door
   - type: AccessReader
-    access: [ [ "Engineering", "Command" ] ]
+    access: [ [ "ChiefEngineer" ] ]
 
 # Electrical supplies
 - type: entity
@@ -151,7 +151,7 @@
       state_open: freezer_open
       state_closed: freezer_door
   - type: AccessReader
-    access: [ [ "Service" ] ]
+    access: [ [ "Kitchen" ] ]
 
 # Botanist
 - type: entity
@@ -166,7 +166,7 @@
       state_open: hydro_open
       state_closed: hydro_door
   - type: AccessReader
-    access: [ [ "Service" ] ]
+    access: [ [ "Hydroponics" ] ]
 
 # Medicine
 - type: entity
@@ -227,7 +227,7 @@
       state_open: cmo_open
       state_closed: cmo_door
   - type: AccessReader
-    access: [ [ "Medical", "Command" ] ]
+    access: [ [ "ChiefMedicalOfficer" ] ]
 
 # Science
 - type: entity
@@ -242,7 +242,7 @@
       state_open: rd_open
       state_closed: rd_door
   - type: AccessReader
-    access: [ [ "Research", "Command" ] ]
+    access: [ [ "ResearchDirector" ] ]
 
 - type: entity
   id: LockerScientist
@@ -271,7 +271,7 @@
       state_open: hos_open
       state_closed: hos_door
   - type: AccessReader
-    access: [["Security", "Command"]]
+    access: [["HeadOfSecurity"]]
 
 # Warden
 - type: entity
@@ -311,7 +311,7 @@
   description: Usually cold and empty... like your heart.
   components:
   - type: AccessReader
-    access: [["Service"]] # TODO access [["Detective"]]
+    access: [["Security"]] # TODO access [["Detective"]]
 
 # Syndicate
 - type: entity
diff --git a/Resources/Prototypes/Entities/Structures/Storage/Crates/crates.yml b/Resources/Prototypes/Entities/Structures/Storage/Crates/crates.yml
index ed2dd0a225..4df41bf983 100644
--- a/Resources/Prototypes/Entities/Structures/Storage/Crates/crates.yml
+++ b/Resources/Prototypes/Entities/Structures/Storage/Crates/crates.yml
@@ -495,7 +495,7 @@
   parent: CrateBaseSecure
   components:
   - type: AccessReader
-    access: [["Service"]]
+    access: [["Hydroponics"]]
   - type: Lock
   - type: Sprite
     sprite: Structures/Storage/Crates/hydro_secure.rsi
@@ -524,7 +524,7 @@
   parent: CrateBaseSecure
   components:
   - type: AccessReader
-    access: [["Security"]]
+    access: [["Armory"]]
   - type: Lock
   - type: Sprite
     sprite: Structures/Storage/Crates/weapon.rsi