@@ -39,11 +39,11 @@
 static void
 setPermissions(OFString *path, OFZIPArchiveEntry *entry)
 {
 #ifdef OF_FILE_MANAGER_SUPPORTS_PERMISSIONS
 	if ((entry.versionMadeBy >> 8) ==
-	    OF_ZIP_ARCHIVE_ENTRY_ATTR_COMPAT_UNIX) {
+	    OFZIPArchiveEntryAttributeCompatibilityUNIX) {
 		OFNumber *mode = [OFNumber numberWithUnsignedShort:
 		    (entry.versionSpecificAttributes >> 16) & 0777];
 		OFFileAttributes attributes = [OFDictionary
 		    dictionaryWithObject: mode
 				  forKey: OFFilePOSIXPermissions];
@@ -123,11 +123,11 @@
 					      entry.compressedSize];
 			OFString *uncompressedSize = [OFString
 			    stringWithFormat: @"%" PRIu64,
 					      entry.uncompressedSize];
 			OFString *compressionMethod =
-			    of_zip_archive_entry_compression_method_to_string(
+			    OFZIPArchiveEntryCompressionMethodName(
 			    entry.compressionMethod);
 			OFString *CRC32 = [OFString
 			    stringWithFormat: @"%08" PRIX32, entry.CRC32];
 			OFString *modificationDate = [entry.modificationDate
 			    localDateStringWithFormat: @"%Y-%m-%d %H:%M:%S"];
@@ -169,28 +169,29 @@
 			    @"Modification date: %[date]",
 			    @"date", modificationDate)];
 
 			if (app->_outputLevel >= 2) {
 				uint16_t versionMadeBy = entry.versionMadeBy;
+				OFZIPArchiveEntryAttributeCompatibility UNIX =
+				    OFZIPArchiveEntryAttributeCompatibilityUNIX;
 
 				[of_stdout writeString: @"\t"];
 				[of_stdout writeLine: OF_LOCALIZED(
 				    @"list_version_made_by",
 				    @"Version made by: %[version]",
 				    @"version",
-				    of_zip_archive_entry_version_to_string(
+				    OFZIPArchiveEntryVersionToString(
 				    versionMadeBy))];
 				[of_stdout writeString: @"\t"];
 				[of_stdout writeLine: OF_LOCALIZED(
 				    @"list_min_version_needed",
 				    @"Minimum version needed: %[version]",
 				    @"version",
-				    of_zip_archive_entry_version_to_string(
+				    OFZIPArchiveEntryVersionToString(
 				    entry.minVersionNeeded))];
 
-				if ((versionMadeBy >> 8) ==
-				    OF_ZIP_ARCHIVE_ENTRY_ATTR_COMPAT_UNIX) {
+				if ((versionMadeBy >> 8) == UNIX) {
 					uint32_t mode = entry
 					    .versionSpecificAttributes >> 16;
 					OFString *modeString = [OFString
 					    stringWithFormat: @"%06o", mode];
 					[of_stdout writeString: @"\t"];
@@ -443,11 +444,11 @@
 
 		entry.compressedSize = (int64_t)size;
 		entry.uncompressedSize = (int64_t)size;
 
 		entry.compressionMethod =
-		    OF_ZIP_ARCHIVE_ENTRY_COMPRESSION_METHOD_NONE;
+		    OFZIPArchiveEntryCompressionMethodNone;
 		entry.modificationDate = attributes.fileModificationDate;
 
 		[entry makeImmutable];
 
 		output = [_archive streamForWritingEntry: entry];