@@ -20,31 +20,31 @@
 
 @interface TableGenerator: OFObject <OFApplicationDelegate,
     OFHTTPClientDelegate>
 {
 	OFHTTPClient *_HTTPClient;
-	of_unichar_t _uppercaseTable[0x110000];
-	of_unichar_t _lowercaseTable[0x110000];
-	of_unichar_t _titlecaseTable[0x110000];
-	of_unichar_t _casefoldingTable[0x110000];
+	OFUnichar _uppercaseTable[0x110000];
+	OFUnichar _lowercaseTable[0x110000];
+	OFUnichar _titlecaseTable[0x110000];
+	OFUnichar _caseFoldingTable[0x110000];
 	OFString *_decompositionTable[0x110000];
 	OFString *_decompositionCompatTable[0x110000];
 	char _uppercaseTableUsed[0x1100];
 	char _lowercaseTableUsed[0x1100];
 	char _titlecaseTableUsed[0x1100];
-	char _casefoldingTableUsed[0x1100];
+	char _caseFoldingTableUsed[0x1100];
 	char _decompositionTableUsed[0x1100];
 	char _decompositionCompatTableUsed[0x1100];
 	size_t _uppercaseTableSize;
 	size_t _lowercaseTableSize;
 	size_t _titlecaseTableSize;
-	size_t _casefoldingTableSize;
+	size_t _caseFoldingTableSize;
 	size_t _decompositionTableSize;
 	size_t _decompositionCompatTableSize;
 	enum {
-		STATE_UNICODE_DATA,
-		STATE_CASE_FOLDING
+		stateUnicodeData,
+		stateCaseFolding
 	} _state;
 }
 
 - (void)parseUnicodeData: (OFHTTPResponse *)response;
 - (void)parseCaseFolding: (OFHTTPResponse *)response;