@@ -17,11 +17,11 @@
 
 #import "OFHTTPCookie.h"
 #import "OFArray.h"
 #import "OFDate.h"
 #import "OFDictionary.h"
-#import "OFURL.h"
+#import "OFURI.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
-    forURL: (OFURL *)URL
+    forURI: (OFURI *)URI
 {
 	OFMutableArray OF_GENERIC(OFHTTPCookie *) *ret = [OFMutableArray array];
 	void *pool = objc_autoreleasePoolPush();
 	OFString *string = [headerFields objectForKey: @"Set-Cookie"];
-	OFString *domain = URL.host;
+	OFString *domain = URI.host;
 	const OFUnichar *characters = string.characters;
 	size_t length = string.length, last = 0;
 	enum {
 		statePreName,
 		stateName,
@@ -93,11 +93,11 @@
 			}
 			break;
 		case stateName:
 			if (characters[i] == '=') {
 				name = [string substringWithRange:
-				    OFRangeMake(last, i - last)];
+				    OFMakeRange(last, i - last)];
 				state = stateExpectValue;
 			}
 			break;
 		case stateExpectValue:
 			if (characters[i] == '"') {
@@ -111,11 +111,11 @@
 			i--;
 			break;
 		case stateValue:
 			if (characters[i] == ';' || characters[i] == ',') {
 				value = [string substringWithRange:
-				    OFRangeMake(last, i - last)];
+				    OFMakeRange(last, i - last)];
 
 				[ret addObject:
 				    [OFHTTPCookie cookieWithName: name
 							   value: value
 							  domain: domain]];
@@ -125,11 +125,11 @@
 			}
 			break;
 		case stateQuotedValue:
 			if (characters[i] == '"') {
 				value = [string substringWithRange:
-				    OFRangeMake(last, i - last)];
+				    OFMakeRange(last, i - last)];
 				[ret addObject:
 				    [OFHTTPCookie cookieWithName: name
 							   value: value
 							  domain: domain]];
 
@@ -153,18 +153,18 @@
 			}
 			break;
 		case stateAttrName:
 			if (characters[i] == '=') {
 				name = [string substringWithRange:
-				    OFRangeMake(last, i - last)];
+				    OFMakeRange(last, i - last)];
 
 				state = stateAttrValue;
 				last = i + 1;
 			} else if (characters[i] == ';' ||
 			    characters[i] == ',') {
 				name = [string substringWithRange:
-				    OFRangeMake(last, i - last)];
+				    OFMakeRange(last, i - last)];
 
 				handleAttribute(ret.lastObject, name, nil);
 
 				state = (characters[i] == ';'
 				    ? statePreAttrName : statePreName);
@@ -172,11 +172,11 @@
 
 			break;
 		case stateAttrValue:
 			if (characters[i] == ';' || characters[i] == ',') {
 				value = [string substringWithRange:
-				    OFRangeMake(last, i - last)];
+				    OFMakeRange(last, i - last)];
 
 				/*
 				 * Expires often contains a comma, even though
 				 * the comma is used as a separator for
 				 * concatenating headers as per RFC 2616,
@@ -213,11 +213,11 @@
 	case stateQuotedValue:
 		@throw [OFInvalidFormatException exception];
 		break;
 	case stateValue:
 		value = [string substringWithRange:
-		    OFRangeMake(last, length - last)];
+		    OFMakeRange(last, length - last)];
 		[ret addObject: [OFHTTPCookie cookieWithName: name
 						       value: value
 						      domain: domain]];
 		break;
 	/* We end up here if the cookie is just foo= */
@@ -227,18 +227,18 @@
 						      domain: domain]];
 		break;
 	case stateAttrName:
 		if (last != length) {
 			name = [string substringWithRange:
-			    OFRangeMake(last, length - last)];
+			    OFMakeRange(last, length - last)];
 
 			handleAttribute(ret.lastObject, name, nil);
 		}
 		break;
 	case stateAttrValue:
 		value = [string substringWithRange:
-		    OFRangeMake(last, length - last)];
+		    OFMakeRange(last, length - last)];
 
 		handleAttribute(ret.lastObject, name, value);
 
 		break;
 	}
@@ -369,12 +369,12 @@
 	OFHashAddHash(&hash, _name.hash);
 	OFHashAddHash(&hash, _value.hash);
 	OFHashAddHash(&hash, _domain.hash);
 	OFHashAddHash(&hash, _path.hash);
 	OFHashAddHash(&hash, _expires.hash);
-	OFHashAdd(&hash, _secure);
-	OFHashAdd(&hash, _HTTPOnly);
+	OFHashAddByte(&hash, _secure);
+	OFHashAddByte(&hash, _HTTPOnly);
 	OFHashAddHash(&hash, _extensions.hash);
 	OFHashFinalize(&hash);
 
 	return hash;
 }