diff --git a/stepmania/src/RageFileDriverDirect.cpp b/stepmania/src/RageFileDriverDirect.cpp
index a627179339..f0a197af76 100644
--- a/stepmania/src/RageFileDriverDirect.cpp
+++ b/stepmania/src/RageFileDriverDirect.cpp
@@ -106,7 +106,7 @@ RageFileObj *MakeFileObjDirect( CString sPath, int mode, int &err )
 	return new RageFileObjDirect( sPath, fd, mode );
 }
 
-RageFileObj *RageFileDriverDirect::Open( const CString &path, int mode, int &err )
+RageBasicFile *RageFileDriverDirect::Open( const CString &path, int mode, int &err )
 {
 	CString sPath = path;
 
diff --git a/stepmania/src/RageFileDriverDirect.h b/stepmania/src/RageFileDriverDirect.h
index 4a99a40bc3..beacc8cb1f 100644
--- a/stepmania/src/RageFileDriverDirect.h
+++ b/stepmania/src/RageFileDriverDirect.h
@@ -8,7 +8,7 @@ class RageFileDriverDirect: public RageFileDriver
 public:
 	RageFileDriverDirect( CString root );
 
-	RageFileObj *Open( const CString &path, int mode, int &err );
+	RageBasicFile *Open( const CString &path, int mode, int &err );
 	bool Remove( const CString &sPath );
 	bool Ready();
 
diff --git a/stepmania/src/RageFileDriverMemory.cpp b/stepmania/src/RageFileDriverMemory.cpp
index 77243a6c49..03d6ed792d 100644
--- a/stepmania/src/RageFileDriverMemory.cpp
+++ b/stepmania/src/RageFileDriverMemory.cpp
@@ -117,7 +117,7 @@ RageFileDriverMem::~RageFileDriverMem()
 	}
 }
 
-RageFileObj *RageFileDriverMem::Open( const CString &sPath, int mode, int &err )
+RageBasicFile *RageFileDriverMem::Open( const CString &sPath, int mode, int &err )
 {
 	LockMut(m_Mutex);
 
diff --git a/stepmania/src/RageFileDriverMemory.h b/stepmania/src/RageFileDriverMemory.h
index 9dcc73fefd..b1425a2092 100644
--- a/stepmania/src/RageFileDriverMemory.h
+++ b/stepmania/src/RageFileDriverMemory.h
@@ -34,7 +34,7 @@ public:
 	RageFileDriverMem();
 	~RageFileDriverMem();
 
-	RageFileObj *Open( const CString &sPath, int mode, int &err );
+	RageBasicFile *Open( const CString &sPath, int mode, int &err );
 	void FlushDirCache( const CString &sPath ) { }
 
 	bool Remove( const CString &sPath );
diff --git a/stepmania/src/RageFileDriverZip.cpp b/stepmania/src/RageFileDriverZip.cpp
index 606b2da212..68b31b3150 100644
--- a/stepmania/src/RageFileDriverZip.cpp
+++ b/stepmania/src/RageFileDriverZip.cpp
@@ -383,7 +383,7 @@ RageFileDriverZip::~RageFileDriverZip()
 		delete Files[i];
 }
 
-RageFileObj *RageFileDriverZip::Open( const CString &path, int mode, int &err )
+RageBasicFile *RageFileDriverZip::Open( const CString &path, int mode, int &err )
 {
 	if( mode == RageFile::WRITE )
 	{
diff --git a/stepmania/src/RageFileDriverZip.h b/stepmania/src/RageFileDriverZip.h
index ead96fd002..04e0f9a167 100644
--- a/stepmania/src/RageFileDriverZip.h
+++ b/stepmania/src/RageFileDriverZip.h
@@ -11,7 +11,7 @@ public:
 	RageFileDriverZip( CString path );
 	virtual ~RageFileDriverZip();
 
-	RageFileObj *Open( const CString &path, int mode, int &err );
+	RageBasicFile *Open( const CString &path, int mode, int &err );
 	void FlushDirCache( const CString &sPath );
 
 private: