183 files changed, 405 insertions, 405 deletions

diff --git a/src/bindings/Client.hpp b/src/bindings/Client.hpp
index 988b941c..703b4199 100644
--- a/src/bindings/Client.hpp
+++ b/src/bindings/Client.hpp
@@ -7,7 +7,7 @@ class Client : public Ingen::ClientInterface
 {
 public:
     /** Wrapper for engine->register_client to appease SWIG */
-    virtual void subscribe(Ingen::yEngineInterface* engine) {
+    virtual void subscribe(Ingen::yServerInterface* engine) {
         engine->register_client(this);
     }
 
diff --git a/src/bindings/ingen_bindings.cpp b/src/bindings/ingen_bindings.cpp
index 51c61a22..2e5b753d 100644
--- a/src/bindings/ingen_bindings.cpp
+++ b/src/bindings/ingen_bindings.cpp
@@ -1,7 +1,7 @@
 #include "python2.4/Python.h"
 #include "raul/log.hpp"
 #include "ingen_bindings.hpp"
-#include "engine/Engine.hpp"
+#include "server/Engine.hpp"
 #include "shared/World.hpp"
 
 bool
diff --git a/src/client/ClientStore.cpp b/src/client/ClientStore.cpp
index 48fa0d1e..e647c130 100644
--- a/src/client/ClientStore.cpp
+++ b/src/client/ClientStore.cpp
@@ -43,7 +43,7 @@ using namespace Shared;
 namespace Client {
 
 ClientStore::ClientStore(SharedPtr<Shared::LV2URIMap>       uris,
-                         SharedPtr<EngineInterface> engine,
+                         SharedPtr<ServerInterface> engine,
                          SharedPtr<SigClientInterface>      emitter)
 	: _uris(uris)
 	, _engine(engine)
diff --git a/src/client/ClientStore.hpp b/src/client/ClientStore.hpp
index d904cbf2..a5a3cbc1 100644
--- a/src/client/ClientStore.hpp
+++ b/src/client/ClientStore.hpp
@@ -26,7 +26,7 @@
 
 #include <sigc++/sigc++.h>
 
-#include "ingen/EngineInterface.hpp"
+#include "ingen/ServerInterface.hpp"
 #include "raul/Path.hpp"
 #include "raul/PathTable.hpp"
 #include "raul/TableImpl.hpp"
@@ -57,7 +57,7 @@ class ClientStore : public Shared::Store
 public:
 	ClientStore(
 		SharedPtr<Shared::LV2URIMap>  uris,
-		SharedPtr<EngineInterface>    engine=SharedPtr<EngineInterface>(),
+		SharedPtr<ServerInterface>    engine=SharedPtr<ServerInterface>(),
 		SharedPtr<SigClientInterface> emitter=SharedPtr<SigClientInterface>());
 
 	SharedPtr<PluginModel>  plugin(const Raul::URI& uri);
@@ -127,7 +127,7 @@ private:
 	                        const Raul::Path& dst_port_path);
 
 	SharedPtr<Shared::LV2URIMap>  _uris;
-	SharedPtr<EngineInterface>    _engine;
+	SharedPtr<ServerInterface>    _engine;
 	SharedPtr<SigClientInterface> _emitter;
 
 	SharedPtr<Plugins> _plugins; ///< Map, keyed by plugin URI
diff --git a/src/client/HTTPEngineSender.cpp b/src/client/HTTPEngineSender.cpp
index d9b477a6..96b6a6cf 100644
--- a/src/client/HTTPEngineSender.cpp
+++ b/src/client/HTTPEngineSender.cpp
@@ -58,13 +58,13 @@ HTTPEngineSender::attach(int32_t ping_id, bool block)
 	HTTPClientReceiver::send(msg);
 }
 
-/* *** EngineInterface implementation below here *** */
+/* *** ServerInterface implementation below here *** */
 
 /** Register with the engine via HTTP.
  *
  * Note that this does not actually use 'key', since the engine creates
  * it's own key for HTTP clients (namely the incoming URL), for NAT
- * traversal.  It is a parameter to remain compatible with EngineInterface.
+ * traversal.  It is a parameter to remain compatible with ServerInterface.
  */
 void
 HTTPEngineSender::register_client(ClientInterface* client)
diff --git a/src/client/HTTPEngineSender.hpp b/src/client/HTTPEngineSender.hpp
index 75e2a2f7..27c34a51 100644
--- a/src/client/HTTPEngineSender.hpp
+++ b/src/client/HTTPEngineSender.hpp
@@ -25,7 +25,7 @@
 #include "raul/Path.hpp"
 #include "sord/sordmm.hpp"
 
-#include "ingen/EngineInterface.hpp"
+#include "ingen/ServerInterface.hpp"
 
 typedef struct _SoupSession SoupSession;
 
@@ -39,12 +39,12 @@ class HTTPClientReceiver;
 
 /* HTTP (via libsoup) interface to the engine.
  *
- * Clients can use this opaquely as an EngineInterface to control the engine
+ * Clients can use this opaquely as an ServerInterface to control the engine
  * over HTTP (whether over a network or not).
  *
  * \ingroup IngenClient
  */
-class HTTPEngineSender : public EngineInterface
+class HTTPEngineSender : public ServerInterface
 {
 public:
 	HTTPEngineSender(Shared::World* world, const Raul::URI& engine_url);
@@ -60,7 +60,7 @@ public:
 
 	void attach(int32_t ping_id, bool block);
 
-	/* *** EngineInterface implementation below here *** */
+	/* *** ServerInterface implementation below here *** */
 
 	void enable()  { _enabled = true; }
 	void disable() { _enabled = false; }
diff --git a/src/client/OSCEngineSender.cpp b/src/client/OSCEngineSender.cpp
index 51e6f8c9..9c3b836c 100644
--- a/src/client/OSCEngineSender.cpp
+++ b/src/client/OSCEngineSender.cpp
@@ -78,13 +78,13 @@ OSCEngineSender::attach(int32_t ping_id, bool block)
 	this->ping();
 }
 
-/* *** EngineInterface implementation below here *** */
+/* *** ServerInterface implementation below here *** */
 
 /** Register with the engine via OSC.
  *
  * Note that this does not actually use 'client', since the engine creates
  * it's own key for OSC clients (namely the incoming URL), for NAT
- * traversal.  It is a parameter to remain compatible with EngineInterface.
+ * traversal.  It is a parameter to remain compatible with ServerInterface.
  */
 void
 OSCEngineSender::register_client(ClientInterface* client)
diff --git a/src/client/OSCEngineSender.hpp b/src/client/OSCEngineSender.hpp
index 041a16b8..a29694fb 100644
--- a/src/client/OSCEngineSender.hpp
+++ b/src/client/OSCEngineSender.hpp
@@ -25,7 +25,7 @@
 
 #include <lo/lo.h>
 
-#include "ingen/EngineInterface.hpp"
+#include "ingen/ServerInterface.hpp"
 #include "shared/OSCSender.hpp"
 
 namespace Ingen {
@@ -34,12 +34,12 @@ namespace Client {
 
 /* OSC (via liblo) interface to the engine.
  *
- * Clients can use this opaquely as an EngineInterface* to control the engine
+ * Clients can use this opaquely as an ServerInterface* to control the engine
  * over OSC (whether over a network or not, etc).
  *
  * \ingroup IngenClient
  */
-class OSCEngineSender : public EngineInterface, public Shared::OSCSender {
+class OSCEngineSender : public ServerInterface, public Shared::OSCSender {
 public:
 	OSCEngineSender(const Raul::URI& engine_url,
 	                size_t           max_packet_size);
@@ -61,7 +61,7 @@ public:
 
 	void attach(int32_t ping_id, bool block);
 
-	/* *** EngineInterface implementation below here *** */
+	/* *** ServerInterface implementation below here *** */
 
 	void enable()  { _enabled = true; }
 	void disable() { _enabled = false; }
diff --git a/src/client/PluginModel.hpp b/src/client/PluginModel.hpp
index f03edd94..0d72af12 100644
--- a/src/client/PluginModel.hpp
+++ b/src/client/PluginModel.hpp
@@ -30,7 +30,7 @@
 #ifdef HAVE_SLV2
 #include "slv2/slv2.h"
 #endif
-#include "ingen/EngineInterface.hpp"
+#include "ingen/ServerInterface.hpp"
 #include "ingen/Plugin.hpp"
 #include "shared/World.hpp"
 #include "shared/ResourceImpl.hpp"
diff --git a/src/client/PluginUI.hpp b/src/client/PluginUI.hpp
index 266756e9..e07da923 100644
--- a/src/client/PluginUI.hpp
+++ b/src/client/PluginUI.hpp
@@ -25,7 +25,7 @@
 
 namespace Ingen {
 
-class EngineInterface; 
+class ServerInterface; 
 
 namespace Shared { class World; }
 
diff --git a/src/client/ThreadedSigClientInterface.hpp b/src/client/ThreadedSigClientInterface.hpp
index 87c2f1a5..4fe85209 100644
--- a/src/client/ThreadedSigClientInterface.hpp
+++ b/src/client/ThreadedSigClientInterface.hpp
@@ -32,7 +32,7 @@ typedef sigc::slot<void> Closure;
 
 namespace Ingen {
 
-class EngineInterface;
+class ServerInterface;
 
 namespace Client {
 
diff --git a/src/client/ingen_client.cpp b/src/client/ingen_client.cpp
index 93b00e59..dc4d7f20 100644
--- a/src/client/ingen_client.cpp
+++ b/src/client/ingen_client.cpp
@@ -29,23 +29,23 @@
 using namespace Ingen;
 
 #ifdef HAVE_LIBLO
-SharedPtr<Ingen::EngineInterface>
+SharedPtr<Ingen::ServerInterface>
 new_osc_interface(Ingen::Shared::World* world, const std::string& url)
 {
 	Client::OSCEngineSender* oes = Client::OSCEngineSender::create(
 		url, world->conf()->option("packet-size").get_int32());
 	oes->attach(rand(), true);
-	return SharedPtr<EngineInterface>(oes);
+	return SharedPtr<ServerInterface>(oes);
 }
 #endif
 
 #ifdef HAVE_SOUP
-SharedPtr<Ingen::EngineInterface>
+SharedPtr<Ingen::ServerInterface>
 new_http_interface(Ingen::Shared::World* world, const std::string& url)
 {
 	Client::HTTPEngineSender* hes = new Client::HTTPEngineSender(world, url);
 	hes->attach(rand(), true);
-	return SharedPtr<EngineInterface>(hes);
+	return SharedPtr<ServerInterface>(hes);
 }
 #endif
 
diff --git a/src/gui/App.cpp b/src/gui/App.cpp
index 0ed8b10a..e4a8c167 100644
--- a/src/gui/App.cpp
+++ b/src/gui/App.cpp
@@ -28,8 +28,8 @@
 #include "raul/Path.hpp"
 #include "flowcanvas/Connection.hpp"
 #include "shared/World.hpp"
-#include "engine/Engine.hpp"
-#include "ingen/EngineInterface.hpp"
+#include "server/Engine.hpp"
+#include "ingen/ServerInterface.hpp"
 #include "shared/runtime_paths.hpp"
 #include "shared/LV2URIMap.hpp"
 #include "client/ObjectModel.hpp"
@@ -189,7 +189,7 @@ App::detach()
 		_store.reset();
 		_client.reset();
 		_handle.reset();
-		_world->set_engine(SharedPtr<EngineInterface>());
+		_world->set_engine(SharedPtr<ServerInterface>());
 	}
 }
 
diff --git a/src/gui/App.hpp b/src/gui/App.hpp
index 5a5fa0c2..82eab2f3 100644
--- a/src/gui/App.hpp
+++ b/src/gui/App.hpp
@@ -31,7 +31,7 @@
 
 namespace Ingen {
 	class ClientInterface;
-	class EngineInterface;
+	class ServerInterface;
 	class Port;
 	namespace Shared {
 		class World;
@@ -99,7 +99,7 @@ public:
 
 	Glib::RefPtr<Gdk::Pixbuf> icon_from_path(const std::string& path, int size);
 
-	SharedPtr<Ingen::EngineInterface>     engine() const { return _world->engine(); }
+	SharedPtr<Ingen::ServerInterface>     engine() const { return _world->engine(); }
 	SharedPtr<Client::SigClientInterface> client() const { return _client; }
 	SharedPtr<Client::ClientStore>        store()  const { return _store; }
 	SharedPtr<ThreadedLoader>             loader() const { return _loader; }
diff --git a/src/gui/ConnectWindow.cpp b/src/gui/ConnectWindow.cpp
index f93ebf4c..171113fb 100644
--- a/src/gui/ConnectWindow.cpp
+++ b/src/gui/ConnectWindow.cpp
@@ -25,10 +25,10 @@
 #include "raul/log.hpp"
 
 #include "ingen-config.h"
-#include "ingen/EngineInterface.hpp"
+#include "ingen/ServerInterface.hpp"
 #include "shared/Module.hpp"
 #include "shared/World.hpp"
-#include "engine/Engine.hpp"
+#include "server/Engine.hpp"
 #ifdef HAVE_SOUP
 #include "client/HTTPClientReceiver.hpp"
 #include "client/HTTPEngineSender.hpp"
@@ -83,7 +83,7 @@ ConnectWindow::start(Ingen::Shared::World* world)
 }
 
 void
-ConnectWindow::set_connected_to(SharedPtr<EngineInterface> engine)
+ConnectWindow::set_connected_to(SharedPtr<ServerInterface> engine)
 {
 	App::instance().world()->set_engine(engine);
 
@@ -142,7 +142,7 @@ ConnectWindow::set_connecting_widget_states()
 
 /** Launch (if applicable) and connect to the Engine.
  *
- * This will create the EngineInterface and ClientInterface and initialize
+ * This will create the ServerInterface and ClientInterface and initialize
  * the App with them.
  */
 void
@@ -193,14 +193,14 @@ ConnectWindow::connect(bool existing)
 #ifdef HAVE_LIBLO
 			if (scheme == "osc.udp" || scheme == "osc.tcp")
 				world->set_engine(
-					SharedPtr<EngineInterface>(
+					SharedPtr<ServerInterface>(
 						new OSCEngineSender(
 							uri,
 							world->conf()->option("packet-size").get_int32())));
 #endif
 #ifdef HAVE_SOUP
 			if (scheme == "http")
-				world->set_engine(SharedPtr<EngineInterface>(
+				world->set_engine(SharedPtr<ServerInterface>(
 					                  new HTTPEngineSender(world, uri)));
 #endif
 		} else {
@@ -222,7 +222,7 @@ ConnectWindow::connect(bool existing)
 		const string cmd = string("ingen -e --engine-port=").append(port_str);
 
 		if (Raul::Process::launch(cmd)) {
-			world->set_engine(SharedPtr<EngineInterface>(
+			world->set_engine(SharedPtr<ServerInterface>(
 					new OSCEngineSender(
 						string("osc.udp://localhost:").append(port_str),
 						world->conf()->option("packet-size").get_int32())));
@@ -252,7 +252,7 @@ ConnectWindow::connect(bool existing)
 
 		SharedPtr<SigClientInterface> client(new SigClientInterface());
 
-		if (!((Engine::Engine*)world->local_engine().get())->driver())
+		if (!((Server::Engine*)world->local_engine().get())->driver())
 			world->load_module("jack");
 
 		world->local_engine()->activate();
@@ -272,7 +272,7 @@ ConnectWindow::disconnect()
 	_attached = false;
 
 	App::instance().detach();
-	set_connected_to(SharedPtr<Ingen::EngineInterface>());
+	set_connected_to(SharedPtr<Ingen::ServerInterface>());
 
 	if (!_widgets_loaded)
 		return;
diff --git a/src/gui/ConnectWindow.hpp b/src/gui/ConnectWindow.hpp
index b5434d29..1e5fdd37 100644
--- a/src/gui/ConnectWindow.hpp
+++ b/src/gui/ConnectWindow.hpp
@@ -49,7 +49,7 @@ class ConnectWindow : public Dialog
 public:
 	ConnectWindow(BaseObjectType* cobject, const Glib::RefPtr<Gnome::Glade::Xml>& xml);
 
-	void set_connected_to(SharedPtr<EngineInterface> engine);
+	void set_connected_to(SharedPtr<ServerInterface> engine);
 	void start(Ingen::Shared::World* world);
 	void on_response(int32_t id) { _attached = true; }
 
diff --git a/src/gui/ControlPanel.cpp b/src/gui/ControlPanel.cpp
index 083c1457..03e044cc 100644
--- a/src/gui/ControlPanel.cpp
+++ b/src/gui/ControlPanel.cpp
@@ -15,7 +15,7 @@
  * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#include "ingen/EngineInterface.hpp"
+#include "ingen/ServerInterface.hpp"
 #include "ingen/PortType.hpp"
 #include "shared/LV2URIMap.hpp"
 #include "client/NodeModel.hpp"
diff --git a/src/gui/Controls.cpp b/src/gui/Controls.cpp
index a2c09e11..9322fd77 100644
--- a/src/gui/Controls.cpp
+++ b/src/gui/Controls.cpp
@@ -18,7 +18,7 @@
 #include <cmath>
 #include <algorithm>
 #include "raul/log.hpp"
-#include "ingen/EngineInterface.hpp"
+#include "ingen/ServerInterface.hpp"
 #include "shared/LV2URIMap.hpp"
 #include "client/PluginModel.hpp"
 #include "client/NodeModel.hpp"
diff --git a/src/gui/LoadPatchWindow.cpp b/src/gui/LoadPatchWindow.cpp
index edc47d4f..99c1c127 100644
--- a/src/gui/LoadPatchWindow.cpp
+++ b/src/gui/LoadPatchWindow.cpp
@@ -20,7 +20,7 @@
 #include <cassert>
 #include <boost/optional.hpp>
 #include <glibmm/miscutils.h>
-#include "ingen/EngineInterface.hpp"
+#include "ingen/ServerInterface.hpp"
 #include "shared/LV2URIMap.hpp"
 #include "client/NodeModel.hpp"
 #include "client/PatchModel.hpp"
diff --git a/src/gui/LoadPluginWindow.cpp b/src/gui/LoadPluginWindow.cpp
index b2cfc052..cf780f2d 100644
--- a/src/gui/LoadPluginWindow.cpp
+++ b/src/gui/LoadPluginWindow.cpp
@@ -19,7 +19,7 @@
 #include <algorithm>
 #include <ctype.h>
 #include "ingen-config.h"
-#include "ingen/EngineInterface.hpp"
+#include "ingen/ServerInterface.hpp"
 #include "shared/LV2URIMap.hpp"
 #include "client/PatchModel.hpp"
 #include "client/ClientStore.hpp"
diff --git a/src/gui/LoadRemotePatchWindow.cpp b/src/gui/LoadRemotePatchWindow.cpp
index e66b25a1..0318dba7 100644
--- a/src/gui/LoadRemotePatchWindow.cpp
+++ b/src/gui/LoadRemotePatchWindow.cpp
@@ -19,7 +19,7 @@
 #include <dirent.h>
 #include <boost/optional/optional.hpp>
 #include "client/PatchModel.hpp"
-#include "ingen/EngineInterface.hpp"
+#include "ingen/ServerInterface.hpp"
 #include "shared/World.hpp"
 #include "App.hpp"
 #include "Configuration.hpp"
diff --git a/src/gui/NewSubpatchWindow.cpp b/src/gui/NewSubpatchWindow.cpp
index 35e66e3b..26664693 100644
--- a/src/gui/NewSubpatchWindow.cpp
+++ b/src/gui/NewSubpatchWindow.cpp
@@ -16,7 +16,7 @@
  */
 
 #include "App.hpp"
-#include "ingen/EngineInterface.hpp"
+#include "ingen/ServerInterface.hpp"
 #include "shared/LV2URIMap.hpp"
 #include "client/PatchModel.hpp"
 #include "client/ClientStore.hpp"
diff --git a/src/gui/NodeControlWindow.cpp b/src/gui/NodeControlWindow.cpp
index b4ccbe73..ef09a68d 100644
--- a/src/gui/NodeControlWindow.cpp
+++ b/src/gui/NodeControlWindow.cpp
@@ -16,7 +16,7 @@
  */
 
 #include <cmath>
-#include "ingen/EngineInterface.hpp"
+#include "ingen/ServerInterface.hpp"
 #include "shared/LV2URIMap.hpp"
 #include "client/NodeModel.hpp"
 #include "App.hpp"
diff --git a/src/gui/NodeMenu.cpp b/src/gui/NodeMenu.cpp
index 1e6b0f9f..3a683027 100644
--- a/src/gui/NodeMenu.cpp
+++ b/src/gui/NodeMenu.cpp
@@ -17,7 +17,7 @@
 
 #include <gtkmm.h>
 #include "ingen-config.h"
-#include "ingen/EngineInterface.hpp"
+#include "ingen/ServerInterface.hpp"
 #include "shared/LV2URIMap.hpp"
 #include "client/NodeModel.hpp"
 #include "client/PluginModel.hpp"
diff --git a/src/gui/NodeModule.cpp b/src/gui/NodeModule.cpp
index 984e84b8..d8f22ecd 100644
--- a/src/gui/NodeModule.cpp
+++ b/src/gui/NodeModule.cpp
@@ -19,7 +19,7 @@
 #include "ingen-config.h"
 #include "raul/log.hpp"
 #include "raul/Atom.hpp"
-#include "ingen/EngineInterface.hpp"
+#include "ingen/ServerInterface.hpp"
 #include "shared/LV2URIMap.hpp"
 #include "client/PatchModel.hpp"
 #include "client/NodeModel.hpp"
diff --git a/src/gui/ObjectMenu.cpp b/src/gui/ObjectMenu.cpp
index 39afa071..d8a5e426 100644
--- a/src/gui/ObjectMenu.cpp
+++ b/src/gui/ObjectMenu.cpp
@@ -17,7 +17,7 @@
 
 #include <utility>
 #include <gtkmm.h>
-#include "ingen/EngineInterface.hpp"
+#include "ingen/ServerInterface.hpp"
 #include "shared/LV2URIMap.hpp"
 #include "client/ObjectModel.hpp"
 #include "App.hpp"
diff --git a/src/gui/PatchCanvas.cpp b/src/gui/PatchCanvas.cpp
index 8c7cb0fa..334b7035 100644
--- a/src/gui/PatchCanvas.cpp
+++ b/src/gui/PatchCanvas.cpp
@@ -22,7 +22,7 @@
 #include "raul/log.hpp"
 #include "flowcanvas/Canvas.hpp"
 #include "flowcanvas/Ellipse.hpp"
-#include "ingen/EngineInterface.hpp"
+#include "ingen/ServerInterface.hpp"
 #include "shared/LV2URIMap.hpp"
 #include "shared/Builder.hpp"
 #include "shared/ClashAvoider.hpp"
diff --git a/src/gui/PatchPortModule.cpp b/src/gui/PatchPortModule.cpp
index 10bb60e6..51dd064a 100644
--- a/src/gui/PatchPortModule.cpp
+++ b/src/gui/PatchPortModule.cpp
@@ -18,7 +18,7 @@
 #include <cassert>
 #include <utility>
 #include "PatchPortModule.hpp"
-#include "ingen/EngineInterface.hpp"
+#include "ingen/ServerInterface.hpp"
 #include "shared/LV2URIMap.hpp"
 #include "client/PatchModel.hpp"
 #include "client/NodeModel.hpp"
diff --git a/src/gui/PatchTreeWindow.cpp b/src/gui/PatchTreeWindow.cpp
index 5ed578db..adb41a13 100644
--- a/src/gui/PatchTreeWindow.cpp
+++ b/src/gui/PatchTreeWindow.cpp
@@ -17,7 +17,7 @@
 
 #include "raul/log.hpp"
 #include "raul/Path.hpp"
-#include "ingen/EngineInterface.hpp"
+#include "ingen/ServerInterface.hpp"
 #include "shared/LV2URIMap.hpp"
 #include "client/ClientStore.hpp"
 #include "client/PatchModel.hpp"
diff --git a/src/gui/PatchView.cpp b/src/gui/PatchView.cpp
index 55c6b4b6..afe73048 100644
--- a/src/gui/PatchView.cpp
+++ b/src/gui/PatchView.cpp
@@ -18,7 +18,7 @@
 #include <cassert>
 #include <fstream>
 #include "raul/log.hpp"
-#include "ingen/EngineInterface.hpp"
+#include "ingen/ServerInterface.hpp"
 #include "shared/LV2URIMap.hpp"
 #include "client/PatchModel.hpp"
 #include "App.hpp"
diff --git a/src/gui/PatchWindow.cpp b/src/gui/PatchWindow.cpp
index 218453d6..cd97e3e3 100644
--- a/src/gui/PatchWindow.cpp
+++ b/src/gui/PatchWindow.cpp
@@ -22,7 +22,7 @@
 #include <glib/gstdio.h>
 #include <glibmm/fileutils.h>
 #include "raul/AtomRDF.hpp"
-#include "ingen/EngineInterface.hpp"
+#include "ingen/ServerInterface.hpp"
 #include "shared/LV2URIMap.hpp"
 #include "client/PatchModel.hpp"
 #include "client/ClientStore.hpp"
diff --git a/src/gui/Port.cpp b/src/gui/Port.cpp
index f22af7e4..ba28078d 100644
--- a/src/gui/Port.cpp
+++ b/src/gui/Port.cpp
@@ -18,7 +18,7 @@
 #include <cassert>
 #include "raul/log.hpp"
 #include "flowcanvas/Module.hpp"
-#include "ingen/EngineInterface.hpp"
+#include "ingen/ServerInterface.hpp"
 #include "shared/LV2URIMap.hpp"
 #include "client/PatchModel.hpp"
 #include "client/PortModel.hpp"
diff --git a/src/gui/PortMenu.cpp b/src/gui/PortMenu.cpp
index 69a67dd9..079e3c3e 100644
--- a/src/gui/PortMenu.cpp
+++ b/src/gui/PortMenu.cpp
@@ -18,7 +18,7 @@
 #include <math.h>
 #include <gtkmm.h>
 #include "raul/SharedPtr.hpp"
-#include "ingen/EngineInterface.hpp"
+#include "ingen/ServerInterface.hpp"
 #include "shared/LV2URIMap.hpp"
 #include "client/PatchModel.hpp"
 #include "client/PortModel.hpp"
diff --git a/src/gui/PortPropertiesWindow.cpp b/src/gui/PortPropertiesWindow.cpp
index 1f3be2fb..23d38ac9 100644
--- a/src/gui/PortPropertiesWindow.cpp
+++ b/src/gui/PortPropertiesWindow.cpp
@@ -17,7 +17,7 @@
 
 #include <cassert>
 #include <string>
-#include "ingen/EngineInterface.hpp"
+#include "ingen/ServerInterface.hpp"
 #include "shared/LV2URIMap.hpp"
 #include "client/NodeModel.hpp"
 #include "client/PluginModel.hpp"
diff --git a/src/gui/RenameWindow.cpp b/src/gui/RenameWindow.cpp
index 52e3a339..7b8844f1 100644
--- a/src/gui/RenameWindow.cpp
+++ b/src/gui/RenameWindow.cpp
@@ -17,7 +17,7 @@
 
 #include <cassert>
 #include <string>
-#include "ingen/EngineInterface.hpp"
+#include "ingen/ServerInterface.hpp"
 #include "shared/LV2URIMap.hpp"
 #include "client/ObjectModel.hpp"
 #include "client/ClientStore.hpp"
diff --git a/src/gui/SubpatchModule.cpp b/src/gui/SubpatchModule.cpp
index 4023a1f2..e2347bdd 100644
--- a/src/gui/SubpatchModule.cpp
+++ b/src/gui/SubpatchModule.cpp
@@ -17,7 +17,7 @@
 
 #include "SubpatchModule.hpp"
 #include <cassert>
-#include "ingen/EngineInterface.hpp"
+#include "ingen/ServerInterface.hpp"
 #include "client/PatchModel.hpp"
 #include "App.hpp"
 #include "NodeModule.hpp"
diff --git a/src/gui/ThreadedLoader.cpp b/src/gui/ThreadedLoader.cpp
index 5338b7ee..7a7a3ede 100644
--- a/src/gui/ThreadedLoader.cpp
+++ b/src/gui/ThreadedLoader.cpp
@@ -30,7 +30,7 @@ using namespace Raul;
 namespace Ingen {
 namespace GUI {
 
-ThreadedLoader::ThreadedLoader(SharedPtr<Shared::LV2URIMap> uris, SharedPtr<EngineInterface> engine)
+ThreadedLoader::ThreadedLoader(SharedPtr<Shared::LV2URIMap> uris, SharedPtr<ServerInterface> engine)
 	: _engine(engine)
 {
 	set_name("Loader");
diff --git a/src/gui/ThreadedLoader.hpp b/src/gui/ThreadedLoader.hpp
index ef137d1e..c35da81f 100644
--- a/src/gui/ThreadedLoader.hpp
+++ b/src/gui/ThreadedLoader.hpp
@@ -25,7 +25,7 @@
 #include "raul/Thread.hpp"
 #include "raul/Slave.hpp"
 #include <glibmm/thread.h>
-#include "ingen/EngineInterface.hpp"
+#include "ingen/ServerInterface.hpp"
 #include "serialisation/Serialiser.hpp"
 #include "serialisation/Parser.hpp"
 using std::string;
@@ -54,7 +54,7 @@ class ThreadedLoader : public Raul::Slave
 {
 public:
 	ThreadedLoader(SharedPtr<Shared::LV2URIMap> uris,
-	               SharedPtr<EngineInterface>   engine);
+	               SharedPtr<ServerInterface>   engine);
 
 	void load_patch(bool                              merge,
                     const Glib::ustring&              document_uri,
@@ -75,7 +75,7 @@ private:
 
 	void _whipped();
 
-	SharedPtr<EngineInterface> _engine;
+	SharedPtr<ServerInterface> _engine;
 
 	Glib::Mutex   _mutex;
 	list<Closure> _events;
diff --git a/src/gui/UploadPatchWindow.cpp b/src/gui/UploadPatchWindow.cpp
index a7526eee..326aa968 100644
--- a/src/gui/UploadPatchWindow.cpp
+++ b/src/gui/UploadPatchWindow.cpp
@@ -24,7 +24,7 @@
 #include "shared/World.hpp"
 #include "shared/LV2URIMap.hpp"
 #include "client/ClientStore.hpp"
-#include "ingen/EngineInterface.hpp"
+#include "ingen/ServerInterface.hpp"
 #include "serialisation/Serialiser.hpp"
 #include "serialisation/names.hpp"
 #include "client/PatchModel.hpp"
diff --git a/src/ingen/main.cpp b/src/ingen/main.cpp
index 4691c302..57f59793 100644
--- a/src/ingen/main.cpp
+++ b/src/ingen/main.cpp
@@ -40,7 +40,7 @@
 #include "ingen-config.h"
 
 #include "ingen/EngineBase.hpp"
-#include "ingen/EngineInterface.hpp"
+#include "ingen/ServerInterface.hpp"
 #include "serialisation/Parser.hpp"
 #include "shared/Configuration.hpp"
 #include "shared/World.hpp"
@@ -102,7 +102,7 @@ main(int argc, char** argv)
 	// Set bundle path from executable location so resources can be found
 	Shared::set_bundle_path_from_code((void*)&main);
 
-	SharedPtr<EngineInterface> engine_interface;
+	SharedPtr<ServerInterface> engine_interface;
 
 	Glib::thread_init();
 #if HAVE_SOUP
diff --git a/src/serialisation/Parser.cpp b/src/serialisation/Parser.cpp
index f66cd38f..d1ff41f9 100644
--- a/src/serialisation/Parser.cpp
+++ b/src/serialisation/Parser.cpp
@@ -34,7 +34,7 @@
 #include "serd/serd.h"
 #include "sord/sordmm.hpp"
 
-#include "ingen/EngineInterface.hpp"
+#include "ingen/ServerInterface.hpp"
 #include "shared/World.hpp"
 #include "shared/LV2URIMap.hpp"
 
diff --git a/src/serialisation/Serialiser.cpp b/src/serialisation/Serialiser.cpp
index 1eb76344..04b4c692 100644
--- a/src/serialisation/Serialiser.cpp
+++ b/src/serialisation/Serialiser.cpp
@@ -43,7 +43,7 @@
 #include "sord/sordmm.hpp"
 
 #include "ingen/Connection.hpp"
-#include "ingen/EngineInterface.hpp"
+#include "ingen/ServerInterface.hpp"
 #include "ingen/Node.hpp"
 #include "ingen/Patch.hpp"
 #include "ingen/Plugin.hpp"
diff --git a/src/engine/AudioBuffer.cpp b/src/server/AudioBuffer.cpp
index 172e41ac..f255ec2f 100644
--- a/src/engine/AudioBuffer.cpp
+++ b/src/server/AudioBuffer.cpp
@@ -32,7 +32,7 @@ using namespace Raul;
  * stops sucking.  Probably a good idea to inline them as well */
 
 namespace Ingen {
-namespace Engine {
+namespace Server {
 
 AudioBuffer::AudioBuffer(BufferFactory& bufs, PortType type, size_t size)
 	: ObjectBuffer(bufs, size)
@@ -203,5 +203,5 @@ AudioBuffer::prepare_read(Context& context)
 	}
 }
 
-} // namespace Engine
+} // namespace Server
 } // namespace Ingen
diff --git a/src/engine/AudioBuffer.hpp b/src/server/AudioBuffer.hpp
index d0c562a9..4a7869e2 100644
--- a/src/engine/AudioBuffer.hpp
+++ b/src/server/AudioBuffer.hpp
@@ -28,7 +28,7 @@
 using namespace std;
 
 namespace Ingen {
-namespace Engine {
+namespace Server {
 
 class AudioBuffer : public ObjectBuffer
 {
@@ -103,7 +103,7 @@ AudioBuffer::accumulate(Context& context, const AudioBuffer* const src)
 	}
 }
 
-} // namespace Engine
+} // namespace Server
 } // namespace Ingen
 
 #endif // INGEN_ENGINE_AUDIOBUFFER_HPP
diff --git a/src/engine/Buffer.hpp b/src/server/Buffer.hpp
index 56682228..e44915b3 100644
--- a/src/engine/Buffer.hpp
+++ b/src/server/Buffer.hpp
@@ -29,7 +29,7 @@
 #include "BufferFactory.hpp"
 
 namespace Ingen {
-namespace Engine {
+namespace Server {
 
 class Context;
 class Engine;
@@ -86,12 +86,12 @@ private:
 	size_t  _refs; ///< Intrusive reference count for intrusive_ptr
 };
 
-} // namespace Engine
+} // namespace Server
 } // namespace Ingen
 
 namespace boost {
-inline void intrusive_ptr_add_ref(Ingen::Engine::Buffer* b) { b->ref(); }
-inline void intrusive_ptr_release(Ingen::Engine::Buffer* b) { b->deref(); }
+inline void intrusive_ptr_add_ref(Ingen::Server::Buffer* b) { b->ref(); }
+inline void intrusive_ptr_release(Ingen::Server::Buffer* b) { b->deref(); }
 }
 
 #endif // INGEN_ENGINE_BUFFER_HPP
diff --git a/src/engine/BufferFactory.cpp b/src/server/BufferFactory.cpp
index 7aac798a..f725079b 100644
--- a/src/engine/BufferFactory.cpp
+++ b/src/server/BufferFactory.cpp
@@ -29,7 +29,7 @@
 using namespace Raul;
 
 namespace Ingen {
-namespace Engine {
+namespace Server {
 
 static const size_t EVENT_BYTES_PER_FRAME = 4; // FIXME
 
@@ -159,5 +159,5 @@ BufferFactory::recycle(Buffer* buf)
 	} while (!head_ptr.compare_and_exchange(try_head, buf));
 }
 
-} // namespace Engine
+} // namespace Server
 } // namespace Ingen
diff --git a/src/engine/BufferFactory.hpp b/src/server/BufferFactory.hpp
index 5d6ebf7c..58dc55af 100644
--- a/src/engine/BufferFactory.hpp
+++ b/src/server/BufferFactory.hpp
@@ -30,7 +30,7 @@ namespace Ingen {
 
 namespace Shared { class LV2URIMap; }
 
-namespace Engine {
+namespace Server {
 
 class Engine;
 class Buffer;
@@ -86,7 +86,7 @@ private:
 	Ref _silent_buffer;
 };
 
-} // namespace Engine
+} // namespace Server
 } // namespace Ingen
 
 #endif // INGEN_ENGINE_BUFFERFACTORY_HPP
diff --git a/src/engine/ClientBroadcaster.cpp b/src/server/ClientBroadcaster.cpp
index 46c50ea6..2931497a 100644
--- a/src/engine/ClientBroadcaster.cpp
+++ b/src/server/ClientBroadcaster.cpp
@@ -32,7 +32,7 @@ using namespace std;
 using namespace Raul;
 
 namespace Ingen {
-namespace Engine {
+namespace Server {
 
 /** Register a client to receive messages over the notification band.
  */
@@ -112,5 +112,5 @@ ClientBroadcaster::send_object(const GraphObjectImpl* o, bool recursive)
 		ObjectSender::send_object((*i).second, o, recursive);
 }
 
-} // namespace Engine
+} // namespace Server
 } // namespace Ingen
diff --git a/src/engine/ClientBroadcaster.hpp b/src/server/ClientBroadcaster.hpp
index c72cdeec..5db6961d 100644
--- a/src/engine/ClientBroadcaster.hpp
+++ b/src/server/ClientBroadcaster.hpp
@@ -29,7 +29,7 @@
 using namespace std;
 
 namespace Ingen {
-namespace Engine {
+namespace Server {
 
 class GraphObjectImpl;
 class NodeImpl;
@@ -124,7 +124,7 @@ private:
 	Clients _clients;
 };
 
-} // namespace Engine
+} // namespace Server
 } // namespace Ingen
 
 #endif // INGEN_ENGINE_CLIENTBROADCASTER_HPP
diff --git a/src/engine/CompiledPatch.hpp b/src/server/CompiledPatch.hpp
index 274816fb..65ee9fad 100644
--- a/src/engine/CompiledPatch.hpp
+++ b/src/server/CompiledPatch.hpp
@@ -24,7 +24,7 @@
 #include <boost/utility.hpp>
 
 namespace Ingen {
-namespace Engine {
+namespace Server {
 
 class ConnectionImpl;
 
@@ -70,7 +70,7 @@ struct CompiledPatch : public std::vector<CompiledNode>
 	std::vector<ConnectionImpl*> queued_connections;
 };
 
-} // namespace Engine
+} // namespace Server
 } // namespace Ingen
 
 #endif // INGEN_ENGINE_COMPILEDPATCH_HPP
diff --git a/src/engine/ConnectionImpl.cpp b/src/server/ConnectionImpl.cpp
index 90ac75ea..1e339910 100644
--- a/src/engine/ConnectionImpl.cpp
+++ b/src/server/ConnectionImpl.cpp
@@ -34,7 +34,7 @@
 #include "util.hpp"
 
 namespace Ingen {
-namespace Engine {
+namespace Server {
 
 /** Constructor for a connection from a node's output port.
  *
@@ -148,6 +148,6 @@ ConnectionImpl::can_connect(const OutputPort* src, const InputPort* dst)
 			|| (src->supports(uris.atom_Vector)  && dst->is_a(PortType::AUDIO)));
 }
 
-} // namespace Engine
+} // namespace Server
 } // namespace Ingen
 
diff --git a/src/engine/ConnectionImpl.hpp b/src/server/ConnectionImpl.hpp
index d28196fc..ce30eaa4 100644
--- a/src/engine/ConnectionImpl.hpp
+++ b/src/server/ConnectionImpl.hpp
@@ -31,7 +31,7 @@
 using namespace std;
 
 namespace Ingen {
-namespace Engine {
+namespace Server {
 
 class PortImpl;
 class OutputPort;
@@ -104,7 +104,7 @@ protected:
 	bool               _pending_disconnection;
 };
 
-} // namespace Engine
+} // namespace Server
 } // namespace Ingen
 
 #endif // INGEN_ENGINE_CONNECTIONIMPL_HPP
diff --git a/src/engine/Context.hpp b/src/server/Context.hpp
index 5ffb8a93..d2d1b11f 100644
--- a/src/engine/Context.hpp
+++ b/src/server/Context.hpp
@@ -25,7 +25,7 @@
 #include "types.hpp"
 
 namespace Ingen {
-namespace Engine {
+namespace Server {
 
 class Engine;
 
@@ -100,7 +100,7 @@ protected:
 	bool        _realtime;   ///< True iff context is hard realtime
 };
 
-} // namespace Engine
+} // namespace Server
 } // namespace Ingen
 
 #endif // INGEN_ENGINE_CONTEXT_HPP
diff --git a/src/engine/ControlBindings.cpp b/src/server/ControlBindings.cpp
index 6c5b2f95..6c2cf09c 100644
--- a/src/engine/ControlBindings.cpp
+++ b/src/server/ControlBindings.cpp
@@ -36,7 +36,7 @@ using namespace std;
 using namespace Raul;
 
 namespace Ingen {
-namespace Engine {
+namespace Server {
 
 ControlBindings::ControlBindings(Engine& engine)
 	: _engine(engine)
@@ -380,5 +380,5 @@ ControlBindings::post_process(ProcessContext& context, EventBuffer* buffer)
 	}
 }
 
-} // namespace Engine
+} // namespace Server
 } // namespace Ingen
diff --git a/src/engine/ControlBindings.hpp b/src/server/ControlBindings.hpp
index 2b2946ec..92eee7c7 100644
--- a/src/engine/ControlBindings.hpp
+++ b/src/server/ControlBindings.hpp
@@ -26,7 +26,7 @@
 #include "BufferFactory.hpp"
 
 namespace Ingen {
-namespace Engine {
+namespace Server {
 
 class Engine;
 class ProcessContext;
@@ -96,7 +96,7 @@ private:
 	EventBuffer*        _feedback;
 };
 
-} // namespace Engine
+} // namespace Server
 } // namespace Ingen
 
 #endif // INGEN_ENGINE_CONTROLBINDINGS_HPP
diff --git a/src/engine/Driver.hpp b/src/server/Driver.hpp
index f47f2b44..f9416e3e 100644
--- a/src/engine/Driver.hpp
+++ b/src/server/Driver.hpp
@@ -28,7 +28,7 @@
 namespace Raul { class Path; }
 
 namespace Ingen {
-namespace Engine {
+namespace Server {
 
 class DuplexPort;
 class ProcessContext;
@@ -117,7 +117,7 @@ public:
 	virtual ProcessContext& context() = 0;
 };
 
-} // namespace Engine
+} // namespace Server
 } // namespace Ingen
 
 #endif // INGEN_ENGINE_DRIVER_HPP
diff --git a/src/engine/DuplexPort.cpp b/src/server/DuplexPort.cpp
index ecd8da27..773aab37 100644
--- a/src/engine/DuplexPort.cpp
+++ b/src/server/DuplexPort.cpp
@@ -32,7 +32,7 @@
 using namespace std;
 
 namespace Ingen {
-namespace Engine {
+namespace Server {
 
 DuplexPort::DuplexPort(
 		BufferFactory&    bufs,
@@ -94,6 +94,6 @@ DuplexPort::post_process(Context& context)
 	}
 }
 
-} // namespace Engine
+} // namespace Server
 } // namespace Ingen
 
diff --git a/src/engine/DuplexPort.hpp b/src/server/DuplexPort.hpp
index 4341c6e3..ed00e072 100644
--- a/src/engine/DuplexPort.hpp
+++ b/src/server/DuplexPort.hpp
@@ -24,7 +24,7 @@
 #include "OutputPort.hpp"
 
 namespace Ingen {
-namespace Engine {
+namespace Server {
 
 class NodeImpl;
 
@@ -64,7 +64,7 @@ protected:
 	bool _is_output;
 };
 
-} // namespace Engine
+} // namespace Server
 } // namespace Ingen
 
 #endif // INGEN_ENGINE_DUPLEXPORT_HPP
diff --git a/src/engine/Engine.cpp b/src/server/Engine.cpp
index 357604ed..4a4a9c0f 100644
--- a/src/engine/Engine.cpp
+++ b/src/server/Engine.cpp
@@ -50,7 +50,7 @@ using namespace std;
 using namespace Raul;
 
 namespace Ingen {
-namespace Engine {
+namespace Server {
 
 bool ThreadManager::single_threaded = true;
 
@@ -221,5 +221,5 @@ Engine::process_events(ProcessContext& context)
 		(*i)->process(*_post_processor, context);
 }
 
-} // namespace Engine
+} // namespace Server
 } // namespace Ingen
diff --git a/src/engine/Engine.hpp b/src/server/Engine.hpp
index ffcd5dc9..b3cf6688 100644
--- a/src/engine/Engine.hpp
+++ b/src/server/Engine.hpp
@@ -33,7 +33,7 @@ namespace Ingen {
 
 namespace Shared { class World; }
 
-namespace Engine {
+namespace Server {
 
 class BufferFactory;
 class ClientBroadcaster;
@@ -109,7 +109,7 @@ private:
 	bool _quit_flag;
 };
 
-} // namespace Engine
+} // namespace Server
 } // namespace Ingen
 
 #endif // INGEN_ENGINE_ENGINE_HPP
diff --git a/src/engine/EngineStore.cpp b/src/server/EngineStore.cpp
index 010edbc0..ee0dc933 100644
--- a/src/engine/EngineStore.cpp
+++ b/src/server/EngineStore.cpp
@@ -33,7 +33,7 @@ using namespace std;
 using namespace Raul;
 
 namespace Ingen {
-namespace Engine {
+namespace Server {
 
 /** Find the Patch at the given path.
  */
@@ -156,5 +156,5 @@ EngineStore::remove_children(iterator object)
 	return SharedPtr<EngineStore::Objects>();
 }
 
-} // namespace Engine
+} // namespace Server
 } // namespace Ingen
diff --git a/src/engine/EngineStore.hpp b/src/server/EngineStore.hpp
index c6d1e024..ba8dd000 100644
--- a/src/engine/EngineStore.hpp
+++ b/src/server/EngineStore.hpp
@@ -26,7 +26,7 @@ namespace Ingen {
 
 class GraphObject;
 
-namespace Engine {
+namespace Server {
 
 class PatchImpl;
 class NodeImpl;
@@ -59,7 +59,7 @@ public:
 	SharedPtr<Objects> remove_children(Objects::iterator i);
 };
 
-} // namespace Engine
+} // namespace Server
 } // namespace Ingen
 
 #endif // OBJECTSTORE
diff --git a/src/engine/Event.cpp b/src/server/Event.cpp
index 76af56c0..f967bfac 100644
--- a/src/engine/Event.cpp
+++ b/src/server/Event.cpp
@@ -29,7 +29,7 @@
  */
 
 namespace Ingen {
-namespace Engine {
+namespace Server {
 
 void
 Event::execute(ProcessContext& context)
@@ -51,6 +51,6 @@ Event::post_process()
 	ThreadManager::assert_not_thread(THREAD_PROCESS);
 }
 
-} // namespace Engine
+} // namespace Server
 } // namespace Ingen
 
diff --git a/src/engine/Event.hpp b/src/server/Event.hpp
index d6664683..af39bfa4 100644
--- a/src/engine/Event.hpp
+++ b/src/server/Event.hpp
@@ -25,7 +25,7 @@
 #include "types.hpp"
 
 namespace Ingen {
-namespace Engine {
+namespace Server {
 
 class Engine;
 class Request;
@@ -74,7 +74,7 @@ protected:
 	bool               _executed;
 };
 
-} // namespace Engine
+} // namespace Server
 } // namespace Ingen
 
 #endif // INGEN_ENGINE_EVENT_HPP
diff --git a/src/engine/EventBuffer.cpp b/src/server/EventBuffer.cpp
index 50f938ce..1e8713ba 100644
--- a/src/engine/EventBuffer.cpp
+++ b/src/server/EventBuffer.cpp
@@ -28,7 +28,7 @@ using namespace std;
 using namespace Raul;
 
 namespace Ingen {
-namespace Engine {
+namespace Server {
 
 /** Allocate a new event buffer.
  * \a capacity is in bytes (not number of events).
@@ -211,5 +211,5 @@ EventBuffer::append(uint32_t       frames,
 	}
 }
 
-} // namespace Engine
+} // namespace Server
 } // namespace Ingen
diff --git a/src/engine/EventBuffer.hpp b/src/server/EventBuffer.hpp
index 16f5afbe..de67ae0c 100644
--- a/src/engine/EventBuffer.hpp
+++ b/src/server/EventBuffer.hpp
@@ -25,7 +25,7 @@
 #include "Buffer.hpp"
 
 namespace Ingen {
-namespace Engine {
+namespace Server {
 
 class EventBuffer : public Buffer {
 public:
@@ -80,7 +80,7 @@ private:
 	uint32_t                   _latest_subframes; ///< Latest time of all events (subframes)
 };
 
-} // namespace Engine
+} // namespace Server
 } // namespace Ingen
 
 #endif // INGEN_ENGINE_EVENTBUFFER_HPP
diff --git a/src/engine/EventSink.cpp b/src/server/EventSink.cpp
index bf31beaa..bb81f3ec 100644
--- a/src/engine/EventSink.cpp
+++ b/src/server/EventSink.cpp
@@ -21,7 +21,7 @@
 using namespace std;
 
 namespace Ingen {
-namespace Engine {
+namespace Server {
 
 /** \a size is not size_t because an event will never be even remotely close
  * to UINT32_MAX in size, so uint32_t saves wasted space on 64-bit.
@@ -58,5 +58,5 @@ EventSink::read(uint32_t event_buffer_size, uint8_t* event_buffer)
 		return false;
 }
 
-} // namespace Engine
+} // namespace Server
 } // namespace Ingen
diff --git a/src/engine/EventSink.hpp b/src/server/EventSink.hpp
index 50edea77..bbc3c324 100644
--- a/src/engine/EventSink.hpp
+++ b/src/server/EventSink.hpp
@@ -24,7 +24,7 @@
 #include "raul/RingBuffer.hpp"
 
 namespace Ingen {
-namespace Engine {
+namespace Server {
 
 class PortImpl;
 class Engine;
@@ -52,7 +52,7 @@ private:
 	Raul::RingBuffer _events;
 };
 
-} // namespace Engine
+} // namespace Server
 } // namespace Ingen
 
 #endif // INGEN_ENGINE_EVENTSINK_HPP
diff --git a/src/engine/EventSource.cpp b/src/server/EventSource.cpp
index 33ab94ab..273a4693 100644
--- a/src/engine/EventSource.cpp
+++ b/src/server/EventSource.cpp
@@ -25,7 +25,7 @@
 using namespace std;
 
 namespace Ingen {
-namespace Engine {
+namespace Server {
 
 EventSource::EventSource(size_t queue_size)
 	: _blocking_semaphore(0)
@@ -122,6 +122,6 @@ EventSource::_whipped()
 		_blocking_semaphore.wait();
 }
 
-} // namespace Engine
+} // namespace Server
 } // namespace Ingen
 
diff --git a/src/engine/EventSource.hpp b/src/server/EventSource.hpp
index 52bb08f6..19d87ed9 100644
--- a/src/engine/EventSource.hpp
+++ b/src/server/EventSource.hpp
@@ -23,7 +23,7 @@
 #include "raul/List.hpp"
 
 namespace Ingen {
-namespace Engine {
+namespace Server {
 
 class Event;
 class QueuedEvent;
@@ -66,7 +66,7 @@ private:
 	Raul::Semaphore                           _blocking_semaphore;
 };
 
-} // namespace Engine
+} // namespace Server
 } // namespace Ingen
 
 #endif // INGEN_ENGINE_EVENTSOURCE_HPP
diff --git a/src/engine/GraphObjectImpl.cpp b/src/server/GraphObjectImpl.cpp
index 6b8e8a08..334a8caa 100644
--- a/src/engine/GraphObjectImpl.cpp
+++ b/src/server/GraphObjectImpl.cpp
@@ -25,7 +25,7 @@ using namespace std;
 using namespace Raul;
 
 namespace Ingen {
-namespace Engine {
+namespace Server {
 
 GraphObjectImpl::GraphObjectImpl(Ingen::Shared::LV2URIMap& uris,
                                  GraphObjectImpl*          parent,
@@ -69,5 +69,5 @@ GraphObjectImpl::find_child(const std::string& name) const
 	throw;
 }
 
-} // namespace Engine
+} // namespace Server
 } // namespace Ingen
diff --git a/src/engine/GraphObjectImpl.hpp b/src/server/GraphObjectImpl.hpp
index 88e18ff4..6c08c9c4 100644
--- a/src/engine/GraphObjectImpl.hpp
+++ b/src/server/GraphObjectImpl.hpp
@@ -34,7 +34,7 @@ namespace Ingen {
 
 namespace Shared { class LV2URIMap; }
 
-namespace Engine {
+namespace Server {
 
 class PatchImpl;
 class Context;
@@ -107,7 +107,7 @@ protected:
 	Raul::Symbol     _symbol;
 };
 
-} // namespace Engine
+} // namespace Server
 } // namespace Ingen
 
 #endif // INGEN_ENGINE_GRAPHOBJECTIMPL_HPP
diff --git a/src/engine/HTTPClientSender.cpp b/src/server/HTTPClientSender.cpp
index 21dc11a3..1334e6e7 100644
--- a/src/engine/HTTPClientSender.cpp
+++ b/src/server/HTTPClientSender.cpp
@@ -29,7 +29,7 @@ using namespace std;
 using namespace Raul;
 
 namespace Ingen {
-namespace Engine {
+namespace Server {
 
 void
 HTTPClientSender::response_ok(int32_t id)
@@ -142,5 +142,5 @@ HTTPClientSender::move(const Path& old_path, const Path& new_path)
 	send_chunk(msg);
 }
 
-} // namespace Engine
+} // namespace Server
 } // namespace Ingen
diff --git a/src/engine/HTTPClientSender.hpp b/src/server/HTTPClientSender.hpp
index 5b3cdc73..63842c3a 100644
--- a/src/engine/HTTPClientSender.hpp
+++ b/src/server/HTTPClientSender.hpp
@@ -27,9 +27,9 @@
 
 namespace Ingen {
 
-class EngineInterface;
+class ServerInterface;
 
-namespace Engine {
+namespace Server {
 
 class Engine;
 
@@ -100,7 +100,7 @@ private:
 	bool        _enabled;
 };
 
-} // namespace Engine
+} // namespace Server
 } // namespace Ingen
 
 #endif // INGEN_ENGINE_HTTPCLIENTSENDER_HPP
diff --git a/src/engine/HTTPEngineReceiver.cpp b/src/server/HTTPEngineReceiver.cpp
index 910be584..b027a6b3 100644
--- a/src/engine/HTTPEngineReceiver.cpp
+++ b/src/server/HTTPEngineReceiver.cpp
@@ -48,7 +48,7 @@ namespace Ingen {
 
 using namespace Serialisation;
 
-namespace Engine {
+namespace Server {
 
 HTTPEngineReceiver::HTTPEngineReceiver(Engine& engine, uint16_t port)
 	: QueuedEngineInterface(engine, 64) // FIXME
@@ -225,6 +225,6 @@ HTTPEngineReceiver::ReceiveThread::_run()
 	soup_server_run(_receiver._server);
 }
 
-} // namespace Engine
+} // namespace Server
 } // namespace Ingen
 
diff --git a/src/engine/HTTPEngineReceiver.hpp b/src/server/HTTPEngineReceiver.hpp
index 0241270a..c261d0f1 100644
--- a/src/engine/HTTPEngineReceiver.hpp
+++ b/src/server/HTTPEngineReceiver.hpp
@@ -29,7 +29,7 @@ typedef struct _SoupMessage SoupMessage;
 typedef struct SoupClientContext SoupClientContext;
 
 namespace Ingen {
-namespace Engine {
+namespace Server {
 
 class HTTPEngineReceiver : public QueuedEngineInterface
 {
@@ -58,7 +58,7 @@ private:
 	SoupServer*    _server;
 };
 
-} // namespace Engine
+} // namespace Server
 } // namespace Ingen
 
 #endif // INGEN_ENGINE_HTTPENGINERECEIVER_HPP
diff --git a/src/engine/InputPort.cpp b/src/server/InputPort.cpp
index 80058632..a79f808b 100644
--- a/src/engine/InputPort.cpp
+++ b/src/server/InputPort.cpp
@@ -34,7 +34,7 @@
 using namespace std;
 
 namespace Ingen {
-namespace Engine {
+namespace Server {
 
 InputPort::InputPort(BufferFactory&      bufs,
                      NodeImpl*           parent,
@@ -224,6 +224,6 @@ InputPort::direct_connect() const
 		&& !_connections.front()->must_queue();
 }
 
-} // namespace Engine
+} // namespace Server
 } // namespace Ingen
 
diff --git a/src/engine/InputPort.hpp b/src/server/InputPort.hpp
index 04fd2653..0ecd5317 100644
--- a/src/engine/InputPort.hpp
+++ b/src/server/InputPort.hpp
@@ -26,7 +26,7 @@
 #include "PortImpl.hpp"
 
 namespace Ingen {
-namespace Engine {
+namespace Server {
 
 class ConnectionImpl;
 class Context;
@@ -87,7 +87,7 @@ protected:
 	Connections _connections;
 };
 
-} // namespace Engine
+} // namespace Server
 } // namespace Ingen
 
 #endif // INGEN_ENGINE_INPUTPORT_HPP
diff --git a/src/engine/InternalPlugin.cpp b/src/server/InternalPlugin.cpp
index f8022e71..bcf30a47 100644
--- a/src/engine/InternalPlugin.cpp
+++ b/src/server/InternalPlugin.cpp
@@ -30,7 +30,7 @@ using namespace std;
 using namespace Raul;
 
 namespace Ingen {
-namespace Engine {
+namespace Server {
 
 using namespace Internals;
 
@@ -68,5 +68,5 @@ InternalPlugin::instantiate(BufferFactory& bufs,
 	}
 }
 
-} // namespace Engine
+} // namespace Server
 } // namespace Ingen
diff --git a/src/engine/InternalPlugin.hpp b/src/server/InternalPlugin.hpp
index 6301b999..be1df1d0 100644
--- a/src/engine/InternalPlugin.hpp
+++ b/src/server/InternalPlugin.hpp
@@ -31,7 +31,7 @@
 #define NS_INTERNALS "http://drobilla.net/ns/ingen-internals#"
 
 namespace Ingen {
-namespace Engine {
+namespace Server {
 
 class NodeImpl;
 class BufferFactory;
@@ -56,7 +56,7 @@ private:
 	const std::string _symbol;
 };
 
-} // namespace Engine
+} // namespace Server
 } // namespace Ingen
 
 #endif // INGEN_ENGINE_INTERNALPLUGIN_HPP
diff --git a/src/engine/JackDriver.cpp b/src/server/JackDriver.cpp
index 6a118778..e78c33af 100644
--- a/src/engine/JackDriver.cpp
+++ b/src/server/JackDriver.cpp
@@ -60,7 +60,7 @@ using namespace Raul;
 typedef jack_default_audio_sample_t jack_sample_t;
 
 namespace Ingen {
-namespace Engine {
+namespace Server {
 
 //// JackPort ////
 
@@ -557,5 +557,5 @@ JackDriver::_session_cb(jack_session_event_t* event)
 }
 #endif
 
-} // namespace Engine
+} // namespace Server
 } // namespace Ingen
diff --git a/src/engine/JackDriver.hpp b/src/server/JackDriver.hpp
index 702692b8..5439c95c 100644
--- a/src/engine/JackDriver.hpp
+++ b/src/server/JackDriver.hpp
@@ -40,7 +40,7 @@
 namespace Raul { class Path; }
 
 namespace Ingen {
-namespace Engine {
+namespace Server {
 
 class Engine;
 class PatchImpl;
@@ -177,7 +177,7 @@ private:
 	PatchImpl*             _root_patch;
 };
 
-} // namespace Engine
+} // namespace Server
 } // namespace Ingen
 
 #endif // INGEN_ENGINE_JACKAUDIODRIVER_HPP
diff --git a/src/engine/LV2BlobFeature.hpp b/src/server/LV2BlobFeature.hpp
index a23a3953..0e892219 100644
--- a/src/engine/LV2BlobFeature.hpp
+++ b/src/server/LV2BlobFeature.hpp
@@ -21,7 +21,7 @@
 #include "shared/LV2Features.hpp"
 
 namespace Ingen {
-namespace Engine {
+namespace Server {
 
 struct BlobFeature : public Ingen::Shared::LV2Features::Feature {
 	BlobFeature() {
@@ -60,7 +60,7 @@ private:
 	LV2_Feature _feature;
 };
 
-} // namespace Engine
+} // namespace Server
 } // namespace Ingen
 
 #endif // INGEN_ENGINE_LV2BLOBFEATURE_HPP
diff --git a/src/engine/LV2EventFeature.hpp b/src/server/LV2EventFeature.hpp
index c9ac1c32..5e2f1f31 100644
--- a/src/engine/LV2EventFeature.hpp
+++ b/src/server/LV2EventFeature.hpp
@@ -22,7 +22,7 @@
 #include "shared/LV2Features.hpp"
 
 namespace Ingen {
-namespace Engine {
+namespace Server {
 
 struct EventFeature : public Ingen::Shared::LV2Features::Feature {
 	EventFeature() {
@@ -48,7 +48,7 @@ private:
 	LV2_Feature _feature;
 };
 
-} // namespace Engine
+} // namespace Server
 } // namespace Ingen
 
 #endif // INGEN_ENGINE_LV2EVENTFEATURE_HPP
diff --git a/src/engine/LV2Info.cpp b/src/server/LV2Info.cpp
index 4fd7885f..6ce5792b 100644
--- a/src/engine/LV2Info.cpp
+++ b/src/server/LV2Info.cpp
@@ -36,7 +36,7 @@
 using namespace std;
 
 namespace Ingen {
-namespace Engine {
+namespace Server {
 
 LV2Info::LV2Info(Ingen::Shared::World* world)
 	: input_class(slv2_value_new_uri(world->slv2_world(), SLV2_PORT_CLASS_INPUT))
@@ -73,5 +73,5 @@ LV2Info::~LV2Info()
 	slv2_value_free(message_port_class);
 }
 
-} // namespace Engine
+} // namespace Server
 } // namespace Ingen
diff --git a/src/engine/LV2Info.hpp b/src/server/LV2Info.hpp
index 292eb012..de252d82 100644
--- a/src/engine/LV2Info.hpp
+++ b/src/server/LV2Info.hpp
@@ -32,7 +32,7 @@ namespace Ingen {
 
 class Node;
 
-namespace Engine {
+namespace Server {
 
 /** Stuff that may need to be passed to an LV2 plugin (i.e. LV2 features).
  */
@@ -56,7 +56,7 @@ private:
 	Ingen::Shared::World* _world;
 };
 
-} // namespace Engine
+} // namespace Server
 } // namespace Ingen
 
 #endif // INGEN_ENGINE_LV2INFO_HPP
diff --git a/src/engine/LV2Node.cpp b/src/server/LV2Node.cpp
index ea292b97..26f1e918 100644
--- a/src/engine/LV2Node.cpp
+++ b/src/server/LV2Node.cpp
@@ -40,7 +40,7 @@ using namespace std;
 using namespace Raul;
 
 namespace Ingen {
-namespace Engine {
+namespace Server {
 
 /** Partially construct a LV2Node.
  *
@@ -405,6 +405,6 @@ LV2Node::set_port_buffer(uint32_t voice, uint32_t port_num,
 			buf ? buf->port_data(_ports->at(port_num)->buffer_type(), offset) : NULL);
 }
 
-} // namespace Engine
+} // namespace Server
 } // namespace Ingen
 
diff --git a/src/engine/LV2Node.hpp b/src/server/LV2Node.hpp
index 7633f4d7..4702d24d 100644
--- a/src/engine/LV2Node.hpp
+++ b/src/server/LV2Node.hpp
@@ -27,7 +27,7 @@
 #include "LV2Features.hpp"
 
 namespace Ingen {
-namespace Engine {
+namespace Server {
 
 class LV2Plugin;
 
@@ -75,7 +75,7 @@ protected:
 	SharedPtr<Ingen::Shared::LV2Features::FeatureArray> _features;
 };
 
-} // namespace Engine
+} // namespace Server
 } // namespace Ingen
 
 #endif // INGEN_ENGINE_LV2NODE_HPP
diff --git a/src/engine/LV2Plugin.cpp b/src/server/LV2Plugin.cpp
index 0efc3abf..ed25d1ac 100644
--- a/src/engine/LV2Plugin.cpp
+++ b/src/server/LV2Plugin.cpp
@@ -32,7 +32,7 @@ using namespace std;
 using namespace Raul;
 
 namespace Ingen {
-namespace Engine {
+namespace Server {
 
 LV2Plugin::LV2Plugin(SharedPtr<LV2Info> lv2_info, const std::string& uri)
 	: PluginImpl(*lv2_info->world().uris().get(), Plugin::LV2, uri)
@@ -106,5 +106,5 @@ LV2Plugin::library_path() const
 	return _library_path;
 }
 
-} // namespace Engine
+} // namespace Server
 } // namespace Ingen
diff --git a/src/engine/LV2Plugin.hpp b/src/server/LV2Plugin.hpp
index 6bc9501a..e4360398 100644
--- a/src/engine/LV2Plugin.hpp
+++ b/src/server/LV2Plugin.hpp
@@ -37,7 +37,7 @@
 #include "LV2Info.hpp"
 
 namespace Ingen {
-namespace Engine {
+namespace Server {
 
 class PatchImpl;
 class NodeImpl;
@@ -69,7 +69,7 @@ private:
 	SharedPtr<LV2Info> _lv2_info;
 };
 
-} // namespace Engine
+} // namespace Server
 } // namespace Ingen
 
 #endif // INGEN_ENGINE_LV2PLUGIN_HPP
diff --git a/src/engine/LV2RequestRunFeature.hpp b/src/server/LV2RequestRunFeature.hpp
index 324676a7..88010bb9 100644
--- a/src/engine/LV2RequestRunFeature.hpp
+++ b/src/server/LV2RequestRunFeature.hpp
@@ -34,7 +34,7 @@ using namespace std;
 using namespace Raul;
 
 namespace Ingen {
-namespace Engine {
+namespace Server {
 
 struct RequestRunFeature : public Ingen::Shared::LV2Features::Feature {
 	struct Data {
@@ -78,7 +78,7 @@ struct RequestRunFeature : public Ingen::Shared::LV2Features::Feature {
 	}
 };
 
-} // namespace Engine
+} // namespace Server
 } // namespace Ingen
 
 #endif // INGEN_ENGINE_LV2_REQUEST_RUN_FEATURE_HPP
diff --git a/src/engine/LV2ResizeFeature.hpp b/src/server/LV2ResizeFeature.hpp
index 4d303070..095796a7 100644
--- a/src/engine/LV2ResizeFeature.hpp
+++ b/src/server/LV2ResizeFeature.hpp
@@ -28,7 +28,7 @@ using namespace std;
 using namespace Raul;
 
 namespace Ingen {
-namespace Engine {
+namespace Server {
 
 struct ResizeFeature : public Ingen::Shared::LV2Features::Feature {
 	static bool resize_port(LV2_Resize_Port_Feature_Data data,
@@ -67,7 +67,7 @@ struct ResizeFeature : public Ingen::Shared::LV2Features::Feature {
 	}
 };
 
-} // namespace Engine
+} // namespace Server
 } // namespace Ingen
 
 #endif // INGEN_ENGINE_LV2RESIZEFEATURE_HPP
diff --git a/src/engine/MessageContext.cpp b/src/server/MessageContext.cpp
index db65472a..0ac385bd 100644
--- a/src/engine/MessageContext.cpp
+++ b/src/server/MessageContext.cpp
@@ -31,7 +31,7 @@ using namespace std;
 using namespace Raul;
 
 namespace Ingen {
-namespace Engine {
+namespace Server {
 
 void
 MessageContext::run(NodeImpl* node, FrameTime time)
@@ -122,5 +122,5 @@ MessageContext::execute(const Request& req)
 	node->reset_valid_ports();
 }
 
-} // namespace Engine
+} // namespace Server
 } // namespace Ingen
diff --git a/src/engine/MessageContext.hpp b/src/server/MessageContext.hpp
index ccdda448..d3bcfed6 100644
--- a/src/engine/MessageContext.hpp
+++ b/src/server/MessageContext.hpp
@@ -29,7 +29,7 @@
 #include "ThreadManager.hpp"
 
 namespace Ingen {
-namespace Engine {
+namespace Server {
 
 class NodeImpl;
 
@@ -107,7 +107,7 @@ protected:
 	FrameTime _end_time;
 };
 
-} // namespace Engine
+} // namespace Server
 } // namespace Ingen
 
 #endif // INGEN_ENGINE_MESSAGECONTEXT_HPP
diff --git a/src/engine/NodeFactory.cpp b/src/server/NodeFactory.cpp
index 20ad9fc2..9c6fc47c 100644
--- a/src/engine/NodeFactory.cpp
+++ b/src/server/NodeFactory.cpp
@@ -45,7 +45,7 @@ using namespace std;
 using namespace Raul;
 
 namespace Ingen {
-namespace Engine {
+namespace Server {
 
 using namespace Internals;
 
@@ -144,5 +144,5 @@ NodeFactory::load_lv2_plugins()
 }
 #endif // HAVE_SLV2
 
-} // namespace Engine
+} // namespace Server
 } // namespace Ingen
diff --git a/src/engine/NodeFactory.hpp b/src/server/NodeFactory.hpp
index 3c906663..f4e4ea41 100644
--- a/src/engine/NodeFactory.hpp
+++ b/src/server/NodeFactory.hpp
@@ -29,7 +29,7 @@
 #include "ingen-config.h"
 
 namespace Ingen {
-namespace Engine {
+namespace Server {
 
 class NodeImpl;
 class PatchImpl;
@@ -70,7 +70,7 @@ private:
 #endif
 };
 
-} // namespace Engine
+} // namespace Server
 } // namespace Ingen
 
 #endif // INGEN_ENGINE_NODEFACTORY_HPP
diff --git a/src/engine/NodeImpl.cpp b/src/server/NodeImpl.cpp
index fc08c8de..eab31716 100644
--- a/src/engine/NodeImpl.cpp
+++ b/src/server/NodeImpl.cpp
@@ -33,7 +33,7 @@
 using namespace std;
 
 namespace Ingen {
-namespace Engine {
+namespace Server {
 
 NodeImpl::NodeImpl(PluginImpl* plugin, const Raul::Symbol& symbol, bool polyphonic, PatchImpl* parent, SampleRate srate)
 	: GraphObjectImpl(plugin->uris(), parent, symbol)
@@ -259,6 +259,6 @@ NodeImpl::set_port_buffer(uint32_t voice, uint32_t port_num,
 			<< " buffer " << buf << " offset " << offset << std::endl;*/
 }
 
-} // namespace Engine
+} // namespace Server
 } // namespace Ingen
 
diff --git a/src/engine/NodeImpl.hpp b/src/server/NodeImpl.hpp
index d2c49e4f..3263727a 100644
--- a/src/engine/NodeImpl.hpp
+++ b/src/server/NodeImpl.hpp
@@ -34,7 +34,7 @@ namespace Ingen {
 class Plugin;
 class Port;
 
-namespace Engine {
+namespace Server {
 
 class Buffer;
 class BufferFactory;
@@ -217,7 +217,7 @@ protected:
 	bool _traversed; ///< Flag for process order algorithm
 };
 
-} // namespace Engine
+} // namespace Server
 } // namespace Ingen
 
 #endif // INGEN_ENGINE_NODEIMPL_HPP
diff --git a/src/engine/OSCClientSender.cpp b/src/server/OSCClientSender.cpp
index bcd3be10..df2a8f3a 100644
--- a/src/engine/OSCClientSender.cpp
+++ b/src/server/OSCClientSender.cpp
@@ -37,7 +37,7 @@ using namespace std;
 using namespace Raul;
 
 namespace Ingen {
-namespace Engine {
+namespace Server {
 
 /** @page client_osc_namespace Client OSC Namespace Documentation
  *
@@ -243,5 +243,5 @@ OSCClientSender::activity(const Path& path)
 	lo_send(_address, "/activity", "s", path.c_str(), LO_ARGS_END);
 }
 
-} // namespace Engine
+} // namespace Server
 } // namespace Ingen
diff --git a/src/engine/OSCClientSender.hpp b/src/server/OSCClientSender.hpp
index 96263263..eb052bc7 100644
--- a/src/engine/OSCClientSender.hpp
+++ b/src/server/OSCClientSender.hpp
@@ -28,9 +28,9 @@
 
 namespace Ingen {
 
-class EngineInterface;
+class ServerInterface;
 
-namespace Engine {
+namespace Server {
 
 
 /** Implements ClientInterface for OSC clients (sends OSC messages).
@@ -101,7 +101,7 @@ private:
 	Raul::URI _url;
 };
 
-} // namespace Engine
+} // namespace Server
 } // namespace Ingen
 
 #endif // INGEN_ENGINE_OSCCLIENTSENDER_HPP
diff --git a/src/engine/OSCEngineReceiver.cpp b/src/server/OSCEngineReceiver.cpp
index fdb0bcc4..635856da 100644
--- a/src/engine/OSCEngineReceiver.cpp
+++ b/src/server/OSCEngineReceiver.cpp
@@ -45,9 +45,9 @@ using namespace std;
 using namespace Raul;
 
 namespace Ingen {
-namespace Engine {
+namespace Server {
 
-/** @page engine_osc_namespace Engine OSC Namespace Documentation
+/** @page engine_osc_namespace Server OSC Namespace Documentation
  *
  * <p>These are the commands the engine recognizes.  A client can control every
  * aspect of the engine entirely with these commands.</p>
@@ -582,5 +582,5 @@ OSCEngineReceiver::unknown_cb(const char* path, const char* types, lo_arg** argv
 	return 0;
 }
 
-} // namespace Engine
+} // namespace Server
 } // namespace Ingen
diff --git a/src/engine/OSCEngineReceiver.hpp b/src/server/OSCEngineReceiver.hpp
index 4293f890..8a76fa01 100644
--- a/src/engine/OSCEngineReceiver.hpp
+++ b/src/server/OSCEngineReceiver.hpp
@@ -25,7 +25,7 @@
 #include "ingen-config.h"
 
 namespace Ingen {
-namespace Engine {
+namespace Server {
 
 class JackDriver;
 class NodeFactory;
@@ -47,7 +47,7 @@ inline static int name##_cb(LO_HANDLER_ARGS, void* myself)\
 /** Receives OSC messages from liblo.
  *
  * This inherits from QueuedEngineInterface and calls it's own functions
- * via OSC.  It's not actually a directly callable EngineInterface (it's
+ * via OSC.  It's not actually a directly callable ServerInterface (it's
  * callable via OSC...) so it should be implemented-as-a (privately inherit)
  * QueuedEngineInterface, but it needs to be public so it's an EventSource
  * the Driver can use.  This probably should be fixed somehow..
@@ -112,7 +112,7 @@ private:
 	lo_server _server;
 };
 
-} // namespace Engine
+} // namespace Server
 } // namespace Ingen
 
 #endif // INGEN_ENGINE_OSCENGINERECEIVER_HPP
diff --git a/src/engine/ObjectBuffer.cpp b/src/server/ObjectBuffer.cpp
index ba0b0c7f..d09fbb96 100644
--- a/src/engine/ObjectBuffer.cpp
+++ b/src/server/ObjectBuffer.cpp
@@ -31,7 +31,7 @@ using namespace std;
 using namespace Raul;
 
 namespace Ingen {
-namespace Engine {
+namespace Server {
 
 /** Allocate a new object buffer.
  * \a capacity is in bytes, including LV2_Atom header
@@ -142,6 +142,6 @@ ObjectBuffer::prepare_write(Context& context)
 	_buf->size = _size - sizeof(LV2_Atom);
 }
 
-} // namespace Engine
+} // namespace Server
 } // namespace Ingen
 
diff --git a/src/engine/ObjectBuffer.hpp b/src/server/ObjectBuffer.hpp
index fe75bd71..11481ad1 100644
--- a/src/engine/ObjectBuffer.hpp
+++ b/src/server/ObjectBuffer.hpp
@@ -23,7 +23,7 @@
 #include "Buffer.hpp"
 
 namespace Ingen {
-namespace Engine {
+namespace Server {
 
 class Context;
 
@@ -50,7 +50,7 @@ private:
 	LV2_Atom* _buf; ///< Contents
 };
 
-} // namespace Engine
+} // namespace Server
 } // namespace Ingen
 
 #endif // INGEN_ENGINE_OBJECTBUFFER_HPP
diff --git a/src/engine/ObjectSender.cpp b/src/server/ObjectSender.cpp
index 77b6c5e3..22aff285 100644
--- a/src/engine/ObjectSender.cpp
+++ b/src/server/ObjectSender.cpp
@@ -31,7 +31,7 @@ using namespace std;
 using namespace Raul;
 
 namespace Ingen {
-namespace Engine {
+namespace Server {
 
 void
 ObjectSender::send_object(ClientInterface*       client,
@@ -144,6 +144,6 @@ ObjectSender::send_port(ClientInterface* client, const PortImpl* port, bool bund
 		client->bundle_end();
 }
 
-} // namespace Engine
+} // namespace Server
 } // namespace Ingen
 
diff --git a/src/engine/ObjectSender.hpp b/src/server/ObjectSender.hpp
index 21f0e928..a743c6d5 100644
--- a/src/engine/ObjectSender.hpp
+++ b/src/server/ObjectSender.hpp
@@ -22,7 +22,7 @@ namespace Ingen {
 
 class ClientInterface;
 
-namespace Engine {
+namespace Server {
 
 class GraphObjectImpl;
 class PatchImpl;
@@ -59,7 +59,7 @@ private:
 	                      bool              bundle=true);
 };
 
-} // namespace Engine
+} // namespace Server
 } // namespace Ingen
 
 #endif // INGEN_ENGINE_OBJECTSENDER_HPP
diff --git a/src/engine/OutputPort.cpp b/src/server/OutputPort.cpp
index 0a16d2db..487832c3 100644
--- a/src/engine/OutputPort.cpp
+++ b/src/server/OutputPort.cpp
@@ -25,7 +25,7 @@
 using namespace std;
 
 namespace Ingen {
-namespace Engine {
+namespace Server {
 
 OutputPort::OutputPort(BufferFactory&      bufs,
                        NodeImpl*           parent,
@@ -72,5 +72,5 @@ OutputPort::post_process(Context& context)
 		broadcast_value(context, false);
 }
 
-} // namespace Engine
+} // namespace Server
 } // namespace Ingen
diff --git a/src/engine/OutputPort.hpp b/src/server/OutputPort.hpp
index c82de111..f16a5ff7 100644
--- a/src/engine/OutputPort.hpp
+++ b/src/server/OutputPort.hpp
@@ -23,7 +23,7 @@
 #include "PortImpl.hpp"
 
 namespace Ingen {
-namespace Engine {
+namespace Server {
 
 /** An output port.
  *
@@ -59,7 +59,7 @@ public:
 	bool is_output() const { return true; }
 };
 
-} // namespace Engine
+} // namespace Server
 } // namespace Ingen
 
 #endif // INGEN_ENGINE_OUTPUTPORT_HPP
diff --git a/src/engine/PatchImpl.cpp b/src/server/PatchImpl.cpp
index 86693686..72545b1b 100644
--- a/src/engine/PatchImpl.cpp
+++ b/src/server/PatchImpl.cpp
@@ -37,7 +37,7 @@ using namespace std;
 using namespace Raul;
 
 namespace Ingen {
-namespace Engine {
+namespace Server {
 
 PatchImpl::PatchImpl(Engine&             engine,
                      const Raul::Symbol& symbol,
@@ -466,5 +466,5 @@ PatchImpl::compile() const
 	return compiled_patch;
 }
 
-} // namespace Engine
+} // namespace Server
 } // namespace Ingen
diff --git a/src/engine/PatchImpl.hpp b/src/server/PatchImpl.hpp
index 8429728f..20ff59a6 100644
--- a/src/engine/PatchImpl.hpp
+++ b/src/server/PatchImpl.hpp
@@ -31,7 +31,7 @@ namespace Ingen {
 
 class Connection;
 
-namespace Engine {
+namespace Server {
 
 class CompiledPatch;
 class ConnectionImpl;
@@ -159,7 +159,7 @@ PatchImpl::compile_recursive(NodeImpl* n, CompiledPatch* output) const
 	output->push_back(CompiledNode(n, n->providers()->size(), n->dependants()));
 }
 
-} // namespace Engine
+} // namespace Server
 } // namespace Ingen
 
 #endif // INGEN_ENGINE_PATCHIMPL_HPP
diff --git a/src/engine/PatchPlugin.hpp b/src/server/PatchPlugin.hpp
index ba244ef6..72885c7d 100644
--- a/src/engine/PatchPlugin.hpp
+++ b/src/server/PatchPlugin.hpp
@@ -24,7 +24,7 @@
 #include "PluginImpl.hpp"
 
 namespace Ingen {
-namespace Engine {
+namespace Server {
 
 class NodeImpl;
 
@@ -60,7 +60,7 @@ private:
 	const std::string _name;
 };
 
-} // namespace Engine
+} // namespace Server
 } // namespace Ingen
 
 #endif // INGEN_ENGINE_PATCHPLUGIN_HPP
diff --git a/src/engine/PluginImpl.cpp b/src/server/PluginImpl.cpp
index e121bd62..4eb2b078 100644
--- a/src/engine/PluginImpl.cpp
+++ b/src/server/PluginImpl.cpp
@@ -22,7 +22,7 @@ using namespace std;
 using namespace Raul;
 
 namespace Ingen {
-namespace Engine {
+namespace Server {
 
 void
 PluginImpl::load()
@@ -45,6 +45,6 @@ PluginImpl::unload()
 	}
 }
 
-} // namespace Engine
+} // namespace Server
 } // namespace Ingen
 
diff --git a/src/engine/PluginImpl.hpp b/src/server/PluginImpl.hpp
index ab4e4a89..cea1145d 100644
--- a/src/engine/PluginImpl.hpp
+++ b/src/server/PluginImpl.hpp
@@ -31,7 +31,7 @@ namespace Ingen {
 
 namespace Shared { class LV2URIMap; }
 
-namespace Engine {
+namespace Server {
 
 class PatchImpl;
 class NodeImpl;
@@ -81,7 +81,7 @@ protected:
 	Glib::Module*       _module;
 };
 
-} // namespace Engine
+} // namespace Server
 } // namespace Ingen
 
 #endif // INGEN_ENGINE_PLUGINIMPL_HPP
diff --git a/src/engine/PortImpl.cpp b/src/server/PortImpl.cpp
index 62cc7577..a448916e 100644
--- a/src/engine/PortImpl.cpp
+++ b/src/server/PortImpl.cpp
@@ -36,7 +36,7 @@ using namespace std;
 using namespace Raul;
 
 namespace Ingen {
-namespace Engine {
+namespace Server {
 
 PortImpl::PortImpl(BufferFactory&      bufs,
                    NodeImpl* const     node,
@@ -247,5 +247,5 @@ PortImpl::buffer_type() const
 	return *_types.begin();
 }
 
-} // namespace Engine
+} // namespace Server
 } // namespace Ingen
diff --git a/src/engine/PortImpl.hpp b/src/server/PortImpl.hpp
index a8f3a63e..b3621f13 100644
--- a/src/engine/PortImpl.hpp
+++ b/src/server/PortImpl.hpp
@@ -33,7 +33,7 @@
 namespace Raul { class Maid; }
 
 namespace Ingen {
-namespace Engine {
+namespace Server {
 
 class NodeImpl;
 class Buffer;
@@ -168,7 +168,7 @@ protected:
 	Raul::Array<BufferFactory::Ref>* _prepared_buffers;
 };
 
-} // namespace Engine
+} // namespace Server
 } // namespace Ingen
 
 #endif // INGEN_ENGINE_PORTIMPL_HPP
diff --git a/src/engine/PostProcessor.cpp b/src/server/PostProcessor.cpp
index 29179b00..25252a16 100644
--- a/src/engine/PostProcessor.cpp
+++ b/src/server/PostProcessor.cpp
@@ -30,7 +30,7 @@ using namespace std;
 using namespace Raul;
 
 namespace Ingen {
-namespace Engine {
+namespace Server {
 
 PostProcessor::PostProcessor(Engine& engine, size_t queue_size)
     : _engine(engine)
@@ -88,5 +88,5 @@ PostProcessor::process()
 	}
 }
 
-} // namespace Engine
+} // namespace Server
 } // namespace Ingen
diff --git a/src/engine/PostProcessor.hpp b/src/server/PostProcessor.hpp
index f0888d2f..a48c89f8 100644
--- a/src/engine/PostProcessor.hpp
+++ b/src/server/PostProcessor.hpp
@@ -23,7 +23,7 @@
 #include "raul/List.hpp"
 
 namespace Ingen {
-namespace Engine {
+namespace Server {
 
 class Event;
 class Engine;
@@ -62,7 +62,7 @@ private:
 	uint8_t*           _event_buffer;
 };
 
-} // namespace Engine
+} // namespace Server
 } // namespace Ingen
 
 #endif // INGEN_ENGINE_POSTPROCESSOR_HPP
diff --git a/src/engine/ProcessContext.cpp b/src/server/ProcessContext.cpp
index 2abe7cf2..4e098b8b 100644
--- a/src/engine/ProcessContext.cpp
+++ b/src/server/ProcessContext.cpp
@@ -19,7 +19,7 @@
 #include "ProcessSlave.hpp"
 
 namespace Ingen {
-namespace Engine {
+namespace Server {
 
 void
 ProcessContext::activate(uint32_t parallelism, bool sched_rt)
@@ -34,5 +34,5 @@ ProcessContext::activate(uint32_t parallelism, bool sched_rt)
 	}
 }
 
-} // namespace Engine
+} // namespace Server
 } // namespace Ingen
diff --git a/src/engine/ProcessContext.hpp b/src/server/ProcessContext.hpp
index bbaa5ad2..339b32f8 100644
--- a/src/engine/ProcessContext.hpp
+++ b/src/server/ProcessContext.hpp
@@ -25,7 +25,7 @@
 #include "types.hpp"
 
 namespace Ingen {
-namespace Engine {
+namespace Server {
 
 class ProcessSlave;
 
@@ -48,7 +48,7 @@ private:
 	Slaves _slaves;
 };
 
-} // namespace Engine
+} // namespace Server
 } // namespace Ingen
 
 #endif // INGEN_ENGINE_PROCESSCONTEXT_HPP
diff --git a/src/engine/ProcessSlave.cpp b/src/server/ProcessSlave.cpp
index 44197d4a..8d60dab3 100644
--- a/src/engine/ProcessSlave.cpp
+++ b/src/server/ProcessSlave.cpp
@@ -22,7 +22,7 @@
 using namespace std;
 
 namespace Ingen {
-namespace Engine {
+namespace Server {
 
 uint32_t ProcessSlave::_next_id = 0;
 
@@ -69,5 +69,5 @@ ProcessSlave::_whipped()
 	_state = STATE_FINISHED;
 }
 
-} // namespace Engine
+} // namespace Server
 } // namespace Ingen
diff --git a/src/engine/ProcessSlave.hpp b/src/server/ProcessSlave.hpp
index 39c599af..4fb4b9d5 100644
--- a/src/engine/ProcessSlave.hpp
+++ b/src/server/ProcessSlave.hpp
@@ -29,7 +29,7 @@
 #include "ProcessContext.hpp"
 
 namespace Ingen {
-namespace Engine {
+namespace Server {
 
 class NodeImpl;
 class CompiledPatch;
@@ -98,7 +98,7 @@ private:
 	ProcessContext* _context;
 };
 
-} // namespace Engine
+} // namespace Server
 } // namespace Ingen
 
 #endif // INGEN_ENGINE_PROCESSSLAVE_HPP
diff --git a/src/engine/QueuedEngineInterface.cpp b/src/server/QueuedEngineInterface.cpp
index 24042b27..5ef9335f 100644
--- a/src/engine/QueuedEngineInterface.cpp
+++ b/src/server/QueuedEngineInterface.cpp
@@ -31,7 +31,7 @@ using namespace std;
 using namespace Raul;
 
 namespace Ingen {
-namespace Engine {
+namespace Server {
 
 QueuedEngineInterface::QueuedEngineInterface(Engine& engine, size_t queue_size)
 	: EventSource(queue_size)
@@ -73,7 +73,7 @@ QueuedEngineInterface::disable_responses()
 	_request->set_id(0);
 }
 
-/* *** EngineInterface implementation below here *** */
+/* *** ServerInterface implementation below here *** */
 
 void
 QueuedEngineInterface::register_client(ClientInterface* client)
@@ -219,5 +219,5 @@ QueuedEngineInterface::request_property(const URI& uri, const URI& key)
 	push_queued(new Events::RequestMetadata(_engine, _request, now(), Resource::DEFAULT, uri, key));
 }
 
-} // namespace Engine
+} // namespace Server
 } // namespace Ingen
diff --git a/src/engine/QueuedEngineInterface.hpp b/src/server/QueuedEngineInterface.hpp
index b9f4f7b7..3bd77013 100644
--- a/src/engine/QueuedEngineInterface.hpp
+++ b/src/server/QueuedEngineInterface.hpp
@@ -23,20 +23,20 @@
 #include <memory>
 #include "raul/SharedPtr.hpp"
 #include "ingen/ClientInterface.hpp"
-#include "ingen/EngineInterface.hpp"
+#include "ingen/ServerInterface.hpp"
 #include "ingen/Resource.hpp"
 #include "EventSource.hpp"
 #include "Request.hpp"
 #include "types.hpp"
 
 namespace Ingen {
-namespace Engine {
+namespace Server {
 
 class Engine;
 
 /** A queued (preprocessed) event source / interface.
  *
- * This is the bridge between the EngineInterface presented to the client, and
+ * This is the bridge between the ServerInterface presented to the client, and
  * the EventSource that needs to be presented to the Driver.
  *
  * Responses occur through the event mechanism (which notified clients in
@@ -45,7 +45,7 @@ class Engine;
  * are successful.
  */
 class QueuedEngineInterface : public EventSource,
-                              public EngineInterface
+                              public ServerInterface
 {
 public:
 	QueuedEngineInterface(Engine& engine, size_t queue_size);
@@ -88,7 +88,7 @@ public:
 
 	virtual void del(const Raul::URI& uri);
 
-	// EngineInterface object commands
+	// ServerInterface object commands
 
 	virtual void disconnect_all(const Raul::Path& parent_patch_path,
 	                            const Raul::Path& path);
@@ -110,7 +110,7 @@ private:
 	SampleCount now() const;
 };
 
-} // namespace Engine
+} // namespace Server
 } // namespace Ingen
 
 #endif // INGEN_ENGINE_QUEUEDENGINEINTERFACE_HPP
diff --git a/src/engine/QueuedEvent.cpp b/src/server/QueuedEvent.cpp
index e08b6b30..ac3c60af 100644
--- a/src/engine/QueuedEvent.cpp
+++ b/src/server/QueuedEvent.cpp
@@ -20,7 +20,7 @@
 #include "ProcessContext.hpp"
 
 namespace Ingen {
-namespace Engine {
+namespace Server {
 
 void
 QueuedEvent::pre_process()
@@ -44,6 +44,6 @@ QueuedEvent::execute(ProcessContext& context)
 	Event::execute(context);
 }
 
-} // namespace Engine
+} // namespace Server
 } // namespace Ingen
 
diff --git a/src/engine/QueuedEvent.hpp b/src/server/QueuedEvent.hpp
index 99c5ff33..20229272 100644
--- a/src/engine/QueuedEvent.hpp
+++ b/src/server/QueuedEvent.hpp
@@ -21,7 +21,7 @@
 #include "Event.hpp"
 
 namespace Ingen {
-namespace Engine {
+namespace Server {
 
 /** An Event with a not-time-critical preprocessing stage.
  *
@@ -71,7 +71,7 @@ protected:
 	bool _blocking;
 };
 
-} // namespace Engine
+} // namespace Server
 } // namespace Ingen
 
 #endif // INGEN_ENGINE_QUEUEDEVENT_HPP
diff --git a/src/engine/Request.hpp b/src/server/Request.hpp
index 3e4372c9..5b91798d 100644
--- a/src/engine/Request.hpp
+++ b/src/server/Request.hpp
@@ -24,7 +24,7 @@
 #include "EventSource.hpp"
 
 namespace Ingen {
-namespace Engine {
+namespace Server {
 
 /** Record of a request (used to respond to clients).
  *
@@ -74,7 +74,7 @@ private:
 	int32_t          _id;
 };
 
-} // namespace Engine
+} // namespace Server
 } // namespace Ingen
 
 #endif // INGEN_ENGINE_REQUEST_HPP
diff --git a/src/engine/ThreadManager.hpp b/src/server/ThreadManager.hpp
index 9a73250d..db705278 100644
--- a/src/engine/ThreadManager.hpp
+++ b/src/server/ThreadManager.hpp
@@ -22,7 +22,7 @@
 #include "raul/Thread.hpp"
 
 namespace Ingen {
-namespace Engine {
+namespace Server {
 
 enum ThreadID {
 	THREAD_PRE_PROCESS,
@@ -50,7 +50,7 @@ public:
 	static bool single_threaded;
 };
 
-} // namespace Engine
+} // namespace Server
 } // namespace Ingen
 
 #endif // INGEN_ENGINE_THREADMANAGER_HPP
diff --git a/src/engine/events.hpp b/src/server/events.hpp
index 7ddcfe52..7ddcfe52 100644
--- a/src/engine/events.hpp
+++ b/src/server/events.hpp
diff --git a/src/engine/events/Connect.cpp b/src/server/events/Connect.cpp
index 0f4bd465..e0f09a3d 100644
--- a/src/engine/events/Connect.cpp
+++ b/src/server/events/Connect.cpp
@@ -37,7 +37,7 @@ using namespace std;
 using namespace Raul;
 
 namespace Ingen {
-namespace Engine {
+namespace Server {
 namespace Events {
 
 Connect::Connect(Engine& engine, SharedPtr<Request> request, SampleCount timestamp, const Path& src_port_path, const Path& dst_port_path)
@@ -198,7 +198,7 @@ Connect::post_process()
 	_request->respond_error(ss.str());
 }
 
-} // namespace Engine
+} // namespace Server
 } // namespace Ingen
 } // namespace Events
 
diff --git a/src/engine/events/Connect.hpp b/src/server/events/Connect.hpp
index ec40f70b..1cc98729 100644
--- a/src/engine/events/Connect.hpp
+++ b/src/server/events/Connect.hpp
@@ -30,7 +30,7 @@ namespace Raul {
 }
 
 namespace Ingen {
-namespace Engine {
+namespace Server {
 
 class PatchImpl;
 class NodeImpl;
@@ -81,7 +81,7 @@ private:
 	Raul::Array<BufferFactory::Ref>* _buffers;
 };
 
-} // namespace Engine
+} // namespace Server
 } // namespace Ingen
 } // namespace Events
 
diff --git a/src/engine/events/CreateNode.cpp b/src/server/events/CreateNode.cpp
index 68e66f0a..01d4f285 100644
--- a/src/engine/events/CreateNode.cpp
+++ b/src/server/events/CreateNode.cpp
@@ -37,7 +37,7 @@ using namespace std;
 using namespace Raul;
 
 namespace Ingen {
-namespace Engine {
+namespace Server {
 namespace Events {
 
 CreateNode::CreateNode(
@@ -140,7 +140,7 @@ CreateNode::post_process()
 	}
 }
 
-} // namespace Engine
+} // namespace Server
 } // namespace Ingen
 } // namespace Events
 
diff --git a/src/engine/events/CreateNode.hpp b/src/server/events/CreateNode.hpp
index 844eca01..bbaf830b 100644
--- a/src/engine/events/CreateNode.hpp
+++ b/src/server/events/CreateNode.hpp
@@ -23,7 +23,7 @@
 #include "ingen/Resource.hpp"
 
 namespace Ingen {
-namespace Engine {
+namespace Server {
 
 class PatchImpl;
 class PluginImpl;
@@ -64,7 +64,7 @@ private:
 	Resource::Properties _properties;
 };
 
-} // namespace Engine
+} // namespace Server
 } // namespace Ingen
 } // namespace Events
 
diff --git a/src/engine/events/CreatePatch.cpp b/src/server/events/CreatePatch.cpp
index dcc79513..a5c75adf 100644
--- a/src/engine/events/CreatePatch.cpp
+++ b/src/server/events/CreatePatch.cpp
@@ -32,7 +32,7 @@ using namespace std;
 using namespace Raul;
 
 namespace Ingen {
-namespace Engine {
+namespace Server {
 namespace Events {
 
 CreatePatch::CreatePatch(
@@ -158,7 +158,7 @@ CreatePatch::post_process()
 	}
 }
 
-} // namespace Engine
+} // namespace Server
 } // namespace Ingen
 } // namespace Events
 
diff --git a/src/engine/events/CreatePatch.hpp b/src/server/events/CreatePatch.hpp
index 847583a4..e3afde5f 100644
--- a/src/engine/events/CreatePatch.hpp
+++ b/src/server/events/CreatePatch.hpp
@@ -22,7 +22,7 @@
 #include "ingen/Resource.hpp"
 
 namespace Ingen {
-namespace Engine {
+namespace Server {
 
 class PatchImpl;
 class CompiledPatch;
@@ -60,7 +60,7 @@ private:
 	Resource::Properties _properties;
 };
 
-} // namespace Engine
+} // namespace Server
 } // namespace Ingen
 } // namespace Events
 
diff --git a/src/engine/events/CreatePort.cpp b/src/server/events/CreatePort.cpp
index de5b2219..ba46a35d 100644
--- a/src/engine/events/CreatePort.cpp
+++ b/src/server/events/CreatePort.cpp
@@ -38,7 +38,7 @@ using namespace std;
 using namespace Raul;
 
 namespace Ingen {
-namespace Engine {
+namespace Server {
 namespace Events {
 
 CreatePort::CreatePort(
@@ -186,7 +186,7 @@ CreatePort::post_process()
 	}
 }
 
-} // namespace Engine
+} // namespace Server
 } // namespace Ingen
 } // namespace Events
 
diff --git a/src/engine/events/CreatePort.hpp b/src/server/events/CreatePort.hpp
index a4be3a30..ae44e2f1 100644
--- a/src/engine/events/CreatePort.hpp
+++ b/src/server/events/CreatePort.hpp
@@ -25,7 +25,7 @@
 #include "ingen/Resource.hpp"
 
 namespace Ingen {
-namespace Engine {
+namespace Server {
 
 class PatchImpl;
 class PortImpl;
@@ -74,7 +74,7 @@ private:
 	Resource::Properties _properties;
 };
 
-} // namespace Engine
+} // namespace Server
 } // namespace Ingen
 } // namespace Events
 
diff --git a/src/engine/events/Deactivate.hpp b/src/server/events/Deactivate.hpp
index 87bfe298..779ba54c 100644
--- a/src/engine/events/Deactivate.hpp
+++ b/src/server/events/Deactivate.hpp
@@ -22,7 +22,7 @@
 #include "Engine.hpp"
 
 namespace Ingen {
-namespace Engine {
+namespace Server {
 namespace Events {
 
 /** Deactivates the engine.
@@ -42,7 +42,7 @@ public:
 	}
 };
 
-} // namespace Engine
+} // namespace Server
 } // namespace Ingen
 } // namespace Events
 
diff --git a/src/engine/events/Delete.cpp b/src/server/events/Delete.cpp
index 4a6e520b..b1dc1558 100644
--- a/src/engine/events/Delete.cpp
+++ b/src/server/events/Delete.cpp
@@ -33,7 +33,7 @@
 using namespace std;
 
 namespace Ingen {
-namespace Engine {
+namespace Server {
 namespace Events {
 
 Delete::Delete(Engine&            engine,
@@ -208,6 +208,6 @@ Delete::post_process()
 	_engine.maid()->push(_garbage);
 }
 
-} // namespace Engine
+} // namespace Server
 } // namespace Ingen
 } // namespace Events
diff --git a/src/engine/events/Delete.hpp b/src/server/events/Delete.hpp
index f00ad847..ba256d87 100644
--- a/src/engine/events/Delete.hpp
+++ b/src/server/events/Delete.hpp
@@ -29,7 +29,7 @@ namespace Raul {
 }
 
 namespace Ingen {
-namespace Engine {
+namespace Server {
 
 class GraphObjectImpl;
 class NodeImpl;
@@ -88,7 +88,7 @@ private:
 	SharedPtr< Raul::Table<Raul::Path, SharedPtr<GraphObject> > > _removed_table;
 };
 
-} // namespace Engine
+} // namespace Server
 } // namespace Ingen
 } // namespace Events
 
diff --git a/src/engine/events/Disconnect.cpp b/src/server/events/Disconnect.cpp
index 9618826c..e9374648 100644
--- a/src/engine/events/Disconnect.cpp
+++ b/src/server/events/Disconnect.cpp
@@ -37,7 +37,7 @@ using namespace std;
 using namespace Raul;
 
 namespace Ingen {
-namespace Engine {
+namespace Server {
 namespace Events {
 
 Disconnect::Disconnect(
@@ -263,7 +263,7 @@ Disconnect::post_process()
     delete _impl;
 }
 
-} // namespace Engine
+} // namespace Server
 } // namespace Ingen
 } // namespace Events
 
diff --git a/src/engine/events/Disconnect.hpp b/src/server/events/Disconnect.hpp
index 7a22e474..a553fe79 100644
--- a/src/engine/events/Disconnect.hpp
+++ b/src/server/events/Disconnect.hpp
@@ -30,7 +30,7 @@ namespace Raul {
 }
 
 namespace Ingen {
-namespace Engine {
+namespace Server {
 
 class CompiledPatch;
 class InputPort;
@@ -100,7 +100,7 @@ private:
 };
 
 } // namespace Events
-} // namespace Engine
+} // namespace Server
 } // namespace Ingen
 
 #endif // INGEN_EVENTS_DISCONNECT_HPP
diff --git a/src/engine/events/DisconnectAll.cpp b/src/server/events/DisconnectAll.cpp
index 3509fd04..dd694810 100644
--- a/src/engine/events/DisconnectAll.cpp
+++ b/src/server/events/DisconnectAll.cpp
@@ -39,7 +39,7 @@ using namespace std;
 using namespace Raul;
 
 namespace Ingen {
-namespace Engine {
+namespace Server {
 namespace Events {
 
 DisconnectAll::DisconnectAll(Engine& engine, SharedPtr<Request> request, SampleCount timestamp, const Path& parent_path, const Path& node_path)
@@ -183,7 +183,7 @@ DisconnectAll::post_process()
 	}
 }
 
-} // namespace Engine
+} // namespace Server
 } // namespace Ingen
 } // namespace Events
 
diff --git a/src/engine/events/DisconnectAll.hpp b/src/server/events/DisconnectAll.hpp
index b5dc258c..d53d1114 100644
--- a/src/engine/events/DisconnectAll.hpp
+++ b/src/server/events/DisconnectAll.hpp
@@ -26,7 +26,7 @@
 #include "QueuedEvent.hpp"
 
 namespace Ingen {
-namespace Engine {
+namespace Server {
 
 class CompiledPatch;
 class NodeImpl;
@@ -86,7 +86,7 @@ private:
 	bool _deleting;
 };
 
-} // namespace Engine
+} // namespace Server
 } // namespace Ingen
 } // namespace Events
 
diff --git a/src/engine/events/Get.cpp b/src/server/events/Get.cpp
index 7425dd8a..058f0b63 100644
--- a/src/engine/events/Get.cpp
+++ b/src/server/events/Get.cpp
@@ -30,7 +30,7 @@
 using namespace Raul;
 
 namespace Ingen {
-namespace Engine {
+namespace Server {
 namespace Events {
 
 Get::Get(
@@ -78,7 +78,7 @@ Get::post_process()
 	}
 }
 
-} // namespace Engine
+} // namespace Server
 } // namespace Ingen
 } // namespace Events
 
diff --git a/src/engine/events/Get.hpp b/src/server/events/Get.hpp
index 56bc5f17..ed68e3c0 100644
--- a/src/engine/events/Get.hpp
+++ b/src/server/events/Get.hpp
@@ -23,7 +23,7 @@
 #include "types.hpp"
 
 namespace Ingen {
-namespace Engine {
+namespace Server {
 
 class GraphObjectImpl;
 class PluginImpl;
@@ -53,7 +53,7 @@ private:
 	NodeFactory::Plugins _plugins;
 };
 
-} // namespace Engine
+} // namespace Server
 } // namespace Ingen
 } // namespace Events
 
diff --git a/src/engine/events/Move.cpp b/src/server/events/Move.cpp
index bccb3856..2e006b8c 100644
--- a/src/engine/events/Move.cpp
+++ b/src/server/events/Move.cpp
@@ -29,7 +29,7 @@ using namespace std;
 using namespace Raul;
 
 namespace Ingen {
-namespace Engine {
+namespace Server {
 namespace Events {
 
 Move::Move(Engine& engine, SharedPtr<Request> request, SampleCount timestamp, const Path& path, const Path& new_path)
@@ -125,6 +125,6 @@ Move::post_process()
 	}
 }
 
-} // namespace Engine
+} // namespace Server
 } // namespace Ingen
 } // namespace Events
diff --git a/src/engine/events/Move.hpp b/src/server/events/Move.hpp
index 03e7e1a6..4286f583 100644
--- a/src/engine/events/Move.hpp
+++ b/src/server/events/Move.hpp
@@ -23,7 +23,7 @@
 #include "EngineStore.hpp"
 
 namespace Ingen {
-namespace Engine {
+namespace Server {
 
 class PatchImpl;
 
@@ -72,7 +72,7 @@ private:
 	EngineStore::iterator _store_iterator;
 };
 
-} // namespace Engine
+} // namespace Server
 } // namespace Ingen
 } // namespace Events
 
diff --git a/src/engine/events/Ping.hpp b/src/server/events/Ping.hpp
index ad4e1361..2353e496 100644
--- a/src/engine/events/Ping.hpp
+++ b/src/server/events/Ping.hpp
@@ -23,7 +23,7 @@
 #include "Request.hpp"
 
 namespace Ingen {
-namespace Engine {
+namespace Server {
 
 class PortImpl;
 
@@ -44,7 +44,7 @@ public:
 	void post_process() { _request->respond_ok(); }
 };
 
-} // namespace Engine
+} // namespace Server
 } // namespace Ingen
 } // namespace Events
 
diff --git a/src/engine/events/RegisterClient.cpp b/src/server/events/RegisterClient.cpp
index 50916e6a..71ec26bc 100644
--- a/src/engine/events/RegisterClient.cpp
+++ b/src/server/events/RegisterClient.cpp
@@ -23,7 +23,7 @@
 using namespace Raul;
 
 namespace Ingen {
-namespace Engine {
+namespace Server {
 namespace Events {
 
 RegisterClient::RegisterClient(Engine&            engine,
@@ -51,7 +51,7 @@ RegisterClient::post_process()
 	_request->respond_ok();
 }
 
-} // namespace Engine
+} // namespace Server
 } // namespace Ingen
 } // namespace Events
 
diff --git a/src/engine/events/RegisterClient.hpp b/src/server/events/RegisterClient.hpp
index 5e5c6a15..ec2d0809 100644
--- a/src/engine/events/RegisterClient.hpp
+++ b/src/server/events/RegisterClient.hpp
@@ -23,7 +23,7 @@
 #include "QueuedEvent.hpp"
 
 namespace Ingen {
-namespace Engine {
+namespace Server {
 namespace Events {
 
 /** Registers a new client with the OSC system, so it can receive updates.
@@ -47,7 +47,7 @@ private:
 	ClientInterface* _client;
 };
 
-} // namespace Engine
+} // namespace Server
 } // namespace Ingen
 } // namespace Events
 
diff --git a/src/engine/events/RequestMetadata.cpp b/src/server/events/RequestMetadata.cpp
index c5642104..156fb51d 100644
--- a/src/engine/events/RequestMetadata.cpp
+++ b/src/server/events/RequestMetadata.cpp
@@ -35,7 +35,7 @@ using namespace std;
 using namespace Raul;
 
 namespace Ingen {
-namespace Engine {
+namespace Server {
 namespace Events {
 
 RequestMetadata::RequestMetadata(Engine&            engine,
@@ -131,7 +131,7 @@ RequestMetadata::post_process()
 	}
 }
 
-} // namespace Engine
+} // namespace Server
 } // namespace Ingen
 } // namespace Events
 
diff --git a/src/engine/events/RequestMetadata.hpp b/src/server/events/RequestMetadata.hpp
index e1730207..3f8311ef 100644
--- a/src/engine/events/RequestMetadata.hpp
+++ b/src/server/events/RequestMetadata.hpp
@@ -27,7 +27,7 @@ namespace Ingen {
 
 namespace Shared { class ResourceImpl; }
 
-namespace Engine {
+namespace Server {
 
 class GraphObjectImpl;
 
@@ -72,7 +72,7 @@ private:
 	Resource::Graph              _context;
 };
 
-} // namespace Engine
+} // namespace Server
 } // namespace Ingen
 } // namespace Events
 
diff --git a/src/engine/events/SendBinding.cpp b/src/server/events/SendBinding.cpp
index b9a43366..ebfa21dd 100644
--- a/src/engine/events/SendBinding.cpp
+++ b/src/server/events/SendBinding.cpp
@@ -25,7 +25,7 @@
 using namespace std;
 
 namespace Ingen {
-namespace Engine {
+namespace Server {
 namespace Events {
 
 void
@@ -49,7 +49,7 @@ SendBinding::post_process()
 	_engine.broadcaster()->set_property(_port->path(), uris.ingen_controlBinding, dict);
 }
 
-} // namespace Engine
+} // namespace Server
 } // namespace Ingen
 } // namespace Events
 
diff --git a/src/engine/events/SendBinding.hpp b/src/server/events/SendBinding.hpp
index 1cd38ff2..f3727ece 100644
--- a/src/engine/events/SendBinding.hpp
+++ b/src/server/events/SendBinding.hpp
@@ -18,12 +18,12 @@
 #ifndef INGEN_EVENTS_SENDBINDING_HPP
 #define INGEN_EVENTS_SENDBINDING_HPP
 
-#include "engine/Event.hpp"
-#include "engine/ControlBindings.hpp"
-#include "engine/types.hpp"
+#include "server/Event.hpp"
+#include "server/ControlBindings.hpp"
+#include "server/types.hpp"
 
 namespace Ingen {
-namespace Engine {
+namespace Server {
 
 class PortImpl;
 
@@ -79,7 +79,7 @@ private:
 	int16_t               _num;
 };
 
-} // namespace Engine
+} // namespace Server
 } // namespace Ingen
 } // namespace Events
 
diff --git a/src/engine/events/SendPortActivity.cpp b/src/server/events/SendPortActivity.cpp
index e202c519..8ff960e2 100644
--- a/src/engine/events/SendPortActivity.cpp
+++ b/src/server/events/SendPortActivity.cpp
@@ -21,7 +21,7 @@
 #include "ClientBroadcaster.hpp"
 
 namespace Ingen {
-namespace Engine {
+namespace Server {
 namespace Events {
 
 void
@@ -30,7 +30,7 @@ SendPortActivity::post_process()
 	_engine.broadcaster()->activity(_port->path());
 }
 
-} // namespace Engine
+} // namespace Server
 } // namespace Ingen
 } // namespace Events
 
diff --git a/src/engine/events/SendPortActivity.hpp b/src/server/events/SendPortActivity.hpp
index a99081ba..dd74a68a 100644
--- a/src/engine/events/SendPortActivity.hpp
+++ b/src/server/events/SendPortActivity.hpp
@@ -22,7 +22,7 @@
 #include "types.hpp"
 
 namespace Ingen {
-namespace Engine {
+namespace Server {
 
 class PortImpl;
 
@@ -62,7 +62,7 @@ private:
 	PortImpl* _port;
 };
 
-} // namespace Engine
+} // namespace Server
 } // namespace Ingen
 } // namespace Events
 
diff --git a/src/engine/events/SendPortValue.cpp b/src/server/events/SendPortValue.cpp
index 9ac60a05..1364b692 100644
--- a/src/engine/events/SendPortValue.cpp
+++ b/src/server/events/SendPortValue.cpp
@@ -25,7 +25,7 @@
 using namespace std;
 
 namespace Ingen {
-namespace Engine {
+namespace Server {
 namespace Events {
 
 void
@@ -36,7 +36,7 @@ SendPortValue::post_process()
 			_engine.world()->uris()->ingen_value, _value);
 }
 
-} // namespace Engine
+} // namespace Server
 } // namespace Ingen
 } // namespace Events
 
diff --git a/src/engine/events/SendPortValue.hpp b/src/server/events/SendPortValue.hpp
index 3ed1275e..4465ef00 100644
--- a/src/engine/events/SendPortValue.hpp
+++ b/src/server/events/SendPortValue.hpp
@@ -19,11 +19,11 @@
 #define INGEN_EVENTS_SENDPORTVALUE_HPP
 
 #include "raul/Atom.hpp"
-#include "engine/Event.hpp"
-#include "engine/types.hpp"
+#include "server/Event.hpp"
+#include "server/types.hpp"
 
 namespace Ingen {
-namespace Engine {
+namespace Server {
 
 class PortImpl;
 
@@ -75,7 +75,7 @@ private:
 	Raul::Atom _value;
 };
 
-} // namespace Engine
+} // namespace Server
 } // namespace Ingen
 } // namespace Events
 
diff --git a/src/engine/events/SetMetadata.cpp b/src/server/events/SetMetadata.cpp
index 8e7ef2bf..1812ad91 100644
--- a/src/engine/events/SetMetadata.cpp
+++ b/src/server/events/SetMetadata.cpp
@@ -43,7 +43,7 @@ using namespace std;
 using namespace Raul;
 
 namespace Ingen {
-namespace Engine {
+namespace Server {
 namespace Events {
 
 typedef Resource::Properties Properties;
@@ -374,7 +374,7 @@ SetMetadata::post_process()
 	}
 }
 
-} // namespace Engine
+} // namespace Server
 } // namespace Ingen
 } // namespace Events
 
diff --git a/src/engine/events/SetMetadata.hpp b/src/server/events/SetMetadata.hpp
index ca2d49ec..59856730 100644
--- a/src/engine/events/SetMetadata.hpp
+++ b/src/server/events/SetMetadata.hpp
@@ -24,7 +24,7 @@
 #include "QueuedEvent.hpp"
 
 namespace Ingen {
-namespace Engine {
+namespace Server {
 
 class GraphObjectImpl;
 class PatchImpl;
@@ -117,7 +117,7 @@ private:
 	SharedPtr<ControlBindings::Bindings> _old_bindings;
 };
 
-} // namespace Engine
+} // namespace Server
 } // namespace Ingen
 } // namespace Events
 
diff --git a/src/engine/events/SetPortValue.cpp b/src/server/events/SetPortValue.cpp
index f68a6cab..4af14d44 100644
--- a/src/engine/events/SetPortValue.cpp
+++ b/src/server/events/SetPortValue.cpp
@@ -42,7 +42,7 @@ using namespace std;
 using namespace Raul;
 
 namespace Ingen {
-namespace Engine {
+namespace Server {
 namespace Events {
 
 SetPortValue::SetPortValue(Engine&            engine,
@@ -217,7 +217,7 @@ SetPortValue::post_process()
 	}
 }
 
-} // namespace Engine
+} // namespace Server
 } // namespace Ingen
 } // namespace Events
 
diff --git a/src/engine/events/SetPortValue.hpp b/src/server/events/SetPortValue.hpp
index 78ef0cf4..6f3cde87 100644
--- a/src/engine/events/SetPortValue.hpp
+++ b/src/server/events/SetPortValue.hpp
@@ -23,7 +23,7 @@
 #include "types.hpp"
 
 namespace Ingen {
-namespace Engine {
+namespace Server {
 
 class PortImpl;
 
@@ -76,7 +76,7 @@ private:
 	PortImpl*        _port;
 };
 
-} // namespace Engine
+} // namespace Server
 } // namespace Ingen
 } // namespace Events
 
diff --git a/src/engine/events/UnregisterClient.cpp b/src/server/events/UnregisterClient.cpp
index 6f850596..b87bfa81 100644
--- a/src/engine/events/UnregisterClient.cpp
+++ b/src/server/events/UnregisterClient.cpp
@@ -24,7 +24,7 @@
 using namespace Raul;
 
 namespace Ingen {
-namespace Engine {
+namespace Server {
 namespace Events {
 
 UnregisterClient::UnregisterClient(Engine& engine, SharedPtr<Request> request, SampleCount timestamp, const URI& uri)
@@ -42,7 +42,7 @@ UnregisterClient::post_process()
 		_request->respond_error("Unable to unregister client");
 }
 
-} // namespace Engine
+} // namespace Server
 } // namespace Ingen
 } // namespace Events
 
diff --git a/src/engine/events/UnregisterClient.hpp b/src/server/events/UnregisterClient.hpp
index 427fc897..eefc6318 100644
--- a/src/engine/events/UnregisterClient.hpp
+++ b/src/server/events/UnregisterClient.hpp
@@ -22,7 +22,7 @@
 #include "raul/URI.hpp"
 
 namespace Ingen {
-namespace Engine {
+namespace Server {
 namespace Events {
 
 /** Unregisters an OSC client so it no longer receives notifications.
@@ -43,7 +43,7 @@ private:
 	Raul::URI _uri;
 };
 
-} // namespace Engine
+} // namespace Server
 } // namespace Ingen
 } // namespace Events
 
diff --git a/src/engine/ingen_engine.cpp b/src/server/ingen_engine.cpp
index c31e5e33..568267cd 100644
--- a/src/engine/ingen_engine.cpp
+++ b/src/server/ingen_engine.cpp
@@ -25,11 +25,11 @@ using namespace Ingen;
 
 struct IngenEngineModule : public Ingen::Shared::Module {
 	virtual void load(Ingen::Shared::World* world) {
-		Engine::set_denormal_flags();
-		SharedPtr<Engine::Engine> engine(new Engine::Engine(world));
+		Server::set_denormal_flags();
+		SharedPtr<Server::Engine> engine(new Server::Engine(world));
 		world->set_local_engine(engine);
-		SharedPtr<Engine::QueuedEngineInterface> interface(
-				new Engine::QueuedEngineInterface(*engine.get(),
+		SharedPtr<Server::QueuedEngineInterface> interface(
+				new Server::QueuedEngineInterface(*engine.get(),
 				                                  engine->event_queue_size()));
 		world->set_engine(interface);
 		engine->add_event_source(interface);
diff --git a/src/engine/ingen_http.cpp b/src/server/ingen_http.cpp
index f7153ca2..d205b175 100644
--- a/src/engine/ingen_http.cpp
+++ b/src/server/ingen_http.cpp
@@ -25,9 +25,9 @@ using namespace Ingen;
 
 struct IngenHTTPModule : public Ingen::Shared::Module {
 	void load(Ingen::Shared::World* world) {
-		Engine::Engine* engine = (Engine::Engine*)world->local_engine().get();
-		SharedPtr<Engine::HTTPEngineReceiver> interface(
-			new Engine::HTTPEngineReceiver(
+		Server::Engine* engine = (Server::Engine*)world->local_engine().get();
+		SharedPtr<Server::HTTPEngineReceiver> interface(
+			new Server::HTTPEngineReceiver(
 				*engine,
 				world->conf()->option("engine-port").get_int32()));
 		engine->add_event_source(interface);
diff --git a/src/engine/ingen_jack.cpp b/src/server/ingen_jack.cpp
index e46dd8a6..ff760f1c 100644
--- a/src/engine/ingen_jack.cpp
+++ b/src/server/ingen_jack.cpp
@@ -25,12 +25,12 @@ using namespace Ingen;
 
 struct IngenJackModule : public Ingen::Shared::Module {
 	void load(Ingen::Shared::World* world) {
-		Engine::JackDriver* driver = new Engine::JackDriver(
-			*(Engine::Engine*)world->local_engine().get());
+		Server::JackDriver* driver = new Server::JackDriver(
+			*(Server::Engine*)world->local_engine().get());
 		driver->attach(world->conf()->option("jack-server").get_string(),
 				world->conf()->option("jack-client").get_string(), NULL);
-		((Engine::Engine*)world->local_engine().get())->set_driver(
-			SharedPtr<Engine::Driver>(driver));
+		((Server::Engine*)world->local_engine().get())->set_driver(
+			SharedPtr<Server::Driver>(driver));
 	}
 };
 
diff --git a/src/engine/ingen_lv2.cpp b/src/server/ingen_lv2.cpp
index c6a250b7..bd64cf34 100644
--- a/src/engine/ingen_lv2.cpp
+++ b/src/server/ingen_lv2.cpp
@@ -31,15 +31,15 @@
 #include "raul/Thread.hpp"
 #include "raul/log.hpp"
 
-#include "engine/AudioBuffer.hpp"
-#include "engine/Driver.hpp"
-#include "engine/Engine.hpp"
-#include "engine/PatchImpl.hpp"
-#include "engine/PostProcessor.hpp"
-#include "engine/ProcessContext.hpp"
-#include "engine/QueuedEngineInterface.hpp"
-#include "engine/ThreadManager.hpp"
-#include "ingen/EngineInterface.hpp"
+#include "server/AudioBuffer.hpp"
+#include "server/Driver.hpp"
+#include "server/Engine.hpp"
+#include "server/PatchImpl.hpp"
+#include "server/PostProcessor.hpp"
+#include "server/ProcessContext.hpp"
+#include "server/QueuedEngineInterface.hpp"
+#include "server/ThreadManager.hpp"
+#include "ingen/ServerInterface.hpp"
 #include "shared/World.hpp"
 #include "serialisation/Parser.hpp"
 #include "shared/Configuration.hpp"
@@ -73,7 +73,7 @@ public:
 Lib lib;
 
 namespace Ingen {
-namespace Engine {
+namespace Server {
 
 class LV2Driver;
 
@@ -123,7 +123,7 @@ private:
 	void*      _buffer;
 };
 
-class LV2Driver : public Ingen::Engine::Driver {
+class LV2Driver : public Ingen::Server::Driver {
 private:
 	typedef std::vector<LV2Port*> Ports;
 
@@ -216,13 +216,13 @@ private:
 	Ports          _ports;
 };
 
-} // namespace Engine
+} // namespace Server
 } // namespace Ingen
 
 extern "C" {
 
 using namespace Ingen;
-using namespace Ingen::Engine;
+using namespace Ingen::Server;
 
 /** LV2 plugin library entry point */
 LV2_SYMBOL_EXPORT
@@ -264,26 +264,26 @@ ingen_instantiate(const LV2_Descriptor*    descriptor,
 		return NULL;
 	}
 
-	SharedPtr<Engine::Engine> engine(new Engine::Engine(plugin->world));
+	SharedPtr<Server::Engine> engine(new Server::Engine(plugin->world));
 	plugin->world->set_local_engine(engine);
 
-	SharedPtr<Engine::QueuedEngineInterface> interface(
-		new Engine::QueuedEngineInterface(
+	SharedPtr<Server::QueuedEngineInterface> interface(
+		new Server::QueuedEngineInterface(
 			*engine.get(),
 			engine->event_queue_size()));
 
 	plugin->world->set_engine(interface);
 	engine->add_event_source(interface);
 
-	Raul::Thread::get().set_context(Engine::THREAD_PRE_PROCESS);
-	Engine::ThreadManager::single_threaded = true;
+	Raul::Thread::get().set_context(Server::THREAD_PRE_PROCESS);
+	Server::ThreadManager::single_threaded = true;
 
 	// FIXME: fixed (or at least maximum) buffer size
 	LV2Driver* driver = new LV2Driver(*engine.get(), rate, 4096);
-	engine->set_driver(SharedPtr<Ingen::Engine::Driver>(driver));
+	engine->set_driver(SharedPtr<Ingen::Server::Driver>(driver));
 	
 	engine->activate();
-	Engine::ThreadManager::single_threaded = true;
+	Server::ThreadManager::single_threaded = true;
 
 	ProcessContext context(*engine.get());
 	context.locate(0, UINT_MAX, 0);
@@ -312,10 +312,10 @@ ingen_instantiate(const LV2_Descriptor*    descriptor,
 static void
 ingen_connect_port(LV2_Handle instance, uint32_t port, void* data)
 {
-	using namespace Ingen::Engine;
+	using namespace Ingen::Server;
 
 	IngenPlugin*    me     = (IngenPlugin*)instance;
-	Engine::Engine* engine = (Engine::Engine*)me->world->local_engine().get();
+	Server::Engine* engine = (Server::Engine*)me->world->local_engine().get();
 	LV2Driver*      driver = (LV2Driver*)engine->driver();
 	if (port < driver->ports().size()) {
 		driver->ports().at(port)->set_buffer(data);
@@ -336,9 +336,9 @@ static void
 ingen_run(LV2_Handle instance, uint32_t sample_count)
 {
 	IngenPlugin*    me     = (IngenPlugin*)instance;
-	Engine::Engine* engine = (Engine::Engine*)me->world->local_engine().get();
+	Server::Engine* engine = (Server::Engine*)me->world->local_engine().get();
 	// FIXME: don't do this every call
-	Raul::Thread::get().set_context(Ingen::Engine::THREAD_PROCESS);
+	Raul::Thread::get().set_context(Ingen::Server::THREAD_PROCESS);
 	((LV2Driver*)engine->driver())->run(sample_count);
 }
 
@@ -353,8 +353,8 @@ static void
 ingen_cleanup(LV2_Handle instance)
 {
 	IngenPlugin* me = (IngenPlugin*)instance;
-	me->world->set_local_engine(SharedPtr<Ingen::Engine::Engine>());
-	me->world->set_engine(SharedPtr<Ingen::EngineInterface>());
+	me->world->set_local_engine(SharedPtr<Ingen::Server::Engine>());
+	me->world->set_engine(SharedPtr<Ingen::ServerInterface>());
 	delete me->world;
 	free(instance);
 }
diff --git a/src/engine/ingen_osc.cpp b/src/server/ingen_osc.cpp
index 252d984e..bf0f09f8 100644
--- a/src/engine/ingen_osc.cpp
+++ b/src/server/ingen_osc.cpp
@@ -25,9 +25,9 @@ using namespace Ingen;
 
 struct IngenOSCModule : public Ingen::Shared::Module {
 	void load(Ingen::Shared::World* world) {
-		Engine::Engine* engine = (Engine::Engine*)world->local_engine().get();
-		SharedPtr<Engine::OSCEngineReceiver> interface(
-			new Engine::OSCEngineReceiver(
+		Server::Engine* engine = (Server::Engine*)world->local_engine().get();
+		SharedPtr<Server::OSCEngineReceiver> interface(
+			new Server::OSCEngineReceiver(
 				*engine,
 				engine->event_queue_size(),
 				world->conf()->option("engine-port").get_int32()));
diff --git a/src/engine/internals/Controller.cpp b/src/server/internals/Controller.cpp
index 15156f08..3d477de6 100644
--- a/src/engine/internals/Controller.cpp
+++ b/src/server/internals/Controller.cpp
@@ -32,7 +32,7 @@
 using namespace std;
 
 namespace Ingen {
-namespace Engine {
+namespace Server {
 namespace Internals {
 
 InternalPlugin* ControllerNode::internal_plugin(Shared::LV2URIMap& uris) {
@@ -142,6 +142,6 @@ ControllerNode::control(ProcessContext& context, uint8_t control_num, uint8_t va
 }
 
 } // namespace Internals
-} // namespace Engine
+} // namespace Server
 } // namespace Ingen
 
diff --git a/src/engine/internals/Controller.hpp b/src/server/internals/Controller.hpp
index 54b1d3ac..30ef663f 100644
--- a/src/engine/internals/Controller.hpp
+++ b/src/server/internals/Controller.hpp
@@ -22,7 +22,7 @@
 #include "NodeImpl.hpp"
 
 namespace Ingen {
-namespace Engine {
+namespace Server {
 
 class InputPort;
 class OutputPort;
@@ -67,7 +67,7 @@ private:
 	OutputPort* _audio_port;
 };
 
-} // namespace Engine
+} // namespace Server
 } // namespace Ingen
 } // namespace Internals
 
diff --git a/src/engine/internals/Delay.cpp b/src/server/internals/Delay.cpp
index bded108a..5c2758da 100644
--- a/src/engine/internals/Delay.cpp
+++ b/src/server/internals/Delay.cpp
@@ -43,7 +43,7 @@ using namespace std;
 using namespace Raul;
 
 namespace Ingen {
-namespace Engine {
+namespace Server {
 namespace Internals {
 
 static const float MAX_DELAY_SECONDS = 8.0f;
@@ -203,6 +203,6 @@ DelayNode::process(ProcessContext& context)
 }
 
 } // namespace Internals
-} // namespace Engine
+} // namespace Server
 } // namespace Ingen
 
diff --git a/src/engine/internals/Delay.hpp b/src/server/internals/Delay.hpp
index bc6f2682..7456d7cc 100644
--- a/src/engine/internals/Delay.hpp
+++ b/src/server/internals/Delay.hpp
@@ -24,7 +24,7 @@
 #include "NodeImpl.hpp"
 
 namespace Ingen {
-namespace Engine {
+namespace Server {
 
 class InputPort;
 class OutputPort;
@@ -71,7 +71,7 @@ private:
 	float    _delay_samples;
 };
 
-} // namespace Engine
+} // namespace Server
 } // namespace Ingen
 } // namespace Internals
 
diff --git a/src/engine/internals/Note.cpp b/src/server/internals/Note.cpp
index 8545857e..f28dacc1 100644
--- a/src/engine/internals/Note.cpp
+++ b/src/server/internals/Note.cpp
@@ -39,7 +39,7 @@ using namespace std;
 using namespace Raul;
 
 namespace Ingen {
-namespace Engine {
+namespace Server {
 namespace Internals {
 
 InternalPlugin* NoteNode::internal_plugin(Shared::LV2URIMap& uris) {
@@ -411,6 +411,6 @@ NoteNode::sustain_off(ProcessContext& context, FrameTime time)
 }
 
 } // namespace Internals
-} // namespace Engine
+} // namespace Server
 } // namespace Ingen
 
diff --git a/src/engine/internals/Note.hpp b/src/server/internals/Note.hpp
index 7a47dc76..d20baf13 100644
--- a/src/engine/internals/Note.hpp
+++ b/src/server/internals/Note.hpp
@@ -23,7 +23,7 @@
 #include "NodeImpl.hpp"
 
 namespace Ingen {
-namespace Engine {
+namespace Server {
 
 class InputPort;
 class OutputPort;
@@ -94,7 +94,7 @@ private:
 	OutputPort* _trig_port;
 };
 
-} // namespace Engine
+} // namespace Server
 } // namespace Ingen
 } // namespace Internals
 
diff --git a/src/engine/internals/Trigger.cpp b/src/server/internals/Trigger.cpp
index 55474618..d062fa13 100644
--- a/src/engine/internals/Trigger.cpp
+++ b/src/server/internals/Trigger.cpp
@@ -35,7 +35,7 @@ using namespace std;
 using namespace Raul;
 
 namespace Ingen {
-namespace Engine {
+namespace Server {
 namespace Internals {
 
 InternalPlugin* TriggerNode::internal_plugin(Shared::LV2URIMap& uris) {
@@ -164,5 +164,5 @@ TriggerNode::note_off(ProcessContext& context, uint8_t note_num, FrameTime time)
 }
 
 } // namespace Internals
-} // namespace Engine
+} // namespace Server
 } // namespace Ingen
diff --git a/src/engine/internals/Trigger.hpp b/src/server/internals/Trigger.hpp
index da796f5e..92b85345 100644
--- a/src/engine/internals/Trigger.hpp
+++ b/src/server/internals/Trigger.hpp
@@ -22,7 +22,7 @@
 #include "NodeImpl.hpp"
 
 namespace Ingen {
-namespace Engine {
+namespace Server {
 
 class InputPort;
 class OutputPort;
@@ -70,7 +70,7 @@ private:
 	OutputPort* _vel_port;
 };
 
-} // namespace Engine
+} // namespace Server
 } // namespace Ingen
 } // namespace Internals
 
diff --git a/src/engine/mix.hpp b/src/server/mix.hpp
index 3797396b..4b062ed9 100644
--- a/src/engine/mix.hpp
+++ b/src/server/mix.hpp
@@ -26,7 +26,7 @@
 using namespace Raul;
 
 namespace Ingen {
-namespace Engine {
+namespace Server {
 
 inline void
 mix(Context& context, Buffer* dst, const IntrusivePtr<Buffer>* srcs, uint32_t num_srcs)
@@ -85,7 +85,7 @@ mix(Context& context, Buffer* dst, const IntrusivePtr<Buffer>* srcs, uint32_t nu
 	}
 }
 
-} // namespace Engine
+} // namespace Server
 } // namespace Ingen
 
 #endif // INGEN_ENGINE_MIX_HPP
diff --git a/src/engine/types.hpp b/src/server/types.hpp
index 1c6b217e..1c6b217e 100644
--- a/src/engine/types.hpp
+++ b/src/server/types.hpp
diff --git a/src/engine/util.hpp b/src/server/util.hpp
index fb9ba161..9aab55ac 100644
--- a/src/engine/util.hpp
+++ b/src/server/util.hpp
@@ -40,7 +40,7 @@
 #endif
 
 namespace Ingen {
-namespace Engine {
+namespace Server {
 
 /** Set flags to disable denormal processing.
  */
@@ -84,7 +84,7 @@ ingen_jack_port_name(const Raul::Path& path)
 	return path.chop_start("/");
 }
 
-} // namespace Engine
+} // namespace Server
 } // namespace Ingen
 
 #endif // INGEN_ENGINE_UTIL_HPP
diff --git a/src/engine/wscript b/src/server/wscript
index 2321da69..708f38d2 100644
--- a/src/engine/wscript
+++ b/src/server/wscript
@@ -3,7 +3,7 @@ from waflib.extras import autowaf as autowaf
 
 def build(bld):
 	# Headers
-	bld.install_files('${INCLUDEDIR}/ingen/engine', bld.path.ant_glob('*.hpp'))
+	bld.install_files('${INCLUDEDIR}/ingen/server', bld.path.ant_glob('*.hpp'))
 
 	core_source = '''
 		AudioBuffer.cpp
@@ -66,8 +66,8 @@ def build(bld):
 	obj.source = core_source
 	obj.export_includes = ['.']
 	obj.includes        = ['.', '..', '../..', '../../include']
-	obj.name            = 'libingen_engine'
-	obj.target          = 'ingen_engine'
+	obj.name            = 'libingen_server'
+	obj.target          = 'ingen_server'
 	obj.install_path    = '${LIBDIR}'
 	obj.use             = 'libingen_shared'
 	core_libs = 'GLIBMM GTHREAD LV2CORE SLV2 RAUL SORD'
@@ -82,7 +82,7 @@ def build(bld):
 			HTTPEngineReceiver.cpp
 			ingen_http.cpp
 		'''
-		obj.includes     = ['.', '..', '../..', '../../include', '../engine']
+		obj.includes     = ['.', '..', '../..', '../../include', '../server']
 		obj.name         = 'libingen_http'
 		obj.target       = 'ingen_http'
 		obj.install_path = '${LIBDIR}'
@@ -98,7 +98,7 @@ def build(bld):
 			ingen_osc.cpp
 		'''
 		obj.export_includes = ['.']
-		obj.includes        = ['.', '..', '../..', '../../include', '../engine']
+		obj.includes        = ['.', '..', '../..', '../../include', '../server']
 		obj.name            = 'libingen_osc'
 		obj.target          = 'ingen_osc'
 		obj.install_path    = '${LIBDIR}'
@@ -108,11 +108,11 @@ def build(bld):
 		obj = bld(features = 'cxx cxxshlib')
 		obj.source = 'JackDriver.cpp ingen_jack.cpp'
 		obj.export_includes = ['.']
-		obj.includes        = ['.', '..', '../..', '../../include', '../engine']
+		obj.includes        = ['.', '..', '../..', '../../include', '../server']
 		obj.name            = 'libingen_jack'
 		obj.target          = 'ingen_jack'
 		obj.install_path    = '${LIBDIR}'
-		obj.use             = 'libingen_engine'
+		obj.use             = 'libingen_server'
 		autowaf.use_lib(bld, obj, core_libs + ' JACK')
 
 	# Ingen LV2 wrapper
@@ -124,5 +124,5 @@ def build(bld):
 	obj.target	    = 'ingen_lv2'
 	obj.install_path    = '${LIBDIR}'
 	obj.use             = 'libingen_shared'
-	obj.add_objects	    = 'libingen_engine'
+	obj.add_objects	    = 'libingen_server'
 	autowaf.use_lib(bld, obj, core_libs)
diff --git a/src/shared/World.cpp b/src/shared/World.cpp
index eea7bbd5..4c06a8f6 100644
--- a/src/shared/World.cpp
+++ b/src/shared/World.cpp
@@ -172,7 +172,7 @@ public:
 	LV2Features*                         lv2_features;
 	Sord::World*                         rdf_world;
 	SharedPtr<LV2URIMap>                 uris;
-    SharedPtr<EngineInterface>           engine;
+    SharedPtr<ServerInterface>           engine;
 	SharedPtr<EngineBase>                local_engine;
     SharedPtr<Serialisation::Serialiser> serialiser;
     SharedPtr<Serialisation::Parser>     parser;
@@ -193,7 +193,7 @@ World::~World()
 }
 
 void World::set_local_engine(SharedPtr<EngineBase> e)              { _impl->local_engine = e; }
-void World::set_engine(SharedPtr<EngineInterface> e)               { _impl->engine = e; }
+void World::set_engine(SharedPtr<ServerInterface> e)               { _impl->engine = e; }
 void World::set_serialiser(SharedPtr<Serialisation::Serialiser> s) { _impl->serialiser = s; }
 void World::set_parser(SharedPtr<Serialisation::Parser> p)         { _impl->parser = p; }
 void World::set_store(SharedPtr<Store> s)                          { _impl->store = s; }
@@ -202,7 +202,7 @@ void World::set_conf(Raul::Configuration* c)                       { _impl->conf
 int&                                 World::argc()         { return _impl->argc; }
 char**&                              World::argv()         { return _impl->argv; }
 SharedPtr<EngineBase>                World::local_engine() { return _impl->local_engine; }
-SharedPtr<EngineInterface>           World::engine()       { return _impl->engine; }
+SharedPtr<ServerInterface>           World::engine()       { return _impl->engine; }
 SharedPtr<Serialisation::Serialiser> World::serialiser()   { return _impl->serialiser; }
 SharedPtr<Serialisation::Parser>     World::parser()       { return _impl->parser; }
 SharedPtr<Store>                     World::store()        { return _impl->store; }
@@ -245,14 +245,14 @@ World::unload_modules()
 
 /** Get an interface for a remote engine at @a url
  */
-SharedPtr<EngineInterface>
+SharedPtr<ServerInterface>
 World::interface(const std::string& url)
 {
 	const string scheme = url.substr(0, url.find(":"));
 	const Pimpl::InterfaceFactories::const_iterator i = _impl->interface_factories.find(scheme);
 	if (i == _impl->interface_factories.end()) {
 		warn << "Unknown URI scheme `" << scheme << "'" << endl;
-		return SharedPtr<EngineInterface>();
+		return SharedPtr<ServerInterface>();
 	}
 
 	return i->second(this, url);
diff --git a/src/shared/World.hpp b/src/shared/World.hpp
index 7f100d8a..a0603bf0 100644
--- a/src/shared/World.hpp
+++ b/src/shared/World.hpp
@@ -36,7 +36,7 @@ namespace Sord { class World; }
 namespace Ingen {
 
 class EngineBase;
-class EngineInterface;
+class ServerInterface;
 
 namespace Serialisation { class Serialiser; class Parser; }
 
@@ -63,27 +63,27 @@ public:
 	virtual bool load_module(const char* name);
 	virtual void unload_modules();
 
-	typedef SharedPtr<EngineInterface> (*InterfaceFactory)(
+	typedef SharedPtr<ServerInterface> (*InterfaceFactory)(
 			World*             world,
 			const std::string& engine_url);
 
 	virtual void add_interface_factory(const std::string& scheme,
 	                                   InterfaceFactory   factory);
 
-	virtual SharedPtr<EngineInterface> interface(
+	virtual SharedPtr<ServerInterface> interface(
 		const std::string& engine_url);
 
 	virtual bool run(const std::string& mime_type,
 	                 const std::string& filename);
 
 	virtual void set_local_engine(SharedPtr<EngineBase> e);
-	virtual void set_engine(SharedPtr<EngineInterface> e);
+	virtual void set_engine(SharedPtr<ServerInterface> e);
 	virtual void set_serialiser(SharedPtr<Serialisation::Serialiser> s);
 	virtual void set_parser(SharedPtr<Serialisation::Parser> p);
 	virtual void set_store(SharedPtr<Store> s);
 
 	virtual SharedPtr<EngineBase>                local_engine();
-	virtual SharedPtr<EngineInterface>           engine();
+	virtual SharedPtr<ServerInterface>           engine();
 	virtual SharedPtr<Serialisation::Serialiser> serialiser();
 	virtual SharedPtr<Serialisation::Parser>     parser();
 	virtual SharedPtr<Store>                     store();