4 files changed, 12 insertions, 12 deletions
diff --git a/include/ingen/AtomForge.hpp b/include/ingen/AtomForge.hpp
index b1cec69d..24e42186 100644
--- a/include/ingen/AtomForge.hpp
+++ b/include/ingen/AtomForge.hpp
@@ -73,7 +73,7 @@ private:
 	using SratomPtr = UPtr<Sratom, SratomDeleter>;
 
 	/// Append some data and return a reference to its start
-	intptr_t append(const void* buf, uint32_t len) {
+	intptr_t append(const void* data, uint32_t len) {
 		// Record offset of the start of this write (+1 to avoid null)
 		const intptr_t ref = _size + 1;
 
@@ -85,7 +85,7 @@ private:
 		}
 
 		// Append new data
-		memcpy(reinterpret_cast<uint8_t*>(_buf.get()) + _size, buf, len);
+		memcpy(reinterpret_cast<uint8_t*>(_buf.get()) + _size, data, len);
 		_size += len;
 		return ref;
 	}
@@ -103,13 +103,13 @@ private:
 	}
 
 	static LV2_Atom_Forge_Ref
-	c_append(void* handle, const void* buf, uint32_t len) {
-		return static_cast<AtomForge*>(handle)->append(buf, len);
+	c_append(void* self, const void* data, uint32_t len) {
+		return static_cast<AtomForge*>(self)->append(data, len);
 	}
 
 	static LV2_Atom*
-	c_deref(void* handle, LV2_Atom_Forge_Ref ref) {
-		return static_cast<AtomForge*>(handle)->deref(ref);
+	c_deref(void* self, LV2_Atom_Forge_Ref ref) {
+		return static_cast<AtomForge*>(self)->deref(ref);
 	}
 
 	size_t    _size;     ///< Current atom size
diff --git a/include/ingen/Forge.hpp b/include/ingen/Forge.hpp
index 10b4e622..54f5d3a9 100644
--- a/include/ingen/Forge.hpp
+++ b/include/ingen/Forge.hpp
@@ -55,8 +55,8 @@ public:
 
 	Atom make_urid(const ingen::URI& u);
 
-	static Atom alloc(uint32_t size, uint32_t type, const void* val) {
-		return Atom(size, type, val);
+	static Atom alloc(uint32_t s, uint32_t t, const void* v) {
+		return Atom(s, t, v);
 	}
 
 	Atom alloc(const char* v) {
diff --git a/include/ingen/URIs.hpp b/include/ingen/URIs.hpp
index 9d4b2818..baa376e9 100644
--- a/include/ingen/URIs.hpp
+++ b/include/ingen/URIs.hpp
@@ -39,10 +39,10 @@ class URIMap;
  */
 class INGEN_API URIs : public Raul::Noncopyable {
 public:
-	URIs(ingen::Forge& forge, URIMap* map, LilvWorld* lworld);
+	URIs(ingen::Forge& ingen_forge, URIMap* map, LilvWorld* lworld);
 
 	struct Quark : public URI {
-		Quark(ingen::Forge& forge,
+		Quark(ingen::Forge& ingen_forge,
 		      URIMap*       map,
 		      LilvWorld*    lworld,
 		      const char*   str);
diff --git a/include/ingen/client/PluginModel.hpp b/include/ingen/client/PluginModel.hpp
index dbefaf95..8afcd38f 100644
--- a/include/ingen/client/PluginModel.hpp
+++ b/include/ingen/client/PluginModel.hpp
@@ -65,10 +65,10 @@ public:
 
 	Raul::Symbol default_block_symbol() const;
 	std::string  human_name() const;
-	std::string  port_human_name(uint32_t i) const;
+	std::string  port_human_name(uint32_t index) const;
 
 	using ScalePoints = std::map<float, std::string>;
-	ScalePoints port_scale_points(uint32_t i) const;
+	ScalePoints port_scale_points(uint32_t index) const;
 
 	using Presets = std::map<URI, std::string>;
 	const Presets& presets() const { return _presets; }