Index: src/OFURLEncoding.h
==================================================================
--- src/OFURLEncoding.h
+++ src/OFURLEncoding.h
@@ -21,14 +21,14 @@
 /**
  * Encodes a string for use in a URL.
  *
  * \return A new, autoreleased string
  */
-- (OFString*)urlEncodedString;
+- (OFString*)stringByURLEncoding;
 
 /**
  * Decodes a string used in a URL.
  *
  * \return A new, autoreleased string
  */
-- (OFString*)urlDecodedString;
+- (OFString*)stringByURLDecoding;
 @end

Index: src/OFURLEncoding.m
==================================================================
--- src/OFURLEncoding.m
+++ src/OFURLEncoding.m
@@ -21,11 +21,11 @@
 
 /* Reference for static linking */
 int _OFURLEncoding_reference;
 
 @implementation OFString (OFURLEncoding)
-- (OFString*)urlEncodedString
+- (OFString*)stringByURLEncoding
 {
 	const char *s;
 	char *ret_c;
 	size_t i;
 	OFString *ret;
@@ -61,11 +61,11 @@
 	}
 
 	return ret;
 }
 
-- (OFString*)urlDecodedString
+- (OFString*)stringByURLDecoding
 {
 	const char *s;
 	char *ret_c, c;
 	size_t i;
 	int st;

Index: tests/OFString/OFString.m
==================================================================
--- tests/OFString/OFString.m
+++ tests/OFString/OFString.m
@@ -107,14 +107,15 @@
 	CHECK([[a objectAtIndex: j++] isEqual: @""])
 	CHECK([[a objectAtIndex: j++] isEqual: @"baz"])
 	CHECK([[a objectAtIndex: j++] isEqual: @""])
 	CHECK([[a objectAtIndex: j++] isEqual: @""])
 
-	CHECK([[@"foo\"ba'_$" urlEncodedString] isEqual: @"foo%22ba%27_%24"])
-	CHECK([[@"foo%20bar%22%24" urlDecodedString] isEqual: @"foo bar\"$"])
-	CHECK_EXCEPT([@"foo%bar" urlDecodedString], OFInvalidEncodingException)
-	CHECK_EXCEPT([@"foo%FFbar" urlDecodedString],
+	CHECK([[@"foo\"ba'_$" stringByURLEncoding] isEqual: @"foo%22ba%27_%24"])
+	CHECK([[@"foo%20bar%22%24" stringByURLDecoding] isEqual: @"foo bar\"$"])
+	CHECK_EXCEPT([@"foo%bar" stringByURLDecoding],
+	    OFInvalidEncodingException)
+	CHECK_EXCEPT([@"foo%FFbar" stringByURLDecoding],
 	    OFInvalidEncodingException)
 
 	s1 = [@"asd fo asd fofo asd" mutableCopy];
 	[s1 replaceOccurrencesOfString: @"fo"
 			    withString: @"foo"];