diff --git a/common/JackNetIOAdapter.cpp b/common/JackAudioAdapter.cpp
similarity index 72%
rename from common/JackNetIOAdapter.cpp
rename to common/JackAudioAdapter.cpp
index f1a5124e..665b6b21 100644
--- a/common/JackNetIOAdapter.cpp
+++ b/common/JackAudioAdapter.cpp
@@ -17,7 +17,7 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
 */
 
-#include "JackNetIOAdapter.h"
+#include "JackAudioAdapter.h"
 #include "JackError.h"
 #include "JackExports.h"
 #include <stdio.h>
@@ -29,8 +29,8 @@ using namespace std;
 namespace Jack
 {
 
-JackNetIOAdapter::JackNetIOAdapter(jack_client_t* jack_client, 
-                                    JackIOAdapterInterface* audio_io, 
+JackAudioAdapter::JackAudioAdapter(jack_client_t* jack_client, 
+                                    JackAudioAdapterInterface* audio_io, 
                                     int input, 
                                     int output)
 {
@@ -39,7 +39,7 @@ JackNetIOAdapter::JackNetIOAdapter(jack_client_t* jack_client,
     fJackClient = jack_client;
     fCaptureChannels = input;
     fPlaybackChannels = output;
-    fIOAdapter = audio_io;
+    fAudioAdapter = audio_io;
     
     fCapturePortList = new jack_port_t* [fCaptureChannels];
     fPlaybackPortList = new jack_port_t* [fPlaybackChannels];
@@ -62,13 +62,13 @@ fail:
      FreePorts();
 }
 
-JackNetIOAdapter::~JackNetIOAdapter()
+JackAudioAdapter::~JackAudioAdapter()
 {
     // When called, Close has already been used for the client, thus ports are already unregistered.
-    delete fIOAdapter;
+    delete fAudioAdapter;
 }
 
-void JackNetIOAdapter::FreePorts()
+void JackAudioAdapter::FreePorts()
 {
     int i;
     
@@ -86,14 +86,14 @@ void JackNetIOAdapter::FreePorts()
     delete[] fPlaybackPortList;
 }
 
-int JackNetIOAdapter::Open()
+int JackAudioAdapter::Open()
 {
-    return fIOAdapter->Open();
+    return fAudioAdapter->Open();
 }
 
-int JackNetIOAdapter::Close()
+int JackAudioAdapter::Close()
 {
-    return fIOAdapter->Close();
+    return fAudioAdapter->Close();
 }
 
 } //namespace
@@ -103,18 +103,18 @@ extern "C"
 {
 #endif
 
-#include "JackCallbackNetIOAdapter.h"
+#include "JackCallbackAudioAdapter.h"
 
 #ifdef __linux__
-#include "JackAlsaIOAdapter.h"
+#include "JackAlsaAdapter.h"
 #endif
 
 #ifdef __APPLE__
-#include "JackCoreAudioIOAdapter.h"
+#include "JackCoreAudioAdapter.h"
 #endif
 
 #ifdef WIN32
-#include "JackPortAudioIOAdapter.h"
+#include "JackPortAudioAdapter.h"
 #endif
 
 #define max(x,y) (((x)>(y)) ? (x) : (y))
@@ -122,10 +122,10 @@ extern "C"
 
 	EXPORT int jack_initialize(jack_client_t* jack_client, const char* load_init)
 	{
-        Jack::JackNetIOAdapter* adapter;
+        Jack::JackAudioAdapter* adapter;
         const char** ports;
         
-        jack_log("Loading NetAudio Adapter");
+        jack_log("Loading audioadapter");
         
         // Find out input and output ports numbers
         int input = 0;
@@ -146,18 +146,18 @@ extern "C"
         output = max(2, output);
      
     #ifdef __linux__
-        adapter = new Jack::JackCallbackNetIOAdapter(jack_client, 
-            new Jack::JackAlsaIOAdapter(input, output, jack_get_buffer_size(jack_client), jack_get_sample_rate(jack_client)), input, output);
+        adapter = new Jack::JackCallbackAudioAdapter(jack_client, 
+            new Jack::JackAlsaAdapter(input, output, jack_get_buffer_size(jack_client), jack_get_sample_rate(jack_client)), input, output);
     #endif
 
     #ifdef WIN32
-        adapter = new Jack::JackCallbackNetIOAdapter(jack_client, 
-            new Jack::JackPortAudioIOAdapter(input, output, jack_get_buffer_size(jack_client), jack_get_sample_rate(jack_client)), input, output);
+        adapter = new Jack::JackCallbackAudioAdapter(jack_client, 
+            new Jack::JackPortAudioAdapter(input, output, jack_get_buffer_size(jack_client), jack_get_sample_rate(jack_client)), input, output);
     #endif
         
     #ifdef __APPLE__
-        adapter = new Jack::JackCallbackNetIOAdapter(jack_client, 
-            new Jack::JackCoreAudioIOAdapter(input, output, jack_get_buffer_size(jack_client), jack_get_sample_rate(jack_client)), input, output);
+        adapter = new Jack::JackCallbackAudioAdapter(jack_client, 
+            new Jack::JackCoreAudioAdapter(input, output, jack_get_buffer_size(jack_client), jack_get_sample_rate(jack_client)), input, output);
     #endif
         
         assert(adapter);
@@ -172,10 +172,10 @@ extern "C"
 
 	EXPORT void jack_finish(void* arg)
 	{
-        Jack::JackCallbackNetIOAdapter* adapter = static_cast<Jack::JackCallbackNetIOAdapter*>(arg); 
+        Jack::JackCallbackAudioAdapter* adapter = static_cast<Jack::JackCallbackAudioAdapter*>(arg); 
         
       	if (adapter) {
-			jack_log("Unloading NetAudio Adapter");
+			jack_log("Unloading audioadapter");
             adapter->Close();
 			delete adapter;
 		}
diff --git a/common/JackNetIOAdapter.h b/common/JackAudioAdapter.h
similarity index 77%
rename from common/JackNetIOAdapter.h
rename to common/JackAudioAdapter.h
index c77e2524..d46ea77b 100644
--- a/common/JackNetIOAdapter.h
+++ b/common/JackAudioAdapter.h
@@ -17,16 +17,16 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
 */
 
-#ifndef __JackNetIOAdapter__
-#define __JackNetIOAdapter__
+#ifndef __JackAudioAdapter__
+#define __JackAudioAdapter__
 
 #include "jack.h"
-#include "JackIOAdapter.h"
+#include "JackAudioAdapterInterface.h"
 
 namespace Jack
 {
 
-    class JackNetIOAdapter
+    class JackAudioAdapter
     {
 
         protected:
@@ -38,17 +38,17 @@ namespace Jack
             jack_port_t** fPlaybackPortList;
 
             jack_client_t* fJackClient;
-            JackIOAdapterInterface* fIOAdapter;
+            JackAudioAdapterInterface* fAudioAdapter;
 
             void FreePorts();
 
         public:
 
-            JackNetIOAdapter(jack_client_t* jack_client, 
-                            JackIOAdapterInterface* audio_io, 
+            JackAudioAdapter(jack_client_t* jack_client, 
+                            JackAudioAdapterInterface* audio_io, 
                             int input, 
                             int output);
-            virtual ~JackNetIOAdapter();
+            virtual ~JackAudioAdapter();
          
             int Open();
             int Close();
diff --git a/common/JackIOAdapter.cpp b/common/JackAudioAdapterInterface.cpp
similarity index 81%
rename from common/JackIOAdapter.cpp
rename to common/JackAudioAdapterInterface.cpp
index a1270285..546e404d 100644
--- a/common/JackIOAdapter.cpp
+++ b/common/JackAudioAdapterInterface.cpp
@@ -17,7 +17,7 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
 */
 
-#include "JackIOAdapter.h"
+#include "JackAudioAdapter.h"
 #include <stdio.h>
 
 namespace Jack
@@ -38,7 +38,7 @@ void MeasureTable::Write(int time1, int time2, float r1, float r2, int pos1, int
                 
 void MeasureTable::Save()
 {
-	FILE* file = fopen("JackIOAdapter.log", "w");
+	FILE* file = fopen("JackAudioAdapter.log", "w");
 
 	for (int i = 1; i < TABLE_MAX; i++) {
 		fprintf(file, "%d \t %d \t %d  \t %f \t %f \t %d \t %d \n", 
@@ -50,7 +50,7 @@ void MeasureTable::Save()
 	fclose(file);
 }
 
-void JackIOAdapterInterface::ResetRingBuffers()
+void JackAudioAdapterInterface::ResetRingBuffers()
 {
     int i;
         
@@ -63,7 +63,7 @@ void JackIOAdapterInterface::ResetRingBuffers()
     }
 }
 
-void JackIOAdapterInterface::ResampleFactor(jack_nframes_t& frame1, jack_nframes_t& frame2)
+void JackAudioAdapterInterface::ResampleFactor(jack_nframes_t& frame1, jack_nframes_t& frame2)
 {
     jack_time_t time = jack_get_time();
     
@@ -81,16 +81,16 @@ void JackIOAdapterInterface::ResampleFactor(jack_nframes_t& frame1, jack_nframes
         jack_nframes_t time2 = fProducerDLL.Time2Frames(time);
         frame1 = time1;
         frame2 = time2;
-        jack_log("JackIOAdapterInterface::ResampleFactor src_ratio_input = %f src_ratio_output = %f", double(time1) / double(time2), double(time2) / double(time1));
+        jack_log("JackAudioAdapterInterface::ResampleFactor src_ratio_input = %f src_ratio_output = %f", double(time1) / double(time2), double(time2) / double(time1));
     }
 }
 
-int JackIOAdapterInterface::Open()
+int JackAudioAdapterInterface::Open()
 {
     return 0;
 }
 
-int JackIOAdapterInterface::Close()
+int JackAudioAdapterInterface::Close()
 {
     return 0;
 }
diff --git a/common/JackIOAdapter.h b/common/JackAudioAdapterInterface.h
similarity index 93%
rename from common/JackIOAdapter.h
rename to common/JackAudioAdapterInterface.h
index 689c1343..cdc9223d 100644
--- a/common/JackIOAdapter.h
+++ b/common/JackAudioAdapterInterface.h
@@ -17,8 +17,8 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
 */
 
-#ifndef __JackIOAdapter__
-#define __JackIOAdapter__
+#ifndef __JackAudioAdapterInterface__
+#define __JackAudioAdapterInterface__
 
 #include "ringbuffer.h"
 #include "jack.h"
@@ -58,7 +58,7 @@ namespace Jack
     
     };
 
-	class JackIOAdapterInterface
+	class JackAudioAdapterInterface
 	{
     
 		protected:
@@ -84,7 +84,7 @@ namespace Jack
                
 		public:
         
-			JackIOAdapterInterface(int input, int output, jack_nframes_t buffer_size, jack_nframes_t sample_rate)
+			JackAudioAdapterInterface(int input, int output, jack_nframes_t buffer_size, jack_nframes_t sample_rate)
                 :fCaptureChannels(input), 
                 fPlaybackChannels(output), 
                 fBufferSize(buffer_size), 
@@ -93,7 +93,7 @@ namespace Jack
                 fConsumerDLL(buffer_size, sample_rate),
                 fRunning(false)
             {}
-			virtual ~JackIOAdapterInterface()
+			virtual ~JackAudioAdapterInterface()
             {}
             
             void SetRingBuffers(JackResampler** input, JackResampler** output)
diff --git a/common/JackCallbackNetIOAdapter.cpp b/common/JackCallbackAudioAdapter.cpp
similarity index 74%
rename from common/JackCallbackNetIOAdapter.cpp
rename to common/JackCallbackAudioAdapter.cpp
index 20f23315..54768ffa 100644
--- a/common/JackCallbackNetIOAdapter.cpp
+++ b/common/JackCallbackAudioAdapter.cpp
@@ -17,7 +17,7 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
 */
 
-#include "JackCallbackNetIOAdapter.h"
+#include "JackCallbackAudioAdapter.h"
 #include "JackLibSampleRateResampler.h"
 #include "JackError.h"
 #include "JackExports.h"
@@ -29,18 +29,18 @@ using namespace std;
 namespace Jack
 {
 
-int JackCallbackNetIOAdapter::Process(jack_nframes_t frames, void* arg)
+int JackCallbackAudioAdapter::Process(jack_nframes_t frames, void* arg)
 {
-    JackCallbackNetIOAdapter* adapter = static_cast<JackCallbackNetIOAdapter*>(arg);
+    JackCallbackAudioAdapter* adapter = static_cast<JackCallbackAudioAdapter*>(arg);
     float* buffer;
     bool failure = false;
     int i;
     
-    if (!adapter->fIOAdapter->IsRunning())
+    if (!adapter->fAudioAdapter->IsRunning())
         return 0;
         
     // DLL
-    adapter->fIOAdapter->SetCallbackTime(jack_get_time());
+    adapter->fAudioAdapter->SetCallbackTime(jack_get_time());
      
     // Push/pull from ringbuffer
     for (i = 0; i < adapter->fCaptureChannels; i++) {
@@ -57,29 +57,29 @@ int JackCallbackNetIOAdapter::Process(jack_nframes_t frames, void* arg)
      
     // Reset all ringbuffers in case of failure
     if (failure) {
-        jack_error("JackCallbackNetIOAdapter::Process ringbuffer failure... reset");
+        jack_error("JackCallbackAudioAdapter::Process ringbuffer failure... reset");
         adapter->Reset();
     }
     return 0;
 }
 
-int JackCallbackNetIOAdapter::BufferSize(jack_nframes_t buffer_size, void* arg)
+int JackCallbackAudioAdapter::BufferSize(jack_nframes_t buffer_size, void* arg)
 {
-    JackCallbackNetIOAdapter* adapter = static_cast<JackCallbackNetIOAdapter*>(arg);
+    JackCallbackAudioAdapter* adapter = static_cast<JackCallbackAudioAdapter*>(arg);
     adapter->Reset();
-    adapter->fIOAdapter->SetBufferSize(buffer_size);
+    adapter->fAudioAdapter->SetBufferSize(buffer_size);
     return 0;
 }
 
-int JackCallbackNetIOAdapter::SampleRate(jack_nframes_t sample_rate, void* arg)
+int JackCallbackAudioAdapter::SampleRate(jack_nframes_t sample_rate, void* arg)
 {
-    JackCallbackNetIOAdapter* adapter = static_cast<JackCallbackNetIOAdapter*>(arg);
+    JackCallbackAudioAdapter* adapter = static_cast<JackCallbackAudioAdapter*>(arg);
     adapter->Reset();
-    adapter->fIOAdapter->SetSampleRate(sample_rate);
+    adapter->fAudioAdapter->SetSampleRate(sample_rate);
     return 0;
 }
 
-void JackCallbackNetIOAdapter::Reset()
+void JackCallbackAudioAdapter::Reset()
 {
     int i;
         
@@ -91,14 +91,14 @@ void JackCallbackNetIOAdapter::Reset()
         fPlaybackRingBuffer[i]->Reset();
     }
         
-    fIOAdapter->Reset();
+    fAudioAdapter->Reset();
 }
 
-JackCallbackNetIOAdapter::JackCallbackNetIOAdapter(jack_client_t* jack_client, 
-                                                JackIOAdapterInterface* audio_io, 
+JackCallbackAudioAdapter::JackCallbackAudioAdapter(jack_client_t* jack_client, 
+                                                JackAudioAdapterInterface* audio_io, 
                                                 int input, 
                                                 int output)
-                                                : JackNetIOAdapter(jack_client, audio_io, input, output)
+                                                : JackAudioAdapter(jack_client, audio_io, input, output)
 {
     int i;
      
@@ -113,7 +113,7 @@ JackCallbackNetIOAdapter::JackCallbackNetIOAdapter(jack_client_t* jack_client,
         fPlaybackRingBuffer[i] = new JackLibSampleRateResampler();
    }
  
-    fIOAdapter->SetRingBuffers(fCaptureRingBuffer, fPlaybackRingBuffer);
+    fAudioAdapter->SetRingBuffers(fCaptureRingBuffer, fPlaybackRingBuffer);
        
     jack_log("ReadSpace = %ld", fCaptureRingBuffer[0]->ReadSpace());
     jack_log("WriteSpace = %ld", fPlaybackRingBuffer[0]->WriteSpace());
@@ -136,7 +136,7 @@ fail:
      FreePorts();
 }
 
-JackCallbackNetIOAdapter::~JackCallbackNetIOAdapter()
+JackCallbackAudioAdapter::~JackCallbackAudioAdapter()
 {
     int i;
     
diff --git a/common/JackCallbackNetIOAdapter.h b/common/JackCallbackAudioAdapter.h
similarity index 78%
rename from common/JackCallbackNetIOAdapter.h
rename to common/JackCallbackAudioAdapter.h
index 6cb40697..310a677b 100644
--- a/common/JackCallbackNetIOAdapter.h
+++ b/common/JackCallbackAudioAdapter.h
@@ -17,15 +17,15 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
 */
 
-#ifndef __JackCallbackNetIOAdapter__
-#define __JackCallbackNetIOAdapter__
+#ifndef __JackCallbackAudioAdapter__
+#define __JackCallbackAudioAdapter__
 
-#include "JackNetIOAdapter.h"
+#include "JackAudioAdapter.h"
 #include "ringbuffer.h"
 
 namespace Jack
 {
-    class JackCallbackNetIOAdapter : public JackNetIOAdapter
+    class JackCallbackAudioAdapter : public JackAudioAdapter
     {
 
         private:
@@ -41,11 +41,11 @@ namespace Jack
 
         public:
 
-            JackCallbackNetIOAdapter(jack_client_t* jack_client, 
-                                    JackIOAdapterInterface* audio_io, 
+            JackCallbackAudioAdapter(jack_client_t* jack_client, 
+                                    JackAudioAdapterInterface* audio_io, 
                                     int input, 
                                     int output);
-            ~JackCallbackNetIOAdapter();
+            ~JackCallbackAudioAdapter();
     
     };
     
diff --git a/common/wscript b/common/wscript
index 4ee65cca..ecad12fc 100644
--- a/common/wscript
+++ b/common/wscript
@@ -194,12 +194,12 @@ def build(bld):
     create_jack_process_obj(bld, 'netmanager', 'JackNetManager.cpp', serverlib)
 
     if bld.env()['IS_MACOSX']:
-         process = create_jack_process_obj(bld, 'netioadapter','JackResampler.cpp JackLibSampleRateResampler.cpp JackIOAdapter.cpp JackNetIOAdapter.cpp JackCallbackNetIOAdapter.cpp ../macosx/JackCoreAudioIOAdapter.cpp', serverlib)
+         process = create_jack_process_obj(bld, 'audioadapter','JackResampler.cpp JackLibSampleRateResampler.cpp JackAudioAdapter.cpp JackAudioAdapterInterface.cpp JackCallbackAudioAdapter.cpp ../macosx/JackCoreAudioAdapter.cpp', serverlib)
     
     if bld.env()['IS_LINUX']:
-         process = create_jack_process_obj(bld, 'netioadapter','JackResampler.cpp JackLibSampleRateResampler.cpp JackIOAdapter.cpp JackNetIOAdapter.cpp JackCallbackNetIOAdapter.cpp ../linux/alsa/JackAlsaIOAdapter.cpp', serverlib)
+         process = create_jack_process_obj(bld, 'audioadapter','JackResampler.cpp JackLibSampleRateResampler.cpp JackAudioAdapter.cpp JackAudioAdapterInterface.cpp JackCallbackAudioAdapter.cpp ../linux/alsa/JackAlsaAdapter.cpp', serverlib)
 
-    #process = create_jack_process_obj(bld, 'netioadapter', 'JackResampler.cpp JackLibSampleRateResampler.cpp JackIOAdapter.cpp JackNetIOAdapter.cpp JackCallbackNetIOAdapter.cpp ../windows/JackPortAudioIOAdapter.cpp', serverlib)
+    #process = create_jack_process_obj(bld, 'audioadapter', 'JackResampler.cpp JackLibSampleRateResampler.cpp JackAudioAdapter.cpp JackAudioAdapterInterface.cpp JackCallbackAudioAdapter.cpp ../windows/JackPortAudioAdapter.cpp', serverlib)
 
     process.env.append_value("LINKFLAGS", "-lsamplerate")
 
diff --git a/linux/alsa/JackAlsaIOAdapter.cpp b/linux/alsa/JackAlsaAdapter.cpp
similarity index 86%
rename from linux/alsa/JackAlsaIOAdapter.cpp
rename to linux/alsa/JackAlsaAdapter.cpp
index e2bbb097..49956621 100644
--- a/linux/alsa/JackAlsaIOAdapter.cpp
+++ b/linux/alsa/JackAlsaAdapter.cpp
@@ -17,12 +17,12 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
 */
 
-#include "JackAlsaIOAdapter.h"
+#include "JackAlsaAdapter.h"
 
 namespace Jack
 {
 
-int JackAlsaIOAdapter::Open()
+int JackAlsaAdapter::Open()
 {
     if (fAudioInterface.open() == 0) {
         fAudioInterface.longinfo();
@@ -34,7 +34,7 @@ int JackAlsaIOAdapter::Open()
     }
 }
 
-int JackAlsaIOAdapter::Close()
+int JackAlsaAdapter::Close()
 {
 #ifdef DEBUG
     fTable.Save();
@@ -43,14 +43,14 @@ int JackAlsaIOAdapter::Close()
     return fAudioInterface.close();
 }
 
-bool JackAlsaIOAdapter::Init()
+bool JackAlsaAdapter::Init()
 {
     fAudioInterface.write();
     fAudioInterface.write();
     return true;
 }
             
-bool JackAlsaIOAdapter::Execute()
+bool JackAlsaAdapter::Execute()
 {
     if (fAudioInterface.read() < 0)
         return false;
@@ -81,15 +81,15 @@ bool JackAlsaIOAdapter::Execute()
      
     // Reset all ringbuffers in case of failure
     if (failure) {
-        jack_error("JackAlsaIOAdapter::Execute ringbuffer failure... reset");
+        jack_error("JackAlsaAdapter::Execute ringbuffer failure... reset");
         adapter->ResetRingBuffers();
     }
     return true;
 }
 
-int JackAlsaIOAdapter::SetBufferSize(jack_nframes_t buffer_size)
+int JackAlsaAdapter::SetBufferSize(jack_nframes_t buffer_size)
 {
-    JackIOAdapterInterface::SetBufferSize(buffer_size);
+    JackAudioAdapterInterface::SetBufferSize(buffer_size);
     Close();
     return Open();
 }
diff --git a/linux/alsa/JackAlsaIOAdapter.h b/linux/alsa/JackAlsaAdapter.h
similarity index 98%
rename from linux/alsa/JackAlsaIOAdapter.h
rename to linux/alsa/JackAlsaAdapter.h
index 5e6f95d3..7e8431e2 100644
--- a/linux/alsa/JackAlsaIOAdapter.h
+++ b/linux/alsa/JackAlsaAdapter.h
@@ -17,14 +17,14 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
 */
 
-#ifndef __JackAlsaIOAdapter__
-#define __JackAlsaIOAdapter__
+#ifndef __JackAlsaAdapter__
+#define __JackAlsaAdapter__
 
 #include <math.h>
 #include <limits.h>
 #include <assert.h>
 #include <alsa/asoundlib.h>
-#include "JackIOAdapter.h"
+#include "JackAudioAdapterInterface.h"
 #include "JackPlatformThread.h"
 #include "JackError.h"
 #include "jack.h"
@@ -517,7 +517,7 @@ namespace Jack
         }
     };
 
-	class JackAlsaIOAdapter : public JackIOAdapterInterface, public JackRunnableInterface
+	class JackAlsaAdapter : public JackAudioAdapterInterface, public JackRunnableInterface
 	{
     
 	    private:
@@ -527,12 +527,12 @@ namespace Jack
        
 	    public:
         
-            JackAlsaIOAdapter(int input, int output, jack_nframes_t buffer_size, jack_nframes_t sample_rate)
-                :JackIOAdapterInterface(input, output, buffer_size, sample_rate)
+            JackAlsaAdapter(int input, int output, jack_nframes_t buffer_size, jack_nframes_t sample_rate)
+                :JackAudioAdapterInterface(input, output, buffer_size, sample_rate)
                 ,fThread(this), fAudioInterface(input, output, buffer_size, sample_rate)	
             {}
            
-            ~JackAlsaIOAdapter()
+            ~JackAlsaAdapter()
             {}
             
             virtual int Open();
diff --git a/macosx/JackCoreAudioIOAdapter.cpp b/macosx/JackCoreAudioAdapter.cpp
similarity index 93%
rename from macosx/JackCoreAudioIOAdapter.cpp
rename to macosx/JackCoreAudioAdapter.cpp
index 4bafbd9d..13b7f6bd 100644
--- a/macosx/JackCoreAudioIOAdapter.cpp
+++ b/macosx/JackCoreAudioAdapter.cpp
@@ -17,7 +17,7 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
 */
 
-#include "JackCoreAudioIOAdapter.h"
+#include "JackCoreAudioAdapter.h"
 #include "JackError.h"
 #include <unistd.h>
 
@@ -93,13 +93,13 @@ static void printError(OSStatus err)
     }
 }
 
-OSStatus JackCoreAudioIOAdapter::SRNotificationCallback(AudioDeviceID inDevice,
+OSStatus JackCoreAudioAdapter::SRNotificationCallback(AudioDeviceID inDevice,
                                                         UInt32 inChannel,
                                                         Boolean	isInput,
                                                         AudioDevicePropertyID inPropertyID,
                                                         void* inClientData)
 {
-    JackCoreAudioIOAdapter* driver = static_cast<JackCoreAudioIOAdapter*>(inClientData);
+    JackCoreAudioAdapter* driver = static_cast<JackCoreAudioAdapter*>(inClientData);
 
     switch (inPropertyID) {
 
@@ -113,14 +113,14 @@ OSStatus JackCoreAudioIOAdapter::SRNotificationCallback(AudioDeviceID inDevice,
     return noErr;
 }
             
-OSStatus JackCoreAudioIOAdapter::Render(void *inRefCon,
+OSStatus JackCoreAudioAdapter::Render(void *inRefCon,
                                         AudioUnitRenderActionFlags *ioActionFlags,
                                         const AudioTimeStamp *inTimeStamp,
                                         UInt32 inBusNumber,
                                         UInt32 inNumberFrames,
                                         AudioBufferList *ioData)
 {
-    JackCoreAudioIOAdapter* adapter = static_cast<JackCoreAudioIOAdapter*>(inRefCon);
+    JackCoreAudioAdapter* adapter = static_cast<JackCoreAudioAdapter*>(inRefCon);
     AudioUnitRender(adapter->fAUHAL, ioActionFlags, inTimeStamp, 1, inNumberFrames, adapter->fInputData);
     bool failure = false;
       
@@ -146,13 +146,13 @@ OSStatus JackCoreAudioIOAdapter::Render(void *inRefCon,
     
     // Reset all ringbuffers in case of failure
     if (failure) {
-        jack_error("JackCoreAudioIOAdapter::Render ringbuffer failure... reset");
+        jack_error("JackCoreAudioAdapter::Render ringbuffer failure... reset");
         adapter->ResetRingBuffers();
     }
     return noErr;
 }
 
-OSStatus JackCoreAudioIOAdapter::GetDefaultDevice(AudioDeviceID* id)
+OSStatus JackCoreAudioAdapter::GetDefaultDevice(AudioDeviceID* id)
 {
     OSStatus res;
     UInt32 theSize = sizeof(UInt32);
@@ -177,7 +177,7 @@ OSStatus JackCoreAudioIOAdapter::GetDefaultDevice(AudioDeviceID* id)
     }
 }
 
-OSStatus JackCoreAudioIOAdapter::GetTotalChannels(AudioDeviceID device, int* channelCount, bool isInput)
+OSStatus JackCoreAudioAdapter::GetTotalChannels(AudioDeviceID device, int* channelCount, bool isInput)
 {
     OSStatus err = noErr;
     UInt32	outSize;
@@ -202,7 +202,7 @@ OSStatus JackCoreAudioIOAdapter::GetTotalChannels(AudioDeviceID device, int* cha
 }
 
 // Setup
-int JackCoreAudioIOAdapter::SetupDevices(const char* capture_driver_uid,
+int JackCoreAudioAdapter::SetupDevices(const char* capture_driver_uid,
                                         const char* playback_driver_uid,
                                         char* capture_driver_name,
                                         char* playback_driver_name)
@@ -215,7 +215,7 @@ int JackCoreAudioIOAdapter::SetupDevices(const char* capture_driver_uid,
     return 0;
 }
 
-int JackCoreAudioIOAdapter::SetupChannels(bool capturing,
+int JackCoreAudioAdapter::SetupChannels(bool capturing,
                                         bool playing,
                                         int& inchannels,
                                         int& outchannels,
@@ -242,7 +242,7 @@ int JackCoreAudioIOAdapter::SetupChannels(bool capturing,
     return 0;
 }
 
-int JackCoreAudioIOAdapter::SetupBufferSizeAndSampleRate(jack_nframes_t nframes, jack_nframes_t samplerate)
+int JackCoreAudioAdapter::SetupBufferSizeAndSampleRate(jack_nframes_t nframes, jack_nframes_t samplerate)
 {
     OSStatus err = noErr;
     UInt32 outSize;
@@ -298,9 +298,9 @@ int JackCoreAudioIOAdapter::SetupBufferSizeAndSampleRate(jack_nframes_t nframes,
     return 0;
 }
 
-int JackCoreAudioIOAdapter::SetupBuffers(int inchannels, int outchannels)
+int JackCoreAudioAdapter::SetupBuffers(int inchannels, int outchannels)
 {
-    jack_log("JackCoreAudioIOAdapter::SetupBuffers: input = %ld output = %ld", inchannels, outchannels);
+    jack_log("JackCoreAudioAdapter::SetupBuffers: input = %ld output = %ld", inchannels, outchannels);
     
     // Prepare buffers
     fInputData = (AudioBufferList*)malloc(sizeof(UInt32) + inchannels * sizeof(AudioBuffer));
@@ -317,7 +317,7 @@ int JackCoreAudioIOAdapter::SetupBuffers(int inchannels, int outchannels)
     return 0;
 }
 
-void JackCoreAudioIOAdapter::DisposeBuffers()
+void JackCoreAudioAdapter::DisposeBuffers()
 {
     if (fInputData) {
         for (int i = 0; i < fCaptureChannels; i++) 
@@ -327,7 +327,7 @@ void JackCoreAudioIOAdapter::DisposeBuffers()
     }
 }
 
-int JackCoreAudioIOAdapter::OpenAUHAL(bool capturing,
+int JackCoreAudioAdapter::OpenAUHAL(bool capturing,
                                     bool playing,
                                     int inchannels,
                                     int outchannels,
@@ -505,13 +505,13 @@ int JackCoreAudioIOAdapter::OpenAUHAL(bool capturing,
     return 0;
 }
 
-void JackCoreAudioIOAdapter::CloseAUHAL()
+void JackCoreAudioAdapter::CloseAUHAL()
 {
     AudioUnitUninitialize(fAUHAL);
     CloseComponent(fAUHAL);
 }
   
-int JackCoreAudioIOAdapter::Open()
+int JackCoreAudioAdapter::Open()
 {
     OSStatus err;
     int in_nChannels = 0;
@@ -543,7 +543,7 @@ error:
     return -1;
 }
 
-int JackCoreAudioIOAdapter::Close()
+int JackCoreAudioAdapter::Close()
 {
 #ifdef DEBUG    
     fTable.Save();
@@ -554,9 +554,9 @@ int JackCoreAudioIOAdapter::Close()
     return 0;
 }
 
-int JackCoreAudioIOAdapter::SetBufferSize(jack_nframes_t buffer_size)
+int JackCoreAudioAdapter::SetBufferSize(jack_nframes_t buffer_size)
 {
-    JackIOAdapterInterface::SetBufferSize(buffer_size);
+    JackAudioAdapterInterface::SetBufferSize(buffer_size);
     Close();
     return Open();
 }
diff --git a/macosx/JackCoreAudioIOAdapter.h b/macosx/JackCoreAudioAdapter.h
similarity index 90%
rename from macosx/JackCoreAudioIOAdapter.h
rename to macosx/JackCoreAudioAdapter.h
index 1b8fe11c..d530a155 100644
--- a/macosx/JackCoreAudioIOAdapter.h
+++ b/macosx/JackCoreAudioAdapter.h
@@ -17,10 +17,10 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
 */
 
-#ifndef __JackCoreAudioIOAdapter__
-#define __JackCoreAudioIOAdapter__
+#ifndef __JackCoreAudioAdapter__
+#define __JackCoreAudioAdapter__
 
-#include "JackIOAdapter.h"
+#include "JackAudioAdapterInterface.h"
 #include "jack.h"
 #include <AudioToolbox/AudioConverter.h>
 #include <CoreAudio/CoreAudio.h>
@@ -35,7 +35,7 @@ namespace Jack
     #define	kAudioDeviceSectionGlobal	((CAAudioHardwareDeviceSectionID)0x00)
     #define	kAudioDeviceSectionWildcard	((CAAudioHardwareDeviceSectionID)0xFF)
 
-	class JackCoreAudioIOAdapter : public JackIOAdapterInterface
+	class JackCoreAudioAdapter : public JackAudioAdapterInterface
 	{
     
 		private:
@@ -96,10 +96,10 @@ namespace Jack
     
 		public:
         
-			JackCoreAudioIOAdapter(int input, int output, jack_nframes_t buffer_size, jack_nframes_t sample_rate)
-                :JackIOAdapterInterface(input, output, buffer_size, sample_rate),fInputData(0),fState(false)
+			JackCoreAudioAdapter(int input, int output, jack_nframes_t buffer_size, jack_nframes_t sample_rate)
+                :JackAudioAdapterInterface(input, output, buffer_size, sample_rate),fInputData(0),fState(false)
             {}
-			~JackCoreAudioIOAdapter()
+			~JackCoreAudioAdapter()
             {}
             
             virtual int Open();
diff --git a/macosx/Jackdmp.xcodeproj/project.pbxproj b/macosx/Jackdmp.xcodeproj/project.pbxproj
index b44a6a83..4acd1475 100644
--- a/macosx/Jackdmp.xcodeproj/project.pbxproj
+++ b/macosx/Jackdmp.xcodeproj/project.pbxproj
@@ -536,16 +536,16 @@
 		4BCC87990D57168300A7FEB1 /* Accelerate.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4BCC87950D57168300A7FEB1 /* Accelerate.framework */; };
 		4BD07AAF0E1BB8330001F7B5 /* JackResampler.h in Headers */ = {isa = PBXBuildFile; fileRef = 4BD07AAD0E1BB8330001F7B5 /* JackResampler.h */; };
 		4BD07AB00E1BB8330001F7B5 /* JackResampler.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4BD07AAE0E1BB8330001F7B5 /* JackResampler.cpp */; };
-		4BD07AB30E1BB8430001F7B5 /* JackNetIOAdapter.h in Headers */ = {isa = PBXBuildFile; fileRef = 4BD07AB10E1BB8430001F7B5 /* JackNetIOAdapter.h */; };
-		4BD07AB40E1BB8430001F7B5 /* JackNetIOAdapter.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4BD07AB20E1BB8430001F7B5 /* JackNetIOAdapter.cpp */; };
 		4BD07AB70E1BB84F0001F7B5 /* JackLibSampleRateResampler.h in Headers */ = {isa = PBXBuildFile; fileRef = 4BD07AB50E1BB84F0001F7B5 /* JackLibSampleRateResampler.h */; };
 		4BD07AB80E1BB84F0001F7B5 /* JackLibSampleRateResampler.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4BD07AB60E1BB84F0001F7B5 /* JackLibSampleRateResampler.cpp */; };
-		4BD07ABB0E1BB8610001F7B5 /* JackIOAdapter.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4BD07AB90E1BB8610001F7B5 /* JackIOAdapter.cpp */; };
-		4BD07ABC0E1BB8610001F7B5 /* JackIOAdapter.h in Headers */ = {isa = PBXBuildFile; fileRef = 4BD07ABA0E1BB8610001F7B5 /* JackIOAdapter.h */; };
-		4BD07AC00E1BB8780001F7B5 /* JackCoreAudioIOAdapter.h in Headers */ = {isa = PBXBuildFile; fileRef = 4BD07ABE0E1BB8780001F7B5 /* JackCoreAudioIOAdapter.h */; };
-		4BD07AC10E1BB8780001F7B5 /* JackCoreAudioIOAdapter.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4BD07ABF0E1BB8780001F7B5 /* JackCoreAudioIOAdapter.cpp */; };
-		4BD07AC50E1BB89E0001F7B5 /* JackCallbackNetIOAdapter.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4BD07AC30E1BB89E0001F7B5 /* JackCallbackNetIOAdapter.cpp */; };
-		4BD07AC60E1BB89E0001F7B5 /* JackCallbackNetIOAdapter.h in Headers */ = {isa = PBXBuildFile; fileRef = 4BD07AC40E1BB89E0001F7B5 /* JackCallbackNetIOAdapter.h */; };
+		4BD337590E1EB7AB0043571E /* JackCoreAudioAdapter.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4BD337570E1EB7AB0043571E /* JackCoreAudioAdapter.cpp */; };
+		4BD3375A0E1EB7AB0043571E /* JackCoreAudioAdapter.h in Headers */ = {isa = PBXBuildFile; fileRef = 4BD337580E1EB7AB0043571E /* JackCoreAudioAdapter.h */; };
+		4BD3375F0E1EB7CB0043571E /* JackAudioAdapterInterface.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4BD3375B0E1EB7CB0043571E /* JackAudioAdapterInterface.cpp */; };
+		4BD337600E1EB7CB0043571E /* JackAudioAdapterInterface.h in Headers */ = {isa = PBXBuildFile; fileRef = 4BD3375C0E1EB7CB0043571E /* JackAudioAdapterInterface.h */; };
+		4BD337610E1EB7CB0043571E /* JackAudioAdapter.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4BD3375D0E1EB7CB0043571E /* JackAudioAdapter.cpp */; };
+		4BD337620E1EB7CB0043571E /* JackAudioAdapter.h in Headers */ = {isa = PBXBuildFile; fileRef = 4BD3375E0E1EB7CB0043571E /* JackAudioAdapter.h */; };
+		4BD337650E1EB8040043571E /* JackCallbackAudioAdapter.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4BD337630E1EB8040043571E /* JackCallbackAudioAdapter.cpp */; };
+		4BD337660E1EB8040043571E /* JackCallbackAudioAdapter.h in Headers */ = {isa = PBXBuildFile; fileRef = 4BD337640E1EB8040043571E /* JackCallbackAudioAdapter.h */; };
 		4BD4B4D809BACD9600750C0F /* JackTransportEngine.h in Headers */ = {isa = PBXBuildFile; fileRef = 4BD4B4D409BACD9600750C0F /* JackTransportEngine.h */; };
 		4BD4B4D909BACD9600750C0F /* JackTransportEngine.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4BD4B4D509BACD9600750C0F /* JackTransportEngine.cpp */; };
 		4BD4B4E409BACEF300750C0F /* JackTransportEngine.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4BD4B4D509BACD9600750C0F /* JackTransportEngine.cpp */; };
@@ -1315,19 +1315,19 @@
 		4BC834990DF4632F00DD1C93 /* JackPlatformSynchro.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = JackPlatformSynchro.h; path = ../common/JackPlatformSynchro.h; sourceTree = SOURCE_ROOT; };
 		4BC8349A0DF4632F00DD1C93 /* JackPlatformThread.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = JackPlatformThread.h; path = ../common/JackPlatformThread.h; sourceTree = SOURCE_ROOT; };
 		4BCC87950D57168300A7FEB1 /* Accelerate.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Accelerate.framework; path = /System/Library/Frameworks/Accelerate.framework; sourceTree = "<absolute>"; };
-		4BD07AA50E1BB7770001F7B5 /* netioadapter.so */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.dylib"; includeInIndex = 0; path = netioadapter.so; sourceTree = BUILT_PRODUCTS_DIR; };
+		4BD07AA50E1BB7770001F7B5 /* audioadapter.so */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.dylib"; includeInIndex = 0; path = audioadapter.so; sourceTree = BUILT_PRODUCTS_DIR; };
 		4BD07AAD0E1BB8330001F7B5 /* JackResampler.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = JackResampler.h; path = ../common/JackResampler.h; sourceTree = SOURCE_ROOT; };
 		4BD07AAE0E1BB8330001F7B5 /* JackResampler.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = JackResampler.cpp; path = ../common/JackResampler.cpp; sourceTree = SOURCE_ROOT; };
-		4BD07AB10E1BB8430001F7B5 /* JackNetIOAdapter.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = JackNetIOAdapter.h; path = ../common/JackNetIOAdapter.h; sourceTree = SOURCE_ROOT; };
-		4BD07AB20E1BB8430001F7B5 /* JackNetIOAdapter.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = JackNetIOAdapter.cpp; path = ../common/JackNetIOAdapter.cpp; sourceTree = SOURCE_ROOT; };
 		4BD07AB50E1BB84F0001F7B5 /* JackLibSampleRateResampler.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = JackLibSampleRateResampler.h; path = ../common/JackLibSampleRateResampler.h; sourceTree = SOURCE_ROOT; };
 		4BD07AB60E1BB84F0001F7B5 /* JackLibSampleRateResampler.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = JackLibSampleRateResampler.cpp; path = ../common/JackLibSampleRateResampler.cpp; sourceTree = SOURCE_ROOT; };
-		4BD07AB90E1BB8610001F7B5 /* JackIOAdapter.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = JackIOAdapter.cpp; path = ../common/JackIOAdapter.cpp; sourceTree = SOURCE_ROOT; };
-		4BD07ABA0E1BB8610001F7B5 /* JackIOAdapter.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = JackIOAdapter.h; path = ../common/JackIOAdapter.h; sourceTree = SOURCE_ROOT; };
-		4BD07ABE0E1BB8780001F7B5 /* JackCoreAudioIOAdapter.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JackCoreAudioIOAdapter.h; sourceTree = SOURCE_ROOT; };
-		4BD07ABF0E1BB8780001F7B5 /* JackCoreAudioIOAdapter.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JackCoreAudioIOAdapter.cpp; sourceTree = SOURCE_ROOT; };
-		4BD07AC30E1BB89E0001F7B5 /* JackCallbackNetIOAdapter.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = JackCallbackNetIOAdapter.cpp; path = ../common/JackCallbackNetIOAdapter.cpp; sourceTree = SOURCE_ROOT; };
-		4BD07AC40E1BB89E0001F7B5 /* JackCallbackNetIOAdapter.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = JackCallbackNetIOAdapter.h; path = ../common/JackCallbackNetIOAdapter.h; sourceTree = SOURCE_ROOT; };
+		4BD337570E1EB7AB0043571E /* JackCoreAudioAdapter.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = JackCoreAudioAdapter.cpp; sourceTree = SOURCE_ROOT; };
+		4BD337580E1EB7AB0043571E /* JackCoreAudioAdapter.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = JackCoreAudioAdapter.h; sourceTree = SOURCE_ROOT; };
+		4BD3375B0E1EB7CB0043571E /* JackAudioAdapterInterface.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; name = JackAudioAdapterInterface.cpp; path = ../common/JackAudioAdapterInterface.cpp; sourceTree = SOURCE_ROOT; };
+		4BD3375C0E1EB7CB0043571E /* JackAudioAdapterInterface.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = JackAudioAdapterInterface.h; path = ../common/JackAudioAdapterInterface.h; sourceTree = SOURCE_ROOT; };
+		4BD3375D0E1EB7CB0043571E /* JackAudioAdapter.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; name = JackAudioAdapter.cpp; path = ../common/JackAudioAdapter.cpp; sourceTree = SOURCE_ROOT; };
+		4BD3375E0E1EB7CB0043571E /* JackAudioAdapter.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = JackAudioAdapter.h; path = ../common/JackAudioAdapter.h; sourceTree = SOURCE_ROOT; };
+		4BD337630E1EB8040043571E /* JackCallbackAudioAdapter.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; name = JackCallbackAudioAdapter.cpp; path = ../common/JackCallbackAudioAdapter.cpp; sourceTree = SOURCE_ROOT; };
+		4BD337640E1EB8040043571E /* JackCallbackAudioAdapter.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = JackCallbackAudioAdapter.h; path = ../common/JackCallbackAudioAdapter.h; sourceTree = SOURCE_ROOT; };
 		4BD4B4D409BACD9600750C0F /* JackTransportEngine.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = JackTransportEngine.h; path = ../common/JackTransportEngine.h; sourceTree = SOURCE_ROOT; };
 		4BD4B4D509BACD9600750C0F /* JackTransportEngine.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; name = JackTransportEngine.cpp; path = ../common/JackTransportEngine.cpp; sourceTree = SOURCE_ROOT; };
 		4BD561C708EEB910006BBC2A /* JackSynchro.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = JackSynchro.h; path = ../common/JackSynchro.h; sourceTree = SOURCE_ROOT; };
@@ -2085,7 +2085,7 @@
 				4BFA82B70DF6A9E40087B4E1 /* jack_monitor_client */,
 				4BFA82C30DF6A9E40087B4E1 /* jack_showtime */,
 				4BFA82CF0DF6A9E40087B4E1 /* jack_impulse_grabber */,
-				4BD07AA50E1BB7770001F7B5 /* netioadapter.so */,
+				4BD07AA50E1BB7770001F7B5 /* audioadapter.so */,
 			);
 			name = Products;
 			sourceTree = "<group>";
@@ -2481,18 +2481,18 @@
 		4BD07AA70E1BB80B0001F7B5 /* adapter */ = {
 			isa = PBXGroup;
 			children = (
-				4BD07AC30E1BB89E0001F7B5 /* JackCallbackNetIOAdapter.cpp */,
-				4BD07AC40E1BB89E0001F7B5 /* JackCallbackNetIOAdapter.h */,
+				4BD337630E1EB8040043571E /* JackCallbackAudioAdapter.cpp */,
+				4BD337640E1EB8040043571E /* JackCallbackAudioAdapter.h */,
 				4BD07AAD0E1BB8330001F7B5 /* JackResampler.h */,
 				4BD07AAE0E1BB8330001F7B5 /* JackResampler.cpp */,
-				4BD07AB10E1BB8430001F7B5 /* JackNetIOAdapter.h */,
-				4BD07AB20E1BB8430001F7B5 /* JackNetIOAdapter.cpp */,
 				4BD07AB50E1BB84F0001F7B5 /* JackLibSampleRateResampler.h */,
 				4BD07AB60E1BB84F0001F7B5 /* JackLibSampleRateResampler.cpp */,
-				4BD07AB90E1BB8610001F7B5 /* JackIOAdapter.cpp */,
-				4BD07ABA0E1BB8610001F7B5 /* JackIOAdapter.h */,
-				4BD07ABE0E1BB8780001F7B5 /* JackCoreAudioIOAdapter.h */,
-				4BD07ABF0E1BB8780001F7B5 /* JackCoreAudioIOAdapter.cpp */,
+				4BD3375B0E1EB7CB0043571E /* JackAudioAdapterInterface.cpp */,
+				4BD3375C0E1EB7CB0043571E /* JackAudioAdapterInterface.h */,
+				4BD3375D0E1EB7CB0043571E /* JackAudioAdapter.cpp */,
+				4BD3375E0E1EB7CB0043571E /* JackAudioAdapter.h */,
+				4BD337570E1EB7AB0043571E /* JackCoreAudioAdapter.cpp */,
+				4BD337580E1EB7AB0043571E /* JackCoreAudioAdapter.h */,
 			);
 			name = adapter;
 			sourceTree = "<group>";
@@ -3239,11 +3239,11 @@
 			buildActionMask = 2147483647;
 			files = (
 				4BD07AAF0E1BB8330001F7B5 /* JackResampler.h in Headers */,
-				4BD07AB30E1BB8430001F7B5 /* JackNetIOAdapter.h in Headers */,
 				4BD07AB70E1BB84F0001F7B5 /* JackLibSampleRateResampler.h in Headers */,
-				4BD07ABC0E1BB8610001F7B5 /* JackIOAdapter.h in Headers */,
-				4BD07AC00E1BB8780001F7B5 /* JackCoreAudioIOAdapter.h in Headers */,
-				4BD07AC60E1BB89E0001F7B5 /* JackCallbackNetIOAdapter.h in Headers */,
+				4BD3375A0E1EB7AB0043571E /* JackCoreAudioAdapter.h in Headers */,
+				4BD337600E1EB7CB0043571E /* JackAudioAdapterInterface.h in Headers */,
+				4BD337620E1EB7CB0043571E /* JackAudioAdapter.h in Headers */,
+				4BD337660E1EB8040043571E /* JackCallbackAudioAdapter.h in Headers */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -4433,9 +4433,9 @@
 			productReference = 4BA7FEC30D8E76270017FF73 /* jack_server_control */;
 			productType = "com.apple.product-type.tool";
 		};
-		4BD07A9B0E1BB7770001F7B5 /* netioadapter */ = {
+		4BD07A9B0E1BB7770001F7B5 /* audioadapter */ = {
 			isa = PBXNativeTarget;
-			buildConfigurationList = 4BD07AA10E1BB7770001F7B5 /* Build configuration list for PBXNativeTarget "netioadapter" */;
+			buildConfigurationList = 4BD07AA10E1BB7770001F7B5 /* Build configuration list for PBXNativeTarget "audioadapter" */;
 			buildPhases = (
 				4BD07A9C0E1BB7770001F7B5 /* Headers */,
 				4BD07A9E0E1BB7770001F7B5 /* Sources */,
@@ -4445,9 +4445,9 @@
 			);
 			dependencies = (
 			);
-			name = netioadapter;
+			name = audioadapter;
 			productName = jack_coreaudio;
-			productReference = 4BD07AA50E1BB7770001F7B5 /* netioadapter.so */;
+			productReference = 4BD07AA50E1BB7770001F7B5 /* audioadapter.so */;
 			productType = "com.apple.product-type.library.dynamic";
 		};
 		4BD623ED0CBCF0F000DE782F /* inprocess */ = {
@@ -4742,7 +4742,7 @@
 				4B699DA6097D421700A18468 /* jack_dummy Universal */,
 				BA222AC50DC88132001A17F4 /* jack_net Universal */,
 				4BD623ED0CBCF0F000DE782F /* inprocess */,
-				4BD07A9B0E1BB7770001F7B5 /* netioadapter */,
+				4BD07A9B0E1BB7770001F7B5 /* audioadapter */,
 				BA222AE00DC882DB001A17F4 /* netmanager */,
 				4B35C41B0D4731D1000DE7AE /* jackdmp framework 64bits */,
 				4B35C4270D4731D1000DE7AE /* Jackmp.framework 64 bits */,
@@ -5885,11 +5885,11 @@
 			buildActionMask = 2147483647;
 			files = (
 				4BD07AB00E1BB8330001F7B5 /* JackResampler.cpp in Sources */,
-				4BD07AB40E1BB8430001F7B5 /* JackNetIOAdapter.cpp in Sources */,
 				4BD07AB80E1BB84F0001F7B5 /* JackLibSampleRateResampler.cpp in Sources */,
-				4BD07ABB0E1BB8610001F7B5 /* JackIOAdapter.cpp in Sources */,
-				4BD07AC10E1BB8780001F7B5 /* JackCoreAudioIOAdapter.cpp in Sources */,
-				4BD07AC50E1BB89E0001F7B5 /* JackCallbackNetIOAdapter.cpp in Sources */,
+				4BD337590E1EB7AB0043571E /* JackCoreAudioAdapter.cpp in Sources */,
+				4BD3375F0E1EB7CB0043571E /* JackAudioAdapterInterface.cpp in Sources */,
+				4BD337610E1EB7CB0043571E /* JackAudioAdapter.cpp in Sources */,
+				4BD337650E1EB8040043571E /* JackCallbackAudioAdapter.cpp in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -6242,7 +6242,7 @@
 		};
 		4BD07AFC0E1BC3DF0001F7B5 /* PBXTargetDependency */ = {
 			isa = PBXTargetDependency;
-			target = 4BD07A9B0E1BB7770001F7B5 /* netioadapter */;
+			target = 4BD07A9B0E1BB7770001F7B5 /* audioadapter */;
 			targetProxy = 4BD07AFB0E1BC3DF0001F7B5 /* PBXContainerItemProxy */;
 		};
 		4BD624D30CBCF55700DE782F /* PBXTargetDependency */ = {
@@ -13124,7 +13124,7 @@
 				);
 				OTHER_REZFLAGS = "";
 				PREBINDING = NO;
-				PRODUCT_NAME = netioadapter;
+				PRODUCT_NAME = audioadapter;
 				SDKROOT = "";
 				SECTORDER_FLAGS = "";
 				WARNING_CFLAGS = (
@@ -15203,7 +15203,7 @@
 			defaultConfigurationIsVisible = 0;
 			defaultConfigurationName = Default;
 		};
-		4BD07AA10E1BB7770001F7B5 /* Build configuration list for PBXNativeTarget "netioadapter" */ = {
+		4BD07AA10E1BB7770001F7B5 /* Build configuration list for PBXNativeTarget "audioadapter" */ = {
 			isa = XCConfigurationList;
 			buildConfigurations = (
 				4BD07AA20E1BB7770001F7B5 /* Development */,
diff --git a/windows/JackPortAudioIOAdapter.cpp b/windows/JackPortAudioAdapter.cpp
similarity index 78%
rename from windows/JackPortAudioIOAdapter.cpp
rename to windows/JackPortAudioAdapter.cpp
index 94f0a44d..63e9bcad 100644
--- a/windows/JackPortAudioIOAdapter.cpp
+++ b/windows/JackPortAudioAdapter.cpp
@@ -17,20 +17,20 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
 */
 
-#include "JackPortAudioIOAdapter.h"
+#include "JackPortAudioAdapter.h"
 #include "portaudio.h"
 #include "JackError.h"
 
 namespace Jack
 {
 
-int JackPortAudioIOAdapter::Render(const void* inputBuffer, void* outputBuffer,
+int JackPortAudioAdapter::Render(const void* inputBuffer, void* outputBuffer,
                                 unsigned long framesPerBuffer,
                                 const PaStreamCallbackTimeInfo* timeInfo,
                                 PaStreamCallbackFlags statusFlags,
                                 void* userData)
 {
-    JackPortAudioIOAdapter* adapter = static_cast<JackPortAudioIOAdapter*>(userData);
+    JackPortAudioAdapter* adapter = static_cast<JackPortAudioAdapter*>(userData);
     float** paBuffer;
     float* buffer;
     bool failure = false;
@@ -61,13 +61,13 @@ int JackPortAudioIOAdapter::Render(const void* inputBuffer, void* outputBuffer,
 
     // Reset all ringbuffers in case of failure
     if (failure) {
-        jack_error("JackPortAudioIOAdapter::Render ringbuffer failure... reset");
+        jack_error("JackPortAudioAdapter::Render ringbuffer failure... reset");
         adapter->ResetRingBuffers();
     }
     return paContinue;
 }
         
-int JackPortAudioIOAdapter::Open()
+int JackPortAudioAdapter::Open()
 {
     PaError err;
     PaStreamParameters inputParameters;
@@ -75,18 +75,18 @@ int JackPortAudioIOAdapter::Open()
     PaDeviceIndex inputDevice;
     PaDeviceIndex outputDevice;
     
-    if (JackIOAdapterInterface::Open() < 0)
+    if (JackAudioAdapterInterface::Open() < 0)
         return -1;
     
     err = Pa_Initialize();
     if (err != paNoError) {
-        jack_error("JackPortAudioIOAdapter::Pa_Initialize error = %s\n", Pa_GetErrorText(err));
+        jack_error("JackPortAudioAdapter::Pa_Initialize error = %s\n", Pa_GetErrorText(err));
         goto error;
     }
     
-    jack_log("JackPortAudioIOAdapter::Pa_GetDefaultInputDevice %ld", Pa_GetDefaultInputDevice());
-    jack_log("JackPortAudioIOAdapter::Pa_GetDefaultOutputDevice %ld", Pa_GetDefaultOutputDevice());
-    jack_log("JackPortAudioIOAdapter::Open fBufferSize = %ld fSampleRate %f", fBufferSize, fSampleRate);
+    jack_log("JackPortAudioAdapter::Pa_GetDefaultInputDevice %ld", Pa_GetDefaultInputDevice());
+    jack_log("JackPortAudioAdapter::Pa_GetDefaultOutputDevice %ld", Pa_GetDefaultOutputDevice());
+    jack_log("JackPortAudioAdapter::Open fBufferSize = %ld fSampleRate %f", fBufferSize, fSampleRate);
 
     inputDevice = Pa_GetDefaultInputDevice();
     outputDevice = Pa_GetDefaultOutputDevice();
@@ -125,7 +125,7 @@ int JackPortAudioIOAdapter::Open()
          jack_error("Pa_StartStream error = %s", Pa_GetErrorText(err));
          goto error;
     }
-    jack_log("JackPortAudioIOAdapter::Open OK");
+    jack_log("JackPortAudioAdapter::Open OK");
     return 0;
      
 error:
@@ -133,24 +133,24 @@ error:
     return -1;
 }
 
-int JackPortAudioIOAdapter::Close()
+int JackPortAudioAdapter::Close()
 {
 #ifdef DEBUG
     fTable.Save();
 #endif
-    jack_log("JackPortAudioIOAdapter::Close");
+    jack_log("JackPortAudioAdapter::Close");
     Pa_StopStream(fStream);
-    jack_log("JackPortAudioIOAdapter:: Pa_StopStream");
+    jack_log("JackPortAudioAdapter:: Pa_StopStream");
     Pa_CloseStream(fStream);
-    jack_log("JackPortAudioIOAdapter:: Pa_CloseStream");
+    jack_log("JackPortAudioAdapter:: Pa_CloseStream");
     Pa_Terminate();
-    jack_log("JackPortAudioIOAdapter:: Pa_Terminate");
-    return JackIOAdapterInterface::Close();
+    jack_log("JackPortAudioAdapter:: Pa_Terminate");
+    return JackAudioAdapterInterface::Close();
 }
 
-int JackPortAudioIOAdapter::SetBufferSize(jack_nframes_t buffer_size)
+int JackPortAudioAdapter::SetBufferSize(jack_nframes_t buffer_size)
 {
-    JackIOAdapterInterface::SetBufferSize(buffer_size);
+    JackAudioAdapterInterface::SetBufferSize(buffer_size);
     Close();
     return Open();
 }
diff --git a/windows/JackPortAudioIOAdapter.h b/windows/JackPortAudioAdapter.h
similarity index 79%
rename from windows/JackPortAudioIOAdapter.h
rename to windows/JackPortAudioAdapter.h
index 4cd1d067..e802dbf1 100644
--- a/windows/JackPortAudioIOAdapter.h
+++ b/windows/JackPortAudioAdapter.h
@@ -17,16 +17,16 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
 */
 
-#ifndef __JackPortAudioIOAdapter__
-#define __JackPortAudioIOAdapter__
+#ifndef __JackPortAudioAdapter__
+#define __JackPortAudioAdapter__
 
-#include "JackIOAdapter.h"
+#include "JackAudioAdapter.h"
 #include "portaudio.h"
 
 namespace Jack
 {
 
-   	class JackPortAudioIOAdapter : public JackIOAdapterInterface
+   	class JackPortAudioAdapter : public JackAudioAdapterInterface
 	{
     
 		private:
@@ -43,10 +43,10 @@ namespace Jack
        
 		public:
         
-			JackPortAudioIOAdapter(int input, int output, jack_nframes_t buffer_size, jack_nframes_t sample_rate)
-                :JackIOAdapterInterface(input, output, buffer_size, sample_rate)
+			JackPortAudioAdapter(int input, int output, jack_nframes_t buffer_size, jack_nframes_t sample_rate)
+                :JackAudioAdapterInterface(input, output, buffer_size, sample_rate)
             {}
-			~JackPortAudioIOAdapter()
+			~JackPortAudioAdapter()
             {}
             
             int Open();