diff --git a/stepmania/src/ScreenDebugOverlay.cpp b/stepmania/src/ScreenDebugOverlay.cpp
index 32783fd438..58e7db03f5 100644
--- a/stepmania/src/ScreenDebugOverlay.cpp
+++ b/stepmania/src/ScreenDebugOverlay.cpp
@@ -267,7 +267,7 @@ void ScreenDebugOverlay::UpdateText()
 		case DebugLine_FillMachineStats:	s2="";					break;
 		case DebugLine_SendNotesEnded:		s2="";					break;
 		case DebugLine_Volume:				s2=bOn ? "on":"off";	break;
-		case DebugLine_ReloadCurrentScreen:	s2=SCREENMAN ? SCREENMAN->GetTopScreen()->m_sName:"";	break;
+		case DebugLine_ReloadCurrentScreen:	s2=SCREENMAN ? SCREENMAN->GetTopScreen()->GetName():"";	break;
 		case DebugLine_ReloadTheme:			s2="";					break;
 		case DebugLine_WriteProfiles:		s2="";					break;
 		case DebugLine_WritePreferences:	s2="";					break;
@@ -415,7 +415,7 @@ bool ScreenDebugOverlay::OverlayInput( const DeviceInput& DeviceI, const InputEv
 			case DebugLine_ReloadCurrentScreen:
 				SOUND->StopMusic();
 				ResetGame();
-				SCREENMAN->SetNewScreen( SCREENMAN->GetTopScreen()->m_sName );
+				SCREENMAN->SetNewScreen( SCREENMAN->GetTopScreen()->GetName() );
 				break;
 			case DebugLine_ReloadTheme:
 				THEME->ReloadMetrics();
diff --git a/stepmania/src/ScreenManager.cpp b/stepmania/src/ScreenManager.cpp
index 7de88a7157..1e6b2c2357 100644
--- a/stepmania/src/ScreenManager.cpp
+++ b/stepmania/src/ScreenManager.cpp
@@ -351,7 +351,7 @@ void ScreenManager::PrepareScreen( const CString &sScreenName )
 	for( int i = (int)m_vPreparedScreens.size()-1; i>=0; i-- )
 	{
 		Screen *&pScreen = m_vPreparedScreens[i];
-		if( pScreen->m_sName == sScreenName )
+		if( pScreen->GetName() == sScreenName )
 			return;
 	}
 
@@ -370,7 +370,7 @@ void ScreenManager::PrepareScreen( const CString &sScreenName )
 		Actor *pNewBGA = NULL;
 		FOREACH( Actor*, m_vPreparedBackgrounds, a )
 		{
-			if( (*a)->m_sName == sNewBGA )
+			if( (*a)->GetName() == sNewBGA )
 			{
 				pNewBGA = *a;
 				break;
@@ -486,7 +486,7 @@ void ScreenManager::LoadDelayedScreen()
 	Screen* pNewScreen = NULL;
 	FOREACH( Screen*, m_vPreparedScreens, s )
 	{
-		if( (*s)->m_sName == sScreenName )
+		if( (*s)->GetName() == sScreenName )
 		{
 			pNewScreen = *s;
 			m_vPreparedScreens.erase( s );
@@ -521,7 +521,7 @@ void ScreenManager::LoadDelayedScreen()
 		{
 			FOREACH( Actor*, m_vPreparedBackgrounds, a )
 			{
-				if( (*a)->m_sName == sNewBGA )
+				if( (*a)->GetName() == sNewBGA )
 				{
 					pNewBGA = *a;
 					m_vPreparedBackgrounds.erase( a );
diff --git a/stepmania/src/ScreenNetSelectBase.cpp b/stepmania/src/ScreenNetSelectBase.cpp
index 133ff65162..36a0013d42 100644
--- a/stepmania/src/ScreenNetSelectBase.cpp
+++ b/stepmania/src/ScreenNetSelectBase.cpp
@@ -256,9 +256,9 @@ void ScreenNetSelectBase::UpdateUsers()
 void UtilSetQuadInit( Actor& actor, const CString &sClassName )
 {
 	ActorUtil::SetXYAndOnCommand( actor, sClassName );
-	actor.SetDiffuse( THEME->GetMetricC( sClassName, actor.m_sName + "Color" ) );
-	actor.SetWidth( THEME->GetMetricF( sClassName, actor.m_sName + "Width" ) );
-	actor.SetHeight( THEME->GetMetricF( sClassName, actor.m_sName + "Height" ) );
+	actor.SetDiffuse( THEME->GetMetricC( sClassName, actor.GetName() + "Color" ) );
+	actor.SetWidth( THEME->GetMetricF( sClassName, actor.GetName() + "Width" ) );
+	actor.SetHeight( THEME->GetMetricF( sClassName, actor.GetName() + "Height" ) );
 }
 
 #endif