diff --git a/stepmania/Courses/Samples/AllMusicRandom.crs b/stepmania/Courses/Samples/AllMusicRandom.crs
index 54df3693f1..26dec2cccd 100644
--- a/stepmania/Courses/Samples/AllMusicRandom.crs
+++ b/stepmania/Courses/Samples/AllMusicRandom.crs
@@ -1,5 +1,5 @@
 #COURSE:All Music Random;
-#SONG:*:TRICK;
-#SONG:*:TRICK;
-#SONG:*:TRICK;
-#SONG:*:TRICK;
+#SONG:*:Medium:;
+#SONG:*:Medium:;
+#SONG:*:Medium:;
+#SONG:*:Medium:;
diff --git a/stepmania/Courses/Samples/PlayersBest1-4.crs b/stepmania/Courses/Samples/PlayersBest1-4.crs
index ad4cc9559f..bcbc88602a 100644
--- a/stepmania/Courses/Samples/PlayersBest1-4.crs
+++ b/stepmania/Courses/Samples/PlayersBest1-4.crs
@@ -1,6 +1,6 @@
 #COURSE:Players Best  1-4;
-#SONG:BEST1:TRICK;
-#SONG:BEST2:TRICK;
-#SONG:BEST3:TRICK;
-#SONG:BEST4:TRICK;
+#SONG:BEST1:Medium;
+#SONG:BEST2:Medium;
+#SONG:BEST3:Medium;
+#SONG:BEST4:Medium;
 
diff --git a/stepmania/Courses/Samples/PlayersBest13-16.crs b/stepmania/Courses/Samples/PlayersBest13-16.crs
index 6e44697ecd..1b0b9c91fd 100644
--- a/stepmania/Courses/Samples/PlayersBest13-16.crs
+++ b/stepmania/Courses/Samples/PlayersBest13-16.crs
@@ -1,5 +1,5 @@
 #COURSE:Players Best 13-16;
-#SONG:BEST13:TRICK;
-#SONG:BEST14:TRICK;
-#SONG:BEST15:TRICK;
-#SONG:BEST16:TRICK;
+#SONG:BEST13:Medium;
+#SONG:BEST14:Medium;
+#SONG:BEST15:Medium;
+#SONG:BEST16:Medium;
diff --git a/stepmania/Courses/Samples/PlayersBest5-8.crs b/stepmania/Courses/Samples/PlayersBest5-8.crs
index 1f3a52903c..e889f818d1 100644
--- a/stepmania/Courses/Samples/PlayersBest5-8.crs
+++ b/stepmania/Courses/Samples/PlayersBest5-8.crs
@@ -1,5 +1,5 @@
 #COURSE:Players Best  5-8;
-#SONG:BEST5:TRICK;
-#SONG:BEST6:TRICK;
-#SONG:BEST7:TRICK;
-#SONG:BEST8:TRICK;
+#SONG:BEST5:Medium;
+#SONG:BEST6:Medium;
+#SONG:BEST7:Medium;
+#SONG:BEST8:Medium;
diff --git a/stepmania/Courses/Samples/PlayersBest9-12.crs b/stepmania/Courses/Samples/PlayersBest9-12.crs
index 2bcc274976..9cad62b0b2 100644
--- a/stepmania/Courses/Samples/PlayersBest9-12.crs
+++ b/stepmania/Courses/Samples/PlayersBest9-12.crs
@@ -1,5 +1,5 @@
 #COURSE:Players Best  9-12;
-#SONG:BEST9:TRICK;
-#SONG:BEST10:TRICK;
-#SONG:BEST11:TRICK;
-#SONG:BEST12:TRICK;
+#SONG:BEST9:Medium;
+#SONG:BEST10:Medium;
+#SONG:BEST11:Medium;
+#SONG:BEST12:Medium;
diff --git a/stepmania/Courses/Samples/PlayersWorst.crs b/stepmania/Courses/Samples/PlayersWorst.crs
index b0804bcb04..9a493263ae 100644
--- a/stepmania/Courses/Samples/PlayersWorst.crs
+++ b/stepmania/Courses/Samples/PlayersWorst.crs
@@ -1,5 +1,5 @@
 #COURSE:Players Worst;
-#SONG:WORST1:TRICK;
-#SONG:WORST2:TRICK;
-#SONG:WORST3:TRICK;
-#SONG:WORST4:TRICK;
+#SONG:WORST1:Medium;
+#SONG:WORST2:Medium;
+#SONG:WORST3:Medium;
+#SONG:WORST4:Medium;
diff --git a/stepmania/Courses/Samples/Tortoise and the Hare.crs b/stepmania/Courses/Samples/Tortoise and the Hare.crs
index ea925f9e74..b0e41a52fe 100644
--- a/stepmania/Courses/Samples/Tortoise and the Hare.crs	
+++ b/stepmania/Courses/Samples/Tortoise and the Hare.crs	
@@ -1,5 +1,5 @@
 #COURSE:Tortoise and the Hare;
-#SONG:*:TRICK:0.8xmusic;
-#SONG:*:TRICK:1.1xmusic;
-#SONG:*:TRICK:1.3xmusic;
-#SONG:*:TRICK:1.5xmusic;
+#SONG:*:Medium:0.8xmusic;
+#SONG:*:Medium:1.1xmusic;
+#SONG:*:Medium:1.3xmusic;
+#SONG:*:Medium:1.5xmusic;
diff --git a/stepmania/Courses/Samples/TrickyRandom.crs b/stepmania/Courses/Samples/TrickyRandom.crs
index 0f167e2086..8d8f3bb067 100644
--- a/stepmania/Courses/Samples/TrickyRandom.crs
+++ b/stepmania/Courses/Samples/TrickyRandom.crs
@@ -1,5 +1,5 @@
 #COURSE:Tricky Random;
-#SONG:*:TRICK:1.5x,reverse;
-#SONG:*:TRICK:expand;
-#SONG:*:TRICK:0.25x,dark;
-#SONG:*:TRICK:sudden,land;
+#SONG:*:Medium:1.5x,reverse;
+#SONG:*:Medium:expand;
+#SONG:*:Medium:0.25x,dark;
+#SONG:*:Medium:sudden,land;