diff --git a/Classes/ContentRepository/Service/WorkspaceService.php b/Classes/ContentRepository/Service/WorkspaceService.php
index d3bc898417..08d6ce7867 100644
--- a/Classes/ContentRepository/Service/WorkspaceService.php
+++ b/Classes/ContentRepository/Service/WorkspaceService.php
@@ -64,14 +64,14 @@ public function getPublishableNodeInfo(WorkspaceName $workspaceName, ContentRepo
             return [];
         }
         $changeFinder = $contentRepository->projectionState(ChangeFinder::class);
-        $changes = $changeFinder->findByContentStreamIdentifier($workspace->currentContentStreamId);
+        $changes = $changeFinder->findByContentStreamId($workspace->currentContentStreamId);
         $unpublishedNodes = [];
         foreach ($changes as $change) {
             if ($change->removalAttachmentPoint) {
                 $nodeAddress = new NodeAddress(
-                    $change->contentStreamIdentifier,
+                    $change->contentStreamId,
                     $change->originDimensionSpacePoint->toDimensionSpacePoint(),
-                    $change->nodeAggregateIdentifier,
+                    $change->nodeAggregateId,
                     $workspaceName
                 );
 
@@ -79,7 +79,7 @@ public function getPublishableNodeInfo(WorkspaceName $workspaceName, ContentRepo
                  * See {@see Remove::apply} -> Removal Attachment Point == closest document node.
                  */
                 $documentNodeAddress = new NodeAddress(
-                    $change->contentStreamIdentifier,
+                    $change->contentStreamId,
                     $change->originDimensionSpacePoint->toDimensionSpacePoint(),
                     $change->removalAttachmentPoint,
                     $workspaceName
@@ -95,7 +95,7 @@ public function getPublishableNodeInfo(WorkspaceName $workspaceName, ContentRepo
                     $change->originDimensionSpacePoint->toDimensionSpacePoint(),
                     VisibilityConstraints::withoutRestrictions()
                 );
-                $node = $subgraph->findNodeById($change->nodeAggregateIdentifier);
+                $node = $subgraph->findNodeById($change->nodeAggregateId);
 
                 if ($node instanceof Node) {
                     $documentNode = $this->getClosestDocumentNode($node);
diff --git a/Classes/Domain/Model/Changes/AbstractCreate.php b/Classes/Domain/Model/Changes/AbstractCreate.php
index 98bac97f7f..9cdf2cfe7a 100644
--- a/Classes/Domain/Model/Changes/AbstractCreate.php
+++ b/Classes/Domain/Model/Changes/AbstractCreate.php
@@ -84,13 +84,13 @@ public function getName(): ?string
 
     /**
      * @param Node $parentNode
-     * @param NodeAggregateId|null $succeedingSiblingNodeAggregateIdentifier
+     * @param NodeAggregateId|null $succeedingSiblingNodeAggregateId
      * @return Node
      * @throws InvalidNodeCreationHandlerException|NodeNameIsAlreadyOccupied|NodeException
      */
     protected function createNode(
         Node $parentNode,
-        NodeAggregateId $succeedingSiblingNodeAggregateIdentifier = null
+        NodeAggregateId $succeedingSiblingNodeAggregateId = null
     ): Node {
         $nodeTypeName = $this->getNodeTypeName();
         if (is_null($nodeTypeName)) {
@@ -100,15 +100,15 @@ protected function createNode(
         // $name = $this->getName() ?: $this->nodeService->generateUniqueNodeName($parent->findParentNode());
         $nodeName = NodeName::fromString($this->getName() ?: uniqid('node-', false));
 
-        $nodeAggregateIdentifier = NodeAggregateId::create(); // generate a new NodeAggregateIdentifier
+        $nodeAggregateId = NodeAggregateId::create(); // generate a new NodeAggregateId
 
         $command = new CreateNodeAggregateWithNode(
             $parentNode->subgraphIdentity->contentStreamId,
-            $nodeAggregateIdentifier,
+            $nodeAggregateId,
             $nodeTypeName,
             OriginDimensionSpacePoint::fromDimensionSpacePoint($parentNode->subgraphIdentity->dimensionSpacePoint),
             $parentNode->nodeAggregateId,
-            $succeedingSiblingNodeAggregateIdentifier,
+            $succeedingSiblingNodeAggregateId,
             $nodeName
         );
         $contentRepository = $this->contentRepositoryRegistry->get($parentNode->subgraphIdentity->contentRepositoryId);
diff --git a/Classes/Domain/Model/Changes/Property.php b/Classes/Domain/Model/Changes/Property.php
index 43017d45ba..000aaed738 100644
--- a/Classes/Domain/Model/Changes/Property.php
+++ b/Classes/Domain/Model/Changes/Property.php
@@ -152,10 +152,10 @@ public function apply(): void
             // Use extra commands for reference handling
             if ($propertyType === 'reference' || $propertyType === 'references') {
                 $value = $this->getValue();
-                $destinationNodeAggregateIdentifiers = [];
+                $destinationNodeAggregateIds = [];
                 if ($propertyType === 'reference') {
                     if (is_string($value) && !empty($value)) {
-                        $destinationNodeAggregateIdentifiers[] = $value;
+                        $destinationNodeAggregateIds[] = $value;
                     }
                 }
 
@@ -163,8 +163,8 @@ public function apply(): void
                     /** @var array<int,string> $values */
                     $values = $value;
                     if (is_array($values)) {
-                        foreach ($values as $singleNodeAggregateIdentifier) {
-                            $destinationNodeAggregateIdentifiers[] = $singleNodeAggregateIdentifier;
+                        foreach ($values as $singleNodeAggregateId) {
+                            $destinationNodeAggregateIds[] = $singleNodeAggregateId;
                         }
                     }
                 }
@@ -175,7 +175,7 @@ public function apply(): void
                         $subject->nodeAggregateId,
                         $subject->originDimensionSpacePoint,
                         ReferenceName::fromString($propertyName),
-                        NodeReferencesToWrite::fromNodeAggregateIds(NodeAggregateIds::fromArray($destinationNodeAggregateIdentifiers))
+                        NodeReferencesToWrite::fromNodeAggregateIds(NodeAggregateIds::fromArray($destinationNodeAggregateIds))
                     )
                 );
             } else {
@@ -256,11 +256,11 @@ public function apply(): void
             // because it may have been modified by the commands above.
             // Thus, we need to re-fetch it (as a workaround; until we do not need this anymore)
             $subgraph = $this->contentRepositoryRegistry->subgraphForNode($subject);
-            $originalNodeAggregateIdentifier = $subject->nodeAggregateId;
-            $node = $subgraph->findNodeById($originalNodeAggregateIdentifier);
+            $originalNodeAggregateId = $subject->nodeAggregateId;
+            $node = $subgraph->findNodeById($originalNodeAggregateId);
             if (is_null($node)) {
                 throw new \InvalidArgumentException(
-                    'Cannot apply Property on missing node ' . $originalNodeAggregateIdentifier,
+                    'Cannot apply Property on missing node ' . $originalNodeAggregateId,
                     1645560836
                 );
             }
diff --git a/Classes/FlowQueryOperations/NeosUiDefaultNodesOperation.php b/Classes/FlowQueryOperations/NeosUiDefaultNodesOperation.php
index ad7435d215..78e8301aa1 100644
--- a/Classes/FlowQueryOperations/NeosUiDefaultNodesOperation.php
+++ b/Classes/FlowQueryOperations/NeosUiDefaultNodesOperation.php
@@ -172,7 +172,7 @@ private function flattenSubtreeToNodeList(
             return;
         }
 
-        $nodes[(string)$currentNode->getNodeAggregateIdentifier()] = $currentNode;
+        $nodes[(string)$currentNode->getNodeAggregateId()] = $currentNode;
 
         foreach ($subtree->getChildren() as $childSubtree) {
             $this->flattenSubtreeToNodeList($nodeAccessor, $childSubtree, $nodes);