diff --git a/data/json/items/melee/axes.json b/data/json/items/melee/axes.json
index ac16e6bc8175..35a5100ddd05 100644
--- a/data/json/items/melee/axes.json
+++ b/data/json/items/melee/axes.json
@@ -3,7 +3,7 @@
     "id": "battleaxe",
     "type": "GENERIC",
     "category": "weapons",
-    "weapon_category": [ "1H_AXES" ],
+    "weapon_category": [ "2H_AXES" ],
     "name": { "str": "battle axe" },
     "description": "This is a huge axe designed for warfare.  Though intended for use as a weapon, it can also be pressed into service as a rather clumsy woodcutting tool.",
     "weight": "2002 g",
diff --git a/data/json/items/tool/entry_tools.json b/data/json/items/tool/entry_tools.json
index e525a9beb82a..be5ce36567d8 100644
--- a/data/json/items/tool/entry_tools.json
+++ b/data/json/items/tool/entry_tools.json
@@ -56,7 +56,7 @@
     "id": "iceaxe",
     "type": "GENERIC",
     "category": "tools_entry",
-    "weapon_category": [ "HAND_AXES" ],
+    "weapon_category": [ "1H_AXES" ],
     "name": { "str": "ice axe" },
     "description": "This is an ice axe with hammer on its head, a multi-purpose hiking and climbing tool used by mountaineers.  It is sturdy enough to pry open closed doors or lift manhole covers.",
     "weight": "500 g",
diff --git a/data/json/items/tool/firefighting.json b/data/json/items/tool/firefighting.json
index c97cb6056da7..ec8a14844b8a 100644
--- a/data/json/items/tool/firefighting.json
+++ b/data/json/items/tool/firefighting.json
@@ -3,7 +3,7 @@
     "id": "crash_axe",
     "type": "GENERIC",
     "category": "tools_entry",
-    "weapon_category": [ "HAND_AXES" ],
+    "weapon_category": [ "1H_AXES" ],
     "symbol": ";",
     "color": "light_gray",
     "name": { "str": "crash axe" },
diff --git a/data/json/items/tool/woodworking.json b/data/json/items/tool/woodworking.json
index 75f431db3711..114d45c28eca 100644
--- a/data/json/items/tool/woodworking.json
+++ b/data/json/items/tool/woodworking.json
@@ -151,7 +151,7 @@
     "id": "hatchet",
     "type": "GENERIC",
     "category": "weapons",
-    "weapon_category": [ "HAND_AXES" ],
+    "weapon_category": [ "1H_AXES" ],
     "symbol": ";",
     "color": "light_gray",
     "name": { "str": "hatchet" },
diff --git a/data/json/obsoletion/uncategorized.json b/data/json/obsoletion/uncategorized.json
index 7584da8355ec..122948b9a738 100644
--- a/data/json/obsoletion/uncategorized.json
+++ b/data/json/obsoletion/uncategorized.json
@@ -421,5 +421,11 @@
       "//": "destroy_threshold equal to str_min instead of str_max due to delicate electronics",
       "ranged": { "reduction": [ 16, 32 ], "destroy_threshold": 32, "block_unaimed_chance": "50%" }
     }
+  },
+  {
+    "type": "weapon_category",
+    "id": "HAND_AXES",
+    "name": "Hand Axes",
+    "//": "Axe with a short handle, typically wielded in one hand, ocassionally thrown."
   }
 ]
diff --git a/data/json/weapon_categories.json b/data/json/weapon_categories.json
index 5ee28ebd1f69..7e6e5b8d518c 100644
--- a/data/json/weapon_categories.json
+++ b/data/json/weapon_categories.json
@@ -107,23 +107,17 @@
     "name": "Two-handed Hammers",
     "//": "Hammers meant to be wielded with both hands."
   },
-  {
-    "type": "weapon_category",
-    "id": "HAND_AXES",
-    "name": "Hand Axes",
-    "//": "Axe with a short handle, typically wielded in one hand, ocassionally thrown."
-  },
   {
     "type": "weapon_category",
     "id": "1H_AXES",
     "name": "One-handed Axes",
-    "//": "Axes meant to be wielded with one hand, typically with a handle longer than the handaxe."
+    "//": "Axes meant to be wielded with one hand."
   },
   {
     "type": "weapon_category",
     "id": "2H_AXES",
     "name": "Two-handed Axes",
-    "//": "Axes meant to be wielded with two hands."
+    "//": "Axes with a handle long enough to allow or require wielding with two hands."
   },
   {
     "type": "weapon_category",
diff --git a/data/mods/CRT_EXPANSION/items/crt_tools.json b/data/mods/CRT_EXPANSION/items/crt_tools.json
index cb12abed07fe..29fd7ff86481 100644
--- a/data/mods/CRT_EXPANSION/items/crt_tools.json
+++ b/data/mods/CRT_EXPANSION/items/crt_tools.json
@@ -209,7 +209,7 @@
   {
     "type": "GENERIC",
     "id": "crt_hatchet_extended",
-    "weapon_category": [ "1H_AXES" ],
+    "weapon_category": [ "2H_AXES" ],
     "symbol": ";",
     "color": "light_gray",
     "name": "C.R.I.T axe",
diff --git a/data/mods/MMA/martialarts.json b/data/mods/MMA/martialarts.json
index 5b11e9e3bb63..e6b8a1c7ecad 100644
--- a/data/mods/MMA/martialarts.json
+++ b/data/mods/MMA/martialarts.json
@@ -197,7 +197,7 @@
       "mma_tec_iron_heart_wide",
       "mma_tec_iron_heart_wide_crit"
     ],
-    "weapon_category": [ "HAND_AXES", "2H_SWORDS", "1H_SWORDS" ]
+    "weapon_category": [ "1H_AXES", "2H_AXES", "2H_SWORDS", "1H_SWORDS" ]
   },
   {
     "type": "martial_art",
@@ -576,6 +576,6 @@
       }
     ],
     "techniques": [ "mma_tec_tiger_claw_break" ],
-    "weapon_category": [ "1H_AXES", "FIST_WEAPONS", "KNIVES", "HAND_AXES" ]
+    "weapon_category": [ "1H_AXES", "FIST_WEAPONS", "KNIVES" ]
   }
 ]
diff --git a/data/mods/Magical_Nights/items/class_items.json b/data/mods/Magical_Nights/items/class_items.json
index c5140d9c9709..317cdd04394e 100644
--- a/data/mods/Magical_Nights/items/class_items.json
+++ b/data/mods/Magical_Nights/items/class_items.json
@@ -190,7 +190,7 @@
     "id": "rune_stormshaper_weapon",
     "type": "GENERIC",
     "name": { "str": "Stormshaper axe" },
-    "weapon_category": [ "1H_AXES" ],
+    "weapon_category": [ "2H_AXES" ],
     "//": "Equivalent to copper ax +1, with volume reduction so it can be sheathed like the other school weapons.  Metals chosen for being two most conductive metals + balancing reasons",
     "description": "A forged copper axe with silver trimmings and a wooden handle.  There is a Stormshaper rune embedded in the eye.",
     "weight": "3330 g",