diff --git a/stepmania/src/NoteField.cpp b/stepmania/src/NoteField.cpp
index 51fe863982..a308ba53ec 100644
--- a/stepmania/src/NoteField.cpp
+++ b/stepmania/src/NoteField.cpp
@@ -58,7 +58,7 @@ void NoteField::Unload()
 void NoteField::CacheNoteSkin( const RString &sNoteSkin_ )
 {
 	RString sNoteSkin = sNoteSkin_;
-	sNoteSkin.ToLower();
+	sNoteSkin.MakeLower();
 
 	if( m_NoteDisplays.find(sNoteSkin) != m_NoteDisplays.end() )
 		return;
@@ -78,7 +78,7 @@ void NoteField::CacheNoteSkin( const RString &sNoteSkin_ )
 void NoteField::UncacheNoteSkin( const RString &sNoteSkin_ )
 {
 	RString sNoteSkin( sNoteSkin_ );
-	sNoteSkin.ToLower();
+	sNoteSkin.MakeLower();
 
 	LOG->Trace("NoteField::CacheNoteSkin: release %s", sNoteSkin.c_str() );
 	ASSERT_M( m_NoteDisplays.find(sNoteSkin) != m_NoteDisplays.end(), sNoteSkin );
diff --git a/stepmania/src/NotesLoaderBMS.cpp b/stepmania/src/NotesLoaderBMS.cpp
index e9d909bc92..36bba3a662 100644
--- a/stepmania/src/NotesLoaderBMS.cpp
+++ b/stepmania/src/NotesLoaderBMS.cpp
@@ -230,7 +230,7 @@ int BMSLoader::GetMeasureStartRow( const MeasureToTimeSig_t &sigs, int iMeasureN
 
 void BMSLoader::SearchForDifficulty( RString sTag, Steps *pOut )
 {
-	sTag.ToLower();
+	sTag.MakeLower();
 
 	/* Only match "Light" in parentheses. */
 	if( sTag.find( "(light" ) != sTag.npos )
@@ -892,7 +892,7 @@ bool BMSLoader::LoadFromDir( const RString &sDir, Song &out )
 		if( GetTagFromMap( aBMSData[i], "#title", sTag ) && sTag.size() != commonSubstring.size() )
 		{
 			sTag = sTag.substr( commonSubstring.size(), sTag.size() - commonSubstring.size() );
-			sTag.ToLower();
+			sTag.MakeLower();
 
 			// XXX: We should do this with filenames too, I have plenty of examples.
 			//      however, filenames will be trickier, as stuffs at the beginning AND
diff --git a/stepmania/src/NotesLoaderDWI.cpp b/stepmania/src/NotesLoaderDWI.cpp
index 3b1a97464b..ed32f59d6d 100644
--- a/stepmania/src/NotesLoaderDWI.cpp
+++ b/stepmania/src/NotesLoaderDWI.cpp
@@ -525,7 +525,7 @@ bool DWILoader::LoadFromDWIFile( const RString &sPath, Song &out )
 
 				pos = endpos + 1;
 
-				sub.ToLower();
+				sub.MakeLower();
 				BlacklistedImages.insert( sub );
 			}
 		}
diff --git a/stepmania/src/RageSoundReader_Chain.cpp b/stepmania/src/RageSoundReader_Chain.cpp
index eb3718ab76..7d41ea4c1c 100644
--- a/stepmania/src/RageSoundReader_Chain.cpp
+++ b/stepmania/src/RageSoundReader_Chain.cpp
@@ -47,7 +47,7 @@ SoundReader *RageSoundReader_Chain::Copy() const
  * read it more than once at a time. */
 bool RageSoundReader_Chain::AddSound( RString sPath, float fOffsetSecs, float fPan )
 {
-	sPath.ToLower();
+	sPath.MakeLower();
 
 	map<RString, SoundReader *>::const_iterator it;
 	it = m_apLoadedSounds.find( sPath );
diff --git a/stepmania/src/RageUtil_FileDB.cpp b/stepmania/src/RageUtil_FileDB.cpp
index 85f5c9e544..cf4b20cd79 100644
--- a/stepmania/src/RageUtil_FileDB.cpp
+++ b/stepmania/src/RageUtil_FileDB.cpp
@@ -10,11 +10,11 @@ void FileSet::GetFilesMatching( const RString &sBeginning_, const RString &sCont
 	/* "files" is a case-insensitive mapping, by filename.  Use lower_bound to figure
 	 * out where to start. */
 	RString sBeginning = sBeginning_;
-	sBeginning.ToLower();
+	sBeginning.MakeLower();
 	RString sContaining = sContaining_;
-	sContaining.ToLower();
+	sContaining.MakeLower();
 	RString sEnding = sEnding_;
-	sEnding.ToLower();
+	sEnding.MakeLower();
 
 	set<File>::const_iterator i = files.lower_bound( File(sBeginning) );
 	for( ; i != files.end(); ++i )
diff --git a/stepmania/src/Song.cpp b/stepmania/src/Song.cpp
index 37c4aefa63..b98e20bb44 100644
--- a/stepmania/src/Song.cpp
+++ b/stepmania/src/Song.cpp
@@ -642,7 +642,7 @@ void Song::TidyUpData()
 
 		// ignore DWI "-char" graphics
 		RString sLower = arrayImages[i];
-		sLower.ToLower();
+		sLower.MakeLower();
 		if( BlacklistedImages.find(sLower) != BlacklistedImages.end() )
 			continue;	// skip
 		
diff --git a/stepmania/src/ThemeManager.cpp b/stepmania/src/ThemeManager.cpp
index 7809c4c264..74514224ac 100644
--- a/stepmania/src/ThemeManager.cpp
+++ b/stepmania/src/ThemeManager.cpp
@@ -404,13 +404,13 @@ struct CompareLanguageTag
 	{
 		m_sLanguageString = RString("(lang ") + sLang + ")";
 		LOG->Trace( "try \"%s\"", sLang.c_str() );
-		m_sLanguageString.ToLower();
+		m_sLanguageString.MakeLower();
 	}
 
 	bool operator()( const RString &sFile ) const
 	{
 		RString sLower( sFile );
-		sLower.ToLower();
+		sLower.MakeLower();
 		size_t iPos = sLower.find( m_sLanguageString );
 		return iPos != RString::npos;
 	}