diff --git a/assets/voxygen/voxel/humanoid_main_weapon_manifest.ron b/assets/voxygen/voxel/humanoid_main_weapon_manifest.ron
index 0bf1551d20..a36258c555 100644
--- a/assets/voxygen/voxel/humanoid_main_weapon_manifest.ron
+++ b/assets/voxygen/voxel/humanoid_main_weapon_manifest.ron
@@ -173,91 +173,91 @@
     ),
     // 1h Swords
     "common.items.weapons.sword_1h.bloodsteel-0": (
-        vox_spec: ("voxel.weapon.sword_1h.bloodsteel-0", (-2.0, -4.5, -7.5)),
+        vox_spec: ("weapon.sword_1h.bloodsteel-0", (-2.0, -4.5, -7.5)),
         color: None
     ),
     "common.items.weapons.sword_1h.bloodsteel-1": (
-        vox_spec: ("voxel.weapon.sword_1h.bloodsteel-1", (-2.0, -4.5, -7.5)),
+        vox_spec: ("weapon.sword_1h.bloodsteel-1", (-2.0, -4.5, -7.5)),
         color: None
     ),
     "common.items.weapons.sword_1h.bloodsteel-2": (
-        vox_spec: ("voxel.weapon.sword_1h.bloodsteel-2", (-2.0, -4.5, -7.5)),
+        vox_spec: ("weapon.sword_1h.bloodsteel-2", (-2.0, -4.5, -7.5)),
         color: None
     ),
     "common.items.weapons.sword_1h.bronze-0": (
-        vox_spec: ("voxel.weapon.sword_1h.bronze-0", (-2.0, -4.5, -7.5)),
+        vox_spec: ("weapon.sword_1h.bronze-0", (-2.0, -4.5, -7.5)),
         color: None
     ),
     "common.items.weapons.sword_1h.bronze-1": (
-        vox_spec: ("voxel.weapon.sword_1h.bronze-1", (-2.0, -4.5, -7.5)),
+        vox_spec: ("weapon.sword_1h.bronze-1", (-2.0, -4.5, -7.5)),
         color: None
     ),
     "common.items.weapons.sword_1h.bronze-2": (
-        vox_spec: ("voxel.weapon.sword_1h.bronze-2", (-2.0, -4.5, -7.5)),
+        vox_spec: ("weapon.sword_1h.bronze-2", (-2.0, -4.5, -7.5)),
         color: None
     ),
     "common.items.weapons.sword_1h.cobalt-0": (
-        vox_spec: ("voxel.weapon.sword_1h.cobalt-0", (-2.0, -4.5, -7.5)),
+        vox_spec: ("weapon.sword_1h.cobalt-0", (-2.0, -4.5, -7.5)),
         color: None
     ),
     "common.items.weapons.sword_1h.cobalt-1": (
-        vox_spec: ("voxel.weapon.sword_1h.cobalt-1", (-2.0, -4.5, -7.5)),
+        vox_spec: ("weapon.sword_1h.cobalt-1", (-2.0, -4.5, -7.5)),
         color: None
     ),
     "common.items.weapons.sword_1h.cobalt-2": (
-        vox_spec: ("voxel.weapon.sword_1h.cobalt-2", (-2.0, -4.5, -7.5)),
+        vox_spec: ("weapon.sword_1h.cobalt-2", (-2.0, -4.5, -7.5)),
         color: None
     ),
     "common.items.weapons.sword_1h.cobalt-3": (
-        vox_spec: ("voxel.weapon.sword_1h.cobalt-3", (-2.0, -4.5, -7.5)),
+        vox_spec: ("weapon.sword_1h.cobalt-3", (-2.0, -4.5, -7.5)),
         color: None
     ),
     "common.items.weapons.sword_1h.iron-0": (
-        vox_spec: ("voxel.weapon.sword_1h.iron-0", (-2.0, -4.5, -7.5)),
+        vox_spec: ("weapon.sword_1h.iron-0", (-2.0, -4.5, -7.5)),
         color: None
     ),
     "common.items.weapons.sword_1h.iron-1": (
-        vox_spec: ("voxel.weapon.sword_1h.iron-1", (-2.0, -4.5, -7.5)),
+        vox_spec: ("weapon.sword_1h.iron-1", (-2.0, -4.5, -7.5)),
         color: None
     ),
     "common.items.weapons.sword_1h.iron-2": (
-        vox_spec: ("voxel.weapon.sword_1h.iron-2", (-2.0, -4.5, -7.5)),
+        vox_spec: ("weapon.sword_1h.iron-2", (-2.0, -4.5, -7.5)),
         color: None
     ),
     "common.items.weapons.sword_1h.iron-3": (
-        vox_spec: ("voxel.weapon.sword_1h.iron-3", (-2.0, -4.5, -7.5)),
+        vox_spec: ("weapon.sword_1h.iron-3", (-2.0, -4.5, -7.5)),
         color: None
     ),
     "common.items.weapons.sword_1h.iron-4": (
-        vox_spec: ("voxel.weapon.sword_1h.iron-4", (-2.0, -4.5, -7.5)),
+        vox_spec: ("weapon.sword_1h.iron-4", (-2.0, -4.5, -7.5)),
         color: None
     ),
     "common.items.weapons.sword_1h.obsidian-0": (
-        vox_spec: ("voxel.weapon.sword_1h.obsidian-0", (-2.0, -4.5, -7.5)),
+        vox_spec: ("weapon.sword_1h.obsidian-0", (-2.0, -4.5, -7.5)),
         color: None
     ),
     "common.items.weapons.sword_1h.orichalcum-0": (
-        vox_spec: ("voxel.weapon.sword_1h.orichalcum-0", (-2.0, -4.5, -7.5)),
+        vox_spec: ("weapon.sword_1h.orichalcum-0", (-2.0, -4.5, -7.5)),
         color: None
     ),
     "common.items.weapons.sword_1h.orichalcum-1": (
-        vox_spec: ("voxel.weapon.sword_1h.orichalcum-1", (-2.0, -4.5, -7.5)),
+        vox_spec: ("weapon.sword_1h.orichalcum-1", (-2.0, -4.5, -7.5)),
         color: None
     ),
     "common.items.weapons.sword_1h.steel-0": (
-        vox_spec: ("voxel.weapon.sword_1h.steel-0", (-2.0, -4.5, -7.5)),
+        vox_spec: ("weapon.sword_1h.steel-0", (-2.0, -4.5, -7.5)),
         color: None
     ),
     "common.items.weapons.sword_1h.steel-1": (
-        vox_spec: ("voxel.weapon.sword_1h.steel-1", (-2.0, -4.5, -7.5)),
+        vox_spec: ("weapon.sword_1h.steel-1", (-2.0, -4.5, -7.5)),
         color: None
     ),
     "common.items.weapons.sword_1h.steel-2": (
-        vox_spec: ("voxel.weapon.sword_1h.steel-2", (-2.0, -4.5, -7.5)),
+        vox_spec: ("weapon.sword_1h.steel-2", (-2.0, -4.5, -7.5)),
         color: None
     ),
     "common.items.weapons.sword_1h.steel-3": (
-        vox_spec: ("voxel.weapon.sword_1h.steel-3", (-2.0, -4.5, -7.5)),
+        vox_spec: ("weapon.sword_1h.steel-3", (-2.0, -4.5, -7.5)),
         color: None
     ),
     // Axes
diff --git a/common/net/src/msg/client.rs b/common/net/src/msg/client.rs
index 84ae660132..8b040a6b7b 100644
--- a/common/net/src/msg/client.rs
+++ b/common/net/src/msg/client.rs
@@ -58,7 +58,6 @@ pub enum ClientGeneral {
     Character(CharacterId),
     Spectate,
     //Only in game
-    // Large enum variant allowed for clippy because of this
     ControllerInputs(Box<comp::ControllerInputs>),
     ControlEvent(comp::ControlEvent),
     ControlAction(comp::ControlAction),
diff --git a/common/src/comp/inventory/item/tool.rs b/common/src/comp/inventory/item/tool.rs
index 9e2d527ac8..9e45a89134 100644
--- a/common/src/comp/inventory/item/tool.rs
+++ b/common/src/comp/inventory/item/tool.rs
@@ -136,7 +136,7 @@ pub struct AbilitySet<T> {
 
 impl AbilitySet<CharacterAbility> {
     pub fn modified_by_tool(self, tool: &Tool) -> Self {
-        let stats: Stats = Stats::from(tool);
+        let stats = Stats::from(tool);
         self.map(|a| a.adjusted_by_stats(stats.power, stats.poise_strength, stats.speed))
     }
 }
diff --git a/voxygen/src/audio/sfx/event_mapper/combat/tests.rs b/voxygen/src/audio/sfx/event_mapper/combat/tests.rs
index be2525eb86..af3f53eadc 100644
--- a/voxygen/src/audio/sfx/event_mapper/combat/tests.rs
+++ b/voxygen/src/audio/sfx/event_mapper/combat/tests.rs
@@ -78,7 +78,7 @@ fn maps_basic_melee() {
                 knockback: 0.0,
                 range: 1.0,
                 max_angle: 1.0,
-                ability_info: empty_info(),
+                ability_info: empty_ability_info(),
             },
             timer: Duration::default(),
             stage_section: states::utils::StageSection::Buildup,
@@ -132,7 +132,7 @@ fn matches_ability_stage() {
                 max_speed_increase: 0.8,
                 scales_from_combo: 2,
                 is_interruptible: true,
-                ability_info: empty_info(),
+                ability_info: empty_ability_info(),
             },
             stage: 1,
             combo: 0,
@@ -191,7 +191,7 @@ fn ignores_different_ability_stage() {
                 max_speed_increase: 0.8,
                 scales_from_combo: 2,
                 is_interruptible: true,
-                ability_info: empty_info(),
+                ability_info: empty_ability_info(),
             },
             stage: 1,
             combo: 0,
@@ -217,7 +217,7 @@ fn ignores_different_ability_stage() {
 }
 
 fn empty_ability_info() -> states::utils::AbilityInfo {
-    Self {
+    states::utils::AbilityInfo {
         tool: None,
         hand: None,
         key: states::utils::AbilityKey::Mouse1,