diff --git a/topics/basics/plugin_user_experience.md b/topics/basics/plugin_user_experience.md
index a74401f25..c5e2a0cf4 100644
--- a/topics/basics/plugin_user_experience.md
+++ b/topics/basics/plugin_user_experience.md
@@ -35,7 +35,7 @@ Plugins should be just easy to use.
Ideally, all the features should work out of the box after the installation, without any special user interactions, like manually enabling crucial plugin features.
Default settings should reflect the typical plugin usage in a standard project.
-All the settings and actions should be easy to find and be placed in the proper [settings](settings.md) or [action group](grouping_action.md), e.g.:
+All the settings and actions should be easy to find and be placed in the proper [settings](settings.md) or [action group](grouping_actions_tutorial.md), e.g.:
* Framework plugin settings should be placed under the Settings | Languages & Frameworks
* Action marking a directory as a plugin-specific root type should be added to Mark Directory as... group
diff --git a/topics/tutorials/action_system/grouping_action.md b/topics/tutorials/action_system/grouping_actions_tutorial.md
similarity index 100%
rename from topics/tutorials/action_system/grouping_action.md
rename to topics/tutorials/action_system/grouping_actions_tutorial.md
diff --git a/topics/tutorials/actions_tutorial.md b/topics/tutorials/actions_tutorial.md
index bc7157d97..986115209 100644
--- a/topics/tutorials/actions_tutorial.md
+++ b/topics/tutorials/actions_tutorial.md
@@ -7,6 +7,6 @@
This tutorial leads you through a series of steps which show how to create, register, and customize custom actions and action groups.
By registering actions, you can add your own menu items, toolbar buttons and keyboard shortcuts to the IDE user interface.
* [](creating_actions_tutorial.md)
-* [](grouping_action.md)
+* [](grouping_actions_tutorial.md)
The source code for the [`action_basics`](%gh-sdk-samples-master%/action_basics) code sample is used throughout this tutorial.
diff --git a/topics/user_interface_components/popups.md b/topics/user_interface_components/popups.md
index 990d671b4..509142e7d 100644
--- a/topics/user_interface_components/popups.md
+++ b/topics/user_interface_components/popups.md
@@ -15,9 +15,9 @@ The most commonly used methods are:
| Method | Description |
|---------------------------------|-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
| `createComponentPopupBuilder()` | Generic, allows showing any [Swing](https://docs.oracle.com/javase/tutorial/uiswing/start/index.html) component.
See [`ComponentPopupBuilder`](%gh-ic%/platform/platform-api/src/com/intellij/openapi/ui/popup/ComponentPopupBuilder.java)'s methods for possible options.
**Example:** [`IntentionPreviewPopupUpdateProcessor`](%gh-ic%/platform/lang-impl/src/com/intellij/codeInsight/intention/impl/preview/IntentionPreviewPopupUpdateProcessor.kt) creating a popup rendering the intention preview.
|
-| `createPopupChooserBuilder()` | For choosing one or more items from a plain `java.util.List`.
See [`PopupChooserBuilder`](%gh-ic%/platform/platform-api/src/com/intellij/openapi/ui/popup/PopupChooserBuilder.java)'s methods for possible options.
**Example:** [`ShowMessageHistoryAction`](%gh-ic%/platform/vcs-impl/src/com/intellij/openapi/vcs/actions/ShowMessageHistoryAction.kt) creating a popup with recent commit messages history in the commit message text area.
|
+| `createPopupChooserBuilder()` | For choosing one or more items from a plain `java.util.List`.
See [`PopupChooserBuilder`](%gh-ic%/platform/platform-api/src/com/intellij/openapi/ui/popup/PopupChooserBuilder.java)'s methods for possible options.
**Example:** [`ShowMessageHistoryAction`](%gh-ic%/platform/vcs-impl/src/com/intellij/openapi/vcs/actions/ShowMessageHistoryAction.kt) creating a popup with recent commit messages history in the commit message text area.
|
| `createConfirmation()` | For choosing between two options, and performing different actions depending on which option is selected.
**Example:** [`VariableInplaceRenamer`](%gh-ic%/platform/lang-impl/src/com/intellij/refactoring/rename/inplace/VariableInplaceRenamer.java) creating confirmation popup after invalid variable name is provided in the inplace rename action.
|
-| `createActionGroupPopup()` | Show actions from an [Action Group](grouping_action.md) and executes the action selected by the user.
**Example:** [`ShowRecentFindUsagesGroup`](%gh-ic%/platform/lang-impl/src/com/intellij/find/impl/ShowRecentFindUsagesGroup.java) invoked via Edit / Find Usages / Recent Find Usages and showing recent find usages group popup.
|
+| `createActionGroupPopup()` | Show actions from an [Action Group](grouping_actions_tutorial.md) and executes the action selected by the user.
**Example:** [`ShowRecentFindUsagesGroup`](%gh-ic%/platform/lang-impl/src/com/intellij/find/impl/ShowRecentFindUsagesGroup.java) invoked via Edit / Find Usages / Recent Find Usages and showing recent find usages group popup.
|
### Action Groups