diff --git a/Classes/Infrastructure/ContentRepository/CreationDialogPostprocessor.php b/Classes/Infrastructure/ContentRepository/CreationDialog/CreationDialogNodeTypePostprocessor.php
similarity index 97%
rename from Classes/Infrastructure/ContentRepository/CreationDialogPostprocessor.php
rename to Classes/Infrastructure/ContentRepository/CreationDialog/CreationDialogNodeTypePostprocessor.php
index f9971cd420..e43b78cff0 100644
--- a/Classes/Infrastructure/ContentRepository/CreationDialogPostprocessor.php
+++ b/Classes/Infrastructure/ContentRepository/CreationDialog/CreationDialogNodeTypePostprocessor.php
@@ -12,7 +12,7 @@
 
 declare(strict_types=1);
 
-namespace Neos\Neos\Ui\Infrastructure\ContentRepository;
+namespace Neos\Neos\Ui\Infrastructure\ContentRepository\CreationDialog;
 
 use Neos\ContentRepository\Core\NodeType\NodeType;
 use Neos\ContentRepository\Core\NodeType\NodeTypePostprocessorInterface;
@@ -53,7 +53,7 @@
  *     'someProperty':
  *       # ...
  */
-class CreationDialogPostprocessor implements NodeTypePostprocessorInterface
+class CreationDialogNodeTypePostprocessor implements NodeTypePostprocessorInterface
 {
     /**
      * @var array
diff --git a/Classes/Infrastructure/ContentRepository/PromotedElementsCreationHandlerFactory.php b/Classes/Infrastructure/ContentRepository/CreationDialog/PromotedElementsCreationHandlerFactory.php
similarity index 98%
rename from Classes/Infrastructure/ContentRepository/PromotedElementsCreationHandlerFactory.php
rename to Classes/Infrastructure/ContentRepository/CreationDialog/PromotedElementsCreationHandlerFactory.php
index ee32850097..04b36ff2b6 100644
--- a/Classes/Infrastructure/ContentRepository/PromotedElementsCreationHandlerFactory.php
+++ b/Classes/Infrastructure/ContentRepository/CreationDialog/PromotedElementsCreationHandlerFactory.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Neos\Neos\Ui\Infrastructure\ContentRepository;
+namespace Neos\Neos\Ui\Infrastructure\ContentRepository\CreationDialog;
 
 use Neos\ContentRepository\Core\Factory\ContentRepositoryServiceFactoryDependencies;
 use Neos\ContentRepository\Core\Factory\ContentRepositoryServiceFactoryInterface;
diff --git a/Configuration/NodeTypes.yaml b/Configuration/NodeTypes.yaml
index be0d2127db..f2a90db920 100644
--- a/Configuration/NodeTypes.yaml
+++ b/Configuration/NodeTypes.yaml
@@ -2,7 +2,7 @@
   postprocessors:
     'CreationDialogPostprocessor':
       position: 'after NodeTypePresetPostprocessor'
-      postprocessor: 'Neos\Neos\Ui\Infrastructure\ContentRepository\CreationDialogPostprocessor'
+      postprocessor: 'Neos\Neos\Ui\Infrastructure\ContentRepository\CreationDialog\CreationDialogNodeTypePostprocessor'
   ui:
     creationDialog:
       elements:
@@ -25,17 +25,17 @@
       uriPathSegment:
         factoryClassName: 'Neos\Neos\Ui\Infrastructure\Neos\UriPathSegmentNodeCreationHandlerFactory'
       promotedElements:
-        factoryClassName: 'Neos\Neos\Ui\Infrastructure\ContentRepository\PromotedElementsCreationHandlerFactory'
+        factoryClassName: 'Neos\Neos\Ui\Infrastructure\ContentRepository\CreationDialog\PromotedElementsCreationHandlerFactory'
 
 'Neos.Neos:Content':
   postprocessors:
     'CreationDialogPostprocessor':
       position: 'after NodeTypePresetPostprocessor'
-      postprocessor: 'Neos\Neos\Ui\Infrastructure\ContentRepository\CreationDialogPostprocessor'
+      postprocessor: 'Neos\Neos\Ui\Infrastructure\ContentRepository\CreationDialog\CreationDialogNodeTypePostprocessor'
   options:
     nodeCreationHandlers:
       promotedElements:
-        factoryClassName: 'Neos\Neos\Ui\Infrastructure\ContentRepository\PromotedElementsCreationHandlerFactory'
+        factoryClassName: 'Neos\Neos\Ui\Infrastructure\ContentRepository\CreationDialog\PromotedElementsCreationHandlerFactory'
 
 'Neos.Neos:ContentCollection':
   ui:
diff --git a/Tests/Unit/CreationDialogPostprocessorTest.php b/Tests/Unit/CreationDialogNodeTypePostprocessorTest.php
similarity index 86%
rename from Tests/Unit/CreationDialogPostprocessorTest.php
rename to Tests/Unit/CreationDialogNodeTypePostprocessorTest.php
index 6d23735f92..e15fb7b0ba 100644
--- a/Tests/Unit/CreationDialogPostprocessorTest.php
+++ b/Tests/Unit/CreationDialogNodeTypePostprocessorTest.php
@@ -5,14 +5,14 @@
 use Neos\ContentRepository\Core\NodeType\NodeType;
 use Neos\ContentRepository\Core\NodeType\NodeTypeName;
 use Neos\Flow\Tests\UnitTestCase;
-use Neos\Neos\Ui\Infrastructure\ContentRepository\CreationDialogPostprocessor;
+use Neos\Neos\Ui\Infrastructure\ContentRepository\CreationDialog\CreationDialogNodeTypePostprocessor;
 
-class CreationDialogPostprocessorTest extends UnitTestCase
+class CreationDialogNodeTypePostprocessorTest extends UnitTestCase
 {
     /**
-     * @var CreationDialogPostprocessor
+     * @var CreationDialogNodeTypePostprocessor
      */
-    private $creationDialogPostprocessor;
+    private $postprocessor;
 
     /**
      * @var NodeType
@@ -21,7 +21,7 @@ class CreationDialogPostprocessorTest extends UnitTestCase
 
     public function setUp(): void
     {
-        $this->creationDialogPostprocessor = new CreationDialogPostprocessor();
+        $this->postprocessor = new CreationDialogNodeTypePostprocessor();
         $this->mockNodeType = new NodeType(NodeTypeName::fromString('Foo:Bar'), [], [], new DefaultNodeLabelGeneratorFactory());
     }
 
@@ -53,7 +53,7 @@ public function processCopiesInspectorConfigurationToCreationDialogElements(): v
             ],
         ];
 
-        $this->creationDialogPostprocessor->process($this->mockNodeType, $configuration, []);
+        $this->postprocessor->process($this->mockNodeType, $configuration, []);
 
         $expectedElements = [
             'somePropertyName' => [
@@ -97,7 +97,7 @@ public function processDoesNotCreateEmptyCreationDialogs(): void
         ];
         $originalConfiguration = $configuration;
 
-        $this->creationDialogPostprocessor->process($this->mockNodeType, $configuration, []);
+        $this->postprocessor->process($this->mockNodeType, $configuration, []);
 
         self::assertSame($originalConfiguration, $configuration);
     }
@@ -121,7 +121,7 @@ public function processRespectsDataTypeDefaultConfiguration(): void
                 ],
             ],
         ];
-        $this->inject($this->creationDialogPostprocessor, 'dataTypesDefaultConfiguration', [
+        $this->inject($this->postprocessor, 'dataTypesDefaultConfiguration', [
             'SomeType' => [
                 'editor' => 'Some\Default\Editor',
                 'editorOptions' => [
@@ -131,7 +131,7 @@ public function processRespectsDataTypeDefaultConfiguration(): void
             ]
         ]);
 
-        $this->creationDialogPostprocessor->process($this->mockNodeType, $configuration, []);
+        $this->postprocessor->process($this->mockNodeType, $configuration, []);
 
         $expectedElements = [
             'somePropertyName' => [
@@ -165,7 +165,7 @@ public function processRespectsEditorDefaultConfiguration(): void
                 ],
             ],
         ];
-        $this->inject($this->creationDialogPostprocessor, 'editorDefaultConfiguration', [
+        $this->inject($this->postprocessor, 'editorDefaultConfiguration', [
             'Some\Editor' => [
                 'editorOptions' => [
                     'some' => 'editorDefault',
@@ -174,7 +174,7 @@ public function processRespectsEditorDefaultConfiguration(): void
                 ]
             ]
         ]);
-        $this->inject($this->creationDialogPostprocessor, 'dataTypesDefaultConfiguration', [
+        $this->inject($this->postprocessor, 'dataTypesDefaultConfiguration', [
             'SomeType' => [
                 'editor' => 'Some\Editor',
                 'editorOptions' => [
@@ -185,7 +185,7 @@ public function processRespectsEditorDefaultConfiguration(): void
         ]);
 
 
-        $this->creationDialogPostprocessor->process($this->mockNodeType, $configuration, []);
+        $this->postprocessor->process($this->mockNodeType, $configuration, []);
 
         $expectedElements = [
             'somePropertyName' => [