@@ -487,17 +487,17 @@
 	    [C(@"𝄞öö") rangeOfString: @"öö"].location == 1 &&
 	    [C(@"𝄞öö") rangeOfString: @"ö"].location == 1 &&
 	    [C(@"𝄞öö") rangeOfString: @"𝄞"].location == 0 &&
 	    [C(@"𝄞öö") rangeOfString: @"x"].location == OFNotFound &&
 	    [C(@"𝄞öö") rangeOfString: @"öö"
-	    options: OF_STRING_SEARCH_BACKWARDS].location == 1 &&
+	    options: OFStringSearchBackwards].location == 1 &&
 	    [C(@"𝄞öö") rangeOfString: @"ö"
-	    options: OF_STRING_SEARCH_BACKWARDS].location == 2 &&
+	    options: OFStringSearchBackwards].location == 2 &&
 	    [C(@"𝄞öö") rangeOfString: @"𝄞"
-	    options: OF_STRING_SEARCH_BACKWARDS].location == 0 &&
+	    options: OFStringSearchBackwards].location == 0 &&
 	    [C(@"𝄞öö") rangeOfString: @"x"
-	    options: OF_STRING_SEARCH_BACKWARDS].location == OFNotFound)
+	    options: OFStringSearchBackwards].location == OFNotFound)
 
 	EXPECT_EXCEPTION(
 	    @"Detect out of range in -[rangeOfString:options:range:]",
 	    OFOutOfRangeException,
 	    [C(@"𝄞öö") rangeOfString: @"ö" options: 0 range: OFMakeRange(3, 1)])
@@ -505,11 +505,11 @@
 	cs = [OFCharacterSet characterSetWithCharactersInString: @"cđ"];
 	TEST(@"-[indexOfCharacterFromSet:]",
 	     [C(@"abcđabcđe") indexOfCharacterFromSet: cs] == 2 &&
 	     [C(@"abcđabcđë")
 	     indexOfCharacterFromSet: cs
-			     options: OF_STRING_SEARCH_BACKWARDS] == 7 &&
+			     options: OFStringSearchBackwards] == 7 &&
 	     [C(@"abcđabcđë")
 	     indexOfCharacterFromSet: cs
 			     options: 0
 			       range: OFMakeRange(4, 4)] == 6 &&
 	     [C(@"abcđabcđëf")
@@ -608,11 +608,11 @@
 
 	i = 0;
 	TEST(@"-[componentsSeparatedByString:options:]",
 	    (a = [C(@"fooXXbarXXXXbazXXXX")
 	    componentsSeparatedByString: @"XX"
-				options: OF_STRING_SKIP_EMPTY]) &&
+				options: OFStringSkipEmptyComponents]) &&
 	    [[a objectAtIndex: i++] isEqual: @"foo"] &&
 	    [[a objectAtIndex: i++] isEqual: @"bar"] &&
 	    [[a objectAtIndex: i++] isEqual: @"baz"] &&
 	    a.count == i)
 
@@ -637,11 +637,11 @@
 
 	i = 0;
 	TEST(@"-[componentsSeparatedByCharactersInSet:options:]",
 	    (a = [C(@"fooXYbarXYZXbazXYXZ")
 	    componentsSeparatedByCharactersInSet: cs
-					 options: OF_STRING_SKIP_EMPTY]) &&
+	    options: OFStringSkipEmptyComponents]) &&
 	    [[a objectAtIndex: i++] isEqual: @"foo"] &&
 	    [[a objectAtIndex: i++] isEqual: @"bar"] &&
 	    [[a objectAtIndex: i++] isEqual: @"baz"] &&
 	    a.count == i)