diff --git a/APR-Core/Buff.lua b/APR-Core/Buff.lua
index bcd5a160..a23281c6 100644
--- a/APR-Core/Buff.lua
+++ b/APR-Core/Buff.lua
@@ -34,7 +34,7 @@ local BuffFrame_body = CreateFrame("Frame", "BuffFrame_body", BuffFrame, "Backdr
 BuffFrame_body:SetAllPoints()
 
 -- Create the frame header
-local BuffFrameHeader = CreateFrame("Frame", "BuffFrameHeader", BuffFrame, "ObjectiveTrackerHeaderTemplate")
+local BuffFrameHeader = CreateFrame("Frame", "BuffFrameHeader", BuffFrame, "ObjectiveTrackerContainerHeaderTemplate")
 BuffFrameHeader:SetPoint("bottom", BuffFrame, "top", 0, -20)
 BuffFrameHeader.Text:SetText(L["BUFF"])
 BuffFrameHeader.MinimizeButton:Hide()
diff --git a/APR-Core/CurrentStep.lua b/APR-Core/CurrentStep.lua
index ac8bf8ec..c372ded9 100644
--- a/APR-Core/CurrentStep.lua
+++ b/APR-Core/CurrentStep.lua
@@ -44,7 +44,7 @@ CurrentStepFrame_StepHolder:SetAllPoints()
 
 -- Create the frame header
 local CurrentStepFrameHeader = CreateFrame("Frame", "CurrentStepFrameHeader", CurrentStepFrame,
-    "ObjectiveTrackerHeaderTemplate")
+    "ObjectiveTrackerContainerHeaderTemplate")
 CurrentStepFrameHeader.Text:SetText("Azeroth Pilot Reloaded") -- Replace with APR.title if needed
 
 CurrentStepFrameHeader:RegisterForDrag("LeftButton")
@@ -309,14 +309,14 @@ local On_ObjectiveTracker_Update = function()
     APR.currentStep:RefreshCurrentStepFrameAnchor()
 end
 
-hooksecurefunc("ObjectiveTracker_Update", function(reason, id)
-    On_ObjectiveTracker_Update()
-    CurrentStepFrameHeader.Text:SetText(APR.title)
-end)
+-- hooksecurefunc("QuestLogQuests_Update", function(reason, id)
+--     On_ObjectiveTracker_Update()
+--     CurrentStepFrameHeader.Text:SetText(APR.title)
+-- end)
 
-ObjectiveTrackerFrame.HeaderMenu.MinimizeButton:HookScript("OnClick", function()
-    On_ObjectiveTracker_Update()
-end)
+-- ObjectiveTrackerFrame.HeaderMenu.MinimizeButton:HookScript("OnClick", function()
+--     On_ObjectiveTracker_Update()
+-- end)
 
 -- Helper function to create a button
 local function CreateButton(name, parent, width, height, text, script)
diff --git a/APR-Core/Heirloom.lua b/APR-Core/Heirloom.lua
index acbe3693..78ecd16a 100644
--- a/APR-Core/Heirloom.lua
+++ b/APR-Core/Heirloom.lua
@@ -28,7 +28,8 @@ local HeirloomFrame_body = CreateFrame("Frame", "HeirloomFrame_body", HeirloomFr
 HeirloomFrame_body:SetAllPoints()
 
 -- Create the frame header
-local HeirloomFrameHeader = CreateFrame("Frame", "HeirloomFrameHeader", HeirloomFrame, "ObjectiveTrackerHeaderTemplate")
+local HeirloomFrameHeader = CreateFrame("Frame", "HeirloomFrameHeader", HeirloomFrame,
+    "ObjectiveTrackerContainerHeaderTemplate")
 HeirloomFrameHeader:SetPoint("bottom", HeirloomFrame, "top", 0, -20)
 HeirloomFrameHeader.Text:SetText(L["HEIRLOOM"])
 HeirloomFrameHeader.MinimizeButton:Hide()
diff --git a/APR-Core/Party.lua b/APR-Core/Party.lua
index 236727b4..55ee1568 100644
--- a/APR-Core/Party.lua
+++ b/APR-Core/Party.lua
@@ -33,7 +33,7 @@ local PartyFrame_TeamHolder = CreateFrame("Frame", "PartyFrame_TeamHolder", Part
 PartyFrame_TeamHolder:SetAllPoints()
 
 -- Create the frame header
-local PartyFrameHeader = CreateFrame("Frame", "PartyFrameHeader", PartyFrame, "ObjectiveTrackerHeaderTemplate")
+local PartyFrameHeader = CreateFrame("Frame", "PartyFrameHeader", PartyFrame, "ObjectiveTrackerContainerHeaderTemplate")
 PartyFrameHeader:SetPoint("bottom", PartyFrame, "top", 0, -20)
 PartyFrameHeader.Text:SetText(L["GROUP"])
 
diff --git a/APR-Core/QuestOrderList.lua b/APR-Core/QuestOrderList.lua
index d906ca4e..0aa44f11 100644
--- a/APR-Core/QuestOrderList.lua
+++ b/APR-Core/QuestOrderList.lua
@@ -71,7 +71,7 @@ QuestOrderListFrame_ScrollFrame:SetScrollChild(QuestOrderListFrame_ScrollChild)
 
 -- Create the frame header
 local QuestOrderListFrame_StepHolderHeader = CreateFrame("Frame", "QuestOrderListFrame_StepHolderHeader",
-    QuestOrderListFrame, "ObjectiveTrackerHeaderTemplate")
+    QuestOrderListFrame, "ObjectiveTrackerContainerHeaderTemplate")
 QuestOrderListFrame_StepHolderHeader:SetPoint("TOPLEFT", QuestOrderListFrame, "TOPLEFT", 0, 0)
 QuestOrderListFrame_StepHolderHeader.Text:SetText(L["QUEST_ORDER_LIST"])
 QuestOrderListFrame_StepHolderHeader.MinimizeButton:Hide()
diff --git a/APR-Core/RouteSelection.lua b/APR-Core/RouteSelection.lua
index 84e747c1..c6b3fa47 100644
--- a/APR-Core/RouteSelection.lua
+++ b/APR-Core/RouteSelection.lua
@@ -22,7 +22,7 @@ RouteSelectionFrame:SetBackdropColor(unpack(APR.Color.defaultLightBackdrop))
 
 -- Create the frame header
 local RouteSelectionFrameHeader = CreateFrame("Frame", "RouteSelectionFrameHeader", RouteSelectionFrame,
-    "ObjectiveTrackerHeaderTemplate")
+    "ObjectiveTrackerContainerHeaderTemplate")
 RouteSelectionFrameHeader:SetPoint("bottom", RouteSelectionFrame, "top", 0, -20)
 RouteSelectionFrameHeader.Text:SetText(L["ROUTE_SELECTION"])
 RouteSelectionFrameHeader.MinimizeButton:Hide()