diff --git a/Neos.ContentRepository.NodeAccess/Configuration/Settings.yaml b/Neos.ContentRepository.NodeAccess/Configuration/Settings.yaml
deleted file mode 100644
index 34c0b75a38a..00000000000
--- a/Neos.ContentRepository.NodeAccess/Configuration/Settings.yaml
+++ /dev/null
@@ -1,52 +0,0 @@
-Neos:
-
-  ContentRepository:
-
-    # Configure available content dimensions for nodes, after adding a dimension the database has to be filled with
-    # the dimension default values.
-    # Also add named presets with fallback chains that can happen in your dimensions.
-    #
-    # Example
-    #
-    #   contentDimensions:
-    #     language:
-    #       default: mul_ZZ
-    #       defaultPreset: 'all'
-    #       presets:
-    #         'all':
-    #           values: ['mul_ZZ']
-    #
-    #     persona:
-    #       default: everybody
-    #       defaultPreset: 'all'
-    #       presets:
-    #         'all':
-    #           values: ['everybody']
-    contentDimensions: {  }
-
-    # Configures defaults for node label generation
-    labelGenerator:
-      eel:
-        defaultContext:
-          String: Neos\Eel\Helper\StringHelper
-          Array: Neos\Eel\Helper\ArrayHelper
-          Date: Neos\Eel\Helper\DateHelper
-          Configuration: Neos\Eel\Helper\ConfigurationHelper
-          Math: Neos\Eel\Helper\MathHelper
-          Json: Neos\Eel\Helper\JsonHelper
-          I18n: Neos\Flow\I18n\EelHelper\TranslationHelper
-          q: Neos\Eel\FlowQuery\FlowQuery::q
-
-    unstableInternalWillChangeLater:
-      projection:
-        defaultProjectorsToBeBlocked:
-          'Neos\ContentRepository\Core\Projection\ContentStream\ContentStreamProjector': true
-          'Neos\ContentRepository\Core\Projection\Workspace\WorkspaceProjector': true
-
-
-    NodeAccess:
-      nodeAccessorFactories:
-        contentSubgraph:
-          position: end
-          className: Neos\ContentRepository\NodeAccess\NodeAccessor\Implementation\ContentSubgraphAccessorFactory
-
diff --git a/Neos.Neos/Classes/Domain/NodeLabel/ExpressionBasedNodeLabelGenerator.php b/Neos.Neos/Classes/Domain/NodeLabel/ExpressionBasedNodeLabelGenerator.php
index 6218cdd518b..250346e78de 100644
--- a/Neos.Neos/Classes/Domain/NodeLabel/ExpressionBasedNodeLabelGenerator.php
+++ b/Neos.Neos/Classes/Domain/NodeLabel/ExpressionBasedNodeLabelGenerator.php
@@ -28,7 +28,7 @@ class ExpressionBasedNodeLabelGenerator implements NodeLabelGeneratorInterface
     protected EelEvaluatorInterface $eelEvaluator;
 
     /**
-     * @Flow\InjectConfiguration(package="Neos.ContentRepository", path="labelGenerator.eel.defaultContext")
+     * @Flow\InjectConfiguration(package="Neos.Neos", path="labelGenerator.eel.defaultContext")
      * @var array<string, string>
      */
     protected $defaultContextConfiguration;
diff --git a/Neos.Neos/Configuration/Settings.yaml b/Neos.Neos/Configuration/Settings.yaml
index 11ca11829ba..a8d9e9da3f0 100755
--- a/Neos.Neos/Configuration/Settings.yaml
+++ b/Neos.Neos/Configuration/Settings.yaml
@@ -487,40 +487,18 @@ Neos:
         neos-site: Sites
         neos-plugin: Plugins
 
-  ContentRepository:
-    # Definition of available content dimensions. Additional content dimensions may be defined in third-party packages
-    # or via global settings.
-    #
-    #contentDimensions:
-    #
-    #  # Content dimension "language" serves for translation of content into different languages. Its value specifies
-    #  # the language or language variant by means of a locale.
-    #  'language':
-    #    # The default dimension that is applied when creating nodes without specifying a dimension
-    #    default: 'mul_ZZ'
-    #    # The default preset to use if no URI segment was given when resolving languages in the router
-    #    defaultPreset: 'all'
-    #    label: 'Language'
-    #    icon: 'icon-language'
-    #    presets:
-    #      'all':
-    #        label: 'All languages'
-    #        values: ['mul_ZZ']
-    #        uriSegment: 'all'
-    #      # Example for additional languages:
-    #
-    #      'en_GB':
-    #        label: 'English (Great Britain)'
-    #        values: ['en_GB', 'en_ZZ', 'mul_ZZ']
-    #        uriSegment: 'gb'
-    #      'de':
-    #        label: 'German (Germany)'
-    #        values: ['de_DE', 'de_ZZ', 'mul_ZZ']
-    #        uriSegment: 'de'
-
+    # Configures defaults for node label generation
     labelGenerator:
       eel:
         defaultContext:
+          String: Neos\Eel\Helper\StringHelper
+          Array: Neos\Eel\Helper\ArrayHelper
+          Date: Neos\Eel\Helper\DateHelper
+          Configuration: Neos\Eel\Helper\ConfigurationHelper
+          Math: Neos\Eel\Helper\MathHelper
+          Json: Neos\Eel\Helper\JsonHelper
+          I18n: Neos\Flow\I18n\EelHelper\TranslationHelper
+          q: Neos\Eel\FlowQuery\FlowQuery::q
           Neos.Node: Neos\Neos\Fusion\Helper\NodeHelper
 
   Fusion: