diff --git a/dlls/cstrike/cstrike.dsp b/dlls/cstrike/cstrike.dsp
index 885585fd..7c7ab3fe 100755
--- a/dlls/cstrike/cstrike.dsp
+++ b/dlls/cstrike/cstrike.dsp
@@ -83,7 +83,7 @@ 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 /nologo /dll /debug /machine:I386 /pdbtype:sept
-# ADD 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 /nologo /dll /debug /machine:I386 /out:"Debug/cstrike_amxx_debug.dll" /pdbtype:sept
+# ADD 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 /nologo /dll /debug /machine:I386 /out:"Debug/cstrike_amx_debug.dll" /pdbtype:sept
 
 !ENDIF 
 
diff --git a/dlls/cstrike/cstrike.h b/dlls/cstrike/cstrike.h
index 7b2a51f9..894cd420 100755
--- a/dlls/cstrike/cstrike.h
+++ b/dlls/cstrike/cstrike.h
@@ -1,5 +1,4 @@
 //#define __cswonbuild__ // comment when compiling for STEAM
-//#define CS_WON_BUILD
 
  /* AMX Mod X 
    *   Counter-Strike Module 
@@ -68,9 +67,9 @@ pfnmodule_engine_g* g_engModuleFunc;
 #define NAME "Counter-Strike"
 #define AUTHOR "AMX Mod X Dev Team"
 #if defined __cswonbuild__
-#define VERSION "0.15 WON" // change both these versions
+#define VERSION "0.16 WON" // change both these versions
 #else
-#define VERSION "0.15 STEAM" // change both these versions
+#define VERSION "0.16 STEAM" // change both these versions
 #endif // defined __cswonbuild__
 #define URL "http://www.amxmodx.org"
 #define LOGTAG "AMXCS"
diff --git a/dlls/cstrike/cstrike.vcproj b/dlls/cstrike/cstrike.vcproj
index cc7cbdaa..4cb3a5a7 100755
--- a/dlls/cstrike/cstrike.vcproj
+++ b/dlls/cstrike/cstrike.vcproj
@@ -38,13 +38,13 @@
 				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCLinkerTool"
-				OutputFile="Debug/cstrike_amxx_debug.dll"
+				OutputFile="Debug/cstrike_amx_debug.dll"
 				LinkIncremental="1"
 				SuppressStartupBanner="TRUE"
 				ModuleDefinitionFile=".\cstrike.def"
 				GenerateDebugInformation="TRUE"
-				ProgramDatabaseFile=".\Debug/cstrike_amxx_debug.pdb"
-				ImportLibrary=".\Debug/cstrike_amxx_debug.lib"
+				ProgramDatabaseFile=".\Debug/cstrike_amx_debug.pdb"
+				ImportLibrary=".\Debug/cstrike_amx_debug.lib"
 				TargetMachine="1"/>
 			<Tool
 				Name="VCMIDLTool"
@@ -103,12 +103,12 @@
 				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCLinkerTool"
-				OutputFile="Release/cstrike_amxx.dll"
+				OutputFile="Release/cstrike_amx.dll"
 				LinkIncremental="1"
 				SuppressStartupBanner="TRUE"
 				ModuleDefinitionFile=".\cstrike.def"
-				ProgramDatabaseFile=".\Release/cstrike_amxx.pdb"
-				ImportLibrary=".\Release/cstrike_amxx.lib"
+				ProgramDatabaseFile=".\Release/cstrike_amx.pdb"
+				ImportLibrary=".\Release/cstrike_amx.lib"
 				TargetMachine="1"/>
 			<Tool
 				Name="VCMIDLTool"
@@ -121,9 +121,9 @@
 			<Tool
 				Name="VCPostBuildEventTool"
 				CommandLine="echo Copying dll...
-copy Release\cstrike_amxx.dll K:\S\cstrike\addons\amx\dlls
+copy Release\cstrike_amx.dll K:\S\cstrike\addons\amx\dlls
 echo Copying inc...
-copy cstrike_amxx.inc K:\S\cstrike\addons\amx\examples\include
+copy cstrike_amx.inc K:\S\cstrike\addons\amx\examples\include
 "/>
 			<Tool
 				Name="VCPreBuildEventTool"/>
@@ -210,7 +210,7 @@ copy cstrike_amxx.inc K:\S\cstrike\addons\amx\examples\include
 			Filter="ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe">
 		</Filter>
 		<File
-			RelativePath="cstrike_amxx.inc">
+			RelativePath="cstrike_amx.inc">
 		</File>
 	</Files>
 	<Globals>
diff --git a/dlls/engine/engine.dsp b/dlls/engine/engine.dsp
index e4b90c8d..67404f54 100755
--- a/dlls/engine/engine.dsp
+++ b/dlls/engine/engine.dsp
@@ -110,7 +110,7 @@ SOURCE=.\engine.inc
 # End Source File
 # Begin Source File
 
-SOURCE=.\engine.def
+SOURCE=.\engine_amx.def
 # End Source File
 # End Group
 # End Target
diff --git a/dlls/engine/engine.vcproj b/dlls/engine/engine.vcproj
index c18c587e..6da41f27 100755
--- a/dlls/engine/engine.vcproj
+++ b/dlls/engine/engine.vcproj
@@ -42,7 +42,7 @@
 				OutputFile="release/engine_amx.dll"
 				LinkIncremental="1"
 				SuppressStartupBanner="TRUE"
-				ModuleDefinitionFile=".\engine.def"
+				ModuleDefinitionFile=".\engine_amx.def"
 				ProgramDatabaseFile=".\Release/engine_amx.pdb"
 				ImportLibrary=".\Release/engine_amx.lib"
 				TargetMachine="1"/>
@@ -104,7 +104,7 @@
 				OutputFile=".\Debug/engine.dll"
 				LinkIncremental="1"
 				SuppressStartupBanner="TRUE"
-				ModuleDefinitionFile=".\engine.def"
+				ModuleDefinitionFile=".\engine_amx.def"
 				GenerateDebugInformation="TRUE"
 				ProgramDatabaseFile=".\Debug/engine.pdb"
 				ImportLibrary=".\Debug/engine.lib"
@@ -172,7 +172,7 @@
 			Name="Resource Files"
 			Filter="ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe">
 			<File
-				RelativePath="engine.def">
+				RelativePath="engine_amx.def">
 			</File>
 			<File
 				RelativePath="engine.inc">
diff --git a/dlls/engine/engine.def b/dlls/engine/engine_amx.def
similarity index 100%
rename from dlls/engine/engine.def
rename to dlls/engine/engine_amx.def
diff --git a/dlls/fun/fun.dsp b/dlls/fun/fun.dsp
index a65115ab..4b3d4dac 100755
--- a/dlls/fun/fun.dsp
+++ b/dlls/fun/fun.dsp
@@ -4,7 +4,7 @@
 
 # TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102
 
-CFG=fun - Win32 Debug
+CFG=fun_amx - Win32 Debug
 !MESSAGE This is not a valid makefile. To build this project using NMAKE,
 !MESSAGE use the Export Makefile command and run
 !MESSAGE 
@@ -17,8 +17,8 @@ CFG=fun - Win32 Debug
 !MESSAGE 
 !MESSAGE Possible choices for configuration are:
 !MESSAGE 
-!MESSAGE "fun - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "fun - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE "fun_amx - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE "fun_amx - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library")
 !MESSAGE 
 
 # Begin Project
@@ -29,7 +29,7 @@ CPP=cl.exe
 MTL=midl.exe
 RSC=rc.exe
 
-!IF  "$(CFG)" == "fun - Win32 Release"
+!IF  "$(CFG)" == "fun_amx - Win32 Release"
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 0
@@ -56,10 +56,10 @@ LINK32=link.exe
 # ADD 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 /nologo /dll /machine:I386
 # Begin Special Build Tool
 SOURCE="$(InputPath)"
-PostBuild_Cmds=echo Copying dll...	copy Release\fun.dll K:\S\cstrike\addons\amxx\modules\fun_amx.dll	echo Copying inc...	copy ..\plugins\include\fun.inc K:\S\cstrike\addons\amxx\scripting\include
+PostBuild_Cmds=echo Copying dll...	copy Release\fun_amx.dll K:\S\cstrike\addons\amxx\modules\fun_amx.dll	echo Copying inc...	copy ..\plugins\include\fun.inc K:\S\cstrike\addons\amxx\scripting\include
 # End Special Build Tool
 
-!ELSEIF  "$(CFG)" == "fun - Win32 Debug"
+!ELSEIF  "$(CFG)" == "fun_amx - Win32 Debug"
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 1
@@ -89,8 +89,8 @@ LINK32=link.exe
 
 # Begin Target
 
-# Name "fun - Win32 Release"
-# Name "fun - Win32 Debug"
+# Name "fun_amx - Win32 Release"
+# Name "fun_amx - Win32 Debug"
 # Begin Group "Source Files"
 
 # PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
@@ -100,7 +100,7 @@ SOURCE=.\fun.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=.\fun.def
+SOURCE=.\fun_amx.def
 # End Source File
 # End Group
 # Begin Group "Header Files"
diff --git a/dlls/fun/fun.dsw b/dlls/fun/fun.dsw
index cdf16e93..f0b2ae38 100755
--- a/dlls/fun/fun.dsw
+++ b/dlls/fun/fun.dsw
@@ -3,7 +3,7 @@ Microsoft Developer Studio Workspace File, Format Version 6.00
 
 ###############################################################################
 
-Project: "fun"=".\fun.dsp" - Package Owner=<4>
+Project: "fun_amx"=".\fun_amx.dsp" - Package Owner=<4>
 
 Package=<5>
 {{{
diff --git a/dlls/fun/fun.h b/dlls/fun/fun.h
index 371cb9bb..7f31f07a 100755
--- a/dlls/fun/fun.h
+++ b/dlls/fun/fun.h
@@ -59,7 +59,7 @@ pfnmodule_engine_g* g_engModuleFunc;		// These seem to be meta/amxmod related
 
 #define NAME "Fun"
 #define AUTHOR "AMX Mod X Dev Team"
-#define VERSION "0.15"
+#define VERSION "0.16"
 #define URL "http://www.amxmodx.org"
 #define LOGTAG "FUN"
 #define DATE __DATE__
diff --git a/dlls/fun/fun.vcproj b/dlls/fun/fun.vcproj
index 99c82dbd..8c58ad1b 100755
--- a/dlls/fun/fun.vcproj
+++ b/dlls/fun/fun.vcproj
@@ -2,7 +2,7 @@
 <VisualStudioProject
 	ProjectType="Visual C++"
 	Version="7.10"
-	Name="fun"
+	Name="fun_amx"
 	SccProjectName=""
 	SccLocalPath="">
 	<Platforms>
@@ -38,10 +38,10 @@
 				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCLinkerTool"
-				OutputFile=".\Release/fun.dll"
+				OutputFile=".\Release/fun_amx.dll"
 				LinkIncremental="1"
 				SuppressStartupBanner="TRUE"
-				ModuleDefinitionFile=".\fun.def"
+				ModuleDefinitionFile=".\fun_amx.def"
 				ProgramDatabaseFile=".\Release/fun.pdb"
 				ImportLibrary=".\Release/fun.lib"
 				TargetMachine="1"/>
@@ -172,7 +172,7 @@ copy fun.inc K:\S\cstrike\addons\amx\plugins\include
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="fun.def">
+				RelativePath="fun_amx.def">
 			</File>
 		</Filter>
 		<Filter
diff --git a/dlls/fun/fun.def b/dlls/fun/fun_amx.def
similarity index 90%
rename from dlls/fun/fun.def
rename to dlls/fun/fun_amx.def
index d0ec1766..1b983d27 100755
--- a/dlls/fun/fun.def
+++ b/dlls/fun/fun_amx.def
@@ -1,4 +1,4 @@
-LIBRARY fun
+LIBRARY fun_amx
 EXPORTS
 	GiveFnptrsToDll			@1
 	Meta_Attach				@2