diff --git a/data/json/items/battery.json b/data/json/items/battery.json
index 8bf3f3f616fd0..591bbd3b0da39 100644
--- a/data/json/items/battery.json
+++ b/data/json/items/battery.json
@@ -20,11 +20,10 @@
     "id": "light_minus_battery_cell",
     "type": "MAGAZINE",
     "category": "spare_parts",
-    "name": "ultra-light battery",
-    "name_plural": "ultra-light batteries",
+    "name": { "str": "ultra-light battery", "str_pl": "ultra-light batteries" },
     "description": "This is a light battery cell designed for small size over everything else.  It retains its universal compatibility, though.",
     "weight": "5 g",
-    "volume": 0,
+    "volume": "1 ml",
     "price": 1500,
     "material": [ "iron", "plastic" ],
     "symbol": "=",
@@ -38,11 +37,10 @@
     "id": "light_minus_atomic_battery_cell",
     "type": "MAGAZINE",
     "category": "spare_parts",
-    "name": "ultra-light plutonium fuel battery",
-    "name_plural": "ultra-light plutonium fuel batteries",
+    "name": { "str": "ultra-light plutonium fuel battery", "str_pl": "ultra-light plutonium fuel batteries" },
     "description": "This battery uses a thin plutonium-244 rod to stablize an exotic nanocompound.  It is universally compatible with small devices.  Although it stores a huge amount of power, it cannot be recharged.",
     "weight": "80 g",
-    "volume": 0,
+    "volume": "1 ml",
     "price": 15000,
     "material": [ "iron", "plastic" ],
     "symbol": "=",
@@ -57,11 +55,10 @@
     "id": "light_minus_disposable_cell",
     "type": "MAGAZINE",
     "category": "spare_parts",
-    "name": "ultra-light disposable battery",
-    "name_plural": "ultra-light disposable batteries",
+    "name": { "str": "ultra-light disposable battery", "str_pl": "ultra-light disposable batteries" },
     "description": "This is a light battery cell designed for small size over everything else.  It retains its universal compatibility, though.  The battery's chemistry means that it has a very high capacity, but cannot be recharged.",
     "weight": "5 g",
-    "volume": 0,
+    "volume": "1 ml",
     "price": 3000,
     "material": [ "iron", "plastic" ],
     "symbol": "=",
@@ -76,8 +73,7 @@
     "id": "light_battery_cell",
     "type": "MAGAZINE",
     "category": "spare_parts",
-    "name": "light battery",
-    "name_plural": "light batteries",
+    "name": { "str": "light battery", "str_pl": "light batteries" },
     "description": "This is a light battery cell, universally compatible with all kinds of small devices.",
     "weight": "30 g",
     "volume": "25ml",
@@ -94,8 +90,7 @@
     "id": "light_plus_battery_cell",
     "type": "MAGAZINE",
     "category": "spare_parts",
-    "name": "light battery (high-capacity)",
-    "name_plural": "light batteries (high-capacity)",
+    "name": { "str": "light battery (high-capacity)", "str_pl": "light batteries (high-capacity)" },
     "description": "This is a high-capacity light battery cell, universally compatible with all kinds of small devices.",
     "weight": "45 g",
     "volume": "35ml",
@@ -112,8 +107,7 @@
     "id": "light_atomic_battery_cell",
     "type": "MAGAZINE",
     "category": "spare_parts",
-    "name": "light plutonium fuel battery",
-    "name_plural": "light plutonium fuel batteries",
+    "name": { "str": "light plutonium fuel battery", "str_pl": "light plutonium fuel batteries" },
     "description": "This battery uses a thin plutonium-244 rod to stabilize an exotic nanocompound.  It is universally compatible with all kinds of personal electronic devices.  Although it stores a huge amount of power, it cannot be recharged.",
     "weight": "160 g",
     "volume": "35ml",
@@ -131,8 +125,7 @@
     "id": "light_disposable_cell",
     "type": "MAGAZINE",
     "category": "spare_parts",
-    "name": "light disposable battery",
-    "name_plural": "light disposable batteries",
+    "name": { "str": "light disposable battery", "str_pl": "light disposable batteries" },
     "description": "This is a light battery cell, universally compatible with all kinds of small devices.  The battery's chemistry means that it has a very high capacity, but cannot be recharged.",
     "weight": "45 g",
     "volume": "35ml",
@@ -150,8 +143,7 @@
     "id": "medium_battery_cell",
     "type": "MAGAZINE",
     "category": "spare_parts",
-    "name": "medium battery",
-    "name_plural": "medium batteries",
+    "name": { "str": "medium battery", "str_pl": "medium batteries" },
     "description": "This is a medium battery cell, universally compatible with all kinds of appliances and power tools.",
     "weight": "600 g",
     "volume": "450ml",
@@ -168,8 +160,7 @@
     "id": "medium_plus_battery_cell",
     "type": "MAGAZINE",
     "category": "spare_parts",
-    "name": "medium battery (high-capacity)",
-    "name_plural": "medium batteries (high-capacity)",
+    "name": { "str": "medium battery (high-capacity)", "str_pl": "medium batteries (high-capacity)" },
     "description": "This is a high-capacity medium battery cell, universally compatible with all kinds of appliances and power tools.",
     "weight": "725 g",
     "volume": "525ml",
@@ -186,8 +177,7 @@
     "id": "medium_atomic_battery_cell",
     "type": "MAGAZINE",
     "category": "spare_parts",
-    "name": "medium plutonium fuel battery",
-    "name_plural": "medium plutonium fuel batteries",
+    "name": { "str": "medium plutonium fuel battery", "str_pl": "medium plutonium fuel batteries" },
     "description": "This battery uses a thin plutonium-244 rod to stablize an exotic nanocompound.  It is universally compatible with all kinds of appliances and power tools.  Although it stores a huge amount of power, it cannot be recharged.",
     "weight": "1000 g",
     "volume": "525ml",
@@ -205,8 +195,7 @@
     "id": "medium_disposable_cell",
     "type": "MAGAZINE",
     "category": "spare_parts",
-    "name": "medium disposable battery",
-    "name_plural": "medium disposable batteries",
+    "name": { "str": "medium disposable battery", "str_pl": "medium disposable batteries" },
     "description": "This is a medium battery cell, universally compatible with all kinds of appliances and power tools.  The battery's chemistry means that it has a very high capacity, but cannot be recharged.",
     "weight": "725 g",
     "volume": "525ml",
@@ -224,8 +213,7 @@
     "id": "heavy_battery_cell",
     "type": "MAGAZINE",
     "category": "spare_parts",
-    "name": "heavy battery",
-    "name_plural": "heavy batteries",
+    "name": { "str": "heavy battery", "str_pl": "heavy batteries" },
     "description": "This is a heavy battery cell, universally compatible with all kinds of industrial-grade equipment and large tools.",
     "weight": "1000 g",
     "volume": "1225ml",
@@ -242,8 +230,7 @@
     "id": "heavy_plus_battery_cell",
     "type": "MAGAZINE",
     "category": "spare_parts",
-    "name": "heavy battery (high-capacity)",
-    "name_plural": "heavy batteries (high-capacity)",
+    "name": { "str": "heavy battery (high-capacity)", "str_pl": "heavy batteries (high-capacity)" },
     "description": "This is a high-capacity heavy battery cell, universally compatible with all kinds of industrial-grade equipment and large tools.",
     "weight": "1250 g",
     "volume": "1500ml",
@@ -260,8 +247,7 @@
     "id": "heavy_atomic_battery_cell",
     "type": "MAGAZINE",
     "category": "spare_parts",
-    "name": "heavy plutonium fuel battery",
-    "name_plural": "heavy plutonium fuel batteries",
+    "name": { "str": "heavy plutonium fuel battery", "str_pl": "heavy plutonium fuel batteries" },
     "description": "This battery uses a thin plutonium-244 rod to stablize an exotic nanocompound.  It is universally compatible with all kinds of industrial-grade equipment and large tools.  Although it stores a huge amount of power, it cannot be recharged.",
     "weight": "1600 g",
     "volume": "1500ml",
@@ -297,8 +283,7 @@
     "id": "heavy_disposable_cell",
     "type": "MAGAZINE",
     "category": "spare_parts",
-    "name": "heavy disposable battery",
-    "name_plural": "heavy disposable batteries",
+    "name": { "str": "heavy disposable battery", "str_pl": "heavy disposable batteries" },
     "description": "This is a heavy battery cell, universally compatible with all kinds of industrial-grade equipment and large tools.  The battery's chemistry means that it has a very high capacity, but cannot be recharged.",
     "weight": "1250 g",
     "volume": "1500ml",