diff --git a/stepmania/src/Actor.cpp b/stepmania/src/Actor.cpp
index df3fde9dc5..089a2ffa94 100644
--- a/stepmania/src/Actor.cpp
+++ b/stepmania/src/Actor.cpp
@@ -198,7 +198,7 @@ void Actor::LoadFromNode( const CString& sDir, const XNode* pNode )
 	{
         if( pChild->m_sName == "Input" )
         {
-			/* Parameters are set as globals by ActorUtil::LoadFromActorFile.
+			/* Parameters are set as globals by ActorUtil::LoadFromNode.
 			 * If parameters are specified here, save them to the actor.  Accessing
 			 * parameters as globals directly is deprecated. */
 			CString sName;
diff --git a/stepmania/src/ActorFrame.cpp b/stepmania/src/ActorFrame.cpp
index b484ceab81..f2763f8a6b 100644
--- a/stepmania/src/ActorFrame.cpp
+++ b/stepmania/src/ActorFrame.cpp
@@ -104,7 +104,7 @@ void ActorFrame::LoadChildrenFromNode( const CString& sDir, const XNode* pNode )
 	{
 		FOREACH_CONST_Child( pChildren, pChild )
 		{
-			Actor* pChildActor = ActorUtil::LoadFromActorFile( sDir, pChild );
+			Actor* pChildActor = ActorUtil::LoadFromNode( sDir, pChild );
 			if( pChildActor )
 				AddChild( pChildActor );
 		}
diff --git a/stepmania/src/ActorUtil.cpp b/stepmania/src/ActorUtil.cpp
index 4a859772de..6be2545398 100644
--- a/stepmania/src/ActorUtil.cpp
+++ b/stepmania/src/ActorUtil.cpp
@@ -105,7 +105,7 @@ retry:
 }
 
 
-Actor* ActorUtil::LoadFromActorFile( const CString& sDir, const XNode* pNode )
+Actor* ActorUtil::LoadFromNode( const CString& sDir, const XNode* pNode )
 {
 	ASSERT( pNode );
 
@@ -266,7 +266,7 @@ Actor* ActorUtil::MakeActor( const CString &sPath_ )
 				return new Actor;
 			}
 			CString sDir = Dirname( sPath );
-			return LoadFromActorFile( sDir, &xml );
+			return ActorUtil::LoadFromNode( sDir, &xml );
 		}
 	case FT_Bitmap:
 	case FT_Movie:
diff --git a/stepmania/src/ActorUtil.h b/stepmania/src/ActorUtil.h
index e688a22bef..7b43914e50 100644
--- a/stepmania/src/ActorUtil.h
+++ b/stepmania/src/ActorUtil.h
@@ -66,7 +66,7 @@ namespace ActorUtil
 	inline void SetXYAndOnCommand( Actor* pActor, const CString &sType, Actor* pParent = NULL ) { if(pActor) SetXYAndOnCommand( *pActor, sType, pParent ); }
 
 	// Return a Sprite, BitmapText, or Model depending on the file type
-	Actor* LoadFromActorFile( const CString& sAniDir, const XNode* pNode );
+	Actor* LoadFromNode( const CString& sAniDir, const XNode* pNode );
 	Actor* MakeActor( const CString &sPath );
 
 	void ResolvePath( CString &sPath, const CString &sName );
diff --git a/stepmania/src/AutoActor.cpp b/stepmania/src/AutoActor.cpp
index f1a0946023..1cdafc349e 100644
--- a/stepmania/src/AutoActor.cpp
+++ b/stepmania/src/AutoActor.cpp
@@ -41,7 +41,7 @@ void AutoActor::LoadFromNode( const CString &sDir, const XNode* pNode )
 {
 	Unload();
 
-	m_pActor = ActorUtil::LoadFromActorFile( sDir, pNode );
+	m_pActor = ActorUtil::LoadFromNode( sDir, pNode );
 }
 
 void AutoActor::LoadAndSetName( const CString &sScreenName, const CString &sActorName )
diff --git a/stepmania/src/BGAnimationLayer.cpp b/stepmania/src/BGAnimationLayer.cpp
index 3bde91fed2..2d795b9494 100644
--- a/stepmania/src/BGAnimationLayer.cpp
+++ b/stepmania/src/BGAnimationLayer.cpp
@@ -462,7 +462,7 @@ void BGAnimationLayer::LoadFromNode( const CString& sDir, const XNode* pNode )
 	{
 	case TYPE_SPRITE:
 		{
-			Actor* pActor = ActorUtil::LoadFromActorFile( sAniDir, pNode );
+			Actor* pActor = ActorUtil::LoadFromNode( sAniDir, pNode );
 			this->AddChild( pActor );
 			if( bStretch )
 				pActor->StretchTo( FullScreenRectF );