diff --git a/briar-api/src/net/sf/briar/api/messaging/MessageFactory.java b/briar-api/src/net/sf/briar/api/messaging/MessageFactory.java
index ade4acda4ed4040e5adedbb9592a5d4130719e47..85cc33b661ce6db027366bbe4c3ba07dfe0d9359 100644
--- a/briar-api/src/net/sf/briar/api/messaging/MessageFactory.java
+++ b/briar-api/src/net/sf/briar/api/messaging/MessageFactory.java
@@ -11,12 +11,12 @@ public interface MessageFactory {
 			byte[] body) throws IOException, GeneralSecurityException;
 
 	/** Creates an anonymous message to an unrestricted group. */
-	Message createAnonymousGroupMessage(MessageId parent, Group group,
+	Message createAnonymousMessage(MessageId parent, Group group,
 			String contentType, byte[] body) throws IOException,
 			GeneralSecurityException;
 
 	/** Creates an anonymous message to a restricted group. */
-	Message createAnonymousGroupMessage(MessageId parent, Group group,
+	Message createAnonymousMessage(MessageId parent, Group group,
 			PrivateKey groupKey, String contentType, byte[] body)
 					throws IOException, GeneralSecurityException;
 
diff --git a/briar-core/src/net/sf/briar/messaging/MessageFactoryImpl.java b/briar-core/src/net/sf/briar/messaging/MessageFactoryImpl.java
index bf329c80c4621eab4a39d9ac420a72f28fcbd7a7..a66b3b6bf220521ce91ec19239c96863c89c1924 100644
--- a/briar-core/src/net/sf/briar/messaging/MessageFactoryImpl.java
+++ b/briar-core/src/net/sf/briar/messaging/MessageFactoryImpl.java
@@ -63,14 +63,14 @@ class MessageFactoryImpl implements MessageFactory {
 		return createMessage(parent, null, null, null, null, contentType, body);
 	}
 
-	public Message createAnonymousGroupMessage(MessageId parent, Group group,
+	public Message createAnonymousMessage(MessageId parent, Group group,
 			String contentType, byte[] body) throws IOException,
 			GeneralSecurityException {
 		return createMessage(parent, group, null, null, null, contentType,
 				body);
 	}
 
-	public Message createAnonymousGroupMessage(MessageId parent, Group group,
+	public Message createAnonymousMessage(MessageId parent, Group group,
 			PrivateKey groupKey, String contentType, byte[] body)
 					throws IOException, GeneralSecurityException {
 		return createMessage(parent, group, groupKey, null, null, contentType,
@@ -78,8 +78,8 @@ class MessageFactoryImpl implements MessageFactory {
 	}
 
 	public Message createPseudonymousMessage(MessageId parent, Group group,
-			Author author, PrivateKey authorKey, String contentType, byte[] body)
-					throws IOException, GeneralSecurityException {
+			Author author, PrivateKey authorKey, String contentType,
+			byte[] body) throws IOException, GeneralSecurityException {
 		return createMessage(parent, group, null, author, authorKey,
 				contentType, body);
 	}
diff --git a/briar-tests/src/net/sf/briar/ProtocolIntegrationTest.java b/briar-tests/src/net/sf/briar/ProtocolIntegrationTest.java
index e838923c98893c968b8790a1b6bbfb8cfc889ffa..2c400f9ea0a327d7653747b9c46aa2eea4fc24af 100644
--- a/briar-tests/src/net/sf/briar/ProtocolIntegrationTest.java
+++ b/briar-tests/src/net/sf/briar/ProtocolIntegrationTest.java
@@ -106,9 +106,9 @@ public class ProtocolIntegrationTest extends BriarTestCase {
 				authorKeyPair.getPublic().getEncoded());
 		// Create two messages to each group: one anonymous, one pseudonymous
 		MessageFactory messageFactory = i.getInstance(MessageFactory.class);
-		message = messageFactory.createAnonymousGroupMessage(null, group,
+		message = messageFactory.createAnonymousMessage(null, group,
 				contentType, messageBody.getBytes("UTF-8"));
-		message1 = messageFactory.createAnonymousGroupMessage(null, group1,
+		message1 = messageFactory.createAnonymousMessage(null, group1,
 				groupKeyPair.getPrivate(), contentType,
 				messageBody.getBytes("UTF-8"));
 		message2 = messageFactory.createPseudonymousMessage(null, group,