diff --git a/src/Protocol/SymbolInformation.php b/src/Protocol/SymbolInformation.php
index 499e417..3070c28 100644
--- a/src/Protocol/SymbolInformation.php
+++ b/src/Protocol/SymbolInformation.php
@@ -2,6 +2,7 @@
 
 namespace LanguageServer\Protocol;
 
+use LanguageServer\ProtocolBridge\LocationFactory;
 use Microsoft\PhpParser;
 use Microsoft\PhpParser\Node;
 
@@ -108,7 +109,7 @@ class SymbolInformation
             return null;
         }
 
-        $symbol->location = Location::fromNode($node);
+        $symbol->location = LocationFactory::fromNode($node);
         if ($fqn !== null) {
             $parts = preg_split('/(::|->|\\\\)/', $fqn);
             array_pop($parts);
diff --git a/src/Server/TextDocument.php b/src/Server/TextDocument.php
index 8085a26..8aaca57 100644
--- a/src/Server/TextDocument.php
+++ b/src/Server/TextDocument.php
@@ -210,7 +210,7 @@ class TextDocument
                     if ($descendantNode instanceof Node\Expression\Variable &&
                         $descendantNode->getName() === $node->getName()
                     ) {
-                        $locations[] = Location::fromNode($descendantNode);
+                        $locations[] = LocationFactory::fromNode($descendantNode);
                     }
                 }
             } else {
diff --git a/tests/Server/Workspace/DidChangeWatchedFilesTest.php b/tests/Server/Workspace/DidChangeWatchedFilesTest.php
index 1074c58..31e2fc5 100644
--- a/tests/Server/Workspace/DidChangeWatchedFilesTest.php
+++ b/tests/Server/Workspace/DidChangeWatchedFilesTest.php
@@ -6,7 +6,8 @@ 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, Message};
+use LanguageServer\Protocol\{FileChangeType, FileEvent};
+use LanguageServer\ProtocolBridge\Message;
 use LanguageServer\Tests\MockProtocolStream;
 use LanguageServer\Tests\Server\ServerTestCase;
 use LanguageServer\Server\Workspace;