diff --git a/Content.Server/Storage/Components/EntityStorageComponent.cs b/Content.Server/Storage/Components/EntityStorageComponent.cs
index 8fa27d2efb..37093efd1d 100644
--- a/Content.Server/Storage/Components/EntityStorageComponent.cs
+++ b/Content.Server/Storage/Components/EntityStorageComponent.cs
@@ -28,11 +28,11 @@ public sealed class EntityStorageComponent : Component
     public int RemovedMasks;
 
     [ViewVariables]
-    [DataField("Capacity")]
-    public int StorageCapacityMax = 30;
+    [DataField("capacity")]
+    public int Capacity = 30;
 
     [ViewVariables]
-    [DataField("IsCollidableWhenOpen")]
+    [DataField("isCollidableWhenOpen")]
     public bool IsCollidableWhenOpen;
 
     //The offset for where items are emptied/vacuumed for the EntityStorage. 
@@ -44,8 +44,8 @@ public sealed class EntityStorageComponent : Component
     public readonly CollisionGroup EnteringOffsetCollisionFlags = CollisionGroup.Impassable | CollisionGroup.MidImpassable;
 
     [ViewVariables]
-    [DataField("EnteringRange")]
-    public float EnteringRange = -0.18f;
+    [DataField("enteringRange")]
+    public float EnteringRange = 0.18f;
 
     [DataField("showContents")]
     public bool ShowContents;
diff --git a/Content.Server/Storage/EntitySystems/EntityStorageSystem.cs b/Content.Server/Storage/EntitySystems/EntityStorageSystem.cs
index b57f5f43d9..8f6c932b58 100644
--- a/Content.Server/Storage/EntitySystems/EntityStorageSystem.cs
+++ b/Content.Server/Storage/EntitySystems/EntityStorageSystem.cs
@@ -162,7 +162,7 @@ public sealed class EntityStorageSystem : EntitySystem
                 continue;
 
             count++;
-            if (count >= component.StorageCapacityMax)
+            if (count >= component.Capacity)
                 break;
         }
 
@@ -202,7 +202,7 @@ public sealed class EntityStorageSystem : EntitySystem
         if (component.Open)
             return true;
 
-        if (component.Contents.ContainedEntities.Count >= component.StorageCapacityMax)
+        if (component.Contents.ContainedEntities.Count >= component.Capacity)
             return false;
 
         return true;
diff --git a/Resources/Prototypes/Entities/Objects/Specific/Medical/morgue.yml b/Resources/Prototypes/Entities/Objects/Specific/Medical/morgue.yml
index c5a64fc63f..cd91e12a1c 100644
--- a/Resources/Prototypes/Entities/Objects/Specific/Medical/morgue.yml
+++ b/Resources/Prototypes/Entities/Objects/Specific/Medical/morgue.yml
@@ -38,8 +38,8 @@
       mask:
       - Impassable
   - type: EntityStorage
-    Capacity: 1
-    IsCollidableWhenOpen: true
+    capacity: 1
+    isCollidableWhenOpen: true
     closeSound:
       path: /Audio/Misc/zip.ogg
     openSound:
diff --git a/Resources/Prototypes/Entities/Objects/Specific/Xenoarchaeology/artifact_equipment.yml b/Resources/Prototypes/Entities/Objects/Specific/Xenoarchaeology/artifact_equipment.yml
index 298cc462b9..0ba021ca9a 100644
--- a/Resources/Prototypes/Entities/Objects/Specific/Xenoarchaeology/artifact_equipment.yml
+++ b/Resources/Prototypes/Entities/Objects/Specific/Xenoarchaeology/artifact_equipment.yml
@@ -39,7 +39,7 @@
       sprite: Structures/Storage/Crates/artifact.rsi
       state: artifact_container_icon
     - type: EntityStorage
-      Capacity: 1
+      capacity: 1
       whitelist:
         components:
         - Artifact
diff --git a/Resources/Prototypes/Entities/Structures/Storage/Crates/base_structurecrates.yml b/Resources/Prototypes/Entities/Structures/Storage/Crates/base_structurecrates.yml
index 4d01a33ce0..219dec801e 100644
--- a/Resources/Prototypes/Entities/Structures/Storage/Crates/base_structurecrates.yml
+++ b/Resources/Prototypes/Entities/Structures/Storage/Crates/base_structurecrates.yml
@@ -31,7 +31,7 @@
       layer:
       - MachineLayer
   - type: EntityStorage
-    Capacity: 500
+    capacity: 500
   - type: Weldable
   - type: PlaceableSurface
   - type: Damageable
@@ -94,7 +94,7 @@
       layer:
       - MachineLayer
   - type: EntityStorage
-    Capacity: 500
+    capacity: 500
   - type: Weldable
   - type: PlaceableSurface
   - type: Damageable
diff --git a/Resources/Prototypes/Entities/Structures/Storage/Crates/crates.yml b/Resources/Prototypes/Entities/Structures/Storage/Crates/crates.yml
index f2731e2d49..9ea6adf105 100644
--- a/Resources/Prototypes/Entities/Structures/Storage/Crates/crates.yml
+++ b/Resources/Prototypes/Entities/Structures/Storage/Crates/crates.yml
@@ -580,7 +580,7 @@
   parent: CrateGeneric
   components:
   - type: EntityStorage
-    Capacity: 500
+    capacity: 500
   - type: Sprite
     sprite: Structures/Storage/Crates/livestock.rsi
     layers:
diff --git a/Resources/Prototypes/Entities/Structures/Storage/morgue.yml b/Resources/Prototypes/Entities/Structures/Storage/morgue.yml
index 3328ac23a1..f7546a7172 100644
--- a/Resources/Prototypes/Entities/Structures/Storage/morgue.yml
+++ b/Resources/Prototypes/Entities/Structures/Storage/morgue.yml
@@ -32,9 +32,9 @@
       layer:
       - WallLayer
   - type: EntityStorage
-    IsCollidableWhenOpen: true
+    isCollidableWhenOpen: true
     showContents: false
-    Capacity: 1
+    capacity: 1
     enteringOffset: 0, -1
     closeSound:
       path: /Audio/Items/deconstruct.ogg
@@ -124,9 +124,9 @@
       layer:
       - MachineLayer
   - type: EntityStorage
-    IsCollidableWhenOpen: true
+    isCollidableWhenOpen: true
     showContents: false
-    Capacity: 1
+    capacity: 1
     enteringOffset: 0, -1
     closeSound:
       path: /Audio/Items/deconstruct.ogg