diff --git a/stepmania/Themes/default/metrics.ini b/stepmania/Themes/default/metrics.ini
index 1da582a6da..30bead218c 100644
--- a/stepmania/Themes/default/metrics.ini
+++ b/stepmania/Themes/default/metrics.ini
@@ -20,9 +20,9 @@ MaxCourseEntriesBeforeShowVarious=6
 GameBaseNoteSkin="default"
 
 [Gameplay]
-ComboIsPerRow=GAMESTATE:GetPlayMode() == PLAY_MODE_ONI
-MinScoreToContinueCombo=GAMESTATE:GetPlayMode() == PLAY_MODE_ONI and TNS_W2 or TNS_W3
-MinScoreToMaintainCombo=TNS_W3
+ComboIsPerRow=GAMESTATE:GetPlayMode() == "PlayMode_Oni"
+MinScoreToContinueCombo=GAMESTATE:GetPlayMode() == "PlayMode_Oni" and "TapNoteScore_W2" or "TapNoteScore_W3"
+MinScoreToMaintainCombo="TapNoteScore_W3"
 
 [Screen]
 ScreenInitCommand=