@@ -40,12 +40,12 @@
 	OFStream *_stream;
 	uint64_t _toRead;
 	bool _atEndOfStream;
 }
 
-- initWithEntry: (OFTarArchiveEntry *)entry
-	 stream: (OFStream *)stream;
+- initWithStream: (OFStream *)stream
+	   entry: (OFTarArchiveEntry *)entry;
 - (void)of_skip;
 @end
 
 @interface OFTarArchive_FileWriteStream: OFStream
 {
@@ -52,12 +52,12 @@
 	OFTarArchiveEntry *_entry;
 	OFStream *_stream;
 	uint64_t _toWrite;
 }
 
-- initWithEntry: (OFTarArchiveEntry *)entry
-	 stream: (OFStream *)stream;
+- initWithStream: (OFStream *)stream
+	   entry: (OFTarArchiveEntry *)entry;
 @end
 
 static void
 stringToBuffer(unsigned char *buffer, OFString *string, size_t length)
 {
@@ -210,12 +210,12 @@
 
 	entry = [[[OFTarArchiveEntry alloc]
 	    of_initWithHeader: buffer.c] autorelease];
 
 	_lastReturnedStream = [[OFTarArchive_FileReadStream alloc]
-	    initWithEntry: entry
-		   stream: _stream];
+	    initWithStream: _stream
+		     entry: entry];
 
 	return entry;
 }
 
 - (OFStream *)streamForReadingCurrentEntry
@@ -283,12 +283,12 @@
 
 	[_stream writeBuffer: buffer
 		      length: sizeof(buffer)];
 
 	_lastReturnedStream = [[OFTarArchive_FileWriteStream alloc]
-	    initWithEntry: entry
-		   stream: _stream];
+	    initWithStream: _stream
+		     entry: entry];
 
 	objc_autoreleasePoolPop(pool);
 
 	return [[_lastReturnedStream retain] autorelease];
 }
@@ -314,12 +314,12 @@
 	_stream = nil;
 }
 @end
 
 @implementation OFTarArchive_FileReadStream
-- initWithEntry: (OFTarArchiveEntry *)entry
-	 stream: (OFStream *)stream
+- initWithStream: (OFStream *)stream
+	   entry: (OFTarArchiveEntry *)entry
 {
 	self = [super init];
 
 	@try {
 		_entry = [entry copy];
@@ -417,12 +417,12 @@
 			    exactLength: 512 - ((size_t)size % 512)];
 }
 @end
 
 @implementation OFTarArchive_FileWriteStream
-- initWithEntry: (OFTarArchiveEntry *)entry
-	 stream: (OFStream *)stream
+- initWithStream: (OFStream *)stream
+	   entry: (OFTarArchiveEntry *)entry
 {
 	self = [super init];
 
 	@try {
 		_entry = [entry copy];