diff --git a/core/modules/help_topics/help_topics/config_basic.help_topic.yml b/core/modules/help_topics/help_topics/config_basic.yml
similarity index 100%
rename from core/modules/help_topics/help_topics/config_basic.help_topic.yml
rename to core/modules/help_topics/help_topics/config_basic.yml
diff --git a/core/modules/help_topics/help_topics/config_error.help_topic.yml b/core/modules/help_topics/help_topics/config_error.yml
similarity index 100%
rename from core/modules/help_topics/help_topics/config_error.help_topic.yml
rename to core/modules/help_topics/help_topics/config_error.yml
diff --git a/core/modules/help_topics/help_topics/help_topic_writing.help_topic.yml b/core/modules/help_topics/help_topics/help_topic_writing.yml
similarity index 100%
rename from core/modules/help_topics/help_topics/help_topic_writing.help_topic.yml
rename to core/modules/help_topics/help_topics/help_topic_writing.yml
diff --git a/core/modules/help_topics/help_topics/maintenance.help_topic.yml b/core/modules/help_topics/help_topics/maintenance.yml
similarity index 100%
rename from core/modules/help_topics/help_topics/maintenance.help_topic.yml
rename to core/modules/help_topics/help_topics/maintenance.yml
diff --git a/core/modules/help_topics/help_topics/menu_overview.help_topic.yml b/core/modules/help_topics/help_topics/menu_overview.yml
similarity index 100%
rename from core/modules/help_topics/help_topics/menu_overview.help_topic.yml
rename to core/modules/help_topics/help_topics/menu_overview.yml
diff --git a/core/modules/help_topics/help_topics/security.help_topic.yml b/core/modules/help_topics/help_topics/security.yml
similarity index 100%
rename from core/modules/help_topics/help_topics/security.help_topic.yml
rename to core/modules/help_topics/help_topics/security.yml
diff --git a/core/modules/help_topics/help_topics/security_account_settings.help_topic.yml b/core/modules/help_topics/help_topics/security_account_settings.yml
similarity index 100%
rename from core/modules/help_topics/help_topics/security_account_settings.help_topic.yml
rename to core/modules/help_topics/help_topics/security_account_settings.yml
diff --git a/core/modules/help_topics/help_topics/ui_accessibility.help_topic.yml b/core/modules/help_topics/help_topics/ui_accessibility.yml
similarity index 100%
rename from core/modules/help_topics/help_topics/ui_accessibility.help_topic.yml
rename to core/modules/help_topics/help_topics/ui_accessibility.yml
diff --git a/core/modules/help_topics/help_topics/ui_components.help_topic.yml b/core/modules/help_topics/help_topics/ui_components.yml
similarity index 100%
rename from core/modules/help_topics/help_topics/ui_components.help_topic.yml
rename to core/modules/help_topics/help_topics/ui_components.yml
diff --git a/core/modules/help_topics/help_topics/ui_contextual.help_topic.yml b/core/modules/help_topics/help_topics/ui_contextual.yml
similarity index 100%
rename from core/modules/help_topics/help_topics/ui_contextual.help_topic.yml
rename to core/modules/help_topics/help_topics/ui_contextual.yml
diff --git a/core/modules/help_topics/help_topics/ui_shortcuts.help_topic.yml b/core/modules/help_topics/help_topics/ui_shortcuts.yml
similarity index 100%
rename from core/modules/help_topics/help_topics/ui_shortcuts.help_topic.yml
rename to core/modules/help_topics/help_topics/ui_shortcuts.yml
diff --git a/core/modules/help_topics/help_topics/ui_tours.help_topic.yml b/core/modules/help_topics/help_topics/ui_tours.yml
similarity index 100%
rename from core/modules/help_topics/help_topics/ui_tours.help_topic.yml
rename to core/modules/help_topics/help_topics/ui_tours.yml
diff --git a/core/modules/help_topics/tests/modules/help_topics_test/help_topics/help_test.help_topic.yml b/core/modules/help_topics/tests/modules/help_topics_test/help_topics/help_test.yml
similarity index 100%
rename from core/modules/help_topics/tests/modules/help_topics_test/help_topics/help_test.help_topic.yml
rename to core/modules/help_topics/tests/modules/help_topics_test/help_topics/help_test.yml
diff --git a/core/modules/help_topics/tests/modules/help_topics_test/help_topics/help_test_additional.help_topic.yml b/core/modules/help_topics/tests/modules/help_topics_test/help_topics/help_test_additional.yml
similarity index 100%
rename from core/modules/help_topics/tests/modules/help_topics_test/help_topics/help_test_additional.help_topic.yml
rename to core/modules/help_topics/tests/modules/help_topics_test/help_topics/help_test_additional.yml
diff --git a/core/modules/help_topics/tests/modules/help_topics_test/help_topics/help_test_linked.help_topic.yml b/core/modules/help_topics/tests/modules/help_topics_test/help_topics/help_test_linked.yml
similarity index 100%
rename from core/modules/help_topics/tests/modules/help_topics_test/help_topics/help_test_linked.help_topic.yml
rename to core/modules/help_topics/tests/modules/help_topics_test/help_topics/help_test_linked.yml
diff --git a/core/modules/help_topics/tests/themes/help_topic_test_theme/help_topics/help_test_theme.help_topic.yml b/core/modules/help_topics/tests/themes/help_topic_test_theme/help_topics/help_test_theme.yml
similarity index 100%
rename from core/modules/help_topics/tests/themes/help_topic_test_theme/help_topics/help_test_theme.help_topic.yml
rename to core/modules/help_topics/tests/themes/help_topic_test_theme/help_topics/help_test_theme.yml