7 files changed, 19 insertions, 21 deletions
diff --git a/ingen/client/BlockModel.hpp b/ingen/client/BlockModel.hpp
index dbb0faf3..d0bae8de 100644
--- a/ingen/client/BlockModel.hpp
+++ b/ingen/client/BlockModel.hpp
@@ -48,7 +48,7 @@ public:
 	BlockModel(const BlockModel& copy);
 	virtual ~BlockModel();
 
-	GraphType graph_type() const { return GraphObject::PATCH; }
+	GraphType graph_type() const { return GraphObject::GRAPH; }
 
 	typedef std::vector< SharedPtr<const PortModel> > Ports;
 
diff --git a/ingen/client/ClientStore.hpp b/ingen/client/ClientStore.hpp
index 6da7310e..e7e6105b 100644
--- a/ingen/client/ClientStore.hpp
+++ b/ingen/client/ClientStore.hpp
@@ -38,8 +38,8 @@ class URIs;
 namespace Client {
 
 class BlockModel;
+class GraphModel;
 class ObjectModel;
-class PatchModel;
 class PluginModel;
 class PortModel;
 class SigClientInterface;
@@ -94,7 +94,7 @@ public:
 	void disconnect(const Raul::Path& tail,
 	                const Raul::Path& head);
 
-	void disconnect_all(const Raul::Path& parent_patch,
+	void disconnect_all(const Raul::Path& graph,
 	                    const Raul::Path& path);
 
 	void del(const Raul::URI& uri);
@@ -117,7 +117,7 @@ private:
 
 	void add_plugin(SharedPtr<PluginModel> plugin);
 
-	SharedPtr<PatchModel> connection_patch(const Raul::Path& tail_path,
+	SharedPtr<GraphModel> connection_graph(const Raul::Path& tail_path,
 	                                       const Raul::Path& head_path);
 
 	void bundle_begin() {}
diff --git a/ingen/client/PatchModel.hpp b/ingen/client/GraphModel.hpp
index b4f56799..03a41891 100644
--- a/ingen/client/PatchModel.hpp
+++ b/ingen/client/GraphModel.hpp
@@ -14,8 +14,8 @@
   along with Ingen.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#ifndef INGEN_CLIENT_PATCHMODEL_HPP
-#define INGEN_CLIENT_PATCHMODEL_HPP
+#ifndef INGEN_CLIENT_GRAPHMODEL_HPP
+#define INGEN_CLIENT_GRAPHMODEL_HPP
 
 #include "ingen/client/BlockModel.hpp"
 #include "raul/SharedPtr.hpp"
@@ -26,16 +26,16 @@ namespace Client {
 class ClientStore;
 class EdgeModel;
 
-/** Client's model of a patch.
+/** Client's model of a graph.
  *
  * @ingroup IngenClient
  */
-class PatchModel : public BlockModel
+class GraphModel : public BlockModel
 {
 public:
 	/* WARNING: Copy constructor creates a shallow copy WRT connections */
 
-	GraphType graph_type() const { return GraphObject::PATCH; }
+	GraphType graph_type() const { return GraphObject::GRAPH; }
 
 	SharedPtr<EdgeModel> get_edge(const Ingen::GraphObject* tail,
 	                              const Ingen::GraphObject* head);
@@ -53,11 +53,9 @@ public:
 private:
 	friend class ClientStore;
 
-	PatchModel(URIs& uris, const Raul::Path& patch_path)
-		: BlockModel(
-			uris, Raul::URI("http://drobilla.net/ns/ingen#Patch"), patch_path)
-	{
-	}
+	GraphModel(URIs& uris, const Raul::Path& graph_path)
+		: BlockModel(uris, uris.ingen_Graph, graph_path)
+	{}
 
 	void clear();
 	void add_child(SharedPtr<ObjectModel> c);
@@ -71,4 +69,4 @@ private:
 } // namespace Client
 } // namespace Ingen
 
-#endif // INGEN_CLIENT_PATCHMODEL_HPP
+#endif // INGEN_CLIENT_GRAPHMODEL_HPP
diff --git a/ingen/client/ObjectModel.hpp b/ingen/client/ObjectModel.hpp
index b51e82e6..c9f4e6d1 100644
--- a/ingen/client/ObjectModel.hpp
+++ b/ingen/client/ObjectModel.hpp
@@ -41,7 +41,7 @@ namespace Client {
 
 class ClientStore;
 
-/** Base class for all GraphObject models (BlockModel, PatchModel, PortModel).
+/** Base class for all GraphObject models (BlockModel, GraphModel, PortModel).
  *
  * There are no non-const public methods intentionally, models are not allowed
  * to be manipulated directly by anything (but the Store) because of the
diff --git a/ingen/client/PluginModel.hpp b/ingen/client/PluginModel.hpp
index 7475e57a..7e082879 100644
--- a/ingen/client/PluginModel.hpp
+++ b/ingen/client/PluginModel.hpp
@@ -37,7 +37,7 @@ class URIs;
 
 namespace Client {
 
-class PatchModel;
+class GraphModel;
 class BlockModel;
 class PluginUI;
 
diff --git a/ingen/client/SigClientInterface.hpp b/ingen/client/SigClientInterface.hpp
index a330d31e..dc6676f7 100644
--- a/ingen/client/SigClientInterface.hpp
+++ b/ingen/client/SigClientInterface.hpp
@@ -103,8 +103,8 @@ protected:
 	void disconnect(const Raul::Path& tail, const Raul::Path& head)
 		{ EMIT(disconnection, tail, head); }
 
-	void disconnect_all(const Raul::Path& parent_patch_path, const Raul::Path& path)
-		{ EMIT(disconnect_all, parent_patch_path, path); }
+	void disconnect_all(const Raul::Path& graph, const Raul::Path& path)
+		{ EMIT(disconnect_all, graph, path); }
 
 	void set_property(const Raul::URI& subject, const Raul::URI& key, const Raul::Atom& value)
 		{ EMIT(property_change, subject, key, value); }
diff --git a/ingen/client/ThreadedSigClientInterface.hpp b/ingen/client/ThreadedSigClientInterface.hpp
index 633bd265..a89108bc 100644
--- a/ingen/client/ThreadedSigClientInterface.hpp
+++ b/ingen/client/ThreadedSigClientInterface.hpp
@@ -101,8 +101,8 @@ public:
 	void disconnect(const Raul::Path& tail, const Raul::Path& head)
 		{ push_sig(sigc::bind(disconnection_slot, tail, head)); }
 
-	void disconnect_all(const Raul::Path& parent_patch_path, const Raul::Path& path)
-		{ push_sig(sigc::bind(disconnect_all_slot, parent_patch_path, path)); }
+	void disconnect_all(const Raul::Path& graph, const Raul::Path& path)
+		{ push_sig(sigc::bind(disconnect_all_slot, graph, path)); }
 
 	void set_property(const Raul::URI& subject, const Raul::URI& key, const Raul::Atom& value)
 		{ push_sig(sigc::bind(property_change_slot, subject, key, value)); }