@@ -29,23 +29,23 @@
  */
 OF_SUBCLASSING_RESTRICTED
 @interface OFTarArchive: OFObject
 {
 	OFStream *_stream;
-	enum {
-		OF_TAR_ARCHIVE_MODE_READ,
-		OF_TAR_ARCHIVE_MODE_WRITE,
-		OF_TAR_ARCHIVE_MODE_APPEND
+	enum OFTarArchiveMode {
+		OFTarArchiveModeRead,
+		OFTarArchiveModeWrite,
+		OFTarArchiveModeAppend
 	} _mode;
-	of_string_encoding_t _encoding;
+	OFStringEncoding _encoding;
 	OFStream *_Nullable _lastReturnedStream;
 }
 
 /**
  * @brief The encoding to use for the archive. Defaults to UTF-8.
  */
-@property (nonatomic) of_string_encoding_t encoding;
+@property (nonatomic) OFStringEncoding encoding;
 
 /**
  * @brief A stream for reading the current entry.
  *
  * @note This is only available in read mode.