diff --git a/definitions/ScalingStatValues.dbd b/definitions/ScalingStatValues.dbd
index 915ed783454..08430013ea9 100644
--- a/definitions/ScalingStatValues.dbd
+++ b/definitions/ScalingStatValues.dbd
@@ -104,43 +104,6 @@ int Field_4_4_0_54377_026?
 int Field_4_4_0_54377_027?
 int Field_4_4_0_54377_028?
 int Field_4_4_0_54377_029?
-int Field_4_4_0_54377_030?
-int Field_4_4_0_54377_031?
-int Field_4_4_0_54377_032?
-int Field_4_4_0_54377_033?
-int Field_4_4_0_54377_034?
-int Field_4_4_0_54377_035?
-int Field_4_4_0_54377_036?
-int Field_4_4_0_54377_037?
-int Field_5_5_0_61000_002?
-int Field_5_5_0_61000_003?
-int Field_5_5_0_61000_004?
-int Field_5_5_0_61000_005?
-int Field_5_5_0_61000_006?
-int Field_5_5_0_61000_007?
-int Field_5_5_0_61000_008?
-int Field_5_5_0_61000_009?
-int Field_5_5_0_61000_010?
-int Field_5_5_0_61000_011?
-int Field_5_5_0_61000_012?
-int Field_5_5_0_61000_013?
-int Field_5_5_0_61000_014?
-int Field_5_5_0_61000_015?
-int Field_5_5_0_61000_016?
-int Field_5_5_0_61000_017?
-int Field_5_5_0_61000_018?
-int Field_5_5_0_61000_019?
-int Field_5_5_0_61000_020?
-int Field_5_5_0_61000_021?
-int Field_5_5_0_61000_022?
-int Field_5_5_0_61000_023?
-int Field_5_5_0_61000_024?
-int Field_5_5_0_61000_025?
-int Field_5_5_0_61000_026?
-int Field_5_5_0_61000_027?
-int Field_5_5_0_61000_028?
-int Field_5_5_0_61000_029?
-int Field_5_5_0_61000_030?
 
 BUILD 3.0.1.8471-3.0.1.8874
 $id$ID<32>
@@ -332,14 +295,14 @@ Field_4_4_0_54377_026<32>
 Field_4_4_0_54377_027<32>
 Field_4_4_0_54377_028<32>
 Field_4_4_0_54377_029<32>
-Field_4_4_0_54377_030<32>[4]
-Field_4_4_0_54377_031<32>[4]
-Field_4_4_0_54377_032<32>[4]
-Field_4_4_0_54377_033<32>[4]
-Field_4_4_0_54377_034<32>[4]
-Field_4_4_0_54377_035<32>[4]
-Field_4_4_0_54377_036<32>[4]
-Field_4_4_0_54377_037<32>[4]
+ArmorShoulder<32>[4]
+ArmorChest<32>[4]
+ArmorHead<32>[4]
+ArmorLegs<32>[4]
+ArmorFeet<32>[4]
+ArmorWaist<32>[4]
+ArmorHands<32>[4]
+ArmorWrists<32>[4]
 
 BUILD 5.0.1.15464-5.2.0.16826
 $id$ID<32>
@@ -436,14 +399,14 @@ Field_4_4_0_54377_026<32>
 Field_4_4_0_54377_027<32>
 Field_4_4_0_54377_028<32>
 Field_4_4_0_54377_029<32>
-Field_4_4_0_54377_030<32>[4]
-Field_4_4_0_54377_031<32>[4]
-Field_4_4_0_54377_032<32>[4]
-Field_4_4_0_54377_033<32>[4]
-Field_4_4_0_54377_034<32>[4]
-Field_4_4_0_54377_035<32>[4]
-Field_4_4_0_54377_036<32>[4]
-Field_4_4_0_54377_037<32>[4]
+ArmorShoulder<32>[4]
+ArmorChest<32>[4]
+ArmorHead<32>[4]
+ArmorLegs<32>[4]
+ArmorFeet<32>[4]
+ArmorWaist<32>[4]
+ArmorHands<32>[4]
+ArmorWrists<32>[4]
 
 LAYOUT 63E728DB
 BUILD 5.5.4.67090, 5.5.4.67177, 5.5.4.67279, 5.5.4.67345, 5.5.4.67440, 5.5.4.67732, 5.5.4.67765, 5.5.4.67849, 5.5.4.67969, 5.5.4.68016, 5.5.4.68042, 5.5.4.68077, 5.5.4.68159, 5.5.4.68317, 5.5.4.68571, 5.5.4.68716
@@ -459,43 +422,43 @@ BUILD 1.15.8.63829, 1.15.8.64057, 1.15.8.64130, 1.15.8.64272, 1.15.8.64344, 1.15
 $noninline,id$ID<32>
 Charlevel<32>
 EffectiveLevel<32>
-Field_5_5_0_61000_002<32>
-Field_5_5_0_61000_003<32>
-Field_5_5_0_61000_004<32>
-Field_5_5_0_61000_005<32>
-Field_5_5_0_61000_006<32>
-Field_5_5_0_61000_007<32>
-Field_5_5_0_61000_008<32>
-Field_5_5_0_61000_009<32>
-Field_5_5_0_61000_010<32>
-Field_5_5_0_61000_011<32>
-Field_5_5_0_61000_012<32>
-Field_5_5_0_61000_013<32>
-Field_5_5_0_61000_014<32>
-Field_5_5_0_61000_015<32>
-Field_5_5_0_61000_016<32>
-Field_5_5_0_61000_017<32>
-Field_5_5_0_61000_018<32>
-Field_5_5_0_61000_019<32>
-Field_5_5_0_61000_020<32>
-Field_5_5_0_61000_021<32>
-Field_5_5_0_61000_022<32>
-Field_5_5_0_61000_023<32>
-Field_5_5_0_61000_024<32>
-Field_5_5_0_61000_025<32>
-Field_5_5_0_61000_026<32>
-Field_5_5_0_61000_027<32>
-Field_5_5_0_61000_028<32>
-Field_5_5_0_61000_029<32>
-Field_5_5_0_61000_030<32>
-Field_4_4_0_54377_030<32>[4]
-Field_4_4_0_54377_031<32>[4]
-Field_4_4_0_54377_032<32>[4]
-Field_4_4_0_54377_033<32>[4]
-Field_4_4_0_54377_034<32>[4]
-Field_4_4_0_54377_035<32>[4]
-Field_4_4_0_54377_036<32>[4]
-Field_4_4_0_54377_037<32>[4]
+WeaponDPS1H<32>
+WeaponDPS2H<32>
+SpellcasterDPS1H<32>
+SpellcasterDPS2H<32>
+RangedDPS<32>
+WandDPS<32>
+SpellPower<32>
+BudgetPrimary<32>
+BudgetSecondary<32>
+BudgetTertiary<32>
+BudgetSub<32>
+BudgetTrivial<32>
+ArmorBack<32>
+ArmorShield<32>
+ShoulderBudget<32>
+TrinketBudget<32>
+WeaponBudget1H<32>
+PrimaryBudget<32>
+RangedBudget<32>
+TertiaryBudget<32>
+ClothShoulderArmor<32>
+LeatherShoulderArmor<32>
+MailShoulderArmor<32>
+PlateShoulderArmor<32>
+ClothCloakArmor<32>
+ClothChestArmor<32>
+LeatherChestArmor<32>
+MailChestArmor<32>
+PlateChestArmor<32>
+ArmorShoulder<32>[4]
+ArmorChest<32>[4]
+ArmorHead<32>[4]
+ArmorLegs<32>[4]
+ArmorFeet<32>[4]
+ArmorWaist<32>[4]
+ArmorHands<32>[4]
+ArmorWrists<32>[4]
 
 BUILD 6.0.1.18179
 $id$ID<32>