diff --git a/stepmania/Themes/default/metrics.ini b/stepmania/Themes/default/metrics.ini
index 3d58be9279..bf30d1ca4b 100644
--- a/stepmania/Themes/default/metrics.ini
+++ b/stepmania/Themes/default/metrics.ini
@@ -48,7 +48,8 @@ CurrentModeX=0
 CurrentModeY=0
 CurrentModeZoom=1
 
-[Unlocks]
+[UnlockManager]
+AutoLockChallengeSteps=0
 UnlockNames=
 # UnlockNames=1,2
 # The song "Pledge" requires 500 AP.
@@ -5083,6 +5084,3 @@ ComboOnCommand=hidden,1
 
 [Profile]
 ShowCoinData=1
-
-[UnlockManager]
-AutoLockChallengeSteps=0
diff --git a/stepmania/src/UnlockManager.cpp b/stepmania/src/UnlockManager.cpp
index c0f37bd3be..53d6714c00 100644
--- a/stepmania/src/UnlockManager.cpp
+++ b/stepmania/src/UnlockManager.cpp
@@ -18,8 +18,8 @@
 
 UnlockManager*	UNLOCKMAN = NULL;	// global and accessable from anywhere in our program
 
-#define UNLOCK_NAMES		THEME->GetMetric ("Unlocks","UnlockNames")
-#define UNLOCK(sLineName)	THEME->GetMetric ("Unlocks",ssprintf("Unlock%s",sLineName.c_str()))
+#define UNLOCK_NAMES		THEME->GetMetric ("UnlockManager","UnlockNames")
+#define UNLOCK(sLineName)	THEME->GetMetric ("UnlockManager",ssprintf("Unlock%s",sLineName.c_str()))
 
 ThemeMetric<bool> AUTO_LOCK_CHALLENGE_STEPS( "UnlockManager", "AutoLockChallengeSteps" );