diff --git a/stepmania/src/PlayerScoreList.cpp b/stepmania/src/PlayerScoreList.cpp
index 8dbee0c60c..b1b56e2419 100644
--- a/stepmania/src/PlayerScoreList.cpp
+++ b/stepmania/src/PlayerScoreList.cpp
@@ -124,7 +124,7 @@ void PlayerScoreList::Refresh()
 		int i = iter - v.begin();
 		PlayerScoreItem &psi = m_vScoreItem[iter->iEnabledPlayerIndex];
 		psi.SetDrawOrder( -i );
-		psi.BeginTweening( 0.5f, Actor::TWEEN_DECELERATE );
+		psi.BeginTweening( 0.5f, TWEEN_DECELERATE );
 		psi.DestTweenState() = m_vtsPositions[i];
 	}
 
diff --git a/stepmania/src/ScreenDebugOverlay.cpp b/stepmania/src/ScreenDebugOverlay.cpp
index aa6ce439ef..b9dae6fd48 100644
--- a/stepmania/src/ScreenDebugOverlay.cpp
+++ b/stepmania/src/ScreenDebugOverlay.cpp
@@ -291,7 +291,7 @@ bool ScreenDebugOverlay::OverlayInput( const InputEventPlus &input )
 			txt1.FinishTweening();
 			float fZoom = txt1.GetZoom();
 			txt1.SetZoom( fZoom * 1.2f );
-			txt1.BeginTweening( 0.2f, Actor::TWEEN_LINEAR );
+			txt1.BeginTweening( 0.2f, TWEEN_LINEAR );
 			txt1.SetZoom( fZoom );
 
 			RString sMessage;
diff --git a/stepmania/src/ScreenEz2SelectPlayer.cpp b/stepmania/src/ScreenEz2SelectPlayer.cpp
index 444cefb403..4eae8d9f97 100644
--- a/stepmania/src/ScreenEz2SelectPlayer.cpp
+++ b/stepmania/src/ScreenEz2SelectPlayer.cpp
@@ -204,12 +204,12 @@ void ScreenEz2SelectPlayer::TweenOnScreen()
 		
 		fOriginalX = m_sprJoinMessage[p].GetX();
 		m_sprJoinMessage[p].SetX( m_sprJoinMessage[p].GetX()+fOffScreenOffset );
-		m_sprJoinMessage[p].BeginTweening( 0.5f, Actor::TWEEN_BOUNCE_END );
+		m_sprJoinMessage[p].BeginTweening( 0.5f, TWEEN_BOUNCE_END );
 		m_sprJoinMessage[p].SetX( fOriginalX );
 
 		fOriginalX = m_sprJoinFrame[p].GetX();
 		m_sprJoinFrame[p].SetX( m_sprJoinMessage[p].GetX()+fOffScreenOffset );
-		m_sprJoinFrame[p].BeginTweening( 0.5f, Actor::TWEEN_BOUNCE_END );
+		m_sprJoinFrame[p].BeginTweening( 0.5f, TWEEN_BOUNCE_END );
 		m_sprJoinFrame[p].SetX( fOriginalX );
 	}
 
@@ -224,9 +224,9 @@ void ScreenEz2SelectPlayer::TweenOffScreen()
 	{
 		float fOffScreenOffset = float( (p==PLAYER_1) ? -SCREEN_WIDTH : +SCREEN_WIDTH );
 
-		m_sprJoinMessage[p].BeginTweening( 0.5f, Actor::TWEEN_DECELERATE );
+		m_sprJoinMessage[p].BeginTweening( 0.5f, TWEEN_DECELERATE );
 		m_sprJoinMessage[p].SetX( m_sprJoinMessage[p].GetX()+fOffScreenOffset );
-		m_sprJoinFrame[p].BeginTweening( 0.5f, Actor::TWEEN_DECELERATE );
+		m_sprJoinFrame[p].BeginTweening( 0.5f, TWEEN_DECELERATE );
 		m_sprJoinFrame[p].SetX( m_sprJoinMessage[p].GetX()+fOffScreenOffset );
 	}
 }
diff --git a/stepmania/src/ScreenSyncOverlay.cpp b/stepmania/src/ScreenSyncOverlay.cpp
index 971f7f01db..d3b5bf8e99 100644
--- a/stepmania/src/ScreenSyncOverlay.cpp
+++ b/stepmania/src/ScreenSyncOverlay.cpp
@@ -262,19 +262,19 @@ bool ScreenSyncOverlay::OverlayInput( const InputEventPlus &input )
 void ScreenSyncOverlay::ShowHelp()
 {
 	m_quad.StopTweening();
-	m_quad.BeginTweening( 0.3f, Actor::TWEEN_LINEAR );
+	m_quad.BeginTweening( 0.3f, TWEEN_LINEAR );
 	m_quad.SetDiffuseAlpha( 0.5f );
 
 	m_textHelp.StopTweening();
-	m_textHelp.BeginTweening( 0.3f, Actor::TWEEN_LINEAR );
+	m_textHelp.BeginTweening( 0.3f, TWEEN_LINEAR );
 	m_textHelp.SetDiffuseAlpha( 1 );
 
 	m_quad.Sleep( 4 );
-	m_quad.BeginTweening( 0.3f, Actor::TWEEN_LINEAR );
+	m_quad.BeginTweening( 0.3f, TWEEN_LINEAR );
 	m_quad.SetDiffuseAlpha( 0 );
 
 	m_textHelp.Sleep( 4 );
-	m_textHelp.BeginTweening( 0.3f, Actor::TWEEN_LINEAR );
+	m_textHelp.BeginTweening( 0.3f, TWEEN_LINEAR );
 	m_textHelp.SetDiffuseAlpha( 0 );
 }
 
diff --git a/stepmania/src/WheelBase.cpp b/stepmania/src/WheelBase.cpp
index 028488b1f8..0cb723ed84 100644
--- a/stepmania/src/WheelBase.cpp
+++ b/stepmania/src/WheelBase.cpp
@@ -428,7 +428,7 @@ void WheelBase::TweenOnScreen( bool bChangingSort )
 		m_ScrollBar.BeginTweening( 0.2f );	// sleep
 	else
 		m_ScrollBar.BeginTweening( 0.7f );	// sleep
-	m_ScrollBar.BeginTweening( 0.2f , Actor::TWEEN_ACCELERATE );
+	m_ScrollBar.BeginTweening( 0.2f , TWEEN_ACCELERATE );
 	m_ScrollBar.AddX( -30 );
 
 	TweenOnScreenUpdateItems( bChangingSort );
@@ -477,7 +477,7 @@ void WheelBase::TweenOffScreen( bool bChangingSort )
 	}
 
 	m_ScrollBar.BeginTweening( 0 );
-	m_ScrollBar.BeginTweening( 0.2f, Actor::TWEEN_ACCELERATE );
+	m_ScrollBar.BeginTweening( 0.2f, TWEEN_ACCELERATE );
 	m_ScrollBar.SetX( SCROLL_BAR_X+30 );	
 
 	TweenOffScreenUpdateItems( bChangingSort );