@@ -23,14 +23,14 @@
 
 @implementation TestsAppDelegate (OFValueTests)
 - (void)valueTests
 {
 	void *pool = objc_autoreleasePoolPush();
-	OFRange range = OFMakeRange(1, 64), range2;
-	OFPoint point = OFMakePoint(1.5f, 3.0f), point2;
-	OFSize size = OFMakeSize(4.5f, 5.0f), size2;
-	OFRect rect = OFMakeRect(1.5f, 3.0f, 4.5f, 6.0f), rect2;
+	OFRange range = OFRangeMake(1, 64), range2;
+	OFPoint point = OFPointMake(1.5f, 3.0f), point2;
+	OFSize size = OFSizeMake(4.5f, 5.0f), size2;
+	OFRect rect = OFRectMake(1.5f, 3.0f, 4.5f, 6.0f), rect2;
 	OFValue *value;
 	void *pointer = &value;
 
 	TEST(@"+[valueWithBytes:objCType:]",
 	    (value = [OFValue valueWithBytes: &range
@@ -38,11 +38,11 @@
 
 	TEST(@"-[objCType]", strcmp(value.objCType, @encode(OFRange)) == 0)
 
 	TEST(@"-[getValue:size:]",
 	    R([value getValue: &range2 size: sizeof(OFRange)]) &&
-	    OFEqualRanges(range2, range))
+	    OFRangeEqual(range2, range))
 
 	EXPECT_EXCEPTION(@"-[getValue:size:] with wrong size throws",
 	    OFOutOfRangeException,
 	    [value getValue: &range size: sizeof(OFRange) - 1])
 
@@ -74,19 +74,19 @@
 
 	TEST(@"+[valueWithRange:]",
 	    (value = [OFValue valueWithRange: range]))
 
 	TEST(@"-[rangeValue]",
-	    OFEqualRanges(value.rangeValue, range) &&
+	    OFRangeEqual(value.rangeValue, range) &&
 	    (value = [OFValue valueWithBytes: &range
 				    objCType: @encode(OFRange)]) &&
-	    OFEqualRanges(value.rangeValue, range))
+	    OFRangeEqual(value.rangeValue, range))
 
 	TEST(@"-[getValue:size:] for OFRangeValue",
 	    (value = [OFValue valueWithRange: range]) &&
 	    R([value getValue: &range2 size: sizeof(range2)]) &&
-	    OFEqualRanges(range2, range))
+	    OFRangeEqual(range2, range))
 
 	EXPECT_EXCEPTION(@"-[rangeValue] with wrong size throws",
 	    OFOutOfRangeException,
 	    [[OFValue valueWithBytes: "a"
 			    objCType: @encode(char)] rangeValue])
@@ -93,19 +93,19 @@
 
 	TEST(@"+[valueWithPoint:]",
 	    (value = [OFValue valueWithPoint: point]))
 
 	TEST(@"-[pointValue]",
-	    OFEqualPoints(value.pointValue, point) &&
+	    OFPointEqual(value.pointValue, point) &&
 	    (value = [OFValue valueWithBytes: &point
 				    objCType: @encode(OFPoint)]) &&
-	    OFEqualPoints(value.pointValue, point))
+	    OFPointEqual(value.pointValue, point))
 
 	TEST(@"-[getValue:size:] for OFPointValue",
 	    (value = [OFValue valueWithPoint: point]) &&
 	    R([value getValue: &point2 size: sizeof(point2)]) &&
-	    OFEqualPoints(point2, point))
+	    OFPointEqual(point2, point))
 
 	EXPECT_EXCEPTION(@"-[pointValue] with wrong size throws",
 	    OFOutOfRangeException,
 	    [[OFValue valueWithBytes: "a"
 			    objCType: @encode(char)] pointValue])
@@ -112,19 +112,19 @@
 
 	TEST(@"+[valueWithSize:]",
 	    (value = [OFValue valueWithSize: size]))
 
 	TEST(@"-[sizeValue]",
-	    OFEqualSizes(value.sizeValue, size) &&
+	    OFSizeEqual(value.sizeValue, size) &&
 	    (value = [OFValue valueWithBytes: &size
 				    objCType: @encode(OFSize)]) &&
-	    OFEqualSizes(value.sizeValue, size))
+	    OFSizeEqual(value.sizeValue, size))
 
 	TEST(@"-[getValue:size:] for OFSizeValue",
 	    (value = [OFValue valueWithSize: size]) &&
 	    R([value getValue: &size2 size: sizeof(size2)]) &&
-	    OFEqualSizes(size2, size))
+	    OFSizeEqual(size2, size))
 
 	EXPECT_EXCEPTION(@"-[sizeValue] with wrong size throws",
 	    OFOutOfRangeException,
 	    [[OFValue valueWithBytes: "a"
 			    objCType: @encode(char)] sizeValue])
@@ -131,19 +131,19 @@
 
 	TEST(@"+[valueWithRect:]",
 	    (value = [OFValue valueWithRect: rect]))
 
 	TEST(@"-[rectValue]",
-	    OFEqualRects(value.rectValue, rect) &&
+	    OFRectEqual(value.rectValue, rect) &&
 	    (value = [OFValue valueWithBytes: &rect
 				    objCType: @encode(OFRect)]) &&
-	    OFEqualRects(value.rectValue, rect))
+	    OFRectEqual(value.rectValue, rect))
 
 	TEST(@"-[getValue:size:] for OFRectValue",
 	    (value = [OFValue valueWithRect: rect]) &&
 	    R([value getValue: &rect2 size: sizeof(rect2)]) &&
-	    OFEqualRects(rect2, rect))
+	    OFRectEqual(rect2, rect))
 
 	EXPECT_EXCEPTION(@"-[rectValue] with wrong size throws",
 	    OFOutOfRangeException,
 	    [[OFValue valueWithBytes: "a" objCType: @encode(char)] rectValue])