diff --git a/examples/thread.php b/examples/thread.php
index e76948f..ff01e7f 100755
--- a/examples/thread.php
+++ b/examples/thread.php
@@ -4,7 +4,7 @@ require dirname(__DIR__).'/vendor/autoload.php';
 
 use Amp\Delayed;
 use Amp\Loop;
-use Amp\Parallel\Threading\Thread;
+use Amp\Parallel\Thread\Thread;
 
 Loop::run(function () {
     $timer = Loop::repeat(1000, function () {
diff --git a/lib/Threading/Internal/Mutex.php b/lib/Thread/Internal/Mutex.php
similarity index 95%
rename from lib/Threading/Internal/Mutex.php
rename to lib/Thread/Internal/Mutex.php
index 9074540..c7ca4ea 100644
--- a/lib/Threading/Internal/Mutex.php
+++ b/lib/Thread/Internal/Mutex.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Amp\Parallel\Threading\Internal;
+namespace Amp\Parallel\Thread\Internal;
 
 use Amp\Coroutine;
 use Amp\Delayed;
diff --git a/lib/Threading/Internal/Semaphore.php b/lib/Thread/Internal/Semaphore.php
similarity index 98%
rename from lib/Threading/Internal/Semaphore.php
rename to lib/Thread/Internal/Semaphore.php
index b116f3d..dcc78cc 100644
--- a/lib/Threading/Internal/Semaphore.php
+++ b/lib/Thread/Internal/Semaphore.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Amp\Parallel\Threading\Internal;
+namespace Amp\Parallel\Thread\Internal;
 
 use Amp\Coroutine;
 use Amp\Delayed;
diff --git a/lib/Threading/Internal/Storage.php b/lib/Thread/Internal/Storage.php
similarity index 91%
rename from lib/Threading/Internal/Storage.php
rename to lib/Thread/Internal/Storage.php
index ae94de9..a2df245 100644
--- a/lib/Threading/Internal/Storage.php
+++ b/lib/Thread/Internal/Storage.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Amp\Parallel\Threading\Internal;
+namespace Amp\Parallel\Thread\Internal;
 
 /**
  * @internal
diff --git a/lib/Threading/Internal/Thread.php b/lib/Thread/Internal/Thread.php
similarity index 99%
rename from lib/Threading/Internal/Thread.php
rename to lib/Thread/Internal/Thread.php
index 9dc9469..47c059b 100644
--- a/lib/Threading/Internal/Thread.php
+++ b/lib/Thread/Internal/Thread.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Amp\Parallel\Threading\Internal;
+namespace Amp\Parallel\Thread\Internal;
 
 use Amp\Loop;
 use Amp\Parallel\Sync\Channel;
diff --git a/lib/Threading/Mutex.php b/lib/Thread/Mutex.php
similarity index 89%
rename from lib/Threading/Mutex.php
rename to lib/Thread/Mutex.php
index 9db9dc7..13f8e94 100644
--- a/lib/Threading/Mutex.php
+++ b/lib/Thread/Mutex.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Amp\Parallel\Threading;
+namespace Amp\Parallel\Thread;
 
 use Amp\Parallel\Sync\Mutex as SyncMutex;
 use Amp\Promise;
@@ -11,7 +11,7 @@ use Amp\Promise;
  * Compatible with POSIX systems and Microsoft Windows.
  */
 class Mutex implements SyncMutex {
-    /** @var \Amp\Parallel\Threading\Internal\Mutex */
+    /** @var \Amp\Parallel\Thread\Internal\Mutex */
     private $mutex;
 
     /**
diff --git a/lib/Threading/Parcel.php b/lib/Thread/Parcel.php
similarity index 93%
rename from lib/Threading/Parcel.php
rename to lib/Thread/Parcel.php
index 3138c49..b877b24 100644
--- a/lib/Threading/Parcel.php
+++ b/lib/Thread/Parcel.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Amp\Parallel\Threading;
+namespace Amp\Parallel\Thread;
 
 use Amp\Coroutine;
 use Amp\Parallel\Sync\Parcel as SyncParcel;
@@ -10,10 +10,10 @@ use Amp\Promise;
  * A thread-safe container that shares a value between multiple threads.
  */
 class Parcel implements SyncParcel {
-    /** @var \Amp\Parallel\Threading\Mutex */
+    /** @var \Amp\Parallel\Thread\Mutex */
     private $mutex;
 
-    /** @var \Amp\Parallel\Threading\Internal\Storage */
+    /** @var \Amp\Parallel\Thread\Internal\Storage */
     private $storage;
 
     /**
diff --git a/lib/Threading/Semaphore.php b/lib/Thread/Semaphore.php
similarity index 98%
rename from lib/Threading/Semaphore.php
rename to lib/Thread/Semaphore.php
index bdf75f0..0328f7f 100644
--- a/lib/Threading/Semaphore.php
+++ b/lib/Thread/Semaphore.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Amp\Parallel\Threading;
+namespace Amp\Parallel\Thread;
 
 use Amp\Parallel\Sync\Semaphore as SyncSemaphore;
 use Amp\Promise;
diff --git a/lib/Threading/Thread.php b/lib/Thread/Thread.php
similarity index 98%
rename from lib/Threading/Thread.php
rename to lib/Thread/Thread.php
index 92ca165..5f60995 100644
--- a/lib/Threading/Thread.php
+++ b/lib/Thread/Thread.php
@@ -1,12 +1,12 @@
 <?php
 
-namespace Amp\Parallel\Threading;
+namespace Amp\Parallel\Thread;
 
 use Amp\Coroutine;
 use Amp\Loop;
+use Amp\Parallel\Context;
 use Amp\Parallel\ContextException;
 use Amp\Parallel\StatusError;
-use Amp\Parallel\Strand;
 use Amp\Parallel\Sync\ChannelException;
 use Amp\Parallel\Sync\ChannelledSocket;
 use Amp\Parallel\Sync\ExitResult;
@@ -21,7 +21,7 @@ use function Amp\call;
  * maintained both in the context that creates the thread and in the thread
  * itself.
  */
-class Thread implements Strand {
+class Thread implements Context {
     const EXIT_CHECK_FREQUENCY = 250;
 
     /** @var Internal\Thread An internal thread instance. */
diff --git a/lib/Worker/DefaultWorkerFactory.php b/lib/Worker/DefaultWorkerFactory.php
index bc18e22..551dc63 100644
--- a/lib/Worker/DefaultWorkerFactory.php
+++ b/lib/Worker/DefaultWorkerFactory.php
@@ -2,7 +2,7 @@
 
 namespace Amp\Parallel\Worker;
 
-use Amp\Parallel\Threading\Thread;
+use Amp\Parallel\Thread\Thread;
 
 /**
  * The built-in worker factory type.
diff --git a/lib/Worker/WorkerThread.php b/lib/Worker/WorkerThread.php
index 67f7693..24ee369 100644
--- a/lib/Worker/WorkerThread.php
+++ b/lib/Worker/WorkerThread.php
@@ -2,7 +2,7 @@
 
 namespace Amp\Parallel\Worker;
 
-use Amp\Parallel\Threading\Thread;
+use Amp\Parallel\Thread\Thread;
 use Amp\Promise;
 
 /**
diff --git a/test/Threading/MutexTest.php b/test/Thread/MutexTest.php
similarity index 93%
rename from test/Threading/MutexTest.php
rename to test/Thread/MutexTest.php
index efdbce7..0432b48 100644
--- a/test/Threading/MutexTest.php
+++ b/test/Thread/MutexTest.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace Amp\Parallel\Test\Threading;
+namespace Amp\Parallel\Test\Thread;
 
 use Amp\Loop;
-use Amp\Parallel\Threading\Mutex;
+use Amp\Parallel\Thread\Mutex;
 use Amp\PHPUnit\TestCase;
 
 /**
diff --git a/test/Threading/ParcelTest.php b/test/Thread/ParcelTest.php
similarity index 75%
rename from test/Threading/ParcelTest.php
rename to test/Thread/ParcelTest.php
index 07ca323..895dcc4 100644
--- a/test/Threading/ParcelTest.php
+++ b/test/Thread/ParcelTest.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace Amp\Parallel\Test\Threading;
+namespace Amp\Parallel\Test\Thread;
 
 use Amp\Parallel\Test\Sync\AbstractParcelTest;
-use Amp\Parallel\Threading\Parcel;
+use Amp\Parallel\Thread\Parcel;
 
 /**
  * @requires extension pthreads
diff --git a/test/Threading/SemaphoreTest.php b/test/Thread/SemaphoreTest.php
similarity index 91%
rename from test/Threading/SemaphoreTest.php
rename to test/Thread/SemaphoreTest.php
index 5d49667..4ea6174 100644
--- a/test/Threading/SemaphoreTest.php
+++ b/test/Thread/SemaphoreTest.php
@@ -1,12 +1,12 @@
 <?php
 
-namespace Amp\Parallel\Test\Threading;
+namespace Amp\Parallel\Test\Thread;
 
 use Amp\Loop;
 use Amp\Parallel\Sync\Semaphore as SyncSemaphore;
 use Amp\Parallel\Test\Sync\AbstractSemaphoreTest;
-use Amp\Parallel\Threading\Semaphore;
-use Amp\Parallel\Threading\Thread;
+use Amp\Parallel\Thread\Semaphore;
+use Amp\Parallel\Thread\Thread;
 
 /**
  * @group threading
diff --git a/test/Threading/ThreadTest.php b/test/Thread/ThreadTest.php
similarity index 88%
rename from test/Threading/ThreadTest.php
rename to test/Thread/ThreadTest.php
index 2b9f39b..bec1ea8 100644
--- a/test/Threading/ThreadTest.php
+++ b/test/Thread/ThreadTest.php
@@ -1,10 +1,10 @@
 <?php
 
-namespace Amp\Parallel\Test\Threading;
+namespace Amp\Parallel\Test\Thread;
 
 use Amp\Loop;
 use Amp\Parallel\Test\AbstractContextTest;
-use Amp\Parallel\Threading\Thread;
+use Amp\Parallel\Thread\Thread;
 
 /**
  * @group threading