@@ -963,11 +963,11 @@
 		@throw [OFInvalidEncodingException exception];
 
 	return character;
 }
 
-- (void)getCharacters: (of_unichar_t *)buffer inRange: (of_range_t)range
+- (void)getCharacters: (of_unichar_t *)buffer inRange: (OFRange)range
 {
 	/* TODO: Could be slightly optimized */
 	void *pool = objc_autoreleasePoolPush();
 	const of_unichar_t *characters = self.characters;
 
@@ -979,13 +979,13 @@
 	    range.length * sizeof(of_unichar_t));
 
 	objc_autoreleasePoolPop(pool);
 }
 
-- (of_range_t)rangeOfString: (OFString *)string
-		    options: (int)options
-		      range: (of_range_t)range
+- (OFRange)rangeOfString: (OFString *)string
+		 options: (int)options
+		   range: (OFRange)range
 {
 	const char *cString = string.UTF8String;
 	size_t cStringLength = string.UTF8StringLength;
 	size_t rangeLocation, rangeLength;
 
@@ -1003,14 +1003,14 @@
 		rangeLocation = range.location;
 		rangeLength = range.length;
 	}
 
 	if (cStringLength == 0)
-		return of_range(0, 0);
+		return OFMakeRange(0, 0);
 
 	if (cStringLength > rangeLength)
-		return of_range(OF_NOT_FOUND, 0);
+		return OFMakeRange(OF_NOT_FOUND, 0);
 
 	if (options & OF_STRING_SEARCH_BACKWARDS) {
 		for (size_t i = rangeLength - cStringLength;; i--) {
 			if (memcmp(_s->cString + rangeLocation + i, cString,
 			    cStringLength) == 0) {
@@ -1021,11 +1021,11 @@
 				return range;
 			}
 
 			/* Did not match and we're at the last char */
 			if (i == 0)
-				return of_range(OF_NOT_FOUND, 0);
+				return OFMakeRange(OF_NOT_FOUND, 0);
 		}
 	} else {
 		for (size_t i = 0; i <= rangeLength - cStringLength; i++) {
 			if (memcmp(_s->cString + rangeLocation + i, cString,
 			    cStringLength) == 0) {
@@ -1036,11 +1036,11 @@
 				return range;
 			}
 		}
 	}
 
-	return of_range(OF_NOT_FOUND, 0);
+	return OFMakeRange(OF_NOT_FOUND, 0);
 }
 
 - (bool)containsString: (OFString *)string
 {
 	const char *cString = string.UTF8String;
@@ -1057,11 +1057,11 @@
 			return true;
 
 	return false;
 }
 
-- (OFString *)substringWithRange: (of_range_t)range
+- (OFString *)substringWithRange: (OFRange)range
 {
 	size_t start = range.location;
 	size_t end = range.location + range.length;
 
 	if (range.length > SIZE_MAX - range.location || end > _s->length)