Index: src/IRCConnection.m
==================================================================
--- src/IRCConnection.m
+++ src/IRCConnection.m
@@ -294,11 +294,11 @@
 		OFString *where = [components objectAtIndex: 2];
 		IRCUser *user;
 		OFMutableSet *channel;
 
 		who = [who substringFromIndex: 1];
-		user = [IRCUser IRCUserWithString: who];
+		user = [IRCUser userWithString: who];
 
 		if ([who hasPrefix:
 		    [_nickname stringByAppendingString: @"!"]]) {
 			channel = [OFMutableSet set];
 			[_channels setObject: channel forKey: where];
@@ -365,11 +365,11 @@
 		OFString *reason = nil;
 		size_t pos = who.length + 1 +
 		    [[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)
 			reason = [line substringFromIndex: pos + 2];
 
@@ -396,11 +396,11 @@
 		size_t pos = who.length + 1 +
 		    [[components objectAtIndex: 1] length] + 1 +
 		    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)
 			reason = [line substringFromIndex: pos + 2];
 
@@ -424,11 +424,11 @@
 		OFString *reason = nil;
 		size_t pos = who.length + 1 +
 		    [[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];
 
 		for (OFString *channel in _channels)
@@ -451,11 +451,11 @@
 		IRCUser *user;
 
 		who = [who substringFromIndex: 1];
 		nickname = [nickname substringFromIndex: 1];
 
-		user = [IRCUser IRCUserWithString: who];
+		user = [IRCUser userWithString: who];
 
 		if ([user.nickname isEqual: _nickname]) {
 			[_nickname release];
 			_nickname = [nickname copy];
 		}
@@ -485,11 +485,11 @@
 		size_t pos = from.length + 1 +
 		    [[components objectAtIndex: 1] length] + 1 + to.length;
 
 		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:
 			    didReceiveMessage:channel:user:)])
 				[_delegate connection: self
@@ -522,11 +522,11 @@
 		if (![from containsString: @"!"] || [to isEqual: @"*"]) {
 			/* System message - ignore for now */
 			return;
 		}
 
-		user = [IRCUser IRCUserWithString: from];
+		user = [IRCUser userWithString: from];
 
 		if (![to isEqual: _nickname]) {
 			if ([_delegate respondsToSelector: @selector(connection:
 			    didReceiveNotice:channel:user:)])
 				[_delegate connection: self

Index: src/IRCUser.h
==================================================================
--- src/IRCUser.h
+++ src/IRCUser.h
@@ -30,10 +30,10 @@
 	OFString *_nickname, *_username, *_hostname;
 }
 
 @property (readonly, nonatomic) OFString *nickname, *username, *hostname;
 
-+ (instancetype)IRCUserWithString: (OFString *)string;
++ (instancetype)userWithString: (OFString *)string;
 - (instancetype)initWithString: (OFString *)string OF_DESIGNATED_INITIALIZER;
 @end
 
 OF_ASSUME_NONNULL_END

Index: src/IRCUser.m
==================================================================
--- src/IRCUser.m
+++ src/IRCUser.m
@@ -34,11 +34,11 @@
 #import "IRCUser.h"
 
 @implementation IRCUser
 @synthesize username = _username, nickname = _nickname, hostname = _hostname;
 
-+ (instancetype)IRCUserWithString: (OFString *)string
++ (instancetype)userWithString: (OFString *)string
 {
 	return [[[self alloc] initWithString: string] autorelease];
 }
 
 - (instancetype)initWithString: (OFString *)string