@@ -13,30 +13,30 @@
  * file.
  */
 
 #import "OFString.h"
 
-#define OF_UNICODE_UPPERCASE_TABLE_SIZE 0x1EA
-#define OF_UNICODE_LOWERCASE_TABLE_SIZE 0x1EA
-#define OF_UNICODE_TITLECASE_TABLE_SIZE 0x1EA
-#define OF_UNICODE_CASEFOLDING_TABLE_SIZE 0x1EA
-#define OF_UNICODE_DECOMPOSITION_TABLE_SIZE 0x2FB
-#define OF_UNICODE_DECOMPOSITION_COMPAT_TABLE_SIZE 0x2FB
+#define OFUnicodeUppercaseTableSize 0x1EA
+#define OFUnicodeLowercaseTableSize 0x1EA
+#define OFUnicodeTitlecaseTableSize 0x1EA
+#define OFUnicodeCaseFoldingTableSize 0x1EA
+#define OFUnicodeDecompositionTableSize 0x2FB
+#define OFUnicodeDecompositionCompatTableSize 0x2FB
 
 #ifdef __cplusplus
 extern "C" {
 #endif
-extern const of_unichar_t *const _Nonnull
-    of_unicode_uppercase_table[OF_UNICODE_UPPERCASE_TABLE_SIZE];
-extern const of_unichar_t *const _Nonnull
-    of_unicode_lowercase_table[OF_UNICODE_LOWERCASE_TABLE_SIZE];
-extern const of_unichar_t *const _Nonnull
-    of_unicode_titlecase_table[OF_UNICODE_TITLECASE_TABLE_SIZE];
-extern const of_unichar_t *const _Nonnull
-    of_unicode_casefolding_table[OF_UNICODE_CASEFOLDING_TABLE_SIZE];
-extern const char *const _Nullable *const _Nonnull
-    of_unicode_decomposition_table[OF_UNICODE_DECOMPOSITION_TABLE_SIZE];
-extern const char *const _Nullable *const _Nonnull
-    of_unicode_decomposition_compat_table[OF_UNICODE_DECOMPOSITION_COMPAT_TABLE_SIZE];
+extern const OFUnichar *const _Nonnull
+    OFUnicodeUppercaseTable[OFUnicodeUppercaseTableSize];
+extern const OFUnichar *const _Nonnull
+    OFUnicodeLowercaseTable[OFUnicodeLowercaseTableSize];
+extern const OFUnichar *const _Nonnull
+    OFUnicodeTitlecaseTable[OFUnicodeTitlecaseTableSize];
+extern const OFUnichar *const _Nonnull
+    OFUnicodeCaseFoldingTable[OFUnicodeCaseFoldingTableSize];
+extern const char *const _Nullable *const _Nonnull
+    OFUnicodeDecompositionTable[OFUnicodeDecompositionTableSize];
+extern const char *const _Nullable *const _Nonnull
+    OFUnicodeDecompositionCompatTable[OFUnicodeDecompositionCompatTableSize];
 #ifdef __cplusplus
 }
 #endif