diff --git a/stepmania/src/LuaHelpers.cpp b/stepmania/src/LuaManager.cpp
similarity index 100%
rename from stepmania/src/LuaHelpers.cpp
rename to stepmania/src/LuaManager.cpp
diff --git a/stepmania/src/LuaHelpers.h b/stepmania/src/LuaManager.h
similarity index 100%
rename from stepmania/src/LuaHelpers.h
rename to stepmania/src/LuaManager.h
diff --git a/stepmania/src/Makefile.am b/stepmania/src/Makefile.am
index c9feff9d65..e971bfb077 100644
--- a/stepmania/src/Makefile.am
+++ b/stepmania/src/Makefile.am
@@ -65,7 +65,7 @@ CourseUtil.cpp CourseUtil.h DateTime.cpp DateTime.h Font.cpp Font.h FontCharAlia
 FontCharmaps.cpp FontCharmaps.h Game.cpp Game.h GameCommand.cpp GameCommand.h \
 GameConstantsAndTypes.cpp GameConstantsAndTypes.h \
 GameInput.cpp GameInput.h Grade.cpp Grade.h HighScore.cpp HighScore.h Inventory.cpp Inventory.h LuaFunctions.h \
-LuaHelpers.cpp LuaHelpers.h LyricsLoader.cpp LyricsLoader.h MenuInput.h \
+LyricsLoader.cpp LyricsLoader.h MenuInput.h \
 NoteData.cpp NoteData.h NoteDataUtil.cpp NoteDataUtil.h NoteDataWithScoring.cpp NoteDataWithScoring.h \
 NoteFieldPositioning.cpp NoteFieldPositioning.h NoteTypes.cpp NoteTypes.h NotesLoader.cpp NotesLoader.h \
 NotesLoaderBMS.cpp NotesLoaderBMS.h NotesLoaderDWI.cpp NotesLoaderDWI.h NotesLoaderKSF.cpp NotesLoaderKSF.h \
@@ -268,7 +268,8 @@ GlobalSingletons = \
 AnnouncerManager.cpp AnnouncerManager.h Bookkeeper.cpp Bookkeeper.h CryptManager.cpp CryptManager.h \
 FontManager.cpp FontManager.h GameSoundManager.cpp GameSoundManager.h GameManager.cpp GameManager.h \
 GameState.cpp GameState.h InputFilter.cpp InputFilter.h \
-InputMapper.cpp InputMapper.h InputQueue.cpp InputQueue.h LightsManager.cpp LightsManager.h \
+InputMapper.cpp InputMapper.h InputQueue.cpp InputQueue.h \
+LuaManager.cpp LuaManager.h LightsManager.cpp LightsManager.h \
 MemoryCardManager.cpp MemoryCardManager.h NetworkSyncManager.cpp NetworkSyncManager.h \
 NetworkSyncServer.cpp NetworkSyncServer.h NoteSkinManager.cpp NoteSkinManager.h \
 PrefsManager.cpp PrefsManager.h ProfileManager.cpp ProfileManager.h ScreenManager.cpp \
diff --git a/stepmania/src/StepMania.dsp b/stepmania/src/StepMania.dsp
index 6d42e681bd..0d532f3745 100644
--- a/stepmania/src/StepMania.dsp
+++ b/stepmania/src/StepMania.dsp
@@ -62,7 +62,7 @@ IntDir=.\../Debug6
 TargetDir=\stepmania\stepmania\Program
 TargetName=StepMania-debug
 SOURCE="$(InputPath)"
-PreLink_Cmds=archutils\Win32\verinc                                                                                                                                                             	cl                     /Zl                     /nologo                     /c                     verstub.cpp                     /Fo$(IntDir)\ 
+PreLink_Cmds=archutils\Win32\verinc                                                                                                                                                               	cl                       /Zl                       /nologo                       /c                       verstub.cpp                       /Fo$(IntDir)\ 
 PostBuild_Cmds=archutils\Win32\mapconv $(IntDir)\$(TargetName).map $(TargetDir)\StepMania.vdi
 # End Special Build Tool
 
@@ -99,7 +99,7 @@ IntDir=.\../Release6
 TargetDir=\stepmania\stepmania\Program
 TargetName=StepMania
 SOURCE="$(InputPath)"
-PreLink_Cmds=archutils\Win32\verinc                                                                                                                                                              	cl                                                                                                                       /Zl                                                                                                                       /nologo                                                                                                                       /c                                                                                                                       verstub.cpp                                                                                                                       /Fo$(IntDir)\ 
+PreLink_Cmds=archutils\Win32\verinc                                                                                                                                                                	cl                                                                                                                         /Zl                                                                                                                         /nologo                                                                                                                         /c                                                                                                                         verstub.cpp                                                                                                                         /Fo$(IntDir)\ 
 PostBuild_Cmds=archutils\Win32\mapconv $(IntDir)\$(TargetName).map $(TargetDir)\StepMania.vdi
 # End Special Build Tool
 
@@ -816,18 +816,14 @@ SOURCE=.\Inventory.h
 # End Source File
 # Begin Source File
 
+SOURCE=.\LuaBinding.h
+# End Source File
+# Begin Source File
+
 SOURCE=.\LuaFunctions.h
 # End Source File
 # Begin Source File
 
-SOURCE=.\LuaHelpers.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\LuaHelpers.h
-# End Source File
-# Begin Source File
-
 SOURCE=.\LyricsLoader.cpp
 # End Source File
 # Begin Source File
@@ -2996,6 +2992,14 @@ SOURCE=.\LightsManager.h
 # End Source File
 # Begin Source File
 
+SOURCE=.\LuaManager.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\LuaManager.h
+# End Source File
+# Begin Source File
+
 SOURCE=.\MemoryCardManager.cpp
 # End Source File
 # Begin Source File
diff --git a/stepmania/src/StepMania.vcproj b/stepmania/src/StepMania.vcproj
index b8afbf219e..9a5ae586e5 100644
--- a/stepmania/src/StepMania.vcproj
+++ b/stepmania/src/StepMania.vcproj
@@ -707,15 +707,12 @@ cl /Zl /nologo /c verstub.cpp /Fo"$(IntDir)"\
 			<File
 				RelativePath="Inventory.h">
 			</File>
+			<File
+				RelativePath="LuaBinding.h">
+			</File>
 			<File
 				RelativePath="LuaFunctions.h">
 			</File>
-			<File
-				RelativePath="LuaHelpers.cpp">
-			</File>
-			<File
-				RelativePath="LuaHelpers.h">
-			</File>
 			<File
 				RelativePath="LyricsLoader.cpp">
 			</File>
@@ -2331,6 +2328,12 @@ cl /Zl /nologo /c verstub.cpp /Fo&quot;$(IntDir)&quot;\
 			<File
 				RelativePath="LightsManager.h">
 			</File>
+			<File
+				RelativePath="LuaManager.cpp">
+			</File>
+			<File
+				RelativePath="LuaManager.h">
+			</File>
 			<File
 				RelativePath="MemoryCardManager.cpp">
 			</File>