@@ -58,11 +58,11 @@
 typedef char32_t of_char32_t;
 #else
 typedef uint_least16_t of_char16_t;
 typedef uint_least32_t of_char32_t;
 #endif
-typedef of_char32_t of_unichar_t;
+typedef of_char32_t OFUnichar;
 
 /**
  * @brief The encoding of a string.
  */
 typedef enum of_string_encoding_t {
@@ -215,11 +215,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_unichar_t *characters
+@property (readonly, nonatomic) const OFUnichar *characters
     OF_RETURNS_INNER_POINTER;
 
 /**
  * @brief The string in UTF-16 encoding with native byte order.
  *
@@ -390,11 +390,11 @@
  *
  * @param characters An array of Unicode characters
  * @param length The length of the Unicode character array
  * @return A new autoreleased OFString
  */
-+ (instancetype)stringWithCharacters: (const of_unichar_t *)characters
++ (instancetype)stringWithCharacters: (const OFUnichar *)characters
 			      length: (size_t)length;
 
 /**
  * @brief Creates a new OFString from a UTF-16 encoded string.
  *
@@ -485,12 +485,12 @@
 
 /**
  * @brief Creates a new OFString from a format string.
  *
  * See printf for the format syntax. As an addition, `%@` is available as
- * format specifier for objects, `%C` for `of_unichar_t` and `%S` for
- * `const of_unichar_t *`.
+ * format specifier for objects, `%C` for `OFUnichar` and `%S` for
+ * `const OFUnichar *`.
  *
  * @param format A string used as format to initialize the OFString
  * @return A new autoreleased OFString
  */
 + (instancetype)stringWithFormat: (OFConstantString *)format, ...;
@@ -648,11 +648,11 @@
  *
  * @param characters An array of Unicode characters
  * @param length The length of the Unicode character array
  * @return An initialized OFString
  */
-- (instancetype)initWithCharacters: (const of_unichar_t *)characters
+- (instancetype)initWithCharacters: (const OFUnichar *)characters
 			    length: (size_t)length;
 
 /**
  * @brief Initializes an already allocated OFString with a UTF-16 string.
  *
@@ -743,12 +743,12 @@
 
 /**
  * @brief Initializes an already allocated OFString with a format string.
  *
  * See printf for the format syntax. As an addition, `%@` is available as
- * format specifier for objects, `%C` for `of_unichar_t` and `%S` for
- * `const of_unichar_t *`.
+ * format specifier for objects, `%C` for `OFUnichar` and `%S` for
+ * `const OFUnichar *`.
  *
  * @param format A string used as format to initialize the OFString
  * @return An initialized OFString
  */
 - (instancetype)initWithFormat: (OFConstantString *)format, ...;
@@ -755,12 +755,12 @@
 
 /**
  * @brief Initializes an already allocated OFString with a format string.
  *
  * See printf for the format syntax. As an addition, `%@` is available as
- * format specifier for objects, `%C` for `of_unichar_t` and `%S` for
- * `const of_unichar_t *`.
+ * format specifier for objects, `%C` for `OFUnichar` and `%S` for
+ * `const OFUnichar *`.
  *
  * @param format A string used as format to initialize the OFString
  * @param arguments The arguments used in the format string
  * @return An initialized OFString
  */
@@ -903,20 +903,20 @@
  * @brief Returns the Unicode character at the specified index.
  *
  * @param index The index of the Unicode character to return
  * @return The Unicode character at the specified index
  */
-- (of_unichar_t)characterAtIndex: (size_t)index;
+- (OFUnichar)characterAtIndex: (size_t)index;
 
 /**
  * @brief Copies the Unicode characters in the specified range to the specified
  *	  buffer.
  *
  * @param buffer The buffer to store the Unicode characters
  * @param range The range of the Unicode characters to copy
  */
-- (void)getCharacters: (of_unichar_t *)buffer inRange: (OFRange)range;
+- (void)getCharacters: (OFUnichar *)buffer inRange: (OFRange)range;
 
 /**
  * @brief Returns the range of the first occurrence of the string.
  *
  * @param string The string to search
@@ -1279,12 +1279,12 @@
 #ifdef __cplusplus
 extern "C" {
 #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(of_unichar_t, char *);
-extern ssize_t of_string_utf8_decode(const char *, size_t, of_unichar_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 *);
 #ifdef __cplusplus
 }
 #endif