@@ -356,11 +356,11 @@
 {
 	return (id)[[OFString_UTF8 alloc] initWithUnicodeString: string];
 }
 
 - initWithUnicodeString: (const of_unichar_t*)string
-	      byteOrder: (of_endianess_t)byteOrder
+	      byteOrder: (of_byte_order_t)byteOrder
 {
 	return (id)[[OFString_UTF8 alloc] initWithUnicodeString: string
 						      byteOrder: byteOrder];
 }
 
@@ -370,11 +370,11 @@
 	return (id)[[OFString_UTF8 alloc] initWithUnicodeString: string
 							 length: length];
 }
 
 - initWithUnicodeString: (const of_unichar_t*)string
-	      byteOrder: (of_endianess_t)byteOrder
+	      byteOrder: (of_byte_order_t)byteOrder
 		 length: (size_t)length
 {
 	return (id)[[OFString_UTF8 alloc] initWithUnicodeString: string
 						      byteOrder: byteOrder
 							 length: length];
@@ -384,11 +384,11 @@
 {
 	return (id)[[OFString_UTF8 alloc] initWithUTF16String: string];
 }
 
 - initWithUTF16String: (const uint16_t*)string
-	    byteOrder: (of_endianess_t)byteOrder
+	    byteOrder: (of_byte_order_t)byteOrder
 {
 	return (id)[[OFString_UTF8 alloc] initWithUTF16String: string
 						    byteOrder: byteOrder];
 }
 
@@ -398,11 +398,11 @@
 	return (id)[[OFString_UTF8 alloc] initWithUTF16String: string
 						       length: length];
 }
 
 - initWithUTF16String: (const uint16_t*)string
-	    byteOrder: (of_endianess_t)byteOrder
+	    byteOrder: (of_byte_order_t)byteOrder
 	       length: (size_t)length
 {
 	return (id)[[OFString_UTF8 alloc] initWithUTF16String: string
 						    byteOrder: byteOrder
 						       length: length];
@@ -557,11 +557,11 @@
 {
 	return [[[self alloc] initWithUnicodeString: string] autorelease];
 }
 
 + (instancetype)stringWithUnicodeString: (const of_unichar_t*)string
-			      byteOrder: (of_endianess_t)byteOrder
+			      byteOrder: (of_byte_order_t)byteOrder
 {
 	return [[[self alloc] initWithUnicodeString: string
 					  byteOrder: byteOrder] autorelease];
 }
 
@@ -571,11 +571,11 @@
 	return [[[self alloc] initWithUnicodeString: string
 					     length: length] autorelease];
 }
 
 + (instancetype)stringWithUnicodeString: (const of_unichar_t*)string
-			      byteOrder: (of_endianess_t)byteOrder
+			      byteOrder: (of_byte_order_t)byteOrder
 				 length: (size_t)length
 {
 	return [[[self alloc] initWithUnicodeString: string
 					  byteOrder: byteOrder
 					     length: length] autorelease];
@@ -585,11 +585,11 @@
 {
 	return [[[self alloc] initWithUTF16String: string] autorelease];
 }
 
 + (instancetype)stringWithUTF16String: (const uint16_t*)string
-			    byteOrder: (of_endianess_t)byteOrder
+			    byteOrder: (of_byte_order_t)byteOrder
 {
 	return [[[self alloc] initWithUTF16String: string
 					byteOrder: byteOrder] autorelease];
 }
 
@@ -599,11 +599,11 @@
 	return [[[self alloc] initWithUTF16String: string
 					   length: length] autorelease];
 }
 
 + (instancetype)stringWithUTF16String: (const uint16_t*)string
-			    byteOrder: (of_endianess_t)byteOrder
+			    byteOrder: (of_byte_order_t)byteOrder
 			       length: (size_t)length
 {
 	return [[[self alloc] initWithUTF16String: string
 					byteOrder: byteOrder
 					   length: length] autorelease];
@@ -719,16 +719,16 @@
 }
 
 - initWithUnicodeString: (const of_unichar_t*)string
 {
 	return [self initWithUnicodeString: string
-				 byteOrder: OF_ENDIANESS_NATIVE
+				 byteOrder: OF_BYTE_ORDER_NATIVE
 				    length: of_unicode_string_length(string)];
 }
 
 - initWithUnicodeString: (const of_unichar_t*)string
-	      byteOrder: (of_endianess_t)byteOrder
+	      byteOrder: (of_byte_order_t)byteOrder
 {
 	return [self initWithUnicodeString: string
 				 byteOrder: byteOrder
 				    length: of_unicode_string_length(string)];
 }
@@ -735,16 +735,16 @@
 
 - initWithUnicodeString: (const of_unichar_t*)string
 		 length: (size_t)length
 {
 	return [self initWithUnicodeString: string
-				 byteOrder: OF_ENDIANESS_NATIVE
+				 byteOrder: OF_BYTE_ORDER_NATIVE
 				    length: length];
 }
 
 - initWithUnicodeString: (const of_unichar_t*)string
-	      byteOrder: (of_endianess_t)byteOrder
+	      byteOrder: (of_byte_order_t)byteOrder
 		 length: (size_t)length
 {
 	Class c = [self class];
 	[self release];
 	@throw [OFNotImplementedException exceptionWithClass: c
@@ -752,16 +752,16 @@
 }
 
 - initWithUTF16String: (const uint16_t*)string
 {
 	return [self initWithUTF16String: string
-			       byteOrder: OF_ENDIANESS_BIG_ENDIAN
+			       byteOrder: OF_BYTE_ORDER_BIG_ENDIAN
 				  length: of_utf16_string_length(string)];
 }
 
 - initWithUTF16String: (const uint16_t*)string
-	    byteOrder: (of_endianess_t)byteOrder
+	    byteOrder: (of_byte_order_t)byteOrder
 {
 	return [self initWithUTF16String: string
 			       byteOrder: byteOrder
 				  length: of_utf16_string_length(string)];
 }
@@ -768,16 +768,16 @@
 
 - initWithUTF16String: (const uint16_t*)string
 	       length: (size_t)length
 {
 	return [self initWithUTF16String: string
-			       byteOrder: OF_ENDIANESS_BIG_ENDIAN
+			       byteOrder: OF_BYTE_ORDER_BIG_ENDIAN
 				  length: length];
 }
 
 - initWithUTF16String: (const uint16_t*)string
-	    byteOrder: (of_endianess_t)byteOrder
+	    byteOrder: (of_byte_order_t)byteOrder
 	       length: (size_t)length
 {
 	Class c = [self class];
 	[self release];
 	@throw [OFNotImplementedException exceptionWithClass: c