--- a/src/share/classes/java/util/functions/BiPredicate.java	Mon Aug 27 16:07:43 2012 -0400
+++ b/src/share/classes/java/util/functions/BiPredicate.java	Mon Aug 27 17:31:45 2012 -0400
@@ -58,13 +58,13 @@
 public interface BiPredicate<L,R> {
 
     /**
-     * !?! mduigou Naming is inconsistent with Predicate.test
-     * Return {@code true} if the input object matches some criteria.
+     * Return {@code true} if the inputs match some criteria.
      *
-     * @param t the input object.
-     * @return {@code true} if the input object matched some criteria.
+     * @param l an input object.
+     * @param r an input object.
+     * @return {@code true} if the inputs match some criteria.
      */
-     boolean eval(L l, R r);
+     boolean test(L l, R r);
 
     /**
      * Create a predicate which evaluates to {@code true} only if this predicate

--- a/src/share/classes/java/util/streams/ops/BiAllMatchOp.java	Mon Aug 27 16:07:43 2012 -0400
+++ b/src/share/classes/java/util/streams/ops/BiAllMatchOp.java	Mon Aug 27 17:31:45 2012 -0400
@@ -52,7 +52,7 @@
 
     public static <K,V> boolean allMatch(MapIterator<K,V> iterator, BiPredicate<? super K, ? super V> predicate) {
         while (iterator.hasNext()) {
-            if(!predicate.eval(iterator.nextKey(), iterator.curValue())) {
+            if(!predicate.test(iterator.nextKey(), iterator.curValue())) {
                 return false;
             }
         }

--- a/src/share/classes/java/util/streams/ops/BiAnyMatchOp.java	Mon Aug 27 16:07:43 2012 -0400
+++ b/src/share/classes/java/util/streams/ops/BiAnyMatchOp.java	Mon Aug 27 17:31:45 2012 -0400
@@ -52,7 +52,7 @@
 
     public static <K,V> boolean anyMatch(MapIterator<K,V> iterator, BiPredicate<? super K, ? super V> predicate) {
         while (iterator.hasNext()) {
-            if(predicate.eval(iterator.nextKey(), iterator.curValue())) {
+            if(predicate.test(iterator.nextKey(), iterator.curValue())) {
                 return true;
             }
         }

--- a/src/share/classes/java/util/streams/ops/BiFilterOp.java	Mon Aug 27 16:07:43 2012 -0400
+++ b/src/share/classes/java/util/streams/ops/BiFilterOp.java	Mon Aug 27 17:31:45 2012 -0400
@@ -71,7 +71,7 @@
         return new BiSink<K,V>() {
             @Override
             public void accept(K k, V v) {
-                if(predicate.eval(k, v)) {
+                if(predicate.test(k, v)) {
                     biSink.accept(k, v);
                 }
             }
@@ -103,7 +103,7 @@
         public boolean hasNext() {
             while (!nextReady && source.hasNext()) {
                 current = source.next();
-                nextReady = predicate.eval(current.getKey(), current.getValue());
+                nextReady = predicate.test(current.getKey(), current.getValue());
             }
 
             return nextReady;

--- a/test-ng/tests/org/openjdk/tests/java/util/streams/ops/StreamOpTestCase.java	Mon Aug 27 16:07:43 2012 -0400
+++ b/test-ng/tests/org/openjdk/tests/java/util/streams/ops/StreamOpTestCase.java	Mon Aug 27 17:31:45 2012 -0400
@@ -223,15 +223,15 @@
         sink2.begin(data.length);
         forEach(data, sink2);
         U answer2 = sink2.end();
-        Assert.assertTrue(equalator.eval(answer1, answer2));
+        Assert.assertTrue(equalator.test(answer1, answer2));
 
         // Third pass -- wrap with SequentialPipeline.op
         U answer3 = seq(data, op);
-        Assert.assertTrue(equalator.eval(answer1, answer3));
+        Assert.assertTrue(equalator.test(answer1, answer3));
 
         // Fourth pass -- wrap with ParallelPipeline.op
         U answer4 = par(data, op);
-        Assert.assertTrue(equalator.eval(answer1, answer4));
+        Assert.assertTrue(equalator.test(answer1, answer4));
     }
 
     private static <U> void assertEquals(ArraySink<U> sink1, ArraySink<U> sink2) {