diff --git a/.travis.yml b/.travis.yml
index f98d874f..a4d48fb8 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -33,7 +33,7 @@ install:
 script: |
   if [ "$TRAVIS_OS_NAME" = "linux" ]; then PREMAKE=build/premake5-linux-64; else PREMAKE=build/premake5-osx; fi &&
   if [ "$TRAVIS_OS_NAME" = "linux" ]; then BUILD_CONF=release_x64; else BUILD_CONF=release_x32; fi &&
-  $PREMAKE --file=build/premake4.lua gmake &&
+  $PREMAKE --file=build/premake5.lua gmake &&
   config=$BUILD_CONF make -C build/gmake/ &&
   BUILD_DIR=`ls build/gmake/lib` &&
   mkdir -p "$PWD"/build/gmake/lib/lib/"$BUILD_DIR" &&
diff --git a/appveyor.yml b/appveyor.yml
index b1bff223..58e8f374 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -48,7 +48,7 @@ install:
   - build\premake5.exe --file=build\scripts\LLVM.lua download_llvm
 
 build_script:
-  - build\premake5.exe --file=build\premake4.lua %VS_VERSION%
+  - build\premake5.exe --file=build\premake5.lua %VS_VERSION%
   - msbuild %BUILD_PATH%\CppSharp.sln /logger:"C:\Program Files\AppVeyor\BuildAgent\Appveyor.MSBuildLogger.dll" /verbosity:minimal
 
 #---------------------------------#
diff --git a/build/GenerateMake.bat b/build/GenerateMake.bat
index a7d760f0..62473a69 100644
--- a/build/GenerateMake.bat
+++ b/build/GenerateMake.bat
@@ -1,5 +1,5 @@
 @echo off
 
-premake5 --file=premake4.lua gmake
+premake5 --file=premake5.lua gmake
 
 pause
\ No newline at end of file
diff --git a/build/GenerateProjects.bat b/build/GenerateProjects.bat
index 93daf595..99a73ce5 100644
--- a/build/GenerateProjects.bat
+++ b/build/GenerateProjects.bat
@@ -20,23 +20,23 @@ if "%C%"=="1" goto vs2012
 if "%C%"=="0" goto clean
 
 :clean
-"premake5" --file=premake4.lua clean
+"premake5" --file=premake5.lua clean
 goto quit
 
 :vs2012
-"premake5" --file=premake4.lua vs2012
+"premake5" --file=premake5.lua vs2012
 goto quit
 
 :vs2013
-"premake5" --file=premake4.lua vs2013
+"premake5" --file=premake5.lua vs2013
 goto quit
 
 :vs2015
-"premake5" --file=premake4.lua vs2015
+"premake5" --file=premake5.lua vs2015
 goto quit
 
 :gmake
-"premake5" --file=premake4.lua gmake
+"premake5" --file=premake5.lua gmake
 goto quit
 
 :quit
diff --git a/build/premake4.lua b/build/premake5.lua
similarity index 82%
rename from build/premake4.lua
rename to build/premake5.lua
index f002bea9..8eb113d2 100644
--- a/build/premake4.lua
+++ b/build/premake5.lua
@@ -50,8 +50,8 @@ solution "CppSharp"
       
   group "Libraries"
     include (srcdir .. "/Core")
-    include (srcdir .. "/AST/AST.lua")
-    include (srcdir .. "/Generator/Generator.lua")
-    include (srcdir .. "/Generator.Tests/Generator.Tests.lua")
-    include (srcdir .. "/Runtime/Runtime.lua")
+    include (srcdir .. "/AST")
+    include (srcdir .. "/Generator")
+    include (srcdir .. "/Generator.Tests")
+    include (srcdir .. "/Runtime")
     include (srcdir .. "/CppParser")
diff --git a/src/AST/AST.lua b/src/AST/premake5.lua
similarity index 100%
rename from src/AST/AST.lua
rename to src/AST/premake5.lua
diff --git a/src/Core/premake4.lua b/src/Core/premake4.lua
index ed0a1d93..f3a12f72 100644
--- a/src/Core/premake4.lua
+++ b/src/Core/premake4.lua
@@ -1,3 +1,5 @@
+include("../../build/Parser.lua")
+
 project "CppSharp"
 
   kind "SharedLib"
diff --git a/src/Generator.Tests/Generator.Tests.lua b/src/Generator.Tests/premake5.lua
similarity index 100%
rename from src/Generator.Tests/Generator.Tests.lua
rename to src/Generator.Tests/premake5.lua
diff --git a/src/Generator/Generator.lua b/src/Generator/premake5.lua
similarity index 100%
rename from src/Generator/Generator.lua
rename to src/Generator/premake5.lua
diff --git a/src/Runtime/Runtime.lua b/src/Runtime/premake5.lua
similarity index 100%
rename from src/Runtime/Runtime.lua
rename to src/Runtime/premake5.lua