@@ -448,11 +448,11 @@
 - (void)replaceCharactersInRange: (of_range_t)range
 		      withString: (OFString*)replacement
 {
 	[self deleteCharactersInRange: range];
 	[self insertString: replacement
-		   atIndex: range.start];
+		   atIndex: range.location];
 }
 
 - (void)replaceOccurrencesOfString: (OFString*)string
 			withString: (OFString*)replacement
 {
@@ -470,11 +470,11 @@
 	const of_unichar_t *searchString = [string unicodeString];
 	size_t searchLength = [string length];
 	size_t replacementLength = [replacement length];
 	size_t i;
 
-	if (range.start + range.length > [self length])
+	if (range.location + range.length > [self length])
 		@throw [OFOutOfRangeException exceptionWithClass: [self class]];
 
 	if (searchLength > range.length) {
 		objc_autoreleasePoolPop(pool);
 		return;
@@ -481,11 +481,11 @@
 	}
 
 	pool2 = objc_autoreleasePoolPush();
 	unicodeString = [self unicodeString];
 
-	for (i = range.start; i <= range.length - searchLength; i++) {
+	for (i = range.location; i <= range.length - searchLength; i++) {
 		if (memcmp(unicodeString + i, searchString,
 		    searchLength * sizeof(of_unichar_t)))
 			continue;
 
 		[self replaceCharactersInRange: of_range(i, searchLength)