diff --git a/tests/EmitTest.php b/tests/EmitTest.php
index 31124f9..e4381e8 100644
--- a/tests/EmitTest.php
+++ b/tests/EmitTest.php
@@ -4,7 +4,7 @@
 
 use PHPUnit_Framework_TestCase;
 use Tomaj\Hermes\Test\Driver\DummyDriver;
-use Tomaj\Hermes\Dispatcher;
+use Tomaj\Hermes\Emitter;
 use Tomaj\Hermes\Message;
 
 class EmitTest extends PHPUnit_Framework_TestCase
@@ -12,11 +12,11 @@ class EmitTest extends PHPUnit_Framework_TestCase
     public function testEmitWithDummyDriver()
     {
         $driver = new DummyDriver();
-        $dispatcher = new Dispatcher($driver);
+        $emitter = new Emitter($driver);
 
         $this->assertNull($driver->getMessage());
 
-        $dispatcher->emit(new Message('event-type', ['content']));
+        $emitter->emit(new Message('event-type', ['content']));
 
         $message = $driver->getMessage();
         $this->assertEquals('event-type', $message->getType());
diff --git a/tests/Logger/LoggerTest.php b/tests/Logger/LoggerTest.php
index 268586d..c84ff07 100644
--- a/tests/Logger/LoggerTest.php
+++ b/tests/Logger/LoggerTest.php
@@ -6,6 +6,7 @@
 use Tomaj\Hermes\Test\Driver\DummyDriver;
 use Tomaj\Hermes\Test\Handler\TestHandler;
 use Tomaj\Hermes\Message;
+use Tomaj\Hermes\Emitter;
 use Tomaj\Hermes\Dispatcher;
 
 class LoggerTest extends PHPUnit_Framework_TestCase
@@ -14,9 +15,9 @@ public function testLoggerWithEmit()
     {
         $driver = new DummyDriver();
         $testLogger = new TestLogger();
-        $dispatcher = new Dispatcher($driver, $testLogger);
+        $emitter = new Emitter($driver, $testLogger);
         $message = new Message('test', ['asdsd' => 'asdsd']);
-        $dispatcher->emit($message);
+        $emitter->emit($message);
 
         $logData = $testLogger->getLogs();
         $this->assertCount(1, $logData);