@@ -225,20 +225,20 @@
 
 	return self;
 }
 
 - (instancetype)initWithCString: (const char *)cString
-		       encoding: (of_string_encoding_t)encoding
+		       encoding: (OFStringEncoding)encoding
 			 length: (size_t)cStringLength
 {
 	self = [super init];
 
 	@try {
 		const OFChar16 *table;
 		size_t tableOffset, j;
 
-		if (encoding == OF_STRING_ENCODING_UTF_8 &&
+		if (encoding == OFStringEncodingUTF8 &&
 		    cStringLength >= 3 &&
 		    memcmp(cString, "\xEF\xBB\xBF", 3) == 0) {
 			cString += 3;
 			cStringLength -= 3;
 		}
@@ -247,16 +247,16 @@
 
 		_s->cString = of_alloc(cStringLength + 1, 1);
 		_s->cStringLength = cStringLength;
 		_s->freeWhenDone = true;
 
-		if (encoding == OF_STRING_ENCODING_UTF_8 ||
-		    encoding == OF_STRING_ENCODING_ASCII) {
+		if (encoding == OFStringEncodingUTF8 ||
+		    encoding == OFStringEncodingASCII) {
 			switch (of_string_utf8_check(cString, cStringLength,
 			    &_s->length)) {
 			case 1:
-				if (encoding == OF_STRING_ENCODING_ASCII)
+				if (encoding == OFStringEncodingASCII)
 					@throw [OFInvalidEncodingException
 					    exception];
 
 				_s->isUTF8 = true;
 				break;
@@ -271,11 +271,11 @@
 		}
 
 		/* All other encodings we support are single byte encodings */
 		_s->length = cStringLength;
 
-		if (encoding == OF_STRING_ENCODING_ISO_8859_1) {
+		if (encoding == OFStringEncodingISO8859_1) {
 			j = 0;
 			for (size_t i = 0; i < cStringLength; i++) {
 				char buffer[4];
 				size_t bytes;
 
@@ -310,41 +310,41 @@
 		case encoding:				\
 			table = var;			\
 			tableOffset = var##_offset;	\
 			break;
 #ifdef HAVE_ISO_8859_2
-		CASE(OF_STRING_ENCODING_ISO_8859_2, of_iso_8859_2_table)
+		CASE(OFStringEncodingISO8859_2, of_iso_8859_2_table)
 #endif
 #ifdef HAVE_ISO_8859_3
-		CASE(OF_STRING_ENCODING_ISO_8859_3, of_iso_8859_3_table)
+		CASE(OFStringEncodingISO8859_3, of_iso_8859_3_table)
 #endif
 #ifdef HAVE_ISO_8859_15
-		CASE(OF_STRING_ENCODING_ISO_8859_15, of_iso_8859_15_table)
+		CASE(OFStringEncodingISO8859_15, of_iso_8859_15_table)
 #endif
 #ifdef HAVE_WINDOWS_1251
-		CASE(OF_STRING_ENCODING_WINDOWS_1251, of_windows_1251_table)
+		CASE(OFStringEncodingWindows1251, of_windows_1251_table)
 #endif
 #ifdef HAVE_WINDOWS_1252
-		CASE(OF_STRING_ENCODING_WINDOWS_1252, of_windows_1252_table)
+		CASE(OFStringEncodingWindows1252, of_windows_1252_table)
 #endif
 #ifdef HAVE_CODEPAGE_437
-		CASE(OF_STRING_ENCODING_CODEPAGE_437, of_codepage_437_table)
+		CASE(OFStringEncodingCodepage437, of_codepage_437_table)
 #endif
 #ifdef HAVE_CODEPAGE_850
-		CASE(OF_STRING_ENCODING_CODEPAGE_850, of_codepage_850_table)
+		CASE(OFStringEncodingCodepage850, of_codepage_850_table)
 #endif
 #ifdef HAVE_CODEPAGE_858
-		CASE(OF_STRING_ENCODING_CODEPAGE_858, of_codepage_858_table)
+		CASE(OFStringEncodingCodepage858, of_codepage_858_table)
 #endif
 #ifdef HAVE_MAC_ROMAN
-		CASE(OF_STRING_ENCODING_MAC_ROMAN, of_mac_roman_table)
+		CASE(OFStringEncodingMacRoman, of_mac_roman_table)
 #endif
 #ifdef HAVE_KOI8_R
-		CASE(OF_STRING_ENCODING_KOI8_R, of_koi8_r_table)
+		CASE(OFStringEncodingKOI8R, of_koi8_r_table)
 #endif
 #ifdef HAVE_KOI8_U
-		CASE(OF_STRING_ENCODING_KOI8_U, of_koi8_u_table)
+		CASE(OFStringEncodingKOI8U, of_koi8_u_table)
 #endif
 #undef CASE
 		default:
 			@throw [OFInvalidEncodingException exception];
 		}
@@ -709,18 +709,18 @@
 	[super dealloc];
 }
 
 - (size_t)getCString: (char *)cString
 	   maxLength: (size_t)maxLength
-	    encoding: (of_string_encoding_t)encoding
+	    encoding: (OFStringEncoding)encoding
 {
 	switch (encoding) {
-	case OF_STRING_ENCODING_ASCII:
+	case OFStringEncodingASCII:
 		if (_s->isUTF8)
 			@throw [OFInvalidEncodingException exception];
 		/* intentional fall-through */
-	case OF_STRING_ENCODING_UTF_8:
+	case OFStringEncodingUTF8:
 		if (_s->cStringLength + 1 > maxLength)
 			@throw [OFOutOfRangeException exception];
 
 		memcpy(cString, _s->cString, _s->cStringLength + 1);
 
@@ -730,18 +730,18 @@
 			       maxLength: maxLength
 				encoding: encoding];
 	}
 }
 
-- (const char *)cStringWithEncoding: (of_string_encoding_t)encoding
+- (const char *)cStringWithEncoding: (OFStringEncoding)encoding
 {
 	switch (encoding) {
-	case OF_STRING_ENCODING_ASCII:
+	case OFStringEncodingASCII:
 		if (_s->isUTF8)
 			@throw [OFInvalidEncodingException exception];
 		/* intentional fall-through */
-	case OF_STRING_ENCODING_UTF_8:
+	case OFStringEncodingUTF8:
 		return _s->cString;
 	default:
 		return [super cStringWithEncoding: encoding];
 	}
 }
@@ -754,15 +754,15 @@
 - (size_t)length
 {
 	return _s->length;
 }
 
-- (size_t)cStringLengthWithEncoding: (of_string_encoding_t)encoding
+- (size_t)cStringLengthWithEncoding: (OFStringEncoding)encoding
 {
 	switch (encoding) {
-	case OF_STRING_ENCODING_UTF_8:
-	case OF_STRING_ENCODING_ASCII:
+	case OFStringEncodingUTF8:
+	case OFStringEncodingASCII:
 		return _s->cStringLength;
 	default:
 		return [super cStringLengthWithEncoding: encoding];
 	}
 }