diff --git a/Classes/Behavior/Features/Bootstrap/CRTestSuiteRuntimeVariables.php b/Classes/Behavior/Features/Bootstrap/CRTestSuiteRuntimeVariables.php
index 4c6e287..12ebd6b 100644
--- a/Classes/Behavior/Features/Bootstrap/CRTestSuiteRuntimeVariables.php
+++ b/Classes/Behavior/Features/Bootstrap/CRTestSuiteRuntimeVariables.php
@@ -14,7 +14,7 @@
 
 namespace Neos\ContentRepository\TestSuite\Behavior\Features\Bootstrap;
 
-use Neos\ContentRepository\Core\ContentGraphAdapter;
+use Neos\ContentRepository\Core\ContentRepositoryReadModel;
 use Neos\ContentRepository\Core\ContentRepository;
 use Neos\ContentRepository\Core\DimensionSpace\DimensionSpacePoint;
 use Neos\ContentRepository\Core\Projection\ContentGraph\ContentSubgraphInterface;
@@ -125,9 +125,9 @@ public function visibilityConstraintsAreSetTo(string $restrictionType): void
 
     public function getCurrentSubgraph(): ContentSubgraphInterface
     {
-        $contentGraphAdapter = $this->currentContentRepository->projectionState(ContentGraphAdapter::class);
+        $contentRepositoryReadModel = $this->currentContentRepository->projectionState(ContentRepositoryReadModel::class);
 
-        return $contentGraphAdapter->getContentGraphByWorkspaceName($this->currentWorkspaceName)->getSubgraph(
+        return $contentRepositoryReadModel->getContentGraphByWorkspaceName($this->currentWorkspaceName)->getSubgraph(
             $this->currentDimensionSpacePoint,
             $this->currentVisibilityConstraints
         );
diff --git a/Classes/Behavior/Features/Bootstrap/ProjectedNodeTrait.php b/Classes/Behavior/Features/Bootstrap/ProjectedNodeTrait.php
index fcc37c8..84f9206 100644
--- a/Classes/Behavior/Features/Bootstrap/ProjectedNodeTrait.php
+++ b/Classes/Behavior/Features/Bootstrap/ProjectedNodeTrait.php
@@ -16,7 +16,7 @@
 
 use Behat\Gherkin\Node\TableNode;
 use GuzzleHttp\Psr7\Uri;
-use Neos\ContentRepository\Core\ContentGraphAdapter;
+use Neos\ContentRepository\Core\ContentRepositoryReadModel;
 use Neos\ContentRepository\Core\Feature\SubtreeTagging\Dto\SubtreeTag;
 use Neos\ContentRepository\Core\NodeType\NodeTypeName;
 use Neos\ContentRepository\Core\Projection\ContentGraph\ContentSubgraphInterface;
@@ -33,7 +33,6 @@
 use Neos\ContentRepository\Core\SharedModel\Node\NodeName;
 use Neos\ContentRepository\Core\SharedModel\Node\PropertyName;
 use Neos\ContentRepository\Core\SharedModel\Workspace\Workspace;
-use Neos\ContentRepository\Core\SharedModel\Workspace\WorkspaceFilter;
 use Neos\ContentRepository\Core\Tests\Behavior\Fixtures\DayOfWeek;
 use Neos\ContentRepository\Core\Tests\Behavior\Fixtures\PostalAddress;
 use Neos\ContentRepository\Core\Tests\Behavior\Fixtures\PriceSpecification;
@@ -82,8 +81,8 @@ public function iGetTheNodeAtPath(string $serializedNodePath): void
     public function iExpectANodeIdentifiedByXToExistInTheContentGraph(string $serializedNodeDiscriminator): void
     {
         $nodeDiscriminator = NodeDiscriminator::fromShorthand($serializedNodeDiscriminator);
-        $contentGraphAdapter = $this->currentContentRepository->projectionState(ContentGraphAdapter::class);
-        $contentGraphAdapter->forgetInstances();
+        $contentRepositoryReadModel = $this->currentContentRepository->projectionState(ContentRepositoryReadModel::class);
+        $contentRepositoryReadModel->forgetInstances();
         $matchingWorkspace = $this->currentContentRepository->getWorkspaces()->find(
             static fn (Workspace $workspace) => $workspace->currentContentStreamId->equals($nodeDiscriminator->contentStreamId)
         );