diff --git a/stepmania/src/GameConstantsAndTypes.cpp b/stepmania/src/GameConstantsAndTypes.cpp
index f91f2e5817..c67dd5e1dd 100644
--- a/stepmania/src/GameConstantsAndTypes.cpp
+++ b/stepmania/src/GameConstantsAndTypes.cpp
@@ -372,13 +372,7 @@ StringToX( EditMode );
 LuaXType( EditMode );
 
 static const char *StageNames[] = {
-	"1",
-	"2",
-	"3",
-	"4",
-	"5",
-	"6",
-	"Final",
+	"Normal",
 	"Extra1",
 	"Extra2",
 	"Nonstop",
diff --git a/stepmania/src/GameConstantsAndTypes.h b/stepmania/src/GameConstantsAndTypes.h
index 2192204c6c..8b2743ad1a 100644
--- a/stepmania/src/GameConstantsAndTypes.h
+++ b/stepmania/src/GameConstantsAndTypes.h
@@ -441,13 +441,7 @@ LuaDeclareType( EditMode );
 
 enum Stage
 {
-	STAGE_1,
-	STAGE_2,
-	STAGE_3,
-	STAGE_4,
-	STAGE_5,
-	STAGE_6,
-	STAGE_FINAL,
+	STAGE_NORMAL,
 	STAGE_EXTRA1,
 	STAGE_EXTRA2,
 	STAGE_NONSTOP,
diff --git a/stepmania/src/GameState.cpp b/stepmania/src/GameState.cpp
index 7407a3af78..1d482fcac7 100644
--- a/stepmania/src/GameState.cpp
+++ b/stepmania/src/GameState.cpp
@@ -941,10 +941,9 @@ Stage GameState::GetCurrentStage() const
 	else if( m_PlayMode == PLAY_MODE_ONI )		return STAGE_ONI;
 	else if( m_PlayMode == PLAY_MODE_NONSTOP )	return STAGE_NONSTOP;
 	else if( m_PlayMode == PLAY_MODE_ENDLESS )	return STAGE_ENDLESS;
-	else if( IsFinalStage() )			return STAGE_FINAL;
 	else if( IsExtraStage() )			return STAGE_EXTRA1;
 	else if( IsExtraStage2() )			return STAGE_EXTRA2;
-	else						return enum_add2( STAGE_1, GetLargestCurrentStageIndexForAnyHumanPlayer() );
+	else						return STAGE_NORMAL;
 }
 
 // Return true if it's possible for GetCurrentStage() to return the given stage.
@@ -958,18 +957,6 @@ bool GameState::IsStagePossible( Stage s ) const
 	Stage actual = GAMESTATE->GetCurrentStage();
 	GAMESTATE->m_pCurSong.SetWithoutBroadcast( pSong );
 
-	/* Check long/marathon, which can change the stage to FINAL. */
-	if( s == STAGE_FINAL && actual >= STAGE_1 && actual <= STAGE_FINAL )
-	{
-		Stage max_actual = actual;
-
-		// For long/marathon songs:
-		enum_add( max_actual, +2 );
-
-		if( max_actual >= STAGE_FINAL )
-			return true;
-	}
-
 	return s == actual;
 }
 
diff --git a/stepmania/src/ScreenEvaluation.cpp b/stepmania/src/ScreenEvaluation.cpp
index 2bb65dd758..7f2fa4d984 100644
--- a/stepmania/src/ScreenEvaluation.cpp
+++ b/stepmania/src/ScreenEvaluation.cpp
@@ -94,7 +94,7 @@ ScreenEvaluation::ScreenEvaluation()
 		GAMESTATE->SetCurrentStyle( GAMEMAN->GameAndStringToStyle(GAMEMAN->GetDefaultGame(),"versus") );
 		STATSMAN->m_CurStageStats.m_playMode = GAMESTATE->m_PlayMode;
 		STATSMAN->m_CurStageStats.m_pStyle = GAMESTATE->GetCurrentStyle();
-		STATSMAN->m_CurStageStats.m_Stage = STAGE_1;
+		STATSMAN->m_CurStageStats.m_Stage = STAGE_NORMAL;
 		GAMESTATE->m_MasterPlayerNumber = PLAYER_1;
 		GAMESTATE->m_pCurSong.Set( SONGMAN->GetRandomSong() );
 		STATSMAN->m_CurStageStats.m_vpPlayedSongs.push_back( GAMESTATE->m_pCurSong );
@@ -660,13 +660,13 @@ void ScreenEvaluation::Init()
 		!GAMESTATE->IsCourseMode() &&
 		!SUMMARY )
 	{
-		m_sprTryExtraStage.Load( THEME->GetPathG(m_sName,GAMESTATE->IsExtraStage()?"try extra2":"try extra1") );
+		m_sprTryExtraStage.Load( THEME->GetPathG(m_sName,GAMESTATE->IsExtraStage2()?"try extra2":"try extra1") );
 		m_sprTryExtraStage->SetName( "TryExtraStage" );
 		ActorUtil::LoadAllCommands( *m_sprTryExtraStage, m_sName );
 		SET_XY( m_sprTryExtraStage );
 		this->AddChild( m_sprTryExtraStage );
 
-		if( GAMESTATE->IsExtraStage() )
+		if( GAMESTATE->IsExtraStage2() )
 			SOUND->PlayOnce( THEME->GetPathS(m_sName,"try extra2") );
 		else
 			SOUND->PlayOnce( THEME->GetPathS(m_sName,"try extra1") );