@@ -492,19 +492,19 @@
 	return (id)[[OFUTF8String alloc] initWithUTF16String: string
 						      length: length];
 }
 
 - (instancetype)initWithUTF16String: (const of_char16_t *)string
-			  byteOrder: (of_byte_order_t)byteOrder
+			  byteOrder: (OFByteOrder)byteOrder
 {
 	return (id)[[OFUTF8String alloc] initWithUTF16String: string
 						   byteOrder: byteOrder];
 }
 
 - (instancetype)initWithUTF16String: (const of_char16_t *)string
 			     length: (size_t)length
-			  byteOrder: (of_byte_order_t)byteOrder
+			  byteOrder: (OFByteOrder)byteOrder
 {
 	return (id)[[OFUTF8String alloc] initWithUTF16String: string
 						      length: length
 						   byteOrder: byteOrder];
 }
@@ -520,19 +520,19 @@
 	return (id)[[OFUTF8String alloc] initWithUTF32String: string
 						      length: length];
 }
 
 - (instancetype)initWithUTF32String: (const of_char32_t *)string
-			  byteOrder: (of_byte_order_t)byteOrder
+			  byteOrder: (OFByteOrder)byteOrder
 {
 	return (id)[[OFUTF8String alloc] initWithUTF32String: string
 						   byteOrder: byteOrder];
 }
 
 - (instancetype)initWithUTF32String: (const of_char32_t *)string
 			     length: (size_t)length
-			  byteOrder: (of_byte_order_t)byteOrder
+			  byteOrder: (OFByteOrder)byteOrder
 {
 	return (id)[[OFUTF8String alloc] initWithUTF32String: string
 						      length: length
 						   byteOrder: byteOrder];
 }
@@ -713,19 +713,19 @@
 	return [[[self alloc] initWithUTF16String: string
 					   length: length] autorelease];
 }
 
 + (instancetype)stringWithUTF16String: (const of_char16_t *)string
-			    byteOrder: (of_byte_order_t)byteOrder
+			    byteOrder: (OFByteOrder)byteOrder
 {
 	return [[[self alloc] initWithUTF16String: string
 					byteOrder: byteOrder] autorelease];
 }
 
 + (instancetype)stringWithUTF16String: (const of_char16_t *)string
 			       length: (size_t)length
-			    byteOrder: (of_byte_order_t)byteOrder
+			    byteOrder: (OFByteOrder)byteOrder
 {
 	return [[[self alloc] initWithUTF16String: string
 					   length: length
 					byteOrder: byteOrder] autorelease];
 }
@@ -741,19 +741,19 @@
 	return [[[self alloc] initWithUTF32String: string
 					   length: length] autorelease];
 }
 
 + (instancetype)stringWithUTF32String: (const of_char32_t *)string
-			    byteOrder: (of_byte_order_t)byteOrder
+			    byteOrder: (OFByteOrder)byteOrder
 {
 	return [[[self alloc] initWithUTF32String: string
 					byteOrder: byteOrder] autorelease];
 }
 
 + (instancetype)stringWithUTF32String: (const of_char32_t *)string
 			       length: (size_t)length
-			    byteOrder: (of_byte_order_t)byteOrder
+			    byteOrder: (OFByteOrder)byteOrder
 {
 	return [[[self alloc] initWithUTF32String: string
 					   length: length
 					byteOrder: byteOrder] autorelease];
 }
@@ -897,62 +897,62 @@
 
 - (instancetype)initWithUTF16String: (const of_char16_t *)string
 {
 	return [self initWithUTF16String: string
 				  length: of_string_utf16_length(string)
-			       byteOrder: OF_BYTE_ORDER_NATIVE];
+			       byteOrder: OFByteOrderNative];
 }
 
 - (instancetype)initWithUTF16String: (const of_char16_t *)string
 			     length: (size_t)length
 {
 	return [self initWithUTF16String: string
 				  length: length
-			       byteOrder: OF_BYTE_ORDER_NATIVE];
+			       byteOrder: OFByteOrderNative];
 }
 
 - (instancetype)initWithUTF16String: (const of_char16_t *)string
-			  byteOrder: (of_byte_order_t)byteOrder
+			  byteOrder: (OFByteOrder)byteOrder
 {
 	return [self initWithUTF16String: string
 				  length: of_string_utf16_length(string)
 			       byteOrder: byteOrder];
 }
 
 - (instancetype)initWithUTF16String: (const of_char16_t *)string
 			     length: (size_t)length
-			  byteOrder: (of_byte_order_t)byteOrder
+			  byteOrder: (OFByteOrder)byteOrder
 {
 	OF_INVALID_INIT_METHOD
 }
 
 - (instancetype)initWithUTF32String: (const of_char32_t *)string
 {
 	return [self initWithUTF32String: string
 				  length: of_string_utf32_length(string)
-			       byteOrder: OF_BYTE_ORDER_NATIVE];
+			       byteOrder: OFByteOrderNative];
 }
 
 - (instancetype)initWithUTF32String: (const of_char32_t *)string
 			     length: (size_t)length
 {
 	return [self initWithUTF32String: string
 				  length: length
-			       byteOrder: OF_BYTE_ORDER_NATIVE];
+			       byteOrder: OFByteOrderNative];
 }
 
 - (instancetype)initWithUTF32String: (const of_char32_t *)string
-			  byteOrder: (of_byte_order_t)byteOrder
+			  byteOrder: (OFByteOrder)byteOrder
 {
 	return [self initWithUTF32String: string
 				  length: of_string_utf32_length(string)
 			       byteOrder: byteOrder];
 }
 
 - (instancetype)initWithUTF32String: (const of_char32_t *)string
 			     length: (size_t)length
-			  byteOrder: (of_byte_order_t)byteOrder
+			  byteOrder: (OFByteOrder)byteOrder
 {
 	OF_INVALID_INIT_METHOD
 }
 
 - (instancetype)initWithFormat: (OFConstantString *)format, ...
@@ -2541,21 +2541,21 @@
 	}
 }
 
 - (const of_char16_t *)UTF16String
 {
-	return [self UTF16StringWithByteOrder: OF_BYTE_ORDER_NATIVE];
+	return [self UTF16StringWithByteOrder: OFByteOrderNative];
 }
 
-- (const of_char16_t *)UTF16StringWithByteOrder: (of_byte_order_t)byteOrder
+- (const of_char16_t *)UTF16StringWithByteOrder: (OFByteOrder)byteOrder
 {
 	void *pool = objc_autoreleasePoolPush();
 	const of_unichar_t *characters = self.characters;
 	size_t length = self.length;
 	of_char16_t *buffer;
 	size_t j;
-	bool swap = (byteOrder != OF_BYTE_ORDER_NATIVE);
+	bool swap = (byteOrder != OFByteOrderNative);
 
 	/* Allocate memory for the worst case */
 	buffer = of_alloc((length + 1) * 2, sizeof(of_char16_t));
 
 	j = 0;
@@ -2618,24 +2618,24 @@
 	return UTF16StringLength;
 }
 
 - (const of_char32_t *)UTF32String
 {
-	return [self UTF32StringWithByteOrder: OF_BYTE_ORDER_NATIVE];
+	return [self UTF32StringWithByteOrder: OFByteOrderNative];
 }
 
-- (const of_char32_t *)UTF32StringWithByteOrder: (of_byte_order_t)byteOrder
+- (const of_char32_t *)UTF32StringWithByteOrder: (OFByteOrder)byteOrder
 {
 	size_t length = self.length;
 	of_char32_t *buffer;
 
 	buffer = of_alloc(length + 1, sizeof(of_char32_t));
 	@try {
 		[self getCharacters: buffer inRange: of_range(0, length)];
 		buffer[length] = 0;
 
-		if (byteOrder != OF_BYTE_ORDER_NATIVE)
+		if (byteOrder != OFByteOrderNative)
 			for (size_t i = 0; i < length; i++)
 				buffer[i] = OF_BSWAP32(buffer[i]);
 
 		return [[OFData dataWithItemsNoCopy: buffer
 					      count: length + 1