@@ -52,17 +52,17 @@
 #else
 typedef void OFString;
 #endif
 
 #if defined(__cplusplus) && __cplusplus >= 201103L
-typedef char16_t of_char16_t;
-typedef char32_t of_char32_t;
+typedef char16_t OFChar16;
+typedef char32_t OFChar32;
 #else
-typedef uint_least16_t of_char16_t;
-typedef uint_least32_t of_char32_t;
+typedef uint_least16_t OFChar16;
+typedef uint_least32_t OFChar32;
 #endif
-typedef of_char32_t OFUnichar;
+typedef OFChar32 OFUnichar;
 
 /**
  * @brief The encoding of a string.
  */
 typedef enum of_string_encoding_t {
@@ -225,11 +225,11 @@
  *
  * 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.
  */
-@property (readonly, nonatomic) const of_char16_t *UTF16String
+@property (readonly, nonatomic) const OFChar16 *UTF16String
     OF_RETURNS_INNER_POINTER;
 
 /**
  * @brief The length of the string in UTF-16 characters.
  */
@@ -240,11 +240,11 @@
  *
  * 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.
  */
-@property (readonly, nonatomic) const of_char32_t *UTF32String
+@property (readonly, nonatomic) const OFChar32 *UTF32String
     OF_RETURNS_INNER_POINTER;
 
 /**
  * @brief The string with leading whitespaces deleted.
  */
@@ -399,21 +399,21 @@
  * @brief Creates a new OFString from a UTF-16 encoded string.
  *
  * @param string The UTF-16 string
  * @return A new autoreleased OFString
  */
-+ (instancetype)stringWithUTF16String: (const of_char16_t *)string;
++ (instancetype)stringWithUTF16String: (const OFChar16 *)string;
 
 /**
  * @brief Creates a new OFString from a UTF-16 encoded string with the
  *	  specified length.
  *
  * @param string The UTF-16 string
  * @param length The length of the UTF-16 string
  * @return A new autoreleased OFString
  */
-+ (instancetype)stringWithUTF16String: (const of_char16_t *)string
++ (instancetype)stringWithUTF16String: (const OFChar16 *)string
 			       length: (size_t)length;
 
 /**
  * @brief Creates a new OFString from a UTF-16 encoded string, assuming the
  *	  specified byte order if no byte order mark is found.
@@ -420,11 +420,11 @@
  *
  * @param string The UTF-16 string
  * @param byteOrder The byte order to assume if there is no byte order mark
  * @return A new autoreleased OFString
  */
-+ (instancetype)stringWithUTF16String: (const of_char16_t *)string
++ (instancetype)stringWithUTF16String: (const OFChar16 *)string
 			    byteOrder: (OFByteOrder)byteOrder;
 
 /**
  * @brief Creates a new OFString from a UTF-16 encoded string with the
  *	  specified length, assuming the specified byte order if no byte order
@@ -433,31 +433,31 @@
  * @param string The UTF-16 string
  * @param length The length of the UTF-16 string
  * @param byteOrder The byte order to assume if there is no byte order mark
  * @return A new autoreleased OFString
  */
-+ (instancetype)stringWithUTF16String: (const of_char16_t *)string
++ (instancetype)stringWithUTF16String: (const OFChar16 *)string
 			       length: (size_t)length
 			    byteOrder: (OFByteOrder)byteOrder;
 
 /**
  * @brief Creates a new OFString from a UTF-32 encoded string.
  *
  * @param string The UTF-32 string
  * @return A new autoreleased OFString
  */
-+ (instancetype)stringWithUTF32String: (const of_char32_t *)string;
++ (instancetype)stringWithUTF32String: (const OFChar32 *)string;
 
 /**
  * @brief Creates a new OFString from a UTF-32 encoded string with the
  *	  specified length.
  *
  * @param string The UTF-32 string
  * @param length The length of the UTF-32 string
  * @return A new autoreleased OFString
  */
-+ (instancetype)stringWithUTF32String: (const of_char32_t *)string
++ (instancetype)stringWithUTF32String: (const OFChar32 *)string
 			       length: (size_t)length;
 
 /**
  * @brief Creates a new OFString from a UTF-32 encoded string, assuming the
  *	  specified byte order if no byte order mark is found.
@@ -464,11 +464,11 @@
  *
  * @param string The UTF-32 string
  * @param byteOrder The byte order to assume if there is no byte order mark
  * @return A new autoreleased OFString
  */
-+ (instancetype)stringWithUTF32String: (const of_char32_t *)string
++ (instancetype)stringWithUTF32String: (const OFChar32 *)string
 			    byteOrder: (OFByteOrder)byteOrder;
 
 /**
  * @brief Creates a new OFString from a UTF-32 encoded string with the
  *	  specified length, assuming the specified byte order if no byte order
@@ -477,11 +477,11 @@
  * @param string The UTF-32 string
  * @param length The length of the UTF-32 string
  * @param byteOrder The byte order to assume if there is no byte order mark
  * @return A new autoreleased OFString
  */
-+ (instancetype)stringWithUTF32String: (const of_char32_t *)string
++ (instancetype)stringWithUTF32String: (const OFChar32 *)string
 			       length: (size_t)length
 			    byteOrder: (OFByteOrder)byteOrder;
 
 /**
  * @brief Creates a new OFString from a format string.
@@ -657,21 +657,21 @@
  * @brief Initializes an already allocated OFString with a UTF-16 string.
  *
  * @param string The UTF-16 string
  * @return An initialized OFString
  */
-- (instancetype)initWithUTF16String: (const of_char16_t *)string;
+- (instancetype)initWithUTF16String: (const OFChar16 *)string;
 
 /**
  * @brief Initializes an already allocated OFString with a UTF-16 string with
  *	  the specified length.
  *
  * @param string The UTF-16 string
  * @param length The length of the UTF-16 string
  * @return An initialized OFString
  */
-- (instancetype)initWithUTF16String: (const of_char16_t *)string
+- (instancetype)initWithUTF16String: (const OFChar16 *)string
 			     length: (size_t)length;
 
 /**
  * @brief Initializes an already allocated OFString with a UTF-16 string,
  *	  assuming the specified byte order if no byte order mark is found.
@@ -678,11 +678,11 @@
  *
  * @param string The UTF-16 string
  * @param byteOrder The byte order to assume if there is no byte order mark
  * @return An initialized OFString
  */
-- (instancetype)initWithUTF16String: (const of_char16_t *)string
+- (instancetype)initWithUTF16String: (const OFChar16 *)string
 			  byteOrder: (OFByteOrder)byteOrder;
 
 /**
  * @brief Initializes an already allocated OFString with a UTF-16 string with
  *	  the specified length, assuming the specified byte order if no byte
@@ -691,31 +691,31 @@
  * @param string The UTF-16 string
  * @param length The length of the UTF-16 string
  * @param byteOrder The byte order to assume if there is no byte order mark
  * @return An initialized OFString
  */
-- (instancetype)initWithUTF16String: (const of_char16_t *)string
+- (instancetype)initWithUTF16String: (const OFChar16 *)string
 			     length: (size_t)length
 			  byteOrder: (OFByteOrder)byteOrder;
 
 /**
  * @brief Initializes an already allocated OFString with a UTF-32 string.
  *
  * @param string The UTF-32 string
  * @return An initialized OFString
  */
-- (instancetype)initWithUTF32String: (const of_char32_t *)string;
+- (instancetype)initWithUTF32String: (const OFChar32 *)string;
 
 /**
  * @brief Initializes an already allocated OFString with a UTF-32 string with
  *	  the specified length
  *
  * @param string The UTF-32 string
  * @param length The length of the UTF-32 string
  * @return An initialized OFString
  */
-- (instancetype)initWithUTF32String: (const of_char32_t *)string
+- (instancetype)initWithUTF32String: (const OFChar32 *)string
 			     length: (size_t)length;
 
 /**
  * @brief Initializes an already allocated OFString with a UTF-32 string,
  *	  assuming the specified byte order if no byte order mark is found.
@@ -722,11 +722,11 @@
  *
  * @param string The UTF-32 string
  * @param byteOrder The byte order to assume if there is no byte order mark
  * @return An initialized OFString
  */
-- (instancetype)initWithUTF32String: (const of_char32_t *)string
+- (instancetype)initWithUTF32String: (const OFChar32 *)string
 			  byteOrder: (OFByteOrder)byteOrder;
 
 /**
  * @brief Initializes an already allocated OFString with a UTF-32 string with
  *	  the specified length, assuming the specified byte order if no byte
@@ -735,11 +735,11 @@
  * @param string The UTF-32 string
  * @param length The length of the UTF-32 string
  * @param byteOrder The byte order to assume if there is no byte order mark
  * @return An initialized OFString
  */
-- (instancetype)initWithUTF32String: (const of_char32_t *)string
+- (instancetype)initWithUTF32String: (const OFChar32 *)string
 			     length: (size_t)length
 			  byteOrder: (OFByteOrder)byteOrder;
 
 /**
  * @brief Initializes an already allocated OFString with a format string.
@@ -1206,11 +1206,11 @@
  * copy it.
  *
  * @param byteOrder The byte order for the UTF-16 encoding
  * @return The string in UTF-16 encoding with the specified byte order
  */
-- (const of_char16_t *)UTF16StringWithByteOrder: (OFByteOrder)byteOrder
+- (const OFChar16 *)UTF16StringWithByteOrder: (OFByteOrder)byteOrder
     OF_RETURNS_INNER_POINTER;
 
 /**
  * @brief Returns the string in UTF-32 encoding with the specified byte order.
  *
@@ -1219,11 +1219,11 @@
  * copy it.
  *
  * @param byteOrder The byte order for the UTF-32 encoding
  * @return The string in UTF-32 encoding with the specified byte order
  */
-- (const of_char32_t *)UTF32StringWithByteOrder: (OFByteOrder)byteOrder
+- (const OFChar32 *)UTF32StringWithByteOrder: (OFByteOrder)byteOrder
     OF_RETURNS_INNER_POINTER;
 
 /**
  * @brief Returns the string as OFData with the specified encoding.
  *
@@ -1281,12 +1281,12 @@
 #endif
 extern of_string_encoding_t of_string_parse_encoding(OFString *);
 extern OFString *_Nullable of_string_name_of_encoding(of_string_encoding_t);
 extern size_t of_string_utf8_encode(OFUnichar, char *);
 extern ssize_t of_string_utf8_decode(const char *, size_t, OFUnichar *);
-extern size_t of_string_utf16_length(const of_char16_t *);
-extern size_t of_string_utf32_length(const of_char32_t *);
+extern size_t of_string_utf16_length(const OFChar16 *);
+extern size_t of_string_utf32_length(const OFChar32 *);
 #ifdef __cplusplus
 }
 #endif
 
 OF_ASSUME_NONNULL_END