@@ -1029,11 +1029,11 @@
 {
 	/* TODO: Could be slightly optimized */
 	void *pool = objc_autoreleasePoolPush();
 	const of_unichar_t *unicodeString = [self unicodeString];
 
-	memcpy(buffer, unicodeString + range.start,
+	memcpy(buffer, unicodeString + range.location,
 	    range.length * sizeof(of_unichar_t));
 
 	objc_autoreleasePoolPop(pool);
 }
 
@@ -1045,16 +1045,16 @@
 	size_t i, cStringLength = [string UTF8StringLength];
 	size_t rangeStart, rangeLength;
 
 	if (s->isUTF8) {
 		rangeStart = of_string_utf8_get_position(
-		    s->cString, range.start, s->cStringLength);
+		    s->cString, range.location, s->cStringLength);
 		rangeLength = of_string_utf8_get_position(
 		    s->cString + rangeStart, range.length,
 		    s->cStringLength - rangeStart);
 	} else {
-		rangeStart = range.start;
+		rangeStart = range.location;
 		rangeLength = range.length;
 	}
 
 	if (cStringLength == 0)
 		return of_range(0, 0);
@@ -1065,11 +1065,11 @@
 
 	if (options & OF_STRING_SEARCH_BACKWARDS) {
 		for (i = rangeLength - cStringLength;; i--) {
 			if (!memcmp(s->cString + rangeStart + i, cString,
 			    cStringLength)) {
-				range.start += of_string_utf8_get_index(
+				range.location += of_string_utf8_get_index(
 				    s->cString + rangeStart, i);
 				range.length = [string length];
 
 				return range;
 			}
@@ -1080,11 +1080,11 @@
 		}
 	} else {
 		for (i = 0; i <= rangeLength - cStringLength; i++) {
 			if (!memcmp(s->cString + rangeStart + i, cString,
 			    cStringLength)) {
-				range.start += of_string_utf8_get_index(
+				range.location += of_string_utf8_get_index(
 				    s->cString + rangeStart, i);
 				range.length = [string length];
 
 				return range;
 			}
@@ -1112,12 +1112,12 @@
 	return NO;
 }
 
 - (OFString*)substringWithRange: (of_range_t)range
 {
-	size_t start = range.start;
-	size_t end = range.start + range.length;
+	size_t start = range.location;
+	size_t end = range.location + range.length;
 
 	if (end > s->length)
 		@throw [OFOutOfRangeException exceptionWithClass: [self class]];
 
 	if (s->isUTF8) {