@@ -180,11 +180,11 @@
 
 	TEST(@"-[indexOfObjectIdenticalTo:]",
 	    [a[1] indexOfObjectIdenticalTo: c_ary[1]] == 1)
 
 	TEST(@"-[objectsInRange:]",
-	    [[a[0] objectsInRange: of_range(1, 2)] isEqual:
+	    [[a[0] objectsInRange: OFRangeMake(1, 2)] isEqual:
 	    [arrayClass arrayWithObjects: c_ary[1], c_ary[2], nil]])
 
 	TEST(@"-[replaceObject:withObject:]",
 	    R([m[0] replaceObject: c_ary[1] withObject: c_ary[0]]) &&
 	    [[m[0] objectAtIndex: 0] isEqual: c_ary[0]] &&
@@ -213,11 +213,11 @@
 	TEST(@"-[removeObjectAtIndex:]", R([m[1] removeObjectAtIndex: 1]) &&
 	    m[1].count == 2 && [[m[1] objectAtIndex: 1] isEqual: c_ary[2]])
 
 	m[1] = [[a[0] mutableCopy] autorelease];
 	TEST(@"-[removeObjectsInRange:]",
-	    R([m[1] removeObjectsInRange: of_range(0, 2)]) &&
+	    R([m[1] removeObjectsInRange: OFRangeMake(0, 2)]) &&
 	    m[1].count == 1 && [[m[1] objectAtIndex: 0] isEqual: c_ary[2]])
 
 	m[1] = [[a[0] mutableCopy] autorelease];
 	[m[1] addObject: @"qux"];
 	[m[1] addObject: @"last"];
@@ -237,20 +237,20 @@
 	[m[1] addObject: @"z"];
 	TEST(@"-[sortedArray]",
 	    [[m[1] sortedArray] isEqual: [arrayClass arrayWithObjects:
 	    @"0", @"Bar", @"Baz", @"Foo", @"z", nil]] &&
 	    [[m[1] sortedArrayUsingSelector: @selector(compare:)
-				    options: OF_ARRAY_SORT_DESCENDING]
+				    options: OFArraySortDescending]
 	    isEqual: [arrayClass arrayWithObjects:
 	    @"z", @"Foo", @"Baz", @"Bar", @"0", nil]])
 
 	EXPECT_EXCEPTION(@"Detect out of range in -[objectAtIndex:]",
 	    OFOutOfRangeException, [a[0] objectAtIndex: a[0].count])
 
 	EXPECT_EXCEPTION(@"Detect out of range in -[removeObjectsInRange:]",
 	    OFOutOfRangeException, [m[0] removeObjectsInRange:
-		of_range(0, m[0].count + 1)])
+		OFRangeMake(0, m[0].count + 1)])
 
 	TEST(@"-[componentsJoinedByString:]",
 	    (a[1] = [arrayClass arrayWithObjects: @"", @"a", @"b", @"c",
 	    nil]) &&
 	    [[a[1] componentsJoinedByString: @" "] isEqual: @" a b c"] &&
@@ -257,12 +257,13 @@
 	    (a[1] = [arrayClass arrayWithObject: @"foo"]) &&
 	    [[a[1] componentsJoinedByString: @" "] isEqual: @"foo"])
 
 	TEST(@"-[componentsJoinedByString:options]",
 	    (a[1] = [arrayClass arrayWithObjects: @"", @"foo", @"", @"", @"bar",
-	    @"", nil]) && [[a[1] componentsJoinedByString: @" "
-						  options: OF_ARRAY_SKIP_EMPTY]
+	    @"", nil]) &&
+	    [[a[1] componentsJoinedByString: @" "
+				    options: OFArraySkipEmptyComponents]
 	    isEqual: @"foo bar"])
 
 	m[0] = [[a[0] mutableCopy] autorelease];
 	ok = true;
 	i = 0;