diff --git a/stepmania/src/ScreenAttract.cpp b/stepmania/src/ScreenAttract.cpp
index 1926c74d05..e83f77ba52 100644
--- a/stepmania/src/ScreenAttract.cpp
+++ b/stepmania/src/ScreenAttract.cpp
@@ -109,7 +109,7 @@ void ScreenAttract::HandleScreenMessage( const ScreenMessage SM )
 		SM == SM_BeginFadingOut )
 	{
 		if( !IsTransitioning() )
-			StartTransitioning( SM_GoToNextScreen );
+			StartTransitioningScreen( SM_GoToNextScreen );
 	}
 	else if( SM == SM_GoToStartScreen )
 	{
diff --git a/stepmania/src/ScreenBookkeeping.cpp b/stepmania/src/ScreenBookkeeping.cpp
index 91e7ac1920..f8a39917ad 100644
--- a/stepmania/src/ScreenBookkeeping.cpp
+++ b/stepmania/src/ScreenBookkeeping.cpp
@@ -83,7 +83,7 @@ void ScreenBookkeeping::MenuStart( PlayerNumber pn )
 	if( !IsTransitioning() )
 	{
 		SCREENMAN->PlayStartSound();
-		StartTransitioning( SM_GoToNextScreen );		
+		StartTransitioningScreen( SM_GoToNextScreen );		
 	}
 }
 
@@ -92,7 +92,7 @@ void ScreenBookkeeping::MenuBack( PlayerNumber pn )
 	if(!IsTransitioning())
 	{
 		SCREENMAN->PlayStartSound();
-		StartTransitioning( SM_GoToPrevScreen );		
+		StartTransitioningScreen( SM_GoToPrevScreen );		
 	}
 }
 
diff --git a/stepmania/src/ScreenCenterImage.cpp b/stepmania/src/ScreenCenterImage.cpp
index 13b19c4cf9..4a39a07db1 100644
--- a/stepmania/src/ScreenCenterImage.cpp
+++ b/stepmania/src/ScreenCenterImage.cpp
@@ -70,11 +70,11 @@ void ScreenCenterImage::Input( const InputEventPlus &input )
 		{
 		case MENU_BUTTON_START:
 			SCREENMAN->PlayStartSound();
-			StartTransitioning( SM_GoToNextScreen );		
+			StartTransitioningScreen( SM_GoToNextScreen );		
 			return;
 
 		case MENU_BUTTON_BACK:
-			StartTransitioning( SM_GoToPrevScreen );		
+			StartTransitioningScreen( SM_GoToPrevScreen );		
 			return;
 		}
 	}
diff --git a/stepmania/src/ScreenEditMenu.cpp b/stepmania/src/ScreenEditMenu.cpp
index 991654ec50..2938bc4ec9 100644
--- a/stepmania/src/ScreenEditMenu.cpp
+++ b/stepmania/src/ScreenEditMenu.cpp
@@ -91,7 +91,7 @@ void ScreenEditMenu::HandleScreenMessage( const ScreenMessage SM )
 		if( !ScreenTextEntry::s_bCancelledLast )
 		{
 			SOUND->StopMusic();
-			StartTransitioning( SM_GoToNextScreen );
+			StartTransitioningScreen( SM_GoToNextScreen );
 		}
 	}
 
@@ -281,7 +281,7 @@ void ScreenEditMenu::MenuStart( PlayerNumber pn )
 			{
 				SOUND->StopMusic();
 				SCREENMAN->PlayStartSound();
-				StartTransitioning( SM_GoToNextScreen );
+				StartTransitioningScreen( SM_GoToNextScreen );
 			}
 		}
 		break;
diff --git a/stepmania/src/ScreenEvaluation.cpp b/stepmania/src/ScreenEvaluation.cpp
index 5da708122f..632350cf9c 100644
--- a/stepmania/src/ScreenEvaluation.cpp
+++ b/stepmania/src/ScreenEvaluation.cpp
@@ -969,7 +969,7 @@ void ScreenEvaluation::EndScreen()
 			}
 		}
 	}
-	StartTransitioning( SM_GoToNextScreen );
+	StartTransitioningScreen( SM_GoToNextScreen );
 }
 
 /*
diff --git a/stepmania/src/ScreenEvaluationMultiplayer.cpp b/stepmania/src/ScreenEvaluationMultiplayer.cpp
index 300b7943c7..615c1f4479 100644
--- a/stepmania/src/ScreenEvaluationMultiplayer.cpp
+++ b/stepmania/src/ScreenEvaluationMultiplayer.cpp
@@ -286,7 +286,7 @@ void ScreenEvaluationMultiplayer::MenuBack( PlayerNumber pn )
 void ScreenEvaluationMultiplayer::MenuStart( PlayerNumber pn )
 {
 	
-	this->StartTransitioning( SM_GoToNextScreen );
+	this->StartTransitioningScreen( SM_GoToNextScreen );
 }
 
 
diff --git a/stepmania/src/ScreenEz2SelectMusic.cpp b/stepmania/src/ScreenEz2SelectMusic.cpp
index 011d9e26af..78ac26e474 100644
--- a/stepmania/src/ScreenEz2SelectMusic.cpp
+++ b/stepmania/src/ScreenEz2SelectMusic.cpp
@@ -505,7 +505,7 @@ void ScreenEz2SelectMusic::Update( float fDeltaTime )
 	if(m_bMadeChoice && RageTimer::GetTimeSinceStartFast() > m_fRemainingWaitTime + 2 && !m_bTransitioning)
 	{
 		m_bTransitioning = true;
-		StartTransitioning( SM_GoToNextScreen );
+		StartTransitioningScreen( SM_GoToNextScreen );
 	}
 
 	Screen::Update( fDeltaTime );
diff --git a/stepmania/src/ScreenEz2SelectPlayer.cpp b/stepmania/src/ScreenEz2SelectPlayer.cpp
index 7e1a14da24..ecd1de0b67 100644
--- a/stepmania/src/ScreenEz2SelectPlayer.cpp
+++ b/stepmania/src/ScreenEz2SelectPlayer.cpp
@@ -139,7 +139,7 @@ void ScreenEz2SelectPlayer::HandleScreenMessage( const ScreenMessage SM )
 		}
 
 		TweenOursOffScreen();
-		StartTransitioning( SM_GoToNextScreen );
+		StartTransitioningScreen( SM_GoToNextScreen );
 		break;
 	}
 
@@ -202,7 +202,7 @@ void ScreenEz2SelectPlayer::MenuStart( PlayerNumber pn )
 	if( bBothSidesJoined )
 	{
 		TweenOursOffScreen();
-		StartTransitioning( SM_GoToNextScreen );
+		StartTransitioningScreen( SM_GoToNextScreen );
 	}
 	else
 	{
diff --git a/stepmania/src/ScreenInstructions.cpp b/stepmania/src/ScreenInstructions.cpp
index edd39d5f6d..cd7ff77c76 100644
--- a/stepmania/src/ScreenInstructions.cpp
+++ b/stepmania/src/ScreenInstructions.cpp
@@ -30,7 +30,7 @@ void ScreenInstructions::MenuBack( PlayerNumber pn )
 
 void ScreenInstructions::MenuStart( PlayerNumber pn )
 {
-	StartTransitioning( SM_GoToNextScreen );
+	StartTransitioningScreen( SM_GoToNextScreen );
 }
 
 /*
diff --git a/stepmania/src/ScreenJoinMultiplayer.cpp b/stepmania/src/ScreenJoinMultiplayer.cpp
index 4b6864fecd..887525173d 100644
--- a/stepmania/src/ScreenJoinMultiplayer.cpp
+++ b/stepmania/src/ScreenJoinMultiplayer.cpp
@@ -253,7 +253,7 @@ void ScreenJoinMultiplayer::MenuStart( PlayerNumber pn )
 		return;
 	}
 	
-	this->StartTransitioning( SM_GoToNextScreen );
+	this->StartTransitioningScreen( SM_GoToNextScreen );
 }
 
 
diff --git a/stepmania/src/ScreenMapControllers.cpp b/stepmania/src/ScreenMapControllers.cpp
index 0e29007b12..e3cbf40b85 100644
--- a/stepmania/src/ScreenMapControllers.cpp
+++ b/stepmania/src/ScreenMapControllers.cpp
@@ -299,7 +299,7 @@ void ScreenMapControllers::Input( const InputEventPlus &input )
 
 				INPUTMAPPER->SaveMappingsToDisk();	// save changes
 
-				StartTransitioning( SM_GoToNextScreen );		
+				StartTransitioningScreen( SM_GoToNextScreen );		
 				for( int b=0; b<GAMESTATE->GetCurrentGame()->m_iButtonsPerController; b++ )
 					m_Line[b].RunCommands( (b%2)? ODD_LINE_OUT:EVEN_LINE_OUT );
 			}
diff --git a/stepmania/src/ScreenNameEntryTraditional.cpp b/stepmania/src/ScreenNameEntryTraditional.cpp
index 6105ede827..f8d7ed2557 100644
--- a/stepmania/src/ScreenNameEntryTraditional.cpp
+++ b/stepmania/src/ScreenNameEntryTraditional.cpp
@@ -727,7 +727,7 @@ void ScreenNameEntryTraditional::MenuRight( const InputEventPlus &input )
 
 void ScreenNameEntryTraditional::AllFinished()
 {
-	StartTransitioning( SM_GoToNextScreen );
+	StartTransitioningScreen( SM_GoToNextScreen );
 
 	FOREACH_HumanPlayer( pn )
 	{
diff --git a/stepmania/src/ScreenNetSelectMusic.cpp b/stepmania/src/ScreenNetSelectMusic.cpp
index 89d4feb1b8..2b93a1905d 100644
--- a/stepmania/src/ScreenNetSelectMusic.cpp
+++ b/stepmania/src/ScreenNetSelectMusic.cpp
@@ -478,7 +478,7 @@ void ScreenNetSelectMusic::StartSelectedSong()
 	GAMESTATE->m_pPreferredSong = pSong;
 	
 	TweenOffScreen();
-	StartTransitioning( SM_GoToNextScreen );
+	StartTransitioningScreen( SM_GoToNextScreen );
 }
 
 void ScreenNetSelectMusic::UpdateDifficulties( PlayerNumber pn )
diff --git a/stepmania/src/ScreenOptions.cpp b/stepmania/src/ScreenOptions.cpp
index 0e385fe6ae..5c7941f1e0 100644
--- a/stepmania/src/ScreenOptions.cpp
+++ b/stepmania/src/ScreenOptions.cpp
@@ -630,7 +630,7 @@ void ScreenOptions::HandleScreenMessage( const ScreenMessage SM )
 	{
 		if(IsTransitioning())
 			return; /* already transitioning */
-		StartTransitioning( SM_ExportOptions );
+		StartTransitioningScreen( SM_ExportOptions );
 
 		SCREENMAN->PlayStartSound();
 
diff --git a/stepmania/src/ScreenRanking.cpp b/stepmania/src/ScreenRanking.cpp
index 4bf6f6b741..bfddea26de 100644
--- a/stepmania/src/ScreenRanking.cpp
+++ b/stepmania/src/ScreenRanking.cpp
@@ -147,13 +147,13 @@ void ScreenRanking::Input( const InputEventPlus &input )
 void ScreenRanking::MenuStart( PlayerNumber pn )
 {
 	if( !IsTransitioning() )
-		StartTransitioning( SM_GoToNextScreen );
+		StartTransitioningScreen( SM_GoToNextScreen );
 }
 
 void ScreenRanking::MenuBack( PlayerNumber pn )
 {
 	if( !IsTransitioning() )
-		StartTransitioning( SM_GoToNextScreen );
+		StartTransitioningScreen( SM_GoToNextScreen );
 }
 
 void ScreenRanking::HandleScreenMessage( const ScreenMessage SM )
@@ -172,7 +172,7 @@ void ScreenRanking::HandleScreenMessage( const ScreenMessage SM )
 		}
 		else
 		{
-			StartTransitioning(SM_GoToNextScreen);
+			StartTransitioningScreen(SM_GoToNextScreen);
 		}
 	}
 	else if( SM == SM_HidePage )
diff --git a/stepmania/src/ScreenSelect.cpp b/stepmania/src/ScreenSelect.cpp
index e750a5e76e..37a50f60fb 100644
--- a/stepmania/src/ScreenSelect.cpp
+++ b/stepmania/src/ScreenSelect.cpp
@@ -243,7 +243,7 @@ void ScreenSelect::HandleScreenMessage( const ScreenMessage SM )
 	else if( SM == SM_AllDoneChoosing ) 	/* It's our turn to tween out. */
 	{
 		if( !IsTransitioning() )
-			StartTransitioning( SM_GoToNextScreen );
+			StartTransitioningScreen( SM_GoToNextScreen );
 	}
 	else if( SM == SM_GoToNextScreen )
 	{
diff --git a/stepmania/src/ScreenSelectCharacter.cpp b/stepmania/src/ScreenSelectCharacter.cpp
index 8827c1485c..e3b44ad7b3 100644
--- a/stepmania/src/ScreenSelectCharacter.cpp
+++ b/stepmania/src/ScreenSelectCharacter.cpp
@@ -182,7 +182,7 @@ void ScreenSelectCharacter::HandleScreenMessage( const ScreenMessage SM )
 	switch( SM )
 	{
 	case SM_BeginFadingOut:
-		StartTransitioning( SM_GoToNextScreen );
+		StartTransitioningScreen( SM_GoToNextScreen );
 		return;
 	case SM_MenuTimer:
 		MenuStart(PLAYER_1);
diff --git a/stepmania/src/ScreenSelectGroup.cpp b/stepmania/src/ScreenSelectGroup.cpp
index b1936a08ac..0feed27990 100644
--- a/stepmania/src/ScreenSelectGroup.cpp
+++ b/stepmania/src/ScreenSelectGroup.cpp
@@ -152,7 +152,7 @@ void ScreenSelectGroup::HandleScreenMessage( const ScreenMessage SM )
 	switch( SM )
 	{
 	case SM_BeginFadingOut:
-		StartTransitioning( SM_GoToNextScreen );
+		StartTransitioningScreen( SM_GoToNextScreen );
 		return;
 	}
 	Screen::HandleScreenMessage( SM );
diff --git a/stepmania/src/ScreenSelectMusic.cpp b/stepmania/src/ScreenSelectMusic.cpp
index c1dd33eeb2..328c44343a 100644
--- a/stepmania/src/ScreenSelectMusic.cpp
+++ b/stepmania/src/ScreenSelectMusic.cpp
@@ -1245,12 +1245,12 @@ void ScreenSelectMusic::MenuStart( PlayerNumber pn )
 
 		if( OPTIONS_MENU_AVAILABLE )
 		{
-			StartTransitioning( SM_None );
+			StartTransitioningScreen( SM_None );
 			this->PostScreenMessage( SM_TweenOffOptionsMessage, SHOW_OPTIONS_MESSAGE_SECONDS );
 		}
 		else
 		{
-			StartTransitioning( SM_BeginFadingOut );
+			StartTransitioningScreen( SM_BeginFadingOut );
 		}
 	}
 }
diff --git a/stepmania/src/ScreenSetTime.cpp b/stepmania/src/ScreenSetTime.cpp
index 20143a1720..38fb77d9aa 100644
--- a/stepmania/src/ScreenSetTime.cpp
+++ b/stepmania/src/ScreenSetTime.cpp
@@ -222,7 +222,7 @@ void ScreenSetTime::MenuStart( PlayerNumber pn )
 		}
 
 		SOUND->PlayOnce( THEME->GetPathS("Common","start") );
-		StartTransitioning( SM_GoToNextScreen );
+		StartTransitioningScreen( SM_GoToNextScreen );
 	}
 	else
 		ChangeSelection( +1 );
@@ -235,7 +235,7 @@ void ScreenSetTime::MenuSelect( PlayerNumber pn )
 
 void ScreenSetTime::MenuBack( PlayerNumber pn )
 {
-	StartTransitioning( SM_GoToPrevScreen );
+	StartTransitioningScreen( SM_GoToPrevScreen );
 }
 
 /*
diff --git a/stepmania/src/ScreenSplash.cpp b/stepmania/src/ScreenSplash.cpp
index f23a2b9d0b..972279c4fe 100644
--- a/stepmania/src/ScreenSplash.cpp
+++ b/stepmania/src/ScreenSplash.cpp
@@ -40,7 +40,7 @@ void ScreenSplash::HandleScreenMessage( const ScreenMessage SM )
 	}
 	else if( SM == SM_BeginFadingOut )
 	{
-		StartTransitioning( SM_GoToNextScreen );
+		StartTransitioningScreen( SM_GoToNextScreen );
 		return;
 	}
 
diff --git a/stepmania/src/ScreenTestInput.cpp b/stepmania/src/ScreenTestInput.cpp
index b6c0921579..47cc9e55ed 100644
--- a/stepmania/src/ScreenTestInput.cpp
+++ b/stepmania/src/ScreenTestInput.cpp
@@ -147,7 +147,7 @@ void ScreenTestInput::MenuBack( PlayerNumber pn )
 	if(!IsTransitioning())
 	{
 		SCREENMAN->PlayStartSound();
-		StartTransitioning( SM_GoToPrevScreen );		
+		StartTransitioningScreen( SM_GoToPrevScreen );		
 	}
 }
 
diff --git a/stepmania/src/ScreenTestLights.cpp b/stepmania/src/ScreenTestLights.cpp
index a5b9db2af4..47796c9934 100644
--- a/stepmania/src/ScreenTestLights.cpp
+++ b/stepmania/src/ScreenTestLights.cpp
@@ -138,7 +138,7 @@ void ScreenTestLights::MenuBack( PlayerNumber pn )
 	{
 		SCREENMAN->PlayStartSound();
 		OFF_COMMAND( m_textInputs );
-		StartTransitioning( SM_GoToPrevScreen );		
+		StartTransitioningScreen( SM_GoToPrevScreen );		
 	}
 }
 
diff --git a/stepmania/src/ScreenWithMenuElements.cpp b/stepmania/src/ScreenWithMenuElements.cpp
index 64710448a8..eaa108d439 100644
--- a/stepmania/src/ScreenWithMenuElements.cpp
+++ b/stepmania/src/ScreenWithMenuElements.cpp
@@ -230,7 +230,7 @@ void ScreenWithMenuElements::ResetTimer()
 	}
 }
 
-void ScreenWithMenuElements::StartTransitioning( ScreenMessage smSendWhenDone )
+void ScreenWithMenuElements::StartTransitioningScreen( ScreenMessage smSendWhenDone )
 {
 	TweenOffScreen();
 
diff --git a/stepmania/src/ScreenWithMenuElements.h b/stepmania/src/ScreenWithMenuElements.h
index 3206789d8e..474f4a4061 100644
--- a/stepmania/src/ScreenWithMenuElements.h
+++ b/stepmania/src/ScreenWithMenuElements.h
@@ -22,7 +22,7 @@ public:
 	virtual ~ScreenWithMenuElements();
 
 	void Update( float fDeltaTime );
-	void StartTransitioning( ScreenMessage smSendWhenDone );
+	void StartTransitioningScreen( ScreenMessage smSendWhenDone );
 	virtual void Cancel( ScreenMessage smSendWhenDone );
 	bool IsTransitioning();