diff --git a/assets/common/item_price_calculation.ron b/assets/common/item_price_calculation.ron
index 95952696f0..0bc268b1e7 100644
--- a/assets/common/item_price_calculation.ron
+++ b/assets/common/item_price_calculation.ron
@@ -31,7 +31,7 @@ loot_tables: [
     (0.4, true, "common.loot_tables.food.wild_ingredients"),
     (0.2, true, "common.loot_tables.food.prepared"),
     // TODO: Change consumables and split them up
-    (1.0, true, "common.loot_tables.consumables.default"),
+    (1.0, true, "common.loot_tables.consumable.default"),
     (0.5, false, "common.loot_tables.trading"),
 ],
 // this is the amount of that good the most common item represents
diff --git a/assets/common/loot_tables/consumable/default.ron b/assets/common/loot_tables/consumable/default.ron
new file mode 100644
index 0000000000..88738054df
--- /dev/null
+++ b/assets/common/loot_tables/consumable/default.ron
@@ -0,0 +1,5 @@
+[
+    (2.0, LootTable("common.loot_tables.consumable.potion")),
+    (0.5, LootTable("common.loot_tables.consumable.throwable")),
+    (1.0, LootTable("common.loot_tables.consumable.misc")),
+]
diff --git a/assets/common/loot_tables/consumables/fireworks.ron b/assets/common/loot_tables/consumable/firework.ron
similarity index 100%
rename from assets/common/loot_tables/consumables/fireworks.ron
rename to assets/common/loot_tables/consumable/firework.ron
diff --git a/assets/common/loot_tables/consumable/misc.ron b/assets/common/loot_tables/consumable/misc.ron
new file mode 100644
index 0000000000..02b2c9c0c7
--- /dev/null
+++ b/assets/common/loot_tables/consumable/misc.ron
@@ -0,0 +1,5 @@
+[
+    // misc
+    (0.1, Item("common.items.utility.collar")),
+    (1.0, LootTable("common.loot_tables.consumable.firework")),
+]
diff --git a/assets/common/loot_tables/consumables/potions.ron b/assets/common/loot_tables/consumable/potion.ron
similarity index 100%
rename from assets/common/loot_tables/consumables/potions.ron
rename to assets/common/loot_tables/consumable/potion.ron
diff --git a/assets/common/loot_tables/consumables/throwables.ron b/assets/common/loot_tables/consumable/throwable.ron
similarity index 100%
rename from assets/common/loot_tables/consumables/throwables.ron
rename to assets/common/loot_tables/consumable/throwable.ron
diff --git a/assets/common/loot_tables/consumables/default.ron b/assets/common/loot_tables/consumables/default.ron
deleted file mode 100644
index e6e0e88af0..0000000000
--- a/assets/common/loot_tables/consumables/default.ron
+++ /dev/null
@@ -1,5 +0,0 @@
-[
-    (2.0, LootTable("common.loot_tables.consumables.potions")),
-    (0.5, LootTable("common.loot_tables.consumables.throwables")),
-    (1.0, LootTable("common.loot_tables.consumables.misc")),
-]
diff --git a/assets/common/loot_tables/consumables/misc.ron b/assets/common/loot_tables/consumables/misc.ron
deleted file mode 100644
index a4f4a71ae7..0000000000
--- a/assets/common/loot_tables/consumables/misc.ron
+++ /dev/null
@@ -1,5 +0,0 @@
-[
-    // misc
-    (0.1, Item("common.items.utility.collar")),
-    (1.0, LootTable("common.loot_tables.consumables.fireworks")),
-]
diff --git a/assets/common/loot_tables/dungeon/tier-0/miniboss.ron b/assets/common/loot_tables/dungeon/tier-0/miniboss.ron
index 615293ed66..910575b7e0 100644
--- a/assets/common/loot_tables/dungeon/tier-0/miniboss.ron
+++ b/assets/common/loot_tables/dungeon/tier-0/miniboss.ron
@@ -1,5 +1,5 @@
 [
     (1.0, LootTable("common.loot_tables.armor.cloth")),
     (2.0, LootTable("common.loot_tables.weapons.tier-0")),
-    (2.0, LootTable("common.loot_tables.consumables.potions")),
+    (2.0, LootTable("common.loot_tables.consumable.potion")),
 ]
diff --git a/assets/common/loot_tables/dungeon/tier-5/enemy.ron b/assets/common/loot_tables/dungeon/tier-5/enemy.ron
index 2bf145da77..88530ec0c6 100644
--- a/assets/common/loot_tables/dungeon/tier-5/enemy.ron
+++ b/assets/common/loot_tables/dungeon/tier-5/enemy.ron
@@ -14,5 +14,5 @@
     (0.1, Item("common.items.glider.glider_blue")),
     (0.001, Item("common.items.armor.misc.back.backpack")),
     (0.1, Item("common.items.armor.misc.bag.heavy_seabag")),
-    (1.0, LootTable("common.loot_tables.consumables.default")),
+    (1.0, LootTable("common.loot_tables.consumable.default")),
 ]
diff --git a/assets/common/loot_tables/dungeon/tier-5/minion.ron b/assets/common/loot_tables/dungeon/tier-5/minion.ron
index efcd9f0c57..a382efce96 100644
--- a/assets/common/loot_tables/dungeon/tier-5/minion.ron
+++ b/assets/common/loot_tables/dungeon/tier-5/minion.ron
@@ -5,5 +5,5 @@
     (3.0, LootTable("common.loot_tables.food.wild_ingredients")),
     (0.5, LootTable("common.loot_tables.food.prepared")),
     // Consumables
-    (0.5, LootTable("common.loot_tables.consumables.default")),
+    (0.5, LootTable("common.loot_tables.consumable.default")),
 ]
diff --git a/common/src/comp/inventory/item/mod.rs b/common/src/comp/inventory/item/mod.rs
index bc5aab8cba..f1d4216ed3 100644
--- a/common/src/comp/inventory/item/mod.rs
+++ b/common/src/comp/inventory/item/mod.rs
@@ -741,7 +741,9 @@ impl Item {
             SpriteKind::Seashells => "common.items.crafting_ing.seashells",
             // Containers
             // IMPORTANT: Add any new container to `SpriteKind::is_container`
-            container @ (SpriteKind::DungeonChest0
+            container
+            @
+            (SpriteKind::DungeonChest0
             | SpriteKind::DungeonChest1
             | SpriteKind::DungeonChest2
             | SpriteKind::DungeonChest3