7 files changed, 14 insertions, 14 deletions
diff --git a/src/client/PluginUI.cpp b/src/client/PluginUI.cpp
index 42e864b1..d7ff6218 100644
--- a/src/client/PluginUI.cpp
+++ b/src/client/PluginUI.cpp
@@ -20,7 +20,7 @@
 #include "atom.lv2/atom.h"
 #include "shared/LV2Features.hpp"
 #include "shared/LV2URIMap.hpp"
-#include "shared/LV2Object.hpp"
+#include "shared/LV2Atom.hpp"
 #include "PluginUI.hpp"
 #include "NodeModel.hpp"
 #include "PortModel.hpp"
@@ -87,7 +87,7 @@ lv2_ui_write(LV2UI_Controller controller,
 	} else if (format == uris.object_transfer.id) {
 		LV2_Atom* buf = (LV2_Atom*)buffer;
 		Raul::Atom val;
-		Shared::LV2Object::to_atom(uris, buf, val);
+		Shared::LV2Atom::to_atom(uris, buf, val);
 		ui->world()->engine()->set_property(port->path(), uris.ingen_value, val);
 
 	} else {
diff --git a/src/engine/PortImpl.cpp b/src/engine/PortImpl.cpp
index ebb358e5..af17c2aa 100644
--- a/src/engine/PortImpl.cpp
+++ b/src/engine/PortImpl.cpp
@@ -26,7 +26,7 @@
 #include "BufferFactory.hpp"
 #include "Engine.hpp"
 #include "EventBuffer.hpp"
-#include "LV2Object.hpp"
+#include "LV2Atom.hpp"
 #include "NodeImpl.hpp"
 #include "ObjectBuffer.hpp"
 #include "PortImpl.hpp"
@@ -227,7 +227,7 @@ PortImpl::broadcast_value(Context& context, bool force)
 		break;
 	case PortType::VALUE:
 	case PortType::MESSAGE:
-		LV2Object::to_atom(_bufs.uris(), ((ObjectBuffer*)buffer(0).get())->atom(), val);
+		LV2Atom::to_atom(_bufs.uris(), ((ObjectBuffer*)buffer(0).get())->atom(), val);
 		break;
 	}
 
diff --git a/src/engine/events/RequestMetadata.cpp b/src/engine/events/RequestMetadata.cpp
index 850ecc3d..0a705612 100644
--- a/src/engine/events/RequestMetadata.cpp
+++ b/src/engine/events/RequestMetadata.cpp
@@ -18,7 +18,7 @@
 #include "raul/IntrusivePtr.hpp"
 #include "interface/ClientInterface.hpp"
 #include "events/RequestMetadata.hpp"
-#include "shared/LV2Object.hpp"
+#include "shared/LV2Atom.hpp"
 #include "shared/LV2URIMap.hpp"
 #include "AudioBuffer.hpp"
 #include "ClientBroadcaster.hpp"
@@ -101,7 +101,7 @@ RequestMetadata::execute(ProcessContext& context)
 			} else {
 				IntrusivePtr<ObjectBuffer> obuf = PtrCast<ObjectBuffer>(port->buffer(0));
 				if (obuf) {
-					LV2Object::to_atom(*_engine.world()->uris().get(), obuf->atom(), _value);
+					LV2Atom::to_atom(*_engine.world()->uris().get(), obuf->atom(), _value);
 				}
 			}
 		} else {
diff --git a/src/engine/events/SetPortValue.cpp b/src/engine/events/SetPortValue.cpp
index 6488fd6c..67c2a31b 100644
--- a/src/engine/events/SetPortValue.cpp
+++ b/src/engine/events/SetPortValue.cpp
@@ -20,7 +20,7 @@
 #include "event.lv2/event.h"
 #include "shared/LV2URIMap.hpp"
 #include "shared/LV2Features.hpp"
-#include "shared/LV2Object.hpp"
+#include "shared/LV2Atom.hpp"
 #include "module/World.hpp"
 #include "AudioBuffer.hpp"
 #include "ClientBroadcaster.hpp"
@@ -176,7 +176,7 @@ SetPortValue::apply(Context& context)
 		ObjectBuffer* const obuf = dynamic_cast<ObjectBuffer*>(buf);
 		if (obuf) {
 			obuf->atom()->size = obuf->size() - sizeof(LV2_Atom);
-			if (LV2Object::from_atom(uris, _value, obuf->atom())) {
+			if (LV2Atom::from_atom(uris, _value, obuf->atom())) {
 				debug << "Converted atom " << _value << " :: " << obuf->atom()->type
 					<< " * " << obuf->atom()->size << " @ " << obuf->atom() << endl;
 				return;
diff --git a/src/shared/LV2Object.cpp b/src/shared/LV2Atom.cpp
index 9000320f..9ae97761 100644
--- a/src/shared/LV2Object.cpp
+++ b/src/shared/LV2Atom.cpp
@@ -20,7 +20,7 @@
 #include "uri-map.lv2/uri-map.h"
 #include "atom.lv2/atom.h"
 #include "LV2Features.hpp"
-#include "LV2Object.hpp"
+#include "LV2Atom.hpp"
 #include "LV2URIMap.hpp"
 
 using namespace std;
@@ -28,7 +28,7 @@ using namespace Raul;
 
 namespace Ingen {
 namespace Shared {
-namespace LV2Object {
+namespace LV2Atom {
 
 
 bool
@@ -90,7 +90,7 @@ from_atom(const Shared::LV2URIMap& uris, const Raul::Atom& atom, LV2_Atom* objec
 }
 
 
-} // namespace LV2Object
+} // namespace LV2Atom
 
 } // namespace Shared
 } // namespace Ingen
diff --git a/src/shared/LV2Object.hpp b/src/shared/LV2Atom.hpp
index 5b50d726..511cb4ff 100644
--- a/src/shared/LV2Object.hpp
+++ b/src/shared/LV2Atom.hpp
@@ -27,12 +27,12 @@ namespace Shared {
 class World;
 class LV2URIMap;
 
-namespace LV2Object {
+namespace LV2Atom {
 
 	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
+} // namespace LV2Atom
 
 } // namespace Shared
 } // namespace Ingen
diff --git a/src/shared/wscript b/src/shared/wscript
index 6626f55a..ebef1119 100644
--- a/src/shared/wscript
+++ b/src/shared/wscript
@@ -10,8 +10,8 @@ def build(bld):
 		Builder.cpp
 		ClashAvoider.cpp
 		Configuration.cpp
+		LV2Atom.cpp
 		LV2Features.cpp
-		LV2Object.cpp
 		LV2URIMap.cpp
 		ResourceImpl.cpp
 		Store.cpp