diff --git a/sim/mage/TestP1Mage.results b/sim/mage/TestP1Mage.results
index bb190e17f..39ab88ee6 100644
--- a/sim/mage/TestP1Mage.results
+++ b/sim/mage/TestP1Mage.results
@@ -104,10 +104,10 @@ dps_results: {
  }
 }
 dps_results: {
- key: "TestP1Mage-Phase1-AllItems-Champion'sRegalia"
+ key: "TestP1Mage-Phase1-AllItems-Champion'sArcanum"
  value: {
-  dps: 479.60128
-  tps: 355.60874
+  dps: 512.72564
+  tps: 379.31583
  }
 }
 dps_results: {
@@ -146,10 +146,10 @@ dps_results: {
  }
 }
 dps_results: {
- key: "TestP1Mage-Phase1-AllItems-LieutenantCommander'sRegalia"
+ key: "TestP1Mage-Phase1-AllItems-LieutenantCommander'sArcanum"
  value: {
-  dps: 479.60128
-  tps: 355.60874
+  dps: 512.72564
+  tps: 379.31583
  }
 }
 dps_results: {
diff --git a/sim/mage/item_sets_pvp.go b/sim/mage/item_sets_pvp.go
index 8bf90bddf..18651f9ea 100644
--- a/sim/mage/item_sets_pvp.go
+++ b/sim/mage/item_sets_pvp.go
@@ -6,11 +6,11 @@ import (
 )
 
 ///////////////////////////////////////////////////////////////////////////
-//                            SoD Phase 4 Item Sets
+//                            Clasic Phase 2
 ///////////////////////////////////////////////////////////////////////////
 
-var ItemSetChampionsRegalia = core.NewItemSet(core.ItemSet{
-	Name: "Champion's Regalia",
+var ItemSetChampionsArcanum = core.NewItemSet(core.ItemSet{
+	Name: "Champion's Arcanum",
 	Bonuses: map[int32]core.ApplyEffect{
 		// Increases damage and healing done by magical spells and effects by up to 23.
 		2: func(agent core.Agent) {
@@ -29,8 +29,8 @@ var ItemSetChampionsRegalia = core.NewItemSet(core.ItemSet{
 	},
 })
 
-var ItemSetLieutenantCommandersRegalia = core.NewItemSet(core.ItemSet{
-	Name: "Lieutenant Commander's Regalia",
+var ItemSetLieutenantCommandersArcanum = core.NewItemSet(core.ItemSet{
+	Name: "Lieutenant Commander's Arcanum",
 	Bonuses: map[int32]core.ApplyEffect{
 		// Increases damage and healing done by magical spells and effects by up to 23.
 		2: func(agent core.Agent) {
@@ -50,7 +50,7 @@ var ItemSetLieutenantCommandersRegalia = core.NewItemSet(core.ItemSet{
 })
 
 ///////////////////////////////////////////////////////////////////////////
-//                            SoD Phase 4 Item Sets
+//                            Phase 3 Items
 ///////////////////////////////////////////////////////////////////////////
 
 var ItemSetWarlordsRegalia = core.NewItemSet(core.ItemSet{
diff --git a/sim/rogue/dps_rogue/TestCombatDaggers.results b/sim/rogue/dps_rogue/TestCombatDaggers.results
index 31e3369f9..c6f53ed69 100644
--- a/sim/rogue/dps_rogue/TestCombatDaggers.results
+++ b/sim/rogue/dps_rogue/TestCombatDaggers.results
@@ -111,10 +111,10 @@ dps_results: {
  }
 }
 dps_results: {
- key: "TestCombatDaggers-Phase5-AllItems-Champion'sVestments"
+ key: "TestCombatDaggers-Phase5-AllItems-Champion'sGuard"
  value: {
-  dps: 896.12446
-  tps: 636.24837
+  dps: 951.86163
+  tps: 675.82176
  }
 }
 dps_results: {
@@ -132,10 +132,17 @@ dps_results: {
  }
 }
 dps_results: {
- key: "TestCombatDaggers-Phase5-AllItems-LieutenantCommander'sVestments"
+ key: "TestCombatDaggers-Phase5-AllItems-FieldMarshal'sVestments"
  value: {
-  dps: 896.12446
-  tps: 636.24837
+  dps: 980.51726
+  tps: 696.16726
+ }
+}
+dps_results: {
+ key: "TestCombatDaggers-Phase5-AllItems-LieutenantCommander'sGuard"
+ value: {
+  dps: 951.86163
+  tps: 675.82176
  }
 }
 dps_results: {
@@ -152,6 +159,13 @@ dps_results: {
   tps: 677.12471
  }
 }
+dps_results: {
+ key: "TestCombatDaggers-Phase5-AllItems-Warlord'sVestments"
+ value: {
+  dps: 980.51726
+  tps: 696.16726
+ }
+}
 dps_results: {
  key: "TestCombatDaggers-Phase5-Average-Default"
  value: {
diff --git a/sim/rogue/dps_rogue/TestCombatSinisterStrike.results b/sim/rogue/dps_rogue/TestCombatSinisterStrike.results
index d005da3f6..2a33e8a47 100644
--- a/sim/rogue/dps_rogue/TestCombatSinisterStrike.results
+++ b/sim/rogue/dps_rogue/TestCombatSinisterStrike.results
@@ -111,10 +111,10 @@ dps_results: {
  }
 }
 dps_results: {
- key: "TestCombatSinisterStrike-Phase5-AllItems-Champion'sVestments"
+ key: "TestCombatSinisterStrike-Phase5-AllItems-Champion'sGuard"
  value: {
-  dps: 919.47147
-  tps: 652.82474
+  dps: 965.37804
+  tps: 685.41841
  }
 }
 dps_results: {
@@ -132,10 +132,17 @@ dps_results: {
  }
 }
 dps_results: {
- key: "TestCombatSinisterStrike-Phase5-AllItems-LieutenantCommander'sVestments"
+ key: "TestCombatSinisterStrike-Phase5-AllItems-FieldMarshal'sVestments"
  value: {
-  dps: 919.47147
-  tps: 652.82474
+  dps: 1018.98979
+  tps: 723.48275
+ }
+}
+dps_results: {
+ key: "TestCombatSinisterStrike-Phase5-AllItems-LieutenantCommander'sGuard"
+ value: {
+  dps: 965.37804
+  tps: 685.41841
  }
 }
 dps_results: {
@@ -152,6 +159,13 @@ dps_results: {
   tps: 711.48551
  }
 }
+dps_results: {
+ key: "TestCombatSinisterStrike-Phase5-AllItems-Warlord'sVestments"
+ value: {
+  dps: 1018.98979
+  tps: 723.48275
+ }
+}
 dps_results: {
  key: "TestCombatSinisterStrike-Phase5-Average-Default"
  value: {
diff --git a/sim/rogue/items_sets_pvp.go b/sim/rogue/items_sets_pvp.go
index 80c78a7d5..7ee746017 100644
--- a/sim/rogue/items_sets_pvp.go
+++ b/sim/rogue/items_sets_pvp.go
@@ -9,8 +9,8 @@ import (
 //                          Classic Phase 2
 ///////////////////////////////////////////////////////////////////////////
 
-var ItemSetChampionsVestments = core.NewItemSet(core.ItemSet{
-	Name: "Champion's Vestments",
+var ItemSetChampionsGuard = core.NewItemSet(core.ItemSet{
+	Name: "Champion's Guard",
 	Bonuses: map[int32]core.ApplyEffect{
 		// +40 Attack Power.
 		2: func(agent core.Agent) {
@@ -32,8 +32,8 @@ var ItemSetChampionsVestments = core.NewItemSet(core.ItemSet{
 	},
 })
 
-var ItemSetLieutenantCommandersVestments = core.NewItemSet(core.ItemSet{
-	Name: "Lieutenant Commander's Vestments",
+var ItemSetLieutenantCommandersGuard = core.NewItemSet(core.ItemSet{
+	Name: "Lieutenant Commander's Guard",
 	Bonuses: map[int32]core.ApplyEffect{
 		// +40 Attack Power.
 		2: func(agent core.Agent) {
@@ -54,3 +54,49 @@ var ItemSetLieutenantCommandersVestments = core.NewItemSet(core.ItemSet{
 		},
 	},
 })
+
+var ItemSetWarlordsVestments = core.NewItemSet(core.ItemSet{
+	Name: "Warlord's Vestments",
+	Bonuses: map[int32]core.ApplyEffect{
+		// +20 Stamina.
+		2: func(agent core.Agent) {
+			c := agent.GetCharacter()
+			c.AddStat(stats.Stamina, 20)
+		},
+		// Reduces the cooldown of your Gouge ability by 1 sec.
+		4: func(agent core.Agent) {
+			// Nothing to do
+		},
+		// +40 Attack Power.
+		6: func(agent core.Agent) {
+			c := agent.GetCharacter()
+			c.AddStats(stats.Stats{
+				stats.AttackPower:       40,
+				stats.RangedAttackPower: 40,
+			})
+		},
+	},
+})
+
+var ItemSetFieldMarshalsVestments = core.NewItemSet(core.ItemSet{
+	Name: "Field Marshal's Vestments",
+	Bonuses: map[int32]core.ApplyEffect{
+		// +20 Stamina.
+		2: func(agent core.Agent) {
+			c := agent.GetCharacter()
+			c.AddStat(stats.Stamina, 20)
+		},
+		// Reduces the cooldown of your Gouge ability by 1 sec.
+		4: func(agent core.Agent) {
+			// Nothing to do
+		},
+		// +40 Attack Power.
+		6: func(agent core.Agent) {
+			c := agent.GetCharacter()
+			c.AddStats(stats.Stats{
+				stats.AttackPower:       40,
+				stats.RangedAttackPower: 40,
+			})
+		},
+	},
+})
diff --git a/sim/warrior/dps_warrior/TestP1DPSWarrior.results b/sim/warrior/dps_warrior/TestP1DPSWarrior.results
index 545d1a2cc..166dac7db 100644
--- a/sim/warrior/dps_warrior/TestP1DPSWarrior.results
+++ b/sim/warrior/dps_warrior/TestP1DPSWarrior.results
@@ -118,10 +118,10 @@ dps_results: {
  }
 }
 dps_results: {
- key: "TestP1DPSWarrior-Phase1-AllItems-Champion'sBattlegear"
+ key: "TestP1DPSWarrior-Phase1-AllItems-Champion'sBattlearmor"
  value: {
-  dps: 1197.18775
-  tps: 1047.39886
+  dps: 1281.15573
+  tps: 1120.66888
  }
 }
 dps_results: {
@@ -139,10 +139,17 @@ dps_results: {
  }
 }
 dps_results: {
- key: "TestP1DPSWarrior-Phase1-AllItems-LieutenantCommander'sBattlegear"
+ key: "TestP1DPSWarrior-Phase1-AllItems-FieldMarshal'sBattlegear"
  value: {
-  dps: 1197.18775
-  tps: 1047.39886
+  dps: 1351.18502
+  tps: 1181.04309
+ }
+}
+dps_results: {
+ key: "TestP1DPSWarrior-Phase1-AllItems-LieutenantCommander'sBattlearmor"
+ value: {
+  dps: 1281.15573
+  tps: 1120.66888
  }
 }
 dps_results: {
@@ -152,6 +159,13 @@ dps_results: {
   tps: 1198.43317
  }
 }
+dps_results: {
+ key: "TestP1DPSWarrior-Phase1-AllItems-Warlord'sBattlegear"
+ value: {
+  dps: 1351.18502
+  tps: 1181.04309
+ }
+}
 dps_results: {
  key: "TestP1DPSWarrior-Phase1-Average-Default"
  value: {
diff --git a/sim/warrior/item_sets_pvp.go b/sim/warrior/item_sets_pvp.go
index 65886bf8f..80adf0416 100644
--- a/sim/warrior/item_sets_pvp.go
+++ b/sim/warrior/item_sets_pvp.go
@@ -9,8 +9,8 @@ import (
 //                           Classic Phase 2
 ///////////////////////////////////////////////////////////////////////////
 
-var ItemSetChampionsBattlegear = core.NewItemSet(core.ItemSet{
-	Name: "Champion's Battlegear",
+var ItemSetChampionsBattlearmor = core.NewItemSet(core.ItemSet{
+	Name: "Champion's Battlearmor",
 	Bonuses: map[int32]core.ApplyEffect{
 		// +40 Attack Power.
 		2: func(agent core.Agent) {
@@ -32,8 +32,8 @@ var ItemSetChampionsBattlegear = core.NewItemSet(core.ItemSet{
 	},
 })
 
-var ItemSetLieutenantCommandersBattlegear = core.NewItemSet(core.ItemSet{
-	Name: "Lieutenant Commander's Battlegear",
+var ItemSetLieutenantCommandersBattlearmor = core.NewItemSet(core.ItemSet{
+	Name: "Lieutenant Commander's Battlearmor",
 	Bonuses: map[int32]core.ApplyEffect{
 		// +40 Attack Power.
 		2: func(agent core.Agent) {
@@ -54,3 +54,49 @@ var ItemSetLieutenantCommandersBattlegear = core.NewItemSet(core.ItemSet{
 		},
 	},
 })
+
+var ItemSetWarlordsBattlegear = core.NewItemSet(core.ItemSet{
+	Name: "Warlord's Battlegear",
+	Bonuses: map[int32]core.ApplyEffect{
+		// +20 Stamina.
+		2: func(agent core.Agent) {
+			c := agent.GetCharacter()
+			c.AddStat(stats.Stamina, 20)
+		},
+		// Reduces the cooldown of your Intercept ability by 5 sec.
+		4: func(agent core.Agent) {
+			// Nothing to do
+		},
+		// +40 Attack Power.
+		6: func(agent core.Agent) {
+			c := agent.GetCharacter()
+			c.AddStats(stats.Stats{
+				stats.AttackPower:       40,
+				stats.RangedAttackPower: 40,
+			})
+		},
+	},
+})
+
+var ItemSetFieldMarshalsBattlegear = core.NewItemSet(core.ItemSet{
+	Name: "Field Marshal's Battlegear",
+	Bonuses: map[int32]core.ApplyEffect{
+		// +20 Stamina.
+		2: func(agent core.Agent) {
+			c := agent.GetCharacter()
+			c.AddStat(stats.Stamina, 20)
+		},
+		// Reduces the cooldown of your Intercept ability by 5 sec.
+		4: func(agent core.Agent) {
+			// Nothing to do
+		},
+		// +40 Attack Power.
+		6: func(agent core.Agent) {
+			c := agent.GetCharacter()
+			c.AddStats(stats.Stats{
+				stats.AttackPower:       40,
+				stats.RangedAttackPower: 40,
+			})
+		},
+	},
+})
\ No newline at end of file
diff --git a/sim/warrior/tank_warrior/TestP1TankWarrior.results b/sim/warrior/tank_warrior/TestP1TankWarrior.results
index 825e9356a..44f52573a 100644
--- a/sim/warrior/tank_warrior/TestP1TankWarrior.results
+++ b/sim/warrior/tank_warrior/TestP1TankWarrior.results
@@ -118,10 +118,10 @@ dps_results: {
  }
 }
 dps_results: {
- key: "TestP1TankWarrior-Phase1-AllItems-Champion'sBattlegear"
+ key: "TestP1TankWarrior-Phase1-AllItems-Champion'sBattlearmor"
  value: {
-  dps: 176.5019
-  tps: 326.39273
+  dps: 186.16189
+  tps: 342.38782
  }
 }
 dps_results: {
@@ -139,10 +139,17 @@ dps_results: {
  }
 }
 dps_results: {
- key: "TestP1TankWarrior-Phase1-AllItems-LieutenantCommander'sBattlegear"
+ key: "TestP1TankWarrior-Phase1-AllItems-FieldMarshal'sBattlegear"
  value: {
-  dps: 176.5019
-  tps: 326.39273
+  dps: 197.01502
+  tps: 361.01703
+ }
+}
+dps_results: {
+ key: "TestP1TankWarrior-Phase1-AllItems-LieutenantCommander'sBattlearmor"
+ value: {
+  dps: 186.16189
+  tps: 342.38782
  }
 }
 dps_results: {
@@ -152,6 +159,13 @@ dps_results: {
   tps: 348.35385
  }
 }
+dps_results: {
+ key: "TestP1TankWarrior-Phase1-AllItems-Warlord'sBattlegear"
+ value: {
+  dps: 197.01502
+  tps: 361.01703
+ }
+}
 dps_results: {
  key: "TestP1TankWarrior-Phase1-Average-Default"
  value: {