diff --git a/stepmania/src/Screen.cpp b/stepmania/src/Screen.cpp
index 7c98d349a5..c9a8f4d807 100644
--- a/stepmania/src/Screen.cpp
+++ b/stepmania/src/Screen.cpp
@@ -209,7 +209,7 @@ void Screen::HandleScreenMessage( const ScreenMessage SM )
 		if( SCREENMAN->IsStackedScreen(this) )
 			SCREENMAN->PopTopScreen( m_smSendOnPop );
 		else
-			SCREENMAN->SetNewScreen( SM == SM_GoToNextScreen? GetNextScreen():GetPrevScreen() );
+			SCREENMAN->SetNewScreen( SM == SM_GoToNextScreen? GetNextScreenName():GetPrevScreen() );
 	}
 	else if( SM == SM_GainFocus )
 	{
@@ -226,7 +226,7 @@ void Screen::HandleScreenMessage( const ScreenMessage SM )
 	}
 }
 
-RString Screen::GetNextScreen() const
+RString Screen::GetNextScreenName() const
 {
 	if( !m_sNextScreen.empty() )
 		return m_sNextScreen;
@@ -266,7 +266,7 @@ void Screen::ClearMessageQueue( const ScreenMessage SM )
 class LunaScreen: public Luna<Screen>
 {
 public:
-	static int GetNextScreen( T* p, lua_State *L ) { lua_pushstring(L, p->GetNextScreen() ); return 1; }
+	static int GetNextScreenName( T* p, lua_State *L ) { lua_pushstring(L, p->GetNextScreenName() ); return 1; }
 	static int lockinput( T* p, lua_State *L ) { p->SetLockInputSecs(FArg(1)); return 0; }
 
 	static int PostScreenMessage( T* p, lua_State *L )
@@ -279,7 +279,7 @@ public:
 
 	LunaScreen()
 	{
-		ADD_METHOD( GetNextScreen );
+		ADD_METHOD( GetNextScreenName );
 		ADD_METHOD( PostScreenMessage );
 		ADD_METHOD( lockinput );
 	}
diff --git a/stepmania/src/Screen.h b/stepmania/src/Screen.h
index 9c97d16b0c..1ae1af1193 100644
--- a/stepmania/src/Screen.h
+++ b/stepmania/src/Screen.h
@@ -88,7 +88,7 @@ protected:
 	float                           m_fLockInputSecs;
 
 public:
-	RString GetNextScreen() const;
+	RString GetNextScreenName() const;
 	RString GetPrevScreen() const;
 
 	// let subclass override if they want
diff --git a/stepmania/src/ScreenAttract.cpp b/stepmania/src/ScreenAttract.cpp
index ffe97cee7b..071511256a 100644
--- a/stepmania/src/ScreenAttract.cpp
+++ b/stepmania/src/ScreenAttract.cpp
@@ -138,7 +138,7 @@ void ScreenAttract::HandleScreenMessage( const ScreenMessage SM )
 		 * going to interrupt it when we fade in, stop the old music before we fade out. */
 		bool bMusicChanging = false;
 		if( PLAY_MUSIC )
-			bMusicChanging = THEME->GetPathS(m_sName,"music") != THEME->GetPathS(GetNextScreen(),"music",true);	// GetPath optional on the next screen because it may not have music.
+			bMusicChanging = THEME->GetPathS(m_sName,"music") != THEME->GetPathS(GetNextScreenName(),"music",true);	// GetPath optional on the next screen because it may not have music.
 
 		if( bMusicChanging )
 			SOUND->StopMusic();
diff --git a/stepmania/src/ScreenOptions.cpp b/stepmania/src/ScreenOptions.cpp
index 4b2bb8748c..85364c6b7e 100644
--- a/stepmania/src/ScreenOptions.cpp
+++ b/stepmania/src/ScreenOptions.cpp
@@ -533,7 +533,7 @@ void ScreenOptions::HandleScreenMessage( const ScreenMessage SM )
 			m_sNextScreen = sThisScreen;
 
 		// If options set a NextScreen or one is specified in metrics, then fade out
-		if( GetNextScreen() == "" )
+		if( GetNextScreenName() == "" )
 		{
 			LOG->Warn( "%s::HandleScreenMessage: Tried to fade out, but we have no next screen", m_sName.c_str() );
 			return;
diff --git a/stepmania/src/ScreenOptionsMaster.cpp b/stepmania/src/ScreenOptionsMaster.cpp
index 69f5a03f25..5867d4f343 100644
--- a/stepmania/src/ScreenOptionsMaster.cpp
+++ b/stepmania/src/ScreenOptionsMaster.cpp
@@ -127,7 +127,7 @@ void ScreenOptionsMaster::HandleScreenMessage( const ScreenMessage SM )
 			 * only reload it if it changed. */
 			RString sNewTheme = PREFSMAN->m_sTheme.Get();
 			bool bForceThemeReload = !!(m_iChangeMask & OPT_APPLY_ASPECT_RATIO) || !!(m_iChangeMask & OPT_APPLY_GRAPHICS);
-			GameLoop::ChangeTheme( sNewTheme, this->GetNextScreen(), bForceThemeReload );
+			GameLoop::ChangeTheme( sNewTheme, this->GetNextScreenName(), bForceThemeReload );
 			StepMania::ApplyGraphicOptions();
 		}
 
diff --git a/stepmania/src/ScreenSplash.cpp b/stepmania/src/ScreenSplash.cpp
index 299a57540e..f2605db4f8 100644
--- a/stepmania/src/ScreenSplash.cpp
+++ b/stepmania/src/ScreenSplash.cpp
@@ -27,7 +27,7 @@ void ScreenSplash::HandleScreenMessage( const ScreenMessage SM )
 	{
 		RageTimer length;
 		if( PREPARE_SCREEN )
-			SCREENMAN->PrepareScreen( GetNextScreen() );
+			SCREENMAN->PrepareScreen( GetNextScreenName() );
 		float fScreenLoadSeconds = length.GetDeltaTime();
 
 		/* The screen load took fScreenLoadSeconds.  Move on to the next screen after
diff --git a/stepmania/src/ScreenStage.cpp b/stepmania/src/ScreenStage.cpp
index 9b03572668..b9fb6117bd 100644
--- a/stepmania/src/ScreenStage.cpp
+++ b/stepmania/src/ScreenStage.cpp
@@ -55,7 +55,7 @@ void ScreenStage::HandleScreenMessage( const ScreenMessage SM )
 	if( SM == SM_PrepScreen )
 	{
 		RageTimer length;
-		SCREENMAN->PrepareScreen( GetNextScreen() );
+		SCREENMAN->PrepareScreen( GetNextScreenName() );
 		float fScreenLoadSeconds = length.GetDeltaTime();
 
 		/* The screen load took fScreenLoadSeconds.  Move on to the next screen after