5 files changed, 15 insertions, 15 deletions
diff --git a/ingen/client/BlockModel.hpp b/ingen/client/BlockModel.hpp
index d0bae8de..65d632d5 100644
--- a/ingen/client/BlockModel.hpp
+++ b/ingen/client/BlockModel.hpp
@@ -22,10 +22,10 @@
 #include <vector>
 
 #include "raul/SharedPtr.hpp"
-#include "ingen/GraphObject.hpp"
+#include "ingen/Node.hpp"
 #include "ingen/client/ObjectModel.hpp"
-#include "ingen/client/PortModel.hpp"
 #include "ingen/client/PluginModel.hpp"
+#include "ingen/client/PortModel.hpp"
 
 namespace Raul { class Path; }
 
@@ -48,13 +48,13 @@ public:
 	BlockModel(const BlockModel& copy);
 	virtual ~BlockModel();
 
-	GraphType graph_type() const { return GraphObject::GRAPH; }
+	GraphType graph_type() const { return Node::GRAPH; }
 
 	typedef std::vector< SharedPtr<const PortModel> > Ports;
 
 	SharedPtr<const PortModel> get_port(const Raul::Symbol& symbol) const;
 
-	GraphObject* port(uint32_t index) const;
+	Node* port(uint32_t index) const;
 
 	const Raul::URI&       plugin_uri()   const { return _plugin_uri; }
 	const Plugin*          plugin()       const { return _plugin.get(); }
diff --git a/ingen/client/ClientStore.hpp b/ingen/client/ClientStore.hpp
index e7e6105b..2ca25dde 100644
--- a/ingen/client/ClientStore.hpp
+++ b/ingen/client/ClientStore.hpp
@@ -31,8 +31,8 @@ namespace Raul { class Atom; }
 
 namespace Ingen {
 
-class GraphObject;
 class Log;
+class Node;
 class URIs;
 
 namespace Client {
diff --git a/ingen/client/GraphModel.hpp b/ingen/client/GraphModel.hpp
index 03a41891..d527eb82 100644
--- a/ingen/client/GraphModel.hpp
+++ b/ingen/client/GraphModel.hpp
@@ -35,10 +35,10 @@ class GraphModel : public BlockModel
 public:
 	/* WARNING: Copy constructor creates a shallow copy WRT connections */
 
-	GraphType graph_type() const { return GraphObject::GRAPH; }
+	GraphType graph_type() const { return Node::GRAPH; }
 
-	SharedPtr<EdgeModel> get_edge(const Ingen::GraphObject* tail,
-	                              const Ingen::GraphObject* head);
+	SharedPtr<EdgeModel> get_edge(const Ingen::Node* tail,
+	                              const Ingen::Node* head);
 
 	bool     enabled()       const;
 	bool     polyphonic()    const;
@@ -62,8 +62,8 @@ private:
 	bool remove_child(SharedPtr<ObjectModel> c);
 
 	void add_edge(SharedPtr<EdgeModel> cm);
-	void remove_edge(const Ingen::GraphObject* tail,
-	                 const Ingen::GraphObject* head);
+	void remove_edge(const Ingen::Node* tail,
+	                 const Ingen::Node* head);
 };
 
 } // namespace Client
diff --git a/ingen/client/ObjectModel.hpp b/ingen/client/ObjectModel.hpp
index c9f4e6d1..60e873e4 100644
--- a/ingen/client/ObjectModel.hpp
+++ b/ingen/client/ObjectModel.hpp
@@ -29,7 +29,7 @@
 #include "raul/SharedPtr.hpp"
 #include "raul/URI.hpp"
 
-#include "ingen/GraphObject.hpp"
+#include "ingen/Node.hpp"
 #include "ingen/Resource.hpp"
 #include "ingen/client/signal.hpp"
 
@@ -41,7 +41,7 @@ namespace Client {
 
 class ClientStore;
 
-/** Base class for all GraphObject models (BlockModel, GraphModel, PortModel).
+/** Base class for all Node 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
@@ -52,7 +52,7 @@ class ClientStore;
  *
  * @ingroup IngenClient
  */
-class ObjectModel : public GraphObject
+class ObjectModel : public Node
 {
 public:
 	virtual ~ObjectModel();
@@ -68,7 +68,7 @@ public:
 	SharedPtr<ObjectModel> parent()     const { return _parent; }
 	bool                   polyphonic() const;
 
-	GraphObject* graph_parent() const { return _parent.get(); }
+	Node* graph_parent() const { return _parent.get(); }
 
 	// Signals
 	INGEN_SIGNAL(new_child, void, SharedPtr<ObjectModel>);
diff --git a/ingen/client/PortModel.hpp b/ingen/client/PortModel.hpp
index bfc56a9d..675cc827 100644
--- a/ingen/client/PortModel.hpp
+++ b/ingen/client/PortModel.hpp
@@ -41,7 +41,7 @@ class PortModel : public ObjectModel
 public:
 	enum Direction { INPUT, OUTPUT };
 
-	GraphType graph_type() const { return GraphObject::PORT; }
+	GraphType graph_type() const { return Node::PORT; }
 
 	bool supports(const Raul::URI& value_type) const;