8 files changed, 18 insertions, 18 deletions
diff --git a/src/libs/engine/ClientBroadcaster.cpp b/src/libs/engine/ClientBroadcaster.cpp
index 34f34933..23b841c0 100644
--- a/src/libs/engine/ClientBroadcaster.cpp
+++ b/src/libs/engine/ClientBroadcaster.cpp
@@ -180,7 +180,7 @@ void
 ClientBroadcaster::send_connection(const SharedPtr<const ConnectionImpl> c)
 {
 	for (Clients::const_iterator i = _clients.begin(); i != _clients.end(); ++i)
-		(*i).second->connection(c->src_port()->path(), c->dst_port()->path());
+		(*i).second->connect(c->src_port()->path(), c->dst_port()->path());
 }
 
 
@@ -188,7 +188,7 @@ void
 ClientBroadcaster::send_disconnection(const string& src_port_path, const string& dst_port_path)
 {
 	for (Clients::const_iterator i = _clients.begin(); i != _clients.end(); ++i)
-		(*i).second->disconnection(src_port_path, dst_port_path);
+		(*i).second->disconnect(src_port_path, dst_port_path);
 }
 
 
diff --git a/src/libs/engine/OSCClientSender.cpp b/src/libs/engine/OSCClientSender.cpp
index 3b853571..2139a49a 100644
--- a/src/libs/engine/OSCClientSender.cpp
+++ b/src/libs/engine/OSCClientSender.cpp
@@ -426,7 +426,7 @@ OSCClientSender::patch_polyphony(const std::string& patch_path, uint32_t poly)
  * \arg \b dst-path (string) - Path of the destination port</p> \n \n
  */
 void
-OSCClientSender::connection(const std::string& src_port_path, const std::string& dst_port_path)
+OSCClientSender::connect(const std::string& src_port_path, const std::string& dst_port_path)
 {
 	send("/ingen/new_connection", "ss", src_port_path.c_str(), dst_port_path.c_str(), LO_ARGS_END);
 }
@@ -438,7 +438,7 @@ OSCClientSender::connection(const std::string& src_port_path, const std::string&
  * \arg \b dst-path (string) - Path of the destination port</p> \n \n
  */
 void
-OSCClientSender::disconnection(const std::string& src_port_path, const std::string& dst_port_path)
+OSCClientSender::disconnect(const std::string& src_port_path, const std::string& dst_port_path)
 {
 	send("/ingen/disconnection", "ss", src_port_path.c_str(), dst_port_path.c_str(), LO_ARGS_END);
 }
diff --git a/src/libs/engine/OSCClientSender.hpp b/src/libs/engine/OSCClientSender.hpp
index cd2264df..d102790d 100644
--- a/src/libs/engine/OSCClientSender.hpp
+++ b/src/libs/engine/OSCClientSender.hpp
@@ -109,11 +109,11 @@ public:
 	virtual void object_renamed(const std::string& old_path,
 	                            const std::string& new_path);
 	
-	virtual void connection(const std::string& src_port_path,
-	                        const std::string& dst_port_path);
+	virtual void connect(const std::string& src_port_path,
+	                     const std::string& dst_port_path);
 	
-	virtual void disconnection(const std::string& src_port_path,
-	                           const std::string& dst_port_path);
+	virtual void disconnect(const std::string& src_port_path,
+	                        const std::string& dst_port_path);
 	
 	virtual void variable_change(const std::string& subject_path,
 	                             const std::string& predicate,
diff --git a/src/libs/engine/OSCEngineReceiver.cpp b/src/libs/engine/OSCEngineReceiver.cpp
index ca035a7f..5c1318cd 100644
--- a/src/libs/engine/OSCEngineReceiver.cpp
+++ b/src/libs/engine/OSCEngineReceiver.cpp
@@ -86,7 +86,7 @@ OSCEngineReceiver::OSCEngineReceiver(Engine& engine, size_t queue_size, uint16_t
 	lo_server_add_method(_server, "/ingen/load_plugins", "i", load_plugins_cb, this);
 	lo_server_add_method(_server, "/ingen/activate", "i", engine_activate_cb, this);
 	lo_server_add_method(_server, "/ingen/deactivate", "i", engine_deactivate_cb, this);
-	lo_server_add_method(_server, "/ingen/create_patch", "isi", create_patch_cb, this);
+	lo_server_add_method(_server, "/ingen/new_patch", "isi", new_patch_cb, this);
 	lo_server_add_method(_server, "/ingen/enable_patch", "is", enable_patch_cb, this);
 	lo_server_add_method(_server, "/ingen/disable_patch", "is", disable_patch_cb, this);
 	lo_server_add_method(_server, "/ingen/clear_patch", "is", clear_patch_cb, this);
@@ -373,18 +373,18 @@ OSCEngineReceiver::_engine_deactivate_cb(const char* path, const char* types, lo
 
 
 /** \page engine_osc_namespace
- * <p> \b /ingen/create_patch - Creates a new, empty, toplevel patch.
+ * <p> \b /ingen/new_patch - Creates a new, empty, toplevel patch.
  * \arg \b response-id  (integer)
  * \arg \b patch-path  (string) - Patch path (complete, ie /master/parent/new_patch)
  * \arg \b poly        (integer) - Patch's (internal) polyphony </p> \n \n
  */
 int
-OSCEngineReceiver::_create_patch_cb(const char* path, const char* types, lo_arg** argv, int argc, lo_message msg)
+OSCEngineReceiver::_new_patch_cb(const char* path, const char* types, lo_arg** argv, int argc, lo_message msg)
 {
 	const char*   patch_path  = &argv[1]->s;
 	const int32_t poly        =  argv[2]->i;
 
-	create_patch(patch_path, poly);
+	new_patch(patch_path, poly);
 	return 0;
 }
 
diff --git a/src/libs/engine/OSCEngineReceiver.hpp b/src/libs/engine/OSCEngineReceiver.hpp
index a998054f..006192bf 100644
--- a/src/libs/engine/OSCEngineReceiver.hpp
+++ b/src/libs/engine/OSCEngineReceiver.hpp
@@ -93,7 +93,7 @@ private:
 	LO_HANDLER(load_plugins);
 	LO_HANDLER(engine_activate);
 	LO_HANDLER(engine_deactivate);
-	LO_HANDLER(create_patch);
+	LO_HANDLER(new_patch);
 	LO_HANDLER(rename);
 	LO_HANDLER(create_port);
 	LO_HANDLER(create_node);
diff --git a/src/libs/engine/ObjectSender.cpp b/src/libs/engine/ObjectSender.cpp
index 67bd41d2..47312226 100644
--- a/src/libs/engine/ObjectSender.cpp
+++ b/src/libs/engine/ObjectSender.cpp
@@ -69,7 +69,7 @@ ObjectSender::send_patch(ClientInterface* client, const PatchImpl* patch, bool r
 		// Send connections
 		for (PatchImpl::Connections::const_iterator j = patch->connections().begin();
 				j != patch->connections().end(); ++j)
-			client->connection((*j)->src_port_path(), (*j)->dst_port_path());
+			client->connect((*j)->src_port_path(), (*j)->dst_port_path());
 
 	}
 }
diff --git a/src/libs/engine/QueuedEngineInterface.cpp b/src/libs/engine/QueuedEngineInterface.cpp
index 988093aa..3aa96aee 100644
--- a/src/libs/engine/QueuedEngineInterface.cpp
+++ b/src/libs/engine/QueuedEngineInterface.cpp
@@ -138,8 +138,8 @@ QueuedEngineInterface::bundle_end()
 // Object commands
 
 void
-QueuedEngineInterface::create_patch(const string& path,
-                                    uint32_t      poly)
+QueuedEngineInterface::new_patch(const string& path,
+                                 uint32_t      poly)
 {
 	push_queued(new CreatePatchEvent(_engine, _responder, now(), path, poly));
 }
diff --git a/src/libs/engine/QueuedEngineInterface.hpp b/src/libs/engine/QueuedEngineInterface.hpp
index adf6d263..e8a8669d 100644
--- a/src/libs/engine/QueuedEngineInterface.hpp
+++ b/src/libs/engine/QueuedEngineInterface.hpp
@@ -81,8 +81,8 @@ public:
 			
 	// Object commands
 	
-	virtual void create_patch(const string& path,
-	                          uint32_t      poly);
+	virtual void new_patch(const string& path,
+	                       uint32_t      poly);
 
 	virtual void create_port(const string& path,
 	                         const string& data_type,