diff --git a/common/JackConstants.h b/common/JackConstants.h
index 3931caf4..38965f45 100644
--- a/common/JackConstants.h
+++ b/common/JackConstants.h
@@ -51,7 +51,7 @@ namespace Jack
 #ifdef WIN32
 #define jack_server_dir "server"
 #define jack_client_dir "client"
-#define ADDON_DIR "jackmp"
+#define ADDON_DIR "jack"
 #elif __APPLE__
 #define jack_server_dir "/tmp"
 #define jack_client_dir "/tmp"
diff --git a/windows/Debug/bin/JackRouter.dll b/windows/Debug/bin/JackRouter.dll
deleted file mode 100644
index a6d89a85..00000000
Binary files a/windows/Debug/bin/JackRouter.dll and /dev/null differ
diff --git a/windows/Debug/bin/JackRouter.ini b/windows/Debug/bin/JackRouter.ini
deleted file mode 100644
index 8a62b6a7..00000000
--- a/windows/Debug/bin/JackRouter.ini
+++ /dev/null
@@ -1,7 +0,0 @@
-[IO]
-input=4
-output=4
-
-[AUTO_CONNECT]
-input=1
-output=1
diff --git a/windows/Debug/bin/portaudio_x86.dll b/windows/Debug/bin/portaudio_x86.dll
deleted file mode 100644
index 15a2f2be..00000000
Binary files a/windows/Debug/bin/portaudio_x86.dll and /dev/null differ
diff --git a/windows/Release/bin/JackRouter.dll b/windows/Release/bin/JackRouter.dll
deleted file mode 100644
index a6d89a85..00000000
Binary files a/windows/Release/bin/JackRouter.dll and /dev/null differ
diff --git a/windows/Release/bin/portaudio_x86.dll b/windows/Release/bin/portaudio_x86.dll
index b0e90dd9..ec083746 100644
Binary files a/windows/Release/bin/portaudio_x86.dll and b/windows/Release/bin/portaudio_x86.dll differ
diff --git a/windows/Setup/JackRouter.dll b/windows/Setup/JackRouter.dll
new file mode 100644
index 00000000..f5d4ef3c
Binary files /dev/null and b/windows/Setup/JackRouter.dll differ
diff --git a/windows/Release/bin/JackRouter.ini b/windows/Setup/JackRouter.ini
similarity index 59%
rename from windows/Release/bin/JackRouter.ini
rename to windows/Setup/JackRouter.ini
index 8a62b6a7..216b888a 100644
--- a/windows/Release/bin/JackRouter.ini
+++ b/windows/Setup/JackRouter.ini
@@ -1,6 +1,6 @@
 [IO]
-input=4
-output=4
+input=18
+output=18
 
 [AUTO_CONNECT]
 input=1
diff --git a/windows/Setup/jack.ci b/windows/Setup/jack.ci
index e624c04f..25d1631a 100644
--- a/windows/Setup/jack.ci
+++ b/windows/Setup/jack.ci
@@ -53,27 +53,27 @@
    <bgfoot> </> 
    <bgback> </>
    <files listview >
-      <_><src>..\Release\bin\libjackmp.a</><dest>inst</><custom>lib</><ifexist>overnewer</><recurs>0</></>
-<_><src>..\Release\bin\libjackservermp.a</><dest>inst</><custom>lib</><ifexist>overnewer</><recurs>0</></>
+      <_><src>..\Release\bin\libjack.a</><dest>inst</><custom>lib</><ifexist>overnewer</><recurs>0</></>
+<_><src>..\Release\bin\libjack.def</><dest>inst</><custom>lib</><ifexist>overnewer</><recurs>0</></>
+<_><src>..\Release\bin\libjackserver.a</><dest>inst</><custom>lib</><ifexist>overnewer</><recurs>0</></>
+<_><src>..\Release\bin\libjackserver.def</><dest>inst</><custom>lib</><ifexist>overnewer</><recurs>0</></>
 <_><src>..\Release\bin\jack_connect.exe</><dest>inst</><custom></><ifexist>overnewer</><recurs>0</></>
 <_><src>..\Release\bin\jack_disconnect.exe</><dest>inst</><custom></><ifexist>overnewer</><recurs>0</></>
 <_><src>..\Release\bin\jack_load.exe</><dest>inst</><custom></><ifexist>overnewer</><recurs>0</></>
 <_><src>..\Release\bin\jack_lsp.exe</><dest>inst</><custom></><ifexist>overnewer</><recurs>0</></>
 <_><src>..\Release\bin\jack_metro.exe</><dest>inst</><custom></><ifexist>overnewer</><recurs>0</></>
 <_><src>..\Release\bin\jack_unload.exe</><dest>inst</><custom></><ifexist>overnewer</><recurs>0</></>
-<_><src>..\Release\bin\jackdmp.exe</><dest>inst</><custom></><ifexist>overnewer</><recurs>0</></>
-<_><src>..\Release\bin\JackRouter.dll</><dest>inst</><custom></><ifexist>overnewer</><recurs>0</></>
-<_><src>..\Release\bin\JackRouter.ini</><dest>inst</><custom></><ifexist>overnewer</><recurs>0</></>
-<_><src>..\Release\bin\libjackmp.dll</><dest>inst</><custom></><ifexist>overnewer</><recurs>0</></>
-<_><src>..\Release\bin\libjackservermp.dll</><dest>inst</><custom></><ifexist>overnewer</><recurs>0</></>
+<_><src>..\Release\bin\jackd.exe</><dest>inst</><custom></><ifexist>overnewer</><recurs>0</></>
+<_><src>..\Release\bin\libjack.dll</><dest>inst</><custom></><ifexist>overnewer</><recurs>0</></>
+<_><src>..\Release\bin\libjackserver.dll</><dest>inst</><custom></><ifexist>overnewer</><recurs>0</></>
 <_><src>..\Release\bin\libsamplerate-0.dll</><dest>inst</><custom></><ifexist>overnewer</><recurs>0</></>
 <_><src>..\Release\bin\portaudio_x86.dll</><dest>inst</><custom></><ifexist>overnewer</><recurs>0</></>
-<_><src>..\Release\bin\jackmp\jack_net.dll</><dest>inst</><custom>jackmp</><ifexist>overnewer</><recurs>0</></>
-<_><src>..\Release\bin\jackmp\jack_dummy.dll</><dest>inst</><custom>jackmp</><ifexist>overnewer</><recurs>0</></>
-<_><src>..\Release\bin\jackmp\jack_portaudio.dll</><dest>inst</><custom>jackmp</><ifexist>overnewer</><recurs>0</></>
-<_><src>..\Release\bin\jackmp\netmanager.dll</><dest>inst</><custom>jackmp</><ifexist>overnewer</><recurs>0</></>
-<_><src>..\Release\bin\jackmp\audioadapter.dll</><dest>inst</><custom>jackmp</><ifexist>overnewer</><recurs>0</></>
-<_><src>..\Release\bin\jackmp\netadapter.dll</><dest>inst</><custom>jackmp</><ifexist>overnewer</><recurs>0</></>
+<_><src>..\Release\bin\jack\jack_net.dll</><dest>inst</><custom>jack</><ifexist>overnewer</><recurs>0</></>
+<_><src>..\Release\bin\jack\jack_dummy.dll</><dest>inst</><custom>jack</><ifexist>overnewer</><recurs>0</></>
+<_><src>..\Release\bin\jack\jack_portaudio.dll</><dest>inst</><custom>jack</><ifexist>overnewer</><recurs>0</></>
+<_><src>..\Release\bin\jack\netmanager.dll</><dest>inst</><custom>jack</><ifexist>overnewer</><recurs>0</></>
+<_><src>..\Release\bin\jack\audioadapter.dll</><dest>inst</><custom>jack</><ifexist>overnewer</><recurs>0</></>
+<_><src>..\Release\bin\jack\netadapter.dll</><dest>inst</><custom>jack</><ifexist>overnewer</><recurs>0</></>
 <_><src>..\..\common\jack\control.h</><dest>inst</><custom>includes\jack</><ifexist>overnewer</><recurs>0</></>
 <_><src>..\..\common\jack\intclient.h</><dest>inst</><custom>includes\jack</><ifexist>overnewer</><recurs>0</></>
 <_><src>..\..\common\jack\jack.h</><dest>inst</><custom>includes\jack</><ifexist>overnewer</><recurs>0</></>
@@ -84,6 +84,8 @@
 <_><src>..\..\common\jack\thread.h</><dest>inst</><custom>includes\jack</><ifexist>overnewer</><recurs>0</></>
 <_><src>..\..\common\jack\transport.h</><dest>inst</><custom>includes\jack</><ifexist>overnewer</><recurs>0</></>
 <_><src>..\..\common\jack\types.h</><dest>inst</><custom>includes\jack</><ifexist>overnewer</><recurs>0</></>
+<_><src>.\JackRouter.dll</><dest>inst</><custom></><ifexist>overnewer</><recurs>0</></>
+<_><src>.\JackRouter.ini</><dest>inst</><custom></><ifexist>overnewer</><recurs>0</></>
 <_><src>.\qjackctl\mingwm10.dll</><dest>inst</><custom></><ifexist>overnewer</><recurs>0</></>
 <_><src>.\qjackctl\qjackctl.exe</><dest>inst</><custom></><ifexist>overnewer</><recurs>0</></>
 <_><src>.\qjackctl\QtCore4.dll</><dest>inst</><custom></><ifexist>overnewer</><recurs>0</></>
@@ -99,8 +101,8 @@
       
    </registry>
    <shcut listview >
-      <_><shpath>prog</><shname>Jack NetDriver</><tarpath>inst</><tarname>jackdmp.exe</><cmdline>-R -S -d net</><workpath>inst</><workcust></><icon></></>
-<_><shpath>prog</><shname>Jack Portaudio</><tarpath>inst</><tarname>jackdmp.exe</><cmdline>-R -S -d portaudio</><workpath>inst</><workcust></><icon></></>
+      <_><shpath>prog</><shname>Jack NetDriver</><tarpath>inst</><tarname>jackd.exe</><cmdline>-R -S -d net</><workpath>inst</><workcust></><icon></></>
+<_><shpath>prog</><shname>Jack Portaudio</><tarpath>inst</><tarname>jackd.exe</><cmdline>-R -S -d portaudio</><workpath>inst</><workcust></><icon></></>
 <_><shpath>prog</><shname>Jack Control</><tarpath>inst</><tarname>qjackctl.exe</><cmdline></><workpath>inst</><workcust></><icon>jackdmp.exe</></>
 <_><shpath>prog</><shname>Jack Command</><tarpath>sys</><tarname>cmd.exe</><cmdline></><workpath>inst</><workcust></><icon></></>
 
diff --git a/windows/jack_audioadapter.cbp b/windows/jack_audioadapter.cbp
index 15b0e2f0..bda06a4a 100644
--- a/windows/jack_audioadapter.cbp
+++ b/windows/jack_audioadapter.cbp
@@ -7,7 +7,7 @@
 		<Option compiler="gcc" />
 		<Build>
 			<Target title="Win32 Release">
-				<Option output="Release\bin\jackmp\audioadapter" prefix_auto="1" extension_auto="1" />
+				<Option output="Release\bin\jack\audioadapter" prefix_auto="1" extension_auto="1" />
 				<Option object_output="Release\" />
 				<Option type="3" />
 				<Option compiler="gcc" />
@@ -35,12 +35,12 @@
 					<Add library="odbccp32" />
 					<Add library="portaudio_x86" />
 					<Add library="libsamplerate-0" />
-					<Add library="libjackservermp" />
+					<Add library="libjackserver" />
 					<Add directory="Release\bin" />
 				</Linker>
 			</Target>
 			<Target title="Win32 Debug">
-				<Option output="Debug\bin\jackmp\audioadapter" prefix_auto="1" extension_auto="1" />
+				<Option output="Debug\bin\jack\audioadapter" prefix_auto="1" extension_auto="1" />
 				<Option object_output="Debug\" />
 				<Option type="3" />
 				<Option compiler="gcc" />
@@ -68,12 +68,12 @@
 					<Add library="odbccp32" />
 					<Add library="portaudio_x86" />
 					<Add library="libsamplerate-0" />
-					<Add library="libjackservermp" />
+					<Add library="libjackserver" />
 					<Add directory="Debug\bin" />
 				</Linker>
 			</Target>
 			<Target title="Win32 Monitor">
-				<Option output="Release\bin\jackmp\audioadapter" prefix_auto="1" extension_auto="1" />
+				<Option output="Release\bin\jack\audioadapter" prefix_auto="1" extension_auto="1" />
 				<Option object_output="Release\" />
 				<Option type="3" />
 				<Option compiler="gcc" />
@@ -102,7 +102,7 @@
 					<Add library="odbccp32" />
 					<Add library="portaudio_x86" />
 					<Add library="libsamplerate-0" />
-					<Add library="libjackservermp" />
+					<Add library="libjackserver" />
 					<Add directory="Release\bin" />
 				</Linker>
 			</Target>
@@ -125,7 +125,7 @@
 			<Add library="odbccp32" />
 			<Add library="portaudio_x86" />
 			<Add library="libsamplerate-0" />
-			<Add library="libjackservermp" />
+			<Add library="libjackserver" />
 		</Linker>
 		<Unit filename="..\common\JackAudioAdapter.cpp" />
 		<Unit filename="..\common\JackAudioAdapterFactory.cpp" />
diff --git a/windows/jack_connect.cbp b/windows/jack_connect.cbp
index a6f2c0ab..06d218ee 100644
--- a/windows/jack_connect.cbp
+++ b/windows/jack_connect.cbp
@@ -31,7 +31,7 @@
 					<Add library="uuid" />
 					<Add library="odbc32" />
 					<Add library="odbccp32" />
-					<Add library="libjackmp" />
+					<Add library="libjack" />
 					<Add directory="Release\bin" />
 				</Linker>
 			</Target>
@@ -60,7 +60,7 @@
 					<Add library="uuid" />
 					<Add library="odbc32" />
 					<Add library="odbccp32" />
-					<Add library="libjackmp" />
+					<Add library="libjack" />
 					<Add directory="Release\bin" />
 				</Linker>
 			</Target>
@@ -90,7 +90,7 @@
 					<Add library="uuid" />
 					<Add library="odbc32" />
 					<Add library="odbccp32" />
-					<Add library="libjackmp" />
+					<Add library="libjack" />
 					<Add directory="Release\bin" />
 				</Linker>
 			</Target>
@@ -111,7 +111,7 @@
 			<Add library="uuid" />
 			<Add library="odbc32" />
 			<Add library="odbccp32" />
-			<Add library="libjackmp" />
+			<Add library="libjack" />
 		</Linker>
 		<Unit filename="..\example-clients\connect.c">
 			<Option compilerVar="CC" />
diff --git a/windows/jack_disconnect.cbp b/windows/jack_disconnect.cbp
index 57f1998f..71ce2d31 100644
--- a/windows/jack_disconnect.cbp
+++ b/windows/jack_disconnect.cbp
@@ -31,7 +31,7 @@
 					<Add library="uuid" />
 					<Add library="odbc32" />
 					<Add library="odbccp32" />
-					<Add library="libjackmp" />
+					<Add library="libjack" />
 					<Add directory="Release\bin" />
 				</Linker>
 			</Target>
@@ -60,7 +60,7 @@
 					<Add library="uuid" />
 					<Add library="odbc32" />
 					<Add library="odbccp32" />
-					<Add library="libjackmp" />
+					<Add library="libjack" />
 					<Add directory="Release\bin" />
 				</Linker>
 			</Target>
@@ -90,7 +90,7 @@
 					<Add library="uuid" />
 					<Add library="odbc32" />
 					<Add library="odbccp32" />
-					<Add library="libjackmp" />
+					<Add library="libjack" />
 					<Add directory="Release\bin" />
 				</Linker>
 			</Target>
@@ -111,7 +111,7 @@
 			<Add library="uuid" />
 			<Add library="odbc32" />
 			<Add library="odbccp32" />
-			<Add library="libjackmp" />
+			<Add library="libjack" />
 		</Linker>
 		<Unit filename="..\example-clients\connect.c">
 			<Option compilerVar="CC" />
diff --git a/windows/jack_dummy.cbp b/windows/jack_dummy.cbp
index 4e0ea5ee..1da22f00 100644
--- a/windows/jack_dummy.cbp
+++ b/windows/jack_dummy.cbp
@@ -7,7 +7,7 @@
 		<Option compiler="gcc" />
 		<Build>
 			<Target title="Win32 Release">
-				<Option output="Release\bin\jackmp\jack_dummy" prefix_auto="1" extension_auto="1" />
+				<Option output="Release\bin\jack\jack_dummy" prefix_auto="1" extension_auto="1" />
 				<Option object_output="Release\" />
 				<Option type="3" />
 				<Option compiler="gcc" />
@@ -32,12 +32,12 @@
 					<Add library="uuid" />
 					<Add library="odbc32" />
 					<Add library="odbccp32" />
-					<Add library="libjackservermp" />
+					<Add library="libjackserver" />
 					<Add directory="Release\bin" />
 				</Linker>
 			</Target>
 			<Target title="Win32 Debug">
-				<Option output="Debug\bin\jackmp\jack_dummy" prefix_auto="1" extension_auto="1" />
+				<Option output="Debug\bin\jack\jack_dummy" prefix_auto="1" extension_auto="1" />
 				<Option object_output="Debug\" />
 				<Option type="3" />
 				<Option compiler="gcc" />
@@ -62,12 +62,12 @@
 					<Add library="uuid" />
 					<Add library="odbc32" />
 					<Add library="odbccp32" />
-					<Add library="libjackservermp" />
+					<Add library="libjackserver" />
 					<Add directory="Debug\bin" />
 				</Linker>
 			</Target>
 			<Target title="Win32 Monitor">
-				<Option output="Release\bin\jackmp\jack_dummy" prefix_auto="1" extension_auto="1" />
+				<Option output="Release\bin\jack\jack_dummy" prefix_auto="1" extension_auto="1" />
 				<Option object_output="Release\" />
 				<Option type="3" />
 				<Option compiler="gcc" />
@@ -93,7 +93,7 @@
 					<Add library="uuid" />
 					<Add library="odbc32" />
 					<Add library="odbccp32" />
-					<Add library="libjackservermp" />
+					<Add library="libjackserver" />
 					<Add directory="Release\bin" />
 				</Linker>
 			</Target>
@@ -114,7 +114,7 @@
 			<Add library="uuid" />
 			<Add library="odbc32" />
 			<Add library="odbccp32" />
-			<Add library="libjackservermp" />
+			<Add library="libjackserver" />
 		</Linker>
 		<Unit filename="..\common\JackDummyDriver.cpp" />
 		<Extensions>
diff --git a/windows/jack_load.cbp b/windows/jack_load.cbp
index 22370e83..0194570d 100644
--- a/windows/jack_load.cbp
+++ b/windows/jack_load.cbp
@@ -32,7 +32,7 @@
 					<Add library="uuid" />
 					<Add library="odbc32" />
 					<Add library="odbccp32" />
-					<Add library="libjackmp" />
+					<Add library="libjack" />
 					<Add directory="Release\bin" />
 				</Linker>
 			</Target>
@@ -61,7 +61,7 @@
 					<Add library="uuid" />
 					<Add library="odbc32" />
 					<Add library="odbccp32" />
-					<Add library="libjackmp" />
+					<Add library="libjack" />
 					<Add directory="Debug\bin" />
 				</Linker>
 			</Target>
@@ -92,7 +92,7 @@
 					<Add library="uuid" />
 					<Add library="odbc32" />
 					<Add library="odbccp32" />
-					<Add library="libjackmp" />
+					<Add library="libjack" />
 					<Add directory="Release\bin" />
 				</Linker>
 			</Target>
@@ -113,7 +113,7 @@
 			<Add library="uuid" />
 			<Add library="odbc32" />
 			<Add library="odbccp32" />
-			<Add library="libjackmp" />
+			<Add library="libjack" />
 		</Linker>
 		<Unit filename="..\example-clients\ipload.c">
 			<Option compilerVar="CC" />
diff --git a/windows/jack_lsp.cbp b/windows/jack_lsp.cbp
index ce7500b9..ecb6766a 100644
--- a/windows/jack_lsp.cbp
+++ b/windows/jack_lsp.cbp
@@ -30,7 +30,7 @@
 					<Add library="uuid" />
 					<Add library="odbc32" />
 					<Add library="odbccp32" />
-					<Add library="libjackmp" />
+					<Add library="libjack" />
 					<Add directory="Release\bin" />
 				</Linker>
 			</Target>
@@ -57,7 +57,7 @@
 					<Add library="uuid" />
 					<Add library="odbc32" />
 					<Add library="odbccp32" />
-					<Add library="libjackmp" />
+					<Add library="libjack" />
 					<Add directory="Debug\bin" />
 				</Linker>
 			</Target>
@@ -85,7 +85,7 @@
 					<Add library="uuid" />
 					<Add library="odbc32" />
 					<Add library="odbccp32" />
-					<Add library="libjackmp" />
+					<Add library="libjack" />
 					<Add directory="Release\bin" />
 				</Linker>
 			</Target>
@@ -105,7 +105,7 @@
 			<Add library="uuid" />
 			<Add library="odbc32" />
 			<Add library="odbccp32" />
-			<Add library="libjackmp" />
+			<Add library="libjack" />
 		</Linker>
 		<Unit filename="..\example-clients\lsp.c">
 			<Option compilerVar="CC" />
diff --git a/windows/jack_metro.cbp b/windows/jack_metro.cbp
index 9e38d08d..31efd65e 100644
--- a/windows/jack_metro.cbp
+++ b/windows/jack_metro.cbp
@@ -32,7 +32,7 @@
 					<Add library="uuid" />
 					<Add library="odbc32" />
 					<Add library="odbccp32" />
-					<Add library="libjackmp" />
+					<Add library="libjack" />
 					<Add directory="Release\bin" />
 				</Linker>
 			</Target>
@@ -62,7 +62,7 @@
 					<Add library="uuid" />
 					<Add library="odbc32" />
 					<Add library="odbccp32" />
-					<Add library="libjackmp" />
+					<Add library="libjack" />
 					<Add directory="Debug\bin" />
 				</Linker>
 			</Target>
@@ -93,7 +93,7 @@
 					<Add library="uuid" />
 					<Add library="odbc32" />
 					<Add library="odbccp32" />
-					<Add library="libjackmp" />
+					<Add library="libjack" />
 					<Add directory="Release\bin" />
 				</Linker>
 			</Target>
@@ -114,7 +114,7 @@
 			<Add library="uuid" />
 			<Add library="odbc32" />
 			<Add library="odbccp32" />
-			<Add library="libjackmp" />
+			<Add library="libjack" />
 		</Linker>
 		<Unit filename="..\example-clients\metro.c">
 			<Option compilerVar="CC" />
diff --git a/windows/jack_netadapter.cbp b/windows/jack_netadapter.cbp
index 46e0c7d4..0946bc73 100644
--- a/windows/jack_netadapter.cbp
+++ b/windows/jack_netadapter.cbp
@@ -7,7 +7,7 @@
 		<Option compiler="gcc" />
 		<Build>
 			<Target title="Win32 Release">
-				<Option output="Release\bin\jackmp\netadapter" prefix_auto="1" extension_auto="1" />
+				<Option output="Release\bin\jack\netadapter" prefix_auto="1" extension_auto="1" />
 				<Option object_output="Release\" />
 				<Option type="3" />
 				<Option compiler="gcc" />
@@ -20,8 +20,9 @@
 					<Add directory="..\windows" />
 				</Compiler>
 				<Linker>
-					<Add library="user32" />
+					<Add option="-enable-auto-import" />
 					<Add library="kernel32" />
+					<Add library="user32" />
 					<Add library="gdi32" />
 					<Add library="winspool" />
 					<Add library="comdlg32" />
@@ -32,13 +33,13 @@
 					<Add library="uuid" />
 					<Add library="odbc32" />
 					<Add library="odbccp32" />
-					<Add library="libjackservermp" />
+					<Add library="libjackserver" />
 					<Add library="libsamplerate-0" />
 					<Add directory="Release\bin" />
 				</Linker>
 			</Target>
 			<Target title="Win32 Debug">
-				<Option output="Debug\bin\jackmp\netadapter" prefix_auto="1" extension_auto="1" />
+				<Option output="Debug\bin\jack\netadapter" prefix_auto="1" extension_auto="1" />
 				<Option object_output="Debug\" />
 				<Option type="3" />
 				<Option compiler="gcc" />
@@ -51,8 +52,9 @@
 					<Add directory="..\windows" />
 				</Compiler>
 				<Linker>
-					<Add library="user32" />
+					<Add option="-enable-auto-import" />
 					<Add library="kernel32" />
+					<Add library="user32" />
 					<Add library="gdi32" />
 					<Add library="winspool" />
 					<Add library="comdlg32" />
@@ -63,13 +65,13 @@
 					<Add library="uuid" />
 					<Add library="odbc32" />
 					<Add library="odbccp32" />
-					<Add library="libjackservermp" />
+					<Add library="libjackserver" />
 					<Add library="libsamplerate-0" />
 					<Add directory="Debug\bin" />
 				</Linker>
 			</Target>
 			<Target title="Win32 Monitor">
-				<Option output="Release\bin\jackmp\netadapter" prefix_auto="1" extension_auto="1" />
+				<Option output="Release\bin\jack\netadapter" prefix_auto="1" extension_auto="1" />
 				<Option object_output="Release\" />
 				<Option type="3" />
 				<Option compiler="gcc" />
@@ -83,6 +85,7 @@
 					<Add directory="..\windows" />
 				</Compiler>
 				<Linker>
+					<Add option="-enable-auto-import" />
 					<Add library="kernel32" />
 					<Add library="user32" />
 					<Add library="gdi32" />
@@ -95,7 +98,7 @@
 					<Add library="uuid" />
 					<Add library="odbc32" />
 					<Add library="odbccp32" />
-					<Add library="libjackservermp" />
+					<Add library="libjackserver" />
 					<Add library="libsamplerate-0" />
 					<Add directory="Release\bin" />
 				</Linker>
@@ -108,6 +111,7 @@
 			<Add directory="..\windows" />
 		</Compiler>
 		<Linker>
+			<Add option="-enable-auto-import" />
 			<Add library="kernel32" />
 			<Add library="user32" />
 			<Add library="gdi32" />
@@ -120,7 +124,7 @@
 			<Add library="uuid" />
 			<Add library="odbc32" />
 			<Add library="odbccp32" />
-			<Add library="libjackservermp" />
+			<Add library="libjackserver" />
 			<Add library="libsamplerate-0" />
 			<Add directory="Release\bin" />
 		</Linker>
diff --git a/windows/jack_netdriver.cbp b/windows/jack_netdriver.cbp
index f7dcea35..ccba0fd5 100644
--- a/windows/jack_netdriver.cbp
+++ b/windows/jack_netdriver.cbp
@@ -7,7 +7,7 @@
 		<Option compiler="gcc" />
 		<Build>
 			<Target title="Win32 Release">
-				<Option output="Release\bin\jackmp\jack_net" prefix_auto="1" extension_auto="1" />
+				<Option output="Release\bin\jack\jack_net" prefix_auto="1" extension_auto="1" />
 				<Option object_output="Release\" />
 				<Option type="3" />
 				<Option compiler="gcc" />
@@ -33,13 +33,13 @@
 					<Add library="uuid" />
 					<Add library="odbc32" />
 					<Add library="odbccp32" />
-					<Add library="libjackservermp" />
+					<Add library="libjackserver" />
 					<Add library="ws2_32" />
 					<Add directory="Release\bin" />
 				</Linker>
 			</Target>
 			<Target title="Win32 Debug">
-				<Option output="Debug\bin\jackmp\jack_net" prefix_auto="1" extension_auto="1" />
+				<Option output="Debug\bin\jack\jack_net" prefix_auto="1" extension_auto="1" />
 				<Option object_output="Debug\" />
 				<Option type="3" />
 				<Option compiler="gcc" />
@@ -53,8 +53,8 @@
 				</Compiler>
 				<Linker>
 					<Add option="-enable-auto-import" />
-					<Add library="user32" />
 					<Add library="kernel32" />
+					<Add library="user32" />
 					<Add library="gdi32" />
 					<Add library="winspool" />
 					<Add library="comdlg32" />
@@ -65,13 +65,13 @@
 					<Add library="uuid" />
 					<Add library="odbc32" />
 					<Add library="odbccp32" />
-					<Add library="libjackservermp" />
+					<Add library="libjackserver" />
 					<Add library="ws2_32" />
 					<Add directory="Debug\bin" />
 				</Linker>
 			</Target>
 			<Target title="Win32 Monitor">
-				<Option output="Release\bin\jackmp\jack_net" prefix_auto="1" extension_auto="1" />
+				<Option output="Release\bin\jack\jack_net" prefix_auto="1" extension_auto="1" />
 				<Option object_output="Release\" />
 				<Option type="3" />
 				<Option compiler="gcc" />
@@ -98,7 +98,7 @@
 					<Add library="uuid" />
 					<Add library="odbc32" />
 					<Add library="odbccp32" />
-					<Add library="libjackservermp" />
+					<Add library="libjackserver" />
 					<Add library="ws2_32" />
 					<Add directory="Release\bin" />
 				</Linker>
@@ -121,7 +121,7 @@
 			<Add library="uuid" />
 			<Add library="odbc32" />
 			<Add library="odbccp32" />
-			<Add library="libjackservermp" />
+			<Add library="libjackserver" />
 			<Add library="ws2_32" />
 		</Linker>
 		<Unit filename="..\common\JackNetDriver.cpp" />
diff --git a/windows/jack_netmanager.cbp b/windows/jack_netmanager.cbp
index a774a10b..9ae80683 100644
--- a/windows/jack_netmanager.cbp
+++ b/windows/jack_netmanager.cbp
@@ -7,7 +7,7 @@
 		<Option compiler="gcc" />
 		<Build>
 			<Target title="Win32 Release">
-				<Option output="Release\bin\jackmp\netmanager" prefix_auto="1" extension_auto="1" />
+				<Option output="Release\bin\jack\netmanager" prefix_auto="1" extension_auto="1" />
 				<Option object_output="Release\" />
 				<Option type="3" />
 				<Option compiler="gcc" />
@@ -33,12 +33,12 @@
 					<Add library="odbc32" />
 					<Add library="odbccp32" />
 					<Add library="ws2_32" />
-					<Add library="libjackservermp" />
+					<Add library="libjackserver" />
 					<Add directory="Release\bin" />
 				</Linker>
 			</Target>
 			<Target title="Win32 Debug">
-				<Option output="Debug\bin\jackmp\netmanager" prefix_auto="1" extension_auto="1" />
+				<Option output="Debug\bin\jack\netmanager" prefix_auto="1" extension_auto="1" />
 				<Option object_output="Debug\" />
 				<Option type="3" />
 				<Option compiler="gcc" />
@@ -64,12 +64,12 @@
 					<Add library="odbc32" />
 					<Add library="odbccp32" />
 					<Add library="ws2_32" />
-					<Add library="libjackservermp" />
+					<Add library="libjackserver" />
 					<Add directory="Debug\bin" />
 				</Linker>
 			</Target>
 			<Target title="Win32 Monitor">
-				<Option output="Release\bin\jackmp\netmanager" prefix_auto="1" extension_auto="1" />
+				<Option output="Release\bin\jack\netmanager" prefix_auto="1" extension_auto="1" />
 				<Option object_output="Release\" />
 				<Option type="3" />
 				<Option compiler="gcc" />
@@ -96,7 +96,7 @@
 					<Add library="odbc32" />
 					<Add library="odbccp32" />
 					<Add library="ws2_32" />
-					<Add library="libjackservermp" />
+					<Add library="libjackserver" />
 					<Add directory="Release\bin" />
 				</Linker>
 			</Target>
@@ -119,7 +119,7 @@
 			<Add library="odbc32" />
 			<Add library="odbccp32" />
 			<Add library="ws2_32" />
-			<Add library="libjackservermp" />
+			<Add library="libjackserver" />
 		</Linker>
 		<Unit filename="..\common\JackNetManager.cpp" />
 		<Unit filename="jacknetmanager.rc">
diff --git a/windows/jack_portaudio.cbp b/windows/jack_portaudio.cbp
index 4cdcdcc4..e7daf124 100644
--- a/windows/jack_portaudio.cbp
+++ b/windows/jack_portaudio.cbp
@@ -7,7 +7,7 @@
 		<Option compiler="gcc" />
 		<Build>
 			<Target title="Win32 Release">
-				<Option output="Release\bin\jackmp\jack_portaudio" prefix_auto="1" extension_auto="1" />
+				<Option output="Release\bin\jack\jack_portaudio" prefix_auto="1" extension_auto="1" />
 				<Option object_output="Release" />
 				<Option type="3" />
 				<Option compiler="gcc" />
@@ -37,14 +37,14 @@
 					<Add library="uuid" />
 					<Add library="odbc32" />
 					<Add library="odbccp32" />
-					<Add library="libjackservermp" />
+					<Add library="libjackserver" />
 					<Add library="portaudio_x86" />
 					<Add directory="Release\bin" />
 					<Add directory="..\windows" />
 				</Linker>
 			</Target>
 			<Target title="Win32 Debug">
-				<Option output="Debug\bin\jackmp\jack_portaudio" prefix_auto="1" extension_auto="1" />
+				<Option output="Debug\bin\jack\jack_portaudio" prefix_auto="1" extension_auto="1" />
 				<Option object_output="Debug" />
 				<Option type="3" />
 				<Option compiler="gcc" />
@@ -74,14 +74,14 @@
 					<Add library="uuid" />
 					<Add library="odbc32" />
 					<Add library="odbccp32" />
-					<Add library="libjackservermp" />
+					<Add library="libjackserver" />
 					<Add library="portaudio_x86" />
 					<Add directory="Debug\bin" />
 					<Add directory="..\windows" />
 				</Linker>
 			</Target>
 			<Target title="Win32 Monitor">
-				<Option output="Release\bin\jackmp\jack_portaudio" prefix_auto="1" extension_auto="1" />
+				<Option output="Release\bin\jack\jack_portaudio" prefix_auto="1" extension_auto="1" />
 				<Option object_output="Release" />
 				<Option type="3" />
 				<Option compiler="gcc" />
@@ -112,7 +112,7 @@
 					<Add library="uuid" />
 					<Add library="odbc32" />
 					<Add library="odbccp32" />
-					<Add library="libjackservermp" />
+					<Add library="libjackserver" />
 					<Add library="portaudio_x86" />
 					<Add directory="Release\bin" />
 					<Add directory="..\windows" />
@@ -135,7 +135,7 @@
 			<Add library="uuid" />
 			<Add library="odbc32" />
 			<Add library="odbccp32" />
-			<Add library="libjackservermp" />
+			<Add library="libjackserver" />
 			<Add library="portaudio_x86" />
 		</Linker>
 		<Unit filename="JackPortAudioDevices.cpp" />
diff --git a/windows/jack_unload.cbp b/windows/jack_unload.cbp
index 6e7621ed..edbde77d 100644
--- a/windows/jack_unload.cbp
+++ b/windows/jack_unload.cbp
@@ -31,7 +31,7 @@
 					<Add library="uuid" />
 					<Add library="odbc32" />
 					<Add library="odbccp32" />
-					<Add library="libjackmp" />
+					<Add library="libjack" />
 					<Add directory="Release\bin" />
 				</Linker>
 			</Target>
@@ -60,7 +60,7 @@
 					<Add library="uuid" />
 					<Add library="odbc32" />
 					<Add library="odbccp32" />
-					<Add library="libjackmp" />
+					<Add library="libjack" />
 					<Add directory="Debug\bin" />
 				</Linker>
 			</Target>
@@ -90,7 +90,7 @@
 					<Add library="uuid" />
 					<Add library="odbc32" />
 					<Add library="odbccp32" />
-					<Add library="libjackmp" />
+					<Add library="libjack" />
 					<Add directory="Release\bin" />
 				</Linker>
 			</Target>
@@ -111,7 +111,7 @@
 			<Add library="uuid" />
 			<Add library="odbc32" />
 			<Add library="odbccp32" />
-			<Add library="libjackmp" />
+			<Add library="libjack" />
 		</Linker>
 		<Unit filename="..\example-clients\ipunload.c">
 			<Option compilerVar="CC" />
diff --git a/windows/jackdmp.cbp b/windows/jackd.cbp
similarity index 90%
rename from windows/jackdmp.cbp
rename to windows/jackd.cbp
index 8ef561f5..963fdf66 100644
--- a/windows/jackdmp.cbp
+++ b/windows/jackd.cbp
@@ -2,12 +2,12 @@
 <CodeBlocks_project_file>
 	<FileVersion major="1" minor="6" />
 	<Project>
-		<Option title="jackdmp" />
+		<Option title="jackd" />
 		<Option pch_mode="2" />
 		<Option compiler="gcc" />
 		<Build>
 			<Target title="Win32 Release">
-				<Option output="Release\bin\jackdmp" prefix_auto="1" extension_auto="1" />
+				<Option output="Release\bin\jackd" prefix_auto="1" extension_auto="1" />
 				<Option object_output="Release" />
 				<Option type="1" />
 				<Option compiler="gcc" />
@@ -37,12 +37,12 @@
 					<Add library="uuid" />
 					<Add library="odbc32" />
 					<Add library="odbccp32" />
-					<Add library="libjackservermp" />
+					<Add library="libjackserver" />
 					<Add directory="Release\bin" />
 				</Linker>
 			</Target>
 			<Target title="Win32 Debug">
-				<Option output="Debug\bin\jackdmp" prefix_auto="1" extension_auto="1" />
+				<Option output="Debug\bin\jackd" prefix_auto="1" extension_auto="1" />
 				<Option object_output="Debug" />
 				<Option type="1" />
 				<Option compiler="gcc" />
@@ -71,12 +71,12 @@
 					<Add library="uuid" />
 					<Add library="odbc32" />
 					<Add library="odbccp32" />
-					<Add library="libjackservermp" />
+					<Add library="libjackserver" />
 					<Add directory="Debug\bin" />
 				</Linker>
 			</Target>
 			<Target title="Win32 Monitor">
-				<Option output="Release\bin\jackdmp" prefix_auto="1" extension_auto="1" />
+				<Option output="Release\bin\jackd" prefix_auto="1" extension_auto="1" />
 				<Option object_output="Release" />
 				<Option type="1" />
 				<Option compiler="gcc" />
@@ -107,7 +107,7 @@
 					<Add library="uuid" />
 					<Add library="odbc32" />
 					<Add library="odbccp32" />
-					<Add library="libjackservermp" />
+					<Add library="libjackserver" />
 					<Add directory="Release\bin" />
 				</Linker>
 			</Target>
@@ -128,7 +128,7 @@
 			<Add library="uuid" />
 			<Add library="odbc32" />
 			<Add library="odbccp32" />
-			<Add library="libjackservermp" />
+			<Add library="libjackserver" />
 		</Linker>
 		<Unit filename="..\common\Jackdmp.cpp" />
 		<Unit filename="getopt.c">
@@ -137,7 +137,7 @@
 		<Unit filename="getopt1.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="jackdmp.rc">
+		<Unit filename="jackd.rc">
 			<Option compilerVar="WINDRES" />
 		</Unit>
 		<Extensions>
diff --git a/windows/jackdmp.rc b/windows/jackd.rc
similarity index 79%
rename from windows/jackdmp.rc
rename to windows/jackd.rc
index 4300c5e4..0ead5b9f 100644
--- a/windows/jackdmp.rc
+++ b/windows/jackd.rc
@@ -1,48 +1,48 @@
-// Generated by ResEdit 1.4.3
-// Copyright (C) 2006-2008
-// http://www.resedit.net
-
-#include "resource.h"
-#include "afxres.h"
-
-
-//
-// Version Information resources
-//
-LANGUAGE LANG_FRENCH, SUBLANG_DEFAULT
-1 VERSIONINFO
-    FILEVERSION     1,9,0,0
-    PRODUCTVERSION  1,9,0,0
-    FILEOS          VOS_UNKNOWN
-    FILETYPE        VFT_APP
-BEGIN
-    BLOCK "StringFileInfo"
-    BEGIN
-        BLOCK "040c04b0"
-        BEGIN
-            VALUE "Comments", "\0"
-            VALUE "CompanyName", "Grame\0"
-            VALUE "FileDescription", "Jackmp server for Windows\0"
-            VALUE "FileVersion", "1, 9, 0, 0\0"
-            VALUE "InternalName", "jackdmp\0"
-            VALUE "LegalCopyright", "Copyright Grame © 2006-2008\0"
-            VALUE "LegalTrademarks", "\0"
-            VALUE "OriginalFilename", "jackdmp.exe\0"
-            VALUE "PrivateBuild", "\0"
-            VALUE "ProductName", "jackdmp\0"
-            VALUE "ProductVersion", "1, 9, 0, 0\0"
-            VALUE "SpecialBuild", "\0"
-        END
-    END
-    BLOCK "VarFileInfo"
-    BEGIN
-        VALUE "Translation", 1036, 1200
-    END
-END
-
-
-//
-// Icon resources
-//
-LANGUAGE LANG_FRENCH, SUBLANG_DEFAULT
-IDI_ICON1          ICON           ".\\Setup\\src\\jack.ico"
+// Generated by ResEdit 1.4.3
+// Copyright (C) 2006-2008
+// http://www.resedit.net
+
+#include "resource.h"
+#include "afxres.h"
+
+
+//
+// Version Information resources
+//
+LANGUAGE LANG_FRENCH, SUBLANG_DEFAULT
+1 VERSIONINFO
+    FILEVERSION     1,9,0,0
+    PRODUCTVERSION  1,9,0,0
+    FILEOS          VOS_UNKNOWN
+    FILETYPE        VFT_APP
+BEGIN
+    BLOCK "StringFileInfo"
+    BEGIN
+        BLOCK "040c04b0"
+        BEGIN
+            VALUE "Comments", "\0"
+            VALUE "CompanyName", "Grame\0"
+            VALUE "FileDescription", "Jack server for Windows\0"
+            VALUE "FileVersion", "1, 9, 0, 0\0"
+            VALUE "InternalName", "jackd\0"
+            VALUE "LegalCopyright", "Copyright Grame © 2006-2008\0"
+            VALUE "LegalTrademarks", "\0"
+            VALUE "OriginalFilename", "jackd.exe\0"
+            VALUE "PrivateBuild", "\0"
+            VALUE "ProductName", "jackd\0"
+            VALUE "ProductVersion", "1, 9, 0, 0\0"
+            VALUE "SpecialBuild", "\0"
+        END
+    END
+    BLOCK "VarFileInfo"
+    BEGIN
+        VALUE "Translation", 1036, 1200
+    END
+END
+
+
+//
+// Icon resources
+//
+LANGUAGE LANG_FRENCH, SUBLANG_DEFAULT
+IDI_ICON1          ICON           ".\\Setup\\src\\jack.ico"
diff --git a/windows/jackd.workspace b/windows/jackd.workspace
new file mode 100644
index 00000000..848c2c7d
--- /dev/null
+++ b/windows/jackd.workspace
@@ -0,0 +1,60 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
+<CodeBlocks_workspace_file>
+	<Workspace title="jack">
+		<Project filename="libjackserver.cbp" />
+		<Project filename="jackd.cbp">
+			<Depends filename="libjackserver.cbp" />
+		</Project>
+		<Project filename="jack_portaudio.cbp" active="1">
+			<Depends filename="libjackserver.cbp" />
+			<Depends filename="jackd.cbp" />
+		</Project>
+		<Project filename="jack_netdriver.cbp">
+			<Depends filename="libjackserver.cbp" />
+			<Depends filename="jackd.cbp" />
+		</Project>
+		<Project filename="jack_dummy.cbp">
+			<Depends filename="libjackserver.cbp" />
+			<Depends filename="jackd.cbp" />
+		</Project>
+		<Project filename="jack_netmanager.cbp">
+			<Depends filename="libjackserver.cbp" />
+			<Depends filename="jackd.cbp" />
+			<Depends filename="jack_netdriver.cbp" />
+			<Depends filename="jack_netadapter.cbp" />
+		</Project>
+		<Project filename="jack_audioadapter.cbp">
+			<Depends filename="libjackserver.cbp" />
+			<Depends filename="jackd.cbp" />
+		</Project>
+		<Project filename="jack_netadapter.cbp">
+			<Depends filename="libjackserver.cbp" />
+			<Depends filename="jackd.cbp" />
+		</Project>
+		<Project filename="libjack.cbp" />
+		<Project filename="jack_load.cbp">
+			<Depends filename="jackd.cbp" />
+			<Depends filename="libjack.cbp" />
+		</Project>
+		<Project filename="jack_unload.cbp">
+			<Depends filename="jackd.cbp" />
+			<Depends filename="libjack.cbp" />
+		</Project>
+		<Project filename="jack_lsp.cbp">
+			<Depends filename="jackd.cbp" />
+			<Depends filename="libjack.cbp" />
+		</Project>
+		<Project filename="jack_metro.cbp">
+			<Depends filename="jackd.cbp" />
+			<Depends filename="libjack.cbp" />
+		</Project>
+		<Project filename="jack_connect.cbp">
+			<Depends filename="jackd.cbp" />
+			<Depends filename="libjack.cbp" />
+		</Project>
+		<Project filename="jack_disconnect.cbp">
+			<Depends filename="jackd.cbp" />
+			<Depends filename="libjack.cbp" />
+		</Project>
+	</Workspace>
+</CodeBlocks_workspace_file>
diff --git a/windows/jackdmp.workspace b/windows/jackdmp.workspace
deleted file mode 100644
index 9938bff0..00000000
--- a/windows/jackdmp.workspace
+++ /dev/null
@@ -1,42 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
-<CodeBlocks_workspace_file>
-	<Workspace title="jackdmp workspace">
-		<Project filename="libjackservermp.cbp" />
-		<Project filename="libjackmp.cbp" />
-		<Project filename="jackdmp.cbp">
-			<Depends filename="libjackservermp.cbp" />
-		</Project>
-		<Project filename="jack_dummy.cbp" />
-		<Project filename="jack_portaudio.cbp">
-			<Depends filename="libjackservermp.cbp" />
-		</Project>
-		<Project filename="jack_audioadapter.cbp">
-			<Depends filename="libjackservermp.cbp" />
-		</Project>
-		<Project filename="jack_netdriver.cbp">
-			<Depends filename="libjackservermp.cbp" />
-		</Project>
-		<Project filename="jack_netadapter.cbp" active="1">
-			<Depends filename="libjackservermp.cbp" />
-		</Project>
-		<Project filename="jack_netmanager.cbp">
-			<Depends filename="libjackservermp.cbp" />
-		</Project>
-		<Project filename="jack_load.cbp">
-			<Depends filename="libjackmp.cbp" />
-		</Project>
-		<Project filename="jack_unload.cbp">
-			<Depends filename="libjackmp.cbp" />
-		</Project>
-		<Project filename="jack_lsp.cbp">
-			<Depends filename="libjackmp.cbp" />
-		</Project>
-		<Project filename="jack_metro.cbp">
-			<Depends filename="libjackmp.cbp" />
-		</Project>
-		<Project filename="jack_connect.cbp" />
-		<Project filename="jack_disconnect.cbp">
-			<Depends filename="libjackmp.cbp" />
-		</Project>
-	</Workspace>
-</CodeBlocks_workspace_file>
diff --git a/windows/libjackmp.cbp b/windows/libjack.cbp
similarity index 93%
rename from windows/libjackmp.cbp
rename to windows/libjack.cbp
index e9a67452..51e4c8a5 100644
--- a/windows/libjackmp.cbp
+++ b/windows/libjack.cbp
@@ -2,15 +2,16 @@
 <CodeBlocks_project_file>
 	<FileVersion major="1" minor="6" />
 	<Project>
-		<Option title="libjackmp" />
+		<Option title="libjack" />
 		<Option pch_mode="2" />
 		<Option compiler="gcc" />
 		<Build>
 			<Target title="Win32 Release">
-				<Option output="Release\bin\libjackmp" prefix_auto="1" extension_auto="1" />
+				<Option output="Release\bin\libjack" prefix_auto="1" extension_auto="1" />
 				<Option object_output="Release" />
 				<Option type="3" />
 				<Option compiler="gcc" />
+				<Option createDefFile="1" />
 				<Option createStaticLib="1" />
 				<Compiler>
 					<Add option="-O2" />
@@ -44,10 +45,11 @@
 				</Linker>
 			</Target>
 			<Target title="Win32 Debug">
-				<Option output="Debug\bin\libjackmp" prefix_auto="1" extension_auto="1" />
+				<Option output="Debug\bin\libjack" prefix_auto="1" extension_auto="1" />
 				<Option object_output="Debug" />
 				<Option type="3" />
 				<Option compiler="gcc" />
+				<Option createDefFile="1" />
 				<Option createStaticLib="1" />
 				<Compiler>
 					<Add option="-Wall" />
@@ -81,10 +83,11 @@
 				</Linker>
 			</Target>
 			<Target title="Win32 Monitor">
-				<Option output="Release\bin\libjackmp" prefix_auto="1" extension_auto="1" />
+				<Option output="Release\bin\libjack" prefix_auto="1" extension_auto="1" />
 				<Option object_output="Release" />
 				<Option type="3" />
 				<Option compiler="gcc" />
+				<Option createDefFile="1" />
 				<Option createStaticLib="1" />
 				<Compiler>
 					<Add option="-O2" />
@@ -167,7 +170,7 @@
 		<Unit filename="JackWinProcessSync.cpp" />
 		<Unit filename="JackWinSemaphore.cpp" />
 		<Unit filename="JackWinThread.cpp" />
-		<Unit filename="libjackmp.rc">
+		<Unit filename="libjack.rc">
 			<Option compilerVar="WINDRES" />
 		</Unit>
 		<Unit filename="regex.c">
diff --git a/windows/libjackmp.rc b/windows/libjack.rc
similarity index 76%
rename from windows/libjackmp.rc
rename to windows/libjack.rc
index 21907d83..e7c299c0 100644
--- a/windows/libjackmp.rc
+++ b/windows/libjack.rc
@@ -1,41 +1,41 @@
-// Generated by ResEdit 1.4.3
-// Copyright (C) 2006-2008
-// http://www.resedit.net
-
-#include "resource.h"
-#include "afxres.h"
-
-
-//
-// Version Information resources
-//
-LANGUAGE LANG_FRENCH, SUBLANG_DEFAULT
-1 VERSIONINFO
-    FILEVERSION     1,9,0,0
-    PRODUCTVERSION  1,9,0,0
-    FILEOS          VOS_UNKNOWN
-    FILETYPE        VFT_DLL
-BEGIN
-    BLOCK "StringFileInfo"
-    BEGIN
-        BLOCK "040c04b0"
-        BEGIN
-            VALUE "Comments", "\0"
-            VALUE "CompanyName", "Grame\0"
-            VALUE "FileDescription", "Jackmp client library for Windows\0"
-            VALUE "FileVersion", "1, 9, 0, 0\0"
-            VALUE "InternalName", "libjackmp\0"
-            VALUE "LegalCopyright", "Copyright Grame © 2006-2008\0"
-            VALUE "LegalTrademarks", "\0"
-            VALUE "OriginalFilename", "libjackmp.dll\0"
-            VALUE "PrivateBuild", "\0"
-            VALUE "ProductName", "libjackmp\0"
-            VALUE "ProductVersion", "1, 9, 0, 0\0"
-            VALUE "SpecialBuild", "\0"
-        END
-    END
-    BLOCK "VarFileInfo"
-    BEGIN
-        VALUE "Translation", 1036, 1200
-    END
-END
+// Generated by ResEdit 1.4.3
+// Copyright (C) 2006-2008
+// http://www.resedit.net
+
+#include "resource.h"
+#include "afxres.h"
+
+
+//
+// Version Information resources
+//
+LANGUAGE LANG_FRENCH, SUBLANG_DEFAULT
+1 VERSIONINFO
+    FILEVERSION     1,9,0,0
+    PRODUCTVERSION  1,9,0,0
+    FILEOS          VOS_UNKNOWN
+    FILETYPE        VFT_DLL
+BEGIN
+    BLOCK "StringFileInfo"
+    BEGIN
+        BLOCK "040c04b0"
+        BEGIN
+            VALUE "Comments", "\0"
+            VALUE "CompanyName", "Grame\0"
+            VALUE "FileDescription", "Jack client library for Windows\0"
+            VALUE "FileVersion", "1, 9, 0, 0\0"
+            VALUE "InternalName", "libjack\0"
+            VALUE "LegalCopyright", "Copyright Grame © 2006-2008\0"
+            VALUE "LegalTrademarks", "\0"
+            VALUE "OriginalFilename", "libjack.dll\0"
+            VALUE "PrivateBuild", "\0"
+            VALUE "ProductName", "libjack\0"
+            VALUE "ProductVersion", "1, 9, 0, 0\0"
+            VALUE "SpecialBuild", "\0"
+        END
+    END
+    BLOCK "VarFileInfo"
+    BEGIN
+        VALUE "Translation", 1036, 1200
+    END
+END
diff --git a/windows/libjackservermp.cbp b/windows/libjackserver.cbp
similarity index 94%
rename from windows/libjackservermp.cbp
rename to windows/libjackserver.cbp
index fb635ab2..2974491f 100644
--- a/windows/libjackservermp.cbp
+++ b/windows/libjackserver.cbp
@@ -2,15 +2,16 @@
 <CodeBlocks_project_file>
 	<FileVersion major="1" minor="6" />
 	<Project>
-		<Option title="libjackservermp" />
+		<Option title="libjackserver" />
 		<Option pch_mode="2" />
 		<Option compiler="gcc" />
 		<Build>
 			<Target title="Win32 Release">
-				<Option output="Release\bin\libjackservermp" prefix_auto="1" extension_auto="1" />
+				<Option output="Release\bin\libjackserver" prefix_auto="1" extension_auto="1" />
 				<Option object_output="Release" />
 				<Option type="3" />
 				<Option compiler="gcc" />
+				<Option createDefFile="1" />
 				<Option createStaticLib="1" />
 				<Compiler>
 					<Add option="-O2" />
@@ -45,10 +46,11 @@
 				</Linker>
 			</Target>
 			<Target title="Win32 Debug">
-				<Option output="Debug\bin\libjackservermp" prefix_auto="1" extension_auto="1" />
+				<Option output="Debug\bin\libjackserver" prefix_auto="1" extension_auto="1" />
 				<Option object_output="Debug" />
 				<Option type="3" />
 				<Option compiler="gcc" />
+				<Option createDefFile="1" />
 				<Option createStaticLib="1" />
 				<Compiler>
 					<Add option="-Wall" />
@@ -83,10 +85,11 @@
 				</Linker>
 			</Target>
 			<Target title="Win32 Monitor">
-				<Option output="Release\bin\libjackservermp" prefix_auto="1" extension_auto="1" />
+				<Option output="Release\bin\libjackserver" prefix_auto="1" extension_auto="1" />
 				<Option object_output="Release" />
 				<Option type="3" />
 				<Option compiler="gcc" />
+				<Option createDefFile="1" />
 				<Option createStaticLib="1" />
 				<Compiler>
 					<Add option="-O2" />
@@ -203,7 +206,7 @@
 		<Unit filename="getopt1.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="libjackservermp.rc">
+		<Unit filename="libjackserver.rc">
 			<Option compilerVar="WINDRES" />
 		</Unit>
 		<Unit filename="regex.c">
diff --git a/windows/libjackservermp.rc b/windows/libjackserver.rc
similarity index 75%
rename from windows/libjackservermp.rc
rename to windows/libjackserver.rc
index 2f3e19e6..7a0e9b5a 100644
--- a/windows/libjackservermp.rc
+++ b/windows/libjackserver.rc
@@ -1,41 +1,41 @@
-// Generated by ResEdit 1.4.3
-// Copyright (C) 2006-2008
-// http://www.resedit.net
-
-#include "resource.h"
-#include "afxres.h"
-
-
-//
-// Version Information resources
-//
-LANGUAGE LANG_FRENCH, SUBLANG_DEFAULT
-1 VERSIONINFO
-    FILEVERSION     1,9,0,0
-    PRODUCTVERSION  1,9,0,0
-    FILEOS          VOS_UNKNOWN
-    FILETYPE        VFT_DLL
-BEGIN
-    BLOCK "StringFileInfo"
-    BEGIN
-        BLOCK "040c04b0"
-        BEGIN
-            VALUE "Comments", "\0"
-            VALUE "CompanyName", "Grame\0"
-            VALUE "FileDescription", "Jackmp server library for Windows\0"
-            VALUE "FileVersion", "1, 9, 0, 0\0"
-            VALUE "InternalName", "libjackservermp\0"
-            VALUE "LegalCopyright", "Copyright Grame © 2006-2008\0"
-            VALUE "LegalTrademarks", "\0"
-            VALUE "OriginalFilename", "libjackservermp.dll\0"
-            VALUE "PrivateBuild", "\0"
-            VALUE "ProductName", "libjackservermp\0"
-            VALUE "ProductVersion", "1, 9, 0, 0\0"
-            VALUE "SpecialBuild", "\0"
-        END
-    END
-    BLOCK "VarFileInfo"
-    BEGIN
-        VALUE "Translation", 1036, 1200
-    END
-END
+// Generated by ResEdit 1.4.3
+// Copyright (C) 2006-2008
+// http://www.resedit.net
+
+#include "resource.h"
+#include "afxres.h"
+
+
+//
+// Version Information resources
+//
+LANGUAGE LANG_FRENCH, SUBLANG_DEFAULT
+1 VERSIONINFO
+    FILEVERSION     1,9,0,0
+    PRODUCTVERSION  1,9,0,0
+    FILEOS          VOS_UNKNOWN
+    FILETYPE        VFT_DLL
+BEGIN
+    BLOCK "StringFileInfo"
+    BEGIN
+        BLOCK "040c04b0"
+        BEGIN
+            VALUE "Comments", "\0"
+            VALUE "CompanyName", "Grame\0"
+            VALUE "FileDescription", "Jack server library for Windows\0"
+            VALUE "FileVersion", "1, 9, 0, 0\0"
+            VALUE "InternalName", "libjackserver\0"
+            VALUE "LegalCopyright", "Copyright Grame © 2006-2008\0"
+            VALUE "LegalTrademarks", "\0"
+            VALUE "OriginalFilename", "libjackserver.dll\0"
+            VALUE "PrivateBuild", "\0"
+            VALUE "ProductName", "libjackserver\0"
+            VALUE "ProductVersion", "1, 9, 0, 0\0"
+            VALUE "SpecialBuild", "\0"
+        END
+    END
+    BLOCK "VarFileInfo"
+    BEGIN
+        VALUE "Translation", 1036, 1200
+    END
+END
diff --git a/windows/portaudio_x86.lib b/windows/portaudio_x86.lib
index 9d221f35..47d2551c 100644
Binary files a/windows/portaudio_x86.lib and b/windows/portaudio_x86.lib differ