@@ -71,16 +71,16 @@
 
 		f = of_ascii_toupper(f);
 		s = of_ascii_toupper(s);
 
 		if (f > s)
-			return OF_ORDERED_DESCENDING;
+			return OFOrderedDescending;
 		if (f < s)
-			return OF_ORDERED_ASCENDING;
+			return OFOrderedAscending;
 	}
 
-	return OF_ORDERED_SAME;
+	return OFOrderedSame;
 }
 
 int
 of_string_utf8_check(const char *UTF8String, size_t UTF8Length, size_t *length)
 {
@@ -797,17 +797,17 @@
 		return false;
 
 	return true;
 }
 
-- (of_comparison_result_t)compare: (OFString *)string
+- (OFComparisonResult)compare: (OFString *)string
 {
 	size_t otherCStringLength, minimumCStringLength;
 	int compare;
 
 	if (string == self)
-		return OF_ORDERED_SAME;
+		return OFOrderedSame;
 
 	if (![string isKindOfClass: [OFString class]])
 		@throw [OFInvalidArgumentException exception];
 
 	otherCStringLength = string.UTF8StringLength;
@@ -815,33 +815,33 @@
 	    ? otherCStringLength : _s->cStringLength);
 
 	if ((compare = memcmp(_s->cString, string.UTF8String,
 	    minimumCStringLength)) == 0) {
 		if (_s->cStringLength > otherCStringLength)
-			return OF_ORDERED_DESCENDING;
+			return OFOrderedDescending;
 		if (_s->cStringLength < otherCStringLength)
-			return OF_ORDERED_ASCENDING;
-		return OF_ORDERED_SAME;
+			return OFOrderedAscending;
+		return OFOrderedSame;
 	}
 
 	if (compare > 0)
-		return OF_ORDERED_DESCENDING;
+		return OFOrderedDescending;
 	else
-		return OF_ORDERED_ASCENDING;
+		return OFOrderedAscending;
 }
 
-- (of_comparison_result_t)caseInsensitiveCompare: (OFString *)string
+- (OFComparisonResult)caseInsensitiveCompare: (OFString *)string
 {
 	const char *otherCString;
 	size_t otherCStringLength, minimumCStringLength;
 #ifdef OF_HAVE_UNICODE_TABLES
 	size_t i, j;
 #endif
 	int compare;
 
 	if (string == self)
-		return OF_ORDERED_SAME;
+		return OFOrderedSame;
 
 	otherCString = string.UTF8String;
 	otherCStringLength = string.UTF8StringLength;
 
 #ifdef OF_HAVE_UNICODE_TABLES
@@ -851,20 +851,20 @@
 		    ? otherCStringLength : _s->cStringLength);
 
 		if ((compare = memcasecmp(_s->cString, otherCString,
 		    minimumCStringLength)) == 0) {
 			if (_s->cStringLength > otherCStringLength)
-				return OF_ORDERED_DESCENDING;
+				return OFOrderedDescending;
 			if (_s->cStringLength < otherCStringLength)
-				return OF_ORDERED_ASCENDING;
-			return OF_ORDERED_SAME;
+				return OFOrderedAscending;
+			return OFOrderedSame;
 		}
 
 		if (compare > 0)
-			return OF_ORDERED_DESCENDING;
+			return OFOrderedDescending;
 		else
-			return OF_ORDERED_ASCENDING;
+			return OFOrderedAscending;
 #ifdef OF_HAVE_UNICODE_TABLES
 	}
 
 	i = j = 0;
 
@@ -895,25 +895,25 @@
 			if (tc)
 				c2 = tc;
 		}
 
 		if (c1 > c2)
-			return OF_ORDERED_DESCENDING;
+			return OFOrderedDescending;
 		if (c1 < c2)
-			return OF_ORDERED_ASCENDING;
+			return OFOrderedAscending;
 
 		i += l1;
 		j += l2;
 	}
 
 	if (_s->cStringLength - i > otherCStringLength - j)
-		return OF_ORDERED_DESCENDING;
+		return OFOrderedDescending;
 	else if (_s->cStringLength - i < otherCStringLength - j)
-		return OF_ORDERED_ASCENDING;
+		return OFOrderedAscending;
 #endif
 
-	return OF_ORDERED_SAME;
+	return OFOrderedSame;
 }
 
 - (unsigned long)hash
 {
 	uint32_t hash;