@@ -47,13 +47,13 @@
 
 	return value;
 }
 
 @implementation OFTarArchiveEntry
-@synthesize name = _name, mode = _mode, size = _size;
+@synthesize fileName = _fileName, mode = _mode, size = _size;
 @synthesize modificationDate = _modificationDate, type = _type;
-@synthesize targetName = _targetName;
+@synthesize targetFileName = _targetFileName;
 
 - (instancetype)OF_initWithHeader: (char[512])header
 			   stream: (OFStream*)stream
 {
 	self = [super init];
@@ -61,21 +61,21 @@
 	@try {
 		void *pool = objc_autoreleasePoolPush();
 
 		_stream = [stream retain];
 
-		_name = [stringFromBuffer(header, 100) copy];
+		_fileName = [stringFromBuffer(header, 100) copy];
 		_mode = (uint32_t)octalValueFromBuffer(
 		    header + 100, 8, UINT32_MAX);
 		_size = _toRead = (size_t)octalValueFromBuffer(
 		    header + 124, 12, UINT64_MAX);
 		_modificationDate = [[OFDate alloc]
 		    initWithTimeIntervalSince1970:
 		    (of_time_interval_t)octalValueFromBuffer(
 		    header + 136, 12, UINTMAX_MAX)];
 		_type = header[156];
-		_targetName = [stringFromBuffer(header + 157, 100) copy];
+		_targetFileName = [stringFromBuffer(header + 157, 100) copy];
 
 		if (_type == '\0')
 			_type = OF_TAR_ARCHIVE_ENTRY_TYPE_FILE;
 
 		objc_autoreleasePoolPop(pool);
@@ -88,13 +88,13 @@
 }
 
 - (void)dealloc
 {
 	[_stream release];
-	[_name release];
+	[_fileName release];
 	[_modificationDate release];
-	[_targetName release];
+	[_targetFileName release];
 
 	[super dealloc];
 }
 
 - (size_t)lowlevelReadIntoBuffer: (void*)buffer
@@ -110,14 +110,14 @@
 		length = (size_t)_toRead;
 
 	ret = [_stream readIntoBuffer: buffer
 			       length: length];
 
-	_toRead -= ret;
-
 	if (ret == 0)
 		_atEndOfStream = true;
+
+	_toRead -= ret;
 
 	return ret;
 }
 
 - (bool)lowlevelIsAtEndOfStream