@@ -310,11 +310,11 @@
 
 	return self;
 }
 
 - initWithUnicodeString: (const of_unichar_t*)string
-	      byteOrder: (of_endianess_t)byteOrder
+	      byteOrder: (of_byte_order_t)byteOrder
 		 length: (size_t)length
 {
 	self = [super init];
 
 	@try {
@@ -326,11 +326,11 @@
 			length--;
 		} else if (length > 0 && *string == 0xFFFE0000) {
 			swap = YES;
 			string++;
 			length--;
-		} else if (byteOrder != OF_ENDIANESS_NATIVE)
+		} else if (byteOrder != OF_BYTE_ORDER_NATIVE)
 			swap = YES;
 
 		s = &s_store;
 
 		s->cStringLength = length;
@@ -392,11 +392,11 @@
 
 	return self;
 }
 
 - initWithUTF16String: (const uint16_t*)string
-	    byteOrder: (of_endianess_t)byteOrder
+	    byteOrder: (of_byte_order_t)byteOrder
 	       length: (size_t)length
 {
 	self = [super init];
 
 	@try {
@@ -408,11 +408,11 @@
 			length--;
 		} else if (length > 0 && *string == 0xFFFE) {
 			swap = YES;
 			string++;
 			length--;
-		} else if (byteOrder != OF_ENDIANESS_NATIVE)
+		} else if (byteOrder != OF_BYTE_ORDER_NATIVE)
 			swap = YES;
 
 		s = &s_store;
 
 		s->cStringLength = length;