diff --git a/data/json/items/containers.json b/data/json/items/containers.json
index ed2097418e963..25333cb7d77ba 100644
--- a/data/json/items/containers.json
+++ b/data/json/items/containers.json
@@ -112,14 +112,7 @@
     "to_hit": -5,
     "rigid": false,
     "material": "cotton",
-    "pocket_data": [
-      {
-        "pocket_type": "CONTAINER",
-        "max_contains_volume": "1 L",
-        "max_contains_weight": "3 kg",
-        "moves": 400
-      }
-    ],
+    "pocket_data": [ { "pocket_type": "CONTAINER", "max_contains_volume": "1 L", "max_contains_weight": "3 kg", "moves": 400 } ],
     "symbol": ")",
     "color": "brown",
     "contains": "15 L",
@@ -136,14 +129,7 @@
     "price": 0,
     "to_hit": -5,
     "material": "cotton",
-    "pocket_data": [
-      {
-        "pocket_type": "CONTAINER",
-        "max_contains_volume": "1 L",
-        "max_contains_weight": "3 kg",
-        "moves": 400
-      }
-    ],
+    "pocket_data": [ { "pocket_type": "CONTAINER", "max_contains_volume": "1 L", "max_contains_weight": "3 kg", "moves": 400 } ],
     "symbol": ")",
     "color": "brown"
   },
@@ -381,14 +367,7 @@
     "material": "paper",
     "symbol": ")",
     "color": "white",
-    "pocket_data": [
-      {
-        "pocket_type": "CONTAINER",
-        "rigid": true,
-        "max_contains_volume": "250 ml",
-        "max_contains_weight": "3 kg"
-      }
-    ]
+    "pocket_data": [ { "pocket_type": "CONTAINER", "rigid": true, "max_contains_volume": "250 ml", "max_contains_weight": "3 kg" } ]
   },
   {
     "id": "box_small",
@@ -398,14 +377,7 @@
     "description": "A small cardboard box.  No bigger than a foot in dimension.",
     "weight": "151 g",
     "volume": "1 L",
-    "pocket_data": [
-      {
-        "pocket_type": "CONTAINER",
-        "rigid": true,
-        "max_contains_volume": "990 ml",
-        "max_contains_weight": "4 kg"
-      }
-    ],
+    "pocket_data": [ { "pocket_type": "CONTAINER", "rigid": true, "max_contains_volume": "990 ml", "max_contains_weight": "4 kg" } ],
     "price": 0,
     "material": "cardboard",
     "symbol": ")",
@@ -1230,14 +1202,7 @@
     "material": "gutskin",
     "symbol": ")",
     "color": "brown",
-    "pocket_data": [
-      {
-        "pocket_type": "CONTAINER",
-        "watertight": true,
-        "max_contains_volume": "3 L",
-        "max_contains_weight": "6 kg"
-      }
-    ]
+    "pocket_data": [ { "pocket_type": "CONTAINER", "watertight": true, "max_contains_volume": "3 L", "max_contains_weight": "6 kg" } ]
   },
   {
     "id": "metal_tank",
@@ -1329,14 +1294,7 @@
     "material": "gutskin",
     "symbol": ")",
     "color": "brown",
-    "pocket_data": [
-      {
-        "pocket_type": "CONTAINER",
-        "watertight": true,
-        "max_contains_volume": "1500 ml",
-        "max_contains_weight": "3 kg"
-      }
-    ]
+    "pocket_data": [ { "pocket_type": "CONTAINER", "watertight": true, "max_contains_volume": "1500 ml", "max_contains_weight": "3 kg" } ]
   },
   {
     "id": "waterskin",
@@ -1352,14 +1310,7 @@
     "material": "leather",
     "symbol": ")",
     "color": "brown",
-    "pocket_data": [
-      {
-        "pocket_type": "CONTAINER",
-        "watertight": true,
-        "max_contains_volume": "1500 ml",
-        "max_contains_weight": "3 kg"
-      }
-    ],
+    "pocket_data": [ { "pocket_type": "CONTAINER", "watertight": true, "max_contains_volume": "1500 ml", "max_contains_weight": "3 kg" } ],
     "armor_data": { "covers": [ "LEG_EITHER" ], "coverage": 5, "material_thickness": 2 },
     "flags": [ "WAIST", "WATER_FRIENDLY" ]
   },
@@ -1377,14 +1328,7 @@
     "material": "leather",
     "symbol": ")",
     "color": "brown",
-    "pocket_data": [
-      {
-        "pocket_type": "CONTAINER",
-        "watertight": true,
-        "max_contains_volume": "3 L",
-        "max_contains_weight": "6 kg"
-      }
-    ],
+    "pocket_data": [ { "pocket_type": "CONTAINER", "watertight": true, "max_contains_volume": "3 L", "max_contains_weight": "6 kg" } ],
     "armor_data": { "covers": [ "TORSO" ], "coverage": 10, "material_thickness": 2 },
     "flags": [ "WAIST", "WATER_FRIENDLY" ]
   },
@@ -1402,14 +1346,7 @@
     "material": "leather",
     "symbol": ")",
     "color": "brown",
-    "pocket_data": [
-      {
-        "pocket_type": "CONTAINER",
-        "watertight": true,
-        "max_contains_volume": "5 L",
-        "max_contains_weight": "10 kg"
-      }
-    ],
+    "pocket_data": [ { "pocket_type": "CONTAINER", "watertight": true, "max_contains_volume": "5 L", "max_contains_weight": "10 kg" } ],
     "armor_data": { "covers": [ "TORSO" ], "coverage": 15, "material_thickness": 2 },
     "flags": [ "BELTED", "WATER_FRIENDLY" ]
   },
@@ -1427,14 +1364,7 @@
     "material": [ "wood", "steel" ],
     "symbol": ")",
     "color": "brown",
-    "pocket_data": [
-      {
-        "pocket_type": "CONTAINER",
-        "watertight": true,
-        "max_contains_volume": "100 L",
-        "max_contains_weight": "200 kg"
-      }
-    ],
+    "pocket_data": [ { "pocket_type": "CONTAINER", "watertight": true, "max_contains_volume": "100 L", "max_contains_weight": "200 kg" } ],
     "contains": "100 L",
     "seals": true,
     "watertight": true,
@@ -1453,13 +1383,7 @@
     "material": "paper",
     "symbol": ",",
     "color": "light_gray",
-    "pocket_data": [
-      {
-        "pocket_type": "CONTAINER",
-        "max_contains_volume": "2500 ml",
-        "max_contains_weight": "6 kg"
-      }
-    ],
+    "pocket_data": [ { "pocket_type": "CONTAINER", "max_contains_volume": "2500 ml", "max_contains_weight": "6 kg" } ],
     "flags": [ "TRADER_AVOID" ]
   },
   {
@@ -1521,14 +1445,7 @@
     "material": "plastic",
     "symbol": ")",
     "color": "white",
-    "pocket_data": [
-      {
-        "pocket_type": "CONTAINER",
-        "watertight": true,
-        "max_contains_volume": "3750 ml",
-        "max_contains_weight": "7 kg"
-      }
-    ],
+    "pocket_data": [ { "pocket_type": "CONTAINER", "watertight": true, "max_contains_volume": "3750 ml", "max_contains_weight": "7 kg" } ],
     "properties": [ [ "burst_when_filled", "75" ] ]
   },
   {
diff --git a/data/json/items/generic/dining_kitchen.json b/data/json/items/generic/dining_kitchen.json
index f3119d5290269..47a9708517d89 100644
--- a/data/json/items/generic/dining_kitchen.json
+++ b/data/json/items/generic/dining_kitchen.json
@@ -294,14 +294,22 @@
   },
   {
     "id": "bowl_plastic",
-    "type": "CONTAINER",
+    "type": "GENERIC",
     "category": "other",
     "name": "plastic bowl",
     "symbol": "u",
     "description": "A plastic bowl with a convenient sealing lid.  Holds 750 ml of liquid.",
     "copy-from": "base_plastic_dish",
     "volume": "750 ml",
-    "container_data": { "contains": "750 ml", "seals": true, "watertight": true },
+    "pocket_data": [
+      {
+        "pocket_type": "CONTAINER",
+        "watertight": false,
+        "rigid": true,
+        "max_contains_volume": "750 ml",
+        "max_contains_weight": "1 kg"
+      }
+    ],
     "qualities": [ [ "CONTAIN", 1 ] ]
   },
   {
diff --git a/data/json/items/tool/container.json b/data/json/items/tool/container.json
index 6acf7c899a4c6..633971482a30e 100644
--- a/data/json/items/tool/container.json
+++ b/data/json/items/tool/container.json
@@ -1,7 +1,7 @@
 [
   {
     "id": "bottle_metal",
-    "type": "CONTAINER",
+    "type": "GENERIC",
     "category": "other",
     "name": { "str": "steel bottle" },
     "description": "A stainless steel water bottle, holds 750ml of liquid.",
@@ -13,14 +13,20 @@
     "material": "steel",
     "symbol": ")",
     "color": "light_cyan",
-    "contains": "750 ml",
-    "seals": true,
-    "watertight": true,
+    "pocket_data": [
+      {
+        "pocket_type": "CONTAINER",
+        "watertight": true,
+        "rigid": true,
+        "max_contains_volume": "750 ml",
+        "max_contains_weight": "1 kg"
+      }
+    ],
     "qualities": [ [ "CONTAIN", 1 ], [ "BOIL", 2 ] ]
   },
   {
     "id": "bottle_folding",
-    "type": "CONTAINER",
+    "type": "GENERIC",
     "category": "other",
     "name": { "str": "foldable plastic bottle" },
     "description": "A non-rigid plastic bottle for easy storage, holds 500 ml of liquid.",
@@ -28,12 +34,17 @@
     "volume": "50 ml",
     "price": 0,
     "to_hit": 1,
-    "rigid": false,
     "material": "plastic",
     "symbol": ")",
     "color": "light_cyan",
-    "contains": "500 ml",
-    "seals": true,
-    "watertight": true
+    "pocket_data": [
+      {
+        "pocket_type": "CONTAINER",
+        "watertight": true,
+        "rigid": false,
+        "max_contains_volume": "500 ml",
+        "max_contains_weight": "1 kg"
+      }
+    ]
   }
 ]
diff --git a/data/json/items/tool/med.json b/data/json/items/tool/med.json
index bbc20d51608d2..e9a2e3c0cd15b 100644
--- a/data/json/items/tool/med.json
+++ b/data/json/items/tool/med.json
@@ -156,7 +156,7 @@
   },
   {
     "id": "vacutainer",
-    "type": "CONTAINER",
+    "type": "GENERIC",
     "category": "tools",
     "name": { "str": "blood draw kit" },
     "description": "This is a kit for drawing blood, including a test tube for holding the sample.  Use this tool to draw blood, either from yourself or from a corpse you are standing on.",
@@ -168,11 +168,17 @@
     "material": "plastic",
     "symbol": ";",
     "color": "light_cyan",
-    "contains": "250 ml",
-    "seals": true,
-    "watertight": true,
     "use_action": "BLOOD_DRAW",
-    "flags": [ "SPEAR" ]
+    "flags": [ "SPEAR" ],
+    "pocket_data": [
+      {
+        "pocket_type": "CONTAINER",
+        "watertight": true,
+        "rigid": true,
+        "max_contains_volume": "250 ml",
+        "max_contains_weight": "50 g"
+      }
+    ]
   },
   {
     "id": "wrapped_rad_badge",