diff --git a/hlslang.vcxproj b/hlslang.vcxproj
index 86b12e8..bd54b7d 100644
--- a/hlslang.vcxproj
+++ b/hlslang.vcxproj
@@ -281,6 +281,8 @@ rename gen_hlslang.cpp Gen_hlslang.cpp
       <Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(RootDir)%(Directory)..\..\tools\flex.exe %(FullPath)
 if EXIST %(RootDir)%(Directory)gen_hlslang.cpp del %(RootDir)%(Directory)gen_hlslang.cpp
 move gen_hlslang.cpp %(RootDir)%(Directory)gen_hlslang.cpp
+cd %(RootDir)%(Directory)
+rename gen_hlslang.cpp Gen_hlslang.cpp
 </Command>
       <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">hlslang_tab.h;%(AdditionalInputs)</AdditionalInputs>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(RootDir)%(Directory)Gen_hlslang.cpp;%(Outputs)</Outputs>
@@ -288,6 +290,8 @@ move gen_hlslang.cpp %(RootDir)%(Directory)gen_hlslang.cpp
       <Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(RootDir)%(Directory)..\..\tools\flex.exe %(FullPath)
 if EXIST %(RootDir)%(Directory)gen_hlslang.cpp del %(RootDir)%(Directory)gen_hlslang.cpp
 move gen_hlslang.cpp %(RootDir)%(Directory)gen_hlslang.cpp
+cd %(RootDir)%(Directory)
+rename gen_hlslang.cpp Gen_hlslang.cpp
 </Command>
       <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">hlslang_tab.h;%(AdditionalInputs)</AdditionalInputs>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(RootDir)%(Directory)Gen_hlslang.cpp;%(Outputs)</Outputs>
@@ -304,12 +308,13 @@ rename %(RootDir)%(Directory)%(Filename).tab.h %(Filename)_tab.h
 </Command>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(RootDir)%(Directory)Gen_%(Filename)_tab.cpp;%(Outputs)</Outputs>
       <Message Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Executing Bison on %(FullPath)</Message>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">SET BISON_SIMPLE=%(RootDir)%(Directory)..\..\tools\bison.simple
-SET BISON_HAIRY=%(RootDir)%(Directory)..\..\tools\bison.simple
-cd %(RootDir)%(Directory)
-%(RootDir)%(Directory)..\..\tools\bison.exe -d -t -v %(Filename).y
-if EXIST %(RootDir)%(Directory)Gen_%(Filename)_tab.cpp del %(RootDir)%(Directory)Gen_%(Filename)_tab.cpp
-rename %(RootDir)%(Directory)%(Filename)_tab.c Gen_%(Filename)_tab.cpp
+      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">cd %(RootDir)%(Directory)
+set PATH=%PATH%;"%(RootDir)%(Directory)..\..\tools\bin\"
+%(RootDir)%(Directory)..\..\tools\bin\bison.exe -d -t -v %(Filename).y
+del /s /q %(RootDir)%(Directory)Gen_%(Filename)_tab.cpp
+del /s /q %(RootDir)%(Directory)%(Filename)_tab.h
+rename %(RootDir)%(Directory)%(Filename).tab.c Gen_%(Filename)_tab.cpp
+rename %(RootDir)%(Directory)%(Filename).tab.h %(Filename)_tab.h
 </Command>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(RootDir)%(Directory)Gen_%(Filename)_tab.cpp;%(Outputs)</Outputs>
       <Message Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Executing Bison on %(FullPath)</Message>
@@ -323,12 +328,13 @@ rename %(RootDir)%(Directory)%(Filename).tab.h %(Filename)_tab.h
 </Command>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(RootDir)%(Directory)Gen_%(Filename)_tab.cpp;%(Outputs)</Outputs>
       <Message Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Executing Bison on %(FullPath)</Message>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">SET BISON_SIMPLE=%(RootDir)%(Directory)..\..\tools\bison.simple
-SET BISON_HAIRY=%(RootDir)%(Directory)..\..\tools\bison.simple
-cd %(RootDir)%(Directory)
-%(RootDir)%(Directory)..\..\tools\bison.exe -d -t -v %(Filename).y
-if EXIST %(RootDir)%(Directory)Gen_%(Filename)_tab.cpp del %(RootDir)%(Directory)Gen_%(Filename)_tab.cpp
-rename %(RootDir)%(Directory)%(Filename)_tab.c Gen_%(Filename)_tab.cpp
+      <Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">cd %(RootDir)%(Directory)
+set PATH=%PATH%;"%(RootDir)%(Directory)..\..\tools\bin\"
+%(RootDir)%(Directory)..\..\tools\bin\bison.exe -d -t -v %(Filename).y
+del /s /q %(RootDir)%(Directory)Gen_%(Filename)_tab.cpp
+del /s /q %(RootDir)%(Directory)%(Filename)_tab.h
+rename %(RootDir)%(Directory)%(Filename).tab.c Gen_%(Filename)_tab.cpp
+rename %(RootDir)%(Directory)%(Filename).tab.h %(Filename)_tab.h
 </Command>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(RootDir)%(Directory)Gen_%(Filename)_tab.cpp;%(Outputs)</Outputs>
     </CustomBuild>