diff --git a/core/modules/help/help.module b/core/modules/help/help.module
index 84497f243f1..9704b9e3f4d 100644
--- a/core/modules/help/help.module
+++ b/core/modules/help/help.module
@@ -36,7 +36,7 @@ function help_help($route_name, RouteMatchInterface $route_match) {
       $search_help = ($module_handler->moduleExists('search')) ? Url::fromRoute('help.page', ['name' => 'search'])->toString() : '#';
       $output = '<h3>' . t('About') . '</h3>';
       $output .= '<p>' . t('The Help module generates <a href=":help-page">Help topics and reference pages</a> to guide you through the use and configuration of modules, and provides a Help block with page-level help. The reference pages are a starting point for <a href=":handbook">Drupal.org online documentation</a> pages that contain more extensive and up-to-date information, are annotated with user-contributed comments, and serve as the definitive reference point for all Drupal documentation. For more information, see the <a href=":help">online documentation for the Help module</a>.', [':help' => 'https://www.drupal.org/documentation/modules/help/', ':handbook' => 'https://www.drupal.org/documentation', ':help-page' => Url::fromRoute('help.main')->toString()]) . '</p>';
-      $output .= '<p>' . t('Help topics provided by modules and themes are also part of the Help module. If the core Search module is enabled, these topics are searchable. For more information, see the <a href=":online">online documentation for Help Topics</a>.', [':online' => 'https://www.drupal.org/documentation/modules/help_topics']) . '</p>';
+      $output .= '<p>' . t('Help topics provided by modules and themes are also part of the Help module. If the core Search module is enabled, these topics are searchable. For more information, see the <a href=":online">online documentation, Help Topic Standards</a>.', [':online' => 'https://www.drupal.org/docs/develop/managing-a-drupalorg-theme-module-or-distribution-project/documenting-your-project/help-topic-standards']) . '</p>';
       $output .= '<h3>' . t('Uses') . '</h3>';
       $output .= '<dl>';
       $output .= '<dt>' . t('Providing a help reference') . '</dt>';
@@ -46,7 +46,7 @@ function help_help($route_name, RouteMatchInterface $route_match) {
       $output .= '<dt>' . t('Viewing help topics') . '</dt>';
       $output .= '<dd>' . t('The top-level help topics are listed on the main <a href=":help_page">Help page</a>. Links to other topics, including non-top-level help topics, can be found under the "Related" heading when viewing a topic page.', [':help_page' => $help_home]) . '</dd>';
       $output .= '<dt>' . t('Providing help topics') . '</dt>';
-      $output .= '<dd>' . t("Modules and themes can provide help topics as Twig-file-based plugins in a project sub-directory called <em>help_topics</em>; plugin meta-data is provided in YAML front matter within each Twig file. Plugin-based help topics provided by modules and themes will automatically be updated when a module or theme is updated. Use the plugins in <em>core/modules/help_topics/help_topics</em> as a guide when writing and formatting a help topic plugin for your theme or module.") . '</dd>';
+      $output .= '<dd>' . t("Modules and themes can provide help topics as Twig-file-based plugins in a project sub-directory called <em>help_topics</em>; plugin meta-data is provided in YAML front matter within each Twig file. Plugin-based help topics provided by modules and themes will automatically be updated when a module or theme is updated. Use the plugins in <em>core/modules/help/help_topics</em> as a guide when writing and formatting a help topic plugin for your theme or module.") . '</dd>';
       $output .= '<dt>' . t('Translating help topics') . '</dt>';
       $output .= '<dd>' . t('The title and body text of help topics provided by contributed modules and themes are translatable using the <a href=":locale_help">Interface Translation module</a>. Topics provided by custom modules and themes are also translatable if they have been viewed at least once in a non-English language, which triggers putting their translatable text into the translation database.', [':locale_help' => $locale_help]) . '</dd>';
       $output .= '<dt>' . t('Configuring help search') . '</dt>';
diff --git a/core/modules/help/tests/src/Kernel/HelpSearchPluginTest.php b/core/modules/help/tests/src/Kernel/HelpSearchPluginTest.php
index becce2bf220..a79bd634a3c 100644
--- a/core/modules/help/tests/src/Kernel/HelpSearchPluginTest.php
+++ b/core/modules/help/tests/src/Kernel/HelpSearchPluginTest.php
@@ -11,7 +11,7 @@ use Drupal\search\Plugin\SearchIndexingInterface;
  *
  * @group help
  *
- * @see \Drupal\help_topics\Plugin\Search\HelpSearch
+ * @see \Drupal\help\Plugin\Search\HelpSearch
  */
 class HelpSearchPluginTest extends KernelTestBase {
 
@@ -26,7 +26,7 @@ class HelpSearchPluginTest extends KernelTestBase {
   public function testAnnotation() {
     /** @var \Drupal\search\SearchPluginManager $manager */
     $manager = \Drupal::service('plugin.manager.search');
-    /** @var \Drupal\help_topics\Plugin\Search\HelpSearch $plugin */
+    /** @var \Drupal\help\Plugin\Search\HelpSearch $plugin */
     $plugin = $manager->createInstance('help_search');
     $this->assertInstanceOf(AccessibleInterface::class, $plugin);
     $this->assertInstanceOf(SearchIndexingInterface::class, $plugin);