Index: generators/TableGenerator.h
==================================================================
--- generators/TableGenerator.h
+++ generators/TableGenerator.h
@@ -18,24 +18,24 @@
 
 @class OFString;
 
 @interface TableGenerator: OFObject
 {
-	of_unichar_t uppercaseTable[0x110000];
-	of_unichar_t lowercaseTable[0x110000];
-	of_unichar_t titlecaseTable[0x110000];
-	of_unichar_t casefoldingTable[0x110000];
-	char uppercaseTableUsed[0x1100];
-	char lowercaseTableUsed[0x1100];
-	char titlecaseTableUsed[0x1100];
-	char casefoldingTableUsed[0x1100];
-	size_t uppercaseTableSize;
-	size_t lowercaseTableSize;
-	size_t titlecaseTableSize;
-	size_t casefoldingTableSize;
+	of_unichar_t _uppercaseTable[0x110000];
+	of_unichar_t _lowercaseTable[0x110000];
+	of_unichar_t _titlecaseTable[0x110000];
+	of_unichar_t _casefoldingTable[0x110000];
+	char _uppercaseTableUsed[0x1100];
+	char _lowercaseTableUsed[0x1100];
+	char _titlecaseTableUsed[0x1100];
+	char _casefoldingTableUsed[0x1100];
+	size_t _uppercaseTableSize;
+	size_t _lowercaseTableSize;
+	size_t _titlecaseTableSize;
+	size_t _casefoldingTableSize;
 }
 
 - (void)parseUnicodeData;
 - (void)parseCaseFolding;
 - (void)writeTablesToFile: (OFString*)path;
 - (void)writeHeaderToFile: (OFString*)path;
 @end

Index: generators/TableGenerator.m
==================================================================
--- generators/TableGenerator.m
+++ generators/TableGenerator.m
@@ -44,29 +44,33 @@
 @implementation TableGenerator
 - init
 {
 	self = [super init];
 
-	uppercaseTableSize   = SIZE_MAX;
-	lowercaseTableSize   = SIZE_MAX;
-	titlecaseTableSize   = SIZE_MAX;
-	casefoldingTableSize = SIZE_MAX;
+	_uppercaseTableSize   = SIZE_MAX;
+	_lowercaseTableSize   = SIZE_MAX;
+	_titlecaseTableSize   = SIZE_MAX;
+	_casefoldingTableSize = SIZE_MAX;
 
 	return self;
 }
 
 - (void)applicationDidFinishLaunching
 {
+	OFString *path;
 	[self parseUnicodeData];
 	[self parseCaseFolding];
 
 	[of_stdout writeString: @"Writing files..."];
 
-	[self writeTablesToFile: [OFString stringWithPath:
+	path = [OFString pathWithComponents: [OFArray arrayWithObjects:
 	    OF_PATH_PARENT_DIRECTORY, @"src", @"unicode.m", nil]];
-	[self writeHeaderToFile: [OFString stringWithPath:
+	[self writeTablesToFile: path];
+
+	path = [OFString pathWithComponents: [OFArray arrayWithObjects:
 	    OF_PATH_PARENT_DIRECTORY, @"src", @"unicode.h", nil]];
+	[self writeHeaderToFile: path];
 
 	[of_stdout writeLine: @" done"];
 
 	[OFApplication terminate];
 }
@@ -103,15 +107,15 @@
 			[OFApplication terminateWithStatus: 1];
 		}
 		splitObjects = [split objects];
 
 		codep = (of_unichar_t)[splitObjects[0] hexadecimalValue];
-		uppercaseTable[codep] =
+		_uppercaseTable[codep] =
 		    (of_unichar_t)[splitObjects[12] hexadecimalValue];
-		lowercaseTable[codep] =
+		_lowercaseTable[codep] =
 		    (of_unichar_t)[splitObjects[13] hexadecimalValue];
-		titlecaseTable[codep] =
+		_titlecaseTable[codep] =
 		    (of_unichar_t)[splitObjects[14] hexadecimalValue];
 
 		objc_autoreleasePoolPop(pool2);
 	}
 
@@ -156,11 +160,11 @@
 		if (![splitObjects[1] isEqual: @"S"] &&
 		    ![splitObjects[1] isEqual: @"C"])
 			continue;
 
 		codep = (of_unichar_t)[splitObjects[0] hexadecimalValue];
-		casefoldingTable[codep] =
+		_casefoldingTable[codep] =
 		    (of_unichar_t)[splitObjects[2] hexadecimalValue];
 
 		objc_autoreleasePoolPop(pool2);
 	}
 
@@ -178,99 +182,140 @@
 
 	[file writeString: COPYRIGHT
 	    @"#include \"config.h\"\n"
 	    @"\n"
 	    @"#import \"OFString.h\"\n\n"
-	    @"static const of_unichar_t nop_page[0x100] = {};\n\n"];
+	    @"static const of_unichar_t emptyPage[0x100] = {};\n\n"];
+
+	/* Write uppercasePage%u */
+	for (i = 0; i < 0x110000; i += 0x100) {
+		bool isEmpty = true;
+
+		for (j = i; j < i + 0x100; j++) {
+			if (_uppercaseTable[j] != 0) {
+				isEmpty = false;
+				_uppercaseTableSize = i >> 8;
+				_uppercaseTableUsed[_uppercaseTableSize] = 1;
+				break;
+			}
+		}
+
+		if (!isEmpty) {
+			void *pool2 = objc_autoreleasePoolPush();
+
+			[file writeString: [OFString stringWithFormat:
+			    @"static const of_unichar_t "
+			    @"uppercasePage%u[0x100] = {\n", i >> 8]];
+
+			for (j = i; j < i + 0x100; j += 8)
+				[file writeString: [OFString stringWithFormat:
+				    @"\t%u, %u, %u, %u, %u, %u, %u, %u,\n",
+				    _uppercaseTable[j],
+				    _uppercaseTable[j + 1],
+				    _uppercaseTable[j + 2],
+				    _uppercaseTable[j + 3],
+				    _uppercaseTable[j + 4],
+				    _uppercaseTable[j + 5],
+				    _uppercaseTable[j + 6],
+				    _uppercaseTable[j + 7]]];
+
+			[file writeString: @"};\n\n"];
+
+			objc_autoreleasePoolPop(pool2);
+		}
+	}
 
-	/* Write uppercase_page_%u */
+	/* Write lowercasePage%u */
 	for (i = 0; i < 0x110000; i += 0x100) {
 		bool isEmpty = true;
 
 		for (j = i; j < i + 0x100; j++) {
-			if (uppercaseTable[j] != 0) {
+			if (_lowercaseTable[j] != 0) {
 				isEmpty = false;
-				uppercaseTableSize = i >> 8;
-				uppercaseTableUsed[uppercaseTableSize] = 1;
+				_lowercaseTableSize = i >> 8;
+				_lowercaseTableUsed[_lowercaseTableSize] = 1;
 				break;
 			}
 		}
 
 		if (!isEmpty) {
 			void *pool2 = objc_autoreleasePoolPush();
 
 			[file writeString: [OFString stringWithFormat:
 			    @"static const of_unichar_t "
-			    @"uppercase_page_%u[0x100] = {\n", i >> 8]];
+			    @"lowercasePage%u[0x100] = {\n", i >> 8]];
 
 			for (j = i; j < i + 0x100; j += 8)
 				[file writeString: [OFString stringWithFormat:
 				    @"\t%u, %u, %u, %u, %u, %u, %u, %u,\n",
-				    uppercaseTable[j],
-				    uppercaseTable[j + 1],
-				    uppercaseTable[j + 2],
-				    uppercaseTable[j + 3],
-				    uppercaseTable[j + 4],
-				    uppercaseTable[j + 5],
-				    uppercaseTable[j + 6],
-				    uppercaseTable[j + 7]]];
+				    _lowercaseTable[j],
+				    _lowercaseTable[j + 1],
+				    _lowercaseTable[j + 2],
+				    _lowercaseTable[j + 3],
+				    _lowercaseTable[j + 4],
+				    _lowercaseTable[j + 5],
+				    _lowercaseTable[j + 6],
+				    _lowercaseTable[j + 7]]];
 
 			[file writeString: @"};\n\n"];
 
 			objc_autoreleasePoolPop(pool2);
 		}
 	}
 
-	/* Write lowercase_page_%u */
+	/* Write titlecasePage%u if it does NOT match uppercasePage%u */
 	for (i = 0; i < 0x110000; i += 0x100) {
 		bool isEmpty = true;
 
 		for (j = i; j < i + 0x100; j++) {
-			if (lowercaseTable[j] != 0) {
-				isEmpty = false;
-				lowercaseTableSize = i >> 8;
-				lowercaseTableUsed[lowercaseTableSize] = 1;
+			if (_titlecaseTable[j] != 0) {
+				isEmpty = !memcmp(_uppercaseTable + i,
+				    _titlecaseTable + i,
+				    256 * sizeof(of_unichar_t));
+				_titlecaseTableSize = i >> 8;
+				_titlecaseTableUsed[_titlecaseTableSize] =
+				    (isEmpty ? 2 : 1);
 				break;
 			}
 		}
 
 		if (!isEmpty) {
 			void *pool2 = objc_autoreleasePoolPush();
 
 			[file writeString: [OFString stringWithFormat:
 			    @"static const of_unichar_t "
-			    @"lowercase_page_%u[0x100] = {\n", i >> 8]];
+			    @"titlecasePage%u[0x100] = {\n", i >> 8]];
 
 			for (j = i; j < i + 0x100; j += 8)
 				[file writeString: [OFString stringWithFormat:
 				    @"\t%u, %u, %u, %u, %u, %u, %u, %u,\n",
-				    lowercaseTable[j],
-				    lowercaseTable[j + 1],
-				    lowercaseTable[j + 2],
-				    lowercaseTable[j + 3],
-				    lowercaseTable[j + 4],
-				    lowercaseTable[j + 5],
-				    lowercaseTable[j + 6],
-				    lowercaseTable[j + 7]]];
+				    _titlecaseTable[j],
+				    _titlecaseTable[j + 1],
+				    _titlecaseTable[j + 2],
+				    _titlecaseTable[j + 3],
+				    _titlecaseTable[j + 4],
+				    _titlecaseTable[j + 5],
+				    _titlecaseTable[j + 6],
+				    _titlecaseTable[j + 7]]];
 
 			[file writeString: @"};\n\n"];
 
 			objc_autoreleasePoolPop(pool2);
 		}
 	}
 
-	/* Write titlecase_page_%u if it does NOT match uppercase_page_%u */
+	/* Write casefoldingPage%u if it does NOT match lowercasePage%u */
 	for (i = 0; i < 0x110000; i += 0x100) {
 		bool isEmpty = true;
 
 		for (j = i; j < i + 0x100; j++) {
-			if (titlecaseTable[j] != 0) {
-				isEmpty = !memcmp(uppercaseTable + i,
-				    titlecaseTable + i,
+			if (_casefoldingTable[j] != 0) {
+				isEmpty = !memcmp(_lowercaseTable + i,
+				    _casefoldingTable + i,
 				    256 * sizeof(of_unichar_t));
-				titlecaseTableSize = i >> 8;
-				titlecaseTableUsed[titlecaseTableSize] =
+				_casefoldingTableSize = i >> 8;
+				_casefoldingTableUsed[_casefoldingTableSize] =
 				    (isEmpty ? 2 : 1);
 				break;
 			}
 		}
 
@@ -277,64 +322,23 @@
 		if (!isEmpty) {
 			void *pool2 = objc_autoreleasePoolPush();
 
 			[file writeString: [OFString stringWithFormat:
 			    @"static const of_unichar_t "
-			    @"titlecase_page_%u[0x100] = {\n", i >> 8]];
-
-			for (j = i; j < i + 0x100; j += 8)
-				[file writeString: [OFString stringWithFormat:
-				    @"\t%u, %u, %u, %u, %u, %u, %u, %u,\n",
-				    titlecaseTable[j],
-				    titlecaseTable[j + 1],
-				    titlecaseTable[j + 2],
-				    titlecaseTable[j + 3],
-				    titlecaseTable[j + 4],
-				    titlecaseTable[j + 5],
-				    titlecaseTable[j + 6],
-				    titlecaseTable[j + 7]]];
-
-			[file writeString: @"};\n\n"];
-
-			objc_autoreleasePoolPop(pool2);
-		}
-	}
-
-	/* Write casefolding_page_%u if it does NOT match lowercase_page_%u */
-	for (i = 0; i < 0x110000; i += 0x100) {
-		bool isEmpty = true;
-
-		for (j = i; j < i + 0x100; j++) {
-			if (casefoldingTable[j] != 0) {
-				isEmpty = !memcmp(lowercaseTable + i,
-				    casefoldingTable + i,
-				    256 * sizeof(of_unichar_t));
-				casefoldingTableSize = i >> 8;
-				casefoldingTableUsed[casefoldingTableSize] =
-				    (isEmpty ? 2 : 1);
-				break;
-			}
-		}
-
-		if (!isEmpty) {
-			void *pool2 = objc_autoreleasePoolPush();
-
-			[file writeString: [OFString stringWithFormat:
-			    @"static const of_unichar_t "
-			    @"casefolding_page_%u[0x100] = {\n", i >> 8]];
-
-			for (j = i; j < i + 0x100; j += 8)
-				[file writeString: [OFString stringWithFormat:
-				    @"\t%u, %u, %u, %u, %u, %u, %u, %u,\n",
-				    casefoldingTable[j],
-				    casefoldingTable[j + 1],
-				    casefoldingTable[j + 2],
-				    casefoldingTable[j + 3],
-				    casefoldingTable[j + 4],
-				    casefoldingTable[j + 5],
-				    casefoldingTable[j + 6],
-				    casefoldingTable[j + 7]]];
+			    @"casefoldingPage%u[0x100] = {\n", i >> 8]];
+
+			for (j = i; j < i + 0x100; j += 8)
+				[file writeString: [OFString stringWithFormat:
+				    @"\t%u, %u, %u, %u, %u, %u, %u, %u,\n",
+				    _casefoldingTable[j],
+				    _casefoldingTable[j + 1],
+				    _casefoldingTable[j + 2],
+				    _casefoldingTable[j + 3],
+				    _casefoldingTable[j + 4],
+				    _casefoldingTable[j + 5],
+				    _casefoldingTable[j + 6],
+				    _casefoldingTable[j + 7]]];
 
 			[file writeString: @"};\n\n"];
 
 			objc_autoreleasePoolPop(pool2);
 		}
@@ -342,28 +346,28 @@
 
 	/*
 	 * Those are currently set to the last index.
 	 * But from now on, we need the size.
 	 */
-	uppercaseTableSize++;
-	lowercaseTableSize++;
-	titlecaseTableSize++;
-	casefoldingTableSize++;
+	_uppercaseTableSize++;
+	_lowercaseTableSize++;
+	_titlecaseTableSize++;
+	_casefoldingTableSize++;
 
 	/* Write of_unicode_uppercase_table */
 	[file writeString: [OFString stringWithFormat:
 	    @"const of_unichar_t* const of_unicode_uppercase_table[0x%X] = "
-	    @"{\n\t", uppercaseTableSize]];
+	    @"{\n\t", _uppercaseTableSize]];
 
-	for (i = 0; i < uppercaseTableSize; i++) {
-		if (uppercaseTableUsed[i]) {
+	for (i = 0; i < _uppercaseTableSize; i++) {
+		if (_uppercaseTableUsed[i]) {
 			[file writeString: [OFString stringWithFormat:
-			    @"uppercase_page_%u", i]];
+			    @"uppercasePage%u", i]];
 		} else
-			[file writeString: @"nop_page"];
+			[file writeString: @"emptyPage"];
 
-		if (i + 1 < uppercaseTableSize) {
+		if (i + 1 < _uppercaseTableSize) {
 			if ((i + 1) % 4 == 0)
 				[file writeString: @",\n\t"];
 			else
 				[file writeString: @", "];
 		}
@@ -372,20 +376,20 @@
 	[file writeString: @"\n};\n\n"];
 
 	/* Write of_unicode_lowercase_table */
 	[file writeString: [OFString stringWithFormat:
 	    @"const of_unichar_t* const of_unicode_lowercase_table[0x%X] = "
-	    @"{\n\t", lowercaseTableSize]];
+	    @"{\n\t", _lowercaseTableSize]];
 
-	for (i = 0; i < lowercaseTableSize; i++) {
-		if (lowercaseTableUsed[i]) {
+	for (i = 0; i < _lowercaseTableSize; i++) {
+		if (_lowercaseTableUsed[i]) {
 			[file writeString: [OFString stringWithFormat:
-			    @"lowercase_page_%u", i]];
+			    @"lowercasePage%u", i]];
 		} else
-			[file writeString: @"nop_page"];
+			[file writeString: @"emptyPage"];
 
-		if (i + 1 < lowercaseTableSize) {
+		if (i + 1 < _lowercaseTableSize) {
 			if ((i + 1) % 4 == 0)
 				[file writeString: @",\n\t"];
 			else
 				[file writeString: @", "];
 		}
@@ -394,23 +398,23 @@
 	[file writeString: @"\n};\n\n"];
 
 	/* Write of_unicode_titlecase_table */
 	[file writeString: [OFString stringWithFormat:
 	    @"const of_unichar_t* const of_unicode_titlecase_table[0x%X] = {"
-	    @"\n\t", titlecaseTableSize]];
-
-	for (i = 0; i < titlecaseTableSize; i++) {
-		if (titlecaseTableUsed[i] == 1) {
-			[file writeString: [OFString stringWithFormat:
-			    @"titlecase_page_%u", i]];
-		} else if (titlecaseTableUsed[i] == 2) {
-			[file writeString: [OFString stringWithFormat:
-			    @"uppercase_page_%u", i]];
-		} else
-			[file writeString: @"nop_page"];
-
-		if (i + 1 < titlecaseTableSize) {
+	    @"\n\t", _titlecaseTableSize]];
+
+	for (i = 0; i < _titlecaseTableSize; i++) {
+		if (_titlecaseTableUsed[i] == 1) {
+			[file writeString: [OFString stringWithFormat:
+			    @"titlecasePage%u", i]];
+		} else if (_titlecaseTableUsed[i] == 2) {
+			[file writeString: [OFString stringWithFormat:
+			    @"uppercasePage%u", i]];
+		} else
+			[file writeString: @"emptyPage"];
+
+		if (i + 1 < _titlecaseTableSize) {
 			if ((i + 1) % 4 == 0)
 				[file writeString: @",\n\t"];
 			else
 				[file writeString: @", "];
 		}
@@ -419,23 +423,23 @@
 	[file writeString: @"\n};\n\n"];
 
 	/* Write of_unicode_casefolding_table */
 	[file writeString: [OFString stringWithFormat:
 	    @"const of_unichar_t* const of_unicode_casefolding_table[0x%X] = "
-	    @"{\n\t", casefoldingTableSize]];
-
-	for (i = 0; i < casefoldingTableSize; i++) {
-		if (casefoldingTableUsed[i] == 1) {
-			[file writeString: [OFString stringWithFormat:
-			    @"casefolding_page_%u", i]];
-		} else if (casefoldingTableUsed[i] == 2) {
-			[file writeString: [OFString stringWithFormat:
-			    @"lowercase_page_%u", i]];
-		} else
-			[file writeString: @"nop_page"];
-
-		if (i + 1 < casefoldingTableSize) {
+	    @"{\n\t", _casefoldingTableSize]];
+
+	for (i = 0; i < _casefoldingTableSize; i++) {
+		if (_casefoldingTableUsed[i] == 1) {
+			[file writeString: [OFString stringWithFormat:
+			    @"casefoldingPage%u", i]];
+		} else if (_casefoldingTableUsed[i] == 2) {
+			[file writeString: [OFString stringWithFormat:
+			    @"lowercasePage%u", i]];
+		} else
+			[file writeString: @"emptyPage"];
+
+		if (i + 1 < _casefoldingTableSize) {
 			if ((i + 1) % 3 == 0)
 				[file writeString: @",\n\t"];
 			else
 				[file writeString: @", "];
 		}
@@ -458,12 +462,12 @@
 	[file writeString: [OFString stringWithFormat:
 	    @"#define OF_UNICODE_UPPERCASE_TABLE_SIZE 0x%X\n"
 	    @"#define OF_UNICODE_LOWERCASE_TABLE_SIZE 0x%X\n"
 	    @"#define OF_UNICODE_TITLECASE_TABLE_SIZE 0x%X\n"
 	    @"#define OF_UNICODE_CASEFOLDING_TABLE_SIZE 0x%X\n\n",
-	    uppercaseTableSize, lowercaseTableSize, titlecaseTableSize,
-	    casefoldingTableSize]];
+	    _uppercaseTableSize, _lowercaseTableSize, _titlecaseTableSize,
+	    _casefoldingTableSize]];
 
 	[file writeString:
 	    @"#ifdef __cplusplus\n"
 	    @"extern \"C\" {\n"
 	    @"#endif\n"

Index: src/OFApplication.m
==================================================================
--- src/OFApplication.m
+++ src/OFApplication.m
@@ -61,11 +61,11 @@
 @end
 
 static OFApplication *app = nil;
 
 static void
-atexit_handler(void)
+atexitHandler(void)
 {
 	id <OFApplicationDelegate> delegate = [app delegate];
 
 	if ([delegate respondsToSelector: @selector(applicationWillTerminate)])
 		[delegate applicationWillTerminate];
@@ -178,11 +178,11 @@
 		char *env;
 #endif
 
 		environment = [[OFMutableDictionary alloc] init];
 
-		atexit(atexit_handler);
+		atexit(atexitHandler);
 #if defined(_WIN32)
 		env = GetEnvironmentStringsW();
 
 		while (*env != 0) {
 			OFString *tmp, *key, *value;

Index: src/OFDataArray+MessagePackValue.m
==================================================================
--- src/OFDataArray+MessagePackValue.m
+++ src/OFDataArray+MessagePackValue.m
@@ -28,36 +28,36 @@
 #import "autorelease.h"
 #import "macros.h"
 
 int _OFDataArray_MessagePackValue_reference;
 
-static size_t parse_object(const uint8_t*, size_t, id*);
+static size_t parseObject(const uint8_t*, size_t, id*);
 
 static uint16_t
-read_uint16(const uint8_t *buffer)
+readUInt16(const uint8_t *buffer)
 {
 	return ((uint16_t)buffer[0] << 8) | buffer[1];
 }
 
 static uint32_t
-read_uint32(const uint8_t *buffer)
+readUInt32(const uint8_t *buffer)
 {
 	return ((uint32_t)buffer[0] << 24) | ((uint32_t)buffer[1] << 16) |
 	    ((uint32_t)buffer[2] << 8) | buffer[3];
 }
 
 static uint64_t
-read_uint64(const uint8_t *buffer)
+readUInt64(const uint8_t *buffer)
 {
 	return ((uint64_t)buffer[0] << 56) | ((uint64_t)buffer[1] << 48) |
 	    ((uint64_t)buffer[2] << 40) | ((uint64_t)buffer[3] << 32) |
 	    ((uint64_t)buffer[4] << 24) | ((uint64_t)buffer[5] << 16) |
 	    ((uint64_t)buffer[6] << 8) | buffer[7];
 }
 
 static size_t
-parse_array(const uint8_t *buffer, size_t length, id *object, size_t count)
+parseArray(const uint8_t *buffer, size_t length, id *object, size_t count)
 {
 	void *pool;
 	size_t i, pos;
 
 	/*
@@ -72,11 +72,11 @@
 		id child;
 		size_t childLength;
 
 		pool = objc_autoreleasePoolPush();
 
-		childLength = parse_object(buffer + pos, length - pos, &child);
+		childLength = parseObject(buffer + pos, length - pos, &child);
 		if (childLength == 0 || child == nil) {
 			objc_autoreleasePoolPop(pool);
 
 			*object = nil;
 			return 0;
@@ -90,11 +90,11 @@
 
 	return pos;
 }
 
 static size_t
-parse_table(const uint8_t *buffer, size_t length, id *object, size_t count)
+parseTable(const uint8_t *buffer, size_t length, id *object, size_t count)
 {
 	void *pool;
 	size_t i, pos;
 
 	/*
@@ -109,20 +109,20 @@
 		id key, value;
 		size_t keyLength, valueLength;
 
 		pool = objc_autoreleasePoolPush();
 
-		keyLength = parse_object(buffer + pos, length - pos, &key);
+		keyLength = parseObject(buffer + pos, length - pos, &key);
 		if (keyLength == 0 || key == nil) {
 			objc_autoreleasePoolPop(pool);
 
 			*object = nil;
 			return 0;
 		}
 		pos += keyLength;
 
-		valueLength = parse_object(buffer + pos, length - pos, &value);
+		valueLength = parseObject(buffer + pos, length - pos, &value);
 		if (valueLength == 0 || value == nil) {
 			objc_autoreleasePoolPop(pool);
 
 			*object = nil;
 			return 0;
@@ -137,11 +137,11 @@
 
 	return pos;
 }
 
 static size_t
-parse_object(const uint8_t *buffer, size_t length, id *object)
+parseObject(const uint8_t *buffer, size_t length, id *object)
 {
 	size_t i, count;
 	int8_t type;
 	OFDataArray *data;
 
@@ -173,16 +173,16 @@
 		return count + 1;
 	}
 
 	/* fixarray */
 	if ((buffer[0] & 0xF0) == 0x90)
-		return parse_array(buffer + 1, length - 1, object,
+		return parseArray(buffer + 1, length - 1, object,
 		    buffer[0] & 0xF) + 1;
 
 	/* fixmap */
 	if ((buffer[0] & 0xF0) == 0x80)
-		return parse_table(buffer + 1, length - 1, object,
+		return parseTable(buffer + 1, length - 1, object,
 		    buffer[0] & 0xF) + 1;
 
 	/* Prefix byte */
 	switch (*buffer) {
 	/* Unsigned integers */
@@ -194,23 +194,23 @@
 		return 2;
 	case 0xCD: /* uint 16 */
 		if (length < 3)
 			goto error;
 
-		*object = [OFNumber numberWithUInt16: read_uint16(buffer + 1)];
+		*object = [OFNumber numberWithUInt16: readUInt16(buffer + 1)];
 		return 3;
 	case 0xCE: /* uint 32 */
 		if (length < 5)
 			goto error;
 
-		*object = [OFNumber numberWithUInt32: read_uint32(buffer + 1)];
+		*object = [OFNumber numberWithUInt32: readUInt32(buffer + 1)];
 		return 5;
 	case 0xCF: /* uint 64 */
 		if (length < 9)
 			goto error;
 
-		*object = [OFNumber numberWithUInt64: read_uint64(buffer + 1)];
+		*object = [OFNumber numberWithUInt64: readUInt64(buffer + 1)];
 		return 9;
 	/* Signed integers */
 	case 0xD0: /* int 8 */
 		if (length < 2)
 			goto error;
@@ -219,23 +219,23 @@
 		return 2;
 	case 0xD1: /* int 16 */
 		if (length < 3)
 			goto error;
 
-		*object = [OFNumber numberWithInt16: read_uint16(buffer + 1)];
+		*object = [OFNumber numberWithInt16: readUInt16(buffer + 1)];
 		return 3;
 	case 0xD2: /* int 32 */
 		if (length < 5)
 			goto error;
 
-		*object = [OFNumber numberWithInt32: read_uint32(buffer + 1)];
+		*object = [OFNumber numberWithInt32: readUInt32(buffer + 1)];
 		return 5;
 	case 0xD3: /* int 64 */
 		if (length < 9)
 			goto error;
 
-		*object = [OFNumber numberWithInt64: read_uint64(buffer + 1)];
+		*object = [OFNumber numberWithInt64: readUInt64(buffer + 1)];
 		return 9;
 	/* Floating point */
 	case 0xCA:; /* float 32 */
 		union {
 			uint8_t u8[4];
@@ -294,11 +294,11 @@
 		return count + 2;
 	case 0xC5: /* bin 16 */
 		if (length < 3)
 			goto error;
 
-		count = read_uint16(buffer + 1);
+		count = readUInt16(buffer + 1);
 
 		if (length < count + 3)
 			goto error;
 
 		*object = [OFDataArray dataArrayWithCapacity: count];
@@ -308,11 +308,11 @@
 		return count + 3;
 	case 0xC6: /* bin 32 */
 		if (length < 5)
 			goto error;
 
-		count = read_uint32(buffer + 1);
+		count = readUInt32(buffer + 1);
 
 		if (length < count + 5)
 			goto error;
 
 		*object = [OFDataArray dataArrayWithCapacity: count];
@@ -347,11 +347,11 @@
 		return count + 3;
 	case 0xC8: /* ext 16 */
 		if (length < 4)
 			goto error;
 
-		count = read_uint16(buffer + 1);
+		count = readUInt16(buffer + 1);
 
 		if (length < count + 4)
 			goto error;
 
 		type = buffer[3];
@@ -371,11 +371,11 @@
 		return count + 4;
 	case 0xC9: /* ext 32 */
 		if (length < 6)
 			goto error;
 
-		count = read_uint32(buffer + 1);
+		count = readUInt32(buffer + 1);
 
 		if (length < count + 6)
 			goto error;
 
 		type = buffer[5];
@@ -503,11 +503,11 @@
 		return count + 2;
 	case 0xDA: /* str 16 */
 		if (length < 3)
 			goto error;
 
-		count = read_uint16(buffer + 1);
+		count = readUInt16(buffer + 1);
 
 		if (length < count + 3)
 			goto error;
 
 		*object = [OFString
@@ -516,11 +516,11 @@
 		return count + 3;
 	case 0xDB: /* str 32 */
 		if (length < 5)
 			goto error;
 
-		count = read_uint32(buffer + 1);
+		count = readUInt32(buffer + 1);
 
 		if (length < count + 5)
 			goto error;
 
 		*object = [OFString
@@ -530,31 +530,31 @@
 	/* Arrays */
 	case 0xDC: /* array 16 */
 		if (length < 3)
 			goto error;
 
-		return parse_array(buffer + 3, length - 3, object,
-		    read_uint16(buffer + 1)) + 3;
+		return parseArray(buffer + 3, length - 3, object,
+		    readUInt16(buffer + 1)) + 3;
 	case 0xDD: /* array 32 */
 		if (length < 5)
 			goto error;
 
-		return parse_array(buffer + 5, length - 5, object,
-		    read_uint32(buffer + 1)) + 5;
+		return parseArray(buffer + 5, length - 5, object,
+		    readUInt32(buffer + 1)) + 5;
 	/* Maps */
 	case 0xDE: /* map 16 */
 		if (length < 3)
 			goto error;
 
-		return parse_table(buffer + 3, length - 3, object,
-		    read_uint16(buffer + 1)) + 3;
+		return parseTable(buffer + 3, length - 3, object,
+		    readUInt16(buffer + 1)) + 3;
 	case 0xDF: /* map 32 */
 		if (length < 5)
 			goto error;
 
-		return parse_table(buffer + 5, length - 5, object,
-		    read_uint32(buffer + 1)) + 5;
+		return parseTable(buffer + 5, length - 5, object,
+		    readUInt32(buffer + 1)) + 5;
 	}
 
 error:
 	*object = nil;
 	return 0;
@@ -564,12 +564,12 @@
 - (id)messagePackValue
 {
 	size_t count = [self count];
 	id object;
 
-	if (parse_object([self items], count, &object) != count ||
+	if (parseObject([self items], count, &object) != count ||
 	    object == nil)
 		@throw [OFInvalidFormatException exception];
 
 	return object;
 }
 @end

Index: src/OFDate.m
==================================================================
--- src/OFDate.m
+++ src/OFDate.m
@@ -131,11 +131,11 @@
 									\
 	return tm->field;
 # endif
 #endif
 
-static int month_to_day_of_year[12] = {
+static int monthToDayOfYear[12] = {
 	0,
 	31,
 	31 + 28,
 	31 + 28 + 31,
 	31 + 28 + 31 + 30,
@@ -259,11 +259,11 @@
 		    (tm.tm_year + 1900) % 400 == 0))
 			_seconds += 86400;
 		/* Months */
 		if (tm.tm_mon < 0 || tm.tm_mon > 12)
 			@throw [OFInvalidFormatException exception];
-		_seconds += month_to_day_of_year[tm.tm_mon] * 86400;
+		_seconds += monthToDayOfYear[tm.tm_mon] * 86400;
 		/* Days */
 		_seconds += (tm.tm_mday - 1) * 86400;
 		/* Hours */
 		_seconds += tm.tm_hour * 3600;
 		/* Minutes */

Index: src/OFFile.m
==================================================================
--- src/OFFile.m
+++ src/OFFile.m
@@ -106,11 +106,11 @@
 #if defined(OF_HAVE_CHOWN) && defined(OF_HAVE_THREADS)
 static of_mutex_t mutex;
 #endif
 
 static int
-parse_mode(const char *mode)
+parseMode(const char *mode)
 {
 	if (!strcmp(mode, "r"))
 		return O_RDONLY;
 	if (!strcmp(mode, "rb"))
 		return O_RDONLY | O_BINARY;
@@ -700,11 +700,11 @@
 	self = [super init];
 
 	@try {
 		int flags;
 
-		if ((flags = parse_mode([mode UTF8String])) == -1)
+		if ((flags = parseMode([mode UTF8String])) == -1)
 			@throw [OFInvalidArgumentException exception];
 
 #ifndef _WIN32
 		if ((_fd = open([path cStringWithEncoding:
 		    OF_STRING_ENCODING_NATIVE], flags, DEFAULT_MODE)) == -1)

Index: src/OFHTTPClient.m
==================================================================
--- src/OFHTTPClient.m
+++ src/OFHTTPClient.m
@@ -46,11 +46,11 @@
 
 #import "autorelease.h"
 #import "macros.h"
 
 static OF_INLINE void
-normalize_key(char *str_)
+normalizeKey(char *str_)
 {
 	uint8_t *str = (uint8_t*)str_;
 	bool firstLetter = true;
 
 	while (*str != '\0') {
@@ -491,11 +491,11 @@
 			@throw [OFOutOfMemoryException
 			    exceptionWithRequestedSize: tmp - lineC + 1];
 
 		memcpy(keyC, lineC, tmp - lineC);
 		keyC[tmp - lineC] = '\0';
-		normalize_key(keyC);
+		normalizeKey(keyC);
 
 		@try {
 			key = [OFString stringWithUTF8StringNoCopy: keyC
 						      freeWhenDone: true];
 		} @catch (id e) {

Index: src/OFHTTPServer.m
==================================================================
--- src/OFHTTPServer.m
+++ src/OFHTTPServer.m
@@ -52,11 +52,11 @@
   didAcceptSocket: (OFTCPSocket*)clientSocket
 	exception: (OFException*)exception;
 @end
 
 static const char*
-status_code_to_string(short code)
+statusCodeToString(short code)
 {
 	switch (code) {
 	case 100:
 		return "Continue";
 	case 101:
@@ -141,11 +141,11 @@
 		return NULL;
 	}
 }
 
 static OF_INLINE OFString*
-normalized_key(OFString *key)
+normalizedKey(OFString *key)
 {
 	char *cString = strdup([key UTF8String]);
 	uint8_t *tmp = (uint8_t*)cString;
 	bool firstLetter = true;
 
@@ -215,11 +215,11 @@
 
 	[_socket writeFormat: @"HTTP/%@ %d %s\r\n"
 			      @"Server: %@\r\n"
 			      @"Date: %@\r\n",
 			      [self protocolVersionString], _statusCode,
-			      status_code_to_string(_statusCode),
+			      statusCodeToString(_statusCode),
 			      [_server name], date];
 
 	keyEnumerator = [_headers keyEnumerator];
 	valueEnumerator = [_headers objectEnumerator];
 	while ((key = [keyEnumerator nextObject]) != nil &&
@@ -479,11 +479,11 @@
 
 	key = [line substringWithRange: of_range(0, pos)];
 	value = [line substringWithRange:
 	    of_range(pos + 1, [line length] - pos - 1)];
 
-	key = normalized_key([key stringByDeletingTrailingWhitespaces]);
+	key = normalizedKey([key stringByDeletingTrailingWhitespaces]);
 	value = [value stringByDeletingLeadingWhitespaces];
 
 	[_headers setObject: value
 		     forKey: key];
 
@@ -553,11 +553,11 @@
 
 	[_socket writeFormat: @"HTTP/1.1 %d %s\r\n"
 			      @"Date: %@\r\n"
 			      @"Server: %@\r\n"
 			      @"\r\n",
-			      statusCode, status_code_to_string(statusCode),
+			      statusCode, statusCodeToString(statusCode),
 			      date, [_server name]];
 	[_socket close];
 
 	return false;
 }

Index: src/OFMapTable.m
==================================================================
--- src/OFMapTable.m
+++ src/OFMapTable.m
@@ -37,28 +37,28 @@
 	uint32_t hash;
 };
 static struct of_map_table_bucket deleted = {};
 
 static void*
-default_retain(void *value)
+defaultRetain(void *value)
 {
 	return value;
 }
 
 static void
-default_release(void *value)
+defaultRelease(void *value)
 {
 }
 
 static uint32_t
-default_hash(void *value)
+defaultHash(void *value)
 {
 	return (uint32_t)(uintptr_t)value;
 }
 
 static bool
-default_equal(void *value1, void *value2)
+defaultEqual(void *value1, void *value2)
 {
 	return (value1 == value2);
 }
 
 @interface OFMapTable (OF_PRIVATE_CATEGORY)
@@ -126,19 +126,19 @@
 
 #define SET_DEFAULT(var, value) \
 	if (var == NULL)	\
 		var = value;
 
-		SET_DEFAULT(_keyFunctions.retain, default_retain);
-		SET_DEFAULT(_keyFunctions.release, default_release);
-		SET_DEFAULT(_keyFunctions.hash, default_hash);
-		SET_DEFAULT(_keyFunctions.equal, default_equal);
-
-		SET_DEFAULT(_valueFunctions.retain, default_retain);
-		SET_DEFAULT(_valueFunctions.release, default_release);
-		SET_DEFAULT(_valueFunctions.hash, default_hash);
-		SET_DEFAULT(_valueFunctions.equal, default_equal);
+		SET_DEFAULT(_keyFunctions.retain, defaultRetain);
+		SET_DEFAULT(_keyFunctions.release, defaultRelease);
+		SET_DEFAULT(_keyFunctions.hash, defaultHash);
+		SET_DEFAULT(_keyFunctions.equal, defaultEqual);
+
+		SET_DEFAULT(_valueFunctions.retain, defaultRetain);
+		SET_DEFAULT(_valueFunctions.release, defaultRelease);
+		SET_DEFAULT(_valueFunctions.hash, defaultHash);
+		SET_DEFAULT(_valueFunctions.equal, defaultEqual);
 
 #undef SET_DEFAULT
 
 		if (capacity > UINT32_MAX / sizeof(*_buckets) ||
 		    capacity > UINT32_MAX / 8)

Index: src/OFObject.m
==================================================================
--- src/OFObject.m
+++ src/OFObject.m
@@ -90,17 +90,17 @@
 	(__BIGGEST_ALIGNMENT__ - 1)) & ~(__BIGGEST_ALIGNMENT__ - 1))
 #define PRE_MEM(mem) ((struct pre_mem*)(void*)((char*)mem - PRE_MEM_ALIGN))
 
 static struct {
 	Class isa;
-} alloc_failed_exception;
+} allocFailedException;
 
 uint32_t of_hash_seed;
 
 #if !defined(OF_APPLE_RUNTIME) || defined(__OBJC2__)
 static void
-uncaught_exception_handler(id exception)
+uncaughtExceptionHandler(id exception)
 {
 	OFString *description = [exception description];
 	OFArray *backtrace = nil;
 
 	fprintf(stderr, "\nRuntime error: Unhandled exception:\n%s\n",
@@ -118,11 +118,11 @@
 	abort();
 }
 #endif
 
 static void
-enumeration_mutation_handler(id object)
+enumerationMutationHandler(id object)
 {
 	@throw [OFEnumerationMutationException exceptionWithObject: object];
 }
 
 void
@@ -137,11 +137,11 @@
 	abort();
 }
 
 #ifdef OF_OBJFW_RUNTIME
 static IMP
-common_forward_handler(id obj, SEL sel, IMP (*lookup)(id, SEL), IMP forward)
+commonForwardHandler(id obj, SEL sel, IMP (*lookup)(id, SEL), IMP forward)
 {
 	/* Try resolveClassMethod:/resolveInstanceMethod: */
 	if (class_isMetaClass(object_getClass(obj))) {
 		if ([obj respondsToSelector: @selector(resolveClassMethod:)] &&
 		    [obj resolveClassMethod: sel]) {
@@ -186,29 +186,28 @@
 	of_method_not_found(obj, sel);
 	return NULL;
 }
 
 static IMP
-forward_handler(id obj, SEL sel)
+forwardHandler(id obj, SEL sel)
 {
-	return common_forward_handler(obj, sel,
-	    objc_msg_lookup, (IMP)of_forward);
+	return commonForwardHandler(obj, sel, objc_msg_lookup, (IMP)of_forward);
 }
 
 static IMP
-forward_handler_stret(id obj, SEL sel)
+forwardHandlerStret(id obj, SEL sel)
 {
-	return common_forward_handler(obj, sel,
+	return commonForwardHandler(obj, sel,
 	    objc_msg_lookup_stret, (IMP)of_forward_stret);
 }
 #endif
 
 #ifndef HAVE_OBJC_ENUMERATIONMUTATION
 void
 objc_enumerationMutation(id object)
 {
-	enumeration_mutation_handler(object);
+	enumerationMutationHandler(object);
 }
 #endif
 
 id
 of_alloc_object(Class class, size_t extraSize, size_t extraAlignment,
@@ -225,12 +224,12 @@
 
 	instance = malloc(PRE_IVARS_ALIGN + instanceSize +
 	    extraAlignment + extraSize);
 
 	if OF_UNLIKELY (instance == nil) {
-		alloc_failed_exception.isa = [OFAllocFailedException class];
-		@throw (id)&alloc_failed_exception;
+		allocFailedException.isa = [OFAllocFailedException class];
+		@throw (id)&allocFailedException;
 	}
 
 	((struct pre_ivar*)instance)->retainCount = 1;
 	((struct pre_ivar*)instance)->firstMem = NULL;
 	((struct pre_ivar*)instance)->lastMem = NULL;
@@ -275,23 +274,23 @@
 
 @implementation OFObject
 + (void)load
 {
 #if !defined(OF_APPLE_RUNTIME) || defined(__OBJC2__)
-	objc_setUncaughtExceptionHandler(uncaught_exception_handler);
+	objc_setUncaughtExceptionHandler(uncaughtExceptionHandler);
 #endif
 
 #if defined(OF_OBJFW_RUNTIME)
-	objc_forward_handler = forward_handler;
-	objc_forward_handler_stret = forward_handler_stret;
+	objc_forward_handler = forwardHandler;
+	objc_forward_handler_stret = forwardHandlerStret;
 #elif defined(OF_APPLE_RUNTIME) && \
     defined(OF_HAVE_FORWARDING_TARGET_FOR_SELECTOR)
 	objc_setForwardHandler(of_forward, of_forward_stret);
 #endif
 
 #ifdef HAVE_OBJC_ENUMERATIONMUTATION
-	objc_setEnumerationMutationHandler(enumeration_mutation_handler);
+	objc_setEnumerationMutationHandler(enumerationMutationHandler);
 #endif
 
 #if defined(HAVE_ARC4RANDOM)
 	of_hash_seed = arc4random();
 #elif defined(HAVE_RANDOM)

Index: src/OFString+XMLUnescaping.m
==================================================================
--- src/OFString+XMLUnescaping.m
+++ src/OFString+XMLUnescaping.m
@@ -26,11 +26,11 @@
 #import "macros.h"
 
 int _OFString_XMLUnescaping_reference;
 
 static OF_INLINE OFString*
-parse_numeric_entity(const char *entity, size_t length)
+parseNumericEntity(const char *entity, size_t length)
 {
 	of_unichar_t c;
 	size_t i;
 	char buffer[5];
 
@@ -133,11 +133,11 @@
 			else if (entity[0] == '#') {
 				void *pool;
 				OFString *tmp;
 
 				pool = objc_autoreleasePoolPush();
-				tmp = parse_numeric_entity(entity,
+				tmp = parseNumericEntity(entity,
 				    entityLength);
 
 				if (tmp == nil)
 					@throw [OFInvalidFormatException
 					    exception];
@@ -234,11 +234,11 @@
 			else if (entity[0] == '#') {
 				void *pool;
 				OFString *tmp;
 
 				pool = objc_autoreleasePoolPush();
-				tmp = parse_numeric_entity(entity,
+				tmp = parseNumericEntity(entity,
 				    entityLength);
 
 				if (tmp == nil)
 					@throw [OFInvalidFormatException
 					    exception];

Index: src/OFThread.m
==================================================================
--- src/OFThread.m
+++ src/OFThread.m
@@ -76,11 +76,11 @@
 
 static of_tlskey_t threadSelfKey;
 static OFThread *mainThread;
 
 static id
-call_main(id object)
+callMain(id object)
 {
 	OFThread *thread = (OFThread*)object;
 
 	if (!of_tlskey_set(threadSelfKey, thread))
 		@throw [OFInitializationFailedException
@@ -110,11 +110,11 @@
 
 	return 0;
 }
 
 static void
-set_thread_name(OFThread *thread)
+setThreadName(OFThread *thread)
 {
 # ifdef __HAIKU__
 	OFString *name = thread->_name;
 
 	if (name == nil)
@@ -300,16 +300,16 @@
 
 	[self retain];
 
 	_running = OF_THREAD_RUNNING;
 
-	if (!of_thread_new(&_thread, call_main, self)) {
+	if (!of_thread_new(&_thread, callMain, self)) {
 		[self release];
 		@throw [OFThreadStartFailedException exceptionWithThread: self];
 	}
 
-	set_thread_name(self);
+	setThreadName(self);
 }
 
 - (id)join
 {
 	if (_running == OF_THREAD_NOT_RUNNING || !of_thread_join(_thread))
@@ -352,11 +352,11 @@
 - (void)setName: (OFString*)name
 {
 	OF_SETTER(_name, name, true, 1)
 
 	if (_running == OF_THREAD_RUNNING)
-		set_thread_name(self);
+		setThreadName(self);
 }
 
 - (void)dealloc
 {
 	if (_running == OF_THREAD_RUNNING)

Index: src/OFXMLParser.m
==================================================================
--- src/OFXMLParser.m
+++ src/OFXMLParser.m
@@ -40,11 +40,11 @@
 typedef void (*state_function)(id, SEL);
 static SEL selectors[OF_XMLPARSER_NUM_STATES];
 static state_function lookupTable[OF_XMLPARSER_NUM_STATES];
 
 static OF_INLINE void
-buffer_append(OFDataArray *buffer, const char *string,
+appendToBuffer(OFDataArray *buffer, const char *string,
     of_string_encoding_t encoding, size_t length)
 {
 	if (OF_LIKELY(encoding == OF_STRING_ENCODING_UTF_8))
 		[buffer addItems: string
 			   count: length];
@@ -58,11 +58,11 @@
 		objc_autoreleasePoolPop(pool);
 	}
 }
 
 static OFString*
-transform_string(OFDataArray *buffer, size_t cut, bool unescape,
+transformString(OFDataArray *buffer, size_t cut, bool unescape,
     id <OFStringXMLUnescapingDelegate> delegate)
 {
 	char *items;
 	size_t i, length;
 	bool hasEntities = false;
@@ -93,11 +93,11 @@
 
 	return ret;
 }
 
 static OFString*
-namespace_for_prefix(OFString *prefix, OFArray *namespaces)
+namespaceForPrefix(OFString *prefix, OFArray *namespaces)
 {
 	OFDictionary **objects = [namespaces objects];
 	ssize_t i;
 
 	if (prefix == nil)
@@ -112,20 +112,20 @@
 
 	return nil;
 }
 
 static OF_INLINE void
-resolve_attribute_namespace(OFXMLAttribute *attribute, OFArray *namespaces,
+resolveAttributeNamespace(OFXMLAttribute *attribute, OFArray *namespaces,
     OFXMLParser *self)
 {
 	OFString *attributeNS;
 	OFString *attributePrefix = attribute->_namespace;
 
 	if (attributePrefix == nil)
 		return;
 
-	attributeNS = namespace_for_prefix(attributePrefix, namespaces);
+	attributeNS = namespaceForPrefix(attributePrefix, namespaces);
 
 	if ((attributePrefix != nil && attributeNS == nil))
 		@throw [OFUnboundPrefixException
 		    exceptionWithPrefix: attributePrefix
 				 parser: self];
@@ -266,11 +266,11 @@
 		_lastCarriageReturn = (_data[_i] == '\r');
 	}
 
 	/* In OF_XMLPARSER_IN_TAG, there can be only spaces */
 	if (length - _last > 0 && _state != OF_XMLPARSER_IN_TAG)
-		buffer_append(_buffer, _data + _last, _encoding,
+		appendToBuffer(_buffer, _data + _last, _encoding,
 		    length - _last);
 }
 
 - (void)parseString: (OFString*)string
 {
@@ -344,15 +344,15 @@
 
 	if (_data[_i] != '<')
 		return;
 
 	if ((length = _i - _last) > 0)
-		buffer_append(_buffer, _data + _last, _encoding, length);
+		appendToBuffer(_buffer, _data + _last, _encoding, length);
 
 	if ([_buffer count] > 0) {
 		void *pool = objc_autoreleasePoolPush();
-		OFString *characters = transform_string(_buffer, 0, true, self);
+		OFString *characters = transformString(_buffer, 0, true, self);
 
 		if ([_delegate respondsToSelector:
 		    @selector(parser:foundCharacters:)])
 			[_delegate parser: self
 			  foundCharacters: characters];
@@ -509,12 +509,12 @@
 		_level = 1;
 	else if (_level == 1 && _data[_i] == '>') {
 		void *pool = objc_autoreleasePoolPush();
 		OFString *PI;
 
-		buffer_append(_buffer, _data + _last, _encoding, _i - _last);
-		PI = transform_string(_buffer, 1, false, nil);
+		appendToBuffer(_buffer, _data + _last, _encoding, _i - _last);
+		PI = transformString(_buffer, 1, false, nil);
 
 		if ([PI isEqual: @"xml"] || [PI hasPrefix: @"xml "] ||
 		    [PI hasPrefix: @"xml\t"] || [PI hasPrefix: @"xml\r"] ||
 		    [PI hasPrefix: @"xml\n"])
 			if (![self OF_parseXMLProcessingInstructions: PI])
@@ -547,11 +547,11 @@
 	if (_data[_i] != ' ' && _data[_i] != '\t' && _data[_i] != '\n' &&
 	    _data[_i] != '\r' && _data[_i] != '>' && _data[_i] != '/')
 		return;
 
 	if ((length = _i - _last) > 0)
-		buffer_append(_buffer, _data + _last, _encoding, length);
+		appendToBuffer(_buffer, _data + _last, _encoding, length);
 
 	pool = objc_autoreleasePoolPush();
 
 	bufferCString = [_buffer items];
 	bufferLength = [_buffer count];
@@ -572,11 +572,11 @@
 	}
 
 	if (_data[_i] == '>' || _data[_i] == '/') {
 		OFString *namespace;
 
-		namespace = namespace_for_prefix(_prefix, _namespaces);
+		namespace = namespaceForPrefix(_prefix, _namespaces);
 
 		if (_prefix != nil && namespace == nil)
 			@throw [OFUnboundPrefixException
 			    exceptionWithPrefix: _prefix
 					 parser: self];
@@ -632,11 +632,11 @@
 	if (_data[_i] != ' ' && _data[_i] != '\t' && _data[_i] != '\n' &&
 	    _data[_i] != '\r' && _data[_i] != '>')
 		return;
 
 	if ((length = _i - _last) > 0)
-		buffer_append(_buffer, _data + _last, _encoding, length);
+		appendToBuffer(_buffer, _data + _last, _encoding, length);
 
 	pool = objc_autoreleasePoolPush();
 
 	bufferCString = [_buffer items];
 	bufferLength = [_buffer count];
@@ -661,11 +661,11 @@
 
 	[_previous removeLastObject];
 
 	[_buffer removeAllItems];
 
-	namespace = namespace_for_prefix(_prefix, _namespaces);
+	namespace = namespaceForPrefix(_prefix, _namespaces);
 	if (_prefix != nil && namespace == nil)
 		@throw [OFUnboundPrefixException exceptionWithPrefix: _prefix
 							      parser: self];
 
 	if ([_delegate respondsToSelector:
@@ -711,18 +711,18 @@
 	}
 
 	attributesObjects = [_attributes objects];
 	attributesCount = [_attributes count];
 
-	namespace = namespace_for_prefix(_prefix, _namespaces);
+	namespace = namespaceForPrefix(_prefix, _namespaces);
 
 	if (_prefix != nil && namespace == nil)
 		@throw [OFUnboundPrefixException exceptionWithPrefix: _prefix
 							      parser: self];
 
 	for (j = 0; j < attributesCount; j++)
-		resolve_attribute_namespace(attributesObjects[j], _namespaces,
+		resolveAttributeNamespace(attributesObjects[j], _namespaces,
 		    self);
 
 	pool = objc_autoreleasePoolPush();
 
 	if ([_delegate respondsToSelector:
@@ -776,11 +776,11 @@
 	if (_data[_i] != '=' && _data[_i] != ' ' && _data[_i] != '\t' &&
 	    _data[_i] != '\n' && _data[_i] != '\r')
 		return;
 
 	if ((length = _i - _last) > 0)
-		buffer_append(_buffer, _data + _last, _encoding, length);
+		appendToBuffer(_buffer, _data + _last, _encoding, length);
 
 	pool = objc_autoreleasePoolPush();
 
 	bufferString = [OFString stringWithUTF8String: [_buffer items]
 					       length: [_buffer count]];
@@ -850,14 +850,14 @@
 
 	if (_data[_i] != _delimiter)
 		return;
 
 	if ((length = _i - _last) > 0)
-		buffer_append(_buffer, _data + _last, _encoding, length);
+		appendToBuffer(_buffer, _data + _last, _encoding, length);
 
 	pool = objc_autoreleasePoolPush();
-	attributeValue = transform_string(_buffer, 0, true, self);
+	attributeValue = transformString(_buffer, 0, true, self);
 
 	if (_attributePrefix == nil && [_attributeName isEqual: @"xmlns"])
 		[[_namespaces lastObject] setObject: attributeValue
 					     forKey: @""];
 	if ([_attributePrefix isEqual: @"xmlns"])
@@ -942,12 +942,12 @@
 		_level++;
 	else if (_data[_i] == '>' && _level >= 2) {
 		void *pool = objc_autoreleasePoolPush();
 		OFString *CDATA;
 
-		buffer_append(_buffer, _data + _last, _encoding, _i - _last);
-		CDATA = transform_string(_buffer, 2, false, nil);
+		appendToBuffer(_buffer, _data + _last, _encoding, _i - _last);
+		CDATA = transformString(_buffer, 2, false, nil);
 
 		if ([_delegate respondsToSelector:
 		    @selector(parser:foundCDATA:)])
 			[_delegate parser: self
 			       foundCDATA: CDATA];
@@ -992,12 +992,12 @@
 	if (_data[_i] != '>')
 		@throw [OFMalformedXMLException exceptionWithParser: self];
 
 	pool = objc_autoreleasePoolPush();
 
-	buffer_append(_buffer, _data + _last, _encoding, _i - _last);
-	comment = transform_string(_buffer, 2, false, nil);
+	appendToBuffer(_buffer, _data + _last, _encoding, _i - _last);
+	comment = transformString(_buffer, 2, false, nil);
 
 	if ([_delegate respondsToSelector: @selector(parser:foundComment:)])
 		[_delegate parser: self
 		     foundComment: comment];
 

Index: src/instance.m
==================================================================
--- src/instance.m
+++ src/instance.m
@@ -16,39 +16,39 @@
 
 #include "config.h"
 
 #import "OFObject.h"
 
-static SEL cxx_construct = NULL;
-static SEL cxx_destruct = NULL;
+static SEL constructSel = NULL;
+static SEL destructSel = NULL;
 
 static bool
-call_ctors(Class cls, id obj)
+callConstructors(Class cls, id obj)
 {
 	Class super = class_getSuperclass(cls);
-	id (*ctor)(id, SEL);
+	id (*construct)(id, SEL);
 	id (*last)(id, SEL);
 
 	if (super != nil)
-		if (!call_ctors(super, obj))
+		if (!callConstructors(super, obj))
 			return false;
 
-	if (cxx_construct == NULL)
-		cxx_construct = sel_registerName(".cxx_construct");
+	if (constructSel == NULL)
+		constructSel = sel_registerName(".cxx_construct");
 
-	if (!class_respondsToSelector(cls, cxx_construct))
+	if (!class_respondsToSelector(cls, constructSel))
 		return true;
 
-	ctor = (id(*)(id, SEL))
-	    class_getMethodImplementation(cls, cxx_construct);
+	construct = (id(*)(id, SEL))
+	    class_getMethodImplementation(cls, constructSel);
 	last = (id(*)(id, SEL))
-	    class_getMethodImplementation(super, cxx_construct);
+	    class_getMethodImplementation(super, constructSel);
 
-	if (ctor == last)
+	if (construct == last)
 		return true;
 
-	return (ctor(obj, cxx_construct) != nil);
+	return (construct(obj, constructSel) != nil);
 }
 
 id
 objc_constructInstance(Class cls, void *bytes)
 {
@@ -57,11 +57,11 @@
 	if (cls == Nil || bytes == NULL)
 		return nil;
 
 	object_setClass(obj, cls);
 
-	if (!call_ctors(cls, obj))
+	if (!callConstructors(cls, obj))
 		return nil;
 
 	return obj;
 }
 
@@ -69,25 +69,25 @@
 objc_destructInstance(id obj)
 {
 	Class cls;
 	void (*last)(id, SEL) = NULL;
 
-	if (cxx_destruct == NULL)
-		cxx_destruct = sel_registerName(".cxx_destruct");
+	if (destructSel == NULL)
+		destructSel = sel_registerName(".cxx_destruct");
 
 	for (cls = object_getClass(obj); cls != Nil;
 	    cls = class_getSuperclass(cls)) {
-		void (*dtor)(id, SEL);
+		void (*destruct)(id, SEL);
 
-		if (class_respondsToSelector(cls, cxx_destruct)) {
-			if ((dtor = (void(*)(id, SEL))
+		if (class_respondsToSelector(cls, destructSel)) {
+			if ((destruct = (void(*)(id, SEL))
 			    class_getMethodImplementation(cls,
-			    cxx_destruct)) != last)
-				dtor(obj, cxx_destruct);
+			    destructSel)) != last)
+				destruct(obj, destructSel);
 
-			last = dtor;
+			last = destruct;
 		} else
 			break;
 	}
 
 	return obj;
 }

Index: src/unicode.m
==================================================================
--- src/unicode.m
+++ src/unicode.m
@@ -16,13 +16,13 @@
 
 #include "config.h"
 
 #import "OFString.h"
 
-static const of_unichar_t nop_page[0x100] = {};
+static const of_unichar_t emptyPage[0x100] = {};
 
-static const of_unichar_t uppercase_page_0[0x100] = {
+static const of_unichar_t uppercasePage0[0x100] = {
 	0, 0, 0, 0, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0,
@@ -53,11 +53,11 @@
 	200, 201, 202, 203, 204, 205, 206, 207,
 	208, 209, 210, 211, 212, 213, 214, 0,
 	216, 217, 218, 219, 220, 221, 222, 376,
 };
 
-static const of_unichar_t uppercase_page_1[0x100] = {
+static const of_unichar_t uppercasePage1[0x100] = {
 	0, 256, 0, 258, 0, 260, 0, 262,
 	0, 264, 0, 266, 0, 268, 0, 270,
 	0, 272, 0, 274, 0, 276, 0, 278,
 	0, 280, 0, 282, 0, 284, 0, 286,
 	0, 288, 0, 290, 0, 292, 0, 294,
@@ -88,11 +88,11 @@
 	0, 488, 0, 490, 0, 492, 0, 494,
 	0, 0, 497, 497, 0, 500, 0, 0,
 	0, 504, 0, 506, 0, 508, 0, 510,
 };
 
-static const of_unichar_t uppercase_page_2[0x100] = {
+static const of_unichar_t uppercasePage2[0x100] = {
 	0, 512, 0, 514, 0, 516, 0, 518,
 	0, 520, 0, 522, 0, 524, 0, 526,
 	0, 528, 0, 530, 0, 532, 0, 534,
 	0, 536, 0, 538, 0, 540, 0, 542,
 	0, 0, 0, 546, 0, 548, 0, 550,
@@ -123,11 +123,11 @@
 	0, 0, 0, 0, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0,
 };
 
-static const of_unichar_t uppercase_page_3[0x100] = {
+static const of_unichar_t uppercasePage3[0x100] = {
 	0, 0, 0, 0, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0,
@@ -158,11 +158,11 @@
 	0, 1000, 0, 1002, 0, 1004, 0, 1006,
 	922, 929, 1017, 0, 0, 917, 0, 0,
 	1015, 0, 0, 1018, 0, 0, 0, 0,
 };
 
-static const of_unichar_t uppercase_page_4[0x100] = {
+static const of_unichar_t uppercasePage4[0x100] = {
 	0, 0, 0, 0, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0,
@@ -193,11 +193,11 @@
 	0, 1256, 0, 1258, 0, 1260, 0, 1262,
 	0, 1264, 0, 1266, 0, 1268, 0, 1270,
 	0, 1272, 0, 1274, 0, 1276, 0, 1278,
 };
 
-static const of_unichar_t uppercase_page_5[0x100] = {
+static const of_unichar_t uppercasePage5[0x100] = {
 	0, 1280, 0, 1282, 0, 1284, 0, 1286,
 	0, 1288, 0, 1290, 0, 1292, 0, 1294,
 	0, 1296, 0, 1298, 0, 1300, 0, 1302,
 	0, 1304, 0, 1306, 0, 1308, 0, 1310,
 	0, 1312, 0, 1314, 0, 1316, 0, 1318,
@@ -228,11 +228,11 @@
 	0, 0, 0, 0, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0,
 };
 
-static const of_unichar_t uppercase_page_29[0x100] = {
+static const of_unichar_t uppercasePage29[0x100] = {
 	0, 0, 0, 0, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0,
@@ -263,11 +263,11 @@
 	0, 0, 0, 0, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0,
 };
 
-static const of_unichar_t uppercase_page_30[0x100] = {
+static const of_unichar_t uppercasePage30[0x100] = {
 	0, 7680, 0, 7682, 0, 7684, 0, 7686,
 	0, 7688, 0, 7690, 0, 7692, 0, 7694,
 	0, 7696, 0, 7698, 0, 7700, 0, 7702,
 	0, 7704, 0, 7706, 0, 7708, 0, 7710,
 	0, 7712, 0, 7714, 0, 7716, 0, 7718,
@@ -298,11 +298,11 @@
 	0, 7912, 0, 7914, 0, 7916, 0, 7918,
 	0, 7920, 0, 7922, 0, 7924, 0, 7926,
 	0, 7928, 0, 7930, 0, 7932, 0, 7934,
 };
 
-static const of_unichar_t uppercase_page_31[0x100] = {
+static const of_unichar_t uppercasePage31[0x100] = {
 	7944, 7945, 7946, 7947, 7948, 7949, 7950, 7951,
 	0, 0, 0, 0, 0, 0, 0, 0,
 	7960, 7961, 7962, 7963, 7964, 7965, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0,
 	7976, 7977, 7978, 7979, 7980, 7981, 7982, 7983,
@@ -333,11 +333,11 @@
 	0, 0, 0, 0, 0, 0, 0, 0,
 	0, 0, 0, 8188, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0,
 };
 
-static const of_unichar_t uppercase_page_33[0x100] = {
+static const of_unichar_t uppercasePage33[0x100] = {
 	0, 0, 0, 0, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0,
@@ -368,11 +368,11 @@
 	0, 0, 0, 0, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0,
 };
 
-static const of_unichar_t uppercase_page_36[0x100] = {
+static const of_unichar_t uppercasePage36[0x100] = {
 	0, 0, 0, 0, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0,
@@ -403,11 +403,11 @@
 	9422, 9423, 0, 0, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0,
 };
 
-static const of_unichar_t uppercase_page_44[0x100] = {
+static const of_unichar_t uppercasePage44[0x100] = {
 	0, 0, 0, 0, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0,
@@ -438,11 +438,11 @@
 	0, 0, 0, 0, 11499, 0, 11501, 0,
 	0, 0, 0, 11506, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0,
 };
 
-static const of_unichar_t uppercase_page_45[0x100] = {
+static const of_unichar_t uppercasePage45[0x100] = {
 	4256, 4257, 4258, 4259, 4260, 4261, 4262, 4263,
 	4264, 4265, 4266, 4267, 4268, 4269, 4270, 4271,
 	4272, 4273, 4274, 4275, 4276, 4277, 4278, 4279,
 	4280, 4281, 4282, 4283, 4284, 4285, 4286, 4287,
 	4288, 4289, 4290, 4291, 4292, 4293, 0, 4295,
@@ -473,11 +473,11 @@
 	0, 0, 0, 0, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0,
 };
 
-static const of_unichar_t uppercase_page_166[0x100] = {
+static const of_unichar_t uppercasePage166[0x100] = {
 	0, 0, 0, 0, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0,
@@ -508,11 +508,11 @@
 	0, 0, 0, 0, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0,
 };
 
-static const of_unichar_t uppercase_page_167[0x100] = {
+static const of_unichar_t uppercasePage167[0x100] = {
 	0, 0, 0, 0, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0,
 	0, 0, 0, 42786, 0, 42788, 0, 42790,
@@ -543,11 +543,11 @@
 	0, 0, 0, 0, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0,
 };
 
-static const of_unichar_t uppercase_page_255[0x100] = {
+static const of_unichar_t uppercasePage255[0x100] = {
 	0, 0, 0, 0, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0,
@@ -578,11 +578,11 @@
 	0, 0, 0, 0, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0,
 };
 
-static const of_unichar_t uppercase_page_260[0x100] = {
+static const of_unichar_t uppercasePage260[0x100] = {
 	0, 0, 0, 0, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0,
@@ -613,11 +613,11 @@
 	0, 0, 0, 0, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0,
 };
 
-static const of_unichar_t lowercase_page_0[0x100] = {
+static const of_unichar_t lowercasePage0[0x100] = {
 	0, 0, 0, 0, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0,
@@ -648,11 +648,11 @@
 	0, 0, 0, 0, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0,
 };
 
-static const of_unichar_t lowercase_page_1[0x100] = {
+static const of_unichar_t lowercasePage1[0x100] = {
 	257, 0, 259, 0, 261, 0, 263, 0,
 	265, 0, 267, 0, 269, 0, 271, 0,
 	273, 0, 275, 0, 277, 0, 279, 0,
 	281, 0, 283, 0, 285, 0, 287, 0,
 	289, 0, 291, 0, 293, 0, 295, 0,
@@ -683,11 +683,11 @@
 	489, 0, 491, 0, 493, 0, 495, 0,
 	0, 499, 499, 0, 501, 0, 405, 447,
 	505, 0, 507, 0, 509, 0, 511, 0,
 };
 
-static const of_unichar_t lowercase_page_2[0x100] = {
+static const of_unichar_t lowercasePage2[0x100] = {
 	513, 0, 515, 0, 517, 0, 519, 0,
 	521, 0, 523, 0, 525, 0, 527, 0,
 	529, 0, 531, 0, 533, 0, 535, 0,
 	537, 0, 539, 0, 541, 0, 543, 0,
 	414, 0, 547, 0, 549, 0, 551, 0,
@@ -718,11 +718,11 @@
 	0, 0, 0, 0, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0,
 };
 
-static const of_unichar_t lowercase_page_3[0x100] = {
+static const of_unichar_t lowercasePage3[0x100] = {
 	0, 0, 0, 0, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0,
@@ -753,11 +753,11 @@
 	1001, 0, 1003, 0, 1005, 0, 1007, 0,
 	0, 0, 0, 0, 952, 0, 0, 1016,
 	0, 1010, 1019, 0, 0, 891, 892, 893,
 };
 
-static const of_unichar_t lowercase_page_4[0x100] = {
+static const of_unichar_t lowercasePage4[0x100] = {
 	1104, 1105, 1106, 1107, 1108, 1109, 1110, 1111,
 	1112, 1113, 1114, 1115, 1116, 1117, 1118, 1119,
 	1072, 1073, 1074, 1075, 1076, 1077, 1078, 1079,
 	1080, 1081, 1082, 1083, 1084, 1085, 1086, 1087,
 	1088, 1089, 1090, 1091, 1092, 1093, 1094, 1095,
@@ -788,11 +788,11 @@
 	1257, 0, 1259, 0, 1261, 0, 1263, 0,
 	1265, 0, 1267, 0, 1269, 0, 1271, 0,
 	1273, 0, 1275, 0, 1277, 0, 1279, 0,
 };
 
-static const of_unichar_t lowercase_page_5[0x100] = {
+static const of_unichar_t lowercasePage5[0x100] = {
 	1281, 0, 1283, 0, 1285, 0, 1287, 0,
 	1289, 0, 1291, 0, 1293, 0, 1295, 0,
 	1297, 0, 1299, 0, 1301, 0, 1303, 0,
 	1305, 0, 1307, 0, 1309, 0, 1311, 0,
 	1313, 0, 1315, 0, 1317, 0, 1319, 0,
@@ -823,11 +823,11 @@
 	0, 0, 0, 0, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0,
 };
 
-static const of_unichar_t lowercase_page_16[0x100] = {
+static const of_unichar_t lowercasePage16[0x100] = {
 	0, 0, 0, 0, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0,
@@ -858,11 +858,11 @@
 	0, 0, 0, 0, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0,
 };
 
-static const of_unichar_t lowercase_page_30[0x100] = {
+static const of_unichar_t lowercasePage30[0x100] = {
 	7681, 0, 7683, 0, 7685, 0, 7687, 0,
 	7689, 0, 7691, 0, 7693, 0, 7695, 0,
 	7697, 0, 7699, 0, 7701, 0, 7703, 0,
 	7705, 0, 7707, 0, 7709, 0, 7711, 0,
 	7713, 0, 7715, 0, 7717, 0, 7719, 0,
@@ -893,11 +893,11 @@
 	7913, 0, 7915, 0, 7917, 0, 7919, 0,
 	7921, 0, 7923, 0, 7925, 0, 7927, 0,
 	7929, 0, 7931, 0, 7933, 0, 7935, 0,
 };
 
-static const of_unichar_t lowercase_page_31[0x100] = {
+static const of_unichar_t lowercasePage31[0x100] = {
 	0, 0, 0, 0, 0, 0, 0, 0,
 	7936, 7937, 7938, 7939, 7940, 7941, 7942, 7943,
 	0, 0, 0, 0, 0, 0, 0, 0,
 	7952, 7953, 7954, 7955, 7956, 7957, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0,
@@ -928,11 +928,11 @@
 	8160, 8161, 8058, 8059, 8165, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0,
 	8056, 8057, 8060, 8061, 8179, 0, 0, 0,
 };
 
-static const of_unichar_t lowercase_page_33[0x100] = {
+static const of_unichar_t lowercasePage33[0x100] = {
 	0, 0, 0, 0, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 969, 0,
@@ -963,11 +963,11 @@
 	0, 0, 0, 0, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0,
 };
 
-static const of_unichar_t lowercase_page_36[0x100] = {
+static const of_unichar_t lowercasePage36[0x100] = {
 	0, 0, 0, 0, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0,
@@ -998,11 +998,11 @@
 	0, 0, 0, 0, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0,
 };
 
-static const of_unichar_t lowercase_page_44[0x100] = {
+static const of_unichar_t lowercasePage44[0x100] = {
 	11312, 11313, 11314, 11315, 11316, 11317, 11318, 11319,
 	11320, 11321, 11322, 11323, 11324, 11325, 11326, 11327,
 	11328, 11329, 11330, 11331, 11332, 11333, 11334, 11335,
 	11336, 11337, 11338, 11339, 11340, 11341, 11342, 11343,
 	11344, 11345, 11346, 11347, 11348, 11349, 11350, 11351,
@@ -1033,11 +1033,11 @@
 	0, 0, 0, 11500, 0, 11502, 0, 0,
 	0, 0, 11507, 0, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0,
 };
 
-static const of_unichar_t lowercase_page_166[0x100] = {
+static const of_unichar_t lowercasePage166[0x100] = {
 	0, 0, 0, 0, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0,
@@ -1068,11 +1068,11 @@
 	0, 0, 0, 0, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0,
 };
 
-static const of_unichar_t lowercase_page_167[0x100] = {
+static const of_unichar_t lowercasePage167[0x100] = {
 	0, 0, 0, 0, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0,
 	0, 0, 42787, 0, 42789, 0, 42791, 0,
@@ -1103,11 +1103,11 @@
 	0, 0, 0, 0, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0,
 };
 
-static const of_unichar_t lowercase_page_255[0x100] = {
+static const of_unichar_t lowercasePage255[0x100] = {
 	0, 0, 0, 0, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0,
 	0, 65345, 65346, 65347, 65348, 65349, 65350, 65351,
@@ -1138,11 +1138,11 @@
 	0, 0, 0, 0, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0,
 };
 
-static const of_unichar_t lowercase_page_260[0x100] = {
+static const of_unichar_t lowercasePage260[0x100] = {
 	66600, 66601, 66602, 66603, 66604, 66605, 66606, 66607,
 	66608, 66609, 66610, 66611, 66612, 66613, 66614, 66615,
 	66616, 66617, 66618, 66619, 66620, 66621, 66622, 66623,
 	66624, 66625, 66626, 66627, 66628, 66629, 66630, 66631,
 	66632, 66633, 66634, 66635, 66636, 66637, 66638, 66639,
@@ -1173,11 +1173,11 @@
 	0, 0, 0, 0, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0,
 };
 
-static const of_unichar_t titlecase_page_1[0x100] = {
+static const of_unichar_t titlecasePage1[0x100] = {
 	0, 256, 0, 258, 0, 260, 0, 262,
 	0, 264, 0, 266, 0, 268, 0, 270,
 	0, 272, 0, 274, 0, 276, 0, 278,
 	0, 280, 0, 282, 0, 284, 0, 286,
 	0, 288, 0, 290, 0, 292, 0, 294,
@@ -1208,11 +1208,11 @@
 	0, 488, 0, 490, 0, 492, 0, 494,
 	0, 498, 498, 498, 0, 500, 0, 0,
 	0, 504, 0, 506, 0, 508, 0, 510,
 };
 
-static const of_unichar_t casefolding_page_0[0x100] = {
+static const of_unichar_t casefoldingPage0[0x100] = {
 	0, 0, 0, 0, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0,
@@ -1243,11 +1243,11 @@
 	0, 0, 0, 0, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0,
 };
 
-static const of_unichar_t casefolding_page_1[0x100] = {
+static const of_unichar_t casefoldingPage1[0x100] = {
 	257, 0, 259, 0, 261, 0, 263, 0,
 	265, 0, 267, 0, 269, 0, 271, 0,
 	273, 0, 275, 0, 277, 0, 279, 0,
 	281, 0, 283, 0, 285, 0, 287, 0,
 	289, 0, 291, 0, 293, 0, 295, 0,
@@ -1278,11 +1278,11 @@
 	489, 0, 491, 0, 493, 0, 495, 0,
 	0, 499, 499, 0, 501, 0, 405, 447,
 	505, 0, 507, 0, 509, 0, 511, 0,
 };
 
-static const of_unichar_t casefolding_page_3[0x100] = {
+static const of_unichar_t casefoldingPage3[0x100] = {
 	0, 0, 0, 0, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0,
@@ -1313,11 +1313,11 @@
 	1001, 0, 1003, 0, 1005, 0, 1007, 0,
 	954, 961, 0, 0, 952, 949, 0, 1016,
 	0, 1010, 1019, 0, 0, 891, 892, 893,
 };
 
-static const of_unichar_t casefolding_page_30[0x100] = {
+static const of_unichar_t casefoldingPage30[0x100] = {
 	7681, 0, 7683, 0, 7685, 0, 7687, 0,
 	7689, 0, 7691, 0, 7693, 0, 7695, 0,
 	7697, 0, 7699, 0, 7701, 0, 7703, 0,
 	7705, 0, 7707, 0, 7709, 0, 7711, 0,
 	7713, 0, 7715, 0, 7717, 0, 7719, 0,
@@ -1348,11 +1348,11 @@
 	7913, 0, 7915, 0, 7917, 0, 7919, 0,
 	7921, 0, 7923, 0, 7925, 0, 7927, 0,
 	7929, 0, 7931, 0, 7933, 0, 7935, 0,
 };
 
-static const of_unichar_t casefolding_page_31[0x100] = {
+static const of_unichar_t casefoldingPage31[0x100] = {
 	0, 0, 0, 0, 0, 0, 0, 0,
 	7936, 7937, 7938, 7939, 7940, 7941, 7942, 7943,
 	0, 0, 0, 0, 0, 0, 0, 0,
 	7952, 7953, 7954, 7955, 7956, 7957, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0,
@@ -1384,300 +1384,300 @@
 	0, 0, 0, 0, 0, 0, 0, 0,
 	8056, 8057, 8060, 8061, 8179, 0, 0, 0,
 };
 
 const of_unichar_t* const of_unicode_uppercase_table[0x105] = {
-	uppercase_page_0, uppercase_page_1, uppercase_page_2, uppercase_page_3,
-	uppercase_page_4, uppercase_page_5, nop_page, nop_page,
-	nop_page, nop_page, nop_page, nop_page,
-	nop_page, nop_page, nop_page, nop_page,
-	nop_page, nop_page, nop_page, nop_page,
-	nop_page, nop_page, nop_page, nop_page,
-	nop_page, nop_page, nop_page, nop_page,
-	nop_page, uppercase_page_29, uppercase_page_30, uppercase_page_31,
-	nop_page, uppercase_page_33, nop_page, nop_page,
-	uppercase_page_36, nop_page, nop_page, nop_page,
-	nop_page, nop_page, nop_page, nop_page,
-	uppercase_page_44, uppercase_page_45, nop_page, nop_page,
-	nop_page, nop_page, nop_page, nop_page,
-	nop_page, nop_page, nop_page, nop_page,
-	nop_page, nop_page, nop_page, nop_page,
-	nop_page, nop_page, nop_page, nop_page,
-	nop_page, nop_page, nop_page, nop_page,
-	nop_page, nop_page, nop_page, nop_page,
-	nop_page, nop_page, nop_page, nop_page,
-	nop_page, nop_page, nop_page, nop_page,
-	nop_page, nop_page, nop_page, nop_page,
-	nop_page, nop_page, nop_page, nop_page,
-	nop_page, nop_page, nop_page, nop_page,
-	nop_page, nop_page, nop_page, nop_page,
-	nop_page, nop_page, nop_page, nop_page,
-	nop_page, nop_page, nop_page, nop_page,
-	nop_page, nop_page, nop_page, nop_page,
-	nop_page, nop_page, nop_page, nop_page,
-	nop_page, nop_page, nop_page, nop_page,
-	nop_page, nop_page, nop_page, nop_page,
-	nop_page, nop_page, nop_page, nop_page,
-	nop_page, nop_page, nop_page, nop_page,
-	nop_page, nop_page, nop_page, nop_page,
-	nop_page, nop_page, nop_page, nop_page,
-	nop_page, nop_page, nop_page, nop_page,
-	nop_page, nop_page, nop_page, nop_page,
-	nop_page, nop_page, nop_page, nop_page,
-	nop_page, nop_page, nop_page, nop_page,
-	nop_page, nop_page, nop_page, nop_page,
-	nop_page, nop_page, nop_page, nop_page,
-	nop_page, nop_page, nop_page, nop_page,
-	nop_page, nop_page, uppercase_page_166, uppercase_page_167,
-	nop_page, nop_page, nop_page, nop_page,
-	nop_page, nop_page, nop_page, nop_page,
-	nop_page, nop_page, nop_page, nop_page,
-	nop_page, nop_page, nop_page, nop_page,
-	nop_page, nop_page, nop_page, nop_page,
-	nop_page, nop_page, nop_page, nop_page,
-	nop_page, nop_page, nop_page, nop_page,
-	nop_page, nop_page, nop_page, nop_page,
-	nop_page, nop_page, nop_page, nop_page,
-	nop_page, nop_page, nop_page, nop_page,
-	nop_page, nop_page, nop_page, nop_page,
-	nop_page, nop_page, nop_page, nop_page,
-	nop_page, nop_page, nop_page, nop_page,
-	nop_page, nop_page, nop_page, nop_page,
-	nop_page, nop_page, nop_page, nop_page,
-	nop_page, nop_page, nop_page, nop_page,
-	nop_page, nop_page, nop_page, nop_page,
-	nop_page, nop_page, nop_page, nop_page,
-	nop_page, nop_page, nop_page, nop_page,
-	nop_page, nop_page, nop_page, nop_page,
-	nop_page, nop_page, nop_page, nop_page,
-	nop_page, nop_page, nop_page, uppercase_page_255,
-	nop_page, nop_page, nop_page, nop_page,
-	uppercase_page_260
+	uppercasePage0, uppercasePage1, uppercasePage2, uppercasePage3,
+	uppercasePage4, uppercasePage5, emptyPage, emptyPage,
+	emptyPage, emptyPage, emptyPage, emptyPage,
+	emptyPage, emptyPage, emptyPage, emptyPage,
+	emptyPage, emptyPage, emptyPage, emptyPage,
+	emptyPage, emptyPage, emptyPage, emptyPage,
+	emptyPage, emptyPage, emptyPage, emptyPage,
+	emptyPage, uppercasePage29, uppercasePage30, uppercasePage31,
+	emptyPage, uppercasePage33, emptyPage, emptyPage,
+	uppercasePage36, emptyPage, emptyPage, emptyPage,
+	emptyPage, emptyPage, emptyPage, emptyPage,
+	uppercasePage44, uppercasePage45, emptyPage, emptyPage,
+	emptyPage, emptyPage, emptyPage, emptyPage,
+	emptyPage, emptyPage, emptyPage, emptyPage,
+	emptyPage, emptyPage, emptyPage, emptyPage,
+	emptyPage, emptyPage, emptyPage, emptyPage,
+	emptyPage, emptyPage, emptyPage, emptyPage,
+	emptyPage, emptyPage, emptyPage, emptyPage,
+	emptyPage, emptyPage, emptyPage, emptyPage,
+	emptyPage, emptyPage, emptyPage, emptyPage,
+	emptyPage, emptyPage, emptyPage, emptyPage,
+	emptyPage, emptyPage, emptyPage, emptyPage,
+	emptyPage, emptyPage, emptyPage, emptyPage,
+	emptyPage, emptyPage, emptyPage, emptyPage,
+	emptyPage, emptyPage, emptyPage, emptyPage,
+	emptyPage, emptyPage, emptyPage, emptyPage,
+	emptyPage, emptyPage, emptyPage, emptyPage,
+	emptyPage, emptyPage, emptyPage, emptyPage,
+	emptyPage, emptyPage, emptyPage, emptyPage,
+	emptyPage, emptyPage, emptyPage, emptyPage,
+	emptyPage, emptyPage, emptyPage, emptyPage,
+	emptyPage, emptyPage, emptyPage, emptyPage,
+	emptyPage, emptyPage, emptyPage, emptyPage,
+	emptyPage, emptyPage, emptyPage, emptyPage,
+	emptyPage, emptyPage, emptyPage, emptyPage,
+	emptyPage, emptyPage, emptyPage, emptyPage,
+	emptyPage, emptyPage, emptyPage, emptyPage,
+	emptyPage, emptyPage, emptyPage, emptyPage,
+	emptyPage, emptyPage, emptyPage, emptyPage,
+	emptyPage, emptyPage, emptyPage, emptyPage,
+	emptyPage, emptyPage, emptyPage, emptyPage,
+	emptyPage, emptyPage, uppercasePage166, uppercasePage167,
+	emptyPage, emptyPage, emptyPage, emptyPage,
+	emptyPage, emptyPage, emptyPage, emptyPage,
+	emptyPage, emptyPage, emptyPage, emptyPage,
+	emptyPage, emptyPage, emptyPage, emptyPage,
+	emptyPage, emptyPage, emptyPage, emptyPage,
+	emptyPage, emptyPage, emptyPage, emptyPage,
+	emptyPage, emptyPage, emptyPage, emptyPage,
+	emptyPage, emptyPage, emptyPage, emptyPage,
+	emptyPage, emptyPage, emptyPage, emptyPage,
+	emptyPage, emptyPage, emptyPage, emptyPage,
+	emptyPage, emptyPage, emptyPage, emptyPage,
+	emptyPage, emptyPage, emptyPage, emptyPage,
+	emptyPage, emptyPage, emptyPage, emptyPage,
+	emptyPage, emptyPage, emptyPage, emptyPage,
+	emptyPage, emptyPage, emptyPage, emptyPage,
+	emptyPage, emptyPage, emptyPage, emptyPage,
+	emptyPage, emptyPage, emptyPage, emptyPage,
+	emptyPage, emptyPage, emptyPage, emptyPage,
+	emptyPage, emptyPage, emptyPage, emptyPage,
+	emptyPage, emptyPage, emptyPage, emptyPage,
+	emptyPage, emptyPage, emptyPage, emptyPage,
+	emptyPage, emptyPage, emptyPage, uppercasePage255,
+	emptyPage, emptyPage, emptyPage, emptyPage,
+	uppercasePage260
 };
 
 const of_unichar_t* const of_unicode_lowercase_table[0x105] = {
-	lowercase_page_0, lowercase_page_1, lowercase_page_2, lowercase_page_3,
-	lowercase_page_4, lowercase_page_5, nop_page, nop_page,
-	nop_page, nop_page, nop_page, nop_page,
-	nop_page, nop_page, nop_page, nop_page,
-	lowercase_page_16, nop_page, nop_page, nop_page,
-	nop_page, nop_page, nop_page, nop_page,
-	nop_page, nop_page, nop_page, nop_page,
-	nop_page, nop_page, lowercase_page_30, lowercase_page_31,
-	nop_page, lowercase_page_33, nop_page, nop_page,
-	lowercase_page_36, nop_page, nop_page, nop_page,
-	nop_page, nop_page, nop_page, nop_page,
-	lowercase_page_44, nop_page, nop_page, nop_page,
-	nop_page, nop_page, nop_page, nop_page,
-	nop_page, nop_page, nop_page, nop_page,
-	nop_page, nop_page, nop_page, nop_page,
-	nop_page, nop_page, nop_page, nop_page,
-	nop_page, nop_page, nop_page, nop_page,
-	nop_page, nop_page, nop_page, nop_page,
-	nop_page, nop_page, nop_page, nop_page,
-	nop_page, nop_page, nop_page, nop_page,
-	nop_page, nop_page, nop_page, nop_page,
-	nop_page, nop_page, nop_page, nop_page,
-	nop_page, nop_page, nop_page, nop_page,
-	nop_page, nop_page, nop_page, nop_page,
-	nop_page, nop_page, nop_page, nop_page,
-	nop_page, nop_page, nop_page, nop_page,
-	nop_page, nop_page, nop_page, nop_page,
-	nop_page, nop_page, nop_page, nop_page,
-	nop_page, nop_page, nop_page, nop_page,
-	nop_page, nop_page, nop_page, nop_page,
-	nop_page, nop_page, nop_page, nop_page,
-	nop_page, nop_page, nop_page, nop_page,
-	nop_page, nop_page, nop_page, nop_page,
-	nop_page, nop_page, nop_page, nop_page,
-	nop_page, nop_page, nop_page, nop_page,
-	nop_page, nop_page, nop_page, nop_page,
-	nop_page, nop_page, nop_page, nop_page,
-	nop_page, nop_page, nop_page, nop_page,
-	nop_page, nop_page, nop_page, nop_page,
-	nop_page, nop_page, nop_page, nop_page,
-	nop_page, nop_page, nop_page, nop_page,
-	nop_page, nop_page, lowercase_page_166, lowercase_page_167,
-	nop_page, nop_page, nop_page, nop_page,
-	nop_page, nop_page, nop_page, nop_page,
-	nop_page, nop_page, nop_page, nop_page,
-	nop_page, nop_page, nop_page, nop_page,
-	nop_page, nop_page, nop_page, nop_page,
-	nop_page, nop_page, nop_page, nop_page,
-	nop_page, nop_page, nop_page, nop_page,
-	nop_page, nop_page, nop_page, nop_page,
-	nop_page, nop_page, nop_page, nop_page,
-	nop_page, nop_page, nop_page, nop_page,
-	nop_page, nop_page, nop_page, nop_page,
-	nop_page, nop_page, nop_page, nop_page,
-	nop_page, nop_page, nop_page, nop_page,
-	nop_page, nop_page, nop_page, nop_page,
-	nop_page, nop_page, nop_page, nop_page,
-	nop_page, nop_page, nop_page, nop_page,
-	nop_page, nop_page, nop_page, nop_page,
-	nop_page, nop_page, nop_page, nop_page,
-	nop_page, nop_page, nop_page, nop_page,
-	nop_page, nop_page, nop_page, nop_page,
-	nop_page, nop_page, nop_page, nop_page,
-	nop_page, nop_page, nop_page, lowercase_page_255,
-	nop_page, nop_page, nop_page, nop_page,
-	lowercase_page_260
+	lowercasePage0, lowercasePage1, lowercasePage2, lowercasePage3,
+	lowercasePage4, lowercasePage5, emptyPage, emptyPage,
+	emptyPage, emptyPage, emptyPage, emptyPage,
+	emptyPage, emptyPage, emptyPage, emptyPage,
+	lowercasePage16, emptyPage, emptyPage, emptyPage,
+	emptyPage, emptyPage, emptyPage, emptyPage,
+	emptyPage, emptyPage, emptyPage, emptyPage,
+	emptyPage, emptyPage, lowercasePage30, lowercasePage31,
+	emptyPage, lowercasePage33, emptyPage, emptyPage,
+	lowercasePage36, emptyPage, emptyPage, emptyPage,
+	emptyPage, emptyPage, emptyPage, emptyPage,
+	lowercasePage44, emptyPage, emptyPage, emptyPage,
+	emptyPage, emptyPage, emptyPage, emptyPage,
+	emptyPage, emptyPage, emptyPage, emptyPage,
+	emptyPage, emptyPage, emptyPage, emptyPage,
+	emptyPage, emptyPage, emptyPage, emptyPage,
+	emptyPage, emptyPage, emptyPage, emptyPage,
+	emptyPage, emptyPage, emptyPage, emptyPage,
+	emptyPage, emptyPage, emptyPage, emptyPage,
+	emptyPage, emptyPage, emptyPage, emptyPage,
+	emptyPage, emptyPage, emptyPage, emptyPage,
+	emptyPage, emptyPage, emptyPage, emptyPage,
+	emptyPage, emptyPage, emptyPage, emptyPage,
+	emptyPage, emptyPage, emptyPage, emptyPage,
+	emptyPage, emptyPage, emptyPage, emptyPage,
+	emptyPage, emptyPage, emptyPage, emptyPage,
+	emptyPage, emptyPage, emptyPage, emptyPage,
+	emptyPage, emptyPage, emptyPage, emptyPage,
+	emptyPage, emptyPage, emptyPage, emptyPage,
+	emptyPage, emptyPage, emptyPage, emptyPage,
+	emptyPage, emptyPage, emptyPage, emptyPage,
+	emptyPage, emptyPage, emptyPage, emptyPage,
+	emptyPage, emptyPage, emptyPage, emptyPage,
+	emptyPage, emptyPage, emptyPage, emptyPage,
+	emptyPage, emptyPage, emptyPage, emptyPage,
+	emptyPage, emptyPage, emptyPage, emptyPage,
+	emptyPage, emptyPage, emptyPage, emptyPage,
+	emptyPage, emptyPage, emptyPage, emptyPage,
+	emptyPage, emptyPage, emptyPage, emptyPage,
+	emptyPage, emptyPage, emptyPage, emptyPage,
+	emptyPage, emptyPage, emptyPage, emptyPage,
+	emptyPage, emptyPage, lowercasePage166, lowercasePage167,
+	emptyPage, emptyPage, emptyPage, emptyPage,
+	emptyPage, emptyPage, emptyPage, emptyPage,
+	emptyPage, emptyPage, emptyPage, emptyPage,
+	emptyPage, emptyPage, emptyPage, emptyPage,
+	emptyPage, emptyPage, emptyPage, emptyPage,
+	emptyPage, emptyPage, emptyPage, emptyPage,
+	emptyPage, emptyPage, emptyPage, emptyPage,
+	emptyPage, emptyPage, emptyPage, emptyPage,
+	emptyPage, emptyPage, emptyPage, emptyPage,
+	emptyPage, emptyPage, emptyPage, emptyPage,
+	emptyPage, emptyPage, emptyPage, emptyPage,
+	emptyPage, emptyPage, emptyPage, emptyPage,
+	emptyPage, emptyPage, emptyPage, emptyPage,
+	emptyPage, emptyPage, emptyPage, emptyPage,
+	emptyPage, emptyPage, emptyPage, emptyPage,
+	emptyPage, emptyPage, emptyPage, emptyPage,
+	emptyPage, emptyPage, emptyPage, emptyPage,
+	emptyPage, emptyPage, emptyPage, emptyPage,
+	emptyPage, emptyPage, emptyPage, emptyPage,
+	emptyPage, emptyPage, emptyPage, emptyPage,
+	emptyPage, emptyPage, emptyPage, emptyPage,
+	emptyPage, emptyPage, emptyPage, lowercasePage255,
+	emptyPage, emptyPage, emptyPage, emptyPage,
+	lowercasePage260
 };
 
 const of_unichar_t* const of_unicode_titlecase_table[0x105] = {
-	uppercase_page_0, titlecase_page_1, uppercase_page_2, uppercase_page_3,
-	uppercase_page_4, uppercase_page_5, nop_page, nop_page,
-	nop_page, nop_page, nop_page, nop_page,
-	nop_page, nop_page, nop_page, nop_page,
-	nop_page, nop_page, nop_page, nop_page,
-	nop_page, nop_page, nop_page, nop_page,
-	nop_page, nop_page, nop_page, nop_page,
-	nop_page, uppercase_page_29, uppercase_page_30, uppercase_page_31,
-	nop_page, uppercase_page_33, nop_page, nop_page,
-	uppercase_page_36, nop_page, nop_page, nop_page,
-	nop_page, nop_page, nop_page, nop_page,
-	uppercase_page_44, uppercase_page_45, nop_page, nop_page,
-	nop_page, nop_page, nop_page, nop_page,
-	nop_page, nop_page, nop_page, nop_page,
-	nop_page, nop_page, nop_page, nop_page,
-	nop_page, nop_page, nop_page, nop_page,
-	nop_page, nop_page, nop_page, nop_page,
-	nop_page, nop_page, nop_page, nop_page,
-	nop_page, nop_page, nop_page, nop_page,
-	nop_page, nop_page, nop_page, nop_page,
-	nop_page, nop_page, nop_page, nop_page,
-	nop_page, nop_page, nop_page, nop_page,
-	nop_page, nop_page, nop_page, nop_page,
-	nop_page, nop_page, nop_page, nop_page,
-	nop_page, nop_page, nop_page, nop_page,
-	nop_page, nop_page, nop_page, nop_page,
-	nop_page, nop_page, nop_page, nop_page,
-	nop_page, nop_page, nop_page, nop_page,
-	nop_page, nop_page, nop_page, nop_page,
-	nop_page, nop_page, nop_page, nop_page,
-	nop_page, nop_page, nop_page, nop_page,
-	nop_page, nop_page, nop_page, nop_page,
-	nop_page, nop_page, nop_page, nop_page,
-	nop_page, nop_page, nop_page, nop_page,
-	nop_page, nop_page, nop_page, nop_page,
-	nop_page, nop_page, nop_page, nop_page,
-	nop_page, nop_page, nop_page, nop_page,
-	nop_page, nop_page, nop_page, nop_page,
-	nop_page, nop_page, nop_page, nop_page,
-	nop_page, nop_page, nop_page, nop_page,
-	nop_page, nop_page, nop_page, nop_page,
-	nop_page, nop_page, uppercase_page_166, uppercase_page_167,
-	nop_page, nop_page, nop_page, nop_page,
-	nop_page, nop_page, nop_page, nop_page,
-	nop_page, nop_page, nop_page, nop_page,
-	nop_page, nop_page, nop_page, nop_page,
-	nop_page, nop_page, nop_page, nop_page,
-	nop_page, nop_page, nop_page, nop_page,
-	nop_page, nop_page, nop_page, nop_page,
-	nop_page, nop_page, nop_page, nop_page,
-	nop_page, nop_page, nop_page, nop_page,
-	nop_page, nop_page, nop_page, nop_page,
-	nop_page, nop_page, nop_page, nop_page,
-	nop_page, nop_page, nop_page, nop_page,
-	nop_page, nop_page, nop_page, nop_page,
-	nop_page, nop_page, nop_page, nop_page,
-	nop_page, nop_page, nop_page, nop_page,
-	nop_page, nop_page, nop_page, nop_page,
-	nop_page, nop_page, nop_page, nop_page,
-	nop_page, nop_page, nop_page, nop_page,
-	nop_page, nop_page, nop_page, nop_page,
-	nop_page, nop_page, nop_page, nop_page,
-	nop_page, nop_page, nop_page, nop_page,
-	nop_page, nop_page, nop_page, uppercase_page_255,
-	nop_page, nop_page, nop_page, nop_page,
-	uppercase_page_260
+	uppercasePage0, titlecasePage1, uppercasePage2, uppercasePage3,
+	uppercasePage4, uppercasePage5, emptyPage, emptyPage,
+	emptyPage, emptyPage, emptyPage, emptyPage,
+	emptyPage, emptyPage, emptyPage, emptyPage,
+	emptyPage, emptyPage, emptyPage, emptyPage,
+	emptyPage, emptyPage, emptyPage, emptyPage,
+	emptyPage, emptyPage, emptyPage, emptyPage,
+	emptyPage, uppercasePage29, uppercasePage30, uppercasePage31,
+	emptyPage, uppercasePage33, emptyPage, emptyPage,
+	uppercasePage36, emptyPage, emptyPage, emptyPage,
+	emptyPage, emptyPage, emptyPage, emptyPage,
+	uppercasePage44, uppercasePage45, emptyPage, emptyPage,
+	emptyPage, emptyPage, emptyPage, emptyPage,
+	emptyPage, emptyPage, emptyPage, emptyPage,
+	emptyPage, emptyPage, emptyPage, emptyPage,
+	emptyPage, emptyPage, emptyPage, emptyPage,
+	emptyPage, emptyPage, emptyPage, emptyPage,
+	emptyPage, emptyPage, emptyPage, emptyPage,
+	emptyPage, emptyPage, emptyPage, emptyPage,
+	emptyPage, emptyPage, emptyPage, emptyPage,
+	emptyPage, emptyPage, emptyPage, emptyPage,
+	emptyPage, emptyPage, emptyPage, emptyPage,
+	emptyPage, emptyPage, emptyPage, emptyPage,
+	emptyPage, emptyPage, emptyPage, emptyPage,
+	emptyPage, emptyPage, emptyPage, emptyPage,
+	emptyPage, emptyPage, emptyPage, emptyPage,
+	emptyPage, emptyPage, emptyPage, emptyPage,
+	emptyPage, emptyPage, emptyPage, emptyPage,
+	emptyPage, emptyPage, emptyPage, emptyPage,
+	emptyPage, emptyPage, emptyPage, emptyPage,
+	emptyPage, emptyPage, emptyPage, emptyPage,
+	emptyPage, emptyPage, emptyPage, emptyPage,
+	emptyPage, emptyPage, emptyPage, emptyPage,
+	emptyPage, emptyPage, emptyPage, emptyPage,
+	emptyPage, emptyPage, emptyPage, emptyPage,
+	emptyPage, emptyPage, emptyPage, emptyPage,
+	emptyPage, emptyPage, emptyPage, emptyPage,
+	emptyPage, emptyPage, emptyPage, emptyPage,
+	emptyPage, emptyPage, emptyPage, emptyPage,
+	emptyPage, emptyPage, emptyPage, emptyPage,
+	emptyPage, emptyPage, emptyPage, emptyPage,
+	emptyPage, emptyPage, uppercasePage166, uppercasePage167,
+	emptyPage, emptyPage, emptyPage, emptyPage,
+	emptyPage, emptyPage, emptyPage, emptyPage,
+	emptyPage, emptyPage, emptyPage, emptyPage,
+	emptyPage, emptyPage, emptyPage, emptyPage,
+	emptyPage, emptyPage, emptyPage, emptyPage,
+	emptyPage, emptyPage, emptyPage, emptyPage,
+	emptyPage, emptyPage, emptyPage, emptyPage,
+	emptyPage, emptyPage, emptyPage, emptyPage,
+	emptyPage, emptyPage, emptyPage, emptyPage,
+	emptyPage, emptyPage, emptyPage, emptyPage,
+	emptyPage, emptyPage, emptyPage, emptyPage,
+	emptyPage, emptyPage, emptyPage, emptyPage,
+	emptyPage, emptyPage, emptyPage, emptyPage,
+	emptyPage, emptyPage, emptyPage, emptyPage,
+	emptyPage, emptyPage, emptyPage, emptyPage,
+	emptyPage, emptyPage, emptyPage, emptyPage,
+	emptyPage, emptyPage, emptyPage, emptyPage,
+	emptyPage, emptyPage, emptyPage, emptyPage,
+	emptyPage, emptyPage, emptyPage, emptyPage,
+	emptyPage, emptyPage, emptyPage, emptyPage,
+	emptyPage, emptyPage, emptyPage, emptyPage,
+	emptyPage, emptyPage, emptyPage, uppercasePage255,
+	emptyPage, emptyPage, emptyPage, emptyPage,
+	uppercasePage260
 };
 
 const of_unichar_t* const of_unicode_casefolding_table[0x105] = {
-	casefolding_page_0, casefolding_page_1, lowercase_page_2,
-	casefolding_page_3, lowercase_page_4, lowercase_page_5,
-	nop_page, nop_page, nop_page,
-	nop_page, nop_page, nop_page,
-	nop_page, nop_page, nop_page,
-	nop_page, lowercase_page_16, nop_page,
-	nop_page, nop_page, nop_page,
-	nop_page, nop_page, nop_page,
-	nop_page, nop_page, nop_page,
-	nop_page, nop_page, nop_page,
-	casefolding_page_30, casefolding_page_31, nop_page,
-	lowercase_page_33, nop_page, nop_page,
-	lowercase_page_36, nop_page, nop_page,
-	nop_page, nop_page, nop_page,
-	nop_page, nop_page, lowercase_page_44,
-	nop_page, nop_page, nop_page,
-	nop_page, nop_page, nop_page,
-	nop_page, nop_page, nop_page,
-	nop_page, nop_page, nop_page,
-	nop_page, nop_page, nop_page,
-	nop_page, nop_page, nop_page,
-	nop_page, nop_page, nop_page,
-	nop_page, nop_page, nop_page,
-	nop_page, nop_page, nop_page,
-	nop_page, nop_page, nop_page,
-	nop_page, nop_page, nop_page,
-	nop_page, nop_page, nop_page,
-	nop_page, nop_page, nop_page,
-	nop_page, nop_page, nop_page,
-	nop_page, nop_page, nop_page,
-	nop_page, nop_page, nop_page,
-	nop_page, nop_page, nop_page,
-	nop_page, nop_page, nop_page,
-	nop_page, nop_page, nop_page,
-	nop_page, nop_page, nop_page,
-	nop_page, nop_page, nop_page,
-	nop_page, nop_page, nop_page,
-	nop_page, nop_page, nop_page,
-	nop_page, nop_page, nop_page,
-	nop_page, nop_page, nop_page,
-	nop_page, nop_page, nop_page,
-	nop_page, nop_page, nop_page,
-	nop_page, nop_page, nop_page,
-	nop_page, nop_page, nop_page,
-	nop_page, nop_page, nop_page,
-	nop_page, nop_page, nop_page,
-	nop_page, nop_page, nop_page,
-	nop_page, nop_page, nop_page,
-	nop_page, nop_page, nop_page,
-	nop_page, nop_page, nop_page,
-	nop_page, nop_page, nop_page,
-	nop_page, nop_page, nop_page,
-	nop_page, nop_page, nop_page,
-	nop_page, nop_page, nop_page,
-	nop_page, nop_page, nop_page,
-	nop_page, lowercase_page_166, lowercase_page_167,
-	nop_page, nop_page, nop_page,
-	nop_page, nop_page, nop_page,
-	nop_page, nop_page, nop_page,
-	nop_page, nop_page, nop_page,
-	nop_page, nop_page, nop_page,
-	nop_page, nop_page, nop_page,
-	nop_page, nop_page, nop_page,
-	nop_page, nop_page, nop_page,
-	nop_page, nop_page, nop_page,
-	nop_page, nop_page, nop_page,
-	nop_page, nop_page, nop_page,
-	nop_page, nop_page, nop_page,
-	nop_page, nop_page, nop_page,
-	nop_page, nop_page, nop_page,
-	nop_page, nop_page, nop_page,
-	nop_page, nop_page, nop_page,
-	nop_page, nop_page, nop_page,
-	nop_page, nop_page, nop_page,
-	nop_page, nop_page, nop_page,
-	nop_page, nop_page, nop_page,
-	nop_page, nop_page, nop_page,
-	nop_page, nop_page, nop_page,
-	nop_page, nop_page, nop_page,
-	nop_page, nop_page, nop_page,
-	nop_page, nop_page, nop_page,
-	nop_page, nop_page, nop_page,
-	nop_page, nop_page, nop_page,
-	nop_page, nop_page, nop_page,
-	nop_page, nop_page, nop_page,
-	lowercase_page_255, nop_page, nop_page,
-	nop_page, nop_page, lowercase_page_260
+	casefoldingPage0, casefoldingPage1, lowercasePage2,
+	casefoldingPage3, lowercasePage4, lowercasePage5,
+	emptyPage, emptyPage, emptyPage,
+	emptyPage, emptyPage, emptyPage,
+	emptyPage, emptyPage, emptyPage,
+	emptyPage, lowercasePage16, emptyPage,
+	emptyPage, emptyPage, emptyPage,
+	emptyPage, emptyPage, emptyPage,
+	emptyPage, emptyPage, emptyPage,
+	emptyPage, emptyPage, emptyPage,
+	casefoldingPage30, casefoldingPage31, emptyPage,
+	lowercasePage33, emptyPage, emptyPage,
+	lowercasePage36, emptyPage, emptyPage,
+	emptyPage, emptyPage, emptyPage,
+	emptyPage, emptyPage, lowercasePage44,
+	emptyPage, emptyPage, emptyPage,
+	emptyPage, emptyPage, emptyPage,
+	emptyPage, emptyPage, emptyPage,
+	emptyPage, emptyPage, emptyPage,
+	emptyPage, emptyPage, emptyPage,
+	emptyPage, emptyPage, emptyPage,
+	emptyPage, emptyPage, emptyPage,
+	emptyPage, emptyPage, emptyPage,
+	emptyPage, emptyPage, emptyPage,
+	emptyPage, emptyPage, emptyPage,
+	emptyPage, emptyPage, emptyPage,
+	emptyPage, emptyPage, emptyPage,
+	emptyPage, emptyPage, emptyPage,
+	emptyPage, emptyPage, emptyPage,
+	emptyPage, emptyPage, emptyPage,
+	emptyPage, emptyPage, emptyPage,
+	emptyPage, emptyPage, emptyPage,
+	emptyPage, emptyPage, emptyPage,
+	emptyPage, emptyPage, emptyPage,
+	emptyPage, emptyPage, emptyPage,
+	emptyPage, emptyPage, emptyPage,
+	emptyPage, emptyPage, emptyPage,
+	emptyPage, emptyPage, emptyPage,
+	emptyPage, emptyPage, emptyPage,
+	emptyPage, emptyPage, emptyPage,
+	emptyPage, emptyPage, emptyPage,
+	emptyPage, emptyPage, emptyPage,
+	emptyPage, emptyPage, emptyPage,
+	emptyPage, emptyPage, emptyPage,
+	emptyPage, emptyPage, emptyPage,
+	emptyPage, emptyPage, emptyPage,
+	emptyPage, emptyPage, emptyPage,
+	emptyPage, emptyPage, emptyPage,
+	emptyPage, emptyPage, emptyPage,
+	emptyPage, emptyPage, emptyPage,
+	emptyPage, emptyPage, emptyPage,
+	emptyPage, emptyPage, emptyPage,
+	emptyPage, emptyPage, emptyPage,
+	emptyPage, emptyPage, emptyPage,
+	emptyPage, emptyPage, emptyPage,
+	emptyPage, lowercasePage166, lowercasePage167,
+	emptyPage, emptyPage, emptyPage,
+	emptyPage, emptyPage, emptyPage,
+	emptyPage, emptyPage, emptyPage,
+	emptyPage, emptyPage, emptyPage,
+	emptyPage, emptyPage, emptyPage,
+	emptyPage, emptyPage, emptyPage,
+	emptyPage, emptyPage, emptyPage,
+	emptyPage, emptyPage, emptyPage,
+	emptyPage, emptyPage, emptyPage,
+	emptyPage, emptyPage, emptyPage,
+	emptyPage, emptyPage, emptyPage,
+	emptyPage, emptyPage, emptyPage,
+	emptyPage, emptyPage, emptyPage,
+	emptyPage, emptyPage, emptyPage,
+	emptyPage, emptyPage, emptyPage,
+	emptyPage, emptyPage, emptyPage,
+	emptyPage, emptyPage, emptyPage,
+	emptyPage, emptyPage, emptyPage,
+	emptyPage, emptyPage, emptyPage,
+	emptyPage, emptyPage, emptyPage,
+	emptyPage, emptyPage, emptyPage,
+	emptyPage, emptyPage, emptyPage,
+	emptyPage, emptyPage, emptyPage,
+	emptyPage, emptyPage, emptyPage,
+	emptyPage, emptyPage, emptyPage,
+	emptyPage, emptyPage, emptyPage,
+	emptyPage, emptyPage, emptyPage,
+	emptyPage, emptyPage, emptyPage,
+	emptyPage, emptyPage, emptyPage,
+	lowercasePage255, emptyPage, emptyPage,
+	emptyPage, emptyPage, lowercasePage260
 };