diff --git a/stepmania/src/Attack.cpp b/stepmania/src/Attack.cpp
index 81887e6d6e..70576fd226 100644
--- a/stepmania/src/Attack.cpp
+++ b/stepmania/src/Attack.cpp
@@ -6,15 +6,15 @@
 #include "Foreach.h"
 #include "PlayerOptions.h"
 
-void Attack::GetAttackBeats( const Song *song, const PlayerState* pPlayerState, float &fStartBeat, float &fEndBeat ) const
+void Attack::GetAttackBeats( const Song *pSong, const PlayerState* pPlayerState, float &fStartBeat, float &fEndBeat ) const
 {
-	ASSERT( song );
+	ASSERT( pSong );
 
 	if( fStartSecond >= 0 )
 	{
 		CHECKPOINT;
-		fStartBeat = song->GetBeatFromElapsedTime( fStartSecond );
-		fEndBeat = song->GetBeatFromElapsedTime( fStartSecond+fSecsRemaining );
+		fStartBeat = pSong->GetBeatFromElapsedTime( fStartSecond );
+		fEndBeat = pSong->GetBeatFromElapsedTime( fStartSecond+fSecsRemaining );
 	}
 	else
 	{
diff --git a/stepmania/src/Attack.h b/stepmania/src/Attack.h
index 92e81eb1eb..c4cb41bb16 100644
--- a/stepmania/src/Attack.h
+++ b/stepmania/src/Attack.h
@@ -45,7 +45,7 @@ struct Attack
 		bShowInAttackList = bShowInAttackList_;
 	}
 
-	void GetAttackBeats( const Song *song, const PlayerState* pPlayerState, float &fStartBeat, float &fEndBeat ) const;
+	void GetAttackBeats( const Song *pSong, const PlayerState* pPlayerState, float &fStartBeat, float &fEndBeat ) const;
 	bool IsBlank() const { return sModifiers.empty(); }
 	bool operator== ( const Attack &rhs ) const;
 	bool ContainsTransformOrTurn() const;