diff --git a/stepmania/src/CodeDetector.cpp b/stepmania/src/CodeDetector.cpp
index 2e80beebe3..8565dc1bbd 100644
--- a/stepmania/src/CodeDetector.cpp
+++ b/stepmania/src/CodeDetector.cpp
@@ -133,7 +133,7 @@ bool CodeItem::Load( RString sButtonsNames )
 
 		// Search for the corresponding GameButton
 		const GameButton gb = pGame->ButtonNameToIndex( sButtonName );
-		if( gb == GAME_BUTTON_INVALID )
+		if( gb == GameButton_Invalid )
 		{
 			LOG->Trace( "The code '%s' contains an unrecognized button '%s'.", sButtonsNames.c_str(), sButtonName.c_str() );
 			buttons.clear();
diff --git a/stepmania/src/Game.cpp b/stepmania/src/Game.cpp
index 3a6216f451..d94f72e4b2 100644
--- a/stepmania/src/Game.cpp
+++ b/stepmania/src/Game.cpp
@@ -9,7 +9,7 @@
 int	Game::GetNumGameplayButtons() const
 {
 	int iIndexOfStart = ButtonNameToIndex( "Start" );
-	ASSERT( iIndexOfStart != GAME_BUTTON_INVALID );
+	ASSERT( iIndexOfStart != GameButton_Invalid );
 	return iIndexOfStart;
 }
 
@@ -19,7 +19,7 @@ GameButton Game::ButtonNameToIndex( const RString &sButtonName ) const
 		if( stricmp(m_szButtonNames[i], sButtonName) == 0 )
 			return i;
 
-	return GAME_BUTTON_INVALID;
+	return GameButton_Invalid;
 }
 
 MenuButton Game::GameInputToMenuButton( GameInput GameI ) const
diff --git a/stepmania/src/GameInput.cpp b/stepmania/src/GameInput.cpp
index 2375ea4232..9b348a090d 100644
--- a/stepmania/src/GameInput.cpp
+++ b/stepmania/src/GameInput.cpp
@@ -31,7 +31,7 @@ GameButton StringToGameButton( const Game* pGame, const RString& s )
 		if( s == GameButtonToString(pGame,(GameButton)i) )
 			return (GameButton)i;
 	}
-	return GAME_BUTTON_INVALID;
+	return GameButton_Invalid;
 }
 
 
diff --git a/stepmania/src/GameInput.h b/stepmania/src/GameInput.h
index 8583147f63..81b98adaac 100644
--- a/stepmania/src/GameInput.h
+++ b/stepmania/src/GameInput.h
@@ -22,7 +22,7 @@ RString GameButtonToLocalizedString( const Game* pGame, GameButton i );
 GameButton StringToGameButton( const Game* pGame, const RString& s );
 
 const GameButton NUM_GameButton = 20;
-const GameButton GAME_BUTTON_INVALID = NUM_GameButton+1;
+const GameButton GameButton_Invalid = NUM_GameButton+1;
 #define FOREACH_GameButton( gb ) FOREACH_ENUM( GameButton, NUM_GameButton, gb )
 
 enum	// DanceButtons
@@ -240,7 +240,7 @@ enum	// LightsButtons
 
 struct GameInput
 {
-	GameInput(): controller(GameController_Invalid), button(GAME_BUTTON_INVALID) { }
+	GameInput(): controller(GameController_Invalid), button(GameButton_Invalid) { }
 
 	GameInput( GameController c, GameButton b ): controller(c), button(b) { }
 
@@ -258,7 +258,7 @@ struct GameInput
 	}
 
 	inline bool IsValid() const { return controller != GameController_Invalid; };
-	inline void MakeInvalid() { controller = GameController_Invalid; button = GAME_BUTTON_INVALID; };
+	inline void MakeInvalid() { controller = GameController_Invalid; button = GameButton_Invalid; };
 
 	RString ToString( const Game* pGame ) const;
 	bool FromString( const Game* pGame, const RString &s );
diff --git a/stepmania/src/LightsManager.cpp b/stepmania/src/LightsManager.cpp
index 05229a89e5..06476d5f54 100644
--- a/stepmania/src/LightsManager.cpp
+++ b/stepmania/src/LightsManager.cpp
@@ -465,7 +465,7 @@ void LightsManager::GetFirstLitGameButtonLight( GameController &gcOut, GameButto
 		}
 	}
 	gcOut = GameController_Invalid;
-	gbOut = GAME_BUTTON_INVALID;
+	gbOut = GameButton_Invalid;
 }
 
 bool LightsManager::IsEnabled() const
diff --git a/stepmania/src/Style.h b/stepmania/src/Style.h
index b9966c113d..ebe0fe05e6 100644
--- a/stepmania/src/Style.h
+++ b/stepmania/src/Style.h
@@ -47,7 +47,7 @@ public:
 	/* This maps from game inputs to columns.  More than one button may map to a
 	 * single column. */
 	enum { NO_MAPPING = -1, END_MAPPING = -2 };
-	int		m_iInputColumn[NUM_GameController][NUM_GameButton]; // maps each input to a column, or GAME_BUTTON_INVALID
+	int		m_iInputColumn[NUM_GameController][NUM_GameButton]; // maps each input to a column, or GameButton_Invalid
 	int		m_iColumnDrawOrder[MAX_COLS_PER_PLAYER];
 	bool		m_bNeedsZoomOutWith2Players;
 	bool		m_bCanUseBeginnerHelper;