@@ -27,18 +27,18 @@
 	void *pool = objc_autoreleasePoolPush();
 	OFHTTPCookieManager *manager = [OFHTTPCookieManager manager];
 	OFURL *URL[4];
 	OFHTTPCookie *cookie[5];
 
-	URL[0] = [OFURL URLWithString: @"http://heap.zone/foo"];
-	URL[1] = [OFURL URLWithString: @"https://heap.zone/foo/bar"];
-	URL[2] = [OFURL URLWithString: @"https://test.heap.zone/foo/bar"];
+	URL[0] = [OFURL URLWithString: @"http://nil.im/foo"];
+	URL[1] = [OFURL URLWithString: @"https://nil.im/foo/bar"];
+	URL[2] = [OFURL URLWithString: @"https://test.nil.im/foo/bar"];
 	URL[3] = [OFURL URLWithString: @"http://webkeks.org/foo/bar"];
 
 	cookie[0] = [OFHTTPCookie cookieWithName: @"test"
 					   value: @"1"
-					  domain: @"heap.zone"];
+					  domain: @"nil.im"];
 	TEST(@"-[addCookie:forURL:] #1", R([manager addCookie: cookie[0]
 						       forURL: URL[0]]))
 
 	TEST(@"-[cookiesForURL:] #1",
 	    [[manager cookiesForURL: URL[0]] isEqual:
@@ -55,11 +55,11 @@
 	    [OFArray arrayWithObject: cookie[0]]] &&
 	    [[manager cookiesForURL: URL[3]] isEqual: [OFArray array]])
 
 	cookie[2] = [OFHTTPCookie cookieWithName: @"test"
 					   value: @"3"
-					  domain: @"heap.zone"];
+					  domain: @"nil.im"];
 	cookie[2].secure = true;
 	TEST(@"-[addCookie:forURL:] #3", R([manager addCookie: cookie[2]
 						       forURL: URL[1]]))
 
 	TEST(@"-[cookiesForURL:] #3",
@@ -68,12 +68,12 @@
 	    [[manager cookiesForURL: URL[0]] isEqual: [OFArray array]])
 
 	cookie[2].expires = [OFDate dateWithTimeIntervalSinceNow: -1];
 	cookie[3] = [OFHTTPCookie cookieWithName: @"test"
 					   value: @"4"
-					  domain: @"heap.zone"];
-	cookie[3].domain = @".heap.zone";
+					  domain: @"nil.im"];
+	cookie[3].domain = @".nil.im";
 	TEST(@"-[addCookie:forURL:] #4", R([manager addCookie: cookie[3]
 						       forURL: URL[1]]))
 
 	TEST(@"-[cookiesForURL:] #4",
 	    [[manager cookiesForURL: URL[1]] isEqual:
@@ -81,11 +81,11 @@
 	    [[manager cookiesForURL: URL[2]] isEqual:
 	    [OFArray arrayWithObject: cookie[3]]])
 
 	cookie[4] = [OFHTTPCookie cookieWithName: @"bar"
 					   value: @"5"
-					  domain: @"test.heap.zone"];
+					  domain: @"test.nil.im"];
 	TEST(@"-[addCookie:forURL:] #5", R([manager addCookie: cookie[4]
 						       forURL: URL[0]]))
 
 	TEST(@"-[cookiesForURL:] #5",
 	    [[manager cookiesForURL: URL[0]] isEqual: