diff --git a/stepmania/src/Game.cpp b/stepmania/src/Game.cpp
index 929838f7d7..d620d4cff6 100644
--- a/stepmania/src/Game.cpp
+++ b/stepmania/src/Game.cpp
@@ -87,14 +87,14 @@ void Game::MenuInputToGameInput( MenuInput MenuI, GameInput GameIout[4] ) const
 	}
 }
 
-RString Game::ColToButtonName( int col ) const
+RString Game::ColToButtonName( int iCol ) const
 {
 	const Style *pStyle = GAMESTATE->GetCurrentStyle();
-	const char *pzColumnName = pStyle->m_ColumnInfo[PLAYER_1][col].pzName;
+	const char *pzColumnName = pStyle->m_ColumnInfo[PLAYER_1][iCol].pzName;
 	if( pzColumnName != NULL )
 		return pzColumnName;
 
-	GameInput GI = pStyle->StyleInputToGameInput( col, PLAYER_1 );
+	GameInput GI = pStyle->StyleInputToGameInput( iCol, PLAYER_1 );
 
 	return m_szButtonNames[GI.button];
 }
diff --git a/stepmania/src/LightsManager.cpp b/stepmania/src/LightsManager.cpp
index 53c8cc9175..5e91a26da9 100644
--- a/stepmania/src/LightsManager.cpp
+++ b/stepmania/src/LightsManager.cpp
@@ -63,9 +63,9 @@ static void GetUsedGameInputs( vector<GameInput> &vGameInputsOut )
 			continue;
 		FOREACH_PlayerNumber( pn )
 		{
-			for( int i=0; i<(*style)->m_iColsPerPlayer; i++ )
+			for( int iCol=0; iCol<(*style)->m_iColsPerPlayer; ++iCol )
 			{
-				GameInput gi = (*style)->StyleInputToGameInput( i, pn );
+				GameInput gi = (*style)->StyleInputToGameInput( iCol, pn );
 				if( gi.IsValid() )
 				{
 					vGIs.insert( gi );