diff --git a/stepmania/src/ScreenEdit.cpp b/stepmania/src/ScreenEdit.cpp
index 2caadfd79e..7def2f4289 100644
--- a/stepmania/src/ScreenEdit.cpp
+++ b/stepmania/src/ScreenEdit.cpp
@@ -217,7 +217,7 @@ ScreenEdit::ScreenEdit()
 	GAMESTATE->m_PlayerOptions[PLAYER_1].m_fArrowScrollSpeed = 1;
 	GAMESTATE->m_PlayerOptions[PLAYER_1].m_ColorType = PlayerOptions::COLOR_NOTE;
 
-	m_Background.LoadFromSong( m_pSong );
+	m_BGAnimation.LoadFromAniDir( THEME->GetPathTo("BGAnimations","edit") );
 
 	shiftAnchor = -1;
 	m_SnapDisplay.SetXY( EDIT_X, EDIT_GRAY_Y );
@@ -359,7 +359,7 @@ void ScreenEdit::Update( float fDeltaTime )
 		}
 	}
 
-	m_Background.Update( fDeltaTime );
+	m_BGAnimation.Update( fDeltaTime );
 	m_SnapDisplay.Update( fDeltaTime );
 	m_GrayArrowRowEdit.Update( fDeltaTime );
 	m_NoteFieldEdit.Update( fDeltaTime );
@@ -501,7 +501,7 @@ void ScreenEdit::Update( float fDeltaTime )
 
 void ScreenEdit::DrawPrimitives()
 {
-	m_Background.Draw();
+	m_BGAnimation.Draw();
 	m_SnapDisplay.Draw();
 	m_GrayArrowRowEdit.Draw();
 
diff --git a/stepmania/src/ScreenEdit.h b/stepmania/src/ScreenEdit.h
index 8205b7e5cb..64c70116da 100644
--- a/stepmania/src/ScreenEdit.h
+++ b/stepmania/src/ScreenEdit.h
@@ -18,7 +18,7 @@
 #include "FocusingSprite.h"
 #include "RageMusic.h"
 #include "MotionBlurSprite.h"
-#include "Background.h"
+#include "BGAnimation.h"
 #include "SnapDisplay.h"
 
 
@@ -55,16 +55,16 @@ protected:
 	Song*			m_pSong;
 	Notes*			m_pNotes;
 
-	Background				m_Background;
+	BGAnimation		m_BGAnimation;
 
-	NoteField				m_NoteFieldEdit;
-	SnapDisplay				m_SnapDisplay;
-	GrayArrowRow			m_GrayArrowRowEdit;
+	NoteField		m_NoteFieldEdit;
+	SnapDisplay		m_SnapDisplay;
+	GrayArrowRow	m_GrayArrowRowEdit;
 
-	BitmapText				m_textInfo;		// status information that changes
-	BitmapText				m_textHelp;
-	Quad					m_rectShortcutsBack;
-	BitmapText				m_textShortcuts;
+	BitmapText		m_textInfo;		// status information that changes
+	BitmapText		m_textHelp;
+	Quad			m_rectShortcutsBack;
+	BitmapText		m_textShortcuts;
 
 	// keep track of where we are and what we're doing
 	float				m_fTrailingBeat;	// this approaches GAMESTATE->m_fSongBeat, which is the actual beat