@@ -17,11 +17,11 @@
 
 #import "OFString.h"
 
 #import "common.h"
 
-const of_char16_t of_koi8_u_table[] = {
+const OFChar16 OFKOI8UTable[] = {
 	0x2500, 0x2502, 0x250C, 0x2510, 0x2514, 0x2518, 0x251C, 0x2524,
 	0x252C, 0x2534, 0x253C, 0x2580, 0x2584, 0x2588, 0x258C, 0x2590,
 	0x2591, 0x2592, 0x2593, 0x2320, 0x25A0, 0x2219, 0x221A, 0x2248,
 	0x2264,	0x2265, 0x00A0, 0x2321, 0x00B0, 0x00B2, 0x00B7, 0x00F7,
 	0x2550, 0x2551, 0x2552, 0x0451, 0x0454, 0x2554, 0x0456, 0x0457,
@@ -35,12 +35,12 @@
 	0x042E, 0x0410, 0x0411, 0x0426, 0x0414, 0x0415, 0x0424, 0x0413,
 	0x0425, 0x0418, 0x0419, 0x041A, 0x041B, 0x041C, 0x041D, 0x041E,
 	0x041F, 0x042F, 0x0420, 0x0421, 0x0422, 0x0423, 0x0416, 0x0412,
 	0x042C, 0x042B, 0x0417, 0x0428, 0x042D, 0x0429, 0x0427, 0x042A
 };
-const size_t of_koi8_u_table_offset =
-    256 - (sizeof(of_koi8_u_table) / sizeof(*of_koi8_u_table));
+const size_t OFKOI8UTableOffset =
+    256 - (sizeof(OFKOI8UTable) / sizeof(*OFKOI8UTable));
 
 static const unsigned char page0[] = {
 	0x9A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
 	0x00, 0xBF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
 	0x9C, 0x00, 0x9D, 0x00, 0x00, 0x00, 0x00, 0x9E,
@@ -121,15 +121,15 @@
 	0x94
 };
 static const uint8_t page25Start = 0x00;
 
 bool
-of_unicode_to_koi8_u(const of_unichar_t *input, unsigned char *output,
-    size_t length, bool lossy)
+OFUnicodeToKOI8U(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) {