@@ -57,11 +57,11 @@
 - (void)of_readEntries;
 - (void)of_closeLastReturnedStream;
 - (void)of_writeCentralDirectory;
 @end
 
-@interface OFZIPArchive_LocalFileHeader: OFObject
+@interface OFZIPArchiveLocalFileHeader: OFObject
 {
 @public
 	uint16_t _minVersionNeeded, _generalPurposeBitFlag, _compressionMethod;
 	uint16_t _lastModifiedFileTime, _lastModifiedFileDate;
 	uint32_t _CRC32;
@@ -72,11 +72,11 @@
 
 - (instancetype)initWithStream: (OFStream *)stream;
 - (bool)matchesEntry: (OFZIPArchiveEntry *)entry;
 @end
 
-@interface OFZIPArchive_FileReadStream: OFStream
+@interface OFZIPArchiveFileReadStream: OFStream
 {
 	OFStream *_stream, *_decompressedStream;
 	OFZIPArchiveEntry *_entry;
 	uint64_t _toRead;
 	uint32_t _CRC32;
@@ -85,11 +85,11 @@
 
 - (instancetype)of_initWithStream: (OFStream *)stream
 			    entry: (OFZIPArchiveEntry *)entry;
 @end
 
-@interface OFZIPArchive_FileWriteStream: OFStream
+@interface OFZIPArchiveFileWriteStream: OFStream
 {
 	OFStream *_stream;
 	uint32_t _CRC32;
 @public
 	int64_t _bytesWritten;
@@ -406,13 +406,13 @@
 	[_lastReturnedStream close];
 
 	if ((_mode == OF_ZIP_ARCHIVE_MODE_WRITE ||
 	    _mode == OF_ZIP_ARCHIVE_MODE_APPEND) &&
 	    [_lastReturnedStream isKindOfClass:
-	    [OFZIPArchive_FileWriteStream class]]) {
-		OFZIPArchive_FileWriteStream *stream =
-		    (OFZIPArchive_FileWriteStream *)_lastReturnedStream;
+	    [OFZIPArchiveFileWriteStream class]]) {
+		OFZIPArchiveFileWriteStream *stream =
+		    (OFZIPArchiveFileWriteStream *)_lastReturnedStream;
 
 		if (INT64_MAX - _offset < stream->_bytesWritten)
 			@throw [OFOutOfRangeException exception];
 
 		_offset += stream->_bytesWritten;
@@ -430,11 +430,11 @@
 
 - (OFStream *)streamForReadingFile: (OFString *)path
 {
 	void *pool = objc_autoreleasePoolPush();
 	OFZIPArchiveEntry *entry;
-	OFZIPArchive_LocalFileHeader *localFileHeader;
+	OFZIPArchiveLocalFileHeader *localFileHeader;
 	int64_t offset64;
 
 	if (_mode != OF_ZIP_ARCHIVE_MODE_READ)
 		@throw [OFInvalidArgumentException exception];
 
@@ -449,11 +449,11 @@
 	if (offset64 < 0 || (of_offset_t)offset64 != offset64)
 		@throw [OFOutOfRangeException exception];
 
 	seekOrThrowInvalidFormat((OFSeekableStream *)_stream,
 	    (of_offset_t)offset64, SEEK_SET);
-	localFileHeader = [[[OFZIPArchive_LocalFileHeader alloc]
+	localFileHeader = [[[OFZIPArchiveLocalFileHeader alloc]
 	    initWithStream: _stream] autorelease];
 
 	if (![localFileHeader matchesEntry: entry])
 		@throw [OFInvalidFormatException exception];
 
@@ -464,11 +464,11 @@
 
 		@throw [OFUnsupportedVersionException
 		    exceptionWithVersion: version];
 	}
 
-	_lastReturnedStream = [[OFZIPArchive_FileReadStream alloc]
+	_lastReturnedStream = [[OFZIPArchiveFileReadStream alloc]
 	     of_initWithStream: _stream
 			 entry: entry];
 
 	objc_autoreleasePoolPop(pool);
 
@@ -554,11 +554,11 @@
 	if (INT64_MAX - _offset < offsetAdd)
 		@throw [OFOutOfRangeException exception];
 
 	_offset += offsetAdd;
 
-	_lastReturnedStream = [[OFZIPArchive_FileWriteStream alloc]
+	_lastReturnedStream = [[OFZIPArchiveFileWriteStream alloc]
 	     initWithStream: _stream
 		      entry: entry];
 
 	objc_autoreleasePoolPop(pool);
 
@@ -628,11 +628,11 @@
 	[_stream release];
 	_stream = nil;
 }
 @end
 
-@implementation OFZIPArchive_LocalFileHeader
+@implementation OFZIPArchiveLocalFileHeader
 - (instancetype)initWithStream: (OFStream *)stream
 {
 	self = [super init];
 
 	@try {
@@ -728,11 +728,11 @@
 
 	return true;
 }
 @end
 
-@implementation OFZIPArchive_FileReadStream
+@implementation OFZIPArchiveFileReadStream
 - (instancetype)of_initWithStream: (OFStream *)stream
 			    entry: (OFZIPArchiveEntry *)entry
 {
 	self = [super init];
 
@@ -855,11 +855,11 @@
 
 	[super close];
 }
 @end
 
-@implementation OFZIPArchive_FileWriteStream
+@implementation OFZIPArchiveFileWriteStream
 - (instancetype)initWithStream: (OFStream *)stream
 			 entry: (OFMutableZIPArchiveEntry *)entry
 {
 	self = [super init];