diff --git a/stepmania/src/CatalogXml.cpp b/stepmania/src/CatalogXml.cpp
index 8f4a98d1ee..3a478c562e 100644
--- a/stepmania/src/CatalogXml.cpp
+++ b/stepmania/src/CatalogXml.cpp
@@ -164,7 +164,7 @@ void CatalogXml::Save( LoadingWindow *loading_window )
 	{
 		XNode* pNode = xml.AppendChild( "Songs" );
 
-		const vector<Song*>& vpSongs = SONGMAN->GetAllSongs();
+		const vector<Song*>& vpSongs = SONGMAN->GetSongs();
 
 		for( unsigned i=0; i<vpSongs.size(); i++ )
 		{
diff --git a/stepmania/src/Profile.cpp b/stepmania/src/Profile.cpp
index 77a2b9c89f..318cb05d0d 100644
--- a/stepmania/src/Profile.cpp
+++ b/stepmania/src/Profile.cpp
@@ -241,7 +241,7 @@ int Profile::GetTotalStepsWithTopGrade( StepsType st, Difficulty d, Grade g ) co
 {
 	int iCount = 0;
 
-	FOREACH_CONST( Song*, SONGMAN->GetAllSongs(), pSong )
+	FOREACH_CONST( Song*, SONGMAN->GetSongs(), pSong )
 	{
 		if( (*pSong)->m_SelectionDisplay == Song::SHOW_NEVER )
 			continue;	// skip
@@ -300,7 +300,7 @@ float Profile::GetSongsPossible( StepsType st, Difficulty dc ) const
 	int iTotalSteps = 0;
 
 	// add steps high scores
-	const vector<Song*> vSongs = SONGMAN->GetAllSongs();
+	const vector<Song*> vSongs = SONGMAN->GetSongs();
 	for( unsigned i=0; i<vSongs.size(); i++ )
 	{
 		Song* pSong = vSongs[i];
diff --git a/stepmania/src/ScreenDebugOverlay.cpp b/stepmania/src/ScreenDebugOverlay.cpp
index 4b48f9661e..2b865d26da 100644
--- a/stepmania/src/ScreenDebugOverlay.cpp
+++ b/stepmania/src/ScreenDebugOverlay.cpp
@@ -703,7 +703,7 @@ static void FillProfileStats( Profile *pProfile )
 		PREFSMAN->m_iMaxHighScoresPerListForMachine.Get():
 		PREFSMAN->m_iMaxHighScoresPerListForPlayer.Get();
 
-	vector<Song*> vpAllSongs = SONGMAN->GetAllSongs();
+	vector<Song*> vpAllSongs = SONGMAN->GetSongs();
 	FOREACH( Song*, vpAllSongs, pSong )
 	{
 		vector<Steps*> vpAllSteps = (*pSong)->GetAllSteps();
diff --git a/stepmania/src/ScreenNameEntryTraditional.cpp b/stepmania/src/ScreenNameEntryTraditional.cpp
index 7fbda73030..e4e2cf9c4b 100644
--- a/stepmania/src/ScreenNameEntryTraditional.cpp
+++ b/stepmania/src/ScreenNameEntryTraditional.cpp
@@ -27,7 +27,7 @@ void ScreenNameEntryTraditional::Init()
 		for( int z = 0; z < 3; ++z )
 		{
 			StageStats ss;
-			const vector<Song*> &apSongs = SONGMAN->GetAllSongs();
+			const vector<Song*> &apSongs = SONGMAN->GetSongs();
 			ss.m_vpPlayedSongs.push_back( apSongs[rand()%apSongs.size()] );
 			ss.m_vpPossibleSongs = ss.m_vpPlayedSongs;
 			ss.m_pStyle = GAMESTATE->GetCurrentStyle();
diff --git a/stepmania/src/ScreenNetSelectMusic.cpp b/stepmania/src/ScreenNetSelectMusic.cpp
index 15d8b60a3d..64db62a6bb 100644
--- a/stepmania/src/ScreenNetSelectMusic.cpp
+++ b/stepmania/src/ScreenNetSelectMusic.cpp
@@ -199,7 +199,7 @@ void ScreenNetSelectMusic::HandleScreenMessage( const ScreenMessage SM )
 			}
 		}
 
-		vector <Song *> AllSongs = SONGMAN->GetAllSongs();
+		vector <Song *> AllSongs = SONGMAN->GetSongs();
 		unsigned i;
 		for( i=0; i < AllSongs.size(); i++ )
 		{
diff --git a/stepmania/src/ScreenRanking.cpp b/stepmania/src/ScreenRanking.cpp
index 467ccaf76f..7e493914d3 100644
--- a/stepmania/src/ScreenRanking.cpp
+++ b/stepmania/src/ScreenRanking.cpp
@@ -41,7 +41,7 @@ AutoScreenMessage( SM_HidePage )
 static void GetAllSongsToShow( vector<Song*> &vpOut, bool bShowOnlyMostRecentScores, int iNumMostRecentScoresToShow )
 {
 	vpOut.clear();
-	FOREACH_CONST( Song*, SONGMAN->GetAllSongs(), s )
+	FOREACH_CONST( Song*, SONGMAN->GetSongs(), s )
 	{
 		if( UNLOCKMAN->SongIsLocked(*s) )
 			continue;	// skip
diff --git a/stepmania/src/SongManager.cpp b/stepmania/src/SongManager.cpp
index 07a43a101d..06c31db1d5 100644
--- a/stepmania/src/SongManager.cpp
+++ b/stepmania/src/SongManager.cpp
@@ -311,7 +311,7 @@ void SongManager::PreloadSongImages()
 	 * that we don't need to. */
 	RageTexturePreloader preload;
 
-	const vector<Song*> &songs = SONGMAN->GetAllSongs();
+	const vector<Song*> &songs = SONGMAN->GetSongs();
 	for( unsigned i = 0; i < songs.size(); ++i )
 	{
 		if( !songs[i]->HasBanner() )
@@ -742,7 +742,7 @@ void SongManager::InitAutogenCourses()
 		m_pCourses.push_back( pCourse );
 	}
 	
-	vector<Song*> apCourseSongs = GetAllSongs();
+	vector<Song*> apCourseSongs = GetSongs();
 
 	// Generate "All Songs" endless course.
 	pCourse = new Course;
@@ -755,7 +755,7 @@ void SongManager::InitAutogenCourses()
 		/* We normally sort by translit artist.  However, display artist is more
 		 * consistent.  For example, transliterated Japanese names are alternately
 		 * spelled given- and family-name first, but display titles are more consistent. */
-		vector<Song*> apSongs = this->GetAllSongs();
+		vector<Song*> apSongs = this->GetSongs();
 		SongUtil::SortSongPointerArrayByDisplayArtist( apSongs );
 
 		RString sCurArtist = "";
@@ -917,7 +917,7 @@ void SongManager::SetPreferences()
 
 void SongManager::GetStepsLoadedFromProfile( vector<Steps*> &AddTo, ProfileSlot slot )
 {
-	const vector<Song*> &vSongs = SONGMAN->GetAllSongs();
+	const vector<Song*> &vSongs = SONGMAN->GetSongs();
 	FOREACH_CONST( Song*, vSongs, song )
 	{
 		(*song)->GetStepsLoadedFromProfile( slot, AddTo );
@@ -927,7 +927,7 @@ void SongManager::GetStepsLoadedFromProfile( vector<Steps*> &AddTo, ProfileSlot
 Song *SongManager::GetSongFromSteps( Steps *pSteps )
 {
 	ASSERT( pSteps );
-	const vector<Song*> &vSongs = SONGMAN->GetAllSongs();
+	const vector<Song*> &vSongs = SONGMAN->GetSongs();
 	FOREACH_CONST( Song*, vSongs, song )
 	{
 		vector<Steps*> vSteps;
@@ -1683,7 +1683,7 @@ class LunaSongManager: public Luna<SongManager>
 public:
 	static int GetAllSongs( T* p, lua_State *L )
 	{
-		const vector<Song*> &v = p->GetAllSongs();
+		const vector<Song*> &v = p->GetSongs();
 		LuaHelpers::CreateTableFromArray<Song*>( v, L );
 		return 1;
 	}
diff --git a/stepmania/src/SongUtil.cpp b/stepmania/src/SongUtil.cpp
index 0b23c8de6a..2f93027301 100644
--- a/stepmania/src/SongUtil.cpp
+++ b/stepmania/src/SongUtil.cpp
@@ -789,7 +789,7 @@ bool SongUtil::ValidateCurrentStepsDescription( const RString &sAnswer, RString
 void SongUtil::GetAllSongGenres( vector<RString> &vsOut )
 {
 	set<RString> genres;
-	FOREACH_CONST( Song*, SONGMAN->GetAllSongs(), song )
+	FOREACH_CONST( Song*, SONGMAN->GetSongs(), song )
 	{
 		if( !(*song)->m_sGenre.empty() )
 			genres.insert( (*song)->m_sGenre );
diff --git a/stepmania/src/StepsUtil.cpp b/stepmania/src/StepsUtil.cpp
index 6d4257b148..e513be7df0 100644
--- a/stepmania/src/StepsUtil.cpp
+++ b/stepmania/src/StepsUtil.cpp
@@ -113,7 +113,7 @@ void StepsUtil::SortStepsPointerArrayByNumPlays( vector<Steps*> &vStepsPointers,
 void StepsUtil::SortStepsPointerArrayByNumPlays( vector<Steps*> &vStepsPointers, const Profile* pProfile, bool bDecending )
 {
 	// ugly...
-	vector<Song*> vpSongs = SONGMAN->GetAllSongs();
+	vector<Song*> vpSongs = SONGMAN->GetSongs();
 	vector<Steps*> vpAllSteps;
 	map<Steps*,Song*> mapStepsToSong;
 	{
diff --git a/stepmania/src/UnlockManager.cpp b/stepmania/src/UnlockManager.cpp
index a30f5063ec..ca008718a5 100644
--- a/stepmania/src/UnlockManager.cpp
+++ b/stepmania/src/UnlockManager.cpp
@@ -428,7 +428,7 @@ void UnlockManager::Load()
 
 	if( AUTO_LOCK_CHALLENGE_STEPS )
 	{
-		FOREACH_CONST( Song*, SONGMAN->GetAllSongs(), s )
+		FOREACH_CONST( Song*, SONGMAN->GetSongs(), s )
 		{
 			// If no hard steps to play to unlock, skip
 			if( SongUtil::GetOneSteps(*s, StepsType_Invalid, Difficulty_Hard) == NULL )
diff --git a/stepmania/src/WorkoutManager.cpp b/stepmania/src/WorkoutManager.cpp
index 13b9fd16c7..2afdebd5e8 100644
--- a/stepmania/src/WorkoutManager.cpp
+++ b/stepmania/src/WorkoutManager.cpp
@@ -131,7 +131,7 @@ void WorkoutManager::GetWorkoutSongsForGenres( const vector<RString> &vsSongGenr
 	soc.m_Selectable = SongCriteria::Selectable_Yes;
 	soc.m_bUseSongGenreAllowedList = true;
 	soc.m_vsSongGenreAllowedList = vsSongGenres;
-	SongUtil::FilterSongs( soc, SONGMAN->GetAllSongs(), vpSongsOut );
+	SongUtil::FilterSongs( soc, SONGMAN->GetSongs(), vpSongsOut );
 }
 
 static LocalizedString SONGS_ENABLED( "WorkoutManager", "%d/%d songs enabled" );