@@ -267,13 +267,14 @@
 	    [[a objectAtIndex: i++] isEqual: @"baz"] &&
 	    [[a objectAtIndex: i++] isEqual: @""] &&
 	    [[a objectAtIndex: i++] isEqual: @""])
 
 	i = 0;
-	TEST(@"-[componentsSeparatedByString:skipEmpty:]",
-	    (a = [@"fooXXbarXXXXbazXXXX" componentsSeparatedByString: @"XX"
-							   skipEmpty: YES]) &&
+	TEST(@"-[componentsSeparatedByString:options:]",
+	    (a = [@"fooXXbarXXXXbazXXXX"
+	    componentsSeparatedByString: @"XX"
+				options: OF_STRING_SKIP_EMPTY]) &&
 	    [a count] == 3 &&
 	    [[a objectAtIndex: i++] isEqual: @"foo"] &&
 	    [[a objectAtIndex: i++] isEqual: @"bar"] &&
 	    [[a objectAtIndex: i++] isEqual: @"baz"])
 
@@ -499,16 +500,17 @@
 	    (s[0] = [OFMutableString stringWithString: @"XX"]) &&
 	    R([s[0] replaceOccurrencesOfString: @"X"
 				    withString: @"XX"]) &&
 	    [s[0] isEqual: @"XXXX"])
 
-	TEST(@"-[replaceOccurrencesOfString:withString:inRange:]",
+	TEST(@"-[replaceOccurrencesOfString:withString:options:range:]",
 	    (s[0] = [OFMutableString stringWithString:
 	    @"foofoobarfoobarfoo"]) &&
 	    R([s[0] replaceOccurrencesOfString: @"oo"
 				    withString: @"óò"
-				       inRange: of_range(2, 15)]) &&
+				       options: 0
+					 range: of_range(2, 15)]) &&
 	    [s[0] isEqual: @"foofóòbarfóòbarfoo"])
 
 	TEST(@"-[deleteLeadingWhitespaces]",
 	    (s[0] = [OFMutableString stringWithString: whitespace[0]]) &&
 	    R([s[0] deleteLeadingWhitespaces]) &&