diff --git a/stepmania/src/GameSoundManager.cpp b/stepmania/src/GameSoundManager.cpp
index 0a96618836..b0ab718f91 100644
--- a/stepmania/src/GameSoundManager.cpp
+++ b/stepmania/src/GameSoundManager.cpp
@@ -96,7 +96,7 @@ struct MusicToPlay
 	}
 };
 vector<MusicToPlay> g_MusicsToPlay;
-static GameSoundManager::PlayMusicParams g_FallbackMusic;
+static GameSoundManager::PlayMusicParams g_FallbackMusicParams;
 
 static void StartMusic( MusicToPlay &ToPlay )
 {
@@ -486,11 +486,11 @@ void GameSoundManager::Update( float fDeltaTime )
 
 		bool bIsPlaying = g_Playing->m_Music->IsPlaying();
 		g_Mutex->Unlock();
-		if( !bIsPlaying && g_bWasPlayingOnLastUpdate && !g_FallbackMusic.sFile.empty() )
+		if( !bIsPlaying && g_bWasPlayingOnLastUpdate && !g_FallbackMusicParams.sFile.empty() )
 		{
-			PlayMusic( g_FallbackMusic );
+			PlayMusic( g_FallbackMusicParams );
 
-			g_FallbackMusic.sFile = "";
+			g_FallbackMusicParams.sFile = "";
 		}
 		g_bWasPlayingOnLastUpdate = bIsPlaying;
 	}
@@ -684,9 +684,9 @@ void GameSoundManager::PlayMusic(
 	PlayMusic( params );
 }
 
-void GameSoundManager::PlayMusic( PlayMusicParams params, PlayMusicParams FallbackMusic )
+void GameSoundManager::PlayMusic( PlayMusicParams params, PlayMusicParams FallbackMusicParams )
 {
-	g_FallbackMusic = FallbackMusic;
+	g_FallbackMusicParams = FallbackMusicParams;
 
 	//	LOG->Trace("play '%s' (current '%s')", file.c_str(), g_Playing->m_Music->GetLoadedFilePath().c_str());
 
diff --git a/stepmania/src/GameSoundManager.h b/stepmania/src/GameSoundManager.h
index 92fe9c9840..d7c5b164ab 100644
--- a/stepmania/src/GameSoundManager.h
+++ b/stepmania/src/GameSoundManager.h
@@ -40,7 +40,7 @@ public:
 		bool bAlignBeat;
 		bool bApplyMusicRate;
 	};
-	void PlayMusic( PlayMusicParams params, PlayMusicParams FallbackMusic = PlayMusicParams() );
+	void PlayMusic( PlayMusicParams params, PlayMusicParams FallbackMusicParams = PlayMusicParams() );
 	void PlayMusic( 
 		RString sFile, 
 		const TimingData *pTiming = NULL,