diff --git a/Content.Shared/Stacks/StackPrototype.cs b/Content.Shared/Stacks/StackPrototype.cs
index 185eaed14e..567b24d5d5 100644
--- a/Content.Shared/Stacks/StackPrototype.cs
+++ b/Content.Shared/Stacks/StackPrototype.cs
@@ -1,5 +1,6 @@
 using Robust.Shared.Prototypes;
 using Robust.Shared.Serialization.Manager.Attributes;
+using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype;
 using Robust.Shared.Utility;
 using Robust.Shared.ViewVariables;
 
@@ -12,16 +13,23 @@ namespace Content.Shared.Stacks
         [DataField("id", required: true)]
         public string ID { get; } = default!;
 
+        /// <summary>
+        ///     Human-readable name for this stack type e.g. "Steel"
+        /// </summary>
+        /// <remarks>This is a localization string ID.</remarks>
         [DataField("name")]
         public string Name { get; } = string.Empty;
 
+        /// <summary>
+        ///     An icon that will be used to represent this stack type.
+        /// </summary>
         [DataField("icon")]
         public SpriteSpecifier? Icon { get; } = null;
 
         /// <summary>
         ///     The entity id that will be spawned by default from this stack.
         /// </summary>
-        [DataField("spawn", required: true)]
+        [DataField("spawn", required: true, customTypeSerializer:typeof(PrototypeIdSerializer<EntityPrototype>))]
         public string Spawn { get; } = string.Empty;
     }
 }
diff --git a/Resources/Prototypes/Entities/Objects/Materials/ore.yml b/Resources/Prototypes/Entities/Objects/Materials/ore.yml
index 28c366d234..0e284df679 100644
--- a/Resources/Prototypes/Entities/Objects/Materials/ore.yml
+++ b/Resources/Prototypes/Entities/Objects/Materials/ore.yml
@@ -78,7 +78,7 @@
   suffix: Full
   components:
   - type: Stack
-    stackType: DiamondOre
+    stackType: DiamondRaw
   - type: Sprite
     state: diamond
 
diff --git a/Resources/Prototypes/Stacks/Materials/ore.yml b/Resources/Prototypes/Stacks/Materials/ore.yml
index 6bbd4feeb7..af319ee5dc 100644
--- a/Resources/Prototypes/Stacks/Materials/ore.yml
+++ b/Resources/Prototypes/Stacks/Materials/ore.yml
@@ -17,10 +17,10 @@
   spawn: BananiumOre1
 
 - type: stack
-  id: DiamondOre
+  id: DiamondRaw
   name: diamond ore
   icon: /Textures/Objects/Materials/ore.rsi/diamond.png
-  spawn: DiamondOre1
+  spawn: DiamondRaw1
 
 - type: stack
   id: GoldOre
diff --git a/Resources/Prototypes/Stacks/consumable_stacks.yml b/Resources/Prototypes/Stacks/consumable_stacks.yml
index d821badc86..a5cec6cfcc 100644
--- a/Resources/Prototypes/Stacks/consumable_stacks.yml
+++ b/Resources/Prototypes/Stacks/consumable_stacks.yml
@@ -10,7 +10,7 @@
   id: PizzaBox
   name: pizza box
   icon: Objects/Consumable/Food/Baked/pizza.rsi/box.png
-  spawn: FoodPizzaBox
+  spawn: FoodBoxPizza
 
 # Smokeables