@@ -49,12 +49,12 @@
  *  - Write support is missing.
  *  - Encrypted files cannot be read.
  */
 
 @interface OFZIPArchive ()
-- (void)OF_readZIPInfo;
-- (void)OF_readEntries;
+- (void)of_readZIPInfo;
+- (void)of_readEntries;
 @end
 
 @interface OFZIPArchive_LocalFileHeader: OFObject
 {
 @public
@@ -158,12 +158,12 @@
 	self = [super init];
 
 	@try {
 		_stream = [stream retain];
 
-		[self OF_readZIPInfo];
-		[self OF_readEntries];
+		[self of_readZIPInfo];
+		[self of_readEntries];
 	} @catch (id e) {
 		[self release];
 		@throw e;
 	}
 
@@ -194,11 +194,11 @@
 	[_lastReturnedStream release];
 
 	[super dealloc];
 }
 
-- (void)OF_readZIPInfo
+- (void)of_readZIPInfo
 {
 	void *pool = objc_autoreleasePoolPush();
 	uint16_t commentLength;
 	of_offset_t offset = -22;
 	bool valid = false;
@@ -283,11 +283,11 @@
 	}
 
 	objc_autoreleasePoolPop(pool);
 }
 
-- (void)OF_readEntries
+- (void)of_readEntries
 {
 	void *pool = objc_autoreleasePoolPush();
 
 	if (_centralDirectoryOffset < 0 ||
 	    (of_offset_t)_centralDirectoryOffset != _centralDirectoryOffset)
@@ -299,11 +299,11 @@
 	_entries = [[OFMutableArray alloc] init];
 	_pathToEntryMap = [[OFMutableDictionary alloc] init];
 
 	for (size_t i = 0; i < _centralDirectoryEntries; i++) {
 		OFZIPArchiveEntry *entry = [[[OFZIPArchiveEntry alloc]
-		    OF_initWithStream: _stream] autorelease];
+		    of_initWithStream: _stream] autorelease];
 
 		if ([_pathToEntryMap objectForKey: [entry fileName]] != nil)
 			@throw [OFInvalidFormatException exception];
 
 		[_entries addObject: entry];
@@ -336,11 +336,11 @@
 
 	[_lastReturnedStream close];
 	[_lastReturnedStream release];
 	_lastReturnedStream = nil;
 
-	offset64 = [entry OF_localFileHeaderOffset];
+	offset64 = [entry of_localFileHeaderOffset];
 	if (offset64 < 0 || (of_offset_t)offset64 != offset64)
 		@throw [OFOutOfRangeException exception];
 
 	seekOrThrowInvalidFormat(_stream, (of_offset_t)offset64, SEEK_SET);
 	localFileHeader = [[[OFZIPArchive_LocalFileHeader alloc]
@@ -432,12 +432,12 @@
 }
 
 - (bool)matchesEntry: (OFZIPArchiveEntry *)entry
 {
 	if (_compressionMethod != [entry compressionMethod] ||
-	    _lastModifiedFileTime != [entry OF_lastModifiedFileTime] ||
-	    _lastModifiedFileDate != [entry OF_lastModifiedFileDate])
+	    _lastModifiedFileTime != [entry of_lastModifiedFileTime] ||
+	    _lastModifiedFileDate != [entry of_lastModifiedFileDate])
 		return false;
 
 	if (!(_generalPurposeBitFlag & (1 << 3)))
 		if (_CRC32 != [entry CRC32] ||
 		    _compressedSize != [entry compressedSize] ||