@@ -17,11 +17,11 @@
 
 #import "OFString.h"
 
 #import "common.h"
 
-const of_char16_t of_mac_roman_table[] = {
+const OFChar16 OFMacRomanTable[] = {
 	0x00C4, 0x00C5, 0x00C7, 0x00C9, 0x00D1, 0x00D6, 0x00DC, 0x00E1,
 	0x00E0, 0x00E2, 0x00E4, 0x00E3, 0x00E5, 0x00E7, 0x00E9, 0x00E8,
 	0x00EA, 0x00EB, 0x00ED, 0x00EC, 0x00EE, 0x00EF, 0x00F1, 0x00F3,
 	0x00F2, 0x00F4, 0x00F6, 0x00F5, 0x00FA, 0x00F9, 0x00FB, 0x00FC,
 	0x2020, 0x00B0, 0x00A2, 0x00A3, 0x00A7, 0x2022, 0x00B6, 0x00DF,
@@ -35,12 +35,12 @@
 	0x2021, 0x00B7, 0x201A, 0x201E, 0x2030, 0x00C2, 0x00CA, 0x00C1,
 	0x00CB, 0x00C8, 0x00CD, 0x00CE, 0x00CF, 0x00CC, 0x00D3, 0x00D4,
 	0xF8FF, 0x00D2, 0x00DA, 0x00DB, 0x00D9, 0x0131, 0x02C6, 0x02DC,
 	0x00AF, 0x02D8, 0x02D9, 0x02DA, 0x00B8, 0x02DD, 0x02DB, 0x02C7
 };
-const size_t of_mac_roman_table_offset =
-    256 - (sizeof(of_mac_roman_table) / sizeof(*of_mac_roman_table));
+const size_t OFMacRomanTableOffset =
+    256 - (sizeof(OFMacRomanTable) / sizeof(*OFMacRomanTable));
 
 static const unsigned char page0[] = {
 	0xCA, 0xC1, 0xA2, 0xA3, 0x00, 0xB4, 0x00, 0xA4,
 	0xAC, 0xA9, 0xBB, 0xC7, 0xC2, 0x00, 0xA8, 0xF8,
 	0xA1, 0xB1, 0x00, 0x00, 0xAB, 0xB5, 0xA6, 0xE1,
@@ -147,15 +147,15 @@
 	0xDE, 0xDF
 };
 static const uint8_t pageFBStart = 0x01;
 
 bool
-of_unicode_to_mac_roman(const of_unichar_t *input, unsigned char *output,
+OFUnicodeToMacRoman(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) {