diff --git a/stepmania/src/RageSound.cpp b/stepmania/src/RageSound.cpp
index f85239a0aa..e0f6ec2b0e 100644
--- a/stepmania/src/RageSound.cpp
+++ b/stepmania/src/RageSound.cpp
@@ -171,7 +171,7 @@ bool RageSound::Load(CString sSoundFilePath, int precache)
 	m_sFilePath = sSoundFilePath;
 	position = 0;
 
-    SoundReader_SDL_Sound *NewSample = new SoundReader_SDL_Sound;
+    SoundReader_FileReader *NewSample = new SoundReader_SDL_Sound;
 	if(!NewSample->Open(sSoundFilePath.c_str()))
 		RageException::Throw( "RageSoundManager::RageSoundManager: error opening sound '%s': '%s'",
 			sSoundFilePath.c_str(), NewSample->GetError().c_str());
diff --git a/stepmania/src/RageSoundReader_SDL_Sound.h b/stepmania/src/RageSoundReader_SDL_Sound.h
index 17a71874ae..9ed5ae9fc0 100644
--- a/stepmania/src/RageSoundReader_SDL_Sound.h
+++ b/stepmania/src/RageSoundReader_SDL_Sound.h
@@ -1,10 +1,10 @@
 #ifndef RAGE_SOUND_READER_SDL_SOUND
 #define RAGE_SOUND_READER_SDL_SOUND
 
-#include "RageSoundReader.h"
+#include "RageSoundReader_FileReader.h"
 #include "SDL_sound-1.0.0/SDL_sound.h"
 
-class SoundReader_SDL_Sound: public SoundReader {
+class SoundReader_SDL_Sound: public SoundReader_FileReader {
 	Sound_Sample *Sample;
 	const char *inbuf;
 	unsigned avail;
diff --git a/stepmania/src/RageSoundReader_Vorbisfile.h b/stepmania/src/RageSoundReader_Vorbisfile.h
index 3fac175db3..51eff00837 100644
--- a/stepmania/src/RageSoundReader_Vorbisfile.h
+++ b/stepmania/src/RageSoundReader_Vorbisfile.h
@@ -1,11 +1,11 @@
 #ifndef RAGE_SOUND_READER_SDL_SOUND
 #define RAGE_SOUND_READER_SDL_SOUND
 
-#include "RageSoundReader.h"
+#include "RageSoundReader_FileReader.h"
 
 typedef struct OggVorbis_File OggVorbis_File;
 
-class RageSoundReader_Vorbisfile: public SoundReader {
+class RageSoundReader_Vorbisfile: public SoundReader_FileReader {
 	OggVorbis_File *vf;
 	char buffer[4096*4];
 	unsigned avail;