diff --git a/stepmania/Themes/default/metrics.ini b/stepmania/Themes/default/metrics.ini
index 8e30bbdf9e..01b48a273a 100644
--- a/stepmania/Themes/default/metrics.ini
+++ b/stepmania/Themes/default/metrics.ini
@@ -473,7 +473,7 @@ NonPresenceP2X=SCREEN_CENTER_X+448
 NonPresenceP2Y=SCREEN_CENTER_Y+0
 NonPresenceP2OnCommand=x,768;sleep,0.5;linear,1.0;x,607
 NonPresenceP2OffCommand=
-DefaultSort=GROUP
+DefaultSort=Group
 FOV=0
 FOVCenterX=SCREEN_CENTER_X+0
 FOVCenterY=SCREEN_CENTER_Y+0
@@ -702,11 +702,11 @@ DoRouletteOnMenuTimer=0
 
 [ScreenSelectCourseNonstop]
 Fallback=ScreenSelectCourse
-DefaultSort=NONSTOP
+DefaultSort=Nonstop
 
 [ScreenSelectCourseOni]
 Fallback=ScreenSelectCourse
-DefaultSort=ONI
+DefaultSort=Oni
 ScoreP1OnCommand=hidden,1
 ScoreP2OnCommand=hidden,1
 ScoreFrameP1OnCommand=hidden,1
@@ -714,7 +714,7 @@ ScoreFrameP2OnCommand=hidden,1
 
 [ScreenSelectCourseEndless]
 Fallback=ScreenSelectCourse
-DefaultSort=ENDLESS
+DefaultSort=Endless
 
 [ScreenNetRoom]
 MusicSelectScreen=ScreenSMOnlineSelectMusic
@@ -2328,15 +2328,15 @@ CirclePercent=0.5
 MostPlayedSongsToShow=30
 SortMenuChoiceNames=Group,Title,Bpm,Popularity,TopGrade,Artist,EasyMeter,MediumMeter,HardMeter
 ModeMenuChoiceNames=Group
-ChoiceGroup=name,GROUP;sort,GROUP
-ChoiceTitle=name,TITLE;sort,TITLE
+ChoiceGroup=name,GROUP;sort,Group
+ChoiceTitle=name,TITLE;sort,Title
 ChoiceBpm=name,BPM;sort,BPM
-ChoicePopularity=name,PLAYERS' BEST;sort,PLAYERS' BEST
-ChoiceTopGrade=name,TOP GRADE;sort,TOP GRADE
-ChoiceArtist=name,ARTIST;sort,ARTIST
-ChoiceEasyMeter=name,EASY METER;sort,EASY METER
-ChoiceMediumMeter=name,MEDIUM METER;sort,MEDIUM METER
-ChoiceHardMeter=name,HARD METER;sort,HARD METER
+ChoicePopularity=name,PLAYERS' BEST;sort,Popularity
+ChoiceTopGrade=name,TOP GRADE;sort,TopGrade
+ChoiceArtist=name,ARTIST;sort,Artist
+ChoiceEasyMeter=name,EASY METER;sort,EasyMeter
+ChoiceMediumMeter=name,MEDIUM METER;sort,MediumMeter
+ChoiceHardMeter=name,HARD METER;sort,HardMeter
 
 [LifeMeterBar]
 MeterWidth=260
diff --git a/stepmania/src/GameConstantsAndTypes.cpp b/stepmania/src/GameConstantsAndTypes.cpp
index 87e21b32d2..9413a0844c 100644
--- a/stepmania/src/GameConstantsAndTypes.cpp
+++ b/stepmania/src/GameConstantsAndTypes.cpp
@@ -64,24 +64,24 @@ XToString( CoinMode );
 
 
 static const CString SortOrderNames[NUM_SORT_ORDERS] = {
-	"PREFERRED",
-	"GROUP",
-	"TITLE",
+	"Preferred",
+	"Group",
+	"Title",
 	"BPM",
-	"PLAYERS BEST",
-	"TOP GRADE",
-	"ARTIST",
-	"EASY METER",
-	"MEDIUM METER",
-	"HARD METER",
-	"CHALLENGE METER",
-	"SORT",
-	"MODE",
-	"COURSES",
-	"NONSTOP",
-	"ONI",
-	"ENDLESS",
-	"ROULETTE"
+	"Popularity",
+	"TopGrade",
+	"Artist",
+	"EasyMeter",
+	"MediumMeter",
+	"HardMeter",
+	"ChallengeMeter",
+	"Sort",
+	"Mode",
+	"Courses",
+	"Nonstop",
+	"Oni",
+	"Endless",
+	"Roulette",
 };
 XToString( SortOrder );
 StringToX( SortOrder );