diff --git a/src/Client/TextDocument.php b/src/Client/TextDocument.php
index f163d60..7630438 100644
--- a/src/Client/TextDocument.php
+++ b/src/Client/TextDocument.php
@@ -4,7 +4,7 @@ declare(strict_types = 1);
 namespace LanguageServer\Client;
 
 use LanguageServer\ClientHandler;
-use LanguageServer\Protocol\{TextDocumentItem, TextDocumentIdentifier};
+use LanguageServerProtocol\{TextDocumentItem, TextDocumentIdentifier};
 use Sabre\Event\Promise;
 use JsonMapper;
 
diff --git a/src/Client/Workspace.php b/src/Client/Workspace.php
index 901e386..8c31f1f 100644
--- a/src/Client/Workspace.php
+++ b/src/Client/Workspace.php
@@ -4,7 +4,7 @@ declare(strict_types = 1);
 namespace LanguageServer\Client;
 
 use LanguageServer\ClientHandler;
-use LanguageServer\Protocol\TextDocumentIdentifier;
+use LanguageServerProtocol\TextDocumentIdentifier;
 use Sabre\Event\Promise;
 use JsonMapper;
 
diff --git a/src/CompletionProvider.php b/src/CompletionProvider.php
index 22f0a9d..44cf5b8 100644
--- a/src/CompletionProvider.php
+++ b/src/CompletionProvider.php
@@ -5,7 +5,7 @@ namespace LanguageServer;
 
 use LanguageServer\Index\ReadableIndex;
 use LanguageServer\Factory\CompletionItemFactory;
-use LanguageServer\Protocol\{
+use LanguageServerProtocol\{
     TextEdit,
     Range,
     Position,
diff --git a/src/ContentRetriever/ClientContentRetriever.php b/src/ContentRetriever/ClientContentRetriever.php
index b88042c..d83aad1 100644
--- a/src/ContentRetriever/ClientContentRetriever.php
+++ b/src/ContentRetriever/ClientContentRetriever.php
@@ -4,7 +4,7 @@ declare(strict_types = 1);
 namespace LanguageServer\ContentRetriever;
 
 use LanguageServer\LanguageClient;
-use LanguageServer\Protocol\{TextDocumentIdentifier, TextDocumentItem};
+use LanguageServerProtocol\{TextDocumentIdentifier, TextDocumentItem};
 use Sabre\Event\Promise;
 
 /**
diff --git a/src/Definition.php b/src/Definition.php
index 1600408..9ea27f9 100644
--- a/src/Definition.php
+++ b/src/Definition.php
@@ -5,7 +5,7 @@ namespace LanguageServer;
 
 use LanguageServer\Index\ReadableIndex;
 use phpDocumentor\Reflection\{Types, Type, Fqsen, TypeResolver};
-use LanguageServer\Protocol\SymbolInformation;
+use LanguageServerProtocol\SymbolInformation;
 use Generator;
 
 /**
diff --git a/src/DefinitionResolver.php b/src/DefinitionResolver.php
index 6f2dd38..3a4f378 100644
--- a/src/DefinitionResolver.php
+++ b/src/DefinitionResolver.php
@@ -5,7 +5,7 @@ namespace LanguageServer;
 
 use LanguageServer\Index\ReadableIndex;
 use LanguageServer\Factory\SymbolInformationFactory;
-use LanguageServer\Protocol\SymbolInformation;
+use LanguageServerProtocol\SymbolInformation;
 use Microsoft\PhpParser;
 use Microsoft\PhpParser\Node;
 use Microsoft\PhpParser\FunctionLike;
diff --git a/src/Factory/CompletionItemFactory.php b/src/Factory/CompletionItemFactory.php
index 9e77cba..ce00fa6 100644
--- a/src/Factory/CompletionItemFactory.php
+++ b/src/Factory/CompletionItemFactory.php
@@ -3,9 +3,9 @@
 namespace LanguageServer\Factory;
 
 use LanguageServer\Definition;
-use LanguageServer\Protocol\CompletionItem;
-use LanguageServer\Protocol\CompletionItemKind;
-use LanguageServer\Protocol\SymbolKind;
+use LanguageServerProtocol\CompletionItem;
+use LanguageServerProtocol\CompletionItemKind;
+use LanguageServerProtocol\SymbolKind;
 
 class CompletionItemFactory
 {
diff --git a/src/Factory/LocationFactory.php b/src/Factory/LocationFactory.php
index 7f2da4c..3ccc80b 100644
--- a/src/Factory/LocationFactory.php
+++ b/src/Factory/LocationFactory.php
@@ -2,9 +2,9 @@
 
 namespace LanguageServer\Factory;
 
-use LanguageServer\Protocol\Location;
-use LanguageServer\Protocol\Position;
-use LanguageServer\Protocol\Range;
+use LanguageServerProtocol\Location;
+use LanguageServerProtocol\Position;
+use LanguageServerProtocol\Range;
 use Microsoft\PhpParser\Node;
 use Microsoft\PhpParser\PositionUtilities;
 
diff --git a/src/Factory/RangeFactory.php b/src/Factory/RangeFactory.php
index fdce13f..b438db5 100644
--- a/src/Factory/RangeFactory.php
+++ b/src/Factory/RangeFactory.php
@@ -2,8 +2,8 @@
 
 namespace LanguageServer\Factory;
 
-use LanguageServer\Protocol\Position;
-use LanguageServer\Protocol\Range;
+use LanguageServerProtocol\Position;
+use LanguageServerProtocol\Range;
 use Microsoft\PhpParser\Node;
 use Microsoft\PhpParser\PositionUtilities;
 
diff --git a/src/Factory/SymbolInformationFactory.php b/src/Factory/SymbolInformationFactory.php
index 2bf6c5f..b03d951 100644
--- a/src/Factory/SymbolInformationFactory.php
+++ b/src/Factory/SymbolInformationFactory.php
@@ -2,9 +2,9 @@
 
 namespace LanguageServer\Factory;
 
-use LanguageServer\Protocol\Location;
-use LanguageServer\Protocol\SymbolInformation;
-use LanguageServer\Protocol\SymbolKind;
+use LanguageServerProtocol\Location;
+use LanguageServerProtocol\SymbolInformation;
+use LanguageServerProtocol\SymbolKind;
 use Microsoft\PhpParser\Node;
 use Microsoft\PhpParser\ResolvedName;
 use LanguageServer\Factory\LocationFactory;
diff --git a/src/Indexer.php b/src/Indexer.php
index 85d1787..8b1fd9b 100644
--- a/src/Indexer.php
+++ b/src/Indexer.php
@@ -6,7 +6,7 @@ namespace LanguageServer;
 use LanguageServer\Cache\Cache;
 use LanguageServer\FilesFinder\FilesFinder;
 use LanguageServer\Index\{DependenciesIndex, Index};
-use LanguageServer\Protocol\MessageType;
+use LanguageServerProtocol\MessageType;
 use Webmozart\PathUtil\Path;
 use Sabre\Event\Promise;
 use function Sabre\Event\coroutine;
diff --git a/src/LanguageServer.php b/src/LanguageServer.php
index c023e33..05dd48a 100644
--- a/src/LanguageServer.php
+++ b/src/LanguageServer.php
@@ -3,7 +3,7 @@ declare(strict_types = 1);
 
 namespace LanguageServer;
 
-use LanguageServer\Protocol\{
+use LanguageServerProtocol\{
     ServerCapabilities,
     ClientCapabilities,
     TextDocumentSyncKind,
diff --git a/src/PhpDocument.php b/src/PhpDocument.php
index 805bc08..0547615 100644
--- a/src/PhpDocument.php
+++ b/src/PhpDocument.php
@@ -4,7 +4,7 @@ declare(strict_types = 1);
 namespace LanguageServer;
 
 use LanguageServer\Index\Index;
-use LanguageServer\Protocol\{
+use LanguageServerProtocol\{
     Diagnostic, Position, Range
 };
 use Microsoft\PhpParser;
diff --git a/src/Server/TextDocument.php b/src/Server/TextDocument.php
index a9ddced..0922b5e 100644
--- a/src/Server/TextDocument.php
+++ b/src/Server/TextDocument.php
@@ -9,7 +9,7 @@ use LanguageServer\{
 use LanguageServer\Index\ReadableIndex;
 use LanguageServer\Factory\LocationFactory;
 use LanguageServer\Factory\RangeFactory;
-use LanguageServer\Protocol\{
+use LanguageServerProtocol\{
     FormattingOptions,
     Hover,
     Location,
@@ -110,7 +110,7 @@ class TextDocument
      * The document symbol request is sent from the client to the server to list all symbols found in a given text
      * document.
      *
-     * @param \LanguageServer\Protocol\TextDocumentIdentifier $textDocument
+     * @param \LanguageServerProtocol\TextDocumentIdentifier $textDocument
      * @return Promise <SymbolInformation[]>
      */
     public function documentSymbol(TextDocumentIdentifier $textDocument): Promise
@@ -129,7 +129,7 @@ class TextDocument
      * document's truth is now managed by the client and the server must not try to read the document's truth using the
      * document's uri.
      *
-     * @param \LanguageServer\Protocol\TextDocumentItem $textDocument The document that was opened.
+     * @param \LanguageServerProtocol\TextDocumentItem $textDocument The document that was opened.
      * @return void
      */
     public function didOpen(TextDocumentItem $textDocument)
@@ -143,8 +143,8 @@ class TextDocument
     /**
      * The document change notification is sent from the client to the server to signal changes to a text document.
      *
-     * @param \LanguageServer\Protocol\VersionedTextDocumentIdentifier $textDocument
-     * @param \LanguageServer\Protocol\TextDocumentContentChangeEvent[] $contentChanges
+     * @param \LanguageServerProtocol\VersionedTextDocumentIdentifier $textDocument
+     * @param \LanguageServerProtocol\TextDocumentContentChangeEvent[] $contentChanges
      * @return void
      */
     public function didChange(VersionedTextDocumentIdentifier $textDocument, array $contentChanges)
@@ -159,7 +159,7 @@ class TextDocument
      * The document's truth now exists where the document's uri points to (e.g. if the document's uri is a file uri the
      * truth now exists on disk).
      *
-     * @param \LanguageServer\Protocol\TextDocumentIdentifier $textDocument The document that was closed
+     * @param \LanguageServerProtocol\TextDocumentIdentifier $textDocument The document that was closed
      * @return void
      */
     public function didClose(TextDocumentIdentifier $textDocument)
diff --git a/src/Server/Workspace.php b/src/Server/Workspace.php
index b3fee63..fd93a9e 100644
--- a/src/Server/Workspace.php
+++ b/src/Server/Workspace.php
@@ -6,7 +6,7 @@ namespace LanguageServer\Server;
 use LanguageServer\{LanguageClient, PhpDocumentLoader};
 use LanguageServer\Index\{ProjectIndex, DependenciesIndex, Index};
 use LanguageServer\Factory\LocationFactory;
-use LanguageServer\Protocol\{
+use LanguageServerProtocol\{
     FileChangeType,
     FileEvent,
     SymbolInformation,
diff --git a/src/SignatureHelpProvider.php b/src/SignatureHelpProvider.php
index 439be9c..43851b0 100644
--- a/src/SignatureHelpProvider.php
+++ b/src/SignatureHelpProvider.php
@@ -4,7 +4,7 @@ declare(strict_types = 1);
 namespace LanguageServer;
 
 use LanguageServer\Index\ReadableIndex;
-use LanguageServer\Protocol\{
+use LanguageServerProtocol\{
     Position,
     SignatureHelp,
     ParameterInformation
diff --git a/src/SignatureInformationFactory.php b/src/SignatureInformationFactory.php
index 6b8a1f0..86402b6 100644
--- a/src/SignatureInformationFactory.php
+++ b/src/SignatureInformationFactory.php
@@ -3,7 +3,7 @@ declare(strict_types = 1);
 
 namespace LanguageServer;
 
-use LanguageServer\Protocol\{SignatureInformation, ParameterInformation};
+use LanguageServerProtocol\{SignatureInformation, ParameterInformation};
 use Microsoft\PhpParser\FunctionLike;
 
 class SignatureInformationFactory
diff --git a/src/TreeAnalyzer.php b/src/TreeAnalyzer.php
index d9687a0..6b48470 100644
--- a/src/TreeAnalyzer.php
+++ b/src/TreeAnalyzer.php
@@ -4,7 +4,7 @@ declare(strict_types = 1);
 namespace LanguageServer;
 
 use LanguageServer\Factory\RangeFactory;
-use LanguageServer\Protocol\{Diagnostic, DiagnosticSeverity, Range, Position};
+use LanguageServerProtocol\{Diagnostic, DiagnosticSeverity, Range, Position};
 use phpDocumentor\Reflection\DocBlockFactory;
 use Microsoft\PhpParser;
 use Microsoft\PhpParser\Node;
diff --git a/tests/Diagnostics/InvalidThisUsageTest.php b/tests/Diagnostics/InvalidThisUsageTest.php
index b7e8196..566c1c0 100644
--- a/tests/Diagnostics/InvalidThisUsageTest.php
+++ b/tests/Diagnostics/InvalidThisUsageTest.php
@@ -9,7 +9,7 @@ use LanguageServer\{
     DefinitionResolver, TreeAnalyzer
 };
 use LanguageServer\Index\{Index};
-use LanguageServer\Protocol\{
+use LanguageServerProtocol\{
     Diagnostic, DiagnosticSeverity, Position, Range
 };
 use function LanguageServer\pathToUri;
diff --git a/tests/LanguageServerTest.php b/tests/LanguageServerTest.php
index f4484a0..10ca3f9 100644
--- a/tests/LanguageServerTest.php
+++ b/tests/LanguageServerTest.php
@@ -6,7 +6,7 @@ namespace LanguageServer\Tests;
 use PHPUnit\Framework\TestCase;
 use LanguageServer\LanguageServer;
 use LanguageServer\Message;
-use LanguageServer\Protocol\{
+use LanguageServerProtocol\{
     ClientCapabilities,
     TextDocumentSyncKind,
     MessageType,
diff --git a/tests/PhpDocumentTest.php b/tests/PhpDocumentTest.php
index ae1b5cd..710e651 100644
--- a/tests/PhpDocumentTest.php
+++ b/tests/PhpDocumentTest.php
@@ -9,7 +9,7 @@ use LanguageServer\{
 use LanguageServer\Index\{
     Index
 };
-use LanguageServer\Protocol\{
+use LanguageServerProtocol\{
     Position
 };
 use Microsoft\PhpParser;
diff --git a/tests/Server/ServerTestCase.php b/tests/Server/ServerTestCase.php
index 45d949f..880e1a0 100644
--- a/tests/Server/ServerTestCase.php
+++ b/tests/Server/ServerTestCase.php
@@ -10,7 +10,7 @@ use LanguageServer\{
 };
 use LanguageServer\Index\{ProjectIndex, DependenciesIndex, Index};
 use LanguageServer\ContentRetriever\FileSystemContentRetriever;
-use LanguageServer\Protocol\{Position, Location, Range};
+use LanguageServerProtocol\{Position, Location, Range};
 use function LanguageServer\pathToUri;
 
 abstract class ServerTestCase extends TestCase
diff --git a/tests/Server/TextDocument/CompletionTest.php b/tests/Server/TextDocument/CompletionTest.php
index 2b4e9ff..c64c8e6 100644
--- a/tests/Server/TextDocument/CompletionTest.php
+++ b/tests/Server/TextDocument/CompletionTest.php
@@ -10,7 +10,7 @@ use LanguageServer\{
 };
 use LanguageServer\Index\{Index, ProjectIndex, DependenciesIndex};
 use LanguageServer\ContentRetriever\FileSystemContentRetriever;
-use LanguageServer\Protocol\{
+use LanguageServerProtocol\{
     TextDocumentIdentifier,
     TextEdit,
     Range,
diff --git a/tests/Server/TextDocument/Definition/GlobalFallbackTest.php b/tests/Server/TextDocument/Definition/GlobalFallbackTest.php
index 4e45f9e..cca6d4d 100644
--- a/tests/Server/TextDocument/Definition/GlobalFallbackTest.php
+++ b/tests/Server/TextDocument/Definition/GlobalFallbackTest.php
@@ -10,7 +10,7 @@ use LanguageServer\{
 };
 use LanguageServer\Index\{Index, ProjectIndex, DependenciesIndex};
 use LanguageServer\ContentRetriever\FileSystemContentRetriever;
-use LanguageServer\Protocol\{TextDocumentIdentifier, Position, Range, Location};
+use LanguageServerProtocol\{TextDocumentIdentifier, Position, Range, Location};
 
 class GlobalFallbackTest extends ServerTestCase
 {
diff --git a/tests/Server/TextDocument/Definition/GlobalTest.php b/tests/Server/TextDocument/Definition/GlobalTest.php
index 2a80873..fdfb3b2 100644
--- a/tests/Server/TextDocument/Definition/GlobalTest.php
+++ b/tests/Server/TextDocument/Definition/GlobalTest.php
@@ -4,7 +4,7 @@ declare(strict_types = 1);
 namespace LanguageServer\Tests\Server\TextDocument\Definition;
 
 use LanguageServer\Tests\Server\ServerTestCase;
-use LanguageServer\Protocol\{TextDocumentIdentifier, Position, Location, Range};
+use LanguageServerProtocol\{TextDocumentIdentifier, Position, Location, Range};
 use function LanguageServer\pathToUri;
 
 class GlobalTest extends ServerTestCase
diff --git a/tests/Server/TextDocument/Definition/NamespacedTest.php b/tests/Server/TextDocument/Definition/NamespacedTest.php
index 395881b..0f9a582 100644
--- a/tests/Server/TextDocument/Definition/NamespacedTest.php
+++ b/tests/Server/TextDocument/Definition/NamespacedTest.php
@@ -3,7 +3,7 @@ declare(strict_types = 1);
 
 namespace LanguageServer\Tests\Server\TextDocument\Definition;
 
-use LanguageServer\Protocol\{TextDocumentIdentifier, Location};
+use LanguageServerProtocol\{TextDocumentIdentifier, Location};
 use function LanguageServer\pathToUri;
 
 class NamespacedTest extends GlobalTest
diff --git a/tests/Server/TextDocument/DidChangeTest.php b/tests/Server/TextDocument/DidChangeTest.php
index 4d26ed8..0f92ed7 100644
--- a/tests/Server/TextDocument/DidChangeTest.php
+++ b/tests/Server/TextDocument/DidChangeTest.php
@@ -10,7 +10,7 @@ use LanguageServer\{
 };
 use LanguageServer\ContentRetriever\FileSystemContentRetriever;
 use LanguageServer\Index\{Index, ProjectIndex, DependenciesIndex};
-use LanguageServer\Protocol\{
+use LanguageServerProtocol\{
     VersionedTextDocumentIdentifier,
     TextDocumentContentChangeEvent,
     Range,
diff --git a/tests/Server/TextDocument/DidCloseTest.php b/tests/Server/TextDocument/DidCloseTest.php
index 42daec5..22eb534 100644
--- a/tests/Server/TextDocument/DidCloseTest.php
+++ b/tests/Server/TextDocument/DidCloseTest.php
@@ -10,7 +10,7 @@ use LanguageServer\{
 };
 use LanguageServer\ContentRetriever\FileSystemContentRetriever;
 use LanguageServer\Index\{Index, ProjectIndex, DependenciesIndex};
-use LanguageServer\Protocol\{TextDocumentItem, TextDocumentIdentifier};
+use LanguageServerProtocol\{TextDocumentItem, TextDocumentIdentifier};
 
 class DidCloseTest extends TestCase
 {
diff --git a/tests/Server/TextDocument/DocumentSymbolTest.php b/tests/Server/TextDocument/DocumentSymbolTest.php
index 155e4a2..205e8fe 100644
--- a/tests/Server/TextDocument/DocumentSymbolTest.php
+++ b/tests/Server/TextDocument/DocumentSymbolTest.php
@@ -6,7 +6,7 @@ namespace LanguageServer\Tests\Server\TextDocument;
 use LanguageServer\Tests\Server\ServerTestCase;
 use LanguageServer\Tests\MockProtocolStream;
 use LanguageServer\{Server, LanguageClient, Project};
-use LanguageServer\Protocol\{TextDocumentIdentifier, SymbolInformation, SymbolKind, Position, Location, Range};
+use LanguageServerProtocol\{TextDocumentIdentifier, SymbolInformation, SymbolKind, Position, Location, Range};
 use function LanguageServer\pathToUri;
 
 class DocumentSymbolTest extends ServerTestCase
diff --git a/tests/Server/TextDocument/HoverTest.php b/tests/Server/TextDocument/HoverTest.php
index 2ba49e1..42b69c8 100644
--- a/tests/Server/TextDocument/HoverTest.php
+++ b/tests/Server/TextDocument/HoverTest.php
@@ -6,7 +6,7 @@ namespace LanguageServer\Tests\Server\TextDocument;
 use LanguageServer\Tests\MockProtocolStream;
 use LanguageServer\Tests\Server\ServerTestCase;
 use LanguageServer\{Server, LanguageClient, Project};
-use LanguageServer\Protocol\{TextDocumentIdentifier, Position, Range, Hover, MarkedString};
+use LanguageServerProtocol\{TextDocumentIdentifier, Position, Range, Hover, MarkedString};
 use function LanguageServer\pathToUri;
 
 class HoverTest extends ServerTestCase
diff --git a/tests/Server/TextDocument/ParseErrorsTest.php b/tests/Server/TextDocument/ParseErrorsTest.php
index 4428523..09cdc98 100644
--- a/tests/Server/TextDocument/ParseErrorsTest.php
+++ b/tests/Server/TextDocument/ParseErrorsTest.php
@@ -10,7 +10,7 @@ use LanguageServer\{
 };
 use LanguageServer\Index\{Index, ProjectIndex, DependenciesIndex};
 use LanguageServer\ContentRetriever\FileSystemContentRetriever;
-use LanguageServer\Protocol\{TextDocumentItem, DiagnosticSeverity};
+use LanguageServerProtocol\{TextDocumentItem, DiagnosticSeverity};
 use Sabre\Event\Promise;
 use JsonMapper;
 
diff --git a/tests/Server/TextDocument/References/GlobalFallbackTest.php b/tests/Server/TextDocument/References/GlobalFallbackTest.php
index abfefce..b1cbdac 100644
--- a/tests/Server/TextDocument/References/GlobalFallbackTest.php
+++ b/tests/Server/TextDocument/References/GlobalFallbackTest.php
@@ -10,7 +10,7 @@ use LanguageServer\ContentRetriever\FileSystemContentRetriever;
 use LanguageServer\Index\{
     DependenciesIndex, Index, ProjectIndex
 };
-use LanguageServer\Protocol\{
+use LanguageServerProtocol\{
     Location, Position, Range, ReferenceContext, TextDocumentIdentifier
 };
 use LanguageServer\Tests\MockProtocolStream;
diff --git a/tests/Server/TextDocument/References/GlobalTest.php b/tests/Server/TextDocument/References/GlobalTest.php
index 105dfef..d2550c8 100644
--- a/tests/Server/TextDocument/References/GlobalTest.php
+++ b/tests/Server/TextDocument/References/GlobalTest.php
@@ -3,7 +3,7 @@ declare(strict_types = 1);
 
 namespace LanguageServer\Tests\Server\TextDocument\References;
 
-use LanguageServer\Protocol\{TextDocumentIdentifier, Position, ReferenceContext, Location, Range};
+use LanguageServerProtocol\{TextDocumentIdentifier, Position, ReferenceContext, Location, Range};
 use LanguageServer\Tests\Server\ServerTestCase;
 use function LanguageServer\pathToUri;
 
diff --git a/tests/Server/TextDocument/References/NamespacedTest.php b/tests/Server/TextDocument/References/NamespacedTest.php
index 1ee1ab4..b2bb9bb 100644
--- a/tests/Server/TextDocument/References/NamespacedTest.php
+++ b/tests/Server/TextDocument/References/NamespacedTest.php
@@ -3,7 +3,7 @@ declare(strict_types = 1);
 
 namespace LanguageServer\Tests\Server\TextDocument\References;
 
-use LanguageServer\Protocol\{TextDocumentIdentifier, Position, ReferenceContext, Location, Range};
+use LanguageServerProtocol\{TextDocumentIdentifier, Position, ReferenceContext, Location, Range};
 use function LanguageServer\pathToUri;
 
 class NamespacedTest extends GlobalTest
diff --git a/tests/Server/TextDocument/SignatureHelpTest.php b/tests/Server/TextDocument/SignatureHelpTest.php
index 2004aae..83dcb2c 100644
--- a/tests/Server/TextDocument/SignatureHelpTest.php
+++ b/tests/Server/TextDocument/SignatureHelpTest.php
@@ -10,7 +10,7 @@ use LanguageServer\{
 };
 use LanguageServer\Index\{Index, ProjectIndex, DependenciesIndex};
 use LanguageServer\ContentRetriever\FileSystemContentRetriever;
-use LanguageServer\Protocol\{
+use LanguageServerProtocol\{
     TextDocumentIdentifier,
     TextEdit,
     Range,
diff --git a/tests/Server/Workspace/DidChangeWatchedFilesTest.php b/tests/Server/Workspace/DidChangeWatchedFilesTest.php
index ff40e0b..1f57acd 100644
--- a/tests/Server/Workspace/DidChangeWatchedFilesTest.php
+++ b/tests/Server/Workspace/DidChangeWatchedFilesTest.php
@@ -6,7 +6,7 @@ namespace LanguageServer\Tests\Server\Workspace;
 use LanguageServer\ContentRetriever\FileSystemContentRetriever;
 use LanguageServer\{DefinitionResolver, LanguageClient, PhpDocumentLoader, Server};
 use LanguageServer\Index\{DependenciesIndex, Index, ProjectIndex};
-use LanguageServer\Protocol\{FileChangeType, FileEvent};
+use LanguageServerProtocol\{FileChangeType, FileEvent};
 use LanguageServer\Message;
 use LanguageServer\Tests\MockProtocolStream;
 use LanguageServer\Tests\Server\ServerTestCase;
diff --git a/tests/Server/Workspace/SymbolTest.php b/tests/Server/Workspace/SymbolTest.php
index 765841b..9dc5df1 100644
--- a/tests/Server/Workspace/SymbolTest.php
+++ b/tests/Server/Workspace/SymbolTest.php
@@ -6,7 +6,7 @@ namespace LanguageServer\Tests\Server\Workspace;
 use LanguageServer\Tests\MockProtocolStream;
 use LanguageServer\Tests\Server\ServerTestCase;
 use LanguageServer\{Server, Client, LanguageClient, Project, PhpDocument};
-use LanguageServer\Protocol\{
+use LanguageServerProtocol\{
     TextDocumentItem,
     TextDocumentIdentifier,
     SymbolInformation,
diff --git a/tests/Validation/ValidationTest.php b/tests/Validation/ValidationTest.php
index 04f7540..2c3efaf 100644
--- a/tests/Validation/ValidationTest.php
+++ b/tests/Validation/ValidationTest.php
@@ -64,7 +64,7 @@ class ValidationTest extends TestCase
 
         try {
             $this->assertEquals($expectedValues['definitions'], $actualValues['definitions']);
-            $this->assertEquals((array)$expectedValues['references'], (array)$actualValues['references'], 'references don\'t match.');
+            $this->assertEquals((array)$expectedValues['references'], (array)$actualValues['references'], sprintf('references match in "%s"', $outputFile));
         } catch (\Throwable $e) {
             $outputFile = getExpectedValuesFile($testCaseFile);
             file_put_contents($outputFile, json_encode($actualValues, JSON_PRETTY_PRINT|JSON_UNESCAPED_SLASHES));
diff --git a/tests/Validation/cases/namespaces5.php b/tests/Validation/cases/namespaces5.php
index 85ee4b5..d4a37b2 100644
--- a/tests/Validation/cases/namespaces5.php
+++ b/tests/Validation/cases/namespaces5.php
@@ -1,3 +1,3 @@
 <?php
 namespace B;
-use LanguageServer\Protocol\{TextDocumentIdentifier, Position, ReferenceContext, Location, Range};
+use LanguageServerProtocol\{TextDocumentIdentifier, Position, ReferenceContext, Location, Range};
diff --git a/tests/Validation/cases/namespaces5.php.expected.json b/tests/Validation/cases/namespaces5.php.expected.json
index 7ad96f3..9a46a68 100644
--- a/tests/Validation/cases/namespaces5.php.expected.json
+++ b/tests/Validation/cases/namespaces5.php.expected.json
@@ -1,24 +1,21 @@
 {
     "references": {
-        "LanguageServer\\Protocol": [
+        "LanguageServerProtocol": [
             "./namespaces5.php"
         ],
-        "LanguageServer": [
+        "LanguageServerProtocol\\TextDocumentIdentifier": [
             "./namespaces5.php"
         ],
-        "LanguageServer\\Protocol\\TextDocumentIdentifier": [
+        "LanguageServerProtocol\\Position": [
             "./namespaces5.php"
         ],
-        "LanguageServer\\Protocol\\Position": [
+        "LanguageServerProtocol\\ReferenceContext": [
             "./namespaces5.php"
         ],
-        "LanguageServer\\Protocol\\ReferenceContext": [
+        "LanguageServerProtocol\\Location": [
             "./namespaces5.php"
         ],
-        "LanguageServer\\Protocol\\Location": [
-            "./namespaces5.php"
-        ],
-        "LanguageServer\\Protocol\\Range": [
+        "LanguageServerProtocol\\Range": [
             "./namespaces5.php"
         ]
     },