@@ -280,11 +280,11 @@
 	_centralDirectoryOffset = [_stream readLittleEndianInt32];
 
 	commentLength = [_stream readLittleEndianInt16];
 	_archiveComment = [[_stream
 	    readStringWithLength: commentLength
-			encoding: OF_STRING_ENCODING_CODEPAGE_437] copy];
+			encoding: OFStringEncodingCodepage437] copy];
 
 	if (_diskNumber == 0xFFFF ||
 	    _centralDirectoryDisk == 0xFFFF ||
 	    _centralDirectoryEntriesInDisk == 0xFFFF ||
 	    _centralDirectoryEntries == 0xFFFF ||
@@ -633,11 +633,11 @@
 
 	@try {
 		void *pool = objc_autoreleasePoolPush();
 		OFMutableData *extraField = nil;
 		uint16_t fileNameLength, extraFieldLength;
-		of_string_encoding_t encoding;
+		OFStringEncoding encoding;
 		size_t ZIP64Index;
 		uint16_t ZIP64Size;
 
 		if ([stream readLittleEndianInt32] != 0x04034B50)
 			@throw [OFInvalidFormatException exception];
@@ -651,12 +651,11 @@
 		_compressedSize = [stream readLittleEndianInt32];
 		_uncompressedSize = [stream readLittleEndianInt32];
 		fileNameLength = [stream readLittleEndianInt16];
 		extraFieldLength = [stream readLittleEndianInt16];
 		encoding = (_generalPurposeBitFlag & (1u << 11)
-		    ? OF_STRING_ENCODING_UTF_8
-		    : OF_STRING_ENCODING_CODEPAGE_437);
+		    ? OFStringEncodingUTF8 : OFStringEncodingCodepage437);
 
 		_fileName = [[stream readStringWithLength: fileNameLength
 						 encoding: encoding] copy];
 		if (extraFieldLength > 0)
 			extraField = [[[stream readDataWithCount: