@@ -172,20 +172,20 @@
 	    initWithContentsOfFile: path
 			  encoding: encoding];
 }
 #endif
 
-- (instancetype)initWithContentsOfURL: (OFURL *)URL
+- (instancetype)initWithContentsOfURI: (OFURI *)URI
 {
-	return (id)[[OFMutableUTF8String alloc] initWithContentsOfURL: URL];
+	return (id)[[OFMutableUTF8String alloc] initWithContentsOfURI: URI];
 }
 
-- (instancetype)initWithContentsOfURL: (OFURL *)URL
+- (instancetype)initWithContentsOfURI: (OFURI *)URI
 			     encoding: (OFStringEncoding)encoding
 {
 	return (id)[[OFMutableUTF8String alloc]
-	    initWithContentsOfURL: URL
+	    initWithContentsOfURI: URI
 			 encoding: encoding];
 }
 
 - (instancetype)initWithSerialization: (OFXMLElement *)element
 {
@@ -287,11 +287,11 @@
 - (void)setCharacter: (OFUnichar)character atIndex: (size_t)idx
 {
 	void *pool = objc_autoreleasePoolPush();
 	OFString *string =
 	    [OFString stringWithCharacters: &character length: 1];
-	[self replaceCharactersInRange: OFRangeMake(idx, 1) withString: string];
+	[self replaceCharactersInRange: OFMakeRange(idx, 1) withString: string];
 	objc_autoreleasePoolPop(pool);
 }
 
 - (void)appendString: (OFString *)string
 {
@@ -370,26 +370,10 @@
 	} @finally {
 		free(UTF8String);
 	}
 }
 
-- (void)prependString: (OFString *)string
-{
-	[self insertString: string atIndex: 0];
-}
-
-- (void)reverse
-{
-	size_t i, j, length = self.length;
-
-	for (i = 0, j = length - 1; i < length / 2; i++, j--) {
-		OFUnichar tmp = [self characterAtIndex: j];
-		[self setCharacter: [self characterAtIndex: i] atIndex: j];
-		[self setCharacter: tmp atIndex: i];
-	}
-}
-
 #ifdef OF_HAVE_UNICODE_TABLES
 - (void)uppercase
 {
 	[self of_convertWithWordStartTable: OFUnicodeUppercaseTable
 			   wordMiddleTable: OFUnicodeUppercaseTable
@@ -429,11 +413,11 @@
 }
 #endif
 
 - (void)insertString: (OFString *)string atIndex: (size_t)idx
 {
-	[self replaceCharactersInRange: OFRangeMake(idx, 0) withString: string];
+	[self replaceCharactersInRange: OFMakeRange(idx, 0) withString: string];
 }
 
 - (void)deleteCharactersInRange: (OFRange)range
 {
 	[self replaceCharactersInRange: range withString: @""];
@@ -449,11 +433,11 @@
 			withString: (OFString *)replacement
 {
 	[self replaceOccurrencesOfString: string
 			      withString: replacement
 				 options: 0
-				   range: OFRangeMake(0, self.length)];
+				   range: OFMakeRange(0, self.length)];
 }
 
 - (void)replaceOccurrencesOfString: (OFString *)string
 			withString: (OFString *)replacement
 			   options: (int)options
@@ -483,11 +467,11 @@
 	for (size_t i = range.location; i <= range.length - searchLength; i++) {
 		if (memcmp(characters + i, searchCharacters,
 		    searchLength * sizeof(OFUnichar)) != 0)
 			continue;
 
-		[self replaceCharactersInRange: OFRangeMake(i, searchLength)
+		[self replaceCharactersInRange: OFMakeRange(i, searchLength)
 				    withString: replacement];
 
 		range.length -= searchLength;
 		range.length += replacementLength;
 
@@ -515,11 +499,11 @@
 			break;
 	}
 
 	objc_autoreleasePoolPop(pool);
 
-	[self deleteCharactersInRange: OFRangeMake(0, i)];
+	[self deleteCharactersInRange: OFMakeRange(0, i)];
 }
 
 - (void)deleteTrailingWhitespaces
 {
 	void *pool;
@@ -542,11 +526,11 @@
 		d++;
 	}
 
 	objc_autoreleasePoolPop(pool);
 
-	[self deleteCharactersInRange: OFRangeMake(length - d, d)];
+	[self deleteCharactersInRange: OFMakeRange(length - d, d)];
 }
 
 - (void)deleteEnclosingWhitespaces
 {
 	[self deleteLeadingWhitespaces];