diff --git a/Resources/Prototypes/_CP14/Entities/Objects/Consumable/Drinks/mugs.yml b/Resources/Prototypes/_CP14/Entities/Objects/Consumable/Drinks/mugs.yml
index 5021289001..b242dc8ee9 100644
--- a/Resources/Prototypes/_CP14/Entities/Objects/Consumable/Drinks/mugs.yml
+++ b/Resources/Prototypes/_CP14/Entities/Objects/Consumable/Drinks/mugs.yml
@@ -46,7 +46,8 @@
         type: TransferAmountBoundUserInterface
   - type: Spillable
     solution: mug
-  - type: Drink
+  - type: Edible
+    edible: Drink
     solution: mug
   - type: Appearance
   - type: Injector
diff --git a/Resources/Prototypes/_CP14/Entities/Objects/Fun/plushies.yml b/Resources/Prototypes/_CP14/Entities/Objects/Fun/plushies.yml
index 089c28d3e7..230346aa72 100644
--- a/Resources/Prototypes/_CP14/Entities/Objects/Fun/plushies.yml
+++ b/Resources/Prototypes/_CP14/Entities/Objects/Fun/plushies.yml
@@ -141,7 +141,8 @@
     interfaces:
       enum.TransferAmountUiKey.Key:
         type: TransferAmountBoundUserInterface
-  - type: Drink
+  - type: Edible
+    edible: Drink
     solution: plushie
   - type: Spillable
     solution: plushie
diff --git a/Resources/Prototypes/_CP14/Entities/Objects/Specific/Alchemy/tools.yml b/Resources/Prototypes/_CP14/Entities/Objects/Specific/Alchemy/tools.yml
index 1afba0f465..b57c16f50d 100644
--- a/Resources/Prototypes/_CP14/Entities/Objects/Specific/Alchemy/tools.yml
+++ b/Resources/Prototypes/_CP14/Entities/Objects/Specific/Alchemy/tools.yml
@@ -40,7 +40,8 @@
     solution: vat
   - type: SolutionItemStatus
     solution: vat
-  - type: Drink
+  - type: Edible
+    edible: Drink
     solution: vat
   - type: Injector
     solutionName: vat
@@ -137,7 +138,8 @@
     solution: mortar
   - type: SolutionItemStatus
     solution: mortar
-  - type: Drink
+  - type: Edible
+    edible: Drink
     solution: mortar
   - type: Injector
     solutionName: mortar
diff --git a/Resources/Prototypes/_CP14/Entities/Objects/Specific/Alchemy/vials.yml b/Resources/Prototypes/_CP14/Entities/Objects/Specific/Alchemy/vials.yml
index eb82320b1f..d6a3485915 100644
--- a/Resources/Prototypes/_CP14/Entities/Objects/Specific/Alchemy/vials.yml
+++ b/Resources/Prototypes/_CP14/Entities/Objects/Specific/Alchemy/vials.yml
@@ -37,7 +37,8 @@
     interfaces:
       enum.TransferAmountUiKey.Key:
         type: TransferAmountBoundUserInterface
-  - type: Drink
+  - type: Edible
+    edible: Drink
     solution: vial
   - type: Spillable
     solution: vial
diff --git a/Resources/Prototypes/_CP14/Entities/Objects/Tools/bucket.yml b/Resources/Prototypes/_CP14/Entities/Objects/Tools/bucket.yml
index 28edc2851e..db5ab43c8a 100644
--- a/Resources/Prototypes/_CP14/Entities/Objects/Tools/bucket.yml
+++ b/Resources/Prototypes/_CP14/Entities/Objects/Tools/bucket.yml
@@ -5,7 +5,8 @@
   description: It's a boring old bucket.
   categories: [ ForkFiltered ]
   components:
-  - type: Drink
+  - type: Edible
+    edible: Drink
     solution: bucket
     ignoreEmpty: true
   - type: Sprite
diff --git a/Resources/Prototypes/_CP14/Entities/Structures/Floor/floorWater.yml b/Resources/Prototypes/_CP14/Entities/Structures/Floor/floorWater.yml
index adb040e455..6a233c83eb 100644
--- a/Resources/Prototypes/_CP14/Entities/Structures/Floor/floorWater.yml
+++ b/Resources/Prototypes/_CP14/Entities/Structures/Floor/floorWater.yml
@@ -104,7 +104,8 @@
           Quantity: 9999999
   - type: DrainableSolution
     solution: pool
-  - type: Drink
+  - type: Edible
+    edible: Drink
     solution: pool
   - type: RandomSpawner
     prototypes:
diff --git a/Resources/Prototypes/_CP14/Entities/Structures/Furniture/barrel.yml b/Resources/Prototypes/_CP14/Entities/Structures/Furniture/barrel.yml
index 5854f9c74b..1946e639e9 100644
--- a/Resources/Prototypes/_CP14/Entities/Structures/Furniture/barrel.yml
+++ b/Resources/Prototypes/_CP14/Entities/Structures/Furniture/barrel.yml
@@ -12,7 +12,8 @@
     solution: barrel
   - type: DrawableSolution
     solution: barrel
-  - type: Drink
+  - type: Edible
+    edible: Drink
     solution: barrel
 
 - type: entity
diff --git a/Resources/Prototypes/_CP14/Entities/Structures/Specific/Alchemy/vat.yml b/Resources/Prototypes/_CP14/Entities/Structures/Specific/Alchemy/vat.yml
index fcf3d475ab..aa11192592 100644
--- a/Resources/Prototypes/_CP14/Entities/Structures/Specific/Alchemy/vat.yml
+++ b/Resources/Prototypes/_CP14/Entities/Structures/Specific/Alchemy/vat.yml
@@ -71,7 +71,8 @@
     solution: vat
   - type: CP14WeatherRefillable
     solution: vat
-  - type: Drink
+  - type: Edible
+    edible: Drink
     solution: vat
   - type: Anchorable
 
diff --git a/Resources/Prototypes/_CP14/Entities/Structures/well.yml b/Resources/Prototypes/_CP14/Entities/Structures/well.yml
index fee16ce2da..3c86cb92e8 100644
--- a/Resources/Prototypes/_CP14/Entities/Structures/well.yml
+++ b/Resources/Prototypes/_CP14/Entities/Structures/well.yml
@@ -23,7 +23,8 @@
           Quantity: 9999999
   - type: DrainableSolution
     solution: pool
-  - type: Drink
+  - type: Edible
+    edible: Drink
     solution: pool
 
 - type: entity