diff --git a/data/json/items/tool_armor.json b/data/json/items/tool_armor.json
index 24e2882bfb998..d7d3123ca68cb 100644
--- a/data/json/items/tool_armor.json
+++ b/data/json/items/tool_armor.json
@@ -1961,7 +1961,7 @@
     "id": "mask_filter_on",
     "copy-from": "mask_filter",
     "type": "TOOL_ARMOR",
-    "name": { "str": "filter mask (on)" },
+    "name": { "str": "filter mask (on)", "str_pl": "filter masks (on)" },
     "armor": [ { "encumbrance": 15, "rigid_layer_only": true, "coverage": 100, "covers": [ "mouth" ] } ],
     "tick_action": [ "GASMASK" ],
     "use_action": [ "GASMASK_DEACTIVATE" ]
@@ -2004,7 +2004,7 @@
     "id": "mask_gas_on",
     "copy-from": "mask_gas",
     "type": "TOOL_ARMOR",
-    "name": { "str": "gas mask (on)" },
+    "name": { "str": "gas mask (on)", "str_pl": "gas masks (on)" },
     "armor": [
       { "covers": [ "eyes" ], "rigid_layer_only": true, "coverage": 100, "encumbrance": 25 },
       { "covers": [ "mouth" ], "rigid_layer_only": true, "coverage": 100, "encumbrance": 35 }
@@ -2050,7 +2050,7 @@
     "id": "mask_gas_xl_on",
     "copy-from": "mask_gas_xl",
     "type": "TOOL_ARMOR",
-    "name": { "str": "XL gas mask (on)" },
+    "name": { "str": "XL gas mask (on)", "str_pl": "XL gas masks (on)" },
     "armor": [
       { "covers": [ "eyes" ], "rigid_layer_only": true, "coverage": 100, "encumbrance": 25 },
       { "covers": [ "mouth" ], "rigid_layer_only": true, "coverage": 100, "encumbrance": 35 }
@@ -2096,7 +2096,7 @@
     "id": "mask_gas_xs_on",
     "copy-from": "mask_gas_xs",
     "type": "TOOL_ARMOR",
-    "name": { "str": "XS gas mask (on)" },
+    "name": { "str": "XS gas mask (on)", "str_pl": "XS gas masks (on)" },
     "armor": [
       { "covers": [ "eyes" ], "rigid_layer_only": true, "coverage": 100, "encumbrance": 25 },
       { "covers": [ "mouth" ], "rigid_layer_only": true, "coverage": 100, "encumbrance": 35 }
@@ -2139,7 +2139,7 @@
     "id": "mask_gas_half_on",
     "copy-from": "mask_gas_half",
     "type": "TOOL_ARMOR",
-    "name": { "str": "half-face gas mask (on)" },
+    "name": { "str": "half-face gas mask (on)", "str_pl": "half-face gas masks (on)" },
     "armor": [ { "covers": [ "mouth" ], "rigid_layer_only": true, "coverage": 100, "encumbrance": 35 } ],
     "tick_action": [ "GASMASK" ],
     "use_action": [ "GASMASK_DEACTIVATE" ]
@@ -2194,7 +2194,7 @@
     "id": "mask_fsurvivor_on",
     "copy-from": "mask_fsurvivor",
     "type": "TOOL_ARMOR",
-    "name": { "str": "survivor firemask (on)" },
+    "name": { "str": "survivor firemask (on)", "str_pl": "survivor firemasks (on)" },
     "armor": [
       {
         "material": [
@@ -2228,7 +2228,7 @@
     "id": "mask_fsurvivorxl_on",
     "copy-from": "mask_fsurvivorxl",
     "type": "TOOL_ARMOR",
-    "name": { "str": "XL survivor firemask (on)" },
+    "name": { "str": "XL survivor firemask (on)", "str_pl": "XL survivor firemasks (on)" },
     "armor": [
       {
         "material": [
@@ -2262,7 +2262,7 @@
     "id": "mask_fsurvivorxs_on",
     "copy-from": "mask_fsurvivorxs",
     "type": "TOOL_ARMOR",
-    "name": { "str": "XS survivor firemask (on)" },
+    "name": { "str": "XS survivor firemask (on)", "str_pl": "XS survivor firemasks (on)" },
     "armor": [
       {
         "material": [
@@ -2333,7 +2333,7 @@
     "id": "mask_bunker_on",
     "copy-from": "mask_bunker",
     "type": "TOOL_ARMOR",
-    "name": { "str": "firefighter PBA mask (on)" },
+    "name": { "str": "firefighter PBA mask (on)", "str_pl": "firefighter PBA masks (on)" },
     "armor": [
       {
         "material": [
@@ -2407,7 +2407,7 @@
     "id": "mask_hsurvivor_on",
     "copy-from": "mask_hsurvivor",
     "type": "TOOL_ARMOR",
-    "name": { "str": "heavy survivor mask (on)" },
+    "name": { "str": "heavy survivor mask (on)", "str_pl": "heavy survivor masks (on)" },
     "armor": [
       {
         "material": [
@@ -2444,7 +2444,7 @@
     "id": "mask_hsurvivorxl_on",
     "copy-from": "mask_hsurvivorxl",
     "type": "TOOL_ARMOR",
-    "name": { "str": "XL heavy survivor mask (on)" },
+    "name": { "str": "XL heavy survivor mask (on)", "str_pl": "XL heavy survivor masks (on)" },
     "armor": [
       {
         "material": [
@@ -2481,7 +2481,7 @@
     "id": "mask_hsurvivorxs_on",
     "copy-from": "mask_hsurvivorxs",
     "type": "TOOL_ARMOR",
-    "name": { "str": "XS heavy survivor mask (on)" },
+    "name": { "str": "XS heavy survivor mask (on)", "str_pl": "XS heavy survivor masks (on)" },
     "armor": [
       {
         "material": [
@@ -2509,7 +2509,7 @@
     "id": "mask_lsurvivor",
     "type": "TOOL_ARMOR",
     "category": "armor",
-    "name": { "str": "survivor half mask" },
+    "name": { "str": "survivor half-face gas mask" },
     "description": "A half-face gasmask handcrafted from treated leather.  It provides no protection for the eyes, and must be activated before use.",
     "weight": "341 g",
     "volume": "625 ml",
@@ -2546,7 +2546,7 @@
     "id": "mask_lsurvivor_on",
     "copy-from": "mask_lsurvivor",
     "type": "TOOL_ARMOR",
-    "name": { "str": "survivor half mask (on)" },
+    "name": { "str": "survivor half-face gas mask (on)", "str_pl": "survivor half-face gas masks (on)" },
     "armor": [
       {
         "material": [ { "type": "leather_treated", "covered_by_mat": 100, "thickness": 4 } ],
@@ -2563,7 +2563,7 @@
     "type": "TOOL_ARMOR",
     "copy-from": "mask_lsurvivor",
     "looks_like": "mask_lsurvivor",
-    "name": { "str": "XL survivor half mask" },
+    "name": { "str": "XL survivor half-face gas mask" },
     "proportional": { "weight": 1.25, "volume": 1.25, "price": 0.5 },
     "flags": [ "VARSIZE", "STURDY", "OVERSIZE", "SUN_GLASSES", "SLEEP_IGNORE", "UNRESTRICTED" ]
   },
@@ -2571,7 +2571,7 @@
     "id": "mask_lsurvivorxl_on",
     "copy-from": "mask_lsurvivorxl",
     "type": "TOOL_ARMOR",
-    "name": { "str": "XL survivor half mask (on)" },
+    "name": { "str": "XL survivor half-face gas mask (on)", "str_pl": "XL survivor half-face gas masks (on)" },
     "armor": [
       {
         "material": [ { "type": "leather_treated", "covered_by_mat": 100, "thickness": 4 } ],
@@ -2588,7 +2588,7 @@
     "type": "TOOL_ARMOR",
     "copy-from": "mask_lsurvivor",
     "looks_like": "mask_lsurvivor",
-    "name": { "str": "XS survivor half mask" },
+    "name": { "str": "XS survivor half-face gas mask" },
     "proportional": { "weight": 0.75, "volume": 0.75, "price": 0.5 },
     "flags": [ "VARSIZE", "STURDY", "SUN_GLASSES", "SLEEP_IGNORE", "UNDERSIZE", "UNRESTRICTED" ]
   },
@@ -2596,7 +2596,7 @@
     "id": "mask_lsurvivorxs_on",
     "copy-from": "mask_lsurvivorxs",
     "type": "TOOL_ARMOR",
-    "name": { "str": "XS survivor half mask (on)" },
+    "name": { "str": "XS survivor half-face gas mask (on)", "str_pl": "XS survivor half-face gas masks (on)" },
     "armor": [
       {
         "material": [ { "type": "leather_treated", "covered_by_mat": 100, "thickness": 4 } ],
@@ -2655,7 +2655,7 @@
     "id": "mask_survivor_on",
     "copy-from": "mask_survivor",
     "type": "TOOL_ARMOR",
-    "name": { "str": "survivor mask (on)" },
+    "name": { "str": "survivor mask (on)", "str_pl": "survivor masks (on)" },
     "armor": [
       {
         "material": [ { "type": "leather_treated", "covered_by_mat": 100, "thickness": 4 } ],
@@ -2686,7 +2686,7 @@
     "id": "mask_survivorxl_on",
     "copy-from": "mask_survivorxl",
     "type": "TOOL_ARMOR",
-    "name": { "str": "XL survivor mask (on)" },
+    "name": { "str": "XL survivor mask (on)", "str_pl": "XL survivor masks (on)" },
     "armor": [
       {
         "material": [ { "type": "leather_treated", "covered_by_mat": 100, "thickness": 4 } ],
@@ -2717,7 +2717,7 @@
     "id": "mask_survivorxs_on",
     "copy-from": "mask_survivorxs",
     "type": "TOOL_ARMOR",
-    "name": { "str": "XS survivor mask (on)" },
+    "name": { "str": "XS survivor mask (on)", "str_pl": "XS survivor masks (on)" },
     "armor": [
       {
         "material": [ { "type": "leather_treated", "covered_by_mat": 100, "thickness": 4 } ],