@@ -173,11 +173,11 @@
 parseNetStackArray(OFString *string)
 {
 	if (![string hasPrefix: @"["] || ![string hasSuffix: @"]"])
 		return nil;
 
-	string = [string substringWithRange: of_range(1, string.length - 2)];
+	string = [string substringWithRange: OFMakeRange(1, string.length - 2)];
 
 	return [string componentsSeparatedByString: @"|"];
 }
 #endif
 
@@ -277,11 +277,11 @@
 		if (components.count < 2)
 			continue;
 
 		address = components.firstObject;
 		hosts = [components objectsInRange:
-		    of_range(1, components.count - 1)];
+		    OFMakeRange(1, components.count - 1)];
 
 		for (OFString *host in hosts) {
 			OFMutableArray *addresses =
 			    [staticHosts objectForKey: host];
 
@@ -380,11 +380,11 @@
 			continue;
 		}
 
 		option = components.firstObject;
 		arguments = [components objectsInRange:
-		    of_range(1, components.count - 1)];
+		    OFMakeRange(1, components.count - 1)];
 
 		if ([option isEqual: @"nameserver"]) {
 			if (arguments.count != 1) {
 				objc_autoreleasePoolPop(pool2);
 				continue;
@@ -479,11 +479,11 @@
 		if (components.count < 2)
 			continue;
 
 		address = components.firstObject;
 		hosts = [components objectsInRange:
-		    of_range(1, components.count - 1)];
+		    OFMakeRange(1, components.count - 1)];
 
 		for (OFString *host in hosts) {
 			OFMutableArray *addresses =
 			    [staticHosts objectForKey: host];