diff --git a/assets/common/items/npc_weapons/npcweapon/beast_claws.ron b/assets/common/items/npc_weapons/unique/beast_claws.ron
similarity index 100%
rename from assets/common/items/npc_weapons/npcweapon/beast_claws.ron
rename to assets/common/items/npc_weapons/unique/beast_claws.ron
diff --git a/assets/common/items/npc_weapons/npcweapon/stone_golems_fist.ron b/assets/common/items/npc_weapons/unique/stone_golems_fist.ron
similarity index 100%
rename from assets/common/items/npc_weapons/npcweapon/stone_golems_fist.ron
rename to assets/common/items/npc_weapons/unique/stone_golems_fist.ron
diff --git a/assets/voxygen/item_image_manifest.ron b/assets/voxygen/item_image_manifest.ron
index b7c0aa25ce..aab1c6c5f0 100644
--- a/assets/voxygen/item_image_manifest.ron
+++ b/assets/voxygen/item_image_manifest.ron
@@ -4,522 +4,574 @@
 ({
     // Weapons
     // Bows
-    Tool(Bow("ShortBow0")): VoxTrans(
+    "common.items.weapons.bow.starter_bow": VoxTrans(
         "voxel.weapon.bow.shortbow_starter",
         (0.0, 0.0, 0.0), (90.0, 90.0, 0.0), 1.0,
     ),
-    Tool(Bow("WoodShortbow0")): VoxTrans(
+    "common.items.weapons.bow.wood_shortbow-0": VoxTrans(
         "voxel.weapon.bow.shortbow_wood-0",
         (0.0, 0.0, 0.0), (90.0, 90.0, 0.0), 1.0,
     ),
-    Tool(Bow("WoodShortbow1")): VoxTrans(
+    "common.items.weapons.bow.wood_shortbow-1": VoxTrans(
         "voxel.weapon.bow.shortbow_wood-1",
         (0.0, 0.0, 0.0), (90.0, 90.0, 0.0), 1.0,
     ),
-    Tool(Bow("LeafyShortbow0")): VoxTrans(
+    "common.items.weapons.bow.leafy_shortbow-0": VoxTrans(
         "voxel.weapon.bow.shortbow_leafy-0",
         (0.0, 0.0, 0.0), (90.0, 90.0, 0.0), 1.0,
     ),
-    Tool(Bow("WoodLongbow0")): VoxTrans(
+    "common.items.weapons.bow.wood_longbow-0": VoxTrans(
         "voxel.weapon.bow.longbow_wood-0",
         (0.0, 0.0, 0.0), (90.0, 90.0, 0.0), 1.0,
     ),
-    Tool(Bow("WoodLongbow1")): VoxTrans(
+    "common.items.weapons.bow.wood_longbow-1": VoxTrans(
         "voxel.weapon.bow.longbow_wood-1",
         (0.0, 0.0, 0.0), (90.0, 90.0, 0.0), 1.0,
     ),
-    Tool(Bow("LeafyLongbow0")): VoxTrans(
+    "common.items.weapons.bow.leafy_longbow-0": VoxTrans(
         "voxel.weapon.bow.longbow_leafy-0",
         (0.0, 0.0, 0.0), (90.0, 90.0, 0.0), 1.0,
     ),
-    Tool(Bow("HornLongbow0")): VoxTrans(
+    "common.items.weapons.bow.horn_longbow-0": VoxTrans(
         "voxel.weapon.bow.longbow_horn-0",
         (0.0, 0.0, 0.0), (90.0, 90.0, 0.0), 1.0,
     ),
-    Tool(Bow("IronLongbow0")): VoxTrans(
+    "common.items.npc_weapons.bow.horn_longbow-0": VoxTrans(
+        "voxel.weapon.bow.longbow_horn-0",
+        (0.0, 0.0, 0.0), (90.0, 90.0, 0.0), 1.0,
+    ),
+    "common.items.weapons.bow.iron_longbow-0": VoxTrans(
         "voxel.weapon.bow.longbow_iron-0",
         (0.0, 0.0, 0.0), (90.0, 90.0, 0.0), 1.0,
     ),
-    Tool(Bow("RareLongbow")): VoxTrans(
+    "common.items.weapons.bow.rare_longbow": VoxTrans(
         "voxel.weapon.bow.longbow_rare",
         (0.0, 0.0, 0.0), (90.0, 90.0, 0.0), 1.0,
     ),
-    Tool(Bow("NatureOreLongbow")): VoxTrans(
+    "common.items.weapons.bow.nature_ore_longbow-0": VoxTrans(
         "voxel.weapon.bow.longbow_ore_nature-0",
         (0.0, 0.0, 0.0), (90.0, 90.0, 0.0), 1.0,
     ),
     // Daggers
-    Tool(Dagger("BasicDagger")): VoxTrans(
+    "common.items.weapons.dagger.starter_dagger": VoxTrans(
+        "voxel.weapon.dagger.dagger_rusty",
+        (0.0, 0.0, -4.0), (-120.0, 90.0, 0.0), 1.1,
+    ),
+    "common.items.npc_weapons.dagger.starter_dagger": VoxTrans(
         "voxel.weapon.dagger.dagger_rusty",
         (0.0, 0.0, -4.0), (-120.0, 90.0, 0.0), 1.1,
     ),
     // Swords
-    Tool(Sword("Short0")): VoxTrans(
+    "common.items.weapons.sword.short_sword_0": VoxTrans(
         "voxel.weapon.sword.short_2h-0",
         (-3.0, 3.0, 0.0), (-135.0, 90.0, 0.0), 1.60,
     ),
-    Tool(Sword("BasicSword")): VoxTrans(
+    "common.items.weapons.sword.starter_sword": VoxTrans(
         "voxel.weapon.sword.rusty_2h",
         (0.0, 0.0, 0.0), (-135.0, 90.0, 0.0), 1.3,
     ),
-    Tool(Sword("Zweihander0")): VoxTrans(
+    "common.items.npc_weapons.sword.starter_sword": VoxTrans(
+        "voxel.weapon.sword.rusty_2h",
+        (0.0, 0.0, 0.0), (-135.0, 90.0, 0.0), 1.3,
+    ),
+    "common.items.weapons.sword.zweihander_sword_0": VoxTrans(
         "voxel.weapon.sword.zweihander_2h-0",
         (0.0, 0.0, 0.0), (-135.0, 90.0, 0.0), 1.2,
     ),
-    Tool(Sword("WoodTraining")): VoxTrans(
+    "common.items.npc_weapons.sword.zweihander_sword_0": VoxTrans(
+        "voxel.weapon.sword.zweihander_2h-0",
+        (0.0, 0.0, 0.0), (-135.0, 90.0, 0.0), 1.2,
+    ),
+    "common.items.weapons.sword.wood_sword": VoxTrans(
         "voxel.weapon.sword.wood_ore_2h",
         (0.0, 0.0, 0.0), (-135.0, 90.0, 0.0), 1.2,
     ),
-    Tool(Sword("LongFine3")): VoxTrans(
-        "voxel.weapon.sword.long_2h_fine-3",
-        (0.0, 9.0, 0.0), (-90.0, 90.0, 0.0), 2.4,
-    ),
-    Tool(Sword("GreatswordDam0")): VoxTrans(
+    "common.items.weapons.sword.greatsword_2h_dam-0": VoxTrans(
         "voxel.weapon.sword.greatsword_2h_dam-0",
         (0.0, 0.0, 0.0), (-135.0, 90.0, 0.0), 1.5,
     ),
-    Tool(Sword("GreatswordDam1")): VoxTrans(
+    "common.items.weapons.sword.greatsword_2h_dam-1": VoxTrans(
         "voxel.weapon.sword.greatsword_2h_dam-1",
         (0.0, 0.0, 0.0), (-135.0, 90.0, 0.0), 1.5,
     ),
-    Tool(Sword("GreatswordDam2")): VoxTrans(
+    "common.items.weapons.sword.greatsword_2h_dam-2": VoxTrans(
         "voxel.weapon.sword.greatsword_2h_dam-2",
         (0.0, 0.0, 0.0), (-135.0, 90.0, 0.0), 1.5,
     ),
-    Tool(Sword("GreatswordSimple0")): VoxTrans(
+    "common.items.weapons.sword.greatsword_2h_simple-0": VoxTrans(
         "voxel.weapon.sword.greatsword_2h_simple-0",
         (0.0, 0.0, 0.0), (-135.0, 90.0, 0.0), 1.5,
     ),
-    Tool(Sword("GreatswordSimple1")): VoxTrans(
+    "common.items.weapons.sword.greatsword_2h_simple-1": VoxTrans(
         "voxel.weapon.sword.greatsword_2h_simple-1",
         (0.0, 0.0, 0.0), (-135.0, 90.0, 0.0), 1.5,
     ),
-    Tool(Sword("GreatswordSimple2")): VoxTrans(
+    "common.items.weapons.sword.greatsword_2h_simple-2": VoxTrans(
         "voxel.weapon.sword.greatsword_2h_simple-2",
         (0.0, 0.0, 0.0), (-135.0, 90.0, 0.0), 1.5,
     ),
-    Tool(Sword("GreatswordOrn0")): VoxTrans(
+    "common.items.weapons.sword.greatsword_2h_orn-0": VoxTrans(
         "voxel.weapon.sword.greatsword_2h_orn-0",
         (0.0, 0.0, 0.0), (-135.0, 90.0, 0.0), 1.5,
     ),
-    Tool(Sword("GreatswordOrn1")): VoxTrans(
+    "common.items.weapons.sword.greatsword_2h_orn-1": VoxTrans(
         "voxel.weapon.sword.greatsword_2h_orn-1",
         (0.0, 0.0, 0.0), (-135.0, 90.0, 0.0), 1.5,
     ),
-    Tool(Sword("GreatswordOrn2")): VoxTrans(
+    "common.items.weapons.sword.greatsword_2h_orn-2": VoxTrans(
         "voxel.weapon.sword.greatsword_2h_orn-2",
         (0.0, 0.0, 0.0), (-135.0, 90.0, 0.0), 1.5,
     ),
-    Tool(Sword("GreatswordFine0")): VoxTrans(
+    "common.items.weapons.sword.greatsword_2h_fine-0": VoxTrans(
         "voxel.weapon.sword.greatsword_2h_fine-0",
         (0.0, 0.0, 0.0), (-135.0, 90.0, 0.0), 1.5,
     ),
-    Tool(Sword("GreatswordFine1")): VoxTrans(
+    "common.items.weapons.sword.greatsword_2h_fine-1": VoxTrans(
         "voxel.weapon.sword.greatsword_2h_fine-1",
         (0.0, 0.0, 0.0), (-135.0, 90.0, 0.0), 1.5,
     ),
-    Tool(Sword("GreatswordFine2")): VoxTrans(
+    "common.items.weapons.sword.greatsword_2h_fine-2": VoxTrans(
         "voxel.weapon.sword.greatsword_2h_fine-2",
         (0.0, 0.0, 0.0), (-135.0, 90.0, 0.0), 1.5,
     ),
-    Tool(Sword("LongDam0")): VoxTrans(
+    "common.items.weapons.sword.long_2h_dam-0": VoxTrans(
         "voxel.weapon.sword.long_2h_dam-0",
         (0.0, 0.0, 0.0), (-135.0, 90.0, 0.0), 1.5,
     ),
-    Tool(Sword("LongDam1")): VoxTrans(
+    "common.items.weapons.sword.long_2h_dam-1": VoxTrans(
         "voxel.weapon.sword.long_2h_dam-1",
         (0.0, 0.0, 0.0), (-135.0, 90.0, 0.0), 1.5,
     ),
-    Tool(Sword("LongDam2")): VoxTrans(
+    "common.items.weapons.sword.long_2h_dam-2": VoxTrans(
         "voxel.weapon.sword.long_2h_dam-2",
         (0.0, 0.0, 0.0), (-135.0, 90.0, 0.0), 1.5,
     ),
-    Tool(Sword("LongDam3")): VoxTrans(
+    "common.items.weapons.sword.long_2h_dam-3": VoxTrans(
         "voxel.weapon.sword.long_2h_dam-3",
         (0.0, 0.0, 0.0), (-135.0, 90.0, 0.0), 1.5,
     ),
-    Tool(Sword("LongDam4")): VoxTrans(
+    "common.items.weapons.sword.long_2h_dam-4": VoxTrans(
         "voxel.weapon.sword.long_2h_dam-4",
         (0.0, 0.0, 0.0), (-135.0, 90.0, 0.0), 1.5,
     ),
-    Tool(Sword("LongDam5")): VoxTrans(
+    "common.items.weapons.sword.long_2h_dam-5": VoxTrans(
         "voxel.weapon.sword.long_2h_dam-5",
         (0.0, 0.0, 0.0), (-135.0, 90.0, 0.0), 1.5,
     ),
-    Tool(Sword("LongSimple0")): VoxTrans(
+    "common.items.weapons.sword.long_2h_simple-0": VoxTrans(
         "voxel.weapon.sword.long_2h_simple-0",
         (0.0, 0.0, 0.0), (-135.0, 90.0, 0.0), 1.5,
     ),
-    Tool(Sword("LongSimple1")): VoxTrans(
+    "common.items.weapons.sword.long_2h_simple-1": VoxTrans(
         "voxel.weapon.sword.long_2h_simple-1",
         (0.0, 0.0, 0.0), (-135.0, 90.0, 0.0), 1.5,
     ),
-    Tool(Sword("LongSimple2")): VoxTrans(
+    "common.items.weapons.sword.long_2h_simple-2": VoxTrans(
         "voxel.weapon.sword.long_2h_simple-2",
         (0.0, 0.0, 0.0), (-135.0, 90.0, 0.0), 1.5,
     ),
-    Tool(Sword("LongSimple3")): VoxTrans(
+    "common.items.weapons.sword.long_2h_simple-3": VoxTrans(
         "voxel.weapon.sword.long_2h_simple-3",
         (0.0, 0.0, 0.0), (-135.0, 90.0, 0.0), 1.5,
     ),
-    Tool(Sword("LongSimple4")): VoxTrans(
+    "common.items.weapons.sword.long_2h_simple-4": VoxTrans(
         "voxel.weapon.sword.long_2h_simple-4",
         (0.0, 0.0, 0.0), (-135.0, 90.0, 0.0), 1.5,
     ),
-    Tool(Sword("LongSimple5")): VoxTrans(
+    "common.items.weapons.sword.long_2h_simple-5": VoxTrans(
         "voxel.weapon.sword.long_2h_simple-5",
         (0.0, 0.0, 0.0), (-135.0, 90.0, 0.0), 1.5,
     ),
-    Tool(Sword("LongOrn0")): VoxTrans(
+    "common.items.weapons.sword.long_2h_orn-0": VoxTrans(
         "voxel.weapon.sword.long_2h_orn-0",
         (0.0, 0.0, 0.0), (-135.0, 90.0, 0.0), 1.5,
     ),
-    Tool(Sword("LongOrn1")): VoxTrans(
+    "common.items.weapons.sword.long_2h_orn-1": VoxTrans(
         "voxel.weapon.sword.long_2h_orn-1",
         (0.0, 0.0, 0.0), (-135.0, 90.0, 0.0), 1.5,
     ),
-    Tool(Sword("LongOrn2")): VoxTrans(
+    "common.items.weapons.sword.long_2h_orn-2": VoxTrans(
         "voxel.weapon.sword.long_2h_orn-2",
         (0.0, 0.0, 0.0), (-135.0, 90.0, 0.0), 1.5,
     ),
-    Tool(Sword("LongOrn3")): VoxTrans(
+    "common.items.weapons.sword.long_2h_orn-3": VoxTrans(
         "voxel.weapon.sword.long_2h_orn-3",
         (0.0, 0.0, 0.0), (-135.0, 90.0, 0.0), 1.5,
     ),
-    Tool(Sword("LongOrn4")): VoxTrans(
+    "common.items.weapons.sword.long_2h_orn-4": VoxTrans(
         "voxel.weapon.sword.long_2h_orn-4",
         (0.0, 0.0, 0.0), (-135.0, 90.0, 0.0), 1.5,
     ),
-    Tool(Sword("LongOrn5")): VoxTrans(
+    "common.items.weapons.sword.long_2h_orn-5": VoxTrans(
         "voxel.weapon.sword.long_2h_orn-5",
         (0.0, 0.0, 0.0), (-135.0, 90.0, 0.0), 1.5,
     ),
-    Tool(Sword("LongFine0")): VoxTrans(
+    "common.items.weapons.sword.long_2h_fine-0": VoxTrans(
         "voxel.weapon.sword.long_2h_fine-0",
         (0.0, 0.0, 0.0), (-135.0, 90.0, 0.0), 1.5,
     ),
-    Tool(Sword("LongFine1")): VoxTrans(
+    "common.items.weapons.sword.long_2h_fine-1": VoxTrans(
         "voxel.weapon.sword.long_2h_fine-1",
         (0.0, 0.0, 0.0), (-135.0, 90.0, 0.0), 1.5,
     ),
-    Tool(Sword("LongFine2")): VoxTrans(
+    "common.items.weapons.sword.long_2h_fine-2": VoxTrans(
         "voxel.weapon.sword.long_2h_fine-2",
         (0.0, 0.0, 0.0), (-135.0, 90.0, 0.0), 1.5,
     ),
-    Tool(Sword("LongFine3")): VoxTrans(
+    "common.items.weapons.sword.long_2h_fine-3": VoxTrans(
         "voxel.weapon.sword.long_2h_fine-3",
         (0.0, 0.0, 0.0), (-135.0, 90.0, 0.0), 1.5,
     ),
-    Tool(Sword("LongFine4")): VoxTrans(
+    "common.items.weapons.sword.long_2h_fine-4": VoxTrans(
         "voxel.weapon.sword.long_2h_fine-4",
         (0.0, 0.0, 0.0), (-135.0, 90.0, 0.0), 1.5,
     ),
-    Tool(Sword("LongFine5")): VoxTrans(
+    "common.items.weapons.sword.long_2h_fine-5": VoxTrans(
         "voxel.weapon.sword.long_2h_fine-5",
         (0.0, 0.0, 0.0), (-135.0, 90.0, 0.0), 1.5,
     ),
-    Tool(Sword("CultPurp0")): VoxTrans(
+    "common.items.npc_weapons.sword.cultist_purp_2h-0": VoxTrans(
+        "voxel.weapon.sword.cultist_purp_2h-0",
+        (0.0, 0.0, 0.0), (-135.0, 90.0, 0.0), 1.5,
+    ),
+    "common.items.npc_weapons.sword.cultist_purp_2h_boss-0": VoxTrans(
+        "voxel.weapon.sword.cultist_purp_2h-0",
+        (0.0, 0.0, 0.0), (-135.0, 90.0, 0.0), 1.5,
+    ),
+    "common.items.weapons.sword.cultist_purp_2h_boss-0": VoxTrans(
         "voxel.weapon.sword.cultist_purp_2h-0",
         (0.0, 0.0, 0.0), (-135.0, 90.0, 0.0), 1.5,
     ),
     // Axes
-    Tool(Axe("BasicAxe")): VoxTrans(
+    "common.items.weapons.axe.starter_axe": VoxTrans(
         "voxel.weapon.axe.2haxe_rusty",
         (1.0, -1.0, 0.0), (-135.0, 90.0, 0.0), 1.2,
     ),
-    Tool(Axe("OrcAxe0")): VoxTrans(
+    "common.items.npc_weapons.axe.starter_axe": VoxTrans(
+        "voxel.weapon.axe.2haxe_rusty",
+        (1.0, -1.0, 0.0), (-135.0, 90.0, 0.0), 1.2,
+    ),
+    "common.items.weapons.axe.orc_axe-0": VoxTrans(
         "voxel.weapon.axe.2haxe_orc-0",
         (1.0, -1.0, 0.0), (-135.0, 90.0, 0.0), 1.2,
     ),
-    Tool(Axe("WornIronAxe0")): VoxTrans(
+    "common.items.weapons.axe.worn_iron_axe-0": VoxTrans(
         "voxel.weapon.axe.2haxe_worn_iron-0",
         (1.0, -1.0, 0.0), (-135.0, 90.0, 0.0), 1.2,
     ),
-    Tool(Axe("WornIronAxe1")): VoxTrans(
+    "common.items.weapons.axe.worn_iron_axe-1": VoxTrans(
         "voxel.weapon.axe.2haxe_worn_iron-1",
         (1.0, -1.0, 0.0), (-135.0, 90.0, 0.0), 1.2,
     ),
-    Tool(Axe("WornIronAxe2")): VoxTrans(
+    "common.items.weapons.axe.worn_iron_axe-2": VoxTrans(
         "voxel.weapon.axe.2haxe_worn_iron-2",
         (1.0, -1.0, 0.0), (-135.0, 90.0, 0.0), 1.2,
     ),
-    Tool(Axe("WornIronAxe3")): VoxTrans(
+    "common.items.weapons.axe.worn_iron_axe-3": VoxTrans(
         "voxel.weapon.axe.2haxe_worn_iron-3",
         (1.0, -1.0, 0.0), (-135.0, 90.0, 0.0), 1.2,
     ),
-    Tool(Axe("WornIronAxe4")): VoxTrans(
+    "common.items.weapons.axe.worn_iron_axe-4": VoxTrans(
         "voxel.weapon.axe.2haxe_worn_iron-4",
         (1.0, -1.0, 0.0), (-135.0, 90.0, 0.0), 1.2,
     ),
-    Tool(Axe("BronzeAxe0")): VoxTrans(
+    "common.items.weapons.axe.bronze_axe-0": VoxTrans(
         "voxel.weapon.axe.2haxe_bronze-0",
         (1.0, -1.0, 0.0), (-135.0, 90.0, 0.0), 1.2,
     ),
-    Tool(Axe("BronzeAxe1")): VoxTrans(
+    "common.items.weapons.axe.bronze_axe-1": VoxTrans(
         "voxel.weapon.axe.2haxe_bronze-1",
         (1.0, -1.0, 0.0), (-135.0, 90.0, 0.0), 1.2,
     ),
-    Tool(Axe("IronAxe0")): VoxTrans(
+    "common.items.weapons.axe.iron_axe-0": VoxTrans(
         "voxel.weapon.axe.2haxe_iron-0",
         (1.0, -1.0, 0.0), (-135.0, 90.0, 0.0), 1.2,
     ),
-    Tool(Axe("IronAxe1")): VoxTrans(
+    "common.items.weapons.axe.iron_axe-1": VoxTrans(
         "voxel.weapon.axe.2haxe_iron-1",
         (1.0, -1.0, 0.0), (-135.0, 90.0, 0.0), 1.2,
     ),
-    Tool(Axe("IronAxe2")): VoxTrans(
+    "common.items.weapons.axe.iron_axe-2": VoxTrans(
         "voxel.weapon.axe.2haxe_iron-2",
         (1.0, -1.0, 0.0), (-135.0, 90.0, 0.0), 1.2,
     ),
-    Tool(Axe("IronAxe3")): VoxTrans(
+    "common.items.weapons.axe.iron_axe-3": VoxTrans(
         "voxel.weapon.axe.2haxe_iron-3",
         (1.0, -1.0, 0.0), (-135.0, 90.0, 0.0), 1.2,
     ),
-    Tool(Axe("IronAxe4")): VoxTrans(
+    "common.items.weapons.axe.iron_axe-4": VoxTrans(
         "voxel.weapon.axe.2haxe_iron-4",
         (1.0, -1.0, 0.0), (-135.0, 90.0, 0.0), 1.2,
     ),
-    Tool(Axe("IronAxe5")): VoxTrans(
+    "common.items.weapons.axe.iron_axe-5": VoxTrans(
         "voxel.weapon.axe.2haxe_iron-5",
         (1.0, -1.0, 0.0), (-135.0, 90.0, 0.0), 1.2,
     ),
-    Tool(Axe("IronAxe6")): VoxTrans(
+    "common.items.weapons.axe.iron_axe-6": VoxTrans(
         "voxel.weapon.axe.2haxe_iron-6",
         (1.0, -1.0, 0.0), (-135.0, 90.0, 0.0), 1.2,
     ),
-    Tool(Axe("IronAxe7")): VoxTrans(
+    "common.items.weapons.axe.iron_axe-7": VoxTrans(
         "voxel.weapon.axe.2haxe_iron-7",
         (1.0, -1.0, 0.0), (-135.0, 90.0, 0.0), 1.2,
     ),
-    Tool(Axe("IronAxe8")): VoxTrans(
+    "common.items.weapons.axe.iron_axe-8": VoxTrans(
         "voxel.weapon.axe.2haxe_iron-8",
         (1.0, -1.0, 0.0), (-135.0, 90.0, 0.0), 1.2,
     ),
-    Tool(Axe("IronAxe8")): VoxTrans(
-        "voxel.weapon.axe.2haxe_iron-8",
-        (1.0, -1.0, 0.0), (-135.0, 90.0, 0.0), 1.2,
-    ),
-    Tool(Axe("IronAxe9")): VoxTrans(
+    "common.items.weapons.axe.iron_axe-9": VoxTrans(
         "voxel.weapon.axe.2haxe_iron-9",
         (1.0, -1.0, 0.0), (-135.0, 90.0, 0.0), 1.2,
     ),
-    Tool(Axe("SteelAxe0")): VoxTrans(
+    "common.items.weapons.axe.steel_axe-0": VoxTrans(
         "voxel.weapon.axe.2haxe_steel-0",
         (1.0, -1.0, 0.0), (-135.0, 90.0, 0.0), 1.2,
     ),
-    Tool(Axe("SteelAxe1")): VoxTrans(
+    "common.items.weapons.axe.steel_axe-1": VoxTrans(
         "voxel.weapon.axe.2haxe_steel-1",
         (1.0, -1.0, 0.0), (-135.0, 90.0, 0.0), 1.2,
     ),
-    Tool(Axe("SteelAxe2")): VoxTrans(
+    "common.items.weapons.axe.steel_axe-2": VoxTrans(
         "voxel.weapon.axe.2haxe_steel-2",
         (1.0, -1.0, 0.0), (-135.0, 90.0, 0.0), 1.2,
     ),
-    Tool(Axe("SteelAxe3")): VoxTrans(
+    "common.items.weapons.axe.steel_axe-3": VoxTrans(
         "voxel.weapon.axe.2haxe_steel-3",
         (1.0, -1.0, 0.0), (-135.0, 90.0, 0.0), 1.2,
     ),
-    Tool(Axe("SteelAxe4")): VoxTrans(
+    "common.items.weapons.axe.steel_axe-4": VoxTrans(
         "voxel.weapon.axe.2haxe_steel-4",
         (1.0, -1.0, 0.0), (-135.0, 90.0, 0.0), 1.2,
     ),
-    Tool(Axe("SteelAxe5")): VoxTrans(
+    "common.items.weapons.axe.steel_axe-5": VoxTrans(
         "voxel.weapon.axe.2haxe_steel-5",
         (1.0, -1.0, 0.0), (-135.0, 90.0, 0.0), 1.2,
     ),
-    Tool(Axe("SteelAxe6")): VoxTrans(
+    "common.items.weapons.axe.steel_axe-6": VoxTrans(
         "voxel.weapon.axe.2haxe_steel-6",
         (1.0, -1.0, 0.0), (-135.0, 90.0, 0.0), 1.2,
     ),
-    Tool(Axe("BloodsteelAxe0")): VoxTrans(
+    "common.items.weapons.axe.bloodsteel_axe-0": VoxTrans(
         "voxel.weapon.axe.2haxe_bloodsteel-0",
         (1.0, -1.0, 0.0), (-135.0, 90.0, 0.0), 1.2,
     ),
-    Tool(Axe("BloodsteelAxe1")): VoxTrans(
+    "common.items.weapons.axe.bloodsteel_axe-1": VoxTrans(
         "voxel.weapon.axe.2haxe_bloodsteel-1",
         (1.0, -1.0, 0.0), (-135.0, 90.0, 0.0), 1.2,
     ),
-    Tool(Axe("BloodsteelAxe2")): VoxTrans(
+    "common.items.weapons.axe.bloodsteel_axe-2": VoxTrans(
         "voxel.weapon.axe.2haxe_bloodsteel-2",
         (1.0, -1.0, 0.0), (-135.0, 90.0, 0.0), 1.2,
     ),
-    Tool(Axe("CobaltAxe0")): VoxTrans(
+    "common.items.weapons.axe.cobalt_axe-0": VoxTrans(
         "voxel.weapon.axe.2haxe_cobalt-0",
         (1.0, -1.0, 0.0), (-135.0, 90.0, 0.0), 1.2,
     ),
-    Tool(Axe("MalachiteAxe0")): VoxTrans(
+    "common.items.weapons.axe.malachite_axe-0": VoxTrans(
+        "voxel.weapon.axe.2haxe_malachite-0",
+        (1.0, -1.0, 0.0), (-135.0, 90.0, 0.0), 1.2,
+    ),
+    "common.items.npc_weapons.axe.malachite_axe-0": VoxTrans(
         "voxel.weapon.axe.2haxe_malachite-0",
         (1.0, -1.0, 0.0), (-135.0, 90.0, 0.0), 1.2,
     ),
     // Hammers
-    Tool(Hammer("BasicHammer")): VoxTrans(
+    "common.items.weapons.hammer.hammer_1": VoxTrans(
         "voxel.weapon.hammer.2hhammer_rusty",
         (2.0, -1.0, 0.0), (-135.0, 90.0, 0.0), 1.1,
     ),
-    Tool(Hammer("WoodHammer0")): VoxTrans(
+    "common.items.weapons.hammer.starter_hammer": VoxTrans(
+        "voxel.weapon.hammer.2hhammer_rusty",
+        (2.0, -1.0, 0.0), (-135.0, 90.0, 0.0), 1.1,
+    ),
+    "common.items.npc_weapons.hammer.starter_hammer": VoxTrans(
+        "voxel.weapon.hammer.2hhammer_rusty",
+        (2.0, -1.0, 0.0), (-135.0, 90.0, 0.0), 1.1,
+    ),
+    "common.items.weapons.hammer.wood_hammer-0": VoxTrans(
         "voxel.weapon.hammer.2hhammer_wood-0",
         (2.0, -1.0, 0.0), (-135.0, 90.0, 0.0), 1.1,
     ),
-    Tool(Hammer("FlimsyHammer")): VoxTrans(
+    "common.items.weapons.hammer.flimsy_hammer": VoxTrans(
         "voxel.weapon.hammer.2hhammer_flimsy",
         (2.0, -1.0, 0.0), (-135.0, 90.0, 0.0), 1.1,
     ),
-    Tool(Hammer("StoneHammer0")): VoxTrans(
+    "common.items.weapons.hammer.stone_hammer-0": VoxTrans(
         "voxel.weapon.hammer.2hhammer_stone-0",
         (2.0, -1.0, 0.0), (-135.0, 90.0, 0.0), 1.1,
     ),
-    Tool(Hammer("StoneHammer1")): VoxTrans(
+    "common.items.weapons.hammer.stone_hammer-1": VoxTrans(
         "voxel.weapon.hammer.2hhammer_stone-1",
         (2.0, -1.0, 0.0), (-135.0, 90.0, 0.0), 1.1,
     ),
-    Tool(Hammer("StoneHammer2")): VoxTrans(
+    "common.items.weapons.hammer.stone_hammer-2": VoxTrans(
         "voxel.weapon.hammer.2hhammer_stone-2",
         (2.0, -1.0, 0.0), (-135.0, 90.0, 0.0), 1.1,
     ),
-    Tool(Hammer("StoneHammer3")): VoxTrans(
+    "common.items.weapons.hammer.stone_hammer-3": VoxTrans(
         "voxel.weapon.hammer.2hhammer_stone-3",
         (2.0, -1.0, 0.0), (-135.0, 90.0, 0.0), 1.1,
     ),
-    Tool(Hammer("WornIronHammer0")): VoxTrans(
+    "common.items.weapons.hammer.worn_iron_hammer-0": VoxTrans(
         "voxel.weapon.hammer.2hhammer_worn_iron-0",
         (2.0, -1.0, 0.0), (-135.0, 90.0, 0.0), 1.1,
     ),
-    Tool(Hammer("WornIronHammer1")): VoxTrans(
+    "common.items.weapons.hammer.worn_iron_hammer-1": VoxTrans(
         "voxel.weapon.hammer.2hhammer_worn_iron-1",
         (2.0, -1.0, 0.0), (-135.0, 90.0, 0.0), 1.1,
     ),
-    Tool(Hammer("WornIronHammer2")): VoxTrans(
+    "common.items.weapons.hammer.worn_iron_hammer-2": VoxTrans(
         "voxel.weapon.hammer.2hhammer_worn_iron-2",
         (2.0, -1.0, 0.0), (-135.0, 90.0, 0.0), 1.1,
     ),
-    Tool(Hammer("WornIronHammer3")): VoxTrans(
+    "common.items.weapons.hammer.worn_iron_hammer-3": VoxTrans(
         "voxel.weapon.hammer.2hhammer_worn_iron-3",
         (2.0, -1.0, 0.0), (-135.0, 90.0, 0.0), 1.1,
     ),
-    Tool(Hammer("BronzeHammer0")): VoxTrans(
+    "common.items.weapons.hammer.bronze_hammer-0": VoxTrans(
         "voxel.weapon.hammer.2hhammer_bronze-0",
         (2.0, -1.0, 0.0), (-135.0, 90.0, 0.0), 1.1,
     ),
-    Tool(Hammer("BronzeHammer1")): VoxTrans(
+    "common.items.weapons.hammer.bronze_hammer-1": VoxTrans(
         "voxel.weapon.hammer.2hhammer_bronze-1",
         (2.0, -1.0, 0.0), (-135.0, 90.0, 0.0), 1.1,
     ),
-    Tool(Hammer("IronHammer0")): VoxTrans(
+    "common.items.weapons.hammer.iron_hammer-0": VoxTrans(
         "voxel.weapon.hammer.2hhammer_iron-0",
         (2.0, -1.0, 0.0), (-135.0, 90.0, 0.0), 1.1,
     ),
-    Tool(Hammer("IronHammer1")): VoxTrans(
+    "common.items.weapons.hammer.iron_hammer-1": VoxTrans(
         "voxel.weapon.hammer.2hhammer_iron-1",
         (2.0, -1.0, 0.0), (-135.0, 90.0, 0.0), 1.1,
     ),
-    Tool(Hammer("IronHammer2")): VoxTrans(
+    "common.items.weapons.hammer.iron_hammer-2": VoxTrans(
         "voxel.weapon.hammer.2hhammer_iron-2",
         (2.0, -1.0, 0.0), (-135.0, 90.0, 0.0), 1.1,
     ),
-    Tool(Hammer("IronHammer3")): VoxTrans(
+    "common.items.weapons.hammer.iron_hammer-3": VoxTrans(
         "voxel.weapon.hammer.2hhammer_iron-3",
         (2.0, -1.0, 0.0), (-135.0, 90.0, 0.0), 1.1,
     ),
-    Tool(Hammer("IronHammer4")): VoxTrans(
+    "common.items.weapons.hammer.iron_hammer-4": VoxTrans(
         "voxel.weapon.hammer.2hhammer_iron-4",
         (2.0, -1.0, 0.0), (-135.0, 90.0, 0.0), 1.1,
     ),
-    Tool(Hammer("IronHammer5")): VoxTrans(
+    "common.items.weapons.hammer.iron_hammer-5": VoxTrans(
         "voxel.weapon.hammer.2hhammer_iron-5",
         (2.0, -1.0, 0.0), (-135.0, 90.0, 0.0), 1.1,
     ),
-    Tool(Hammer("IronHammer6")): VoxTrans(
+    "common.items.weapons.hammer.iron_hammer-6": VoxTrans(
         "voxel.weapon.hammer.2hhammer_iron-6",
         (2.0, -1.0, 0.0), (-135.0, 90.0, 0.0), 1.1,
     ),
-    Tool(Hammer("IronHammer7")): VoxTrans(
+    "common.items.weapons.hammer.iron_hammer-7": VoxTrans(
         "voxel.weapon.hammer.2hhammer_iron-7",
         (2.0, -1.0, 0.0), (-135.0, 90.0, 0.0), 1.1,
     ),
-    Tool(Hammer("IronHammer8")): VoxTrans(
+    "common.items.weapons.hammer.iron_hammer-8": VoxTrans(
         "voxel.weapon.hammer.2hhammer_iron-8",
         (2.0, -1.0, 0.0), (-135.0, 90.0, 0.0), 1.1,
     ),
-    Tool(Hammer("SteelHammer0")): VoxTrans(
+    "common.items.weapons.hammer.steel_hammer-0": VoxTrans(
         "voxel.weapon.hammer.2hhammer_steel-0",
         (2.0, -1.0, 0.0), (-135.0, 90.0, 0.0), 1.1,
     ),
-    Tool(Hammer("SteelHammer1")): VoxTrans(
+    "common.items.weapons.hammer.steel_hammer-1": VoxTrans(
         "voxel.weapon.hammer.2hhammer_steel-1",
         (2.0, -1.0, 0.0), (-135.0, 90.0, 0.0), 1.1,
     ),
-    Tool(Hammer("SteelHammer2")): VoxTrans(
+    "common.items.weapons.hammer.steel_hammer-2": VoxTrans(
         "voxel.weapon.hammer.2hhammer_steel-2",
         (2.0, -1.0, 0.0), (-135.0, 90.0, 0.0), 1.1,
     ),
-    Tool(Hammer("SteelHammer3")): VoxTrans(
+    "common.items.weapons.hammer.steel_hammer-3": VoxTrans(
         "voxel.weapon.hammer.2hhammer_steel-3",
         (2.0, -1.0, 0.0), (-135.0, 90.0, 0.0), 1.1,
     ),
-    Tool(Hammer("SteelHammer4")): VoxTrans(
+    "common.items.weapons.hammer.steel_hammer-4": VoxTrans(
         "voxel.weapon.hammer.2hhammer_steel-4",
         (2.0, -1.0, 0.0), (-135.0, 90.0, 0.0), 1.1,
     ),
-    Tool(Hammer("SteelHammer5")): VoxTrans(
+    "common.items.weapons.hammer.steel_hammer-5": VoxTrans(
         "voxel.weapon.hammer.2hhammer_steel-5",
         (2.0, -1.0, 0.0), (-135.0, 90.0, 0.0), 1.1,
     ),
-    Tool(Hammer("CobaltHammer0")): VoxTrans(
+    "common.items.weapons.hammer.cobalt_hammer-0": VoxTrans(
         "voxel.weapon.hammer.2hhammer_cobalt-0",
         (2.0, -1.0, 0.0), (-135.0, 90.0, 0.0), 1.1,
     ),
-    Tool(Hammer("CobaltHammer1")): VoxTrans(
+    "common.items.weapons.hammer.cobalt_hammer-1": VoxTrans(
         "voxel.weapon.hammer.2hhammer_cobalt-1",
         (2.0, -1.0, 0.0), (-135.0, 90.0, 0.0), 1.1,
     ),
-    Tool(Hammer("RunicHammer")): VoxTrans(
+    "common.items.weapons.hammer.runic_hammer": VoxTrans(
         "voxel.weapon.hammer.2hhammer_runic",
         (2.0, -1.0, 0.0), (-135.0, 90.0, 0.0), 1.1,
     ),
-    Tool(Hammer("RamsheadHammer")): VoxTrans(
+    "common.items.weapons.hammer.ramshead_hammer": VoxTrans(
         "voxel.weapon.hammer.2hhammer_ramshead",
         (2.0, -1.0, 0.0), (-135.0, 90.0, 0.0), 1.1,
     ),
-    Tool(Hammer("Mjolnir")): VoxTrans(
+    "common.items.weapons.hammer.mjolnir": VoxTrans(
         "voxel.weapon.hammer.2hhammer_mjolnir",
         (2.0, -1.0, 0.0), (-135.0, 90.0, 0.0), 1.1,
     ),
-    Tool(Hammer("CultPurp0")): VoxTrans(
+    "common.items.weapons.hammer.cultist_purp_2h-0": VoxTrans(
+        "voxel.weapon.hammer.cult_purp-0",
+        (2.0, -1.0, 0.0), (-135.0, 90.0, 0.0), 1.1,
+    ),
+    "common.items.npc_weapons.hammer.cultist_purp_2h-0": VoxTrans(
         "voxel.weapon.hammer.cult_purp-0",
         (2.0, -1.0, 0.0), (-135.0, 90.0, 0.0), 1.1,
     ),
     // Staffs
-    Tool(Staff("BasicStaff")): VoxTrans(
+    "common.items.weapons.staff.staff_1": VoxTrans(
         "voxel.weapon.staff.firestaff_starter",
         (1.0, 0.0, 0.0), (-130., 90.0, 0.0), 1.2,
     ),
-    Tool(Staff("BoneStaff")): VoxTrans(
+    "common.items.weapons.staff.starter_staff": VoxTrans(
+        "voxel.weapon.staff.firestaff_starter",
+        (1.0, 0.0, 0.0), (-130., 90.0, 0.0), 1.2,
+    ),
+    "common.items.weapons.staff.bone_staff": VoxTrans(
         "voxel.weapon.staff.firestaff_bone",
         (1.0, 0.0, 0.0), (-130., 90.0, 0.0), 1.2,
     ),
-    Tool(Staff("AmethystStaff")): VoxTrans(
+    "common.items.npc_weapons.staff.bone_staff": VoxTrans(
+        "voxel.weapon.staff.firestaff_bone",
+        (1.0, 0.0, 0.0), (-130., 90.0, 0.0), 1.2,
+    ),
+    "common.items.weapons.staff.amethyst_staff": VoxTrans(
         "voxel.weapon.staff.firestaff_amethyst",
         (1.0, 0.0, 0.0), (-130., 90.0, 0.0), 1.2,
     ),
-    Tool(Staff("CultistStaff")): VoxTrans(
+    "common.items.weapons.staff.cultist_staff": VoxTrans(
+        "voxel.weapon.staff.firestaff_cultist",
+        (1.0, 0.0, 0.0), (-130., 90.0, 0.0), 1.2,
+    ),
+    "common.items.npc_weapons.staff.cultist_staff": VoxTrans(
         "voxel.weapon.staff.firestaff_cultist",
         (1.0, 0.0, 0.0), (-130., 90.0, 0.0), 1.2,
     ),
     // Healing staff
-    Tool(Sceptre("Sceptre")): VoxTrans(
+    "common.items.weapons.sceptre.staff_nature": VoxTrans(
         "voxel.weapon.sceptre.wood-nature",
         (1.0, -1.0, 0.0), (-130., 90.0, 0.0), 1.2,
     ),
-    Tool(Sceptre("StarterSceptre")): VoxTrans(
+    "common.items.weapons.sceptre.starter_sceptre": VoxTrans(
         "voxel.weapon.sceptre.wood-simple",
         (0.0, -0.0, 0.0), (-130., 90.0, 0.0), 1.25,
     ),
-     Tool(Sceptre("SceptreVelorite")): VoxTrans(
+     "common.items.weapons.sceptre.sceptre_velorite_0": VoxTrans(
         "voxel.weapon.sceptre.ore-nature",
         (1.0, -1.0, 0.0), (-130., 90.0, 0.0), 1.15,
     ),
     // Shields
-    Tool(Shield("BasicShield")): VoxTrans(
+    "common.items.weapons.shield.shield_1": VoxTrans(
+        "voxel.weapon.shield.wood-0",
+        (0.0, 0.0, 0.0), (-90.0, 90.0, 0.0), 2.4,
+    ),
+    "common.items.npc_weapons.shield.shield_1": VoxTrans(
         "voxel.weapon.shield.wood-0",
         (0.0, 0.0, 0.0), (-90.0, 90.0, 0.0), 2.4,
     ),
@@ -537,43 +589,67 @@
         "element.icons.lantern_red-0",
     ),
     // Farming Equipment
-    Tool(Farming("Broom")): VoxTrans(
+    "common.items.weapons.tool.broom": VoxTrans(
         "voxel.weapon.tool.broom-0",
         (0.0, 0.0, 0.0), (-135.0, 90.0, 0.0), 1.1,
     ),
-    Tool(Farming("Hoe0")): VoxTrans(
+    "common.items.weapons.tool.hoe": VoxTrans(
         "voxel.weapon.tool.hoe_green",
         (0.0, 0.0, 0.0), (130.0, 35.0, 180.0), 1.0,
     ),
-    Tool(Farming("Hoe1")): VoxTrans(
-        "voxel.weapon.tool.hoe_blue",
-        (0.0, 0.0, 0.0), (130.0, 35.0, 180.0), 1.0,
-    ),
-    Tool(Farming("Pitchfork")): VoxTrans(
+    "common.items.weapons.tool.pitchfork": VoxTrans(
         "voxel.weapon.tool.pitchfork-0",
         (0.0, 0.0, 0.0), (-135.0, 90.0, 0.0), 1.1,
     ),
-    Tool(Farming("Rake")): VoxTrans(
+    "common.items.weapons.tool.rake": VoxTrans(
         "voxel.weapon.tool.rake-0",
         (0.0, 0.0, 0.0), (-135.0, 90.0, 0.0), 1.0,
     ),
-    Tool(Farming("FishingRod0")): VoxTrans(
+    "common.items.weapons.tool.fishing_rod": VoxTrans(
         "voxel.weapon.tool.fishing_rod_blue-0",
         (0.0, 0.0, 0.0), (90.0, 90.0, 0.0), 1.5,
     ),
-    Tool(Farming("FishingRod0")): VoxTrans(
-        "voxel.weapon.tool.fishing_rod_orange-0",
-        (0.0, 0.0, 0.0), (90.0, 90.0, 0.0), 1.0,
-    ),
-    Tool(Farming("Pickaxe0")): VoxTrans(
+    "common.items.weapons.tool.pickaxe": VoxTrans(
         "voxel.weapon.tool.pickaxe_green-0",
         (0.0, 0.0, 0.0), (-135.0, 90.0, 0.0), 1.0,
     ),
-    Tool(Farming("Shovel0")): VoxTrans(
+    "common.items.weapons.tool.shovel-0": VoxTrans(
         "voxel.weapon.tool.shovel_green",
         (0.0, 0.0, 0.0), (-135.0, 90.0, 0.0), 1.2,
     ),
-    Tool(Farming("Shovel1")): VoxTrans(
+    "common.items.weapons.tool.shovel-1": VoxTrans(
+        "voxel.weapon.tool.shovel_gold",
+        (0.0, 0.0, 0.0), (-135.0, 90.0, 0.0), 1.2,
+    ),
+    "common.items.npc_weapons.tool.broom": VoxTrans(
+        "voxel.weapon.tool.broom-0",
+        (0.0, 0.0, 0.0), (-135.0, 90.0, 0.0), 1.1,
+    ),
+    "common.items.npc_weapons.tool.hoe": VoxTrans(
+        "voxel.weapon.tool.hoe_green",
+        (0.0, 0.0, 0.0), (130.0, 35.0, 180.0), 1.0,
+    ),
+    "common.items.npc_weapons.tool.pitchfork": VoxTrans(
+        "voxel.weapon.tool.pitchfork-0",
+        (0.0, 0.0, 0.0), (-135.0, 90.0, 0.0), 1.1,
+    ),
+    "common.items.npc_weapons.tool.rake": VoxTrans(
+        "voxel.weapon.tool.rake-0",
+        (0.0, 0.0, 0.0), (-135.0, 90.0, 0.0), 1.0,
+    ),
+    "common.items.npc_weapons.tool.fishing_rod": VoxTrans(
+        "voxel.weapon.tool.fishing_rod_blue-0",
+        (0.0, 0.0, 0.0), (90.0, 90.0, 0.0), 1.5,
+    ),
+    "common.items.npc_weapons.tool.pickaxe": VoxTrans(
+        "voxel.weapon.tool.pickaxe_green-0",
+        (0.0, 0.0, 0.0), (-135.0, 90.0, 0.0), 1.0,
+    ),
+    "common.items.npc_weapons.tool.shovel-0": VoxTrans(
+        "voxel.weapon.tool.shovel_green",
+        (0.0, 0.0, 0.0), (-135.0, 90.0, 0.0), 1.2,
+    ),
+    "common.items.npc_weapons.tool.shovel-1": VoxTrans(
         "voxel.weapon.tool.shovel_gold",
         (0.0, 0.0, 0.0), (-135.0, 90.0, 0.0), 1.2,
     ),
@@ -1282,7 +1358,11 @@
         (0.0, 0.0, 0.0), (-50.0, 30.0, 20.0), 1.1,
     ),
     // Debug Items
-    Tool(Debug("Boost")): VoxTrans(
+    "common.items.debug.boost": VoxTrans(
+        "voxel.weapon.tool.broom_belzeshrub_purple",
+        (0.0, 0.0, 0.0), (-135.0, 90.0, 0.0), 1.1,
+    ),
+    "common.items.debug.possess": VoxTrans(
         "voxel.weapon.tool.broom_belzeshrub_purple",
         (0.0, 0.0, 0.0), (-135.0, 90.0, 0.0), 1.1,
     ),
diff --git a/assets/voxygen/voxel/humanoid_main_weapon_manifest.ron b/assets/voxygen/voxel/humanoid_main_weapon_manifest.ron
index 66e9cdb4fe..e1024e9848 100644
--- a/assets/voxygen/voxel/humanoid_main_weapon_manifest.ron
+++ b/assets/voxygen/voxel/humanoid_main_weapon_manifest.ron
@@ -1,572 +1,660 @@
 ({  //Swords
-    Sword("BasicSword"): (
+    "common.items.weapons.sword.starter_sword": (
         vox_spec: ("weapon.sword.rusty_2h", (-1.5, -6.5, -4.0)),
         color: None
     ),
-    Sword("Rapier"): (
+    "common.items.npc_weapons.sword.starter_sword": (
         vox_spec: ("weapon.sword.rusty_2h", (-1.5, -6.5, -4.0)),
         color: None
     ),
-    Sword("WoodTraining"): (
+    "common.items.weapons.sword.wood_sword": (
         vox_spec: ("weapon.sword.wood_ore_2h", (-1.5, -6.5, -4.0)),
         color: None
     ),
-    Sword("Zweihander0"): (
+    "common.items.weapons.sword.zweihander_sword_0": (
         vox_spec: ("weapon.sword.zweihander_2h-0", (-1.5, -6.5, -4.0)),
         color: None
     ),
-    Sword("Short0"): (
+    "common.items.npc_weapons.sword.zweihander_sword_0": (
+        vox_spec: ("weapon.sword.zweihander_2h-0", (-1.5, -6.5, -4.0)),
+        color: None
+    ),
+    "common.items.weapons.sword.short_sword_0": (
         vox_spec: ("weapon.sword.short_2h-0", (-1.5, -6.5, -1.0)),
         color: None
     ),
-    Sword("GreatswordDam0"): (
+    "common.items.weapons.sword.greatsword_2h_dam-0": (
         vox_spec: ("weapon.sword.greatsword_2h_dam-0", (-1.0, -4.5, -6.5)),
         color: None
     ),
-    Sword("GreatswordDam1"): (
+    "common.items.weapons.sword.greatsword_2h_dam-1": (
         vox_spec: ("weapon.sword.greatsword_2h_dam-1", (-1.0, -4.5, -6.5)),
         color: None
     ),
-    Sword("GreatswordDam2"): (
+    "common.items.weapons.sword.greatsword_2h_dam-2": (
         vox_spec: ("weapon.sword.greatsword_2h_dam-2", (-1.0, -4.5, -6.5)),
         color: None
     ),
-    Sword("GreatswordSimple0"): (
+    "common.items.weapons.sword.greatsword_2h_simple-0": (
         vox_spec: ("weapon.sword.greatsword_2h_simple-0", (-1.0, -4.5, -6.5)),
         color: None
     ),
-    Sword("GreatswordSimple1"): (
+    "common.items.weapons.sword.greatsword_2h_simple-1": (
         vox_spec: ("weapon.sword.greatsword_2h_simple-1", (-1.0, -4.5, -6.5)),
         color: None
     ),
-    Sword("GreatswordSimple2"): (
+    "common.items.weapons.sword.greatsword_2h_simple-2": (
         vox_spec: ("weapon.sword.greatsword_2h_simple-2", (-1.0, -4.5, -6.5)),
         color: None
     ),
-    Sword("GreatswordOrn0"): (
+    "common.items.weapons.sword.greatsword_2h_orn-0": (
         vox_spec: ("weapon.sword.greatsword_2h_orn-0", (-1.0, -4.5, -7.5)),
         color: None
     ),
-    Sword("GreatswordOrn1"): (
+    "common.items.weapons.sword.greatsword_2h_orn-1": (
         vox_spec: ("weapon.sword.greatsword_2h_orn-1", (-1.0, -4.5, -7.5)),
         color: None
     ),
-    Sword("GreatswordOrn2"): (
+    "common.items.weapons.sword.greatsword_2h_orn-2": (
         vox_spec: ("weapon.sword.greatsword_2h_orn-2", (-1.0, -4.5, -7.5)),
         color: None
     ),
-    Sword("GreatswordFine0"): (
+    "common.items.weapons.sword.greatsword_2h_fine-0": (
         vox_spec: ("weapon.sword.greatsword_2h_fine-0", (-2.0, -6.5, -8.0)),
         color: None
     ),
-    Sword("GreatswordFine1"): (
+    "common.items.weapons.sword.greatsword_2h_fine-1": (
         vox_spec: ("weapon.sword.greatsword_2h_fine-1", (-2.0, -6.5, -8.0)),
         color: None
     ),
-    Sword("GreatswordFine2"): (
+    "common.items.weapons.sword.greatsword_2h_fine-2": (
         vox_spec: ("weapon.sword.greatsword_2h_fine-2", (-2.0, -6.5, -8.0)),
         color: None
     ),
-    Sword("LongDam0"): (
+    "common.items.weapons.sword.long_2h_dam-0": (
         vox_spec: ("weapon.sword.long_2h_dam-0", (-1.0, -3.5, -5.0)),
         color: None
     ),
-    Sword("LongDam1"): (
+    "common.items.weapons.sword.long_2h_dam-1": (
         vox_spec: ("weapon.sword.long_2h_dam-1", (-1.0, -3.5, -5.0)),
         color: None
     ),
-    Sword("LongDam2"): (
+    "common.items.weapons.sword.long_2h_dam-2": (
         vox_spec: ("weapon.sword.long_2h_dam-2", (-1.0, -3.5, -5.0)),
         color: None
     ),
-    Sword("LongDam3"): (
+    "common.items.weapons.sword.long_2h_dam-3": (
         vox_spec: ("weapon.sword.long_2h_dam-3", (-1.0, -3.5, -5.0)),
         color: None
     ),
-    Sword("LongDam4"): (
+    "common.items.weapons.sword.long_2h_dam-4": (
         vox_spec: ("weapon.sword.long_2h_dam-4", (-1.0, -3.5, -5.0)),
         color: None
     ),
-    Sword("LongDam5"): (
+    "common.items.weapons.sword.long_2h_dam-5": (
         vox_spec: ("weapon.sword.long_2h_dam-5", (-1.0, -3.5, -5.0)),
         color: None
     ),
-    Sword("LongSimple0"): (
+    "common.items.weapons.sword.long_2h_simple-0": (
         vox_spec: ("weapon.sword.long_2h_simple-0", (-1.0, -3.5, -5.0)),
         color: None
     ),
-    Sword("LongSimple1"): (
+    "common.items.weapons.sword.long_2h_simple-1": (
         vox_spec: ("weapon.sword.long_2h_simple-1", (-1.0, -3.5, -5.0)),
         color: None
     ),
-    Sword("LongSimple2"): (
+    "common.items.weapons.sword.long_2h_simple-2": (
         vox_spec: ("weapon.sword.long_2h_simple-2", (-1.0, -3.5, -5.0)),
         color: None
     ),
-    Sword("LongSimple3"): (
+    "common.items.weapons.sword.long_2h_simple-3": (
         vox_spec: ("weapon.sword.long_2h_simple-3", (-1.0, -3.5, -5.0)),
         color: None
     ),
-    Sword("LongSimple4"): (
+    "common.items.weapons.sword.long_2h_simple-4": (
         vox_spec: ("weapon.sword.long_2h_simple-4", (-1.0, -3.5, -5.0)),
         color: None
     ),
-    Sword("LongSimple5"): (
+    "common.items.weapons.sword.long_2h_simple-5": (
         vox_spec: ("weapon.sword.long_2h_simple-5", (-1.0, -3.5, -5.0)),
         color: None
     ),
-    Sword("LongOrn0"): (
+    "common.items.weapons.sword.long_2h_orn-0": (
         vox_spec: ("weapon.sword.long_2h_orn-0", (-1.0, -3.5, -6.0)),
         color: None
     ),
-    Sword("LongOrn1"): (
+    "common.items.weapons.sword.long_2h_orn-1": (
         vox_spec: ("weapon.sword.long_2h_orn-1", (-1.0, -3.5, -6.0)),
         color: None
     ),
-    Sword("LongOrn2"): (
+    "common.items.weapons.sword.long_2h_orn-2": (
         vox_spec: ("weapon.sword.long_2h_orn-2", (-1.0, -3.5, -6.0)),
         color: None
     ),
-    Sword("LongOrn3"): (
+    "common.items.weapons.sword.long_2h_orn-3": (
         vox_spec: ("weapon.sword.long_2h_orn-3", (-1.0, -3.5, -6.0)),
         color: None
     ),
-    Sword("LongOrn4"): (
+    "common.items.weapons.sword.long_2h_orn-4": (
         vox_spec: ("weapon.sword.long_2h_orn-4", (-1.0, -3.5, -6.0)),
         color: None
     ),
-    Sword("LongOrn5"): (
+    "common.items.weapons.sword.long_2h_orn-5": (
         vox_spec: ("weapon.sword.long_2h_orn-5", (-1.0, -3.5, -6.0)),
         color: None
     ),
-    Sword("LongFine0"): (
+    "common.items.weapons.sword.long_2h_fine-0": (
         vox_spec: ("weapon.sword.long_2h_fine-0", (-2.0, -4.5, -6.0)),
         color: None
     ),
-    Sword("LongFine1"): (
+    "common.items.weapons.sword.long_2h_fine-1": (
         vox_spec: ("weapon.sword.long_2h_fine-1", (-2.0, -4.5, -6.0)),
         color: None
     ),
-    Sword("LongFine2"): (
+    "common.items.weapons.sword.long_2h_fine-2": (
         vox_spec: ("weapon.sword.long_2h_fine-2", (-2.0, -4.5, -6.0)),
         color: None
     ),
-    Sword("LongFine3"): (
+    "common.items.weapons.sword.long_2h_fine-3": (
         vox_spec: ("weapon.sword.long_2h_fine-3", (-2.0, -4.5, -6.0)),
         color: None
     ),
-    Sword("LongFine4"): (
+    "common.items.weapons.sword.long_2h_fine-4": (
         vox_spec: ("weapon.sword.long_2h_fine-4", (-2.0, -4.5, -6.0)),
         color: None
     ),
-    Sword("LongFine5"): (
+    "common.items.weapons.sword.long_2h_fine-5": (
         vox_spec: ("weapon.sword.long_2h_fine-5", (-2.0, -4.5, -6.0)),
         color: None
     ),
-     Sword("CultPurp0"): (
+    "common.items.weapons.sword.cultist_purp_2h-0": (
+        vox_spec: ("weapon.sword.cultist_purp_2h-0", (-2.0, -4.5, -7.5)),
+        color: None
+    ),
+    "common.items.npc_weapons.sword.cultist_purp_2h-0": (
+        vox_spec: ("weapon.sword.cultist_purp_2h-0", (-2.0, -4.5, -7.5)),
+        color: None
+    ),
+    "common.items.npc_weapons.sword.cultist_purp_2h_boss-0": (
         vox_spec: ("weapon.sword.cultist_purp_2h-0", (-2.0, -4.5, -7.5)),
         color: None
     ),
     // Axes
-    Axe("BasicAxe"): (
+    "common.items.npc_weapons.axe.starter_axe": (
         vox_spec: ("weapon.axe.2haxe_rusty", (-1.5, -5.0, -4.0)),
         color: None
     ),
-    Axe("OrcAxe0"): (
+    "common.items.weapons.axe.starter_axe": (
+        vox_spec: ("weapon.axe.2haxe_rusty", (-1.5, -5.0, -4.0)),
+        color: None
+    ),
+    "common.items.weapons.axe.orc_axe-0": (
         vox_spec: ("weapon.axe.2haxe_orc-0", (-1.5, -3.0, -4.5)),
         color: None
     ),
-    Axe("WornIronAxe0"): (
+    "common.items.weapons.axe.worn_iron_axe-0": (
         vox_spec: ("weapon.axe.2haxe_worn_iron-0", (-1.5, -3.0, -4.0)),
         color: None
     ),
-    Axe("WornIronAxe1"): (
+    "common.items.weapons.axe.worn_iron_axe-1": (
         vox_spec: ("weapon.axe.2haxe_worn_iron-1", (-1.5, -4.0, -4.0)),
         color: None
     ),
-    Axe("WornIronAxe2"): (
+    "common.items.weapons.axe.worn_iron_axe-2": (
         vox_spec: ("weapon.axe.2haxe_worn_iron-2", (-1.5, -4.0, -4.0)),
         color: None
     ),
-    Axe("WornIronAxe3"): (
+    "common.items.weapons.axe.worn_iron_axe-3": (
         vox_spec: ("weapon.axe.2haxe_worn_iron-3", (-1.5, -8.0, -4.0)),//offcenterY
         color: None
     ),
-    Axe("WornIronAxe4"): (
+    "common.items.weapons.axe.worn_iron_axe-4": (
         vox_spec: ("weapon.axe.2haxe_worn_iron-4", (-1.5, -4.0, -5.5)),
         color: None
     ),
-    Axe("BronzeAxe0"): (
+    "common.items.weapons.axe.bronze_axe-0": (
         vox_spec: ("weapon.axe.2haxe_bronze-0", (-1.5, -4.0, -4.5)),
         color: None
     ),
-    Axe("BronzeAxe1"): (
+    "common.items.weapons.axe.bronze_axe-1": (
         vox_spec: ("weapon.axe.2haxe_bronze-1", (-1.5, -3.0, -5.5)),
         color: None
     ),
-    Axe("IronAxe0"): (
+    "common.items.weapons.axe.iron_axe-0": (
         vox_spec: ("weapon.axe.2haxe_iron-0", (-1.5, -5.0, -5.5)),
         color: None
     ),
-    Axe("IronAxe1"): (
+    "common.items.weapons.axe.iron_axe-1": (
         vox_spec: ("weapon.axe.2haxe_iron-1", (-1.5, -5.0, -5.5)),
         color: None
     ),
-    Axe("IronAxe2"): (
+    "common.items.weapons.axe.iron_axe-2": (
         vox_spec: ("weapon.axe.2haxe_iron-2", (-1.5, -5.0, -5.5)),
         color: None
     ),
-    Axe("IronAxe3"): (
+    "common.items.weapons.axe.iron_axe-3": (
         vox_spec: ("weapon.axe.2haxe_iron-3", (-1.5, -6.0, -6.5)),
         color: None
     ),
-    Axe("IronAxe4"): (
+    "common.items.weapons.axe.iron_axe-4": (
         vox_spec: ("weapon.axe.2haxe_iron-4", (-1.5, -6.0, -5.5)),
         color: None
     ),
-    Axe("IronAxe5"): (
+    "common.items.weapons.axe.iron_axe-5": (
         vox_spec: ("weapon.axe.2haxe_iron-5", (-1.5, -6.0, -5.0)),
         color: None
     ),
-    Axe("IronAxe6"): (
+    "common.items.weapons.axe.iron_axe-6": (
         vox_spec: ("weapon.axe.2haxe_iron-6", (-1.5, -5.0, -6.0)),
         color: None
     ),
-    Axe("IronAxe7"): (
+    "common.items.weapons.axe.iron_axe-7": (
         vox_spec: ("weapon.axe.2haxe_iron-7", (-1.5, -5.0, -5.0)),
         color: None
     ),
-    Axe("IronAxe8"): (
+    "common.items.weapons.axe.iron_axe-8": (
         vox_spec: ("weapon.axe.2haxe_iron-8", (-1.5, -5.0, -5.0)),
         color: None
     ),
-    Axe("IronAxe9"): (
+    "common.items.weapons.axe.iron_axe-9": (
         vox_spec: ("weapon.axe.2haxe_iron-9", (-1.5, -4.0, -5.0)),
         color: None
     ),
-    Axe("SteelAxe0"): (
+    "common.items.weapons.axe.steel_axe-0": (
         vox_spec: ("weapon.axe.2haxe_steel-0", (-1.5, -6.0, -4.5)),
         color: None
     ),
-    Axe("SteelAxe1"): (
+    "common.items.weapons.axe.steel_axe-1": (
         vox_spec: ("weapon.axe.2haxe_steel-1", (-1.5, -7.0, -5.5)),
         color: None
     ),
-    Axe("SteelAxe2"): (
+    "common.items.weapons.axe.steel_axe-2": (
         vox_spec: ("weapon.axe.2haxe_steel-2", (-1.5, -3.5, -3.5)),
         color: None
     ),
-    Axe("SteelAxe3"): (
+    "common.items.weapons.axe.steel_axe-3": (
         vox_spec: ("weapon.axe.2haxe_steel-3", (-1.5, -4.0, -6.0)),
         color: None
     ),
-    Axe("SteelAxe4"): (
+    "common.items.weapons.axe.steel_axe-4": (
         vox_spec: ("weapon.axe.2haxe_steel-4", (-1.5, -4.0, -5.5)),
         color: None
     ),
-    Axe("SteelAxe5"): (
+    "common.items.weapons.axe.steel_axe-5": (
         vox_spec: ("weapon.axe.2haxe_steel-5", (-1.5, -5.5, -5.5)),
         color: None
     ),
-    Axe("SteelAxe6"): (
+    "common.items.weapons.axe.steel_axe-6": (
         vox_spec: ("weapon.axe.2haxe_steel-6", (-1.5, -4.0, -4.0)),
         color: None
     ),
-    Axe("BloodsteelAxe0"): (
+    "common.items.weapons.axe.bloodsteel_axe-0": (
         vox_spec: ("weapon.axe.2haxe_bloodsteel-0", (-1.5, -7.0, -4.0)),
         color: None
     ),
-    Axe("BloodsteelAxe1"): (
+    "common.items.weapons.axe.bloodsteel_axe-1": (
         vox_spec: ("weapon.axe.2haxe_bloodsteel-1", (-1.5, -5.5, -5.0)),
         color: None
     ),
-    Axe("BloodsteelAxe2"): (
+    "common.items.weapons.axe.bloodsteel_axe-2": (
         vox_spec: ("weapon.axe.2haxe_bloodsteel-2", (-1.5, -5.0, -4.0)),
         color: None
     ),
-    Axe("CobaltAxe0"): (
+    "common.items.weapons.axe.cobalt_axe-0": (
         vox_spec: ("weapon.axe.2haxe_cobalt-0", (-1.5, -5.0, -5.5)),
         color: None
     ),
-    Axe("MalachiteAxe0"): (
+    "common.items.npc_weapons.axe.malachite_axe-0": (
+        vox_spec: ("weapon.axe.2haxe_malachite-0", (-1.5, -5.0, -6.0)),
+        color: None
+    ),
+    "common.items.weapons.axe.malachite_axe-0": (
         vox_spec: ("weapon.axe.2haxe_malachite-0", (-1.5, -5.0, -6.0)),
         color: None
     ),
     // Hammers
-    Hammer("BasicHammer"): (
+    "common.items.weapons.hammer.hammer_1": (
         vox_spec: ("weapon.hammer.2hhammer_rusty", (-2.5, -5.5, -4.5)),
         color: None
     ),
-    Hammer("WoodHammer0"): (
+    "common.items.weapons.hammer.starter_hammer": (
+        vox_spec: ("weapon.hammer.2hhammer_rusty", (-2.5, -5.5, -4.5)),
+        color: None
+    ),
+    "common.items.npc_weapons.hammer.starter_hammer": (
+        vox_spec: ("weapon.hammer.2hhammer_rusty", (-2.5, -5.5, -4.5)),
+        color: None
+    ),
+    "common.items.weapons.hammer.wood_hammer-0": (
         vox_spec: ("weapon.hammer.2hhammer_wood-0", (-3.5, -5.5, -4.5)),
         color: None
     ),
-    Hammer("FlimsyHammer"): (
+    "common.items.weapons.hammer.flimsy_hammer": (
         vox_spec: ("weapon.hammer.2hhammer_flimsy", (-2.5, -5.5, -4.0)),
         color: None
     ),
-    Hammer("StoneHammer0"): (
+    "common.items.weapons.hammer.stone_hammer-0": (
         vox_spec: ("weapon.hammer.2hhammer_stone-0", (-3.5, -6.5, -5.0)),
         color: None
     ),
-    Hammer("StoneHammer1"): (
+    "common.items.weapons.hammer.stone_hammer-1": (
         vox_spec: ("weapon.hammer.2hhammer_stone-1", (-3.5, -6.5, -5.0)),
         color: None
     ),
-    Hammer("StoneHammer2"): (
+    "common.items.weapons.hammer.stone_hammer-2": (
         vox_spec: ("weapon.hammer.2hhammer_stone-2", (-3.5, -6.5, -5.0)),
         color: None
     ),
-    Hammer("StoneHammer3"): (
+    "common.items.weapons.hammer.stone_hammer-3": (
         vox_spec: ("weapon.hammer.2hhammer_stone-3", (-2.5, -6.5, -5.0)),
         color: None
     ),
-    Hammer("WornIronHammer0"): (
+    "common.items.weapons.hammer.worn_iron_hammer-0": (
         vox_spec: ("weapon.hammer.2hhammer_worn_iron-0", (-2.5, -4.5, -4.0)),
         color: None
     ),
-    Hammer("WornIronHammer1"): (
+    "common.items.weapons.hammer.worn_iron_hammer-1": (
         vox_spec: ("weapon.hammer.2hhammer_worn_iron-1", (-2.5, -4.5, -3.0)),
         color: None
     ),
-    Hammer("WornIronHammer2"): (
+    "common.items.weapons.hammer.worn_iron_hammer-2": (
         vox_spec: ("weapon.hammer.2hhammer_worn_iron-2", (-2.5, -3.5, -3.0)),
         color: None
     ),
-    Hammer("WornIronHammer3"): (
+    "common.items.weapons.hammer.worn_iron_hammer-3": (
         vox_spec: ("weapon.hammer.2hhammer_worn_iron-3", (-2.5, -4.5, -3.0)),
         color: None
     ),
-    Hammer("BronzeHammer0"): (
+    "common.items.weapons.hammer.bronze_hammer-0": (
         vox_spec: ("weapon.hammer.2hhammer_bronze-0", (-2.5, -6.5, -5.0)),
         color: None
     ),
-    Hammer("BronzeHammer1"): (
+    "common.items.weapons.hammer.bronze_hammer-1": (
         vox_spec: ("weapon.hammer.2hhammer_bronze-1", (-3.5, -3.5, -4.0)),
         color: None
     ),
-    Hammer("IronHammer0"): (
+    "common.items.weapons.hammer.iron_hammer-0": (
         vox_spec: ("weapon.hammer.2hhammer_iron-0", (-2.5, -6.5, -4.0)),
         color: None
     ),
-    Hammer("IronHammer1"): (
+    "common.items.weapons.hammer.iron_hammer-1": (
         vox_spec: ("weapon.hammer.2hhammer_iron-1", (-3.5, -7.5, -5.0)),
         color: None
     ),
-    Hammer("IronHammer2"): (
+    "common.items.weapons.hammer.iron_hammer-2": (
         vox_spec: ("weapon.hammer.2hhammer_iron-2", (-3.5, -3.5, -5.0)),
         color: None
     ),
-    Hammer("IronHammer3"): (
+    "common.items.weapons.hammer.iron_hammer-3": (
         vox_spec: ("weapon.hammer.2hhammer_iron-3", (-3.5, -3.5, -5.0)),
         color: None
     ),
-    Hammer("IronHammer4"): (
+    "common.items.weapons.hammer.iron_hammer-4": (
         vox_spec: ("weapon.hammer.2hhammer_iron-4", (-3.5, -7.5, -4.0)),
         color: None
     ),
-    Hammer("IronHammer5"): (
+    "common.items.weapons.hammer.iron_hammer-5": (
         vox_spec: ("weapon.hammer.2hhammer_iron-5", (-1.5, -7.0, -5.0)),
         color: None
     ),
-    Hammer("IronHammer6"): (
+    "common.items.weapons.hammer.iron_hammer-6": (
         vox_spec: ("weapon.hammer.2hhammer_iron-6", (-2.5, -7.0, -5.0)),
         color: None
     ),
-    Hammer("IronHammer7"): (
+    "common.items.weapons.hammer.iron_hammer-7": (
         vox_spec: ("weapon.hammer.2hhammer_iron-7", (-3.5, -7.5, -5.0)),
         color: None
     ),
-    Hammer("IronHammer8"): (
+    "common.items.weapons.hammer.iron_hammer-8": (
         vox_spec: ("weapon.hammer.2hhammer_iron-8", (-1.5, -5.5, -7.0)),
         color: None
     ),
-    Hammer("SteelHammer0"): (
+    "common.items.weapons.hammer.steel_hammer-0": (
         vox_spec: ("weapon.hammer.2hhammer_steel-0", (-2.5, -5.5, -5.0)),
         color: None
     ),
-    Hammer("SteelHammer1"): (
+    "common.items.weapons.hammer.steel_hammer-1": (
         vox_spec: ("weapon.hammer.2hhammer_steel-1", (-3.5, -7.5, -5.0)),
         color: None
     ),
-    Hammer("SteelHammer2"): (
+    "common.items.weapons.hammer.steel_hammer-2": (
         vox_spec: ("weapon.hammer.2hhammer_steel-2", (-3.5, -3.5, -3.0)),
         color: None
     ),
-    Hammer("SteelHammer3"): (
+    "common.items.weapons.hammer.steel_hammer-3": (
         vox_spec: ("weapon.hammer.2hhammer_steel-3", (-5.5, -5.5, -4.5)),
         color: None
     ),
-    Hammer("SteelHammer4"): (
+    "common.items.weapons.hammer.steel_hammer-4": (
         vox_spec: ("weapon.hammer.2hhammer_steel-4", (-3.5, -7.5, -4.0)),
         color: None
     ),
-    Hammer("SteelHammer5"): (
+    "common.items.weapons.hammer.steel_hammer-5": (
         vox_spec: ("weapon.hammer.2hhammer_steel-5", (-5.5, -5.5, -5.0)),
         color: None
     ),
-    Hammer("CobaltHammer0"): (
+    "common.items.weapons.hammer.cobalt_hammer-0": (
         vox_spec: ("weapon.hammer.2hhammer_cobalt-0", (-2.5, -7.5, -6.0)),
         color: None
     ),
-    Hammer("CobaltHammer1"): (
+    "common.items.weapons.hammer.cobalt_hammer-1": (
         vox_spec: ("weapon.hammer.2hhammer_cobalt-1", (-4.5, -4.5, -4.0)),
         color: None
     ),
-    Hammer("RunicHammer"): (
+    "common.items.weapons.hammer.runic_hammer": (
         vox_spec: ("weapon.hammer.2hhammer_runic", (-2.5, -7.5, -5.0)),
         color: None
     ),
-    Hammer("RamsheadHammer"): (
+    "common.items.weapons.hammer.ramshead_hammer": (
         vox_spec: ("weapon.hammer.2hhammer_ramshead", (-4.5, -5.5, -5.0)),
         color: None
     ),
-    Hammer("Mjolnir"): (
+    "common.items.weapons.hammer.mjolnir": (
         vox_spec: ("weapon.hammer.2hhammer_mjolnir", (-2.5, -8.5, -4.0)),
         color: None
     ),
-    Hammer("CultPurp0"): (
+    "common.items.weapons.hammer.cultist_purp_2h-0": (
         vox_spec: ("weapon.hammer.cult_purp-0", (-3.5, -4.5, -5.0)),    
         color: None
     ),
-    /*Dagger("Craftsman"): ( //TODO This should be a 1h hammer!
+    "common.items.npc_weapons.hammer.cultist_purp_2h-0": (
+        vox_spec: ("weapon.hammer.cult_purp-0", (-3.5, -4.5, -5.0)),    
+        color: None
+    ),
+    "Craftsman": ( //TODO This should be a 1h hammer!
         vox_spec: ("weapon.hammer.craftsman", (-2.0, -5.0, -5.5)),
         color: None
     ),*/
     // Daggers
-    Dagger("BasicDagger"): (
+    "common.items.weapons.dagger.starter_dagger": (
+        vox_spec: ("weapon.dagger.dagger_rusty", (-1.5, -3.0, -3.0)),
+        color: None
+    ),
+    "common.items.npc_weapons.dagger.starter_dagger": (
         vox_spec: ("weapon.dagger.dagger_rusty", (-1.5, -3.0, -3.0)),
         color: None
     ),
     // Shields
-    Shield("BasicShield"): (
+    "common.items.weapons.shield.shield_1": (
+        vox_spec: ("weapon.shield.wood-0", (-2.5, -5.5, -5.5)),
+        color: None
+    ),
+    "common.items.npc_weapons.shield.shield_1": (
         vox_spec: ("weapon.shield.wood-0", (-2.5, -5.5, -5.5)),
         color: None
     ),
     // Bows
-    Bow("ShortBow0"): (
+    "common.items.weapons.bow.starter_bow": (
         vox_spec: ("weapon.bow.shortbow_starter", (-0.5, -3.0, -8.5)),
         color: None
     ),
-    Bow("WoodShortbow0"): (
+    "common.items.weapons.bow.wood_shortbow-0": (
         vox_spec: ("weapon.bow.shortbow_wood-0", (-0.5, -3.0, -9.5)),
         color: None
     ),
-    Bow("WoodShortbow1"): (
+    "common.items.weapons.bow.wood_shortbow-1": (
         vox_spec: ("weapon.bow.shortbow_wood-1", (-0.5, -3.5, -9.5)),
         color: None
     ),
-    Bow("LeafyShortbow0"): (
+    "common.items.weapons.bow.leafy_shortbow-0": (
         vox_spec: ("weapon.bow.shortbow_leafy-0", (-0.5, -4.5, -9.0)),
         color: None
     ),
-    Bow("WoodLongbow0"): (
+    "common.items.weapons.bow.wood_longbow-0": (
         vox_spec: ("weapon.bow.longbow_wood-0", (-0.5, -3.5, -12.5)),
         color: None
     ),
-    Bow("WoodLongbow1"): (
+    "common.items.weapons.bow.wood_longbow-1": (
         vox_spec: ("weapon.bow.longbow_wood-1", (-1.5, -3.5, -12.5)),
         color: None
     ),
-    Bow("LeafyLongbow0"): (
+    "common.items.weapons.bow.leafy_longbow-0": (
         vox_spec: ("weapon.bow.longbow_leafy-0", (-1.5, -4.5, -12.5)),
         color: None
     ),
-    Bow("HornLongbow0"): (
+    "common.items.weapons.bow.horn_longbow-0": (
         vox_spec: ("weapon.bow.longbow_horn-0", (-1.5, -4.5, -17.5)),
         color: None
     ),
-    Bow("IronLongbow0"): (
+    "common.items.npc_weapons.bow.horn_longbow-0": (
+        vox_spec: ("weapon.bow.longbow_horn-0", (-1.5, -4.5, -17.5)),
+        color: None
+    ),
+    "common.items.weapons.bow.iron_longbow-0": (
         vox_spec: ("weapon.bow.longbow_iron-0", (-1.5, -4.0, -16.0)),
         color: None
     ),
-    Bow("RareLongbow"): (
+    "common.items.weapons.bow.rare_longbow": (
         vox_spec: ("weapon.bow.longbow_rare", (-1.5, -5.0, -13.5)),
         color: None
     ),
-    Bow("NatureOreLongbow"): (
+    "common.items.weapons.bow.nature_ore_longbow-0": (
         vox_spec: ("weapon.bow.longbow_ore_nature-0", (-1.5, -4.0, -15.0)),
         color: None
     ),
     // Farming Equipment
-    Farming("Broom"): (
+    "common.items.weapons.tool.broom": (
         vox_spec: ("weapon.tool.broom-0", (-1.5, -4.0, -4.0)),
         color: None
     ),
-    Farming("Hoe0"): (
+    "common.items.weapons.tool.hoe": (
         vox_spec: ("weapon.tool.hoe_green", (-2.5, -4.5, -4.0)),
         color: None
     ),
-    Farming("Hoe1"): (
-        vox_spec: ("weapon.tool.hoe_blue", (-2.5, -4.5, -4.0)),
-        color: None
-    ),
-     Farming("Pitchfork"): (
+    "common.items.weapons.tool.pitchfork": (
         vox_spec: ("weapon.tool.pitchfork-0", (-1.0, -3.5, -4.0)),
         color: None
     ),
-    Farming("FishingRod0"): (
+    "common.items.weapons.tool.fishing_rod": (
         vox_spec: ("weapon.tool.fishing_rod_blue-0", (-2.5, -4.5, -4.0)),
         color: None
     ),
-    Farming("Rake"): (
+    "common.items.weapons.tool.rake": (
         vox_spec: ("weapon.tool.rake-0", (-1.0, -5.5, -4.0)),
         color: None
-    ),
-    Farming("FishingRod1"): (
-        vox_spec: ("weapon.tool.fishing_rod_orange-0", (-2.5, -4.5, -4.0)),
-        color: None
-    ),    
-    Farming("Pickaxe0"): (
+    ),  
+    "common.items.weapons.tool.pickaxe": (
         vox_spec: ("weapon.tool.pickaxe_green-0", (-1.5, -7.5, -4.0)),
         color: None
     ),
-    Farming("Shovel0"): (
+    "common.items.weapons.tool.shovel-0": (
         vox_spec: ("weapon.tool.shovel_green", (-1.0, -2.5, -4.0)),
         color: None
     ),
-    Farming("Shovel1"): (
+    "common.items.weapons.tool.shovel-1": (
         vox_spec: ("weapon.tool.shovel_gold", (-1.0, -2.5, -4.0)),
         color: None
     ),
-    // Staves    
-    Staff("BasicStaff"): (
+    "common.items.npc_weapons.tool.broom": (
+        vox_spec: ("weapon.tool.broom-0", (-1.5, -4.0, -4.0)),
+        color: None
+    ),
+    "common.items.npc_weapons.tool.hoe": (
+        vox_spec: ("weapon.tool.hoe_green", (-2.5, -4.5, -4.0)),
+        color: None
+    ),
+    "common.items.npc_weapons.tool.pitchfork": (
+        vox_spec: ("weapon.tool.pitchfork-0", (-1.0, -3.5, -4.0)),
+        color: None
+    ),
+    "common.items.npc_weapons.tool.fishing_rod": (
+        vox_spec: ("weapon.tool.fishing_rod_blue-0", (-2.5, -4.5, -4.0)),
+        color: None
+    ),
+    "common.items.npc_weapons.tool.rake": (
+        vox_spec: ("weapon.tool.rake-0", (-1.0, -5.5, -4.0)),
+        color: None
+    ),  
+    "common.items.npc_weapons.tool.pickaxe": (
+        vox_spec: ("weapon.tool.pickaxe_green-0", (-1.5, -7.5, -4.0)),
+        color: None
+    ),
+    "common.items.npc_weapons.tool.shovel-0": (
+        vox_spec: ("weapon.tool.shovel_green", (-1.0, -2.5, -4.0)),
+        color: None
+    ),
+    "common.items.npc_weapons.tool.shovel-1": (
+        vox_spec: ("weapon.tool.shovel_gold", (-1.0, -2.5, -4.0)),
+        color: None
+    ),
+    // Staves
+    "common.items.weapons.staff.staff_1": (
         vox_spec: ("weapon.staff.firestaff_starter", (-1.5, -3.0, -3.0)),
         color: None
     ),
-    Staff("BoneStaff"): (
+    "common.items.weapons.staff.starter_staff": (
+        vox_spec: ("weapon.staff.firestaff_starter", (-1.5, -3.0, -3.0)),
+        color: None
+    ),
+    "common.items.weapons.staff.bone_staff": (
         vox_spec: ("weapon.staff.firestaff_bone", (-1.5, -2.5, -3.0)),
         color: None
     ),
-    Staff("AmethystStaff"): (
+    "common.items.npc_weapons.staff.bone_staff": (
+        vox_spec: ("weapon.staff.firestaff_bone", (-1.5, -2.5, -3.0)),
+        color: None
+    ),
+    "common.items.weapons.staff.amethyst_staff": (
         vox_spec: ("weapon.staff.firestaff_amethyst", (-1.5, -4.0, -4.0)),
         color: None
     ),
-    Staff("CultistStaff"): (
+    "common.items.weapons.staff.cultist_staff": (
         vox_spec: ("weapon.staff.firestaff_cultist", (-2.5, -2.5, -4.0)),
         color: None
     ),
-    // Healing staff
-    Sceptre("StarterSceptre"): (
+    "common.items.npc_weapons.staff.cultist_staff": (
+        vox_spec: ("weapon.staff.firestaff_cultist", (-2.5, -2.5, -4.0)),
+        color: None
+    ),
+    // Healing sceptre
+    "common.items.weapons.sceptre.starter_sceptre": (
         vox_spec: ("weapon.sceptre.wood-simple", (-1.5, -2.5, -6.0)),
         color: None
     ),
-    Sceptre("Sceptre"): (
+    "common.items.weapons.sceptre.staff_nature": (
         vox_spec: ("weapon.sceptre.wood-nature", (-1.0, -6.0, -5.0)),
         color: None
     ),
-    Sceptre("SceptreVelorite"): (
+    "common.items.weapons.sceptre.sceptre_velorite_0": (
         vox_spec: ("weapon.sceptre.ore-nature", (-2.0, -6.0, -5.0)),
         color: None
     ),
     // Misc
-    Debug("Boost"): (
+    "common.items.debug.boost": (
         vox_spec: ("weapon.tool.broom_belzeshrub_purple", (-3.0, -4.0, -4.0)),
         color: None
-    ),    
+    ),
+    "common.items.debug.possess": (
+        vox_spec: ("weapon.tool.broom_belzeshrub_purple", (-3.0, -4.0, -4.0)),
+        color: None
+    ),
     // Misc
-    Empty: (
+    "common.items.weapons.empty.empty": (
             vox_spec: ("armor.empty", (-3.0, -3.5, 1.0)),
             color: None
-        ),
+    ),
+    "common.items.npc_weapons.empty.empty": (
+            vox_spec: ("armor.empty", (-3.0, -3.5, 1.0)),
+            color: None
+    ),
 })
diff --git a/server/src/migrations/2020-11-07-182406_rename_npcweapons/down.sql b/server/src/migrations/2020-11-07-182406_rename_npcweapons/down.sql
new file mode 100644
index 0000000000..e4ce35be0a
--- /dev/null
+++ b/server/src/migrations/2020-11-07-182406_rename_npcweapons/down.sql
@@ -0,0 +1,6 @@
+-- This file should undo anything in `up.sql`
+
+UPDATE item
+SET item_definition_id = 'common.items.npc_weapons.npcweapon.beast_claws'    WHERE item_definition_id = 'common.items.npc_weapons.unique.beast_claws';
+UPDATE item
+SET item_definition_id = 'common.items.npc_weapons.npcweapon.stone_golems_fist' WHERE item_definition_id = 'common.items.npc_weapons.unique.stone_golems_fist';
\ No newline at end of file
diff --git a/server/src/migrations/2020-11-07-182406_rename_npcweapons/up.sql b/server/src/migrations/2020-11-07-182406_rename_npcweapons/up.sql
new file mode 100644
index 0000000000..8196eee0be
--- /dev/null
+++ b/server/src/migrations/2020-11-07-182406_rename_npcweapons/up.sql
@@ -0,0 +1,6 @@
+-- Changes filepaths of sceptres
+
+UPDATE item
+SET item_definition_id = 'common.items.npc_weapons.unique.beast_claws' WHERE item_definition_id = 'common.items.npc_weapons.npcweapon.beast_claws';
+UPDATE item
+SET item_definition_id = 'common.items.npc_weapons.unique.stone_golems_fist' WHERE item_definition_id = 'common.items.npc_weapons.npcweapon.stone_golems_fist';
\ No newline at end of file