diff --git a/components/net/sf/briar/protocol/SubscriptionFactoryImpl.java b/components/net/sf/briar/protocol/SubscriptionFactoryImpl.java
index b545e4e5af1eb54cc329336887fe453261bb7b37..07dfdec95266a292e2eed14082de57ab520c7b93 100644
--- a/components/net/sf/briar/protocol/SubscriptionFactoryImpl.java
+++ b/components/net/sf/briar/protocol/SubscriptionFactoryImpl.java
@@ -9,6 +9,6 @@ class SubscriptionFactoryImpl implements SubscriptionFactory {
 
 	public SubscriptionUpdate createSubscriptions(Map<Group, Long> subs,
 			long timestamp) {
-		return new SubscriptionsImpl(subs, timestamp);
+		return new SubscriptionUpdateImpl(subs, timestamp);
 	}
 }
diff --git a/components/net/sf/briar/protocol/SubscriptionsImpl.java b/components/net/sf/briar/protocol/SubscriptionUpdateImpl.java
similarity index 75%
rename from components/net/sf/briar/protocol/SubscriptionsImpl.java
rename to components/net/sf/briar/protocol/SubscriptionUpdateImpl.java
index 0d15e0d07e9cffcc1770dcfd5da0fd10177f3bcf..8a1d73ad2d92bea8176ec936a5fc2ac3a7f86821 100644
--- a/components/net/sf/briar/protocol/SubscriptionsImpl.java
+++ b/components/net/sf/briar/protocol/SubscriptionUpdateImpl.java
@@ -5,12 +5,12 @@ import java.util.Map;
 import net.sf.briar.api.protocol.Group;
 import net.sf.briar.api.protocol.SubscriptionUpdate;
 
-class SubscriptionsImpl implements SubscriptionUpdate {
+class SubscriptionUpdateImpl implements SubscriptionUpdate {
 
 	private final Map<Group, Long> subs;
 	private final long timestamp;
 
-	SubscriptionsImpl(Map<Group, Long> subs, long timestamp) {
+	SubscriptionUpdateImpl(Map<Group, Long> subs, long timestamp) {
 		this.subs = subs;
 		this.timestamp = timestamp;
 	}
diff --git a/components/net/sf/briar/protocol/TransportFactoryImpl.java b/components/net/sf/briar/protocol/TransportFactoryImpl.java
index 376653a3ade2018aafa757e4c097f4c6a6f7deea..922ee3550b0899ddc5a74f16581d61625bfd3e51 100644
--- a/components/net/sf/briar/protocol/TransportFactoryImpl.java
+++ b/components/net/sf/briar/protocol/TransportFactoryImpl.java
@@ -8,6 +8,6 @@ class TransportFactoryImpl implements TransportFactory {
 
 	public TransportUpdate createTransports(Map<String, Map<String, String>> transports,
 			long timestamp) {
-		return new TransportsImpl(transports, timestamp);
+		return new TransportUpdateImpl(transports, timestamp);
 	}
 }
diff --git a/components/net/sf/briar/protocol/TransportsImpl.java b/components/net/sf/briar/protocol/TransportUpdateImpl.java
similarity index 77%
rename from components/net/sf/briar/protocol/TransportsImpl.java
rename to components/net/sf/briar/protocol/TransportUpdateImpl.java
index 988c071fad9953e6607588ec15688fefc42a8e80..3536f8cd33ad19d43172553dbc05eb66b702e98f 100644
--- a/components/net/sf/briar/protocol/TransportsImpl.java
+++ b/components/net/sf/briar/protocol/TransportUpdateImpl.java
@@ -4,12 +4,12 @@ import java.util.Map;
 
 import net.sf.briar.api.protocol.TransportUpdate;
 
-class TransportsImpl implements TransportUpdate {
+class TransportUpdateImpl implements TransportUpdate {
 
 	private final Map<String, Map<String, String>> transports;
 	private final long timestamp;
 
-	TransportsImpl(Map<String, Map<String, String>> transports,
+	TransportUpdateImpl(Map<String, Map<String, String>> transports,
 			long timestamp) {
 		this.transports = transports;
 		this.timestamp = timestamp;