From bf4df1ea7445e482df9c2e6a9c647915f6a33a53 Mon Sep 17 00:00:00 2001
From: mhsdesign <85400359+mhsdesign@users.noreply.github.com>
Date: Sat, 18 May 2024 16:51:45 +0200
Subject: [PATCH 1/3] TASK: Replace `$node->subgraphIdentity->*` with
 `$node->*`

---
 .../FlowQueryOperations/PropertyOperation.php    |  2 +-
 .../Module/Management/WorkspacesController.php   |  4 ++--
 .../Domain/Model/NodeCacheEntryIdentifier.php    |  2 +-
 .../FrontendRouting/NodeAddressFactory.php       |  2 +-
 .../Fusion/DimensionsMenuItemsImplementation.php | 16 ++++++++--------
 .../Classes/Fusion/Helper/DimensionHelper.php    |  6 +++---
 Neos.Neos/Classes/Fusion/Helper/LinkHelper.php   |  2 +-
 Neos.Neos/Classes/Fusion/Helper/NodeHelper.php   |  4 ++--
 .../Classes/Fusion/NodeUriImplementation.php     |  2 +-
 .../Routing/NodeIdentityConverterAspect.php      |  2 +-
 .../Service/ContentElementEditableService.php    |  2 +-
 .../Service/ContentElementWrappingService.php    |  4 ++--
 .../NodeToNodeAddressStringConverter.php         |  2 +-
 .../Utility/NodeTypeWithFallbackProvider.php     |  2 +-
 Neos.Neos/Classes/View/FusionView.php            |  2 +-
 .../Classes/ViewHelpers/Link/NodeViewHelper.php  |  6 +++---
 .../Classes/ViewHelpers/Uri/NodeViewHelper.php   |  4 ++--
 .../Service/TimeableNodeVisibilityService.php    |  4 ++--
 18 files changed, 34 insertions(+), 34 deletions(-)

diff --git a/Neos.ContentRepository.NodeAccess/Classes/FlowQueryOperations/PropertyOperation.php b/Neos.ContentRepository.NodeAccess/Classes/FlowQueryOperations/PropertyOperation.php
index 840a963cb19..23c4414fafe 100644
--- a/Neos.ContentRepository.NodeAccess/Classes/FlowQueryOperations/PropertyOperation.php
+++ b/Neos.ContentRepository.NodeAccess/Classes/FlowQueryOperations/PropertyOperation.php
@@ -111,7 +111,7 @@ public function evaluate(FlowQuery $flowQuery, array $arguments): mixed
             return ObjectAccess::getPropertyPath($element, substr($propertyName, 1));
         }
 
-        $contentRepository = $this->contentRepositoryRegistry->get($element->subgraphIdentity->contentRepositoryId);
+        $contentRepository = $this->contentRepositoryRegistry->get($element->contentRepositoryId);
         $nodeTypeManager = $contentRepository->getNodeTypeManager();
 
         if ($nodeTypeManager->getNodeType($element->nodeTypeName)?->hasReference($propertyName)) {
diff --git a/Neos.Neos/Classes/Controller/Module/Management/WorkspacesController.php b/Neos.Neos/Classes/Controller/Module/Management/WorkspacesController.php
index 90b32ee165f..78bc4cb0b9d 100644
--- a/Neos.Neos/Classes/Controller/Module/Management/WorkspacesController.php
+++ b/Neos.Neos/Classes/Controller/Module/Management/WorkspacesController.php
@@ -481,7 +481,7 @@ public function rebaseAndRedirectAction(Node $targetNode, Workspace $targetWorks
 
         $targetNodeAddressInPersonalWorkspace = new NodeAddress(
             $personalWorkspace->currentContentStreamId,
-            $targetNode->subgraphIdentity->dimensionSpacePoint,
+            $targetNode->dimensionSpacePoint,
             $targetNode->nodeAggregateId,
             $personalWorkspace->workspaceName
         );
@@ -874,7 +874,7 @@ protected function getOriginalNode(
         ContentRepository $contentRepository,
     ): ?Node {
         $baseSubgraph = $contentRepository->getContentGraph($baseWorkspaceName)->getSubgraph(
-            $modifiedNode->subgraphIdentity->dimensionSpacePoint,
+            $modifiedNode->dimensionSpacePoint,
             VisibilityConstraints::withoutRestrictions()
         );
         return $baseSubgraph->findNodeById($modifiedNode->nodeAggregateId);
diff --git a/Neos.Neos/Classes/Domain/Model/NodeCacheEntryIdentifier.php b/Neos.Neos/Classes/Domain/Model/NodeCacheEntryIdentifier.php
index 19366baf85d..59f06371ff4 100644
--- a/Neos.Neos/Classes/Domain/Model/NodeCacheEntryIdentifier.php
+++ b/Neos.Neos/Classes/Domain/Model/NodeCacheEntryIdentifier.php
@@ -33,7 +33,7 @@ private function __construct(
     public static function fromNode(Node $node): self
     {
         return new self('Node_' . $node->subgraphIdentity->contentStreamId->value
-            . '_' . $node->subgraphIdentity->dimensionSpacePoint->hash
+            . '_' . $node->dimensionSpacePoint->hash
             . '_' .  $node->nodeAggregateId->value);
     }
 
diff --git a/Neos.Neos/Classes/FrontendRouting/NodeAddressFactory.php b/Neos.Neos/Classes/FrontendRouting/NodeAddressFactory.php
index 9781840a45a..ccb6d8908c2 100644
--- a/Neos.Neos/Classes/FrontendRouting/NodeAddressFactory.php
+++ b/Neos.Neos/Classes/FrontendRouting/NodeAddressFactory.php
@@ -63,7 +63,7 @@ public function createFromNode(Node $node): NodeAddress
     {
         return $this->createFromContentStreamIdAndDimensionSpacePointAndNodeAggregateId(
             $node->subgraphIdentity->contentStreamId,
-            $node->subgraphIdentity->dimensionSpacePoint,
+            $node->dimensionSpacePoint,
             $node->nodeAggregateId,
         );
     }
diff --git a/Neos.Neos/Classes/Fusion/DimensionsMenuItemsImplementation.php b/Neos.Neos/Classes/Fusion/DimensionsMenuItemsImplementation.php
index 11fa3dd6074..94d3d6dc671 100644
--- a/Neos.Neos/Classes/Fusion/DimensionsMenuItemsImplementation.php
+++ b/Neos.Neos/Classes/Fusion/DimensionsMenuItemsImplementation.php
@@ -51,7 +51,7 @@ protected function buildItems(): array
         $menuItems = [];
         $currentNode = $this->getCurrentNode();
 
-        $contentRepositoryId = $currentNode->subgraphIdentity->contentRepositoryId;
+        $contentRepositoryId = $currentNode->contentRepositoryId;
         $contentRepository = $this->contentRepositoryRegistry->get(
             $contentRepositoryId,
         );
@@ -63,7 +63,7 @@ protected function buildItems(): array
         assert($dimensionMenuItemsImplementationInternals instanceof DimensionsMenuItemsImplementationInternals);
 
         $interDimensionalVariationGraph = $dimensionMenuItemsImplementationInternals->interDimensionalVariationGraph;
-        $currentDimensionSpacePoint = $currentNode->subgraphIdentity->dimensionSpacePoint;
+        $currentDimensionSpacePoint = $currentNode->dimensionSpacePoint;
         $contentDimensionIdentifierToLimitTo = $this->getContentDimensionIdentifierToLimitTo();
         try {
             $contentGraph = $contentRepository->getContentGraph($currentNode->workspaceName);
@@ -80,7 +80,7 @@ protected function buildItems(): array
                     $variant = $contentGraph
                         ->getSubgraph(
                             $dimensionSpacePoint,
-                            $currentNode->subgraphIdentity->visibilityConstraints,
+                            $currentNode->visibilityConstraints,
                         )
                         ->findNodeById($currentNode->nodeAggregateId);
                 }
@@ -119,9 +119,9 @@ protected function buildItems(): array
                 $order,
                 $contentDimensionIdentifierToLimitTo
             ) {
-                return (int)$order[$menuItemA->node?->subgraphIdentity->dimensionSpacePoint->getCoordinate(
+                return (int)$order[$menuItemA->node?->dimensionSpacePoint->getCoordinate(
                     $contentDimensionIdentifierToLimitTo
-                )] <=> (int)$order[$menuItemB->node?->subgraphIdentity->dimensionSpacePoint->getCoordinate(
+                )] <=> (int)$order[$menuItemB->node?->dimensionSpacePoint->getCoordinate(
                     $contentDimensionIdentifierToLimitTo
                 )];
             });
@@ -138,11 +138,11 @@ protected function isDimensionSpacePointRelevant(DimensionSpacePoint $dimensionS
     {
         return !$this->getContentDimensionIdentifierToLimitTo() // no limit to one dimension, so all DSPs are relevant
             // always include the current variant
-            || $dimensionSpacePoint->equals($this->currentNode->subgraphIdentity->dimensionSpacePoint)
+            || $dimensionSpacePoint->equals($this->currentNode->dimensionSpacePoint)
             // include all direct variants in the dimension we're limited to unless their values
             // in that dimension are missing in the specified list
             || $dimensionSpacePoint->isDirectVariantInDimension(
-                $this->currentNode->subgraphIdentity->dimensionSpacePoint,
+                $this->currentNode->dimensionSpacePoint,
                 $this->getContentDimensionIdentifierToLimitTo()
             )
             && (
@@ -172,7 +172,7 @@ protected function findClosestGeneralizationMatchingDimensionValue(
                 $variant = $contentGraph
                     ->getSubgraph(
                         $generalization,
-                        $this->getCurrentNode()->subgraphIdentity->visibilityConstraints,
+                        $this->getCurrentNode()->visibilityConstraints,
                     )
                     ->findNodeById($nodeAggregateId);
                 if ($variant) {
diff --git a/Neos.Neos/Classes/Fusion/Helper/DimensionHelper.php b/Neos.Neos/Classes/Fusion/Helper/DimensionHelper.php
index de4c5b0b691..0c131a51b48 100644
--- a/Neos.Neos/Classes/Fusion/Helper/DimensionHelper.php
+++ b/Neos.Neos/Classes/Fusion/Helper/DimensionHelper.php
@@ -52,7 +52,7 @@ final class DimensionHelper implements ProtectedContextAwareInterface
     public function currentValue(Node $node, ContentDimensionId|string $dimensionName): ?ContentDimensionValue
     {
         $contentDimensionId = is_string($dimensionName) ? new ContentDimensionId($dimensionName) : $dimensionName;
-        $currentDimensionValueAsString = $node->subgraphIdentity->dimensionSpacePoint->getCoordinate($contentDimensionId);
+        $currentDimensionValueAsString = $node->dimensionSpacePoint->getCoordinate($contentDimensionId);
 
         if (is_string($currentDimensionValueAsString)) {
             return $this->allDimensionValues($node, $contentDimensionId)?->getValue($currentDimensionValueAsString);
@@ -97,7 +97,7 @@ public function originValue(Node $node, ContentDimensionId|string $dimensionName
      */
     public function all(ContentRepositoryId|Node $subject): array
     {
-        $contentRepositoryId = $subject instanceof Node ? $subject->subgraphIdentity->contentRepositoryId : $subject;
+        $contentRepositoryId = $subject instanceof Node ? $subject->contentRepositoryId : $subject;
         $contentRepository = $this->contentRepositoryRegistry->get($contentRepositoryId);
 
         return $contentRepository->getContentDimensionSource()->getContentDimensionsOrderedByPriority();
@@ -118,7 +118,7 @@ public function all(ContentRepositoryId|Node $subject): array
      */
     public function allDimensionValues(ContentRepositoryId|Node $subject, ContentDimensionId|string $dimensionName): ?ContentDimensionValues
     {
-        $contentRepositoryId = $subject instanceof Node ? $subject->subgraphIdentity->contentRepositoryId : $subject;
+        $contentRepositoryId = $subject instanceof Node ? $subject->contentRepositoryId : $subject;
         $contentDimensionId = is_string($dimensionName) ? new ContentDimensionId($dimensionName) : $dimensionName;
 
         $contentRepository = $this->contentRepositoryRegistry->get($contentRepositoryId);
diff --git a/Neos.Neos/Classes/Fusion/Helper/LinkHelper.php b/Neos.Neos/Classes/Fusion/Helper/LinkHelper.php
index 51aa819e4fe..c05b439c532 100644
--- a/Neos.Neos/Classes/Fusion/Helper/LinkHelper.php
+++ b/Neos.Neos/Classes/Fusion/Helper/LinkHelper.php
@@ -106,7 +106,7 @@ public function resolveNodeUri(
             return null;
         }
         $contentRepository = $this->contentRepositoryRegistry->get(
-            $targetNode->subgraphIdentity->contentRepositoryId
+            $targetNode->contentRepositoryId
         );
         $targetNodeAddress = NodeAddressFactory::create($contentRepository)->createFromNode($targetNode);
         try {
diff --git a/Neos.Neos/Classes/Fusion/Helper/NodeHelper.php b/Neos.Neos/Classes/Fusion/Helper/NodeHelper.php
index f79add7ba04..296c6a49623 100644
--- a/Neos.Neos/Classes/Fusion/Helper/NodeHelper.php
+++ b/Neos.Neos/Classes/Fusion/Helper/NodeHelper.php
@@ -149,14 +149,14 @@ public function getNodeType(Node $node): NodeType
 
     public function isNodeTypeExistent(Node $node): bool
     {
-        $contentRepository = $this->contentRepositoryRegistry->get($node->subgraphIdentity->contentRepositoryId);
+        $contentRepository = $this->contentRepositoryRegistry->get($node->contentRepositoryId);
         return $contentRepository->getNodeTypeManager()->hasNodeType($node->nodeTypeName);
     }
 
     public function serializedNodeAddress(Node $node): string
     {
         $contentRepository = $this->contentRepositoryRegistry->get(
-            $node->subgraphIdentity->contentRepositoryId
+            $node->contentRepositoryId
         );
         $nodeAddressFactory = NodeAddressFactory::create($contentRepository);
         return $nodeAddressFactory->createFromNode($node)->serializeForUri();
diff --git a/Neos.Neos/Classes/Fusion/NodeUriImplementation.php b/Neos.Neos/Classes/Fusion/NodeUriImplementation.php
index 9e1da3c7d83..e6757a7868a 100644
--- a/Neos.Neos/Classes/Fusion/NodeUriImplementation.php
+++ b/Neos.Neos/Classes/Fusion/NodeUriImplementation.php
@@ -141,7 +141,7 @@ public function evaluate()
         $node = $this->getNode();
         if ($node instanceof Node) {
             $contentRepository = $this->contentRepositoryRegistry->get(
-                $node->subgraphIdentity->contentRepositoryId
+                $node->contentRepositoryId
             );
             $nodeAddressFactory = NodeAddressFactory::create($contentRepository);
             $nodeAddress = $nodeAddressFactory->createFromNode($node);
diff --git a/Neos.Neos/Classes/Routing/NodeIdentityConverterAspect.php b/Neos.Neos/Classes/Routing/NodeIdentityConverterAspect.php
index b8b5cb260da..599242562e7 100644
--- a/Neos.Neos/Classes/Routing/NodeIdentityConverterAspect.php
+++ b/Neos.Neos/Classes/Routing/NodeIdentityConverterAspect.php
@@ -48,7 +48,7 @@ public function convertNodeToContextPathForRouting(JoinPointInterface $joinPoint
         $objectArgument = $joinPoint->getMethodArgument('object');
         if ($objectArgument instanceof Node) {
             $contentRepository = $this->contentRepositoryRegistry->get(
-                $objectArgument->subgraphIdentity->contentRepositoryId
+                $objectArgument->contentRepositoryId
             );
             $nodeAddressFactory = NodeAddressFactory::create($contentRepository);
             $nodeAddress = $nodeAddressFactory->createFromNode($objectArgument);
diff --git a/Neos.Neos/Classes/Service/ContentElementEditableService.php b/Neos.Neos/Classes/Service/ContentElementEditableService.php
index 16e2159fa9a..4f323d32c26 100644
--- a/Neos.Neos/Classes/Service/ContentElementEditableService.php
+++ b/Neos.Neos/Classes/Service/ContentElementEditableService.php
@@ -51,7 +51,7 @@ class ContentElementEditableService
     public function wrapContentProperty(Node $node, string $property, string $content): string
     {
         $contentRepository = $this->contentRepositoryRegistry->get(
-            $node->subgraphIdentity->contentRepositoryId
+            $node->contentRepositoryId
         );
 
         // TODO: permissions
diff --git a/Neos.Neos/Classes/Service/ContentElementWrappingService.php b/Neos.Neos/Classes/Service/ContentElementWrappingService.php
index b8c1d414d96..ada41a7c176 100644
--- a/Neos.Neos/Classes/Service/ContentElementWrappingService.php
+++ b/Neos.Neos/Classes/Service/ContentElementWrappingService.php
@@ -81,7 +81,7 @@ public function wrapContentObject(
         array $additionalAttributes = []
     ): ?string {
         $contentRepository = $this->contentRepositoryRegistry->get(
-            $node->subgraphIdentity->contentRepositoryId
+            $node->contentRepositoryId
         );
 
         // TODO: reenable permissions
@@ -121,7 +121,7 @@ public function wrapContentObject(
     protected function addCssClasses(array $attributes, Node $node, array $initialClasses = []): array
     {
         $classNames = $initialClasses;
-        if (!$node->subgraphIdentity->dimensionSpacePoint->equals($node->originDimensionSpacePoint)) {
+        if (!$node->dimensionSpacePoint->equals($node->originDimensionSpacePoint)) {
             $classNames[] = 'neos-contentelement-shine-through';
         }
 
diff --git a/Neos.Neos/Classes/TypeConverter/NodeToNodeAddressStringConverter.php b/Neos.Neos/Classes/TypeConverter/NodeToNodeAddressStringConverter.php
index 907a4df7656..7c296803ec8 100644
--- a/Neos.Neos/Classes/TypeConverter/NodeToNodeAddressStringConverter.php
+++ b/Neos.Neos/Classes/TypeConverter/NodeToNodeAddressStringConverter.php
@@ -65,7 +65,7 @@ public function convertFrom(
         PropertyMappingConfigurationInterface $configuration = null
     ) {
         $contentRepository = $this->contentRepositoryRegistry->get(
-            $source->subgraphIdentity->contentRepositoryId
+            $source->contentRepositoryId
         );
         return NodeAddressFactory::create($contentRepository)->createFromNode($source)->serializeForUri();
     }
diff --git a/Neos.Neos/Classes/Utility/NodeTypeWithFallbackProvider.php b/Neos.Neos/Classes/Utility/NodeTypeWithFallbackProvider.php
index 55bb12f5463..277240d2ba5 100644
--- a/Neos.Neos/Classes/Utility/NodeTypeWithFallbackProvider.php
+++ b/Neos.Neos/Classes/Utility/NodeTypeWithFallbackProvider.php
@@ -19,7 +19,7 @@ trait NodeTypeWithFallbackProvider
 {
     protected function getNodeType(Node $node): NodeType
     {
-        $nodeTypeManager = $this->contentRepositoryRegistry->get($node->subgraphIdentity->contentRepositoryId)->getNodeTypeManager();
+        $nodeTypeManager = $this->contentRepositoryRegistry->get($node->contentRepositoryId)->getNodeTypeManager();
 
         return $nodeTypeManager->getNodeType($node->nodeTypeName)
             ?? $nodeTypeManager->getNodeType(NodeTypeNameFactory::forFallback())
diff --git a/Neos.Neos/Classes/View/FusionView.php b/Neos.Neos/Classes/View/FusionView.php
index 0783275afb1..06a14be1dcc 100644
--- a/Neos.Neos/Classes/View/FusionView.php
+++ b/Neos.Neos/Classes/View/FusionView.php
@@ -81,7 +81,7 @@ public function render(): ResponseInterface|StreamInterface
 
         $fusionRuntime = $this->getFusionRuntime($currentSiteNode);
 
-        $this->setFallbackRuleFromDimension($currentNode->subgraphIdentity->dimensionSpacePoint);
+        $this->setFallbackRuleFromDimension($currentNode->dimensionSpacePoint);
 
         return $fusionRuntime->renderEntryPathWithContext($this->fusionPath, [
             'node' => $currentNode,
diff --git a/Neos.Neos/Classes/ViewHelpers/Link/NodeViewHelper.php b/Neos.Neos/Classes/ViewHelpers/Link/NodeViewHelper.php
index a466b777065..f3b74082874 100644
--- a/Neos.Neos/Classes/ViewHelpers/Link/NodeViewHelper.php
+++ b/Neos.Neos/Classes/ViewHelpers/Link/NodeViewHelper.php
@@ -263,7 +263,7 @@ public function render(): string
 
         if ($node instanceof Node) {
             $contentRepository = $this->contentRepositoryRegistry->get(
-                $node->subgraphIdentity->contentRepositoryId
+                $node->contentRepositoryId
             );
             $nodeAddressFactory = NodeAddressFactory::create($contentRepository);
             $nodeAddress = $nodeAddressFactory->createFromNode($node);
@@ -271,7 +271,7 @@ public function render(): string
             $documentNode = $this->getContextVariable('documentNode');
             assert($documentNode instanceof Node);
             $contentRepository = $this->contentRepositoryRegistry->get(
-                $documentNode->subgraphIdentity->contentRepositoryId
+                $documentNode->contentRepositoryId
             );
             $nodeAddress = $this->resolveNodeAddressFromString($node, $documentNode, $contentRepository);
             $node = $documentNode;
@@ -287,7 +287,7 @@ public function render(): string
         $subgraph = $contentRepository->getContentGraph($nodeAddress->workspaceName)
             ->getSubgraph(
                 $nodeAddress->dimensionSpacePoint,
-                $node->subgraphIdentity->visibilityConstraints
+                $node->visibilityConstraints
             );
 
         $resolvedNode = $subgraph->findNodeById($nodeAddress->nodeAggregateId);
diff --git a/Neos.Neos/Classes/ViewHelpers/Uri/NodeViewHelper.php b/Neos.Neos/Classes/ViewHelpers/Uri/NodeViewHelper.php
index 1b3ef235890..d4ddd198953 100644
--- a/Neos.Neos/Classes/ViewHelpers/Uri/NodeViewHelper.php
+++ b/Neos.Neos/Classes/ViewHelpers/Uri/NodeViewHelper.php
@@ -208,7 +208,7 @@ public function render(): string
 
         if ($node instanceof Node) {
             $contentRepository = $this->contentRepositoryRegistry->get(
-                $node->subgraphIdentity->contentRepositoryId
+                $node->contentRepositoryId
             );
             $nodeAddressFactory = NodeAddressFactory::create($contentRepository);
             $nodeAddress = $nodeAddressFactory->createFromNode($node);
@@ -264,7 +264,7 @@ private function resolveNodeAddressFromString(string $path): ?NodeAddress
         /* @var Node $documentNode */
         $documentNode = $this->getContextVariable('documentNode');
         $contentRepository = $this->contentRepositoryRegistry->get(
-            $documentNode->subgraphIdentity->contentRepositoryId
+            $documentNode->contentRepositoryId
         );
         $nodeAddressFactory = NodeAddressFactory::create($contentRepository);
         $documentNodeAddress = $nodeAddressFactory->createFromNode($documentNode);
diff --git a/Neos.TimeableNodeVisibility/Classes/Service/TimeableNodeVisibilityService.php b/Neos.TimeableNodeVisibility/Classes/Service/TimeableNodeVisibilityService.php
index b76e74eed3c..73d3f97005a 100644
--- a/Neos.TimeableNodeVisibility/Classes/Service/TimeableNodeVisibilityService.php
+++ b/Neos.TimeableNodeVisibility/Classes/Service/TimeableNodeVisibilityService.php
@@ -55,7 +55,7 @@ public function handleExceededNodeDates(ContentRepositoryId $contentRepositoryId
                     EnableNodeAggregate::create(
                         $workspaceName,
                         $node->nodeAggregateId,
-                        $node->subgraphIdentity->dimensionSpacePoint,
+                        $node->dimensionSpacePoint,
                         NodeVariantSelectionStrategy::STRATEGY_ALL_SPECIALIZATIONS
                     )
                 );
@@ -69,7 +69,7 @@ public function handleExceededNodeDates(ContentRepositoryId $contentRepositoryId
                     DisableNodeAggregate::create(
                         $workspaceName,
                         $node->nodeAggregateId,
-                        $node->subgraphIdentity->dimensionSpacePoint,
+                        $node->dimensionSpacePoint,
                         NodeVariantSelectionStrategy::STRATEGY_ALL_SPECIALIZATIONS
                     )
                 );

From ec803ee9674f793426cdff944573c381135bdcc3 Mon Sep 17 00:00:00 2001
From: mhsdesign <85400359+mhsdesign@users.noreply.github.com>
Date: Sat, 18 May 2024 16:52:55 +0200
Subject: [PATCH 2/3] TASK: Rename `$node->nodeAggregateId` to
 `$node->aggregateId`

---
 .../src/Domain/Repository/ContentSubgraph.php |  4 +--
 .../Repository/ContentSubhypergraph.php       |  2 +-
 .../Feature/Common/NodeCreationInternals.php  |  6 ++--
 .../Feature/Common/NodeVariationInternals.php |  4 +--
 .../Dto/NodeSubtreeSnapshot.php               |  6 ++--
 .../Classes/Feature/NodeMove/NodeMove.php     | 16 +++++-----
 .../Feature/NodeTypeChange/NodeTypeChange.php |  4 +--
 .../ContentGraph/AbsoluteNodePath.php         |  4 +--
 .../ContentSubgraphWithRuntimeCaches.php      |  8 ++---
 .../ContentGraph/ContentSubgraphIdentity.php  |  2 +-
 .../Classes/Projection/ContentGraph/Nodes.php |  4 +--
 .../Classes/SharedModel/Node/NodeAddress.php  |  2 +-
 .../SharedModel/Node/NodeAggregateIds.php     |  2 +-
 .../BackReferenceNodesOperation.php           |  2 +-
 .../BackReferencesOperation.php               |  2 +-
 .../FlowQueryOperations/ChildrenOperation.php | 20 ++++++-------
 .../FlowQueryOperations/ClosestOperation.php  |  2 +-
 .../CreateNodeHashTrait.php                   |  2 +-
 .../FlowQueryOperations/FilterOperation.php   |  4 +--
 .../FlowQueryOperations/FindOperation.php     |  4 +--
 .../FlowQueryOperations/HasOperation.php      |  2 +-
 .../FlowQueryOperations/IdOperation.php       |  2 +-
 .../FlowQueryOperations/NextAllOperation.php  |  4 +--
 .../FlowQueryOperations/NextOperation.php     |  4 +--
 .../NextUntilOperation.php                    |  4 +--
 .../FlowQueryOperations/ParentOperation.php   |  6 ++--
 .../FlowQueryOperations/ParentsOperation.php  |  2 +-
 .../ParentsUntilOperation.php                 |  4 +--
 .../FlowQueryOperations/PrevAllOperation.php  |  4 +--
 .../FlowQueryOperations/PrevOperation.php     |  4 +--
 .../PrevUntilOperation.php                    |  4 +--
 .../FlowQueryOperations/PropertyOperation.php |  6 ++--
 .../ReferenceNodesOperation.php               |  2 +-
 .../ReferencesOperation.php                   |  2 +-
 .../FlowQueryOperations/SiblingsOperation.php | 10 +++----
 .../AddNewPropertyTransformationFactory.php   |  2 +-
 ...angePropertyValueTransformationFactory.php |  2 +-
 .../RemoveNodeTransformationFactory.php       |  2 +-
 .../RemovePropertyTransformationFactory.php   |  2 +-
 .../RenamePropertyTransformationFactory.php   |  2 +-
 ...ripTagsOnPropertyTransformationFactory.php |  2 +-
 .../DisallowedChildNodeAdjustment.php         |  2 +-
 .../src/Adjustment/PropertyAdjustment.php     |  2 +-
 .../Adjustment/TetheredNodeAdjustments.php    |  4 +--
 .../Bootstrap/CRTestSuiteRuntimeVariables.php |  4 +--
 .../Features/Bootstrap/CRTestSuiteTrait.php   |  2 +-
 .../Bootstrap/Helpers/NodeDiscriminator.php   |  2 +-
 .../Features/Bootstrap/NodeTraversalTrait.php | 30 +++++++++----------
 .../Features/Bootstrap/ProjectedNodeTrait.php | 28 ++++++++---------
 .../Command/ContentCommandController.php      |  6 ++--
 .../Classes/Controller/UsageController.php    |  4 +--
 .../Controller/Frontend/NodeController.php    |  8 ++---
 .../Management/WorkspacesController.php       |  8 ++---
 .../Controller/Service/NodesController.php    |  8 ++---
 .../Domain/Model/NodeCacheEntryIdentifier.php |  2 +-
 .../Domain/Repository/SiteRepository.php      |  4 +--
 .../Domain/Service/SiteNodeUtility.php        |  4 +--
 .../Classes/Domain/Service/SiteService.php    |  2 +-
 .../Classes/Domain/Workspace/Workspace.php    |  2 +-
 .../Eel/FlowQueryOperations/SortOperation.php |  4 +--
 .../FrontendRouting/NodeAddressFactory.php    |  2 +-
 Neos.Neos/Classes/Fusion/Cache/CacheTag.php   |  2 +-
 .../DimensionsMenuItemsImplementation.php     |  4 +--
 .../Classes/Fusion/Helper/LinkHelper.php      |  2 +-
 .../Classes/Fusion/Helper/NodeHelper.php      |  8 ++---
 .../Fusion/MenuItemsImplementation.php        | 12 ++++----
 .../Classes/Fusion/NodeUriImplementation.php  |  2 +-
 .../Classes/Presentation/VisualNodePath.php   |  2 +-
 .../Routing/Cache/RouteCacheFlusher.php       |  2 +-
 .../Service/ImageVariantGarbageCollector.php  |  2 +-
 Neos.Neos/Classes/Service/LinkingService.php  |  2 +-
 Neos.Neos/Classes/View/FusionView.php         |  4 +--
 .../DocumentBreadcrumbPathViewHelper.php      |  2 +-
 .../ViewHelpers/Link/NodeViewHelper.php       |  8 ++---
 .../Node/ClosestDocumentViewHelper.php        |  2 +-
 .../ViewHelpers/Uri/NodeViewHelper.php        |  6 ++--
 .../Features/Bootstrap/BrowserTrait.php       |  2 +-
 .../Features/Bootstrap/FusionTrait.php        |  2 +-
 ...imeableNodeVisibilityCommandController.php |  4 +--
 .../Service/TimeableNodeVisibilityService.php |  8 ++---
 .../Behavior/Bootstrap/FeatureContext.php     | 12 ++++----
 81 files changed, 194 insertions(+), 194 deletions(-)

diff --git a/Neos.ContentGraph.DoctrineDbalAdapter/src/Domain/Repository/ContentSubgraph.php b/Neos.ContentGraph.DoctrineDbalAdapter/src/Domain/Repository/ContentSubgraph.php
index 322ed95e789..504ca01ca1a 100644
--- a/Neos.ContentGraph.DoctrineDbalAdapter/src/Domain/Repository/ContentSubgraph.php
+++ b/Neos.ContentGraph.DoctrineDbalAdapter/src/Domain/Repository/ContentSubgraph.php
@@ -243,7 +243,7 @@ public function retrieveNodePath(NodeAggregateId $nodeAggregateId): AbsoluteNode
                 1687513836
             );
         }
-        $ancestors = $this->findAncestorNodes($leafNode->nodeAggregateId, FindAncestorNodesFilter::create())
+        $ancestors = $this->findAncestorNodes($leafNode->aggregateId, FindAncestorNodesFilter::create())
             ->reverse();
 
         try {
@@ -457,7 +457,7 @@ private function findNodeByPathFromStartingNode(NodePath $path, Node $startingNo
         $currentNode = $startingNode;
 
         foreach ($path->getParts() as $edgeName) {
-            $currentNode = $this->findChildNodeConnectedThroughEdgeName($currentNode->nodeAggregateId, $edgeName);
+            $currentNode = $this->findChildNodeConnectedThroughEdgeName($currentNode->aggregateId, $edgeName);
             if ($currentNode === null) {
                 return null;
             }
diff --git a/Neos.ContentGraph.PostgreSQLAdapter/src/Domain/Repository/ContentSubhypergraph.php b/Neos.ContentGraph.PostgreSQLAdapter/src/Domain/Repository/ContentSubhypergraph.php
index b25c7452294..19aac2de5cb 100644
--- a/Neos.ContentGraph.PostgreSQLAdapter/src/Domain/Repository/ContentSubhypergraph.php
+++ b/Neos.ContentGraph.PostgreSQLAdapter/src/Domain/Repository/ContentSubhypergraph.php
@@ -533,7 +533,7 @@ private function findNodeByPathFromStartingNode(NodePath $path, Node $startingNo
         $currentNode = $startingNode;
         foreach ($path->getParts() as $edgeName) {
             // id exists here :)
-            $currentNode = $this->findChildNodeConnectedThroughEdgeName($currentNode->nodeAggregateId, $edgeName);
+            $currentNode = $this->findChildNodeConnectedThroughEdgeName($currentNode->aggregateId, $edgeName);
             if ($currentNode === null) {
                 return null;
             }
diff --git a/Neos.ContentRepository.Core/Classes/Feature/Common/NodeCreationInternals.php b/Neos.ContentRepository.Core/Classes/Feature/Common/NodeCreationInternals.php
index ef78ca2d0da..5a7e2ff42e4 100644
--- a/Neos.ContentRepository.Core/Classes/Feature/Common/NodeCreationInternals.php
+++ b/Neos.ContentRepository.Core/Classes/Feature/Common/NodeCreationInternals.php
@@ -59,21 +59,21 @@ private function resolveInterdimensionalSiblingsForCreation(
                 // a) happy path, the explicitly requested succeeding sibling also exists in this dimension space point
                 $interdimensionalSiblings[] = new InterdimensionalSibling(
                     $coveredDimensionSpacePoint,
-                    $variantSucceedingSibling->nodeAggregateId,
+                    $variantSucceedingSibling->aggregateId,
                 );
                 continue;
             }
 
             // check the other siblings succeeding in the origin dimension space point
             foreach ($originAlternativeSucceedingSiblings as $originSibling) {
-                $alternativeVariantSucceedingSibling = $subGraph->findNodeById($originSibling->nodeAggregateId);
+                $alternativeVariantSucceedingSibling = $subGraph->findNodeById($originSibling->aggregateId);
                 if (!$alternativeVariantSucceedingSibling) {
                     continue;
                 }
                 // b) one of the further succeeding sibling exists in this dimension space point
                 $interdimensionalSiblings[] = new InterdimensionalSibling(
                     $coveredDimensionSpacePoint,
-                    $alternativeVariantSucceedingSibling->nodeAggregateId,
+                    $alternativeVariantSucceedingSibling->aggregateId,
                 );
                 continue 2;
             }
diff --git a/Neos.ContentRepository.Core/Classes/Feature/Common/NodeVariationInternals.php b/Neos.ContentRepository.Core/Classes/Feature/Common/NodeVariationInternals.php
index 08aaa79770a..02d278a193e 100644
--- a/Neos.ContentRepository.Core/Classes/Feature/Common/NodeVariationInternals.php
+++ b/Neos.ContentRepository.Core/Classes/Feature/Common/NodeVariationInternals.php
@@ -282,14 +282,14 @@ private function resolveInterdimensionalSiblings(
         foreach ($variantCoverage as $variantDimensionSpacePoint) {
             // check the siblings succeeding in the origin dimension space point
             foreach ($originSiblings as $originSibling) {
-                $variantSibling = $contentGraph->getSubgraph($variantDimensionSpacePoint, VisibilityConstraints::withoutRestrictions())->findNodeById($originSibling->nodeAggregateId);
+                $variantSibling = $contentGraph->getSubgraph($variantDimensionSpacePoint, VisibilityConstraints::withoutRestrictions())->findNodeById($originSibling->aggregateId);
                 if (!$variantSibling) {
                     continue;
                 }
                 // a) one of the further succeeding sibling exists in this dimension space point
                 $interdimensionalSiblings[] = new InterdimensionalSibling(
                     $variantDimensionSpacePoint,
-                    $variantSibling->nodeAggregateId,
+                    $variantSibling->aggregateId,
                 );
                 continue 2;
             }
diff --git a/Neos.ContentRepository.Core/Classes/Feature/NodeDuplication/Dto/NodeSubtreeSnapshot.php b/Neos.ContentRepository.Core/Classes/Feature/NodeDuplication/Dto/NodeSubtreeSnapshot.php
index 8d24085c5f7..216358c808c 100644
--- a/Neos.ContentRepository.Core/Classes/Feature/NodeDuplication/Dto/NodeSubtreeSnapshot.php
+++ b/Neos.ContentRepository.Core/Classes/Feature/NodeDuplication/Dto/NodeSubtreeSnapshot.php
@@ -46,20 +46,20 @@ public static function fromSubgraphAndStartNode(ContentSubgraphInterface $subgra
     {
         $childNodes = [];
         foreach (
-            $subgraph->findChildNodes($sourceNode->nodeAggregateId, FindChildNodesFilter::create()) as $sourceChildNode
+            $subgraph->findChildNodes($sourceNode->aggregateId, FindChildNodesFilter::create()) as $sourceChildNode
         ) {
             $childNodes[] = self::fromSubgraphAndStartNode($subgraph, $sourceChildNode);
         }
         $properties = $sourceNode->properties;
 
         return new self(
-            $sourceNode->nodeAggregateId,
+            $sourceNode->aggregateId,
             $sourceNode->nodeTypeName,
             $sourceNode->nodeName,
             $sourceNode->classification,
             $properties->serialized(),
             NodeReferencesSnapshot::fromReferences(
-                $subgraph->findReferences($sourceNode->nodeAggregateId, FindReferencesFilter::create())
+                $subgraph->findReferences($sourceNode->aggregateId, FindReferencesFilter::create())
             ),
             $childNodes
         );
diff --git a/Neos.ContentRepository.Core/Classes/Feature/NodeMove/NodeMove.php b/Neos.ContentRepository.Core/Classes/Feature/NodeMove/NodeMove.php
index 055407245ee..c9883cb668d 100644
--- a/Neos.ContentRepository.Core/Classes/Feature/NodeMove/NodeMove.php
+++ b/Neos.ContentRepository.Core/Classes/Feature/NodeMove/NodeMove.php
@@ -273,13 +273,13 @@ private function resolveInterdimensionalSiblingsForMove(
             );
             if ($succeedingSiblingId) {
                 $variantSucceedingSibling = $variantSubgraph->findNodeById($succeedingSiblingId);
-                $variantParentId = $parentNodeAggregateId ?: $variantSubgraph->findParentNode($nodeAggregateId)?->nodeAggregateId;
+                $variantParentId = $parentNodeAggregateId ?: $variantSubgraph->findParentNode($nodeAggregateId)?->aggregateId;
                 $siblingParent = $variantSubgraph->findParentNode($succeedingSiblingId);
-                if ($variantSucceedingSibling && $siblingParent && $variantParentId?->equals($siblingParent->nodeAggregateId)) {
+                if ($variantSucceedingSibling && $siblingParent && $variantParentId?->equals($siblingParent->aggregateId)) {
                     // a) happy path, the explicitly requested succeeding sibling also exists in this dimension space point
                     $interdimensionalSiblings[] = new InterdimensionalSibling(
                         $dimensionSpacePoint,
-                        $variantSucceedingSibling->nodeAggregateId,
+                        $variantSucceedingSibling->aggregateId,
                     );
                     continue;
                 }
@@ -295,13 +295,13 @@ private function resolveInterdimensionalSiblingsForMove(
                         continue;
                     }
                     $siblingParent = $variantSubgraph->findParentNode($alternativeSucceedingSiblingId);
-                    if (!$siblingParent || !$variantParentId?->equals($siblingParent->nodeAggregateId)) {
+                    if (!$siblingParent || !$variantParentId?->equals($siblingParent->aggregateId)) {
                         continue;
                     }
                     // b) one of the further succeeding sibling exists in this dimension space point
                     $interdimensionalSiblings[] = new InterdimensionalSibling(
                         $dimensionSpacePoint,
-                        $alternativeVariantSucceedingSibling->nodeAggregateId,
+                        $alternativeVariantSucceedingSibling->aggregateId,
                     );
                     continue 2;
                 }
@@ -310,9 +310,9 @@ private function resolveInterdimensionalSiblingsForMove(
             if ($precedingSiblingId) {
                 $variantPrecedingSiblingId = null;
                 $variantPrecedingSibling = $variantSubgraph->findNodeById($precedingSiblingId);
-                $variantParentId = $parentNodeAggregateId ?: $variantSubgraph->findParentNode($nodeAggregateId)?->nodeAggregateId;
+                $variantParentId = $parentNodeAggregateId ?: $variantSubgraph->findParentNode($nodeAggregateId)?->aggregateId;
                 $siblingParent = $variantSubgraph->findParentNode($precedingSiblingId);
-                if ($variantPrecedingSibling && $siblingParent && $variantParentId?->equals($siblingParent->nodeAggregateId)) {
+                if ($variantPrecedingSibling && $siblingParent && $variantParentId?->equals($siblingParent->aggregateId)) {
                     // c) happy path, the explicitly requested preceding sibling also exists in this dimension space point
                     $variantPrecedingSiblingId = $precedingSiblingId;
                 } elseif ($alternativePrecedingSiblingIds) {
@@ -323,7 +323,7 @@ private function resolveInterdimensionalSiblingsForMove(
                             continue;
                         }
                         $siblingParent = $variantSubgraph->findParentNode($alternativePrecedingSiblingId);
-                        if (!$siblingParent || !$variantParentId?->equals($siblingParent->nodeAggregateId)) {
+                        if (!$siblingParent || !$variantParentId?->equals($siblingParent->aggregateId)) {
                             continue;
                         }
                         $alternativeVariantSucceedingSibling = $variantSubgraph->findNodeById($alternativePrecedingSiblingId);
diff --git a/Neos.ContentRepository.Core/Classes/Feature/NodeTypeChange/NodeTypeChange.php b/Neos.ContentRepository.Core/Classes/Feature/NodeTypeChange/NodeTypeChange.php
index 9b8fe91d363..08ce951665f 100644
--- a/Neos.ContentRepository.Core/Classes/Feature/NodeTypeChange/NodeTypeChange.php
+++ b/Neos.ContentRepository.Core/Classes/Feature/NodeTypeChange/NodeTypeChange.php
@@ -188,7 +188,7 @@ private function handleChangeNodeAggregateType(
                     VisibilityConstraints::withoutRestrictions()
                 )->findNodeByPath(
                     $tetheredNodeTypeDefinition->name,
-                    $node->nodeAggregateId,
+                    $node->aggregateId,
                 );
 
                 if ($tetheredNode === null) {
@@ -404,7 +404,7 @@ private function findDimensionSpacePointsConnectingParentAndChildAggregate(
             );
             if (
                 $parentNode
-                && $parentNode->nodeAggregateId->equals($parentNodeAggregate->nodeAggregateId)
+                && $parentNode->aggregateId->equals($parentNodeAggregate->nodeAggregateId)
             ) {
                 $points[] = $coveredDimensionSpacePoint;
             }
diff --git a/Neos.ContentRepository.Core/Classes/Projection/ContentGraph/AbsoluteNodePath.php b/Neos.ContentRepository.Core/Classes/Projection/ContentGraph/AbsoluteNodePath.php
index 3968d06abac..794a94e3f94 100644
--- a/Neos.ContentRepository.Core/Classes/Projection/ContentGraph/AbsoluteNodePath.php
+++ b/Neos.ContentRepository.Core/Classes/Projection/ContentGraph/AbsoluteNodePath.php
@@ -88,8 +88,8 @@ public static function fromLeafNodeAndAncestors(Node $leafNode, Nodes $ancestors
             }
             if (!$ancestor->nodeName) {
                 throw new \InvalidArgumentException(
-                    'Could not resolve node path for node ' . $leafNode->nodeAggregateId->value
-                    . ', ancestor ' . $ancestor->nodeAggregateId->value . ' is unnamed.',
+                    'Could not resolve node path for node ' . $leafNode->aggregateId->value
+                    . ', ancestor ' . $ancestor->aggregateId->value . ' is unnamed.',
                     1687509348
                 );
             }
diff --git a/Neos.ContentRepository.Core/Classes/Projection/ContentGraph/ContentGraphWithRuntimeCaches/ContentSubgraphWithRuntimeCaches.php b/Neos.ContentRepository.Core/Classes/Projection/ContentGraph/ContentGraphWithRuntimeCaches/ContentSubgraphWithRuntimeCaches.php
index 72510b43e62..6f0a49ef84f 100644
--- a/Neos.ContentRepository.Core/Classes/Projection/ContentGraph/ContentGraphWithRuntimeCaches/ContentSubgraphWithRuntimeCaches.php
+++ b/Neos.ContentRepository.Core/Classes/Projection/ContentGraph/ContentGraphWithRuntimeCaches/ContentSubgraphWithRuntimeCaches.php
@@ -91,8 +91,8 @@ public function findChildNodes(NodeAggregateId $parentNodeAggregateId, FindChild
         $childNodes = $this->wrappedContentSubgraph->findChildNodes($parentNodeAggregateId, $filter);
         foreach ($childNodes as $node) {
             $namedChildNodeCache->add($parentNodeAggregateId, $node->nodeName, $node);
-            $parentNodeIdCache->add($node->nodeAggregateId, $parentNodeAggregateId);
-            $nodeByIdCache->add($node->nodeAggregateId, $node);
+            $parentNodeIdCache->add($node->aggregateId, $parentNodeAggregateId);
+            $nodeByIdCache->add($node->aggregateId, $node);
         }
         $childNodesCache->add($parentNodeAggregateId, $filter->nodeTypes, $childNodes);
         return $childNodes;
@@ -174,10 +174,10 @@ public function findParentNode(NodeAggregateId $childNodeAggregateId): ?Node
             $parentNodeIdCache->rememberNonExistingParentNode($childNodeAggregateId);
             return null;
         }
-        $parentNodeIdCache->add($childNodeAggregateId, $parentNode->nodeAggregateId);
+        $parentNodeIdCache->add($childNodeAggregateId, $parentNode->aggregateId);
         // we also add the parent node to the NodeAggregateId => Node cache;
         // as this might improve cache hit rates as well.
-        $this->inMemoryCache->getNodeByNodeAggregateIdCache()->add($parentNode->nodeAggregateId, $parentNode);
+        $this->inMemoryCache->getNodeByNodeAggregateIdCache()->add($parentNode->aggregateId, $parentNode);
         return $parentNode;
     }
 
diff --git a/Neos.ContentRepository.Core/Classes/Projection/ContentGraph/ContentSubgraphIdentity.php b/Neos.ContentRepository.Core/Classes/Projection/ContentGraph/ContentSubgraphIdentity.php
index 8c00f8e1268..086d508b32d 100644
--- a/Neos.ContentRepository.Core/Classes/Projection/ContentGraph/ContentSubgraphIdentity.php
+++ b/Neos.ContentRepository.Core/Classes/Projection/ContentGraph/ContentSubgraphIdentity.php
@@ -15,7 +15,7 @@
  * - {@see visibilityConstraints}
  *
  * In addition to the above subgraph identity, a Node's read model identity is further described
- * by {@see Node::$nodeAggregateId}.
+ * by {@see Node::$aggregateId}.
  *
  * With the above information, you can fetch a Subgraph directly by using
  * {@see \Neos\ContentRepositoryRegistry\ContentRepositoryRegistry::subgraphForNode()}.
diff --git a/Neos.ContentRepository.Core/Classes/Projection/ContentGraph/Nodes.php b/Neos.ContentRepository.Core/Classes/Projection/ContentGraph/Nodes.php
index 13fc62b379a..4c4d3688a68 100644
--- a/Neos.ContentRepository.Core/Classes/Projection/ContentGraph/Nodes.php
+++ b/Neos.ContentRepository.Core/Classes/Projection/ContentGraph/Nodes.php
@@ -147,7 +147,7 @@ private function getNodeIndex(Node $subject): int
         }
         throw new \InvalidArgumentException(sprintf(
             'The node %s does not exist in this set',
-            $subject->nodeAggregateId->value
+            $subject->aggregateId->value
         ), 1542901216);
     }
 
@@ -210,7 +210,7 @@ public function map(\Closure $callback): array
     public function toNodeAggregateIds(): NodeAggregateIds
     {
         return NodeAggregateIds::create(...$this->map(
-            fn (Node $node): NodeAggregateId => $node->nodeAggregateId,
+            fn (Node $node): NodeAggregateId => $node->aggregateId,
         ));
     }
 }
diff --git a/Neos.ContentRepository.Core/Classes/SharedModel/Node/NodeAddress.php b/Neos.ContentRepository.Core/Classes/SharedModel/Node/NodeAddress.php
index d085a58686c..4025758bd8d 100644
--- a/Neos.ContentRepository.Core/Classes/SharedModel/Node/NodeAddress.php
+++ b/Neos.ContentRepository.Core/Classes/SharedModel/Node/NodeAddress.php
@@ -55,7 +55,7 @@ public static function fromNode(Node $node): self
             $node->contentRepositoryId,
             $node->workspaceName,
             $node->dimensionSpacePoint,
-            $node->nodeAggregateId
+            $node->aggregateId
         );
     }
 
diff --git a/Neos.ContentRepository.Core/Classes/SharedModel/Node/NodeAggregateIds.php b/Neos.ContentRepository.Core/Classes/SharedModel/Node/NodeAggregateIds.php
index 01f89fa2401..f8abbbcc3d7 100644
--- a/Neos.ContentRepository.Core/Classes/SharedModel/Node/NodeAggregateIds.php
+++ b/Neos.ContentRepository.Core/Classes/SharedModel/Node/NodeAggregateIds.php
@@ -71,7 +71,7 @@ public static function fromJsonString(string $jsonString): self
     public static function fromNodes(Nodes $nodes): self
     {
         return self::fromArray(
-            array_map(fn(Node $node) => $node->nodeAggregateId, iterator_to_array($nodes))
+            array_map(fn(Node $node) => $node->aggregateId, iterator_to_array($nodes))
         );
     }
 
diff --git a/Neos.ContentRepository.NodeAccess/Classes/FlowQueryOperations/BackReferenceNodesOperation.php b/Neos.ContentRepository.NodeAccess/Classes/FlowQueryOperations/BackReferenceNodesOperation.php
index 2f8d2a456b8..99013a906ce 100644
--- a/Neos.ContentRepository.NodeAccess/Classes/FlowQueryOperations/BackReferenceNodesOperation.php
+++ b/Neos.ContentRepository.NodeAccess/Classes/FlowQueryOperations/BackReferenceNodesOperation.php
@@ -73,7 +73,7 @@ public function evaluate(FlowQuery $flowQuery, array $arguments): void
         /** @var Node $contextNode */
         foreach ($flowQuery->getContext() as $contextNode) {
             $subgraph = $this->contentRepositoryRegistry->subgraphForNode($contextNode);
-            $output[] = iterator_to_array($subgraph->findBackReferences($contextNode->nodeAggregateId, $filter));
+            $output[] = iterator_to_array($subgraph->findBackReferences($contextNode->aggregateId, $filter));
         }
         $flowQuery->setContext(array_map(fn(Reference $reference) => $reference->node, array_merge(...$output)));
     }
diff --git a/Neos.ContentRepository.NodeAccess/Classes/FlowQueryOperations/BackReferencesOperation.php b/Neos.ContentRepository.NodeAccess/Classes/FlowQueryOperations/BackReferencesOperation.php
index f6b159b570e..8056ab41891 100644
--- a/Neos.ContentRepository.NodeAccess/Classes/FlowQueryOperations/BackReferencesOperation.php
+++ b/Neos.ContentRepository.NodeAccess/Classes/FlowQueryOperations/BackReferencesOperation.php
@@ -79,7 +79,7 @@ public function evaluate(FlowQuery $flowQuery, array $arguments): void
         /** @var Node $contextNode */
         foreach ($flowQuery->getContext() as $contextNode) {
             $subgraph = $this->contentRepositoryRegistry->subgraphForNode($contextNode);
-            $output[] = iterator_to_array($subgraph->findBackReferences($contextNode->nodeAggregateId, $filter));
+            $output[] = iterator_to_array($subgraph->findBackReferences($contextNode->aggregateId, $filter));
         }
         $flowQuery->setContext(array_merge(...$output));
     }
diff --git a/Neos.ContentRepository.NodeAccess/Classes/FlowQueryOperations/ChildrenOperation.php b/Neos.ContentRepository.NodeAccess/Classes/FlowQueryOperations/ChildrenOperation.php
index 363713b6684..c28c110209a 100644
--- a/Neos.ContentRepository.NodeAccess/Classes/FlowQueryOperations/ChildrenOperation.php
+++ b/Neos.ContentRepository.NodeAccess/Classes/FlowQueryOperations/ChildrenOperation.php
@@ -83,11 +83,11 @@ public function evaluate(FlowQuery $flowQuery, array $arguments)
         /** @var Node $contextNode */
         foreach ($flowQuery->getContext() as $contextNode) {
             $childNodes = $this->contentRepositoryRegistry->subgraphForNode($contextNode)
-                ->findChildNodes($contextNode->nodeAggregateId, FindChildNodesFilter::create());
+                ->findChildNodes($contextNode->aggregateId, FindChildNodesFilter::create());
             foreach ($childNodes as $childNode) {
-                if (!isset($outputNodeAggregateIds[$childNode->nodeAggregateId->value])) {
+                if (!isset($outputNodeAggregateIds[$childNode->aggregateId->value])) {
                     $output[] = $childNode;
-                    $outputNodeAggregateIds[$childNode->nodeAggregateId->value] = true;
+                    $outputNodeAggregateIds[$childNode->aggregateId->value] = true;
                 }
             }
         }
@@ -142,14 +142,14 @@ protected function earlyOptimizationOfFilters(FlowQuery $flowQuery, array $parse
                         $resolvedNode = $this->contentRepositoryRegistry->subgraphForNode($contextNode)
                             ->findNodeByPath(
                                 NodePath::fromString($nodePath),
-                                $contextNode->nodeAggregateId,
+                                $contextNode->aggregateId,
                             );
 
                         if (!is_null($resolvedNode) && !isset($filteredOutputNodeIdentifiers[
-                            $resolvedNode->nodeAggregateId->value
+                            $resolvedNode->aggregateId->value
                         ])) {
                             $filteredOutput[] = $resolvedNode;
-                            $filteredOutputNodeIdentifiers[$resolvedNode->nodeAggregateId->value] = true;
+                            $filteredOutputNodeIdentifiers[$resolvedNode->aggregateId->value] = true;
                         }
                     }
                 } elseif (count($instanceOfFilters) > 0) {
@@ -161,7 +161,7 @@ protected function earlyOptimizationOfFilters(FlowQuery $flowQuery, array $parse
                     foreach ($flowQuery->getContext() as $contextNode) {
                         $childNodes = $this->contentRepositoryRegistry->subgraphForNode($contextNode)
                             ->findChildNodes(
-                            $contextNode->nodeAggregateId,
+                            $contextNode->aggregateId,
                             FindChildNodesFilter::create(
                                 nodeTypes: NodeTypeCriteria::create(
                                     NodeTypeNames::fromStringArray($allowedNodeTypes),
@@ -172,10 +172,10 @@ protected function earlyOptimizationOfFilters(FlowQuery $flowQuery, array $parse
 
                         foreach ($childNodes as $childNode) {
                             if (!isset($filteredOutputNodeIdentifiers[
-                                $childNode->nodeAggregateId->value
+                                $childNode->aggregateId->value
                             ])) {
                                 $filteredOutput[] = $childNode;
-                                $filteredOutputNodeIdentifiers[$childNode->nodeAggregateId->value] = true;
+                                $filteredOutputNodeIdentifiers[$childNode->aggregateId->value] = true;
                             }
                         }
                     }
@@ -198,7 +198,7 @@ protected function earlyOptimizationOfFilters(FlowQuery $flowQuery, array $parse
                 /** @var Node $filteredNode */
                 foreach ($filteredOutput as $filteredNode) {
                     /** @phpstan-ignore-next-line undefined behaviour https://github.com/neos/neos-development-collection/issues/4507#issuecomment-1784123143 */
-                    if (!isset($outputNodeAggregateIds[$filteredNode->nodeAggregateId->value])) {
+                    if (!isset($outputNodeAggregateIds[$filteredNode->aggregateId->value])) {
                         $output[] = $filteredNode;
                     }
                 }
diff --git a/Neos.ContentRepository.NodeAccess/Classes/FlowQueryOperations/ClosestOperation.php b/Neos.ContentRepository.NodeAccess/Classes/FlowQueryOperations/ClosestOperation.php
index 121bcc3eb5f..782249ae878 100644
--- a/Neos.ContentRepository.NodeAccess/Classes/FlowQueryOperations/ClosestOperation.php
+++ b/Neos.ContentRepository.NodeAccess/Classes/FlowQueryOperations/ClosestOperation.php
@@ -75,7 +75,7 @@ public function evaluate(FlowQuery $flowQuery, array $arguments)
 
             foreach ($contextNodeQuery as $result) {
                 /* @var Node $result */
-                $output[$result->nodeAggregateId->value] = $result;
+                $output[$result->aggregateId->value] = $result;
             }
         }
 
diff --git a/Neos.ContentRepository.NodeAccess/Classes/FlowQueryOperations/CreateNodeHashTrait.php b/Neos.ContentRepository.NodeAccess/Classes/FlowQueryOperations/CreateNodeHashTrait.php
index 8475f3ddcbd..3f17459b930 100644
--- a/Neos.ContentRepository.NodeAccess/Classes/FlowQueryOperations/CreateNodeHashTrait.php
+++ b/Neos.ContentRepository.NodeAccess/Classes/FlowQueryOperations/CreateNodeHashTrait.php
@@ -20,7 +20,7 @@ protected function createNodeHash(Node $node): string
             implode(
                 ':',
                 [
-                    $node->nodeAggregateId->value,
+                    $node->aggregateId->value,
                     $node->contentRepositoryId->value,
                     $node->workspaceName->value,
                     $node->dimensionSpacePoint->hash,
diff --git a/Neos.ContentRepository.NodeAccess/Classes/FlowQueryOperations/FilterOperation.php b/Neos.ContentRepository.NodeAccess/Classes/FlowQueryOperations/FilterOperation.php
index ea12e20c0b1..5b79de1c9da 100644
--- a/Neos.ContentRepository.NodeAccess/Classes/FlowQueryOperations/FilterOperation.php
+++ b/Neos.ContentRepository.NodeAccess/Classes/FlowQueryOperations/FilterOperation.php
@@ -107,7 +107,7 @@ protected function matchesPropertyNameFilter($element, $propertyNameFilter)
      */
     protected function matchesIdentifierFilter($element, $identifier)
     {
-        return (strtolower($element->nodeAggregateId->value) === strtolower($identifier));
+        return (strtolower($element->aggregateId->value) === strtolower($identifier));
     }
 
     /**
@@ -121,7 +121,7 @@ protected function getPropertyPath($element, $propertyPath)
     {
         if ($propertyPath === '_identifier') {
             // TODO: deprecated (Neos <9 case)
-            return $element->nodeAggregateId->value;
+            return $element->aggregateId->value;
         } elseif ($propertyPath[0] === '_') {
             return ObjectAccess::getPropertyPath($element, substr($propertyPath, 1));
         } else {
diff --git a/Neos.ContentRepository.NodeAccess/Classes/FlowQueryOperations/FindOperation.php b/Neos.ContentRepository.NodeAccess/Classes/FlowQueryOperations/FindOperation.php
index c3f5908b6e1..b34ac65895c 100644
--- a/Neos.ContentRepository.NodeAccess/Classes/FlowQueryOperations/FindOperation.php
+++ b/Neos.ContentRepository.NodeAccess/Classes/FlowQueryOperations/FindOperation.php
@@ -252,7 +252,7 @@ protected function addNodesByPath(NodePath|AbsoluteNodePath $nodePath, array $en
                 if ($nodePath instanceof AbsoluteNodePath) {
                     $nodeByPath = $subgraph->findNodeByAbsolutePath($nodePath);
                 } else {
-                    $nodeByPath = $subgraph->findNodeByPath($nodePath, $node->nodeAggregateId);
+                    $nodeByPath = $subgraph->findNodeByPath($nodePath, $node->aggregateId);
                 }
                 if (isset($nodeByPath)) {
                     $result[] = $nodeByPath;
@@ -277,7 +277,7 @@ protected function addNodesByType(NodeTypeName $nodeTypeName, array $entryPoints
 
             /** @var Node $node */
             foreach ($entryPoint['nodes'] as $node) {
-                foreach ($subgraph->findDescendantNodes($node->nodeAggregateId, FindDescendantNodesFilter::create(nodeTypes: $nodeTypeFilter)) as $descendant) {
+                foreach ($subgraph->findDescendantNodes($node->aggregateId, FindDescendantNodesFilter::create(nodeTypes: $nodeTypeFilter)) as $descendant) {
                     $result[] = $descendant;
                 }
             }
diff --git a/Neos.ContentRepository.NodeAccess/Classes/FlowQueryOperations/HasOperation.php b/Neos.ContentRepository.NodeAccess/Classes/FlowQueryOperations/HasOperation.php
index bf522838cbd..0b01c624fbe 100644
--- a/Neos.ContentRepository.NodeAccess/Classes/FlowQueryOperations/HasOperation.php
+++ b/Neos.ContentRepository.NodeAccess/Classes/FlowQueryOperations/HasOperation.php
@@ -100,7 +100,7 @@ public function evaluate(FlowQuery $flowQuery, array $arguments)
             foreach ($elements as $element) {
                 if ($element instanceof Node) {
                     $parent = $this->contentRepositoryRegistry->subgraphForNode($element)
-                        ->findParentNode($element->nodeAggregateId);
+                        ->findParentNode($element->aggregateId);
                     if (!is_null($parent)) {
                         foreach ($context as $contextElement) {
                             /** @var Node $contextElement */
diff --git a/Neos.ContentRepository.NodeAccess/Classes/FlowQueryOperations/IdOperation.php b/Neos.ContentRepository.NodeAccess/Classes/FlowQueryOperations/IdOperation.php
index d98ad6ee3c8..8d2a13fc4ed 100644
--- a/Neos.ContentRepository.NodeAccess/Classes/FlowQueryOperations/IdOperation.php
+++ b/Neos.ContentRepository.NodeAccess/Classes/FlowQueryOperations/IdOperation.php
@@ -74,6 +74,6 @@ public function evaluate(FlowQuery $flowQuery, array $arguments)
         if (!$node instanceof Node) {
             return null;
         }
-        return $node->nodeAggregateId->value;
+        return $node->aggregateId->value;
     }
 }
diff --git a/Neos.ContentRepository.NodeAccess/Classes/FlowQueryOperations/NextAllOperation.php b/Neos.ContentRepository.NodeAccess/Classes/FlowQueryOperations/NextAllOperation.php
index 881f39c97bd..89bc14f75f9 100644
--- a/Neos.ContentRepository.NodeAccess/Classes/FlowQueryOperations/NextAllOperation.php
+++ b/Neos.ContentRepository.NodeAccess/Classes/FlowQueryOperations/NextAllOperation.php
@@ -74,8 +74,8 @@ public function evaluate(FlowQuery $flowQuery, array $arguments)
                     FindSucceedingSiblingNodesFilter::create()
                 );
             foreach ($nextNodes as $nextNode) {
-                if ($nextNode !== null && !isset($outputNodePaths[$nextNode->nodeAggregateId->value])) {
-                    $outputNodePaths[$nextNode->nodeAggregateId->value] = true;
+                if ($nextNode !== null && !isset($outputNodePaths[$nextNode->aggregateId->value])) {
+                    $outputNodePaths[$nextNode->aggregateId->value] = true;
                     $output[] = $nextNode;
                 }
             }
diff --git a/Neos.ContentRepository.NodeAccess/Classes/FlowQueryOperations/NextOperation.php b/Neos.ContentRepository.NodeAccess/Classes/FlowQueryOperations/NextOperation.php
index 6a35910db12..9903cb806cb 100644
--- a/Neos.ContentRepository.NodeAccess/Classes/FlowQueryOperations/NextOperation.php
+++ b/Neos.ContentRepository.NodeAccess/Classes/FlowQueryOperations/NextOperation.php
@@ -74,8 +74,8 @@ public function evaluate(FlowQuery $flowQuery, array $arguments)
                     $contextNode->nodeAggregateId,
                     FindSucceedingSiblingNodesFilter::create()
                 )->first();
-            if ($nextNode !== null && !isset($outputNodePaths[$nextNode->nodeAggregateId->value])) {
-                $outputNodePaths[$nextNode->nodeAggregateId->value] = true;
+            if ($nextNode !== null && !isset($outputNodePaths[$nextNode->aggregateId->value])) {
+                $outputNodePaths[$nextNode->aggregateId->value] = true;
                 $output[] = $nextNode;
             }
         }
diff --git a/Neos.ContentRepository.NodeAccess/Classes/FlowQueryOperations/NextUntilOperation.php b/Neos.ContentRepository.NodeAccess/Classes/FlowQueryOperations/NextUntilOperation.php
index 750a13a6d6b..e79d0fe7dc2 100644
--- a/Neos.ContentRepository.NodeAccess/Classes/FlowQueryOperations/NextUntilOperation.php
+++ b/Neos.ContentRepository.NodeAccess/Classes/FlowQueryOperations/NextUntilOperation.php
@@ -87,8 +87,8 @@ public function evaluate(FlowQuery $flowQuery, array $arguments)
             }
             foreach ($nextNodes as $nextNode) {
                 if ($nextNode !== null
-                    && !isset($outputNodeIdentifiers[$nextNode->nodeAggregateId->value])) {
-                    $outputNodeIdentifiers[$nextNode->nodeAggregateId->value] = true;
+                    && !isset($outputNodeIdentifiers[$nextNode->aggregateId->value])) {
+                    $outputNodeIdentifiers[$nextNode->aggregateId->value] = true;
                     $output[] = $nextNode;
                 }
             }
diff --git a/Neos.ContentRepository.NodeAccess/Classes/FlowQueryOperations/ParentOperation.php b/Neos.ContentRepository.NodeAccess/Classes/FlowQueryOperations/ParentOperation.php
index 57f1037f6e1..fb3f84f41d3 100644
--- a/Neos.ContentRepository.NodeAccess/Classes/FlowQueryOperations/ParentOperation.php
+++ b/Neos.ContentRepository.NodeAccess/Classes/FlowQueryOperations/ParentOperation.php
@@ -69,14 +69,14 @@ public function evaluate(FlowQuery $flowQuery, array $arguments)
         foreach ($flowQuery->getContext() as $contextNode) {
             /* @var $contextNode Node */
             $parentNode = $this->contentRepositoryRegistry->subgraphForNode($contextNode)
-                ->findParentNode($contextNode->nodeAggregateId);
+                ->findParentNode($contextNode->aggregateId);
             if ($parentNode === null) {
                 continue;
             }
 
-            if (!isset($outputNodeAggregateIds[$parentNode->nodeAggregateId->value])) {
+            if (!isset($outputNodeAggregateIds[$parentNode->aggregateId->value])) {
                 $output[] = $parentNode;
-                $outputNodeAggregateIds[$parentNode->nodeAggregateId->value] = true;
+                $outputNodeAggregateIds[$parentNode->aggregateId->value] = true;
             }
         }
 
diff --git a/Neos.ContentRepository.NodeAccess/Classes/FlowQueryOperations/ParentsOperation.php b/Neos.ContentRepository.NodeAccess/Classes/FlowQueryOperations/ParentsOperation.php
index 150f0e57b1b..7d31223ef51 100644
--- a/Neos.ContentRepository.NodeAccess/Classes/FlowQueryOperations/ParentsOperation.php
+++ b/Neos.ContentRepository.NodeAccess/Classes/FlowQueryOperations/ParentsOperation.php
@@ -80,7 +80,7 @@ public function evaluate(FlowQuery $flowQuery, array $arguments)
             $ancestorNodes = $this->contentRepositoryRegistry
                 ->subgraphForNode($contextNode)
                 ->findAncestorNodes(
-                    $contextNode->nodeAggregateId,
+                    $contextNode->aggregateId,
                     $findAncestorNodesFilter
                 );
             $parents = $parents->merge($ancestorNodes);
diff --git a/Neos.ContentRepository.NodeAccess/Classes/FlowQueryOperations/ParentsUntilOperation.php b/Neos.ContentRepository.NodeAccess/Classes/FlowQueryOperations/ParentsUntilOperation.php
index 1a830b86130..864aa5276c4 100644
--- a/Neos.ContentRepository.NodeAccess/Classes/FlowQueryOperations/ParentsUntilOperation.php
+++ b/Neos.ContentRepository.NodeAccess/Classes/FlowQueryOperations/ParentsUntilOperation.php
@@ -92,8 +92,8 @@ public function evaluate(FlowQuery $flowQuery, array $arguments)
             }
             foreach ($parentNodes as $parentNode) {
                 if ($parentNode !== null
-                    && !isset($outputNodeAggregateIds[$parentNode->nodeAggregateId->value])) {
-                    $outputNodeAggregateIds[$parentNode->nodeAggregateId->value] = true;
+                    && !isset($outputNodeAggregateIds[$parentNode->aggregateId->value])) {
+                    $outputNodeAggregateIds[$parentNode->aggregateId->value] = true;
                     $output[] = $parentNode;
                 }
             }
diff --git a/Neos.ContentRepository.NodeAccess/Classes/FlowQueryOperations/PrevAllOperation.php b/Neos.ContentRepository.NodeAccess/Classes/FlowQueryOperations/PrevAllOperation.php
index 66a26d21650..f646c63c5cf 100644
--- a/Neos.ContentRepository.NodeAccess/Classes/FlowQueryOperations/PrevAllOperation.php
+++ b/Neos.ContentRepository.NodeAccess/Classes/FlowQueryOperations/PrevAllOperation.php
@@ -75,9 +75,9 @@ public function evaluate(FlowQuery $flowQuery, array $arguments)
                 )->reverse();
             foreach ($prevNodes as $prevNode) {
                 if ($prevNode !== null
-                    && !isset($outputNodeAggregateIds[$prevNode->nodeAggregateId->value])
+                    && !isset($outputNodeAggregateIds[$prevNode->aggregateId->value])
                 ) {
-                    $outputNodeAggregateIds[$prevNode->nodeAggregateId->value] = true;
+                    $outputNodeAggregateIds[$prevNode->aggregateId->value] = true;
                     $output[] = $prevNode;
                 }
             }
diff --git a/Neos.ContentRepository.NodeAccess/Classes/FlowQueryOperations/PrevOperation.php b/Neos.ContentRepository.NodeAccess/Classes/FlowQueryOperations/PrevOperation.php
index 96793bae77c..a50f0eacd47 100644
--- a/Neos.ContentRepository.NodeAccess/Classes/FlowQueryOperations/PrevOperation.php
+++ b/Neos.ContentRepository.NodeAccess/Classes/FlowQueryOperations/PrevOperation.php
@@ -73,8 +73,8 @@ public function evaluate(FlowQuery $flowQuery, array $arguments): void
                     $contextNode->nodeAggregateId,
                     FindPrecedingSiblingNodesFilter::create()
                 )->first();
-            if ($previousNode !== null && !isset($outputNodePaths[$previousNode->nodeAggregateId->value])) {
-                $outputNodePaths[$previousNode->nodeAggregateId->value] = true;
+            if ($previousNode !== null && !isset($outputNodePaths[$previousNode->aggregateId->value])) {
+                $outputNodePaths[$previousNode->aggregateId->value] = true;
                 $output[] = $previousNode;
             }
         }
diff --git a/Neos.ContentRepository.NodeAccess/Classes/FlowQueryOperations/PrevUntilOperation.php b/Neos.ContentRepository.NodeAccess/Classes/FlowQueryOperations/PrevUntilOperation.php
index 20147bf683f..62faaf35669 100644
--- a/Neos.ContentRepository.NodeAccess/Classes/FlowQueryOperations/PrevUntilOperation.php
+++ b/Neos.ContentRepository.NodeAccess/Classes/FlowQueryOperations/PrevUntilOperation.php
@@ -87,8 +87,8 @@ public function evaluate(FlowQuery $flowQuery, array $arguments): void
             }
             foreach ($prevNodes as $prevNode) {
                 if ($prevNode !== null &&
-                    !isset($outputNodeIdentifiers[$prevNode->nodeAggregateId->value])) {
-                    $outputNodeIdentifiers[$prevNode->nodeAggregateId->value] = true;
+                    !isset($outputNodeIdentifiers[$prevNode->aggregateId->value])) {
+                    $outputNodeIdentifiers[$prevNode->aggregateId->value] = true;
                     $output[] = $prevNode;
                 }
             }
diff --git a/Neos.ContentRepository.NodeAccess/Classes/FlowQueryOperations/PropertyOperation.php b/Neos.ContentRepository.NodeAccess/Classes/FlowQueryOperations/PropertyOperation.php
index 23c4414fafe..c6b72e2dbe0 100644
--- a/Neos.ContentRepository.NodeAccess/Classes/FlowQueryOperations/PropertyOperation.php
+++ b/Neos.ContentRepository.NodeAccess/Classes/FlowQueryOperations/PropertyOperation.php
@@ -96,7 +96,7 @@ public function evaluate(FlowQuery $flowQuery, array $arguments): mixed
         if ($propertyName === '_path') {
             $subgraph = $this->contentRepositoryRegistry->subgraphForNode($element);
             $ancestors = $subgraph->findAncestorNodes(
-                $element->nodeAggregateId,
+                $element->aggregateId,
                 FindAncestorNodesFilter::create()
             )->reverse();
 
@@ -104,7 +104,7 @@ public function evaluate(FlowQuery $flowQuery, array $arguments): mixed
         }
         if ($propertyName === '_identifier') {
             // TODO: deprecated (Neos <9 case)
-            return $element->nodeAggregateId->value;
+            return $element->aggregateId->value;
         }
 
         if ($propertyName[0] === '_') {
@@ -118,7 +118,7 @@ public function evaluate(FlowQuery $flowQuery, array $arguments): mixed
             // legacy access layer for references
             $subgraph = $this->contentRepositoryRegistry->subgraphForNode($element);
             $references = $subgraph->findReferences(
-                $element->nodeAggregateId,
+                $element->aggregateId,
                 FindReferencesFilter::create(referenceName: $propertyName)
             )->getNodes();
 
diff --git a/Neos.ContentRepository.NodeAccess/Classes/FlowQueryOperations/ReferenceNodesOperation.php b/Neos.ContentRepository.NodeAccess/Classes/FlowQueryOperations/ReferenceNodesOperation.php
index fe8e1890b50..fd1ed47efd6 100644
--- a/Neos.ContentRepository.NodeAccess/Classes/FlowQueryOperations/ReferenceNodesOperation.php
+++ b/Neos.ContentRepository.NodeAccess/Classes/FlowQueryOperations/ReferenceNodesOperation.php
@@ -72,7 +72,7 @@ public function evaluate(FlowQuery $flowQuery, array $arguments): void
         /** @var Node $contextNode */
         foreach ($flowQuery->getContext() as $contextNode) {
             $subgraph = $this->contentRepositoryRegistry->subgraphForNode($contextNode);
-            $output[] = iterator_to_array($subgraph->findReferences($contextNode->nodeAggregateId, $filter));
+            $output[] = iterator_to_array($subgraph->findReferences($contextNode->aggregateId, $filter));
         }
         $flowQuery->setContext(array_map(fn(Reference $reference) => $reference->node, array_merge(...$output)));
     }
diff --git a/Neos.ContentRepository.NodeAccess/Classes/FlowQueryOperations/ReferencesOperation.php b/Neos.ContentRepository.NodeAccess/Classes/FlowQueryOperations/ReferencesOperation.php
index 60737ce46d4..1ae9a961ff7 100644
--- a/Neos.ContentRepository.NodeAccess/Classes/FlowQueryOperations/ReferencesOperation.php
+++ b/Neos.ContentRepository.NodeAccess/Classes/FlowQueryOperations/ReferencesOperation.php
@@ -77,7 +77,7 @@ public function evaluate(FlowQuery $flowQuery, array $arguments): void
         /** @var Node $contextNode */
         foreach ($flowQuery->getContext() as $contextNode) {
             $subgraph = $this->contentRepositoryRegistry->subgraphForNode($contextNode);
-            $output[] = iterator_to_array($subgraph->findReferences($contextNode->nodeAggregateId, $filter));
+            $output[] = iterator_to_array($subgraph->findReferences($contextNode->aggregateId, $filter));
         }
         $flowQuery->setContext(array_merge(...$output));
     }
diff --git a/Neos.ContentRepository.NodeAccess/Classes/FlowQueryOperations/SiblingsOperation.php b/Neos.ContentRepository.NodeAccess/Classes/FlowQueryOperations/SiblingsOperation.php
index d25894deee4..13f76207072 100644
--- a/Neos.ContentRepository.NodeAccess/Classes/FlowQueryOperations/SiblingsOperation.php
+++ b/Neos.ContentRepository.NodeAccess/Classes/FlowQueryOperations/SiblingsOperation.php
@@ -68,24 +68,24 @@ public function evaluate(FlowQuery $flowQuery, array $arguments): void
         $outputNodeAggregateIds = [];
         foreach ($flowQuery->getContext() as $contextNode) {
             /** @var Node $contextNode */
-            $outputNodeAggregateIds[$contextNode->nodeAggregateId->value] = true;
+            $outputNodeAggregateIds[$contextNode->aggregateId->value] = true;
         }
 
         foreach ($flowQuery->getContext() as $contextNode) {
             $subgraph = $this->contentRepositoryRegistry->subgraphForNode($contextNode);
 
-            $parentNode = $subgraph->findParentNode($contextNode->nodeAggregateId);
+            $parentNode = $subgraph->findParentNode($contextNode->aggregateId);
             if ($parentNode === null) {
                 // no parent found
                 continue;
             }
 
             foreach (
-                $subgraph->findChildNodes($parentNode->nodeAggregateId, FindChildNodesFilter::create()) as $childNode
+                $subgraph->findChildNodes($parentNode->aggregateId, FindChildNodesFilter::create()) as $childNode
             ) {
-                if (!isset($outputNodeAggregateIds[$childNode->nodeAggregateId->value])) {
+                if (!isset($outputNodeAggregateIds[$childNode->aggregateId->value])) {
                     $output[] = $childNode;
-                    $outputNodeAggregateIds[$childNode->nodeAggregateId->value] = true;
+                    $outputNodeAggregateIds[$childNode->aggregateId->value] = true;
                 }
             }
         }
diff --git a/Neos.ContentRepository.NodeMigration/src/Transformation/AddNewPropertyTransformationFactory.php b/Neos.ContentRepository.NodeMigration/src/Transformation/AddNewPropertyTransformationFactory.php
index 74bc503c913..778d3cd8d14 100644
--- a/Neos.ContentRepository.NodeMigration/src/Transformation/AddNewPropertyTransformationFactory.php
+++ b/Neos.ContentRepository.NodeMigration/src/Transformation/AddNewPropertyTransformationFactory.php
@@ -69,7 +69,7 @@ public function execute(
                     return $this->contentRepository->handle(
                         SetSerializedNodeProperties::create(
                             $workspaceNameForWriting,
-                            $node->nodeAggregateId,
+                            $node->aggregateId,
                             $node->originDimensionSpacePoint,
                             SerializedPropertyValues::fromArray([
                                 $this->newPropertyName => SerializedPropertyValue::create(
diff --git a/Neos.ContentRepository.NodeMigration/src/Transformation/ChangePropertyValueTransformationFactory.php b/Neos.ContentRepository.NodeMigration/src/Transformation/ChangePropertyValueTransformationFactory.php
index 6ed394e9a68..41712b0325c 100644
--- a/Neos.ContentRepository.NodeMigration/src/Transformation/ChangePropertyValueTransformationFactory.php
+++ b/Neos.ContentRepository.NodeMigration/src/Transformation/ChangePropertyValueTransformationFactory.php
@@ -131,7 +131,7 @@ public function execute(
                     return $this->contentRepository->handle(
                         SetSerializedNodeProperties::create(
                             $workspaceNameForWriting,
-                            $node->nodeAggregateId,
+                            $node->aggregateId,
                             $node->originDimensionSpacePoint,
                             SerializedPropertyValues::fromArray([
                                 $this->propertyName => SerializedPropertyValue::create(
diff --git a/Neos.ContentRepository.NodeMigration/src/Transformation/RemoveNodeTransformationFactory.php b/Neos.ContentRepository.NodeMigration/src/Transformation/RemoveNodeTransformationFactory.php
index 2db6a3a046e..53a2276fa3f 100644
--- a/Neos.ContentRepository.NodeMigration/src/Transformation/RemoveNodeTransformationFactory.php
+++ b/Neos.ContentRepository.NodeMigration/src/Transformation/RemoveNodeTransformationFactory.php
@@ -89,7 +89,7 @@ public function execute(
 
                 return $this->contentRepository->handle(RemoveNodeAggregate::create(
                     $workspaceNameForWriting,
-                    $node->nodeAggregateId,
+                    $node->aggregateId,
                     $coveredDimensionSpacePoint,
                     $this->strategy,
                 ));
diff --git a/Neos.ContentRepository.NodeMigration/src/Transformation/RemovePropertyTransformationFactory.php b/Neos.ContentRepository.NodeMigration/src/Transformation/RemovePropertyTransformationFactory.php
index e47bfcfefec..46d7e3255ca 100644
--- a/Neos.ContentRepository.NodeMigration/src/Transformation/RemovePropertyTransformationFactory.php
+++ b/Neos.ContentRepository.NodeMigration/src/Transformation/RemovePropertyTransformationFactory.php
@@ -59,7 +59,7 @@ public function execute(
                     return $this->contentRepository->handle(
                         SetSerializedNodeProperties::create(
                             $workspaceNameForWriting,
-                            $node->nodeAggregateId,
+                            $node->aggregateId,
                             $node->originDimensionSpacePoint,
                             SerializedPropertyValues::createEmpty(),
                             PropertyNames::fromArray([$this->propertyName])
diff --git a/Neos.ContentRepository.NodeMigration/src/Transformation/RenamePropertyTransformationFactory.php b/Neos.ContentRepository.NodeMigration/src/Transformation/RenamePropertyTransformationFactory.php
index b9fe78e8f50..0d1cc13ed67 100644
--- a/Neos.ContentRepository.NodeMigration/src/Transformation/RenamePropertyTransformationFactory.php
+++ b/Neos.ContentRepository.NodeMigration/src/Transformation/RenamePropertyTransformationFactory.php
@@ -68,7 +68,7 @@ public function execute(
                     return $this->contentRepository->handle(
                         SetSerializedNodeProperties::create(
                             $workspaceNameForWriting,
-                            $node->nodeAggregateId,
+                            $node->aggregateId,
                             $node->originDimensionSpacePoint,
                             SerializedPropertyValues::fromArray([
                                 $this->to => $serializedPropertyValue
diff --git a/Neos.ContentRepository.NodeMigration/src/Transformation/StripTagsOnPropertyTransformationFactory.php b/Neos.ContentRepository.NodeMigration/src/Transformation/StripTagsOnPropertyTransformationFactory.php
index ff9b5113af8..f071722b34f 100644
--- a/Neos.ContentRepository.NodeMigration/src/Transformation/StripTagsOnPropertyTransformationFactory.php
+++ b/Neos.ContentRepository.NodeMigration/src/Transformation/StripTagsOnPropertyTransformationFactory.php
@@ -69,7 +69,7 @@ public function execute(
                     return $this->contentRepository->handle(
                         SetSerializedNodeProperties::create(
                             $workspaceNameForWriting,
-                            $node->nodeAggregateId,
+                            $node->aggregateId,
                             $node->originDimensionSpacePoint,
                             SerializedPropertyValues::fromArray([
                                 $this->propertyName => SerializedPropertyValue::create(
diff --git a/Neos.ContentRepository.StructureAdjustment/src/Adjustment/DisallowedChildNodeAdjustment.php b/Neos.ContentRepository.StructureAdjustment/src/Adjustment/DisallowedChildNodeAdjustment.php
index a3743176f32..7ab39598d42 100644
--- a/Neos.ContentRepository.StructureAdjustment/src/Adjustment/DisallowedChildNodeAdjustment.php
+++ b/Neos.ContentRepository.StructureAdjustment/src/Adjustment/DisallowedChildNodeAdjustment.php
@@ -57,7 +57,7 @@ public function findAdjustmentsForNodeType(NodeTypeName $nodeTypeName): \Generat
 
                 $parentNode = $subgraph->findParentNode($nodeAggregate->nodeAggregateId);
                 $grandparentNode = $parentNode !== null
-                    ? $subgraph->findParentNode($parentNode->nodeAggregateId)
+                    ? $subgraph->findParentNode($parentNode->aggregateId)
                     : null;
 
                 $allowedByParent = true;
diff --git a/Neos.ContentRepository.StructureAdjustment/src/Adjustment/PropertyAdjustment.php b/Neos.ContentRepository.StructureAdjustment/src/Adjustment/PropertyAdjustment.php
index 1b8c9bb69de..da8063a76c3 100644
--- a/Neos.ContentRepository.StructureAdjustment/src/Adjustment/PropertyAdjustment.php
+++ b/Neos.ContentRepository.StructureAdjustment/src/Adjustment/PropertyAdjustment.php
@@ -115,7 +115,7 @@ private function publishNodePropertiesWereSet(
         $events = Events::with(
             new NodePropertiesWereSet(
                 $node->subgraphIdentity->contentStreamId,
-                $node->nodeAggregateId,
+                $node->aggregateId,
                 $node->originDimensionSpacePoint,
                 $nodeAggregate->getCoverageByOccupant($node->originDimensionSpacePoint),
                 $serializedPropertyValues,
diff --git a/Neos.ContentRepository.StructureAdjustment/src/Adjustment/TetheredNodeAdjustments.php b/Neos.ContentRepository.StructureAdjustment/src/Adjustment/TetheredNodeAdjustments.php
index 6e0d3b1c6e5..d3aa41be81b 100644
--- a/Neos.ContentRepository.StructureAdjustment/src/Adjustment/TetheredNodeAdjustments.php
+++ b/Neos.ContentRepository.StructureAdjustment/src/Adjustment/TetheredNodeAdjustments.php
@@ -219,13 +219,13 @@ private function reorderNodes(
             foreach ($coverageByOrigin as $coveredDimensionSpacePoint) {
                 $succeedingSiblingsForCoverage[] = new InterdimensionalSibling(
                     $coveredDimensionSpacePoint,
-                    $succeedingNode->nodeAggregateId
+                    $succeedingNode->aggregateId
                 );
             }
 
             $events[] = new NodeAggregateWasMoved(
                 $contentStreamId,
-                $nodeToMove->nodeAggregateId,
+                $nodeToMove->aggregateId,
                 null,
                 new InterdimensionalSiblings(...$succeedingSiblingsForCoverage),
             );
diff --git a/Neos.ContentRepository.TestSuite/Classes/Behavior/Features/Bootstrap/CRTestSuiteRuntimeVariables.php b/Neos.ContentRepository.TestSuite/Classes/Behavior/Features/Bootstrap/CRTestSuiteRuntimeVariables.php
index 398ea384130..656e45666cc 100644
--- a/Neos.ContentRepository.TestSuite/Classes/Behavior/Features/Bootstrap/CRTestSuiteRuntimeVariables.php
+++ b/Neos.ContentRepository.TestSuite/Classes/Behavior/Features/Bootstrap/CRTestSuiteRuntimeVariables.php
@@ -170,12 +170,12 @@ public function iRememberNodeAggregateIdOfNodesChildAs(string $parentNodeAggrega
         $this->rememberedNodeAggregateIds[$indexName] = $this->getCurrentSubgraph()->findNodeByPath(
             NodePath::fromString($childNodeName),
             NodeAggregateId::fromString($parentNodeAggregateId),
-        )->nodeAggregateId;
+        )->aggregateId;
     }
 
     protected function getCurrentNodeAggregateId(): NodeAggregateId
     {
         assert($this->currentNode instanceof Node);
-        return $this->currentNode->nodeAggregateId;
+        return $this->currentNode->aggregateId;
     }
 }
diff --git a/Neos.ContentRepository.TestSuite/Classes/Behavior/Features/Bootstrap/CRTestSuiteTrait.php b/Neos.ContentRepository.TestSuite/Classes/Behavior/Features/Bootstrap/CRTestSuiteTrait.php
index f203182b36d..057edaa23b6 100644
--- a/Neos.ContentRepository.TestSuite/Classes/Behavior/Features/Bootstrap/CRTestSuiteTrait.php
+++ b/Neos.ContentRepository.TestSuite/Classes/Behavior/Features/Bootstrap/CRTestSuiteTrait.php
@@ -208,7 +208,7 @@ public function theSubtreeForNodeAggregateWithNodeTypesAndLevelsDeepShouldBe(
             $actualLevel = $flattenedSubtree[$i]->level;
             Assert::assertSame($expectedLevel, $actualLevel, 'Level does not match in index ' . $i . ', expected: ' . $expectedLevel . ', actual: ' . $actualLevel);
             $expectedNodeAggregateId = NodeAggregateId::fromString($expectedRow['nodeAggregateId']);
-            $actualNodeAggregateId = $flattenedSubtree[$i]->node->nodeAggregateId;
+            $actualNodeAggregateId = $flattenedSubtree[$i]->node->aggregateId;
             Assert::assertTrue(
                 $expectedNodeAggregateId->equals($actualNodeAggregateId),
                 'NodeAggregateId does not match in index ' . $i . ', expected: "' . $expectedNodeAggregateId->value . '", actual: "' . $actualNodeAggregateId->value . '"'
diff --git a/Neos.ContentRepository.TestSuite/Classes/Behavior/Features/Bootstrap/Helpers/NodeDiscriminator.php b/Neos.ContentRepository.TestSuite/Classes/Behavior/Features/Bootstrap/Helpers/NodeDiscriminator.php
index 6d59cc44bf7..005e5464e4d 100644
--- a/Neos.ContentRepository.TestSuite/Classes/Behavior/Features/Bootstrap/Helpers/NodeDiscriminator.php
+++ b/Neos.ContentRepository.TestSuite/Classes/Behavior/Features/Bootstrap/Helpers/NodeDiscriminator.php
@@ -51,7 +51,7 @@ public static function fromNode(Node $node): self
     {
         return new self(
             $node->subgraphIdentity->contentStreamId,
-            $node->nodeAggregateId,
+            $node->aggregateId,
             $node->originDimensionSpacePoint
         );
     }
diff --git a/Neos.ContentRepository.TestSuite/Classes/Behavior/Features/Bootstrap/NodeTraversalTrait.php b/Neos.ContentRepository.TestSuite/Classes/Behavior/Features/Bootstrap/NodeTraversalTrait.php
index 098598b9c2a..46b55f80fef 100644
--- a/Neos.ContentRepository.TestSuite/Classes/Behavior/Features/Bootstrap/NodeTraversalTrait.php
+++ b/Neos.ContentRepository.TestSuite/Classes/Behavior/Features/Bootstrap/NodeTraversalTrait.php
@@ -58,7 +58,7 @@ public function iExecuteTheFindChildNodesQueryIExpectTheFollowingNodes(string $p
         $filter = FindChildNodesFilter::create(...$filterValues);
         $subgraph = $this->getCurrentSubgraph();
 
-        $actualNodeIds = array_map(static fn(Node $node) => $node->nodeAggregateId->value, iterator_to_array($subgraph->findChildNodes($parentNodeAggregateId, $filter)));
+        $actualNodeIds = array_map(static fn(Node $node) => $node->aggregateId->value, iterator_to_array($subgraph->findChildNodes($parentNodeAggregateId, $filter)));
         Assert::assertSame($expectedNodeIds, $actualNodeIds, 'findChildNodes returned an unexpected result');
         $actualCount = $subgraph->countChildNodes($parentNodeAggregateId, CountChildNodesFilter::fromFindChildNodesFilter($filter));
         Assert::assertSame($expectedTotalCount ?? count($expectedNodeIds), $actualCount, 'countChildNodes returned an unexpected result');
@@ -76,7 +76,7 @@ public function iExecuteTheFindReferencesQueryIExpectTheFollowingReferences(stri
         $subgraph = $this->getCurrentSubgraph();
 
         $actualReferences = array_map(static fn(Reference $reference) => [
-            'nodeAggregateId' => $reference->node->nodeAggregateId->value,
+            'nodeAggregateId' => $reference->node->aggregateId->value,
             'name' => $reference->name->value,
             'properties' => json_decode(json_encode($reference->properties?->serialized(), JSON_THROW_ON_ERROR), true, 512, JSON_THROW_ON_ERROR)
         ], iterator_to_array($subgraph->findReferences($nodeAggregateId, $filter)));
@@ -95,7 +95,7 @@ public function iExecuteTheFindBackReferencesQueryIExpectTheFollowingReferences(
         $filter = FindBackReferencesFilter::create(...$filterValues);
         $subgraph = $this->getCurrentSubgraph();
         $actualReferences = array_map(static fn(Reference $reference) => [
-            'nodeAggregateId' => $reference->node->nodeAggregateId->value,
+            'nodeAggregateId' => $reference->node->aggregateId->value,
             'name' => $reference->name->value,
             'properties' => json_decode(json_encode($reference->properties?->serialized(), JSON_THROW_ON_ERROR), true, 512, JSON_THROW_ON_ERROR)
         ], iterator_to_array($subgraph->findBackReferences($nodeAggregateId, $filter)));
@@ -113,7 +113,7 @@ public function iExecuteTheFindNodeByIdQueryIExpectTheFollowingNodes(string $nod
         $expectedNodeAggregateId = $expectedNodeIdSerialized !== null ? NodeAggregateId::fromString($expectedNodeIdSerialized) : null;
 
         $actualNode = $this->getCurrentSubgraph()->findNodeById($nodeAggregateId);
-        Assert::assertSame($actualNode?->nodeAggregateId->value, $expectedNodeAggregateId?->value);
+        Assert::assertSame($actualNode?->aggregateId->value, $expectedNodeAggregateId?->value);
     }
 
     /**
@@ -126,7 +126,7 @@ public function iExecuteTheFindParentNodeQueryIExpectTheFollowingNodes(string $n
         $expectedNodeAggregateId = $expectedNodeIdSerialized !== null ? NodeAggregateId::fromString($expectedNodeIdSerialized) : null;
 
         $actualParentNode = $this->getCurrentSubgraph()->findParentNode($nodeAggregateId);
-        Assert::assertSame($actualParentNode?->nodeAggregateId->value, $expectedNodeAggregateId?->value);
+        Assert::assertSame($actualParentNode?->aggregateId->value, $expectedNodeAggregateId?->value);
     }
 
     /**
@@ -140,7 +140,7 @@ public function iExecuteTheFindNodeByPathQueryIExpectTheFollowingNodes(string $p
         $expectedNodeAggregateId = $expectedNodeIdSerialized !== null ? NodeAggregateId::fromString($expectedNodeIdSerialized) : null;
 
         $actualNode = $this->getCurrentSubgraph()->findNodeByPath($path, $startingNodeAggregateId);
-        Assert::assertSame($actualNode?->nodeAggregateId->value, $expectedNodeAggregateId?->value);
+        Assert::assertSame($actualNode?->aggregateId->value, $expectedNodeAggregateId?->value);
     }
 
     /**
@@ -153,7 +153,7 @@ public function iExecuteTheFindNodeByAbsolutePathQueryIExpectTheFollowingNodes(s
         $expectedNodeAggregateId = $expectedNodeIdSerialized !== null ? NodeAggregateId::fromString($expectedNodeIdSerialized) : null;
 
         $actualNode = $this->getCurrentSubgraph()->findNodeByAbsolutePath($path);
-        Assert::assertSame($actualNode?->nodeAggregateId->value, $expectedNodeAggregateId?->value);
+        Assert::assertSame($actualNode?->aggregateId->value, $expectedNodeAggregateId?->value);
     }
 
     /**
@@ -167,7 +167,7 @@ public function iExecuteTheFindChildNodeByNodeNameQueryIExpectTheFollowingNodes(
         $expectedNodeAggregateId = $expectedNodeIdSerialized !== null ? NodeAggregateId::fromString($expectedNodeIdSerialized) : null;
 
         $actualNode = $this->getCurrentSubgraph()->findNodeByPath($edgeName, $parentNodeAggregateId);
-        Assert::assertSame($actualNode?->nodeAggregateId->value, $expectedNodeAggregateId?->value);
+        Assert::assertSame($actualNode?->aggregateId->value, $expectedNodeAggregateId?->value);
     }
 
     /**
@@ -181,7 +181,7 @@ public function iExecuteTheFindSucceedingSiblingNodesQueryIExpectTheFollowingNod
         $filter = FindSucceedingSiblingNodesFilter::create(...$filterValues);
 
         $actualNodeIds = array_map(
-            static fn(Node $node) => $node->nodeAggregateId->value,
+            static fn(Node $node) => $node->aggregateId->value,
             iterator_to_array($this->getCurrentSubgraph()->findSucceedingSiblingNodes($siblingNodeAggregateId, $filter))
         );
         Assert::assertSame($expectedNodeIds, $actualNodeIds);
@@ -198,7 +198,7 @@ public function iExecuteTheFindPrecedingSiblingNodesQueryIExpectTheFollowingNode
         $filter = FindPrecedingSiblingNodesFilter::create(...$filterValues);
 
         $actualNodeIds = array_map(
-            static fn(Node $node) => $node->nodeAggregateId->value,
+            static fn(Node $node) => $node->aggregateId->value,
             iterator_to_array($this->getCurrentSubgraph()->findPrecedingSiblingNodes($siblingNodeAggregateId, $filter))
         );
         Assert::assertSame($expectedNodeIds, $actualNodeIds);
@@ -254,7 +254,7 @@ public function iExecuteTheFindSubtreeQueryIExpectTheFollowingTrees(string $entr
                 sort($inheritedTags);
                 $tags = [...array_map(static fn(string $tag) => $tag . '*', $explicitTags), ...$inheritedTags];
             }
-            $result[] = str_repeat(' ', $subtree->level) . $subtree->node->nodeAggregateId->value . ($tags !== [] ? ' (' . implode(',', $tags) . ')' : '');
+            $result[] = str_repeat(' ', $subtree->level) . $subtree->node->aggregateId->value . ($tags !== [] ? ' (' . implode(',', $tags) . ')' : '');
             $subtreeStack = [...$subtree->children, ...$subtreeStack];
         }
         Assert::assertSame($expectedTree?->getRaw() ?? '', implode(chr(10), $result));
@@ -271,7 +271,7 @@ public function iExecuteTheFindDescendantNodesQueryIExpectTheFollowingNodes(stri
         $filter = FindDescendantNodesFilter::create(...$filterValues);
         $subgraph = $this->getCurrentSubgraph();
 
-        $actualNodeIds = array_map(static fn(Node $node) => $node->nodeAggregateId->value, iterator_to_array($subgraph->findDescendantNodes($entryNodeAggregateId, $filter)));
+        $actualNodeIds = array_map(static fn(Node $node) => $node->aggregateId->value, iterator_to_array($subgraph->findDescendantNodes($entryNodeAggregateId, $filter)));
         Assert::assertSame($expectedNodeIds, $actualNodeIds, 'findDescendantNodes returned an unexpected result');
         $actualCount = $subgraph->countDescendantNodes($entryNodeAggregateId, CountDescendantNodesFilter::fromFindDescendantNodesFilter($filter));
         Assert::assertSame($expectedTotalCount ?? count($expectedNodeIds), $actualCount, 'countDescendantNodes returned an unexpected result');
@@ -287,7 +287,7 @@ public function iExecuteTheFindAncestorNodesQueryIExpectTheFollowingNodes(string
         $filterValues = !empty($filterSerialized) ? json_decode($filterSerialized, true, 512, JSON_THROW_ON_ERROR) : [];
         $filter = FindAncestorNodesFilter::create(...$filterValues);
         $subgraph = $this->getCurrentSubgraph();
-        $actualNodeIds = array_map(static fn(Node $node) => $node->nodeAggregateId->value, iterator_to_array($subgraph->findAncestorNodes($entryNodeAggregateId, $filter)));
+        $actualNodeIds = array_map(static fn(Node $node) => $node->aggregateId->value, iterator_to_array($subgraph->findAncestorNodes($entryNodeAggregateId, $filter)));
         Assert::assertSame($expectedNodeIds, $actualNodeIds, 'findAncestorNodes returned an unexpected result');
         $actualCount = $subgraph->countAncestorNodes($entryNodeAggregateId, CountAncestorNodesFilter::fromFindAncestorNodesFilter($filter));
         Assert::assertSame($expectedTotalCount ?? count($expectedNodeIds), $actualCount, 'countAncestorNodes returned an unexpected result');
@@ -302,7 +302,7 @@ public function iExecuteTheFindClosestNodeQueryIExpectTheFollowingNodes(string $
         $filterValues = !empty($filterSerialized) ? json_decode($filterSerialized, true, 512, JSON_THROW_ON_ERROR) : [];
         $filter = FindClosestNodeFilter::create(...$filterValues);
         $subgraph = $this->getCurrentSubgraph();
-        $actualNodeId = $subgraph->findClosestNode($entryNodeAggregateId, $filter)?->nodeAggregateId->value;
+        $actualNodeId = $subgraph->findClosestNode($entryNodeAggregateId, $filter)?->aggregateId->value;
         Assert::assertSame($expectedNodeId, $actualNodeId, 'findClosestNode returned an unexpected result');
     }
 
@@ -347,6 +347,6 @@ public function iExecuteTheFindRootNodeByTypeQueryIExpectTheFollowingNodes(strin
             : null;
 
         $actualNode = $this->getCurrentSubgraph()->findRootNodeByType(NodeTypeName::fromString($serializedNodeTypeName));
-        Assert::assertSame($actualNode?->nodeAggregateId->value, $expectedNodeAggregateId?->value);
+        Assert::assertSame($actualNode?->aggregateId->value, $expectedNodeAggregateId?->value);
     }
 }
diff --git a/Neos.ContentRepository.TestSuite/Classes/Behavior/Features/Bootstrap/ProjectedNodeTrait.php b/Neos.ContentRepository.TestSuite/Classes/Behavior/Features/Bootstrap/ProjectedNodeTrait.php
index 0822a944d08..c2f7a69c929 100644
--- a/Neos.ContentRepository.TestSuite/Classes/Behavior/Features/Bootstrap/ProjectedNodeTrait.php
+++ b/Neos.ContentRepository.TestSuite/Classes/Behavior/Features/Bootstrap/ProjectedNodeTrait.php
@@ -430,7 +430,7 @@ public function iExpectThisNodeToHaveTheFollowingReferences(TableNode $expectedR
     {
         $this->assertOnCurrentNode(function (Node $currentNode) use ($expectedReferences) {
             $actualReferences = $this->getCurrentSubgraph()
-                ->findReferences($currentNode->nodeAggregateId, FindReferencesFilter::create());
+                ->findReferences($currentNode->aggregateId, FindReferencesFilter::create());
 
             $this->assertReferencesMatch($expectedReferences, $actualReferences);
         });
@@ -444,7 +444,7 @@ public function iExpectThisNodeToHaveNoReferences(): void
     {
         $this->assertOnCurrentNode(function (Node $currentNode) {
             $references = $this->getCurrentSubgraph()
-                ->findReferences($currentNode->nodeAggregateId, FindReferencesFilter::create());
+                ->findReferences($currentNode->aggregateId, FindReferencesFilter::create());
 
             Assert::assertCount(0, $references, 'No references were expected.');
         });
@@ -458,7 +458,7 @@ public function iExpectThisNodeToBeReferencedBy(TableNode $expectedReferences):
     {
         $this->assertOnCurrentNode(function (Node $currentNode) use ($expectedReferences) {
             $actualReferences = $this->getCurrentSubgraph()
-                ->findBackReferences($currentNode->nodeAggregateId, FindBackReferencesFilter::create());
+                ->findBackReferences($currentNode->aggregateId, FindBackReferencesFilter::create());
 
             $this->assertReferencesMatch($expectedReferences, $actualReferences);
         });
@@ -537,7 +537,7 @@ public function iExpectThisNodeToNotBeReferenced(): void
     {
         $this->assertOnCurrentNode(function (Node $currentNode) {
             $originNodes = $this->getCurrentSubgraph()
-                ->findBackReferences($currentNode->nodeAggregateId, FindBackReferencesFilter::create());
+                ->findBackReferences($currentNode->aggregateId, FindBackReferencesFilter::create());
             Assert::assertCount(0, $originNodes, 'No referencing nodes were expected.');
         });
     }
@@ -552,13 +552,13 @@ public function iExpectThisNodeToBeTheChildOfNode(string $serializedParentNodeDi
         $this->assertOnCurrentNode(function (Node $currentNode) use ($expectedParentDiscriminator) {
             $subgraph = $this->getCurrentSubgraph();
 
-            $parent = $subgraph->findParentNode($currentNode->nodeAggregateId);
+            $parent = $subgraph->findParentNode($currentNode->aggregateId);
             Assert::assertInstanceOf(Node::class, $parent, 'Parent not found.');
             $actualParentDiscriminator = NodeDiscriminator::fromNode($parent);
             Assert::assertTrue($expectedParentDiscriminator->equals($actualParentDiscriminator), 'Parent discriminator does not match. Expected was ' . json_encode($expectedParentDiscriminator) . ', given was ' . json_encode($actualParentDiscriminator));
 
             $expectedChildDiscriminator = NodeDiscriminator::fromNode($currentNode);
-            $child = $subgraph->findNodeByPath($currentNode->nodeName, $parent->nodeAggregateId);
+            $child = $subgraph->findNodeByPath($currentNode->nodeName, $parent->aggregateId);
             $actualChildDiscriminator = NodeDiscriminator::fromNode($child);
             Assert::assertTrue($expectedChildDiscriminator->equals($actualChildDiscriminator), 'Child discriminator does not match. Expected was ' . json_encode($expectedChildDiscriminator) . ', given was ' . json_encode($actualChildDiscriminator));
         });
@@ -570,8 +570,8 @@ public function iExpectThisNodeToBeTheChildOfNode(string $serializedParentNodeDi
     public function iExpectThisNodeToHaveNoParentNode(): void
     {
         $this->assertOnCurrentNode(function (Node $currentNode) {
-            $parentNode = $this->getCurrentSubgraph()->findParentNode($currentNode->nodeAggregateId);
-            $unexpectedNodeAggregateId = $parentNode ? $parentNode->nodeAggregateId : '';
+            $parentNode = $this->getCurrentSubgraph()->findParentNode($currentNode->aggregateId);
+            $unexpectedNodeAggregateId = $parentNode ? $parentNode->aggregateId : '';
             Assert::assertNull($parentNode, 'Parent node ' . $unexpectedNodeAggregateId . ' was found, but none was expected.');
         });
     }
@@ -585,7 +585,7 @@ public function iExpectThisNodeToHaveTheFollowingChildNodes(TableNode $expectedC
         $this->assertOnCurrentNode(function (Node $currentNode) use ($expectedChildNodesTable) {
             $subgraph = $this->getCurrentSubgraph();
             $actualChildNodes = [];
-            foreach ($subgraph->findChildNodes($currentNode->nodeAggregateId, FindChildNodesFilter::create()) as $actualChildNode) {
+            foreach ($subgraph->findChildNodes($currentNode->aggregateId, FindChildNodesFilter::create()) as $actualChildNode) {
                 $actualChildNodes[] = $actualChildNode;
             }
 
@@ -611,7 +611,7 @@ public function iExpectThisNodeToHaveNoChildNodes(): void
     {
         $this->assertOnCurrentNode(function (Node $currentNode) {
             $subgraph = $this->getCurrentSubgraph();
-            $actualChildNodes = $subgraph->findChildNodes($currentNode->nodeAggregateId, FindChildNodesFilter::create());
+            $actualChildNodes = $subgraph->findChildNodes($currentNode->aggregateId, FindChildNodesFilter::create());
 
             Assert::assertEquals(0, count($actualChildNodes), 'ContentSubgraph::findChildNodes returned present child nodes.');
         });
@@ -627,7 +627,7 @@ public function iExpectThisNodeToHaveTheFollowingPrecedingSiblings(TableNode $ex
             $actualSiblings = [];
             foreach (
                 $this->getCurrentSubgraph()->findPrecedingSiblingNodes(
-                    $currentNode->nodeAggregateId,
+                    $currentNode->aggregateId,
                     FindPrecedingSiblingNodesFilter::create()
                 ) as $actualSibling
             ) {
@@ -649,7 +649,7 @@ public function iExpectThisNodeToHaveNoPrecedingSiblings(): void
     {
         $this->assertOnCurrentNode(function (Node $currentNode) {
             $actualSiblings = $this->getCurrentSubgraph()
-                ->findPrecedingSiblingNodes($currentNode->nodeAggregateId, FindPrecedingSiblingNodesFilter::create());
+                ->findPrecedingSiblingNodes($currentNode->aggregateId, FindPrecedingSiblingNodesFilter::create());
             Assert::assertCount(0, $actualSiblings, 'ContentSubgraph::findPrecedingSiblingNodes: No siblings were expected');
         });
     }
@@ -664,7 +664,7 @@ public function iExpectThisNodeToHaveTheFollowingSucceedingSiblings(TableNode $e
             $actualSiblings = [];
             foreach (
                 $this->getCurrentSubgraph()->findSucceedingSiblingNodes(
-                    $currentNode->nodeAggregateId,
+                    $currentNode->aggregateId,
                     FindSucceedingSiblingNodesFilter::create()
                 ) as $actualSibling
             ) {
@@ -686,7 +686,7 @@ public function iExpectThisNodeToHaveNoSucceedingSiblings(): void
     {
         $this->assertOnCurrentNode(function (Node $currentNode) {
             $actualSiblings = $this->getCurrentSubgraph()
-                ->findSucceedingSiblingNodes($currentNode->nodeAggregateId, FindSucceedingSiblingNodesFilter::create());
+                ->findSucceedingSiblingNodes($currentNode->aggregateId, FindSucceedingSiblingNodesFilter::create());
             Assert::assertCount(0, $actualSiblings, 'ContentSubgraph::findSucceedingSiblingNodes: No siblings were expected');
         });
     }
diff --git a/Neos.ContentRepositoryRegistry/Classes/Command/ContentCommandController.php b/Neos.ContentRepositoryRegistry/Classes/Command/ContentCommandController.php
index 7dd70f7859e..9262230ceca 100644
--- a/Neos.ContentRepositoryRegistry/Classes/Command/ContentCommandController.php
+++ b/Neos.ContentRepositoryRegistry/Classes/Command/ContentCommandController.php
@@ -188,14 +188,14 @@ private function createVariantRecursivelyInternal(int $level, NodeAggregateId $p
                 if ($childNodeType?->isOfType('Neos.Neos:Document')) {
                     $this->output("%s- %s\n", [
                         str_repeat('  ', $level),
-                        $childNode->getProperty('uriPathSegment') ?? $childNode->nodeAggregateId->value
+                        $childNode->getProperty('uriPathSegment') ?? $childNode->aggregateId->value
                     ]);
                 }
                 try {
                     // Tethered nodes' variants are automatically created when the parent is translated.
                     $contentRepository->handle(CreateNodeVariant::create(
                         $workspaceName,
-                        $childNode->nodeAggregateId,
+                        $childNode->aggregateId,
                         $childNode->originDimensionSpacePoint,
                         $target
                     ));
@@ -210,7 +210,7 @@ private function createVariantRecursivelyInternal(int $level, NodeAggregateId $p
 
             $this->createVariantRecursivelyInternal(
                 $level + 1,
-                $childNode->nodeAggregateId,
+                $childNode->aggregateId,
                 $sourceSubgraph,
                 $target,
                 $workspaceName,
diff --git a/Neos.Media.Browser/Classes/Controller/UsageController.php b/Neos.Media.Browser/Classes/Controller/UsageController.php
index c39f55fafb7..b41a07f5283 100644
--- a/Neos.Media.Browser/Classes/Controller/UsageController.php
+++ b/Neos.Media.Browser/Classes/Controller/UsageController.php
@@ -137,14 +137,14 @@ public function relatedNodesAction(AssetInterface $asset)
                 continue;
             }
 
-            $documentNode = $subgraph->findClosestNode($node->nodeAggregateId, FindClosestNodeFilter::create(nodeTypes: NodeTypeNameFactory::NAME_DOCUMENT));
+            $documentNode = $subgraph->findClosestNode($node->aggregateId, FindClosestNodeFilter::create(nodeTypes: NodeTypeNameFactory::NAME_DOCUMENT));
             // this should actually never happen, too.
             if (!$documentNode) {
                 $inaccessibleRelations[] = $inaccessibleRelation;
                 continue;
             }
 
-            $siteNode = $subgraph->findClosestNode($node->nodeAggregateId, FindClosestNodeFilter::create(nodeTypes: NodeTypeNameFactory::NAME_SITE));
+            $siteNode = $subgraph->findClosestNode($node->aggregateId, FindClosestNodeFilter::create(nodeTypes: NodeTypeNameFactory::NAME_SITE));
             // this should actually never happen, too. :D
             if (!$siteNode) {
                 $inaccessibleRelations[] = $inaccessibleRelation;
diff --git a/Neos.Neos/Classes/Controller/Frontend/NodeController.php b/Neos.Neos/Classes/Controller/Frontend/NodeController.php
index 6f3a607f830..0bbe4077267 100644
--- a/Neos.Neos/Classes/Controller/Frontend/NodeController.php
+++ b/Neos.Neos/Classes/Controller/Frontend/NodeController.php
@@ -343,7 +343,7 @@ private static function fillCacheInternal(
         $allChildNodesByNodeIdentifierCache = $inMemoryCache->getAllChildNodesByNodeIdCache();
         if ($node->nodeName !== null) {
             $namedChildNodeByNodeIdentifierCache->add(
-                $parentNode->nodeAggregateId,
+                $parentNode->aggregateId,
                 $node->nodeName,
                 $node
             );
@@ -352,8 +352,8 @@ private static function fillCacheInternal(
         }
 
         $parentNodeIdentifierByChildNodeIdentifierCache->add(
-            $node->nodeAggregateId,
-            $parentNode->nodeAggregateId
+            $node->aggregateId,
+            $parentNode->aggregateId
         );
 
         $allChildNodes = [];
@@ -364,7 +364,7 @@ private static function fillCacheInternal(
         }
         // TODO Explain why this is safe (Content can not contain other documents)
         $allChildNodesByNodeIdentifierCache->add(
-            $node->nodeAggregateId,
+            $node->aggregateId,
             null,
             Nodes::fromArray($allChildNodes)
         );
diff --git a/Neos.Neos/Classes/Controller/Module/Management/WorkspacesController.php b/Neos.Neos/Classes/Controller/Module/Management/WorkspacesController.php
index 78bc4cb0b9d..238ccb36ae3 100644
--- a/Neos.Neos/Classes/Controller/Module/Management/WorkspacesController.php
+++ b/Neos.Neos/Classes/Controller/Module/Management/WorkspacesController.php
@@ -482,7 +482,7 @@ public function rebaseAndRedirectAction(Node $targetNode, Workspace $targetWorks
         $targetNodeAddressInPersonalWorkspace = new NodeAddress(
             $personalWorkspace->currentContentStreamId,
             $targetNode->dimensionSpacePoint,
-            $targetNode->nodeAggregateId,
+            $targetNode->aggregateId,
             $personalWorkspace->workspaceName
         );
 
@@ -770,7 +770,7 @@ protected function computeSiteChanges(Workspace $selectedWorkspace, ContentRepos
                 $documentNode = null;
                 $siteNode = null;
                 $ancestors = $subgraph->findAncestorNodes(
-                    $node->nodeAggregateId,
+                    $node->aggregateId,
                     FindAncestorNodesFilter::create()
                 );
                 $ancestors = Nodes::fromArray([$node])->merge($ancestors);
@@ -778,7 +778,7 @@ protected function computeSiteChanges(Workspace $selectedWorkspace, ContentRepos
                 $nodePathSegments = [];
                 $documentPathSegments = [];
                 foreach ($ancestors as $ancestor) {
-                    $pathSegment = $ancestor->nodeName ?: NodeName::fromString($ancestor->nodeAggregateId->value);
+                    $pathSegment = $ancestor->nodeName ?: NodeName::fromString($ancestor->aggregateId->value);
                     // Don't include `sites` path as they are not needed
                     // by the HTML/JS magic and won't be included as `$documentPathSegments`
                     if (!$this->getNodeType($ancestor)->isOfType(NodeTypeNameFactory::NAME_SITES)) {
@@ -877,7 +877,7 @@ protected function getOriginalNode(
             $modifiedNode->dimensionSpacePoint,
             VisibilityConstraints::withoutRestrictions()
         );
-        return $baseSubgraph->findNodeById($modifiedNode->nodeAggregateId);
+        return $baseSubgraph->findNodeById($modifiedNode->aggregateId);
     }
 
     /**
diff --git a/Neos.Neos/Classes/Controller/Service/NodesController.php b/Neos.Neos/Classes/Controller/Service/NodesController.php
index 8308dead8eb..244dafebdfb 100644
--- a/Neos.Neos/Classes/Controller/Service/NodesController.php
+++ b/Neos.Neos/Classes/Controller/Service/NodesController.php
@@ -148,7 +148,7 @@ public function indexAction(
             }
 
             $nodes = !is_null($entryNode) ? $subgraph->findDescendantNodes(
-                $entryNode->nodeAggregateId,
+                $entryNode->aggregateId,
                 FindDescendantNodesFilter::create(
                     nodeTypes: NodeTypeCriteria::create(
                         NodeTypeNames::fromStringArray($nodeTypes),
@@ -386,7 +386,7 @@ protected function adoptNodeAndParents(
         ) {
             $identifiersFromRootlineToTranslate[] = $nodeAggregateId;
             $nodeAggregateId = $sourceSubgraph->findParentNode($nodeAggregateId)
-                ?->nodeAggregateId;
+                ?->aggregateId;
         }
         // $identifiersFromRootlineToTranslate is now bottom-to-top; so we need to reverse
         // them to know what we need to create.
@@ -447,7 +447,7 @@ private function createNodeVariantsForChildNodes(
                 $contentRepository->handle(
                     CreateNodeVariant::create(
                         $workspaceName,
-                        $childNode->nodeAggregateId,
+                        $childNode->aggregateId,
                         $childNode->originDimensionSpacePoint,
                         OriginDimensionSpacePoint::fromDimensionSpacePoint($targetDimensionSpacePoint),
                     )
@@ -456,7 +456,7 @@ private function createNodeVariantsForChildNodes(
 
             $this->createNodeVariantsForChildNodes(
                 $workspaceName,
-                $childNode->nodeAggregateId,
+                $childNode->aggregateId,
                 $constraints,
                 $sourceSubgraph,
                 $targetSubgraph,
diff --git a/Neos.Neos/Classes/Domain/Model/NodeCacheEntryIdentifier.php b/Neos.Neos/Classes/Domain/Model/NodeCacheEntryIdentifier.php
index 59f06371ff4..936e0c6e427 100644
--- a/Neos.Neos/Classes/Domain/Model/NodeCacheEntryIdentifier.php
+++ b/Neos.Neos/Classes/Domain/Model/NodeCacheEntryIdentifier.php
@@ -34,7 +34,7 @@ public static function fromNode(Node $node): self
     {
         return new self('Node_' . $node->subgraphIdentity->contentStreamId->value
             . '_' . $node->dimensionSpacePoint->hash
-            . '_' .  $node->nodeAggregateId->value);
+            . '_' .  $node->aggregateId->value);
     }
 
     public function getCacheEntryIdentifier(): string
diff --git a/Neos.Neos/Classes/Domain/Repository/SiteRepository.php b/Neos.Neos/Classes/Domain/Repository/SiteRepository.php
index a5718b66824..d0f66098535 100644
--- a/Neos.Neos/Classes/Domain/Repository/SiteRepository.php
+++ b/Neos.Neos/Classes/Domain/Repository/SiteRepository.php
@@ -122,10 +122,10 @@ public function findOneByNodeName(string|SiteNodeName $nodeName): ?Site
     public function findSiteBySiteNode(Node $siteNode): Site
     {
         if (!$this->getNodeType($siteNode)->isOfType(NodeTypeNameFactory::NAME_SITE)) {
-            throw new \Neos\Neos\Domain\Exception(sprintf('Node %s is not a site node. Site nodes must be of type "%s".', $siteNode->nodeAggregateId->value, NodeTypeNameFactory::NAME_SITE), 1697108987);
+            throw new \Neos\Neos\Domain\Exception(sprintf('Node %s is not a site node. Site nodes must be of type "%s".', $siteNode->aggregateId->value, NodeTypeNameFactory::NAME_SITE), 1697108987);
         }
         if ($siteNode->nodeName === null) {
-            throw new \Neos\Neos\Domain\Exception(sprintf('Site node "%s" is unnamed', $siteNode->nodeAggregateId->value), 1681286146);
+            throw new \Neos\Neos\Domain\Exception(sprintf('Site node "%s" is unnamed', $siteNode->aggregateId->value), 1681286146);
         }
         return $this->findOneByNodeName(SiteNodeName::fromNodeName($siteNode->nodeName))
             ?? throw new \Neos\Neos\Domain\Exception(sprintf('No site found for nodeNodeName "%s"', $siteNode->nodeName->value), 1677245517);
diff --git a/Neos.Neos/Classes/Domain/Service/SiteNodeUtility.php b/Neos.Neos/Classes/Domain/Service/SiteNodeUtility.php
index fb7829123bf..2a29f452c26 100644
--- a/Neos.Neos/Classes/Domain/Service/SiteNodeUtility.php
+++ b/Neos.Neos/Classes/Domain/Service/SiteNodeUtility.php
@@ -72,7 +72,7 @@ public function findSiteNodeBySite(
 
         $siteNode = $subgraph->findNodeByPath(
             $site->getNodeName()->toNodeName(),
-            $rootNode->nodeAggregateId
+            $rootNode->aggregateId
         );
 
         if (!$siteNode) {
@@ -82,7 +82,7 @@ public function findSiteNodeBySite(
         if (!$this->getNodeType($siteNode)->isOfType(NodeTypeNameFactory::NAME_SITE)) {
             throw new \RuntimeException(sprintf(
                 'The site node "%s" (type: "%s") must be of type "%s"',
-                $siteNode->nodeAggregateId->value,
+                $siteNode->aggregateId->value,
                 $siteNode->nodeTypeName->value,
                 NodeTypeNameFactory::NAME_SITE
             ), 1697140367);
diff --git a/Neos.Neos/Classes/Domain/Service/SiteService.php b/Neos.Neos/Classes/Domain/Service/SiteService.php
index 0fe7b730fd0..32a39458303 100644
--- a/Neos.Neos/Classes/Domain/Service/SiteService.php
+++ b/Neos.Neos/Classes/Domain/Service/SiteService.php
@@ -123,7 +123,7 @@ public function pruneAll()
     public function assignUploadedAssetToSiteAssetCollection(Asset $asset, Node $node, string $propertyName)
     {
         $subgraph = $this->contentRepositoryRegistry->subgraphForNode($node);
-        $siteNode = $subgraph->findClosestNode($node->nodeAggregateId, FindClosestNodeFilter::create(nodeTypes: NodeTypeNameFactory::NAME_SITE));
+        $siteNode = $subgraph->findClosestNode($node->aggregateId, FindClosestNodeFilter::create(nodeTypes: NodeTypeNameFactory::NAME_SITE));
         if (!$siteNode) {
             // should not happen
             return;
diff --git a/Neos.Neos/Classes/Domain/Workspace/Workspace.php b/Neos.Neos/Classes/Domain/Workspace/Workspace.php
index 22487168e32..9d3bd125be8 100644
--- a/Neos.Neos/Classes/Domain/Workspace/Workspace.php
+++ b/Neos.Neos/Classes/Domain/Workspace/Workspace.php
@@ -410,7 +410,7 @@ private function isChangePublishableWithinAncestorScope(
             FindClosestNodeFilter::create(nodeTypes: $ancestorNodeTypeName->value)
         );
 
-        return $actualAncestorNode?->nodeAggregateId->equals($ancestorId) ?? false;
+        return $actualAncestorNode?->aggregateId->equals($ancestorId) ?? false;
     }
 
     /**
diff --git a/Neos.Neos/Classes/Eel/FlowQueryOperations/SortOperation.php b/Neos.Neos/Classes/Eel/FlowQueryOperations/SortOperation.php
index 4f63e806a84..a2958005f6e 100644
--- a/Neos.Neos/Classes/Eel/FlowQueryOperations/SortOperation.php
+++ b/Neos.Neos/Classes/Eel/FlowQueryOperations/SortOperation.php
@@ -123,8 +123,8 @@ public function evaluate(FlowQuery $flowQuery, array $arguments)
                 $propertyValue = $propertyValue->getTimestamp();
             }
 
-            $sortSequence[$node->nodeAggregateId->value] = $propertyValue;
-            $nodesByIdentifier[$node->nodeAggregateId->value] = $node;
+            $sortSequence[$node->aggregateId->value] = $propertyValue;
+            $nodesByIdentifier[$node->aggregateId->value] = $node;
         }
 
         // Create the sort sequence
diff --git a/Neos.Neos/Classes/FrontendRouting/NodeAddressFactory.php b/Neos.Neos/Classes/FrontendRouting/NodeAddressFactory.php
index ccb6d8908c2..7d187251677 100644
--- a/Neos.Neos/Classes/FrontendRouting/NodeAddressFactory.php
+++ b/Neos.Neos/Classes/FrontendRouting/NodeAddressFactory.php
@@ -64,7 +64,7 @@ public function createFromNode(Node $node): NodeAddress
         return $this->createFromContentStreamIdAndDimensionSpacePointAndNodeAggregateId(
             $node->subgraphIdentity->contentStreamId,
             $node->dimensionSpacePoint,
-            $node->nodeAggregateId,
+            $node->aggregateId,
         );
     }
 
diff --git a/Neos.Neos/Classes/Fusion/Cache/CacheTag.php b/Neos.Neos/Classes/Fusion/Cache/CacheTag.php
index c86e2c30e20..69814d621ef 100644
--- a/Neos.Neos/Classes/Fusion/Cache/CacheTag.php
+++ b/Neos.Neos/Classes/Fusion/Cache/CacheTag.php
@@ -47,7 +47,7 @@ final public static function forNodeAggregateFromNode(Node $node): self
         return self::forNodeAggregate(
             $node->contentRepositoryId,
             $node->workspaceName,
-            $node->nodeAggregateId
+            $node->aggregateId
         );
     }
 
diff --git a/Neos.Neos/Classes/Fusion/DimensionsMenuItemsImplementation.php b/Neos.Neos/Classes/Fusion/DimensionsMenuItemsImplementation.php
index 94d3d6dc671..ae03301ba2e 100644
--- a/Neos.Neos/Classes/Fusion/DimensionsMenuItemsImplementation.php
+++ b/Neos.Neos/Classes/Fusion/DimensionsMenuItemsImplementation.php
@@ -82,14 +82,14 @@ protected function buildItems(): array
                             $dimensionSpacePoint,
                             $currentNode->visibilityConstraints,
                         )
-                        ->findNodeById($currentNode->nodeAggregateId);
+                        ->findNodeById($currentNode->aggregateId);
                 }
 
                 if (!$variant && $this->includeGeneralizations() && $contentDimensionIdentifierToLimitTo) {
                     $variant = $this->findClosestGeneralizationMatchingDimensionValue(
                         $dimensionSpacePoint,
                         $contentDimensionIdentifierToLimitTo,
-                        $currentNode->nodeAggregateId,
+                        $currentNode->aggregateId,
                         $dimensionMenuItemsImplementationInternals,
                         $contentGraph
                     );
diff --git a/Neos.Neos/Classes/Fusion/Helper/LinkHelper.php b/Neos.Neos/Classes/Fusion/Helper/LinkHelper.php
index c05b439c532..5cdb3e74f98 100644
--- a/Neos.Neos/Classes/Fusion/Helper/LinkHelper.php
+++ b/Neos.Neos/Classes/Fusion/Helper/LinkHelper.php
@@ -119,7 +119,7 @@ public function resolveNodeUri(
         ) {
             $this->systemLogger->info(sprintf(
                 'Failed to build URI for node "%s": %e',
-                $targetNode->nodeAggregateId->value,
+                $targetNode->aggregateId->value,
                 $e->getMessage()
             ), LogEnvironment::fromMethodName(__METHOD__));
             return null;
diff --git a/Neos.Neos/Classes/Fusion/Helper/NodeHelper.php b/Neos.Neos/Classes/Fusion/Helper/NodeHelper.php
index 296c6a49623..3efcbad4b8e 100644
--- a/Neos.Neos/Classes/Fusion/Helper/NodeHelper.php
+++ b/Neos.Neos/Classes/Fusion/Helper/NodeHelper.php
@@ -70,7 +70,7 @@ public function nearestContentCollection(Node $node, string $nodePath): Node
 
             $subNode = $nodePath instanceof AbsoluteNodePath
                 ? $subgraph->findNodeByAbsolutePath($nodePath)
-                : $subgraph->findNodeByPath($nodePath, $node->nodeAggregateId);
+                : $subgraph->findNodeByPath($nodePath, $node->aggregateId);
 
             if ($subNode !== null && $this->isOfType($subNode, $contentCollectionType)) {
                 return $subNode;
@@ -79,7 +79,7 @@ public function nearestContentCollection(Node $node, string $nodePath): Node
                     $node,
                     $this->contentRepositoryRegistry->subgraphForNode($node)
                         ->findAncestorNodes(
-                            $node->nodeAggregateId,
+                            $node->aggregateId,
                             FindAncestorNodesFilter::create()
                         )
                 );
@@ -116,7 +116,7 @@ public function labelForNode(Node $node): NodeLabelToken
     public function depth(Node $node): int
     {
         return $this->contentRepositoryRegistry->subgraphForNode($node)
-            ->countAncestorNodes($node->nodeAggregateId, CountAncestorNodesFilter::create());
+            ->countAncestorNodes($node->aggregateId, CountAncestorNodesFilter::create());
     }
 
     /**
@@ -126,7 +126,7 @@ public function path(Node $node): string
     {
         $subgraph = $this->contentRepositoryRegistry->subgraphForNode($node);
         $ancestors = $subgraph->findAncestorNodes(
-            $node->nodeAggregateId,
+            $node->aggregateId,
             FindAncestorNodesFilter::create()
         )->reverse();
 
diff --git a/Neos.Neos/Classes/Fusion/MenuItemsImplementation.php b/Neos.Neos/Classes/Fusion/MenuItemsImplementation.php
index 9cf4abc075a..6df043d367d 100644
--- a/Neos.Neos/Classes/Fusion/MenuItemsImplementation.php
+++ b/Neos.Neos/Classes/Fusion/MenuItemsImplementation.php
@@ -158,7 +158,7 @@ protected function buildItems(): array
             foreach ($this->getItemCollection() as $node) {
                 if ($this->getMaximumLevels() > 0) {
                     $childSubtree = $subgraph->findSubtree(
-                        $node->nodeAggregateId,
+                        $node->aggregateId,
                         FindSubtreeFilter::create(nodeTypes: $this->getNodeTypeCriteria(), maximumLevels: $this->getMaximumLevels() - 1)
                     );
                     if ($childSubtree === null) {
@@ -273,7 +273,7 @@ protected function findMenuStartingPointAggregateId(): ?NodeAggregateId
         }
 
         if ($this->getEntryLevel() === 0) {
-            return $traversalStartingPoint->nodeAggregateId;
+            return $traversalStartingPoint->aggregateId;
         } elseif ($this->getEntryLevel() < 0) {
             $ancestorNodeAggregateIds = $this->getCurrentNodeRootlineAggregateIds();
             $ancestorNodeAggregateIdArray = array_values(iterator_to_array($ancestorNodeAggregateIds));
@@ -300,7 +300,7 @@ protected function getCurrentNodeRootlineAggregateIds(): NodeAggregateIds
         }
         $subgraph = $this->contentRepositoryRegistry->subgraphForNode($this->getCurrentNode());
         $currentNodeAncestors = $subgraph->findAncestorNodes(
-            $this->currentNode->nodeAggregateId,
+            $this->currentNode->aggregateId,
             FindAncestorNodesFilter::create(
                 NodeTypeCriteria::createWithAllowedNodeTypeNames(
                     NodeTypeNames::with(
@@ -310,7 +310,7 @@ protected function getCurrentNodeRootlineAggregateIds(): NodeAggregateIds
             )
         );
 
-        $this->currentNodeRootlineAggregateIds = NodeAggregateIds::create($this->currentNode->nodeAggregateId)
+        $this->currentNodeRootlineAggregateIds = NodeAggregateIds::create($this->currentNode->aggregateId)
             ->merge(NodeAggregateIds::fromNodes($currentNodeAncestors));
 
         return $this->currentNodeRootlineAggregateIds;
@@ -318,10 +318,10 @@ protected function getCurrentNodeRootlineAggregateIds(): NodeAggregateIds
 
     protected function calculateItemState(Node $node): MenuItemState
     {
-        if ($node->nodeAggregateId->equals($this->getCurrentNode()->nodeAggregateId)) {
+        if ($node->aggregateId->equals($this->getCurrentNode()->aggregateId)) {
             return MenuItemState::CURRENT;
         }
-        if ($this->getCurrentNodeRootlineAggregateIds()->contain($node->nodeAggregateId)) {
+        if ($this->getCurrentNodeRootlineAggregateIds()->contain($node->aggregateId)) {
             return MenuItemState::ACTIVE;
         }
         return MenuItemState::NORMAL;
diff --git a/Neos.Neos/Classes/Fusion/NodeUriImplementation.php b/Neos.Neos/Classes/Fusion/NodeUriImplementation.php
index e6757a7868a..9afa00aa77f 100644
--- a/Neos.Neos/Classes/Fusion/NodeUriImplementation.php
+++ b/Neos.Neos/Classes/Fusion/NodeUriImplementation.php
@@ -184,7 +184,7 @@ public function evaluate()
         try {
             return (string)NodeUriBuilder::fromUriBuilder($uriBuilder)->uriFor($nodeAddress);
         } catch (NoMatchingRouteException) {
-            $this->systemLogger->warning(sprintf('Could not resolve "%s" to a node uri. Arguments: %s', $node->nodeAggregateId->value, json_encode($uriBuilder->getLastArguments())), LogEnvironment::fromMethodName(__METHOD__));
+            $this->systemLogger->warning(sprintf('Could not resolve "%s" to a node uri. Arguments: %s', $node->aggregateId->value, json_encode($uriBuilder->getLastArguments())), LogEnvironment::fromMethodName(__METHOD__));
         }
         return '';
     }
diff --git a/Neos.Neos/Classes/Presentation/VisualNodePath.php b/Neos.Neos/Classes/Presentation/VisualNodePath.php
index 7c2eef8184d..2e0d6fb4f5d 100644
--- a/Neos.Neos/Classes/Presentation/VisualNodePath.php
+++ b/Neos.Neos/Classes/Presentation/VisualNodePath.php
@@ -31,7 +31,7 @@ public static function fromAncestors(Node $leafNode, Nodes $ancestors): self
     {
         $pathSegments = [];
         foreach ($ancestors->reverse() as $ancestor) {
-            $pathSegments[] = $ancestor->nodeName?->value ?: '[' . $ancestor->nodeAggregateId->value . ']';
+            $pathSegments[] = $ancestor->nodeName?->value ?: '[' . $ancestor->aggregateId->value . ']';
         }
 
         return new self('/' . implode('/', $pathSegments));
diff --git a/Neos.Neos/Classes/Routing/Cache/RouteCacheFlusher.php b/Neos.Neos/Classes/Routing/Cache/RouteCacheFlusher.php
index 14507af46af..aa6e4e5b20e 100644
--- a/Neos.Neos/Classes/Routing/Cache/RouteCacheFlusher.php
+++ b/Neos.Neos/Classes/Routing/Cache/RouteCacheFlusher.php
@@ -54,7 +54,7 @@ class RouteCacheFlusher
      */
     public function registerNodeChange(Node $node)
     {
-        $identifier = $node->nodeAggregateId->value;
+        $identifier = $node->aggregateId->value;
         if (in_array($identifier, $this->tagsToFlush)) {
             return;
         }
diff --git a/Neos.Neos/Classes/Service/ImageVariantGarbageCollector.php b/Neos.Neos/Classes/Service/ImageVariantGarbageCollector.php
index 57fce9969cd..0f4e21b4838 100644
--- a/Neos.Neos/Classes/Service/ImageVariantGarbageCollector.php
+++ b/Neos.Neos/Classes/Service/ImageVariantGarbageCollector.php
@@ -79,7 +79,7 @@ public function removeUnusedImageVariant(Node $node, $propertyName, $oldValue, $
                     $usageItem instanceof AssetUsageReference
                     && $usageItem->getContentStreamId()->equals($node->subgraphIdentity->contentStreamId)
                     && $usageItem->getOriginDimensionSpacePoint()->equals($node->originDimensionSpacePoint)
-                    && $usageItem->getNodeAggregateId()->equals($node->nodeAggregateId)
+                    && $usageItem->getNodeAggregateId()->equals($node->aggregateId)
                 ) {
                     $this->assetRepository->remove($oldValue);
                 }
diff --git a/Neos.Neos/Classes/Service/LinkingService.php b/Neos.Neos/Classes/Service/LinkingService.php
index e9553c778d9..65780952b11 100644
--- a/Neos.Neos/Classes/Service/LinkingService.php
+++ b/Neos.Neos/Classes/Service/LinkingService.php
@@ -329,7 +329,7 @@ public function createNodeUri(
                     );
                 }
                 $node = $this->contentRepositoryRegistry->subgraphForNode($baseNode)
-                    ->findNodeByPath(NodePath::fromString($nodeString), $baseNode->nodeAggregateId);
+                    ->findNodeByPath(NodePath::fromString($nodeString), $baseNode->aggregateId);
             }
             if (!$node instanceof Node) {
                 throw new NeosException(sprintf(
diff --git a/Neos.Neos/Classes/View/FusionView.php b/Neos.Neos/Classes/View/FusionView.php
index 06a14be1dcc..5f8d50363fe 100644
--- a/Neos.Neos/Classes/View/FusionView.php
+++ b/Neos.Neos/Classes/View/FusionView.php
@@ -73,7 +73,7 @@ public function render(): ResponseInterface|StreamInterface
         $currentNode = $this->getCurrentNode();
 
         $subgraph = $this->contentRepositoryRegistry->subgraphForNode($currentNode);
-        $currentSiteNode = $subgraph->findClosestNode($currentNode->nodeAggregateId, FindClosestNodeFilter::create(nodeTypes: NodeTypeNameFactory::NAME_SITE));
+        $currentSiteNode = $subgraph->findClosestNode($currentNode->aggregateId, FindClosestNodeFilter::create(nodeTypes: NodeTypeNameFactory::NAME_SITE));
 
         if (!$currentSiteNode) {
             throw new \RuntimeException('No site node found!', 1697053346);
@@ -166,7 +166,7 @@ public function getFusionPath()
     protected function getClosestDocumentNode(Node $node): ?Node
     {
         return $this->contentRepositoryRegistry->subgraphForNode($node)
-            ->findClosestNode($node->nodeAggregateId, FindClosestNodeFilter::create(nodeTypes: NodeTypeNameFactory::NAME_DOCUMENT));
+            ->findClosestNode($node->aggregateId, FindClosestNodeFilter::create(nodeTypes: NodeTypeNameFactory::NAME_DOCUMENT));
     }
 
     /**
diff --git a/Neos.Neos/Classes/ViewHelpers/Backend/DocumentBreadcrumbPathViewHelper.php b/Neos.Neos/Classes/ViewHelpers/Backend/DocumentBreadcrumbPathViewHelper.php
index 4ca88d29f08..644c18e8444 100644
--- a/Neos.Neos/Classes/ViewHelpers/Backend/DocumentBreadcrumbPathViewHelper.php
+++ b/Neos.Neos/Classes/ViewHelpers/Backend/DocumentBreadcrumbPathViewHelper.php
@@ -54,7 +54,7 @@ public function render(): mixed
             if ($this->getNodeType($currentNode)->isOfType(NodeTypeNameFactory::NAME_DOCUMENT)) {
                 $documentNodes[] = $currentNode;
             }
-            $currentNode = $subgraph->findParentNode($currentNode->nodeAggregateId);
+            $currentNode = $subgraph->findParentNode($currentNode->aggregateId);
         }
         $documentNodes = array_reverse($documentNodes);
         $this->templateVariableContainer->add('documentNodes', $documentNodes);
diff --git a/Neos.Neos/Classes/ViewHelpers/Link/NodeViewHelper.php b/Neos.Neos/Classes/ViewHelpers/Link/NodeViewHelper.php
index f3b74082874..305fd2ea5e5 100644
--- a/Neos.Neos/Classes/ViewHelpers/Link/NodeViewHelper.php
+++ b/Neos.Neos/Classes/ViewHelpers/Link/NodeViewHelper.php
@@ -311,7 +311,7 @@ public function render(): string
             } catch (NodeNotFoundException | InvalidShortcutException $e) {
                 $this->throwableStorage->logThrowable(new ViewHelperException(sprintf(
                     'Failed to resolve shortcut node "%s" on subgraph "%s"',
-                    $resolvedNode->nodeAggregateId->value,
+                    $resolvedNode->aggregateId->value,
                     json_encode($subgraph, JSON_PARTIAL_OUTPUT_ON_ERROR)
                 ), 1601370239, $e));
             }
@@ -394,13 +394,13 @@ private function resolveNodeAddressFromString(
             } else {
                 $targetNode = $subgraph->findNodeByPath(
                     NodePath::fromString(substr($path, 1)),
-                    $siteNode->nodeAggregateId
+                    $siteNode->aggregateId
                 );
             }
         } else {
             $targetNode = $subgraph->findNodeByPath(
                 NodePath::fromString($path),
-                $documentNode->nodeAggregateId
+                $documentNode->aggregateId
             );
         }
         if ($targetNode === null) {
@@ -411,6 +411,6 @@ private function resolveNodeAddressFromString(
                 json_encode($subgraph, JSON_PARTIAL_OUTPUT_ON_ERROR)
             ), 1601311789);
         }
-        return $documentNodeAddress->withNodeAggregateId($targetNode->nodeAggregateId);
+        return $documentNodeAddress->withNodeAggregateId($targetNode->aggregateId);
     }
 }
diff --git a/Neos.Neos/Classes/ViewHelpers/Node/ClosestDocumentViewHelper.php b/Neos.Neos/Classes/ViewHelpers/Node/ClosestDocumentViewHelper.php
index e8df9c9251d..d32edbcf2ff 100644
--- a/Neos.Neos/Classes/ViewHelpers/Node/ClosestDocumentViewHelper.php
+++ b/Neos.Neos/Classes/ViewHelpers/Node/ClosestDocumentViewHelper.php
@@ -41,6 +41,6 @@ public function render(): ?Node
         $node = $this->arguments['node'];
 
         return $this->contentRepositoryRegistry->subgraphForNode($node)
-            ->findClosestNode($node->nodeAggregateId, FindClosestNodeFilter::create(nodeTypes: NodeTypeNameFactory::NAME_DOCUMENT));
+            ->findClosestNode($node->aggregateId, FindClosestNodeFilter::create(nodeTypes: NodeTypeNameFactory::NAME_DOCUMENT));
     }
 }
diff --git a/Neos.Neos/Classes/ViewHelpers/Uri/NodeViewHelper.php b/Neos.Neos/Classes/ViewHelpers/Uri/NodeViewHelper.php
index d4ddd198953..39ec88d9b05 100644
--- a/Neos.Neos/Classes/ViewHelpers/Uri/NodeViewHelper.php
+++ b/Neos.Neos/Classes/ViewHelpers/Uri/NodeViewHelper.php
@@ -291,13 +291,13 @@ private function resolveNodeAddressFromString(string $path): ?NodeAddress
             } else {
                 $targetNode = $subgraph->findNodeByPath(
                     NodePath::fromString(substr($path, 1)),
-                    $siteNode->nodeAggregateId
+                    $siteNode->aggregateId
                 );
             }
         } else {
             $targetNode = $subgraph->findNodeByPath(
                 NodePath::fromString($path),
-                $documentNode->nodeAggregateId
+                $documentNode->aggregateId
             );
         }
         if ($targetNode === null) {
@@ -309,6 +309,6 @@ private function resolveNodeAddressFromString(string $path): ?NodeAddress
             ), 1601311789));
             return null;
         }
-        return $documentNodeAddress->withNodeAggregateId($targetNode->nodeAggregateId);
+        return $documentNodeAddress->withNodeAggregateId($targetNode->aggregateId);
     }
 }
diff --git a/Neos.Neos/Tests/Behavior/Features/Bootstrap/BrowserTrait.php b/Neos.Neos/Tests/Behavior/Features/Bootstrap/BrowserTrait.php
index a5454d0352e..40e1b05bd2e 100644
--- a/Neos.Neos/Tests/Behavior/Features/Bootstrap/BrowserTrait.php
+++ b/Neos.Neos/Tests/Behavior/Features/Bootstrap/BrowserTrait.php
@@ -144,7 +144,7 @@ public function iGetTheNodeAddressForTheNodeAtPath(string $serializedNodePath, $
         $this->currentNodeAddresses[$alias] = new NodeAddress(
             $this->currentContentStreamId,
             $this->currentDimensionSpacePoint,
-            $node->nodeAggregateId,
+            $node->aggregateId,
             $this->currentWorkspaceName,
         );
     }
diff --git a/Neos.Neos/Tests/Behavior/Features/Bootstrap/FusionTrait.php b/Neos.Neos/Tests/Behavior/Features/Bootstrap/FusionTrait.php
index b1ebbbd35a5..326e651885c 100644
--- a/Neos.Neos/Tests/Behavior/Features/Bootstrap/FusionTrait.php
+++ b/Neos.Neos/Tests/Behavior/Features/Bootstrap/FusionTrait.php
@@ -93,7 +93,7 @@ public function theFusionContextNodeIs(string $nodeAggregateId): void
         if ($this->fusionContext['documentNode'] === null) {
             throw new \RuntimeException(sprintf('Failed to find closest document node for node with aggregate id "%s"', $nodeAggregateId), 1697790940);
         }
-        $this->fusionContext['site'] = $subgraph->findClosestNode($this->fusionContext['documentNode']->nodeAggregateId, FindClosestNodeFilter::create(nodeTypes: NodeTypeNameFactory::NAME_SITE));
+        $this->fusionContext['site'] = $subgraph->findClosestNode($this->fusionContext['documentNode']->aggregateId, FindClosestNodeFilter::create(nodeTypes: NodeTypeNameFactory::NAME_SITE));
         if ($this->fusionContext['site'] === null) {
             throw new \RuntimeException(sprintf('Failed to resolve site node for node with aggregate id "%s"', $nodeAggregateId), 1697790963);
         }
diff --git a/Neos.TimeableNodeVisibility/Classes/Command/TimeableNodeVisibilityCommandController.php b/Neos.TimeableNodeVisibility/Classes/Command/TimeableNodeVisibilityCommandController.php
index aa90155bdb2..2291e42f850 100644
--- a/Neos.TimeableNodeVisibility/Classes/Command/TimeableNodeVisibilityCommandController.php
+++ b/Neos.TimeableNodeVisibility/Classes/Command/TimeableNodeVisibilityCommandController.php
@@ -29,7 +29,7 @@ public function executeCommand(string $contentRepository = 'default', bool $quie
             foreach ($handlingResult->getByType(ChangedVisibilityType::NODE_WAS_ENABLED) as $result) {
                 $this->output->outputLine(sprintf(
                         '- NodeAggregateId: %s, DimensionSpacePoint: %s',
-                        $result->node->nodeAggregateId->value,
+                        $result->node->aggregateId->value,
                         join(',', $result->node->originDimensionSpacePoint->coordinates)
                     )
                 );
@@ -39,7 +39,7 @@ public function executeCommand(string $contentRepository = 'default', bool $quie
             foreach ($handlingResult->getByType(ChangedVisibilityType::NODE_WAS_DISABLED) as $result) {
                 $this->output->outputLine(sprintf(
                         '- NodeAggregateId: %s, DimensionSpacePoint: %s',
-                        $result->node->nodeAggregateId->value,
+                        $result->node->aggregateId->value,
                         join(',', $result->node->originDimensionSpacePoint->coordinates)
                     )
                 );
diff --git a/Neos.TimeableNodeVisibility/Classes/Service/TimeableNodeVisibilityService.php b/Neos.TimeableNodeVisibility/Classes/Service/TimeableNodeVisibilityService.php
index 73d3f97005a..e50fd2268ec 100644
--- a/Neos.TimeableNodeVisibility/Classes/Service/TimeableNodeVisibilityService.php
+++ b/Neos.TimeableNodeVisibility/Classes/Service/TimeableNodeVisibilityService.php
@@ -54,7 +54,7 @@ public function handleExceededNodeDates(ContentRepositoryId $contentRepositoryId
                 $contentRepository->handle(
                     EnableNodeAggregate::create(
                         $workspaceName,
-                        $node->nodeAggregateId,
+                        $node->aggregateId,
                         $node->dimensionSpacePoint,
                         NodeVariantSelectionStrategy::STRATEGY_ALL_SPECIALIZATIONS
                     )
@@ -68,7 +68,7 @@ public function handleExceededNodeDates(ContentRepositoryId $contentRepositoryId
                 $contentRepository->handle(
                     DisableNodeAggregate::create(
                         $workspaceName,
-                        $node->nodeAggregateId,
+                        $node->aggregateId,
                         $node->dimensionSpacePoint,
                         NodeVariantSelectionStrategy::STRATEGY_ALL_SPECIALIZATIONS
                     )
@@ -105,7 +105,7 @@ private function getNodesWithExceededDates(ContentRepository $contentRepository,
             }
 
             $nodes = $subgraph->findDescendantNodes(
-                $rootNode->nodeAggregateId,
+                $rootNode->aggregateId,
                 FindDescendantNodesFilter::create(
                     nodeTypes: NodeTypeCriteria::createWithAllowedNodeTypeNames(NodeTypeNames::fromStringArray(['Neos.TimeableNodeVisibility:Timeable'])),
                     propertyValue: OrCriteria::create(
@@ -159,7 +159,7 @@ private function logResult(ChangedVisibility $result): void
         $this->logger->info(
             sprintf('Timed node visibility: %s node [NodeAggregateId: %s, DimensionSpacePoints: %s]',
                 $result->type->value,
-                $result->node->nodeAggregateId->value,
+                $result->node->aggregateId->value,
                 implode(',', $result->node->originDimensionSpacePoint->coordinates)
             )
         );
diff --git a/Neos.TimeableNodeVisibility/Tests/Behavior/Bootstrap/FeatureContext.php b/Neos.TimeableNodeVisibility/Tests/Behavior/Bootstrap/FeatureContext.php
index 16caaf8821f..d9c7192c968 100644
--- a/Neos.TimeableNodeVisibility/Tests/Behavior/Bootstrap/FeatureContext.php
+++ b/Neos.TimeableNodeVisibility/Tests/Behavior/Bootstrap/FeatureContext.php
@@ -62,9 +62,9 @@ public function iExpectThisNodeToBeEnabled(): void
             $this->currentDimensionSpacePoint,
             VisibilityConstraints::withoutRestrictions(),
         );
-        $currentNode = $subgraph->findNodeById($this->currentNode->nodeAggregateId);
-        Assert::assertNotNull($currentNode, sprintf('Failed to find node with id "%s" in subgraph %s', $this->currentNode->nodeAggregateId->value, json_encode($subgraph)));
-        Assert::assertFalse($currentNode->tags->contain(SubtreeTag::disabled()), sprintf('Node "%s" was expected to be enabled, but it is not', $this->currentNode->nodeAggregateId->value));
+        $currentNode = $subgraph->findNodeById($this->currentNode->aggregateId);
+        Assert::assertNotNull($currentNode, sprintf('Failed to find node with id "%s" in subgraph %s', $this->currentNode->aggregateId->value, json_encode($subgraph)));
+        Assert::assertFalse($currentNode->tags->contain(SubtreeTag::disabled()), sprintf('Node "%s" was expected to be enabled, but it is not', $this->currentNode->aggregateId->value));
     }
 
     /**
@@ -77,9 +77,9 @@ public function iExpectThisNodeToBeDisabled(): void
             $this->currentDimensionSpacePoint,
             VisibilityConstraints::withoutRestrictions(),
         );
-        $currentNode = $subgraph->findNodeById($this->currentNode->nodeAggregateId);
-        Assert::assertNotNull($currentNode, sprintf('Failed to find node with id "%s" in subgraph %s', $this->currentNode->nodeAggregateId->value, json_encode($subgraph)));
-        Assert::assertTrue($currentNode->tags->contain(SubtreeTag::disabled()), sprintf('Node "%s" was expected to be disabled, but it is not', $this->currentNode->nodeAggregateId->value));
+        $currentNode = $subgraph->findNodeById($this->currentNode->aggregateId);
+        Assert::assertNotNull($currentNode, sprintf('Failed to find node with id "%s" in subgraph %s', $this->currentNode->aggregateId->value, json_encode($subgraph)));
+        Assert::assertTrue($currentNode->tags->contain(SubtreeTag::disabled()), sprintf('Node "%s" was expected to be disabled, but it is not', $this->currentNode->aggregateId->value));
     }
 
     protected function getContentRepositoryService(

From e28fc442a7c56865ee41341961cb11640309d72d Mon Sep 17 00:00:00 2001
From: mhsdesign <85400359+mhsdesign@users.noreply.github.com>
Date: Sat, 18 May 2024 16:53:33 +0200
Subject: [PATCH 3/3] TASK: Rename `$node->nodeName` to `$node->name`

---
 .../Feature/NodeDuplication/Dto/NodeSubtreeSnapshot.php   | 2 +-
 .../Classes/Projection/ContentGraph/AbsoluteNodePath.php  | 4 ++--
 .../ContentSubgraphWithRuntimeCaches.php                  | 2 +-
 .../Classes/FlowQueryOperations/FilterOperation.php       | 2 +-
 .../src/Adjustment/TetheredNodeAdjustments.php            | 4 ++--
 .../Behavior/Features/Bootstrap/Features/NodeRenaming.php | 2 +-
 .../Behavior/Features/Bootstrap/ProjectedNodeTrait.php    | 8 ++++----
 Neos.Media.Browser/Classes/Controller/UsageController.php | 2 +-
 Neos.Neos/Classes/Controller/Frontend/NodeController.php  | 4 ++--
 .../Controller/Module/Management/WorkspacesController.php | 6 +++---
 Neos.Neos/Classes/Domain/Repository/SiteRepository.php    | 6 +++---
 Neos.Neos/Classes/Domain/Service/SiteService.php          | 4 ++--
 Neos.Neos/Classes/Fusion/Helper/NodeLabelToken.php        | 4 ++--
 Neos.Neos/Classes/Presentation/VisualNodePath.php         | 2 +-
 Neos.Neos/Classes/Utility/NodeUriPathSegmentGenerator.php | 2 +-
 15 files changed, 27 insertions(+), 27 deletions(-)

diff --git a/Neos.ContentRepository.Core/Classes/Feature/NodeDuplication/Dto/NodeSubtreeSnapshot.php b/Neos.ContentRepository.Core/Classes/Feature/NodeDuplication/Dto/NodeSubtreeSnapshot.php
index 216358c808c..2ca897bc6fc 100644
--- a/Neos.ContentRepository.Core/Classes/Feature/NodeDuplication/Dto/NodeSubtreeSnapshot.php
+++ b/Neos.ContentRepository.Core/Classes/Feature/NodeDuplication/Dto/NodeSubtreeSnapshot.php
@@ -55,7 +55,7 @@ public static function fromSubgraphAndStartNode(ContentSubgraphInterface $subgra
         return new self(
             $sourceNode->aggregateId,
             $sourceNode->nodeTypeName,
-            $sourceNode->nodeName,
+            $sourceNode->name,
             $sourceNode->classification,
             $properties->serialized(),
             NodeReferencesSnapshot::fromReferences(
diff --git a/Neos.ContentRepository.Core/Classes/Projection/ContentGraph/AbsoluteNodePath.php b/Neos.ContentRepository.Core/Classes/Projection/ContentGraph/AbsoluteNodePath.php
index 794a94e3f94..1579f639fbc 100644
--- a/Neos.ContentRepository.Core/Classes/Projection/ContentGraph/AbsoluteNodePath.php
+++ b/Neos.ContentRepository.Core/Classes/Projection/ContentGraph/AbsoluteNodePath.php
@@ -86,14 +86,14 @@ public static function fromLeafNodeAndAncestors(Node $leafNode, Nodes $ancestors
             if ($ancestor->classification->isRoot()) {
                 continue;
             }
-            if (!$ancestor->nodeName) {
+            if (!$ancestor->name) {
                 throw new \InvalidArgumentException(
                     'Could not resolve node path for node ' . $leafNode->aggregateId->value
                     . ', ancestor ' . $ancestor->aggregateId->value . ' is unnamed.',
                     1687509348
                 );
             }
-            $nodeNames[] = $ancestor->nodeName;
+            $nodeNames[] = $ancestor->name;
         }
 
         return new self(
diff --git a/Neos.ContentRepository.Core/Classes/Projection/ContentGraph/ContentGraphWithRuntimeCaches/ContentSubgraphWithRuntimeCaches.php b/Neos.ContentRepository.Core/Classes/Projection/ContentGraph/ContentGraphWithRuntimeCaches/ContentSubgraphWithRuntimeCaches.php
index 6f0a49ef84f..577ad312e92 100644
--- a/Neos.ContentRepository.Core/Classes/Projection/ContentGraph/ContentGraphWithRuntimeCaches/ContentSubgraphWithRuntimeCaches.php
+++ b/Neos.ContentRepository.Core/Classes/Projection/ContentGraph/ContentGraphWithRuntimeCaches/ContentSubgraphWithRuntimeCaches.php
@@ -90,7 +90,7 @@ public function findChildNodes(NodeAggregateId $parentNodeAggregateId, FindChild
         }
         $childNodes = $this->wrappedContentSubgraph->findChildNodes($parentNodeAggregateId, $filter);
         foreach ($childNodes as $node) {
-            $namedChildNodeCache->add($parentNodeAggregateId, $node->nodeName, $node);
+            $namedChildNodeCache->add($parentNodeAggregateId, $node->name, $node);
             $parentNodeIdCache->add($node->aggregateId, $parentNodeAggregateId);
             $nodeByIdCache->add($node->aggregateId, $node);
         }
diff --git a/Neos.ContentRepository.NodeAccess/Classes/FlowQueryOperations/FilterOperation.php b/Neos.ContentRepository.NodeAccess/Classes/FlowQueryOperations/FilterOperation.php
index 5b79de1c9da..9b1107ddef4 100644
--- a/Neos.ContentRepository.NodeAccess/Classes/FlowQueryOperations/FilterOperation.php
+++ b/Neos.ContentRepository.NodeAccess/Classes/FlowQueryOperations/FilterOperation.php
@@ -95,7 +95,7 @@ public function evaluate(FlowQuery $flowQuery, array $arguments)
     protected function matchesPropertyNameFilter($element, $propertyNameFilter)
     {
         assert($element instanceof Node);
-        return $element->nodeName?->value === $propertyNameFilter;
+        return $element->name?->value === $propertyNameFilter;
     }
 
     /**
diff --git a/Neos.ContentRepository.StructureAdjustment/src/Adjustment/TetheredNodeAdjustments.php b/Neos.ContentRepository.StructureAdjustment/src/Adjustment/TetheredNodeAdjustments.php
index d3aa41be81b..213e6a59443 100644
--- a/Neos.ContentRepository.StructureAdjustment/src/Adjustment/TetheredNodeAdjustments.php
+++ b/Neos.ContentRepository.StructureAdjustment/src/Adjustment/TetheredNodeAdjustments.php
@@ -127,8 +127,8 @@ function () use ($tetheredNodeAggregate) {
                     $actualTetheredChildNodes = [];
                     foreach ($childNodes as $childNode) {
                         if ($childNode->classification->isTethered()) {
-                            assert($childNode->nodeName !== null); // it's tethered!
-                            $actualTetheredChildNodes[$childNode->nodeName->value] = $childNode;
+                            assert($childNode->name !== null); // it's tethered!
+                            $actualTetheredChildNodes[$childNode->name->value] = $childNode;
                         }
                     }
 
diff --git a/Neos.ContentRepository.TestSuite/Classes/Behavior/Features/Bootstrap/Features/NodeRenaming.php b/Neos.ContentRepository.TestSuite/Classes/Behavior/Features/Bootstrap/Features/NodeRenaming.php
index 3288b58930f..ac383b6ba5b 100644
--- a/Neos.ContentRepository.TestSuite/Classes/Behavior/Features/Bootstrap/Features/NodeRenaming.php
+++ b/Neos.ContentRepository.TestSuite/Classes/Behavior/Features/Bootstrap/Features/NodeRenaming.php
@@ -72,6 +72,6 @@ public function theCommandChangeNodeAggregateNameIsExecutedWithPayloadAndExcepti
     public function iExpectTheNodeToHaveTheName(string $nodeAggregateId, string $nodeName)
     {
         $node = $this->getCurrentSubgraph()->findNodeById(NodeAggregateId::fromString($nodeAggregateId));
-        Assert::assertEquals($nodeName, $node->nodeName->value, 'Node Names do not match');
+        Assert::assertEquals($nodeName, $node->name->value, 'Node Names do not match');
     }
 }
diff --git a/Neos.ContentRepository.TestSuite/Classes/Behavior/Features/Bootstrap/ProjectedNodeTrait.php b/Neos.ContentRepository.TestSuite/Classes/Behavior/Features/Bootstrap/ProjectedNodeTrait.php
index c2f7a69c929..ad96bdacce4 100644
--- a/Neos.ContentRepository.TestSuite/Classes/Behavior/Features/Bootstrap/ProjectedNodeTrait.php
+++ b/Neos.ContentRepository.TestSuite/Classes/Behavior/Features/Bootstrap/ProjectedNodeTrait.php
@@ -315,7 +315,7 @@ public function iExpectThisNodeToBeNamed(string $serializedExpectedNodeName): vo
     {
         $expectedNodeName = NodeName::fromString($serializedExpectedNodeName);
         $this->assertOnCurrentNode(function (Node $currentNode) use ($expectedNodeName) {
-            $actualNodeName = $currentNode->nodeName;
+            $actualNodeName = $currentNode->name;
             Assert::assertSame($expectedNodeName->value, $actualNodeName->value, 'Actual node name "' . $actualNodeName->value . '" does not match expected "' . $expectedNodeName->value . '"');
         });
     }
@@ -326,7 +326,7 @@ public function iExpectThisNodeToBeNamed(string $serializedExpectedNodeName): vo
     public function iExpectThisNodeToBeUnnamed(): void
     {
         $this->assertOnCurrentNode(function (Node $currentNode) {
-            Assert::assertNull($currentNode->nodeName, 'Node was not expected to be named');
+            Assert::assertNull($currentNode->name, 'Node was not expected to be named');
         });
     }
 
@@ -558,7 +558,7 @@ public function iExpectThisNodeToBeTheChildOfNode(string $serializedParentNodeDi
             Assert::assertTrue($expectedParentDiscriminator->equals($actualParentDiscriminator), 'Parent discriminator does not match. Expected was ' . json_encode($expectedParentDiscriminator) . ', given was ' . json_encode($actualParentDiscriminator));
 
             $expectedChildDiscriminator = NodeDiscriminator::fromNode($currentNode);
-            $child = $subgraph->findNodeByPath($currentNode->nodeName, $parent->aggregateId);
+            $child = $subgraph->findNodeByPath($currentNode->name, $parent->aggregateId);
             $actualChildDiscriminator = NodeDiscriminator::fromNode($child);
             Assert::assertTrue($expectedChildDiscriminator->equals($actualChildDiscriminator), 'Child discriminator does not match. Expected was ' . json_encode($expectedChildDiscriminator) . ', given was ' . json_encode($actualChildDiscriminator));
         });
@@ -593,7 +593,7 @@ public function iExpectThisNodeToHaveTheFollowingChildNodes(TableNode $expectedC
 
             foreach ($expectedChildNodesTable->getHash() as $index => $row) {
                 $expectedNodeName = NodeName::fromString($row['Name']);
-                $actualNodeName = $actualChildNodes[$index]->nodeName;
+                $actualNodeName = $actualChildNodes[$index]->name;
                 Assert::assertTrue($expectedNodeName->equals($actualNodeName), 'ContentSubgraph::findChildNodes: Node name in index ' . $index . ' does not match. Expected: "' . $expectedNodeName->value . '" Actual: "' . $actualNodeName->value . '"');
                 if (isset($row['NodeDiscriminator'])) {
                     $expectedNodeDiscriminator = NodeDiscriminator::fromShorthand($row['NodeDiscriminator']);
diff --git a/Neos.Media.Browser/Classes/Controller/UsageController.php b/Neos.Media.Browser/Classes/Controller/UsageController.php
index b41a07f5283..bde620635cb 100644
--- a/Neos.Media.Browser/Classes/Controller/UsageController.php
+++ b/Neos.Media.Browser/Classes/Controller/UsageController.php
@@ -152,7 +152,7 @@ public function relatedNodesAction(AssetInterface $asset)
             }
             foreach ($existingSites as $existingSite) {
                 /** @var Site $existingSite * */
-                if ($siteNode->nodeName->equals($existingSite->getNodeName()->toNodeName())) {
+                if ($siteNode->name->equals($existingSite->getNodeName()->toNodeName())) {
                     $site = $existingSite;
                 }
             }
diff --git a/Neos.Neos/Classes/Controller/Frontend/NodeController.php b/Neos.Neos/Classes/Controller/Frontend/NodeController.php
index 0bbe4077267..4fc24f62bf9 100644
--- a/Neos.Neos/Classes/Controller/Frontend/NodeController.php
+++ b/Neos.Neos/Classes/Controller/Frontend/NodeController.php
@@ -341,10 +341,10 @@ private static function fillCacheInternal(
             = $inMemoryCache->getParentNodeIdByChildNodeIdCache();
         $namedChildNodeByNodeIdentifierCache = $inMemoryCache->getNamedChildNodeByNodeIdCache();
         $allChildNodesByNodeIdentifierCache = $inMemoryCache->getAllChildNodesByNodeIdCache();
-        if ($node->nodeName !== null) {
+        if ($node->name !== null) {
             $namedChildNodeByNodeIdentifierCache->add(
                 $parentNode->aggregateId,
-                $node->nodeName,
+                $node->name,
                 $node
             );
         } else {
diff --git a/Neos.Neos/Classes/Controller/Module/Management/WorkspacesController.php b/Neos.Neos/Classes/Controller/Module/Management/WorkspacesController.php
index 238ccb36ae3..92f7fded383 100644
--- a/Neos.Neos/Classes/Controller/Module/Management/WorkspacesController.php
+++ b/Neos.Neos/Classes/Controller/Module/Management/WorkspacesController.php
@@ -778,7 +778,7 @@ protected function computeSiteChanges(Workspace $selectedWorkspace, ContentRepos
                 $nodePathSegments = [];
                 $documentPathSegments = [];
                 foreach ($ancestors as $ancestor) {
-                    $pathSegment = $ancestor->nodeName ?: NodeName::fromString($ancestor->aggregateId->value);
+                    $pathSegment = $ancestor->name ?: NodeName::fromString($ancestor->aggregateId->value);
                     // Don't include `sites` path as they are not needed
                     // by the HTML/JS magic and won't be included as `$documentPathSegments`
                     if (!$this->getNodeType($ancestor)->isOfType(NodeTypeNameFactory::NAME_SITES)) {
@@ -797,8 +797,8 @@ protected function computeSiteChanges(Workspace $selectedWorkspace, ContentRepos
 
                 // Neither $documentNode, $siteNode or its cannot really be null, this is just for type checks;
                 // We should probably throw an exception though
-                if ($documentNode !== null && $siteNode !== null && $siteNode->nodeName) {
-                    $siteNodeName = $siteNode->nodeName->value;
+                if ($documentNode !== null && $siteNode !== null && $siteNode->name) {
+                    $siteNodeName = $siteNode->name->value;
                     // Reverse `$documentPathSegments` to start with the site node.
                     // The paths are used for grouping the nodes and for selecting a tree of nodes.
                     $documentPath = implode('/', array_reverse(array_map(
diff --git a/Neos.Neos/Classes/Domain/Repository/SiteRepository.php b/Neos.Neos/Classes/Domain/Repository/SiteRepository.php
index d0f66098535..a70dc5074e4 100644
--- a/Neos.Neos/Classes/Domain/Repository/SiteRepository.php
+++ b/Neos.Neos/Classes/Domain/Repository/SiteRepository.php
@@ -124,11 +124,11 @@ public function findSiteBySiteNode(Node $siteNode): Site
         if (!$this->getNodeType($siteNode)->isOfType(NodeTypeNameFactory::NAME_SITE)) {
             throw new \Neos\Neos\Domain\Exception(sprintf('Node %s is not a site node. Site nodes must be of type "%s".', $siteNode->aggregateId->value, NodeTypeNameFactory::NAME_SITE), 1697108987);
         }
-        if ($siteNode->nodeName === null) {
+        if ($siteNode->name === null) {
             throw new \Neos\Neos\Domain\Exception(sprintf('Site node "%s" is unnamed', $siteNode->aggregateId->value), 1681286146);
         }
-        return $this->findOneByNodeName(SiteNodeName::fromNodeName($siteNode->nodeName))
-            ?? throw new \Neos\Neos\Domain\Exception(sprintf('No site found for nodeNodeName "%s"', $siteNode->nodeName->value), 1677245517);
+        return $this->findOneByNodeName(SiteNodeName::fromNodeName($siteNode->name))
+            ?? throw new \Neos\Neos\Domain\Exception(sprintf('No site found for nodeNodeName "%s"', $siteNode->name->value), 1677245517);
     }
 
     /**
diff --git a/Neos.Neos/Classes/Domain/Service/SiteService.php b/Neos.Neos/Classes/Domain/Service/SiteService.php
index 32a39458303..c437b57b219 100644
--- a/Neos.Neos/Classes/Domain/Service/SiteService.php
+++ b/Neos.Neos/Classes/Domain/Service/SiteService.php
@@ -128,10 +128,10 @@ public function assignUploadedAssetToSiteAssetCollection(Asset $asset, Node $nod
             // should not happen
             return;
         }
-        if ($siteNode->nodeName === null) {
+        if ($siteNode->name === null) {
             return;
         }
-        $site = $this->siteRepository->findOneByNodeName($siteNode->nodeName->value);
+        $site = $this->siteRepository->findOneByNodeName($siteNode->name->value);
         if ($site === null) {
             return;
         }
diff --git a/Neos.Neos/Classes/Fusion/Helper/NodeLabelToken.php b/Neos.Neos/Classes/Fusion/Helper/NodeLabelToken.php
index cf63385c03c..1bf6f0abf88 100644
--- a/Neos.Neos/Classes/Fusion/Helper/NodeLabelToken.php
+++ b/Neos.Neos/Classes/Fusion/Helper/NodeLabelToken.php
@@ -152,8 +152,8 @@ protected function resolveLabelFromNodeType(): void
             $this->label = $this->node->nodeTypeName->value;
         }
 
-        if (empty($this->postfix) && $this->node->nodeName !== null && $this->node->classification->isTethered()) {
-            $this->postfix =  ' (' . $this->node->nodeName->value . ')';
+        if (empty($this->postfix) && $this->node->name !== null && $this->node->classification->isTethered()) {
+            $this->postfix =  ' (' . $this->node->name->value . ')';
         }
     }
 
diff --git a/Neos.Neos/Classes/Presentation/VisualNodePath.php b/Neos.Neos/Classes/Presentation/VisualNodePath.php
index 2e0d6fb4f5d..aaeff1da893 100644
--- a/Neos.Neos/Classes/Presentation/VisualNodePath.php
+++ b/Neos.Neos/Classes/Presentation/VisualNodePath.php
@@ -31,7 +31,7 @@ public static function fromAncestors(Node $leafNode, Nodes $ancestors): self
     {
         $pathSegments = [];
         foreach ($ancestors->reverse() as $ancestor) {
-            $pathSegments[] = $ancestor->nodeName?->value ?: '[' . $ancestor->aggregateId->value . ']';
+            $pathSegments[] = $ancestor->name?->value ?: '[' . $ancestor->aggregateId->value . ']';
         }
 
         return new self('/' . implode('/', $pathSegments));
diff --git a/Neos.Neos/Classes/Utility/NodeUriPathSegmentGenerator.php b/Neos.Neos/Classes/Utility/NodeUriPathSegmentGenerator.php
index e80e4bc947c..e22ddb69521 100644
--- a/Neos.Neos/Classes/Utility/NodeUriPathSegmentGenerator.php
+++ b/Neos.Neos/Classes/Utility/NodeUriPathSegmentGenerator.php
@@ -44,7 +44,7 @@ public function generateUriPathSegment(?Node $node = null, ?string $text = null)
     {
         $language = null;
         if ($node) {
-            $text = $text ?: $this->nodeLabelGenerator->getLabel($node) ?: ($node->nodeName?->value ?? '');
+            $text = $text ?: $this->nodeLabelGenerator->getLabel($node) ?: ($node->name?->value ?? '');
             $languageDimensionValue = $node->originDimensionSpacePoint->coordinates['language'] ?? null;
             if (!is_null($languageDimensionValue)) {
                 $locale = new Locale($languageDimensionValue);