@@ -19,12 +19,12 @@
 
 /*! @file */
 
 OF_ASSUME_NONNULL_BEGIN
 
+@class OFIRI;
 @class OFString;
-@class OFURI;
 
 /**
  * @brief Options for searching in data.
  *
  * This is a bit mask.
@@ -165,16 +165,16 @@
 + (instancetype)dataWithContentsOfFile: (OFString *)path;
 #endif
 
 /**
  * @brief Creates a new OFData with an item size of 1, containing the data of
- *	  the specified URI.
+ *	  the specified IRI.
  *
- * @param URI The URI to the contents for the OFData
+ * @param IRI The IRI to the contents for the OFData
  * @return A new autoreleased OFData
  */
-+ (instancetype)dataWithContentsOfURI: (OFURI *)URI;
++ (instancetype)dataWithContentsOfIRI: (OFIRI *)IRI;
 
 /**
  * @brief Creates a new OFData with an item size of 1, containing the data of
  *	  the hex string representation.
  *
@@ -268,16 +268,16 @@
 - (instancetype)initWithContentsOfFile: (OFString *)path;
 #endif
 
 /**
  * @brief Initializes an already allocated OFData with an item size of 1,
- *	  containing the data of the specified URI.
+ *	  containing the data of the specified IRI.
  *
- * @param URI The URI to the contents for the OFData
+ * @param IRI The IRI to the contents for the OFData
  * @return A new autoreleased OFData
  */
-- (instancetype)initWithContentsOfURI: (OFURI *)URI;
+- (instancetype)initWithContentsOfIRI: (OFIRI *)IRI;
 
 /**
  * @brief Initializes an already allocated OFData with an item size of 1,
  *	  containing the data of the hex string representation.
  *
@@ -344,17 +344,17 @@
  */
 - (void)writeToFile: (OFString *)path;
 #endif
 
 /**
- * @brief Writes the OFData to the specified URI.
+ * @brief Writes the OFData to the specified IRI.
  *
- * @param URI The URI to write to
+ * @param IRI The IRI to write to
  */
-- (void)writeToURI: (OFURI *)URI;
+- (void)writeToIRI: (OFIRI *)IRI;
 @end
 
 OF_ASSUME_NONNULL_END
 
 #import "OFMutableData.h"
 #import "OFData+CryptographicHashing.h"
 #import "OFData+MessagePackParsing.h"