diff --git a/src/AnonymousClassName.php b/src/AnonymousClassName.php
index 1d6e204..1acdad3 100644
--- a/src/AnonymousClassName.php
+++ b/src/AnonymousClassName.php
@@ -5,7 +5,7 @@
 namespace Typhoon\Reflection;
 
 use PhpParser\Node\Stmt\Class_;
-use Typhoon\Reflection\NameResolution\NameResolver;
+use Typhoon\Reflection\NameContext\NameResolver;
 
 /**
  * @api
diff --git a/src/NameResolution/FullyQualifiedName.php b/src/NameContext/FullyQualifiedName.php
similarity index 93%
rename from src/NameResolution/FullyQualifiedName.php
rename to src/NameContext/FullyQualifiedName.php
index 0693373..85831d9 100644
--- a/src/NameResolution/FullyQualifiedName.php
+++ b/src/NameContext/FullyQualifiedName.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Typhoon\Reflection\NameResolution;
+namespace Typhoon\Reflection\NameContext;
 
 /**
  * @internal
diff --git a/src/NameResolution/Name.php b/src/NameContext/Name.php
similarity index 98%
rename from src/NameResolution/Name.php
rename to src/NameContext/Name.php
index e1d0015..a2d9c5d 100644
--- a/src/NameResolution/Name.php
+++ b/src/NameContext/Name.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Typhoon\Reflection\NameResolution;
+namespace Typhoon\Reflection\NameContext;
 
 /**
  * @internal
diff --git a/src/NameResolution/NameAsClassResolution.php b/src/NameContext/NameAsClassResolution.php
similarity index 96%
rename from src/NameResolution/NameAsClassResolution.php
rename to src/NameContext/NameAsClassResolution.php
index 1ecf94a..864d18b 100644
--- a/src/NameResolution/NameAsClassResolution.php
+++ b/src/NameContext/NameAsClassResolution.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Typhoon\Reflection\NameResolution;
+namespace Typhoon\Reflection\NameContext;
 
 use Typhoon\Reflection\ReflectionException;
 
diff --git a/src/NameResolution/NameContext.php b/src/NameContext/NameContext.php
similarity index 99%
rename from src/NameResolution/NameContext.php
rename to src/NameContext/NameContext.php
index c021c55..75b89bf 100644
--- a/src/NameResolution/NameContext.php
+++ b/src/NameContext/NameContext.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Typhoon\Reflection\NameResolution;
+namespace Typhoon\Reflection\NameContext;
 
 use Typhoon\Reflection\ReflectionException;
 
diff --git a/src/NameResolution/NameContextVisitor.php b/src/NameContext/NameContextVisitor.php
similarity index 98%
rename from src/NameResolution/NameContextVisitor.php
rename to src/NameContext/NameContextVisitor.php
index 2db5f72..2c7bbbc 100644
--- a/src/NameResolution/NameContextVisitor.php
+++ b/src/NameContext/NameContextVisitor.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Typhoon\Reflection\NameResolution;
+namespace Typhoon\Reflection\NameContext;
 
 use PhpParser\Node;
 use PhpParser\Node\Stmt;
diff --git a/src/NameResolution/NameResolution.php b/src/NameContext/NameResolution.php
similarity index 96%
rename from src/NameResolution/NameResolution.php
rename to src/NameContext/NameResolution.php
index be74256..93f0dea 100644
--- a/src/NameResolution/NameResolution.php
+++ b/src/NameContext/NameResolution.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Typhoon\Reflection\NameResolution;
+namespace Typhoon\Reflection\NameContext;
 
 /**
  * @internal
diff --git a/src/NameResolution/NameResolver.php b/src/NameContext/NameResolver.php
similarity index 92%
rename from src/NameResolution/NameResolver.php
rename to src/NameContext/NameResolver.php
index 6ab2bdf..0281f29 100644
--- a/src/NameResolution/NameResolver.php
+++ b/src/NameContext/NameResolver.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Typhoon\Reflection\NameResolution;
+namespace Typhoon\Reflection\NameContext;
 
 /**
  * @internal
diff --git a/src/NameResolution/QualifiedName.php b/src/NameContext/QualifiedName.php
similarity index 96%
rename from src/NameResolution/QualifiedName.php
rename to src/NameContext/QualifiedName.php
index c9e6535..1cbef42 100644
--- a/src/NameResolution/QualifiedName.php
+++ b/src/NameContext/QualifiedName.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Typhoon\Reflection\NameResolution;
+namespace Typhoon\Reflection\NameContext;
 
 /**
  * @internal
diff --git a/src/NameResolution/RelativeName.php b/src/NameContext/RelativeName.php
similarity index 94%
rename from src/NameResolution/RelativeName.php
rename to src/NameContext/RelativeName.php
index 1796239..ce171fb 100644
--- a/src/NameResolution/RelativeName.php
+++ b/src/NameContext/RelativeName.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Typhoon\Reflection\NameResolution;
+namespace Typhoon\Reflection\NameContext;
 
 /**
  * @internal
diff --git a/src/NameResolution/UnqualifiedName.php b/src/NameContext/UnqualifiedName.php
similarity index 95%
rename from src/NameResolution/UnqualifiedName.php
rename to src/NameContext/UnqualifiedName.php
index adae6f6..556df6f 100644
--- a/src/NameResolution/UnqualifiedName.php
+++ b/src/NameContext/UnqualifiedName.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Typhoon\Reflection\NameResolution;
+namespace Typhoon\Reflection\NameContext;
 
 /**
  * @internal
diff --git a/src/Reflector/Context.php b/src/Reflector/Context.php
index c71803d..7fecb55 100644
--- a/src/Reflector/Context.php
+++ b/src/Reflector/Context.php
@@ -8,8 +8,8 @@
 use Typhoon\Reflection\ChangeDetector\FileChangeDetector;
 use Typhoon\Reflection\ClassLoader;
 use Typhoon\Reflection\ClassReflection;
-use Typhoon\Reflection\NameResolution\NameContext;
-use Typhoon\Reflection\NameResolution\NameContextVisitor;
+use Typhoon\Reflection\NameContext\NameContext;
+use Typhoon\Reflection\NameContext\NameContextVisitor;
 use Typhoon\Reflection\ParsingContext;
 use Typhoon\Reflection\PhpDocParser\PhpDocParser;
 use Typhoon\Reflection\PhpParser\PhpParser;
diff --git a/src/Reflector/DiscoveringVisitor.php b/src/Reflector/DiscoveringVisitor.php
index 3f440a3..20663aa 100644
--- a/src/Reflector/DiscoveringVisitor.php
+++ b/src/Reflector/DiscoveringVisitor.php
@@ -9,7 +9,7 @@
 use PhpParser\NodeVisitorAbstract;
 use Typhoon\Reflection\AnonymousClassName;
 use Typhoon\Reflection\ClassReflection;
-use Typhoon\Reflection\NameResolution\NameContext;
+use Typhoon\Reflection\NameContext\NameContext;
 use Typhoon\Reflection\ParsingContext;
 use Typhoon\Reflection\ReflectionException;
 
diff --git a/src/Reflector/NameAsTypeResolution.php b/src/Reflector/NameAsTypeResolution.php
index 758106d..d829a6a 100644
--- a/src/Reflector/NameAsTypeResolution.php
+++ b/src/Reflector/NameAsTypeResolution.php
@@ -4,7 +4,7 @@
 
 namespace Typhoon\Reflection\Reflector;
 
-use Typhoon\Reflection\NameResolution\NameResolution;
+use Typhoon\Reflection\NameContext\NameResolution;
 use Typhoon\Reflection\ReflectionException;
 use Typhoon\Reflection\TemplateReflection;
 use Typhoon\Type\Type;
diff --git a/src/Reflector/PhpDocTypeReflector.php b/src/Reflector/PhpDocTypeReflector.php
index b4ea373..1c49cf4 100644
--- a/src/Reflector/PhpDocTypeReflector.php
+++ b/src/Reflector/PhpDocTypeReflector.php
@@ -25,7 +25,7 @@
 use PHPStan\PhpDocParser\Ast\Type\ObjectShapeNode;
 use PHPStan\PhpDocParser\Ast\Type\TypeNode;
 use PHPStan\PhpDocParser\Ast\Type\UnionTypeNode;
-use Typhoon\Reflection\NameResolution\NameResolver;
+use Typhoon\Reflection\NameContext\NameResolver;
 use Typhoon\Reflection\ReflectionException;
 use Typhoon\Type;
 use Typhoon\Type\types;
diff --git a/src/Reflector/PhpParserReflector.php b/src/Reflector/PhpParserReflector.php
index b9d62be..ed77601 100644
--- a/src/Reflector/PhpParserReflector.php
+++ b/src/Reflector/PhpParserReflector.php
@@ -15,7 +15,7 @@
 use Typhoon\Reflection\AttributeReflection;
 use Typhoon\Reflection\ClassReflection;
 use Typhoon\Reflection\MethodReflection;
-use Typhoon\Reflection\NameResolution\NameContext;
+use Typhoon\Reflection\NameContext\NameContext;
 use Typhoon\Reflection\ParameterReflection;
 use Typhoon\Reflection\PhpDocParser\PhpDoc;
 use Typhoon\Reflection\PropertyReflection;
diff --git a/tests/unit/NameResolution/FullyQualifiedNameTest.php b/tests/unit/NameContext/FullyQualifiedNameTest.php
similarity index 97%
rename from tests/unit/NameResolution/FullyQualifiedNameTest.php
rename to tests/unit/NameContext/FullyQualifiedNameTest.php
index ea4791b..1d75294 100644
--- a/tests/unit/NameResolution/FullyQualifiedNameTest.php
+++ b/tests/unit/NameContext/FullyQualifiedNameTest.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Typhoon\Reflection\NameResolution;
+namespace Typhoon\Reflection\NameContext;
 
 use PHPUnit\Framework\Attributes\CoversClass;
 use PHPUnit\Framework\TestCase;
diff --git a/tests/unit/NameResolution/NameTest.php b/tests/unit/NameContext/NameTest.php
similarity index 98%
rename from tests/unit/NameResolution/NameTest.php
rename to tests/unit/NameContext/NameTest.php
index 82eb0ee..d450414 100644
--- a/tests/unit/NameResolution/NameTest.php
+++ b/tests/unit/NameContext/NameTest.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Typhoon\Reflection\NameResolution;
+namespace Typhoon\Reflection\NameContext;
 
 use PHPUnit\Framework\Attributes\CoversClass;
 use PHPUnit\Framework\Attributes\DataProvider;
diff --git a/tests/unit/NameResolution/QualifiedNameTest.php b/tests/unit/NameContext/QualifiedNameTest.php
similarity index 98%
rename from tests/unit/NameResolution/QualifiedNameTest.php
rename to tests/unit/NameContext/QualifiedNameTest.php
index 3b754b7..24b54b4 100644
--- a/tests/unit/NameResolution/QualifiedNameTest.php
+++ b/tests/unit/NameContext/QualifiedNameTest.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Typhoon\Reflection\NameResolution;
+namespace Typhoon\Reflection\NameContext;
 
 use PHPUnit\Framework\Attributes\CoversClass;
 use PHPUnit\Framework\TestCase;
diff --git a/tests/unit/NameResolution/RelativeNameTest.php b/tests/unit/NameContext/RelativeNameTest.php
similarity index 97%
rename from tests/unit/NameResolution/RelativeNameTest.php
rename to tests/unit/NameContext/RelativeNameTest.php
index 442c5f7..ea1b357 100644
--- a/tests/unit/NameResolution/RelativeNameTest.php
+++ b/tests/unit/NameContext/RelativeNameTest.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Typhoon\Reflection\NameResolution;
+namespace Typhoon\Reflection\NameContext;
 
 use PHPUnit\Framework\Attributes\CoversClass;
 use PHPUnit\Framework\TestCase;
diff --git a/tests/unit/NameResolution/UnqualifiedNameTest.php b/tests/unit/NameContext/UnqualifiedNameTest.php
similarity index 98%
rename from tests/unit/NameResolution/UnqualifiedNameTest.php
rename to tests/unit/NameContext/UnqualifiedNameTest.php
index 01056f1..415abe9 100644
--- a/tests/unit/NameResolution/UnqualifiedNameTest.php
+++ b/tests/unit/NameContext/UnqualifiedNameTest.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Typhoon\Reflection\NameResolution;
+namespace Typhoon\Reflection\NameContext;
 
 use PHPUnit\Framework\Attributes\CoversClass;
 use PHPUnit\Framework\Attributes\DataProvider;
diff --git a/tests/unit/Reflector/PhpDocTypeReflectorTest.php b/tests/unit/Reflector/PhpDocTypeReflectorTest.php
index f1cbf38..a0b59e2 100644
--- a/tests/unit/Reflector/PhpDocTypeReflectorTest.php
+++ b/tests/unit/Reflector/PhpDocTypeReflectorTest.php
@@ -7,7 +7,7 @@
 use PHPUnit\Framework\Attributes\CoversClass;
 use PHPUnit\Framework\Attributes\DataProvider;
 use PHPUnit\Framework\TestCase;
-use Typhoon\Reflection\NameResolution\NameContext;
+use Typhoon\Reflection\NameContext\NameContext;
 use Typhoon\Reflection\PhpDocParser\PhpDocParser;
 use Typhoon\Reflection\ReflectionException;
 use Typhoon\Type\Type;