@@ -17,11 +17,11 @@
 
 #import "OFString.h"
 
 #import "common.h"
 
-const of_char16_t of_iso_8859_2_table[] = {
+const OFChar16 OFISO8859_2Table[] = {
 	0x00A0, 0x0104, 0x02D8, 0x0141, 0x00A4, 0x013D, 0x015A, 0x00A7,
 	0x00A8, 0x0160, 0x015E, 0x0164, 0x0179, 0x00AD, 0x017D, 0x017B,
 	0x00B0, 0x0105, 0x02DB, 0x0142, 0x00B4, 0x013E, 0x015B, 0x02C7,
 	0x00B8, 0x0161, 0x015F, 0x0165, 0x017A, 0x02DD, 0x017E, 0x017C,
 	0x0154, 0x00C1, 0x00C2, 0x0102, 0x00C4, 0x0139, 0x0106, 0x00C7,
@@ -31,12 +31,12 @@
 	0x0155, 0x00E1, 0x00E2, 0x0103, 0x00E4, 0x013A, 0x0107, 0x00E7,
 	0x010D, 0x00E9, 0x0119, 0x00EB, 0x011B, 0x00ED, 0x00EE, 0x010F,
 	0x0111, 0x0144, 0x0148, 0x00F3, 0x00F4, 0x0151, 0x00F6, 0x00F7,
 	0x0159, 0x016F, 0x00FA, 0x0171, 0x00FC, 0x00FD, 0x0163, 0x02D9
 };
-const size_t of_iso_8859_2_table_offset =
-    256 - (sizeof(of_iso_8859_2_table) / sizeof(*of_iso_8859_2_table));
+const size_t OFISO8859_2TableOffset =
+    256 - (sizeof(OFISO8859_2Table) / sizeof(*OFISO8859_2Table));
 
 static const unsigned char page0[] = {
 	0xA0, 0x00, 0x00, 0x00, 0xA4, 0x00, 0x00, 0xA7,
 	0xA8, 0x00, 0x00, 0x00, 0x00, 0xAD, 0x00, 0x00,
 	0xB0, 0x00, 0x00, 0x00, 0xB4, 0x00, 0x00, 0x00,
@@ -78,15 +78,15 @@
 	0x00, 0xA2, 0xFF, 0x00, 0xB2, 0x00, 0xBD
 };
 static const uint8_t page2Start = 0xC7;
 
 bool
-of_unicode_to_iso_8859_2(const of_unichar_t *input, unsigned char *output,
+OFUnicodeToISO8859_2(const OFUnichar *input, unsigned char *output,
     size_t length, bool lossy)
 {
 	for (size_t i = 0; i < length; i++) {
-		of_unichar_t c = input[i];
+		OFUnichar c = input[i];
 
 		if OF_UNLIKELY (c > 0x7F) {
 			uint8_t idx;
 
 			if OF_UNLIKELY (c > 0xFFFF) {