diff --git a/stepmania/Themes/default/metrics.ini b/stepmania/Themes/default/metrics.ini
index 993ac242a0..438cb4155c 100644
--- a/stepmania/Themes/default/metrics.ini
+++ b/stepmania/Themes/default/metrics.ini
@@ -3101,7 +3101,7 @@ Line6=conf,UseUnlockSystem
 Fallback=ScreenOptionsServiceChild
 LineNames=1,2,3,4,5,6
 OptionMenuFlags=together;explanations
-Line1=conf,BackgroundMode
+Line1=conf,RandomBackgroundMode
 Line2=conf,BGBrightness
 Line3=conf,ShowDanger
 Line4=conf,ShowDancingCharacters
diff --git a/stepmania/src/Background.cpp b/stepmania/src/Background.cpp
index 54577276d0..1155a921bf 100644
--- a/stepmania/src/Background.cpp
+++ b/stepmania/src/Background.cpp
@@ -424,7 +424,7 @@ bool BackgroundImpl::Layer::CreateBackground( const Song *pSong, const Backgroun
 
 BackgroundDef BackgroundImpl::Layer::CreateRandomBGA( const Song *pSong, const CString &sEffect, deque<BackgroundDef> &RandomBGAnimations )
 {
-	if( PREFSMAN->m_BackgroundMode == PrefsManager::BGMODE_OFF )
+	if( PREFSMAN->m_RandomBackgroundMode == PrefsManager::BGMODE_OFF )
 		return BackgroundDef();
 
 	if( RandomBGAnimations.empty() )
@@ -510,10 +510,10 @@ void BackgroundImpl::LoadFromSong( const Song* pSong )
 	//
 	{
 		CStringArray vsThrowAway, vsNames;
-		switch( PREFSMAN->m_BackgroundMode )
+		switch( PREFSMAN->m_RandomBackgroundMode )
 		{
 		default:
-			ASSERT_M( 0, ssprintf("Invalid BackgroundMode: %i", (PrefsManager::BackgroundMode)PREFSMAN->m_BackgroundMode) );
+			ASSERT_M( 0, ssprintf("Invalid RandomBackgroundMode: %i", PREFSMAN->m_RandomBackgroundMode) );
 			break;
 		case PrefsManager::BGMODE_OFF:
 			break;
diff --git a/stepmania/src/PrefsManager.cpp b/stepmania/src/PrefsManager.cpp
index accc2d5b3d..19e599e57b 100644
--- a/stepmania/src/PrefsManager.cpp
+++ b/stepmania/src/PrefsManager.cpp
@@ -223,7 +223,7 @@ PrefsManager::PrefsManager() :
 	m_bShowStats			( "ShowStats",				TRUE_IF_DEBUG),
 	m_bShowBanners			( "ShowBanners",			true ),
 
-	m_BackgroundMode		( "BackgroundMode",			BGMODE_ANIMATIONS ),
+	m_RandomBackgroundMode	( "RandomBackgroundMode",	BGMODE_ANIMATIONS ),
 	m_iNumBackgrounds		( "NumBackgrounds",			8 ),
 	m_fBGBrightness			( "BGBrightness",			0.8f ),
 	/* I'd rather get occasional people asking for support for this even though
@@ -443,7 +443,7 @@ void PrefsManager::ReadPrefsFromIni( const IniFile &ini )
 
 	// validate
 	m_iSongsPerPlay.Set( clamp(m_iSongsPerPlay.Get(),0,MAX_SONGS_PER_PLAY) );
-	m_BackgroundMode.Set( (BackgroundMode)clamp((int)m_BackgroundMode.Get(),0,(int)NUM_BackgroundMode-1) );
+	m_RandomBackgroundMode.Set( (RandomBackgroundMode)clamp((int)m_RandomBackgroundMode.Get(),0,(int)NUM_RandomBackgroundMode-1) );
 
 
 	FOREACH_CONST_Child( &ini, section )
diff --git a/stepmania/src/PrefsManager.h b/stepmania/src/PrefsManager.h
index 5060e117d1..26230a5527 100644
--- a/stepmania/src/PrefsManager.h
+++ b/stepmania/src/PrefsManager.h
@@ -33,8 +33,8 @@ public:
 	Preference<bool>	m_bShowStats;
 	Preference<bool>	m_bShowBanners;
 
-	enum BackgroundMode { BGMODE_OFF, BGMODE_ANIMATIONS, BGMODE_RANDOMMOVIES, NUM_BackgroundMode };
-	Preference<BackgroundMode,int>		m_BackgroundMode;
+	enum RandomBackgroundMode { BGMODE_OFF, BGMODE_ANIMATIONS, BGMODE_RANDOMMOVIES, NUM_RandomBackgroundMode };
+	Preference<RandomBackgroundMode,int>		m_RandomBackgroundMode;
 	Preference<int>		m_iNumBackgrounds;
 	Preference<float>	m_fBGBrightness;
 	Preference<bool>	m_bHiddenSongs;
diff --git a/stepmania/src/ScreenOptionsMasterPrefs.cpp b/stepmania/src/ScreenOptionsMasterPrefs.cpp
index e4406bc203..4ad0d097fa 100644
--- a/stepmania/src/ScreenOptionsMasterPrefs.cpp
+++ b/stepmania/src/ScreenOptionsMasterPrefs.cpp
@@ -525,7 +525,7 @@ static void InitializeConfOptions()
 	ADD( ConfOption( "FastLoad",					MovePref,			"OFF","ON" ) );
 
 	/* Background options */
-	ADD( ConfOption( "BackgroundMode",				MovePref,			"OFF","ANIMATIONS","VISUALIZATIONS","RANDOM MOVIES" ) );
+	ADD( ConfOption( "RandomBackgroundMode",		MovePref,			"OFF","ANIMATIONS","VISUALIZATIONS","RANDOM MOVIES" ) );
 	ADD( ConfOption( "BGBrightness",				BGBrightness,		"0%","10%","20%","30%","40%","50%","60%","70%","80%","90%","100%" ) );
 	ADD( ConfOption( "ShowDanger",					MovePref,			"HIDE","SHOW" ) );
 	ADD( ConfOption( "ShowDancingCharacters",		MovePref,			"DEFAULT TO OFF","DEFAULT TO RANDOM","SELECT" ) );