diff --git a/akka-actor-tests/src/test/scala/akka/io/TcpIntegrationSpec.scala b/akka-actor-tests/src/test/scala/akka/io/TcpIntegrationSpec.scala
index a1e25c945d..0826dbbfd4 100644
--- a/akka-actor-tests/src/test/scala/akka/io/TcpIntegrationSpec.scala
+++ b/akka-actor-tests/src/test/scala/akka/io/TcpIntegrationSpec.scala
@@ -74,7 +74,7 @@ class TcpIntegrationSpec extends AkkaSpec("""
       verifyActorTermination(serverConnection)
     }
 
-    "properly handle connection abort via PosionPill from client side" in new TestSetup {
+    "properly handle connection abort via PoisonPill from client side" in new TestSetup {
       val (clientHandler, clientConnection, serverHandler, serverConnection) = establishNewClientConnection()
       clientHandler.send(clientConnection, PoisonPill)
       verifyActorTermination(clientConnection)
@@ -83,7 +83,7 @@ class TcpIntegrationSpec extends AkkaSpec("""
       verifyActorTermination(serverConnection)
     }
 
-    "properly handle connection abort via PosionPill from client side after chit-chat" in new TestSetup {
+    "properly handle connection abort via PoisonPill from client side after chit-chat" in new TestSetup {
       val (clientHandler, clientConnection, serverHandler, serverConnection) = establishNewClientConnection()
       chitchat(clientHandler, clientConnection, serverHandler, serverConnection)
 
@@ -94,7 +94,7 @@ class TcpIntegrationSpec extends AkkaSpec("""
       verifyActorTermination(serverConnection)
     }
 
-    "properly handle connection abort via PosionPill from server side" in new TestSetup {
+    "properly handle connection abort via PoisonPill from server side" in new TestSetup {
       val (clientHandler, clientConnection, serverHandler, serverConnection) = establishNewClientConnection()
       serverHandler.send(serverConnection, PoisonPill)
       verifyActorTermination(serverConnection)
@@ -103,7 +103,7 @@ class TcpIntegrationSpec extends AkkaSpec("""
       verifyActorTermination(clientConnection)
     }
 
-    "properly handle connection abort via PosionPill from server side after chit-chat" in new TestSetup {
+    "properly handle connection abort via PoisonPill from server side after chit-chat" in new TestSetup {
       val (clientHandler, clientConnection, serverHandler, serverConnection) = establishNewClientConnection()
       chitchat(clientHandler, clientConnection, serverHandler, serverConnection)
 
diff --git a/akka-docs/rst/images/actor_lifecycle.png b/akka-docs/rst/images/actor_lifecycle.png
index ba7d568cae..4725a74ca0 100644
Binary files a/akka-docs/rst/images/actor_lifecycle.png and b/akka-docs/rst/images/actor_lifecycle.png differ
diff --git a/akka-docs/rst/images/actor_lifecycle.svg b/akka-docs/rst/images/actor_lifecycle.svg
index cd555f3887..ef4f6871f3 100644
--- a/akka-docs/rst/images/actor_lifecycle.svg
+++ b/akka-docs/rst/images/actor_lifecycle.svg
@@ -319,7 +319,7 @@
            style="font-weight:normal;-inkscape-font-specification:'Franklin Gothic Medium, Oblique'"
            id="flowSpan8013"> or</flowSpan></flowPara><flowPara
          id="flowPara8005"
-         style="font-style:normal;-inkscape-font-specification:'Franklin Gothic Medium, Bold'">PosionPill</flowPara></flowRoot>    <text
+         style="font-style:normal;-inkscape-font-specification:'Franklin Gothic Medium, Bold'">PoisonPill</flowPara></flowRoot>    <text
        xml:space="preserve"
        style="font-size:8px;font-style:oblique;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Franklin Gothic Medium;-inkscape-font-specification:Sans"
        x="296.08759"