@@ -17,11 +17,11 @@
 
 #import "OFHTTPCookie.h"
 #import "OFArray.h"
 #import "OFDate.h"
 #import "OFDictionary.h"
-#import "OFURI.h"
+#import "OFIRI.h"
 
 #import "OFInvalidFormatException.h"
 
 static void
 handleAttribute(OFHTTPCookie *cookie, OFString *name, OFString *value)
@@ -60,16 +60,16 @@
 @synthesize expires = _expires, secure = _secure, HTTPOnly = _HTTPOnly;
 @synthesize extensions = _extensions;
 
 + (OFArray OF_GENERIC(OFHTTPCookie *) *)cookiesWithResponseHeaderFields:
     (OFDictionary OF_GENERIC(OFString *, OFString *) *)headerFields
-    forURI: (OFURI *)URI
+    forIRI: (OFIRI *)IRI
 {
 	OFMutableArray OF_GENERIC(OFHTTPCookie *) *ret = [OFMutableArray array];
 	void *pool = objc_autoreleasePoolPush();
 	OFString *string = [headerFields objectForKey: @"Set-Cookie"];
-	OFString *domain = URI.host;
+	OFString *domain = IRI.host;
 	const OFUnichar *characters = string.characters;
 	size_t length = string.length, last = 0;
 	enum {
 		statePreName,
 		stateName,