diff --git a/Classes/Application/ReloadNodes/ReloadNodesQueryHandler.php b/Classes/Application/ReloadNodes/ReloadNodesQueryHandler.php
index 2329ebbb66..b9d6ad520f 100644
--- a/Classes/Application/ReloadNodes/ReloadNodesQueryHandler.php
+++ b/Classes/Application/ReloadNodes/ReloadNodesQueryHandler.php
@@ -93,7 +93,7 @@ public function handle(ReloadNodesQuery $query, ActionRequest $actionRequest): R
         }
 
         $ancestors = $subgraph->findAncestorNodes(
-            $documentNode->nodeAggregateId,
+            $documentNode->aggregateId,
             FindAncestorNodesFilter::create(
                 NodeTypeCriteria::fromFilterString(NodeTypeNameFactory::NAME_DOCUMENT)
             )
@@ -120,15 +120,15 @@ public function handle(ReloadNodesQuery $query, ActionRequest $actionRequest): R
             if ($level < $this->loadingDepth || // load all nodes within loadingDepth
                 $this->loadingDepth === 0 || // unlimited loadingDepth
                 // load toggled nodes
-                $query->toggledNodesIds->contain($baseNode->nodeAggregateId) ||
+                $query->toggledNodesIds->contain($baseNode->aggregateId) ||
                 // load children of all parents of documentNode
-                in_array($baseNode->nodeAggregateId->value, array_map(
-                    fn (Node $node): string => $node->nodeAggregateId->value,
+                in_array($baseNode->aggregateId->value, array_map(
+                    fn (Node $node): string => $node->aggregateId->value,
                     iterator_to_array($ancestors)
                 ))
             ) {
                 foreach ($subgraph->findChildNodes(
-                    $baseNode->nodeAggregateId,
+                    $baseNode->aggregateId,
                     FindChildNodesFilter::create(nodeTypes: $baseNodeTypeConstraints)
                 ) as $childNode) {
                     $nodeMapBuilder->addNode($childNode);
diff --git a/Classes/ContentRepository/Service/WorkspaceService.php b/Classes/ContentRepository/Service/WorkspaceService.php
index 3535455b70..b1d71bfb65 100644
--- a/Classes/ContentRepository/Service/WorkspaceService.php
+++ b/Classes/ContentRepository/Service/WorkspaceService.php
@@ -104,7 +104,7 @@ public function getPublishableNodeInfo(WorkspaceName $workspaceName, ContentRepo
                 $node = $subgraph->findNodeById($change->nodeAggregateId);
 
                 if ($node instanceof Node) {
-                    $documentNode = $subgraph->findClosestNode($node->nodeAggregateId, FindClosestNodeFilter::create(nodeTypes: NodeTypeNameFactory::NAME_DOCUMENT));
+                    $documentNode = $subgraph->findClosestNode($node->aggregateId, FindClosestNodeFilter::create(nodeTypes: NodeTypeNameFactory::NAME_DOCUMENT));
                     if ($documentNode instanceof Node) {
                         $contentRepository = $this->contentRepositoryRegistry->get($documentNode->contentRepositoryId);
                         $nodeAddressFactory = NodeAddressFactory::create($contentRepository);
diff --git a/Classes/Controller/BackendController.php b/Classes/Controller/BackendController.php
index 5cafa60262..403d2d8e70 100644
--- a/Classes/Controller/BackendController.php
+++ b/Classes/Controller/BackendController.php
@@ -176,7 +176,7 @@ public function indexAction(string $node = null)
 
         $siteNode = $subgraph->findNodeByPath(
             $siteDetectionResult->siteNodeName->toNodeName(),
-            $rootNode->nodeAggregateId
+            $rootNode->aggregateId
         );
 
         if (!$nodeAddress) {
diff --git a/Classes/Controller/BackendServiceController.php b/Classes/Controller/BackendServiceController.php
index 0932b11248..e50f830518 100644
--- a/Classes/Controller/BackendServiceController.php
+++ b/Classes/Controller/BackendServiceController.php
@@ -468,17 +468,17 @@ public function changeBaseWorkspaceAction(string $targetWorkspaceName, string $d
         // todo ensure that https://github.com/neos/neos-ui/pull/3734 doesnt need to be refixed in Neos 9.0
         $redirectNode = $documentNode;
         while (true) {
-            $redirectNodeInBaseWorkspace = $subgraph->findNodeById($redirectNode->nodeAggregateId);
+            $redirectNodeInBaseWorkspace = $subgraph->findNodeById($redirectNode->aggregateId);
             if ($redirectNodeInBaseWorkspace) {
                 break;
             } else {
-                $redirectNode = $subgraph->findParentNode($redirectNode->nodeAggregateId);
+                $redirectNode = $subgraph->findParentNode($redirectNode->aggregateId);
                 // get parent always returns Node
                 if (!$redirectNode) {
                     throw new \Exception(
                         sprintf(
                             'Wasn\'t able to locate any valid node in rootline of node %s in the workspace %s.',
-                            $documentNode->nodeAggregateId->value,
+                            $documentNode->aggregateId->value,
                             $targetWorkspaceName
                         ),
                         1458814469
diff --git a/Classes/Domain/Model/AbstractChange.php b/Classes/Domain/Model/AbstractChange.php
index f2148e45cd..8b32cd8074 100644
--- a/Classes/Domain/Model/AbstractChange.php
+++ b/Classes/Domain/Model/AbstractChange.php
@@ -70,7 +70,7 @@ protected function updateWorkspaceInfo(): void
     {
         if (!is_null($this->subject)) {
             $subgraph = $this->contentRepositoryRegistry->subgraphForNode($this->subject);
-            $documentNode = $subgraph->findClosestNode($this->subject->nodeAggregateId, FindClosestNodeFilter::create(nodeTypes: NodeTypeNameFactory::NAME_DOCUMENT));
+            $documentNode = $subgraph->findClosestNode($this->subject->aggregateId, FindClosestNodeFilter::create(nodeTypes: NodeTypeNameFactory::NAME_DOCUMENT));
             if (!is_null($documentNode)) {
                 $updateWorkspaceInfo = new UpdateWorkspaceInfo($documentNode->contentRepositoryId, $documentNode->workspaceName);
                 $this->feedbackCollection->add($updateWorkspaceInfo);
@@ -81,7 +81,7 @@ protected function updateWorkspaceInfo(): void
     protected function findParentNode(Node $node): ?Node
     {
         return $this->contentRepositoryRegistry->subgraphForNode($node)
-            ->findParentNode($node->nodeAggregateId);
+            ->findParentNode($node->aggregateId);
     }
 
     /**
diff --git a/Classes/Domain/Model/Changes/AbstractCreate.php b/Classes/Domain/Model/Changes/AbstractCreate.php
index 80dbbd8eee..1141d91206 100644
--- a/Classes/Domain/Model/Changes/AbstractCreate.php
+++ b/Classes/Domain/Model/Changes/AbstractCreate.php
@@ -147,7 +147,7 @@ protected function createNode(
             $nodeAggregateId,
             $nodeTypeName,
             OriginDimensionSpacePoint::fromDimensionSpacePoint($parentNode->dimensionSpacePoint),
-            $parentNode->nodeAggregateId,
+            $parentNode->aggregateId,
             $succeedingSiblingNodeAggregateId,
             $nodeName
         );
diff --git a/Classes/Domain/Model/Changes/AbstractStructuralChange.php b/Classes/Domain/Model/Changes/AbstractStructuralChange.php
index 32ab317616..0831eb1fe3 100644
--- a/Classes/Domain/Model/Changes/AbstractStructuralChange.php
+++ b/Classes/Domain/Model/Changes/AbstractStructuralChange.php
@@ -137,7 +137,7 @@ protected function finish(Node $node)
         $this->feedbackCollection->add($updateNodeInfo);
 
         $parentNode = $this->contentRepositoryRegistry->subgraphForNode($node)
-            ->findParentNode($node->nodeAggregateId);
+            ->findParentNode($node->aggregateId);
         if ($parentNode) {
             $updateParentNodeInfo = new UpdateNodeInfo();
             $updateParentNodeInfo->setNode($parentNode);
@@ -184,7 +184,7 @@ protected function findChildNodes(Node $node): Nodes
     {
         // TODO REMOVE
         return $this->contentRepositoryRegistry->subgraphForNode($node)
-            ->findChildNodes($node->nodeAggregateId, FindChildNodesFilter::create());
+            ->findChildNodes($node->aggregateId, FindChildNodesFilter::create());
     }
 
     protected function isNodeTypeAllowedAsChildNode(Node $parentNode, NodeTypeName $nodeTypeNameToCheck): bool
diff --git a/Classes/Domain/Model/Changes/CopyAfter.php b/Classes/Domain/Model/Changes/CopyAfter.php
index 496674275b..c75f5563de 100644
--- a/Classes/Domain/Model/Changes/CopyAfter.php
+++ b/Classes/Domain/Model/Changes/CopyAfter.php
@@ -74,8 +74,8 @@ public function apply(): void
                 $subject->workspaceName,
                 $subject,
                 OriginDimensionSpacePoint::fromDimensionSpacePoint($subject->dimensionSpacePoint),
-                $parentNodeOfPreviousSibling->nodeAggregateId,
-                $succeedingSibling?->nodeAggregateId,
+                $parentNodeOfPreviousSibling->aggregateId,
+                $succeedingSibling?->aggregateId,
                 null
             );
 
@@ -83,7 +83,7 @@ public function apply(): void
 
             $newlyCreatedNode = $this->contentRepositoryRegistry->subgraphForNode($parentNodeOfPreviousSibling)
                 ->findNodeById(
-                    $command->nodeAggregateIdMapping->getNewNodeAggregateId($subject->nodeAggregateId)
+                    $command->nodeAggregateIdMapping->getNewNodeAggregateId($subject->aggregateId)
                 );
             $this->finish($newlyCreatedNode);
             // NOTE: we need to run "finish" before "addNodeCreatedFeedback"
diff --git a/Classes/Domain/Model/Changes/CopyBefore.php b/Classes/Domain/Model/Changes/CopyBefore.php
index 6799a52e5b..efa72ef5ab 100644
--- a/Classes/Domain/Model/Changes/CopyBefore.php
+++ b/Classes/Domain/Model/Changes/CopyBefore.php
@@ -69,8 +69,8 @@ public function apply(): void
                 $subject->workspaceName,
                 $subject,
                 OriginDimensionSpacePoint::fromDimensionSpacePoint($subject->dimensionSpacePoint),
-                $parentNodeOfSucceedingSibling->nodeAggregateId,
-                $succeedingSibling->nodeAggregateId,
+                $parentNodeOfSucceedingSibling->aggregateId,
+                $succeedingSibling->aggregateId,
                 null
             );
 
@@ -78,7 +78,7 @@ public function apply(): void
 
             $newlyCreatedNode = $this->contentRepositoryRegistry->subgraphForNode($parentNodeOfSucceedingSibling)
                 ->findNodeById(
-                    $command->nodeAggregateIdMapping->getNewNodeAggregateId($subject->nodeAggregateId)
+                    $command->nodeAggregateIdMapping->getNewNodeAggregateId($subject->aggregateId)
                 );
             $this->finish($newlyCreatedNode);
             // NOTE: we need to run "finish" before "addNodeCreatedFeedback"
diff --git a/Classes/Domain/Model/Changes/CopyInto.php b/Classes/Domain/Model/Changes/CopyInto.php
index e73f80e56f..08522d2bcc 100644
--- a/Classes/Domain/Model/Changes/CopyInto.php
+++ b/Classes/Domain/Model/Changes/CopyInto.php
@@ -76,7 +76,7 @@ public function apply(): void
                 $subject->workspaceName,
                 $subject,
                 OriginDimensionSpacePoint::fromDimensionSpacePoint($subject->dimensionSpacePoint),
-                $parentNode->nodeAggregateId,
+                $parentNode->aggregateId,
                 null,
                 null
             );
@@ -84,7 +84,7 @@ public function apply(): void
 
             $newlyCreatedNode = $this->contentRepositoryRegistry->subgraphForNode($parentNode)
                 ->findNodeById(
-                    $command->nodeAggregateIdMapping->getNewNodeAggregateId($subject->nodeAggregateId),
+                    $command->nodeAggregateIdMapping->getNewNodeAggregateId($subject->aggregateId),
                 );
             $this->finish($newlyCreatedNode);
             // NOTE: we need to run "finish" before "addNodeCreatedFeedback"
diff --git a/Classes/Domain/Model/Changes/CreateAfter.php b/Classes/Domain/Model/Changes/CreateAfter.php
index 0e884f15b1..686d69abfb 100644
--- a/Classes/Domain/Model/Changes/CreateAfter.php
+++ b/Classes/Domain/Model/Changes/CreateAfter.php
@@ -56,7 +56,7 @@ public function apply(): void
                 // do nothing; $succeedingSibling is null.
             }
 
-            $this->createNode($parentNode, $succeedingSibling?->nodeAggregateId);
+            $this->createNode($parentNode, $succeedingSibling?->aggregateId);
 
             $this->updateWorkspaceInfo();
         }
diff --git a/Classes/Domain/Model/Changes/CreateBefore.php b/Classes/Domain/Model/Changes/CreateBefore.php
index dceb95bce2..958d471691 100644
--- a/Classes/Domain/Model/Changes/CreateBefore.php
+++ b/Classes/Domain/Model/Changes/CreateBefore.php
@@ -49,7 +49,7 @@ public function apply(): void
         $parent = $this->subject ? $this->findParentNode($this->subject) : null;
         $subject = $this->subject;
         if ($this->canApply() && !is_null($subject) && !is_null($parent)) {
-            $this->createNode($parent, $subject->nodeAggregateId);
+            $this->createNode($parent, $subject->aggregateId);
             $this->updateWorkspaceInfo();
         }
     }
diff --git a/Classes/Domain/Model/Changes/MoveAfter.php b/Classes/Domain/Model/Changes/MoveAfter.php
index 727f2dd853..87fa12dadd 100644
--- a/Classes/Domain/Model/Changes/MoveAfter.php
+++ b/Classes/Domain/Model/Changes/MoveAfter.php
@@ -72,8 +72,8 @@ public function apply(): void
                 // do nothing; $succeedingSibling is null.
             }
 
-            $hasEqualParentNode = $parentNode->nodeAggregateId
-                ->equals($parentNodeOfPreviousSibling->nodeAggregateId);
+            $hasEqualParentNode = $parentNode->aggregateId
+                ->equals($parentNodeOfPreviousSibling->aggregateId);
 
 
             $contentRepository = $this->contentRepositoryRegistry->get($subject->contentRepositoryId);
@@ -81,11 +81,11 @@ public function apply(): void
             $command = MoveNodeAggregate::create(
                 $subject->workspaceName,
                 $subject->dimensionSpacePoint,
-                $subject->nodeAggregateId,
+                $subject->aggregateId,
                 RelationDistributionStrategy::STRATEGY_GATHER_ALL,
-                $hasEqualParentNode ? null : $parentNodeOfPreviousSibling->nodeAggregateId,
-                $precedingSibling->nodeAggregateId,
-                $succeedingSibling?->nodeAggregateId,
+                $hasEqualParentNode ? null : $parentNodeOfPreviousSibling->aggregateId,
+                $precedingSibling->aggregateId,
+                $succeedingSibling?->aggregateId,
             );
             $contentRepository->handle($command)->block();
 
diff --git a/Classes/Domain/Model/Changes/MoveBefore.php b/Classes/Domain/Model/Changes/MoveBefore.php
index 8c950056c7..a38dbc42d2 100644
--- a/Classes/Domain/Model/Changes/MoveBefore.php
+++ b/Classes/Domain/Model/Changes/MoveBefore.php
@@ -67,8 +67,8 @@ public function apply(): void
                 // do nothing; $precedingSibling is null.
             }
 
-            $hasEqualParentNode = $parentNode->nodeAggregateId
-                ->equals($succeedingSiblingParent->nodeAggregateId);
+            $hasEqualParentNode = $parentNode->aggregateId
+                ->equals($succeedingSiblingParent->aggregateId);
 
             $contentRepository = $this->contentRepositoryRegistry->get($subject->contentRepositoryId);
 
@@ -76,13 +76,13 @@ public function apply(): void
                 MoveNodeAggregate::create(
                     $subject->workspaceName,
                     $subject->dimensionSpacePoint,
-                    $subject->nodeAggregateId,
+                    $subject->aggregateId,
                     RelationDistributionStrategy::STRATEGY_GATHER_ALL,
                     $hasEqualParentNode
                         ? null
-                        : $succeedingSiblingParent->nodeAggregateId,
-                    $precedingSibling?->nodeAggregateId,
-                    $succeedingSibling->nodeAggregateId,
+                        : $succeedingSiblingParent->aggregateId,
+                    $precedingSibling?->aggregateId,
+                    $succeedingSibling->aggregateId,
                 )
             )->block();
 
diff --git a/Classes/Domain/Model/Changes/MoveInto.php b/Classes/Domain/Model/Changes/MoveInto.php
index 100b842f89..f713c0eec2 100644
--- a/Classes/Domain/Model/Changes/MoveInto.php
+++ b/Classes/Domain/Model/Changes/MoveInto.php
@@ -76,19 +76,19 @@ public function apply(): void
         $subject = $this->subject;
         if ($this->canApply() && $parentNode && $subject) {
             $otherParent = $this->contentRepositoryRegistry->subgraphForNode($subject)
-                ->findParentNode($subject->nodeAggregateId);
+                ->findParentNode($subject->aggregateId);
 
-            $hasEqualParentNode = $otherParent && $otherParent->nodeAggregateId
-                    ->equals($parentNode->nodeAggregateId);
+            $hasEqualParentNode = $otherParent && $otherParent->aggregateId
+                    ->equals($parentNode->aggregateId);
 
             $contentRepository = $this->contentRepositoryRegistry->get($subject->contentRepositoryId);
             $contentRepository->handle(
                 MoveNodeAggregate::create(
                     $subject->workspaceName,
                     $subject->dimensionSpacePoint,
-                    $subject->nodeAggregateId,
+                    $subject->aggregateId,
                     RelationDistributionStrategy::STRATEGY_GATHER_ALL,
-                    $hasEqualParentNode ? null : $parentNode->nodeAggregateId,
+                    $hasEqualParentNode ? null : $parentNode->aggregateId,
                 )
             )->block();
 
diff --git a/Classes/Domain/Model/Changes/Property.php b/Classes/Domain/Model/Changes/Property.php
index aedd5c6004..58be3ccc5b 100644
--- a/Classes/Domain/Model/Changes/Property.php
+++ b/Classes/Domain/Model/Changes/Property.php
@@ -176,7 +176,7 @@ private function createFeedback(Node $subject): void
         // These 'Change' classes have been designed with mutable Neos < 9 Nodes and thus this might seem hacky
         // When fully redesigning the Neos Ui php integration this will fixed
         $subgraph = $this->contentRepositoryRegistry->subgraphForNode($subject);
-        $originalNodeAggregateId = $subject->nodeAggregateId;
+        $originalNodeAggregateId = $subject->aggregateId;
         $node = $subgraph->findNodeById($originalNodeAggregateId);
         if (is_null($node)) {
             throw new \InvalidArgumentException(
@@ -186,7 +186,7 @@ private function createFeedback(Node $subject): void
         }
 
         $this->updateWorkspaceInfo();
-        $parentNode = $subgraph->findParentNode($node->nodeAggregateId);
+        $parentNode = $subgraph->findParentNode($node->aggregateId);
 
         // This might be needed to update node label and other things that we can calculate only on the server
         $updateNodeInfo = new UpdateNodeInfo();
@@ -240,7 +240,7 @@ private function handleNodeReferenceChange(Node $subject, string $propertyName):
         $contentRepository->handle(
             SetNodeReferences::create(
                 $subject->workspaceName,
-                $subject->nodeAggregateId,
+                $subject->aggregateId,
                 $subject->originDimensionSpacePoint,
                 ReferenceName::fromString($propertyName),
                 NodeReferencesToWrite::fromNodeAggregateIds(NodeAggregateIds::fromArray($destinationNodeAggregateIds))
@@ -259,7 +259,7 @@ private function handleHiddenPropertyChange(Node $subject, string $propertyName)
 
         $command = EnableNodeAggregate::create(
             $subject->workspaceName,
-            $subject->nodeAggregateId,
+            $subject->aggregateId,
             $subject->originDimensionSpacePoint->toDimensionSpacePoint(),
             NodeVariantSelectionStrategy::STRATEGY_ALL_SPECIALIZATIONS
         );
@@ -267,7 +267,7 @@ private function handleHiddenPropertyChange(Node $subject, string $propertyName)
         if ($value === true) {
             $command = DisableNodeAggregate::create(
                 $subject->workspaceName,
-                $subject->nodeAggregateId,
+                $subject->aggregateId,
                 $subject->originDimensionSpacePoint->toDimensionSpacePoint(),
                 NodeVariantSelectionStrategy::STRATEGY_ALL_SPECIALIZATIONS
             );
@@ -287,7 +287,7 @@ private function handleNodeTypeChange(Node $subject, string $propertyName): void
         $contentRepository->handle(
             ChangeNodeAggregateType::create(
                 $subject->workspaceName,
-                $subject->nodeAggregateId,
+                $subject->aggregateId,
                 NodeTypeName::fromString($value),
                 NodeAggregateTypeChangeChildConstraintConflictResolutionStrategy::STRATEGY_DELETE
             )
@@ -309,7 +309,7 @@ private function handlePropertyChange(Node $subject, string $propertyName): void
             $contentRepository->handle(
                 CreateNodeVariant::create(
                     $subject->workspaceName,
-                    $subject->nodeAggregateId,
+                    $subject->aggregateId,
                     $subject->originDimensionSpacePoint,
                     $originDimensionSpacePoint
                 )
@@ -319,7 +319,7 @@ private function handlePropertyChange(Node $subject, string $propertyName): void
         $contentRepository->handle(
             SetNodeProperties::create(
                 $subject->workspaceName,
-                $subject->nodeAggregateId,
+                $subject->aggregateId,
                 $originDimensionSpacePoint,
                 PropertyValuesToWrite::fromArray(
                     [
diff --git a/Classes/Domain/Model/Changes/Remove.php b/Classes/Domain/Model/Changes/Remove.php
index 4c11d91e7b..9474d93832 100644
--- a/Classes/Domain/Model/Changes/Remove.php
+++ b/Classes/Domain/Model/Changes/Remove.php
@@ -64,7 +64,7 @@ public function apply(): void
             $parentNode = $this->findParentNode($subject);
             if (is_null($parentNode)) {
                 throw new \InvalidArgumentException(
-                    'Cannot apply Remove without a parent on node ' . $subject->nodeAggregateId->value,
+                    'Cannot apply Remove without a parent on node ' . $subject->aggregateId->value,
                     1645560717
                 );
             }
@@ -75,7 +75,7 @@ public function apply(): void
 
             $command = RemoveNodeAggregate::create(
                 $subject->workspaceName,
-                $subject->nodeAggregateId,
+                $subject->aggregateId,
                 $subject->dimensionSpacePoint,
                 NodeVariantSelectionStrategy::STRATEGY_ALL_SPECIALIZATIONS,
             );
@@ -102,11 +102,11 @@ private function getRemovalAttachmentPoint(): ?NodeAggregateId
         $subgraph = $this->contentRepositoryRegistry->subgraphForNode($this->subject);
 
         if ($this->subject->nodeType?->isOfType(NodeTypeNameFactory::NAME_DOCUMENT)) {
-            $closestSiteNode = $subgraph->findClosestNode($this->subject->nodeAggregateId, FindClosestNodeFilter::create(nodeTypes: NodeTypeNameFactory::NAME_SITE));
-            return $closestSiteNode?->nodeAggregateId;
+            $closestSiteNode = $subgraph->findClosestNode($this->subject->aggregateId, FindClosestNodeFilter::create(nodeTypes: NodeTypeNameFactory::NAME_SITE));
+            return $closestSiteNode?->aggregateId;
         }
 
-        $closestDocumentParentNode = $subgraph->findClosestNode($this->subject->nodeAggregateId, FindClosestNodeFilter::create(nodeTypes: NodeTypeNameFactory::NAME_DOCUMENT));
-        return $closestDocumentParentNode?->nodeAggregateId;
+        $closestDocumentParentNode = $subgraph->findClosestNode($this->subject->aggregateId, FindClosestNodeFilter::create(nodeTypes: NodeTypeNameFactory::NAME_DOCUMENT));
+        return $closestDocumentParentNode?->aggregateId;
     }
 }
diff --git a/Classes/Domain/Model/Feedback/Operations/NodeCreated.php b/Classes/Domain/Model/Feedback/Operations/NodeCreated.php
index 49ac30c2cc..d2e884191b 100644
--- a/Classes/Domain/Model/Feedback/Operations/NodeCreated.php
+++ b/Classes/Domain/Model/Feedback/Operations/NodeCreated.php
@@ -65,7 +65,7 @@ public function getType(): string
      */
     public function getDescription(): string
     {
-        return sprintf('Document Node "%s" created.', $this->getNode()->nodeAggregateId->value);
+        return sprintf('Document Node "%s" created.', $this->getNode()->aggregateId->value);
     }
 
     /**
@@ -96,7 +96,7 @@ public function serializePayload(ControllerContext $controllerContext)
         $nodeAddressFactory = NodeAddressFactory::create($contentRepository);
         return [
             'contextPath' => $nodeAddressFactory->createFromNode($node)->serializeForUri(),
-            'identifier' => $node->nodeAggregateId->value,
+            'identifier' => $node->aggregateId->value,
             'isDocument' => $this->getNodeType($node)->isOfType(NodeTypeNameFactory::NAME_DOCUMENT)
         ];
     }
diff --git a/Classes/Domain/Model/Feedback/Operations/ReloadContentOutOfBand.php b/Classes/Domain/Model/Feedback/Operations/ReloadContentOutOfBand.php
index 239b080283..2db18e40d0 100644
--- a/Classes/Domain/Model/Feedback/Operations/ReloadContentOutOfBand.php
+++ b/Classes/Domain/Model/Feedback/Operations/ReloadContentOutOfBand.php
@@ -86,7 +86,7 @@ public function getType(): string
 
     public function getDescription(): string
     {
-        return sprintf('Rendering of node "%s" required.', $this->node?->nodeAggregateId->value);
+        return sprintf('Rendering of node "%s" required.', $this->node?->aggregateId->value);
     }
 
     /**
diff --git a/Classes/Domain/Model/Feedback/Operations/ReloadDocument.php b/Classes/Domain/Model/Feedback/Operations/ReloadDocument.php
index d8baa8a431..6f2e0ddee7 100644
--- a/Classes/Domain/Model/Feedback/Operations/ReloadDocument.php
+++ b/Classes/Domain/Model/Feedback/Operations/ReloadDocument.php
@@ -76,7 +76,7 @@ public function serializePayload(ControllerContext $controllerContext): array
         $nodeInfoHelper = new NodeInfoHelper();
 
         $documentNode = $this->contentRepositoryRegistry->subgraphForNode($this->node)
-            ->findClosestNode($this->node->nodeAggregateId, FindClosestNodeFilter::create(nodeTypes: NodeTypeNameFactory::NAME_DOCUMENT));
+            ->findClosestNode($this->node->aggregateId, FindClosestNodeFilter::create(nodeTypes: NodeTypeNameFactory::NAME_DOCUMENT));
 
         if ($documentNode) {
             return [
diff --git a/Classes/Domain/Model/Feedback/Operations/RenderContentOutOfBand.php b/Classes/Domain/Model/Feedback/Operations/RenderContentOutOfBand.php
index 888461e1e9..8f0ec05c96 100644
--- a/Classes/Domain/Model/Feedback/Operations/RenderContentOutOfBand.php
+++ b/Classes/Domain/Model/Feedback/Operations/RenderContentOutOfBand.php
@@ -125,7 +125,7 @@ public function getType(): string
 
     public function getDescription(): string
     {
-        return sprintf('Rendering of node "%s" required.', $this->node?->nodeAggregateId->value);
+        return sprintf('Rendering of node "%s" required.', $this->node?->aggregateId->value);
     }
 
     /**
@@ -178,7 +178,7 @@ protected function renderContent(ControllerContext $controllerContext): string
             return '';
         }
         $subgraph = $this->contentRepositoryRegistry->subgraphForNode($this->node);
-        $parentNode = $subgraph->findParentNode($this->node->nodeAggregateId);
+        $parentNode = $subgraph->findParentNode($this->node->aggregateId);
         if ($parentNode) {
             $cacheTags = $this->cachingHelper->nodeTag($parentNode);
             foreach ($cacheTags as $tag) {
diff --git a/Classes/Domain/Model/Feedback/Operations/UpdateNodeInfo.php b/Classes/Domain/Model/Feedback/Operations/UpdateNodeInfo.php
index b0d47acc8c..7c2c13ee29 100644
--- a/Classes/Domain/Model/Feedback/Operations/UpdateNodeInfo.php
+++ b/Classes/Domain/Model/Feedback/Operations/UpdateNodeInfo.php
@@ -80,7 +80,7 @@ public function getType(): string
 
     public function getDescription(): string
     {
-        return sprintf('Updated info for node "%s" is available.', $this->node?->nodeAggregateId->value);
+        return sprintf('Updated info for node "%s" is available.', $this->node?->aggregateId->value);
     }
 
     /**
@@ -129,7 +129,7 @@ private function serializeNodeRecursively(Node $node, ActionRequest $actionReque
 
         if ($this->isRecursive === true) {
             $subgraph = $this->contentRepositoryRegistry->subgraphForNode($node);
-            foreach ($subgraph->findChildNodes($node->nodeAggregateId, FindChildNodesFilter::create()) as $childNode) {
+            foreach ($subgraph->findChildNodes($node->aggregateId, FindChildNodesFilter::create()) as $childNode) {
                 $result = array_merge($result, $this->serializeNodeRecursively($childNode, $actionRequest));
             }
         }
diff --git a/Classes/Domain/Service/NodePropertyConverterService.php b/Classes/Domain/Service/NodePropertyConverterService.php
index cb896109c1..2688c2dbed 100644
--- a/Classes/Domain/Service/NodePropertyConverterService.php
+++ b/Classes/Domain/Service/NodePropertyConverterService.php
@@ -106,13 +106,13 @@ private function getReference(Node $node, string $referenceName): array|string|n
     {
         $subgraph = $this->contentRepositoryRegistry->subgraphForNode($node);
         $references = $subgraph->findReferences(
-            $node->nodeAggregateId,
+            $node->aggregateId,
             FindReferencesFilter::create(referenceName: $referenceName)
         );
 
         $referenceIdentifiers = [];
         foreach ($references as $reference) {
-            $referenceIdentifiers[] = $reference->node->nodeAggregateId->value;
+            $referenceIdentifiers[] = $reference->node->aggregateId->value;
         }
 
         $maxItems = $this->getNodeType($node)->getReferences()[$referenceName]['constraints']['maxItems'] ?? null;
diff --git a/Classes/FlowQueryOperations/NeosUiDefaultNodesOperation.php b/Classes/FlowQueryOperations/NeosUiDefaultNodesOperation.php
index 519009ee37..f3f3b8f2c1 100644
--- a/Classes/FlowQueryOperations/NeosUiDefaultNodesOperation.php
+++ b/Classes/FlowQueryOperations/NeosUiDefaultNodesOperation.php
@@ -83,14 +83,14 @@ public function evaluate(FlowQuery $flowQuery, array $arguments)
         $subgraph = $this->contentRepositoryRegistry->subgraphForNode($documentNode);
 
         $ancestors = $subgraph->findAncestorNodes(
-            $documentNode->nodeAggregateId,
+            $documentNode->aggregateId,
             FindAncestorNodesFilter::create(
                 NodeTypeCriteria::fromFilterString('Neos.Neos:Document')
             )
         );
 
         $nodes = [
-            ($siteNode->nodeAggregateId->value) => $siteNode
+            ($siteNode->aggregateId->value) => $siteNode
         ];
 
         $gatherNodesRecursively = function (
@@ -113,32 +113,32 @@ public function evaluate(FlowQuery $flowQuery, array $arguments)
                 // load toggled nodes
                 in_array($baseNodeAddress->serializeForUri(), $toggledNodes) ||
                 // load children of all parents of documentNode
-                in_array($baseNode->nodeAggregateId->value, array_map(
-                    fn (Node $node): string => $node->nodeAggregateId->value,
+                in_array($baseNode->aggregateId->value, array_map(
+                    fn (Node $node): string => $node->aggregateId->value,
                     iterator_to_array($ancestors)
                 ))
             ) {
                 foreach ($subgraph->findChildNodes(
-                    $baseNode->nodeAggregateId,
+                    $baseNode->aggregateId,
                     FindChildNodesFilter::create(nodeTypes: $baseNodeTypeConstraints)
                 ) as $childNode) {
-                    $nodes[$childNode->nodeAggregateId->value] = $childNode;
+                    $nodes[$childNode->aggregateId->value] = $childNode;
                     $gatherNodesRecursively($nodes, $childNode, $level + 1);
                 }
             }
         };
         $gatherNodesRecursively($nodes, $siteNode);
 
-        if (!isset($nodes[$documentNode->nodeAggregateId->value])) {
-            $nodes[$documentNode->nodeAggregateId->value] = $documentNode;
+        if (!isset($nodes[$documentNode->aggregateId->value])) {
+            $nodes[$documentNode->aggregateId->value] = $documentNode;
         }
 
         foreach ($clipboardNodesContextPaths as $clipboardNodeContextPath) {
             // TODO: does not work across multiple CRs yet.
             $clipboardNodeAddress = $nodeAddressFactory->createFromUriString($clipboardNodeContextPath);
             $clipboardNode = $subgraph->findNodeById($clipboardNodeAddress->nodeAggregateId);
-            if ($clipboardNode && !array_key_exists($clipboardNode->nodeAggregateId->value, $nodes)) {
-                $nodes[$clipboardNode->nodeAggregateId->value] = $clipboardNode;
+            if ($clipboardNode && !array_key_exists($clipboardNode->aggregateId->value, $nodes)) {
+                $nodes[$clipboardNode->aggregateId->value] = $clipboardNode;
             }
         }
 
diff --git a/Classes/FlowQueryOperations/NeosUiFilteredChildrenOperation.php b/Classes/FlowQueryOperations/NeosUiFilteredChildrenOperation.php
index ff98bd9c43..7a080d010d 100644
--- a/Classes/FlowQueryOperations/NeosUiFilteredChildrenOperation.php
+++ b/Classes/FlowQueryOperations/NeosUiFilteredChildrenOperation.php
@@ -76,12 +76,12 @@ public function evaluate(FlowQuery $flowQuery, array $arguments)
             $subgraph = $this->contentRepositoryRegistry->subgraphForNode($contextNode);
 
             foreach ($subgraph->findChildNodes(
-                $contextNode->nodeAggregateId,
+                $contextNode->aggregateId,
                 FindChildNodesFilter::create(nodeTypes: $arguments[0] ?? null)
             ) as $childNode) {
-                if (!isset($outputNodeIdentifiers[$childNode->nodeAggregateId->value])) {
+                if (!isset($outputNodeIdentifiers[$childNode->aggregateId->value])) {
                     $output[] = $childNode;
-                    $outputNodeIdentifiers[$childNode->nodeAggregateId->value] = true;
+                    $outputNodeIdentifiers[$childNode->aggregateId->value] = true;
                 }
             }
         }
diff --git a/Classes/FlowQueryOperations/SearchOperation.php b/Classes/FlowQueryOperations/SearchOperation.php
index e542683813..815380fd2f 100644
--- a/Classes/FlowQueryOperations/SearchOperation.php
+++ b/Classes/FlowQueryOperations/SearchOperation.php
@@ -84,7 +84,7 @@ public function evaluate(FlowQuery $flowQuery, array $arguments): void
             $filter = $filter->with(nodeTypes: $arguments[1]);
         }
         $nodes = $subgraph->findDescendantNodes(
-            $contextNode->nodeAggregateId,
+            $contextNode->aggregateId,
             $filter
         );
         $flowQuery->setContext(iterator_to_array($nodes));
diff --git a/Classes/Fusion/Helper/NodeInfoHelper.php b/Classes/Fusion/Helper/NodeInfoHelper.php
index f81285d76d..49fcfc5edd 100644
--- a/Classes/Fusion/Helper/NodeInfoHelper.php
+++ b/Classes/Fusion/Helper/NodeInfoHelper.php
@@ -180,7 +180,7 @@ protected function getUriInformation(Node $node, ActionRequest $actionRequest):
     protected function getBasicNodeInformation(Node $node): array
     {
         $subgraph = $this->contentRepositoryRegistry->subgraphForNode($node);
-        $parentNode = $subgraph->findParentNode($node->nodeAggregateId);
+        $parentNode = $subgraph->findParentNode($node->aggregateId);
 
         $contentRepository = $this->contentRepositoryRegistry->get($node->contentRepositoryId);
         $nodeAddressFactory = NodeAddressFactory::create($contentRepository);
@@ -190,13 +190,13 @@ protected function getBasicNodeInformation(Node $node): array
             'contextPath' => $nodeAddress->serializeForUri(),
             'nodeAddress' => $nodeAddress->serializeForUri(),
             'name' => $node->nodeName?->value ?? '',
-            'identifier' => $node->nodeAggregateId->jsonSerialize(),
+            'identifier' => $node->aggregateId->jsonSerialize(),
             'nodeType' => $node->nodeTypeName->value,
             'label' => $this->nodeLabelGenerator->getLabel($node),
             'isAutoCreated' => $node->classification === NodeAggregateClassification::CLASSIFICATION_TETHERED,
             // TODO: depth is expensive to calculate; maybe let's get rid of this?
             'depth' => $subgraph->countAncestorNodes(
-                $node->nodeAggregateId,
+                $node->aggregateId,
                 CountAncestorNodesFilter::create()
             ),
             'children' => [],
@@ -221,12 +221,12 @@ protected function renderChildrenInformation(Node $node, string $nodeTypeFilterS
         $subgraph = $this->contentRepositoryRegistry->subgraphForNode($node);
 
         $documentChildNodes = $subgraph->findChildNodes(
-            $node->nodeAggregateId,
+            $node->aggregateId,
             FindChildNodesFilter::create(nodeTypes: $nodeTypeFilterString)
         );
         // child nodes for content tree, must not include those nodes filtered out by `baseNodeType`
         $contentChildNodes = $subgraph->findChildNodes(
-            $node->nodeAggregateId,
+            $node->aggregateId,
             FindChildNodesFilter::create(
                 nodeTypes: $this->buildContentChildNodeFilterString()
             )
@@ -276,20 +276,20 @@ public function renderNodesWithParents(array $nodes, ActionRequest $actionReques
         foreach ($nodes as $node) {
             $subgraph = $this->contentRepositoryRegistry->subgraphForNode($node);
 
-            if (array_key_exists($node->nodeAggregateId->value, $renderedNodes)) {
-                $renderedNodes[$node->nodeAggregateId->value]['matched'] = true;
+            if (array_key_exists($node->aggregateId->value, $renderedNodes)) {
+                $renderedNodes[$node->aggregateId->value]['matched'] = true;
             } elseif ($renderedNode = $this->renderNodeWithMinimalPropertiesAndChildrenInformation(
                 $node,
                 $actionRequest,
                 $baseNodeTypeOverride
             )) {
                 $renderedNode['matched'] = true;
-                $renderedNodes[$node->nodeAggregateId->value] = $renderedNode;
+                $renderedNodes[$node->aggregateId->value] = $renderedNode;
             } else {
                 continue;
             }
 
-            $parentNode = $subgraph->findParentNode($node->nodeAggregateId);
+            $parentNode = $subgraph->findParentNode($node->aggregateId);
             if ($parentNode === null) {
                 // There are a multitude of reasons why a node might not have a parent
                 // and we should ignore these gracefully.
@@ -297,8 +297,8 @@ public function renderNodesWithParents(array $nodes, ActionRequest $actionReques
             }
 
             while ($this->getNodeType($parentNode)->isOfType($baseNodeTypeOverride)) {
-                if (array_key_exists($parentNode->nodeAggregateId->value, $renderedNodes)) {
-                    $renderedNodes[$parentNode->nodeAggregateId->value]['intermediate'] = true;
+                if (array_key_exists($parentNode->aggregateId->value, $renderedNodes)) {
+                    $renderedNodes[$parentNode->aggregateId->value]['intermediate'] = true;
                 } else {
                     $renderedParentNode = $this->renderNodeWithMinimalPropertiesAndChildrenInformation(
                         $parentNode,
@@ -307,10 +307,10 @@ public function renderNodesWithParents(array $nodes, ActionRequest $actionReques
                     );
                     if ($renderedParentNode) {
                         $renderedParentNode['intermediate'] = true;
-                        $renderedNodes[$parentNode->nodeAggregateId->value] = $renderedParentNode;
+                        $renderedNodes[$parentNode->aggregateId->value] = $renderedParentNode;
                     }
                 }
-                $parentNode = $subgraph->findParentNode($parentNode->nodeAggregateId);
+                $parentNode = $subgraph->findParentNode($parentNode->aggregateId);
                 if ($parentNode === null) {
                     // There are a multitude of reasons why a node might not have a parent
                     // and we should ignore these gracefully.