@@ -355,12 +355,12 @@
 	TEST(@"+[stringWithContentsOfFile:encoding]", (string = [stringClass
 	    stringWithContentsOfFile: @"testfile.txt"
 			    encoding: OFStringEncodingISO8859_1]) &&
 	    [string isEqual: @"testäöü"])
 
-	TEST(@"+[stringWithContentsOfURL:encoding]", (string = [stringClass
-	    stringWithContentsOfURL: [OFURL fileURLWithPath: @"testfile.txt"]
+	TEST(@"+[stringWithContentsOfURI:encoding]", (string = [stringClass
+	    stringWithContentsOfURI: [OFURI fileURIWithPath: @"testfile.txt"]
 			   encoding: OFStringEncodingISO8859_1]) &&
 	    [string isEqual: @"testäöü"])
 #endif
 
 	TEST(@"-[appendUTFString:length:]",
@@ -1269,30 +1269,33 @@
 		     @"412a9247c3579a329e53a5dc74676b106755e3394f9454a2d4227324"
 		     @"2615d32f80437d61"])
 
 	characterSet =
 	    [OFCharacterSet characterSetWithCharactersInString: @"abfo'_~$🍏"];
-	TEST(@"-[stringByURLEncodingWithAllowedCharacters:]",
-	    [[C(@"foo\"ba'_~$]🍏🍌") stringByURLEncodingWithAllowedCharacters:
-	    characterSet] isEqual: @"foo%22ba'_~$%5D🍏%F0%9F%8D%8C"])
+	TEST(@"-[stringByAddingPercentEncodingWithAllowedCharacters:]",
+	    [[C(@"foo\"ba'_~$]🍏🍌")
+	    stringByAddingPercentEncodingWithAllowedCharacters: characterSet]
+	    isEqual: @"foo%22ba'_~$%5D🍏%F0%9F%8D%8C"])
 
-	TEST(@"-[stringByURLDecoding]",
-	    [C(@"foo%20bar%22+%24%F0%9F%8D%8C").stringByURLDecoding
+	TEST(@"-[stringByRemovingPercentEncoding]",
+	    [C(@"foo%20bar%22+%24%F0%9F%8D%8C").stringByRemovingPercentEncoding
 	    isEqual: @"foo bar\"+$🍌"])
 
 	TEST(@"-[insertString:atIndex:]",
 	    (mutableString1 = [mutableStringClass
 	    stringWithString: @"𝄞öööbä€"]) &&
 	    R([mutableString1 insertString: @"äöü" atIndex: 3]) &&
 	    [mutableString1 isEqual: @"𝄞ööäöüöbä€"])
 
-	EXPECT_EXCEPTION(@"Detect invalid format in -[stringByURLDecoding] "
-	    @"#1", OFInvalidFormatException,
-	    [C(@"foo%xbar") stringByURLDecoding])
-	EXPECT_EXCEPTION(@"Detect invalid encoding in -[stringByURLDecoding] "
-	    @"#2", OFInvalidEncodingException,
-	    [C(@"foo%FFbar") stringByURLDecoding])
+	EXPECT_EXCEPTION(@"Detect invalid format in "
+	    @"-[stringByRemovingPercentEncoding] #1",
+	    OFInvalidFormatException,
+	    [C(@"foo%xbar") stringByRemovingPercentEncoding])
+	EXPECT_EXCEPTION(@"Detect invalid encoding in "
+	    @"-[stringByRemovingPercentEncoding] #2",
+	    OFInvalidEncodingException,
+	    [C(@"foo%FFbar") stringByRemovingPercentEncoding])
 
 	TEST(@"-[setCharacter:atIndex:]",
 	    (mutableString1 = [mutableStringClass
 	    stringWithString: @"abäde"]) &&
 	    R([mutableString1 setCharacter: 0xF6 atIndex: 2]) &&