@@ -16,13 +16,13 @@
 #include "config.h"
 
 #import "OFINIFileSettings.h"
 #import "OFArray.h"
 #import "OFINIFile.h"
+#import "OFIRI.h"
 #import "OFString.h"
 #import "OFSystemInfo.h"
-#import "OFURI.h"
 
 @implementation OFINIFileSettings
 - (instancetype)initWithApplicationName: (OFString *)applicationName
 {
 	self = [super initWithApplicationName: applicationName];
@@ -30,13 +30,13 @@
 	@try {
 		void *pool = objc_autoreleasePoolPush();
 		OFString *fileName;
 
 		fileName = [applicationName stringByAppendingString: @".ini"];
-		_fileURI = [[[OFSystemInfo userConfigURI]
-		    URIByAppendingPathComponent: fileName] copy];
-		_INIFile = [[OFINIFile alloc] initWithURI: _fileURI];
+		_fileIRI = [[[OFSystemInfo userConfigIRI]
+		    IRIByAppendingPathComponent: fileName] copy];
+		_INIFile = [[OFINIFile alloc] initWithIRI: _fileIRI];
 
 		objc_autoreleasePoolPop(pool);
 	} @catch (id e) {
 		[self release];
 		@throw e;
@@ -45,11 +45,11 @@
 	return self;
 }
 
 - (void)dealloc
 {
-	[_fileURI release];
+	[_fileIRI release];
 	[_INIFile release];
 
 	[super dealloc];
 }
 
@@ -241,8 +241,8 @@
 	objc_autoreleasePoolPop(pool);
 }
 
 - (void)save
 {
-	[_INIFile writeToURI: _fileURI];
+	[_INIFile writeToIRI: _fileIRI];
 }
 @end