diff --git a/mk/windoze/Glest.suo b/mk/windoze/Glest.suo
index 5538afc7e..74ad00338 100644
Binary files a/mk/windoze/Glest.suo and b/mk/windoze/Glest.suo differ
diff --git a/mk/windoze/Installer/MegaGlestInstaller.nsi b/mk/windoze/Installer/MegaGlestInstaller.nsi
index c14213ffa..e630cd95a 100644
--- a/mk/windoze/Installer/MegaGlestInstaller.nsi
+++ b/mk/windoze/Installer/MegaGlestInstaller.nsi
@@ -3,8 +3,8 @@
 
 !define APNAME MegaGlest
 !define APNAME_OLD Mega-Glest
-!define APVER_OLD 3.4.0
-!define APVER 3.5.0
+!define APVER_OLD 3.5.0
+!define APVER 3.5.1
 
 Name "${APNAME} ${APVER}"
 SetCompressor /FINAL /SOLID lzma
@@ -23,12 +23,12 @@ RequestExecutionLevel none
 
 PageEx license
        LicenseText "Megaglest License"
-       LicenseData "..\..\..\data\glest_game\docs\LICENSE"
+       LicenseData "..\..\..\data\glest_game\docs\README.data-license.txt"
 PageExEnd
 
 PageEx license
        LicenseText "Megaglest README"
-       LicenseData "..\..\..\data\glest_game\docs\README"
+       LicenseData "..\..\..\docs\README.txt"
 PageExEnd
 
 ;--------------------------------
@@ -58,8 +58,7 @@ Page instfiles
 UninstPage uninstConfirm
 UninstPage instfiles
 
-Function MUIGUIInit
-
+Function myGUIInit
   SetOutPath '$PLUGINSDIR'
   File megaglestinstallscreen.jpg
 
@@ -71,6 +70,25 @@ Function MUIGUIInit
 #  FindWindow $0 "#32770" "" $HWNDPARENT
 #  GetDlgItem $0 $0 1006
 #  SetCtlColors $0 0xDF9437 0xDF9437
+FunctionEnd
+
+Function un.myGUIInit
+  SetOutPath '$PLUGINSDIR'
+  File megaglestinstallscreen.jpg
+
+  FindWindow $0 '_Nb'
+  EBanner::show /NOUNLOAD /FIT=BOTH /HWND=$0 "$PLUGINSDIR\megaglestinstallscreen.jpg"
+FunctionEnd
+  
+Function MUIGUIInit
+
+  Call myGUIInit
+  
+#  SetOutPath '$PLUGINSDIR'
+#  File megaglestinstallscreen.jpg
+
+#  FindWindow $0 '_Nb'
+#  EBanner::show /NOUNLOAD /FIT=BOTH /HWND=$0 "$PLUGINSDIR\megaglestinstallscreen.jpg"
 
 # look for known older versions
 
@@ -98,6 +116,16 @@ Function MUIGUIInit
    StrCpy $R2 "?"
    IfFileExists $EXEDIR\glest_game.exe foundInst doneInit
 
+   IfFileExists $INSTDIR\megaglest.exe 0 +2
+   StrCpy $R0 "$INSTDIR"
+   StrCpy $R2 "?"
+   IfFileExists $INSTDIR\megaglest.exe foundInst
+
+   IfFileExists $EXEDIR\megaglest.exe 0 +2
+   StrCpy $R0 "$EXEDIR"
+   StrCpy $R2 "?"
+   IfFileExists $EXEDIR\megaglest_exe foundInst doneInit
+
 foundInst:
 
   #MessageBox MB_OK|MB_ICONEXCLAMATION "Looking for mods in [$R0\\mydata\\]"
@@ -162,7 +190,7 @@ noLaunchWebsite:
     click Yes to launch the game now$\nor 'No' to exit." IDNO noLaunch
 
     SetOutPath $INSTDIR
-    Exec 'glest_game.exe'
+    Exec 'megaglest.exe'
 
 noLaunch:
 
@@ -178,31 +206,34 @@ Section "${APNAME} (required)"
   ; Set output path to the installation directory.
   SetOutPath $INSTDIR
   ; Put file there
-  File "..\..\..\data\glest_game\glest_game.exe"
-  File "..\..\..\data\glest_game\glest_editor.exe"
-  File "..\..\..\data\glest_game\glest_configurator.exe"
-  File "..\..\..\data\glest_game\g3d_viewer.exe"
+  File "..\..\..\data\glest_game\megaglest.exe"
+  File "..\..\..\data\glest_game\megaglest_editor.exe"
+  File "..\..\..\data\glest_game\megaglest_configurator.exe"
+  File "..\..\..\data\glest_game\megaglest_g3dviewer.exe"
   File "..\..\..\data\glest_game\7z.exe"
   File "..\..\..\data\glest_game\configuration.xml"
   File "..\..\..\data\glest_game\megaglest.ico"
   File "..\..\..\data\glest_game\glest.ini"
   File "..\..\..\data\glest_game\glestkeys.ini"
   File "..\..\..\data\glest_game\servers.ini"
-#  File "..\..\..\data\glest_game\dsound.dll"
   File "..\..\..\data\glest_game\openal32.dll"
   File "..\..\..\data\glest_game\xerces-c_3_0.dll"
   
   SetOutPath "$INSTDIR\blender\"
   File "..\..\..\data\glest_game\xml2g.exe"
   File "..\..\..\data\glest_game\g2xml.exe"
-  File "..\..\..\source\tools\glexemel\g3d_support.py"
-  File "..\..\..\source\tools\glexemel\g3d_xml_exporter.py"
-  File "..\..\..\source\tools\glexemel\g3d.dtd"
-  File "..\..\..\source\tools\glexemel\g3d_logo.png"
+  File /r /x .svn /x mydata "..\..\..\source\tools\glexemel\*.*"
+#  File "..\..\..\data\glest_game\xml2g.exe"
+#  File "..\..\..\data\glest_game\g2xml.exe"
+#  File "..\..\..\source\tools\glexemel\g3d_support.py"
+#  File "..\..\..\source\tools\glexemel\g3d_xml_exporter.py"
+#  File "..\..\..\source\tools\glexemel\g3d.dtd"
+#  File "..\..\..\source\tools\glexemel\g3d_logo.png"
   SetOutPath $INSTDIR
 
   File /r /x .svn /x mydata "..\..\..\data\glest_game\data"
   File /r /x .svn /x mydata "..\..\..\data\glest_game\docs"
+  File /r /x .svn /x mydata "..\..\..\docs"
   File /r /x .svn /x mydata "..\..\..\data\glest_game\maps"
   File /r /x .svn /x mydata "..\..\..\data\glest_game\scenarios"
   File /r /x .svn /x mydata "..\..\..\data\glest_game\techs"
@@ -243,11 +274,11 @@ Section "Start Menu Shortcuts"
 
   CreateDirectory "$SMPROGRAMS\${APNAME}"
   CreateShortCut "$SMPROGRAMS\${APNAME}\Uninstall.lnk" "$INSTDIR\uninstall.exe" "" "$INSTDIR\uninstall.exe" 0
-  CreateShortCut "$SMPROGRAMS\${APNAME}\${APNAME}.lnk" "$INSTDIR\glest_game.exe" "" "$INSTDIR\glest_game.exe" 0 "" "" "${APNAME}"
+  CreateShortCut "$SMPROGRAMS\${APNAME}\${APNAME}.lnk" "$INSTDIR\megaglest.exe" "" "$INSTDIR\megaglest.exe" 0 "" "" "${APNAME}"
 
 ;  CreateShortCut "$SMPROGRAMS\${APNAME} ${APVER}\${APNAME} Configurator.lnk" "$INSTDIR\glest_configurator.exe" "" "$INSTDIR\glest_configurator.exe" 0 "" "" "${APNAME} Config Editor"
-  CreateShortCut "$SMPROGRAMS\${APNAME}\${APNAME} Map Editor.lnk" "$INSTDIR\glest_editor.exe" "" "$INSTDIR\glest_editor.exe" 0 "" "" "${APNAME} Map Editor"
-  CreateShortCut "$SMPROGRAMS\${APNAME}\${APNAME} G3D Viewer.lnk" "$INSTDIR\g3d_viewer.exe" "" "$INSTDIR\g3d_viewer.exe" 0 "" "" "${APNAME} G3D Viewer"
+  CreateShortCut "$SMPROGRAMS\${APNAME}\${APNAME} Map Editor.lnk" "$INSTDIR\megaglest_editor.exe" "" "$INSTDIR\megaglest_editor.exe" 0 "" "" "${APNAME} MegaGlest Map Editor"
+  CreateShortCut "$SMPROGRAMS\${APNAME}\${APNAME} G3D Viewer.lnk" "$INSTDIR\megaglest_g3dviewer.exe" "" "$INSTDIR\megaglest_g3dviewer.exe" 0 "" "" "${APNAME} MegaGlest G3D Viewer"
 
 SectionEnd
 
@@ -257,6 +288,8 @@ SectionEnd
 
 Section "Uninstall"
 
+  Call un.myGUIInit
+  
   ; Remove registry keys
   DeleteRegKey HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${APNAME}"
   DeleteRegKey HKLM SOFTWARE\${APNAME}
@@ -264,16 +297,15 @@ Section "Uninstall"
   ; Remove files and uninstaller
   Delete $INSTDIR\uninstall.exe
 
-  Delete $INSTDIR\glest_game.exe
-  Delete $INSTDIR\glest_editor.exe
-  Delete $INSTDIR\glest_configurator.exe
-  Delete $INSTDIR\g3d_viewer.exe
+  Delete $INSTDIR\megaglest.exe
+  Delete $INSTDIR\megaglest_editor.exe
+  Delete $INSTDIR\megaglest_configurator.exe
+  Delete $INSTDIR\megaglest_g3dviewer.exe
   Delete $INSTDIR\configuration.xml
   Delete $INSTDIR\megaglest.ico
   Delete $INSTDIR\glest.ini
   Delete $INSTDIR\glestkeys.ini
   Delete $INSTDIR\servers.ini
- # Delete $INSTDIR\dsound.dll
   Delete $INSTDIR\openal32.dll
   Delete $INSTDIR\xerces-c_3_0.dll
   Delete $INSTDIR\*.log
diff --git a/mk/windoze/Installer/MegaGlestUpdater.nsi b/mk/windoze/Installer/MegaGlestUpdater.nsi
index c2d0fd15d..df5f6eb3b 100644
--- a/mk/windoze/Installer/MegaGlestUpdater.nsi
+++ b/mk/windoze/Installer/MegaGlestUpdater.nsi
@@ -2,10 +2,10 @@
 ; General Attributes
 
 !define APNAME MegaGlest
-!define APVER 3.5.0
+!define APVER 3.5.1
 !define APNAME_OLD Mega-Glest
-!define APVER_OLD 3.4.0
-!define APVER_UPDATE 3.5.0
+!define APVER_OLD 3.5.0
+!define APVER_UPDATE 3.5.1
 
 Name "${APNAME} ${APVER_UPDATE}"
 SetCompressor /FINAL /SOLID lzma
@@ -25,12 +25,12 @@ RequestExecutionLevel admin
 
 PageEx license
        LicenseText "Megaglest License"
-       LicenseData "..\..\..\data\glest_game\docs\LICENSE"
+       LicenseData "..\..\..\data\glest_game\docs\README.data-license.txt"
 PageExEnd
 
 PageEx license
        LicenseText "Megaglest README"
-       LicenseData "..\..\..\data\glest_game\docs\README"
+       LicenseData "..\..\..\docs\README.txt"
 PageExEnd
 
 ;--------------------------------
@@ -96,6 +96,16 @@ Function MUIGUIInit
    StrCpy $R2 "?"
    IfFileExists $EXEDIR\glest_game.exe foundInst doneInit
 
+   IfFileExists $INSTDIR\megaglest.exe 0 +2
+   StrCpy $R0 "$INSTDIR"
+   StrCpy $R2 "?"
+   IfFileExists $INSTDIR\megaglest.exe foundInst
+
+   IfFileExists $EXEDIR\megaglest.exe 0 +2
+   StrCpy $R0 "$EXEDIR"
+   StrCpy $R2 "?"
+   IfFileExists $EXEDIR\megaglest.exe foundInst doneInit
+
 foundInst:
    StrCpy $INSTDIR "$R0"
    
@@ -162,12 +172,14 @@ Section "${APNAME} (required)"
   #RMDir /r "$INSTDIR\techs\megapack\factions\norsemen\upgrades\training_field"
 
   ; Put file there
-  File "..\..\..\data\glest_game\glest_game.exe"
-  File "..\..\..\data\glest_game\glest_editor.exe"
-  File "..\..\..\data\glest_game\glest_configurator.exe"
-  File "..\..\..\data\glest_game\g3d_viewer.exe"
+  File "..\..\..\data\glest_game\megaglest.exe"
+  File "..\..\..\data\glest_game\megaglest_editor.exe"
+  File "..\..\..\data\glest_game\megaglest_configurator.exe"
+  File "..\..\..\data\glest_game\megaglest_g3dviewer.exe"
   File "..\..\..\data\glest_game\7z.exe"
-  File "..\..\..\data\glest_game\*.ini"
+  File "..\..\..\data\glest_game\glest.ini"
+  File "..\..\..\data\glest_game\glestkeys.ini"
+  File "..\..\..\data\glest_game\servers.ini"
   File /r /x .svn /x mydata "..\..\..\data\glest_game\*.lng"
   #File /r /x .svn /x mydata "..\..\..\data\glest_game\tutorials"
   #File /r /x .svn /x mydata "..\..\..\data\glest_game\*.xml"
diff --git a/mk/windoze/g3d_viewer.vcproj b/mk/windoze/g3d_viewer.vcproj
index 488f20b2d..bf9f3754c 100644
--- a/mk/windoze/g3d_viewer.vcproj
+++ b/mk/windoze/g3d_viewer.vcproj
@@ -65,7 +65,7 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalDependencies="wxbase28d.lib wxbase28d_net.lib wxbase28d_xml.lib wxexpatd.lib wxjpegd.lib wxmsw28d_adv.lib wxmsw28d_aui.lib wxmsw28d_core.lib wxmsw28d_gl.lib wxmsw28d_html.lib wxmsw28d_media.lib wxmsw28d_qa.lib wxmsw28d_richtext.lib wxmsw28d_xrc.lib wxregexd.lib wxtiffd.lib wxzlibd.lib winmm.lib rpcrt4.lib kernel32.lib user32.lib gdi32.lib ole32.lib oleaut32.lib comctl32.lib comdlg32.lib uuid.lib advapi32.lib shell32.lib libglest.lib Dbghelp.lib sdl.lib sdlmain.lib dxguid.lib libstreflop.lib libcurl.lib ws2_32.lib xerces-c_3d.lib libpng.lib jpeg.lib"
-				OutputFile="$(OutDir)\G3D_Viewer.exe"
+				OutputFile="$(OutDir)\megaglest_g3dviewer.exe"
 				LinkIncremental="2"
 				AdditionalLibraryDirectories="../../source/win32_deps/lib;&quot;../../build/$(ConfigurationName)/libglest&quot;;../../source/shared_lib/sources/streflop/libstreflop"
 				GenerateDebugInformation="true"
@@ -143,7 +143,7 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalDependencies="wxbase28.lib wxbase28_net.lib wxbase28_xml.lib wxexpat.lib wxjpeg.lib wxmsw28_adv.lib wxmsw28_aui.lib wxmsw28_core.lib wxmsw28_gl.lib wxmsw28_html.lib wxmsw28_media.lib wxmsw28_qa.lib wxmsw28_richtext.lib wxmsw28_xrc.lib wxregex.lib wxtiff.lib wxzlib.lib winmm.lib rpcrt4.lib kernel32.lib user32.lib gdi32.lib ole32.lib oleaut32.lib comctl32.lib comdlg32.lib uuid.lib advapi32.lib shell32.lib libglest.lib Dbghelp.lib sdl.lib sdlmain.lib dxguid.lib libstreflop.lib libcurl.lib ws2_32.lib xerces-c_3.lib libpng.lib jpeg.lib"
-				OutputFile="$(OutDir)\$(ProjectName).exe"
+				OutputFile="$(OutDir)\megaglest_g3dviewer.exe"
 				LinkIncremental="1"
 				AdditionalLibraryDirectories="../../source/win32_deps/lib;&quot;../../build/$(ConfigurationName)/libglest&quot;;../../source/shared_lib/sources/streflop/libstreflop"
 				GenerateDebugInformation="true"
@@ -223,7 +223,7 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalDependencies="wxbase28.lib wxbase28_net.lib wxbase28_xml.lib wxexpat.lib wxjpeg.lib wxmsw28_adv.lib wxmsw28_aui.lib wxmsw28_core.lib wxmsw28_gl.lib wxmsw28_html.lib wxmsw28_media.lib wxmsw28_qa.lib wxmsw28_richtext.lib wxmsw28_xrc.lib wxregex.lib wxtiff.lib wxzlib.lib winmm.lib rpcrt4.lib kernel32.lib user32.lib gdi32.lib ole32.lib oleaut32.lib comctl32.lib comdlg32.lib uuid.lib advapi32.lib shell32.lib libglest.lib Dbghelp.lib sdl.lib sdlmain.lib dxguid.lib libstreflop.lib libcurl.lib ws2_32.lib xerces-c_3.lib libpng.lib"
-				OutputFile="$(OutDir)\$(ProjectName).exe"
+				OutputFile="$(OutDir)\megaglest_g3dviewer.exe"
 				LinkIncremental="2"
 				AdditionalLibraryDirectories="../../source/win32_deps/lib;&quot;../../build/$(ConfigurationName)/libglest&quot;;../../source/shared_lib/sources/streflop/libstreflop"
 				GenerateDebugInformation="true"
diff --git a/mk/windoze/glest_configurator.vcproj b/mk/windoze/glest_configurator.vcproj
index e306effc0..dc8d69421 100644
--- a/mk/windoze/glest_configurator.vcproj
+++ b/mk/windoze/glest_configurator.vcproj
@@ -64,7 +64,7 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalDependencies="wxbase28d.lib wxbase28d_net.lib wxbase28d_xml.lib wxexpatd.lib wxjpegd.lib wxmsw28d_adv.lib wxmsw28d_aui.lib wxmsw28d_core.lib wxmsw28d_gl.lib wxmsw28d_html.lib wxmsw28d_media.lib wxmsw28d_qa.lib wxmsw28d_richtext.lib wxmsw28d_xrc.lib wxpngd.lib wxregexd.lib wxtiffd.lib wxzlibd.lib winmm.lib rpcrt4.lib kernel32.lib user32.lib gdi32.lib ole32.lib oleaut32.lib comctl32.lib comdlg32.lib uuid.lib advapi32.lib shell32.lib  libglest.lib sdl.lib sdlmain.lib dsound.lib dxguid.lib Dbghelp.lib libcurl.lib ws2_32.lib xerces-c_3.lib"
-				OutputFile="$(OutDir)\Glest_Configurator.exe"
+				OutputFile="$(OutDir)\megaglest_configurator.exe"
 				LinkIncremental="2"
 				AdditionalLibraryDirectories="&quot;../../build/$(ConfigurationName)/libglest&quot;;../../source/win32_deps/lib"
 				GenerateDebugInformation="true"
@@ -141,7 +141,7 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalDependencies="wxbase28.lib wxbase28_net.lib wxbase28_xml.lib wxexpat.lib wxjpeg.lib wxmsw28_adv.lib wxmsw28_aui.lib wxmsw28_core.lib wxmsw28_gl.lib wxmsw28_html.lib wxmsw28_media.lib wxmsw28_qa.lib wxmsw28_richtext.lib wxmsw28_xrc.lib wxpng.lib wxregex.lib wxtiff.lib wxzlib.lib winmm.lib rpcrt4.lib kernel32.lib user32.lib gdi32.lib ole32.lib oleaut32.lib comctl32.lib comdlg32.lib uuid.lib advapi32.lib shell32.lib libglest.lib xerces-c_3.lib sdl.lib sdlmain.lib dsound.lib dxguid.lib Dbghelp.lib libcurl.lib ws2_32.lib"
-				OutputFile="$(OutDir)\$(ProjectName).exe"
+				OutputFile="$(OutDir)\megaglest_configurator.exe"
 				LinkIncremental="1"
 				AdditionalLibraryDirectories="&quot;../../build/$(ConfigurationName)/libglest&quot;;../../source/win32_deps/lib"
 				GenerateDebugInformation="true"
@@ -220,7 +220,7 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalDependencies="wxbase28.lib wxbase28_net.lib wxbase28_xml.lib wxexpat.lib wxjpeg.lib wxmsw28_adv.lib wxmsw28_aui.lib wxmsw28_core.lib wxmsw28_gl.lib wxmsw28_html.lib wxmsw28_media.lib wxmsw28_qa.lib wxmsw28_richtext.lib wxmsw28_xrc.lib wxpng.lib wxregex.lib wxtiff.lib wxzlib.lib winmm.lib rpcrt4.lib kernel32.lib user32.lib gdi32.lib ole32.lib oleaut32.lib comctl32.lib comdlg32.lib uuid.lib advapi32.lib shell32.lib libglest.lib xerces-c_3.lib sdl.lib sdlmain.lib dsound.lib dxguid.lib Dbghelp.lib libcurl.lib ws2_32.lib"
-				OutputFile="$(OutDir)\$(ProjectName).exe"
+				OutputFile="$(OutDir)\megaglest_configurator.exe"
 				LinkIncremental="2"
 				AdditionalLibraryDirectories="&quot;../../build/$(ConfigurationName)/libglest&quot;;../../source/win32_deps/lib"
 				GenerateDebugInformation="true"
diff --git a/mk/windoze/glest_editor.vcproj b/mk/windoze/glest_editor.vcproj
index 4b430439c..4cd74bf4a 100644
--- a/mk/windoze/glest_editor.vcproj
+++ b/mk/windoze/glest_editor.vcproj
@@ -65,7 +65,7 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalDependencies="wxbase28d.lib wxbase28d_net.lib wxbase28d_xml.lib wxexpatd.lib wxjpegd.lib wxmsw28d_adv.lib wxmsw28d_aui.lib wxmsw28d_core.lib wxmsw28d_gl.lib wxmsw28d_html.lib wxmsw28d_media.lib wxmsw28d_qa.lib wxmsw28d_richtext.lib wxmsw28d_xrc.lib wxpngd.lib wxregexd.lib wxtiffd.lib wxzlibd.lib winmm.lib rpcrt4.lib kernel32.lib user32.lib gdi32.lib ole32.lib oleaut32.lib comctl32.lib comdlg32.lib uuid.lib advapi32.lib shell32.lib libglest.lib sdl.lib sdlmain.lib dsound.lib dxguid.lib Dbghelp.lib libcurl.lib ws2_32.lib"
-				OutputFile="$(OutDir)\Glest_Editor.exe"
+				OutputFile="$(OutDir)\megaglest_editor.exe"
 				LinkIncremental="2"
 				AdditionalLibraryDirectories="../../source/win32_deps/lib;&quot;../../build/$(ConfigurationName)/libglest&quot;"
 				GenerateDebugInformation="true"
@@ -143,7 +143,7 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalDependencies="wxbase28.lib wxbase28_net.lib wxbase28_xml.lib wxexpat.lib wxjpeg.lib wxmsw28_adv.lib wxmsw28_aui.lib wxmsw28_core.lib wxmsw28_gl.lib wxmsw28_html.lib wxmsw28_media.lib wxmsw28_qa.lib wxmsw28_richtext.lib wxmsw28_xrc.lib wxpng.lib wxregex.lib wxtiff.lib wxzlib.lib winmm.lib rpcrt4.lib kernel32.lib user32.lib gdi32.lib ole32.lib oleaut32.lib comctl32.lib comdlg32.lib uuid.lib advapi32.lib shell32.lib libglest.lib sdl.lib sdlmain.lib dsound.lib dxguid.lib Dbghelp.lib libcurl.lib ws2_32.lib"
-				OutputFile="$(OutDir)\$(ProjectName).exe"
+				OutputFile="$(OutDir)\megaglest_editor.exe"
 				LinkIncremental="1"
 				AdditionalLibraryDirectories="../../source/win32_deps/lib;&quot;../../build/$(ConfigurationName)/libglest&quot;"
 				GenerateDebugInformation="true"
@@ -223,7 +223,7 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalDependencies="wxbase28.lib wxbase28_net.lib wxbase28_xml.lib wxexpat.lib wxjpeg.lib wxmsw28_adv.lib wxmsw28_aui.lib wxmsw28_core.lib wxmsw28_gl.lib wxmsw28_html.lib wxmsw28_media.lib wxmsw28_qa.lib wxmsw28_richtext.lib wxmsw28_xrc.lib wxpng.lib wxregex.lib wxtiff.lib wxzlib.lib winmm.lib rpcrt4.lib kernel32.lib user32.lib gdi32.lib ole32.lib oleaut32.lib comctl32.lib comdlg32.lib uuid.lib advapi32.lib shell32.lib libglest.lib sdl.lib sdlmain.lib dsound.lib dxguid.lib Dbghelp.lib libcurl.lib ws2_32.lib"
-				OutputFile="$(OutDir)\$(ProjectName).exe"
+				OutputFile="$(OutDir)\megaglest_editor.exe"
 				LinkIncremental="2"
 				AdditionalLibraryDirectories="../../source/win32_deps/lib;&quot;../../build/$(ConfigurationName)/libglest&quot;"
 				GenerateDebugInformation="true"
diff --git a/mk/windoze/glest_game.vcproj b/mk/windoze/glest_game.vcproj
index cf99c9158..b662a898a 100644
--- a/mk/windoze/glest_game.vcproj
+++ b/mk/windoze/glest_game.vcproj
@@ -75,6 +75,7 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalDependencies="dsound.lib dxguid.lib ogg_static.lib vorbis_static.lib vorbisfile_static.lib opengl32.lib glu32.lib wsock32.lib libglest.lib mmc.lib lua5.1.lib xerces-c_3.lib Dbghelp.lib libpng.lib jpeg.lib zlib.lib sdl.lib sdlmain.lib winmm.lib openal32.lib iphlpapi.lib libstreflop.lib  libcurl.lib ws2_32.lib libircclient.lib"
+				OutputFile="$(OutDir)\megaglest.exe"
 				AdditionalLibraryDirectories="../../source/win32_deps/lib;&quot;../../build/$(ConfigurationName)/libglest&quot;;../../source/shared_lib/sources/streflop/libstreflop;../../source/win32_deps/libircclient/build/lib"
 				IgnoreAllDefaultLibraries="false"
 				IgnoreDefaultLibraryNames=""
@@ -163,6 +164,7 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalDependencies="dsound.lib dxguid.lib ogg_static.lib vorbis_static.lib vorbisfile_static.lib opengl32.lib glu32.lib wsock32.lib libglest.lib mmc.lib lua5.1.lib xerces-c_3.lib Dbghelp.lib libpng.lib jpeg.lib zlib.lib sdl.lib sdlmain.lib winmm.lib openal32.lib iphlpapi.lib libstreflop.lib libcurl.lib ws2_32.lib libircclient.lib"
+				OutputFile="$(OutDir)\megaglest.exe"
 				LinkIncremental="1"
 				AdditionalLibraryDirectories="../../source/win32_deps/lib;&quot;../../build/$(ConfigurationName)/libglest&quot;;../../source/shared_lib/sources/streflop/libstreflop;../../source/win32_deps/libircclient/build/lib"
 				IgnoreDefaultLibraryNames=""
@@ -254,6 +256,7 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalDependencies="dsound.lib dxguid.lib ogg_static.lib vorbis_static.lib vorbisfile_static.lib opengl32.lib glu32.lib wsock32.lib libglest.lib mmc.lib lua5.1.lib xerces-c_3.lib Dbghelp.lib libpng.lib jpeg.lib zlib.lib sdl.lib sdlmain.lib winmm.lib openal32.lib iphlpapi.lib libstreflop.lib libcurl.lib ws2_32.lib"
+				OutputFile="$(OutDir)\megaglest.exe"
 				LinkIncremental="1"
 				AdditionalLibraryDirectories="../../source/win32_deps/lib;&quot;../../build/$(ConfigurationName)/libglest&quot;;../../source/shared_lib/sources/streflop/libstreflop"
 				IgnoreDefaultLibraryNames=""