@@ -170,36 +170,36 @@
 
 		if (app->_outputLevel >= 2) {
 			[of_stdout writeString: @"\t"];
 
 			switch (entry.type) {
-			case OF_TAR_ARCHIVE_ENTRY_TYPE_FILE:
+			case OFTarArchiveEntryTypeFile:
 				[of_stdout writeLine: OF_LOCALIZED(
 				    @"list_type_normal",
 				    @"Type: Normal file")];
 				break;
-			case OF_TAR_ARCHIVE_ENTRY_TYPE_LINK:
+			case OFTarArchiveEntryTypeLink:
 				[of_stdout writeLine: OF_LOCALIZED(
 				    @"list_type_hardlink",
 				    @"Type: Hard link")];
 				[of_stdout writeString: @"\t"];
 				[of_stdout writeLine: OF_LOCALIZED(
 				    @"list_link_target",
 				    @"Target file name: %[target]",
 				    @"target", entry.targetFileName)];
 				break;
-			case OF_TAR_ARCHIVE_ENTRY_TYPE_SYMLINK:
+			case OFTarArchiveEntryTypeSymlink:
 				[of_stdout writeLine: OF_LOCALIZED(
 				    @"list_type_symlink",
 				    @"Type: Symbolic link")];
 				[of_stdout writeString: @"\t"];
 				[of_stdout writeLine: OF_LOCALIZED(
 				    @"list_link_target",
 				    @"Target file name: %[target]",
 				    @"target", entry.targetFileName)];
 				break;
-			case OF_TAR_ARCHIVE_ENTRY_TYPE_CHARACTER_DEVICE: {
+			case OFTarArchiveEntryTypeCharacterDevice: {
 				OFString *majorString = [OFString
 				    stringWithFormat: @"%d", entry.deviceMajor];
 				OFString *minorString = [OFString
 				    stringWithFormat: @"%d", entry.deviceMinor];
 
@@ -216,11 +216,11 @@
 				    @"list_device_minor",
 				    @"Device minor: %[minor]",
 				    @"minor", minorString)];
 				break;
 			}
-			case OF_TAR_ARCHIVE_ENTRY_TYPE_BLOCK_DEVICE: {
+			case OFTarArchiveEntryTypeBlockDevice: {
 				OFString *majorString = [OFString
 				    stringWithFormat: @"%d", entry.deviceMajor];
 				OFString *minorString = [OFString
 				    stringWithFormat: @"%d", entry.deviceMinor];
 
@@ -237,21 +237,21 @@
 				    @"list_device_minor",
 				    @"Device minor: %[minor]",
 				    @"minor", minorString)];
 				break;
 			}
-			case OF_TAR_ARCHIVE_ENTRY_TYPE_DIRECTORY:
+			case OFTarArchiveEntryTypeDirectory:
 				[of_stdout writeLine: OF_LOCALIZED(
 				    @"list_type_directory",
 				    @"Type: Directory")];
 				break;
-			case OF_TAR_ARCHIVE_ENTRY_TYPE_FIFO:
+			case OFTarArchiveEntryTypeFIFO:
 				[of_stdout writeLine: OF_LOCALIZED(
 				    @"list_type_fifo",
 				    @"Type: FIFO")];
 				break;
-			case OF_TAR_ARCHIVE_ENTRY_TYPE_CONTIGUOUS_FILE:
+			case OFTarArchiveEntryTypeContiguousFile:
 				[of_stdout writeLine: OF_LOCALIZED(
 				    @"list_type_contiguous_file",
 				    @"Type: Contiguous file")];
 				break;
 			default:
@@ -275,22 +275,22 @@
 	OFTarArchiveEntry *entry;
 
 	while ((entry = [_archive nextEntry]) != nil) {
 		void *pool = objc_autoreleasePoolPush();
 		OFString *fileName = entry.fileName;
-		of_tar_archive_entry_type_t type = entry.type;
+		OFTarArchiveEntryType type = entry.type;
 		OFString *outFileName, *directory;
 		OFFile *output;
 		OFStream *stream;
 		uint64_t written = 0, size = entry.size;
 		int8_t percent = -1, newPercent;
 
 		if (!all && ![files containsObject: fileName])
 			continue;
 
-		if (type != OF_TAR_ARCHIVE_ENTRY_TYPE_FILE &&
-		    type != OF_TAR_ARCHIVE_ENTRY_TYPE_DIRECTORY) {
+		if (type != OFTarArchiveEntryTypeFile &&
+		    type != OFTarArchiveEntryTypeDirectory) {
 			if (app->_outputLevel >= 0)
 				[of_stdout writeLine: OF_LOCALIZED(
 				    @"skipping_file",
 				    @"Skipping %[file]...",
 				    @"file", fileName)];
@@ -313,12 +313,12 @@
 		if (app->_outputLevel >= 0)
 			[of_stdout writeString: OF_LOCALIZED(@"extracting_file",
 			    @"Extracting %[file]...",
 			    @"file", fileName)];
 
-		if (type == OF_TAR_ARCHIVE_ENTRY_TYPE_DIRECTORY ||
-		    (type == OF_TAR_ARCHIVE_ENTRY_TYPE_FILE &&
+		if (type == OFTarArchiveEntryTypeDirectory ||
+		    (type == OFTarArchiveEntryTypeFile &&
 		    [fileName hasSuffix: @"/"])) {
 			[fileManager createDirectoryAtPath: outFileName
 					     createParents: true];
 			setPermissions(outFileName, entry);
 			setModificationDate(outFileName, entry);
@@ -490,26 +490,26 @@
 		entry.owner = attributes.fileOwnerAccountName;
 		entry.group = attributes.fileGroupOwnerAccountName;
 #endif
 
 		if ([type isEqual: OFFileTypeRegular])
-			entry.type = OF_TAR_ARCHIVE_ENTRY_TYPE_FILE;
+			entry.type = OFTarArchiveEntryTypeFile;
 		else if ([type isEqual: OFFileTypeDirectory]) {
-			entry.type = OF_TAR_ARCHIVE_ENTRY_TYPE_DIRECTORY;
+			entry.type = OFTarArchiveEntryTypeDirectory;
 			entry.size = 0;
 		} else if ([type isEqual: OFFileTypeSymbolicLink]) {
-			entry.type = OF_TAR_ARCHIVE_ENTRY_TYPE_SYMLINK;
+			entry.type = OFTarArchiveEntryTypeSymlink;
 			entry.targetFileName =
 			    attributes.fileSymbolicLinkDestination;
 			entry.size = 0;
 		}
 
 		[entry makeImmutable];
 
 		output = [_archive streamForWritingEntry: entry];
 
-		if (entry.type == OF_TAR_ARCHIVE_ENTRY_TYPE_FILE) {
+		if (entry.type == OFTarArchiveEntryTypeFile) {
 			uint64_t written = 0, size = entry.size;
 			int8_t percent = -1, newPercent;
 
 			OFFile *input = [OFFile fileWithPath: fileName
 							mode: @"r"];