diff --git a/spec/System/TestSocketables_spec.lua b/spec/System/TestSocketables_spec.lua
index afe9334b0c..8fd5106198 100644
--- a/spec/System/TestSocketables_spec.lua
+++ b/spec/System/TestSocketables_spec.lua
@@ -87,7 +87,7 @@ describe("TestSocketables", function()
 
     it("'(Caster) Staff' runes appear in Items tab", slotTypeTest("staff", "Voltaic Staff"))
 
-    it("'(Quarterstaff) War Staff' runes appear in Items tab", slotTypeTest("warstaff", "Striking Quarterstaff"))
+	it("'Quarterstaff' runes appear in Items tab", slotTypeTest("quarterstaff", "Striking Quarterstaff"))
 
     it("'Spear' runes appear in Items tab", slotTypeTest("spear", "Flying Spear"))
 
diff --git a/src/Classes/Item.lua b/src/Classes/Item.lua
index 423f4769a3..e1c3a7bf0f 100644
--- a/src/Classes/Item.lua
+++ b/src/Classes/Item.lua
@@ -1566,7 +1566,7 @@ function ItemClass:UpdateRunes()
 			local itemType = self.base.type:lower()
 			local baseType = self.base.weapon and "weapon" or self.base.armour and "armour" or (self.base.tags.wand or self.base.tags.staff or self.base.tags.sceptre) and "caster"
 			local specificType =
-				(subType == "warstaff" and "warstaff") or
+				(subType == "warstaff" and "quarterstaff") or
 				(itemType == "shield" and subType == "evasion" and "buckler") or
 				itemType
 			local gatheredMods = getModRunesForTypes(name, baseType, specificType)
diff --git a/src/Classes/ItemsTab.lua b/src/Classes/ItemsTab.lua
index d3ffb571c6..0cc94238aa 100644
--- a/src/Classes/ItemsTab.lua
+++ b/src/Classes/ItemsTab.lua
@@ -1932,7 +1932,7 @@ function ItemsTabClass:GetValidRunesForItem(item)
 		local function isRuneValidForSlot(runeSlot)
 			if runeSlot == "None" then
 				return true
-			elseif runeSlot == "warstaff" then
+			elseif runeSlot == "quarterstaff" then
 				return subType == "warstaff"
 			elseif runeSlot == "buckler" then
 				return itemType == "shield" and subType == "evasion"
@@ -1943,7 +1943,7 @@ function ItemsTabClass:GetValidRunesForItem(item)
 			elseif runeSlot == "caster" then
 				return item.base.tags.wand or item.base.tags.staff or item.base.tags.sceptre
 			else
-				return itemType == runeSlot
+				return itemType == runeSlot and not (subType == "warstaff")
 			end
 		end
 		if isRuneValidForSlot(rune.slot) then
diff --git a/src/Data/ModRunes.lua b/src/Data/ModRunes.lua
index 8c787d82d1..b9fb669d6f 100644
--- a/src/Data/ModRunes.lua
+++ b/src/Data/ModRunes.lua
@@ -3299,7 +3299,7 @@ return {
 				tradeHashes = { [103706408] = { "Rolls only the minimum or maximum Damage value for Physical Damage" },  },
 				rank = { 15 },
 		},
-		["warstaff"] = {
+		["quarterstaff"] = {
 				type = "Rune",
 				"Rolls only the minimum or maximum Damage value for Physical Damage",
 				statOrder = { 7793 },
@@ -3472,7 +3472,7 @@ return {
 		},
 	},
 	["Rune of Confrontation"] = {
-		["warstaff"] = {
+		["quarterstaff"] = {
 				type = "Rune",
 				"Gain 4 Rage on Melee Hit",
 				"-10 to Maximum Rage",
diff --git a/src/Export/Scripts/soulcores.lua b/src/Export/Scripts/soulcores.lua
index 086b54531d..9c48005331 100644
--- a/src/Export/Scripts/soulcores.lua
+++ b/src/Export/Scripts/soulcores.lua
@@ -10,10 +10,10 @@ classMap = {
 	["Armour"] = { "armour" },
 	["Wand or Staff"] = { "wand", "staff" },
 	["Maces or Talisman"] = { "one hand mace", "two hand mace", "talisman" },
-	["One Hand Mace or Quarterstaff"] = { "one hand mace", "warstaff" },
+	["One Hand Mace or Quarterstaff"] = { "one hand mace", "quarterstaff" },
 	["Shield or Buckler"] = { "shield", "buckler" },
 	["All"] = { "weapon", "armour", "caster" },
-	["Quarterstaff or Spear"] = { "warstaff", "spear" },
+	["Quarterstaff or Spear"] = { "quarterstaff", "spear" },
 	["Crossbow Bow or Spear"] = { "crossbow", "bow", "spear" },
 }