@@ -505,11 +505,11 @@
 	return self;
 }
 
 - (instancetype)initWithUTF16String: (const of_char16_t *)string
 			     length: (size_t)length
-			  byteOrder: (of_byte_order_t)byteOrder
+			  byteOrder: (OFByteOrder)byteOrder
 {
 	self = [super init];
 
 	@try {
 		size_t j;
@@ -520,11 +520,11 @@
 			length--;
 		} else if (length > 0 && *string == 0xFFFE) {
 			swap = true;
 			string++;
 			length--;
-		} else if (byteOrder != OF_BYTE_ORDER_NATIVE)
+		} else if (byteOrder != OFByteOrderNative)
 			swap = true;
 
 		_s = &_storage;
 
 		_s->cString = of_alloc((length * 4) + 1, 1);
@@ -590,11 +590,11 @@
 	return self;
 }
 
 - (instancetype)initWithUTF32String: (const of_char32_t *)characters
 			     length: (size_t)length
-			  byteOrder: (of_byte_order_t)byteOrder
+			  byteOrder: (OFByteOrder)byteOrder
 {
 	self = [super init];
 
 	@try {
 		size_t j;
@@ -605,11 +605,11 @@
 			length--;
 		} else if (length > 0 && *characters == 0xFFFE0000) {
 			swap = true;
 			characters++;
 			length--;
-		} else if (byteOrder != OF_BYTE_ORDER_NATIVE)
+		} else if (byteOrder != OFByteOrderNative)
 			swap = true;
 
 		_s = &_storage;
 
 		_s->cString = of_alloc((length * 4) + 1, 1);
@@ -1177,11 +1177,11 @@
 				      count: _s->length
 				   itemSize: sizeof(of_unichar_t)
 			       freeWhenDone: true] items];
 }
 
-- (const of_char32_t *)UTF32StringWithByteOrder: (of_byte_order_t)byteOrder
+- (const of_char32_t *)UTF32StringWithByteOrder: (OFByteOrder)byteOrder
 {
 	of_char32_t *buffer = of_alloc(_s->length + 1, sizeof(of_char32_t));
 	size_t i = 0, j = 0;
 
 	while (i < _s->cStringLength) {
@@ -1194,11 +1194,11 @@
 		if (cLen <= 0 || c > 0x10FFFF) {
 			free(buffer);
 			@throw [OFInvalidEncodingException exception];
 		}
 
-		if (byteOrder != OF_BYTE_ORDER_NATIVE)
+		if (byteOrder != OFByteOrderNative)
 			buffer[j++] = OF_BSWAP32(c);
 		else
 			buffer[j++] = c;
 
 		i += cLen;