diff --git a/stepmania/src/RageSoundReader.cpp b/stepmania/src/RageSoundReader.cpp
index 4a27def928..74a35a0629 100644
--- a/stepmania/src/RageSoundReader.cpp
+++ b/stepmania/src/RageSoundReader.cpp
@@ -2,7 +2,7 @@
 #include "RageSoundReader.h"
 #include "RageUtil_AutoPtr.h"
 
-REGISTER_CLASS_TRAITS( SoundReader, pCopy->Copy() );
+REGISTER_CLASS_TRAITS( RageSoundReader, pCopy->Copy() );
 
 /*
  * Copyright (c) 2006 Glenn Maynard
diff --git a/stepmania/src/RageSoundReader.h b/stepmania/src/RageSoundReader.h
index dedcf565b0..5422bcc1aa 100644
--- a/stepmania/src/RageSoundReader.h
+++ b/stepmania/src/RageSoundReader.h
@@ -1,9 +1,10 @@
-/* SoundReader - Data source for a RageSound. */
+/* RageSoundReader - Data source for a RageSound. */
 
 #ifndef RAGE_SOUND_READER_H
 #define RAGE_SOUND_READER_H
 
-class SoundReader
+#define SoundReader RageSoundReader
+class RageSoundReader
 {
 public:
 	virtual int GetLength() const = 0; /* ms */