@@ -93,24 +93,24 @@
 
 	@try {
 		_stream = [stream retain];
 
 		if ([mode isEqual: @"r"])
-			_mode = OF_LHA_ARCHIVE_MODE_READ;
+			_mode = OFLHAArchiveModeRead;
 		else if ([mode isEqual: @"w"])
-			_mode = OF_LHA_ARCHIVE_MODE_WRITE;
+			_mode = OFLHAArchiveModeWrite;
 		else if ([mode isEqual: @"a"])
-			_mode = OF_LHA_ARCHIVE_MODE_APPEND;
+			_mode = OFLHAArchiveModeAppend;
 		else
 			@throw [OFInvalidArgumentException exception];
 
-		if ((_mode == OF_LHA_ARCHIVE_MODE_WRITE ||
-		    _mode == OF_LHA_ARCHIVE_MODE_APPEND) &&
+		if ((_mode == OFLHAArchiveModeWrite ||
+		    _mode == OFLHAArchiveModeAppend) &&
 		    ![_stream isKindOfClass: [OFSeekableStream class]])
 			@throw [OFInvalidArgumentException exception];
 
-		if (_mode == OF_LHA_ARCHIVE_MODE_APPEND)
+		if (_mode == OFLHAArchiveModeAppend)
 			[(OFSeekableStream *)_stream seekToOffset: 0
 							   whence: SEEK_END];
 
 		_encoding = OFStringEncodingISO8859_1;
 	} @catch (id e) {
@@ -153,11 +153,11 @@
 {
 	OFLHAArchiveEntry *entry;
 	char header[21];
 	size_t headerLen;
 
-	if (_mode != OF_LHA_ARCHIVE_MODE_READ)
+	if (_mode != OFLHAArchiveModeRead)
 		@throw [OFInvalidArgumentException exception];
 
 	[(OFLHAArchiveFileReadStream *)_lastReturnedStream of_skip];
 	@try {
 		[_lastReturnedStream close];
@@ -194,11 +194,11 @@
 	return entry;
 }
 
 - (OFStream *)streamForReadingCurrentEntry
 {
-	if (_mode != OF_LHA_ARCHIVE_MODE_READ)
+	if (_mode != OFLHAArchiveModeRead)
 		@throw [OFInvalidArgumentException exception];
 
 	if (_lastReturnedStream == nil)
 		@throw [OFInvalidArgumentException exception];
 
@@ -208,12 +208,11 @@
 
 - (OFStream *)streamForWritingEntry: (OFLHAArchiveEntry *)entry
 {
 	OFString *compressionMethod;
 
-	if (_mode != OF_LHA_ARCHIVE_MODE_WRITE &&
-	    _mode != OF_LHA_ARCHIVE_MODE_APPEND)
+	if (_mode != OFLHAArchiveModeWrite && _mode != OFLHAArchiveModeAppend)
 		@throw [OFInvalidArgumentException exception];
 
 	compressionMethod = entry.compressionMethod;
 
 	if (![compressionMethod isEqual: @"-lh0-"] &&