diff --git a/ase/ase.dsw b/ase/ase.dsw
index 6e273082..3cf94955 100644
--- a/ase/ase.dsw
+++ b/ase/ase.dsw
@@ -15,7 +15,19 @@ Package=<4>
 
 ###############################################################################
 
-Project: "awk_activex"=".\com\awk\awk.dsp" - Package Owner=<4>
+Project: "awk.activex"=".\com\awk\awk.dsp" - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+}}}
+
+###############################################################################
+
+Project: "awk.test"=.\test\awk\awk.dsp - Package Owner=<4>
 
 Package=<5>
 {{{
@@ -39,19 +51,7 @@ Package=<4>
 
 ###############################################################################
 
-Project: "awk_test"=.\test\awk\awk.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-}}}
-
-###############################################################################
-
-Project: "test_lsp"=.\test\lsp\test_lsp.dsp - Package Owner=<4>
+Project: "lsp.test"=.\test\lsp\lsp.dsp - Package Owner=<4>
 
 Package=<5>
 {{{
diff --git a/ase/test/awk/awk.dsp b/ase/test/awk/awk.dsp
index 819c49a0..77d12bef 100644
--- a/ase/test/awk/awk.dsp
+++ b/ase/test/awk/awk.dsp
@@ -1,10 +1,10 @@
-# Microsoft Developer Studio Project File - Name="awk_test" - Package Owner=<4>
+# Microsoft Developer Studio Project File - Name="awk.test" - Package Owner=<4>
 # Microsoft Developer Studio Generated Build File, Format Version 6.00
 # ** DO NOT EDIT **
 
 # TARGTYPE "Win32 (x86) Console Application" 0x0103
 
-CFG=awk_test - Win32 Debug
+CFG=awk.test - Win32 Debug
 !MESSAGE This is not a valid makefile. To build this project using NMAKE,
 !MESSAGE use the Export Makefile command and run
 !MESSAGE 
@@ -13,12 +13,12 @@ CFG=awk_test - Win32 Debug
 !MESSAGE You can specify a configuration when running NMAKE
 !MESSAGE by defining the macro CFG on the command line. For example:
 !MESSAGE 
-!MESSAGE NMAKE /f "awk.mak" CFG="awk_test - Win32 Debug"
+!MESSAGE NMAKE /f "awk.mak" CFG="awk.test - Win32 Debug"
 !MESSAGE 
 !MESSAGE Possible choices for configuration are:
 !MESSAGE 
-!MESSAGE "awk_test - Win32 Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "awk_test - Win32 Debug" (based on "Win32 (x86) Console Application")
+!MESSAGE "awk.test - Win32 Release" (based on "Win32 (x86) Console Application")
+!MESSAGE "awk.test - Win32 Debug" (based on "Win32 (x86) Console Application")
 !MESSAGE 
 
 # Begin Project
@@ -28,7 +28,7 @@ CFG=awk_test - Win32 Debug
 CPP=cl.exe
 RSC=rc.exe
 
-!IF  "$(CFG)" == "awk_test - Win32 Release"
+!IF  "$(CFG)" == "awk.test - Win32 Release"
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 0
@@ -50,9 +50,9 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo
 LINK32=link.exe
 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
-# ADD LINK32 aseawk.lib xpbas.lib user32.lib kernel32.lib /nologo /subsystem:console /machine:I386 /out:"../../release/win32/vs60/aseawk.exe" /libpath:"$(OutDir)" /libpath:"\projects\xpkit\release"
+# ADD LINK32 aseawk.lib user32.lib kernel32.lib /nologo /subsystem:console /machine:I386 /out:"../../release/win32/vs60/aseawk.exe" /libpath:"$(OutDir)"
 
-!ELSEIF  "$(CFG)" == "awk_test - Win32 Debug"
+!ELSEIF  "$(CFG)" == "awk.test - Win32 Debug"
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 1
@@ -74,14 +74,14 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo
 LINK32=link.exe
 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 aseawk.lib xpbas.lib user32.lib kernel32.lib /nologo /subsystem:console /debug /machine:I386 /out:"../../debug/win32/vs60/aseawk.exe" /pdbtype:sept /libpath:"$(OutDir)" /libpath:"\projects\xpkit\debug"
+# ADD LINK32 aseawk.lib user32.lib kernel32.lib /nologo /subsystem:console /debug /machine:I386 /out:"../../debug/win32/vs60/aseawk.exe" /pdbtype:sept /libpath:"$(OutDir)"
 
 !ENDIF 
 
 # Begin Target
 
-# Name "awk_test - Win32 Release"
-# Name "awk_test - Win32 Debug"
+# Name "awk.test - Win32 Release"
+# Name "awk.test - Win32 Debug"
 # Begin Group "Source Files"
 
 # PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"