diff --git a/stepmania/src/ScreenAttract.cpp b/stepmania/src/ScreenAttract.cpp
index 0b9ea6b0b4..e75b41141b 100644
--- a/stepmania/src/ScreenAttract.cpp
+++ b/stepmania/src/ScreenAttract.cpp
@@ -168,7 +168,7 @@ void ScreenAttract::HandleScreenMessage( const ScreenMessage SM )
 		 * music, it will constantly loop even after the screen has gone on
 		 * to the next attract screen. -- Miryokuteki */
 		bool bGoingToPlayTheSameMusic =
-			THEME->GetPathToS( NEXT_SCREEN, "music", false) == THEME->GetPathToS( m_sName, "music", false);
+			THEME->GetPathS( NEXT_SCREEN, "music", false) == THEME->GetPathS( m_sName, "music", false);
 		if( bGoingToPlayTheSameMusic )
 			; // do nothing
 		else
diff --git a/stepmania/src/ScreenSelect.cpp b/stepmania/src/ScreenSelect.cpp
index e24da67e6f..da6415bc31 100644
--- a/stepmania/src/ScreenSelect.cpp
+++ b/stepmania/src/ScreenSelect.cpp
@@ -65,7 +65,7 @@ ScreenSelect::ScreenSelect( CString sClassName ) : Screen(sClassName)
 			mc.Load( c, sChoice );
 			m_aModeChoices.push_back( mc );
 		
-			CString sBGAnimationDir = THEME->GetPathTo(BGAnimations, m_sName, mc.m_sName, true);	// true="optional"
+			CString sBGAnimationDir = THEME->GetPath(BGAnimations, m_sName, mc.m_sName, true);	// true="optional"
 			if( sBGAnimationDir == "" )
 				sBGAnimationDir = THEME->GetPathToB(m_sName+" background");
 			BGAnimation *pBGA = new BGAnimation;
diff --git a/stepmania/src/SongCreditDisplay.cpp b/stepmania/src/SongCreditDisplay.cpp
index 32f6c724eb..4228ea54da 100644
--- a/stepmania/src/SongCreditDisplay.cpp
+++ b/stepmania/src/SongCreditDisplay.cpp
@@ -18,9 +18,10 @@
 
 SongCreditDisplay::SongCreditDisplay()
 {
-	this->LoadFromFont( THEME->GetPathToF("SongCreditDisplay",(CString)"text") );
 	if( GAMESTATE->IsCourseMode() )
 		return;
+
+	this->LoadFromFont( THEME->GetPathF("SongCreditDisplay","text") );
 	Song* pSong = GAMESTATE->m_pCurSong;
 	ASSERT( pSong );
 
diff --git a/stepmania/src/ThemeManager.cpp b/stepmania/src/ThemeManager.cpp
index 379abe9a3c..0597b57e1c 100644
--- a/stepmania/src/ThemeManager.cpp
+++ b/stepmania/src/ThemeManager.cpp
@@ -342,7 +342,7 @@ try_element_again:
 		* up resolving to the overridden background. */
 		/* Use GetPathToOptional because we don't want report that there's an element
 		 * missing.  Instead we want to report that the redirect is invalid. */
-		CString sNewPath = GetPathTo(category, sNewClassName, sNewFile, true);
+		CString sNewPath = GetPath(category, sNewClassName, sNewFile, true);
 
 		if( !sNewPath.empty() )
 			return sNewPath;
@@ -365,7 +365,7 @@ try_element_again:
 	}
 }
 
-CString ThemeManager::GetPathTo( ElementCategory category, CString sClassName, CString sElement, bool bOptional ) 
+CString ThemeManager::GetPath( ElementCategory category, CString sClassName, CString sElement, bool bOptional ) 
 {
 	CString sFileName = ClassAndElementToFileName( sClassName, sElement );
 
@@ -430,7 +430,7 @@ try_element_again:
 		if(sFileName == "_missing")
 			RageException::Throw("'_missing' isn't present in '%s%s'", GetThemeDirFromName(BASE_THEME_NAME).c_str(), sCategory.c_str() );
 
-		Cache[sFileName] = GetPathTo( category, "", "_missing" );
+		Cache[sFileName] = GetPath( category, "", "_missing" );
 		return Cache[sFileName];
 	/* XXX: "abort" and "cancel" are synonyms; merge */
 	case ArchHooks::abort:
@@ -599,9 +599,9 @@ CString ThemeManager::GetLanguageIniPath( CString sThemeName, CString sLanguage
 }
 
 // TODO: remove these and update the places that use them
-CString ThemeManager::GetPathToB( CString sFileName, bool bOptional ) { CString sClassName, sElement; FileNameToClassAndElement(sFileName,sClassName,sElement); return GetPathToB(sClassName,sElement,bOptional); }
-CString ThemeManager::GetPathToF( CString sFileName, bool bOptional ) { CString sClassName, sElement; FileNameToClassAndElement(sFileName,sClassName,sElement); return GetPathToF(sClassName,sElement,bOptional); }
-CString ThemeManager::GetPathToG( CString sFileName, bool bOptional ) { CString sClassName, sElement; FileNameToClassAndElement(sFileName,sClassName,sElement); return GetPathToG(sClassName,sElement,bOptional); }
-CString ThemeManager::GetPathToN( CString sFileName, bool bOptional ) { CString sClassName, sElement; FileNameToClassAndElement(sFileName,sClassName,sElement); return GetPathToN(sClassName,sElement,bOptional); }
-CString ThemeManager::GetPathToS( CString sFileName, bool bOptional ) { CString sClassName, sElement; FileNameToClassAndElement(sFileName,sClassName,sElement); return GetPathToS(sClassName,sElement,bOptional); }
-CString ThemeManager::GetPathToO( CString sFileName, bool bOptional ) { CString sClassName, sElement; FileNameToClassAndElement(sFileName,sClassName,sElement); return GetPathToO(sClassName,sElement,bOptional); }
+CString ThemeManager::GetPathToB( CString sFileName, bool bOptional ) { CString sClassName, sElement; FileNameToClassAndElement(sFileName,sClassName,sElement); return GetPathB(sClassName,sElement,bOptional); }
+CString ThemeManager::GetPathToF( CString sFileName, bool bOptional ) { CString sClassName, sElement; FileNameToClassAndElement(sFileName,sClassName,sElement); return GetPathF(sClassName,sElement,bOptional); }
+CString ThemeManager::GetPathToG( CString sFileName, bool bOptional ) { CString sClassName, sElement; FileNameToClassAndElement(sFileName,sClassName,sElement); return GetPathG(sClassName,sElement,bOptional); }
+CString ThemeManager::GetPathToN( CString sFileName, bool bOptional ) { CString sClassName, sElement; FileNameToClassAndElement(sFileName,sClassName,sElement); return GetPathN(sClassName,sElement,bOptional); }
+CString ThemeManager::GetPathToS( CString sFileName, bool bOptional ) { CString sClassName, sElement; FileNameToClassAndElement(sFileName,sClassName,sElement); return GetPathS(sClassName,sElement,bOptional); }
+CString ThemeManager::GetPathToO( CString sFileName, bool bOptional ) { CString sClassName, sElement; FileNameToClassAndElement(sFileName,sClassName,sElement); return GetPathO(sClassName,sElement,bOptional); }
diff --git a/stepmania/src/ThemeManager.h b/stepmania/src/ThemeManager.h
index 319517c578..c9eeeabe27 100644
--- a/stepmania/src/ThemeManager.h
+++ b/stepmania/src/ThemeManager.h
@@ -37,13 +37,16 @@ public:
 	void ReloadMetrics();
 	void ReloadMetricsIfNecessary();
 
-	CString GetPathTo( ElementCategory category, CString sClassName, CString sElement, bool bOptional=false );
-	CString GetPathToB( CString sClassName, CString sElement, bool bOptional=false ) { return GetPathTo(BGAnimations,sClassName,sElement,bOptional); };
-	CString GetPathToF( CString sClassName, CString sElement, bool bOptional=false ) { return GetPathTo(Fonts,sClassName,sElement,bOptional); };
-	CString GetPathToG( CString sClassName, CString sElement, bool bOptional=false ) { return GetPathTo(Graphics,sClassName,sElement,bOptional); };
-	CString GetPathToN( CString sClassName, CString sElement, bool bOptional=false ) { return GetPathTo(Numbers,sClassName,sElement,bOptional); };
-	CString GetPathToS( CString sClassName, CString sElement, bool bOptional=false ) { return GetPathTo(Sounds,sClassName,sElement,bOptional); };
-	CString GetPathToO( CString sClassName, CString sElement, bool bOptional=false ) { return GetPathTo(Other,sClassName,sElement,bOptional); };
+	/* I renamed these for two reasons.  The overload conflicts with the ones below:
+	 * GetPathToB( str, str ) was matching the ones below instead of these.  It's also
+	 * easier to search for uses of obsolete functions if they have a different name. */
+	CString GetPath( ElementCategory category, CString sClassName, CString sElement, bool bOptional=false );
+	CString GetPathB( CString sClassName, CString sElement, bool bOptional=false ) { return GetPath(BGAnimations,sClassName,sElement,bOptional); };
+	CString GetPathF( CString sClassName, CString sElement, bool bOptional=false ) { return GetPath(Fonts,sClassName,sElement,bOptional); };
+	CString GetPathG( CString sClassName, CString sElement, bool bOptional=false ) { return GetPath(Graphics,sClassName,sElement,bOptional); };
+	CString GetPathN( CString sClassName, CString sElement, bool bOptional=false ) { return GetPath(Numbers,sClassName,sElement,bOptional); };
+	CString GetPathS( CString sClassName, CString sElement, bool bOptional=false ) { return GetPath(Sounds,sClassName,sElement,bOptional); };
+	CString GetPathO( CString sClassName, CString sElement, bool bOptional=false ) { return GetPath(Other,sClassName,sElement,bOptional); };
 
 	// TODO: remove these and update the places that use them
 	CString GetPathToB( CString sFileName, bool bOptional=false );