3 files changed, 14 insertions, 11 deletions
diff --git a/include/ingen/shared/Builder.hpp b/include/ingen/shared/Builder.hpp
index 8a21dee0..245b3013 100644
--- a/include/ingen/shared/Builder.hpp
+++ b/include/ingen/shared/Builder.hpp
@@ -27,7 +27,7 @@ class GraphObject;
 
 namespace Shared {
 
-class LV2URIMap;
+class URIs;
 
 /** Wrapper for CommonInterface to create existing objects/models.
  *
@@ -36,7 +36,7 @@ class LV2URIMap;
 class Builder
 {
 public:
-	Builder(SharedPtr<Shared::LV2URIMap> uris, CommonInterface& interface);
+	Builder(SharedPtr<Shared::URIs> uris, CommonInterface& interface);
 	virtual ~Builder() {}
 
 	void build(SharedPtr<const GraphObject> object);
@@ -45,8 +45,8 @@ public:
 private:
 	void build_object(SharedPtr<const GraphObject> object);
 
-	SharedPtr<Shared::LV2URIMap> _uris;
-	CommonInterface&             _interface;
+	SharedPtr<Shared::URIs> _uris;
+	CommonInterface&        _interface;
 };
 
 } // namespace Shared
diff --git a/include/ingen/shared/LV2Atom.hpp b/include/ingen/shared/LV2Atom.hpp
index df9ffde9..0aa35889 100644
--- a/include/ingen/shared/LV2Atom.hpp
+++ b/include/ingen/shared/LV2Atom.hpp
@@ -25,15 +25,15 @@ namespace Raul { class Atom; }
 namespace Ingen {
 namespace Shared {
 
-class LV2URIMap;
+class URIs;
 
 namespace LV2Atom {
 
-bool to_atom(const LV2URIMap& uris,
-             const LV2_Atom*  object,
-             Raul::Atom&      atom);
+bool to_atom(const URIs&     uris,
+             const LV2_Atom* object,
+             Raul::Atom&     atom);
 
-bool from_atom(const LV2URIMap&  uris,
+bool from_atom(const URIs&       uris,
                const Raul::Atom& atom,
                LV2_Atom*         object);
 
diff --git a/include/ingen/shared/World.hpp b/include/ingen/shared/World.hpp
index 4f0a00c2..4ee378c6 100644
--- a/include/ingen/shared/World.hpp
+++ b/include/ingen/shared/World.hpp
@@ -41,6 +41,7 @@ namespace Serialisation { class Serialiser; class Parser; }
 namespace Shared {
 
 class LV2Features;
+class URIs;
 class LV2URIMap;
 class Store;
 
@@ -92,8 +93,10 @@ public:
 	virtual SharedPtr<Store>                     store();
 	virtual SharedPtr<ClientInterface>           client();
 
-	virtual Sord::World*         rdf_world();
-	virtual SharedPtr<LV2URIMap> uris();
+	virtual Sord::World* rdf_world();
+	
+	virtual SharedPtr<URIs>      uris();
+	virtual SharedPtr<LV2URIMap> lv2_uri_map();
 
 	virtual int&    argc();
 	virtual char**& argv();