Index: src/OFString.h
==================================================================
--- src/OFString.h
+++ src/OFString.h
@@ -785,11 +785,11 @@
  * \return A double with the value of the string
  */
 - (double)doubleValue;
 
 /**
- * \brief Returns the string as an array of of_unichar_ts.
+ * \brief Returns the string as an array of Unicode characters.
  *
  * The result is valid until the autorelease pool is released. If you want to
  * use the result outside the scope of the current autorelease pool, you have to
  * copy it.
  *

Index: src/OFString.m
==================================================================
--- src/OFString.m
+++ src/OFString.m
@@ -713,11 +713,11 @@
 }
 
 - initWithUTF16String: (const uint16_t*)string
 {
 	return [self initWithUTF16String: string
-			       byteOrder: OF_ENDIANESS_NATIVE
+			       byteOrder: OF_ENDIANESS_BIG_ENDIAN
 				  length: of_utf16_string_length(string)];
 }
 
 - initWithUTF16String: (const uint16_t*)string
 	    byteOrder: (of_endianess_t)byteOrder
@@ -729,11 +729,11 @@
 
 - initWithUTF16String: (const uint16_t*)string
 	       length: (size_t)length
 {
 	return [self initWithUTF16String: string
-			       byteOrder: OF_ENDIANESS_NATIVE
+			       byteOrder: OF_ENDIANESS_BIG_ENDIAN
 				  length: length];
 }
 
 - initWithUTF16String: (const uint16_t*)string
 	    byteOrder: (of_endianess_t)byteOrder