@@ -32,11 +32,11 @@
 
 static struct {
 	Class isa;
 } placeholder;
 
-static OFCharacterSet *URIQueryPartAllowedCharacterSet = nil;
+static OFCharacterSet *IRIQueryPartAllowedCharacterSet = nil;
 
 @interface OFDictionary ()
 - (OFString *)
     of_JSONRepresentationWithOptions: (OFJSONRepresentationOptions)options
 			       depth: (size_t)depth;
@@ -54,12 +54,12 @@
 
 - (instancetype)initWithDictionary: (OFDictionary *)dictionary;
 @end
 
 OF_DIRECT_MEMBERS
-@interface OFURIQueryPartAllowedCharacterSet: OFCharacterSet
-+ (OFCharacterSet *)URIQueryPartAllowedCharacterSet;
+@interface OFIRIQueryPartAllowedCharacterSet: OFCharacterSet
++ (OFCharacterSet *)IRIQueryPartAllowedCharacterSet;
 @end
 
 @implementation OFDictionaryPlaceholder
 - (instancetype)init
 {
@@ -137,23 +137,23 @@
 {
 	OF_DEALLOC_UNSUPPORTED
 }
 @end
 
-@implementation OFURIQueryPartAllowedCharacterSet
+@implementation OFIRIQueryPartAllowedCharacterSet
 + (void)initialize
 {
-	if (self != [OFURIQueryPartAllowedCharacterSet class])
+	if (self != [OFIRIQueryPartAllowedCharacterSet class])
 		return;
 
-	URIQueryPartAllowedCharacterSet =
-	    [[OFURIQueryPartAllowedCharacterSet alloc] init];
+	IRIQueryPartAllowedCharacterSet =
+	    [[OFIRIQueryPartAllowedCharacterSet alloc] init];
 }
 
-+ (OFCharacterSet *)URIQueryPartAllowedCharacterSet
++ (OFCharacterSet *)IRIQueryPartAllowedCharacterSet
 {
-	return URIQueryPartAllowedCharacterSet;
+	return IRIQueryPartAllowedCharacterSet;
 }
 
 - (instancetype)autorelease
 {
 	return self;