diff --git a/Content.Server/CharacterInfo/CharacterInfoSystem.cs b/Content.Server/CharacterInfo/CharacterInfoSystem.cs
index df8718a022..cb2216b5e3 100644
--- a/Content.Server/CharacterInfo/CharacterInfoSystem.cs
+++ b/Content.Server/CharacterInfo/CharacterInfoSystem.cs
@@ -36,7 +36,7 @@ public sealed class CharacterInfoSystem : EntitySystem
         if (_minds.TryGetMind(entity, out var mindId, out var mind))
         {
             // Get objectives
-            foreach (var objective in mind.AllObjectives)
+            foreach (var objective in mind.Objectives)
             {
                 var info = _objectives.GetInfo(objective, mindId, mind);
                 if (info == null)
diff --git a/Content.Server/Dragon/DragonSystem.cs b/Content.Server/Dragon/DragonSystem.cs
index 96ca8d3614..e626edeb26 100644
--- a/Content.Server/Dragon/DragonSystem.cs
+++ b/Content.Server/Dragon/DragonSystem.cs
@@ -225,7 +225,7 @@ public sealed partial class DragonSystem : EntitySystem
             return;
 
         var mind = Comp<MindComponent>(mindContainer.Mind.Value);
-        foreach (var objId in mind.AllObjectives)
+        foreach (var objId in mind.Objectives)
         {
             if (_objQuery.TryGetComponent(objId, out var obj))
             {
@@ -247,7 +247,7 @@ public sealed partial class DragonSystem : EntitySystem
             return;
 
         var mind = Comp<MindComponent>(mindContainer.Mind.Value);
-        foreach (var objId in mind.AllObjectives)
+        foreach (var objId in mind.Objectives)
         {
             if (_objQuery.TryGetComponent(objId, out var obj))
             {
diff --git a/Content.Server/Objectives/Commands/ListObjectivesCommand.cs b/Content.Server/Objectives/Commands/ListObjectivesCommand.cs
index 97fc943269..88dcdcedf6 100644
--- a/Content.Server/Objectives/Commands/ListObjectivesCommand.cs
+++ b/Content.Server/Objectives/Commands/ListObjectivesCommand.cs
@@ -33,7 +33,7 @@ namespace Content.Server.Objectives.Commands
             }
 
             shell.WriteLine($"Objectives for player {player.UserId}:");
-            var objectives = mind.AllObjectives.ToList();
+            var objectives = mind.Objectives.ToList();
             if (objectives.Count == 0)
             {
                 shell.WriteLine("None.");
diff --git a/Content.Server/Objectives/Systems/HelpProgressConditionSystem.cs b/Content.Server/Objectives/Systems/HelpProgressConditionSystem.cs
index e4455c0381..e0a56149b3 100644
--- a/Content.Server/Objectives/Systems/HelpProgressConditionSystem.cs
+++ b/Content.Server/Objectives/Systems/HelpProgressConditionSystem.cs
@@ -59,7 +59,7 @@ public sealed class HelpProgressConditionSystem : EntitySystem
             if (!TryComp<MindComponent>(traitor, out var mind))
                 continue;
 
-            foreach (var objective in mind.AllObjectives)
+            foreach (var objective in mind.Objectives)
             {
                 if (HasComp<HelpProgressConditionComponent>(objective))
                     removeList.Add(traitor);
@@ -88,7 +88,7 @@ public sealed class HelpProgressConditionSystem : EntitySystem
 
         if (TryComp<MindComponent>(target, out var mind))
         {
-            foreach (var objective in mind.AllObjectives)
+            foreach (var objective in mind.Objectives)
             {
                 // this has the potential to loop forever, anything setting target has to check that there is no HelpProgressCondition.
                 var info = _objectives.GetInfo(objective, target, mind);
diff --git a/Content.Server/Objectives/Systems/ObjectiveBlacklistRequirementSystem.cs b/Content.Server/Objectives/Systems/ObjectiveBlacklistRequirementSystem.cs
index 8fe7e7e203..0671c6b67e 100644
--- a/Content.Server/Objectives/Systems/ObjectiveBlacklistRequirementSystem.cs
+++ b/Content.Server/Objectives/Systems/ObjectiveBlacklistRequirementSystem.cs
@@ -23,7 +23,7 @@ public sealed class ObjectiveBlacklistRequirementSystem : EntitySystem
         if (args.Cancelled)
             return;
 
-        foreach (var objective in args.Mind.AllObjectives)
+        foreach (var objective in args.Mind.Objectives)
         {
             if (_whitelistSystem.IsBlacklistPass(comp.Blacklist, objective))
             {
diff --git a/Content.Shared/Mind/SharedMindSystem.cs b/Content.Shared/Mind/SharedMindSystem.cs
index bf1065c1b1..ba365daf15 100644
--- a/Content.Shared/Mind/SharedMindSystem.cs
+++ b/Content.Shared/Mind/SharedMindSystem.cs
@@ -370,7 +370,7 @@ public abstract class SharedMindSystem : EntitySystem
         if (Resolve(mindId, ref mind))
         {
             var query = GetEntityQuery<T>();
-            foreach (var uid in mind.AllObjectives)
+            foreach (var uid in mind.Objectives)
             {
                 if (query.TryGetComponent(uid, out objective))
                 {