@@ -49,12 +49,12 @@
 
 @implementation TestsAppDelegate (OFHMACTests)
 - (void)HMACTests
 {
 	void *pool = objc_autoreleasePoolPush();
-	OFURI *URI = [OFURI URIWithString: @"embedded:testfile.bin"];
-	OFStream *file = [OFURIHandler openItemAtURI: URI mode: @"r"];
+	OFIRI *IRI = [OFIRI IRIWithString: @"embedded:testfile.bin"];
+	OFStream *file = [OFIRIHandler openItemAtIRI: IRI mode: @"r"];
 	OFHMAC *HMACMD5, *HMACSHA1, *HMACRMD160;
 	OFHMAC *HMACSHA256, *HMACSHA384, *HMACSHA512;
 
 	TEST(@"+[HMACWithHashClass:] with MD5",
 	    (HMACMD5 = [OFHMAC HMACWithHashClass: [OFMD5Hash class]