diff --git a/data/challenges/atworldsend.challenge b/data/challenges/atworldsend.challenge
index 67beb35d7..a1359991f 100644
--- a/data/challenges/atworldsend.challenge
+++ b/data/challenges/atworldsend.challenge
@@ -6,7 +6,7 @@
     name="Follow the Leader on a Desert Island"
     description="Win a Follow the Leader race with 3 AI karts on a Desert Island."
     unlock-gp="atworldsend"
-    depend-on="canyon"
+    depend-on="minigolf"
     major="single"
     minor="followtheleader"
     track="islandtrack"
diff --git a/data/challenges/mines.challenge b/data/challenges/mines.challenge
index f7524dd5d..85dd2f275 100644
--- a/data/challenges/mines.challenge
+++ b/data/challenges/mines.challenge
@@ -6,7 +6,7 @@
     name="Collect fuel for your rocket"
     description="Finish with at least 16 nitro points on 2 laps of XR591 in under 2:30 minutes."
     unlock-track="mines"
-    depend-on="lighthousetime canyon"
+    depend-on="lighthousetime minigolf"
     major="single"
     minor="quickrace"
     track="xr591"
diff --git a/data/challenges/canyon.challenge b/data/challenges/minigolf.challenge
similarity index 92%
rename from data/challenges/canyon.challenge
rename to data/challenges/minigolf.challenge
index e144dcf38..bf34c2be7 100644
--- a/data/challenges/canyon.challenge
+++ b/data/challenges/minigolf.challenge
@@ -6,7 +6,7 @@
     name="Win a race on Tux Tollway"
     description="Win a 3 lap race on Tux Tollway against 4 Expert level AI karts."
     depend-on="lighthousetime tothemoonandbackgp"
-    unlock-track="canyon"
+    unlock-track="minigolf"
     major="single"
     minor="quickrace"
     track="tuxtollway"
diff --git a/data/challenges/xr591.challenge b/data/challenges/xr591.challenge
index dbedea55f..ac22152a3 100644
--- a/data/challenges/xr591.challenge
+++ b/data/challenges/xr591.challenge
@@ -2,14 +2,14 @@
 
 <challenge
     version="1"
-    id="canyon"
-    name="Win a race on Canyon"
-    description="Win a 3 lap race on Canyon against 4 Expert level AI karts."
+    id="minigolf"
+    name="Win a race on Minigolf"
+    description="Win a 3 lap race on Minigolf against 4 Expert level AI karts."
     depend-on="tollway"
     unlock-track="xr591"
     major="single"
     minor="quickrace"
-    track="canyon"
+    track="minigolf"
     difficulty="hard"
     laps="3"
     karts="5"
diff --git a/data/grandprix/alltracks.grandprix b/data/grandprix/alltracks.grandprix
index 7f55cd178..cb1d5a211 100644
--- a/data/grandprix/alltracks.grandprix
+++ b/data/grandprix/alltracks.grandprix
@@ -17,7 +17,7 @@
     <track id="zengarden"        laps="4" />
     <track id="city"             laps="3" />
     <track id="xr591"            laps="3" />
-    <track id="canyon"           laps="2" />
+    <track id="minigolf"         laps="3" />
     <track id="snowmountain"     laps="3" />
     <track id="tuxtollway"       laps="2" />
     <track id="subsea"           laps="2" />
diff --git a/data/grandprix/atworldsend.grandprix b/data/grandprix/atworldsend.grandprix
index 3e24ba0ed..459b16bef 100644
--- a/data/grandprix/atworldsend.grandprix
+++ b/data/grandprix/atworldsend.grandprix
@@ -2,7 +2,7 @@
 <supertuxkart_grand_prix name="At World's End">
 
     <track id="fortmagma"    laps="3" />
-    <track id="canyon"       laps="2" />
+    <track id="minigolf"     laps="3" />
     <track id="xr591"        laps="3" />
     <track id="mines"        laps="3" />
     <track id="city"         laps="3" />