diff --git a/stepmania/src/DynamicActorScroller.h b/stepmania/src/DynamicActorScroller.h
index 4f8c5f7fea..2c181712b2 100644
--- a/stepmania/src/DynamicActorScroller.h
+++ b/stepmania/src/DynamicActorScroller.h
@@ -16,7 +16,7 @@ protected:
 	virtual void ShiftSubActors( int iDist );
 	virtual void ConfigureActor( Actor *pActor, int iItem );
 
-	LuaExpression m_LoadFunction;
+	LuaReference m_LoadFunction;
 };
 
 class DynamicActorScrollerAutoDeleteChildren: public DynamicActorScroller 
diff --git a/stepmania/src/GameCommand.h b/stepmania/src/GameCommand.h
index 1cdfdebe54..1cc028a199 100644
--- a/stepmania/src/GameCommand.h
+++ b/stepmania/src/GameCommand.h
@@ -63,7 +63,7 @@ public:
 	RString		m_sPreferredModifiers;
 	RString		m_sStageModifiers;
 	RString		m_sScreen;
-	LuaExpression	m_LuaFunction;
+	LuaReference	m_LuaFunction;
 	Song*		m_pSong;
 	Steps*		m_pSteps;
 	Course*		m_pCourse;
diff --git a/stepmania/src/LuaExpressionTransform.cpp b/stepmania/src/LuaExpressionTransform.cpp
index 477db765cb..66bd194df1 100644
--- a/stepmania/src/LuaExpressionTransform.cpp
+++ b/stepmania/src/LuaExpressionTransform.cpp
@@ -6,7 +6,7 @@
 
 LuaExpressionTransform::LuaExpressionTransform()
 {
-	m_pexprTransformFunction = new LuaExpression;
+	m_pexprTransformFunction = new LuaReference;
 	m_iNumSubdivisions = 1;
 }
 
diff --git a/stepmania/src/LuaExpressionTransform.h b/stepmania/src/LuaExpressionTransform.h
index 9abffb310f..149015d36c 100644
--- a/stepmania/src/LuaExpressionTransform.h
+++ b/stepmania/src/LuaExpressionTransform.h
@@ -4,7 +4,7 @@
 #define LuaExpressionTransform_H
 
 #include "Actor.h"
-class LuaExpression;
+class LuaReference;
 #include <map>
 
 class LuaExpressionTransform
@@ -22,7 +22,7 @@ public:
 
 protected:
 
-	LuaExpression *m_pexprTransformFunction;	// params: self,offset,itemIndex,numItems
+	LuaReference *m_pexprTransformFunction;	// params: self,offset,itemIndex,numItems
 	int m_iNumSubdivisions;	// 1 == one evaluation per position
 	struct PositionOffsetAndItemIndex
 	{
diff --git a/stepmania/src/MenuTimer.h b/stepmania/src/MenuTimer.h
index 5475112710..f2182098b4 100644
--- a/stepmania/src/MenuTimer.h
+++ b/stepmania/src/MenuTimer.h
@@ -40,7 +40,7 @@ protected:
 
 	BitmapText		m_text[NUM_MENU_TIMER_TEXTS];
 
-	LuaExpression	m_exprFormatText[NUM_MENU_TIMER_TEXTS];
+	LuaReference	m_exprFormatText[NUM_MENU_TIMER_TEXTS];
 
 	RageSound	m_soundBeep;
 
diff --git a/stepmania/src/OptionRowHandler.cpp b/stepmania/src/OptionRowHandler.cpp
index 3133f125d7..c4e8043628 100644
--- a/stepmania/src/OptionRowHandler.cpp
+++ b/stepmania/src/OptionRowHandler.cpp
@@ -726,10 +726,10 @@ class OptionRowHandlerListSongsInCurrentSongGroup: public OptionRowHandlerList
 class OptionRowHandlerLua : public OptionRowHandler
 {
 public:
-	LuaExpression *m_pLuaTable;
+	LuaReference *m_pLuaTable;
 	LuaReference m_EnabledForPlayersFunc;
 
-	OptionRowHandlerLua() { m_pLuaTable = new LuaExpression; Init(); }
+	OptionRowHandlerLua() { m_pLuaTable = new LuaReference; Init(); }
 	virtual ~OptionRowHandlerLua() { delete m_pLuaTable; }
 	void Init()
 	{
diff --git a/stepmania/src/PercentageDisplay.h b/stepmania/src/PercentageDisplay.h
index 3f4a22ee61..c68ed65ec8 100644
--- a/stepmania/src/PercentageDisplay.h
+++ b/stepmania/src/PercentageDisplay.h
@@ -42,7 +42,7 @@ private:
 	BitmapText	m_textPercent;
 	BitmapText	m_textPercentRemainder;
 
-	LuaExpression m_Format;
+	LuaReference m_Format;
 };
 
 #endif
diff --git a/stepmania/src/Player.cpp b/stepmania/src/Player.cpp
index f95c6e7fed..b27996fb57 100644
--- a/stepmania/src/Player.cpp
+++ b/stepmania/src/Player.cpp
@@ -151,7 +151,7 @@ void Player::Init(
 		//
 		// Init judgment positions
 		//
-		LuaExpression expr;
+		LuaReference expr;
 		expr.SetFromExpression( THEME->GetMetric(sType,"JudgmentTransformCommandFunction") );
 
 		bool bPlayerUsingBothSides = GAMESTATE->GetCurrentStyle()->m_StyleType==ONE_PLAYER_TWO_SIDES;
diff --git a/stepmania/src/ThemeManager.cpp b/stepmania/src/ThemeManager.cpp
index 57a4b2fdc9..99db560186 100644
--- a/stepmania/src/ThemeManager.cpp
+++ b/stepmania/src/ThemeManager.cpp
@@ -1001,7 +1001,7 @@ void ThemeManager::GetMetric( const RString &sClassName, const RString &sValueNa
 }
 #endif
 
-void ThemeManager::GetMetric( const RString &sClassName, const RString &sValueName, LuaExpression &valueOut )
+void ThemeManager::GetMetric( const RString &sClassName, const RString &sValueName, LuaReference &valueOut )
 {
 	RString sValue = GetMetricRaw( g_pLoadedThemeData->iniMetrics, sClassName, sValueName );
 	valueOut.SetFromExpression( "function(self) " + sValue + "end" );
diff --git a/stepmania/src/ThemeManager.h b/stepmania/src/ThemeManager.h
index e9773e48f5..59edc7bec7 100644
--- a/stepmania/src/ThemeManager.h
+++ b/stepmania/src/ThemeManager.h
@@ -85,7 +85,7 @@ public:
 	void	GetMetric( const RString &sClassName, const RString &sValueName, float &valueOut )			{ valueOut = GetMetricF( sClassName, sValueName ); }
 	void	GetMetric( const RString &sClassName, const RString &sValueName, bool &valueOut )			{ valueOut = GetMetricB( sClassName, sValueName ); }
 	void	GetMetric( const RString &sClassName, const RString &sValueName, RageColor &valueOut )		{ valueOut = GetMetricC( sClassName, sValueName ); }
-	void	GetMetric( const RString &sClassName, const RString &sValueName, LuaExpression &valueOut );
+	void	GetMetric( const RString &sClassName, const RString &sValueName, LuaReference &valueOut );
 #if !defined(SMPACKAGE)
 	void	GetMetric( const RString &sClassName, const RString &sValueName, apActorCommands &valueOut );
 #endif