diff --git a/src/dusk/randomizer/generator/data/macros.yaml b/src/dusk/randomizer/generator/data/macros.yaml
index ec8a93070f..0144556bf5 100644
--- a/src/dusk/randomizer/generator/data/macros.yaml
+++ b/src/dusk/randomizer/generator/data/macros.yaml
@@ -263,7 +263,7 @@ Death Mountain Warp Portal: Can_Complete_Eldin_Twilight
 Bridge of Eldin Warp Portal: Can_Defeat_Shadow_Beast and 'Can_Access_Eldin_Field_North_of_Bridge'
 Castle Town Warp Portal: Can_Complete_Lanayru_Twilight
 Lake Hylia Warp Portal: Can_Complete_Lanayru_Twilight
-Upper Zoras River Warp Portal: (Sword or (Can_Defeat_Shadow_Beast and Transform_Anywhere == On)) and 'Can_Access_Upper_Zoras_River'
+Upper Zoras River Warp Portal: (Sword or (Can_Defeat_Shadow_Beast and Logic_Transform_Anywhere == On)) and 'Can_Access_Upper_Zoras_River'
 Zoras Domain Warp Portal: Can_Complete_Lanayru_Twilight
 Snowpeak Warp Portal: Snowpeak_Does_Not_Require_Reekfish_Scent == On or (Can_Defeat_Shadow_Beast and 'Can_Access_Snowpeak_Summit_Upper')
 Gerudo Desert Warp Portal: Can_Defeat_Shadow_Beast and 'Can_Access_Gerudo_Desert_Cave_of_Ordeals_Plateau'
diff --git a/src/dusk/randomizer/generator/data/settings_list.yaml b/src/dusk/randomizer/generator/data/settings_list.yaml
index 6fc5f33088..4783a0f52e 100644
--- a/src/dusk/randomizer/generator/data/settings_list.yaml
+++ b/src/dusk/randomizer/generator/data/settings_list.yaml
@@ -303,27 +303,6 @@
     - "Off": description
     - "On": description
 
-- Name: Fast Iron Boots
-  Tracker Important: True
-  Default Option: "Off"
-  Options:
-    - "Off": description
-    - "On": description
-
-- Name: Quick Transform
-  Tracker Important: True
-  Default Option: "Off"
-  Options:
-    - "Off": description
-    - "On": description
-
-- Name: Instant Message Text
-  Tracker Important: True
-  Default Option: "Off"
-  Options:
-    - "Off": description
-    - "On": description
-
 - Name: Unlock Map Regions
   Tracker Important: True
   Default Option: "Off"
@@ -331,13 +310,6 @@
     - "Off": description
     - "On": description
 
-- Name: Increase Spinner Speed
-  Tracker Important: True
-  Default Option: "Off"
-  Options:
-    - "Off": description
-    - "On": description
-
 - Name: Open Door of Time
   Tracker Important: True
   Default Option: "Off"
@@ -377,13 +349,6 @@
     - Human: Start as Human Link
     - Wolf: Start as Wolf Link
 
-- Name: Transform Anywhere
-  Tracker Important: True
-  Default Option: "Off"
-  Options:
-    - "Off": description
-    - "On": description
-
 - Name: Increase Wallet Capacity
   Tracker Important: True
   Default Option: "Off"
@@ -760,6 +725,12 @@
     - "Off": "Ball and Chain will not be required to break webs."
     - "On": "Ball and Chain may be required to break webs."
 
+- Name: Logic Transform Anywhere
+  Default Option: "On"
+  Options:
+    - "Off": "You will not be expected to transform in places that you normally can't"
+    - "On": "You may be expected to trasform in places that require using the Transform Anywhere enhancement"
+
 #######################################
 ## Extra Starting Inventory Settings ##
 #######################################
diff --git a/src/dusk/randomizer/generator/data/tests/logic/all random/settings.yaml b/src/dusk/randomizer/generator/data/tests/logic/all random/settings.yaml
index 9ff0fb4e65..cdb0701a59 100644
--- a/src/dusk/randomizer/generator/data/tests/logic/all random/settings.yaml	
+++ b/src/dusk/randomizer/generator/data/tests/logic/all random/settings.yaml	
@@ -55,7 +55,7 @@ Starting Form: Random
 Starting Hearts: 3
 Starting Time of Day: Random
 Temple of Time Sword Requirement: Random
-Transform Anywhere: Random
+Logic Transform Anywhere: Random
 Trap Item Frequency: Random
 Unlock Map Regions: Random
 Unrequired Dungeons Are Barren: Random
diff --git a/src/dusk/randomizer/generator/logic/world.cpp b/src/dusk/randomizer/generator/logic/world.cpp
index cbb901014d..dce69c2a45 100644
--- a/src/dusk/randomizer/generator/logic/world.cpp
+++ b/src/dusk/randomizer/generator/logic/world.cpp
@@ -358,7 +358,7 @@ namespace randomizer::logic::world
                 }
 
                 auto canTransform = canTransformStr == "Always" ||
-                                    (this->Setting("Transform Anywhere") == "On" && canTransformStr == "If Transform Anywhere");
+                                    (this->Setting("Logic Transform Anywhere") == "On" && canTransformStr == "If Transform Anywhere");
 
                 area->SetCanTransform(canTransform);
 
diff --git a/src/m_Do/m_Do_main.cpp b/src/m_Do/m_Do_main.cpp
index 6cd447ef70..1065a7229c 100644
--- a/src/m_Do/m_Do_main.cpp
+++ b/src/m_Do/m_Do_main.cpp
@@ -72,8 +72,8 @@
 #include "tracy/Tracy.hpp"
 
 #if RANDOMIZER_ONLY
-#include "dusk/randomizer/randomizer.hpp"
-#include "dusk/randomizer/test/test.hpp"
+#include "dusk/randomizer/generator/randomizer.hpp"
+#include "dusk/randomizer/generator/test/test.hpp"
 #endif
 
 // --- GLOBALS ---