diff --git a/packs/feat-effects/effect-favored-terrain-gain-climb-speed.json b/packs/feat-effects/effect-favored-terrain-gain-climb-speed.json
index 6d61f59c196..1387dee9ebe 100644
--- a/packs/feat-effects/effect-favored-terrain-gain-climb-speed.json
+++ b/packs/feat-effects/effect-favored-terrain-gain-climb-speed.json
@@ -4,7 +4,7 @@
     "name": "Effect: Favored Terrain (Gain Climb Speed)",
     "system": {
         "description": {
-            "value": "<p>Granted by @UUID[Compendium.pf2e.feats-srd.Item.Favored Terrain]{Favored Terrain (Forest, Moutain or Underground)} if you have the @UUID[Compendium.pf2e.classfeatures.Item.Unimpeded Journey]{Wild Stride} class feature, and are in forested, mountainous or underground terrain and do not already have a climb Speed.</p>\n<p>You gain a climb Speed equal to your Speed.</p>"
+            "value": "<p>Granted by @UUID[Compendium.pf2e.feats-srd.Item.Favored Terrain]{Favored Terrain (Forest, Moutain or Underground)} if you have the @UUID[Compendium.pf2e.classfeatures.Item.Unimpeded Journey] class feature, are in forested, mountainous or underground terrain and do not already have a climb Speed.</p>\n<p>You gain a climb Speed equal to your Speed.</p>"
         },
         "duration": {
             "expiry": null,
@@ -16,9 +16,9 @@
             "value": 11
         },
         "publication": {
-            "license": "OGL",
-            "remaster": false,
-            "title": "Pathfinder Core Rulebook"
+            "license": "ORC",
+            "remaster": true,
+            "title": "Pathfinder Player Core"
         },
         "rules": [
             {
diff --git a/packs/feat-effects/effect-favored-terrain-gain-swim-speed.json b/packs/feat-effects/effect-favored-terrain-gain-swim-speed.json
index 0049bf64052..0ff48f6e183 100644
--- a/packs/feat-effects/effect-favored-terrain-gain-swim-speed.json
+++ b/packs/feat-effects/effect-favored-terrain-gain-swim-speed.json
@@ -4,7 +4,7 @@
     "name": "Effect: Favored Terrain (Gain Swim Speed)",
     "system": {
         "description": {
-            "value": "<p>Granted by @UUID[Compendium.pf2e.feats-srd.Item.Favored Terrain]{Favored Terrain (Aquatic)} if you have the @UUID[Compendium.pf2e.classfeatures.Item.Unimpeded Journey]{Wild Stride} class feature, and are in aquatic terrain and do not already have a swim Speed.</p>\n<p>You gain a swim Speed equal to your Speed.</p>"
+            "value": "<p>Granted by @UUID[Compendium.pf2e.feats-srd.Item.Favored Terrain]{Favored Terrain (Aquatic)} if you have the @UUID[Compendium.pf2e.classfeatures.Item.Unimpeded Journey] class feature, are in aquatic terrain and do not already have a swim Speed.</p>\n<p>You gain a swim Speed equal to your Speed.</p>"
         },
         "duration": {
             "expiry": null,
@@ -16,9 +16,9 @@
             "value": 11
         },
         "publication": {
-            "license": "OGL",
-            "remaster": false,
-            "title": "Pathfinder Core Rulebook"
+            "license": "ORC",
+            "remaster": true,
+            "title": "Pathfinder Player Core"
         },
         "rules": [
             {
diff --git a/packs/feat-effects/effect-favored-terrain-increase-climb-speed.json b/packs/feat-effects/effect-favored-terrain-increase-climb-speed.json
index 776482f4f1f..c0504788ce3 100644
--- a/packs/feat-effects/effect-favored-terrain-increase-climb-speed.json
+++ b/packs/feat-effects/effect-favored-terrain-increase-climb-speed.json
@@ -4,7 +4,7 @@
     "name": "Effect: Favored Terrain (Increase Climb Speed)",
     "system": {
         "description": {
-            "value": "<p>Granted by @UUID[Compendium.pf2e.feats-srd.Item.Favored Terrain]{Favored Terrain (Forest, Moutain or Underground)} if you have the @UUID[Compendium.pf2e.classfeatures.Item.Unimpeded Journey]{Wild Stride} class feature, and are in forested, mountainous or underground terrain and already have a climb Speed.</p>\n<p>You gain a +10-foot status bonus to your climb Speed.</p>"
+            "value": "<p>Granted by @UUID[Compendium.pf2e.feats-srd.Item.Favored Terrain]{Favored Terrain (Forest, Moutain or Underground)} if you have the @UUID[Compendium.pf2e.classfeatures.Item.Unimpeded Journey] class feature, are in forested, mountainous or underground terrain and already have a climb Speed.</p>\n<p>You gain a +10-foot status bonus to your climb Speed.</p>"
         },
         "duration": {
             "expiry": null,
@@ -16,9 +16,9 @@
             "value": 11
         },
         "publication": {
-            "license": "OGL",
-            "remaster": false,
-            "title": "Pathfinder Core Rulebook"
+            "license": "ORC",
+            "remaster": true,
+            "title": "Pathfinder Player Core"
         },
         "rules": [
             {
diff --git a/packs/feat-effects/effect-favored-terrain-increase-fly-speed.json b/packs/feat-effects/effect-favored-terrain-increase-fly-speed.json
new file mode 100644
index 00000000000..cf129a0967a
--- /dev/null
+++ b/packs/feat-effects/effect-favored-terrain-increase-fly-speed.json
@@ -0,0 +1,44 @@
+{
+    "_id": "3cwQvoDRlixQozhQ",
+    "img": "systems/pf2e/icons/spells/dimensional-step.webp",
+    "name": "Effect: Favored Terrain (Increase Fly Speed)",
+    "system": {
+        "description": {
+            "value": "<p>Granted by @UUID[Compendium.pf2e.feats-srd.Item.Favored Terrain]{Favored Terrain (Sky)} if you have the @UUID[Compendium.pf2e.classfeatures.Item.Unimpeded Journey] class feature, and are in sky terrain and already have a fly Speed.</p>\n<p>You gain a +10-foot status bonus to your fly Speed.</p>"
+        },
+        "duration": {
+            "expiry": null,
+            "sustained": false,
+            "unit": "unlimited",
+            "value": -1
+        },
+        "level": {
+            "value": 11
+        },
+        "publication": {
+            "license": "ORC",
+            "remaster": true,
+            "title": "Pathfinder Player Core"
+        },
+        "rules": [
+            {
+                "key": "FlatModifier",
+                "selector": "fly-speed",
+                "type": "status",
+                "value": 10
+            }
+        ],
+        "start": {
+            "initiative": null,
+            "value": 0
+        },
+        "tokenIcon": {
+            "show": true
+        },
+        "traits": {
+            "rarity": "common",
+            "value": []
+        }
+    },
+    "type": "effect"
+}
diff --git a/packs/feat-effects/effect-favored-terrain-increase-land-speed.json b/packs/feat-effects/effect-favored-terrain-increase-land-speed.json
new file mode 100644
index 00000000000..a626ac8b3af
--- /dev/null
+++ b/packs/feat-effects/effect-favored-terrain-increase-land-speed.json
@@ -0,0 +1,44 @@
+{
+    "_id": "GUJQAG5KdwbC5A3p",
+    "img": "systems/pf2e/icons/equipment/worn-items/other-worn-items/boots-of-bounding.webp",
+    "name": "Effect: Favored Terrain (Increase Land Speed)",
+    "system": {
+        "description": {
+            "value": "<p>Granted by @UUID[Compendium.pf2e.feats-srd.Item.Favored Terrain]{Favored Terrain (Plains)} if you have the @UUID[Compendium.pf2e.classfeatures.Item.Unimpeded Journey] class feature and are in plains terrain.</p>\n<p>You gain a +10-foot status bonus to your land Speed.</p>"
+        },
+        "duration": {
+            "expiry": null,
+            "sustained": false,
+            "unit": "unlimited",
+            "value": -1
+        },
+        "level": {
+            "value": 11
+        },
+        "publication": {
+            "license": "ORC",
+            "remaster": true,
+            "title": "Pathfinder Player Core"
+        },
+        "rules": [
+            {
+                "key": "FlatModifier",
+                "selector": "land-speed",
+                "type": "status",
+                "value": 10
+            }
+        ],
+        "start": {
+            "initiative": null,
+            "value": 0
+        },
+        "tokenIcon": {
+            "show": true
+        },
+        "traits": {
+            "rarity": "common",
+            "value": []
+        }
+    },
+    "type": "effect"
+}
diff --git a/packs/feat-effects/effect-favored-terrain-increase-swim-speed.json b/packs/feat-effects/effect-favored-terrain-increase-swim-speed.json
index 704855327d5..e2c2949750c 100644
--- a/packs/feat-effects/effect-favored-terrain-increase-swim-speed.json
+++ b/packs/feat-effects/effect-favored-terrain-increase-swim-speed.json
@@ -4,7 +4,7 @@
     "name": "Effect: Favored Terrain (Increase Swim Speed)",
     "system": {
         "description": {
-            "value": "<p>Granted by @UUID[Compendium.pf2e.feats-srd.Item.Favored Terrain]{Favored Terrain (Aquatic)} if you have the @UUID[Compendium.pf2e.classfeatures.Item.Unimpeded Journey]{Wild Stride} class feature, and are in aquatic terrain and already have a swimSpeed.</p>\n<p>You gain a +10-foot status bonus to your swim Speed.</p>"
+            "value": "<p>Granted by @UUID[Compendium.pf2e.feats-srd.Item.Favored Terrain]{Favored Terrain (Aquatic)} if you have the @UUID[Compendium.pf2e.classfeatures.Item.Unimpeded Journey] class feature, are in aquatic terrain and already have a swim Speed.</p>\n<p>You gain a +10-foot status bonus to your swim Speed.</p>"
         },
         "duration": {
             "expiry": null,
@@ -16,9 +16,9 @@
             "value": 11
         },
         "publication": {
-            "license": "OGL",
-            "remaster": false,
-            "title": "Pathfinder Core Rulebook"
+            "license": "ORC",
+            "remaster": true,
+            "title": "Pathfinder Player Core"
         },
         "rules": [
             {
diff --git a/packs/feats/favored-terrain.json b/packs/feats/favored-terrain.json
index 7dadb80d57c..241e05eb6ed 100644
--- a/packs/feats/favored-terrain.json
+++ b/packs/feats/favored-terrain.json
@@ -11,7 +11,7 @@
         },
         "category": "class",
         "description": {
-            "value": "<p>You have studied a specific terrain to overcome its challenges. Choose aquatic, arctic, desert, forest, mountain, plains, sky, swamp, or underground as your favored terrain. When in that terrain, you can ignore the effects of non-magical difficult terrain. If you have the unimpeded journey class feature, you gain a second benefit while in your favored terrain, depending on your choice:</p>\n<ul>\n<li><strong>Aquatic</strong> You gain a swim Speed equal to your Speed. If you already had a swim Speed, you instead gain a +10-foot status bonus to your swim Speed.</li>\n<li><strong>Arctic</strong> You need to eat and drink only one-tenth as much as usual, you aren't affected by severe or extreme cold, and you can walk across ice and snow at full Speed without needing to @UUID[Compendium.pf2e.actionspf2e.Item.Balance].</li>\n<li><strong>Desert</strong> You need to eat and drink only one-tenth as much as usual, you aren't affected by severe or extreme heat, and you can walk along sand at full Speed without needing to Balance.</li>\n<li><strong>Forest, Mountain, or Underground</strong> You gain a climb Speed equal to your Speed. If you already had a climb Speed, you instead gain a +10-foot status bonus to your climb Speed.</li>\n<li><strong>Plains</strong> You gain a +10-foot status bonus to your land Speed.</li>\n<li><strong>Sky</strong> You gain a +10-foot status bonus to your fly Speed, if you have one.</li>\n<li><strong>Swamp</strong> You can move across bogs at full Speed, even if they are deep enough to be greater difficult terrain or to normally require you to Swim.</li>\n</ul>\n<p>@UUID[Compendium.pf2e.feat-effects.Item.Effect: Favored Terrain (Gain Climb Speed)]</p>\n<p>@UUID[Compendium.pf2e.feat-effects.Item.Effect: Favored Terrain (Increase Climb Speed)]</p>\n<p>@UUID[Compendium.pf2e.feat-effects.Item.Effect: Favored Terrain (Gain Swim Speed)]</p>\n<p>@UUID[Compendium.pf2e.feat-effects.Item.Effect: Favored Terrain (Increase Swim Speed)]</p>"
+            "value": "<p>You have studied a specific terrain to overcome its challenges. Choose aquatic, arctic, desert, forest, mountain, plains, sky, swamp, or underground as your favored terrain. When in that terrain, you can ignore the effects of non-magical difficult terrain. If you have the @UUID[Compendium.pf2e.classfeatures.Item.Unimpeded Journey] class feature, you gain a second benefit while in your favored terrain, depending on your choice:</p><ul><li><strong>Aquatic</strong> You gain a swim Speed equal to your Speed. If you already had a swim Speed, you instead gain a +10-foot status bonus to your swim Speed.</li><li><strong>Arctic</strong> You need to eat and drink only one-tenth as much as usual, you aren't affected by severe or extreme cold, and you can walk across ice and snow at full Speed without needing to @UUID[Compendium.pf2e.actionspf2e.Item.Balance].</li><li><strong>Desert</strong> You need to eat and drink only one-tenth as much as usual, you aren't affected by severe or extreme heat, and you can walk along sand at full Speed without needing to Balance.</li><li><strong>Forest, Mountain, or Underground</strong> You gain a climb Speed equal to your Speed. If you already had a climb Speed, you instead gain a +10-foot status bonus to your climb Speed.</li><li><strong>Plains</strong> You gain a +10-foot status bonus to your land Speed.</li><li><strong>Sky</strong> You gain a +10-foot status bonus to your fly Speed, if you have one.</li><li><strong>Swamp</strong> You can move across bogs at full Speed, even if they are deep enough to be greater difficult terrain or to normally require you to Swim.</li></ul><p>@UUID[Compendium.pf2e.feat-effects.Item.Effect: Favored Terrain (Gain Climb Speed)]</p>\n<p>@UUID[Compendium.pf2e.feat-effects.Item.Effect: Favored Terrain (Gain Swim Speed)]</p>\n<p>@UUID[Compendium.pf2e.feat-effects.Item.Effect: Favored Terrain (Increase Climb Speed)]</p>\n<p>@UUID[Compendium.pf2e.feat-effects.Item.Effect: Favored Terrain (Increase Fly Speed)]</p>\n<p>@UUID[Compendium.pf2e.feat-effects.Item.Effect: Favored Terrain (Increase Land Speed)]</p>\n<p>@UUID[Compendium.pf2e.feat-effects.Item.Effect: Favored Terrain (Increase Swim Speed)]</p>"
         },
         "level": {
             "value": 2
diff --git a/packs/feats/ultimate-skirmisher.json b/packs/feats/ultimate-skirmisher.json
index 3910f2be9e7..0a22a7b962e 100644
--- a/packs/feats/ultimate-skirmisher.json
+++ b/packs/feats/ultimate-skirmisher.json
@@ -19,7 +19,7 @@
         "prerequisites": {
             "value": [
                 {
-                    "value": "wild stride"
+                    "value": "unimpeded journey"
                 }
             ]
         },
diff --git a/packs/feats/wild-strider.json b/packs/feats/wild-strider.json
index ece2346e7b4..b6b37e2affb 100644
--- a/packs/feats/wild-strider.json
+++ b/packs/feats/wild-strider.json
@@ -11,7 +11,7 @@
         },
         "category": "class",
         "description": {
-            "value": "<p>Natural obstacles pose no obstacle to you. You gain the ranger's @UUID[Compendium.pf2e.classfeatures.Item.Unimpeded Journey]{Wild Stride} class feature. This allows you to ignore the effects of all non-magical difficult terrain, treat greater difficult terrain as merely difficult terrain, and gives you an additional benefit from @UUID[Compendium.pf2e.feats-srd.Item.Favored Terrain] based on the terrain.</p>"
+            "value": "<p>Natural obstacles pose no obstacle to you. You gain the ranger's @UUID[Compendium.pf2e.classfeatures.Item.Unimpeded Journey] class feature. This allows you to ignore the effects of difficult terrain, treat greater difficult terrain as merely difficult terrain, and gives you an additional benefit from @UUID[Compendium.pf2e.feats-srd.Item.Favored Terrain] based on the terrain.</p>"
         },
         "level": {
             "value": 12