diff --git a/APR-Core/ChangeLog.lua b/APR-Core/ChangeLog.lua
index e67c9a81..b8d9f69d 100644
--- a/APR-Core/ChangeLog.lua
+++ b/APR-Core/ChangeLog.lua
@@ -79,6 +79,11 @@ end
 
 function APR.changelog:SetChangeLog()
     local news = {
+        { "v4.5.4", "2024-10-29" },
+        "#Bugs",
+        "- Fixed starting route assign function causing lua error",
+        "- Changed 'ZoneDoneSave' to 'RouteCompleted'",
+
         { "v4.5.3", "2024-10-29" },
         "#Features",
         "- Added new starting route for other Dracthyr classes",
diff --git a/APR-Core/QuestHandler.lua b/APR-Core/QuestHandler.lua
index 673a35e2..12105c73 100644
--- a/APR-Core/QuestHandler.lua
+++ b/APR-Core/QuestHandler.lua
@@ -783,7 +783,7 @@ function APR:UpdateStep()
                 APR:UpdateQuestAndStep()
             end)
         end
-        if (step.ZoneDoneSave) then
+        if (step.RouteCompleted) then
             local index, currentRouteName = next(APRCustomPath[APR.PlayerID])
 
             -- Force reset heirloom to show heirloom taximap (not avalaible in exile reach)
diff --git a/APR-Core/QuestOrderList.lua b/APR-Core/QuestOrderList.lua
index e4257aa4..55a17e22 100644
--- a/APR-Core/QuestOrderList.lua
+++ b/APR-Core/QuestOrderList.lua
@@ -612,7 +612,7 @@ function APR.questOrderList:AddStepFromRoute(forceRendering)
                 AddStepFrame(stepIndex, L["GRIND"] .. " " .. step.Grind, color)
             elseif (step.GossipOptionIDs or step.GossipOptionID) and step.NPCIDs then
                 AddStepFrame(stepIndex, L["TALK_NPC"], "gray")
-            elseif step.ZoneDoneSave then
+            elseif step.RouteCompleted then
                 AddStepFrame(stepIndex, L["ROUTE_COMPLETED"], "gray")
             end
             stepIndex = stepIndex + 1
diff --git a/APR-Core/StatusReport.lua b/APR-Core/StatusReport.lua
index 4564a766..91a3aafd 100644
--- a/APR-Core/StatusReport.lua
+++ b/APR-Core/StatusReport.lua
@@ -83,7 +83,7 @@ function APR:getStatusReportInfos()
         charName = { "Name", APR.Username },
         charRealm = { "Realm", GetRealmName() },
         charLevel = { "Level", APR.Level },
-        charClass = { "Class", APR.ClassName }
+        charClass = { "Class", APR:titleCase(APR.ClassName) }
     }
 
     return infoTable
diff --git a/APR-Core/database/AllianceRoutes.lua b/APR-Core/database/AllianceRoutes.lua
index 6cb4132e..53e7364c 100644
--- a/APR-Core/database/AllianceRoutes.lua
+++ b/APR-Core/database/AllianceRoutes.lua
@@ -152,27 +152,24 @@ if (APR.Faction == "Alliance") then
 
     -- WARNING Class before race
     ---
-    local function applyStartingRoute()
-        local route
-        if APR.ClassId == APR.Classes["Demon Hunter"] then
-            route = startRoutes["Demon Hunter"]
-        elseif APR.ClassId == APR.Classes["Death Knight"] then
-            -- Use allied start if race ID is >= 23; otherwise, default Death Knight start
-            route = APR.RaceID >= 23 and startRoutes["Death Knight"].allied or startRoutes["Death Knight"].default
-        elseif APR.Race == "Dracthyr" then
-            -- Check for Dracthyr Evoker-specific start, else use general Dracthyr start
-            route = APR.ClassId == APR.Classes.Evoker and startRoutes.Dracthyr.evoker or
-                startRoutes.Dracthyr.default
-        else
-            route = startRoutes[APR.Race]
-        end
-        if route then
-            assignRoute(route.expansion, route.key, route.label)
-        end
+
+    local route
+    if APR.ClassId == APR.Classes["Demon Hunter"] then
+        route = startRoutes["Demon Hunter"]
+    elseif APR.ClassId == APR.Classes["Death Knight"] then
+        -- Use allied start if race ID is >= 23; otherwise, default Death Knight start
+        route = APR.RaceID >= 23 and startRoutes["Death Knight"].allied or startRoutes["Death Knight"].default
+    elseif APR.Race == "Dracthyr" then
+        -- Check for Dracthyr Evoker-specific start, else use general Dracthyr start
+        route = APR.ClassId == APR.Classes.Evoker and startRoutes.Dracthyr.evoker or
+            startRoutes.Dracthyr.default
+    else
+        route = startRoutes[APR.Race]
+    end
+    if route and route.expansion and route.key and route.label then
+        assignRoute(route.expansion, route.key, route.label)
     end
 
-    -- Apply starting route based on class and race
-    applyStartingRoute()
 
     -- Lumbermill Wod route
     -- Special case for Warlords of Draenor route based on quest completion
diff --git a/APR-Core/database/HordeRoutes.lua b/APR-Core/database/HordeRoutes.lua
index 802443aa..8ed137b7 100644
--- a/APR-Core/database/HordeRoutes.lua
+++ b/APR-Core/database/HordeRoutes.lua
@@ -98,10 +98,6 @@ if (APR.Faction == "Horde") then
 
     -- Starting Route or custom
     ---
-    local function assignRoute(expansion, key, label)
-        APR.RouteList[expansion][key] = label
-    end
-
     local startRoutes = {
         Orc = { expansion = "Vanilla", key = "1-ValleyOfTrialsOrc", label = "Orc Start" },
         Scourge = { expansion = "Vanilla", key = "465-TirisfalGladesUndead", label = "Undead Start" },
@@ -139,36 +135,37 @@ if (APR.Faction == "Horde") then
         EarthenDwarf = { expansion = "TheWarWithin", key = "2248-TWW-Earthen", label = "Earthen Dwarf Start" }
     }
 
+
+    local function assignRoute(expansion, key, label)
+        APR.RouteList[expansion][key] = label
+    end
+
     -- WARNING Class before race
     ---
-    local function applyStartingRoute()
-        local route
-        if APR.ClassId == APR.Classes["Demon Hunter"] then
-            route = startRoutes["Demon Hunter"]
-        elseif APR.ClassId == APR.Classes["Death Knight"] then
-            -- Use allied start if race ID is >= 23; otherwise, default Death Knight start
-            route = APR.RaceID >= 23 and startRoutes["Death Knight"].allied or startRoutes["Death Knight"].default
-        elseif APR.Race == "Dracthyr" then
-            -- Check for Dracthyr Evoker-specific start, else use general Dracthyr start
-            route = APR.ClassId == APR.Classes.Evoker and startRoutes.Dracthyr.evoker or
-                startRoutes.Dracthyr.default
-        elseif APR.Race == "Goblin" then
-            local gob = startRoutes.Goblin
-            assignRoute(gob.main.expansion, gob.main.key, gob.main.label)
-            route = gob.secondary
-        elseif APR.Race == "Troll" and startRoutes.Troll[APR.ClassId] then
-            local trollRoute = startRoutes.Troll[APR.ClassId]
-            assignRoute(trollRoute.expansion, trollRoute.key, trollRoute.label)
-        else
-            route = startRoutes[APR.Race]
-        end
-        if route then
-            assignRoute(route.expansion, route.key, route.label)
-        end
+    local route
+    if APR.ClassId == APR.Classes["Demon Hunter"] then
+        route = startRoutes["Demon Hunter"]
+    elseif APR.ClassId == APR.Classes["Death Knight"] then
+        -- Use allied start if race ID is >= 23; otherwise, default Death Knight start
+        route = APR.RaceID >= 23 and startRoutes["Death Knight"].allied or startRoutes["Death Knight"].default
+    elseif APR.Race == "Dracthyr" then
+        -- Check for Dracthyr Evoker-specific start, else use general Dracthyr start
+        route = APR.ClassId == APR.Classes.Evoker and startRoutes.Dracthyr.evoker or
+            startRoutes.Dracthyr.default
+    elseif APR.Race == "Goblin" then
+        local gob = startRoutes.Goblin
+        assignRoute(gob.main.expansion, gob.main.key, gob.main.label)
+        route = gob.secondary
+    elseif APR.Race == "Troll" and startRoutes.Troll[APR:titleCase(APR.ClassName)] then
+        local trollRoute = startRoutes.Troll[APR:titleCase(APR.ClassName)]
+        assignRoute(trollRoute.expansion, trollRoute.key, trollRoute.label)
+    else
+        route = startRoutes[APR.Race]
+    end
+    if route and route.expansion and route.key and route.label then
+        assignRoute(route.expansion, route.key, route.label)
     end
 
-    -- Apply starting route based on class and race
-    applyStartingRoute()
 
     -- Lumbermill Wod route
     -- Special case for Warlords of Draenor route based on quest completion
diff --git a/APR-Core/helpers/StepHelper.lua b/APR-Core/helpers/StepHelper.lua
index fd5c9e53..56e3b117 100644
--- a/APR-Core/helpers/StepHelper.lua
+++ b/APR-Core/helpers/StepHelper.lua
@@ -18,7 +18,7 @@ function APR:GetStepString(step)
         GetFP = L["GET_FLIGHTPATH"],
         UseFlightPath = L["USE_FLIGHTPATH"],
         WarMode = L["TURN_ON_WARMODE"],
-        ZoneDoneSave = L["ROUTE_COMPLETED"]
+        RouteCompleted = L["ROUTE_COMPLETED"]
     }
 
     for key, _ in pairs(step) do
diff --git a/APR-Core/helpers/Utils.lua b/APR-Core/helpers/Utils.lua
index 84fe4759..a4ce4b9e 100644
--- a/APR-Core/helpers/Utils.lua
+++ b/APR-Core/helpers/Utils.lua
@@ -187,3 +187,9 @@ function APR:ExtractColorAndText(text)
         return nil, text
     end
 end
+
+function APR:titleCase(str)
+    return (str:gsub("(%a)([%w_']*)", function(first, rest)
+        return first:upper() .. rest:lower()
+    end))
+end
diff --git a/Routes/BattleForAzeroth/BattleForAzeroth_Alliance.lua b/Routes/BattleForAzeroth/BattleForAzeroth_Alliance.lua
index 0dc772d7..17692bb0 100644
--- a/Routes/BattleForAzeroth/BattleForAzeroth_Alliance.lua
+++ b/Routes/BattleForAzeroth/BattleForAzeroth_Alliance.lua
@@ -174,7 +174,7 @@ if APR.Faction == "Alliance" then
             _index = 28,
         },
         {
-            ZoneDoneSave = 1,
+            RouteCompleted = 1,
             _index = 29,
         },
     }
@@ -4126,7 +4126,7 @@ if APR.Faction == "Alliance" then
             _index = 652,
         },
         {
-            ZoneDoneSave = 1,
+            RouteCompleted = 1,
             _index = 653,
         },
     }
@@ -7009,7 +7009,7 @@ if APR.Faction == "Alliance" then
             _index = 471,
         },
         {
-            ZoneDoneSave = 1,
+            RouteCompleted = 1,
             _index = 472,
         },
     }
@@ -10135,7 +10135,7 @@ if APR.Faction == "Alliance" then
             _index = 492,
         },
         {
-            ZoneDoneSave = 1,
+            RouteCompleted = 1,
             _index = 493,
         },
     }
@@ -10181,7 +10181,7 @@ if APR.Faction == "Alliance" then
             _index = 6,
         },
         {
-            ZoneDoneSave = 1,
+            RouteCompleted = 1,
             _index = 7,
         },
     }
@@ -10227,7 +10227,7 @@ if APR.Faction == "Alliance" then
             _index = 6,
         },
         {
-            ZoneDoneSave = 1,
+            RouteCompleted = 1,
             _index = 7,
         },
     }
@@ -10301,7 +10301,7 @@ if APR.Faction == "Alliance" then
             _index = 10,
         },
         {
-            ZoneDoneSave = 1,
+            RouteCompleted = 1,
             _index = 11,
         },
     }
diff --git a/Routes/BattleForAzeroth/BattleForAzeroth_Horde.lua b/Routes/BattleForAzeroth/BattleForAzeroth_Horde.lua
index 29da3bde..5cb31ba2 100644
--- a/Routes/BattleForAzeroth/BattleForAzeroth_Horde.lua
+++ b/Routes/BattleForAzeroth/BattleForAzeroth_Horde.lua
@@ -532,7 +532,7 @@ if APR.Faction == "Horde" then
             _index = 61,
         },
         {
-            ZoneDoneSave = 1,
+            RouteCompleted = 1,
             _index = 62,
         },
     }
@@ -4006,7 +4006,7 @@ if APR.Faction == "Horde" then
             _index = 566,
         },
         {
-            ZoneDoneSave = 1,
+            RouteCompleted = 1,
             _index = 567,
         },
     }
@@ -6518,7 +6518,7 @@ if APR.Faction == "Horde" then
             _index = 418,
         },
         {
-            ZoneDoneSave = 1,
+            RouteCompleted = 1,
             _index = 419,
         },
     }
@@ -6649,7 +6649,7 @@ if APR.Faction == "Horde" then
             _index = 20,
         },
         {
-            ZoneDoneSave = 1,
+            RouteCompleted = 1,
             _index = 21,
         },
     }
@@ -8891,7 +8891,7 @@ if APR.Faction == "Horde" then
             _index = 374,
         },
         {
-            ZoneDoneSave = 1,
+            RouteCompleted = 1,
             _index = 375,
         },
     }
@@ -8937,7 +8937,7 @@ if APR.Faction == "Horde" then
             _index = 6,
         },
         {
-            ZoneDoneSave = 1,
+            RouteCompleted = 1,
             _index = 7,
         },
     }
@@ -9038,7 +9038,7 @@ if APR.Faction == "Horde" then
             _index = 14,
         },
         {
-            ZoneDoneSave = 1,
+            RouteCompleted = 1,
             _index = 15,
         },
     }
@@ -9146,7 +9146,7 @@ if APR.Faction == "Horde" then
             _index = 15,
         },
         {
-            ZoneDoneSave = 1,
+            RouteCompleted = 1,
             _index = 16,
         },
     }
diff --git a/Routes/Cataclysm/Cataclysm_Alliance.lua b/Routes/Cataclysm/Cataclysm_Alliance.lua
index 3ffdcbe2..70ab081c 100644
--- a/Routes/Cataclysm/Cataclysm_Alliance.lua
+++ b/Routes/Cataclysm/Cataclysm_Alliance.lua
@@ -1149,7 +1149,7 @@ if (APR.Faction == "Alliance") then
             _index = 211,
         },
         {
-            ZoneDoneSave = 1,
+            RouteCompleted = 1,
             _index = 212,
         },
     }
diff --git a/Routes/Cataclysm/Cataclysm_Horde.lua b/Routes/Cataclysm/Cataclysm_Horde.lua
index c7910fad..da23af2d 100644
--- a/Routes/Cataclysm/Cataclysm_Horde.lua
+++ b/Routes/Cataclysm/Cataclysm_Horde.lua
@@ -509,7 +509,7 @@ if (APR.Faction == "Horde") then
             _index = 86,
         },
         {
-            ZoneDoneSave = 1,
+            RouteCompleted = 1,
             _index = 87,
         },
     }
@@ -1627,7 +1627,7 @@ if (APR.Faction == "Horde") then
             _index = 199,
         },
         {
-            ZoneDoneSave = 1,
+            RouteCompleted = 1,
             _index = 200,
         },
     }
diff --git a/Routes/Dragonflight/Dragonflight.lua b/Routes/Dragonflight/Dragonflight.lua
index 250ff48c..e11283ee 100644
--- a/Routes/Dragonflight/Dragonflight.lua
+++ b/Routes/Dragonflight/Dragonflight.lua
@@ -1616,7 +1616,7 @@ APR.RouteQuestStepList["2022-DF03N-WakingShores"] = {
         _index = 251,
     },
     {
-        ZoneDoneSave = 1,
+        RouteCompleted = 1,
         _index = 252,
     },
 }
@@ -3410,7 +3410,7 @@ APR.RouteQuestStepList["2023-DF04-OhnahranPlains"] = {
         _index = 293,
     },
     {
-        ZoneDoneSave = 1,
+        RouteCompleted = 1,
         _index = 294,
     },
 }
@@ -5550,7 +5550,7 @@ APR.RouteQuestStepList["2024-DF05-AzureSpan"] = {
         _index = 358,
     },
     {
-        ZoneDoneSave = 1,
+        RouteCompleted = 1,
         _index = 359,
     },
 }
@@ -6647,7 +6647,7 @@ APR.RouteQuestStepList["2118-DracthyrStart-Evo"] = {
         _index = 161,
     },
     {
-        ZoneDoneSave = 1,
+        RouteCompleted = 1,
         _index = 162,
     },
 }
@@ -6685,7 +6685,7 @@ APR.RouteQuestStepList["2118-DracthyrStart-Other"] = {
         _index = 4,
     },
     {
-        ZoneDoneSave = 1,
+        RouteCompleted = 1,
         _index = 5,
     },
 }
diff --git a/Routes/Dragonflight/Dragonflight_Alliance.lua b/Routes/Dragonflight/Dragonflight_Alliance.lua
index 11b4bb83..cff543c8 100644
--- a/Routes/Dragonflight/Dragonflight_Alliance.lua
+++ b/Routes/Dragonflight/Dragonflight_Alliance.lua
@@ -114,7 +114,7 @@ if APR.Faction == "Alliance" then
             _index = 19,
         },
         {
-            ZoneDoneSave = 1,
+            RouteCompleted = 1,
             _index = 20,
         },
     }
@@ -451,7 +451,7 @@ if APR.Faction == "Alliance" then
             _index = 53,
         },
         {
-            ZoneDoneSave = 1,
+            RouteCompleted = 1,
             _index = 54,
         },
     }
@@ -1379,7 +1379,7 @@ if APR.Faction == "Alliance" then
             _index = 158,
         },
         {
-            ZoneDoneSave = 1,
+            RouteCompleted = 1,
             _index = 159,
         },
     }
diff --git a/Routes/Dragonflight/Dragonflight_horde.lua b/Routes/Dragonflight/Dragonflight_horde.lua
index 7a216e7c..7088e95d 100644
--- a/Routes/Dragonflight/Dragonflight_horde.lua
+++ b/Routes/Dragonflight/Dragonflight_horde.lua
@@ -131,7 +131,7 @@ if APR.Faction == "Horde" then
             _index = 19,
         },
         {
-            ZoneDoneSave = 1,
+            RouteCompleted = 1,
             _index = 20,
         },
     }
@@ -468,7 +468,7 @@ if APR.Faction == "Horde" then
             _index = 53,
         },
         {
-            ZoneDoneSave = 1,
+            RouteCompleted = 1,
             _index = 54,
         },
     }
@@ -1455,7 +1455,7 @@ if APR.Faction == "Horde" then
             _index = 162,
         },
         {
-            ZoneDoneSave = 1,
+            RouteCompleted = 1,
             _index = 163,
         },
     }
diff --git a/Routes/ExilesReach/ExilesReach_Alliance.lua b/Routes/ExilesReach/ExilesReach_Alliance.lua
index 5a722585..9e5b74ff 100644
--- a/Routes/ExilesReach/ExilesReach_Alliance.lua
+++ b/Routes/ExilesReach/ExilesReach_Alliance.lua
@@ -1383,7 +1383,7 @@ if APR.Faction == "Alliance" then
             _index = 222,
         },
         {
-            ZoneDoneSave = 1,
+            RouteCompleted = 1,
             _index = 223,
         },
     }
diff --git a/Routes/ExilesReach/ExilesReach_Horde.lua b/Routes/ExilesReach/ExilesReach_Horde.lua
index 85c7c63f..8ee40431 100644
--- a/Routes/ExilesReach/ExilesReach_Horde.lua
+++ b/Routes/ExilesReach/ExilesReach_Horde.lua
@@ -1242,7 +1242,7 @@ if APR.Faction == "Horde" then
             _index = 201,
         },
         {
-            ZoneDoneSave = 1,
+            RouteCompleted = 1,
             _index = 202,
         },
     }
diff --git a/Routes/Legion/Legion.lua b/Routes/Legion/Legion.lua
index 91dccd7d..299f3d7a 100644
--- a/Routes/Legion/Legion.lua
+++ b/Routes/Legion/Legion.lua
@@ -739,7 +739,7 @@ APR.RouteQuestStepList["672-Mardum"] = {
         _index = 125,
     },
     {
-        ZoneDoneSave = 1,
+        RouteCompleted = 1,
         _index = 126,
     },
 }
diff --git a/Routes/Legion/Legion_Alliance.lua b/Routes/Legion/Legion_Alliance.lua
index 5be48c9e..588dfadb 100644
--- a/Routes/Legion/Legion_Alliance.lua
+++ b/Routes/Legion/Legion_Alliance.lua
@@ -1655,7 +1655,7 @@ if APR.Faction == "Alliance" then
             _index = 285,
         },
         {
-            ZoneDoneSave = 1,
+            RouteCompleted = 1,
             _index = 286,
         },
     }
@@ -3088,7 +3088,7 @@ if APR.Faction == "Alliance" then
             _index = 246,
         },
         {
-            ZoneDoneSave = 1,
+            RouteCompleted = 1,
             _index = 247,
         },
     }
@@ -4349,7 +4349,7 @@ if APR.Faction == "Alliance" then
             _index = 214,
         },
         {
-            ZoneDoneSave = 1,
+            RouteCompleted = 1,
             _index = 215,
         },
     }
@@ -4396,7 +4396,7 @@ if APR.Faction == "Alliance" then
             _index = 6,
         },
         {
-            ZoneDoneSave = 1,
+            RouteCompleted = 1,
             _index = 7,
         },
     }
@@ -4465,7 +4465,7 @@ if APR.Faction == "Alliance" then
             _index = 9,
         },
         {
-            ZoneDoneSave = 1,
+            RouteCompleted = 1,
             _index = 10,
         },
     }
diff --git a/Routes/Legion/Legion_Horde.lua b/Routes/Legion/Legion_Horde.lua
index 0b7fe46b..06e8e281 100644
--- a/Routes/Legion/Legion_Horde.lua
+++ b/Routes/Legion/Legion_Horde.lua
@@ -1654,7 +1654,7 @@ if APR.Faction == "Horde" then
             _index = 285,
         },
         {
-            ZoneDoneSave = 1,
+            RouteCompleted = 1,
             _index = 286,
         },
     }
@@ -3086,7 +3086,7 @@ if APR.Faction == "Horde" then
             _index = 246,
         },
         {
-            ZoneDoneSave = 1,
+            RouteCompleted = 1,
             _index = 247,
         },
     }
@@ -4354,7 +4354,7 @@ if APR.Faction == "Horde" then
             _index = 215,
         },
         {
-            ZoneDoneSave = 1,
+            RouteCompleted = 1,
             _index = 216,
         },
     }
@@ -6182,7 +6182,7 @@ if APR.Faction == "Horde" then
             _index = 8,
         },
         {
-            ZoneDoneSave = 1,
+            RouteCompleted = 1,
             _index = 9,
         },
     }
@@ -6228,7 +6228,7 @@ if APR.Faction == "Horde" then
             _index = 6,
         },
         {
-            ZoneDoneSave = 1,
+            RouteCompleted = 1,
             _index = 7,
         },
     }
diff --git a/Routes/MistsOfPandaria/MistsOfPandaria.lua b/Routes/MistsOfPandaria/MistsOfPandaria.lua
index 758aee19..69ce23f4 100644
--- a/Routes/MistsOfPandaria/MistsOfPandaria.lua
+++ b/Routes/MistsOfPandaria/MistsOfPandaria.lua
@@ -1116,7 +1116,7 @@ APR.RouteQuestStepList["378-WanderingIsle"] = {
         _index = 202,
     },
     {
-        ZoneDoneSave = 1,
+        RouteCompleted = 1,
         _index = 203,
     },
 }
@@ -2698,7 +2698,7 @@ APR.RouteQuestStepList["378-Panda Starting Zone"] = {
         _index = 239,
     },
     {
-        ZoneDoneSave = 1,
+        RouteCompleted = 1,
         _index = 240,
     },
 }
@@ -2853,7 +2853,7 @@ APR.RouteQuestStepList["554-MoP Remix Intro"] = {
         _index = 23,
     },
     {
-        ZoneDoneSave = 1,
+        RouteCompleted = 1,
         _index = 24,
     },
 }
@@ -4539,7 +4539,7 @@ APR.RouteQuestStepList["376-Valley of the four winds"] = {
         _index = 245,
     },
     {
-        ZoneDoneSave = 1,
+        RouteCompleted = 1,
         _index = 246,
     },
 }
@@ -5840,7 +5840,7 @@ APR.RouteQuestStepList["388-Townlong Steppes"] = {
         _index = 195,
     },
     {
-        ZoneDoneSave = 1,
+        RouteCompleted = 1,
         _index = 196,
     },
 }
@@ -7329,7 +7329,7 @@ APR.RouteQuestStepList["390-Dread Wastes"] = {
         _index = 221,
     },
     {
-        ZoneDoneSave = 1,
+        RouteCompleted = 1,
         _index = 222,
     },
 }
diff --git a/Routes/MistsOfPandaria/MistsOfPandaria_Alliance.lua b/Routes/MistsOfPandaria/MistsOfPandaria_Alliance.lua
index 7e7e7da3..276758e5 100644
--- a/Routes/MistsOfPandaria/MistsOfPandaria_Alliance.lua
+++ b/Routes/MistsOfPandaria/MistsOfPandaria_Alliance.lua
@@ -68,7 +68,7 @@ if APR.Faction == "Alliance" then
             _index = 10,
         },
         {
-            ZoneDoneSave = 1,
+            RouteCompleted = 1,
             _index = 11,
         },
     }
@@ -2887,7 +2887,7 @@ if APR.Faction == "Alliance" then
             _index = 417,
         },
         {
-            ZoneDoneSave = 1,
+            RouteCompleted = 1,
             _index = 418,
         },
     }
@@ -4046,7 +4046,7 @@ if APR.Faction == "Alliance" then
             _index = 172,
         },
         {
-            ZoneDoneSave = 1,
+            RouteCompleted = 1,
             _index = 173,
         },
     }
@@ -6566,7 +6566,7 @@ if APR.Faction == "Alliance" then
             _index = 374,
         },
         {
-            ZoneDoneSave = 1,
+            RouteCompleted = 1,
             _index = 375,
         },
     }
@@ -6825,7 +6825,7 @@ if APR.Faction == "Alliance" then
             _index = 37,
         },
         {
-            ZoneDoneSave = 1,
+            RouteCompleted = 1,
             _index = 38,
         },
     }
diff --git a/Routes/MistsOfPandaria/MistsOfPandaria_Horde.lua b/Routes/MistsOfPandaria/MistsOfPandaria_Horde.lua
index 2782b4f8..73d087e4 100644
--- a/Routes/MistsOfPandaria/MistsOfPandaria_Horde.lua
+++ b/Routes/MistsOfPandaria/MistsOfPandaria_Horde.lua
@@ -123,7 +123,7 @@ if APR.Faction == "Horde" then
             _index = 18,
         },
         {
-            ZoneDoneSave = 1,
+            RouteCompleted = 1,
             _index = 19,
         },
     }
@@ -3194,7 +3194,7 @@ if APR.Faction == "Horde" then
             _index = 449,
         },
         {
-            ZoneDoneSave = 1,
+            RouteCompleted = 1,
             _index = 450,
         },
     }
@@ -4310,7 +4310,7 @@ if APR.Faction == "Horde" then
             _index = 166,
         },
         {
-            ZoneDoneSave = 1,
+            RouteCompleted = 1,
             _index = 167,
         },
     }
@@ -6878,7 +6878,7 @@ if APR.Faction == "Horde" then
             _index = 380,
         },
         {
-            ZoneDoneSave = 1,
+            RouteCompleted = 1,
             _index = 381,
         },
     }
@@ -7182,7 +7182,7 @@ if APR.Faction == "Horde" then
             _index = 43,
         },
         {
-            ZoneDoneSave = 1,
+            RouteCompleted = 1,
             _index = 44,
         },
     }
diff --git a/Routes/Shadowlands/Shadowlands.lua b/Routes/Shadowlands/Shadowlands.lua
index 4ffe9e6a..6f80b8d7 100644
--- a/Routes/Shadowlands/Shadowlands.lua
+++ b/Routes/Shadowlands/Shadowlands.lua
@@ -502,7 +502,7 @@ APR.RouteQuestStepList["1648-Z0-TheMaw-Story"] = {
         _index = 84,
     },
     {
-        ZoneDoneSave = 1,
+        RouteCompleted = 1,
         _index = 85,
     },
 }
@@ -818,7 +818,7 @@ APR.RouteQuestStepList["1670-Z1-Oribos-Story"] = {
         _index = 48,
     },
     {
-        ZoneDoneSave = 1,
+        RouteCompleted = 1,
         _index = 49,
     },
 }
@@ -2526,7 +2526,7 @@ APR.RouteQuestStepList["1533-Z2-Bastion-Story"] = {
         _index = 284,
     },
     {
-        ZoneDoneSave = 1,
+        RouteCompleted = 1,
         _index = 285,
     },
 }
@@ -2587,7 +2587,7 @@ APR.RouteQuestStepList["1670-Z3-Oribos-Story"] = {
         _index = 10,
     },
     {
-        ZoneDoneSave = 1,
+        RouteCompleted = 1,
         _index = 11,
     },
 }
@@ -4054,7 +4054,7 @@ APR.RouteQuestStepList["1536-Z4-Maldraxxus-Story"] = {
         _index = 237,
     },
     {
-        ZoneDoneSave = 1,
+        RouteCompleted = 1,
         _index = 238,
     },
 }
@@ -4089,7 +4089,7 @@ APR.RouteQuestStepList["1670-Z5-Oribos-Story"] = {
         _index = 5,
     },
     {
-        ZoneDoneSave = 1,
+        RouteCompleted = 1,
         _index = 6,
     },
 }
@@ -4283,7 +4283,7 @@ APR.RouteQuestStepList["1960-Z6-TheMaw-Story"] = {
         _index = 33,
     },
     {
-        ZoneDoneSave = 1,
+        RouteCompleted = 1,
         _index = 34,
     },
 }
@@ -4340,7 +4340,7 @@ APR.RouteQuestStepList["1670-Z7-Oribos-Story"] = {
         _index = 9,
     },
     {
-        ZoneDoneSave = 1,
+        RouteCompleted = 1,
         _index = 10,
     },
 }
@@ -4407,7 +4407,7 @@ APR.RouteQuestStepList["1536-Z8-Maldraxxus-Story"] = {
         _index = 10,
     },
     {
-        ZoneDoneSave = 1,
+        RouteCompleted = 1,
         _index = 11,
     },
 }
@@ -4501,7 +4501,7 @@ APR.RouteQuestStepList["1670-Z9-Oribos-Story"] = {
         _index = 15,
     },
     {
-        ZoneDoneSave = 1,
+        RouteCompleted = 1,
         _index = 16,
     },
 }
@@ -4556,7 +4556,7 @@ APR.RouteQuestStepList["1670-Z9-Oribos-Storyx2"] = {
         _index = 9,
     },
     {
-        ZoneDoneSave = 1,
+        RouteCompleted = 1,
         _index = 10,
     },
 }
@@ -7074,7 +7074,7 @@ APR.RouteQuestStepList["1565-Z10-Ardenweald-Story"] = {
         _index = 394,
     },
     {
-        ZoneDoneSave = 1,
+        RouteCompleted = 1,
         _index = 395,
     },
 }
@@ -7110,7 +7110,7 @@ APR.RouteQuestStepList["1670-Z11-Oribos-Story"] = {
         _index = 5,
     },
     {
-        ZoneDoneSave = 1,
+        RouteCompleted = 1,
         _index = 6,
     },
 }
@@ -8981,7 +8981,7 @@ APR.RouteQuestStepList["1525-Z12-Revendreth-Story"] = {
         _index = 312,
     },
     {
-        ZoneDoneSave = 1,
+        RouteCompleted = 1,
         _index = 313,
     },
 }
@@ -9054,7 +9054,7 @@ APR.RouteQuestStepList["1543-Z13-TheMaw-Story"] = {
         _index = 12,
     },
     {
-        ZoneDoneSave = 1,
+        RouteCompleted = 1,
         _index = 13,
     },
 }
@@ -9197,7 +9197,7 @@ APR.RouteQuestStepList["1525-Z14-Revendreth-Story"] = {
         _index = 23,
     },
     {
-        ZoneDoneSave = 1,
+        RouteCompleted = 1,
         _index = 24,
     },
 }
@@ -9279,7 +9279,7 @@ APR.RouteQuestStepList["1670-Z15-Oribos-Story"] = {
         _index = 12,
     },
     {
-        ZoneDoneSave = 1,
+        RouteCompleted = 1,
         _index = 13,
     },
 }
diff --git a/Routes/Shadowlands/Shadowlands_Alliance.lua b/Routes/Shadowlands/Shadowlands_Alliance.lua
index 715ae792..a71d68ef 100644
--- a/Routes/Shadowlands/Shadowlands_Alliance.lua
+++ b/Routes/Shadowlands/Shadowlands_Alliance.lua
@@ -116,7 +116,7 @@ if APR.Faction == "Alliance" then
             _index = 18,
         },
         {
-            ZoneDoneSave = 1,
+            RouteCompleted = 1,
             _index = 19,
         },
     }
@@ -7699,7 +7699,7 @@ if APR.Faction == "Alliance" then
             _index = 1244,
         },
         {
-            ZoneDoneSave = 1,
+            RouteCompleted = 1,
             _index = 1245,
         },
     }
diff --git a/Routes/Shadowlands/Shadowlands_Horde.lua b/Routes/Shadowlands/Shadowlands_Horde.lua
index ea82b35c..8400ba84 100644
--- a/Routes/Shadowlands/Shadowlands_Horde.lua
+++ b/Routes/Shadowlands/Shadowlands_Horde.lua
@@ -116,7 +116,7 @@ if APR.Faction == "Horde" then
             _index = 18,
         },
         {
-            ZoneDoneSave = 1,
+            RouteCompleted = 1,
             _index = 19,
         },
     }
@@ -7699,7 +7699,7 @@ if APR.Faction == "Horde" then
             _index = 1244,
         },
         {
-            ZoneDoneSave = 1,
+            RouteCompleted = 1,
             _index = 1245,
         },
     }
diff --git a/Routes/TheBurningCrusade/TheBurningCrusade_Alliance.lua b/Routes/TheBurningCrusade/TheBurningCrusade_Alliance.lua
index 219eb932..ed287708 100644
--- a/Routes/TheBurningCrusade/TheBurningCrusade_Alliance.lua
+++ b/Routes/TheBurningCrusade/TheBurningCrusade_Alliance.lua
@@ -199,7 +199,7 @@ if (APR.Faction == "Alliance") then
             _index = 37,
         },
         {
-            ZoneDoneSave = 1,
+            RouteCompleted = 1,
             _index = 38,
         },
     }
diff --git a/Routes/TheBurningCrusade/TheBurningCrusade_Horde.lua b/Routes/TheBurningCrusade/TheBurningCrusade_Horde.lua
index 99e89e2d..f5c7e01a 100644
--- a/Routes/TheBurningCrusade/TheBurningCrusade_Horde.lua
+++ b/Routes/TheBurningCrusade/TheBurningCrusade_Horde.lua
@@ -810,7 +810,7 @@ if APR.Faction == "Horde" then
             _index = 123,
         },
         {
-            ZoneDoneSave = 1,
+            RouteCompleted = 1,
             _index = 124,
         },
     }
diff --git a/Routes/TheWarWithin/TheWarWithin.lua b/Routes/TheWarWithin/TheWarWithin.lua
index 272ebc65..0af1b66e 100644
--- a/Routes/TheWarWithin/TheWarWithin.lua
+++ b/Routes/TheWarWithin/TheWarWithin.lua
@@ -521,7 +521,7 @@ APR.RouteQuestStepList["81-TWW-Intro"] = {
         _index = 75,
     },
     {
-        ZoneDoneSave = 1,
+        RouteCompleted = 1,
         _index = 76,
     },
 }
@@ -2234,7 +2234,7 @@ APR.RouteQuestStepList["2248-TWW-Isle-of-Dorn"] = {
         _index = 244,
     },
     {
-        ZoneDoneSave = 1,
+        RouteCompleted = 1,
         _index = 245,
     },
 }
@@ -4656,7 +4656,7 @@ APR.RouteQuestStepList["2214-TWW-Ringing-Deeps"] = {
         _index = 337,
     },
     {
-        ZoneDoneSave = 1,
+        RouteCompleted = 1,
         _index = 338,
     },
 }
@@ -6503,7 +6503,7 @@ APR.RouteQuestStepList["2215-TWW-Hallowfall"] = {
         _index = 264,
     },
     {
-        ZoneDoneSave = 1,
+        RouteCompleted = 1,
         _index = 265,
     },
 }
@@ -7667,7 +7667,7 @@ APR.RouteQuestStepList["2255-TWW-Azj-Kahet"] = {
         _index = 174,
     },
     {
-        ZoneDoneSave = 1,
+        RouteCompleted = 1,
         _index = 175,
     },
 }
@@ -8012,7 +8012,7 @@ APR.RouteQuestStepList["2248-TWW-Against-the-Current-storyline"] = {
         _index = 48,
     },
     {
-        ZoneDoneSave = 1,
+        RouteCompleted = 1,
         _index = 49,
     },
 }
@@ -8391,7 +8391,7 @@ APR.RouteQuestStepList["2248-TWW-Ties-That-Bind-storyline"] = {
         _index = 55,
     },
     {
-        ZoneDoneSave = 1,
+        RouteCompleted = 1,
         _index = 56,
     },
 }
@@ -8750,7 +8750,7 @@ APR.RouteQuestStepList["2248-TWW-News-from-Below-storyline"] = {
         _index = 53,
     },
     {
-        ZoneDoneSave = 1,
+        RouteCompleted = 1,
         _index = 54,
     },
 }
@@ -9266,7 +9266,7 @@ APR.RouteQuestStepList["2248-TWW-The-Machines-March-to-War-storyline"] = {
         _index = 76,
     },
     {
-        ZoneDoneSave = 1,
+        RouteCompleted = 1,
         _index = 77,
     },
 }
@@ -9518,7 +9518,7 @@ APR.RouteQuestStepList["2248-TWW-Light-in-the-Dark-storyline"] = {
         _index = 34,
     },
     {
-        ZoneDoneSave = 1,
+        RouteCompleted = 1,
         _index = 35,
     },
 }
@@ -10652,7 +10652,7 @@ APR.RouteQuestStepList["2248-TWW-Isle-of-Dorn-campaign-only"] = {
         _index = 159,
     },
     {
-        ZoneDoneSave = 1,
+        RouteCompleted = 1,
         _index = 160,
     },
 }
@@ -11780,7 +11780,7 @@ APR.RouteQuestStepList["2214-TWW-Ringing-Deeps-campaign-only"] = {
         _index = 157,
     },
     {
-        ZoneDoneSave = 1,
+        RouteCompleted = 1,
         _index = 158,
     },
 }
@@ -12951,7 +12951,7 @@ APR.RouteQuestStepList["2215-TWW-Hallowfall-campaign-only"] = {
         _index = 161,
     },
     {
-        ZoneDoneSave = 1,
+        RouteCompleted = 1,
         _index = 162,
     },
 }
@@ -13874,7 +13874,7 @@ APR.RouteQuestStepList["2255-TWW-Azj-Kahet-campaign-only"] = {
         _index = 138,
     },
     {
-        ZoneDoneSave = 1,
+        RouteCompleted = 1,
         _index = 139,
     },
 }
@@ -14928,7 +14928,7 @@ APR.RouteQuestStepList["2255-TWW-Allied-Races-Earthen"] = {
         _index = 157,
     },
     {
-        ZoneDoneSave = 1,
+        RouteCompleted = 1,
         _index = 158,
     },
 }
@@ -15166,7 +15166,7 @@ APR.RouteQuestStepList["2248-TWW-Earthen"] = {
         _index = 33,
     },
     {
-        ZoneDoneSave = 1,
+        RouteCompleted = 1,
         _index = 34,
     },
 }
@@ -19013,7 +19013,7 @@ APR.RouteQuestStepList["2248-TWW-Isle-of-Dorn-Full"] = {
         _index = 565,
     },
     {
-        ZoneDoneSave = 1,
+        RouteCompleted = 1,
         _index = 566,
     },
 }
@@ -23083,7 +23083,7 @@ APR.RouteQuestStepList["2214-TWW-Ringing-Deeps-Full"] = {
         _index = 584,
     },
     {
-        ZoneDoneSave = 1,
+        RouteCompleted = 1,
         _index = 585,
     },
 }
diff --git a/Routes/Vanilla/EasternKingdoms_Alliance.lua b/Routes/Vanilla/EasternKingdoms_Alliance.lua
index 00bec8ba..e206190a 100644
--- a/Routes/Vanilla/EasternKingdoms_Alliance.lua
+++ b/Routes/Vanilla/EasternKingdoms_Alliance.lua
@@ -317,7 +317,7 @@ if (APR.Faction == "Alliance") then
             _index = 54,
         },
         {
-            ZoneDoneSave = 1,
+            RouteCompleted = 1,
             _index = 55,
         },
     }
@@ -497,7 +497,7 @@ if (APR.Faction == "Alliance") then
             _index = 29,
         },
         {
-            ZoneDoneSave = 1,
+            RouteCompleted = 1,
             _index = 30,
         },
     }
@@ -903,7 +903,7 @@ if (APR.Faction == "Alliance") then
             _index = 73,
         },
         {
-            ZoneDoneSave = 1,
+            RouteCompleted = 1,
             _index = 74,
         },
     }
@@ -1679,7 +1679,7 @@ if (APR.Faction == "Alliance") then
             _index = 141,
         },
         {
-            ZoneDoneSave = 1,
+            RouteCompleted = 1,
             _index = 142,
         },
     }
@@ -2072,7 +2072,7 @@ if (APR.Faction == "Alliance") then
             _index = 71,
         },
         {
-            ZoneDoneSave = 1,
+            RouteCompleted = 1,
             _index = 72,
         },
     }
@@ -2656,7 +2656,7 @@ if (APR.Faction == "Alliance") then
             _index = 102,
         },
         {
-            ZoneDoneSave = 1,
+            RouteCompleted = 1,
             _index = 103,
         },
     }
@@ -3174,7 +3174,7 @@ if (APR.Faction == "Alliance") then
             _index = 93,
         },
         {
-            ZoneDoneSave = 1,
+            RouteCompleted = 1,
             _index = 94,
         },
     }
@@ -3847,7 +3847,7 @@ if (APR.Faction == "Alliance") then
             _index = 118,
         },
         {
-            ZoneDoneSave = 1,
+            RouteCompleted = 1,
             _index = 119,
         },
     }
@@ -4547,7 +4547,7 @@ if (APR.Faction == "Alliance") then
             _index = 121,
         },
         {
-            ZoneDoneSave = 1,
+            RouteCompleted = 1,
             _index = 122,
         },
     }
@@ -4995,7 +4995,7 @@ if (APR.Faction == "Alliance") then
             _index = 76,
         },
         {
-            ZoneDoneSave = 1,
+            RouteCompleted = 1,
             _index = 77,
         },
     }
@@ -5854,7 +5854,7 @@ if (APR.Faction == "Alliance") then
             _index = 151,
         },
         {
-            ZoneDoneSave = 1,
+            RouteCompleted = 1,
             _index = 152,
         },
     }
@@ -6520,7 +6520,7 @@ if (APR.Faction == "Alliance") then
             _index = 119,
         },
         {
-            ZoneDoneSave = 1,
+            RouteCompleted = 1,
             _index = 120,
         },
     }
@@ -6993,7 +6993,7 @@ if (APR.Faction == "Alliance") then
             _index = 83,
         },
         {
-            ZoneDoneSave = 1,
+            RouteCompleted = 1,
             _index = 84,
         },
     }
@@ -7425,7 +7425,7 @@ if (APR.Faction == "Alliance") then
             _index = 72,
         },
         {
-            ZoneDoneSave = 1,
+            RouteCompleted = 1,
             _index = 73,
         },
     }
@@ -8475,7 +8475,7 @@ if (APR.Faction == "Alliance") then
             _index = 184,
         },
         {
-            ZoneDoneSave = 1,
+            RouteCompleted = 1,
             _index = 185,
         },
     }
@@ -9811,7 +9811,7 @@ if (APR.Faction == "Alliance") then
             _index = 230,
         },
         {
-            ZoneDoneSave = 1,
+            RouteCompleted = 1,
             _index = 231,
         },
     }
@@ -10856,7 +10856,7 @@ if (APR.Faction == "Alliance") then
             _index = 183,
         },
         {
-            ZoneDoneSave = 1,
+            RouteCompleted = 1,
             _index = 184,
         },
     }
@@ -11699,7 +11699,7 @@ if (APR.Faction == "Alliance") then
             _index = 146,
         },
         {
-            ZoneDoneSave = 1,
+            RouteCompleted = 1,
             _index = 147,
         },
     }
@@ -12367,7 +12367,7 @@ if (APR.Faction == "Alliance") then
             _index = 117,
         },
         {
-            ZoneDoneSave = 1,
+            RouteCompleted = 1,
             _index = 118,
         },
     }
@@ -12990,7 +12990,7 @@ if (APR.Faction == "Alliance") then
             _index = 105,
         },
         {
-            ZoneDoneSave = 1,
+            RouteCompleted = 1,
             _index = 106,
         },
     }
@@ -13774,7 +13774,7 @@ if (APR.Faction == "Alliance") then
             _index = 138,
         },
         {
-            ZoneDoneSave = 1,
+            RouteCompleted = 1,
             _index = 139,
         },
     }
@@ -14894,7 +14894,7 @@ if (APR.Faction == "Alliance") then
             _index = 195,
         },
         {
-            ZoneDoneSave = 1,
+            RouteCompleted = 1,
             _index = 196,
         },
     }
diff --git a/Routes/Vanilla/EasternKingdoms_Horde.lua b/Routes/Vanilla/EasternKingdoms_Horde.lua
index 8f457ea7..93b48a73 100644
--- a/Routes/Vanilla/EasternKingdoms_Horde.lua
+++ b/Routes/Vanilla/EasternKingdoms_Horde.lua
@@ -561,7 +561,7 @@ if APR.Faction == "Horde" then
             _index = 98,
         },
         {
-            ZoneDoneSave = 1,
+            RouteCompleted = 1,
             _index = 99,
         },
     }
@@ -1110,7 +1110,7 @@ if APR.Faction == "Horde" then
             _index = 94,
         },
         {
-            ZoneDoneSave = 1,
+            RouteCompleted = 1,
             _index = 95,
         },
     }
@@ -1296,7 +1296,7 @@ if APR.Faction == "Horde" then
             _index = 32,
         },
         {
-            ZoneDoneSave = 1,
+            RouteCompleted = 1,
             _index = 33,
         },
     }
@@ -1397,7 +1397,7 @@ if APR.Faction == "Horde" then
             _index = 16,
         },
         {
-            ZoneDoneSave = 1,
+            RouteCompleted = 1,
             _index = 17,
         },
     }
@@ -1422,7 +1422,7 @@ if APR.Faction == "Horde" then
             _index = 3,
         },
         {
-            ZoneDoneSave = 1,
+            RouteCompleted = 1,
             _index = 4,
         },
     }
@@ -1586,7 +1586,7 @@ if APR.Faction == "Horde" then
             _index = 27,
         },
         {
-            ZoneDoneSave = 1,
+            RouteCompleted = 1,
             _index = 28,
         },
     }
@@ -3677,7 +3677,7 @@ if APR.Faction == "Horde" then
             _index = 351,
         },
         {
-            ZoneDoneSave = 1,
+            RouteCompleted = 1,
             _index = 352,
         },
     }
@@ -4656,7 +4656,7 @@ if APR.Faction == "Horde" then
             _index = 170,
         },
         {
-            ZoneDoneSave = 1,
+            RouteCompleted = 1,
             _index = 171,
         },
     }
diff --git a/Routes/Vanilla/Kalimdor_Alliance.lua b/Routes/Vanilla/Kalimdor_Alliance.lua
index 454a5532..e8f28d5e 100644
--- a/Routes/Vanilla/Kalimdor_Alliance.lua
+++ b/Routes/Vanilla/Kalimdor_Alliance.lua
@@ -189,7 +189,7 @@ if APR.Faction == "Alliance" then
             _index = 35,
         },
         {
-            ZoneDoneSave = 1,
+            RouteCompleted = 1,
             _index = 36,
         },
     }
@@ -673,7 +673,7 @@ if APR.Faction == "Alliance" then
             _index = 86,
         },
         {
-            ZoneDoneSave = 1,
+            RouteCompleted = 1,
             _index = 87,
         },
     }
@@ -1552,7 +1552,7 @@ if APR.Faction == "Alliance" then
             _index = 158,
         },
         {
-            ZoneDoneSave = 1,
+            RouteCompleted = 1,
             _index = 159,
         },
     }
@@ -2649,7 +2649,7 @@ if APR.Faction == "Alliance" then
             _index = 190,
         },
         {
-            ZoneDoneSave = 1,
+            RouteCompleted = 1,
             _index = 191,
         },
     }
@@ -4008,7 +4008,7 @@ if APR.Faction == "Alliance" then
             _index = 238,
         },
         {
-            ZoneDoneSave = 1,
+            RouteCompleted = 1,
             _index = 239,
         },
     }
@@ -4944,7 +4944,7 @@ if APR.Faction == "Alliance" then
             _index = 163,
         },
         {
-            ZoneDoneSave = 1,
+            RouteCompleted = 1,
             _index = 164,
         },
     }
@@ -5825,7 +5825,7 @@ if APR.Faction == "Alliance" then
             _index = 157,
         },
         {
-            ZoneDoneSave = 1,
+            RouteCompleted = 1,
             _index = 158,
         },
     }
@@ -6653,7 +6653,7 @@ if APR.Faction == "Alliance" then
             _index = 147,
         },
         {
-            ZoneDoneSave = 1,
+            RouteCompleted = 1,
             _index = 148,
         },
     }
@@ -7415,7 +7415,7 @@ if APR.Faction == "Alliance" then
             _index = 134,
         },
         {
-            ZoneDoneSave = 1,
+            RouteCompleted = 1,
             _index = 135,
         },
     }
@@ -8346,7 +8346,7 @@ if APR.Faction == "Alliance" then
             _index = 167,
         },
         {
-            ZoneDoneSave = 1,
+            RouteCompleted = 1,
             _index = 168,
         },
     }
@@ -9231,7 +9231,7 @@ if APR.Faction == "Alliance" then
             _index = 155,
         },
         {
-            ZoneDoneSave = 1,
+            RouteCompleted = 1,
             _index = 156,
         },
     }
@@ -10003,7 +10003,7 @@ if APR.Faction == "Alliance" then
             _index = 135,
         },
         {
-            ZoneDoneSave = 1,
+            RouteCompleted = 1,
             _index = 136,
         },
     }
@@ -11152,7 +11152,7 @@ if APR.Faction == "Alliance" then
             _index = 199,
         },
         {
-            ZoneDoneSave = 1,
+            RouteCompleted = 1,
             _index = 200,
         },
     }
@@ -11813,7 +11813,7 @@ if APR.Faction == "Alliance" then
             _index = 118,
         },
         {
-            ZoneDoneSave = 1,
+            RouteCompleted = 1,
             _index = 119,
         },
     }
@@ -12616,7 +12616,7 @@ if APR.Faction == "Alliance" then
             _index = 135,
         },
         {
-            ZoneDoneSave = 1,
+            RouteCompleted = 1,
             _index = 136,
         },
     }
@@ -13016,7 +13016,7 @@ if APR.Faction == "Alliance" then
             _index = 68,
         },
         {
-            ZoneDoneSave = 1,
+            RouteCompleted = 1,
             _index = 69,
         },
     }
@@ -13686,7 +13686,7 @@ if APR.Faction == "Alliance" then
             _index = 114,
         },
         {
-            ZoneDoneSave = 1,
+            RouteCompleted = 1,
             _index = 115,
         },
     }
diff --git a/Routes/Vanilla/Kalimdor_Horde.lua b/Routes/Vanilla/Kalimdor_Horde.lua
index cd0f2cd1..1b756abd 100644
--- a/Routes/Vanilla/Kalimdor_Horde.lua
+++ b/Routes/Vanilla/Kalimdor_Horde.lua
@@ -879,7 +879,7 @@ if APR.Faction == "Horde" then
             _index = 135
         },
         {
-            ZoneDoneSave = 1,
+            RouteCompleted = 1,
             _index = 136
         }
     }
@@ -1090,7 +1090,7 @@ if APR.Faction == "Horde" then
             _index = 35
         },
         {
-            ZoneDoneSave = 1,
+            RouteCompleted = 1,
             _index = 36
         }
     }
@@ -1301,7 +1301,7 @@ if APR.Faction == "Horde" then
             _index = 35
         },
         {
-            ZoneDoneSave = 1,
+            RouteCompleted = 1,
             _index = 36
         }
     }
@@ -1565,7 +1565,7 @@ if APR.Faction == "Horde" then
             _index = 45
         },
         {
-            ZoneDoneSave = 1,
+            RouteCompleted = 1,
             _index = 46
         }
     }
@@ -1823,7 +1823,7 @@ if APR.Faction == "Horde" then
             _index = 44
         },
         {
-            ZoneDoneSave = 1,
+            RouteCompleted = 1,
             _index = 45
         }
     }
@@ -2163,7 +2163,7 @@ if APR.Faction == "Horde" then
             _index = 59
         },
         {
-            ZoneDoneSave = 1,
+            RouteCompleted = 1,
             _index = 60
         }
     }
@@ -2427,7 +2427,7 @@ if APR.Faction == "Horde" then
             _index = 45
         },
         {
-            ZoneDoneSave = 1,
+            RouteCompleted = 1,
             _index = 46
         }
     }
@@ -2691,7 +2691,7 @@ if APR.Faction == "Horde" then
             _index = 45
         },
         {
-            ZoneDoneSave = 1,
+            RouteCompleted = 1,
             _index = 46
         }
     }
@@ -2955,7 +2955,7 @@ if APR.Faction == "Horde" then
             _index = 45
         },
         {
-            ZoneDoneSave = 1,
+            RouteCompleted = 1,
             _index = 46
         }
     }
@@ -3219,7 +3219,7 @@ if APR.Faction == "Horde" then
             _index = 45
         },
         {
-            ZoneDoneSave = 1,
+            RouteCompleted = 1,
             _index = 46
         }
     }
@@ -3483,7 +3483,7 @@ if APR.Faction == "Horde" then
             _index = 45
         },
         {
-            ZoneDoneSave = 1,
+            RouteCompleted = 1,
             _index = 46
         }
     }
@@ -4041,7 +4041,7 @@ if APR.Faction == "Horde" then
             _index = 95
         },
         {
-            ZoneDoneSave = 1,
+            RouteCompleted = 1,
             _index = 96
         }
     }
@@ -5345,7 +5345,7 @@ if APR.Faction == "Horde" then
             _index = 227
         },
         {
-            ZoneDoneSave = 1,
+            RouteCompleted = 1,
             _index = 228
         }
     }
diff --git a/Routes/WarlordsOfDraenor/WarlordsOfDraenor_Alliance.lua b/Routes/WarlordsOfDraenor/WarlordsOfDraenor_Alliance.lua
index 46f01cc0..84c6e99b 100644
--- a/Routes/WarlordsOfDraenor/WarlordsOfDraenor_Alliance.lua
+++ b/Routes/WarlordsOfDraenor/WarlordsOfDraenor_Alliance.lua
@@ -58,7 +58,7 @@ if APR.Faction == "Alliance" then
             _index = 8,
         },
         {
-            ZoneDoneSave = 1,
+            RouteCompleted = 1,
             _index = 9,
         },
     }
@@ -675,7 +675,7 @@ if APR.Faction == "Alliance" then
             _index = 103,
         },
         {
-            ZoneDoneSave = 1,
+            RouteCompleted = 1,
             _index = 104,
         },
     }
@@ -1456,7 +1456,7 @@ if APR.Faction == "Alliance" then
             _index = 126,
         },
         {
-            ZoneDoneSave = 1,
+            RouteCompleted = 1,
             _index = 127,
         },
     }
@@ -2698,7 +2698,7 @@ if APR.Faction == "Alliance" then
             _index = 204,
         },
         {
-            ZoneDoneSave = 1,
+            RouteCompleted = 1,
             _index = 205,
         },
     }
@@ -3303,7 +3303,7 @@ if APR.Faction == "Alliance" then
             _index = 100,
         },
         {
-            ZoneDoneSave = 1,
+            RouteCompleted = 1,
             _index = 101,
         },
     }
@@ -3448,7 +3448,7 @@ if APR.Faction == "Alliance" then
             _index = 24,
         },
         {
-            ZoneDoneSave = 1,
+            RouteCompleted = 1,
             _index = 25,
         },
     }
@@ -3758,7 +3758,7 @@ if APR.Faction == "Alliance" then
             _index = 48,
         },
         {
-            ZoneDoneSave = 1,
+            RouteCompleted = 1,
             _index = 49,
         },
     }
@@ -5037,7 +5037,7 @@ if APR.Faction == "Alliance" then
             _index = 214,
         },
         {
-            ZoneDoneSave = 1,
+            RouteCompleted = 1,
             _index = 215,
         },
     }
@@ -6128,7 +6128,7 @@ if APR.Faction == "Alliance" then
             _index = 183,
         },
         {
-            ZoneDoneSave = 1,
+            RouteCompleted = 1,
             _index = 184,
         },
     }
diff --git a/Routes/WarlordsOfDraenor/WarlordsOfDraenor_Horde.lua b/Routes/WarlordsOfDraenor/WarlordsOfDraenor_Horde.lua
index c38a7b3d..95aa4d79 100644
--- a/Routes/WarlordsOfDraenor/WarlordsOfDraenor_Horde.lua
+++ b/Routes/WarlordsOfDraenor/WarlordsOfDraenor_Horde.lua
@@ -57,7 +57,7 @@ if APR.Faction == "Horde" then
             _index = 8,
         },
         {
-            ZoneDoneSave = 1,
+            RouteCompleted = 1,
             _index = 9,
         },
     }
@@ -637,7 +637,7 @@ if APR.Faction == "Horde" then
             _index = 99,
         },
         {
-            ZoneDoneSave = 1,
+            RouteCompleted = 1,
             _index = 100,
         },
     }
@@ -2572,7 +2572,7 @@ if APR.Faction == "Horde" then
             _index = 325,
         },
         {
-            ZoneDoneSave = 1,
+            RouteCompleted = 1,
             _index = 326,
         },
     }
@@ -3723,7 +3723,7 @@ if APR.Faction == "Horde" then
             _index = 190,
         },
         {
-            ZoneDoneSave = 1,
+            RouteCompleted = 1,
             _index = 191,
         },
     }
@@ -4319,7 +4319,7 @@ if APR.Faction == "Horde" then
             _index = 100,
         },
         {
-            ZoneDoneSave = 1,
+            RouteCompleted = 1,
             _index = 101,
         },
     }
@@ -5666,7 +5666,7 @@ if APR.Faction == "Horde" then
             _index = 228,
         },
         {
-            ZoneDoneSave = 1,
+            RouteCompleted = 1,
             _index = 229,
         },
     }
@@ -7195,7 +7195,7 @@ if APR.Faction == "Horde" then
             _index = 259,
         },
         {
-            ZoneDoneSave = 1,
+            RouteCompleted = 1,
             _index = 260,
         },
     }
@@ -7830,7 +7830,7 @@ if APR.Faction == "Horde" then
             _index = 103,
         },
         {
-            ZoneDoneSave = 1,
+            RouteCompleted = 1,
             _index = 104,
         },
     }
diff --git a/Routes/WrathOfTheLichKing/WrathOfTheLichKing_Alliance.lua b/Routes/WrathOfTheLichKing/WrathOfTheLichKing_Alliance.lua
index 0c587943..d6579fce 100644
--- a/Routes/WrathOfTheLichKing/WrathOfTheLichKing_Alliance.lua
+++ b/Routes/WrathOfTheLichKing/WrathOfTheLichKing_Alliance.lua
@@ -781,7 +781,7 @@ if APR.Faction == "Alliance" then
             _index = 142,
         },
         {
-            ZoneDoneSave = 1,
+            RouteCompleted = 1,
             _index = 143,
         },
     }
@@ -899,7 +899,7 @@ if APR.Faction == "Alliance" then
             _index = 17,
         },
         {
-            ZoneDoneSave = 1,
+            RouteCompleted = 1,
             _index = 18,
         },
     }
diff --git a/Routes/WrathOfTheLichKing/WrathOfTheLichKing_Horde.lua b/Routes/WrathOfTheLichKing/WrathOfTheLichKing_Horde.lua
index 4b7669e2..d147c1dd 100644
--- a/Routes/WrathOfTheLichKing/WrathOfTheLichKing_Horde.lua
+++ b/Routes/WrathOfTheLichKing/WrathOfTheLichKing_Horde.lua
@@ -781,7 +781,7 @@ if APR.Faction == "Horde" then
             _index = 142,
         },
         {
-            ZoneDoneSave = 1,
+            RouteCompleted = 1,
             _index = 143,
         },
     }
@@ -878,7 +878,7 @@ if APR.Faction == "Horde" then
             _index = 14,
         },
         {
-            ZoneDoneSave = 1,
+            RouteCompleted = 1,
             _index = 15,
         },
     }