diff --git a/src/IRCConnection.m b/src/IRCConnection.m
index 6948f49..27ea6e9 100644
--- a/src/IRCConnection.m
+++ b/src/IRCConnection.m
@@ -296,7 +296,7 @@
 		OFMutableSet *channel;
 
 		who = [who substringFromIndex: 1];
-		user = [IRCUser IRCUserWithString: who];
+		user = [IRCUser userWithString: who];
 
 		if ([who hasPrefix:
 		    [_nickname stringByAppendingString: @"!"]]) {
@@ -367,7 +367,7 @@
 		    [[components objectAtIndex: 1] length] + 1 + where.length;
 
 		who = [who substringFromIndex: 1];
-		user = [IRCUser IRCUserWithString: who];
+		user = [IRCUser userWithString: who];
 		channel = [_channels objectForKey: where];
 
 		if (components.count > 3)
@@ -398,7 +398,7 @@
 		    where.length + 1 + whom.length;
 
 		who = [who substringFromIndex: 1];
-		user = [IRCUser IRCUserWithString: who];
+		user = [IRCUser userWithString: who];
 		channel = [_channels objectForKey: where];
 
 		if (components.count > 4)
@@ -426,7 +426,7 @@
 		    [[components objectAtIndex: 1] length];
 
 		who = [who substringFromIndex: 1];
-		user = [IRCUser IRCUserWithString: who];
+		user = [IRCUser userWithString: who];
 
 		if ([components count] > 2)
 			reason = [line substringFromIndex: pos + 2];
@@ -453,7 +453,7 @@
 		who = [who substringFromIndex: 1];
 		nickname = [nickname substringFromIndex: 1];
 
-		user = [IRCUser IRCUserWithString: who];
+		user = [IRCUser userWithString: who];
 
 		if ([user.nickname isEqual: _nickname]) {
 			[_nickname release];
@@ -487,7 +487,7 @@
 
 		from = [from substringFromIndex: 1];
 		message = [line substringFromIndex: pos + 2];
-		user = [IRCUser IRCUserWithString: from];
+		user = [IRCUser userWithString: from];
 
 		if (![to isEqual: _nickname]) {
 			if ([_delegate respondsToSelector: @selector(connection:
@@ -524,7 +524,7 @@
 			return;
 		}
 
-		user = [IRCUser IRCUserWithString: from];
+		user = [IRCUser userWithString: from];
 
 		if (![to isEqual: _nickname]) {
 			if ([_delegate respondsToSelector: @selector(connection:
diff --git a/src/IRCUser.h b/src/IRCUser.h
index aa9bd86..a8bd873 100644
--- a/src/IRCUser.h
+++ b/src/IRCUser.h
@@ -32,7 +32,7 @@ OF_ASSUME_NONNULL_BEGIN
 
 @property (readonly, nonatomic) OFString *nickname, *username, *hostname;
 
-+ (instancetype)IRCUserWithString: (OFString *)string;
++ (instancetype)userWithString: (OFString *)string;
 - (instancetype)initWithString: (OFString *)string OF_DESIGNATED_INITIALIZER;
 @end
 
diff --git a/src/IRCUser.m b/src/IRCUser.m
index 1c29ed0..88f2f46 100644
--- a/src/IRCUser.m
+++ b/src/IRCUser.m
@@ -36,7 +36,7 @@
 @implementation IRCUser
 @synthesize username = _username, nickname = _nickname, hostname = _hostname;
 
-+ (instancetype)IRCUserWithString: (OFString *)string
++ (instancetype)userWithString: (OFString *)string
 {
 	return [[[self alloc] initWithString: string] autorelease];
 }