@@ -79,11 +79,11 @@
 		uint8_t t;
 		const OFUnichar *const *table;
 
 		assert(startTableSize >= 1 && middleTableSize >= 1);
 
-		_s->hashed = false;
+		_s->hasHash = false;
 
 		for (i = 0; i < _s->cStringLength; i++) {
 			if (isStart)
 				table = startTable;
 			else
@@ -176,11 +176,11 @@
 	assert(j == newCStringLength);
 	newCString[j] = 0;
 	OFFreeMemory(unicodeString);
 
 	OFFreeMemory(_s->cString);
-	_s->hashed = false;
+	_s->hasHash = false;
 	_s->cString = newCString;
 	_s->cStringLength = newCStringLength;
 
 	/*
 	 * Even though cStringLength can change, length cannot, therefore no
@@ -203,11 +203,11 @@
 	if (idx >= _s->cStringLength)
 		@throw [OFOutOfRangeException exception];
 
 	/* Shortcut if old and new character both are ASCII */
 	if (character < 0x80 && !(_s->cString[idx] & 0x80)) {
-		_s->hashed = false;
+		_s->hasHash = false;
 		_s->cString[idx] = character;
 		return;
 	}
 
 	if ((lenNew = OFUTF8StringEncode(character, buffer)) == 0)
@@ -215,11 +215,11 @@
 
 	if ((lenOld = OFUTF8StringDecode(_s->cString + idx,
 	    _s->cStringLength - idx, &c)) <= 0)
 		@throw [OFInvalidEncodingException exception];
 
-	_s->hashed = false;
+	_s->hasHash = false;
 
 	if (lenNew == (size_t)lenOld)
 		memcpy(_s->cString + idx, buffer, lenNew);
 	else if (lenNew > (size_t)lenOld) {
 		_s->cString = OFResizeMemory(_s->cString,
@@ -273,11 +273,11 @@
 		break;
 	case -1:
 		@throw [OFInvalidEncodingException exception];
 	}
 
-	_s->hashed = false;
+	_s->hasHash = false;
 	_s->cString = OFResizeMemory(_s->cString,
 	    _s->cStringLength + UTF8StringLength + 1, 1);
 	memcpy(_s->cString + _s->cStringLength, UTF8String,
 	    UTF8StringLength + 1);
 
@@ -302,11 +302,11 @@
 		break;
 	case -1:
 		@throw [OFInvalidEncodingException exception];
 	}
 
-	_s->hashed = false;
+	_s->hasHash = false;
 	_s->cString = OFResizeMemory(_s->cString,
 	    _s->cStringLength + UTF8StringLength + 1, 1);
 	memcpy(_s->cString + _s->cStringLength, UTF8String, UTF8StringLength);
 
 	_s->cStringLength += UTF8StringLength;
@@ -348,11 +348,11 @@
 	if (string == nil)
 		@throw [OFInvalidArgumentException exception];
 
 	UTF8StringLength = string.UTF8StringLength;
 
-	_s->hashed = false;
+	_s->hasHash = false;
 	_s->cString = OFResizeMemory(_s->cString,
 	    _s->cStringLength + UTF8StringLength + 1, 1);
 	memcpy(_s->cString + _s->cStringLength, string.UTF8String,
 	    UTF8StringLength);
 
@@ -389,11 +389,11 @@
 			j += len;
 		}
 
 		tmp[j] = '\0';
 
-		_s->hashed = false;
+		_s->hasHash = false;
 		_s->cString = OFResizeMemory(_s->cString,
 		    _s->cStringLength + j + 1, 1);
 		memcpy(_s->cString + _s->cStringLength, tmp, j + 1);
 
 		_s->cStringLength += j;
@@ -427,11 +427,11 @@
 
 - (void)reverse
 {
 	size_t i, j;
 
-	_s->hashed = false;
+	_s->hasHash = false;
 
 	/* We reverse all bytes and restore UTF-8 later, if necessary */
 	for (i = 0, j = _s->cStringLength - 1; i < _s->cStringLength / 2;
 	    i++, j--) {
 		_s->cString[i] ^= _s->cString[j];
@@ -515,11 +515,11 @@
 	if (_s->isUTF8)
 		idx = OFUTF8StringIndexToPosition(_s->cString, idx,
 		    _s->cStringLength);
 
 	newCStringLength = _s->cStringLength + string.UTF8StringLength;
-	_s->hashed = false;
+	_s->hasHash = false;
 	_s->cString = OFResizeMemory(_s->cString, newCStringLength + 1, 1);
 
 	memmove(_s->cString + idx + string.UTF8StringLength,
 	    _s->cString + idx, _s->cStringLength - idx);
 	memcpy(_s->cString + idx, string.UTF8String,
@@ -552,11 +552,11 @@
 		    _s->cStringLength);
 	}
 
 	memmove(_s->cString + start, _s->cString + end,
 	    _s->cStringLength - end);
-	_s->hashed = false;
+	_s->hasHash = false;
 	_s->length -= range.length;
 	_s->cStringLength -= end - start;
 	_s->cString[_s->cStringLength] = 0;
 
 	@try {
@@ -589,11 +589,11 @@
 		    _s->cStringLength);
 	}
 
 	newCStringLength = _s->cStringLength - (end - start) +
 	    replacement.UTF8StringLength;
-	_s->hashed = false;
+	_s->hasHash = false;
 
 	/*
 	 * If the new string is bigger, we need to resize it first so we can
 	 * memmove() the rest of the string to the end.
 	 *
@@ -700,11 +700,11 @@
 	    _s->cStringLength - last);
 	newCStringLength += _s->cStringLength - last;
 	newCString[newCStringLength] = 0;
 
 	OFFreeMemory(_s->cString);
-	_s->hashed = false;
+	_s->hasHash = false;
 	_s->cString = newCString;
 	_s->cStringLength = newCStringLength;
 	_s->length = newLength;
 
 	if ([replacement isKindOfClass: [OFUTF8String class]] ||
@@ -721,11 +721,11 @@
 
 	for (i = 0; i < _s->cStringLength; i++)
 		if (!OFASCIIIsSpace(_s->cString[i]))
 			break;
 
-	_s->hashed = false;
+	_s->hasHash = false;
 	_s->cStringLength -= i;
 	_s->length -= i;
 
 	memmove(_s->cString, _s->cString + i, _s->cStringLength);
 	_s->cString[_s->cStringLength] = '\0';
@@ -741,11 +741,11 @@
 - (void)deleteTrailingWhitespaces
 {
 	size_t d;
 	char *p;
 
-	_s->hashed = false;
+	_s->hasHash = false;
 
 	d = 0;
 	for (p = _s->cString + _s->cStringLength - 1; p >= _s->cString; p--) {
 		if (!OFASCIIIsSpace(*p))
 			break;
@@ -768,11 +768,11 @@
 - (void)deleteEnclosingWhitespaces
 {
 	size_t d, i;
 	char *p;
 
-	_s->hashed = false;
+	_s->hasHash = false;
 
 	d = 0;
 	for (p = _s->cString + _s->cStringLength - 1; p >= _s->cString; p--) {
 		if (!OFASCIIIsSpace(*p))
 			break;