@@ -17,11 +17,11 @@
 
 #import "OFString.h"
 
 #import "common.h"
 
-const OFChar16 of_iso_8859_15_table[] = {
+const OFChar16 OFISO8859_15Table[] = {
 	0x00A0, 0x00A1, 0x00A2, 0x00A3, 0x20AC, 0x00A5, 0x0160, 0x00A7,
 	0x0161, 0x00A9, 0x00AA, 0x00AB, 0x00AC, 0x00AD, 0x00AE, 0x00AF,
 	0x00B0, 0x00B1, 0x00B2, 0x00B3, 0x017D, 0x00B5, 0x00B6, 0x00B7,
 	0x017E, 0x00B9, 0x00BA, 0x00BB, 0x0152, 0x0153, 0x0178, 0x00BF,
 	0x00C0, 0x00C1, 0x00C2, 0x00C3, 0x00C4, 0x00C5, 0x00C6, 0x00C7,
@@ -31,12 +31,12 @@
 	0x00E0, 0x00E1, 0x00E2, 0x00E3, 0x00E4, 0x00E5, 0x00E6, 0x00E7,
 	0x00E8, 0x00E9, 0x00EA, 0x00EB, 0x00EC, 0x00ED, 0x00EE, 0x00EF,
 	0x00F0, 0x00F1, 0x00F2, 0x00F3, 0x00F4, 0x00F5, 0x00F6, 0x00F7,
 	0x00F8, 0x00F9, 0x00FA, 0x00FB, 0x00FC, 0x00FD, 0x00FE, 0x00FF
 };
-const size_t of_iso_8859_15_table_offset =
-    256 - (sizeof(of_iso_8859_15_table) / sizeof(*of_iso_8859_15_table));
+const size_t OFISO8859_15TableOffset =
+    256 - (sizeof(OFISO8859_15Table) / sizeof(*OFISO8859_15Table));
 
 static const unsigned char page0[] = {
 	0x00, 0xA5, 0x00, 0xA7, 0x00, 0xA9, 0xAA, 0xAB,
 	0xAC, 0xAD, 0xAE, 0xAF, 0xB0, 0xB1, 0xB2, 0xB3,
 	0x00, 0xB5, 0xB6, 0xB7, 0x00, 0xB9, 0xBA, 0xBB,
@@ -58,11 +58,11 @@
 	0xA4
 };
 static const uint8_t page20Start = 0xAC;
 
 bool
-of_unicode_to_iso_8859_15(const OFUnichar *input, unsigned char *output,
+OFUnicodeToISO8859_15(const OFUnichar *input, unsigned char *output,
     size_t length, bool lossy)
 {
 	for (size_t i = 0; i < length; i++) {
 		OFUnichar c = input[i];