diff --git a/briar-api/src/org/briarproject/api/db/DatabaseComponent.java b/briar-api/src/org/briarproject/api/db/DatabaseComponent.java
index 8dc27c97181a421e597e84ae5c8bfe72b3a05fe7..63bd0d8538db605b376aa969b2ec76042613559f 100644
--- a/briar-api/src/org/briarproject/api/db/DatabaseComponent.java
+++ b/briar-api/src/org/briarproject/api/db/DatabaseComponent.java
@@ -43,10 +43,10 @@ public interface DatabaseComponent {
 	void close() throws DbException, IOException;
 
 	/** Adds a listener to be notified when database events occur. */
-	void addListener(EventListener d);
+	void addListener(EventListener l);
 
 	/** Removes a listener. */
-	void removeListener(EventListener d);
+	void removeListener(EventListener l);
 
 	/**
 	 * Stores a contact associated with the given local and remote pseudonyms,
diff --git a/briar-core/src/org/briarproject/db/DatabaseComponentImpl.java b/briar-core/src/org/briarproject/db/DatabaseComponentImpl.java
index 15b1a772e72527954a0f3dd2e336ad375cb2b7e4..0cd93423535b8ea24da14e4150774ff63cf02515 100644
--- a/briar-core/src/org/briarproject/db/DatabaseComponentImpl.java
+++ b/briar-core/src/org/briarproject/db/DatabaseComponentImpl.java
@@ -174,12 +174,12 @@ DatabaseCleaner.Callback {
 		}
 	}
 
-	public void addListener(EventListener d) {
-		listeners.add(d);
+	public void addListener(EventListener l) {
+		listeners.add(l);
 	}
 
-	public void removeListener(EventListener d) {
-		listeners.remove(d);
+	public void removeListener(EventListener l) {
+		listeners.remove(l);
 	}
 
 	public ContactId addContact(Author remote, AuthorId local)
@@ -238,7 +238,7 @@ DatabaseCleaner.Callback {
 
 	/** Notifies all listeners of a database event. */
 	private void callListeners(Event e) {
-		for(EventListener d : listeners) d.eventOccurred(e);
+		for(EventListener l : listeners) l.eventOccurred(e);
 	}
 
 	public void addEndpoint(Endpoint ep) throws DbException {