@@ -18,12 +18,12 @@
 #import "OFString.h"
 #import "OFTarArchiveEntry.h"
 
 OF_ASSUME_NONNULL_BEGIN
 
+@class OFIRI;
 @class OFStream;
-@class OFURI;
 
 /**
  * @class OFTarArchive OFTarArchive.h ObjFW/OFTarArchive.h
  *
  * @brief A class for accessing and manipulating tar archives.
@@ -62,31 +62,31 @@
 + (instancetype)archiveWithStream: (OFStream *)stream mode: (OFString *)mode;
 
 /**
  * @brief Creates a new OFTarArchive object with the specified file.
  *
- * @param URI The URI to the tar archive
+ * @param IRI The IRI to the tar archive
  * @param mode The mode for the tar file. Valid modes are "r" for reading,
  *	       "w" for creating a new file and "a" for appending to an existing
  *	       archive.
  * @return A new, autoreleased OFTarArchive
  * @throw OFInvalidFormatException The archive has an invalid format
  * @throw OFSeekFailedException The archive was open in append mode and seeking
  *				failed
  */
-+ (instancetype)archiveWithURI: (OFURI *)URI mode: (OFString *)mode;
++ (instancetype)archiveWithIRI: (OFIRI *)IRI mode: (OFString *)mode;
 
 /**
- * @brief Creates a URI for accessing a the specified file within the specified
- *	  tar archive.
+ * @brief Creates an IRI for accessing a the specified file within the
+ *	  specified tar archive.
  *
  * @param path The path of the file within the archive
- * @param URI The URI of the archive
- * @return A URI for accessing the specified file within the specified tar
+ * @param IRI The IRI of the archive
+ * @return An IRI for accessing the specified file within the specified tar
  *	   archive
  */
-+ (OFURI *)URIForFilePath: (OFString *)path inArchiveWithURI: (OFURI *)URI;
++ (OFIRI *)IRIForFilePath: (OFString *)path inArchiveWithIRI: (OFIRI *)IRI;
 
 - (instancetype)init OF_UNAVAILABLE;
 
 /**
  * @brief Initializes an already allocated OFTarArchive object with the
@@ -107,20 +107,20 @@
 
 /**
  * @brief Initializes an already allocated OFTarArchive object with the
  *	  specified file.
  *
- * @param URI The URI to the tar archive
+ * @param IRI The IRI to the tar archive
  * @param mode The mode for the tar file. Valid modes are "r" for reading,
  *	       "w" for creating a new file and "a" for appending to an existing
  *	       archive.
  * @return An initialized OFTarArchive
  * @throw OFInvalidFormatException The archive has an invalid format
  * @throw OFSeekFailedException The archive was open in append mode and seeking
  *				failed
  */
-- (instancetype)initWithURI: (OFURI *)URI mode: (OFString *)mode;
+- (instancetype)initWithIRI: (OFIRI *)IRI mode: (OFString *)mode;
 
 /**
  * @brief Returns the next entry from the tar archive or `nil` if all entries
  *	  have been read.
  *