3 files changed, 13 insertions, 13 deletions
diff --git a/src/shared/LV2Object.cpp b/src/shared/LV2Object.cpp
index 4388ede8..9000320f 100644
--- a/src/shared/LV2Object.cpp
+++ b/src/shared/LV2Object.cpp
@@ -18,7 +18,7 @@
 #include "raul/log.hpp"
 #include "raul/Atom.hpp"
 #include "uri-map.lv2/uri-map.h"
-#include "object.lv2/object.h"
+#include "atom.lv2/atom.h"
 #include "LV2Features.hpp"
 #include "LV2Object.hpp"
 #include "LV2URIMap.hpp"
@@ -32,7 +32,7 @@ namespace LV2Object {
 
 
 bool
-to_atom(const Shared::LV2URIMap& uris, const LV2_Object* object, Raul::Atom& atom)
+to_atom(const Shared::LV2URIMap& uris, const LV2_Atom* object, Raul::Atom& atom)
 {
 	if (object->type == uris.object_class_string.id) {
 		atom = Raul::Atom((char*)(object + 1));
@@ -55,7 +55,7 @@ to_atom(const Shared::LV2URIMap& uris, const LV2_Object* object, Raul::Atom& ato
  * object->size should be the capacity of the object (not including header)
  */
 bool
-from_atom(const Shared::LV2URIMap& uris, const Raul::Atom& atom, LV2_Object* object)
+from_atom(const Shared::LV2URIMap& uris, const Raul::Atom& atom, LV2_Atom* object)
 {
 	char* str;
 	switch (atom.type()) {
diff --git a/src/shared/LV2Object.hpp b/src/shared/LV2Object.hpp
index bec2ff89..5b50d726 100644
--- a/src/shared/LV2Object.hpp
+++ b/src/shared/LV2Object.hpp
@@ -19,7 +19,7 @@
 #define INGEN_SHARED_LV2OBJECT_HPP
 
 namespace Raul { class Atom; }
-typedef struct _LV2_Object LV2_Object;
+typedef struct _LV2_Atom LV2_Atom;
 
 namespace Ingen {
 namespace Shared {
@@ -29,8 +29,8 @@ class LV2URIMap;
 
 namespace LV2Object {
 
-	bool to_atom(const Shared::LV2URIMap& uris, const LV2_Object* object, Raul::Atom& atom);
-	bool from_atom(const Shared::LV2URIMap& uris, const Raul::Atom& atom, LV2_Object* object);
+	bool to_atom(const Shared::LV2URIMap& uris, const LV2_Atom* object, Raul::Atom& atom);
+	bool from_atom(const Shared::LV2URIMap& uris, const Raul::Atom& atom, LV2_Atom* object);
 
 } // namespace LV2Object
 
diff --git a/src/shared/LV2URIMap.cpp b/src/shared/LV2URIMap.cpp
index e069a644..e8de602a 100644
--- a/src/shared/LV2URIMap.cpp
+++ b/src/shared/LV2URIMap.cpp
@@ -21,7 +21,7 @@
 #include <glib.h>
 #include <boost/shared_ptr.hpp>
 #include "raul/log.hpp"
-#include "object.lv2/object.h"
+#include "atom.lv2/atom.h"
 #include "LV2URIMap.hpp"
 
 using namespace std;
@@ -99,12 +99,12 @@ LV2URIMap::LV2URIMap()
 	, obj_MessagePort("http://lv2plug.in/ns/dev/objects#MessagePort")
 	, obj_ValuePort("http://lv2plug.in/ns/dev/objects#ValuePort")
 	, obj_supports("http://lv2plug.in/ns/dev/objects#supports")
-	, object_class_bool(LV2_OBJECT_URI "#Bool")
-	, object_class_float32(LV2_OBJECT_URI "#Float32")
-	, object_class_int32(LV2_OBJECT_URI "#Int32")
-	, object_class_string(LV2_OBJECT_URI "#String")
-	, object_class_vector(LV2_OBJECT_URI "#Vector")
-	, object_transfer(LV2_OBJECT_URI "#ObjectTransfer")
+	, object_class_bool(LV2_ATOM_URI "#Bool")
+	, object_class_float32(LV2_ATOM_URI "#Float32")
+	, object_class_int32(LV2_ATOM_URI "#Int32")
+	, object_class_string(LV2_ATOM_URI "#String")
+	, object_class_vector(LV2_ATOM_URI "#Vector")
+	, object_transfer(LV2_ATOM_URI "#ObjectTransfer")
 	, rdf_instanceOf(NS_RDF "instanceOf")
 	, rdf_type(NS_RDF "type")
 	, rdfs_seeAlso(NS_RDFS "seeAlso")