Quantcast

Initial commit for MoP support

Kevin Lyles [06-30-12 - 02:31]
Initial commit for MoP support
Filename
EnchantIDs.lua
GemIds.lua
Locales/enUS/patterns-cooldown-use-effects.lua
Locales/enUS/patterns-elixirs.lua
Locales/enUS/patterns-enchant-items.lua
Locales/enUS/patterns-enchants.lua
Locales/enUS/patterns-equip-stats.lua
Locales/enUS/patterns.lua
Locales/enUS/stats.lua
WeightsWatcher.lua
defaults.lua
diff --git a/EnchantIDs.lua b/EnchantIDs.lua
index 439423e..6612a69 100644
--- a/EnchantIDs.lua
+++ b/EnchantIDs.lua
@@ -97,7 +97,7 @@ local EnchantIDs = {
 			["two-hand"] = "Iron Counterweight",
 		},
 		stats = {
-			["haste rating"] = 20,
+			["haste"] = 20,
 		},
 	},
 	[36] = {
@@ -605,7 +605,7 @@ local EnchantIDs = {
 		},
 		spellID = { 13689 },
 		stats = {
-			["parry rating"] = 10,
+			["parry"] = 10,
 		},
 	},
 	[865] = {
@@ -718,7 +718,7 @@ local EnchantIDs = {
 		spellID = { 25083 },
 		stats = {
 			agility = 8,
-			["dodge rating"] = 8,
+			["dodge"] = 8,
 		},
 	},
 	[911] = {
@@ -758,7 +758,7 @@ local EnchantIDs = {
 		},
 		spellID = { 13931 },
 		stats = {
-			["dodge rating"] = 5,
+			["dodge"] = 5,
 		},
 	},
 	[924] = {
@@ -768,7 +768,7 @@ local EnchantIDs = {
 		},
 		spellID = { 7428 },
 		stats = {
-			["dodge rating"] = 2,
+			["dodge"] = 2,
 		},
 	},
 	[925] = {
@@ -778,7 +778,7 @@ local EnchantIDs = {
 		},
 		spellID = { 13646 },
 		stats = {
-			["dodge rating"] = 3,
+			["dodge"] = 3,
 		},
 	},
 	[926] = {
@@ -841,7 +841,7 @@ local EnchantIDs = {
 		},
 		spellID = { 13948 },
 		stats = {
-			["haste rating"] = 10,
+			["haste"] = 10,
 		},
 	},
 	[943] = {
@@ -1396,7 +1396,7 @@ local EnchantIDs = {
 		},
 		spellID = { 44591, 46594 },
 		stats = {
-			["dodge rating"] = 18,
+			["dodge"] = 18,
 		},
 	},
 	[1952] = {
@@ -1406,7 +1406,7 @@ local EnchantIDs = {
 		},
 		spellID = { 44489 },
 		stats = {
-			["dodge rating"] = 20,
+			["dodge"] = 20,
 		},
 	},
 	[1953] = {
@@ -1416,7 +1416,7 @@ local EnchantIDs = {
 		},
 		spellID = { 47766 },
 		stats = {
-			["dodge rating"] = 22,
+			["dodge"] = 22,
 		},
 	},
 	[2322] = {
@@ -1542,7 +1542,7 @@ local EnchantIDs = {
 			legs = "Core Armor Kit",
 		},
 		stats = {
-			["dodge rating"] = 5,
+			["dodge"] = 5,
 		},
 	},
 	[2504] = {
@@ -1571,7 +1571,7 @@ local EnchantIDs = {
 			ranged = "Biznicks 247x128 Accurascope",
 		},
 		stats = {
-			["ranged hit rating"] = 30,
+			["ranged hit"] = 30,
 		},
 	},
 	[2543] = {
@@ -1581,7 +1581,7 @@ local EnchantIDs = {
 			legs = "Arcanum of Rapidity",
 		},
 		stats = {
-			["haste rating"] = 10,
+			["haste"] = 10,
 		},
 	},
 	[2544] = {
@@ -1601,7 +1601,7 @@ local EnchantIDs = {
 			legs = "Arcanum of Protection",
 		},
 		stats = {
-			["dodge rating"] = 12,
+			["dodge"] = 12,
 		},
 	},
 	[2563] = {
@@ -1662,8 +1662,8 @@ local EnchantIDs = {
 			legs = "Presence of Might",
 		},
 		stats = {
-			["dodge rating"] = 10,
-			["parry rating"] = 10,
+			["dodge"] = 10,
+			["parry"] = 10,
 			stamina = 10,
 		},
 	},
@@ -1674,7 +1674,7 @@ local EnchantIDs = {
 			legs = "Syncretist's Sigil",
 		},
 		stats = {
-			["dodge rating"] = 10,
+			["dodge"] = 10,
 			intellect = 10,
 			stamina = 10,
 		},
@@ -1697,7 +1697,7 @@ local EnchantIDs = {
 			legs = "Presence of Sight",
 		},
 		stats = {
-			["hit rating"] = 8,
+			["hit"] = 8,
 			["spell power"] = 18,
 		},
 	},
@@ -1860,7 +1860,7 @@ local EnchantIDs = {
 		},
 		spellID = { 25086 },
 		stats = {
-			["dodge rating"] = 12,
+			["dodge"] = 12,
 		},
 	},
 	[2646] = {
@@ -1891,7 +1891,7 @@ local EnchantIDs = {
 		},
 		spellID = { 27906, 47051 },
 		stats = {
-			["dodge rating"] = 14,
+			["dodge"] = 14,
 		},
 	},
 	[2649] = {
@@ -1922,7 +1922,7 @@ local EnchantIDs = {
 		},
 		spellID = { 27944 },
 		stats = {
-			["dodge rating"] = 12,
+			["dodge"] = 12,
 		},
 	},
 	[2654] = {
@@ -1942,7 +1942,7 @@ local EnchantIDs = {
 		},
 		spellID = { 27946 },
 		stats = {
-			["parry rating"] = 15,
+			["parry"] = 15,
 		},
 	},
 	[2656] = {
@@ -1973,8 +1973,8 @@ local EnchantIDs = {
 		},
 		spellID = { 27954 },
 		stats = {
-			["critical strike rating"] = 10,
-			["hit rating"] = 10,
+			["critical strike"] = 10,
+			["hit"] = 10,
 		},
 	},
 	[2659] = {
@@ -2196,7 +2196,7 @@ local EnchantIDs = {
 		},
 		stats = {
 			["attack power"] = 26,
-			["critical strike rating"] = 14,
+			["critical strike"] = 14,
 		},
 	},
 	[2721] = {
@@ -2205,7 +2205,7 @@ local EnchantIDs = {
 			shoulder = "Power of the Scourge",
 		},
 		stats = {
-			["critical strike rating"] = 14,
+			["critical strike"] = 14,
 			["spell power"] = 15,
 		},
 	},
@@ -2235,7 +2235,7 @@ local EnchantIDs = {
 			ranged = "Stabilized Eternium Scope",
 		},
 		stats = {
-			["critical strike rating"] = 28,
+			["critical strike"] = 28,
 		},
 	},
 	[2745] = {
@@ -2299,7 +2299,7 @@ local EnchantIDs = {
 			legs = "Vindicator's Armor Kit",
 		},
 		stats = {
-			["dodge rating"] = 8,
+			["dodge"] = 8,
 		},
 	},
 	[2794] = {
@@ -2374,7 +2374,7 @@ local EnchantIDs = {
 		},
 		spellID = { 33992 },
 		stats = {
-			["resilience rating"] = 15,
+			["resilience"] = 15,
 		},
 	},
 	[2934] = {
@@ -2384,7 +2384,7 @@ local EnchantIDs = {
 		},
 		spellID = { 33993 },
 		stats = {
-			["critical strike rating"] = 10,
+			["critical strike"] = 10,
 		},
 	},
 	[2935] = {
@@ -2394,7 +2394,7 @@ local EnchantIDs = {
 		},
 		spellID = { 33994 },
 		stats = {
-			["hit rating"] = 15,
+			["hit"] = 15,
 		},
 	},
 	[2937] = {
@@ -2445,7 +2445,7 @@ local EnchantIDs = {
 			shoulder = "Inscription of Warding",
 		},
 		stats = {
-			["dodge rating"] = 13,
+			["dodge"] = 13,
 		},
 	},
 	[2978] = {
@@ -2454,7 +2454,7 @@ local EnchantIDs = {
 			shoulder = "Greater Inscription of Warding",
 		},
 		stats = {
-			["dodge rating"] = 15,
+			["dodge"] = 15,
 			stamina = 15,
 		},
 	},
@@ -2492,7 +2492,7 @@ local EnchantIDs = {
 			shoulder = "Greater Inscription of Discipline",
 		},
 		stats = {
-			["critical strike rating"] = 10,
+			["critical strike"] = 10,
 			["spell power"] = 18,
 		},
 	},
@@ -2536,7 +2536,7 @@ local EnchantIDs = {
 		},
 		stats = {
 			["attack power"] = 30,
-			["critical strike rating"] = 10,
+			["critical strike"] = 10,
 		},
 	},
 	[2987] = {
@@ -2581,7 +2581,7 @@ local EnchantIDs = {
 			shoulder = "Inscription of the Knight",
 		},
 		stats = {
-			["dodge rating"] = 13,
+			["dodge"] = 13,
 		},
 	},
 	[2991] = {
@@ -2590,8 +2590,8 @@ local EnchantIDs = {
 			shoulder = "Greater Inscription of the Knight",
 		},
 		stats = {
-			["dodge rating"] = 10,
-			["parry rating"] = 15,
+			["dodge"] = 10,
+			["parry"] = 15,
 		},
 	},
 	[2992] = {
@@ -2619,7 +2619,7 @@ local EnchantIDs = {
 			shoulder = "Inscription of the Orb",
 		},
 		stats = {
-			["critical strike rating"] = 13,
+			["critical strike"] = 13,
 		},
 	},
 	[2995] = {
@@ -2628,7 +2628,7 @@ local EnchantIDs = {
 			shoulder = "Greater Inscription of the Orb",
 		},
 		stats = {
-			["critical strike rating"] = 15,
+			["critical strike"] = 15,
 			["spell power"] = 12,
 		},
 	},
@@ -2638,7 +2638,7 @@ local EnchantIDs = {
 			shoulder = "Inscription of the Blade",
 		},
 		stats = {
-			["critical strike rating"] = 13,
+			["critical strike"] = 13,
 		},
 	},
 	[2997] = {
@@ -2648,7 +2648,7 @@ local EnchantIDs = {
 		},
 		stats = {
 			["attack power"] = 20,
-			["critical strike rating"] = 15,
+			["critical strike"] = 15,
 		},
 	},
 	[2998] = {
@@ -2666,8 +2666,8 @@ local EnchantIDs = {
 			head = "Arcanum of the Defender",
 		},
 		stats = {
-			["dodge rating"] = 17,
-			["parry rating"] = 16,
+			["dodge"] = 17,
+			["parry"] = 16,
 		},
 	},
 	[3001] = {
@@ -2686,7 +2686,7 @@ local EnchantIDs = {
 			head = "Arcanum of Power",
 		},
 		stats = {
-			["hit rating"] = 14,
+			["hit"] = 14,
 			["spell power"] = 22,
 		},
 	},
@@ -2697,7 +2697,7 @@ local EnchantIDs = {
 		},
 		stats = {
 			["attack power"] = 34,
-			["hit rating"] = 16,
+			["hit"] = 16,
 		},
 	},
 	[3004] = {
@@ -2706,7 +2706,7 @@ local EnchantIDs = {
 			head = "Arcanum of the Gladiator",
 		},
 		stats = {
-			["resilience rating"] = 20,
+			["resilience"] = 20,
 			stamina = 18,
 		},
 	},
@@ -2762,7 +2762,7 @@ local EnchantIDs = {
 		},
 		stats = {
 			["attack power"] = 40,
-			["critical strike rating"] = 10,
+			["critical strike"] = 10,
 		},
 	},
 	[3011] = {
@@ -2782,7 +2782,7 @@ local EnchantIDs = {
 		},
 		stats = {
 			["attack power"] = 50,
-			["critical strike rating"] = 12,
+			["critical strike"] = 12,
 		},
 	},
 	[3013] = {
@@ -2833,7 +2833,7 @@ local EnchantIDs = {
 		},
 		stats = {
 			["disarm duration reduction (percent)"] = 60,
-			["parry rating"] = 15,
+			["parry"] = 15,
 		},
 	},
 	[3225] = {
@@ -2853,7 +2853,7 @@ local EnchantIDs = {
 		},
 		spellID = { 44383 },
 		stats = {
-			["resilience rating"] = 12,
+			["resilience"] = 12,
 		},
 	},
 	[3230] = {
@@ -2874,7 +2874,7 @@ local EnchantIDs = {
 		},
 		spellID = { 44484, 44598 },
 		stats = {
-			["expertise rating"] = 15,
+			["expertise"] = 15,
 		},
 	},
 	[3232] = {
@@ -2905,7 +2905,7 @@ local EnchantIDs = {
 		},
 		spellID = { 44488 },
 		stats = {
-			["hit rating"] = 20,
+			["hit"] = 20,
 		},
 	},
 	[3236] = {
@@ -2978,7 +2978,7 @@ local EnchantIDs = {
 		},
 		spellID = { 44588 },
 		stats = {
-			["resilience rating"] = 20,
+			["resilience"] = 20,
 		},
 	},
 	[3246] = {
@@ -3028,7 +3028,7 @@ local EnchantIDs = {
 		},
 		spellID = { 44625 },
 		stats = {
-			["parry rating"] = 10,
+			["parry"] = 10,
 			["threat (percent)"] = 2,
 		},
 	},
@@ -3124,7 +3124,7 @@ local EnchantIDs = {
 		},
 		stats = {
 			["attack power"] = 55,
-			["critical strike rating"] = 15,
+			["critical strike"] = 15,
 		},
 	},
 	[3327] = {
@@ -3144,7 +3144,7 @@ local EnchantIDs = {
 		spellID = { 60584 },
 		stats = {
 			["attack power"] = 75,
-			["critical strike rating"] = 22,
+			["critical strike"] = 22,
 		},
 	},
 	[3329] = {
@@ -3258,7 +3258,7 @@ local EnchantIDs = {
 			ranged = "Sun Scope",
 		},
 		stats = {
-			["ranged haste rating"] = 40,
+			["ranged haste"] = 40,
 		},
 	},
 	[3608] = {
@@ -3267,7 +3267,7 @@ local EnchantIDs = {
 			ranged = "Heartseeker Scope",
 		},
 		stats = {
-			["ranged critical strike rating"] = 40,
+			["ranged critical strike"] = 40,
 		},
 	},
 	[3718] = {
@@ -3353,7 +3353,7 @@ local EnchantIDs = {
 		},
 		stats = {
 			["disarm duration reduction (percent)"] = 60,
-			["hit rating"] = 28,
+			["hit"] = 28,
 		},
 	},
 	[3748] = {
@@ -3373,7 +3373,7 @@ local EnchantIDs = {
 		},
 		stats = {
 			["attack power"] = 24,
-			["hit rating"] = 10,
+			["hit"] = 10,
 			stamina = 10,
 		},
 	},
@@ -3385,7 +3385,7 @@ local EnchantIDs = {
 		},
 		stats = {
 			["attack power"] = 28,
-			["dodge rating"] = 12,
+			["dodge"] = 12,
 		},
 	},
 	[3756] = {
@@ -3467,8 +3467,8 @@ local EnchantIDs = {
 		},
 		spellID = { 59619 },
 		stats = {
-			["critical strike rating"] = 25,
-			["hit rating"] = 25,
+			["critical strike"] = 25,
+			["hit"] = 25,
 		},
 	},
 	[3789] = {
@@ -3507,7 +3507,7 @@ local EnchantIDs = {
 		},
 		stats = {
 			["attack power"] = 40,
-			["resilience rating"] = 15,
+			["resilience"] = 15,
 		},
 	},
 	[3794] = {
@@ -3516,7 +3516,7 @@ local EnchantIDs = {
 			shoulder = "Inscription of Dominance",
 		},
 		stats = {
-			["resilience rating"] = 15,
+			["resilience"] = 15,
 			["spell power"] = 23,
 		},
 	},
@@ -3527,7 +3527,7 @@ local EnchantIDs = {
 		},
 		stats = {
 			["attack power"] = 50,
-			["resilience rating"] = 20,
+			["resilience"] = 20,
 		},
 	},
 	[3797] = {
@@ -3536,7 +3536,7 @@ local EnchantIDs = {
 			head = "Arcanum of Dominance",
 		},
 		stats = {
-			["resilience rating"] = 20,
+			["resilience"] = 20,
 			["spell power"] = 29,
 		},
 	},
@@ -3546,7 +3546,7 @@ local EnchantIDs = {
 			shoulder = "Lesser Inscription of the Storm",
 		},
 		stats = {
-			["critical strike rating"] = 10,
+			["critical strike"] = 10,
 			["spell power"] = 18,
 		},
 	},
@@ -3567,7 +3567,7 @@ local EnchantIDs = {
 		},
 		stats = {
 			["attack power"] = 40,
-			["critical strike rating"] = 15,
+			["critical strike"] = 15,
 		},
 	},
 	[3809] = {
@@ -3586,7 +3586,7 @@ local EnchantIDs = {
 			shoulder = "Greater Inscription of the Storm",
 		},
 		stats = {
-			["critical strike rating"] = 15,
+			["critical strike"] = 15,
 			["spell power"] = 24,
 		},
 	},
@@ -3596,7 +3596,7 @@ local EnchantIDs = {
 			shoulder = "Greater Inscription of the Pinnacle",
 		},
 		stats = {
-			["dodge rating"] = 20,
+			["dodge"] = 20,
 			stamina = 22,
 		},
 	},
@@ -3657,7 +3657,7 @@ local EnchantIDs = {
 		},
 		stats = {
 			["attack power"] = 50,
-			["critical strike rating"] = 20,
+			["critical strike"] = 20,
 		},
 	},
 	[3818] = {
@@ -3666,7 +3666,7 @@ local EnchantIDs = {
 			head = "Arcanum of the Stalwart Protector",
 		},
 		stats = {
-			["dodge rating"] = 20,
+			["dodge"] = 20,
 			stamina = 37,
 		},
 	},
@@ -3686,7 +3686,7 @@ local EnchantIDs = {
 			head = "Arcanum of Burning Mysteries",
 		},
 		stats = {
-			["critical strike rating"] = 20,
+			["critical strike"] = 20,
 			intellect = 26,
 		},
 	},
@@ -3707,7 +3707,7 @@ local EnchantIDs = {
 		},
 		stats = {
 			["attack power"] = 75,
-			["critical strike rating"] = 22,
+			["critical strike"] = 22,
 		},
 	},
 	[3824] = {
@@ -3727,7 +3727,7 @@ local EnchantIDs = {
 		},
 		spellID = { 60609 },
 		stats = {
-			["haste rating"] = 15,
+			["haste"] = 15,
 		},
 	},
 	[3826] = {
@@ -3737,8 +3737,8 @@ local EnchantIDs = {
 		},
 		spellID = { 60623 },
 		stats = {
-			["critical strike rating"] = 12,
-			["hit rating"] = 12,
+			["critical strike"] = 12,
+			["hit"] = 12,
 		},
 	},
 	[3827] = {
@@ -3788,7 +3788,7 @@ local EnchantIDs = {
 		},
 		spellID = { 47898 },
 		stats = {
-			["haste rating"] = 23,
+			["haste"] = 23,
 		},
 	},
 	[3832] = {
@@ -3828,7 +3828,7 @@ local EnchantIDs = {
 		spellID = { 61117 },
 		stats = {
 			["attack power"] = 120,
-			["critical strike rating"] = 15,
+			["critical strike"] = 15,
 		},
 	},
 	[3836] = {
@@ -3847,8 +3847,8 @@ local EnchantIDs = {
 		},
 		spellID = { 61119 },
 		stats = {
-			["dodge rating"] = 60,
-			["parry rating"] = 15,
+			["dodge"] = 60,
+			["parry"] = 15,
 		},
 	},
 	[3838] = {
@@ -3857,7 +3857,7 @@ local EnchantIDs = {
 		},
 		spellID = { 61120 },
 		stats = {
-			["critical strike rating"] = 15,
+			["critical strike"] = 15,
 			["spell power"] = 70,
 		},
 	},
@@ -3885,7 +3885,7 @@ local EnchantIDs = {
 			head = "Arcanum of the Savage Gladiator",
 		},
 		stats = {
-			["resilience rating"] = 25,
+			["resilience"] = 25,
 			stamina = 30,
 		},
 	},
@@ -3946,7 +3946,7 @@ local EnchantIDs = {
 		},
 		stats = {
 			["disarm duration reduction (percent)"] = 60,
-			["parry rating"] = 26,
+			["parry"] = 26,
 		},
 	},
 	[3850] = {
@@ -3965,7 +3965,7 @@ local EnchantIDs = {
 			shoulder = "Greater Inscription of the Gladiator",
 		},
 		stats = {
-			["resilience rating"] = 15,
+			["resilience"] = 15,
 			stamina = 30,
 		},
 	},
@@ -3975,7 +3975,7 @@ local EnchantIDs = {
 			legs = "Earthen Leg Armor",
 		},
 		stats = {
-			["resilience rating"] = 40,
+			["resilience"] = 40,
 			stamina = 28,
 		},
 	},
@@ -4006,7 +4006,7 @@ local EnchantIDs = {
 		},
 		spellID = { 63746 },
 		stats = {
-			["hit rating"] = 5,
+			["hit"] = 5,
 		},
 	},
 	[3869] = {
@@ -4056,7 +4056,7 @@ local EnchantIDs = {
 		},
 		stats = {
 			["attack power"] = 30,
-			["critical strike rating"] = 10,
+			["critical strike"] = 10,
 		},
 	},
 	[3876] = {
@@ -4065,8 +4065,8 @@ local EnchantIDs = {
 			shoulder = "Lesser Inscription of the Pinnacle",
 		},
 		stats = {
-			["dodge rating"] = 15,
-			["parry rating"] = 10,
+			["dodge"] = 15,
+			["parry"] = 10,
 		},
 	},
 	[3883] = {
@@ -4086,7 +4086,7 @@ local EnchantIDs = {
 		},
 		spellID = { 74132 },
 		stats = {
-			["mastery rating"] = 50,
+			["mastery"] = 50,
 		},
 	},
 	[4062] = {
@@ -4127,7 +4127,7 @@ local EnchantIDs = {
 		},
 		spellID = { 74193 },
 		stats = {
-			["haste rating"] = 50,
+			["haste"] = 50,
 		},
 	},
 	[4066] = {
@@ -4157,7 +4157,7 @@ local EnchantIDs = {
 		},
 		spellID = { 74198 },
 		stats = {
-			["haste rating"] = 50,
+			["haste"] = 50,
 		},
 	},
 	[4069] = {
@@ -4167,7 +4167,7 @@ local EnchantIDs = {
 		},
 		spellID = { 74199 },
 		stats = {
-			["haste rating"] = 50,
+			["haste"] = 50,
 		},
 	},
 	[4070] = {
@@ -4187,7 +4187,7 @@ local EnchantIDs = {
 		},
 		spellID = { 74201 },
 		stats = {
-			["critical strike rating"] = 50,
+			["critical strike"] = 50,
 		},
 	},
 	[4072] = {
@@ -4247,7 +4247,7 @@ local EnchantIDs = {
 		},
 		spellID = { 74214 },
 		stats = {
-			["resilience rating"] = 40,
+			["resilience"] = 40,
 		},
 	},
 	[4078] = {
@@ -4293,7 +4293,7 @@ local EnchantIDs = {
 		},
 		spellID = { 74220 },
 		stats = {
-			["expertise rating"] = 50,
+			["expertise"] = 50,
 		},
 	},
 	[4083] = {
@@ -4323,7 +4323,7 @@ local EnchantIDs = {
 		},
 		spellID = { 74226 },
 		stats = {
-			["mastery rating"] = 50,
+			["mastery"] = 50,
 		},
 	},
 	[4086] = {
@@ -4333,7 +4333,7 @@ local EnchantIDs = {
 		},
 		spellID = { 74229 },
 		stats = {
-			["dodge rating"] = 50,
+			["dodge"] = 50,
 		},
 	},
 	[4087] = {
@@ -4343,7 +4343,7 @@ local EnchantIDs = {
 		},
 		spellID = { 74230 },
 		stats = {
-			["critical strike rating"] = 50,
+			["critical strike"] = 50,
 		},
 	},
 	[4088] = {
@@ -4363,7 +4363,7 @@ local EnchantIDs = {
 		},
 		spellID = { 74232 },
 		stats = {
-			["hit rating"] = 50,
+			["hit"] = 50,
 		},
 	},
 	[4090] = {
@@ -4394,7 +4394,7 @@ local EnchantIDs = {
 		},
 		spellID = { 74236 },
 		stats = {
-			["hit rating"] = 50,
+			["hit"] = 50,
 		},
 	},
 	[4093] = {
@@ -4414,7 +4414,7 @@ local EnchantIDs = {
 		},
 		spellID = { 74238 },
 		stats = {
-			["mastery rating"] = 50,
+			["mastery"] = 50,
 		},
 	},
 	[4095] = {
@@ -4424,7 +4424,7 @@ local EnchantIDs = {
 		},
 		spellID = { 74239 },
 		stats = {
-			["expertise rating"] = 50,
+			["expertise"] = 50,
 		},
 	},
 	[4096] = {
@@ -4474,7 +4474,7 @@ local EnchantIDs = {
 		},
 		spellID = { 74247 },
 		stats = {
-			["critical strike rating"] = 65,
+			["critical strike"] = 65,
 		},
 	},
 	[4101] = {
@@ -4484,7 +4484,7 @@ local EnchantIDs = {
 		},
 		spellID = { 74248 },
 		stats = {
-			["critical strike rating"] = 65,
+			["critical strike"] = 65,
 		},
 	},
 	[4102] = {
@@ -4514,7 +4514,7 @@ local EnchantIDs = {
 		},
 		spellID = { 74253 },
 		stats = {
-			["mastery rating"] = 35,
+			["mastery"] = 35,
 			["minor run speed"] = 1,
 		},
 	},
@@ -4546,7 +4546,7 @@ local EnchantIDs = {
 		},
 		spellID = { 74255 },
 		stats = {
-			["mastery rating"] = 65,
+			["mastery"] = 65,
 		},
 	},
 	[4108] = {
@@ -4556,7 +4556,7 @@ local EnchantIDs = {
 		},
 		spellID = { 74256 },
 		stats = {
-			["haste rating"] = 65,
+			["haste"] = 65,
 		},
 	},
 	[4109] = {
@@ -4684,7 +4684,7 @@ local EnchantIDs = {
 		},
 		stats = {
 			["attack power"] = 110,
-			["critical strike rating"] = 45,
+			["critical strike"] = 45,
 		},
 	},
 	[4124] = {
@@ -4705,7 +4705,7 @@ local EnchantIDs = {
 		spellID = { 85067 },
 		stats = {
 			["attack power"] = 190,
-			["critical strike rating"] = 55,
+			["critical strike"] = 55,
 		},
 	},
 	[4127] = {
@@ -4734,7 +4734,7 @@ local EnchantIDs = {
 			ranged = "R19 Threatfinder",
 		},
 		stats = {
-			["ranged hit rating"] = 88,
+			["ranged hit"] = 88,
 		},
 	},
 	[4177] = {
@@ -4743,7 +4743,7 @@ local EnchantIDs = {
 			ranged = "Safety Catch Removal Kit",
 		},
 		stats = {
-			["ranged haste rating"] = 88,
+			["ranged haste"] = 88,
 		},
 	},
 	[4189] = {
@@ -4789,7 +4789,7 @@ local EnchantIDs = {
 		spellID = { 86375 },
 		stats = {
 			agility = 130,
-			["mastery rating"] = 25,
+			["mastery"] = 25,
 		},
 	},
 	[4194] = {
@@ -4798,7 +4798,7 @@ local EnchantIDs = {
 		},
 		spellID = { 86401 },
 		stats = {
-			["critical strike rating"] = 25,
+			["critical strike"] = 25,
 			strength = 130,
 		},
 	},
@@ -4808,7 +4808,7 @@ local EnchantIDs = {
 		},
 		spellID = { 86402 },
 		stats = {
-			["dodge rating"] = 25,
+			["dodge"] = 25,
 			stamina = 195,
 		},
 	},
@@ -4818,7 +4818,7 @@ local EnchantIDs = {
 		},
 		spellID = { 86403 },
 		stats = {
-			["haste rating"] = 25,
+			["haste"] = 25,
 			intellect = 130,
 		},
 	},
@@ -4828,7 +4828,7 @@ local EnchantIDs = {
 			shoulder = "Lesser Inscription of Unbreakable Quartz",
 		},
 		stats = {
-			["dodge rating"] = 20,
+			["dodge"] = 20,
 			stamina = 45,
 		},
 	},
@@ -4838,7 +4838,7 @@ local EnchantIDs = {
 			shoulder = "Greater Inscription of Unbreakable Quartz",
 		},
 		stats = {
-			["dodge rating"] = 25,
+			["dodge"] = 25,
 			stamina = 75,
 		},
 	},
@@ -4848,7 +4848,7 @@ local EnchantIDs = {
 			shoulder = "Lesser Inscription of Charged Lodestone",
 		},
 		stats = {
-			["haste rating"] = 20,
+			["haste"] = 20,
 			intellect = 30,
 		},
 	},
@@ -4858,7 +4858,7 @@ local EnchantIDs = {
 			shoulder = "Greater Inscription of Charged Lodestone",
 		},
 		stats = {
-			["haste rating"] = 25,
+			["haste"] = 25,
 			intellect = 50,
 		},
 	},
@@ -4868,7 +4868,7 @@ local EnchantIDs = {
 			shoulder = "Lesser Inscription of Jagged Stone",
 		},
 		stats = {
-			["critical strike rating"] = 20,
+			["critical strike"] = 20,
 			strength = 30,
 		},
 	},
@@ -4878,7 +4878,7 @@ local EnchantIDs = {
 			shoulder = "Greater Inscription of Jagged Stone",
 		},
 		stats = {
-			["critical strike rating"] = 25,
+			["critical strike"] = 25,
 			strength = 50,
 		},
 	},
@@ -4889,7 +4889,7 @@ local EnchantIDs = {
 		},
 		stats = {
 			agility = 50,
-			["mastery rating"] = 25,
+			["mastery"] = 25,
 		},
 	},
 	[4205] = {
@@ -4899,7 +4899,7 @@ local EnchantIDs = {
 		},
 		stats = {
 			agility = 30,
-			["mastery rating"] = 20,
+			["mastery"] = 20,
 		},
 	},
 	[4206] = {
@@ -4908,7 +4908,7 @@ local EnchantIDs = {
 			head = "Arcanum of the Earthen Ring",
 		},
 		stats = {
-			["dodge rating"] = 35,
+			["dodge"] = 35,
 			stamina = 90,
 		},
 	},
@@ -4918,7 +4918,7 @@ local EnchantIDs = {
 			head = "Arcanum of Hyjal",
 		},
 		stats = {
-			["critical strike rating"] = 35,
+			["critical strike"] = 35,
 			intellect = 60,
 		},
 	},
@@ -4928,7 +4928,7 @@ local EnchantIDs = {
 			head = { "Arcanum of the Dragonmaw", "Arcanum of the Wildhammer" },
 		},
 		stats = {
-			["mastery rating"] = 35,
+			["mastery"] = 35,
 			strength = 60,
 		},
 	},
@@ -4939,7 +4939,7 @@ local EnchantIDs = {
 		},
 		stats = {
 			agility = 60,
-			["haste rating"] = 35,
+			["haste"] = 35,
 		},
 	},
 	[4215] = {
@@ -4968,7 +4968,7 @@ local EnchantIDs = {
 		stacks = false,
 		stats = {
 			["disarm duration reduction (percent)"] = 60,
-			["hit rating"] = 40,
+			["hit"] = 40,
 		},
 	},
 	[4227] = {
@@ -4988,7 +4988,7 @@ local EnchantIDs = {
 		},
 		stats = {
 			intellect = 60,
-			["resilience rating"] = 35,
+			["resilience"] = 35,
 		},
 	},
 	[4246] = {
@@ -4998,7 +4998,7 @@ local EnchantIDs = {
 		},
 		stats = {
 			agility = 60,
-			["resilience rating"] = 35,
+			["resilience"] = 35,
 		},
 	},
 	[4247] = {
@@ -5007,7 +5007,7 @@ local EnchantIDs = {
 			head = "Arcanum of Vicious Strength",
 		},
 		stats = {
-			["resilience rating"] = 35,
+			["resilience"] = 35,
 			strength = 60,
 		},
 	},
@@ -5018,7 +5018,7 @@ local EnchantIDs = {
 		},
 		stats = {
 			intellect = 50,
-			["resilience rating"] = 25,
+			["resilience"] = 25,
 		},
 	},
 	[4249] = {
@@ -5027,7 +5027,7 @@ local EnchantIDs = {
 			shoulder = "Greater Inscription of Vicious Strength",
 		},
 		stats = {
-			["resilience rating"] = 25,
+			["resilience"] = 25,
 			strength = 50,
 		},
 	},
@@ -5038,7 +5038,7 @@ local EnchantIDs = {
 		},
 		stats = {
 			agility = 50,
-			["resilience rating"] = 25,
+			["resilience"] = 25,
 		},
 	},
 	[4256] = {
diff --git a/GemIds.lua b/GemIds.lua
index 0083516..e77fa01 100644
--- a/GemIds.lua
+++ b/GemIds.lua
@@ -90,22 +90,22 @@ ww_gems = {
 				[2965] = {
 					"yellow",
 					"Smooth Amber",
-					{[L["critical strike rating"]] = 4},
+					{[L["critical strike"]] = 4},
 				},
 				[2966] = {
 					"blue",
 					"Rigid Zircon",
-					{[L["hit rating"]] = 4},
+					{[L["hit"]] = 4},
 				},
 				[2967] = {
 					"yellow",
 					"Smooth Amber",
-					{[L["critical strike rating"]] = 4},
+					{[L["critical strike"]] = 4},
 				},
 				[2968] = {
 					"yellow",
 					"Subtle Amber",
-					{[L["dodge rating"]] = 4},
+					{[L["dodge"]] = 4},
 				},
 			},
 		},
@@ -114,37 +114,37 @@ ww_gems = {
 				[4166] = {
 					"cogwheel",
 					"Subtle Cogwheel",
-					{[L["dodge rating"]] = 208},
+					{[L["dodge"]] = 208},
 				},
 				[4167] = {
 					"cogwheel",
 					"Smooth Cogwheel",
-					{[L["critical strike rating"]] = 208},
+					{[L["critical strike"]] = 208},
 				},
 				[4168] = {
 					"cogwheel",
 					"Quick Cogwheel",
-					{[L["haste rating"]] = 208},
+					{[L["haste"]] = 208},
 				},
 				[4169] = {
 					"cogwheel",
 					"Fractured Cogwheel",
-					{[L["mastery rating"]] = 208},
+					{[L["mastery"]] = 208},
 				},
 				[4170] = {
 					"cogwheel",
 					"Precise Cogwheel",
-					{[L["expertise rating"]] = 208},
+					{[L["expertise"]] = 208},
 				},
 				[4171] = {
 					"cogwheel",
 					"Flashing Cogwheel",
-					{[L["parry rating"]] = 208},
+					{[L["parry"]] = 208},
 				},
 				[4172] = {
 					"cogwheel",
 					"Rigid Cogwheel",
-					{[L["hit rating"]] = 208},
+					{[L["hit"]] = 208},
 				},
 				[4173] = {
 					"cogwheel",
@@ -154,7 +154,7 @@ ww_gems = {
 				[4239] = {
 					"cogwheel",
 					"Mystic Cogwheel",
-					{[L["resilience rating"]] = 208},
+					{[L["resilience"]] = 208},
 				},
 			},
 		},
@@ -190,17 +190,17 @@ ww_gems = {
 				[2695] = {
 					"yellow",
 					"Smooth Golden Draenite",
-					{[L["critical strike rating"]] = 6},
+					{[L["critical strike"]] = 6},
 				},
 				[2696] = {
 					"yellow",
 					"Subtle Golden Draenite",
-					{[L["dodge rating"]] = 6},
+					{[L["dodge"]] = 6},
 				},
 				[2697] = {
 					"blue",
 					"Rigid Azure Moonstone",
-					{[L["hit rating"]] = 6},
+					{[L["hit"]] = 6},
 				},
 				[2698] = {
 					"blue",
@@ -225,12 +225,12 @@ ww_gems = {
 				[2705] = {
 					"orange",
 					"Reckless Flame Spessarite",
-					{[L["haste rating"]] = 3, [L["intellect"]] = 3},
+					{[L["haste"]] = 3, [L["intellect"]] = 3},
 				},
 				[2706] = {
 					"green",
 					"Regal Deep Peridot",
-					{[L["dodge rating"]] = 3, [L["stamina"]] = 4},
+					{[L["dodge"]] = 3, [L["stamina"]] = 4},
 				},
 				[2707] = {
 					"purple",
@@ -260,32 +260,32 @@ ww_gems = {
 				[2752] = {
 					"orange",
 					"Inscribed Flame Spessarite",
-					{[L["critical strike rating"]] = 3, [L["strength"]] = 3},
+					{[L["critical strike"]] = 3, [L["strength"]] = 3},
 				},
 				[2755] = {
 					"purple",
 					"Glinting Shadow Draenite",
-					{[L["agility"]] = 3, [L["hit rating"]] = 3},
+					{[L["agility"]] = 3, [L["hit"]] = 3},
 				},
 				[2757] = {
 					"green",
 					"Jagged Deep Peridot",
-					{[L["critical strike rating"]] = 3, [L["stamina"]] = 4},
+					{[L["critical strike"]] = 3, [L["stamina"]] = 4},
 				},
 				[2760] = {
 					"orange",
 					"Potent Flame Spessarite",
-					{[L["critical strike rating"]] = 3, [L["intellect"]] = 3},
+					{[L["critical strike"]] = 3, [L["intellect"]] = 3},
 				},
 				[2762] = {
 					"green",
 					"Radiant Deep Peridot",
-					{[L["critical strike rating"]] = 3, [L["spell penetration"]] = 4},
+					{[L["critical strike"]] = 3, [L["spell penetration"]] = 4},
 				},
 				[2942] = {
 					"yellow",
 					"Smooth Golden Draenite",
-					{[L["critical strike rating"]] = 6},
+					{[L["critical strike"]] = 6},
 				},
 				[2971] = {
 					"red",
@@ -295,7 +295,7 @@ ww_gems = {
 				[3104] = {
 					"blue",
 					"Rigid Azure Moonstone",
-					{[L["hit rating"]] = 6},
+					{[L["hit"]] = 6},
 				},
 				[3106] = {
 					"purple",
@@ -310,12 +310,12 @@ ww_gems = {
 				[3110] = {
 					"purple",
 					"Veiled Shadow Draenite",
-					{[L["hit rating"]] = 3, [L["intellect"]] = 3},
+					{[L["hit"]] = 3, [L["intellect"]] = 3},
 				},
 				[3113] = {
 					"orange",
 					"Deadly Flame Spessarite",
-					{[L["agility"]] = 3, [L["critical strike rating"]] = 3},
+					{[L["agility"]] = 3, [L["critical strike"]] = 3},
 				},
 				[3201] = {
 					"purple",
@@ -352,7 +352,7 @@ ww_gems = {
 				[2730] = {
 					"yellow",
 					"Subtle Dawnstone",
-					{[L["dodge rating"]] = 8},
+					{[L["dodge"]] = 8},
 				},
 				[2731] = {
 					"blue",
@@ -377,17 +377,17 @@ ww_gems = {
 				[2735] = {
 					"yellow",
 					"Smooth Dawnstone",
-					{[L["critical strike rating"]] = 8},
+					{[L["critical strike"]] = 8},
 				},
 				[2736] = {
 					"yellow",
 					"Smooth Dawnstone",
-					{[L["critical strike rating"]] = 8},
+					{[L["critical strike"]] = 8},
 				},
 				[2737] = {
 					"yellow",
 					"Subtle Dawnstone",
-					{[L["dodge rating"]] = 8},
+					{[L["dodge"]] = 8},
 				},
 				[2738] = {
 					"purple",
@@ -412,12 +412,12 @@ ww_gems = {
 				[2742] = {
 					"orange",
 					"Reckless Noble Topaz",
-					{[L["haste rating"]] = 4, [L["intellect"]] = 4},
+					{[L["haste"]] = 4, [L["intellect"]] = 4},
 				},
 				[2743] = {
 					"green",
 					"Regal Talasite",
-					{[L["dodge rating"]] = 4, [L["stamina"]] = 6},
+					{[L["dodge"]] = 4, [L["stamina"]] = 6},
 				},
 				[2744] = {
 					"purple",
@@ -427,42 +427,42 @@ ww_gems = {
 				[2753] = {
 					"orange",
 					"Inscribed Noble Topaz",
-					{[L["critical strike rating"]] = 4, [L["strength"]] = 4},
+					{[L["critical strike"]] = 4, [L["strength"]] = 4},
 				},
 				[2754] = {
 					"red",
 					"Flashing Living Ruby",
-					{[L["parry rating"]] = 8},
+					{[L["parry"]] = 8},
 				},
 				[2756] = {
 					"purple",
 					"Glinting Nightseye",
-					{[L["agility"]] = 4, [L["hit rating"]] = 4},
+					{[L["agility"]] = 4, [L["hit"]] = 4},
 				},
 				[2758] = {
 					"green",
 					"Jagged Talasite",
-					{[L["critical strike rating"]] = 4, [L["stamina"]] = 6},
+					{[L["critical strike"]] = 4, [L["stamina"]] = 6},
 				},
 				[2759] = {
 					"yellow",
 					"Mystic Dawnstone",
-					{[L["resilience rating"]] = 8},
+					{[L["resilience"]] = 8},
 				},
 				[2761] = {
 					"orange",
 					"Potent Noble Topaz",
-					{[L["critical strike rating"]] = 4, [L["intellect"]] = 4},
+					{[L["critical strike"]] = 4, [L["intellect"]] = 4},
 				},
 				[2763] = {
 					"green",
 					"Radiant Talasite",
-					{[L["critical strike rating"]] = 4, [L["spell penetration"]] = 5},
+					{[L["critical strike"]] = 4, [L["spell penetration"]] = 5},
 				},
 				[2764] = {
 					"blue",
 					"Rigid Star of Elune",
-					{[L["hit rating"]] = 8},
+					{[L["hit"]] = 8},
 				},
 				[2765] = {
 					"blue",
@@ -472,7 +472,7 @@ ww_gems = {
 				[2827] = {
 					"meta",
 					"Destructive Skyfire Diamond",
-					{[L["critical strike rating"]] = 14, [L["spell reflect (percent)"]] = 1},
+					{[L["critical strike"]] = 14, [L["spell reflect (percent)"]] = 1},
 				},
 				[2828] = {
 					"meta",
@@ -482,12 +482,12 @@ ww_gems = {
 				[2829] = {
 					"meta",
 					"Swift Skyfire Diamond",
-					{[L["critical strike rating"]] = 12, [L["minor run speed"]] = 1},
+					{[L["critical strike"]] = 12, [L["minor run speed"]] = 1},
 				},
 				[2830] = {
 					"meta",
 					"Enigmatic Skyfire Diamond",
-					{[L["critical strike rating"]] = 12, [L["snare/root duration reduction (percent)"]] = 10},
+					{[L["critical strike"]] = 12, [L["snare/root duration reduction (percent)"]] = 10},
 				},
 				[2831] = {
 					"meta",
@@ -502,7 +502,7 @@ ww_gems = {
 				[2833] = {
 					"meta",
 					"Tenacious Earthstorm Diamond",
-					{[L["chance to restore health on hit"]] = 1, [L["dodge rating"]] = 12},
+					{[L["chance to restore health on hit"]] = 1, [L["dodge"]] = 12},
 				},
 				[2834] = {
 					"meta",
@@ -522,7 +522,7 @@ ww_gems = {
 				[3105] = {
 					"blue",
 					"Rigid Star of Elune",
-					{[L["hit rating"]] = 8},
+					{[L["hit"]] = 8},
 				},
 				[3107] = {
 					"purple",
@@ -532,17 +532,17 @@ ww_gems = {
 				[3109] = {
 					"purple",
 					"Glinting Nightseye",
-					{[L["agility"]] = 4, [L["hit rating"]] = 4},
+					{[L["agility"]] = 4, [L["hit"]] = 4},
 				},
 				[3111] = {
 					"purple",
 					"Veiled Nightseye",
-					{[L["hit rating"]] = 4, [L["intellect"]] = 4},
+					{[L["hit"]] = 4, [L["intellect"]] = 4},
 				},
 				[3112] = {
 					"orange",
 					"Deadly Noble Topaz",
-					{[L["agility"]] = 4, [L["critical strike rating"]] = 4},
+					{[L["agility"]] = 4, [L["critical strike"]] = 4},
 				},
 				[3154] = {
 					"meta",
@@ -562,32 +562,32 @@ ww_gems = {
 				[3226] = {
 					"green",
 					"Steady Talasite",
-					{[L["resilience rating"]] = 4, [L["stamina"]] = 6},
+					{[L["resilience"]] = 4, [L["stamina"]] = 6},
 				},
 				[3261] = {
 					"meta",
 					"Chaotic Skyfire Diamond",
-					{[L["critical effect (percent)"]] = 3, [L["critical strike rating"]] = 12},
+					{[L["critical effect (percent)"]] = 3, [L["critical strike"]] = 12},
 				},
 				[3270] = {
 					"yellow",
 					"Quick Dawnstone",
-					{[L["haste rating"]] = 8},
+					{[L["haste"]] = 8},
 				},
 				[3271] = {
 					"orange",
 					"Reckless Noble Topaz",
-					{[L["haste rating"]] = 4, [L["intellect"]] = 4},
+					{[L["haste"]] = 4, [L["intellect"]] = 4},
 				},
 				[3272] = {
 					"green",
 					"Forceful Talasite",
-					{[L["haste rating"]] = 4, [L["stamina"]] = 6},
+					{[L["haste"]] = 4, [L["stamina"]] = 6},
 				},
 				[3274] = {
 					"meta",
 					"Eternal Earthstorm Diamond",
-					{[L["block value (percent)"]] = 1, [L["dodge rating"]] = 12},
+					{[L["block value (percent)"]] = 1, [L["dodge"]] = 12},
 				},
 				[3275] = {
 					"meta",
@@ -597,7 +597,7 @@ ww_gems = {
 				[3280] = {
 					"green",
 					"Regal Talasite",
-					{[L["dodge rating"]] = 4, [L["stamina"]] = 6},
+					{[L["dodge"]] = 4, [L["stamina"]] = 6},
 				},
 			},
 			[4] = {
@@ -634,12 +634,12 @@ ww_gems = {
 				[3120] = {
 					"yellow",
 					"Subtle Lionseye",
-					{[L["dodge rating"]] = 10},
+					{[L["dodge"]] = 10},
 				},
 				[3121] = {
 					"red",
 					"Flashing Crimson Spinel",
-					{[L["parry rating"]] = 10},
+					{[L["parry"]] = 10},
 				},
 				[3122] = {
 					"blue",
@@ -669,32 +669,32 @@ ww_gems = {
 				[3127] = {
 					"yellow",
 					"Smooth Lionseye",
-					{[L["critical strike rating"]] = 10},
+					{[L["critical strike"]] = 10},
 				},
 				[3128] = {
 					"blue",
 					"Rigid Empyrean Sapphire",
-					{[L["hit rating"]] = 10},
+					{[L["hit"]] = 10},
 				},
 				[3129] = {
 					"yellow",
 					"Smooth Lionseye",
-					{[L["critical strike rating"]] = 10},
+					{[L["critical strike"]] = 10},
 				},
 				[3130] = {
 					"yellow",
 					"Subtle Lionseye",
-					{[L["dodge rating"]] = 10},
+					{[L["dodge"]] = 10},
 				},
 				[3131] = {
 					"yellow",
 					"Mystic Lionseye",
-					{[L["resilience rating"]] = 10},
+					{[L["resilience"]] = 10},
 				},
 				[3132] = {
 					"blue",
 					"Rigid Empyrean Sapphire",
-					{[L["hit rating"]] = 10},
+					{[L["hit"]] = 10},
 				},
 				[3133] = {
 					"purple",
@@ -714,7 +714,7 @@ ww_gems = {
 				[3136] = {
 					"purple",
 					"Glinting Shadowsong Amethyst",
-					{[L["agility"]] = 5, [L["hit rating"]] = 5},
+					{[L["agility"]] = 5, [L["hit"]] = 5},
 				},
 				[3137] = {
 					"purple",
@@ -729,42 +729,42 @@ ww_gems = {
 				[3139] = {
 					"orange",
 					"Inscribed Pyrestone",
-					{[L["critical strike rating"]] = 5, [L["strength"]] = 5},
+					{[L["critical strike"]] = 5, [L["strength"]] = 5},
 				},
 				[3140] = {
 					"orange",
 					"Potent Pyrestone",
-					{[L["critical strike rating"]] = 5, [L["intellect"]] = 5},
+					{[L["critical strike"]] = 5, [L["intellect"]] = 5},
 				},
 				[3141] = {
 					"orange",
 					"Reckless Pyrestone",
-					{[L["haste rating"]] = 5, [L["intellect"]] = 5},
+					{[L["haste"]] = 5, [L["intellect"]] = 5},
 				},
 				[3142] = {
 					"purple",
 					"Glinting Shadowsong Amethyst",
-					{[L["agility"]] = 5, [L["hit rating"]] = 5},
+					{[L["agility"]] = 5, [L["hit"]] = 5},
 				},
 				[3143] = {
 					"purple",
 					"Veiled Shadowsong Amethyst",
-					{[L["hit rating"]] = 5, [L["intellect"]] = 5},
+					{[L["hit"]] = 5, [L["intellect"]] = 5},
 				},
 				[3144] = {
 					"orange",
 					"Deadly Pyrestone",
-					{[L["agility"]] = 5, [L["critical strike rating"]] = 5},
+					{[L["agility"]] = 5, [L["critical strike"]] = 5},
 				},
 				[3145] = {
 					"green",
 					"Regal Seaspray Emerald",
-					{[L["dodge rating"]] = 5, [L["stamina"]] = 7},
+					{[L["dodge"]] = 5, [L["stamina"]] = 7},
 				},
 				[3146] = {
 					"green",
 					"Radiant Seaspray Emerald",
-					{[L["critical strike rating"]] = 5, [L["spell penetration"]] = 6},
+					{[L["critical strike"]] = 5, [L["spell penetration"]] = 6},
 				},
 				[3147] = {
 					"purple",
@@ -774,27 +774,27 @@ ww_gems = {
 				[3148] = {
 					"green",
 					"Jagged Seaspray Emerald",
-					{[L["critical strike rating"]] = 5, [L["stamina"]] = 7},
+					{[L["critical strike"]] = 5, [L["stamina"]] = 7},
 				},
 				[3284] = {
 					"green",
 					"Steady Seaspray Emerald",
-					{[L["resilience rating"]] = 5, [L["stamina"]] = 7},
+					{[L["resilience"]] = 5, [L["stamina"]] = 7},
 				},
 				[3285] = {
 					"green",
 					"Forceful Seaspray Emerald",
-					{[L["haste rating"]] = 5, [L["stamina"]] = 7},
+					{[L["haste"]] = 5, [L["stamina"]] = 7},
 				},
 				[3286] = {
 					"orange",
 					"Reckless Pyrestone",
-					{[L["haste rating"]] = 5, [L["intellect"]] = 5},
+					{[L["haste"]] = 5, [L["intellect"]] = 5},
 				},
 				[3287] = {
 					"yellow",
 					"Quick Lionseye",
-					{[L["haste rating"]] = 10},
+					{[L["haste"]] = 10},
 				},
 				[3318] = {
 					"purple",
@@ -821,22 +821,22 @@ ww_gems = {
 				[3376] = {
 					"yellow",
 					"Subtle Sun Crystal",
-					{[L["dodge rating"]] = 12},
+					{[L["dodge"]] = 12},
 				},
 				[3377] = {
 					"red",
 					"Flashing Bloodstone",
-					{[L["parry rating"]] = 12},
+					{[L["parry"]] = 12},
 				},
 				[3378] = {
 					"yellow",
 					"Smooth Sun Crystal",
-					{[L["critical strike rating"]] = 12},
+					{[L["critical strike"]] = 12},
 				},
 				[3379] = {
 					"red",
 					"Precise Bloodstone",
-					{[L["expertise rating"]] = 12},
+					{[L["expertise"]] = 12},
 				},
 				[3380] = {
 					"red",
@@ -851,27 +851,27 @@ ww_gems = {
 				[3382] = {
 					"yellow",
 					"Smooth Sun Crystal",
-					{[L["critical strike rating"]] = 12},
+					{[L["critical strike"]] = 12},
 				},
 				[3383] = {
 					"blue",
 					"Rigid Chalcedony",
-					{[L["hit rating"]] = 12},
+					{[L["hit"]] = 12},
 				},
 				[3384] = {
 					"yellow",
 					"Subtle Sun Crystal",
-					{[L["dodge rating"]] = 12},
+					{[L["dodge"]] = 12},
 				},
 				[3385] = {
 					"yellow",
 					"Mystic Sun Crystal",
-					{[L["resilience rating"]] = 12},
+					{[L["resilience"]] = 12},
 				},
 				[3386] = {
 					"yellow",
 					"Quick Sun Crystal",
-					{[L["haste rating"]] = 12},
+					{[L["haste"]] = 12},
 				},
 				[3387] = {
 					"blue",
@@ -896,7 +896,7 @@ ww_gems = {
 				[3391] = {
 					"green",
 					"Jagged Dark Jade",
-					{[L["critical strike rating"]] = 6, [L["stamina"]] = 9},
+					{[L["critical strike"]] = 6, [L["stamina"]] = 9},
 				},
 				[3392] = {
 					"purple",
@@ -921,17 +921,17 @@ ww_gems = {
 				[3396] = {
 					"green",
 					"Regal Dark Jade",
-					{[L["dodge rating"]] = 6, [L["stamina"]] = 9},
+					{[L["dodge"]] = 6, [L["stamina"]] = 9},
 				},
 				[3397] = {
 					"purple",
 					"Defender's Shadow Crystal",
-					{[L["parry rating"]] = 6, [L["stamina"]] = 9},
+					{[L["parry"]] = 6, [L["stamina"]] = 9},
 				},
 				[3398] = {
 					"purple",
 					"Guardian's Shadow Crystal",
-					{[L["expertise rating"]] = 6, [L["stamina"]] = 9},
+					{[L["expertise"]] = 6, [L["stamina"]] = 9},
 				},
 				[3399] = {
 					"purple",
@@ -941,7 +941,7 @@ ww_gems = {
 				[3400] = {
 					"purple",
 					"Glinting Shadow Crystal",
-					{[L["agility"]] = 6, [L["hit rating"]] = 6},
+					{[L["agility"]] = 6, [L["hit"]] = 6},
 				},
 				[3401] = {
 					"purple",
@@ -951,7 +951,7 @@ ww_gems = {
 				[3402] = {
 					"purple",
 					"Glinting Shadow Crystal",
-					{[L["agility"]] = 6, [L["hit rating"]] = 6},
+					{[L["agility"]] = 6, [L["hit"]] = 6},
 				},
 				[3403] = {
 					"purple",
@@ -961,112 +961,112 @@ ww_gems = {
 				[3404] = {
 					"orange",
 					"Reckless Huge Citrine",
-					{[L["haste rating"]] = 6, [L["intellect"]] = 6},
+					{[L["haste"]] = 6, [L["intellect"]] = 6},
 				},
 				[3405] = {
 					"orange",
 					"Inscribed Huge Citrine",
-					{[L["critical strike rating"]] = 6, [L["strength"]] = 6},
+					{[L["critical strike"]] = 6, [L["strength"]] = 6},
 				},
 				[3406] = {
 					"purple",
 					"Glinting Shadow Crystal",
-					{[L["agility"]] = 6, [L["hit rating"]] = 6},
+					{[L["agility"]] = 6, [L["hit"]] = 6},
 				},
 				[3407] = {
 					"orange",
 					"Champion's Huge Citrine",
-					{[L["dodge rating"]] = 6, [L["strength"]] = 6},
+					{[L["dodge"]] = 6, [L["strength"]] = 6},
 				},
 				[3408] = {
 					"orange",
 					"Resplendent Huge Citrine",
-					{[L["resilience rating"]] = 6, [L["strength"]] = 6},
+					{[L["resilience"]] = 6, [L["strength"]] = 6},
 				},
 				[3409] = {
 					"orange",
 					"Fierce Huge Citrine",
-					{[L["haste rating"]] = 6, [L["strength"]] = 6},
+					{[L["haste"]] = 6, [L["strength"]] = 6},
 				},
 				[3410] = {
 					"orange",
 					"Deadly Huge Citrine",
-					{[L["agility"]] = 6, [L["critical strike rating"]] = 6},
+					{[L["agility"]] = 6, [L["critical strike"]] = 6},
 				},
 				[3411] = {
 					"purple",
 					"Etched Shadow Crystal",
-					{[L["hit rating"]] = 6, [L["strength"]] = 6},
+					{[L["hit"]] = 6, [L["strength"]] = 6},
 				},
 				[3412] = {
 					"orange",
 					"Lucent Huge Citrine",
-					{[L["agility"]] = 6, [L["resilience rating"]] = 6},
+					{[L["agility"]] = 6, [L["resilience"]] = 6},
 				},
 				[3413] = {
 					"orange",
 					"Deft Huge Citrine",
-					{[L["agility"]] = 6, [L["haste rating"]] = 6},
+					{[L["agility"]] = 6, [L["haste"]] = 6},
 				},
 				[3414] = {
 					"orange",
 					"Potent Huge Citrine",
-					{[L["critical strike rating"]] = 6, [L["intellect"]] = 6},
+					{[L["critical strike"]] = 6, [L["intellect"]] = 6},
 				},
 				[3415] = {
 					"purple",
 					"Veiled Shadow Crystal",
-					{[L["hit rating"]] = 6, [L["intellect"]] = 6},
+					{[L["hit"]] = 6, [L["intellect"]] = 6},
 				},
 				[3416] = {
 					"orange",
 					"Willful Huge Citrine",
-					{[L["intellect"]] = 6, [L["resilience rating"]] = 6},
+					{[L["intellect"]] = 6, [L["resilience"]] = 6},
 				},
 				[3417] = {
 					"orange",
 					"Reckless Huge Citrine",
-					{[L["haste rating"]] = 6, [L["intellect"]] = 6},
+					{[L["haste"]] = 6, [L["intellect"]] = 6},
 				},
 				[3418] = {
 					"orange",
 					"Stalwart Huge Citrine",
-					{[L["dodge rating"]] = 6, [L["parry rating"]] = 6},
+					{[L["dodge"]] = 6, [L["parry"]] = 6},
 				},
 				[3419] = {
 					"orange",
 					"Stalwart Huge Citrine",
-					{[L["dodge rating"]] = 6, [L["parry rating"]] = 6},
+					{[L["dodge"]] = 6, [L["parry"]] = 6},
 				},
 				[3420] = {
 					"purple",
 					"Accurate Shadow Crystal",
-					{[L["expertise rating"]] = 6, [L["hit rating"]] = 6},
+					{[L["expertise"]] = 6, [L["hit"]] = 6},
 				},
 				[3421] = {
 					"orange",
 					"Resolute Huge Citrine",
-					{[L["dodge rating"]] = 6, [L["expertise rating"]] = 6},
+					{[L["dodge"]] = 6, [L["expertise"]] = 6},
 				},
 				[3422] = {
 					"orange",
 					"Deadly Huge Citrine",
-					{[L["agility"]] = 6, [L["critical strike rating"]] = 6},
+					{[L["agility"]] = 6, [L["critical strike"]] = 6},
 				},
 				[3423] = {
 					"purple",
 					"Glinting Shadow Crystal",
-					{[L["agility"]] = 6, [L["hit rating"]] = 6},
+					{[L["agility"]] = 6, [L["hit"]] = 6},
 				},
 				[3424] = {
 					"orange",
 					"Lucent Huge Citrine",
-					{[L["agility"]] = 6, [L["resilience rating"]] = 6},
+					{[L["agility"]] = 6, [L["resilience"]] = 6},
 				},
 				[3426] = {
 					"orange",
 					"Deft Huge Citrine",
-					{[L["agility"]] = 6, [L["haste rating"]] = 6},
+					{[L["agility"]] = 6, [L["haste"]] = 6},
 				},
 				[3427] = {
 					"purple",
@@ -1076,27 +1076,27 @@ ww_gems = {
 				[3428] = {
 					"green",
 					"Jagged Dark Jade",
-					{[L["critical strike rating"]] = 6, [L["stamina"]] = 9},
+					{[L["critical strike"]] = 6, [L["stamina"]] = 9},
 				},
 				[3429] = {
 					"green",
 					"Nimble Dark Jade",
-					{[L["dodge rating"]] = 6, [L["hit rating"]] = 6},
+					{[L["dodge"]] = 6, [L["hit"]] = 6},
 				},
 				[3430] = {
 					"green",
 					"Regal Dark Jade",
-					{[L["dodge rating"]] = 6, [L["stamina"]] = 9},
+					{[L["dodge"]] = 6, [L["stamina"]] = 9},
 				},
 				[3431] = {
 					"green",
 					"Steady Dark Jade",
-					{[L["resilience rating"]] = 6, [L["stamina"]] = 9},
+					{[L["resilience"]] = 6, [L["stamina"]] = 9},
 				},
 				[3432] = {
 					"green",
 					"Forceful Dark Jade",
-					{[L["haste rating"]] = 6, [L["stamina"]] = 9},
+					{[L["haste"]] = 6, [L["stamina"]] = 9},
 				},
 				[3433] = {
 					"purple",
@@ -1106,22 +1106,22 @@ ww_gems = {
 				[3434] = {
 					"green",
 					"Misty Dark Jade",
-					{[L["critical strike rating"]] = 6, [L["spirit"]] = 6},
+					{[L["critical strike"]] = 6, [L["spirit"]] = 6},
 				},
 				[3435] = {
 					"green",
 					"Lightning Dark Jade",
-					{[L["haste rating"]] = 6, [L["hit rating"]] = 6},
+					{[L["haste"]] = 6, [L["hit"]] = 6},
 				},
 				[3436] = {
 					"green",
 					"Turbid Dark Jade",
-					{[L["resilience rating"]] = 6, [L["spirit"]] = 6},
+					{[L["resilience"]] = 6, [L["spirit"]] = 6},
 				},
 				[3437] = {
 					"green",
 					"Energized Dark Jade",
-					{[L["haste rating"]] = 6, [L["spirit"]] = 6},
+					{[L["haste"]] = 6, [L["spirit"]] = 6},
 				},
 				[3438] = {
 					"purple",
@@ -1131,37 +1131,37 @@ ww_gems = {
 				[3439] = {
 					"green",
 					"Misty Dark Jade",
-					{[L["critical strike rating"]] = 6, [L["spirit"]] = 6},
+					{[L["critical strike"]] = 6, [L["spirit"]] = 6},
 				},
 				[3440] = {
 					"green",
 					"Lightning Dark Jade",
-					{[L["haste rating"]] = 6, [L["hit rating"]] = 6},
+					{[L["haste"]] = 6, [L["hit"]] = 6},
 				},
 				[3441] = {
 					"green",
 					"Turbid Dark Jade",
-					{[L["resilience rating"]] = 6, [L["spirit"]] = 6},
+					{[L["resilience"]] = 6, [L["spirit"]] = 6},
 				},
 				[3442] = {
 					"green",
 					"Energized Dark Jade",
-					{[L["haste rating"]] = 6, [L["spirit"]] = 6},
+					{[L["haste"]] = 6, [L["spirit"]] = 6},
 				},
 				[3443] = {
 					"green",
 					"Radiant Dark Jade",
-					{[L["critical strike rating"]] = 6, [L["spell penetration"]] = 8},
+					{[L["critical strike"]] = 6, [L["spell penetration"]] = 8},
 				},
 				[3444] = {
 					"green",
 					"Radiant Dark Jade",
-					{[L["critical strike rating"]] = 6, [L["spell penetration"]] = 8},
+					{[L["critical strike"]] = 6, [L["spell penetration"]] = 8},
 				},
 				[3445] = {
 					"green",
 					"Shattered Dark Jade",
-					{[L["haste rating"]] = 6, [L["spell penetration"]] = 8},
+					{[L["haste"]] = 6, [L["spell penetration"]] = 8},
 				},
 			},
 			[6] = {
@@ -1188,22 +1188,22 @@ ww_gems = {
 				[3450] = {
 					"yellow",
 					"Subtle Autumn's Glow",
-					{[L["dodge rating"]] = 16},
+					{[L["dodge"]] = 16},
 				},
 				[3451] = {
 					"red",
 					"Flashing Scarlet Ruby",
-					{[L["parry rating"]] = 16},
+					{[L["parry"]] = 16},
 				},
 				[3452] = {
 					"yellow",
 					"Smooth Autumn's Glow",
-					{[L["critical strike rating"]] = 16},
+					{[L["critical strike"]] = 16},
 				},
 				[3453] = {
 					"red",
 					"Precise Scarlet Ruby",
-					{[L["expertise rating"]] = 16},
+					{[L["expertise"]] = 16},
 				},
 				[3454] = {
 					"blue",
@@ -1233,27 +1233,27 @@ ww_gems = {
 				[3459] = {
 					"yellow",
 					"Smooth Autumn's Glow",
-					{[L["critical strike rating"]] = 16},
+					{[L["critical strike"]] = 16},
 				},
 				[3460] = {
 					"blue",
 					"Rigid Sky Sapphire",
-					{[L["hit rating"]] = 16},
+					{[L["hit"]] = 16},
 				},
 				[3461] = {
 					"yellow",
 					"Subtle Autumn's Glow",
-					{[L["dodge rating"]] = 16},
+					{[L["dodge"]] = 16},
 				},
 				[3462] = {
 					"yellow",
 					"Mystic Autumn's Glow",
-					{[L["resilience rating"]] = 16},
+					{[L["resilience"]] = 16},
 				},
 				[3463] = {
 					"yellow",
 					"Quick Autumn's Glow",
-					{[L["haste rating"]] = 16},
+					{[L["haste"]] = 16},
 				},
 				[3464] = {
 					"purple",
@@ -1278,22 +1278,22 @@ ww_gems = {
 				[3468] = {
 					"green",
 					"Regal Forest Emerald",
-					{[L["dodge rating"]] = 8, [L["stamina"]] = 12},
+					{[L["dodge"]] = 8, [L["stamina"]] = 12},
 				},
 				[3469] = {
 					"purple",
 					"Defender's Twilight Opal",
-					{[L["parry rating"]] = 8, [L["stamina"]] = 12},
+					{[L["parry"]] = 8, [L["stamina"]] = 12},
 				},
 				[3470] = {
 					"green",
 					"Jagged Forest Emerald",
-					{[L["critical strike rating"]] = 8, [L["stamina"]] = 12},
+					{[L["critical strike"]] = 8, [L["stamina"]] = 12},
 				},
 				[3471] = {
 					"purple",
 					"Guardian's Twilight Opal",
-					{[L["expertise rating"]] = 8, [L["stamina"]] = 12},
+					{[L["expertise"]] = 8, [L["stamina"]] = 12},
 				},
 				[3472] = {
 					"purple",
@@ -1308,12 +1308,12 @@ ww_gems = {
 				[3474] = {
 					"purple",
 					"Glinting Twilight Opal",
-					{[L["agility"]] = 8, [L["hit rating"]] = 8},
+					{[L["agility"]] = 8, [L["hit"]] = 8},
 				},
 				[3475] = {
 					"purple",
 					"Glinting Twilight Opal",
-					{[L["agility"]] = 8, [L["hit rating"]] = 8},
+					{[L["agility"]] = 8, [L["hit"]] = 8},
 				},
 				[3476] = {
 					"purple",
@@ -1323,112 +1323,112 @@ ww_gems = {
 				[3477] = {
 					"orange",
 					"Inscribed Monarch Topaz",
-					{[L["critical strike rating"]] = 8, [L["strength"]] = 8},
+					{[L["critical strike"]] = 8, [L["strength"]] = 8},
 				},
 				[3478] = {
 					"purple",
 					"Etched Twilight Opal",
-					{[L["hit rating"]] = 8, [L["strength"]] = 8},
+					{[L["hit"]] = 8, [L["strength"]] = 8},
 				},
 				[3479] = {
 					"orange",
 					"Champion's Monarch Topaz",
-					{[L["dodge rating"]] = 8, [L["strength"]] = 8},
+					{[L["dodge"]] = 8, [L["strength"]] = 8},
 				},
 				[3480] = {
 					"orange",
 					"Resplendent Monarch Topaz",
-					{[L["resilience rating"]] = 8, [L["strength"]] = 8},
+					{[L["resilience"]] = 8, [L["strength"]] = 8},
 				},
 				[3481] = {
 					"orange",
 					"Fierce Monarch Topaz",
-					{[L["haste rating"]] = 8, [L["strength"]] = 8},
+					{[L["haste"]] = 8, [L["strength"]] = 8},
 				},
 				[3482] = {
 					"orange",
 					"Deadly Monarch Topaz",
-					{[L["agility"]] = 8, [L["critical strike rating"]] = 8},
+					{[L["agility"]] = 8, [L["critical strike"]] = 8},
 				},
 				[3483] = {
 					"purple",
 					"Glinting Twilight Opal",
-					{[L["agility"]] = 8, [L["hit rating"]] = 8},
+					{[L["agility"]] = 8, [L["hit"]] = 8},
 				},
 				[3484] = {
 					"orange",
 					"Lucent Monarch Topaz",
-					{[L["agility"]] = 8, [L["resilience rating"]] = 8},
+					{[L["agility"]] = 8, [L["resilience"]] = 8},
 				},
 				[3485] = {
 					"orange",
 					"Deft Monarch Topaz",
-					{[L["agility"]] = 8, [L["haste rating"]] = 8},
+					{[L["agility"]] = 8, [L["haste"]] = 8},
 				},
 				[3486] = {
 					"orange",
 					"Reckless Monarch Topaz",
-					{[L["haste rating"]] = 8, [L["intellect"]] = 8},
+					{[L["haste"]] = 8, [L["intellect"]] = 8},
 				},
 				[3487] = {
 					"orange",
 					"Potent Monarch Topaz",
-					{[L["critical strike rating"]] = 8, [L["intellect"]] = 8},
+					{[L["critical strike"]] = 8, [L["intellect"]] = 8},
 				},
 				[3488] = {
 					"purple",
 					"Veiled Twilight Opal",
-					{[L["hit rating"]] = 8, [L["intellect"]] = 8},
+					{[L["hit"]] = 8, [L["intellect"]] = 8},
 				},
 				[3489] = {
 					"orange",
 					"Willful Monarch Topaz",
-					{[L["intellect"]] = 8, [L["resilience rating"]] = 8},
+					{[L["intellect"]] = 8, [L["resilience"]] = 8},
 				},
 				[3490] = {
 					"orange",
 					"Reckless Monarch Topaz",
-					{[L["haste rating"]] = 8, [L["intellect"]] = 8},
+					{[L["haste"]] = 8, [L["intellect"]] = 8},
 				},
 				[3491] = {
 					"orange",
 					"Deadly Monarch Topaz",
-					{[L["agility"]] = 8, [L["critical strike rating"]] = 8},
+					{[L["agility"]] = 8, [L["critical strike"]] = 8},
 				},
 				[3492] = {
 					"purple",
 					"Glinting Twilight Opal",
-					{[L["agility"]] = 8, [L["hit rating"]] = 8},
+					{[L["agility"]] = 8, [L["hit"]] = 8},
 				},
 				[3493] = {
 					"orange",
 					"Lucent Monarch Topaz",
-					{[L["agility"]] = 8, [L["resilience rating"]] = 8},
+					{[L["agility"]] = 8, [L["resilience"]] = 8},
 				},
 				[3494] = {
 					"orange",
 					"Deft Monarch Topaz",
-					{[L["agility"]] = 8, [L["haste rating"]] = 8},
+					{[L["agility"]] = 8, [L["haste"]] = 8},
 				},
 				[3495] = {
 					"orange",
 					"Stalwart Monarch Topaz",
-					{[L["dodge rating"]] = 8, [L["parry rating"]] = 8},
+					{[L["dodge"]] = 8, [L["parry"]] = 8},
 				},
 				[3496] = {
 					"orange",
 					"Stalwart Monarch Topaz",
-					{[L["dodge rating"]] = 8, [L["parry rating"]] = 8},
+					{[L["dodge"]] = 8, [L["parry"]] = 8},
 				},
 				[3497] = {
 					"purple",
 					"Accurate Twilight Opal",
-					{[L["expertise rating"]] = 8, [L["hit rating"]] = 8},
+					{[L["expertise"]] = 8, [L["hit"]] = 8},
 				},
 				[3498] = {
 					"orange",
 					"Resolute Monarch Topaz",
-					{[L["dodge rating"]] = 8, [L["expertise rating"]] = 8},
+					{[L["dodge"]] = 8, [L["expertise"]] = 8},
 				},
 				[3499] = {
 					"purple",
@@ -1438,27 +1438,27 @@ ww_gems = {
 				[3500] = {
 					"green",
 					"Jagged Forest Emerald",
-					{[L["critical strike rating"]] = 8, [L["stamina"]] = 12},
+					{[L["critical strike"]] = 8, [L["stamina"]] = 12},
 				},
 				[3501] = {
 					"green",
 					"Nimble Forest Emerald",
-					{[L["dodge rating"]] = 8, [L["hit rating"]] = 8},
+					{[L["dodge"]] = 8, [L["hit"]] = 8},
 				},
 				[3502] = {
 					"green",
 					"Regal Forest Emerald",
-					{[L["dodge rating"]] = 8, [L["stamina"]] = 12},
+					{[L["dodge"]] = 8, [L["stamina"]] = 12},
 				},
 				[3503] = {
 					"green",
 					"Steady Forest Emerald",
-					{[L["resilience rating"]] = 8, [L["stamina"]] = 12},
+					{[L["resilience"]] = 8, [L["stamina"]] = 12},
 				},
 				[3504] = {
 					"green",
 					"Forceful Forest Emerald",
-					{[L["haste rating"]] = 8, [L["stamina"]] = 12},
+					{[L["haste"]] = 8, [L["stamina"]] = 12},
 				},
 				[3505] = {
 					"purple",
@@ -1468,22 +1468,22 @@ ww_gems = {
 				[3506] = {
 					"green",
 					"Misty Forest Emerald",
-					{[L["critical strike rating"]] = 8, [L["spirit"]] = 8},
+					{[L["critical strike"]] = 8, [L["spirit"]] = 8},
 				},
 				[3507] = {
 					"green",
 					"Lightning Forest Emerald",
-					{[L["haste rating"]] = 8, [L["hit rating"]] = 8},
+					{[L["haste"]] = 8, [L["hit"]] = 8},
 				},
 				[3508] = {
 					"green",
 					"Turbid Forest Emerald",
-					{[L["resilience rating"]] = 8, [L["spirit"]] = 8},
+					{[L["resilience"]] = 8, [L["spirit"]] = 8},
 				},
 				[3509] = {
 					"green",
 					"Energized Forest Emerald",
-					{[L["haste rating"]] = 8, [L["spirit"]] = 8},
+					{[L["haste"]] = 8, [L["spirit"]] = 8},
 				},
 				[3510] = {
 					"purple",
@@ -1493,47 +1493,47 @@ ww_gems = {
 				[3511] = {
 					"green",
 					"Misty Forest Emerald",
-					{[L["critical strike rating"]] = 8, [L["spirit"]] = 8},
+					{[L["critical strike"]] = 8, [L["spirit"]] = 8},
 				},
 				[3512] = {
 					"green",
 					"Lightning Forest Emerald",
-					{[L["haste rating"]] = 8, [L["hit rating"]] = 8},
+					{[L["haste"]] = 8, [L["hit"]] = 8},
 				},
 				[3513] = {
 					"green",
 					"Turbid Forest Emerald",
-					{[L["resilience rating"]] = 8, [L["spirit"]] = 8},
+					{[L["resilience"]] = 8, [L["spirit"]] = 8},
 				},
 				[3514] = {
 					"green",
 					"Energized Forest Emerald",
-					{[L["haste rating"]] = 8, [L["spirit"]] = 8},
+					{[L["haste"]] = 8, [L["spirit"]] = 8},
 				},
 				[3515] = {
 					"green",
 					"Radiant Forest Emerald",
-					{[L["critical strike rating"]] = 8, [L["spell penetration"]] = 10},
+					{[L["critical strike"]] = 8, [L["spell penetration"]] = 10},
 				},
 				[3516] = {
 					"green",
 					"Radiant Forest Emerald",
-					{[L["critical strike rating"]] = 8, [L["spell penetration"]] = 10},
+					{[L["critical strike"]] = 8, [L["spell penetration"]] = 10},
 				},
 				[3517] = {
 					"green",
 					"Shattered Forest Emerald",
-					{[L["haste rating"]] = 8, [L["spell penetration"]] = 10},
+					{[L["haste"]] = 8, [L["spell penetration"]] = 10},
 				},
 				[3621] = {
 					"meta",
 					"Chaotic Skyflare Diamond",
-					{[L["critical effect (percent)"]] = 3, [L["critical strike rating"]] = 21},
+					{[L["critical effect (percent)"]] = 3, [L["critical strike"]] = 21},
 				},
 				[3622] = {
 					"meta",
 					"Destructive Skyflare Diamond",
-					{[L["critical strike rating"]] = 25, [L["spell reflect (percent)"]] = 1},
+					{[L["critical strike"]] = 25, [L["spell reflect (percent)"]] = 1},
 				},
 				[3623] = {
 					"meta",
@@ -1543,12 +1543,12 @@ ww_gems = {
 				[3624] = {
 					"meta",
 					"Enigmatic Skyflare Diamond",
-					{[L["critical strike rating"]] = 21, [L["snare/root duration reduction (percent)"]] = 10},
+					{[L["critical strike"]] = 21, [L["snare/root duration reduction (percent)"]] = 10},
 				},
 				[3625] = {
 					"meta",
 					"Swift Skyflare Diamond",
-					{[L["critical strike rating"]] = 21, [L["minor run speed"]] = 1},
+					{[L["critical strike"]] = 21, [L["minor run speed"]] = 1},
 				},
 				[3626] = {
 					"meta",
@@ -1568,7 +1568,7 @@ ww_gems = {
 				[3631] = {
 					"meta",
 					"Eternal Earthsiege Diamond",
-					{[L["block value (percent)"]] = 1, [L["dodge rating"]] = 21},
+					{[L["block value (percent)"]] = 1, [L["dodge"]] = 21},
 				},
 				[3632] = {
 					"meta",
@@ -1593,7 +1593,7 @@ ww_gems = {
 				[3636] = {
 					"meta",
 					"Impassive Skyflare Diamond",
-					{[L["critical strike rating"]] = 21, [L["fear duration reduction (percent)"]] = 10},
+					{[L["critical strike"]] = 21, [L["fear duration reduction (percent)"]] = 10},
 				},
 				[3637] = {
 					"meta",
@@ -1603,7 +1603,7 @@ ww_gems = {
 				[3638] = {
 					"meta",
 					"Persistent Earthsiege Diamond",
-					{[L["critical strike rating"]] = 21, [L["stun duration reduction (percent)"]] = 10},
+					{[L["critical strike"]] = 21, [L["stun duration reduction (percent)"]] = 10},
 				},
 				[3639] = {
 					"meta",
@@ -1613,12 +1613,12 @@ ww_gems = {
 				[3640] = {
 					"meta",
 					"Invigorating Earthsiege Diamond",
-					{[L["haste rating"]] = 21, [L["sometimes heal on your crits"]] = 1},
+					{[L["haste"]] = 21, [L["sometimes heal on your crits"]] = 1},
 				},
 				[3641] = {
 					"meta",
 					"Beaming Earthsiege Diamond",
-					{[L["critical strike rating"]] = 21, [L["mana (percent)"]] = 2},
+					{[L["critical strike"]] = 21, [L["mana (percent)"]] = 2},
 				},
 				[3642] = {
 					"meta",
@@ -1655,22 +1655,22 @@ ww_gems = {
 				[3522] = {
 					"yellow",
 					"Subtle King's Amber",
-					{[L["dodge rating"]] = 20},
+					{[L["dodge"]] = 20},
 				},
 				[3523] = {
 					"red",
 					"Flashing Cardinal Ruby",
-					{[L["parry rating"]] = 20},
+					{[L["parry"]] = 20},
 				},
 				[3524] = {
 					"red",
 					"Precise Cardinal Ruby",
-					{[L["expertise rating"]] = 20},
+					{[L["expertise"]] = 20},
 				},
 				[3525] = {
 					"yellow",
 					"Smooth King's Amber",
-					{[L["critical strike rating"]] = 20},
+					{[L["critical strike"]] = 20},
 				},
 				[3526] = {
 					"red",
@@ -1680,27 +1680,27 @@ ww_gems = {
 				[3527] = {
 					"yellow",
 					"Smooth King's Amber",
-					{[L["critical strike rating"]] = 20},
+					{[L["critical strike"]] = 20},
 				},
 				[3528] = {
 					"blue",
 					"Rigid Majestic Zircon",
-					{[L["hit rating"]] = 20},
+					{[L["hit"]] = 20},
 				},
 				[3529] = {
 					"yellow",
 					"Subtle King's Amber",
-					{[L["dodge rating"]] = 20},
+					{[L["dodge"]] = 20},
 				},
 				[3530] = {
 					"yellow",
 					"Mystic King's Amber",
-					{[L["resilience rating"]] = 20},
+					{[L["resilience"]] = 20},
 				},
 				[3531] = {
 					"yellow",
 					"Quick King's Amber",
-					{[L["haste rating"]] = 20},
+					{[L["haste"]] = 20},
 				},
 				[3532] = {
 					"blue",
@@ -1745,27 +1745,27 @@ ww_gems = {
 				[3540] = {
 					"green",
 					"Regal Eye of Zul",
-					{[L["dodge rating"]] = 10, [L["stamina"]] = 15},
+					{[L["dodge"]] = 10, [L["stamina"]] = 15},
 				},
 				[3541] = {
 					"purple",
 					"Defender's Dreadstone",
-					{[L["parry rating"]] = 10, [L["stamina"]] = 15},
+					{[L["parry"]] = 10, [L["stamina"]] = 15},
 				},
 				[3542] = {
 					"purple",
 					"Guardian's Dreadstone",
-					{[L["expertise rating"]] = 10, [L["stamina"]] = 15},
+					{[L["expertise"]] = 10, [L["stamina"]] = 15},
 				},
 				[3543] = {
 					"green",
 					"Jagged Eye of Zul",
-					{[L["critical strike rating"]] = 10, [L["stamina"]] = 15},
+					{[L["critical strike"]] = 10, [L["stamina"]] = 15},
 				},
 				[3544] = {
 					"purple",
 					"Glinting Dreadstone",
-					{[L["agility"]] = 10, [L["hit rating"]] = 10},
+					{[L["agility"]] = 10, [L["hit"]] = 10},
 				},
 				[3545] = {
 					"purple",
@@ -1780,7 +1780,7 @@ ww_gems = {
 				[3547] = {
 					"purple",
 					"Glinting Dreadstone",
-					{[L["agility"]] = 10, [L["hit rating"]] = 10},
+					{[L["agility"]] = 10, [L["hit"]] = 10},
 				},
 				[3548] = {
 					"purple",
@@ -1790,47 +1790,47 @@ ww_gems = {
 				[3549] = {
 					"orange",
 					"Inscribed Ametrine",
-					{[L["critical strike rating"]] = 10, [L["strength"]] = 10},
+					{[L["critical strike"]] = 10, [L["strength"]] = 10},
 				},
 				[3550] = {
 					"purple",
 					"Etched Dreadstone",
-					{[L["hit rating"]] = 10, [L["strength"]] = 10},
+					{[L["hit"]] = 10, [L["strength"]] = 10},
 				},
 				[3551] = {
 					"orange",
 					"Champion's Ametrine",
-					{[L["dodge rating"]] = 10, [L["strength"]] = 10},
+					{[L["dodge"]] = 10, [L["strength"]] = 10},
 				},
 				[3552] = {
 					"orange",
 					"Resplendent Ametrine",
-					{[L["resilience rating"]] = 10, [L["strength"]] = 10},
+					{[L["resilience"]] = 10, [L["strength"]] = 10},
 				},
 				[3553] = {
 					"orange",
 					"Fierce Ametrine",
-					{[L["haste rating"]] = 10, [L["strength"]] = 10},
+					{[L["haste"]] = 10, [L["strength"]] = 10},
 				},
 				[3554] = {
 					"orange",
 					"Deadly Ametrine",
-					{[L["agility"]] = 10, [L["critical strike rating"]] = 10},
+					{[L["agility"]] = 10, [L["critical strike"]] = 10},
 				},
 				[3555] = {
 					"purple",
 					"Glinting Dreadstone",
-					{[L["agility"]] = 10, [L["hit rating"]] = 10},
+					{[L["agility"]] = 10, [L["hit"]] = 10},
 				},
 				[3556] = {
 					"orange",
 					"Lucent Ametrine",
-					{[L["agility"]] = 10, [L["resilience rating"]] = 10},
+					{[L["agility"]] = 10, [L["resilience"]] = 10},
 				},
 				[3557] = {
 					"orange",
 					"Deft Ametrine",
-					{[L["agility"]] = 10, [L["haste rating"]] = 10},
+					{[L["agility"]] = 10, [L["haste"]] = 10},
 				},
 				[3558] = {
 					"purple",
@@ -1840,62 +1840,62 @@ ww_gems = {
 				[3559] = {
 					"orange",
 					"Potent Ametrine",
-					{[L["critical strike rating"]] = 10, [L["intellect"]] = 10},
+					{[L["critical strike"]] = 10, [L["intellect"]] = 10},
 				},
 				[3560] = {
 					"purple",
 					"Veiled Dreadstone",
-					{[L["hit rating"]] = 10, [L["intellect"]] = 10},
+					{[L["hit"]] = 10, [L["intellect"]] = 10},
 				},
 				[3561] = {
 					"orange",
 					"Willful Ametrine",
-					{[L["intellect"]] = 10, [L["resilience rating"]] = 10},
+					{[L["intellect"]] = 10, [L["resilience"]] = 10},
 				},
 				[3563] = {
 					"orange",
 					"Reckless Ametrine",
-					{[L["haste rating"]] = 10, [L["intellect"]] = 10},
+					{[L["haste"]] = 10, [L["intellect"]] = 10},
 				},
 				[3564] = {
 					"orange",
 					"Deadly Ametrine",
-					{[L["agility"]] = 10, [L["critical strike rating"]] = 10},
+					{[L["agility"]] = 10, [L["critical strike"]] = 10},
 				},
 				[3565] = {
 					"purple",
 					"Glinting Dreadstone",
-					{[L["agility"]] = 10, [L["hit rating"]] = 10},
+					{[L["agility"]] = 10, [L["hit"]] = 10},
 				},
 				[3566] = {
 					"orange",
 					"Lucent Ametrine",
-					{[L["agility"]] = 10, [L["resilience rating"]] = 10},
+					{[L["agility"]] = 10, [L["resilience"]] = 10},
 				},
 				[3567] = {
 					"orange",
 					"Deft Ametrine",
-					{[L["agility"]] = 10, [L["haste rating"]] = 10},
+					{[L["agility"]] = 10, [L["haste"]] = 10},
 				},
 				[3568] = {
 					"orange",
 					"Stalwart Ametrine",
-					{[L["dodge rating"]] = 10, [L["parry rating"]] = 10},
+					{[L["dodge"]] = 10, [L["parry"]] = 10},
 				},
 				[3569] = {
 					"orange",
 					"Stalwart Ametrine",
-					{[L["dodge rating"]] = 10, [L["parry rating"]] = 10},
+					{[L["dodge"]] = 10, [L["parry"]] = 10},
 				},
 				[3570] = {
 					"purple",
 					"Accurate Dreadstone",
-					{[L["expertise rating"]] = 10, [L["hit rating"]] = 10},
+					{[L["expertise"]] = 10, [L["hit"]] = 10},
 				},
 				[3571] = {
 					"orange",
 					"Resolute Ametrine",
-					{[L["dodge rating"]] = 10, [L["expertise rating"]] = 10},
+					{[L["dodge"]] = 10, [L["expertise"]] = 10},
 				},
 				[3572] = {
 					"purple",
@@ -1905,27 +1905,27 @@ ww_gems = {
 				[3573] = {
 					"green",
 					"Jagged Eye of Zul",
-					{[L["critical strike rating"]] = 10, [L["stamina"]] = 15},
+					{[L["critical strike"]] = 10, [L["stamina"]] = 15},
 				},
 				[3574] = {
 					"green",
 					"Nimble Eye of Zul",
-					{[L["dodge rating"]] = 10, [L["hit rating"]] = 10},
+					{[L["dodge"]] = 10, [L["hit"]] = 10},
 				},
 				[3575] = {
 					"green",
 					"Regal Eye of Zul",
-					{[L["dodge rating"]] = 10, [L["stamina"]] = 15},
+					{[L["dodge"]] = 10, [L["stamina"]] = 15},
 				},
 				[3576] = {
 					"green",
 					"Steady Eye of Zul",
-					{[L["resilience rating"]] = 10, [L["stamina"]] = 15},
+					{[L["resilience"]] = 10, [L["stamina"]] = 15},
 				},
 				[3577] = {
 					"green",
 					"Forceful Eye of Zul",
-					{[L["haste rating"]] = 10, [L["stamina"]] = 15},
+					{[L["haste"]] = 10, [L["stamina"]] = 15},
 				},
 				[3578] = {
 					"purple",
@@ -1935,22 +1935,22 @@ ww_gems = {
 				[3579] = {
 					"green",
 					"Misty Eye of Zul",
-					{[L["critical strike rating"]] = 10, [L["spirit"]] = 10},
+					{[L["critical strike"]] = 10, [L["spirit"]] = 10},
 				},
 				[3580] = {
 					"green",
 					"Lightning Eye of Zul",
-					{[L["haste rating"]] = 10, [L["hit rating"]] = 10},
+					{[L["haste"]] = 10, [L["hit"]] = 10},
 				},
 				[3581] = {
 					"green",
 					"Turbid Eye of Zul",
-					{[L["resilience rating"]] = 10, [L["spirit"]] = 10},
+					{[L["resilience"]] = 10, [L["spirit"]] = 10},
 				},
 				[3582] = {
 					"green",
 					"Energized Eye of Zul",
-					{[L["haste rating"]] = 10, [L["spirit"]] = 10},
+					{[L["haste"]] = 10, [L["spirit"]] = 10},
 				},
 				[3583] = {
 					"purple",
@@ -1960,49 +1960,49 @@ ww_gems = {
 				[3584] = {
 					"green",
 					"Misty Eye of Zul",
-					{[L["critical strike rating"]] = 10, [L["spirit"]] = 10},
+					{[L["critical strike"]] = 10, [L["spirit"]] = 10},
 				},
 				[3585] = {
 					"green",
 					"Lightning Eye of Zul",
-					{[L["haste rating"]] = 10, [L["hit rating"]] = 10},
+					{[L["haste"]] = 10, [L["hit"]] = 10},
 				},
 				[3586] = {
 					"green",
 					"Turbid Eye of Zul",
-					{[L["resilience rating"]] = 10, [L["spirit"]] = 10},
+					{[L["resilience"]] = 10, [L["spirit"]] = 10},
 				},
 				[3587] = {
 					"green",
 					"Energized Eye of Zul",
-					{[L["haste rating"]] = 10, [L["spirit"]] = 10},
+					{[L["haste"]] = 10, [L["spirit"]] = 10},
 				},
 				[3588] = {
 					"green",
 					"Radiant Eye of Zul",
-					{[L["critical strike rating"]] = 10, [L["spell penetration"]] = 13},
+					{[L["critical strike"]] = 10, [L["spell penetration"]] = 13},
 				},
 				[3589] = {
 					"green",
 					"Radiant Eye of Zul",
-					{[L["critical strike rating"]] = 10, [L["spell penetration"]] = 13},
+					{[L["critical strike"]] = 10, [L["spell penetration"]] = 13},
 				},
 				[3590] = {
 					"green",
 					"Shattered Eye of Zul",
-					{[L["haste rating"]] = 10, [L["spell penetration"]] = 13},
+					{[L["haste"]] = 10, [L["spell penetration"]] = 13},
 				},
 			},
 			[8] = {
 				[3885] = {
 					"green",
 					"Zen Jasper",
-					{[L["mastery rating"]] = 15, [L["spirit"]] = 15},
+					{[L["mastery"]] = 15, [L["spirit"]] = 15},
 				},
 				[3886] = {
 					"green",
 					"Sensei's Jasper",
-					{[L["hit rating"]] = 15, [L["mastery rating"]] = 15},
+					{[L["hit"]] = 15, [L["mastery"]] = 15},
 				},
 				[3889] = {
 					"red",
@@ -2017,7 +2017,7 @@ ww_gems = {
 				[3891] = {
 					"red",
 					"Flashing Carnelian",
-					{[L["parry rating"]] = 30},
+					{[L["parry"]] = 30},
 				},
 				[3892] = {
 					"red",
@@ -2027,7 +2027,7 @@ ww_gems = {
 				[3893] = {
 					"red",
 					"Precise Carnelian",
-					{[L["expertise rating"]] = 30},
+					{[L["expertise"]] = 30},
 				},
 				[3894] = {
 					"blue",
@@ -2047,27 +2047,27 @@ ww_gems = {
 				[3897] = {
 					"blue",
 					"Rigid Zephyrite",
-					{[L["hit rating"]] = 30},
+					{[L["hit"]] = 30},
 				},
 				[3898] = {
 					"yellow",
 					"Subtle Alicite",
-					{[L["dodge rating"]] = 30},
+					{[L["dodge"]] = 30},
 				},
 				[3899] = {
 					"yellow",
 					"Mystic Alicite",
-					{[L["resilience rating"]] = 30},
+					{[L["resilience"]] = 30},
 				},
 				[3900] = {
 					"yellow",
 					"Quick Alicite",
-					{[L["haste rating"]] = 30},
+					{[L["haste"]] = 30},
 				},
 				[3901] = {
 					"yellow",
 					"Fractured Alicite",
-					{[L["mastery rating"]] = 30},
+					{[L["mastery"]] = 30},
 				},
 				[3902] = {
 					"purple",
@@ -2077,7 +2077,7 @@ ww_gems = {
 				[3903] = {
 					"purple",
 					"Defender's Nightstone",
-					{[L["parry rating"]] = 15, [L["stamina"]] = 23},
+					{[L["parry"]] = 15, [L["stamina"]] = 23},
 				},
 				[3904] = {
 					"purple",
@@ -2092,7 +2092,7 @@ ww_gems = {
 				[3906] = {
 					"purple",
 					"Guardian's Nightstone",
-					{[L["expertise rating"]] = 15, [L["stamina"]] = 23},
+					{[L["expertise"]] = 15, [L["stamina"]] = 23},
 				},
 				[3907] = {
 					"purple",
@@ -2102,174 +2102,174 @@ ww_gems = {
 				[3908] = {
 					"purple",
 					"Etched Nightstone",
-					{[L["hit rating"]] = 15, [L["strength"]] = 15},
+					{[L["hit"]] = 15, [L["strength"]] = 15},
 				},
 				[3909] = {
 					"purple",
 					"Glinting Nightstone",
-					{[L["agility"]] = 15, [L["hit rating"]] = 15},
+					{[L["agility"]] = 15, [L["hit"]] = 15},
 				},
 				[3910] = {
 					"purple",
 					"Retaliating Nightstone",
-					{[L["hit rating"]] = 15, [L["parry rating"]] = 15},
+					{[L["hit"]] = 15, [L["parry"]] = 15},
 				},
 				[3911] = {
 					"purple",
 					"Veiled Nightstone",
-					{[L["hit rating"]] = 15, [L["intellect"]] = 15},
+					{[L["hit"]] = 15, [L["intellect"]] = 15},
 				},
 				[3912] = {
 					"purple",
 					"Accurate Nightstone",
-					{[L["expertise rating"]] = 15, [L["hit rating"]] = 15},
+					{[L["expertise"]] = 15, [L["hit"]] = 15},
 				},
 				[3913] = {
 					"orange",
 					"Polished Hessonite",
-					{[L["agility"]] = 15, [L["dodge rating"]] = 15},
+					{[L["agility"]] = 15, [L["dodge"]] = 15},
 				},
 				[3914] = {
 					"orange",
 					"Resolute Hessonite",
-					{[L["dodge rating"]] = 15, [L["expertise rating"]] = 15},
+					{[L["dodge"]] = 15, [L["expertise"]] = 15},
 				},
 				[3915] = {
 					"orange",
 					"Inscribed Hessonite",
-					{[L["critical strike rating"]] = 15, [L["strength"]] = 15},
+					{[L["critical strike"]] = 15, [L["strength"]] = 15},
 				},
 				[3916] = {
 					"orange",
 					"Deadly Hessonite",
-					{[L["agility"]] = 15, [L["critical strike rating"]] = 15},
+					{[L["agility"]] = 15, [L["critical strike"]] = 15},
 				},
 				[3917] = {
 					"orange",
 					"Potent Hessonite",
-					{[L["critical strike rating"]] = 15, [L["intellect"]] = 15},
+					{[L["critical strike"]] = 15, [L["intellect"]] = 15},
 				},
 				[3918] = {
 					"orange",
 					"Fierce Hessonite",
-					{[L["haste rating"]] = 15, [L["strength"]] = 15},
+					{[L["haste"]] = 15, [L["strength"]] = 15},
 				},
 				[3919] = {
 					"orange",
 					"Deft Hessonite",
-					{[L["agility"]] = 15, [L["haste rating"]] = 15},
+					{[L["agility"]] = 15, [L["haste"]] = 15},
 				},
 				[3920] = {
 					"orange",
 					"Reckless Hessonite",
-					{[L["haste rating"]] = 15, [L["intellect"]] = 15},
+					{[L["haste"]] = 15, [L["intellect"]] = 15},
 				},
 				[3921] = {
 					"orange",
 					"Skillful Hessonite",
-					{[L["mastery rating"]] = 15, [L["strength"]] = 15},
+					{[L["mastery"]] = 15, [L["strength"]] = 15},
 				},
 				[3922] = {
 					"orange",
 					"Adept Hessonite",
-					{[L["agility"]] = 15, [L["mastery rating"]] = 15},
+					{[L["agility"]] = 15, [L["mastery"]] = 15},
 				},
 				[3923] = {
 					"orange",
 					"Fine Hessonite",
-					{[L["mastery rating"]] = 15, [L["parry rating"]] = 15},
+					{[L["mastery"]] = 15, [L["parry"]] = 15},
 				},
 				[3924] = {
 					"orange",
 					"Artful Hessonite",
-					{[L["intellect"]] = 15, [L["mastery rating"]] = 15},
+					{[L["intellect"]] = 15, [L["mastery"]] = 15},
 				},
 				[3925] = {
 					"orange",
 					"Keen Hessonite",
-					{[L["expertise rating"]] = 15, [L["mastery rating"]] = 15},
+					{[L["expertise"]] = 15, [L["mastery"]] = 15},
 				},
 				[3926] = {
 					"green",
 					"Regal Jasper",
-					{[L["dodge rating"]] = 15, [L["stamina"]] = 23},
+					{[L["dodge"]] = 15, [L["stamina"]] = 23},
 				},
 				[3927] = {
 					"green",
 					"Nimble Jasper",
-					{[L["dodge rating"]] = 15, [L["hit rating"]] = 15},
+					{[L["dodge"]] = 15, [L["hit"]] = 15},
 				},
 				[3928] = {
 					"green",
 					"Jagged Jasper",
-					{[L["critical strike rating"]] = 15, [L["stamina"]] = 23},
+					{[L["critical strike"]] = 15, [L["stamina"]] = 23},
 				},
 				[3929] = {
 					"green",
 					"Piercing Jasper",
-					{[L["critical strike rating"]] = 15, [L["hit rating"]] = 15},
+					{[L["critical strike"]] = 15, [L["hit"]] = 15},
 				},
 				[3930] = {
 					"green",
 					"Steady Jasper",
-					{[L["resilience rating"]] = 15, [L["stamina"]] = 23},
+					{[L["resilience"]] = 15, [L["stamina"]] = 23},
 				},
 				[3931] = {
 					"green",
 					"Forceful Jasper",
-					{[L["haste rating"]] = 15, [L["stamina"]] = 23},
+					{[L["haste"]] = 15, [L["stamina"]] = 23},
 				},
 				[3932] = {
 					"green",
 					"Lightning Jasper",
-					{[L["haste rating"]] = 15, [L["hit rating"]] = 15},
+					{[L["haste"]] = 15, [L["hit"]] = 15},
 				},
 				[3933] = {
 					"green",
 					"Puissant Jasper",
-					{[L["mastery rating"]] = 15, [L["stamina"]] = 23},
+					{[L["mastery"]] = 15, [L["stamina"]] = 23},
 				},
 				[3936] = {
 					"yellow",
 					"Smooth Alicite",
-					{[L["critical strike rating"]] = 30},
+					{[L["critical strike"]] = 30},
 				},
 			},
 			[9] = {
 				[3983] = {
 					"purple",
 					"Accurate Demonseye",
-					{[L["expertise rating"]] = 20, [L["hit rating"]] = 20},
+					{[L["expertise"]] = 20, [L["hit"]] = 20},
 				},
 				[3984] = {
 					"purple",
 					"Defender's Demonseye",
-					{[L["parry rating"]] = 20, [L["stamina"]] = 30},
+					{[L["parry"]] = 20, [L["stamina"]] = 30},
 				},
 				[3985] = {
 					"purple",
 					"Etched Demonseye",
-					{[L["hit rating"]] = 20, [L["strength"]] = 20},
+					{[L["hit"]] = 20, [L["strength"]] = 20},
 				},
 				[3986] = {
 					"purple",
 					"Veiled Demonseye",
-					{[L["hit rating"]] = 20, [L["intellect"]] = 20},
+					{[L["hit"]] = 20, [L["intellect"]] = 20},
 				},
 				[3987] = {
 					"purple",
 					"Glinting Demonseye",
-					{[L["agility"]] = 20, [L["hit rating"]] = 20},
+					{[L["agility"]] = 20, [L["hit"]] = 20},
 				},
 				[3988] = {
 					"purple",
 					"Guardian's Demonseye",
-					{[L["expertise rating"]] = 20, [L["stamina"]] = 30},
+					{[L["expertise"]] = 20, [L["stamina"]] = 30},
 				},
 				[3989] = {
 					"purple",
 					"Retaliating Demonseye",
-					{[L["hit rating"]] = 20, [L["parry rating"]] = 20},
+					{[L["hit"]] = 20, [L["parry"]] = 20},
 				},
 				[3990] = {
 					"purple",
@@ -2309,42 +2309,42 @@ ww_gems = {
 				[3997] = {
 					"red",
 					"Flashing Inferno Ruby",
-					{[L["parry rating"]] = 40},
+					{[L["parry"]] = 40},
 				},
 				[3998] = {
 					"red",
 					"Precise Inferno Ruby",
-					{[L["expertise rating"]] = 40},
+					{[L["expertise"]] = 40},
 				},
 				[3999] = {
 					"yellow",
 					"Fractured Amberjewel",
-					{[L["mastery rating"]] = 40},
+					{[L["mastery"]] = 40},
 				},
 				[4000] = {
 					"yellow",
 					"Mystic Amberjewel",
-					{[L["resilience rating"]] = 40},
+					{[L["resilience"]] = 40},
 				},
 				[4001] = {
 					"yellow",
 					"Quick Amberjewel",
-					{[L["haste rating"]] = 40},
+					{[L["haste"]] = 40},
 				},
 				[4002] = {
 					"yellow",
 					"Smooth Amberjewel",
-					{[L["critical strike rating"]] = 40},
+					{[L["critical strike"]] = 40},
 				},
 				[4003] = {
 					"yellow",
 					"Subtle Amberjewel",
-					{[L["dodge rating"]] = 40},
+					{[L["dodge"]] = 40},
 				},
 				[4004] = {
 					"blue",
 					"Rigid Ocean Sapphire",
-					{[L["hit rating"]] = 40},
+					{[L["hit"]] = 40},
 				},
 				[4005] = {
 					"blue",
@@ -2364,127 +2364,127 @@ ww_gems = {
 				[4008] = {
 					"orange",
 					"Adept Ember Topaz",
-					{[L["agility"]] = 20, [L["mastery rating"]] = 20},
+					{[L["agility"]] = 20, [L["mastery"]] = 20},
 				},
 				[4009] = {
 					"orange",
 					"Artful Ember Topaz",
-					{[L["intellect"]] = 20, [L["mastery rating"]] = 20},
+					{[L["intellect"]] = 20, [L["mastery"]] = 20},
 				},
 				[4010] = {
 					"orange",
 					"Reckless Ember Topaz",
-					{[L["haste rating"]] = 20, [L["intellect"]] = 20},
+					{[L["haste"]] = 20, [L["intellect"]] = 20},
 				},
 				[4011] = {
 					"orange",
 					"Deadly Ember Topaz",
-					{[L["agility"]] = 20, [L["critical strike rating"]] = 20},
+					{[L["agility"]] = 20, [L["critical strike"]] = 20},
 				},
 				[4012] = {
 					"orange",
 					"Deft Ember Topaz",
-					{[L["agility"]] = 20, [L["haste rating"]] = 20},
+					{[L["agility"]] = 20, [L["haste"]] = 20},
 				},
 				[4013] = {
 					"orange",
 					"Fierce Ember Topaz",
-					{[L["haste rating"]] = 20, [L["strength"]] = 20},
+					{[L["haste"]] = 20, [L["strength"]] = 20},
 				},
 				[4014] = {
 					"orange",
 					"Fine Ember Topaz",
-					{[L["mastery rating"]] = 20, [L["parry rating"]] = 20},
+					{[L["mastery"]] = 20, [L["parry"]] = 20},
 				},
 				[4015] = {
 					"orange",
 					"Inscribed Ember Topaz",
-					{[L["critical strike rating"]] = 20, [L["strength"]] = 20},
+					{[L["critical strike"]] = 20, [L["strength"]] = 20},
 				},
 				[4016] = {
 					"orange",
 					"Keen Ember Topaz",
-					{[L["expertise rating"]] = 20, [L["mastery rating"]] = 20},
+					{[L["expertise"]] = 20, [L["mastery"]] = 20},
 				},
 				[4017] = {
 					"orange",
 					"Polished Ember Topaz",
-					{[L["agility"]] = 20, [L["dodge rating"]] = 20},
+					{[L["agility"]] = 20, [L["dodge"]] = 20},
 				},
 				[4018] = {
 					"orange",
 					"Potent Ember Topaz",
-					{[L["critical strike rating"]] = 20, [L["intellect"]] = 20},
+					{[L["critical strike"]] = 20, [L["intellect"]] = 20},
 				},
 				[4019] = {
 					"orange",
 					"Skillful Ember Topaz",
-					{[L["mastery rating"]] = 20, [L["strength"]] = 20},
+					{[L["mastery"]] = 20, [L["strength"]] = 20},
 				},
 				[4020] = {
 					"orange",
 					"Resolute Ember Topaz",
-					{[L["dodge rating"]] = 20, [L["expertise rating"]] = 20},
+					{[L["dodge"]] = 20, [L["expertise"]] = 20},
 				},
 				[4021] = {
 					"green",
 					"Forceful Dream Emerald",
-					{[L["haste rating"]] = 20, [L["stamina"]] = 30},
+					{[L["haste"]] = 20, [L["stamina"]] = 30},
 				},
 				[4022] = {
 					"green",
 					"Jagged Dream Emerald",
-					{[L["critical strike rating"]] = 20, [L["stamina"]] = 30},
+					{[L["critical strike"]] = 20, [L["stamina"]] = 30},
 				},
 				[4023] = {
 					"green",
 					"Lightning Dream Emerald",
-					{[L["haste rating"]] = 20, [L["hit rating"]] = 20},
+					{[L["haste"]] = 20, [L["hit"]] = 20},
 				},
 				[4024] = {
 					"green",
 					"Nimble Dream Emerald",
-					{[L["dodge rating"]] = 20, [L["hit rating"]] = 20},
+					{[L["dodge"]] = 20, [L["hit"]] = 20},
 				},
 				[4025] = {
 					"green",
 					"Piercing Dream Emerald",
-					{[L["critical strike rating"]] = 20, [L["hit rating"]] = 20},
+					{[L["critical strike"]] = 20, [L["hit"]] = 20},
 				},
 				[4026] = {
 					"green",
 					"Puissant Dream Emerald",
-					{[L["mastery rating"]] = 20, [L["stamina"]] = 30},
+					{[L["mastery"]] = 20, [L["stamina"]] = 30},
 				},
 				[4027] = {
 					"green",
 					"Regal Dream Emerald",
-					{[L["dodge rating"]] = 20, [L["stamina"]] = 30},
+					{[L["dodge"]] = 20, [L["stamina"]] = 30},
 				},
 				[4028] = {
 					"green",
 					"Sensei's Dream Emerald",
-					{[L["hit rating"]] = 20, [L["mastery rating"]] = 20},
+					{[L["hit"]] = 20, [L["mastery"]] = 20},
 				},
 				[4029] = {
 					"green",
 					"Steady Dream Emerald",
-					{[L["resilience rating"]] = 20, [L["stamina"]] = 30},
+					{[L["resilience"]] = 20, [L["stamina"]] = 30},
 				},
 				[4030] = {
 					"green",
 					"Zen Dream Emerald",
-					{[L["mastery rating"]] = 20, [L["spirit"]] = 20},
+					{[L["mastery"]] = 20, [L["spirit"]] = 20},
 				},
 				[4045] = {
 					"meta",
 					"Fleet Shadowspirit Diamond",
-					{[L["mastery rating"]] = 54, [L["minor run speed"]] = 1},
+					{[L["mastery"]] = 54, [L["minor run speed"]] = 1},
 				},
 				[4046] = {
 					"meta",
 					"Chaotic Shadowspirit Diamond",
-					{[L["critical effect (percent)"]] = 3, [L["critical strike rating"]] = 54},
+					{[L["critical effect (percent)"]] = 3, [L["critical strike"]] = 54},
 				},
 				[4047] = {
 					"meta",
@@ -2519,7 +2519,7 @@ ww_gems = {
 				[4053] = {
 					"meta",
 					"Destructive Shadowspirit Diamond",
-					{[L["critical strike rating"]] = 54, [L["spell reflect (percent)"]] = 1},
+					{[L["critical strike"]] = 54, [L["spell reflect (percent)"]] = 1},
 				},
 				[4054] = {
 					"meta",
@@ -2529,12 +2529,12 @@ ww_gems = {
 				[4055] = {
 					"meta",
 					"Enigmatic Shadowspirit Diamond",
-					{[L["critical strike rating"]] = 54, [L["snare/root duration reduction (percent)"]] = 10},
+					{[L["critical strike"]] = 54, [L["snare/root duration reduction (percent)"]] = 10},
 				},
 				[4056] = {
 					"meta",
 					"Impassive Shadowspirit Diamond",
-					{[L["critical strike rating"]] = 54, [L["fear duration reduction (percent)"]] = 10},
+					{[L["critical strike"]] = 54, [L["fear duration reduction (percent)"]] = 10},
 				},
 				[4057] = {
 					"meta",
@@ -2544,22 +2544,22 @@ ww_gems = {
 				[4236] = {
 					"orange",
 					"Willful Ember Topaz",
-					{[L["intellect"]] = 20, [L["resilience rating"]] = 20},
+					{[L["intellect"]] = 20, [L["resilience"]] = 20},
 				},
 				[4237] = {
 					"orange",
 					"Lucent Ember Topaz",
-					{[L["agility"]] = 20, [L["resilience rating"]] = 20},
+					{[L["agility"]] = 20, [L["resilience"]] = 20},
 				},
 				[4238] = {
 					"orange",
 					"Resplendent Ember Topaz",
-					{[L["resilience rating"]] = 20, [L["strength"]] = 20},
+					{[L["resilience"]] = 20, [L["strength"]] = 20},
 				},
 				[4244] = {
 					"green",
 					"Vivid Dream Emerald",
-					{[L["resilience rating"]] = 20, [L["spell penetration"]] = 25},
+					{[L["resilience"]] = 20, [L["spell penetration"]] = 25},
 				},
 				[4251] = {
 					"meta",
@@ -2581,7 +2581,7 @@ ww_gems = {
 				[4273] = {
 					"blue",
 					"Rigid Deepholm Iolite",
-					{[L["hit rating"]] = 50},
+					{[L["hit"]] = 50},
 				},
 				[4274] = {
 					"blue",
@@ -2601,227 +2601,227 @@ ww_gems = {
 				[4277] = {
 					"green",
 					"Misty Elven Peridot",
-					{[L["critical strike rating"]] = 25, [L["spirit"]] = 25},
+					{[L["critical strike"]] = 25, [L["spirit"]] = 25},
 				},
 				[4278] = {
 					"green",
 					"Piercing Elven Peridot",
-					{[L["critical strike rating"]] = 25, [L["hit rating"]] = 25},
+					{[L["critical strike"]] = 25, [L["hit"]] = 25},
 				},
 				[4279] = {
 					"green",
 					"Lightning Elven Peridot",
-					{[L["haste rating"]] = 25, [L["hit rating"]] = 25},
+					{[L["haste"]] = 25, [L["hit"]] = 25},
 				},
 				[4280] = {
 					"green",
 					"Sensei's Elven Peridot",
-					{[L["hit rating"]] = 25, [L["mastery rating"]] = 25},
+					{[L["hit"]] = 25, [L["mastery"]] = 25},
 				},
 				[4281] = {
 					"green",
 					"Infused Elven Peridot",
-					{[L["mastery rating"]] = 25, [L["spell penetration"]] = 32},
+					{[L["mastery"]] = 25, [L["spell penetration"]] = 32},
 				},
 				[4282] = {
 					"green",
 					"Zen Elven Peridot",
-					{[L["mastery rating"]] = 25, [L["spirit"]] = 25},
+					{[L["mastery"]] = 25, [L["spirit"]] = 25},
 				},
 				[4283] = {
 					"green",
 					"Balanced Elven Peridot",
-					{[L["hit rating"]] = 25, [L["resilience rating"]] = 25},
+					{[L["hit"]] = 25, [L["resilience"]] = 25},
 				},
 				[4284] = {
 					"green",
 					"Vivid Elven Peridot",
-					{[L["resilience rating"]] = 25, [L["spell penetration"]] = 32},
+					{[L["resilience"]] = 25, [L["spell penetration"]] = 32},
 				},
 				[4285] = {
 					"green",
 					"Turbid Elven Peridot",
-					{[L["resilience rating"]] = 25, [L["spirit"]] = 25},
+					{[L["resilience"]] = 25, [L["spirit"]] = 25},
 				},
 				[4286] = {
 					"green",
 					"Radiant Elven Peridot",
-					{[L["critical strike rating"]] = 25, [L["spell penetration"]] = 32},
+					{[L["critical strike"]] = 25, [L["spell penetration"]] = 32},
 				},
 				[4287] = {
 					"green",
 					"Shattered Elven Peridot",
-					{[L["haste rating"]] = 25, [L["spell penetration"]] = 32},
+					{[L["haste"]] = 25, [L["spell penetration"]] = 32},
 				},
 				[4288] = {
 					"green",
 					"Energized Elven Peridot",
-					{[L["haste rating"]] = 25, [L["spirit"]] = 25},
+					{[L["haste"]] = 25, [L["spirit"]] = 25},
 				},
 				[4289] = {
 					"green",
 					"Jagged Elven Peridot",
-					{[L["critical strike rating"]] = 25, [L["stamina"]] = 37},
+					{[L["critical strike"]] = 25, [L["stamina"]] = 37},
 				},
 				[4290] = {
 					"green",
 					"Regal Elven Peridot",
-					{[L["dodge rating"]] = 25, [L["stamina"]] = 37},
+					{[L["dodge"]] = 25, [L["stamina"]] = 37},
 				},
 				[4291] = {
 					"green",
 					"Forceful Elven Peridot",
-					{[L["haste rating"]] = 25, [L["stamina"]] = 37},
+					{[L["haste"]] = 25, [L["stamina"]] = 37},
 				},
 				[4292] = {
 					"green",
 					"Nimble Elven Peridot",
-					{[L["dodge rating"]] = 25, [L["hit rating"]] = 25},
+					{[L["dodge"]] = 25, [L["hit"]] = 25},
 				},
 				[4293] = {
 					"green",
 					"Puissant Elven Peridot",
-					{[L["mastery rating"]] = 25, [L["stamina"]] = 37},
+					{[L["mastery"]] = 25, [L["stamina"]] = 37},
 				},
 				[4294] = {
 					"green",
 					"Steady Elven Peridot",
-					{[L["resilience rating"]] = 25, [L["stamina"]] = 37},
+					{[L["resilience"]] = 25, [L["stamina"]] = 37},
 				},
 				[4295] = {
 					"orange",
 					"Deadly Lava Coral",
-					{[L["agility"]] = 25, [L["critical strike rating"]] = 25},
+					{[L["agility"]] = 25, [L["critical strike"]] = 25},
 				},
 				[4296] = {
 					"orange",
 					"Crafty Lava Coral",
-					{[L["critical strike rating"]] = 25, [L["expertise rating"]] = 25},
+					{[L["critical strike"]] = 25, [L["expertise"]] = 25},
 				},
 				[4297] = {
 					"orange",
 					"Potent Lava Coral",
-					{[L["critical strike rating"]] = 25, [L["intellect"]] = 25},
+					{[L["critical strike"]] = 25, [L["intellect"]] = 25},
 				},
 				[4298] = {
 					"orange",
 					"Inscribed Lava Coral",
-					{[L["critical strike rating"]] = 25, [L["strength"]] = 25},
+					{[L["critical strike"]] = 25, [L["strength"]] = 25},
 				},
 				[4299] = {
 					"orange",
 					"Polished Lava Coral",
-					{[L["agility"]] = 25, [L["dodge rating"]] = 25},
+					{[L["agility"]] = 25, [L["dodge"]] = 25},
 				},
 				[4300] = {
 					"orange",
 					"Resolute Lava Coral",
-					{[L["dodge rating"]] = 25, [L["expertise rating"]] = 25},
+					{[L["dodge"]] = 25, [L["expertise"]] = 25},
 				},
 				[4301] = {
 					"orange",
 					"Stalwart Lava Coral",
-					{[L["dodge rating"]] = 25, [L["parry rating"]] = 25},
+					{[L["dodge"]] = 25, [L["parry"]] = 25},
 				},
 				[4302] = {
 					"orange",
 					"Champion's Lava Coral",
-					{[L["dodge rating"]] = 25, [L["strength"]] = 25},
+					{[L["dodge"]] = 25, [L["strength"]] = 25},
 				},
 				[4303] = {
 					"orange",
 					"Deft Lava Coral",
-					{[L["agility"]] = 25, [L["haste rating"]] = 25},
+					{[L["agility"]] = 25, [L["haste"]] = 25},
 				},
 				[4304] = {
 					"orange",
 					"Wicked Lava Coral",
-					{[L["expertise rating"]] = 25, [L["haste rating"]] = 25},
+					{[L["expertise"]] = 25, [L["haste"]] = 25},
 				},
 				[4305] = {
 					"orange",
 					"Reckless Lava Coral",
-					{[L["haste rating"]] = 25, [L["intellect"]] = 25},
+					{[L["haste"]] = 25, [L["intellect"]] = 25},
 				},
 				[4306] = {
 					"orange",
 					"Fierce Lava Coral",
-					{[L["haste rating"]] = 25, [L["strength"]] = 25},
+					{[L["haste"]] = 25, [L["strength"]] = 25},
 				},
 				[4307] = {
 					"orange",
 					"Adept Lava Coral",
-					{[L["agility"]] = 25, [L["mastery rating"]] = 25},
+					{[L["agility"]] = 25, [L["mastery"]] = 25},
 				},
 				[4308] = {
 					"orange",
 					"Keen Lava Coral",
-					{[L["expertise rating"]] = 25, [L["mastery rating"]] = 25},
+					{[L["expertise"]] = 25, [L["mastery"]] = 25},
 				},
 				[4309] = {
 					"orange",
 					"Artful Lava Coral",
-					{[L["intellect"]] = 25, [L["mastery rating"]] = 25},
+					{[L["intellect"]] = 25, [L["mastery"]] = 25},
 				},
 				[4310] = {
 					"orange",
 					"Fine Lava Coral",
-					{[L["mastery rating"]] = 25, [L["parry rating"]] = 25},
+					{[L["mastery"]] = 25, [L["parry"]] = 25},
 				},
 				[4311] = {
 					"orange",
 					"Skillful Lava Coral",
-					{[L["mastery rating"]] = 25, [L["strength"]] = 25},
+					{[L["mastery"]] = 25, [L["strength"]] = 25},
 				},
 				[4312] = {
 					"orange",
 					"Lucent Lava Coral",
-					{[L["agility"]] = 25, [L["resilience rating"]] = 25},
+					{[L["agility"]] = 25, [L["resilience"]] = 25},
 				},
 				[4313] = {
 					"orange",
 					"Tenuous Lava Coral",
-					{[L["expertise rating"]] = 25, [L["resilience rating"]] = 25},
+					{[L["expertise"]] = 25, [L["resilience"]] = 25},
 				},
 				[4314] = {
 					"orange",
 					"Willful Lava Coral",
-					{[L["intellect"]] = 25, [L["resilience rating"]] = 25},
+					{[L["intellect"]] = 25, [L["resilience"]] = 25},
 				},
 				[4315] = {
 					"orange",
 					"Splendid Lava Coral",
-					{[L["parry rating"]] = 25, [L["resilience rating"]] = 25},
+					{[L["parry"]] = 25, [L["resilience"]] = 25},
 				},
 				[4316] = {
 					"orange",
 					"Resplendent Lava Coral",
-					{[L["resilience rating"]] = 25, [L["strength"]] = 25},
+					{[L["resilience"]] = 25, [L["strength"]] = 25},
 				},
 				[4317] = {
 					"purple",
 					"Glinting Shadow Spinel",
-					{[L["agility"]] = 25, [L["hit rating"]] = 25},
+					{[L["agility"]] = 25, [L["hit"]] = 25},
 				},
 				[4318] = {
 					"purple",
 					"Accurate Shadow Spinel",
-					{[L["expertise rating"]] = 25, [L["hit rating"]] = 25},
+					{[L["expertise"]] = 25, [L["hit"]] = 25},
 				},
 				[4319] = {
 					"purple",
 					"Veiled Shadow Spinel",
-					{[L["hit rating"]] = 25, [L["intellect"]] = 25},
+					{[L["hit"]] = 25, [L["intellect"]] = 25},
 				},
 				[4320] = {
 					"purple",
 					"Retaliating Shadow Spinel",
-					{[L["hit rating"]] = 25, [L["parry rating"]] = 25},
+					{[L["hit"]] = 25, [L["parry"]] = 25},
 				},
 				[4321] = {
 					"purple",
 					"Etched Shadow Spinel",
-					{[L["hit rating"]] = 25, [L["strength"]] = 25},
+					{[L["hit"]] = 25, [L["strength"]] = 25},
 				},
 				[4322] = {
 					"purple",
@@ -2841,7 +2841,7 @@ ww_gems = {
 				[4325] = {
 					"purple",
 					"Guardian's Shadow Spinel",
-					{[L["expertise rating"]] = 25, [L["stamina"]] = 37},
+					{[L["expertise"]] = 25, [L["stamina"]] = 37},
 				},
 				[4326] = {
 					"purple",
@@ -2851,7 +2851,7 @@ ww_gems = {
 				[4327] = {
 					"purple",
 					"Defender's Shadow Spinel",
-					{[L["parry rating"]] = 25, [L["stamina"]] = 37},
+					{[L["parry"]] = 25, [L["stamina"]] = 37},
 				},
 				[4328] = {
 					"purple",
@@ -2866,7 +2866,7 @@ ww_gems = {
 				[4330] = {
 					"red",
 					"Precise Queen's Garnet",
-					{[L["expertise rating"]] = 50},
+					{[L["expertise"]] = 50},
 				},
 				[4331] = {
 					"red",
@@ -2876,7 +2876,7 @@ ww_gems = {
 				[4332] = {
 					"red",
 					"Flashing Queen's Garnet",
-					{[L["parry rating"]] = 50},
+					{[L["parry"]] = 50},
 				},
 				[4333] = {
 					"red",
@@ -2886,42 +2886,42 @@ ww_gems = {
 				[4334] = {
 					"yellow",
 					"Smooth Lightstone",
-					{[L["critical strike rating"]] = 50},
+					{[L["critical strike"]] = 50},
 				},
 				[4335] = {
 					"yellow",
 					"Subtle Lightstone",
-					{[L["dodge rating"]] = 50},
+					{[L["dodge"]] = 50},
 				},
 				[4336] = {
 					"yellow",
 					"Quick Lightstone",
-					{[L["haste rating"]] = 50},
+					{[L["haste"]] = 50},
 				},
 				[4337] = {
 					"yellow",
 					"Fractured Lightstone",
-					{[L["mastery rating"]] = 50},
+					{[L["mastery"]] = 50},
 				},
 				[4338] = {
 					"yellow",
 					"Mystic Lightstone",
-					{[L["resilience rating"]] = 50},
+					{[L["resilience"]] = 50},
 				},
 				[4672] = {
 					"green",
 					"Balanced Elven Peridot",
-					{[L["hit rating"]] = 25, [L["resilience rating"]] = 25},
+					{[L["hit"]] = 25, [L["resilience"]] = 25},
 				},
 				[4673] = {
 					"green",
 					"Infused Elven Peridot",
-					{[L["mastery rating"]] = 25, [L["spell penetration"]] = 32},
+					{[L["mastery"]] = 25, [L["spell penetration"]] = 32},
 				},
 				[4674] = {
 					"orange",
 					"Lucent Lava Coral",
-					{[L["agility"]] = 25, [L["resilience rating"]] = 25},
+					{[L["agility"]] = 25, [L["resilience"]] = 25},
 				},
 				[4675] = {
 					"purple",
@@ -2931,32 +2931,32 @@ ww_gems = {
 				[4676] = {
 					"yellow",
 					"Mystic Lightstone",
-					{[L["resilience rating"]] = 50},
+					{[L["resilience"]] = 50},
 				},
 				[4677] = {
 					"green",
 					"Radiant Elven Peridot",
-					{[L["critical strike rating"]] = 25, [L["spell penetration"]] = 32},
+					{[L["critical strike"]] = 25, [L["spell penetration"]] = 32},
 				},
 				[4678] = {
 					"orange",
 					"Resplendent Lava Coral",
-					{[L["resilience rating"]] = 25, [L["strength"]] = 25},
+					{[L["resilience"]] = 25, [L["strength"]] = 25},
 				},
 				[4679] = {
 					"green",
 					"Shattered Elven Peridot",
-					{[L["haste rating"]] = 25, [L["spell penetration"]] = 32},
+					{[L["haste"]] = 25, [L["spell penetration"]] = 32},
 				},
 				[4680] = {
 					"orange",
 					"Splendid Lava Coral",
-					{[L["parry rating"]] = 25, [L["resilience rating"]] = 25},
+					{[L["parry"]] = 25, [L["resilience"]] = 25},
 				},
 				[4681] = {
 					"green",
 					"Steady Elven Peridot",
-					{[L["resilience rating"]] = 25, [L["stamina"]] = 37},
+					{[L["resilience"]] = 25, [L["stamina"]] = 37},
 				},
 				[4682] = {
 					"blue",
@@ -2966,22 +2966,22 @@ ww_gems = {
 				[4683] = {
 					"orange",
 					"Tenuous Lava Coral",
-					{[L["expertise rating"]] = 25, [L["resilience rating"]] = 25},
+					{[L["expertise"]] = 25, [L["resilience"]] = 25},
 				},
 				[4684] = {
 					"green",
 					"Turbid Elven Peridot",
-					{[L["resilience rating"]] = 25, [L["spirit"]] = 25},
+					{[L["resilience"]] = 25, [L["spirit"]] = 25},
 				},
 				[4685] = {
 					"green",
 					"Vivid Elven Peridot",
-					{[L["resilience rating"]] = 25, [L["spell penetration"]] = 32},
+					{[L["resilience"]] = 25, [L["spell penetration"]] = 32},
 				},
 				[4686] = {
 					"orange",
 					"Willful Lava Coral",
-					{[L["intellect"]] = 25, [L["resilience rating"]] = 25},
+					{[L["intellect"]] = 25, [L["resilience"]] = 25},
 				},
 			},
 		},
@@ -3033,17 +3033,17 @@ ww_gems = {
 				[3217] = {
 					"yellow",
 					"Blood of Amber",
-					{[L["critical strike rating"]] = 12},
+					{[L["critical strike"]] = 12},
 				},
 				[3220] = {
 					"yellow",
 					"Stone of Blades",
-					{[L["critical strike rating"]] = 12},
+					{[L["critical strike"]] = 12},
 				},
 				[3221] = {
 					"yellow",
 					"Facet of Eternity",
-					{[L["dodge rating"]] = 12},
+					{[L["dodge"]] = 12},
 				},
 			},
 			[7] = {
@@ -3090,47 +3090,47 @@ ww_gems = {
 				[3738] = {
 					"yellow",
 					"Smooth Dragon's Eye",
-					{[L["critical strike rating"]] = 34},
+					{[L["critical strike"]] = 34},
 				},
 				[3739] = {
 					"yellow",
 					"Quick Dragon's Eye",
-					{[L["haste rating"]] = 34},
+					{[L["haste"]] = 34},
 				},
 				[3740] = {
 					"yellow",
 					"Subtle Dragon's Eye",
-					{[L["dodge rating"]] = 34},
+					{[L["dodge"]] = 34},
 				},
 				[3741] = {
 					"red",
 					"Flashing Dragon's Eye",
-					{[L["parry rating"]] = 34},
+					{[L["parry"]] = 34},
 				},
 				[3742] = {
 					"blue",
 					"Rigid Dragon's Eye",
-					{[L["hit rating"]] = 34},
+					{[L["hit"]] = 34},
 				},
 				[3743] = {
 					"yellow",
 					"Subtle Dragon's Eye",
-					{[L["dodge rating"]] = 34},
+					{[L["dodge"]] = 34},
 				},
 				[3744] = {
 					"yellow",
 					"Mystic Dragon's Eye",
-					{[L["resilience rating"]] = 34},
+					{[L["resilience"]] = 34},
 				},
 				[3745] = {
 					"yellow",
 					"Smooth Dragon's Eye",
-					{[L["critical strike rating"]] = 34},
+					{[L["critical strike"]] = 34},
 				},
 				[3746] = {
 					"red",
 					"Precise Dragon's Eye",
-					{[L["expertise rating"]] = 34},
+					{[L["expertise"]] = 34},
 				},
 				[3747] = {
 					"blue",
@@ -3157,37 +3157,37 @@ ww_gems = {
 				[4034] = {
 					"red",
 					"Flashing Chimera's Eye",
-					{[L["parry rating"]] = 67},
+					{[L["parry"]] = 67},
 				},
 				[4035] = {
 					"yellow",
 					"Fractured Chimera's Eye",
-					{[L["mastery rating"]] = 67},
+					{[L["mastery"]] = 67},
 				},
 				[4036] = {
 					"yellow",
 					"Mystic Chimera's Eye",
-					{[L["resilience rating"]] = 67},
+					{[L["resilience"]] = 67},
 				},
 				[4037] = {
 					"red",
 					"Precise Chimera's Eye",
-					{[L["expertise rating"]] = 67},
+					{[L["expertise"]] = 67},
 				},
 				[4038] = {
 					"yellow",
 					"Quick Chimera's Eye",
-					{[L["haste rating"]] = 67},
+					{[L["haste"]] = 67},
 				},
 				[4039] = {
 					"blue",
 					"Rigid Chimera's Eye",
-					{[L["hit rating"]] = 67},
+					{[L["hit"]] = 67},
 				},
 				[4040] = {
 					"yellow",
 					"Smooth Chimera's Eye",
-					{[L["critical strike rating"]] = 67},
+					{[L["critical strike"]] = 67},
 				},
 				[4041] = {
 					"blue",
@@ -3207,7 +3207,7 @@ ww_gems = {
 				[4044] = {
 					"yellow",
 					"Subtle Chimera's Eye",
-					{[L["dodge rating"]] = 67},
+					{[L["dodge"]] = 67},
 				},
 			},
 		},
@@ -3223,17 +3223,17 @@ ww_gems = {
 				[3646] = {
 					"yellow",
 					"Perfect Subtle Sun Crystal",
-					{[L["dodge rating"]] = 14},
+					{[L["dodge"]] = 14},
 				},
 				[3647] = {
 					"red",
 					"Perfect Precise Bloodstone",
-					{[L["expertise rating"]] = 14},
+					{[L["expertise"]] = 14},
 				},
 				[3648] = {
 					"red",
 					"Perfect Flashing Bloodstone",
-					{[L["parry rating"]] = 14},
+					{[L["parry"]] = 14},
 				},
 				[3649] = {
 					"red",
@@ -3253,7 +3253,7 @@ ww_gems = {
 				[3652] = {
 					"yellow",
 					"Perfect Smooth Sun Crystal",
-					{[L["critical strike rating"]] = 14},
+					{[L["critical strike"]] = 14},
 				},
 				[3653] = {
 					"blue",
@@ -3278,22 +3278,22 @@ ww_gems = {
 				[3657] = {
 					"yellow",
 					"Perfect Smooth Sun Crystal",
-					{[L["critical strike rating"]] = 14},
+					{[L["critical strike"]] = 14},
 				},
 				[3658] = {
 					"yellow",
 					"Perfect Subtle Sun Crystal",
-					{[L["dodge rating"]] = 14},
+					{[L["dodge"]] = 14},
 				},
 				[3659] = {
 					"yellow",
 					"Perfect Quick Sun Crystal",
-					{[L["haste rating"]] = 14},
+					{[L["haste"]] = 14},
 				},
 				[3660] = {
 					"blue",
 					"Perfect Rigid Chalcedony",
-					{[L["hit rating"]] = 14},
+					{[L["hit"]] = 14},
 				},
 				[3661] = {
 					"red",
@@ -3303,12 +3303,12 @@ ww_gems = {
 				[3662] = {
 					"yellow",
 					"Perfect Mystic Sun Crystal",
-					{[L["resilience rating"]] = 14},
+					{[L["resilience"]] = 14},
 				},
 				[3663] = {
 					"purple",
 					"Perfect Glinting Shadow Crystal",
-					{[L["agility"]] = 7, [L["hit rating"]] = 7},
+					{[L["agility"]] = 7, [L["hit"]] = 7},
 				},
 				[3664] = {
 					"purple",
@@ -3318,12 +3318,12 @@ ww_gems = {
 				[3665] = {
 					"green",
 					"Perfect Jagged Dark Jade",
-					{[L["critical strike rating"]] = 7, [L["stamina"]] = 10},
+					{[L["critical strike"]] = 7, [L["stamina"]] = 10},
 				},
 				[3666] = {
 					"purple",
 					"Perfect Glinting Shadow Crystal",
-					{[L["agility"]] = 7, [L["hit rating"]] = 7},
+					{[L["agility"]] = 7, [L["hit"]] = 7},
 				},
 				[3667] = {
 					"purple",
@@ -3333,17 +3333,17 @@ ww_gems = {
 				[3668] = {
 					"green",
 					"Perfect Regal Dark Jade",
-					{[L["dodge rating"]] = 7, [L["stamina"]] = 10},
+					{[L["dodge"]] = 7, [L["stamina"]] = 10},
 				},
 				[3669] = {
 					"purple",
 					"Perfect Guardian's Shadow Crystal",
-					{[L["expertise rating"]] = 7, [L["stamina"]] = 10},
+					{[L["expertise"]] = 7, [L["stamina"]] = 10},
 				},
 				[3670] = {
 					"purple",
 					"Perfect Defender's Shadow Crystal",
-					{[L["parry rating"]] = 7, [L["stamina"]] = 10},
+					{[L["parry"]] = 7, [L["stamina"]] = 10},
 				},
 				[3671] = {
 					"purple",
@@ -3373,62 +3373,62 @@ ww_gems = {
 				[3677] = {
 					"orange",
 					"Perfect Deft Huge Citrine",
-					{[L["agility"]] = 7, [L["haste rating"]] = 7},
+					{[L["agility"]] = 7, [L["haste"]] = 7},
 				},
 				[3678] = {
 					"orange",
 					"Perfect Deft Huge Citrine",
-					{[L["agility"]] = 7, [L["haste rating"]] = 7},
+					{[L["agility"]] = 7, [L["haste"]] = 7},
 				},
 				[3679] = {
 					"purple",
 					"Perfect Glinting Shadow Crystal",
-					{[L["agility"]] = 7, [L["hit rating"]] = 7},
+					{[L["agility"]] = 7, [L["hit"]] = 7},
 				},
 				[3680] = {
 					"orange",
 					"Perfect Lucent Huge Citrine",
-					{[L["agility"]] = 7, [L["resilience rating"]] = 7},
+					{[L["agility"]] = 7, [L["resilience"]] = 7},
 				},
 				[3681] = {
 					"orange",
 					"Perfect Inscribed Huge Citrine",
-					{[L["critical strike rating"]] = 7, [L["strength"]] = 7},
+					{[L["critical strike"]] = 7, [L["strength"]] = 7},
 				},
 				[3682] = {
 					"purple",
 					"Perfect Etched Shadow Crystal",
-					{[L["hit rating"]] = 7, [L["strength"]] = 7},
+					{[L["hit"]] = 7, [L["strength"]] = 7},
 				},
 				[3683] = {
 					"orange",
 					"Perfect Champion's Huge Citrine",
-					{[L["dodge rating"]] = 7, [L["strength"]] = 7},
+					{[L["dodge"]] = 7, [L["strength"]] = 7},
 				},
 				[3684] = {
 					"orange",
 					"Perfect Resplendent Huge Citrine",
-					{[L["resilience rating"]] = 7, [L["strength"]] = 7},
+					{[L["resilience"]] = 7, [L["strength"]] = 7},
 				},
 				[3685] = {
 					"orange",
 					"Perfect Fierce Huge Citrine",
-					{[L["haste rating"]] = 7, [L["strength"]] = 7},
+					{[L["haste"]] = 7, [L["strength"]] = 7},
 				},
 				[3686] = {
 					"orange",
 					"Perfect Deadly Huge Citrine",
-					{[L["agility"]] = 7, [L["critical strike rating"]] = 7},
+					{[L["agility"]] = 7, [L["critical strike"]] = 7},
 				},
 				[3687] = {
 					"purple",
 					"Perfect Glinting Shadow Crystal",
-					{[L["agility"]] = 7, [L["hit rating"]] = 7},
+					{[L["agility"]] = 7, [L["hit"]] = 7},
 				},
 				[3688] = {
 					"orange",
 					"Perfect Lucent Huge Citrine",
-					{[L["agility"]] = 7, [L["resilience rating"]] = 7},
+					{[L["agility"]] = 7, [L["resilience"]] = 7},
 				},
 				[3689] = {
 					"purple",
@@ -3438,77 +3438,77 @@ ww_gems = {
 				[3690] = {
 					"orange",
 					"Perfect Potent Huge Citrine",
-					{[L["critical strike rating"]] = 7, [L["intellect"]] = 7},
+					{[L["critical strike"]] = 7, [L["intellect"]] = 7},
 				},
 				[3691] = {
 					"purple",
 					"Perfect Veiled Shadow Crystal",
-					{[L["hit rating"]] = 7, [L["intellect"]] = 7},
+					{[L["hit"]] = 7, [L["intellect"]] = 7},
 				},
 				[3692] = {
 					"orange",
 					"Perfect Willful Huge Citrine",
-					{[L["intellect"]] = 7, [L["resilience rating"]] = 7},
+					{[L["intellect"]] = 7, [L["resilience"]] = 7},
 				},
 				[3693] = {
 					"orange",
 					"Perfect Reckless Huge Citrine",
-					{[L["haste rating"]] = 7, [L["intellect"]] = 7},
+					{[L["haste"]] = 7, [L["intellect"]] = 7},
 				},
 				[3694] = {
 					"orange",
 					"Perfect Stalwart Huge Citrine",
-					{[L["dodge rating"]] = 7, [L["parry rating"]] = 7},
+					{[L["dodge"]] = 7, [L["parry"]] = 7},
 				},
 				[3695] = {
 					"orange",
 					"Perfect Stalwart Huge Citrine",
-					{[L["dodge rating"]] = 7, [L["parry rating"]] = 7},
+					{[L["dodge"]] = 7, [L["parry"]] = 7},
 				},
 				[3696] = {
 					"purple",
 					"Perfect Accurate Shadow Crystal",
-					{[L["expertise rating"]] = 7, [L["hit rating"]] = 7},
+					{[L["expertise"]] = 7, [L["hit"]] = 7},
 				},
 				[3697] = {
 					"orange",
 					"Perfect Resolute Huge Citrine",
-					{[L["dodge rating"]] = 7, [L["expertise rating"]] = 7},
+					{[L["dodge"]] = 7, [L["expertise"]] = 7},
 				},
 				[3698] = {
 					"green",
 					"Perfect Misty Dark Jade",
-					{[L["critical strike rating"]] = 7, [L["spirit"]] = 7},
+					{[L["critical strike"]] = 7, [L["spirit"]] = 7},
 				},
 				[3699] = {
 					"green",
 					"Perfect Jagged Dark Jade",
-					{[L["critical strike rating"]] = 7, [L["stamina"]] = 10},
+					{[L["critical strike"]] = 7, [L["stamina"]] = 10},
 				},
 				[3700] = {
 					"green",
 					"Perfect Regal Dark Jade",
-					{[L["dodge rating"]] = 7, [L["stamina"]] = 10},
+					{[L["dodge"]] = 7, [L["stamina"]] = 10},
 				},
 				[3701] = {
 					"green",
 					"Perfect Energized Dark Jade",
-					{[L["haste rating"]] = 7, [L["spirit"]] = 7},
+					{[L["haste"]] = 7, [L["spirit"]] = 7},
 				},
 				[3702] = {
 					"green",
 					"Perfect Forceful Dark Jade",
-					{[L["haste rating"]] = 7, [L["stamina"]] = 10},
+					{[L["haste"]] = 7, [L["stamina"]] = 10},
 				},
 				[3703] = {
 					"green",
 					"Perfect Lightning Dark Jade",
-					{[L["haste rating"]] = 7, [L["hit rating"]] = 7},
+					{[L["haste"]] = 7, [L["hit"]] = 7},
 				},
 				[3704] = {
 					"green",
 					"Perfect Nimble Dark Jade",
-					{[L["dodge rating"]] = 7, [L["hit rating"]] = 7},
+					{[L["dodge"]] = 7, [L["hit"]] = 7},
 				},
 				[3705] = {
 					"purple",
@@ -3523,22 +3523,22 @@ ww_gems = {
 				[3707] = {
 					"green",
 					"Perfect Turbid Dark Jade",
-					{[L["resilience rating"]] = 7, [L["spirit"]] = 7},
+					{[L["resilience"]] = 7, [L["spirit"]] = 7},
 				},
 				[3708] = {
 					"green",
 					"Perfect Steady Dark Jade",
-					{[L["resilience rating"]] = 7, [L["stamina"]] = 10},
+					{[L["resilience"]] = 7, [L["stamina"]] = 10},
 				},
 				[3709] = {
 					"green",
 					"Perfect Radiant Dark Jade",
-					{[L["critical strike rating"]] = 7, [L["spell penetration"]] = 9},
+					{[L["critical strike"]] = 7, [L["spell penetration"]] = 9},
 				},
 				[3710] = {
 					"green",
 					"Perfect Misty Dark Jade",
-					{[L["critical strike rating"]] = 7, [L["spirit"]] = 7},
+					{[L["critical strike"]] = 7, [L["spirit"]] = 7},
 				},
 				[3711] = {
 					"purple",
@@ -3548,49 +3548,49 @@ ww_gems = {
 				[3712] = {
 					"green",
 					"Perfect Lightning Dark Jade",
-					{[L["haste rating"]] = 7, [L["hit rating"]] = 7},
+					{[L["haste"]] = 7, [L["hit"]] = 7},
 				},
 				[3713] = {
 					"green",
 					"Perfect Turbid Dark Jade",
-					{[L["resilience rating"]] = 7, [L["spirit"]] = 7},
+					{[L["resilience"]] = 7, [L["spirit"]] = 7},
 				},
 				[3714] = {
 					"green",
 					"Perfect Energized Dark Jade",
-					{[L["haste rating"]] = 7, [L["spirit"]] = 7},
+					{[L["haste"]] = 7, [L["spirit"]] = 7},
 				},
 				[3715] = {
 					"green",
 					"Perfect Radiant Dark Jade",
-					{[L["critical strike rating"]] = 7, [L["spell penetration"]] = 9},
+					{[L["critical strike"]] = 7, [L["spell penetration"]] = 9},
 				},
 				[3716] = {
 					"green",
 					"Perfect Shattered Dark Jade",
-					{[L["haste rating"]] = 7, [L["spell penetration"]] = 9},
+					{[L["haste"]] = 7, [L["spell penetration"]] = 9},
 				},
 				[3767] = {
 					"orange",
 					"Perfect Deadly Huge Citrine",
-					{[L["agility"]] = 7, [L["critical strike rating"]] = 7},
+					{[L["agility"]] = 7, [L["critical strike"]] = 7},
 				},
 			},
 			[8] = {
 				[3887] = {
 					"green",
 					"Perfect Zen Jasper",
-					{[L["mastery rating"]] = 18, [L["spirit"]] = 17},
+					{[L["mastery"]] = 18, [L["spirit"]] = 17},
 				},
 				[3888] = {
 					"green",
 					"Perfect Sensei's Jasper",
-					{[L["hit rating"]] = 17, [L["mastery rating"]] = 18},
+					{[L["hit"]] = 17, [L["mastery"]] = 18},
 				},
 				[3937] = {
 					"purple",
 					"Perfect Etched Nightstone",
-					{[L["hit rating"]] = 17, [L["strength"]] = 18},
+					{[L["hit"]] = 17, [L["strength"]] = 18},
 				},
 				[3938] = {
 					"purple",
@@ -3600,7 +3600,7 @@ ww_gems = {
 				[3939] = {
 					"purple",
 					"Perfect Guardian's Nightstone",
-					{[L["expertise rating"]] = 18, [L["stamina"]] = 26},
+					{[L["expertise"]] = 18, [L["stamina"]] = 26},
 				},
 				[3940] = {
 					"purple",
@@ -3610,7 +3610,7 @@ ww_gems = {
 				[3941] = {
 					"purple",
 					"Perfect Defender's Nightstone",
-					{[L["parry rating"]] = 18, [L["stamina"]] = 26},
+					{[L["parry"]] = 18, [L["stamina"]] = 26},
 				},
 				[3942] = {
 					"purple",
@@ -3625,32 +3625,32 @@ ww_gems = {
 				[3944] = {
 					"yellow",
 					"Perfect Fractured Alicite",
-					{[L["mastery rating"]] = 35},
+					{[L["mastery"]] = 35},
 				},
 				[3945] = {
 					"yellow",
 					"Perfect Quick Alicite",
-					{[L["haste rating"]] = 35},
+					{[L["haste"]] = 35},
 				},
 				[3946] = {
 					"yellow",
 					"Perfect Mystic Alicite",
-					{[L["resilience rating"]] = 35},
+					{[L["resilience"]] = 35},
 				},
 				[3947] = {
 					"yellow",
 					"Perfect Smooth Alicite",
-					{[L["critical strike rating"]] = 35},
+					{[L["critical strike"]] = 35},
 				},
 				[3948] = {
 					"yellow",
 					"Perfect Subtle Alicite",
-					{[L["dodge rating"]] = 35},
+					{[L["dodge"]] = 35},
 				},
 				[3949] = {
 					"blue",
 					"Perfect Rigid Zephyrite",
-					{[L["hit rating"]] = 35},
+					{[L["hit"]] = 35},
 				},
 				[3950] = {
 					"blue",
@@ -3670,7 +3670,7 @@ ww_gems = {
 				[3953] = {
 					"red",
 					"Perfect Precise Carnelian",
-					{[L["expertise rating"]] = 35},
+					{[L["expertise"]] = 35},
 				},
 				[3954] = {
 					"red",
@@ -3680,7 +3680,7 @@ ww_gems = {
 				[3955] = {
 					"red",
 					"Perfect Flashing Carnelian",
-					{[L["parry rating"]] = 35},
+					{[L["parry"]] = 35},
 				},
 				[3956] = {
 					"red",
@@ -3695,127 +3695,127 @@ ww_gems = {
 				[3958] = {
 					"green",
 					"Perfect Puissant Jasper",
-					{[L["mastery rating"]] = 18, [L["stamina"]] = 26},
+					{[L["mastery"]] = 18, [L["stamina"]] = 26},
 				},
 				[3959] = {
 					"green",
 					"Perfect Lightning Jasper",
-					{[L["haste rating"]] = 18, [L["hit rating"]] = 17},
+					{[L["haste"]] = 18, [L["hit"]] = 17},
 				},
 				[3960] = {
 					"green",
 					"Perfect Forceful Jasper",
-					{[L["haste rating"]] = 18, [L["stamina"]] = 26},
+					{[L["haste"]] = 18, [L["stamina"]] = 26},
 				},
 				[3961] = {
 					"green",
 					"Perfect Steady Jasper",
-					{[L["resilience rating"]] = 18, [L["stamina"]] = 26},
+					{[L["resilience"]] = 18, [L["stamina"]] = 26},
 				},
 				[3962] = {
 					"green",
 					"Perfect Piercing Jasper",
-					{[L["critical strike rating"]] = 18, [L["hit rating"]] = 17},
+					{[L["critical strike"]] = 18, [L["hit"]] = 17},
 				},
 				[3963] = {
 					"green",
 					"Perfect Jagged Jasper",
-					{[L["critical strike rating"]] = 18, [L["stamina"]] = 26},
+					{[L["critical strike"]] = 18, [L["stamina"]] = 26},
 				},
 				[3964] = {
 					"green",
 					"Perfect Nimble Jasper",
-					{[L["dodge rating"]] = 18, [L["hit rating"]] = 17},
+					{[L["dodge"]] = 18, [L["hit"]] = 17},
 				},
 				[3965] = {
 					"green",
 					"Perfect Regal Jasper",
-					{[L["dodge rating"]] = 18, [L["stamina"]] = 26},
+					{[L["dodge"]] = 18, [L["stamina"]] = 26},
 				},
 				[3966] = {
 					"orange",
 					"Perfect Keen Hessonite",
-					{[L["expertise rating"]] = 18, [L["mastery rating"]] = 17},
+					{[L["expertise"]] = 18, [L["mastery"]] = 17},
 				},
 				[3967] = {
 					"orange",
 					"Perfect Artful Hessonite",
-					{[L["intellect"]] = 18, [L["mastery rating"]] = 17},
+					{[L["intellect"]] = 18, [L["mastery"]] = 17},
 				},
 				[3968] = {
 					"orange",
 					"Perfect Fine Hessonite",
-					{[L["mastery rating"]] = 17, [L["parry rating"]] = 18},
+					{[L["mastery"]] = 17, [L["parry"]] = 18},
 				},
 				[3969] = {
 					"orange",
 					"Perfect Adept Hessonite",
-					{[L["agility"]] = 18, [L["mastery rating"]] = 17},
+					{[L["agility"]] = 18, [L["mastery"]] = 17},
 				},
 				[3970] = {
 					"orange",
 					"Perfect Skillful Hessonite",
-					{[L["mastery rating"]] = 17, [L["strength"]] = 18},
+					{[L["mastery"]] = 17, [L["strength"]] = 18},
 				},
 				[3971] = {
 					"orange",
 					"Perfect Reckless Hessonite",
-					{[L["haste rating"]] = 17, [L["intellect"]] = 18},
+					{[L["haste"]] = 17, [L["intellect"]] = 18},
 				},
 				[3972] = {
 					"orange",
 					"Perfect Deft Hessonite",
-					{[L["agility"]] = 18, [L["haste rating"]] = 17},
+					{[L["agility"]] = 18, [L["haste"]] = 17},
 				},
 				[3973] = {
 					"orange",
 					"Perfect Fierce Hessonite",
-					{[L["haste rating"]] = 17, [L["strength"]] = 18},
+					{[L["haste"]] = 17, [L["strength"]] = 18},
 				},
 				[3974] = {
 					"orange",
 					"Perfect Potent Hessonite",
-					{[L["critical strike rating"]] = 17, [L["intellect"]] = 18},
+					{[L["critical strike"]] = 17, [L["intellect"]] = 18},
 				},
 				[3975] = {
 					"orange",
 					"Perfect Deadly Hessonite",
-					{[L["agility"]] = 18, [L["critical strike rating"]] = 17},
+					{[L["agility"]] = 18, [L["critical strike"]] = 17},
 				},
 				[3976] = {
 					"orange",
 					"Perfect Inscribed Hessonite",
-					{[L["critical strike rating"]] = 17, [L["strength"]] = 18},
+					{[L["critical strike"]] = 17, [L["strength"]] = 18},
 				},
 				[3977] = {
 					"orange",
 					"Perfect Resolute Hessonite",
-					{[L["dodge rating"]] = 17, [L["expertise rating"]] = 18},
+					{[L["dodge"]] = 17, [L["expertise"]] = 18},
 				},
 				[3978] = {
 					"orange",
 					"Perfect Polished Hessonite",
-					{[L["agility"]] = 18, [L["dodge rating"]] = 17},
+					{[L["agility"]] = 18, [L["dodge"]] = 17},
 				},
 				[3979] = {
 					"purple",
 					"Perfect Accurate Nightstone",
-					{[L["expertise rating"]] = 18, [L["hit rating"]] = 17},
+					{[L["expertise"]] = 18, [L["hit"]] = 17},
 				},
 				[3980] = {
 					"purple",
 					"Perfect Veiled Nightstone",
-					{[L["hit rating"]] = 17, [L["intellect"]] = 18},
+					{[L["hit"]] = 17, [L["intellect"]] = 18},
 				},
 				[3981] = {
 					"purple",
 					"Perfect Retaliating Nightstone",
-					{[L["hit rating"]] = 17, [L["parry rating"]] = 18},
+					{[L["hit"]] = 17, [L["parry"]] = 18},
 				},
 				[3982] = {
 					"purple",
 					"Perfect Glinting Nightstone",
-					{[L["agility"]] = 18, [L["hit rating"]] = 17},
+					{[L["agility"]] = 18, [L["hit"]] = 17},
 				},
 			},
 		},
@@ -3831,17 +3831,17 @@ ww_gems = {
 				[2913] = {
 					"yellow",
 					"Smooth Ornate Dawnstone",
-					{[L["critical strike rating"]] = 10},
+					{[L["critical strike"]] = 10},
 				},
 				[2914] = {
 					"yellow",
 					"Smooth Ornate Dawnstone",
-					{[L["critical strike rating"]] = 10},
+					{[L["critical strike"]] = 10},
 				},
 				[2916] = {
 					"orange",
 					"Potent Ornate Topaz",
-					{[L["critical strike rating"]] = 5, [L["intellect"]] = 5},
+					{[L["critical strike"]] = 5, [L["intellect"]] = 5},
 				},
 				[2945] = {
 					"red",
@@ -3851,7 +3851,7 @@ ww_gems = {
 				[2946] = {
 					"orange",
 					"Deadly Ornate Topaz",
-					{[L["agility"]] = 5, [L["critical strike rating"]] = 5},
+					{[L["agility"]] = 5, [L["critical strike"]] = 5},
 				},
 				[3335] = {
 					"red",
@@ -3861,17 +3861,17 @@ ww_gems = {
 				[3336] = {
 					"yellow",
 					"Smooth Ornate Dawnstone",
-					{[L["critical strike rating"]] = 10},
+					{[L["critical strike"]] = 10},
 				},
 				[3337] = {
 					"orange",
 					"Deadly Ornate Topaz",
-					{[L["agility"]] = 5, [L["critical strike rating"]] = 5},
+					{[L["agility"]] = 5, [L["critical strike"]] = 5},
 				},
 				[3338] = {
 					"orange",
 					"Potent Ornate Topaz",
-					{[L["critical strike rating"]] = 5, [L["intellect"]] = 5},
+					{[L["critical strike"]] = 5, [L["intellect"]] = 5},
 				},
 				[3339] = {
 					"red",
@@ -3881,14 +3881,14 @@ ww_gems = {
 				[3340] = {
 					"yellow",
 					"Smooth Ornate Dawnstone",
-					{[L["critical strike rating"]] = 10},
+					{[L["critical strike"]] = 10},
 				},
 			},
 			[6] = {
 				[3798] = {
 					"meta",
 					"Swift Starflare Diamond",
-					{[L["critical strike rating"]] = 17, [L["minor run speed"]] = 1},
+					{[L["critical strike"]] = 17, [L["minor run speed"]] = 1},
 				},
 				[3799] = {
 					"meta",
@@ -3898,12 +3898,12 @@ ww_gems = {
 				[3800] = {
 					"meta",
 					"Impassive Starflare Diamond",
-					{[L["critical strike rating"]] = 17, [L["fear duration reduction (percent)"]] = 10},
+					{[L["critical strike"]] = 17, [L["fear duration reduction (percent)"]] = 10},
 				},
 				[3801] = {
 					"meta",
 					"Enigmatic Starflare Diamond",
-					{[L["critical strike rating"]] = 17, [L["snare/root duration reduction (percent)"]] = 10},
+					{[L["critical strike"]] = 17, [L["snare/root duration reduction (percent)"]] = 10},
 				},
 				[3802] = {
 					"meta",
@@ -3913,7 +3913,7 @@ ww_gems = {
 				[3803] = {
 					"meta",
 					"Persistent Earthshatter Diamond",
-					{[L["critical strike rating"]] = 17, [L["stun duration reduction (percent)"]] = 10},
+					{[L["critical strike"]] = 17, [L["stun duration reduction (percent)"]] = 10},
 				},
 				[3804] = {
 					"meta",
@@ -3937,27 +3937,27 @@ ww_gems = {
 				[2898] = {
 					"green",
 					"Jagged Deep Peridot",
-					{[L["critical strike rating"]] = 4, [L["stamina"]] = 3},
+					{[L["critical strike"]] = 4, [L["stamina"]] = 3},
 				},
 				[2899] = {
 					"green",
 					"Jagged Deep Peridot",
-					{[L["critical strike rating"]] = 4, [L["stamina"]] = 3},
+					{[L["critical strike"]] = 4, [L["stamina"]] = 3},
 				},
 				[2918] = {
 					"green",
 					"Jagged Deep Peridot",
-					{[L["critical strike rating"]] = 4, [L["stamina"]] = 3},
+					{[L["critical strike"]] = 4, [L["stamina"]] = 3},
 				},
 				[2921] = {
 					"green",
 					"Jagged Deep Peridot",
-					{[L["critical strike rating"]] = 4, [L["stamina"]] = 3},
+					{[L["critical strike"]] = 4, [L["stamina"]] = 3},
 				},
 				[2923] = {
 					"green",
 					"Jagged Deep Peridot",
-					{[L["critical strike rating"]] = 4, [L["stamina"]] = 3},
+					{[L["critical strike"]] = 4, [L["stamina"]] = 3},
 				},
 				[2924] = {
 					"red",
@@ -3977,7 +3977,7 @@ ww_gems = {
 				[2969] = {
 					"meta",
 					"Swift Windfire Diamond",
-					{[L["critical strike rating"]] = 10, [L["minor run speed"]] = 1},
+					{[L["critical strike"]] = 10, [L["minor run speed"]] = 1},
 				},
 				[2970] = {
 					"meta",
@@ -3999,14 +3999,14 @@ ww_gems = {
 				[2891] = {
 					"yellow",
 					"Mystic Dawnstone",
-					{[L["resilience rating"]] = 10},
+					{[L["resilience"]] = 10},
 				},
 			},
 			[7] = {
 				[3792] = {
 					"yellow",
 					"Kharmaa's Grace",
-					{[L["resilience rating"]] = 20},
+					{[L["resilience"]] = 20},
 				},
 			},
 		},
@@ -4022,12 +4022,12 @@ ww_gems = {
 				[3046] = {
 					"orange",
 					"Reckless Fire Opal",
-					{[L["haste rating"]] = 4, [L["intellect"]] = 5},
+					{[L["haste"]] = 4, [L["intellect"]] = 5},
 				},
 				[3047] = {
 					"green",
 					"Jagged Chrysoprase",
-					{[L["critical strike rating"]] = 5, [L["stamina"]] = 6},
+					{[L["critical strike"]] = 5, [L["stamina"]] = 6},
 				},
 				[3048] = {
 					"purple",
@@ -4037,12 +4037,12 @@ ww_gems = {
 				[3049] = {
 					"green",
 					"Misty Chrysoprase",
-					{[L["critical strike rating"]] = 5, [L["spirit"]] = 4},
+					{[L["critical strike"]] = 5, [L["spirit"]] = 4},
 				},
 				[3050] = {
 					"orange",
 					"Reckless Fire Opal",
-					{[L["haste rating"]] = 4, [L["intellect"]] = 5},
+					{[L["haste"]] = 4, [L["intellect"]] = 5},
 				},
 				[3051] = {
 					"purple",
@@ -4052,12 +4052,12 @@ ww_gems = {
 				[3052] = {
 					"purple",
 					"Glinting Tanzanite",
-					{[L["agility"]] = 5, [L["hit rating"]] = 4},
+					{[L["agility"]] = 5, [L["hit"]] = 4},
 				},
 				[3053] = {
 					"orange",
 					"Stalwart Fire Opal",
-					{[L["dodge rating"]] = 4, [L["parry rating"]] = 5},
+					{[L["dodge"]] = 4, [L["parry"]] = 5},
 				},
 				[3054] = {
 					"purple",
@@ -4067,42 +4067,42 @@ ww_gems = {
 				[3055] = {
 					"purple",
 					"Glinting Tanzanite",
-					{[L["agility"]] = 5, [L["hit rating"]] = 4},
+					{[L["agility"]] = 5, [L["hit"]] = 4},
 				},
 				[3056] = {
 					"orange",
 					"Stalwart Fire Opal",
-					{[L["dodge rating"]] = 4, [L["parry rating"]] = 5},
+					{[L["dodge"]] = 4, [L["parry"]] = 5},
 				},
 				[3057] = {
 					"purple",
 					"Etched Tanzanite",
-					{[L["hit rating"]] = 4, [L["strength"]] = 5},
+					{[L["hit"]] = 4, [L["strength"]] = 5},
 				},
 				[3058] = {
 					"green",
 					"Misty Chrysoprase",
-					{[L["critical strike rating"]] = 5, [L["spirit"]] = 4},
+					{[L["critical strike"]] = 5, [L["spirit"]] = 4},
 				},
 				[3060] = {
 					"green",
 					"Regal Chrysoprase",
-					{[L["dodge rating"]] = 5, [L["stamina"]] = 6},
+					{[L["dodge"]] = 5, [L["stamina"]] = 6},
 				},
 				[3061] = {
 					"purple",
 					"Veiled Tanzanite",
-					{[L["hit rating"]] = 4, [L["intellect"]] = 5},
+					{[L["hit"]] = 4, [L["intellect"]] = 5},
 				},
 				[3062] = {
 					"green",
 					"Jagged Chrysoprase",
-					{[L["critical strike rating"]] = 5, [L["stamina"]] = 6},
+					{[L["critical strike"]] = 5, [L["stamina"]] = 6},
 				},
 				[3063] = {
 					"purple",
 					"Defender's Tanzanite",
-					{[L["parry rating"]] = 5, [L["stamina"]] = 6},
+					{[L["parry"]] = 5, [L["stamina"]] = 6},
 				},
 				[3064] = {
 					"purple",
@@ -4122,17 +4122,17 @@ ww_gems = {
 				[3068] = {
 					"green",
 					"Nimble Chrysoprase",
-					{[L["dodge rating"]] = 5, [L["hit rating"]] = 4},
+					{[L["dodge"]] = 5, [L["hit"]] = 4},
 				},
 				[3069] = {
 					"orange",
 					"Willful Fire Opal",
-					{[L["intellect"]] = 5, [L["resilience rating"]] = 4},
+					{[L["intellect"]] = 5, [L["resilience"]] = 4},
 				},
 				[3070] = {
 					"orange",
 					"Deadly Fire Opal",
-					{[L["agility"]] = 5, [L["critical strike rating"]] = 4},
+					{[L["agility"]] = 5, [L["critical strike"]] = 4},
 				},
 				[3071] = {
 					"purple",
@@ -4142,12 +4142,12 @@ ww_gems = {
 				[3072] = {
 					"orange",
 					"Inscribed Fire Opal",
-					{[L["critical strike rating"]] = 4, [L["strength"]] = 5},
+					{[L["critical strike"]] = 4, [L["strength"]] = 5},
 				},
 				[3073] = {
 					"orange",
 					"Polished Fire Opal",
-					{[L["agility"]] = 4, [L["dodge rating"]] = 5},
+					{[L["agility"]] = 4, [L["dodge"]] = 5},
 				},
 				[3074] = {
 					"purple",
@@ -4157,12 +4157,12 @@ ww_gems = {
 				[3075] = {
 					"orange",
 					"Champion's Fire Opal",
-					{[L["dodge rating"]] = 4, [L["strength"]] = 5},
+					{[L["dodge"]] = 4, [L["strength"]] = 5},
 				},
 				[3076] = {
 					"orange",
 					"Potent Fire Opal",
-					{[L["critical strike rating"]] = 4, [L["intellect"]] = 5},
+					{[L["critical strike"]] = 4, [L["intellect"]] = 5},
 				},
 				[3077] = {
 					"purple",
@@ -4172,27 +4172,27 @@ ww_gems = {
 				[3078] = {
 					"green",
 					"Regal Chrysoprase",
-					{[L["dodge rating"]] = 5, [L["stamina"]] = 6},
+					{[L["dodge"]] = 5, [L["stamina"]] = 6},
 				},
 				[3079] = {
 					"orange",
 					"Lucent Fire Opal",
-					{[L["agility"]] = 5, [L["resilience rating"]] = 4},
+					{[L["agility"]] = 5, [L["resilience"]] = 4},
 				},
 				[3080] = {
 					"green",
 					"Steady Chrysoprase",
-					{[L["resilience rating"]] = 5, [L["stamina"]] = 6},
+					{[L["resilience"]] = 5, [L["stamina"]] = 6},
 				},
 				[3081] = {
 					"orange",
 					"Potent Fire Opal",
-					{[L["critical strike rating"]] = 4, [L["intellect"]] = 5},
+					{[L["critical strike"]] = 4, [L["intellect"]] = 5},
 				},
 				[3082] = {
 					"green",
 					"Regal Chrysoprase",
-					{[L["dodge rating"]] = 5, [L["stamina"]] = 6},
+					{[L["dodge"]] = 5, [L["stamina"]] = 6},
 				},
 				[3083] = {
 					"purple",
@@ -4202,12 +4202,12 @@ ww_gems = {
 				[3084] = {
 					"green",
 					"Steady Chrysoprase",
-					{[L["resilience rating"]] = 5, [L["stamina"]] = 6},
+					{[L["resilience"]] = 5, [L["stamina"]] = 6},
 				},
 				[3085] = {
 					"green",
 					"Jagged Chrysoprase",
-					{[L["critical strike rating"]] = 5, [L["stamina"]] = 6},
+					{[L["critical strike"]] = 5, [L["stamina"]] = 6},
 				},
 				[3086] = {
 					"purple",
@@ -4217,27 +4217,27 @@ ww_gems = {
 				[3087] = {
 					"orange",
 					"Resplendent Fire Opal",
-					{[L["resilience rating"]] = 4, [L["strength"]] = 5},
+					{[L["resilience"]] = 4, [L["strength"]] = 5},
 				},
 				[3088] = {
 					"green",
 					"Nimble Chrysoprase",
-					{[L["dodge rating"]] = 4, [L["hit rating"]] = 5},
+					{[L["dodge"]] = 4, [L["hit"]] = 5},
 				},
 				[3089] = {
 					"green",
 					"Lightning Chrysoprase",
-					{[L["haste rating"]] = 4, [L["hit rating"]] = 5},
+					{[L["haste"]] = 4, [L["hit"]] = 5},
 				},
 				[3090] = {
 					"orange",
 					"Splendid Fire Opal",
-					{[L["parry rating"]] = 5, [L["resilience rating"]] = 4},
+					{[L["parry"]] = 5, [L["resilience"]] = 4},
 				},
 				[3091] = {
 					"green",
 					"Radiant Chrysoprase",
-					{[L["critical strike rating"]] = 5, [L["spell penetration"]] = 5},
+					{[L["critical strike"]] = 5, [L["spell penetration"]] = 5},
 				},
 			},
 			[7] = {
@@ -4274,7 +4274,7 @@ ww_gems = {
 				[3867] = {
 					"blue",
 					"Rigid Stormjewel",
-					{[L["hit rating"]] = 20},
+					{[L["hit"]] = 20},
 				},
 			},
 		},
@@ -4294,7 +4294,7 @@ ww_gems = {
 				[3162] = {
 					"meta",
 					"Tense Unstable Diamond",
-					{[L["critical strike rating"]] = 12, [L["stun resist chance (percent)"]] = 5},
+					{[L["critical strike"]] = 12, [L["stun resist chance (percent)"]] = 5},
 				},
 				[3163] = {
 					"meta",
@@ -4370,17 +4370,17 @@ ww_gems = {
 				[3159] = {
 					"orange",
 					"Deadly Citrine",
-					{[L["agility"]] = 5, [L["critical strike rating"]] = 4},
+					{[L["agility"]] = 5, [L["critical strike"]] = 4},
 				},
 				[3160] = {
 					"orange",
 					"Reckless Citrine",
-					{[L["haste rating"]] = 4, [L["intellect"]] = 5},
+					{[L["haste"]] = 4, [L["intellect"]] = 5},
 				},
 				[3161] = {
 					"green",
 					"Jagged Mossjewel",
-					{[L["critical strike rating"]] = 4, [L["stamina"]] = 4},
+					{[L["critical strike"]] = 4, [L["stamina"]] = 4},
 				},
 			},
 			[4] = {
diff --git a/Locales/enUS/patterns-cooldown-use-effects.lua b/Locales/enUS/patterns-cooldown-use-effects.lua
index f4664b9..5c94703 100644
--- a/Locales/enUS/patterns-cooldown-use-effects.lua
+++ b/Locales/enUS/patterns-cooldown-use-effects.lua
@@ -27,7 +27,6 @@ local CooldownUsePreprocessLines = {
 	{" (nature spell) power ", " %1 damage "},
 	{" (shadow spell) power ", " %1 damage "},
 	{" your stats ", " all stats "},
-	{" dodge by ", " dodge rating by "},
 	{" the block value of your shield ", " block value "},
 	{" resistances to all schools of magic ", " all resistances "},
 	{" by up t?o? ?", " by "},
@@ -36,16 +35,16 @@ local CooldownUsePreprocessLines = {
 	{" and increases ", " and "},
 	{" and your ", " and "},
 	-- item 20512
-	{" critical strike rating and spell critical strike rating ", " critical strike rating "},
+	{" critical strike and spell critical strike ", " critical strike "},
 	{" melee and ranged attack power ", " attack power "},
 	-- item 12450
-	{" spell, ranged,? and melee haste rating ", " haste rating "},
+	{" spell, ranged,? and melee haste ", " haste "},
 	-- item 66879
-	{" crit rating ", " critical strike rating "},
+	--Should be obsolete (the item appears to be updated)
+	--{" crit ", " critical strike "},
 	-- item 70144
-	{" critical rating ", " critical strike rating "},
-	-- item 70142
-	{" mastery for ", " mastery rating for "},
+	--Should be obsolete (the item appears to be updated)
+	--{" critical ", " critical strike "},
 }

 local CooldownUseAffixes = {
diff --git a/Locales/enUS/patterns-elixirs.lua b/Locales/enUS/patterns-elixirs.lua
index a65585a..06ccf43 100644
--- a/Locales/enUS/patterns-elixirs.lua
+++ b/Locales/enUS/patterns-elixirs.lua
@@ -16,7 +16,8 @@ local ElixirPreprocessLines = {
 	{" and your ", " and "},
 	{" and restores ", " and "},
 	{" and grants ", " and "},
-	{" critical rating ", " critical strike rating "},
+	-- Should be obsolete (item 40212 appears to have been updated)
+	--{" critical ", " critical strike "},
 	{" maximum health ", " health "},
 	{" the chance that the player will reflect hostile spells cast on them by (%d+)%% for %d+ hrs%. +will automatically reflect the first offensive spell cast against the user", " %1%% spell reflect"},
 	{" is increased by ", " by "},
diff --git a/Locales/enUS/patterns-enchant-items.lua b/Locales/enUS/patterns-enchant-items.lua
index 3f22c96..e38f08c 100644
--- a/Locales/enUS/patterns-enchant-items.lua
+++ b/Locales/enUS/patterns-enchant-items.lua
@@ -14,31 +14,31 @@ local PreprocessLines = {
 	{"^use: permanently enchant a melee weapon to occasionally increase agility by 120 and attack speed slightly%.  requires a level 35 or higher item%.$", "mongoose"},
 	{"^use: permanently enchant a melee weapon to make your spells sometimes restore 100 mana to nearby party members%.  requires a level 35 or higher item%.$", "spellsurge"},
 	{"^use: permanently enchant a melee weapon to occasionally heal nearby party members for 180 to 300 when attacking in melee%.  requires a level 35 or higher item%.$", "battlemaster"},
-	{"^use: permanently enchant a melee weapon to occasionally grant you 120 critical strike rating%.  only one instance of this effect can be active at a time%.  requires a level 60 or higher item%.$", "executioner"},
+	{"^use: permanently enchant a melee weapon to occasionally grant you 120 critical strike%.  only one instance of this effect can be active at a time%.  requires a level 60 or higher item%.$", "executioner"},
 	{"^use: permanently enchant a melee weapon to sometimes inflict fire damage%.  requires a level 60 or higher item%.$", "icebreaker"},
 	{"^use: permanently enchant a melee weapon to sometimes heal the wielder when striking in melee%.  requires a level 60 or higher item%.$", "lifeward"},
 	{"^use: permanently enchant a melee weapon to have a chance of reducing movement speed and doing additional damage against giants%.  requires a level 60 or higher item%.$", "giant slayer"},
 	{"^use: permanently enchant a melee weapon to cause your damaging spells and melee weapon hits to occasionally inflict additional frost damage and slow the target%.  requires a level 60 or higher item%.\r\n\r\nslow effect does not work on targets 73 or higher%.$", "deathfrost"},
 	{"^use: permanently enchant a melee weapon to sometimes increase your attack power by 400, but at the cost of reduced armor%.  requires a level 60 or higher item%.$", "berserking"},
-	{"^use: permanently enchant a melee weapon to cause your harmful spells to sometimes increase haste rating by 250%.  requires a level 60 or higher item%.$", "black magic"},
-	{"^use: permanently enchants a weapon to sometimes grant blade warding when striking an enemy%.  blade warding increases your parry rating by 200 and inflicts 600 to 800 damage on your next parry%.  lasts 10 sec%.\r\n\r\nthis enchantment requires the wielder is at least level 75%.$", "blade ward"},
+	{"^use: permanently enchant a melee weapon to cause your harmful spells to sometimes increase haste by 250%.  requires a level 60 or higher item%.$", "black magic"},
+	{"^use: permanently enchants a weapon to sometimes grant blade warding when striking an enemy%.  blade warding increases your parry by 200 and inflicts 600 to 800 damage on your next parry%.  lasts 10 sec%.\r\n\r\nthis enchantment requires the wielder is at least level 75%.$", "blade ward"},
 	{"^use: permanently enchants your weapon to sometimes grant blood reserve when striking an enemy or inflicting damage with bleed attacks%.  when you fall below 35%% health, blood reserve restores 360 to 440 health%.  lasts 20 sec and stacks up to 5 times%.\r\n\r\nthis enchantment requires the wielder is at least level 75%.$", "blood draining"},
 	{"^use: permanently enchant a weapon to sometimes heal you when damaging an enemy with spells and melee attacks%.  requires a level 300 or higher item%.$", "mending"},
 	{"^use: permanently enchant a weapon to often deal %d%d%d to %d%d%d nature damage to an enemy damaged by your spells or struck by your melee attacks%.  requires a level 300 or higher item%.$", "avalanche"},
 	{"^use: permanently enchant a melee weapon to sometimes disrupt elementals when struck by your melee attacks, dealing arcane damage and silencing them for 5 sec%.  requires a level 300 or higher item%.$", "elemental slayer"},
-	{"^use: permanently enchant a melee weapon to sometimes increase haste rating by 450 for 12 sec when healing or dealing spell or melee damage%.  requires a level 300 or higher item%.$", "hurricane"},
+	{"^use: permanently enchant a melee weapon to sometimes increase haste by 450 for 12 sec when healing or dealing spell or melee damage%.  requires a level 300 or higher item%.$", "hurricane"},
 	{"^use: permanently enchant a weapon to sometimes increase spirit by 200 for 15 sec when healing or dealing damage with spells%.  requires a level 300 or higher item%.$", "heartsong"},
 	{"^use: permanently enchant a weapon to sometimes increase intellect by 500 for 12 sec when dealing damage or healing with spells%.  requires a level 300 or higher item%.$", "power torrent"},
-	{"^use: permanently enchant a weapon to sometimes increase dodge rating by 600 and movement speed by 15%% for 10 sec when striking in melee, stacking with passive movement speed effects%.  requires a level 300 or higher item%.$", "windwalk"},
+	{"^use: permanently enchant a weapon to sometimes increase dodge by 600 and movement speed by 15%% for 10 sec when striking in melee, stacking with passive movement speed effects%.  requires a level 300 or higher item%.$", "windwalk"},
 	{"^use: permanently enchant a weapon to sometimes increase attack power by 1000 for 12 sec when striking in melee%.  requires a level 300 or higher item%.$", "landslide"},
 	{"^use: attaches a permanent scope to a bow or gun that sometimes increases ranged attack power by 800 for 10 sec when dealing damage with ranged attacks%.\r\n\r\nattaching this scope to a ranged weapon causes it to become soulbound%.$", "gnomish x-ray scope"},
 	{"^use: attaches a pyrium spike to your shield that sometimes deals 210 to 350 damage when you block with it%.\r\n\r\nattaching a pyrium spike to your shield causes it to become soulbound%.$", "pyrium shield spike"},
 	{"^use: teaches you how to permanently enchant a melee weapon to cause your damaging spells and melee weapon hits to occasionally inflict additional frost damage and slow the target%.  requires a level 60 or higher item%.$", "deathfrost"},
-	{"^use: teaches you how to permanently enchant a melee weapon to cause your harmful spells to sometimes increase haste rating%.  requires a level 60 or higher item%.$", "black magic"},
+	{"^use: teaches you how to permanently enchant a melee weapon to cause your harmful spells to sometimes increase haste%.  requires a level 60 or higher item%.$", "black magic"},
 	{"^use: teaches you how to permanently enchant a melee weapon to have a chance of reducing movement speed and doing additional damage against giants%.  requires a level 60 or higher item%.$", "giant slayer"},
 	{"^use: teaches you how to permanently enchant a melee weapon to have a chance of stunning and doing additional damage against demons%.$", "demonslaying"},
 	{"^use: teaches you how to permanently enchant a melee weapon to make your spells sometimes restore 100 mana to nearby party members%.  requires a level 35 or higher item%.$", "spellsurge"},
-	{"^use: teaches you how to permanently enchant a melee weapon to occasionally grant you 120 critical strike rating%. requires a level 60 or higher item%.$", "executioner"},
+	{"^use: teaches you how to permanently enchant a melee weapon to occasionally grant you 120 critical strike%. requires a level 60 or higher item%.$", "executioner"},
 	{"^use: teaches you how to permanently enchant a melee weapon to occasionally heal nearby party members for 180 to 300 when attacking in melee%.  requires a level 35 or higher item%.$", "battlemaster"},
 	{"^use: teaches you how to permanently enchant a melee weapon to occasionally increase agility by 120 and attack speed slightly%.  requires a level 35 or higher item%.$", "mongoose"},
 	{"^use: teaches you how to permanently enchant a melee weapon to often chill the target, reducing their movement and attack speed%.  has a reduced effect for players above level 60%.$", "icy chill"},
@@ -50,9 +50,9 @@ local PreprocessLines = {
 	{"^use: teaches you how to permanently enchant a melee weapon to sometimes heal the wielder when striking in melee%.  requires a level 60 or higher item%.$", "lifeward"},
 	{"^use: teaches you how to permanently enchant a melee weapon to sometimes increase your attack power at the cost of reduced armor%.  requires a level 60 or higher item%.$", "berserking"},
 	{"^use: teaches you how to permanently enchant a melee weapon to sometimes inflict fire damage%.  requires a level 60 or higher item%.$", "icebreaker"},
-	{"^use: teaches you how to permanently enchant a weapon to sometimes grant blade warding when striking an enemy, increasing parry rating and inflicting damage on your next parry%.  enchantment requires level 75%.$", "blade ward"},
+	{"^use: teaches you how to permanently enchant a weapon to sometimes grant blade warding when striking an enemy, increasing parry and inflicting damage on your next parry%.  enchantment requires level 75%.$", "blade ward"},
 	{"^use: teaches you how to permanently enchant a weapon to sometimes increase attack power when striking with melee attacks%.  requires a level 300 or higher item%.$", "landslide"},
-	{"^use: teaches you how to permanently enchant a weapon to sometimes increase dodge rating and movement speed when striking in melee%.  requires a level 300 or higher item%.$", "windwalk"},
+	{"^use: teaches you how to permanently enchant a weapon to sometimes increase dodge and movement speed when striking in melee%.  requires a level 300 or higher item%.$", "windwalk"},
 	{"^use: teaches you how to permanently enchant a weapon to sometimes increase spell power when dealing damage or healing with spells%.  requires a level 300 or higher item%.$", "power torrent"},
 }

diff --git a/Locales/enUS/patterns-enchants.lua b/Locales/enUS/patterns-enchants.lua
index 1c7550f..7503785 100644
--- a/Locales/enUS/patterns-enchants.lua
+++ b/Locales/enUS/patterns-enchants.lua
@@ -41,7 +41,6 @@ local EnchantPreprocessLines = {
 	{" attacker power ", " attack power "},
 	-- item 20076
 	{" adds to a shoulder slot item increased ", " "},
-	{" resilience by ", " resilience rating by "},
 	{" mounted movement speed ", " mount speed "},
 	{" stealth slightly ", " effective stealth level by 1 "},
 	{" stealth%.$", " effective stealth level by 1"},
diff --git a/Locales/enUS/patterns-equip-stats.lua b/Locales/enUS/patterns-equip-stats.lua
index 85e4cf1..28d4a65 100644
--- a/Locales/enUS/patterns-equip-stats.lua
+++ b/Locales/enUS/patterns-equip-stats.lua
@@ -19,8 +19,9 @@ local EquipStatsUnweightedLines = {
 }

 local EquipStatsPreprocessLines = {
-	{" the block value of your shield ", " block value "},
-	{" shield block rating ", " block rating "},
+	-- Should be obsolete
+	--{" the block value of your shield ", " block value "},
+	--{" shield block ", " block "},
 	{" effective stealth level%.$", " effective stealth level by 1"},
 	{" stealth slightly%.$", " effective stealth level by 1"},
 	{" run speed increased slightly%.$", " minor run speed increase"},
diff --git a/Locales/enUS/patterns.lua b/Locales/enUS/patterns.lua
index 95a2e04..3b29dd8 100644
--- a/Locales/enUS/patterns.lua
+++ b/Locales/enUS/patterns.lua
@@ -73,6 +73,7 @@ end

 ww_Preprocess = {
 	{"|c[a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9]([^|]+)|r", "%1"},
+	{"([0-9]+),([0-9]+)", "%1%2"},
 	{" +$", ""},
 }

@@ -208,12 +209,12 @@ ww_MultipleStatLines = {
 		end,
 		{"enchant"},
 	},
-	{"^(%a[%a ]+ rating )and (%a[%a ]+ rating )by( %d+)$",
+	{"^(%a[%a ]+) and (%a[%a ]+) by (%d+)$",
 		function(text, pattern, section)
 			local start, _, stat1, stat2, value = string.find(text, pattern)
 			if start then
-				stat1 = WeightsWatcher.singleStat(stat1 .. "by" .. value, section)
-				stat2 = WeightsWatcher.singleStat(stat2 .. "by" .. value, section)
+				stat1 = WeightsWatcher.singleStat(stat1 .. " by " .. value, section)
+				stat2 = WeightsWatcher.singleStat(stat2 .. " by " .. value, section)
 				if stat1 and stat2 then
 					return stat1.stats + stat2.stats
 				else
@@ -221,79 +222,8 @@ ww_MultipleStatLines = {
 				end
 			end
 		end,
-		{"enchant"},
-	},
-	{"^(%a+ )and (%a[%a ]+ )by( %d+)$",
-		function(text, pattern, section)
-			local start, _, stat1, stat2, value = string.find(text, pattern)
-			if start then
-				stat1 = WeightsWatcher.singleStat(stat1 .. "by" .. value, section)
-				stat2 = WeightsWatcher.singleStat(stat2 .. "by" .. value, section)
-				if stat1 and stat2 then
-					return stat1.stats + stat2.stats
-				else
-					ww_unparsed_lines[text][pattern].parsedTo = {stat1, stat2}
-				end
-			end
-		end,
-		{"enchant"},
-	},
-	{"^(%a[%a ]+ )and (%a[%a ]+ )rating by( %d+)$",
-		function(text, pattern, section)
-			local start, _, stat1, stat2, value = string.find(text, pattern)
-			if start then
-				stat1 = WeightsWatcher.singleStat(stat1 .. "rating by" .. value, section)
-				stat2 = WeightsWatcher.singleStat(stat2 .. "rating by" .. value, section)
-				if stat1 and stat2 then
-					return stat1.stats + stat2.stats
-				else
-					ww_unparsed_lines[text][pattern].parsedTo = {stat1, stat2}
-				end
-			end
-		end,
-		{"enchant"},
-	},
-	{"^(%a[%a ]+ )and (%a[%a ]+ )by( %d+)$",
-		function(text, pattern, section)
-			local start, _, stat1, stat2, value = string.find(text, pattern)
-			if start then
-				stat1 = WeightsWatcher.singleStat(stat1 .. "by" .. value, section)
-				stat2 = WeightsWatcher.singleStat(stat2 .. "by" .. value, section)
-				if stat1 and stat2 then
-					return stat1.stats + stat2.stats
-				else
-					ww_unparsed_lines[text][pattern].parsedTo = {stat1, stat2}
-				end
-			end
-		end,
-		{"elixir"},
-	},
---[[	{"^([+-]?%d+) health and mana every 5 seco?n?d?s?$",
-		function(text, pattern)
-			local start, _, value = string.find(text, pattern)
-			if start then
-				value = tonumber(value)
-				local stats = WeightsWatcher.newStatTable()
-				stats["mp5"] = value
-				stats["hp5"] = value
-				return stats
-			end
-		end,
-		{"enchant"},
+		{"elixir", "enchant"},
 	},
-	{"^([+-]?%d+) mana and health every 5 seco?n?d?s?$",
-		function(text, pattern)
-			local start, _, value = string.find(text, pattern)
-			if start then
-				value = tonumber(value)
-				local stats = WeightsWatcher.newStatTable()
-				stats["mp5"] = value
-				stats["hp5"] = value
-				return stats
-			end
-		end,
-		{"enchant"},
-	},]]
 	{"^(%a+), (%a+),? and (%a+) spell power by (%d+)$",
 		function(text, pattern)
 			local start, _, stat1, stat2, stat3, value = string.find(text, pattern)
@@ -369,13 +299,19 @@ ww_MultipleStatLines = {

 ww_SingleStatLines = {
 	{"^(item level) (%d+)$", WeightsWatcher.statNameFirst, {"generic"}},
-	{"^([+-]?%d+) (%a[%a ]+ rating)$", WeightsWatcher.statNumFirst, {"cooldownUseEffect", "elixir", "enchant", "equipEffect", "food", "generic", "socketBonus", "stackingEquipEffect", "useEffect"}},
 	{"^([+-]?%d+) (armor)$", WeightsWatcher.statNumFirst, {"cooldownUseEffect", "elixir", "enchant", "equipEffect", "generic", "useEffect"}},
 	{"^([+-]?%d+) (stamina)$", WeightsWatcher.statNumFirst, {"elixir", "enchant", "food", "generic", "socketBonus", "useEffect"}},
 	{"^([+-]?%d+) (intellect)$", WeightsWatcher.statNumFirst, {"cooldownUseEffect", "elixir", "enchant", "food", "generic", "socketBonus", "stackingEquipEffect", "useEffect"}},
 	{"^([+-]?%d+) (spell power)$", WeightsWatcher.statNumFirst, {"cooldownUseEffect", "elixir", "enchant", "equipEffect", "food", "generic", "socketBonus", "stackingEquipEffect", "useEffect"}},
 	{"^([+-]?%d+) (agility)$", WeightsWatcher.statNumFirst, {"cooldownUseEffect", "elixir", "enchant", "food", "generic", "socketBonus", "stackingEquipEffect", "useEffect"}},
 	{"^([+-]?%d+) (strength)$", WeightsWatcher.statNumFirst, {"cooldownUseEffect", "elixir", "enchant", "food", "generic", "socketBonus", "stackingEquipEffect", "useEffect"}},
+	{"^([+-]?%d+) (hit)$", WeightsWatcher.statNumFirst, {"cooldownUseEffect", "elixir", "enchant", "equipEffect", "food", "generic", "socketBonus", "stackingEquipEffect", "useEffect"}},
+	{"^([+-]?%d+) (critical strike)$", WeightsWatcher.statNumFirst, {"cooldownUseEffect", "elixir", "enchant", "equipEffect", "food", "generic", "socketBonus", "stackingEquipEffect", "useEffect"}},
+	{"^([+-]?%d+) (mastery)$", WeightsWatcher.statNumFirst, {"cooldownUseEffect", "elixir", "enchant", "equipEffect", "food", "generic", "socketBonus", "stackingEquipEffect", "useEffect"}},
+	{"^([+-]?%d+) (expertise)$", WeightsWatcher.statNumFirst, {"cooldownUseEffect", "elixir", "enchant", "equipEffect", "food", "generic", "socketBonus", "stackingEquipEffect", "useEffect"}},
+	{"^([+-]?%d+) (dodge)$", WeightsWatcher.statNumFirst, {"cooldownUseEffect", "elixir", "enchant", "equipEffect", "food", "generic", "socketBonus", "stackingEquipEffect", "useEffect"}},
+	{"^([+-]?%d+) (parry)$", WeightsWatcher.statNumFirst, {"cooldownUseEffect", "elixir", "enchant", "equipEffect", "food", "generic", "socketBonus", "stackingEquipEffect", "useEffect"}},
+	{"^([+-]?%d+) (haste)$", WeightsWatcher.statNumFirst, {"cooldownUseEffect", "elixir", "enchant", "equipEffect", "food", "generic", "socketBonus", "stackingEquipEffect", "useEffect"}},
 	{"^%(?(%d+%.?%d*) damage per second%)?$",
 		function(text, pattern)
 			return WeightsWatcher.singleStatValueOnly(text, pattern, "melee dps")
@@ -520,6 +456,20 @@ ww_SingleStatLines = {
 		{"cooldownUseEffect", "elixir", "enchant", "equipEffect", "food", "stackingEquipEffect", "useEffect"},
 	},

+	-- Tends to eat other stats if not last
+	{"^(%a+ ?%a+ ?%a+) by ([+-]?%d+%%?)$",
+		function(text, pattern, section)
+			local start, _, name, value = string.find(text, pattern)
+			if start then
+				local stats = WeightsWatcher.parseStats(value .. " " .. name, section)
+				if stats then
+					return stats.stats
+				end
+			end
+		end,
+		{"cooldownUseEffect", "elixir", "enchant", "equipEffect", "food", "stackingEquipEffect", "useEffect"},
+	},
+
 	-- meta/enchant effects
 	{"^(%d+)%% increased armor value from items$",
 		function(text, pattern)
diff --git a/Locales/enUS/stats.lua b/Locales/enUS/stats.lua
index 3e84541..ae68360 100644
--- a/Locales/enUS/stats.lua
+++ b/Locales/enUS/stats.lua
@@ -11,7 +11,6 @@ ww_localizedStats = {
 	["armor"] = "armor",
 	["armor (percent)"] = "armor (percent)",
 	["armor from items (percent)"] = "armor from items (percent)",
--- 	["armor penetration rating"] = "armor penetration rating",
 	["attack power"] = "attack power",
 	["attack power against undead"] = "attack power against undead",
 	["avalanche"] = "avalanche",
@@ -22,8 +21,7 @@ ww_localizedStats = {
 	["berserking"] = "berserking",
 	["black magic"] = "black magic",
 	["blade ward"] = "blade ward",
-	["block rating"] = "block rating",
--- 	["block value"] = "block value",
+	["block"] = "block",
 	["block value (percent)"] = "block value (percent)",
 	["blood draining"] = "blood draining",
 	["chance to increase physical haste"] = "chance to increase physical haste",
@@ -32,25 +30,21 @@ ww_localizedStats = {
 	["chance to restore mana on spellcast"] = "chance to restore mana on spellcast",
 	["chance to stun target"] = "chance to stun target",
 	["critical effect (percent)"] = "critical effect (percent)",
---	["critical damage (percent)"] = "critical damage (percent)",
---	["critical healing (percent)"] = "critical healing (percent)",
-	["critical strike rating"] = "critical strike rating",
+	["critical strike"] = "critical strike",
 	["crusader"] = "crusader",
 	["damage absorption (2% chance)"] = "damage absorption (2% chance)",
 	["damage absorption (5% chance)"] = "damage absorption (5% chance)",
 	["darkglow embroidery"] = "darkglow embroidery",
 	["deathfrost"] = "deathfrost",
--- 	["defense rating"] = "defense rating",
 	["demonslaying"] = "demonslaying",
 	["disarm duration reduction (percent)"] = "disarm duration reduction (percent)",
-	["dodge rating"] = "dodge rating",
+	["dodge"] = "dodge",
 	["elemental slayer"] = "elemental slayer",
 	["executioner"] = "executioner",
-	["expertise rating"] = "expertise rating",
+	["expertise"] = "expertise",
 	["disorient resist chance (percent)"] = "disorient resist chance (percent)",
 	["fear duration reduction (percent)"] = "fear duration reduction (percent)",
 	["fear resist chance (percent)"] = "fear resist chance (percent)",
--- 	["feral attack power"] = "feral attack power",
 	["fiery blaze"] = "fiery blaze",
 	["fiery weapon"] = "fiery weapon",
 	["fire resistance"] = "fire resistance",
@@ -60,11 +54,11 @@ ww_localizedStats = {
 	["frost spell damage"] = "frost spell damage",
 	["giant slayer"] = "giant slayer",
 	["gnomish x-ray scope"] = "gnomish x-ray scope",
-	["haste rating"] = "haste rating",
+	["haste"] = "haste",
 	["health"] = "health",
 	["heartsong"] = "heartsong",
 	["herbalism"] = "herbalism",
-	["hit rating"] = "hit rating",
+	["hit"] = "hit",
 -- 	["holy resistance"] = "holy resistance",
 	["holy spell damage"] = "holy spell damage",
 	["hp5"] = "hp5",
@@ -73,7 +67,6 @@ ww_localizedStats = {
 	["icy chill"] = "icy chill",
 	["increased stealth"] = "increased stealth",
 	["intellect"] = "intellect",
--- 	["intellect (percent)"] = "intellect (percent)",
 	["item level"] = "item level",
 	["landslide"] = "landslide",
 	["lifestealing"] = "lifestealing",
@@ -81,10 +74,10 @@ ww_localizedStats = {
 	["lightweave embroidery"] = "lightweave embroidery",
 	["mana"] = "mana",
 	["mana (percent)"] = "mana (percent)",
-	["mastery rating"] = "mastery rating",
+	["mastery"] = "mastery",
 	["maximum melee weapon damage"] = "maximum melee weapon damage",
 	["maximum ranged weapon damage"] = "maximum ranged weapon damage",
-	["melee critical strike rating"] = "melee critical strike rating",
+	["melee critical strike"] = "melee critical strike",
 	["melee damage to beasts"] = "melee damage to beasts",
 	["melee damage to elementals"] = "melee damage to elementals",
 	["melee dps"] = "melee dps",
@@ -97,18 +90,18 @@ ww_localizedStats = {
 	["mp5"] = "mp5",
 	["nature resistance"] = "nature resistance",
 	["nature spell damage"] = "nature spell damage",
-	["parry rating"] = "parry rating",
+	["parry"] = "parry",
 	["power torrent"] = "power torrent",
 	["prismatic socket"] = "prismatic socket",
 	["pyrium shield spike"] = "pyrium shield spike",
 	["ranged attack power"] = "ranged attack power",
-	["ranged critical strike rating"] = "ranged critical strike rating",
+	["ranged critical strike"] = "ranged critical strike",
 	["ranged dps"] = "ranged dps",
-	["ranged haste rating"] = "ranged haste rating",
-	["ranged hit rating"] = "ranged hit rating",
+	["ranged haste"] = "ranged haste",
+	["ranged hit"] = "ranged hit",
 	["ranged weapon speed"] = "ranged weapon speed",
 -- 	["requires level"] = "requires level",
-	["resilience rating"] = "resilience rating",
+	["resilience"] = "resilience",
 	["rune of cinderglacier"] = "rune of cinderglacier",
 	["rune of razorice"] = "rune of razorice",
 	["rune of the fallen crusader"] = "rune of the fallen crusader",
@@ -118,9 +111,9 @@ ww_localizedStats = {
 	["skinning"] = "skinning",
 	["snare/root duration reduction (percent)"] = "snare/root duration reduction (percent)",
 	["sometimes heal on your crits"] = "sometimes heal on your crits",
-	["spell critical strike rating"] = "spell critical strike rating",
+	["spell critical strike"] = "spell critical strike",
 	["spell damage taken reduction (percent)"] = "spell damage taken reduction (percent)",
-	["spell hit rating"] = "spell hit rating",
+	["spell hit"] = "spell hit",
 	["spell penetration"] = "spell penetration",
 	["spell power"] = "spell power",
 	["spell reflect (percent)"] = "spell reflect (percent)",
@@ -153,7 +146,6 @@ ww_statDisplayNames = {
 	[ww_localizedStats["armor"]] = "Armor",
 	[ww_localizedStats["armor (percent)"]] = "Armor (Percent)",
 	[ww_localizedStats["armor from items (percent)"]] = "Armor from Items (Percent)",
--- 	[ww_localizedStats["armor penetration rating"]] = "Armor Penetration Rating",
 	[ww_localizedStats["attack power against undead"]] = "Attack Power Against Undead",
 	[ww_localizedStats["attack power"]] = "Attack Power",
 	[ww_localizedStats["avalanche"]] = "Avalanche",
@@ -164,8 +156,7 @@ ww_statDisplayNames = {
 	[ww_localizedStats["berserking"]] = "Berserking",
 	[ww_localizedStats["black magic"]] = "Black Magic",
 	[ww_localizedStats["blade ward"]] = "Blade Ward",
-	[ww_localizedStats["block rating"]] = "Block Rating",
--- 	[ww_localizedStats["block value"]] = "Block Value",
+	[ww_localizedStats["block"]] = "Block",
 	[ww_localizedStats["block value (percent)"]] = "Block Value (Percent)",
 	[ww_localizedStats["blood draining"]] = "Blood Draining",
 	[ww_localizedStats["chance to increase physical haste"]] = "Chance to Increase Physical Haste",
@@ -174,25 +165,21 @@ ww_statDisplayNames = {
 	[ww_localizedStats["chance to restore mana on spellcast"]] = "Chance to Restore Mana on Spellcast",
 	[ww_localizedStats["chance to stun target"]] = "Chance to Stun Target",
 	[ww_localizedStats["critical effect (percent)"]] = "Critical Effect (Percent)",
---	[ww_localizedStats["critical damage (percent)"]] = "Critical Damage (Percent)",
---	[ww_localizedStats["critical healing (percent)"]] = "Critical Healing (Percent)",
-	[ww_localizedStats["critical strike rating"]] = "Critical Strike Rating",
+	[ww_localizedStats["critical strike"]] = "Critical Strike",
 	[ww_localizedStats["crusader"]] = "Crusader",
 	[ww_localizedStats["damage absorption (2% chance)"]] = "Damage Absorption (2% Chance)",
 	[ww_localizedStats["damage absorption (5% chance)"]] = "Damage Absorption (5% Chance)",
 	[ww_localizedStats["darkglow embroidery"]] = "Darkglow Embroidery",
 	[ww_localizedStats["deathfrost"]] = "Deathfrost",
--- 	[ww_localizedStats["defense rating"]] = "Defense Rating",
 	[ww_localizedStats["demonslaying"]] = "Demonslaying",
 	[ww_localizedStats["disarm duration reduction (percent)"]] = "Disarm Duration Reduction (Percent)",
-	[ww_localizedStats["dodge rating"]] = "Dodge Rating",
-	[ww_localizedStats["expertise rating"]] = "Expertise Rating",
+	[ww_localizedStats["dodge"]] = "Dodge",
+	[ww_localizedStats["expertise"]] = "Expertise",
 	[ww_localizedStats["disorient resist chance (percent)"]] = "Disorient Resist Chance (Percent)",
 	[ww_localizedStats["elemental slayer"]] = "Elemental Slayer",
 	[ww_localizedStats["executioner"]] = "Executioner",
 	[ww_localizedStats["fear duration reduction (percent)"]] = "Fear Duration Reduction (Percent)",
 	[ww_localizedStats["fear resist chance (percent)"]] = "Fear Resist Chance (Percent)",
--- 	[ww_localizedStats["feral attack power"]] = "Feral Attack Power",
 	[ww_localizedStats["fiery blaze"]] = "Fiery Blaze",
 	[ww_localizedStats["fiery weapon"]] = "Fiery Weapon",
 	[ww_localizedStats["fire resistance"]] = "Fire Resistance",
@@ -202,11 +189,11 @@ ww_statDisplayNames = {
 	[ww_localizedStats["frost spell damage"]] = "Frost Spell Damage",
 	[ww_localizedStats["giant slayer"]] = "Giant Slayer",
 	[ww_localizedStats["gnomish x-ray scope"]] = "Gnomish X-Ray Scope",
-	[ww_localizedStats["haste rating"]] = "Haste Rating",
+	[ww_localizedStats["haste"]] = "Haste",
 	[ww_localizedStats["health"]] = "Health",
 	[ww_localizedStats["heartsong"]] = "Heartsong",
 	[ww_localizedStats["herbalism"]] = "Herbalism",
-	[ww_localizedStats["hit rating"]] = "Hit Rating",
+	[ww_localizedStats["hit"]] = "Hit",
 -- 	[ww_localizedStats["holy resistance"]] = "Holy Resistance",
 	[ww_localizedStats["holy spell damage"]] = "Holy Spell Damage",
 	[ww_localizedStats["hp5"]] = "HP5",
@@ -215,7 +202,6 @@ ww_statDisplayNames = {
 	[ww_localizedStats["icy chill"]] = "Icy Chill",
 	[ww_localizedStats["increased stealth"]] = "Increased Stealth",
 	[ww_localizedStats["intellect"]] = "Intellect",
--- 	[ww_localizedStats["intellect (percent)"]] = "Intellect (Percent)",
 	[ww_localizedStats["item level"]] = "Item Level",
 	[ww_localizedStats["landslide"]] = "Landslide",
 	[ww_localizedStats["lifestealing"]] = "Lifestealing",
@@ -223,10 +209,10 @@ ww_statDisplayNames = {
 	[ww_localizedStats["lightweave embroidery"]] = "Lightweave Embroidery",
 	[ww_localizedStats["mana"]] = "Mana",
 	[ww_localizedStats["mana (percent)"]] = "Mana (Percent)",
-	[ww_localizedStats["mastery rating"]] = "Mastery Rating",
+	[ww_localizedStats["mastery"]] = "Mastery",
 	[ww_localizedStats["maximum melee weapon damage"]] = "Maximum Melee Weapon Damage",
 	[ww_localizedStats["maximum ranged weapon damage"]] = "Maximum Ranged Weapon Damage",
-	[ww_localizedStats["melee critical strike rating"]] = "Melee Critical Strike Rating",
+	[ww_localizedStats["melee critical strike"]] = "Melee Critical Strike",
 	[ww_localizedStats["melee damage to beasts"]] = "Melee Damage to Beasts",
 	[ww_localizedStats["melee damage to elementals"]] = "Melee Damage to Elementals",
 	[ww_localizedStats["melee dps"]] = "Melee DPS",
@@ -239,18 +225,18 @@ ww_statDisplayNames = {
 	[ww_localizedStats["mp5"]] = "MP5",
 	[ww_localizedStats["nature resistance"]] = "Nature Resistance",
 	[ww_localizedStats["nature spell damage"]] = "Nature Spell Damage",
-	[ww_localizedStats["parry rating"]] = "Parry Rating",
+	[ww_localizedStats["parry"]] = "Parry",
 	[ww_localizedStats["power torrent"]] = "Power Torrent",
 	[ww_localizedStats["prismatic socket"]] = "Prismatic Socket",
 	[ww_localizedStats["pyrium shield spike"]] = "Pyrium Shield Spike",
 	[ww_localizedStats["ranged attack power"]] = "Ranged Attack Power",
-	[ww_localizedStats["ranged critical strike rating"]] = "Ranged Critical Strike Rating",
+	[ww_localizedStats["ranged critical strike"]] = "Ranged Critical Strike",
 	[ww_localizedStats["ranged dps"]] = "Ranged DPS",
-	[ww_localizedStats["ranged haste rating"]] = "Ranged Haste Rating",
-	[ww_localizedStats["ranged hit rating"]] = "Ranged Hit Rating",
+	[ww_localizedStats["ranged haste"]] = "Ranged Haste",
+	[ww_localizedStats["ranged hit"]] = "Ranged Hit",
 	[ww_localizedStats["ranged weapon speed"]] = "Ranged Weapon Speed",
 -- 	[ww_localizedStats["requires level"]] = "Requires Level",
-	[ww_localizedStats["resilience rating"]] = "Resilience Rating",
+	[ww_localizedStats["resilience"]] = "Resilience",
 	[ww_localizedStats["rune of cinderglacier"]] = "Rune of Cinderglacier",
 	[ww_localizedStats["rune of razorice"]] = "Rune of Razorice",
 	[ww_localizedStats["rune of the fallen crusader"]] = "Rune of the Fallen Crusader",
@@ -260,9 +246,9 @@ ww_statDisplayNames = {
 	[ww_localizedStats["skinning"]] = "Skinning",
 	[ww_localizedStats["snare/root duration reduction (percent)"]] = "Snare/Root Duration Reduction (Percent)",
 	[ww_localizedStats["sometimes heal on your crits"]] = "Sometimes Heal on your Crits",
-	[ww_localizedStats["spell critical strike rating"]] = "Spell Critical Strike Rating",
+	[ww_localizedStats["spell critical strike"]] = "Spell Critical Strike",
 	[ww_localizedStats["spell damage taken reduction (percent)"]] = "Spell Damage Taken Reduction (Percent)",
-	[ww_localizedStats["spell hit rating"]] = "Spell Hit Rating",
+	[ww_localizedStats["spell hit"]] = "Spell Hit",
 	[ww_localizedStats["spell penetration"]] = "Spell Penetration",
 	[ww_localizedStats["spell power"]] = "Spell Power",
 	[ww_localizedStats["spell reflect (percent)"]] = "Spell Reflect (Percent)",
diff --git a/WeightsWatcher.lua b/WeightsWatcher.lua
index c35fc6c..c076ad6 100644
--- a/WeightsWatcher.lua
+++ b/WeightsWatcher.lua
@@ -171,16 +171,16 @@ local normalizedStats = {
 	"health",
 	"hp5",
 	"mana",
-	"mastery rating",
+	"mastery",
 	"armor",
-	"dodge rating",
-	"parry rating",
-	"resilience rating",
+	"dodge",
+	"parry",
+	"resilience",
 	"attack power",
-	"critical strike rating",
-	"expertise rating",
-	"haste rating",
-	"hit rating",
+	"critical strike",
+	"expertise",
+	"haste",
+	"hit",
 	"spell penetration",
 	"spell power",
 	"melee dps",
diff --git a/defaults.lua b/defaults.lua
index 237fad5..b5dea95 100644
--- a/defaults.lua
+++ b/defaults.lua
@@ -9,12 +9,12 @@ ww_trackedStats = {
 	ww_statCategories["Miscellaneous"],
 	ww_statCategories["Individual Enchants"],
 	[ww_statCategories["General"]] = {
-		"critical strike rating",
-		"haste rating",
-		"mastery rating",
+		"critical strike",
+		"haste",
+		"mastery",
 		ww_statCategories["DPS"],
 		[ww_statCategories["DPS"]] = {
-			"hit rating",
+			"hit",
 			ww_statCategories["Enchant/Meta Gem Effects"],
 			[ww_statCategories["Enchant/Meta Gem Effects"]] = {
 --				"critical damage (percent)",
@@ -34,8 +34,8 @@ ww_trackedStats = {
 		ww_statCategories["Ranged DPS"],
 		ww_statCategories["Enchant/Meta Gem Effects"],
 		[ww_statCategories["Melee DPS"]] = {
-			"expertise rating",
-			"melee critical strike rating",
+			"expertise",
+			"melee critical strike",
 			"melee dps",
 			"average melee weapon damage",
 			"maximum melee weapon damage",
@@ -51,10 +51,10 @@ ww_trackedStats = {
 		},
 		[ww_statCategories["Ranged DPS"]] = {
 			"ranged attack power",
-			"ranged critical strike rating",
+			"ranged critical strike",
 			"ranged dps",
-			"ranged haste rating",
-			"ranged hit rating",
+			"ranged haste",
+			"ranged hit",
 			"average ranged weapon damage",
 			"maximum ranged weapon damage",
 			"ranged weapon speed",
@@ -69,11 +69,11 @@ ww_trackedStats = {
 	},
 	[ww_statCategories["Tanking"]] = {
 		"armor",
-		"block rating",
-		"dodge rating",
+		"block",
+		"dodge",
 		"health",
 		"hp5",
-		"parry rating",
+		"parry",
 		"stamina",
 		ww_statCategories["Enchant/Meta Gem Effects"],
 		[ww_statCategories["Enchant/Meta Gem Effects"]] = {
@@ -90,14 +90,14 @@ ww_trackedStats = {
 	},
 	[ww_statCategories["Caster"]] = {
 		"intellect",
-		"spell critical strike rating",
+		"spell critical strike",
 		"spell power",
 		"spirit",
 		ww_statCategories["DPS"],
 		ww_statCategories["Healing"],
 		ww_statCategories["Enchant/Meta Gem Effects"],
 		[ww_statCategories["DPS"]] = {
-			"spell hit rating",
+			"spell hit",
 			"arcane spell damage",
 			"fire spell damage",
 			"frost spell damage",
@@ -125,7 +125,7 @@ ww_trackedStats = {
 		},
 	},
 	[ww_statCategories["PVP"]] = {
-		"resilience rating",
+		"resilience",
 		"spell penetration",
 		ww_statCategories["Enchant/Meta Gem Effects"],
 		[ww_statCategories["Enchant/Meta Gem Effects"]] = {
@@ -261,13 +261,13 @@ ww_defaultVars = {
 			ww_specNames["Unholy"],
 			ww_specNames["Unholy DW"],
 			[ww_specNames["Blood"]] = {
-				["mastery rating"] = 1.2,
-				["dodge rating"] = 1,
-				["parry rating"] = 1,
+				["mastery"] = 1.2,
+				["dodge"] = 1,
+				["parry"] = 1,
 				["stamina"] = 0.65,
-				["expertise rating"] = 0.4,
+				["expertise"] = 0.4,
 				["strength"] = 0.284,
-				["hit rating"] = 0.2,
+				["hit"] = 0.2,
 				["armor"] = 0.153,
 				triggers = {
 					meleeDamage = true,
@@ -276,11 +276,11 @@ ww_defaultVars = {
 			[ww_specNames["Frost"]] = {
 				["melee dps"] = 10.09,
 				["strength"] = 2.83,
-				["hit rating"] = 2.26,
-				["expertise rating"] = 1.75,
-				["haste rating"] = 1.4,
-				["mastery rating"] = 1.37,
-				["critical strike rating"] = 1.34,
+				["hit"] = 2.26,
+				["expertise"] = 1.75,
+				["haste"] = 1.4,
+				["mastery"] = 1.37,
+				["critical strike"] = 1.34,
 				["attack power"] = 1,
 				triggers = {
 					meleeDamage = true,
@@ -289,12 +289,12 @@ ww_defaultVars = {
 			[ww_specNames["Frost DW"]] = {
 				["melee dps"] = (6.69 + 4.12) / 2,
 				["strength"] = 3.08,
-				["hit rating"] = 2.14,
-				["haste rating"] = 1.58,
-				["expertise rating"] = 1.51,
-				["mastery rating"] = 1.33,
+				["hit"] = 2.14,
+				["haste"] = 1.58,
+				["expertise"] = 1.51,
+				["mastery"] = 1.33,
 				["attack power"] = 1.12,
-				["critical strike rating"] = 1.09,
+				["critical strike"] = 1.09,
 				triggers = {
 					meleeDamage = true,
 				},
@@ -302,11 +302,11 @@ ww_defaultVars = {
 			[ww_specNames["Unholy"]] = {
 				["melee dps"] = 5.91,
 				["strength"] = 3.24,
-				["hit rating"] = 2.67,
-				["haste rating"] = 1.64,
-				["mastery rating"] = 1.33,
-				["critical strike rating"] = 1.26,
-				["expertise rating"] = 0.98,
+				["hit"] = 2.67,
+				["haste"] = 1.64,
+				["mastery"] = 1.33,
+				["critical strike"] = 1.26,
+				["expertise"] = 0.98,
 				["attack power"] = 0.82,
 				triggers = {
 					meleeDamage = true,
@@ -315,12 +315,12 @@ ww_defaultVars = {
 			[ww_specNames["Unholy DW"]] = {
 				["melee dps"] = (3.5 + 3.2) / 2,
 				["strength"] = 3.1,
-				["hit rating"] = 1.1,
-				["haste rating"] = 1.01,
-				["mastery rating"] = 0.9,
-				["expertise rating"] = 0.82,
+				["hit"] = 1.1,
+				["haste"] = 1.01,
+				["mastery"] = 0.9,
+				["expertise"] = 0.82,
 				["attack power"] = 0.79,
-				["critical strike rating"] = 0.76,
+				["critical strike"] = 0.76,
 				triggers = {
 					meleeDamage = true,
 				},
@@ -333,12 +333,12 @@ ww_defaultVars = {
 			ww_specNames["Restoration"],
 			[ww_specNames["Balance"]] = {
 				["intellect"] = 2.97,
-				["hit rating"] = 2.4,
+				["hit"] = 2.4,
 				["spirit"] = 2.4,
 				["spell power"] = 2.3,
-				["haste rating"] = 2.15,
-				["mastery rating"] = 1.45,
-				["critical strike rating"] = 0.87,
+				["haste"] = 2.15,
+				["mastery"] = 1.45,
+				["critical strike"] = 0.87,
 				triggers = {
 					harmfulSpell = true,
 				},
@@ -348,27 +348,27 @@ ww_defaultVars = {
 				["agility"] = 3.775,
 				["strength"] = 1.445,
 				["attack power"] = 1.376,
-				["critical strike rating"] = 1.291,
-				["haste rating"] = 1.291,
-				["mastery rating"] = 1.291,
-				["expertise rating"] = 1.24,
-				["hit rating"] = 1.24,
+				["critical strike"] = 1.291,
+				["haste"] = 1.291,
+				["mastery"] = 1.291,
+				["expertise"] = 1.24,
+				["hit"] = 1.24,
 				triggers = {
 					meleeDamage = true,
 				},
 			},
 			[ww_specNames["Feral Tank"]] = {
 				["agility"] = 1,
-				["dodge rating"] = 0.88,
+				["dodge"] = 0.88,
 				["armor"] = 0.71,
-				["mastery rating"] = 0.48,
+				["mastery"] = 0.48,
 				["stamina"] = 0.31,
-				["expertise rating"] = 0.3,
-				["critical strike rating"] = 0.28,
-				["hit rating"] = 0.15,
+				["expertise"] = 0.3,
+				["critical strike"] = 0.28,
+				["hit"] = 0.15,
 				["strength"] = 0.126,
 				["attack power"] = 0.12,
-				["haste rating"] = 0.04,
+				["haste"] = 0.04,
 				triggers = {
 					meleeDamage = true,
 				},
@@ -377,9 +377,9 @@ ww_defaultVars = {
 				["intellect"] = 100,
 				["spell power"] = 85,
 				["spirit"] = 75,
-				["haste rating"] = 65,
-				["mastery rating"] = 60,
-				["critical strike rating"] = 50,
+				["haste"] = 65,
+				["mastery"] = 60,
+				["critical strike"] = 50,
 				triggers = {
 					helpfulSpell = true,
 				},
@@ -392,11 +392,11 @@ ww_defaultVars = {
 			[ww_specNames["Beast Mastery"]] = {
 				["ranged dps"] = 5.03,
 				["agility"] = 3.17,
-				["hit rating"] = 2.58,
-				["critical strike rating"] = 2.31,
-				["haste rating"] = 1.37,
+				["hit"] = 2.58,
+				["critical strike"] = 2.31,
+				["haste"] = 1.37,
 				["attack power"] = 1.2,
-				["mastery rating"] = 0.73,
+				["mastery"] = 0.73,
 				triggers = {
 					rangedDamage = true,
 				},
@@ -405,10 +405,10 @@ ww_defaultVars = {
 				["ranged weapon speed"] = 11.78,
 				["ranged dps"] = 7.68,
 				["agility"] = 3.72,
-				["hit rating"] = 3.49,
-				["critical strike rating"] = 1.66,
-				["haste rating"] = 1.61,
-				["mastery rating"] = 1.38,
+				["hit"] = 3.49,
+				["critical strike"] = 1.66,
+				["haste"] = 1.61,
+				["mastery"] = 1.38,
 				["attack power"] = 1.19,
 				triggers = {
 					rangedDamage = true,
@@ -418,11 +418,11 @@ ww_defaultVars = {
 				["ranged weapon speed"] = 7.63,
 				["ranged dps"] = 5.33,
 				["agility"] = 3.33,
-				["hit rating"] = 2.66,
-				["haste rating"] = 1.5,
+				["hit"] = 2.66,
+				["haste"] = 1.5,
 				["attack power"] = 1.04,
-				["critical strike rating"] = 1.02,
-				["mastery rating"] = 0.95,
+				["critical strike"] = 1.02,
+				["mastery"] = 0.95,
 				triggers = {
 					rangedDamage = true,
 				},
@@ -434,33 +434,33 @@ ww_defaultVars = {
 			ww_specNames["Frost"],
 			[ww_specNames["Arcane"]] = {
 				["intellect"] = 5.16,
-				["hit rating"] = 3.21,
+				["hit"] = 3.21,
 				["spell power"] = 2.8,
-				["mastery rating"] = 1.4,
-				["critical strike rating"] = 1.34,
-				["haste rating"] = 1.28,
+				["mastery"] = 1.4,
+				["critical strike"] = 1.34,
+				["haste"] = 1.28,
 				triggers = {
 					harmfulSpell = true,
 				},
 			},
 			[ww_specNames["Fire"]] = {
 				["intellect"] = 3.43,
-				["hit rating"] = 2.72,
+				["hit"] = 2.72,
 				["spell power"] = 2.57,
-				["haste rating"] = 1.59,
-				["critical strike rating"] = 1.55,
-				["mastery rating"] = 1.3,
+				["haste"] = 1.59,
+				["critical strike"] = 1.55,
+				["mastery"] = 1.3,
 				triggers = {
 					harmfulSpell = true,
 				},
 			},
 			[ww_specNames["Frost"]] = {
 				["intellect"] = 3.68,
-				["hit rating"] = 3.08,
+				["hit"] = 3.08,
 				["spell power"] = 2.66,
-				["critical strike rating"] = 1.97,
-				["haste rating"] = 1.61,
-				["mastery rating"] = 1.43,
+				["critical strike"] = 1.97,
+				["haste"] = 1.61,
+				["mastery"] = 1.43,
 				triggers = {
 					harmfulSpell = true,
 				},
@@ -474,22 +474,22 @@ ww_defaultVars = {
 				["intellect"] = 100,
 				["spell power"] = 80,
 				["spirit"] = 75,
-				["haste rating"] = 40,
-				["critical strike rating"] = 35,
-				["mastery rating"] = 30,
+				["haste"] = 40,
+				["critical strike"] = 35,
+				["mastery"] = 30,
 				triggers = {
 					helpfulSpell = true,
 				},
 			},
 			[ww_specNames["Protection"]] = {
-				["dodge rating"] = 1.23,
-				["parry rating"] = 1.23,
-				["mastery rating"] = 1,
+				["dodge"] = 1.23,
+				["parry"] = 1.23,
+				["mastery"] = 1,
 				["stamina"] = 0.6,
 				["strength"] = 0.349,
 				["armor"] = 0.155,
-				["expertise rating"] = 0.1,
-				["hit rating"] = 0.05,
+				["expertise"] = 0.1,
+				["hit"] = 0.05,
 				triggers = {
 					meleeDamage = true,
 				},
@@ -498,12 +498,12 @@ ww_defaultVars = {
 				["melee weapon speed"] = 18.848,
 				["melee dps"] = 9,
 				["strength"] = 2.33,
-				["hit rating"] = 1.55 + 0.22,
-				["expertise rating"] = 1.3,
-				["mastery rating"] = 1.13,
+				["hit"] = 1.55 + 0.22,
+				["expertise"] = 1.3,
+				["mastery"] = 1.13,
 				["attack power"] = 1,
-				["critical strike rating"] = 0.98,
-				["haste rating"] = 0.79,
+				["critical strike"] = 0.98,
+				["haste"] = 0.79,
 				triggers = {
 					harmfulSpell = true,
 					meleeDamage = true,
@@ -518,9 +518,9 @@ ww_defaultVars = {
 				["intellect"] = 100,
 				["spirit"] = 80,
 				["spell power"] = 75,
-				["mastery rating"] = 60,
-				["haste rating"] = 50,
-				["critical strike rating"] = 40,
+				["mastery"] = 60,
+				["haste"] = 50,
+				["critical strike"] = 40,
 				triggers = {
 					helpfulSpell = true,
 				},
@@ -528,10 +528,10 @@ ww_defaultVars = {
 			[ww_specNames["Holy"]] = {
 				["intellect"] = 100,
 				["spirit"] = 80,
-				["haste rating"] = 75,
+				["haste"] = 75,
 				["spell power"] = 75,
-				["mastery rating"] = 70,
-				["critical strike rating"] = 50,
+				["mastery"] = 70,
+				["critical strike"] = 50,
 				triggers = {
 					helpfulSpell = true,
 				},
@@ -539,11 +539,11 @@ ww_defaultVars = {
 			[ww_specNames["Shadow"]] = {
 				["intellect"] = 3.54,
 				["spell power"] = 2.72,
-				["haste rating"] = 2,
-				["hit rating"] = 1.92,
+				["haste"] = 2,
+				["hit"] = 1.92,
 				["spirit"] = 1.92,
-				["mastery rating"] = 1.84,
-				["critical strike rating"] = 1.67,
+				["mastery"] = 1.84,
+				["critical strike"] = 1.67,
 				triggers = {
 					harmfulSpell = true,
 				},
@@ -556,12 +556,12 @@ ww_defaultVars = {
 			[ww_specNames["Assassination"]] = {
 				["agility"] = 2.6,
 				["melee dps"] = (3.36 + 1.04) / 2,
-				["hit rating"] = 1.1 + 0.65,
-				["mastery rating"] = 1.3,
-				["haste rating"] = 1.2,
-				["expertise rating"] = 1.1,
+				["hit"] = 1.1 + 0.65,
+				["mastery"] = 1.3,
+				["haste"] = 1.2,
+				["expertise"] = 1.1,
 				["attack power"] = 1,
-				["critical strike rating"] = 0.9,
+				["critical strike"] = 0.9,
 				triggers = {
 					meleeDamage = true,
 				},
@@ -569,12 +569,12 @@ ww_defaultVars = {
 			[ww_specNames["Combat"]] = {
 				["melee dps"] = (4.97 + 1.15) / 2,
 				["agility"] = 2.7,
-				["hit rating"] = 1.65 + 0.3,
-				["expertise rating"] = 1.65,
-				["haste rating"] = 1.5,
-				["mastery rating"] = 1.2,
+				["hit"] = 1.65 + 0.3,
+				["expertise"] = 1.65,
+				["haste"] = 1.5,
+				["mastery"] = 1.2,
 				["attack power"] = 1,
-				["critical strike rating"] = 0.9,
+				["critical strike"] = 0.9,
 				["melee weapon speed"] = (4 + -9) / 2,
 				triggers = {
 					meleeDamage = true,
@@ -583,12 +583,12 @@ ww_defaultVars = {
 			[ww_specNames["Subtlety"]] = {
 				["agility"] = 3.6,
 				["melee dps"] = (4 + 1) / 2,
-				["hit rating"] = 1.15 + 0.25,
-				["haste rating"] = 1.35,
+				["hit"] = 1.15 + 0.25,
+				["haste"] = 1.35,
 				["attack power"] = 1.26,
-				["expertise rating"] = 1.15,
-				["critical strike rating"] = 1.1,
-				["mastery rating"] = 0.9,
+				["expertise"] = 1.15,
+				["critical strike"] = 1.1,
+				["mastery"] = 0.9,
 				triggers = {
 					meleeDamage = true,
 				},
@@ -601,11 +601,11 @@ ww_defaultVars = {
 			[ww_specNames["Elemental"]] = {
 				["intellect"] = 2.9,
 				["spell power"] = 2.32,
-				["hit rating"] = 1.74,
+				["hit"] = 1.74,
 				["spirit"] = 1.74,
-				["haste rating"] = 1.6,
-				["mastery rating"] = 1.33,
-				["critical strike rating"] = 1.02,
+				["haste"] = 1.6,
+				["mastery"] = 1.33,
+				["critical strike"] = 1.02,
 				triggers = {
 					harmfulSpell = true,
 				},
@@ -613,14 +613,14 @@ ww_defaultVars = {
 			[ww_specNames["Enhancement"]] = {
 				["melee dps"] = (4.34 + 3.96) / 2,
 				["agility"] = 3.51,
-				["hit rating"] = 2.15 + 1.3,
-				["expertise rating"] = 2.15,
-				["mastery rating"] = 1.73,
+				["hit"] = 2.15 + 1.3,
+				["expertise"] = 2.15,
+				["mastery"] = 1.73,
 				["strength"] = 1.41,
 				["attack power"] = 1.33,
-				["critical strike rating"] = 1.26,
+				["critical strike"] = 1.26,
 				["spell power"] = 1.06,
-				["haste rating"] = 1.03,
+				["haste"] = 1.03,
 				triggers = {
 					harmfulSpell = true,
 					meleeDamage = true,
@@ -630,9 +630,9 @@ ww_defaultVars = {
 				["intellect"] = 100,
 				["spirit"] = 90,
 				["spell power"] = 75,
-				["haste rating"] = 60,
-				["mastery rating"] = 55,
-				["critical strike rating"] = 40,
+				["haste"] = 60,
+				["mastery"] = 55,
+				["critical strike"] = 40,
 				triggers = {
 					helpfulSpell = true,
 				},
@@ -645,21 +645,21 @@ ww_defaultVars = {
 			[ww_specNames["Affliction"]] = {
 				["intellect"] = 3.11,
 				["spell power"] = 2.64,
-				["hit rating"] = 1.65,
-				["haste rating"] = 1.4,
-				["critical strike rating"] = 1.15,
-				["mastery rating"] = 1.15,
+				["hit"] = 1.65,
+				["haste"] = 1.4,
+				["critical strike"] = 1.15,
+				["mastery"] = 1.15,
 				triggers = {
 					harmfulSpell = true,
 				},
 			},
 			[ww_specNames["Demonology"]] = {
 				["intellect"] = 3,
-				["hit rating"] = 2.39,
+				["hit"] = 2.39,
 				["spell power"] = 2.39,
-				["haste rating"] = 1.5,
-				["mastery rating"] = 1.38,
-				["critical strike rating"] = 1.16,
+				["haste"] = 1.5,
+				["mastery"] = 1.38,
+				["critical strike"] = 1.16,
 				triggers = {
 					harmfulSpell = true,
 				},
@@ -667,10 +667,10 @@ ww_defaultVars = {
 			[ww_specNames["Destruction"]] = {
 				["intellect"] = 3.01,
 				["spell power"] = 2.35,
-				["haste rating"] = 1.54,
-				["hit rating"] = 1.51,
-				["critical strike rating"] = 1.21,
-				["mastery rating"] = 0.75,
+				["haste"] = 1.54,
+				["hit"] = 1.51,
+				["critical strike"] = 1.21,
+				["mastery"] = 0.75,
 				triggers = {
 					harmfulSpell = true,
 				},
@@ -684,12 +684,12 @@ ww_defaultVars = {
 			[ww_specNames["Arms"]] = {
 				["melee dps"] = 10.57,
 				["strength"] = 2.02,
-				["hit rating"] = 2,
-				["expertise rating"] = 1.46,
-				["critical strike rating"] = 1.34,
-				["mastery rating"] = 0.9,
+				["hit"] = 2,
+				["expertise"] = 1.46,
+				["critical strike"] = 1.34,
+				["mastery"] = 0.9,
 				["attack power"] = 0.88,
-				["haste rating"] = 0.8,
+				["haste"] = 0.8,
 				triggers = {
 					meleeDamage = true,
 				},
@@ -697,12 +697,12 @@ ww_defaultVars = {
 			[ww_specNames["Fury"]] = {
 				["melee dps"] = (5.21 + 3) / 2,
 				["strength"] = 3.25,
-				["hit rating"] = 3.2,
-				["expertise rating"] = 2.29,
-				["critical strike rating"] = 2.02,
+				["hit"] = 3.2,
+				["expertise"] = 2.29,
+				["critical strike"] = 2.02,
 				["attack power"] = 1.45,
-				["haste rating"] = 1.33,
-				["mastery rating"] = 1.24,
+				["haste"] = 1.33,
+				["mastery"] = 1.24,
 				triggers = {
 					meleeDamage = true,
 				},
@@ -710,25 +710,25 @@ ww_defaultVars = {
 			[ww_specNames["Fury TG"]] = {
 				["melee dps"] = (5.91 + 2.7) / 2,
 				["strength"] = 2.98,
-				["expertise rating"] = 2.47,
-				["hit rating"] = 2.47,
-				["critical strike rating"] = 1.98,
-				["mastery rating"] = 1.57,
-				["haste rating"] = 1.37,
+				["expertise"] = 2.47,
+				["hit"] = 2.47,
+				["critical strike"] = 1.98,
+				["mastery"] = 1.57,
+				["haste"] = 1.37,
 				["attack power"] = 1.36,
 				triggers = {
 					meleeDamage = true,
 				},
 			},
 			[ww_specNames["Protection"]] = {
-				["parry rating"] = 1.54,
-				["dodge rating"] = 1.496,
-				["mastery rating"] = 1,
+				["parry"] = 1.54,
+				["dodge"] = 1.496,
+				["mastery"] = 1,
 				["stamina"] = 0.6,
 				["strength"] = 0.437,
 				["armor"] = 0.155,
-				["expertise rating"] = 0.1,
-				["hit rating"] = 0.05,
+				["expertise"] = 0.1,
+				["hit"] = 0.05,
 				triggers = {
 					meleeDamage = true,
 				},