diff --git a/stepmania/src/Profile.cpp b/stepmania/src/Profile.cpp
index 2100fda4a4..608caf2d74 100644
--- a/stepmania/src/Profile.cpp
+++ b/stepmania/src/Profile.cpp
@@ -253,7 +253,7 @@ int Profile::GetTotalStepsWithTopGrade( StepsType st, Difficulty d, Grade g ) co
 
 	FOREACH_CONST( Song*, SONGMAN->GetSongs(), pSong )
 	{
-		if( (*pSong)->m_SelectionDisplay == Song::SHOW_NEVER )
+		if( (*pSong)->GetDisplayed() == Song::SHOW_NEVER )
 			continue;	// skip
 
 		FOREACH_CONST( Steps*, (*pSong)->GetAllSteps(), pSteps )
@@ -315,7 +315,7 @@ float Profile::GetSongsPossible( StepsType st, Difficulty dc ) const
 	{
 		Song* pSong = vSongs[i];
 		
-		if( pSong->m_SelectionDisplay == Song::SHOW_NEVER )
+		if( pSong->GetDisplayed() == Song::SHOW_NEVER )
 			continue;	// skip
 
 		vector<Steps*> vSteps = pSong->GetAllSteps();
@@ -355,7 +355,7 @@ float Profile::GetSongsActual( StepsType st, Difficulty dc ) const
 		if( pSong == NULL )
 			continue;
 		
-		if( pSong->m_SelectionDisplay == Song::SHOW_NEVER )
+		if( pSong->GetDisplayed() == Song::SHOW_NEVER )
 			continue;	// skip
 		
 		CHECKPOINT_M( ssprintf("Profile::GetSongsActual: song %s", pSong->GetSongDir().c_str()) );
diff --git a/stepmania/src/SongManager.cpp b/stepmania/src/SongManager.cpp
index 381c00bd39..3aa13ed165 100644
--- a/stepmania/src/SongManager.cpp
+++ b/stepmania/src/SongManager.cpp
@@ -596,7 +596,7 @@ int SongManager::GetNumSelectableAndUnlockedSongs() const
 	{
 		if( UNLOCKMAN->SongIsLocked( *i ) )
 			continue;
-		if( (*i)->m_SelectionDisplay != Song::SHOW_ALWAYS )
+		if( (*i)->GetDisplayed() != Song::SHOW_ALWAYS )
 			continue;
 		num++;
 	}
diff --git a/stepmania/src/SongUtil.cpp b/stepmania/src/SongUtil.cpp
index 79189eaf69..cf69961847 100644
--- a/stepmania/src/SongUtil.cpp
+++ b/stepmania/src/SongUtil.cpp
@@ -34,11 +34,11 @@ bool SongCriteria::Matches( const Song *pSong ) const
 	{
 	DEFAULT_FAIL(m_Selectable);
 	case Selectable_Yes:
-		if( pSong->m_SelectionDisplay != Song::SHOW_ALWAYS )
+		if( pSong->GetDisplayed() != Song::SHOW_ALWAYS )
 			return false;
 		break;
 	case Selectable_No:
-		if( pSong->m_SelectionDisplay != Song::SHOW_NEVER )
+		if( pSong->GetDisplayed() != Song::SHOW_NEVER )
 			return false;
 		break;
 	case Selectable_DontCare:
diff --git a/stepmania/src/StageStats.cpp b/stepmania/src/StageStats.cpp
index e20b9196b1..aaba220536 100644
--- a/stepmania/src/StageStats.cpp
+++ b/stepmania/src/StageStats.cpp
@@ -283,7 +283,7 @@ bool StageStats::PlayerHasHighScore( PlayerNumber pn ) const
 
 	// If this is a SHOW_NEVER song, then it's probably a training.
 	// Don't show a high score
-	if( pSong->m_SelectionDisplay == Song::SHOW_NEVER )
+	if( pSong->GetDisplayed() == Song::SHOW_NEVER )
 		return false;
 
 	const HighScoreList &hsl =