diff --git a/stepmania/src/ScoreKeeperMAX2.cpp b/stepmania/src/ScoreKeeperMAX2.cpp
index 6dc8c667aa..e9e0acadd8 100644
--- a/stepmania/src/ScoreKeeperMAX2.cpp
+++ b/stepmania/src/ScoreKeeperMAX2.cpp
@@ -405,11 +405,9 @@ void ScoreKeeperMAX2::HandleTapRowScore( TapNoteScore scoreOfLastTap, int iNumTa
 	}
 
 	
-	currentNetPlayer.ReportScore (
-		m_PlayerNumber, 
-		scoreOfLastTap, 
-		g_CurStageStats.iScore[m_PlayerNumber],
-		g_CurStageStats.iCurCombo[m_PlayerNumber]);
+	NSMAN->ReportScore(m_PlayerNumber, scoreOfLastTap,
+                       g_CurStageStats.iScore[m_PlayerNumber],
+                       g_CurStageStats.iCurCombo[m_PlayerNumber]);
 }
 
 
@@ -423,11 +421,9 @@ void ScoreKeeperMAX2::HandleHoldScore( HoldNoteScore holdScore, TapNoteScore tap
 	if( holdScore == HNS_OK )
 		AddScore( TNS_MARVELOUS );
 
-	currentNetPlayer.ReportScore (
-		m_PlayerNumber, 
-		holdScore+7, 
-		g_CurStageStats.iScore[m_PlayerNumber],
-		g_CurStageStats.iCurCombo[m_PlayerNumber]);
+	NSMAN->ReportScore(m_PlayerNumber, holdScore+7, 
+                       g_CurStageStats.iScore[m_PlayerNumber],
+                       g_CurStageStats.iCurCombo[m_PlayerNumber]);
 
 
 }
diff --git a/stepmania/src/ScreenGameplay.cpp b/stepmania/src/ScreenGameplay.cpp
index a54fdce4c7..d4f8c859e2 100644
--- a/stepmania/src/ScreenGameplay.cpp
+++ b/stepmania/src/ScreenGameplay.cpp
@@ -756,7 +756,7 @@ ScreenGameplay::~ScreenGameplay()
 
 	m_soundAssistTick.StopPlaying(); /* Stop any queued assist ticks. */
 
-	currentNetPlayer.ReportSongOver();
+	NSMAN->ReportSongOver();
 }
 
 bool ScreenGameplay::IsLastSong()
@@ -1029,7 +1029,7 @@ float ScreenGameplay::StartPlayingSong(float MinTimeToNotes, float MinTimeToMusi
 	p.StopMode = RageSoundParams::M_CONTINUE;
 	p.m_StartSecond = fStartSecond;
 
-	currentNetPlayer.StartRequest(); //Network Code.
+	NSMAN->StartRequest(); //Network Code.
 
 	m_soundMusic->Play( &p );