@@ -21,11 +21,11 @@
 #import "OFLHAArchiveEntry.h"
 #import "OFLHAArchiveEntry+Private.h"
 #ifdef OF_HAVE_FILES
 # import "OFFile.h"
 #endif
-#import "OFLHAArchive_LHStream.h"
+#import "OFLHADecompressingStream.h"
 #import "OFStream.h"
 #import "OFSeekableStream.h"
 #import "OFString.h"
 
 #import "crc16.h"
@@ -36,11 +36,11 @@
 #import "OFNotOpenException.h"
 #import "OFOutOfRangeException.h"
 #import "OFTruncatedDataException.h"
 #import "OFWriteFailedException.h"
 
-@interface OFLHAArchive_FileReadStream: OFStream <OFReadyForReadingObserving>
+@interface OFLHAArchiveFileReadStream: OFStream <OFReadyForReadingObserving>
 {
 	OFStream *_stream, *_decompressedStream;
 	OFLHAArchiveEntry *_entry;
 	uint32_t _toRead, _bytesConsumed;
 	uint16_t _CRC16;
@@ -50,11 +50,11 @@
 - (instancetype)of_initWithStream: (OFStream *)stream
 			    entry: (OFLHAArchiveEntry *)entry;
 - (void)of_skip;
 @end
 
-@interface OFLHAArchive_FileWriteStream: OFStream <OFReadyForWritingObserving>
+@interface OFLHAArchiveFileWriteStream: OFStream <OFReadyForWritingObserving>
 {
 	OFMutableLHAArchiveEntry *_entry;
 	of_string_encoding_t _encoding;
 	OFSeekableStream *_stream;
 	of_offset_t _headerOffset;
@@ -164,11 +164,11 @@
 	size_t headerLen;
 
 	if (_mode != OF_LHA_ARCHIVE_MODE_READ)
 		@throw [OFInvalidArgumentException exception];
 
-	[(OFLHAArchive_FileReadStream *)_lastReturnedStream of_skip];
+	[(OFLHAArchiveFileReadStream *)_lastReturnedStream of_skip];
 	[_lastReturnedStream close];
 	[_lastReturnedStream release];
 	_lastReturnedStream = nil;
 
 	for (headerLen = 0; headerLen < 21;) {
@@ -189,11 +189,11 @@
 	entry = [[[OFLHAArchiveEntry alloc]
 	    of_initWithHeader: header
 		       stream: _stream
 		     encoding: _encoding] autorelease];
 
-	_lastReturnedStream = [[OFLHAArchive_FileReadStream alloc]
+	_lastReturnedStream = [[OFLHAArchiveFileReadStream alloc]
 	    of_initWithStream: _stream
 			entry: entry];
 
 	return entry;
 }
@@ -204,11 +204,11 @@
 		@throw [OFInvalidArgumentException exception];
 
 	if (_lastReturnedStream == nil)
 		@throw [OFInvalidArgumentException exception];
 
-	return [[(OFLHAArchive_FileReadStream *)_lastReturnedStream
+	return [[(OFLHAArchiveFileReadStream *)_lastReturnedStream
 	    retain] autorelease];
 }
 
 - (OFStream <OFReadyForWritingObserving> *)
     streamForWritingEntry: (OFLHAArchiveEntry *)entry
@@ -228,16 +228,16 @@
 
 	[_lastReturnedStream close];
 	[_lastReturnedStream release];
 	_lastReturnedStream = nil;
 
-	_lastReturnedStream = [[OFLHAArchive_FileWriteStream alloc]
+	_lastReturnedStream = [[OFLHAArchiveFileWriteStream alloc]
 	    of_initWithStream: (OFSeekableStream *)_stream
 			entry: entry
 		     encoding: _encoding];
 
-	return [[(OFLHAArchive_FileWriteStream *)_lastReturnedStream
+	return [[(OFLHAArchiveFileWriteStream *)_lastReturnedStream
 	    retain] autorelease];
 }
 
 - (void)close
 {
@@ -251,11 +251,11 @@
 	[_stream release];
 	_stream = nil;
 }
 @end
 
-@implementation OFLHAArchive_FileReadStream
+@implementation OFLHAArchiveFileReadStream
 - (instancetype)of_initWithStream: (OFStream *)stream
 			    entry: (OFLHAArchiveEntry *)entry
 {
 	self = [super init];
 
@@ -266,21 +266,21 @@
 
 		compressionMethod = entry.compressionMethod;
 
 		if ([compressionMethod isEqual: @"-lh4-"] ||
 		    [compressionMethod isEqual: @"-lh5-"])
-			_decompressedStream = [[OFLHAArchive_LHStream alloc]
+			_decompressedStream = [[OFLHADecompressingStream alloc]
 			    of_initWithStream: stream
 				 distanceBits: 4
 			       dictionaryBits: 14];
 		else if ([compressionMethod isEqual: @"-lh6-"])
-			_decompressedStream = [[OFLHAArchive_LHStream alloc]
+			_decompressedStream = [[OFLHADecompressingStream alloc]
 			    of_initWithStream: stream
 				 distanceBits: 5
 			       dictionaryBits: 16];
 		else if ([compressionMethod isEqual: @"-lh7-"])
-			_decompressedStream = [[OFLHAArchive_LHStream alloc]
+			_decompressedStream = [[OFLHADecompressingStream alloc]
 			    of_initWithStream: stream
 				 distanceBits: 5
 			       dictionaryBits: 17];
 		else
 			_decompressedStream = [stream retain];
@@ -381,16 +381,17 @@
 	/*
 	 * Get the number of consumed bytes and directly read from the
 	 * compressed stream, to make skipping much faster.
 	 */
 	if ([_decompressedStream isKindOfClass:
-	    [OFLHAArchive_LHStream class]]) {
-		OFLHAArchive_LHStream *LHStream =
-		    (OFLHAArchive_LHStream *)_decompressedStream;
+	    [OFLHADecompressingStream class]]) {
+		OFLHADecompressingStream *decompressingStream =
+		    (OFLHADecompressingStream *)_decompressedStream;
 
-		[LHStream close];
-		toRead = _entry.compressedSize - LHStream->_bytesConsumed;
+		[decompressingStream close];
+		toRead =
+		    _entry.compressedSize - decompressingStream->_bytesConsumed;
 
 		stream = _stream;
 	}
 
 	if ([stream isKindOfClass: [OFSeekableStream class]] &&
@@ -426,11 +427,11 @@
 
 	[super close];
 }
 @end
 
-@implementation OFLHAArchive_FileWriteStream
+@implementation OFLHAArchiveFileWriteStream
 - (instancetype)of_initWithStream: (OFSeekableStream *)stream
 			    entry: (OFLHAArchiveEntry *)entry
 			 encoding: (of_string_encoding_t)encoding
 {
 	self = [super init];