@@ -32,11 +32,11 @@
 #import "OFNotOpenException.h"
 #import "OFOutOfRangeException.h"
 #import "OFTruncatedDataException.h"
 #import "OFWriteFailedException.h"
 
-@interface OFTarArchive_FileReadStream: OFStream <OFReadyForReadingObserving>
+@interface OFTarArchiveFileReadStream: OFStream <OFReadyForReadingObserving>
 {
 	OFTarArchiveEntry *_entry;
 	OFStream *_stream;
 	uint64_t _toRead;
 	bool _atEndOfStream, _skipped;
@@ -45,11 +45,11 @@
 - (instancetype)of_initWithStream: (OFStream *)stream
 			    entry: (OFTarArchiveEntry *)entry;
 - (void)of_skip;
 @end
 
-@interface OFTarArchive_FileWriteStream: OFStream <OFReadyForWritingObserving>
+@interface OFTarArchiveFileWriteStream: OFStream <OFReadyForWritingObserving>
 {
 	OFTarArchiveEntry *_entry;
 	OFStream *_stream;
 	uint64_t _toWrite;
 }
@@ -175,11 +175,11 @@
 	bool empty = true;
 
 	if (_mode != OF_TAR_ARCHIVE_MODE_READ)
 		@throw [OFInvalidArgumentException exception];
 
-	[(OFTarArchive_FileReadStream *)_lastReturnedStream of_skip];
+	[(OFTarArchiveFileReadStream *)_lastReturnedStream of_skip];
 	[_lastReturnedStream close];
 	[_lastReturnedStream release];
 	_lastReturnedStream = nil;
 
 	if (_stream.atEndOfStream)
@@ -205,11 +205,11 @@
 
 	entry = [[[OFTarArchiveEntry alloc]
 	    of_initWithHeader: buffer.c
 		     encoding: _encoding] autorelease];
 
-	_lastReturnedStream = [[OFTarArchive_FileReadStream alloc]
+	_lastReturnedStream = [[OFTarArchiveFileReadStream alloc]
 	    of_initWithStream: _stream
 			entry: entry];
 
 	return entry;
 }
@@ -220,11 +220,11 @@
 		@throw [OFInvalidArgumentException exception];
 
 	if (_lastReturnedStream == nil)
 		@throw [OFInvalidArgumentException exception];
 
-	return [[(OFTarArchive_FileReadStream *)_lastReturnedStream
+	return [[(OFTarArchiveFileReadStream *)_lastReturnedStream
 	    retain] autorelease];
 }
 
 - (OFStream <OFReadyForWritingObserving> *)
     streamForWritingEntry: (OFTarArchiveEntry *)entry
@@ -242,17 +242,17 @@
 	_lastReturnedStream = nil;
 
 	[entry of_writeToStream: _stream
 		       encoding: _encoding];
 
-	_lastReturnedStream = [[OFTarArchive_FileWriteStream alloc]
+	_lastReturnedStream = [[OFTarArchiveFileWriteStream alloc]
 	    of_initWithStream: _stream
 			entry: entry];
 
 	objc_autoreleasePoolPop(pool);
 
-	return [[(OFTarArchive_FileWriteStream *)_lastReturnedStream
+	return [[(OFTarArchiveFileWriteStream *)_lastReturnedStream
 	    retain] autorelease];
 }
 
 - (void)close
 {
@@ -274,11 +274,11 @@
 	[_stream release];
 	_stream = nil;
 }
 @end
 
-@implementation OFTarArchive_FileReadStream
+@implementation OFTarArchiveFileReadStream
 - (instancetype)of_initWithStream: (OFStream *)stream
 			    entry: (OFTarArchiveEntry *)entry
 {
 	self = [super init];
 
@@ -407,11 +407,11 @@
 
 	_skipped = true;
 }
 @end
 
-@implementation OFTarArchive_FileWriteStream
+@implementation OFTarArchiveFileWriteStream
 - (instancetype)of_initWithStream: (OFStream *)stream
 			    entry: (OFTarArchiveEntry *)entry
 {
 	self = [super init];