@@ -17,11 +17,11 @@
 
 #import "OFString.h"
 
 #import "common.h"
 
-const of_char16_t of_codepage_437_table[] = {
+const OFChar16 OFCodepage437Table[] = {
 	0x00C7, 0x00FC, 0x00E9, 0x00E2, 0x00E4, 0x00E0, 0x00E5, 0x00E7,
 	0x00EA, 0x00EB, 0x00E8, 0x00EF, 0x00EE, 0x00EC, 0x00C4, 0x00C5,
 	0x00C9, 0x00E6, 0x00C6, 0x00F4, 0x00F6, 0x00F2, 0x00FB, 0x00F9,
 	0x00FF, 0x00D6, 0x00DC, 0x00A2, 0x00A3, 0x00A5, 0x20A7, 0x0192,
 	0x00E1, 0x00ED, 0x00F3, 0x00FA, 0x00F1, 0x00D1, 0x00AA, 0x00BA,
@@ -35,12 +35,12 @@
 	0x03B1, 0x00DF, 0x0393, 0x03C0, 0x03A3, 0x03C3, 0x00B5, 0x03C4,
 	0x03A6, 0x0398, 0x03A9, 0x03B4, 0x221E, 0x03C6, 0x03B5, 0x2229,
 	0x2261, 0x00B1, 0x2265, 0x2264, 0x2320, 0x2321, 0x00F7, 0x2248,
 	0x00B0, 0x2219, 0x00B7, 0x221A, 0x207F, 0x00B2, 0x25A0, 0x00A0
 };
-const size_t of_codepage_437_table_offset =
-    256 - (sizeof(of_codepage_437_table) / sizeof(*of_codepage_437_table));
+const size_t OFCodepage437TableOffset =
+    256 - (sizeof(OFCodepage437Table) / sizeof(*OFCodepage437Table));
 
 static const unsigned char page0[] = {
 	0xFF, 0xAD, 0x9B, 0x9C, 0x00, 0x9D, 0x00, 0x00,
 	0x00, 0x00, 0xA6, 0xAE, 0xAA, 0x00, 0x00, 0x00,
 	0xF8, 0xF1, 0xFD, 0x00, 0x00, 0xE6, 0x00, 0xFA,
@@ -127,15 +127,15 @@
 	0xFE
 };
 static const uint8_t page25Start = 0x00;
 
 bool
-of_unicode_to_codepage_437(const of_unichar_t *input, unsigned char *output,
+OFUnicodeToCodepage437(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) {