diff --git a/QuestPathGenerator/QuestSourceGenerator.cs b/QuestPathGenerator/QuestSourceGenerator.cs
index d30a0fa6..8bb37b73 100644
--- a/QuestPathGenerator/QuestSourceGenerator.cs
+++ b/QuestPathGenerator/QuestSourceGenerator.cs
@@ -141,7 +141,7 @@ public class QuestSourceGenerator : ISourceGenerator
                                                                                         Token(SyntaxKind
                                                                                             .UShortKeyword)),
                                                                                     Token(SyntaxKind.CommaToken),
-                                                                                    IdentifierName("QuestData")
+                                                                                    IdentifierName("QuestRoot")
                                                                                 }))))
                                                             .WithVariables(
                                                                 SingletonSeparatedList(
@@ -169,7 +169,7 @@ public class QuestSourceGenerator : ISourceGenerator
                                                                                                                     SyntaxKind
                                                                                                                         .CommaToken),
                                                                                                                 IdentifierName(
-                                                                                                                    "QuestData")
+                                                                                                                    "QuestRoot")
                                                                                                             }))))
                                                                                     .WithArgumentList(
                                                                                         ArgumentList())
diff --git a/QuestPaths/AssemblyQuestLoader.cs b/QuestPaths/AssemblyQuestLoader.cs
index 9601c4dc..4abfb4c7 100644
--- a/QuestPaths/AssemblyQuestLoader.cs
+++ b/QuestPaths/AssemblyQuestLoader.cs
@@ -6,6 +6,6 @@ namespace Questionable.QuestPaths;
 
 public static partial class AssemblyQuestLoader
 {
-    public static IReadOnlyDictionary<ushort, QuestData> GetQuests() => Quests;
+    public static IReadOnlyDictionary<ushort, QuestRoot> GetQuests() => Quests;
 }
 #endif
diff --git a/Questionable/Controller/QuestRegistry.cs b/Questionable/Controller/QuestRegistry.cs
index 779c5258..89748fbc 100644
--- a/Questionable/Controller/QuestRegistry.cs
+++ b/Questionable/Controller/QuestRegistry.cs
@@ -37,13 +37,13 @@ internal sealed class QuestRegistry
 #if RELEASE
         _logger.LogInformation("Loading quests from assembly");
 
-        foreach ((ushort questId, QuestData questData) in QuestPaths.AssemblyQuestLoader.GetQuests())
+        foreach ((ushort questId, QuestRoot questRoot) in QuestPaths.AssemblyQuestLoader.GetQuests())
         {
             Quest quest = new()
             {
                 QuestId = questId,
-                Name = string.Empty,
-                Data = questData,
+                Root = questRoot,
+                Info = _questData.GetQuestInfo(questId),
             };
             _quests[questId] = quest;
         }