diff --git a/assets/common/items/npc_weapons/axe/minotaur_axe.ron b/assets/common/items/npc_weapons/axe/minotaur_axe.ron
index a4739fc48a..d1f47d9cdf 100644
--- a/assets/common/items/npc_weapons/axe/minotaur_axe.ron
+++ b/assets/common/items/npc_weapons/axe/minotaur_axe.ron
@@ -15,5 +15,5 @@ ItemDef(
     )),
     quality: Low,
     tags: [],
-    ability_set: Some(Custom("Axe Simple")),
+    ability_spec: Some(Custom("Axe Simple")),
 )
\ No newline at end of file
diff --git a/assets/common/items/npc_weapons/axe/oni_blue_axe.ron b/assets/common/items/npc_weapons/axe/oni_blue_axe.ron
index 544d723d13..69f5603f81 100644
--- a/assets/common/items/npc_weapons/axe/oni_blue_axe.ron
+++ b/assets/common/items/npc_weapons/axe/oni_blue_axe.ron
@@ -15,5 +15,5 @@ ItemDef(
     )),
     quality: Low,
     tags: [],
-    ability_set: Some(Custom("Axe Simple")),
+    ability_spec: Some(Custom("Axe Simple")),
 )
\ No newline at end of file
diff --git a/assets/common/items/npc_weapons/biped_small/gnarling/gnoll_staff.ron b/assets/common/items/npc_weapons/biped_small/gnarling/gnoll_staff.ron
index b6b9a879a3..223ddcc8e9 100644
--- a/assets/common/items/npc_weapons/biped_small/gnarling/gnoll_staff.ron
+++ b/assets/common/items/npc_weapons/biped_small/gnarling/gnoll_staff.ron
@@ -15,5 +15,5 @@ ItemDef(
     )),
     quality: Low,
     tags: [],
-    ability_set: Some(Custom("Staff Simple")),
+    ability_spec: Some(Custom("Staff Simple")),
 )
\ No newline at end of file
diff --git a/assets/common/items/npc_weapons/biped_small/haniwa/gnoll_staff.ron b/assets/common/items/npc_weapons/biped_small/haniwa/gnoll_staff.ron
index 54eafc3109..2b89c18728 100644
--- a/assets/common/items/npc_weapons/biped_small/haniwa/gnoll_staff.ron
+++ b/assets/common/items/npc_weapons/biped_small/haniwa/gnoll_staff.ron
@@ -15,5 +15,5 @@ ItemDef(
     )),
     quality: Low,
     tags: [],
-    ability_set: Some(Custom("Staff Simple")),
+    ability_spec: Some(Custom("Staff Simple")),
 )
\ No newline at end of file
diff --git a/assets/common/items/npc_weapons/biped_small/myrmidon/gnoll_staff.ron b/assets/common/items/npc_weapons/biped_small/myrmidon/gnoll_staff.ron
index e90feb3f5f..6b9d087103 100644
--- a/assets/common/items/npc_weapons/biped_small/myrmidon/gnoll_staff.ron
+++ b/assets/common/items/npc_weapons/biped_small/myrmidon/gnoll_staff.ron
@@ -15,5 +15,5 @@ ItemDef(
     )),
     quality: Low,
     tags: [],
-    ability_set: Some(Custom("Staff Simple")),
+    ability_spec: Some(Custom("Staff Simple")),
 )
\ No newline at end of file
diff --git a/assets/common/items/npc_weapons/biped_small/sahagin/gnoll_staff.ron b/assets/common/items/npc_weapons/biped_small/sahagin/gnoll_staff.ron
index 4fcf64698d..5e36c96f1f 100644
--- a/assets/common/items/npc_weapons/biped_small/sahagin/gnoll_staff.ron
+++ b/assets/common/items/npc_weapons/biped_small/sahagin/gnoll_staff.ron
@@ -15,5 +15,5 @@ ItemDef(
     )),
     quality: Low,
     tags: [],
-    ability_set: Some(Custom("Staff Simple")),
+    ability_spec: Some(Custom("Staff Simple")),
 )
\ No newline at end of file
diff --git a/assets/common/items/npc_weapons/bow/saurok_bow.ron b/assets/common/items/npc_weapons/bow/saurok_bow.ron
index 832e106ede..7734132b1a 100644
--- a/assets/common/items/npc_weapons/bow/saurok_bow.ron
+++ b/assets/common/items/npc_weapons/bow/saurok_bow.ron
@@ -15,5 +15,5 @@ ItemDef(
     )),
     quality: Low,
     tags: [],
-    ability_set: Some(Custom("Bow Simple")),
+    ability_spec: Some(Custom("Bow Simple")),
 )
\ No newline at end of file
diff --git a/assets/common/items/npc_weapons/hammer/cyclops_hammer.ron b/assets/common/items/npc_weapons/hammer/cyclops_hammer.ron
index 58a7f5a28d..59677e5b2c 100644
--- a/assets/common/items/npc_weapons/hammer/cyclops_hammer.ron
+++ b/assets/common/items/npc_weapons/hammer/cyclops_hammer.ron
@@ -15,5 +15,5 @@ ItemDef(
     )),
     quality: Low,
     tags: [],
-    ability_set: Some(Custom("Hammer Simple")),
+    ability_spec: Some(Custom("Hammer Simple")),
 )
\ No newline at end of file
diff --git a/assets/common/items/npc_weapons/hammer/harvester_scythe.ron b/assets/common/items/npc_weapons/hammer/harvester_scythe.ron
index 2967a5c16f..af2d18be18 100644
--- a/assets/common/items/npc_weapons/hammer/harvester_scythe.ron
+++ b/assets/common/items/npc_weapons/hammer/harvester_scythe.ron
@@ -15,5 +15,5 @@ ItemDef(
     )),
     quality: Low,
     tags: [],
-    ability_set: Some(Custom("Hammer Simple")),
+    ability_spec: Some(Custom("Hammer Simple")),
 )
\ No newline at end of file
diff --git a/assets/common/items/npc_weapons/hammer/ogre_hammer.ron b/assets/common/items/npc_weapons/hammer/ogre_hammer.ron
index dc3b9b5343..f2c9833b3a 100644
--- a/assets/common/items/npc_weapons/hammer/ogre_hammer.ron
+++ b/assets/common/items/npc_weapons/hammer/ogre_hammer.ron
@@ -15,5 +15,5 @@ ItemDef(
     )),
     quality: Low,
     tags: [],
-    ability_set: Some(Custom("Hammer Simple")),
+    ability_spec: Some(Custom("Hammer Simple")),
 )
\ No newline at end of file
diff --git a/assets/common/items/npc_weapons/hammer/oni_red_hammer.ron b/assets/common/items/npc_weapons/hammer/oni_red_hammer.ron
index 7af96f125a..66bca833bb 100644
--- a/assets/common/items/npc_weapons/hammer/oni_red_hammer.ron
+++ b/assets/common/items/npc_weapons/hammer/oni_red_hammer.ron
@@ -15,5 +15,5 @@ ItemDef(
     )),
     quality: Low,
     tags: [],
-    ability_set: Some(Custom("Hammer Simple")),
+    ability_spec: Some(Custom("Hammer Simple")),
 )
\ No newline at end of file
diff --git a/assets/common/items/npc_weapons/hammer/troll_hammer.ron b/assets/common/items/npc_weapons/hammer/troll_hammer.ron
index 41d26264a3..8ebc9d63aa 100644
--- a/assets/common/items/npc_weapons/hammer/troll_hammer.ron
+++ b/assets/common/items/npc_weapons/hammer/troll_hammer.ron
@@ -15,5 +15,5 @@ ItemDef(
     )),
     quality: Low,
     tags: [],
-    ability_set: Some(Custom("Hammer Simple")),
+    ability_spec: Some(Custom("Hammer Simple")),
 )
\ No newline at end of file
diff --git a/assets/common/items/npc_weapons/hammer/yeti_hammer.ron b/assets/common/items/npc_weapons/hammer/yeti_hammer.ron
index 7dc551560f..d906f684c9 100644
--- a/assets/common/items/npc_weapons/hammer/yeti_hammer.ron
+++ b/assets/common/items/npc_weapons/hammer/yeti_hammer.ron
@@ -15,5 +15,5 @@ ItemDef(
     )),
     quality: Low,
     tags: [],
-    ability_set: Some(Custom("Hammer Simple")),
+    ability_spec: Some(Custom("Hammer Simple")),
 )
\ No newline at end of file
diff --git a/assets/common/items/npc_weapons/staff/mindflayer_staff.ron b/assets/common/items/npc_weapons/staff/mindflayer_staff.ron
index 8f90f6e704..ee542d5083 100644
--- a/assets/common/items/npc_weapons/staff/mindflayer_staff.ron
+++ b/assets/common/items/npc_weapons/staff/mindflayer_staff.ron
@@ -15,5 +15,5 @@ ItemDef(
     )),
     quality: Legendary,
     tags: [],
-    ability_set: Some(Custom("Mindflayer")),
+    ability_spec: Some(Custom("Mindflayer")),
 )
\ No newline at end of file
diff --git a/assets/common/items/npc_weapons/staff/ogre_staff.ron b/assets/common/items/npc_weapons/staff/ogre_staff.ron
index 59b8bfcc44..5ce9ee2ebc 100644
--- a/assets/common/items/npc_weapons/staff/ogre_staff.ron
+++ b/assets/common/items/npc_weapons/staff/ogre_staff.ron
@@ -15,5 +15,5 @@ ItemDef(
     )),
     quality: Low,
     tags: [],
-    ability_set: Some(Custom("Staff Simple")),
+    ability_spec: Some(Custom("Staff Simple")),
 )
\ No newline at end of file
diff --git a/assets/common/items/npc_weapons/staff/saurok_staff.ron b/assets/common/items/npc_weapons/staff/saurok_staff.ron
index 8e0aa43269..e70a880eef 100644
--- a/assets/common/items/npc_weapons/staff/saurok_staff.ron
+++ b/assets/common/items/npc_weapons/staff/saurok_staff.ron
@@ -15,5 +15,5 @@ ItemDef(
     )),
     quality: Low,
     tags: [],
-    ability_set: Some(Custom("Staff Simple")),
+    ability_spec: Some(Custom("Staff Simple")),
 )
\ No newline at end of file
diff --git a/assets/common/items/npc_weapons/sword/dullahan_sword.ron b/assets/common/items/npc_weapons/sword/dullahan_sword.ron
index 86b43be712..53c197754f 100644
--- a/assets/common/items/npc_weapons/sword/dullahan_sword.ron
+++ b/assets/common/items/npc_weapons/sword/dullahan_sword.ron
@@ -15,5 +15,5 @@ ItemDef(
     )),
     quality: Low,
     tags: [],
-    ability_set: Some(Custom("Sword Simple")),
+    ability_spec: Some(Custom("Sword Simple")),
 )
\ No newline at end of file
diff --git a/assets/common/items/npc_weapons/sword/saurok_sword.ron b/assets/common/items/npc_weapons/sword/saurok_sword.ron
index 6b3b824a02..8c53250630 100644
--- a/assets/common/items/npc_weapons/sword/saurok_sword.ron
+++ b/assets/common/items/npc_weapons/sword/saurok_sword.ron
@@ -15,5 +15,5 @@ ItemDef(
     )),
     quality: Low,
     tags: [],
-    ability_set: Some(Custom("Sword Simple")),
+    ability_spec: Some(Custom("Sword Simple")),
 )
\ No newline at end of file
diff --git a/assets/common/items/npc_weapons/unique/beast_claws.ron b/assets/common/items/npc_weapons/unique/beast_claws.ron
index 9202909358..b67fa33ecb 100644
--- a/assets/common/items/npc_weapons/unique/beast_claws.ron
+++ b/assets/common/items/npc_weapons/unique/beast_claws.ron
@@ -15,5 +15,5 @@ ItemDef(
     )),
     quality: Low,
     tags: [],
-    ability_set: Some(Custom("Beast Claws")),
+    ability_spec: Some(Custom("Beast Claws")),
 )
\ No newline at end of file
diff --git a/assets/common/items/npc_weapons/unique/birdlargebreathe.ron b/assets/common/items/npc_weapons/unique/birdlargebreathe.ron
index 42604f0e9d..e42004cb1d 100644
--- a/assets/common/items/npc_weapons/unique/birdlargebreathe.ron
+++ b/assets/common/items/npc_weapons/unique/birdlargebreathe.ron
@@ -15,5 +15,5 @@ ItemDef(
     )),
     quality: Low,
     tags: [],
-    ability_set: Some(Custom("Bird Large Breathe")),
+    ability_spec: Some(Custom("Bird Large Breathe")),
 )
\ No newline at end of file
diff --git a/assets/common/items/npc_weapons/unique/birdlargefire.ron b/assets/common/items/npc_weapons/unique/birdlargefire.ron
index 3361c1db7c..0a44fcd156 100644
--- a/assets/common/items/npc_weapons/unique/birdlargefire.ron
+++ b/assets/common/items/npc_weapons/unique/birdlargefire.ron
@@ -15,5 +15,5 @@ ItemDef(
     )),
     quality: Low,
     tags: [],
-    ability_set: Some(Custom("Bird Large Fire")),
+    ability_spec: Some(Custom("Bird Large Fire")),
 )
\ No newline at end of file
diff --git a/assets/common/items/npc_weapons/unique/husk.ron b/assets/common/items/npc_weapons/unique/husk.ron
index 9ded5ba0e3..9f1df18b35 100644
--- a/assets/common/items/npc_weapons/unique/husk.ron
+++ b/assets/common/items/npc_weapons/unique/husk.ron
@@ -15,5 +15,5 @@ ItemDef(
     )),
     quality: Low,
     tags: [],
-    ability_set: Some(Custom("Husk")),
+    ability_spec: Some(Custom("Husk")),
 )
\ No newline at end of file
diff --git a/assets/common/items/npc_weapons/unique/quadlowbasic.ron b/assets/common/items/npc_weapons/unique/quadlowbasic.ron
index ed2d37ad8c..a91fbcb7ed 100644
--- a/assets/common/items/npc_weapons/unique/quadlowbasic.ron
+++ b/assets/common/items/npc_weapons/unique/quadlowbasic.ron
@@ -15,5 +15,5 @@ ItemDef(
     )),
     quality: Low,
     tags: [],
-    ability_set: Some(Custom("Quad Low Basic")),
+    ability_spec: Some(Custom("Quad Low Basic")),
 )
\ No newline at end of file
diff --git a/assets/common/items/npc_weapons/unique/quadlowbeam.ron b/assets/common/items/npc_weapons/unique/quadlowbeam.ron
index d597f00d00..ff0207d024 100644
--- a/assets/common/items/npc_weapons/unique/quadlowbeam.ron
+++ b/assets/common/items/npc_weapons/unique/quadlowbeam.ron
@@ -15,5 +15,5 @@ ItemDef(
     )),
     quality: Low,
     tags: [],
-    ability_set: Some(Custom("Quad Low Beam")),
+    ability_spec: Some(Custom("Quad Low Beam")),
 )
\ No newline at end of file
diff --git a/assets/common/items/npc_weapons/unique/quadlowbreathe.ron b/assets/common/items/npc_weapons/unique/quadlowbreathe.ron
index 90ea009c16..a05dad74ad 100644
--- a/assets/common/items/npc_weapons/unique/quadlowbreathe.ron
+++ b/assets/common/items/npc_weapons/unique/quadlowbreathe.ron
@@ -15,5 +15,5 @@ ItemDef(
     )),
     quality: Low,
     tags: [],
-    ability_set: Some(Custom("Quad Low Breathe")),
+    ability_spec: Some(Custom("Quad Low Breathe")),
 )
\ No newline at end of file
diff --git a/assets/common/items/npc_weapons/unique/quadlowquick.ron b/assets/common/items/npc_weapons/unique/quadlowquick.ron
index 242f88515d..70ba06f701 100644
--- a/assets/common/items/npc_weapons/unique/quadlowquick.ron
+++ b/assets/common/items/npc_weapons/unique/quadlowquick.ron
@@ -15,5 +15,5 @@ ItemDef(
     )),
     quality: Low,
     tags: [],
-    ability_set: Some(Custom("Quad Low Quick")),
+    ability_spec: Some(Custom("Quad Low Quick")),
 )
\ No newline at end of file
diff --git a/assets/common/items/npc_weapons/unique/quadlowranged.ron b/assets/common/items/npc_weapons/unique/quadlowranged.ron
index 7f9169f478..3c2b3c66aa 100644
--- a/assets/common/items/npc_weapons/unique/quadlowranged.ron
+++ b/assets/common/items/npc_weapons/unique/quadlowranged.ron
@@ -15,5 +15,5 @@ ItemDef(
     )),
     quality: Low,
     tags: [],
-    ability_set: Some(Custom("Quad Low Ranged")),
+    ability_spec: Some(Custom("Quad Low Ranged")),
 )
\ No newline at end of file
diff --git a/assets/common/items/npc_weapons/unique/quadlowtail.ron b/assets/common/items/npc_weapons/unique/quadlowtail.ron
index e5cf9afe88..1d1d6d2e49 100644
--- a/assets/common/items/npc_weapons/unique/quadlowtail.ron
+++ b/assets/common/items/npc_weapons/unique/quadlowtail.ron
@@ -15,5 +15,5 @@ ItemDef(
     )),
     quality: Low,
     tags: [],
-    ability_set: Some(Custom("Quad Low Tail")),
+    ability_spec: Some(Custom("Quad Low Tail")),
 )
\ No newline at end of file
diff --git a/assets/common/items/npc_weapons/unique/quadmedbasic.ron b/assets/common/items/npc_weapons/unique/quadmedbasic.ron
index 9e745a25ce..49c86239b2 100644
--- a/assets/common/items/npc_weapons/unique/quadmedbasic.ron
+++ b/assets/common/items/npc_weapons/unique/quadmedbasic.ron
@@ -15,5 +15,5 @@ ItemDef(
     )),
     quality: Low,
     tags: [],
-    ability_set: Some(Custom("Quad Med Basic")),
+    ability_spec: Some(Custom("Quad Med Basic")),
 )
\ No newline at end of file
diff --git a/assets/common/items/npc_weapons/unique/quadmedbasicgentle.ron b/assets/common/items/npc_weapons/unique/quadmedbasicgentle.ron
index 02c9c0f477..d4f81fab07 100644
--- a/assets/common/items/npc_weapons/unique/quadmedbasicgentle.ron
+++ b/assets/common/items/npc_weapons/unique/quadmedbasicgentle.ron
@@ -15,5 +15,5 @@ ItemDef(
     )),
     quality: Low,
     tags: [],
-    ability_set: Some(Custom("Quad Med Basic")),
+    ability_spec: Some(Custom("Quad Med Basic")),
 )
diff --git a/assets/common/items/npc_weapons/unique/quadmedcharge.ron b/assets/common/items/npc_weapons/unique/quadmedcharge.ron
index 12ae4e7e9f..b108b02a6c 100644
--- a/assets/common/items/npc_weapons/unique/quadmedcharge.ron
+++ b/assets/common/items/npc_weapons/unique/quadmedcharge.ron
@@ -15,5 +15,5 @@ ItemDef(
     )),
     quality: Low,
     tags: [],
-    ability_set: Some(Custom("Quad Med Charge")),
+    ability_spec: Some(Custom("Quad Med Charge")),
 )
\ No newline at end of file
diff --git a/assets/common/items/npc_weapons/unique/quadmedhoof.ron b/assets/common/items/npc_weapons/unique/quadmedhoof.ron
index 9f5baeadfe..314897c0c3 100644
--- a/assets/common/items/npc_weapons/unique/quadmedhoof.ron
+++ b/assets/common/items/npc_weapons/unique/quadmedhoof.ron
@@ -15,5 +15,5 @@ ItemDef(
     )),
     quality: Low,
     tags: [],
-    ability_set: Some(Custom("Quad Med Hoof")),
+    ability_spec: Some(Custom("Quad Med Hoof")),
 )
\ No newline at end of file
diff --git a/assets/common/items/npc_weapons/unique/quadmedjump.ron b/assets/common/items/npc_weapons/unique/quadmedjump.ron
index ddd684b2d9..7d0d3c16d9 100644
--- a/assets/common/items/npc_weapons/unique/quadmedjump.ron
+++ b/assets/common/items/npc_weapons/unique/quadmedjump.ron
@@ -15,5 +15,5 @@ ItemDef(
     )),
     quality: Low,
     tags: [],
-    ability_set: Some(Custom("Quad Med Jump")),
+    ability_spec: Some(Custom("Quad Med Jump")),
 )
\ No newline at end of file
diff --git a/assets/common/items/npc_weapons/unique/quadmedquick.ron b/assets/common/items/npc_weapons/unique/quadmedquick.ron
index 624c83f77d..bcfc305637 100644
--- a/assets/common/items/npc_weapons/unique/quadmedquick.ron
+++ b/assets/common/items/npc_weapons/unique/quadmedquick.ron
@@ -15,5 +15,5 @@ ItemDef(
     )),
     quality: Low,
     tags: [],
-    ability_set: Some(Custom("Quad Med Quick")),
+    ability_spec: Some(Custom("Quad Med Quick")),
 )
\ No newline at end of file
diff --git a/assets/common/items/npc_weapons/unique/quadsmallbasic.ron b/assets/common/items/npc_weapons/unique/quadsmallbasic.ron
index f648ce7d80..12b0d5820e 100644
--- a/assets/common/items/npc_weapons/unique/quadsmallbasic.ron
+++ b/assets/common/items/npc_weapons/unique/quadsmallbasic.ron
@@ -15,5 +15,5 @@ ItemDef(
     )),
     quality: Low,
     tags: [],
-    ability_set: Some(Custom("Quad Small Basic")),
+    ability_spec: Some(Custom("Quad Small Basic")),
 )
\ No newline at end of file
diff --git a/assets/common/items/npc_weapons/unique/stone_golems_fist.ron b/assets/common/items/npc_weapons/unique/stone_golems_fist.ron
index daaead94bc..a88bb5c254 100644
--- a/assets/common/items/npc_weapons/unique/stone_golems_fist.ron
+++ b/assets/common/items/npc_weapons/unique/stone_golems_fist.ron
@@ -15,5 +15,5 @@ ItemDef(
     )),
     quality: Low,
     tags: [],
-    ability_set: Some(Custom("Stone Golem")),
+    ability_spec: Some(Custom("Stone Golem")),
 )
\ No newline at end of file
diff --git a/assets/common/items/npc_weapons/unique/theropodbasic.ron b/assets/common/items/npc_weapons/unique/theropodbasic.ron
index e8841a2f0b..5e01b1e229 100644
--- a/assets/common/items/npc_weapons/unique/theropodbasic.ron
+++ b/assets/common/items/npc_weapons/unique/theropodbasic.ron
@@ -15,5 +15,5 @@ ItemDef(
     )),
     quality: Low,
     tags: [],
-    ability_set: Some(Custom("Theropod Basic")),
+    ability_spec: Some(Custom("Theropod Basic")),
 )
\ No newline at end of file
diff --git a/assets/common/items/npc_weapons/unique/theropodbird.ron b/assets/common/items/npc_weapons/unique/theropodbird.ron
index e75b0e9f11..7c11a98e86 100644
--- a/assets/common/items/npc_weapons/unique/theropodbird.ron
+++ b/assets/common/items/npc_weapons/unique/theropodbird.ron
@@ -15,5 +15,5 @@ ItemDef(
     )),
     quality: Low,
     tags: [],
-    ability_set: Some(Custom("Theropod Bird")),
+    ability_spec: Some(Custom("Theropod Bird")),
 )
\ No newline at end of file
diff --git a/assets/common/items/npc_weapons/unique/theropodcharge.ron b/assets/common/items/npc_weapons/unique/theropodcharge.ron
index a61e560ce2..c8d40e60d8 100644
--- a/assets/common/items/npc_weapons/unique/theropodcharge.ron
+++ b/assets/common/items/npc_weapons/unique/theropodcharge.ron
@@ -15,5 +15,5 @@ ItemDef(
     )),
     quality: Low,
     tags: [],
-    ability_set: Some(Custom("Theropod Charge")),
+    ability_spec: Some(Custom("Theropod Charge")),
 )
\ No newline at end of file
diff --git a/assets/common/items/npc_weapons/unique/tidal_claws.ron b/assets/common/items/npc_weapons/unique/tidal_claws.ron
index 93be40d8f9..ac0a93a417 100644
--- a/assets/common/items/npc_weapons/unique/tidal_claws.ron
+++ b/assets/common/items/npc_weapons/unique/tidal_claws.ron
@@ -15,5 +15,5 @@ ItemDef(
     )),
     quality: Low,
     tags: [],
-    ability_set: Some(Custom("Tidal Claws")),
+    ability_spec: Some(Custom("Tidal Claws")),
 )
\ No newline at end of file
diff --git a/assets/common/items/npc_weapons/unique/turret.ron b/assets/common/items/npc_weapons/unique/turret.ron
index 5d1483f3a9..fb23f8c049 100644
--- a/assets/common/items/npc_weapons/unique/turret.ron
+++ b/assets/common/items/npc_weapons/unique/turret.ron
@@ -15,5 +15,5 @@ ItemDef(
     )),
     quality: Low,
     tags: [],
-    ability_set: Some(Custom("Turret")),
+    ability_spec: Some(Custom("Turret")),
 )
\ No newline at end of file
diff --git a/assets/common/items/npc_weapons/unique/wendigo_magic.ron b/assets/common/items/npc_weapons/unique/wendigo_magic.ron
index 7b9ecd9566..2640198224 100644
--- a/assets/common/items/npc_weapons/unique/wendigo_magic.ron
+++ b/assets/common/items/npc_weapons/unique/wendigo_magic.ron
@@ -15,5 +15,5 @@ ItemDef(
     )),
     quality: Low,
     tags: [],
-    ability_set: Some(Custom("Wendigo Magic")),
+    ability_spec: Some(Custom("Wendigo Magic")),
 )
\ No newline at end of file
diff --git a/common/src/comp/inventory/item/mod.rs b/common/src/comp/inventory/item/mod.rs
index 83d22141d2..c7d5d4f841 100644
--- a/common/src/comp/inventory/item/mod.rs
+++ b/common/src/comp/inventory/item/mod.rs
@@ -278,7 +278,7 @@ pub struct ItemDef {
     pub slots: u16,
     /// Used to specify a custom ability set for a weapon. Leave None (or don't
     /// include field in ItemDef) to use default ability set for weapon kind.
-    pub ability_set: Option<AbilitySpec>,
+    pub ability_spec: Option<AbilitySpec>,
 }
 
 impl PartialEq for ItemDef {
@@ -307,7 +307,7 @@ impl TryFrom<(&Item, &AbilityMap, &MaterialStatManifest)> for ItemConfig {
             let tool_default = ability_map
                 .get_ability_set(&AbilitySpec::Tool(tool.kind))
                 .cloned();
-            let abilities = if let Some(set_key) = item.ability_set() {
+            let abilities = if let Some(set_key) = item.ability_spec() {
                 if let Some(set) = ability_map.get_ability_set(set_key) {
                     set.clone().modified_by_tool(&tool, msm, &item.components)
                 } else {
@@ -383,7 +383,7 @@ impl ItemDef {
             quality,
             tags,
             slots,
-            ability_set: None,
+            ability_spec: None,
         }
     }
 }
@@ -424,7 +424,7 @@ impl assets::Compound for ItemDef {
             quality,
             tags,
             slots,
-            ability_set,
+            ability_spec,
         } = raw;
 
         // Some commands like /give_item provide the asset specifier separated with \
@@ -441,7 +441,7 @@ impl assets::Compound for ItemDef {
             quality,
             tags,
             slots,
-            ability_set,
+            ability_spec,
         })
     }
 }
@@ -456,7 +456,7 @@ struct RawItemDef {
     tags: Vec<ItemTag>,
     #[serde(default)]
     slots: u16,
-    ability_set: Option<AbilitySpec>,
+    ability_spec: Option<AbilitySpec>,
 }
 
 impl assets::Asset for RawItemDef {
@@ -765,7 +765,7 @@ impl Item {
         }))
     }
 
-    pub fn ability_set(&self) -> Option<&AbilitySpec> { self.item_def.ability_set.as_ref() }
+    pub fn ability_spec(&self) -> Option<&AbilitySpec> { self.item_def.ability_spec.as_ref() }
 }
 
 /// Provides common methods providing details about an item definition
diff --git a/common/src/comp/inventory/item/modular.rs b/common/src/comp/inventory/item/modular.rs
index 9b6278636b..039a377e70 100644
--- a/common/src/comp/inventory/item/modular.rs
+++ b/common/src/comp/inventory/item/modular.rs
@@ -192,7 +192,7 @@ fn make_component_def(
         quality,
         tags: vec![ItemTag::ModularComponent(tag)],
         slots: 0,
-        ability_set: None,
+        ability_spec: None,
     };
     (identifier, item)
 }
@@ -215,7 +215,7 @@ fn make_weapon_def(toolkind: ToolKind) -> (String, RawItemDef) {
         quality,
         tags: Vec::new(),
         slots: 0,
-        ability_set: None,
+        ability_spec: None,
     };
     (identifier, item)
 }
@@ -268,7 +268,7 @@ fn make_tagexample_def(
         quality,
         tags: vec![ItemTag::ModularComponent(tag)],
         slots: 0,
-        ability_set: None,
+        ability_spec: None,
     };
     (identifier, item)
 }
diff --git a/server/src/sys/agent.rs b/server/src/sys/agent.rs
index 408091b738..8ebc872bc7 100644
--- a/server/src/sys/agent.rs
+++ b/server/src/sys/agent.rs
@@ -1507,8 +1507,8 @@ impl<'a> AgentData<'a> {
             .equipped(EquipSlot::Mainhand)
             .as_ref()
             .map(|item| {
-                if let Some(ability_set) = item.ability_set() {
-                    match ability_set {
+                if let Some(ability_spec) = item.ability_spec() {
+                    match ability_spec {
                         AbilitySpec::Custom(spec) => match spec.as_str() {
                             "Axe Simple" | "Sword Simple" => Tactic::Sword,
                             "Staff Simple" => Tactic::Staff,
diff --git a/voxygen/src/scene/figure/mod.rs b/voxygen/src/scene/figure/mod.rs
index daf7fbf5cd..c502b07ddf 100644
--- a/voxygen/src/scene/figure/mod.rs
+++ b/voxygen/src/scene/figure/mod.rs
@@ -731,7 +731,7 @@ impl FigureMgr {
                     .and_then(|i| i.equipped(equip_slot))
                     .map(|i| {
                         if let ItemKind::Tool(tool) = i.kind() {
-                            (Some(tool.kind), Some(tool.hands), i.ability_set())
+                            (Some(tool.kind), Some(tool.hands), i.ability_spec())
                         } else {
                             (None, None, None)
                         }