@@ -53,11 +53,11 @@
 - (void)setURLEncodedScheme: (OFString *)URLEncodedScheme
 {
 	OFString *old;
 
 	if (URLEncodedScheme != nil)
-		OFURLVerifyEscaped(URLEncodedScheme,
+		OFURLVerifyIsEscaped(URLEncodedScheme,
 		    [OFCharacterSet URLSchemeAllowedCharacterSet]);
 
 	old = _URLEncodedScheme;
 	_URLEncodedScheme = [URLEncodedScheme copy];
 	[old release];
@@ -89,11 +89,11 @@
 	    [URLEncodedHost hasSuffix: @"]"]) {
 		if (!OFURLIsIPv6Host([URLEncodedHost substringWithRange:
 		    OFRangeMake(1, URLEncodedHost.length - 2)]))
 			@throw [OFInvalidFormatException exception];
 	} else if (URLEncodedHost != nil)
-		OFURLVerifyEscaped(URLEncodedHost,
+		OFURLVerifyIsEscaped(URLEncodedHost,
 		    [OFCharacterSet URLHostAllowedCharacterSet]);
 
 	old = _URLEncodedHost;
 	_URLEncodedHost = [URLEncodedHost copy];
 	[old release];
@@ -122,11 +122,11 @@
 - (void)setURLEncodedUser: (OFString *)URLEncodedUser
 {
 	OFString *old;
 
 	if (URLEncodedUser != nil)
-		OFURLVerifyEscaped(URLEncodedUser,
+		OFURLVerifyIsEscaped(URLEncodedUser,
 		    [OFCharacterSet URLUserAllowedCharacterSet]);
 
 	old = _URLEncodedUser;
 	_URLEncodedUser = [URLEncodedUser copy];
 	[old release];
@@ -149,11 +149,11 @@
 - (void)setURLEncodedPassword: (OFString *)URLEncodedPassword
 {
 	OFString *old;
 
 	if (URLEncodedPassword != nil)
-		OFURLVerifyEscaped(URLEncodedPassword,
+		OFURLVerifyIsEscaped(URLEncodedPassword,
 		    [OFCharacterSet URLPasswordAllowedCharacterSet]);
 
 	old = _URLEncodedPassword;
 	_URLEncodedPassword = [URLEncodedPassword copy];
 	[old release];
@@ -175,11 +175,11 @@
 - (void)setURLEncodedPath: (OFString *)URLEncodedPath
 {
 	OFString *old;
 
 	if (URLEncodedPath != nil)
-		OFURLVerifyEscaped(URLEncodedPath,
+		OFURLVerifyIsEscaped(URLEncodedPath,
 		    [OFCharacterSet URLPathAllowedCharacterSet]);
 
 	old = _URLEncodedPath;
 	_URLEncodedPath = [URLEncodedPath copy];
 	[old release];
@@ -221,11 +221,11 @@
 - (void)setURLEncodedQuery: (OFString *)URLEncodedQuery
 {
 	OFString *old;
 
 	if (URLEncodedQuery != nil)
-		OFURLVerifyEscaped(URLEncodedQuery,
+		OFURLVerifyIsEscaped(URLEncodedQuery,
 		    [OFCharacterSet URLQueryAllowedCharacterSet]);
 
 	old = _URLEncodedQuery;
 	_URLEncodedQuery = [URLEncodedQuery copy];
 	[old release];
@@ -289,11 +289,11 @@
 - (void)setURLEncodedFragment: (OFString *)URLEncodedFragment
 {
 	OFString *old;
 
 	if (URLEncodedFragment != nil)
-		OFURLVerifyEscaped(URLEncodedFragment,
+		OFURLVerifyIsEscaped(URLEncodedFragment,
 		    [OFCharacterSet URLFragmentAllowedCharacterSet]);
 
 	old = _URLEncodedFragment;
 	_URLEncodedFragment = [URLEncodedFragment copy];
 	[old release];