diff --git a/stepmania/src/GameCommand.cpp b/stepmania/src/GameCommand.cpp
index a18b36d2f5..58a4b104b7 100644
--- a/stepmania/src/GameCommand.cpp
+++ b/stepmania/src/GameCommand.cpp
@@ -49,7 +49,7 @@ void GameCommand::Init()
 	m_pCourse = NULL;
 	m_pTrail = NULL;
 	m_pCharacter = NULL;
-	m_SortOrder = SORT_INVALID;
+	m_SortOrder = SortOrder_INVALID;
 	m_sUnlockEntryID = "";
 	m_sSoundPath = "";
 	m_vsScreensToPrepare.clear();
@@ -135,7 +135,7 @@ bool GameCommand::DescribesCurrentMode( PlayerNumber pn ) const
 		return false;
 	if( !m_sSongGroup.empty() && GAMESTATE->m_sPreferredSongGroup != m_sSongGroup )
 		return false;
-	if( m_SortOrder != SORT_INVALID && GAMESTATE->m_PreferredSortOrder != m_SortOrder )
+	if( m_SortOrder != SortOrder_INVALID && GAMESTATE->m_PreferredSortOrder != m_SortOrder )
 		return false;
 	if( m_iWeightPounds != -1 && PROFILEMAN->GetProfile(pn)->m_iWeightPounds != m_iWeightPounds )
 		return false;
@@ -332,7 +332,7 @@ void GameCommand::LoadOne( const Command& cmd )
 	else if( sName == "sort" )
 	{
 		m_SortOrder = StringToSortOrder( sValue );
-		if( m_SortOrder == SORT_INVALID )
+		if( m_SortOrder == SortOrder_INVALID )
 		{
 			m_sInvalidReason = ssprintf( "SortOrder \"%s\" is not valid.", sValue.c_str() );
 			m_bInvalid |= true;
@@ -727,7 +727,7 @@ void GameCommand::ApplySelf( const vector<PlayerNumber> &vpns ) const
 	}
 	if( !m_sSongGroup.empty() )
 		GAMESTATE->m_sPreferredSongGroup.Set( m_sSongGroup );
-	if( m_SortOrder != SORT_INVALID )
+	if( m_SortOrder != SortOrder_INVALID )
 		GAMESTATE->m_PreferredSortOrder = m_SortOrder;
 	if( !m_sUnlockEntryID.empty() )
 		UNLOCKMAN->UnlockEntryID( m_sUnlockEntryID );
@@ -805,7 +805,7 @@ bool GameCommand::IsZero() const
 		m_pCharacter != NULL || 
 		m_CourseDifficulty != DIFFICULTY_INVALID ||
 		!m_sSongGroup.empty() ||
-		m_SortOrder != SORT_INVALID ||
+		m_SortOrder != SortOrder_INVALID ||
 		m_iWeightPounds != -1 ||
 		m_iGoalCalories != -1 ||
 		m_GoalType != GoalType_INVALID ||
diff --git a/stepmania/src/GameConstantsAndTypes.cpp b/stepmania/src/GameConstantsAndTypes.cpp
index 7a8d7c5631..3ab24d2d71 100644
--- a/stepmania/src/GameConstantsAndTypes.cpp
+++ b/stepmania/src/GameConstantsAndTypes.cpp
@@ -146,7 +146,7 @@ static const char *SortOrderNames[] = {
 	"Endless",
 	"Roulette",
 };
-XToString( SortOrder, NUM_SORT_ORDERS );
+XToString( SortOrder, NUM_SortOrder );
 StringToX( SortOrder );
 
 static void LuaSortOrder(lua_State* L)
diff --git a/stepmania/src/GameConstantsAndTypes.h b/stepmania/src/GameConstantsAndTypes.h
index 9618d32942..fc67fa2878 100644
--- a/stepmania/src/GameConstantsAndTypes.h
+++ b/stepmania/src/GameConstantsAndTypes.h
@@ -115,11 +115,11 @@ enum SortOrder
 	SORT_ONI_COURSES,
 	SORT_ENDLESS_COURSES,
 	SORT_ROULETTE,
-	NUM_SORT_ORDERS,
-	SORT_INVALID
+	NUM_SortOrder,
+	SortOrder_INVALID
 };
 const SortOrder MAX_SELECTABLE_SORT = (SortOrder)(SORT_ROULETTE-1);
-#define FOREACH_SortOrder( so ) FOREACH_ENUM( SortOrder, NUM_SORT_ORDERS, so )
+#define FOREACH_SortOrder( so ) FOREACH_ENUM( SortOrder, NUM_SortOrder, so )
 const RString& SortOrderToString( SortOrder so );
 SortOrder StringToSortOrder( const RString& str );
 
diff --git a/stepmania/src/GameState.cpp b/stepmania/src/GameState.cpp
index a373dd673a..8edcdf640d 100644
--- a/stepmania/src/GameState.cpp
+++ b/stepmania/src/GameState.cpp
@@ -202,7 +202,7 @@ void GameState::Reset()
 		m_PreferredDifficulty[p].Set( DIFFICULTY_INVALID );
 		m_PreferredCourseDifficulty[p].Set( DIFFICULTY_MEDIUM );
 	}
-	m_SortOrder.Set( SORT_INVALID );
+	m_SortOrder.Set( SortOrder_INVALID );
 	m_PreferredSortOrder = GetDefaultSort();
 	m_PlayMode.Set( PLAY_MODE_INVALID );
 	m_EditMode = EditMode_INVALID;
@@ -390,7 +390,7 @@ void GameState::PlayersFinalized()
 			ApplyPreferredModifiers( pn, sModifiers );
 		}
 		// Only set the sort order if it wasn't already set by a GameCommand (or by an earlier profile)
-		if( m_PreferredSortOrder == SORT_INVALID && pProfile->m_SortOrder != SORT_INVALID )
+		if( m_PreferredSortOrder == SortOrder_INVALID && pProfile->m_SortOrder != SortOrder_INVALID )
 			m_PreferredSortOrder = pProfile->m_SortOrder;
 		if( pProfile->m_LastDifficulty != DIFFICULTY_INVALID )
 			m_PreferredDifficulty[pn].Set( pProfile->m_LastDifficulty );
diff --git a/stepmania/src/MusicSortDisplay.cpp b/stepmania/src/MusicSortDisplay.cpp
index e2496e7e71..507eda028b 100644
--- a/stepmania/src/MusicSortDisplay.cpp
+++ b/stepmania/src/MusicSortDisplay.cpp
@@ -16,7 +16,7 @@ MusicSortDisplay::MusicSortDisplay()
 
 void MusicSortDisplay::Set( SortOrder so ) 
 { 
-	if( so == SORT_INVALID )
+	if( so == SortOrder_INVALID )
 		this->UnloadTexture();
 	else
 		Load( THEME->GetPathG("MusicSortDisplay",SortOrderToString(so)) );
diff --git a/stepmania/src/MusicWheel.cpp b/stepmania/src/MusicWheel.cpp
index c39f2a39ac..7a382d776b 100644
--- a/stepmania/src/MusicWheel.cpp
+++ b/stepmania/src/MusicWheel.cpp
@@ -61,7 +61,7 @@ static SortOrder ForceAppropriateSort( PlayMode pm, SortOrder so )
 	case SORT_ONI_COURSES:
 	case SORT_NONSTOP_COURSES:
 	case SORT_ENDLESS_COURSES:
-		so = SORT_INVALID;
+		so = SortOrder_INVALID;
 		break;
 	}
 
@@ -147,13 +147,13 @@ void MusicWheel::BeginScreen()
 
 	/* Never start in the mode menu; some elements may not initialize correctly. */
 	if( GAMESTATE->m_SortOrder == SORT_MODE_MENU )
-		GAMESTATE->m_SortOrder.Set( SORT_INVALID );
+		GAMESTATE->m_SortOrder.Set( SortOrder_INVALID );
 
 	GAMESTATE->m_SortOrder.Set( ForceAppropriateSort(GAMESTATE->m_PlayMode, GAMESTATE->m_SortOrder) );
 
 	/* Only save the sort order if the player didn't already have one.  If he did, don't
 	 * overwrite it. */
-	if( GAMESTATE->m_PreferredSortOrder == SORT_INVALID )
+	if( GAMESTATE->m_PreferredSortOrder == SortOrder_INVALID )
 		GAMESTATE->m_PreferredSortOrder = GAMESTATE->m_SortOrder;
 
 	// HACK: invalidate currently selected song in the case that it
@@ -825,7 +825,7 @@ void MusicWheel::ChangeMusic( int iDist )
 
 bool MusicWheel::ChangeSort( SortOrder new_so )	// return true if change successful
 {
-	ASSERT( new_so < NUM_SORT_ORDERS );
+	ASSERT( new_so < NUM_SortOrder );
 	if( GAMESTATE->m_SortOrder == new_so )
 		return false;
 
diff --git a/stepmania/src/MusicWheel.h b/stepmania/src/MusicWheel.h
index 48aa605415..6e3174ae97 100644
--- a/stepmania/src/MusicWheel.h
+++ b/stepmania/src/MusicWheel.h
@@ -61,7 +61,7 @@ protected:
 
 	virtual void UpdateSwitch();
 
-	vector<WheelItemData *>		m_WheelItemDatas[NUM_SORT_ORDERS];
+	vector<WheelItemData *>		m_WheelItemDatas[NUM_SortOrder];
 	const WheelItemData *GetCurWheelItemData( int i ) { return (const WheelItemData *) m_CurWheelItemData[i]; }
 	
 	RString				m_sLastModeMenuItem;
diff --git a/stepmania/src/Profile.cpp b/stepmania/src/Profile.cpp
index 823cffd62c..4965311973 100644
--- a/stepmania/src/Profile.cpp
+++ b/stepmania/src/Profile.cpp
@@ -99,7 +99,7 @@ void Profile::InitGeneralData()
 {
 	m_sGuid = MakeGuid();
 
-	m_SortOrder = SORT_INVALID;
+	m_SortOrder = SortOrder_INVALID;
 	m_LastDifficulty = DIFFICULTY_INVALID;
 	m_LastCourseDifficulty = DIFFICULTY_INVALID;
 	m_lastSong.Unset();
diff --git a/stepmania/src/ScreenSelectMusic.cpp b/stepmania/src/ScreenSelectMusic.cpp
index 3769d162cc..8d329649af 100644
--- a/stepmania/src/ScreenSelectMusic.cpp
+++ b/stepmania/src/ScreenSelectMusic.cpp
@@ -884,7 +884,7 @@ void ScreenSelectMusic::AfterMusicChange()
 	g_bWantFallbackCdTitle = false;
 	bool bWantBanner = true;
 
-	static SortOrder s_lastSortOrder = SORT_INVALID;
+	static SortOrder s_lastSortOrder = SortOrder_INVALID;
 	if( GAMESTATE->m_SortOrder != s_lastSortOrder )
 	{
 		// Reload to let Lua metrics have a chance to change the help text.