diff --git a/src/ClientHandler.php b/src/ClientHandler.php
index b602ece..23ffc94 100644
--- a/src/ClientHandler.php
+++ b/src/ClientHandler.php
@@ -5,6 +5,7 @@ namespace LanguageServer;
 
 use AdvancedJsonRpc;
 use Sabre\Event\Promise;
+use LanguageServer\ProtocolBridge\Message;
 
 class ClientHandler
 {
@@ -41,12 +42,12 @@ class ClientHandler
     {
         $id = $this->idGenerator->generate();
         return $this->protocolWriter->write(
-            new Protocol\Message(
-                (new AdvancedJsonRpc\Request($id, $method, (object)$params))->__toString()
+            new ProtocolBridge\Message(
+                new AdvancedJsonRpc\Request($id, $method, (object)$params)
             )
         )->then(function () use ($id) {
             $promise = new Promise;
-            $listener = function (Protocol\Message $msg) use ($id, $promise, &$listener) {
+            $listener = function (ProtocolBridge\Message $msg) use ($id, $promise, &$listener) {
                 if (AdvancedJsonRpc\Response::isResponse($msg->body) && $msg->body->id === $id) {
                     // Received a response
                     $this->protocolReader->removeListener('message', $listener);
@@ -72,7 +73,7 @@ class ClientHandler
     public function notify(string $method, $params): Promise
     {
         return $this->protocolWriter->write(
-            new Protocol\Message(
+            new ProtocolBridge\Message(
                 new AdvancedJsonRpc\Notification($method, (object)$params)
             )
         );
diff --git a/src/Protocol/Message.php b/src/ProtocolBridge/Message.php
similarity index 94%
rename from src/Protocol/Message.php
rename to src/ProtocolBridge/Message.php
index 8df5d0e..dd1f3e0 100644
--- a/src/Protocol/Message.php
+++ b/src/ProtocolBridge/Message.php
@@ -1,9 +1,10 @@
 <?php
 declare(strict_types = 1);
 
-namespace LanguageServer\Protocol;
+namespace LanguageServer\ProtocolBridge;
 
 use AdvancedJsonRpc\Message as MessageBody;
+use LanguageServer\ProtocolBridge\Message;
 
 class Message
 {
diff --git a/src/ProtocolBridge/MessageFactory.php b/src/ProtocolBridge/MessageFactory.php
index 1a106ef..4e6c950 100644
--- a/src/ProtocolBridge/MessageFactory.php
+++ b/src/ProtocolBridge/MessageFactory.php
@@ -3,7 +3,7 @@
 namespace LanguageServer\ProtocolBridge;
 
 use AdvancedJsonRpc\Message as AdvancedJsonRpcMessage;
-use LanguageServer\Protocol\Message;
+use LanguageServer\ProtocolBridge\Message;
 
 class MessageFactory
 {
diff --git a/src/ProtocolStreamReader.php b/src/ProtocolStreamReader.php
index 4071dcd..4d98087 100644
--- a/src/ProtocolStreamReader.php
+++ b/src/ProtocolStreamReader.php
@@ -3,7 +3,7 @@ declare(strict_types = 1);
 
 namespace LanguageServer;
 
-use LanguageServer\Protocol\Message;
+use LanguageServer\ProtocolBridge\Message;
 use AdvancedJsonRpc\Message as MessageBody;
 use Sabre\Event\{Loop, Emitter};
 
diff --git a/src/ProtocolStreamWriter.php b/src/ProtocolStreamWriter.php
index f004a5f..f202ea0 100644
--- a/src/ProtocolStreamWriter.php
+++ b/src/ProtocolStreamWriter.php
@@ -3,7 +3,7 @@ declare(strict_types = 1);
 
 namespace LanguageServer;
 
-use LanguageServer\Protocol\Message;
+use LanguageServer\ProtocolBridge\Message;
 use Sabre\Event\{
     Loop,
     Promise
diff --git a/src/ProtocolWriter.php b/src/ProtocolWriter.php
index 5ac237c..dd2da72 100644
--- a/src/ProtocolWriter.php
+++ b/src/ProtocolWriter.php
@@ -3,7 +3,7 @@ declare(strict_types = 1);
 
 namespace LanguageServer;
 
-use LanguageServer\Protocol\Message;
+use LanguageServer\ProtocolBridge\Message;
 use Sabre\Event\Promise;
 
 interface ProtocolWriter
diff --git a/tests/ClientHandlerTest.php b/tests/ClientHandlerTest.php
index 214b018..3a4106f 100644
--- a/tests/ClientHandlerTest.php
+++ b/tests/ClientHandlerTest.php
@@ -5,7 +5,7 @@ namespace LanguageServer\Tests;
 
 use PHPUnit\Framework\TestCase;
 use LanguageServer\ClientHandler;
-use LanguageServer\Protocol\Message;
+use LanguageServer\ProtocolBridge\Message;
 use AdvancedJsonRpc;
 use Sabre\Event\Loop;
 
diff --git a/tests/MockProtocolStream.php b/tests/MockProtocolStream.php
index 8b22be7..92462cd 100644
--- a/tests/MockProtocolStream.php
+++ b/tests/MockProtocolStream.php
@@ -4,8 +4,7 @@ declare(strict_types = 1);
 namespace LanguageServer\Tests;
 
 use LanguageServer\{ProtocolReader, ProtocolWriter};
-use LanguageServer\ProtocolBridge\MessageFactory;
-use LanguageServer\Protocol\Message;
+use LanguageServer\ProtocolBridge\Message;
 use Sabre\Event\{Loop, Emitter, Promise};
 
 /**
@@ -22,7 +21,7 @@ class MockProtocolStream extends Emitter implements ProtocolReader, ProtocolWrit
     public function write(Message $msg): Promise
     {
         Loop\nextTick(function () use ($msg) {
-            $this->emit('message', [MessageFactory::fromRawMessage((string)$msg)]);
+            $this->emit('message', [Message::parse((string)$msg)]);
         });
         return Promise\resolve(null);
     }
diff --git a/tests/ProtocolStreamReaderTest.php b/tests/ProtocolStreamReaderTest.php
index 69eea37..e18b650 100644
--- a/tests/ProtocolStreamReaderTest.php
+++ b/tests/ProtocolStreamReaderTest.php
@@ -5,7 +5,7 @@ namespace LanguageServer\Tests;
 
 use PHPUnit\Framework\TestCase;
 use LanguageServer\{LanguageServer, ProtocolStreamReader, ProtocolStreamWriter};
-use LanguageServer\Protocol\Message;
+use LanguageServer\ProtocolBridge\Message;
 use AdvancedJsonRpc\{Request as RequestBody, Response as ResponseBody};
 use Sabre\Event\Loop;
 
diff --git a/tests/ProtocolStreamWriterTest.php b/tests/ProtocolStreamWriterTest.php
index b67bdcb..331a246 100644
--- a/tests/ProtocolStreamWriterTest.php
+++ b/tests/ProtocolStreamWriterTest.php
@@ -5,7 +5,7 @@ namespace LanguageServer\Tests;
 
 use PHPUnit\Framework\TestCase;
 use LanguageServer\ProtocolStreamWriter;
-use LanguageServer\Protocol\Message;
+use LanguageServer\ProtocolBridge\Message;
 use AdvancedJsonRpc\{Request as RequestBody};
 use Sabre\Event\Loop;
 
diff --git a/tests/Validation/ValidationTest.php b/tests/Validation/ValidationTest.php
index 9057c9d..288fffc 100644
--- a/tests/Validation/ValidationTest.php
+++ b/tests/Validation/ValidationTest.php
@@ -13,7 +13,7 @@ use phpDocumentor\Reflection\DocBlock;
 use phpDocumentor\Reflection\DocBlockFactory;
 use PHPUnit\Framework\TestCase;
 use LanguageServer\ClientHandler;
-use LanguageServer\Protocol\Message;
+use LanguageServer\ProtocolBridge\Message;
 use AdvancedJsonRpc;
 use RecursiveDirectoryIterator;
 use RecursiveIteratorIterator;