diff --git a/src/NodeVisitors/ColumnCalculator.php b/src/NodeVisitor/ColumnCalculator.php
similarity index 96%
rename from src/NodeVisitors/ColumnCalculator.php
rename to src/NodeVisitor/ColumnCalculator.php
index 102c37c..6f6b3bf 100644
--- a/src/NodeVisitors/ColumnCalculator.php
+++ b/src/NodeVisitor/ColumnCalculator.php
@@ -1,7 +1,7 @@
 <?php
 declare(strict_types = 1);
 
-namespace LanguageServer\NodeVisitors;
+namespace LanguageServer\NodeVisitor;
 
 use PhpParser\{NodeVisitorAbstract, Node};
 
diff --git a/src/NodeVisitors/DefinitionCollector.php b/src/NodeVisitor/DefinitionCollector.php
similarity index 94%
rename from src/NodeVisitors/DefinitionCollector.php
rename to src/NodeVisitor/DefinitionCollector.php
index 54ce0e5..9032155 100644
--- a/src/NodeVisitors/DefinitionCollector.php
+++ b/src/NodeVisitor/DefinitionCollector.php
@@ -1,7 +1,7 @@
 <?php
 declare(strict_types = 1);
 
-namespace LanguageServer\NodeVisitors;
+namespace LanguageServer\NodeVisitor;
 
 use PhpParser\{NodeVisitorAbstract, Node};
 
diff --git a/src/NodeVisitors/NodeAtPositionFinder.php b/src/NodeVisitor/NodeAtPositionFinder.php
similarity index 96%
rename from src/NodeVisitors/NodeAtPositionFinder.php
rename to src/NodeVisitor/NodeAtPositionFinder.php
index 33f074e..b6b9cc1 100644
--- a/src/NodeVisitors/NodeAtPositionFinder.php
+++ b/src/NodeVisitor/NodeAtPositionFinder.php
@@ -1,7 +1,7 @@
 <?php
 declare(strict_types = 1);
 
-namespace LanguageServer\NodeVisitors;
+namespace LanguageServer\NodeVisitor;
 
 use PhpParser\{NodeVisitorAbstract, Node};
 use LanguageServer\Protocol\{Position, Range};
diff --git a/src/NodeVisitors/ReferencesAdder.php b/src/NodeVisitor/ReferencesAdder.php
similarity index 97%
rename from src/NodeVisitors/ReferencesAdder.php
rename to src/NodeVisitor/ReferencesAdder.php
index 96059b3..f3f912f 100644
--- a/src/NodeVisitors/ReferencesAdder.php
+++ b/src/NodeVisitor/ReferencesAdder.php
@@ -1,7 +1,7 @@
 <?php
 declare(strict_types = 1);
 
-namespace LanguageServer\NodeVisitors;
+namespace LanguageServer\NodeVisitor;
 
 use PhpParser\{NodeVisitorAbstract, Node};
 use LanguageServer\Protocol\{SymbolInformation, SymbolKind, Range, Position, Location};
diff --git a/src/PhpDocument.php b/src/PhpDocument.php
index d4edb1d..9979d6a 100644
--- a/src/PhpDocument.php
+++ b/src/PhpDocument.php
@@ -4,7 +4,7 @@ declare(strict_types = 1);
 namespace LanguageServer;
 
 use LanguageServer\Protocol\{Diagnostic, DiagnosticSeverity, Range, Position, SymbolInformation, SymbolKind, TextEdit, Location};
-use LanguageServer\NodeVisitors\{NodeAtPositionFinder, ReferencesAdder, DefinitionCollector, ColumnCalculator};
+use LanguageServer\NodeVisitor\{NodeAtPositionFinder, ReferencesAdder, DefinitionCollector, ColumnCalculator};
 use PhpParser\{Error, Comment, Node, ParserFactory, NodeTraverser, Lexer, Parser};
 use PhpParser\PrettyPrinter\Standard as PrettyPrinter;
 use PhpParser\NodeVisitor\NameResolver;
diff --git a/tests/NodeVisitors/DefinitionCollectorTest.php b/tests/NodeVisitor/DefinitionCollectorTest.php
similarity index 97%
rename from tests/NodeVisitors/DefinitionCollectorTest.php
rename to tests/NodeVisitor/DefinitionCollectorTest.php
index 2f18bec..cbd82f2 100644
--- a/tests/NodeVisitors/DefinitionCollectorTest.php
+++ b/tests/NodeVisitor/DefinitionCollectorTest.php
@@ -8,7 +8,7 @@ use PhpParser\{ParserFactory, NodeTraverser, Node};
 use PhpParser\NodeVisitor\NameResolver;
 use LanguageServer\{LanguageClient, Project, PhpDocument};
 use LanguageServer\Tests\MockProtocolStream;
-use LanguageServer\NodeVisitors\{ReferencesAdder, DefinitionCollector};
+use LanguageServer\NodeVisitor\{ReferencesAdder, DefinitionCollector};
 
 class DefinitionCollectorTest extends TestCase
 {
diff --git a/tests/PhpDocumentTest.php b/tests/PhpDocumentTest.php
index 5c4a618..93075fc 100644
--- a/tests/PhpDocumentTest.php
+++ b/tests/PhpDocumentTest.php
@@ -6,7 +6,7 @@ namespace LanguageServer\Tests\Server;
 use PHPUnit\Framework\TestCase;
 use LanguageServer\Tests\MockProtocolStream;
 use LanguageServer\{LanguageClient, Project};
-use LanguageServer\NodeVisitors\NodeAtPositionFinder;
+use LanguageServer\NodeVisitor\NodeAtPositionFinder;
 use LanguageServer\Protocol\{SymbolKind, Position};
 use PhpParser\Node;