4 files changed, 10 insertions, 11 deletions
diff --git a/src/client/ClientModel.cpp b/src/client/ClientModel.cpp
index 5d6674e..17054d4 100644
--- a/src/client/ClientModel.cpp
+++ b/src/client/ClientModel.cpp
@@ -56,7 +56,7 @@ ClientModel::erase_object(uint64_t id)
 }
 
 void
-ClientModel::property(uint64_t id, URIInt key, const Raul::Atom& value)
+ClientModel::property(uint64_t id, URIInt key, const Atom& value)
 {
 	SPtr<ClientObject> object = find(id);
 	if (object) {
diff --git a/src/client/ClientModel.hpp b/src/client/ClientModel.hpp
index a8a66aa..6840c11 100644
--- a/src/client/ClientModel.hpp
+++ b/src/client/ClientModel.hpp
@@ -35,7 +35,7 @@ class ClientModel
 public:
 	void new_object(SPtr<ClientObject> object);
 	void erase_object(uint64_t id);
-	void property(uint64_t id, URIInt key, const Raul::Atom& value);
+	void property(uint64_t id, URIInt key, const Atom& value);
 
 	SPtr<ClientObject> find(uint64_t id);
 
diff --git a/src/client/ClientObject.cpp b/src/client/ClientObject.cpp
index 475d8e3..9481d10 100644
--- a/src/client/ClientObject.cpp
+++ b/src/client/ClientObject.cpp
@@ -33,16 +33,16 @@ ClientObject::ClientObject(const ClientObject& copy, uint64_t id)
 {}
 
 void
-ClientObject::set(URIInt key, const Raul::Atom& value)
+ClientObject::set(URIInt key, const Atom& value)
 {
 	_properties[key] = value;
 	signal_property.emit(key, value);
 }
 
-const Raul::Atom&
+const Atom&
 ClientObject::get(URIInt key) const
 {
-	static const Raul::Atom    null_atom;
+	static const Atom          null_atom;
 	Properties::const_iterator i = _properties.find(key);
 	if (i != _properties.end()) {
 		return i->second;
diff --git a/src/client/ClientObject.hpp b/src/client/ClientObject.hpp
index 4ad2e0e..cf00a2b 100644
--- a/src/client/ClientObject.hpp
+++ b/src/client/ClientObject.hpp
@@ -21,8 +21,7 @@
 
 #include <sigc++/sigc++.h>
 
-#include "raul/Atom.hpp"
-
+#include "machina/Atom.hpp"
 #include "machina/types.hpp"
 
 namespace machina {
@@ -36,10 +35,10 @@ public:
 
 	inline uint64_t id() const { return _id; }
 
-	void              set(URIInt key, const Raul::Atom& value);
-	const Raul::Atom& get(URIInt key) const;
+	void        set(URIInt key, const Atom& value);
+	const Atom& get(URIInt key) const;
 
-	sigc::signal<void, URIInt, Raul::Atom> signal_property;
+	sigc::signal<void, URIInt, Atom> signal_property;
 
 	class View
 	{
@@ -47,7 +46,7 @@ public:
 		virtual ~View() {}
 	};
 
-	typedef std::map<URIInt, Raul::Atom> Properties;
+	typedef std::map<URIInt, Atom> Properties;
 	const Properties& properties() { return _properties; }
 
 	View* view() const         { return _view; }