diff --git a/Core/AtlasLoot.lua b/Core/AtlasLoot.lua
index 61ec98b..7506ff5 100644
--- a/Core/AtlasLoot.lua
+++ b/Core/AtlasLoot.lua
@@ -2574,7 +2574,7 @@ AtlasLoot_HewdropDown_SubTables = {
 	["CavernsOfTimeBlackMorass"] = {
 		{ AL["Chronar"], "COTBMChronar" },
 		{ AL["Epidamu"], "COTBMEpidamu" },
-		{ AL["Drifting Avatar of Time"], "COTBMDriftingAvatar" },
+		{ AL["Drifting Avatar of Sand"], "COTBMDriftingAvatar" },
 		{ AL["Time-Lord Epochronos"], "COTBMTimeLordEpochronos" },
 		{ AL["Mossheart"], "COTBMMossheart" },
 		{ AL["Rotmaw"], "COTBMRotmaw" },
diff --git a/Core/ButtonRegistry.lua b/Core/ButtonRegistry.lua
index 5f97e60..58f2334 100644
--- a/Core/ButtonRegistry.lua
+++ b/Core/ButtonRegistry.lua
@@ -650,14 +650,14 @@ AtlasLoot_ButtonRegistry = {
 	["COTBMEpidamu"] = {
 		Title = AL["Epidamu"];
 		Next_Page = "COTBMDriftingAvatar";
-		Next_Title = AL["Drifting Avatar of Time"];
+		Next_Title = AL["Drifting Avatar of Sand"];
 		Prev_Page = "COTBMChronar";
 		Prev_Title = AL["Chronar"];
 		Back_Page = "DUNGEONSMENU1";
 		Back_Title = AL["Dungeons & Raids"];
 	};
 	["COTBMDriftingAvatar"] = {
-		Title = AL["Drifting Avatar of Time"];
+		Title = AL["Drifting Avatar of Sand"];
 		Next_Page = "COTBMTimeLordEpochronos";
 		Next_Title = AL["Time-Lord Epochronos"];
 		Prev_Page = "COTBMEpidamu";
@@ -670,7 +670,7 @@ AtlasLoot_ButtonRegistry = {
 		Next_Page = "COTBMMossheart";
 		Next_Title = AL["Mossheart"];
 		Prev_Page = "COTBMDriftingAvatar";
-		Prev_Title = AL["Drifting Avatar of Time"];
+		Prev_Title = AL["Drifting Avatar of Sand"];
 		Back_Page = "DUNGEONSMENU1";
 		Back_Title = AL["Dungeons & Raids"];
 	};
diff --git a/Instances/instances.en.lua b/Instances/instances.en.lua
index 96bdc5f..301a149 100644
--- a/Instances/instances.en.lua
+++ b/Instances/instances.en.lua
@@ -3075,7 +3075,7 @@ AtlasLoot_Data["AtlasLootItems"] = {
 		{ 0, "", "", "" },
 		{ 60496, "INV_misc_head_dragon_black", "=q1=Head of Chronar", "=ds=#m3#", "100%" },
 	};
-	COTBMHarbingerAphygth = {
+	--[[COTBMHarbingerAphygth = {
 		{ 50203, "INV_enchant_dustsoul", "=q2=Corrupted Sand", "=ds=#m3#, 15-20", "100%" },
 		{ 0, "", "", "" },
 		{ 61015, "INV_jewelry_necklace_04", "=q3=Hollowbone Choker", "=ds=#s2#", "14%" },
@@ -3087,7 +3087,7 @@ AtlasLoot_Data["AtlasLootItems"] = {
 		{ 61057, "INV_gauntlets_24", "=q3=Arcanic Gloves", "=ds=#s9#, #a2#", "14%" },
 		{ 0, "", "", "" },
 		{ 61020, "INV_Wand_02", "=q4=Lodestone", "=ds=#w12#", "2%" },
-	};
+	};]]
 	COTBMEpidamu = {
 		{ 50203, "INV_enchant_dustsoul", "=q2=Corrupted Sand", "=ds=#m3#, 15-20", "100%" },
 		{ 0, "", "", "" },
diff --git a/Locale/locale.en.lua b/Locale/locale.en.lua
index f85f9ae..ce7ebdb 100644
--- a/Locale/locale.en.lua
+++ b/Locale/locale.en.lua
@@ -867,9 +867,10 @@ AL:RegisterTranslations("enUS", function() return {
 	["Half-Buried Treasure Chest"] = true,
 	["[60] Caverns of Time: Black Morass"] = "|cffffffff[60]|cffffd200 Caverns of Time: Black Morass",
 	["Caverns of Time: Black Morass"] = true,
+	["Black Morass"] = true,
 	["Chronar"] = true,
 	["Epidamu"] = true,
-	["Drifting Avatar of Time"] = true,
+	["Drifting Avatar of Sand"] = true,
 	["Time-Lord Epochronos"] = true,
 	["Mossheart"] = true,
 	["Rotmaw"] = true,
diff --git a/Sets/sets.lua b/Sets/sets.lua
index bfc1035..44cb2ce 100644
--- a/Sets/sets.lua
+++ b/Sets/sets.lua
@@ -380,7 +380,7 @@ AtlasLoot_Data["AtlasLootSetItems"] = {
 		{ 22506, "INV_Crown_01", "=q4=Plagueheart Circlet", "=ds=#s1#, #a1# =q7=#db4#" },
 		{ 22507, "INV_Shoulder_25", "=q4=Plagueheart Shoulderpads", "=ds=#s3#, #a1# =q7=#db1#=ds=, =q7=#db2#=ds=, =q7=#db3#" },
 		{ 22504, "INV_Chest_Cloth_43", "=q4=Plagueheart Robe", "=ds=#s5#, #a1# =q7=#db13#" },
-		{ 22511, "INV_Bracer_13", "=q4=Plagueheart Bindings", "=ds=#s8#, #a1# =q7=#db5#=ds=, =q7=#db6#=ds=, =q7=#db3#" },
+		{ 22511, "INV_Bracer_13", "=q4=Plagueheart Bracers", "=ds=#s8#, #a1# =q7=#db5#=ds=, =q7=#db6#=ds=, =q7=#db3#" },
 		{ 22509, "INV_Gauntlets_17", "=q4=Plagueheart Gloves", "=ds=#s9#, #a1# =q7=#db7#" },
 		{ 22510, "INV_Belt_03", "=q4=Plagueheart Belt", "=ds=#s10#, #a1# =q7=#db8#=ds=, =q7=#db9#=ds=, =q7=#db3#" },
 		{ 22505, "INV_Pants_Cloth_05", "=q4=Plagueheart Leggings", "=ds=#s11#, #a1# =q7=#db10#" },
@@ -443,9 +443,9 @@ AtlasLoot_Data["AtlasLootSetItems"] = {
 		{ 22490, "INV_Helmet_15", "=q4=Dreamwalker Headpiece", "=ds=#s1#, #a2# =q7=#db4#" },
 		{ 22491, "INV_Shoulder_14", "=q4=Dreamwalker Spaulders", "=ds=#s3#, #a2# =q7=#db1#=ds=, =q7=#db2#=ds=, =q7=#db3#" },
 		{ 22488, "INV_Chest_Chain_15", "=q4=Dreamwalker Tunic", "=ds=#s5#, #a2# =q7=#db13#" },
-		{ 22495, "INV_Bracer_02", "=q4=Dreamwalker Wristguards", "=ds=#s8#, #a2# =q7=#db5#=ds=, =q7=#db6#=ds=, =q7=#db3#" },
+		{ 22495, "INV_Bracer_02", "=q4=Dreamwalker Bracers", "=ds=#s8#, #a2# =q7=#db5#=ds=, =q7=#db6#=ds=, =q7=#db3#" },
 		{ 22493, "INV_Gauntlets_25", "=q4=Dreamwalker Handguards", "=ds=#s9#, #a2# =q7=#db7#" },
-		{ 22494, "INV_Belt_22", "=q4=Dreamwalker Girdle", "=ds=#s10#, #a2# =q7=#db8#=ds=, =q7=#db9#=ds=, =q7=#db3#" },
+		{ 22494, "INV_Belt_22", "=q4=Dreamwalker Belt", "=ds=#s10#, #a2# =q7=#db8#=ds=, =q7=#db9#=ds=, =q7=#db3#" },
 		{ 22489, "INV_Pants_Mail_15", "=q4=Dreamwalker Legguards", "=ds=#s11#, #a2# =q7=#db10#" },
 		{ 22492, "INV_Boots_Chain_05", "=q4=Dreamwalker Boots", "=ds=#s12#, #a2# =q7=#db11#=ds=, =q7=#db12#=ds=, =q7=#db3#" },
 		{ 23064, "INV_Jewelry_Ring_51Naxxramas", "=q4=Ring of the Dreamwalker", "=ds=#s13# =q7=#db14#" },
@@ -513,13 +513,13 @@ AtlasLoot_Data["AtlasLootSetItems"] = {
 		{ 47179, "INV_Jewelry_Ring_51Naxxramas", "=q4=Loop of the Earthshatterer", "=ds=#s13#" },
 	};
 	T3Paladin = {
-		{ 22428, "INV_Helmet_15", "=q4=Redemption Headpiece", "=ds=#s1#, #a4# =q7=#db4#" },
+		{ 22428, "INV_Helmet_15", "=q4=Redemption Helm", "=ds=#s1#, #a4# =q7=#db4#" },
 		{ 22429, "INV_Shoulder_14", "=q4=Redemption Spaulders", "=ds=#s3#, #a4# =q7=#db1#=ds=, =q7=#db2#=ds=, =q7=#db3#" },
 		{ 22425, "INV_Chest_Chain_15", "=q4=Redemption Tunic", "=ds=#s5#, #a4# =q7=#db13#" },
-		{ 22424, "INV_Bracer_02", "=q4=Redemption Wristguards", "=ds=#s8#, #a4# =q7=#db5#=ds=, =q7=#db6#=ds=, =q7=#db3#" },
-		{ 22426, "INV_Gauntlets_25", "=q4=Redemption Handguards", "=ds=#s9#, #a4# =q7=#db7#" },
-		{ 22431, "INV_Belt_22", "=q4=Redemption Girdle", "=ds=#s10#, #a4# =q7=#db8#=ds=, =q7=#db9#=ds=, =q7=#db3#" },
-		{ 22427, "INV_Pants_Mail_15", "=q4=Redemption Legguards", "=ds=#s11#, #a4# =q7=#db10#" },
+		{ 22424, "INV_Bracer_02", "=q4=Redemption Bracers", "=ds=#s8#, #a4# =q7=#db5#=ds=, =q7=#db6#=ds=, =q7=#db3#" },
+		{ 22426, "INV_Gauntlets_25", "=q4=Redemption Gloves", "=ds=#s9#, #a4# =q7=#db7#" },
+		{ 22431, "INV_Belt_22", "=q4=Redemption Belt", "=ds=#s10#, #a4# =q7=#db8#=ds=, =q7=#db9#=ds=, =q7=#db3#" },
+		{ 22427, "INV_Pants_Mail_15", "=q4=Redemption Pants", "=ds=#s11#, #a4# =q7=#db10#" },
 		{ 22430, "INV_Boots_Chain_05", "=q4=Redemption Boots", "=ds=#s12#, #a4# =q7=#db11#=ds=, =q7=#db12#=ds=, =q7=#db3#" },
 		{ 23066, "INV_Jewelry_Ring_51Naxxramas", "=q4=Ring of Redemption", "=ds=#s13# =q7=#db14#" },
 		{ 0, "", "", "" },
diff --git a/TableRegister/loottables.en.lua b/TableRegister/loottables.en.lua
index fc046e9..48b8d1e 100644
--- a/TableRegister/loottables.en.lua
+++ b/TableRegister/loottables.en.lua
@@ -381,15 +381,15 @@ AtlasLoot_TableNames = {
 	["KCTreasure"] = { AL["Karazhan Crypt"].." - "..AL["Half-Buried Treasure Chest"], "AtlasLootItems" },
 	["KCTrash"] = { AL["Karazhan Crypt"].." - "..AL["Trash Mobs"], "AtlasLootItems" },
 	-- Caverns of Time: Black Morass
-	["COTBMChronar"] = { AL["Caverns of Time: Black Morass"].." - "..AL["Chronar"], "AtlasLootItems" },
-	["COTBMEpidamu"] = { AL["Caverns of Time: Black Morass"].." - "..AL["Epidamu"], "AtlasLootItems" },
-	["COTBMDriftingAvatar"] = { AL["Caverns of Time: Black Morass"].." - "..AL["Drifting Avatar of Time"], "AtlasLootItems" },
-	["COTBMTimeLordEpochronos"] = { AL["Caverns of Time: Black Morass"].." - "..AL["Time-Lord Epochronos"], "AtlasLootItems" },
-	["COTBMMossheart"] = { AL["Caverns of Time: Black Morass"].." - "..AL["Mossheart"], "AtlasLootItems" },
-	["COTBMRotmaw"] = { AL["Caverns of Time: Black Morass"].." - "..AL["Rotmaw"], "AtlasLootItems" },
-	["COTBMAntnormi"] = { AL["Caverns of Time: Black Morass"].." - "..AL["Antnormi"], "AtlasLootItems" },
-	["COTTrash"] = { AL["Caverns of Time: Black Morass"].." - "..AL["Trash Mobs"], "AtlasLootItems" },
-	["COTBMInfiniteChromie"] = { AL["Caverns of Time: Black Morass"].." - "..AL["Infinite Chromie"], "AtlasLootItems" },
+	["COTBMChronar"] = { AL["Black Morass"].." - "..AL["Chronar"], "AtlasLootItems" },
+	["COTBMEpidamu"] = { AL["Black Morass"].." - "..AL["Epidamu"], "AtlasLootItems" },
+	["COTBMDriftingAvatar"] = { AL["Black Morass"].." - "..AL["Drifting Avatar of Sand"], "AtlasLootItems" },
+	["COTBMTimeLordEpochronos"] = { AL["Black Morass"].." - "..AL["Time-Lord Epochronos"], "AtlasLootItems" },
+	["COTBMMossheart"] = { AL["Black Morass"].." - "..AL["Mossheart"], "AtlasLootItems" },
+	["COTBMRotmaw"] = { AL["Black Morass"].." - "..AL["Rotmaw"], "AtlasLootItems" },
+	["COTBMAntnormi"] = { AL["Black Morass"].." - "..AL["Antnormi"], "AtlasLootItems" },
+	["COTTrash"] = { AL["Black Morass"].." - "..AL["Trash Mobs"], "AtlasLootItems" },
+	["COTBMInfiniteChromie"] = { AL["Black Morass"].." - "..AL["Infinite Chromie"], "AtlasLootItems" },
 	-- Stormwind Vault
 	["SWVAszoshGrimflame"] = { AL["Stormwind Vault"].." - "..AL["Aszosh Grimflame"], "AtlasLootItems" },
 	["SWVThamGrarr"] = { AL["Stormwind Vault"].." - "..AL["Tham'Grarr"], "AtlasLootItems" },
@@ -1241,7 +1241,7 @@ AtlasLoot_TableNamesBoss = {
 	["Caverns of Time: Black Morass"] = {
 		["COTBMChronar"] = { AL["Chronar"], "AtlasLootItems" },
 		["COTBMEpidamu"] = { AL["Epidamu"], "AtlasLootItems" },
-		["COTBMDriftingAvatar"] = { AL["Drifting Avatar of Time"], "AtlasLootItems" },
+		["COTBMDriftingAvatar"] = { AL["Drifting Avatar of Sand"], "AtlasLootItems" },
 		["COTBMTimeLordEpochronos"] = { AL["Time-Lord Epochronos"], "AtlasLootItems" },
 		["COTBMMossheart"] = { AL["Mossheart"], "AtlasLootItems" },
 		["COTBMRotmaw"] = { AL["Rotmaw"], "AtlasLootItems" },