@@ -1733,11 +1733,11 @@
 	4328, 4329, 4330, 4331, 4332, 4333, 4334, 4335,
 	4336, 4337, 4338, 4339, 4340, 4341, 4342, 4343,
 	4344, 4345, 4346, 0, 0, 4349, 4350, 4351,
 };
 
-static const OFUnichar casefoldingPage0[0x100] = {
+static const OFUnichar caseFoldingPage0[0x100] = {
 	0, 0, 0, 0, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0,
@@ -1768,11 +1768,11 @@
 	0, 0, 0, 0, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0,
 };
 
-static const OFUnichar casefoldingPage1[0x100] = {
+static const OFUnichar caseFoldingPage1[0x100] = {
 	257, 0, 259, 0, 261, 0, 263, 0,
 	265, 0, 267, 0, 269, 0, 271, 0,
 	273, 0, 275, 0, 277, 0, 279, 0,
 	281, 0, 283, 0, 285, 0, 287, 0,
 	289, 0, 291, 0, 293, 0, 295, 0,
@@ -1803,11 +1803,11 @@
 	489, 0, 491, 0, 493, 0, 495, 0,
 	0, 499, 499, 0, 501, 0, 405, 447,
 	505, 0, 507, 0, 509, 0, 511, 0,
 };
 
-static const OFUnichar casefoldingPage3[0x100] = {
+static const OFUnichar caseFoldingPage3[0x100] = {
 	0, 0, 0, 0, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0,
@@ -1838,11 +1838,11 @@
 	1001, 0, 1003, 0, 1005, 0, 1007, 0,
 	954, 961, 0, 0, 952, 949, 0, 1016,
 	0, 1010, 1019, 0, 0, 891, 892, 893,
 };
 
-static const OFUnichar casefoldingPage19[0x100] = {
+static const OFUnichar caseFoldingPage19[0x100] = {
 	0, 0, 0, 0, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0,
@@ -1873,11 +1873,11 @@
 	0, 0, 0, 0, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0,
 	5104, 5105, 5106, 5107, 5108, 5109, 0, 0,
 };
 
-static const OFUnichar casefoldingPage28[0x100] = {
+static const OFUnichar caseFoldingPage28[0x100] = {
 	0, 0, 0, 0, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0,
@@ -1908,11 +1908,11 @@
 	0, 0, 0, 0, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0,
 };
 
-static const OFUnichar casefoldingPage30[0x100] = {
+static const OFUnichar caseFoldingPage30[0x100] = {
 	7681, 0, 7683, 0, 7685, 0, 7687, 0,
 	7689, 0, 7691, 0, 7693, 0, 7695, 0,
 	7697, 0, 7699, 0, 7701, 0, 7703, 0,
 	7705, 0, 7707, 0, 7709, 0, 7711, 0,
 	7713, 0, 7715, 0, 7717, 0, 7719, 0,
@@ -1943,11 +1943,11 @@
 	7913, 0, 7915, 0, 7917, 0, 7919, 0,
 	7921, 0, 7923, 0, 7925, 0, 7927, 0,
 	7929, 0, 7931, 0, 7933, 0, 7935, 0,
 };
 
-static const OFUnichar casefoldingPage31[0x100] = {
+static const OFUnichar caseFoldingPage31[0x100] = {
 	0, 0, 0, 0, 0, 0, 0, 0,
 	7936, 7937, 7938, 7939, 7940, 7941, 7942, 7943,
 	0, 0, 0, 0, 0, 0, 0, 0,
 	7952, 7953, 7954, 7955, 7956, 7957, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0,
@@ -1978,11 +1978,11 @@
 	8160, 8161, 8058, 8059, 8165, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0,
 	8056, 8057, 8060, 8061, 8179, 0, 0, 0,
 };
 
-static const OFUnichar casefoldingPage171[0x100] = {
+static const OFUnichar caseFoldingPage171[0x100] = {
 	0, 0, 0, 0, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0,
@@ -12362,11 +12362,11 @@
 	NULL, NULL,
 	NULL, NULL,
 	NULL, NULL,
 };
 
-const OFUnichar *const of_unicode_uppercase_table[0x1EA] = {
+const OFUnichar *const OFUnicodeUppercaseTable[0x1EA] = {
 	uppercasePage0, uppercasePage1, uppercasePage2, uppercasePage3,
 	uppercasePage4, uppercasePage5, emptyPage, emptyPage,
 	emptyPage, emptyPage, emptyPage, emptyPage,
 	emptyPage, emptyPage, emptyPage, emptyPage,
 	uppercasePage16, emptyPage, emptyPage, uppercasePage19,
@@ -12488,11 +12488,11 @@
 	emptyPage, emptyPage, emptyPage, emptyPage,
 	emptyPage, emptyPage, emptyPage, emptyPage,
 	emptyPage, uppercasePage489
 };
 
-const OFUnichar *const of_unicode_lowercase_table[0x1EA] = {
+const OFUnichar *const OFUnicodeLowercaseTable[0x1EA] = {
 	lowercasePage0, lowercasePage1, lowercasePage2, lowercasePage3,
 	lowercasePage4, lowercasePage5, emptyPage, emptyPage,
 	emptyPage, emptyPage, emptyPage, emptyPage,
 	emptyPage, emptyPage, emptyPage, emptyPage,
 	lowercasePage16, emptyPage, emptyPage, lowercasePage19,
@@ -12614,11 +12614,11 @@
 	emptyPage, emptyPage, emptyPage, emptyPage,
 	emptyPage, emptyPage, emptyPage, emptyPage,
 	emptyPage, lowercasePage489
 };
 
-const OFUnichar *const of_unicode_titlecase_table[0x1EA] = {
+const OFUnichar *const OFUnicodeTitlecaseTable[0x1EA] = {
 	uppercasePage0, titlecasePage1, uppercasePage2, uppercasePage3,
 	uppercasePage4, uppercasePage5, emptyPage, emptyPage,
 	emptyPage, emptyPage, emptyPage, emptyPage,
 	emptyPage, emptyPage, emptyPage, emptyPage,
 	titlecasePage16, emptyPage, emptyPage, uppercasePage19,
@@ -12740,22 +12740,22 @@
 	emptyPage, emptyPage, emptyPage, emptyPage,
 	emptyPage, emptyPage, emptyPage, emptyPage,
 	emptyPage, uppercasePage489
 };
 
-const OFUnichar *const of_unicode_casefolding_table[0x1EA] = {
-	casefoldingPage0, casefoldingPage1, lowercasePage2,
-	casefoldingPage3, lowercasePage4, lowercasePage5,
+const OFUnichar *const OFUnicodeCaseFoldingTable[0x1EA] = {
+	caseFoldingPage0, caseFoldingPage1, lowercasePage2,
+	caseFoldingPage3, lowercasePage4, lowercasePage5,
 	emptyPage, emptyPage, emptyPage,
 	emptyPage, emptyPage, emptyPage,
 	emptyPage, emptyPage, emptyPage,
 	emptyPage, lowercasePage16, emptyPage,
-	emptyPage, casefoldingPage19, emptyPage,
+	emptyPage, caseFoldingPage19, emptyPage,
 	emptyPage, emptyPage, emptyPage,
 	emptyPage, emptyPage, emptyPage,
-	emptyPage, casefoldingPage28, emptyPage,
-	casefoldingPage30, casefoldingPage31, emptyPage,
+	emptyPage, caseFoldingPage28, emptyPage,
+	caseFoldingPage30, caseFoldingPage31, emptyPage,
 	lowercasePage33, emptyPage, emptyPage,
 	lowercasePage36, emptyPage, emptyPage,
 	emptyPage, emptyPage, emptyPage,
 	emptyPage, emptyPage, lowercasePage44,
 	emptyPage, emptyPage, emptyPage,
@@ -12798,11 +12798,11 @@
 	emptyPage, emptyPage, emptyPage,
 	emptyPage, emptyPage, emptyPage,
 	emptyPage, emptyPage, emptyPage,
 	emptyPage, lowercasePage166, lowercasePage167,
 	emptyPage, emptyPage, emptyPage,
-	casefoldingPage171, emptyPage, emptyPage,
+	caseFoldingPage171, emptyPage, emptyPage,
 	emptyPage, emptyPage, emptyPage,
 	emptyPage, emptyPage, emptyPage,
 	emptyPage, emptyPage, emptyPage,
 	emptyPage, emptyPage, emptyPage,
 	emptyPage, emptyPage, emptyPage,
@@ -12907,11 +12907,11 @@
 	emptyPage, emptyPage, emptyPage,
 	emptyPage, emptyPage, emptyPage,
 	lowercasePage489
 };
 
-const char *const *of_unicode_decomposition_table[0x2FB] = {
+const char *const *OFUnicodeDecompositionTable[0x2FB] = {
 	decompositionPage0, decompositionPage1, decompositionPage2,
 	decompositionPage3, decompositionPage4, emptyDecompositionPage,
 	decompositionPage6, emptyDecompositionPage, emptyDecompositionPage,
 	decompositionPage9, decompositionPage10, decompositionPage11,
 	decompositionPage12, decompositionPage13, emptyDecompositionPage,
@@ -13165,11 +13165,11 @@
 	emptyDecompositionPage, emptyDecompositionPage, emptyDecompositionPage,
 	emptyDecompositionPage, decompositionPage760, decompositionPage761,
 	decompositionPage762
 };
 
-const char *const *of_unicode_decomposition_compat_table[0x2FB] = {
+const char *const *OFUnicodeDecompositionCompatTable[0x2FB] = {
 	decompCompatPage0, decompCompatPage1, decompCompatPage2,
 	decompCompatPage3, decompositionPage4, decompCompatPage5,
 	decompCompatPage6, emptyDecompositionPage, emptyDecompositionPage,
 	decompositionPage9, decompositionPage10, decompositionPage11,
 	decompCompatPage12, decompCompatPage13, decompCompatPage14,