diff --git a/stepmania/src/GameManager.cpp b/stepmania/src/GameManager.cpp
index 3643892c84..3e64a5f4c7 100644
--- a/stepmania/src/GameManager.cpp
+++ b/stepmania/src/GameManager.cpp
@@ -2694,7 +2694,7 @@ const Style* GameManager::GameAndStringToStyle( const Game *game, CString sStyle
 }
 
 
-CString GameManager::GetSecondaryMenuButtonName( const Game *pGame, GameButton gb ) const
+CString GameManager::GetMenuButtonSecondaryFunction( const Game *pGame, GameButton gb ) const
 {
 	/*
 	 * Each GameButton can be used in gameplay (if any gameplay style maps to
diff --git a/stepmania/src/GameManager.h b/stepmania/src/GameManager.h
index 20d70cd213..7de0e08fb2 100644
--- a/stepmania/src/GameManager.h
+++ b/stepmania/src/GameManager.h
@@ -35,7 +35,7 @@ public:
 	static const Game* StringToGameType( CString sGameType );
 	const Style* GameAndStringToStyle( const Game* pGame, CString sStyle );
 	static CString StyleToThemedString( const Style* s );
-	CString GetSecondaryMenuButtonName( const Game *pGame, GameButton gb ) const;
+	CString GetMenuButtonSecondaryFunction( const Game *pGame, GameButton gb ) const;
 };
 
 extern GameManager*	GAMEMAN;	// global and accessable from anywhere in our program
diff --git a/stepmania/src/ScreenMapControllers.cpp b/stepmania/src/ScreenMapControllers.cpp
index bb97573f73..4ea52fd5d1 100644
--- a/stepmania/src/ScreenMapControllers.cpp
+++ b/stepmania/src/ScreenMapControllers.cpp
@@ -49,7 +49,7 @@ ScreenMapControllers::ScreenMapControllers( CString sClassName ) : ScreenWithMen
 	for( int b=0; b<GAMESTATE->GetCurrentGame()->m_iButtonsPerController; b++ )
 	{
 		CString sName = GAMESTATE->GetCurrentGame()->m_szButtonNames[b];
-		CString sSecondary = GAMEMAN->GetSecondaryMenuButtonName( GAMESTATE->GetCurrentGame(), b );
+		CString sSecondary = GAMEMAN->GetMenuButtonSecondaryFunction( GAMESTATE->GetCurrentGame(), b );
 
 		m_textName[b].LoadFromFont( THEME->GetPathToF("Common title") );
 		m_textName[b].SetXY( SCREEN_CENTER_X, -6 );
diff --git a/stepmania/src/ScreenTestInput.cpp b/stepmania/src/ScreenTestInput.cpp
index b153d4d4e8..8787a09cb3 100644
--- a/stepmania/src/ScreenTestInput.cpp
+++ b/stepmania/src/ScreenTestInput.cpp
@@ -59,7 +59,7 @@ void ScreenTestInput::Update( float fDeltaTime )
 				if( INPUTMAPPER->DeviceToGame(di,gi) )
 				{
 					CString sName = GAMESTATE->GetCurrentGame()->m_szButtonNames[gi.button];
-					CString sSecondary = GAMEMAN->GetSecondaryMenuButtonName( GAMESTATE->GetCurrentGame(), gi.button );
+					CString sSecondary = GAMEMAN->GetMenuButtonSecondaryFunction( GAMESTATE->GetCurrentGame(), gi.button );
 					
 					sTemp += ssprintf("  (Controller %d %s)  %s", gi.controller+1, sName.c_str(), sSecondary.c_str() );
 				}