diff --git a/stepmania/src/ScreenSelectMaster.cpp b/stepmania/src/ScreenSelectMaster.cpp
index ab3a2aef78..e79ca04c17 100644
--- a/stepmania/src/ScreenSelectMaster.cpp
+++ b/stepmania/src/ScreenSelectMaster.cpp
@@ -167,7 +167,7 @@ void ScreenSelectMaster::Init()
 		}
 	}
 
-	for( int page=0; page<NUM_PAGES; page++ )
+	for( int page=0; page<NUM_Page; page++ )
 	{
 		m_sprMore[page].Load( THEME->GetPathG(m_sName, ssprintf("more page%d",page+1)) );
 		m_sprMore[page]->SetName( ssprintf("MorePage%d",page+1) );
@@ -546,7 +546,7 @@ bool ScreenSelectMaster::ChangePage( int iNewChoice )
 		}
 	}
 
-	for( int page=0; page<NUM_PAGES; page++ )
+	for( int page=0; page<NUM_Page; page++ )
 	{
 		m_sprExplanation[page]->PlayCommand( sIconAndExplanationCommand );
 		m_sprMore[page]->PlayCommand( sIconAndExplanationCommand );
@@ -694,7 +694,7 @@ float ScreenSelectMaster::DoMenuStart( PlayerNumber pn )
 
 	if( bIsFirstToChoose )
 	{
-		for( int page=0; page<NUM_PAGES; page++ )
+		for( int page=0; page<NUM_Page; page++ )
 		{
 			if( m_sprMore[page].IsLoaded() )
 				m_sprMore[page]->PlayCommand( "Off" );
@@ -835,7 +835,7 @@ void ScreenSelectMaster::TweenOnScreen()
 	//We have to move page two's explanation and more off the screen
 	//so it doesn't just sit there on page one.  (Thanks Zhek)
 	
-	for (int page=0;page<NUM_PAGES;page++)
+	for (int page=0;page<NUM_Page;page++)
 	{
 		m_sprMore[page]->SetXY(999,999);
 		m_sprExplanation[page]->SetXY(999,999);
diff --git a/stepmania/src/ScreenSelectMaster.h b/stepmania/src/ScreenSelectMaster.h
index b2379c9293..632112f0d1 100644
--- a/stepmania/src/ScreenSelectMaster.h
+++ b/stepmania/src/ScreenSelectMaster.h
@@ -41,7 +41,7 @@ public:
 	virtual bool AllowLateJoin() const { return true; }
 
 protected:
-	enum Page { PAGE_1, PAGE_2, NUM_PAGES };	// on PAGE_2, cursors are locked together
+	enum Page { PAGE_1, PAGE_2, NUM_Page };	// on PAGE_2, cursors are locked together
 	static PlayerNumber GetSharedPlayer();
 	Page GetPage( int iChoiceIndex ) const;
 	Page GetCurrentPage() const;
@@ -84,8 +84,8 @@ protected:
 	float GetCursorX( PlayerNumber pn );
 	float GetCursorY( PlayerNumber pn );
 
-	AutoActor	m_sprExplanation[NUM_PAGES];
-	AutoActor	m_sprMore[NUM_PAGES];
+	AutoActor	m_sprExplanation[NUM_Page];
+	AutoActor	m_sprMore[NUM_Page];
 	// icon is the shared, per-choice piece
 	vector<AutoActor> m_vsprIcon;
 	// preview is per-player, per-choice piece