diff --git a/stepmania/src/arch/Sound/RageSoundDriver_DSound.cpp b/stepmania/src/arch/Sound/RageSoundDriver_DSound.cpp
index 0bf42ed75c..bfa03d2042 100644
--- a/stepmania/src/arch/Sound/RageSoundDriver_DSound.cpp
+++ b/stepmania/src/arch/Sound/RageSoundDriver_DSound.cpp
@@ -61,7 +61,7 @@ void RageSound_DSound::MixerThread()
 			if(stream_pool[i]->state == stream_pool[i]->INACTIVE)
 				continue; /* inactive */
 
-			while(stream_pool[i]->GetPCM(false))
+			while(stream_pool[i]->GetData(false))
 				;
 		}
 	}
@@ -95,7 +95,7 @@ void RageSound_DSound::Update(float delta)
 /* If init is true, we're filling the buffer while it's stopped, so put
  * data in the current buffer (where the play cursor is); otherwise put
  * it in the opposite buffer. */
-bool RageSound_DSound::stream::GetPCM(bool init)
+bool RageSound_DSound::stream::GetData(bool init)
 {
 	VDCHECKPOINT;
 
@@ -221,13 +221,13 @@ void RageSound_DSound::StartMixing(RageSound *snd)
 	/* Pre-buffer the stream. */
 	/* There are two buffers of data; fill them both ahead of time so the
 	 * sound can start almost immediately. */
-	stream_pool[i]->GetPCM(true);
+	stream_pool[i]->GetData(true);
 	stream_pool[i]->str_ds->Play();
 
 	/* Normally, at this point we should still be INACTIVE, in which case,
 	 * tell the mixer thread to start mixing this channel.  However, if it's
 	 * been changed to STOPPING, then we actually finished the whole file
-	 * in the prebuffering GetPCM calls above, so leave it alone and let it
+	 * in the prebuffering GetData calls above, so leave it alone and let it
 	 * finish on its own. */
 	if(stream_pool[i]->state == stream_pool[i]->INACTIVE)
 		stream_pool[i]->state = stream_pool[i]->PLAYING;
diff --git a/stepmania/src/arch/Sound/RageSoundDriver_DSound.h b/stepmania/src/arch/Sound/RageSoundDriver_DSound.h
index e5493d38cb..5474a86e05 100644
--- a/stepmania/src/arch/Sound/RageSoundDriver_DSound.h
+++ b/stepmania/src/arch/Sound/RageSoundDriver_DSound.h
@@ -26,7 +26,7 @@ class RageSound_DSound: public RageSoundDriver
 
 		int flush_pos; /* state == STOPPING only */
 
-		bool GetPCM(bool init);
+		bool GetData(bool init);
 
 	    stream() { str_ds = NULL; snd = NULL; state=INACTIVE; }
 		~stream();
diff --git a/stepmania/src/arch/Sound/RageSoundDriver_DSound_Software.cpp b/stepmania/src/arch/Sound/RageSoundDriver_DSound_Software.cpp
index 3dee63ba5b..3deff8da36 100644
--- a/stepmania/src/arch/Sound/RageSoundDriver_DSound_Software.cpp
+++ b/stepmania/src/arch/Sound/RageSoundDriver_DSound_Software.cpp
@@ -44,12 +44,12 @@ void RageSound_DSound_Software::MixerThread()
 	while(!shutdown) {
 		Sleep(10);
 
-		while(GetPCM())
+		while(GetData())
 			;
 	}
 }
 
-bool RageSound_DSound_Software::GetPCM()
+bool RageSound_DSound_Software::GetData()
 {
 	LockMut(SOUNDMAN->lock);
 
diff --git a/stepmania/src/arch/Sound/RageSoundDriver_DSound_Software.h b/stepmania/src/arch/Sound/RageSoundDriver_DSound_Software.h
index f204f53145..5fb07652b6 100644
--- a/stepmania/src/arch/Sound/RageSoundDriver_DSound_Software.h
+++ b/stepmania/src/arch/Sound/RageSoundDriver_DSound_Software.h
@@ -28,7 +28,7 @@ class RageSound_DSound_Software: public RageSoundDriver
 	DSound ds;
 	DSoundBuf *str_ds;
 
-	bool GetPCM();
+	bool GetData();
 	void Update(float delta);
 
 	static int MixerThread_start(void *p);
diff --git a/stepmania/src/arch/Sound/RageSoundDriver_WaveOut.cpp b/stepmania/src/arch/Sound/RageSoundDriver_WaveOut.cpp
index 34bb311fd7..1877c2c2b8 100644
--- a/stepmania/src/arch/Sound/RageSoundDriver_WaveOut.cpp
+++ b/stepmania/src/arch/Sound/RageSoundDriver_WaveOut.cpp
@@ -54,14 +54,14 @@ void RageSound_WaveOut::MixerThread()
 		LOG->Warn(werr_ssprintf(GetLastError(), "Failed to set sound thread priority"));
 
 	while(!shutdown) {
-		while(GetPCM())
+		while(GetData())
 			;
 
 		WaitForSingleObject(sound_event, 10);
 	}
 }
 
-bool RageSound_WaveOut::GetPCM()
+bool RageSound_WaveOut::GetData()
 {
 	LockMutex L(SOUNDMAN->lock);
 
diff --git a/stepmania/src/arch/Sound/RageSoundDriver_WaveOut.h b/stepmania/src/arch/Sound/RageSoundDriver_WaveOut.h
index 5613b1c5f0..9073790dcd 100644
--- a/stepmania/src/arch/Sound/RageSoundDriver_WaveOut.h
+++ b/stepmania/src/arch/Sound/RageSoundDriver_WaveOut.h
@@ -30,7 +30,7 @@ class RageSound_WaveOut: public RageSoundDriver
 	void MixerThread();
 	SDL_Thread *MixerThreadPtr;
 
-	bool GetPCM();
+	bool GetData();
 	void Update(float delta);
 
 	/* virtuals: */