diff --git a/stepmania/src/MusicWheel.cpp b/stepmania/src/MusicWheel.cpp
index f4eeb6476e..14eca927f2 100644
--- a/stepmania/src/MusicWheel.cpp
+++ b/stepmania/src/MusicWheel.cpp
@@ -859,7 +859,7 @@ void MusicWheel::Update( float fDeltaTime )
 			{
 //				if ( m_bUseRandomExtra )
 //				{
-//					MUSIC->Stop();
+//					SOUNDMAN->music->StopPlaying();
 //					m_soundExpand.Play();
 //					m_WheelState = STATE_ROULETTE_SPINNING;
 //					m_SortOrder = SORT_GROUP;
diff --git a/stepmania/src/ScreenEditMenu.cpp b/stepmania/src/ScreenEditMenu.cpp
index 9e9ca75052..5af38a0189 100644
--- a/stepmania/src/ScreenEditMenu.cpp
+++ b/stepmania/src/ScreenEditMenu.cpp
@@ -150,7 +150,7 @@ void ScreenEditMenu::MenuStart( PlayerNumber pn )
 		return;
 	}
 
-	MUSIC->Stop();
+	SOUNDMAN->music->StopPlaying();
 
 
 	// get the style
@@ -168,7 +168,7 @@ void ScreenEditMenu::MenuBack( PlayerNumber pn )
 {	
 	m_Menu.TweenOffScreenToBlack( SM_None, true );
 
-	MUSIC->Stop();
+	SOUNDMAN->music->StopPlaying();
 
 	m_Fade.CloseWipingLeft( SM_GoToPrevScreen );
 }
diff --git a/stepmania/src/ScreenEz2SelectMusic.cpp b/stepmania/src/ScreenEz2SelectMusic.cpp
index 991cdf947d..53d3129f80 100644
--- a/stepmania/src/ScreenEz2SelectMusic.cpp
+++ b/stepmania/src/ScreenEz2SelectMusic.cpp
@@ -168,7 +168,7 @@ void ScreenEz2SelectMusic::HandleScreenMessage( const ScreenMessage SM )
 		}
 		else
 		{
-			MUSIC->Stop();
+			SOUNDMAN->music->StopPlaying();
 			SCREENMAN->SetNewScreen( "ScreenStage" );
 		}
 		break;
@@ -188,7 +188,7 @@ void ScreenEz2SelectMusic::MenuRight( PlayerNumber pn, const InputEventType type
 
 void ScreenEz2SelectMusic::MenuBack( PlayerNumber pn )
 {
-	MUSIC->Stop();
+	SOUNDMAN->music->StopPlaying();
 
 	m_Menu.TweenOffScreenToBlack( SM_GoToPrevScreen, true );
 }
diff --git a/stepmania/src/ScreenEz2SelectPlayer.cpp b/stepmania/src/ScreenEz2SelectPlayer.cpp
index 248a6adb4d..26dc8e8542 100644
--- a/stepmania/src/ScreenEz2SelectPlayer.cpp
+++ b/stepmania/src/ScreenEz2SelectPlayer.cpp
@@ -175,7 +175,7 @@ void ScreenEz2SelectPlayer::HandleScreenMessage( const ScreenMessage SM )
 		m_Menu.TweenOffScreenToMenu( SM_GoToNextScreen );
 		break;
 	case SM_GoToPrevScreen:
-		MUSIC->Stop();
+		SOUNDMAN->music->StopPlaying();
 		SCREENMAN->SetNewScreen( "ScreenTitleMenu" );
 		break;
 	case SM_GoToNextScreen:
@@ -193,7 +193,7 @@ presses the button bound to back
 
 void ScreenEz2SelectPlayer::MenuBack( PlayerNumber pn )
 {
-	MUSIC->Stop();
+	SOUNDMAN->music->StopPlaying();
 
 	m_Menu.TweenOffScreenToBlack( SM_GoToPrevScreen, true );
 }
diff --git a/stepmania/src/ScreenGameplay.cpp b/stepmania/src/ScreenGameplay.cpp
index a13b1f3488..390d6dae7c 100644
--- a/stepmania/src/ScreenGameplay.cpp
+++ b/stepmania/src/ScreenGameplay.cpp
@@ -113,7 +113,7 @@ ScreenGameplay::ScreenGameplay()
 	g_fTickEarlySecondsCache = TICK_EARLY_SECONDS;
 
 
-	MUSIC->Stop();
+	SOUNDMAN->music->StopPlaying();
 
 	GAMESTATE->ResetStageStatistics();	// clear values
 
diff --git a/stepmania/src/ScreenSandbox.cpp b/stepmania/src/ScreenSandbox.cpp
index 5f3cad7603..67dd0db318 100644
--- a/stepmania/src/ScreenSandbox.cpp
+++ b/stepmania/src/ScreenSandbox.cpp
@@ -32,7 +32,7 @@
 
 ScreenSandbox::ScreenSandbox()
 {	
-MUSIC->Stop();
+SOUNDMAN->music->StopPlaying();
 //	m_quad.StretchTo( RectI(SCREEN_LEFT, SCREEN_TOP, SCREEN_RIGHT, SCREEN_BOTTOM) );
 //	m_quad.SetDiffuse( RageColor(1,1,1,1) );
 //	this->AddChild( &m_quad );
diff --git a/stepmania/src/ScreenSelectCourse.cpp b/stepmania/src/ScreenSelectCourse.cpp
index 458d7df0d2..f01b6e6004 100644
--- a/stepmania/src/ScreenSelectCourse.cpp
+++ b/stepmania/src/ScreenSelectCourse.cpp
@@ -317,7 +317,7 @@ void ScreenSelectCourse::MenuStart( PlayerNumber pn )
 
 void ScreenSelectCourse::MenuBack( PlayerNumber pn )
 {
-	MUSIC->Stop();
+	SOUNDMAN->music->StopPlaying();
 
 	m_Menu.TweenOffScreenToBlack( SM_GoToPrevScreen, true );
 }
diff --git a/stepmania/src/ScreenSelectMode.cpp b/stepmania/src/ScreenSelectMode.cpp
index a8d62a11b4..5a2b8f6529 100644
--- a/stepmania/src/ScreenSelectMode.cpp
+++ b/stepmania/src/ScreenSelectMode.cpp
@@ -216,7 +216,7 @@ void ScreenSelectMode::HandleScreenMessage( const ScreenMessage SM )
 		m_Menu.TweenOffScreenToMenu( SM_GoToNextScreen );
 		break;
 	case SM_GoToPrevScreen:
-		MUSIC->Stop();
+		SOUNDMAN->music->StopPlaying();
 		SCREENMAN->SetNewScreen( "ScreenTitleMenu" );
 		break;
 	case SM_GoToNextScreen:
@@ -289,7 +289,7 @@ presses the button bound to back
 ************************************/
 void ScreenSelectMode::MenuBack( PlayerNumber pn )
 {
-	MUSIC->Stop();
+	SOUNDMAN->music->StopPlaying();
 
 	m_Menu.TweenOffScreenToBlack( SM_GoToPrevScreen, true );
 }
diff --git a/stepmania/src/ScreenSelectMusic.cpp b/stepmania/src/ScreenSelectMusic.cpp
index ebd9715149..f3d89edad2 100644
--- a/stepmania/src/ScreenSelectMusic.cpp
+++ b/stepmania/src/ScreenSelectMusic.cpp
@@ -462,7 +462,7 @@ void ScreenSelectMusic::Input( const DeviceInput& DeviceI, InputEventType type,
 		else
 			if( m_MusicWheel.NextSort() )
 			{
-				MUSIC->Stop();
+				SOUNDMAN->music->StopPlaying();
 
 //				m_MusicSortDisplay.FadeOff( 0, "fade", TWEEN_TIME );
 
@@ -554,7 +554,7 @@ void ScreenSelectMusic::HandleScreenMessage( const ScreenMessage SM )
 		}
 		else
 		{
-			MUSIC->Stop();
+			SOUNDMAN->music->StopPlaying();
 			SCREENMAN->SetNewScreen( "ScreenStage" );
 		}
 		break;
@@ -579,7 +579,7 @@ void ScreenSelectMusic::MenuStart( PlayerNumber pn )
 		{
 			if( m_MusicWheel.NextSort() )
 			{
-				MUSIC->Stop();
+				SOUNDMAN->music->StopPlaying();
 
 //				m_MusicSortDisplay.FadeOff( 0, "fade", TWEEN_TIME );
 
@@ -668,7 +668,7 @@ void ScreenSelectMusic::MenuStart( PlayerNumber pn )
 
 void ScreenSelectMusic::MenuBack( PlayerNumber pn )
 {
-	MUSIC->Stop();
+	SOUNDMAN->music->StopPlaying();
 
 	m_Menu.TweenOffScreenToBlack( SM_GoToPrevScreen, true );
 }
@@ -740,7 +740,7 @@ void ScreenSelectMusic::AfterMusicChange()
 		break;
 	case TYPE_SONG:
 		{
-			MUSIC->Stop();
+			SOUNDMAN->music->StopPlaying();
 			m_fPlaySampleCountdown = SAMPLE_MUSIC_DELAY;
 
 			for( int pn = 0; pn < NUM_PLAYERS; ++pn) {
diff --git a/stepmania/src/ScreenSelectStyle.cpp b/stepmania/src/ScreenSelectStyle.cpp
index b178fd53e8..4f0f3514a0 100644
--- a/stepmania/src/ScreenSelectStyle.cpp
+++ b/stepmania/src/ScreenSelectStyle.cpp
@@ -143,7 +143,7 @@ void ScreenSelectStyle::HandleScreenMessage( const ScreenMessage SM )
 		MenuStart(PLAYER_INVALID);
 		break;
 	case SM_GoToPrevScreen:
-		MUSIC->Stop();
+		SOUNDMAN->music->StopPlaying();
 		SCREENMAN->SetNewScreen( "ScreenTitleMenu" );
 		break;
 	case SM_GoToNextScreen:
@@ -272,7 +272,7 @@ void ScreenSelectStyle::MenuStart( PlayerNumber pn )
 
 void ScreenSelectStyle::MenuBack( PlayerNumber pn )
 {
-	MUSIC->Stop();
+	SOUNDMAN->music->StopPlaying();
 
 	m_Menu.TweenOffScreenToBlack( SM_GoToPrevScreen, true );
 
diff --git a/stepmania/src/ScreenSelectStyle5th.cpp b/stepmania/src/ScreenSelectStyle5th.cpp
index b9aea08ed8..cdfaf11078 100644
--- a/stepmania/src/ScreenSelectStyle5th.cpp
+++ b/stepmania/src/ScreenSelectStyle5th.cpp
@@ -219,7 +219,7 @@ void ScreenSelectStyle5th::HandleScreenMessage( const ScreenMessage SM )
 		MenuStart(PLAYER_1);
 		break;
 	case SM_GoToPrevScreen:
-		MUSIC->Stop();
+		SOUNDMAN->music->StopPlaying();
 		SCREENMAN->SetNewScreen( "ScreenTitleMenu" );
 		break;
 	case SM_GoToNextScreen:
@@ -291,7 +291,7 @@ void ScreenSelectStyle5th::MenuStart( PlayerNumber pn )
 
 void ScreenSelectStyle5th::MenuBack( PlayerNumber pn )
 {
-	MUSIC->Stop();
+	SOUNDMAN->music->StopPlaying();
 
 	m_Menu.TweenOffScreenToBlack( SM_GoToPrevScreen, true );
 }
diff --git a/stepmania/src/ScreenSongOptions.cpp b/stepmania/src/ScreenSongOptions.cpp
index 838a04005e..f499b9ff61 100644
--- a/stepmania/src/ScreenSongOptions.cpp
+++ b/stepmania/src/ScreenSongOptions.cpp
@@ -112,7 +112,7 @@ void ScreenSongOptions::GoToPrevState()
 
 void ScreenSongOptions::GoToNextState()
 {
-	MUSIC->Stop();
+	SOUNDMAN->music->StopPlaying();
 
 	SCREENMAN->SetNewScreen( "ScreenStage" );
 }
diff --git a/stepmania/src/ScreenStage.cpp b/stepmania/src/ScreenStage.cpp
index babf4e51b4..5a119556d6 100644
--- a/stepmania/src/ScreenStage.cpp
+++ b/stepmania/src/ScreenStage.cpp
@@ -56,7 +56,7 @@ enum StageMode
 
 ScreenStage::ScreenStage()
 {
-	MUSIC->Stop();
+	SOUNDMAN->music->StopPlaying();
 
 	g_StageType = (StageType)STAGE_TYPE;