diff --git a/akka-actor-tests/src/test/java/akka/dispatch/JavaFutureTests.java b/akka-actor-tests/src/test/java/akka/dispatch/JavaFutureTests.java
index 812ff052a2..f494fd7d81 100644
--- a/akka-actor-tests/src/test/java/akka/dispatch/JavaFutureTests.java
+++ b/akka-actor-tests/src/test/java/akka/dispatch/JavaFutureTests.java
@@ -306,10 +306,10 @@ public class JavaFutureTests {
   }
 
   @Test
-  public void tryRecoverToMustBeCallable() {
+  public void recoverWithToMustBeCallable() {
     final IllegalStateException fail = new IllegalStateException("OHNOES");
     Promise<Object> p = Futures.promise(system.dispatcher());
-    Future<Object> f = p.future().tryRecover(new Recover<Future<Object>>() {
+    Future<Object> f = p.future().recoverWith(new Recover<Future<Object>>() {
       public Future<Object> recover(Throwable t) throws Throwable {
         if (t == fail) return Futures.<Object>successful("foo", system.dispatcher()).future();
         else throw t;
diff --git a/akka-actor-tests/src/test/scala/akka/dispatch/FutureSpec.scala b/akka-actor-tests/src/test/scala/akka/dispatch/FutureSpec.scala
index c04a063a16..e058218f2d 100644
--- a/akka-actor-tests/src/test/scala/akka/dispatch/FutureSpec.scala
+++ b/akka-actor-tests/src/test/scala/akka/dispatch/FutureSpec.scala
@@ -302,18 +302,18 @@ class FutureSpec extends AkkaSpec with Checkers with BeforeAndAfterAll with Defa
         }
       }
 
-      "tryRecover from exceptions" in {
+      "recoverWith from exceptions" in {
         val o = new IllegalStateException("original")
         val r = new IllegalStateException("recovered")
 
         intercept[IllegalStateException] {
-          Await.result(Promise.failed[String](o) tryRecover { case _ if false == true ⇒ Promise.successful("yay!") }, timeout.duration)
+          Await.result(Promise.failed[String](o) recoverWith { case _ if false == true ⇒ Promise.successful("yay!") }, timeout.duration)
         } must be(o)
 
-        Await.result(Promise.failed[String](o) tryRecover { case _ ⇒ Promise.successful("yay!") }, timeout.duration) must equal("yay!")
+        Await.result(Promise.failed[String](o) recoverWith { case _ ⇒ Promise.successful("yay!") }, timeout.duration) must equal("yay!")
 
         intercept[IllegalStateException] {
-          Await.result(Promise.failed[String](o) tryRecover { case _ ⇒ Promise.failed[String](r) }, timeout.duration)
+          Await.result(Promise.failed[String](o) recoverWith { case _ ⇒ Promise.failed[String](r) }, timeout.duration)
         } must be(r)
       }
 
diff --git a/akka-actor/src/main/scala/akka/dispatch/Future.scala b/akka-actor/src/main/scala/akka/dispatch/Future.scala
index c188f66893..08a73a1925 100644
--- a/akka-actor/src/main/scala/akka/dispatch/Future.scala
+++ b/akka-actor/src/main/scala/akka/dispatch/Future.scala
@@ -482,10 +482,10 @@ sealed trait Future[+T] extends Await.Awaitable[T] {
    *
    *  {{{
    *  val f = Future { Int.MaxValue }
-   *  Future (6 / 0) tryRecover { case e: ArithmeticException => f } // result: Int.MaxValue
+   *  Future (6 / 0) recoverWith { case e: ArithmeticException => f } // result: Int.MaxValue
    *  }}}
    */
-  def tryRecover[U >: T](pf: PartialFunction[Throwable, Future[U]]): Future[U] = {
+  def recoverWith[U >: T](pf: PartialFunction[Throwable, Future[U]]): Future[U] = {
     val p = Promise[U]()
 
     onComplete {
@@ -603,7 +603,7 @@ sealed trait Future[+T] extends Await.Awaitable[T] {
   /**
    * Same as onSuccess { case r => f(r) } but is also used in for-comprehensions
    */
-  final def foreach(f: T ⇒ Unit): Unit = onComplete {
+  final def foreach[U](f: T ⇒ U): Unit = onComplete {
     case Right(r) ⇒ f(r)
     case _        ⇒
   }
diff --git a/akka-docs/java/code/akka/docs/future/FutureDocTestBase.java b/akka-docs/java/code/akka/docs/future/FutureDocTestBase.java
index eaf6a41c27..b064eb803b 100644
--- a/akka-docs/java/code/akka/docs/future/FutureDocTestBase.java
+++ b/akka-docs/java/code/akka/docs/future/FutureDocTestBase.java
@@ -361,7 +361,7 @@ public class FutureDocTestBase {
       public Integer call() {
         return 1 / 0;
       }
-    }, system.dispatcher()).tryRecover(new Recover<Future<Integer>>() {
+    }, system.dispatcher()).recoverWith(new Recover<Future<Integer>>() {
         public Future<Integer> recover(Throwable problem) throws Throwable {
             if (problem instanceof ArithmeticException) {
                 return future(new Callable<Integer>() {
diff --git a/akka-docs/java/futures.rst b/akka-docs/java/futures.rst
index 4586c58996..00f17e57df 100644
--- a/akka-docs/java/futures.rst
+++ b/akka-docs/java/futures.rst
@@ -222,7 +222,7 @@ our ``Future`` would have a result of 0. The ``recover`` method works very simil
 so multiple ``Exception``\s can be handled in this manner, and if an ``Exception`` is not handled this way
 it will behave as if we hadn't used the ``recover`` method.
 
-You can also use the ``tryRecover`` method, which has the same relationship to ``recover`` as ``flatMap` has to ``map``,
+You can also use the ``recoverWith`` method, which has the same relationship to ``recover`` as ``flatMap` has to ``map``,
 and is use like this:
 
 .. includecode:: code/akka/docs/future/FutureDocTestBase.java
diff --git a/akka-docs/scala/code/akka/docs/future/FutureDocSpec.scala b/akka-docs/scala/code/akka/docs/future/FutureDocSpec.scala
index 7ddf46b66b..098fe873ad 100644
--- a/akka-docs/scala/code/akka/docs/future/FutureDocSpec.scala
+++ b/akka-docs/scala/code/akka/docs/future/FutureDocSpec.scala
@@ -267,12 +267,12 @@ class FutureDocSpec extends AkkaSpec {
     Await.result(future, 1 second) must be(0)
   }
 
-  "demonstrate usage of tryRecover" in {
+  "demonstrate usage of recoverWith" in {
     implicit val timeout = system.settings.ActorTimeout
     val actor = system.actorOf(Props[MyActor])
     val msg1 = -1
     //#try-recover
-    val future = akka.pattern.ask(actor, msg1) tryRecover {
+    val future = akka.pattern.ask(actor, msg1) recoverWith {
       case e: ArithmeticException        ⇒ Promise.successful(0)
       case foo: IllegalArgumentException ⇒ Promise.failed[Int](new IllegalStateException("All br0ken!"))
     }
diff --git a/akka-docs/scala/futures.rst b/akka-docs/scala/futures.rst
index 0313ba7d9d..181cc9f8fa 100644
--- a/akka-docs/scala/futures.rst
+++ b/akka-docs/scala/futures.rst
@@ -244,7 +244,7 @@ our ``Future`` would have a result of 0. The ``recover`` method works very simil
 so multiple ``Exception``\s can be handled in this manner, and if an ``Exception`` is not handled this way
 it will behave as if we hadn't used the ``recover`` method.
 
-You can also use the ``tryRecover`` method, which has the same relationship to ``recover`` as ``flatMap` has to ``map``,
+You can also use the ``recoverWith`` method, which has the same relationship to ``recover`` as ``flatMap` has to ``map``,
 and is use like this:
 
 .. includecode:: code/akka/docs/future/FutureDocSpec.scala