@@ -105,11 +105,11 @@
 
 - (instancetype)initWithCharacterSet: (OFCharacterSet *)characterSet;
 @end
 
 bool
-of_url_is_ipv6_host(OFString *host)
+OFURLIsIPv6Host(OFString *host)
 {
 	const char *UTF8String = host.UTF8String;
 	bool hasColon = false;
 
 	while (*UTF8String != '\0') {
@@ -321,11 +321,11 @@
 	    @selector(characterIsMember:), character));
 }
 @end
 
 void
-of_url_verify_escaped(OFString *string, OFCharacterSet *characterSet)
+OFURLVerifyEscaped(OFString *string, OFCharacterSet *characterSet)
 {
 	void *pool = objc_autoreleasePoolPush();
 
 	characterSet = [[[OFInvertedCharacterSetWithoutPercent alloc]
 	    initWithCharacterSet: characterSet] autorelease];
@@ -460,11 +460,11 @@
 
 		_URLEncodedScheme = [[OFString alloc]
 		    initWithUTF8String: UTF8String
 				length: tmp - UTF8String];
 
-		of_url_verify_escaped(_URLEncodedScheme,
+		OFURLVerifyEscaped(_URLEncodedScheme,
 		    [OFCharacterSet URLSchemeAllowedCharacterSet]);
 
 		UTF8String = tmp + 3;
 
 		if ((tmp = strchr(UTF8String, '/')) != NULL) {
@@ -485,18 +485,18 @@
 				_URLEncodedUser = [[OFString alloc]
 				    initWithUTF8String: UTF8String];
 				_URLEncodedPassword = [[OFString alloc]
 				    initWithUTF8String: tmp3];
 
-				of_url_verify_escaped(_URLEncodedPassword,
+				OFURLVerifyEscaped(_URLEncodedPassword,
 				    [OFCharacterSet
 				    URLPasswordAllowedCharacterSet]);
 			} else
 				_URLEncodedUser = [[OFString alloc]
 				    initWithUTF8String: UTF8String];
 
-			of_url_verify_escaped(_URLEncodedUser,
+			OFURLVerifyEscaped(_URLEncodedUser,
 			    [OFCharacterSet URLUserAllowedCharacterSet]);
 
 			UTF8String = tmp2;
 		}
 
@@ -565,21 +565,21 @@
 		} else
 			_URLEncodedHost = [[OFString alloc]
 			    initWithUTF8String: UTF8String];
 
 		if (!isIPv6Host)
-			of_url_verify_escaped(_URLEncodedHost,
+			OFURLVerifyEscaped(_URLEncodedHost,
 			    [OFCharacterSet URLHostAllowedCharacterSet]);
 
 		if ((UTF8String = tmp) != NULL) {
 			if ((tmp = strchr(UTF8String, '#')) != NULL) {
 				*tmp = '\0';
 
 				_URLEncodedFragment = [[OFString alloc]
 				    initWithUTF8String: tmp + 1];
 
-				of_url_verify_escaped(_URLEncodedFragment,
+				OFURLVerifyEscaped(_URLEncodedFragment,
 				    [OFCharacterSet
 				    URLFragmentAllowedCharacterSet]);
 			}
 
 			if ((tmp = strchr(UTF8String, '?')) != NULL) {
@@ -586,11 +586,11 @@
 				*tmp = '\0';
 
 				_URLEncodedQuery = [[OFString alloc]
 				    initWithUTF8String: tmp + 1];
 
-				of_url_verify_escaped(_URLEncodedQuery,
+				OFURLVerifyEscaped(_URLEncodedQuery,
 				    [OFCharacterSet
 				    URLQueryAllowedCharacterSet]);
 			}
 
 			UTF8String--;
@@ -597,11 +597,11 @@
 			*UTF8String = '/';
 
 			_URLEncodedPath = [[OFString alloc]
 			    initWithUTF8String: UTF8String];
 
-			of_url_verify_escaped(_URLEncodedPath,
+			OFURLVerifyEscaped(_URLEncodedPath,
 			    [OFCharacterSet URLPathAllowedCharacterSet]);
 		}
 
 		objc_autoreleasePoolPop(pool);
 	} @catch (id e) {
@@ -643,20 +643,20 @@
 		if ((tmp = strchr(UTF8String, '#')) != NULL) {
 			*tmp = '\0';
 			_URLEncodedFragment = [[OFString alloc]
 			    initWithUTF8String: tmp + 1];
 
-			of_url_verify_escaped(_URLEncodedFragment,
+			OFURLVerifyEscaped(_URLEncodedFragment,
 			    [OFCharacterSet URLFragmentAllowedCharacterSet]);
 		}
 
 		if ((tmp = strchr(UTF8String, '?')) != NULL) {
 			*tmp = '\0';
 			_URLEncodedQuery = [[OFString alloc]
 			    initWithUTF8String: tmp + 1];
 
-			of_url_verify_escaped(_URLEncodedQuery,
+			OFURLVerifyEscaped(_URLEncodedQuery,
 			    [OFCharacterSet URLQueryAllowedCharacterSet]);
 		}
 
 		if (*UTF8String == '/')
 			_URLEncodedPath = [[OFString alloc]
@@ -692,11 +692,11 @@
 
 				_URLEncodedPath = [path copy];
 			}
 		}
 
-		of_url_verify_escaped(_URLEncodedPath,
+		OFURLVerifyEscaped(_URLEncodedPath,
 		    [OFCharacterSet URLPathAllowedCharacterSet]);
 
 		objc_autoreleasePoolPop(pool);
 	} @catch (id e) {
 		[self release];
@@ -878,11 +878,11 @@
 	if ([_URLEncodedHost hasPrefix: @"["] &&
 	    [_URLEncodedHost hasSuffix: @"]"]) {
 		OFString *host = [_URLEncodedHost substringWithRange:
 		    OFRangeMake(1, _URLEncodedHost.length - 2)];
 
-		if (!of_url_is_ipv6_host(host))
+		if (!OFURLIsIPv6Host(host))
 			@throw [OFInvalidArgumentException exception];
 
 		return host;
 	}