diff --git a/stepmania/src/RageSound.cpp b/stepmania/src/RageSound.cpp
index 33d15a38fc..1fe7e29f99 100644
--- a/stepmania/src/RageSound.cpp
+++ b/stepmania/src/RageSound.cpp
@@ -174,7 +174,7 @@ bool RageSound::Load( RString sSoundFilePath, bool bPrecache )
 	if( pSound == NULL )
 	{
 		RString error;
-		pSound = SoundReader_FileReader::OpenFile( sSoundFilePath, error );
+		pSound = RageSoundReader_FileReader::OpenFile( sSoundFilePath, error );
 		if( pSound == NULL )
 		{
 			LOG->Warn( "RageSound::Load: error opening sound \"%s\": %s",
diff --git a/stepmania/src/RageSoundReader_Chain.cpp b/stepmania/src/RageSoundReader_Chain.cpp
index f8b59097a2..c26bbda686 100644
--- a/stepmania/src/RageSoundReader_Chain.cpp
+++ b/stepmania/src/RageSoundReader_Chain.cpp
@@ -54,7 +54,7 @@ bool RageSoundReader_Chain::AddSound( RString sPath, float fOffsetSecs, float fP
 	if( it == m_apLoadedSounds.end() )
 	{
 		RString error;
-		RageSoundReader *pReader = SoundReader_FileReader::OpenFile( sPath, error );
+		RageSoundReader *pReader = RageSoundReader_FileReader::OpenFile( sPath, error );
 		if( pReader == NULL )
 		{
 			LOG->Warn( "RageSoundReader_Chain: error opening sound \"%s\": %s",
diff --git a/stepmania/src/RageSoundReader_FileReader.cpp b/stepmania/src/RageSoundReader_FileReader.cpp
index bc27c270e1..3bb1b315b3 100644
--- a/stepmania/src/RageSoundReader_FileReader.cpp
+++ b/stepmania/src/RageSoundReader_FileReader.cpp
@@ -16,9 +16,9 @@
 #include "RageSoundReader_Vorbisfile.h"
 #endif
 
-SoundReader_FileReader *SoundReader_FileReader::TryOpenFile( RString filename, RString &error, RString format, bool &bKeepTrying )
+RageSoundReader_FileReader *RageSoundReader_FileReader::TryOpenFile( RString filename, RString &error, RString format, bool &bKeepTrying )
 {
-	SoundReader_FileReader *Sample = NULL;
+	RageSoundReader_FileReader *Sample = NULL;
 
 #ifndef NO_WAV_SUPPORT
 	if( !format.CompareNoCase("wav") )
@@ -82,7 +82,7 @@ SoundReader_FileReader *SoundReader_FileReader::TryOpenFile( RString filename, R
 	return NULL;
 }
 
-RageSoundReader *SoundReader_FileReader::OpenFile( RString filename, RString &error )
+RageSoundReader *RageSoundReader_FileReader::OpenFile( RString filename, RString &error )
 {
 	{
 		RageFile TestOpen;
@@ -108,7 +108,7 @@ RageSoundReader *SoundReader_FileReader::OpenFile( RString filename, RString &er
 	/* If the extension matches a format, try that first. */
 	if( FileTypes.find(format) != FileTypes.end() )
 	{
-	    SoundReader_FileReader *NewSample = TryOpenFile( filename, error, format, bKeepTrying );
+	    RageSoundReader_FileReader *NewSample = TryOpenFile( filename, error, format, bKeepTrying );
 		if( NewSample )
 			return NewSample;
 		FileTypes.erase( format );
@@ -116,7 +116,7 @@ RageSoundReader *SoundReader_FileReader::OpenFile( RString filename, RString &er
 
 	for( set<RString>::iterator it = FileTypes.begin(); bKeepTrying && it != FileTypes.end(); ++it )
 	{
-	    SoundReader_FileReader *NewSample = TryOpenFile( filename, error, *it, bKeepTrying );
+	    RageSoundReader_FileReader *NewSample = TryOpenFile( filename, error, *it, bKeepTrying );
 		if( NewSample )
 		{
 			LOG->UserLog( "Sound file", filename, "is really %s.", it->c_str() );
diff --git a/stepmania/src/RageSoundReader_FileReader.h b/stepmania/src/RageSoundReader_FileReader.h
index 64f2a46723..6ec0cd53e3 100644
--- a/stepmania/src/RageSoundReader_FileReader.h
+++ b/stepmania/src/RageSoundReader_FileReader.h
@@ -5,7 +5,8 @@
 
 #include "RageSoundReader.h"
 
-class SoundReader_FileReader: public RageSoundReader
+#define SoundReader_FileReader RageSoundReader_FileReader
+class RageSoundReader_FileReader: public RageSoundReader
 {
 public:
 	/*
@@ -29,7 +30,7 @@ public:
 	static RageSoundReader *OpenFile( RString filename, RString &error );
 
 private:
-	static SoundReader_FileReader *TryOpenFile( RString filename, RString &error, RString format, bool &bKeepTrying );
+	static RageSoundReader_FileReader *TryOpenFile( RString filename, RString &error, RString format, bool &bKeepTrying );
 };
 
 #endif
diff --git a/stepmania/src/RageSoundReader_MP3.cpp b/stepmania/src/RageSoundReader_MP3.cpp
index 3e9b91b89c..ee9e03cac4 100644
--- a/stepmania/src/RageSoundReader_MP3.cpp
+++ b/stepmania/src/RageSoundReader_MP3.cpp
@@ -626,7 +626,7 @@ RageSoundReader_MP3::~RageSoundReader_MP3()
 	delete mad;
 }
 
-SoundReader_FileReader::OpenResult RageSoundReader_MP3::Open( RString filename_ )
+RageSoundReader_FileReader::OpenResult RageSoundReader_MP3::Open( RString filename_ )
 {
 	filename = filename_;
 	if( !file.Open( filename ) )
diff --git a/stepmania/src/RageSoundReader_MP3.h b/stepmania/src/RageSoundReader_MP3.h
index 497918ee2e..6c2c60cb4a 100644
--- a/stepmania/src/RageSoundReader_MP3.h
+++ b/stepmania/src/RageSoundReader_MP3.h
@@ -8,7 +8,7 @@
 
 struct madlib_t;
 
-class RageSoundReader_MP3: public SoundReader_FileReader
+class RageSoundReader_MP3: public RageSoundReader_FileReader
 {
 public:
 	OpenResult Open(RString filename);
diff --git a/stepmania/src/RageSoundReader_Vorbisfile.cpp b/stepmania/src/RageSoundReader_Vorbisfile.cpp
index 305fd8210e..f2b5b40272 100644
--- a/stepmania/src/RageSoundReader_Vorbisfile.cpp
+++ b/stepmania/src/RageSoundReader_Vorbisfile.cpp
@@ -72,7 +72,7 @@ static RString ov_ssprintf( int err, const char *fmt, ...)
 	return s + ssprintf( " (%s)", errstr.c_str() );
 }
 
-SoundReader_FileReader::OpenResult RageSoundReader_Vorbisfile::Open(RString filename_)
+RageSoundReader_FileReader::OpenResult RageSoundReader_Vorbisfile::Open(RString filename_)
 {
 	filename=filename_;
 
@@ -88,7 +88,7 @@ SoundReader_FileReader::OpenResult RageSoundReader_Vorbisfile::Open(RString file
 	return Open( f );
 }
 
-SoundReader_FileReader::OpenResult RageSoundReader_Vorbisfile::Open( RageFileBasic *f )
+RageSoundReader_FileReader::OpenResult RageSoundReader_Vorbisfile::Open( RageFileBasic *f )
 {
 	vf = new OggVorbis_File;
 	memset( vf, 0, sizeof(*vf) );
diff --git a/stepmania/src/RageSoundReader_Vorbisfile.h b/stepmania/src/RageSoundReader_Vorbisfile.h
index 418a56d9dd..f9c5d89765 100644
--- a/stepmania/src/RageSoundReader_Vorbisfile.h
+++ b/stepmania/src/RageSoundReader_Vorbisfile.h
@@ -8,7 +8,7 @@
 typedef struct OggVorbis_File OggVorbis_File;
 class RageFileBasic;
 
-class RageSoundReader_Vorbisfile: public SoundReader_FileReader
+class RageSoundReader_Vorbisfile: public RageSoundReader_FileReader
 {
 public:
 	OpenResult Open(RString filename);
diff --git a/stepmania/src/RageSoundReader_WAV.cpp b/stepmania/src/RageSoundReader_WAV.cpp
index 09ac855181..d93399bfc0 100644
--- a/stepmania/src/RageSoundReader_WAV.cpp
+++ b/stepmania/src/RageSoundReader_WAV.cpp
@@ -396,7 +396,7 @@ RString ReadString( RageFile &f, int iSize, RString &sError )
 	return OPEN_FATAL_ERROR; \
 }
 
-SoundReader_FileReader::OpenResult RageSoundReader_WAV::Open( RString filename_ )
+RageSoundReader_FileReader::OpenResult RageSoundReader_WAV::Open( RString filename_ )
 {
 	m_sFilename = filename_;
 
diff --git a/stepmania/src/RageSoundReader_WAV.h b/stepmania/src/RageSoundReader_WAV.h
index 21e4916614..3a0af995ff 100644
--- a/stepmania/src/RageSoundReader_WAV.h
+++ b/stepmania/src/RageSoundReader_WAV.h
@@ -7,7 +7,7 @@
 #include "RageFile.h"
 
 struct WavReader;
-class RageSoundReader_WAV: public SoundReader_FileReader
+class RageSoundReader_WAV: public RageSoundReader_FileReader
 {
 public:
 	OpenResult Open( RString m_sFilename );
diff --git a/stepmania/src/Song.cpp b/stepmania/src/Song.cpp
index 60ab93e7ec..a60ed2b281 100644
--- a/stepmania/src/Song.cpp
+++ b/stepmania/src/Song.cpp
@@ -407,7 +407,7 @@ void Song::TidyUpData()
 	if( HasMusic() )
 	{
 		RString error;
-		RageSoundReader *Sample = SoundReader_FileReader::OpenFile( GetMusicPath(), error );
+		RageSoundReader *Sample = RageSoundReader_FileReader::OpenFile( GetMusicPath(), error );
 		/* XXX: Checking if the music file exists eliminates a warning originating from BMS files
 		 * (which have no music file, per se) but it's something of a hack. */
 		if( Sample == NULL && m_sMusicFile != "" )