diff --git a/core/modules/help_topics/help_topics/core.quick_edit.html.twig b/core/modules/help_topics/help_topics/core.quick_edit.html.twig
deleted file mode 100644
index 21d22d55dc62ebb49252e07d710a0f1992788f98..0000000000000000000000000000000000000000
--- a/core/modules/help_topics/help_topics/core.quick_edit.html.twig
+++ /dev/null
@@ -1,19 +0,0 @@
----
-label: 'Using in-line (quick) editing'
-related:
-  - core.ui_components
----
-<h2>{% trans %}Goal{% endtrans %}</h2>
-<p>{% trans %}Edit content or settings in place.{% endtrans %}</p>
-<h2>{% trans %}What is quick editing?{% endtrans %}</h2>
-<p>{% trans %}Quick editing is editing either content or settings inline. Content quick editing is provided by the core Quick Edit module, and settings quick editing is provided by the core Settings Tray module; both of them require the core Contextual Links module in order to expose the links that let you edit in place.{% endtrans %}</p>
-<h2>{% trans %}Who can edit content and settings in place?{% endtrans %}</h2>
-<p>{% trans %}In order to follow these steps to edit content in place, the core Quick Edit module must be installed; to edit settings, the core Settings Tray module must be installed. Also, either the core Toolbar module or a contributed replacement must be installed. You will need to have <em>Use contextual links</em> permission, as well as permission to edit the particular content or settings.{% endtrans %}</p>
-<h2>{% trans %}Steps{% endtrans %}</h2>
-<ol>
-  <li>{% trans %}Find and visit a page on your site that has either content or settings that you would like to edit.{% endtrans %}</li>
-  <li>{% trans %}Click the contextual links <em>Edit</em> button on the toolbar (in most themes, it looks like a pencil). Contextual <em>Edit</em> links with the same icon will appear all over your page.{% endtrans %}</li>
-  <li>{% trans %}Find the contextual link for the part of the page you want to edit. For example, if you want to edit the settings for a block, the link should be in the top-right corner of the block, or top-left for right-to-left languages.{% endtrans %}</li>
-  <li>{% trans %}Click the link to open the contextual links menu, and click <em>Quick edit</em>. An editing form for the settings or content should appear on the page.{% endtrans %}</li>
-  <li>{% trans %}Make your edits and submit the form.{% endtrans %}</li>
-</ol>
diff --git a/core/modules/help_topics/help_topics/core.settings_tray.html.twig b/core/modules/help_topics/help_topics/core.settings_tray.html.twig
new file mode 100644
index 0000000000000000000000000000000000000000..ceb23a1e5393fe2a0cbc990aead8dec88df71a87
--- /dev/null
+++ b/core/modules/help_topics/help_topics/core.settings_tray.html.twig
@@ -0,0 +1,19 @@
+---
+label: 'Using in-line (quick) settings editing'
+related:
+  - core.ui_components
+---
+<h2>{% trans %}Goal{% endtrans %}</h2>
+<p>{% trans %}Edit settings in place.{% endtrans %}</p>
+<h2>{% trans %}What is quick editing?{% endtrans %}</h2>
+<p>{% trans %}The core Settings Tray module provides the ability to quickly edit settings inline. It requires the core Contextual Links module in order to expose the links that let you edit in place.{% endtrans %}</p>
+<h2>{% trans %}Who can edit settings in place?{% endtrans %}</h2>
+<p>{% trans %}In order to follow these steps to edit settings in place, the core Settings Tray module must be installed. Also, either the core Toolbar module or a contributed replacement must be installed. You will need to have <em>Use contextual links</em> permission, as well as permission to edit the particular content or settings.{% endtrans %}</p>
+<h2>{% trans %}Steps{% endtrans %}</h2>
+<ol>
+  <li>{% trans %}Find and visit a page on your site that has the settings that you would like to edit.{% endtrans %}</li>
+  <li>{% trans %}Click the contextual links <em>Edit</em> button on the toolbar (in most themes, it looks like a pencil). Contextual <em>Edit</em> links with the same icon will appear all over your page.{% endtrans %}</li>
+  <li>{% trans %}Find the contextual link for the part of the page you want to edit. For example, if you want to edit the settings for a block, the link should be in the top-right corner of the block, or top-left for right-to-left languages.{% endtrans %}</li>
+  <li>{% trans %}Click the link to open the contextual links menu, and click <em>Quick edit</em>. An editing form for the settings should appear on the page.{% endtrans %}</li>
+  <li>{% trans %}Make your edits and submit the form.{% endtrans %}</li>
+</ol>
diff --git a/core/modules/help_topics/help_topics/core.ui_components.html.twig b/core/modules/help_topics/help_topics/core.ui_components.html.twig
index 503b0e91f587ce3022497059bcd6179a4ea81068..1286171aa7e07cb83b3804ff5c303648eaf135f8 100644
--- a/core/modules/help_topics/help_topics/core.ui_components.html.twig
+++ b/core/modules/help_topics/help_topics/core.ui_components.html.twig
@@ -5,7 +5,7 @@ related:
   - block.overview
 ---
 {% set accessibility_topic = render_var(help_topic_link('core.ui_accessibility')) %}
-{% set quick_edit_topic = render_var(help_topic_link('core.quick_edit')) %}
+{% set settings_tray_topic = render_var(help_topic_link('core.settings_tray')) %}
 {% set admin_link = render_var(help_route_link('/admin', 'system.admin')) %}
 <h2>{% trans %}What administrative interface components are available?{% endtrans %}</h2>
 <p>{% trans %}The following administrative interface components are provided by Drupal core and its modules (some contributed modules offer additional functionality):{% endtrans %}</p>
@@ -14,7 +14,7 @@ related:
   <li>{% trans %}A menu system, which you can navigate to find pages for administrative tasks. The core Toolbar module displays this menu on the top or left side of the page (right side in right-to-left languages). There are also contributed module replacements for the core Toolbar module, with additional features, such as the <a href="https://www.drupal.org/project/admin_toolbar">Admin Toolbar module</a>.{% endtrans %}</li>
   <li>{% trans %}The core Shortcuts module enhances the toolbar with a configurable list of links to commonly-used tasks.{% endtrans %}</li>
   <li>{% trans %}If you install the core Contextual Links module, non-administrative pages will contain links leading to related administrative tasks.{% endtrans %}</li>
-  <li>{% trans %}In-place or <em>quick</em> editing. In-place editing of content is provided by the core Quick Edit module, and in-place editing of configuration is provided by the core Settings Tray module. See {{ quick_edit_topic }} for more information.{% endtrans %}</li>
+  <li>{% trans %}In-place or <em>quick</em> editing. In-place editing of configuration is provided by the core Settings Tray module. See {{ settings_tray_topic }} for more information.{% endtrans %}</li>
   <li>{% trans %}The core Help module displays help topics, and provides a Help block that can be placed on administrative pages to provide an overview of their functionality.{% endtrans %}</li>
   <li>{% trans %}The core Tour module allows modules to provide interactive tours of administrative pages for more detailed help.{% endtrans %}</li>
 </ul>
diff --git a/core/modules/quickedit/help_topics/quickedit.quick_edit.html.twig b/core/modules/quickedit/help_topics/quickedit.quick_edit.html.twig
new file mode 100644
index 0000000000000000000000000000000000000000..3b10f6d09dd943842c838ea0f0e8342dc2a8e510
--- /dev/null
+++ b/core/modules/quickedit/help_topics/quickedit.quick_edit.html.twig
@@ -0,0 +1,20 @@
+---
+label: 'Using in-line (quick) content editing'
+related:
+  - core.ui_components
+  - core.settings_tray
+---
+<h2>{% trans %}Goal{% endtrans %}</h2>
+<p>{% trans %}Edit content in place.{% endtrans %}</p>
+<h2>{% trans %}What is quick editing?{% endtrans %}</h2>
+<p>{% trans %}Quick editing is editing content inline. Content quick editing is provided by the core Quick Edit module or its contributed replacement. It requires the core Contextual Links module in order to expose the links that let you edit in place.{% endtrans %}</p>
+<h2>{% trans %}Who can edit content in place?{% endtrans %}</h2>
+<p>{% trans %}In order to follow these steps to edit content in place, the core Quick Edit module or its contributed replacement must be installed. Also, either the core Toolbar module or a contributed replacement must be installed. You will need to have <em>Use contextual links</em> permission, as well as permission to edit the particular content.{% endtrans %}</p>
+<h2>{% trans %}Steps{% endtrans %}</h2>
+<ol>
+  <li>{% trans %}Find and visit a page on your site that has the content that you would like to edit.{% endtrans %}</li>
+  <li>{% trans %}Click the contextual links <em>Edit</em> button on the toolbar (in most themes, it looks like a pencil). Contextual <em>Edit</em> links with the same icon will appear all over your page.{% endtrans %}</li>
+  <li>{% trans %}Find the contextual link for the part of the page you want to edit. For example, if you want to edit the content of a block, the link should be in the top-right corner of the block, or top-left for right-to-left languages.{% endtrans %}</li>
+  <li>{% trans %}Click the link to open the contextual links menu, and click <em>Quick edit</em>. An editing form for the content should appear on the page.{% endtrans %}</li>
+  <li>{% trans %}Make your edits and submit the form.{% endtrans %}</li>
+</ol>