diff --git a/stepmania/src/BGAnimation.cpp b/stepmania/src/BGAnimation.cpp
index cf123cfa0d..e4c1724ef5 100644
--- a/stepmania/src/BGAnimation.cpp
+++ b/stepmania/src/BGAnimation.cpp
@@ -36,8 +36,8 @@ void BGAnimation::AddLayersFromAniDir( const RString &_sAniDir, const XNode *pNo
 		vector<RString> vsLayerNames;
 		FOREACH_CONST_Child( pNode, pLayer )
 		{
-			if( strncmp(pLayer->m_sName, "Layer", 5) == 0 )
-				vsLayerNames.push_back( pLayer->m_sName );
+			if( strncmp(pLayer->GetName(), "Layer", 5) == 0 )
+				vsLayerNames.push_back( pLayer->GetName() );
 		}
 
 		sort( vsLayerNames.begin(), vsLayerNames.end(), CompareLayerNames );
diff --git a/stepmania/src/ExportStrings.cpp b/stepmania/src/ExportStrings.cpp
index fa71cca6de..7207528e2f 100644
--- a/stepmania/src/ExportStrings.cpp
+++ b/stepmania/src/ExportStrings.cpp
@@ -53,10 +53,10 @@ void ExportStrings::LuaInformation()
 	pNode->AppendAttr( "xsi:schemaLocation", "http://www.stepmania.com Lua.xsd" );
 
 	XNode *pVersionNode = pNode->AppendChild( "Version" );
-	pVersionNode->m_sValue = PRODUCT_ID_VER;
+	pVersionNode->SetValue( "foo" );
 
 	XNode *pDateNode = pNode->AppendChild( "Date" );
-	pDateNode->m_sValue = DateTime::GetNowDate().GetString();
+	pDateNode->SetValue( DateTime::GetNowDate().GetString() );
 
 	XmlFileUtil::SaveToFile( pNode, "Lua.xml", "Lua.xsl" );
 
diff --git a/stepmania/src/TitleSubstitution.cpp b/stepmania/src/TitleSubstitution.cpp
index 02d7e791c8..7fba5d2066 100644
--- a/stepmania/src/TitleSubstitution.cpp
+++ b/stepmania/src/TitleSubstitution.cpp
@@ -43,7 +43,7 @@ bool TitleTrans::Matches( const TitleFields &from, TitleFields &to )
 
 void TitleTrans::LoadFromNode( const XNode* pNode )
 {
-	ASSERT( pNode->m_sName == "Translation" );
+	ASSERT( pNode->GetName() == "Translation" );
 
 	FOREACH_CONST_Attr( pNode, attr )
 	{
@@ -148,7 +148,7 @@ void TitleSubst::Load(const RString &filename, const RString &section)
 		return;
 	FOREACH_Child( pGroup, child )
 	{
-		if( child->m_sName != "Translation" )
+		if( child->GetName() != "Translation" )
 			continue;
 
 		TitleTrans tr;
diff --git a/stepmania/src/TrailUtil.cpp b/stepmania/src/TrailUtil.cpp
index 0d3a36ec9f..0602f00d21 100644
--- a/stepmania/src/TrailUtil.cpp
+++ b/stepmania/src/TrailUtil.cpp
@@ -46,7 +46,7 @@ XNode* TrailID::CreateNode() const
 
 void TrailID::LoadFromNode( const XNode* pNode ) 
 {
-	ASSERT( pNode->m_sName == "Trail" );
+	ASSERT( pNode->GetName() == "Trail" );
 
 	RString sTemp;