@@ -19,21 +19,21 @@
 
 #import "OFINIFile.h"
 #import "OFArray.h"
 #import "OFINICategory+Private.h"
 #import "OFINICategory.h"
+#import "OFIRI.h"
+#import "OFIRIHandler.h"
 #import "OFStream.h"
 #import "OFString.h"
-#import "OFURI.h"
-#import "OFURIHandler.h"
 
 #import "OFInvalidFormatException.h"
 #import "OFOpenItemFailedException.h"
 
 OF_DIRECT_MEMBERS
 @interface OFINIFile ()
-- (void)of_parseURI: (OFURI *)URI encoding: (OFStringEncoding)encoding;
+- (void)of_parseIRI: (OFIRI *)IRI encoding: (OFStringEncoding)encoding;
 @end
 
 static bool
 isWhitespaceLine(OFString *line)
 {
@@ -48,38 +48,38 @@
 }
 
 @implementation OFINIFile
 @synthesize categories = _categories;
 
-+ (instancetype)fileWithURI: (OFURI *)URI
++ (instancetype)fileWithIRI: (OFIRI *)IRI
 {
-	return [[[self alloc] initWithURI: URI] autorelease];
+	return [[[self alloc] initWithIRI: IRI] autorelease];
 }
 
-+ (instancetype)fileWithURI: (OFURI *)URI encoding: (OFStringEncoding)encoding
++ (instancetype)fileWithIRI: (OFIRI *)IRI encoding: (OFStringEncoding)encoding
 {
-	return [[[self alloc] initWithURI: URI encoding: encoding] autorelease];
+	return [[[self alloc] initWithIRI: IRI encoding: encoding] autorelease];
 }
 
 - (instancetype)init
 {
 	OF_INVALID_INIT_METHOD
 }
 
-- (instancetype)initWithURI: (OFURI *)URI
+- (instancetype)initWithIRI: (OFIRI *)IRI
 {
-	return [self initWithURI: URI encoding: OFStringEncodingAutodetect];
+	return [self initWithIRI: IRI encoding: OFStringEncodingAutodetect];
 }
 
-- (instancetype)initWithURI: (OFURI *)URI encoding: (OFStringEncoding)encoding
+- (instancetype)initWithIRI: (OFIRI *)IRI encoding: (OFStringEncoding)encoding
 {
 	self = [super init];
 
 	@try {
 		_categories = [[OFMutableArray alloc] init];
 
-		[self of_parseURI: URI encoding: encoding];
+		[self of_parseIRI: IRI encoding: encoding];
 	} @catch (id e) {
 		[self release];
 		@throw e;
 	}
 
@@ -108,11 +108,11 @@
 	objc_autoreleasePoolPop(pool);
 
 	return category;
 }
 
-- (void)of_parseURI: (OFURI *)URI encoding: (OFStringEncoding)encoding
+- (void)of_parseIRI: (OFIRI *)IRI encoding: (OFStringEncoding)encoding
 {
 	void *pool = objc_autoreleasePoolPush();
 	OFStream *file;
 	OFINICategory *category = nil;
 	OFString *line;
@@ -119,11 +119,11 @@
 
 	if (encoding == OFStringEncodingAutodetect)
 		encoding = OFStringEncodingUTF8;
 
 	@try {
-		file = [OFURIHandler openItemAtURI: URI mode: @"r"];
+		file = [OFIRIHandler openItemAtIRI: IRI mode: @"r"];
 	} @catch (OFOpenItemFailedException *e) {
 		/* Handle missing file like an empty file */
 		if (e.errNo == ENOENT)
 			return;
 
@@ -154,19 +154,19 @@
 	}
 
 	objc_autoreleasePoolPop(pool);
 }
 
-- (void)writeToURI: (OFURI *)URI
+- (void)writeToIRI: (OFIRI *)IRI
 {
-	[self writeToURI: URI encoding: OFStringEncodingUTF8];
+	[self writeToIRI: IRI encoding: OFStringEncodingUTF8];
 }
 
-- (void)writeToURI: (OFURI *)URI encoding: (OFStringEncoding)encoding
+- (void)writeToIRI: (OFIRI *)IRI encoding: (OFStringEncoding)encoding
 {
 	void *pool = objc_autoreleasePoolPush();
-	OFStream *file = [OFURIHandler openItemAtURI: URI mode: @"w"];
+	OFStream *file = [OFIRIHandler openItemAtIRI: IRI mode: @"w"];
 	bool first = true;
 
 	for (OFINICategory *category in _categories)
 		if ([category of_writeToStream: file
 				      encoding: encoding