@@ -116,11 +116,11 @@
 		} else {
 			table = middleTable;
 			tableSize = middleTableSize;
 		}
 
-		cLen = of_string_utf8_decode(_s->cString + i,
+		cLen = OFUTF8StringDecode(_s->cString + i,
 		    _s->cStringLength - i, &c);
 
 		if (cLen <= 0 || c > 0x10FFFF) {
 			OFFreeMemory(unicodeString);
 			@throw [OFInvalidEncodingException exception];
@@ -162,11 +162,11 @@
 	j = 0;
 
 	for (i = 0; i < unicodeLen; i++) {
 		size_t d;
 
-		if ((d = of_string_utf8_encode(unicodeString[i],
+		if ((d = OFUTF8StringEncode(unicodeString[i],
 		    newCString + j)) == 0) {
 			OFFreeMemory(unicodeString);
 			OFFreeMemory(newCString);
 			@throw [OFInvalidEncodingException exception];
 		}
@@ -195,11 +195,11 @@
 	OFUnichar c;
 	size_t lenNew;
 	ssize_t lenOld;
 
 	if (_s->isUTF8)
-		idx = of_string_utf8_get_position(_s->cString, idx,
+		idx = OFUTF8StringIndexToPosition(_s->cString, idx,
 		    _s->cStringLength);
 
 	if (idx >= _s->cStringLength)
 		@throw [OFOutOfRangeException exception];
 
@@ -208,14 +208,14 @@
 		_s->hashed = false;
 		_s->cString[idx] = character;
 		return;
 	}
 
-	if ((lenNew = of_string_utf8_encode(character, buffer)) == 0)
+	if ((lenNew = OFUTF8StringEncode(character, buffer)) == 0)
 		@throw [OFInvalidEncodingException exception];
 
-	if ((lenOld = of_string_utf8_decode(_s->cString + idx,
+	if ((lenOld = OFUTF8StringDecode(_s->cString + idx,
 	    _s->cStringLength - idx, &c)) <= 0)
 		@throw [OFInvalidEncodingException exception];
 
 	_s->hashed = false;
 
@@ -265,11 +265,11 @@
 	    memcmp(UTF8String, "\xEF\xBB\xBF", 3) == 0) {
 		UTF8String += 3;
 		UTF8StringLength -= 3;
 	}
 
-	switch (of_string_utf8_check(UTF8String, UTF8StringLength, &length)) {
+	switch (OFUTF8StringCheck(UTF8String, UTF8StringLength, &length)) {
 	case 1:
 		_s->isUTF8 = true;
 		break;
 	case -1:
 		@throw [OFInvalidEncodingException exception];
@@ -294,11 +294,11 @@
 	    memcmp(UTF8String, "\xEF\xBB\xBF", 3) == 0) {
 		UTF8String += 3;
 		UTF8StringLength -= 3;
 	}
 
-	switch (of_string_utf8_check(UTF8String, UTF8StringLength, &length)) {
+	switch (OFUTF8StringCheck(UTF8String, UTF8StringLength, &length)) {
 	case 1:
 		_s->isUTF8 = true;
 		break;
 	case -1:
 		@throw [OFInvalidEncodingException exception];
@@ -376,12 +376,11 @@
 	@try {
 		size_t j = 0;
 		bool isUTF8 = false;
 
 		for (size_t i = 0; i < length; i++) {
-			size_t len = of_string_utf8_encode(characters[i],
-			    tmp + j);
+			size_t len = OFUTF8StringEncode(characters[i], tmp + j);
 
 			if (len == 0)
 				@throw [OFInvalidEncodingException exception];
 
 			if (len > 1)
@@ -512,11 +511,11 @@
 
 	if (idx > _s->length)
 		@throw [OFOutOfRangeException exception];
 
 	if (_s->isUTF8)
-		idx = of_string_utf8_get_position(_s->cString, idx,
+		idx = OFUTF8StringIndexToPosition(_s->cString, idx,
 		    _s->cStringLength);
 
 	newCStringLength = _s->cStringLength + string.UTF8StringLength;
 	_s->hashed = false;
 	_s->cString = OFResizeMemory(_s->cString, newCStringLength + 1, 1);
@@ -545,13 +544,13 @@
 
 	if (range.length > SIZE_MAX - range.location || end > _s->length)
 		@throw [OFOutOfRangeException exception];
 
 	if (_s->isUTF8) {
-		start = of_string_utf8_get_position(_s->cString, start,
+		start = OFUTF8StringIndexToPosition(_s->cString, start,
 		    _s->cStringLength);
-		end = of_string_utf8_get_position(_s->cString, end,
+		end = OFUTF8StringIndexToPosition(_s->cString, end,
 		    _s->cStringLength);
 	}
 
 	memmove(_s->cString + start, _s->cString + end,
 	    _s->cStringLength - end);
@@ -582,13 +581,13 @@
 		@throw [OFOutOfRangeException exception];
 
 	newLength = _s->length - range.length + replacement.length;
 
 	if (_s->isUTF8) {
-		start = of_string_utf8_get_position(_s->cString, start,
+		start = OFUTF8StringIndexToPosition(_s->cString, start,
 		    _s->cStringLength);
-		end = of_string_utf8_get_position(_s->cString, end,
+		end = OFUTF8StringIndexToPosition(_s->cString, end,
 		    _s->cStringLength);
 	}
 
 	newCStringLength = _s->cStringLength - (end - start) +
 	    replacement.UTF8StringLength;
@@ -649,13 +648,13 @@
 	if (range.length > SIZE_MAX - range.location ||
 	    range.location + range.length > self.length)
 		@throw [OFOutOfRangeException exception];
 
 	if (_s->isUTF8) {
-		range.location = of_string_utf8_get_position(_s->cString,
+		range.location = OFUTF8StringIndexToPosition(_s->cString,
 		    range.location, _s->cStringLength);
-		range.length = of_string_utf8_get_position(
+		range.length = OFUTF8StringIndexToPosition(
 		    _s->cString + range.location, range.length,
 		    _s->cStringLength - range.location);
 	}
 
 	if (string.UTF8StringLength > range.length)