diff --git a/stepmania/src/NetworkSyncManager.h b/stepmania/src/NetworkSyncManager.h
index f6b6a9b0d4..5ae6a64e5c 100644
--- a/stepmania/src/NetworkSyncManager.h
+++ b/stepmania/src/NetworkSyncManager.h
@@ -50,9 +50,10 @@ enum NSScoreBoardColumn
 	NSSB_NAMES=0,
 	NSSB_COMBO,
 	NSSB_GRADE,
-	NUM_NSSB_CATEGORIES
+	NUM_NSScoreBoardColumn,
+	NSScoreBoardColumn_Invalid
 };
-#define FOREACH_NSScoreBoardColumn( sc ) FOREACH_ENUM( NSScoreBoardColumn, NUM_NSSB_CATEGORIES, sc )
+#define FOREACH_NSScoreBoardColumn( sc ) FOREACH_ENUM( NSScoreBoardColumn, NUM_NSScoreBoardColumn, sc )
 
 struct NetServerInfo
 {
@@ -128,7 +129,7 @@ public:
 
 	//Used togeather for 
 	bool ChangedScoreboard(int Column);	//If scoreboard changed since this function last called, then true.
-	RString m_Scoreboard[NUM_NSSB_CATEGORIES];
+	RString m_Scoreboard[NUM_NSScoreBoardColumn];
 
 	//Used for chatting
 	void SendChat(const RString& message);
@@ -171,7 +172,7 @@ private:
 	int m_startupStatus;	//Used to see if attempt was successful or not.
 	int	m_iSalt;
 
-	bool m_scoreboardchange[NUM_NSSB_CATEGORIES];
+	bool m_scoreboardchange[NUM_NSScoreBoardColumn];
 
 	RString m_ServerName;
  
diff --git a/stepmania/src/ScreenGameplay.h b/stepmania/src/ScreenGameplay.h
index 626ae067f9..b7ce4e61a9 100644
--- a/stepmania/src/ScreenGameplay.h
+++ b/stepmania/src/ScreenGameplay.h
@@ -187,7 +187,7 @@ protected:
 
 	Sprite			m_sprScoreFrame;
 	BitmapText		m_textSongOptions;
-	BitmapText		m_Scoreboard[NUM_NSSB_CATEGORIES];	// for NSMAN, so we can have a scoreboard
+	BitmapText		m_Scoreboard[NUM_NSScoreBoardColumn];	// for NSMAN, so we can have a scoreboard
 
 	bool			m_bShowScoreboard;