diff --git a/Resources/Prototypes/Entities/Items/Consumables/drinks.yml b/Resources/Prototypes/Entities/Items/Consumables/drinks.yml
index 53024b3993..a0692bb1db 100644
--- a/Resources/Prototypes/Entities/Items/Consumables/drinks.yml
+++ b/Resources/Prototypes/Entities/Items/Consumables/drinks.yml
@@ -17,25 +17,6 @@
   - type: Icon
     state: icon
 
-# Transformable container - normal glass
-- type: entity
-  name: Drinking glass
-  parent: DrinkBase
-  id: DrinkGlass
-  components:
-  - type: Sprite
-    sprite: Objects/Drinks/glass_clear.rsi
-  - type: Icon
-    sprite: Objects/Drinks/glass_clear.rsi
-  - type: Solution
-    fillingState: glass
-    maxVol: 50
-    caps: 16
-  - type: Drink
-  - type: Pourable
-    transferAmount: 5
-  - type: TransformableContainer
-
 - type: entity
   parent: DrinkBase
   id: DrinkAleglass
diff --git a/Resources/Prototypes/Entities/Items/Consumables/drinks_bottles.yml b/Resources/Prototypes/Entities/Items/Consumables/drinks_bottles.yml
index 59f424c0dd..9ba4672af2 100644
--- a/Resources/Prototypes/Entities/Items/Consumables/drinks_bottles.yml
+++ b/Resources/Prototypes/Entities/Items/Consumables/drinks_bottles.yml
@@ -6,6 +6,8 @@
   - type: Drink
     openSounds: bottleOpenSounds
   - type: Solution
+  - type: Pourable
+    transferAmount: 5
   - type: Sprite
     state: icon
   - type: Icon
diff --git a/Resources/Prototypes/Entities/Items/Consumables/drinks_cans.yml b/Resources/Prototypes/Entities/Items/Consumables/drinks_cans.yml
index 0651a49558..a0d79665e1 100644
--- a/Resources/Prototypes/Entities/Items/Consumables/drinks_cans.yml
+++ b/Resources/Prototypes/Entities/Items/Consumables/drinks_cans.yml
@@ -13,6 +13,10 @@
         Quantity: 20
   - type: Pourable
     transferAmount: 5
+  - type: Sprite
+    state: icon
+  - type: Icon
+    state: icon
 
 - type: entity
   parent: DrinkCanBaseFull
diff --git a/Resources/Prototypes/Entities/Items/Consumables/drinks_cups.yml b/Resources/Prototypes/Entities/Items/Consumables/drinks_cups.yml
index 0fe3d44d46..1e57b3a5c1 100644
--- a/Resources/Prototypes/Entities/Items/Consumables/drinks_cups.yml
+++ b/Resources/Prototypes/Entities/Items/Consumables/drinks_cups.yml
@@ -10,7 +10,7 @@
   - type: Pourable
     transferAmount: 5
   - type: Drink
-  - type: Sound
+    isOpen: true
   - type: Sprite
     state: icon
   - type: Icon
@@ -237,3 +237,22 @@
     visuals:
     - type: DrinkFoodVisualizer2D
       steps: 4
+
+# Transformable container - normal glass
+- type: entity
+  name: Drinking glass
+  parent: DrinkBaseCup
+  id: DrinkGlass
+  components:
+  - type: Sprite
+    sprite: Objects/Drinks/glass_clear.rsi
+  - type: Icon
+    sprite: Objects/Drinks/glass_clear.rsi
+  - type: Solution
+    fillingState: glass
+    maxVol: 50
+    caps: 16
+  - type: Drink
+  - type: Pourable
+    transferAmount: 5
+  - type: TransformableContainer
diff --git a/Resources/Prototypes/VendingMachines/cola.yml b/Resources/Prototypes/VendingMachines/cola.yml
index a541949357..4c8232573d 100644
--- a/Resources/Prototypes/VendingMachines/cola.yml
+++ b/Resources/Prototypes/VendingMachines/cola.yml
@@ -11,5 +11,5 @@
     DrinkPurpleCan: 10
     DrinkSpaceMountainWindCan: 10
     DrinkSpaceUpCan: 10
-    DrinkDrinkFoodContaineStarkistCan: 10
-    DrinkFoodContaineThirteenLokoCan: 10
+    DrinkStarkistCan: 10
+    DrinkThirteenLokoCan: 10