diff --git a/ALttPRandomizer/Model/SeedSettings.cs b/ALttPRandomizer/Model/SeedSettings.cs
index 7bc64e3..1f6f0ba 100644
--- a/ALttPRandomizer/Model/SeedSettings.cs
+++ b/ALttPRandomizer/Model/SeedSettings.cs
@@ -30,7 +30,7 @@
         public EntryRequirement CrystalsGanon { get; set; } = EntryRequirement.Crystals7;
 
         [SettingName("bosses_ganon")]
-        [IgnoreSetting(Apr2025, Base)]
+        [IgnoreSetting(Apr2025)]
         public BossRequirement BossesGanon { get; set; } = BossRequirement.Bosses8of10;
 
         [NoSettingName]
@@ -92,11 +92,11 @@
         public DungeonItemLocations Compasses { get; set; } = DungeonItemLocations.Dungeon;
 
         [SettingName("showloot")]
-        [IgnoreSetting(Apr2025, Base)]
+        [IgnoreSetting(Apr2025)]
         public ShowLoot ShowLoot { get; set; } = ShowLoot.Never;
 
         [SettingName("showmap")]
-        [IgnoreSetting(Apr2025, Base)]
+        [IgnoreSetting(Apr2025)]
         public ShowMap ShowMap { get; set; } = ShowMap.Map;
 
         [NoSettingName]
@@ -174,8 +174,8 @@
     }
 
     public enum RandomizerInstance {
-        [GeneratorSettings("base", "OR_", "--bps", "--spoiler=json")] Base,
-        [GeneratorSettings("beta", "GK_","--bps", "--spoiler=json")] Beta,
+        [GeneratorSettings("base", "GK_", "--bps", "--spoiler=json")] Base,
+        [GeneratorSettings("beta", "GK_", "--bps", "--spoiler=json")] Beta,
         [GeneratorSettings("apr2025", "ER_", requireFlips: true, "--json_spoiler")] Apr2025,
     }
 
@@ -294,7 +294,7 @@
         [SettingName("original")] Default,
         [SettingName("restricted")] VanillaDrops,
         Loose,
-        [SettingName("follow_linked")] Chaos,
+        [SettingName("followlinked")] Chaos,
     }
 
     public enum LinkedDrops {
diff --git a/BaseRandomizer b/BaseRandomizer
index ec81a90..f539e24 160000
--- a/BaseRandomizer
+++ b/BaseRandomizer
@@ -1 +1 @@
-Subproject commit ec81a900efcf56304537c16e5596e9eb9b57dc48
+Subproject commit f539e24ddbabd89b08a45284e344b5cb9a16b76c
diff --git a/BetaRandomizer b/BetaRandomizer
index a019fa6..4468721 160000
--- a/BetaRandomizer
+++ b/BetaRandomizer
@@ -1 +1 @@
-Subproject commit a019fa6478fc48428d9f439213da0871761f3db6
+Subproject commit 44687216213aa78cbc125b6bf0762b469a638b69