@@ -23,14 +23,14 @@
 
 @class OFDictionary OF_GENERIC(KeyType, ObjectType);
 @class OFHTTPClient;
 @class OFHTTPRequest;
 @class OFHTTPResponse;
+@class OFIRI;
 @class OFStream;
 @class OFTCPSocket;
 @class OFTLSStream;
-@class OFURI;
 
 /**
  * @protocol OFHTTPClientDelegate OFHTTPClient.h ObjFW/OFHTTPClient.h
  *
  * @brief A delegate for OFHTTPClient.
@@ -117,22 +117,22 @@
  * This callback will only be called if the OFHTTPClient will follow a
  * redirect. If the maximum number of redirects has been reached already, this
  * callback will not be called.
  *
  * @param client The OFHTTPClient which wants to follow a redirect
- * @param URI The URI to which it will follow a redirect
+ * @param IRI The IRI to which it will follow a redirect
  * @param statusCode The status code for the redirection
  * @param request The request for which the OFHTTPClient wants to redirect.
  *		  You are allowed to change the request's headers from this
  *		  callback and they will be used when following the redirect
- *		  (e.g. to set the cookies for the new URI), however, keep in
+ *		  (e.g. to set the cookies for the new IRI), however, keep in
  *		  mind that this will change the request you originally passed.
  * @param response The response indicating the redirect
  * @return A boolean whether the OFHTTPClient should follow the redirect
  */
 -	       (bool)client: (OFHTTPClient *)client
-  shouldFollowRedirectToURI: (OFURI *)URI
+  shouldFollowRedirectToIRI: (OFIRI *)IRI
 		 statusCode: (short)statusCode
 		    request: (OFHTTPRequest *)request
 		   response: (OFHTTPResponse *)response;
 @end
 
@@ -148,11 +148,11 @@
 @public
 #endif
 	OFObject <OFHTTPClientDelegate> *_Nullable _delegate;
 	bool _allowsInsecureRedirects, _inProgress;
 	OFStream *_Nullable _stream;
-	OFURI *_Nullable _lastURI;
+	OFIRI *_Nullable _lastIRI;
 	bool _lastWasHEAD;
 	OFHTTPResponse *_Nullable _lastResponse;
 }
 
 /**