@@ -447,11 +447,11 @@
 		return false;
 
 	return true;
 }
 
-- (of_comparison_result_t)compare: (OFData *)data
+- (OFComparisonResult)compare: (OFData *)data
 {
 	int comparison;
 	size_t count, minCount;
 
 	if (![data isKindOfClass: [OFData class]])
@@ -464,21 +464,21 @@
 	minCount = (_count > count ? count : _count);
 
 	if ((comparison = memcmp(_items, data.items,
 	    minCount * _itemSize)) == 0) {
 		if (_count > count)
-			return OF_ORDERED_DESCENDING;
+			return OFOrderedDescending;
 		if (_count < count)
-			return OF_ORDERED_ASCENDING;
+			return OFOrderedAscending;
 
-		return OF_ORDERED_SAME;
+		return OFOrderedSame;
 	}
 
 	if (comparison > 0)
-		return OF_ORDERED_DESCENDING;
+		return OFOrderedDescending;
 	else
-		return OF_ORDERED_ASCENDING;
+		return OFOrderedAscending;
 }
 
 - (unsigned long)hash
 {
 	uint32_t hash;