@@ -16,15 +16,15 @@
 #include "config.h"
 
 #include <string.h>
 
 #import "OFHTTPRequest.h"
-#import "OFString.h"
-#import "OFURI.h"
+#import "OFArray.h"
+#import "OFData.h"
 #import "OFDictionary.h"
-#import "OFData.h"
-#import "OFArray.h"
+#import "OFIRI.h"
+#import "OFString.h"
 
 #import "OFInvalidArgumentException.h"
 #import "OFInvalidFormatException.h"
 #import "OFOutOfRangeException.h"
 #import "OFUnsupportedVersionException.h"
@@ -76,23 +76,23 @@
 
 	@throw [OFInvalidFormatException exception];
 }
 
 @implementation OFHTTPRequest
-@synthesize URI = _URI, method = _method, headers = _headers;
+@synthesize IRI = _IRI, method = _method, headers = _headers;
 
-+ (instancetype)requestWithURI: (OFURI *)URI
++ (instancetype)requestWithIRI: (OFIRI *)IRI
 {
-	return [[[self alloc] initWithURI: URI] autorelease];
+	return [[[self alloc] initWithIRI: IRI] autorelease];
 }
 
-- (instancetype)initWithURI: (OFURI *)URI
+- (instancetype)initWithIRI: (OFIRI *)IRI
 {
 	self = [super init];
 
 	@try {
-		_URI = [URI copy];
+		_IRI = [IRI copy];
 		_method = OFHTTPRequestMethodGet;
 		_protocolVersion.major = 1;
 		_protocolVersion.minor = 1;
 	} @catch (id e) {
 		[self release];
@@ -107,11 +107,11 @@
 	OF_INVALID_INIT_METHOD
 }
 
 - (void)dealloc
 {
-	[_URI release];
+	[_IRI release];
 	[_headers release];
 
 	[super dealloc];
 }
 
@@ -131,11 +131,11 @@
 	return NULL;
 }
 
 - (id)copy
 {
-	OFHTTPRequest *copy = [[OFHTTPRequest alloc] initWithURI: _URI];
+	OFHTTPRequest *copy = [[OFHTTPRequest alloc] initWithIRI: _IRI];
 
 	@try {
 		copy->_method = _method;
 		copy->_protocolVersion = _protocolVersion;
 		copy.headers = _headers;
@@ -161,11 +161,11 @@
 	request = object;
 
 	if (request->_method != _method ||
 	    request->_protocolVersion.major != _protocolVersion.major ||
 	    request->_protocolVersion.minor != _protocolVersion.minor ||
-	    ![request->_URI isEqual: _URI] ||
+	    ![request->_IRI isEqual: _IRI] ||
 	    ![request->_headers isEqual: _headers])
 		return false;
 
 	if (request.remoteAddress != self.remoteAddress &&
 	    !OFSocketAddressEqual(request.remoteAddress, self.remoteAddress))
@@ -181,11 +181,11 @@
 	OFHashInit(&hash);
 
 	OFHashAddByte(&hash, _method);
 	OFHashAddByte(&hash, _protocolVersion.major);
 	OFHashAddByte(&hash, _protocolVersion.minor);
-	OFHashAddHash(&hash, _URI.hash);
+	OFHashAddHash(&hash, _IRI.hash);
 	OFHashAddHash(&hash, _headers.hash);
 	if (_hasRemoteAddress)
 		OFHashAddHash(&hash, OFSocketAddressHash(&_remoteAddress));
 
 	OFHashFinalize(&hash);
@@ -254,17 +254,17 @@
 		remoteAddress = OFSocketAddressString(&_remoteAddress);
 	else
 		remoteAddress = nil;
 
 	ret = [[OFString alloc] initWithFormat:
-	    @"<%@:\n\tURI = %@\n"
+	    @"<%@:\n\tIRI = %@\n"
 	    @"\tMethod = %s\n"
 	    @"\tHeaders = %@\n"
 	    @"\tRemote address = %@\n"
 	    @">",
-	    self.class, _URI, method, indentedHeaders, remoteAddress];
+	    self.class, _IRI, method, indentedHeaders, remoteAddress];
 
 	objc_autoreleasePoolPop(pool);
 
 	return [ret autorelease];
 }
 @end