Index: src/OFLHAArchive.h
==================================================================
--- src/OFLHAArchive.h
+++ src/OFLHAArchive.h
@@ -82,15 +82,15 @@
 /**
  * @brief Creates a URI for accessing a the specified file within the specified
  *	  LHA archive.
  *
  * @param path The path of the file within the archive
- * @param archive The URI of the archive
+ * @param URI The URI of the archive
  * @return A URI for accessing the specified file within the specified LHA
  *	   archive
  */
-+ (OFURI *)URIForFile: (OFString *)path inArchive: (OFURI *)archive;
++ (OFURI *)URIForFilePath: (OFString *)path inArchiveWithURI: (OFURI *)URI;
 
 - (instancetype)init OF_UNAVAILABLE;
 
 /**
  * @brief Initializes an already allocated OFLHAArchive object with the

Index: src/OFLHAArchive.m
==================================================================
--- src/OFLHAArchive.m
+++ src/OFLHAArchive.m
@@ -91,13 +91,13 @@
 + (instancetype)archiveWithURI: (OFURI *)URI mode: (OFString *)mode
 {
 	return [[[self alloc] initWithURI: URI mode: mode] autorelease];
 }
 
-+ (OFURI *)URIForFile: (OFString *)path inArchive: (OFURI *)archive
++ (OFURI *)URIForFilePath: (OFString *)path inArchiveWithURI: (OFURI *)URI
 {
-	return OFArchiveURIHandlerURIForFileInArchive(@"lha", path, archive);
+	return OFArchiveURIHandlerURIForFileInArchive(@"lha", path, URI);
 }
 
 - (instancetype)init
 {
 	OF_INVALID_INIT_METHOD

Index: src/OFTarArchive.h
==================================================================
--- src/OFTarArchive.h
+++ src/OFTarArchive.h
@@ -86,15 +86,15 @@
 /**
  * @brief Creates a URI for accessing a the specified file within the specified
  *	  tar archive.
  *
  * @param path The path of the file within the archive
- * @param archive The URI of the archive
+ * @param URI The URI of the archive
  * @return A URI for accessing the specified file within the specified tar
  *	   archive
  */
-+ (OFURI *)URIForFile: (OFString *)path inArchive: (OFURI *)archive;
++ (OFURI *)URIForFilePath: (OFString *)path inArchiveWithURI: (OFURI *)URI;
 
 - (instancetype)init OF_UNAVAILABLE;
 
 /**
  * @brief Initializes an already allocated OFTarArchive object with the

Index: src/OFTarArchive.m
==================================================================
--- src/OFTarArchive.m
+++ src/OFTarArchive.m
@@ -77,13 +77,13 @@
 + (instancetype)archiveWithURI: (OFURI *)URI mode: (OFString *)mode
 {
 	return [[[self alloc] initWithURI: URI mode: mode] autorelease];
 }
 
-+ (OFURI *)URIForFile: (OFString *)path inArchive: (OFURI *)archive
++ (OFURI *)URIForFilePath: (OFString *)path inArchiveWithURI: (OFURI *)URI
 {
-	return OFArchiveURIHandlerURIForFileInArchive(@"tar", path, archive);
+	return OFArchiveURIHandlerURIForFileInArchive(@"tar", path, URI);
 }
 
 - (instancetype)init
 {
 	OF_INVALID_INIT_METHOD

Index: src/OFZIPArchive.h
==================================================================
--- src/OFZIPArchive.h
+++ src/OFZIPArchive.h
@@ -95,15 +95,15 @@
 /**
  * @brief Creates a URI for accessing a the specified file within the specified
  *	  ZIP archive.
  *
  * @param path The path of the file within the archive
- * @param archive The URI of the archive
+ * @param URI The URI of the archive
  * @return A URI for accessing the specified file within the specified ZIP
  *	   archive
  */
-+ (OFURI *)URIForFile: (OFString *)path inArchive: (OFURI *)archive;
++ (OFURI *)URIForFilePath: (OFString *)path inArchiveWithURI: (OFURI *)URI;
 
 - (instancetype)init OF_UNAVAILABLE;
 
 /**
  * @brief Initializes an already allocated OFZIPArchive object with the

Index: src/OFZIPArchive.m
==================================================================
--- src/OFZIPArchive.m
+++ src/OFZIPArchive.m
@@ -172,13 +172,13 @@
 + (instancetype)archiveWithURI: (OFURI *)URI mode: (OFString *)mode
 {
 	return [[[self alloc] initWithURI: URI mode: mode] autorelease];
 }
 
-+ (OFURI *)URIForFile: (OFString *)path inArchive: (OFURI *)archive
++ (OFURI *)URIForFilePath: (OFString *)path inArchiveWithURI: (OFURI *)URI
 {
-	return OFArchiveURIHandlerURIForFileInArchive(@"zip", path, archive);
+	return OFArchiveURIHandlerURIForFileInArchive(@"zip", path, URI);
 }
 
 - (instancetype)init
 {
 	OF_INVALID_INIT_METHOD