From 60daf15cdd9bec067bb2c455a0effcbac05a18e3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Yann=20C=C3=A9bron?= <yann.cebron@jetbrains.com>
Date: Thu, 21 Nov 2024 09:55:33 +0100
Subject: [PATCH] [all] plugin.xml: replace <reference> `id` with `ref`
 (IJPL-171993)

GitOrigin-RevId: af77ae2b1a15450c2e9d8defd2f8aa310ebe25d5
---
 images/resources/META-INF/plugin.xml          |  78 ++++-----
 .../intellij.platform.vcs.dvcs.impl.xml       |   6 +-
 .../src/META-INF/PlatformExecutionActions.xml |  10 +-
 .../intellij.platform.execution.dashboard.xml |   6 +-
 ...ntellij.platform.execution.serviceView.xml |  10 +-
 .../META-INF/ExternalSystemActions.xml        |  52 +++---
 .../resources/intellij.platform.lvcs.impl.xml |  14 +-
 .../src/idea/ExecutionActions.xml             |   4 +-
 .../src/idea/LangActions.xml                  |  24 +--
 .../src/idea/PlatformActions.xml              |  76 ++++-----
 .../src/idea/XDebuggerActions.xml             |   8 +-
 ...ntellij.platform.vcs.impl.lang.actions.xml |   2 +-
 .../resources/META-INF/VcsActions.xml         |  52 +++---
 .../intellij.platform.vcs.log.impl.xml        | 158 +++++++++---------
 plugins/commander/src/META-INF/plugin.xml     |   4 +-
 .../git4idea/resources/intellij.vcs.git.xml   | 148 ++++++++--------
 .../resources/META-INF/github-core-config.xml |  34 ++--
 .../gitlab-core/resources/META-INF/plugin.xml |  42 ++---
 .../plugin-resources/META-INF/plugin.xml      |  20 +--
 plugins/hg4idea/src/META-INF/plugin.xml       |  18 +-
 .../core/resources/META-INF/plugin.xml        |  26 +--
 .../src/main/resources/META-INF/plugin.xml    |  64 +++----
 plugins/svn4idea/src/META-INF/plugin.xml      |  34 ++--
 .../tasks-core/resources/META-INF/plugin.xml  |   4 +-
 .../terminal/resources/META-INF/plugin.xml    |   2 +-
 .../xpath/xpath-view/src/META-INF/plugin.xml  |  12 +-
 resources/src/idea/JavaActions.xml            |   2 +-
 27 files changed, 455 insertions(+), 455 deletions(-)

diff --git a/images/resources/META-INF/plugin.xml b/images/resources/META-INF/plugin.xml
index 136a13837cc1..c782938ecfc4 100644
--- a/images/resources/META-INF/plugin.xml
+++ b/images/resources/META-INF/plugin.xml
@@ -143,66 +143,66 @@
       <add-to-group group-id="Other.KeymapGroup"/>
     </group>
     <group id="Images.EditorToolbar">
-      <reference id="Images.ToggleTransparencyChessboard"/>
-      <reference id="Images.Editor.ToggleGrid"/>
+      <reference ref="Images.ToggleTransparencyChessboard"/>
+      <reference ref="Images.Editor.ToggleGrid"/>
       <separator/>
-      <reference id="Images.Editor.ZoomIn"/>
-      <reference id="Images.Editor.ZoomOut"/>
-      <reference id="Images.Editor.ActualSize"/>
-      <reference id="Images.Editor.FitZoomToWindow"/>
-      <reference id="ShowColorPicker"/>
-      <reference id="Images.ChangeBackground"/>
+      <reference ref="Images.Editor.ZoomIn"/>
+      <reference ref="Images.Editor.ZoomOut"/>
+      <reference ref="Images.Editor.ActualSize"/>
+      <reference ref="Images.Editor.FitZoomToWindow"/>
+      <reference ref="ShowColorPicker"/>
+      <reference ref="Images.ChangeBackground"/>
       <separator/>
-      <reference id="TextEditorWithPreview.SplitGroup"/>
+      <reference ref="TextEditorWithPreview.SplitGroup"/>
     </group>
     <group id="Images.EditorPopupMenu">
-      <reference id="CutCopyPasteGroup"/>
+      <reference ref="CutCopyPasteGroup"/>
       <separator/>
-      <reference id="FindUsages"/>
-      <reference id="RefactoringMenu"/>
+      <reference ref="FindUsages"/>
+      <reference ref="RefactoringMenu"/>
       <separator/>
-      <reference id="Images.EditorToolbar"/>
-      <reference id="Images.ShowBorder"/>
+      <reference ref="Images.EditorToolbar"/>
+      <reference ref="Images.ShowBorder"/>
       <separator/>
-      <reference id="Images.SetBackgroundImage"/>
+      <reference ref="Images.SetBackgroundImage"/>
       <separator/>
-      <reference id="VersionControlsGroup"/>
+      <reference ref="VersionControlsGroup"/>
       <separator/>
-      <reference id="Images.EditExternally"/>
-      <reference id="Images.EditExternalEditorPath"/>
-      <reference id="ExternalToolsGroup"/>
+      <reference ref="Images.EditExternally"/>
+      <reference ref="Images.EditExternalEditorPath"/>
+      <reference ref="ExternalToolsGroup"/>
     </group>
     <group id="Images.ThumbnailsToolbar">
-      <reference id="Images.Thumbnails.UpFolder"/>
-      <reference id="Images.Thumbnails.ToggleRecursive"/>
+      <reference ref="Images.Thumbnails.UpFolder"/>
+      <reference ref="Images.Thumbnails.ToggleRecursive"/>
       <separator/>
-      <reference id="Images.ToggleTransparencyChessboard"/>
-      <reference id="Images.Thumbnails.ToggleFileSize"/>
-      <reference id="Images.Thumbnails.ToggleFileName"/>
+      <reference ref="Images.ToggleTransparencyChessboard"/>
+      <reference ref="Images.Thumbnails.ToggleFileSize"/>
+      <reference ref="Images.Thumbnails.ToggleFileName"/>
       <separator/>
 
-      <reference id="Images.Thumbnails.FilterByTheme"/>
-      <reference id="Images.Thumbnails.FilterByTag"/>
-      <reference id="Images.Thumbnails.ToggleTagsPanelName"/>
-      <reference id="Images.Thumbnails.Hide"/>
+      <reference ref="Images.Thumbnails.FilterByTheme"/>
+      <reference ref="Images.Thumbnails.FilterByTag"/>
+      <reference ref="Images.Thumbnails.ToggleTagsPanelName"/>
+      <reference ref="Images.Thumbnails.Hide"/>
     </group>
     <group id="Images.ThumbnailsPopupMenu">
-      <reference id="CutCopyPasteGroup"/>
-      <reference id="EditSource"/>
-      <reference id="Images.Thumbnails.EnterAction"/>
+      <reference ref="CutCopyPasteGroup"/>
+      <reference ref="EditSource"/>
+      <reference ref="Images.Thumbnails.EnterAction"/>
       <separator/>
-      <reference id="Images.ThumbnailsToolbar"/>
+      <reference ref="Images.ThumbnailsToolbar"/>
       <separator/>
-      <reference id="FindUsages"/>
-      <reference id="RefactoringMenu"/>
+      <reference ref="FindUsages"/>
+      <reference ref="RefactoringMenu"/>
       <separator/>
-      <reference id="$Delete"/>
+      <reference ref="$Delete"/>
       <separator/>
-      <reference id="VersionControlsGroup"/>
-      <reference id="CompareTwoFiles"/>
+      <reference ref="VersionControlsGroup"/>
+      <reference ref="CompareTwoFiles"/>
       <separator/>
-      <reference id="Images.EditExternally"/>
-      <reference id="ExternalToolsGroup"/>
+      <reference ref="Images.EditExternally"/>
+      <reference ref="ExternalToolsGroup"/>
     </group>
   </actions>
 </idea-plugin>
diff --git a/platform/dvcs-impl/resources/intellij.platform.vcs.dvcs.impl.xml b/platform/dvcs-impl/resources/intellij.platform.vcs.dvcs.impl.xml
index d40673754343..960788df0644 100644
--- a/platform/dvcs-impl/resources/intellij.platform.vcs.dvcs.impl.xml
+++ b/platform/dvcs-impl/resources/intellij.platform.vcs.dvcs.impl.xml
@@ -51,16 +51,16 @@
     </group>
 
     <group id="Dvcs.Log.ContextMenu">
-      <reference id="Vcs.CherryPick"/>
+      <reference ref="Vcs.CherryPick"/>
       <add-to-group group-id="Vcs.Log.ContextMenu" relative-to-action="ChangesView.CreatePatchFromChanges" anchor="after"/>
     </group>
     <group id="Dvcs.FileHistory.ContextMenu">
-      <reference id="Vcs.CherryPick"/>
+      <reference ref="Vcs.CherryPick"/>
       <add-to-group group-id="Vcs.FileHistory.ContextMenu" relative-to-action="ChangesView.CreatePatchFromChanges" anchor="after"/>
     </group>
 
     <group id="Dvcs.Log.Toolbar">
-      <reference id="Vcs.CherryPick"/>
+      <reference ref="Vcs.CherryPick"/>
       <add-to-group group-id="Vcs.Log.Toolbar"/>
     </group>
 
diff --git a/platform/execution-impl/src/META-INF/PlatformExecutionActions.xml b/platform/execution-impl/src/META-INF/PlatformExecutionActions.xml
index 558d3942b5c7..cb865d752abd 100644
--- a/platform/execution-impl/src/META-INF/PlatformExecutionActions.xml
+++ b/platform/execution-impl/src/META-INF/PlatformExecutionActions.xml
@@ -37,7 +37,7 @@
       <group id="RunToolbarProcessActionGroup"/>
       <action id="RunToolbarStopAction" class="com.intellij.execution.runToolbar.RunToolbarStopAction"/>
       <group id="RunToolbarMoreActionGroup" icon="AllIcons.Actions.More" popup="true" class="com.intellij.execution.runToolbar.RunToolbarMoreActionGroup">
-        <reference id="RunToolbarSlotContextMenuGroup"/>
+        <reference ref="RunToolbarSlotContextMenuGroup"/>
       </group>
     </group>
 
@@ -46,13 +46,13 @@
       <action id="RunToolbarShowHidePopupAction" class="com.intellij.execution.runToolbar.RunToolbarShowHidePopupAction" icon="AllIcons.Toolbar.Expand"/>
       <action id="RunToolbarMainSlotInfoAction" class="com.intellij.execution.runToolbar.RunToolbarMainSlotInfoAction"/>
       <action id="RunToolbarMainRunConfigurationsAction" class="com.intellij.execution.runToolbar.RunToolbarMainRunConfigurationsAction"/>
-      <reference id="RunToolbarRerunAction"/>
-      <reference id="RunToolbarAdditionalProcessActions"/>
+      <reference ref="RunToolbarRerunAction"/>
+      <reference ref="RunToolbarAdditionalProcessActions"/>
       <group id="RunToolbarProcessMainActionGroup"/>
-      <reference id="RunToolbarStopAction"/>
+      <reference ref="RunToolbarStopAction"/>
       <action id="RunToolbarMainMultipleStopAction" class="com.intellij.execution.runToolbar.RunToolbarMainMultipleStopAction" icon="AllIcons.Actions.Suspend"/>
       <group id="RunToolbarMainMoreActionGroup" icon="AllIcons.Actions.More" popup="true" class="com.intellij.execution.runToolbar.RunToolbarMoreActionGroup">
-        <reference id="RunToolbarSlotContextMenuGroup"/>
+        <reference ref="RunToolbarSlotContextMenuGroup"/>
       </group>
     </group>
 
diff --git a/platform/execution.dashboard/resources/intellij.platform.execution.dashboard.xml b/platform/execution.dashboard/resources/intellij.platform.execution.dashboard.xml
index 8a5918401bfb..1570ca5b8041 100644
--- a/platform/execution.dashboard/resources/intellij.platform.execution.dashboard.xml
+++ b/platform/execution.dashboard/resources/intellij.platform.execution.dashboard.xml
@@ -47,8 +47,8 @@
       <action id="RunDashboard.Stop" icon="AllIcons.Actions.Suspend" use-shortcut-of="Stop"
               class="com.intellij.platform.execution.dashboard.actions.StopAction"/>
       <separator/>
-      <reference id="ExpandAll"/>
-      <reference id="CollapseAll"/>
+      <reference ref="ExpandAll"/>
+      <reference ref="CollapseAll"/>
     </group>
     <group id="RunDashboardPopup">
       <action id="RunDashboard.EditConfiguration" icon="AllIcons.Actions.EditSource" use-shortcut-of="EditSourceInNewWindow"
@@ -92,7 +92,7 @@
     <action id="RunDashboard.AddConfiguration" class="com.intellij.platform.execution.dashboard.actions.AddRunConfigurationAction">
       <add-to-group group-id="ServiceView.AddService"/>
     </action>
-    <reference id="RunDashboard.RestoreHiddenConfigurations">
+    <reference ref="RunDashboard.RestoreHiddenConfigurations">
       <add-to-group group-id="ServiceView.AddService" anchor="after" relative-to-action="RunDashboard.AddConfiguration"/>
     </reference>
     <action id="RunDashboard.DoubleClickRun"
diff --git a/platform/execution.serviceView/resources/intellij.platform.execution.serviceView.xml b/platform/execution.serviceView/resources/intellij.platform.execution.serviceView.xml
index 59aeb662a2d9..362ec3769201 100644
--- a/platform/execution.serviceView/resources/intellij.platform.execution.serviceView.xml
+++ b/platform/execution.serviceView/resources/intellij.platform.execution.serviceView.xml
@@ -38,14 +38,14 @@
       <group id="ServiceViewItemPopupGroup"
              class="com.intellij.platform.execution.serviceView.ServiceViewActionProvider$ItemPopupActionGroup"/>
       <separator/>
-      <reference id="ServiceView.OpenInNewTab"/>
-      <reference id="ServiceView.OpenEachInNewTab"/>
-      <reference id="ServiceView.SplitByType"/>
+      <reference ref="ServiceView.OpenInNewTab"/>
+      <reference ref="ServiceView.OpenEachInNewTab"/>
+      <reference ref="ServiceView.SplitByType"/>
       <action id="ServiceView.OpenInToolWindow" class="com.intellij.platform.execution.serviceView.OpenInToolWindowAction"/>
       <separator/>
-      <reference id="$Delete"/>
+      <reference ref="$Delete"/>
       <separator/>
-      <reference id="EditSource"/>
+      <reference ref="EditSource"/>
       <action id="ServiceView.JumpToServices" use-shortcut-of="ShowNavBar"
               class="com.intellij.platform.execution.serviceView.JumpToServicesAction"/>
     </group>
diff --git a/platform/external-system-impl/resources/META-INF/ExternalSystemActions.xml b/platform/external-system-impl/resources/META-INF/ExternalSystemActions.xml
index 764419668d64..67426307139a 100644
--- a/platform/external-system-impl/resources/META-INF/ExternalSystemActions.xml
+++ b/platform/external-system-impl/resources/META-INF/ExternalSystemActions.xml
@@ -22,8 +22,8 @@
               class="com.intellij.openapi.externalSystem.action.ShowExternalSystemSettingsAction">
       </action>
       <group id="ExternalSystem.ShowSettingsGroup" popup="true" icon="AllIcons.General.Settings">
-        <reference id="ExternalSystem.ShowCommonSettings"/>
-        <reference id="ExternalSystem.ShowSettings"/>
+        <reference ref="ExternalSystem.ShowCommonSettings"/>
+        <reference ref="ExternalSystem.ShowSettings"/>
       </group>
       <action id="ExternalSystem.OpenTasksActivationManager"
               class="com.intellij.openapi.externalSystem.action.OpenTasksActivationManagerAction">
@@ -90,52 +90,52 @@
     <group id="ExternalSystemView.BaseProjectMenu">
       <reference ref="ExternalSystem.OpenConfig"/>
       <separator/>
-      <reference id="ExternalSystem.RefreshProject"/>
+      <reference ref="ExternalSystem.RefreshProject"/>
       <separator/>
-      <reference id="ExternalSystem.DetachProject"/>
-      <reference id="ExternalSystem.IgnoreProject"/>
+      <reference ref="ExternalSystem.DetachProject"/>
+      <reference ref="ExternalSystem.IgnoreProject"/>
     </group>
 
     <group id="ExternalSystemView.ProjectMenu" popup="true">
       <reference ref="ExternalSystemView.BaseProjectMenu"/>
       <separator/>
-      <reference id="ExternalSystem.OpenTasksActivationManager"/>
+      <reference ref="ExternalSystem.OpenTasksActivationManager"/>
     </group>
 
     <group id="ExternalSystemView.ModuleMenu" popup="true">
       <reference ref="ExternalSystem.OpenConfig"/>
       <separator/>
-      <reference id="ExternalSystem.RefreshProject"/>
-      <reference id="ExternalSystem.IgnoreProject"/>
+      <reference ref="ExternalSystem.RefreshProject"/>
+      <reference ref="ExternalSystem.IgnoreProject"/>
       <separator/>
-      <reference id="ExternalSystem.OpenTasksActivationManager"/>
+      <reference ref="ExternalSystem.OpenTasksActivationManager"/>
     </group>
 
     <group id="ExternalSystemView.DependencyMenu" popup="true"/>
 
     <group id="ExternalSystemView.ActionsToolbar.LeftPanel">
-      <reference id="ExternalSystem.RefreshAllProjects"/>
-<!--      <reference id="ExternalSystem.AttachProject"/>-->
+      <reference ref="ExternalSystem.RefreshAllProjects"/>
+<!--      <reference ref="ExternalSystem.AttachProject"/>-->
       <reference ref="ExternalSystem.DetachProject"/>
-      <!--<reference id="ExternalSystem.Run/>-->
+      <!--<reference ref="ExternalSystem.Run/>-->
     </group>
     <group id="ExternalSystemView.ActionsToolbar.CenterPanel">
       <separator/>
-      <reference id="ExternalSystem.ExpandAll"/>
-      <reference id="ExternalSystem.CollapseAll"/>
-      <reference id="ExternalSystem.SelectProjectDataToImport"/>
+      <reference ref="ExternalSystem.ExpandAll"/>
+      <reference ref="ExternalSystem.CollapseAll"/>
+      <reference ref="ExternalSystem.SelectProjectDataToImport"/>
     </group>
     <group id="ExternalSystemView.ActionsToolbar.RightPanel">
     </group>
 
     <group id="ExternalSystemView.TaskActivationGroup">
-      <reference id="ExternalSystem.BeforeSync"/>
-      <reference id="ExternalSystem.AfterSync"/>
-      <reference id="ExternalSystem.BeforeCompile"/>
-      <reference id="ExternalSystem.AfterCompile"/>
-      <reference id="ExternalSystem.BeforeRebuild"/>
-      <reference id="ExternalSystem.AfterRebuild"/>
-      <!--<reference id="ExternalSystem.BeforeRun"/>-->
+      <reference ref="ExternalSystem.BeforeSync"/>
+      <reference ref="ExternalSystem.AfterSync"/>
+      <reference ref="ExternalSystem.BeforeCompile"/>
+      <reference ref="ExternalSystem.AfterCompile"/>
+      <reference ref="ExternalSystem.BeforeRebuild"/>
+      <reference ref="ExternalSystem.AfterRebuild"/>
+      <!--<reference ref="ExternalSystem.BeforeRun"/>-->
     </group>
 
     <group id="ExternalSystemView.ActionsToolbar">
@@ -145,18 +145,18 @@
       <separator/>
       <reference ref="ExternalSystemView.ActionsToolbar.RightPanel"/>
       <separator/>
-      <reference id="ExternalSystem.ShowSettingsGroup"/>
+      <reference ref="ExternalSystem.ShowSettingsGroup"/>
     </group>
 
     <group id="ExternalSystemView.TaskMenu" popup="true" class="com.intellij.openapi.externalSystem.action.task.ExternalSystemTaskMenu">
       <separator/>
       <group id="ExternalSystem.CreateRunConfiguration" class="com.intellij.execution.actions.CreateAction"/>
       <separator/>
-      <reference id="EditSource"/>
+      <reference ref="EditSource"/>
       <separator/>
       <reference ref="ExternalSystemView.TaskActivationGroup"/>
       <separator/>
-      <reference id="ExternalSystem.AssignShortcut"/>
+      <reference ref="ExternalSystem.AssignShortcut"/>
     </group>
 
     <group id="ExternalSystemView.RunConfigurationMenu" popup="true"  class="com.intellij.openapi.externalSystem.action.ExternalSystemRunConfigurationMenu">
@@ -170,7 +170,7 @@
       <separator/>
       <reference ref="ExternalSystemView.TaskActivationGroup"/>
       <separator/>
-      <reference id="ExternalSystem.AssignRunConfigurationShortcut"/>
+      <reference ref="ExternalSystem.AssignRunConfigurationShortcut"/>
     </group>
 
     <group id="ExternalSystem.ProjectRefreshActionGroup">
diff --git a/platform/lvcs-impl/resources/intellij.platform.lvcs.impl.xml b/platform/lvcs-impl/resources/intellij.platform.lvcs.impl.xml
index c7cc475c2d66..33ba5706362c 100644
--- a/platform/lvcs-impl/resources/intellij.platform.lvcs.impl.xml
+++ b/platform/lvcs-impl/resources/intellij.platform.lvcs.impl.xml
@@ -53,19 +53,19 @@
     <action id="ActivityView.CreatePatch" class="com.intellij.platform.lvcs.impl.actions.CreatePatchAction" icon="AllIcons.Vcs.Patch"/>
 
     <group id="ActivityView.Toolbar">
-      <reference id="ActivityView.Revert"/>
-      <reference id="ActivityView.CreatePatch"/>
+      <reference ref="ActivityView.Revert"/>
+      <reference ref="ActivityView.CreatePatch"/>
     </group>
     <group id="ActivityView.Popup">
-      <reference id="ActivityView.Revert"/>
-      <reference id="ActivityView.CreatePatch"/>
-      <reference id="Diff.ShowDiff"/>
+      <reference ref="ActivityView.Revert"/>
+      <reference ref="ActivityView.CreatePatch"/>
+      <reference ref="Diff.ShowDiff"/>
     </group>
     <group id="ActivityView.ChangesBrowser.Toolbar">
-      <reference id="ActivityView.RevertDifferences"/>
+      <reference ref="ActivityView.RevertDifferences"/>
     </group>
     <group id="ActivityView.ChangesBrowser.Popup">
-      <reference id="ActivityView.RevertDifferences"/>
+      <reference ref="ActivityView.RevertDifferences"/>
     </group>
   </actions>
 
diff --git a/platform/platform-resources/src/idea/ExecutionActions.xml b/platform/platform-resources/src/idea/ExecutionActions.xml
index 9a036271340f..616aef7786b9 100644
--- a/platform/platform-resources/src/idea/ExecutionActions.xml
+++ b/platform/platform-resources/src/idea/ExecutionActions.xml
@@ -84,7 +84,7 @@
     <group id="RunConfigurationsActionGroup" class="com.intellij.execution.ui.RunConfigurationsActionGroup"/>
 
     <group id="ExecutionTargetsToolbarGroup" searchable="false" popup="false">
-      <reference id="ExecutionTargets"/>
+      <reference ref="ExecutionTargets"/>
       <add-to-group group-id="MainToolbarRight" anchor="before" relative-to-action="NewUiRunWidget"/>
     </group>
 
@@ -218,7 +218,7 @@
       <add-to-group group-id="TouchBarDefault" anchor="first"/>
     </group>
 
-    <reference id="ToggleLineBreakpoint">
+    <reference ref="ToggleLineBreakpoint">
       <add-to-group group-id="TouchBarDefault_cmd" anchor="last"/>
     </reference>
     <!--endregion-->
diff --git a/platform/platform-resources/src/idea/LangActions.xml b/platform/platform-resources/src/idea/LangActions.xml
index 22246f4f3659..d0095cdc2a37 100644
--- a/platform/platform-resources/src/idea/LangActions.xml
+++ b/platform/platform-resources/src/idea/LangActions.xml
@@ -79,7 +79,7 @@
 
     <group id="LightEditModePopup">
       <add-to-group group-id="EditorPopupMenu" anchor="after" relative-to-action="ShowIntentionsGroup"/>
-      <reference id="LightEditOpenFileInProject"/>
+      <reference ref="LightEditOpenFileInProject"/>
       <separator/>
     </group>
 
@@ -481,7 +481,7 @@
         <!--suppress PluginXmlCapitalization -->
         <action id="Floating.CodeToolbar.SurroundWithIf" class="com.intellij.codeInsight.generation.actions.SurroundWithActionBase" />
       </group>
-      <reference id="XDebugger.Code.Toolbar"/>
+      <reference ref="XDebugger.Code.Toolbar"/>
     </group>
 
     <action id="CodeFloatingToolbar.GotoNextMenu" class="com.intellij.ui.codeFloatingToolbar.GotoNextFloatingToolbarMenu" />
@@ -722,7 +722,7 @@
 
     <group id="NewGroup" popup="true" searchable="false">
       <action id="NewFile" class="com.intellij.ide.actions.CreateFileAction" icon="AllIcons.FileTypes.Text"/>
-      <reference id="NewScratchFile"/>
+      <reference ref="NewScratchFile"/>
       <action id="NewDir" class="com.intellij.ide.actions.CreateDirectoryOrPackageAction"/>
       <group class="com.intellij.ide.fileTemplates.actions.FileTemplateSeparator" id="FileTemplateSeparatorGroup"/>
       <group id="NewWebDevelopment" class="com.intellij.ide.actions.NewWebDevelopmentGroup"/>
@@ -744,7 +744,7 @@
       <separator/>
       <reference ref="NavBarVcsGroup"/>
       <separator/>
-      <reference id="NavBarToolBarOthers"/>
+      <reference ref="NavBarToolBarOthers"/>
       <separator/>
       <reference ref="SearchEverywhere"/>
       <reference ref="SettingsEntryPoint"/>
@@ -752,14 +752,14 @@
 
     <group id="NewToolbarActions">
       <group id="LeftToolbarSideGroup">
-        <reference id="Back"/>
-        <reference id="Forward"/>
+        <reference ref="Back"/>
+        <reference ref="Forward"/>
         <action id="SegmentedVcsControlAction" class="com.intellij.execution.segmentedVcsWidget.SegmentedVcsControlAction"/>
         <action id="SearchEverywhereNewToolbarAction" class="com.intellij.ide.navigationToolbar.rider.SearchEverywhereRiderMainToolbarAction"/>
       </group>
       <group id="RightToolbarSideGroup">
-        <reference id="RunToolbarWidgetAction"/>
-        <reference id="SettingsEntryPoint"/>
+        <reference ref="RunToolbarWidgetAction"/>
+        <reference ref="SettingsEntryPoint"/>
       </group>
     </group>
 
@@ -1013,7 +1013,7 @@
       <group id="EditorPopupMenu.Run">
         <reference ref="RunContextPopupGroup"/>
       </group>
-      <reference id="SplitRevealGroup"/>
+      <reference ref="SplitRevealGroup"/>
       <separator/>
       <reference ref="VersionControlsGroup"/>
       <separator/>
@@ -1264,14 +1264,14 @@
       <action id="EditorSearchSession.PrevOccurrence" class="com.intellij.find.editorHeaderActions.PrevOccurrenceAction"/>
       <action id="EditorSearchSession.NextOccurrenceAction" class="com.intellij.find.editorHeaderActions.NextOccurrenceAction"/>
       <group id="TouchBarEditorSearch_ctrl">
-        <reference id="EditorSearchSession.ToggleMatchCase"/>
-        <reference id="EditorSearchSession.ToggleWholeWordsOnlyAction"/>
+        <reference ref="EditorSearchSession.ToggleMatchCase"/>
+        <reference ref="EditorSearchSession.ToggleWholeWordsOnlyAction"/>
       </group>
 
       <add-to-group group-id="TouchBar" anchor="first"/>
     </group>
 
-    <reference id="ToggleBookmark">
+    <reference ref="ToggleBookmark">
       <add-to-group group-id="TouchBarDefault_cmd" anchor="last"/>
     </reference>
     <!--endregion-->
diff --git a/platform/platform-resources/src/idea/PlatformActions.xml b/platform/platform-resources/src/idea/PlatformActions.xml
index 31a92774b96f..0640e3aae691 100644
--- a/platform/platform-resources/src/idea/PlatformActions.xml
+++ b/platform/platform-resources/src/idea/PlatformActions.xml
@@ -549,7 +549,7 @@
           <action id="SelectAllOccurrences" class="com.intellij.openapi.editor.actions.SelectAllOccurrencesAction"/>
           <reference ref="SelectNextOccurrence"/>
           <action id="UnselectPreviousOccurrence" class="com.intellij.openapi.editor.actions.UnselectPreviousOccurrenceAction"/>
-          <reference id="ToggleFindInSelection"/>
+          <reference ref="ToggleFindInSelection"/>
           <separator/>
           <action id="FindWordAtCaret" class="com.intellij.openapi.editor.actions.FindWordAtCaretAction"/>
           <action id="FindPrevWordAtCaret" class="com.intellij.openapi.editor.actions.FindPrevWordAtCaretAction"/>
@@ -914,9 +914,9 @@
     </group>
 
     <group id="SplitRevealGroup" popup="false">
-      <reference id="OpenInRightSplit"/>
-      <reference id="SplitChooser"/>
-      <reference id="RevealGroup"/>
+      <reference ref="OpenInRightSplit"/>
+      <reference ref="SplitChooser"/>
+      <reference ref="RevealGroup"/>
     </group>
 
     <action id="ZoomInIdeAction" class="com.intellij.ide.actions.ZoomInIdeAction">
@@ -930,22 +930,22 @@
     </action>
 
     <group id="MainToolbarPopupActions" searchable="false">
-      <reference id="ViewToolBar"/>
+      <reference ref="ViewToolBar"/>
       <action id="CustomizeUI" class="com.intellij.ide.actions.CustomizeUIAction"/>
     </group>
 
     <group id="EditorTabsEntryPoint" popup="true" icon="AllIcons.Actions.More">
-      <reference id="RecentFiles"/>
-      <reference id="RecentLocations"/>
+      <reference ref="RecentFiles"/>
+      <reference ref="RecentLocations"/>
       <separator/>
-      <reference id="CloseAllEditors"/>
-      <reference id="ReopenClosedTab"/>
+      <reference ref="CloseAllEditors"/>
+      <reference ref="ReopenClosedTab"/>
       <separator/>
-      <reference id="Unsplit"/>
-      <reference id="UnsplitAll"/>
-      <reference id="ChangeSplitOrientation"/>
+      <reference ref="Unsplit"/>
+      <reference ref="UnsplitAll"/>
+      <reference ref="ChangeSplitOrientation"/>
       <separator/>
-      <reference id="ConfigureEditorTabs"/>
+      <reference ref="ConfigureEditorTabs"/>
     </group>
 
     <action id="RestartIde" class="com.intellij.ide.actions.RestartIdeAction"/>
@@ -1161,10 +1161,10 @@
               use-shortcut-of="$Delete"/>
     </group>
     <group id="WelcomeScreen.KeymapGroup" searchable="false">
-      <reference id="WelcomeScreen.Options"/>
-      <reference id="WelcomeScreenRecentProjectActionGroup"/>
-      <reference id="WelcomeScreen.Configure"/>
-      <reference id="WelcomeScreen.OpenDirectoryProject"/>
+      <reference ref="WelcomeScreen.Options"/>
+      <reference ref="WelcomeScreenRecentProjectActionGroup"/>
+      <reference ref="WelcomeScreen.Configure"/>
+      <reference ref="WelcomeScreen.OpenDirectoryProject"/>
 
       <add-to-group group-id="Other.KeymapGroup"/>
     </group>
@@ -1498,10 +1498,10 @@
     </action>
 
     <group id="BlankDiffViewerEditorPopupMenu">
-      <reference id="OpenBlankEditorInBlankDiffWindow"/>
-      <reference id="OpenFileEditorInBlankDiffWindow"/>
-      <reference id="OpenRecentEditorInBlankDiffWindow"/>
-      <reference id="ToggleThreeSideInBlankDiffWindow"/>
+      <reference ref="OpenBlankEditorInBlankDiffWindow"/>
+      <reference ref="OpenFileEditorInBlankDiffWindow"/>
+      <reference ref="OpenRecentEditorInBlankDiffWindow"/>
+      <reference ref="ToggleThreeSideInBlankDiffWindow"/>
 
       <add-to-group group-id="Diff.EditorPopupMenu" anchor="last"/>
       <add-to-group group-id="Diff.KeymapGroup" relative-to-action="ShowBlankDiffWindow" anchor="after"/>
@@ -1555,13 +1555,13 @@
       <action id="GoToTab9" class="com.intellij.ide.actions.TabNavigationActionBase$GoToTab9Action"/>
       <action id="GoToLastTab" class="com.intellij.ide.actions.TabNavigationActionBase$GoToLastTabAction"/>
 
-      <reference id="NextEditorTab"/>
-      <reference id="PreviousEditorTab"/>
-      <reference id="ReopenClosedTab"/>
-      <reference id="PinActiveTab"/>
+      <reference ref="NextEditorTab"/>
+      <reference ref="PreviousEditorTab"/>
+      <reference ref="ReopenClosedTab"/>
+      <reference ref="PinActiveTab"/>
 
-      <reference id="MoveEditorToOppositeTabGroup"/>
-      <reference id="OpenEditorInOppositeTabGroup"/>
+      <reference ref="MoveEditorToOppositeTabGroup"/>
+      <reference ref="OpenEditorInOppositeTabGroup"/>
 
       <add-to-group group-id="Other.KeymapGroup"/>
     </group>
@@ -1674,14 +1674,14 @@
 
     <group id="UpdateEntryPointGroup"/>
     <group id="SettingsEntryPointGroup" class="com.intellij.ide.actions.SettingsEntryPointGroup">
-      <reference id="RunAnything"/>
+      <reference ref="RunAnything"/>
       <separator/>
-      <reference id="ShowSettings"/>
-      <reference id="WelcomeScreen.Plugins"/>
+      <reference ref="ShowSettings"/>
+      <reference ref="WelcomeScreen.Plugins"/>
       <separator/>
-      <reference id="ChangeLaf"/>
-      <reference id="ChangeKeymap"/>
-      <reference id="ChangeView"/>
+      <reference ref="ChangeLaf"/>
+      <reference ref="ChangeKeymap"/>
+      <reference ref="ChangeView"/>
     </group>
 
     <action id="CheckSuggestedPlugins" class="com.intellij.openapi.updateSettings.impl.pluginsAdvertisement.CheckSuggestedPluginsAction"/>
@@ -1689,7 +1689,7 @@
     <action id="MainMenuButton.ShowMenu" class="com.intellij.openapi.actionSystem.EmptyAction"/>
 
     <group id="FindInFiles.Results.ContextMenu" searchable="false">
-      <reference id="CopyReferencePopupGroup"/>
+      <reference ref="CopyReferencePopupGroup"/>
     </group>
 
     <group id="TopStripeActionGroup" class="com.intellij.toolWindow.StripeActionGroup"/>
@@ -1714,11 +1714,11 @@
     <group id="ToolbarPopupActions"/>
 
     <group id="ToolbarPopupActions.MainToolbarNewUI">
-      <reference id="MainToolbarQuickActions"/>
-      <reference id="MainMenuAsSeparateToolbarAction"/>
+      <reference ref="MainToolbarQuickActions"/>
+      <reference ref="MainMenuAsSeparateToolbarAction"/>
       <separator/>
-      <reference id="ChangeProjectColorActionGroup"/>
-      <reference id="WelcomeScreen.ChangeProjectIcon"/>
+      <reference ref="ChangeProjectColorActionGroup"/>
+      <reference ref="WelcomeScreen.ChangeProjectIcon"/>
       <action id="ColoredHeaderAction" class="com.intellij.ide.ui.customization.UseProjectColorsCheckboxAction"/>
       <separator/>
       <action id="MergeMenuWithWindowTitleAction" class="com.intellij.ide.actions.MergeMenuWithWindowTitleAction"/>
diff --git a/platform/platform-resources/src/idea/XDebuggerActions.xml b/platform/platform-resources/src/idea/XDebuggerActions.xml
index 4abc82fdb50d..8376f0eaf6ab 100644
--- a/platform/platform-resources/src/idea/XDebuggerActions.xml
+++ b/platform/platform-resources/src/idea/XDebuggerActions.xml
@@ -135,10 +135,10 @@
 
     <group id="XDebugger.ParallelStacks.Popup.FreezeThreadGroup">
       <separator/>
-      <reference id="Debugger.FreezeInactiveThreadsAmongSelected" />
-      <reference id="Debugger.ThawAllThreadsAction"/>
-      <reference id="Debugger.FreezeSelectedThreads"/>
-      <reference id="Debugger.ThawSelectedThreads"/>
+      <reference ref="Debugger.FreezeInactiveThreadsAmongSelected" />
+      <reference ref="Debugger.ThawAllThreadsAction"/>
+      <reference ref="Debugger.FreezeSelectedThreads"/>
+      <reference ref="Debugger.ThawSelectedThreads"/>
     </group>
 
     <group id="XDebugger.ParallelStacks.Popup.Extra">
diff --git a/platform/vcs-impl/lang/actions/resources/intellij.platform.vcs.impl.lang.actions.xml b/platform/vcs-impl/lang/actions/resources/intellij.platform.vcs.impl.lang.actions.xml
index c98b43641f46..48263aa71f45 100644
--- a/platform/vcs-impl/lang/actions/resources/intellij.platform.vcs.impl.lang.actions.xml
+++ b/platform/vcs-impl/lang/actions/resources/intellij.platform.vcs.impl.lang.actions.xml
@@ -4,7 +4,7 @@
   </dependencies>
   <actions>
     <group id="ChangesView.ApplyPatch.LangGroup">
-      <reference id="ChangesView.ApplyPatch"/>
+      <reference ref="ChangesView.ApplyPatch"/>
 
       <add-to-group group-id="ProjectViewPopupMenu" relative-to-action="ProjectViewEditSource" anchor="after"/>
       <add-to-group group-id="NavbarPopupMenu" relative-to-action="EditSource" anchor="after"/>
diff --git a/platform/vcs-impl/resources/META-INF/VcsActions.xml b/platform/vcs-impl/resources/META-INF/VcsActions.xml
index e1e712f9f97a..4a2ac4e583ae 100644
--- a/platform/vcs-impl/resources/META-INF/VcsActions.xml
+++ b/platform/vcs-impl/resources/META-INF/VcsActions.xml
@@ -107,7 +107,7 @@
         </group>
 
         <separator/>
-        <reference id="Vcs.VcsClone"/>
+        <reference ref="Vcs.VcsClone"/>
         <group id="Vcs.Browse" class="com.intellij.ide.actions.NonEmptyActionGroup" popup="true"/>
         <separator/>
         <group id="Vcs.Import" class="com.intellij.ide.actions.NonEmptyActionGroup"/>
@@ -231,9 +231,9 @@
       <action id="ShelveChanges.UnshelveWithDialog" class="com.intellij.openapi.vcs.changes.shelf.UnshelveWithDialogAction"
               icon="AllIcons.Vcs.Unshelve"/>
       <action id="ShelvedChanges.Restore" class="com.intellij.openapi.vcs.changes.shelf.RestoreShelvedChange"/>
-      <reference id="Diff.ShowDiff"/>
+      <reference ref="Diff.ShowDiff"/>
       <reference ref="Diff.ShowStandaloneDiff"/>
-      <reference id="Vcs.ShowDiffWithLocal"/>
+      <reference ref="Vcs.ShowDiffWithLocal"/>
       <action id="ChangesView.CreatePatchFromChanges" class="com.intellij.openapi.vcs.changes.actions.CreatePatchFromChangesAction$Dialog"
               icon="AllIcons.Vcs.Patch"/>
       <reference ref="ChangesView.CreatePatchToClipboard"/>
@@ -266,9 +266,9 @@
     <action id="Vcs.Shelf.UnshelveChangesAndRemove" class="com.intellij.openapi.vcs.changes.savedPatches.UnshelveChangesAndRemoveAction"/>
 
     <group id="Vcs.Shelf.Operations.ContextMenu" class="com.intellij.openapi.vcs.changes.savedPatches.ShelfOperationsGroup">
-      <reference id="Vcs.Shelf.Apply"/>
-      <reference id="Vcs.Shelf.Pop"/>
-      <reference id="ShelveChanges.UnshelveWithDialog"/>
+      <reference ref="Vcs.Shelf.Apply"/>
+      <reference ref="Vcs.Shelf.Pop"/>
+      <reference ref="ShelveChanges.UnshelveWithDialog"/>
       <reference ref="Vcs.Shelf.Drop"/>
       <reference ref="ShelvedChanges.Restore"/>
       <reference ref="ShelvedChanges.ImportPatches"/>
@@ -287,11 +287,11 @@
     <action id="Vcs.ApplySelectedChanges" class="com.intellij.openapi.vcs.changes.actions.RevertSelectedChangesAction$Apply"/>
 
     <group id="Vcs.SavedPatches.ContextMenu">
-      <reference id="Vcs.Shelf.Operations.ContextMenu"/>
+      <reference ref="Vcs.Shelf.Operations.ContextMenu"/>
       <separator/>
-      <reference id="Diff.ShowDiff"/>
+      <reference ref="Diff.ShowDiff"/>
       <reference ref="Diff.ShowStandaloneDiff"/>
-      <reference id="Vcs.ShowDiffWithLocal"/>
+      <reference ref="Vcs.ShowDiffWithLocal"/>
     </group>
     <group id="Vcs.SavedPatches.ChangesBrowser.ContextMenu">
       <reference ref="Vcs.ShowDiffWithLocal"/>
@@ -346,7 +346,7 @@
       <reference ref="Vcs.OpenRepositoryVersion"/>
       <reference ref="Vcs.RevertSelectedChanges"/>
       <reference ref="Vcs.ApplySelectedChanges"/>
-      <reference id="ChangesView.CreatePatchFromChanges"/>
+      <reference ref="ChangesView.CreatePatchFromChanges"/>
       <reference ref="Vcs.GetVersion"/>
       <reference ref="Vcs.ShowHistoryForRevision"/>
     </group>
@@ -384,7 +384,7 @@
     <group id="UpdateActionGroup">
       <reference ref="EditSource"/>
       <reference ref="$Delete"/>
-      <reference id="Diff.ShowDiff"/>
+      <reference ref="Diff.ShowDiff"/>
     </group>
 
     <action id="Vcs.ReformatCommitMessage" class="com.intellij.vcs.commit.message.ReformatCommitMessageAction"
@@ -400,7 +400,7 @@
 
     <group id="ChangesView.CommitToolbar">
       <action id="Vcs.ToggleAmendCommitMode" class="com.intellij.vcs.commit.ToggleAmendCommitModeAction"/>
-      <reference id="Vcs.MessageActionGroup"/>
+      <reference ref="Vcs.MessageActionGroup"/>
     </group>
 
     <action id="ChangesView.ShowCommitOptions" class="com.intellij.openapi.vcs.actions.ShowCommitOptionsAction"/>
@@ -494,10 +494,10 @@
             icon="AllIcons.Actions.Copy"/>
 
     <group id="VcsSelectionHistoryDialog.Popup">
-      <reference id="Diff.ShowDiff"/>
-      <reference id="Vcs.ShowDiffWithLocal"/>
-      <reference id="VcsHistory.ShowAllAffected"/>
-      <reference id="Vcs.CopyRevisionNumberAction"/>
+      <reference ref="Diff.ShowDiff"/>
+      <reference ref="Vcs.ShowDiffWithLocal"/>
+      <reference ref="VcsHistory.ShowAllAffected"/>
+      <reference ref="Vcs.CopyRevisionNumberAction"/>
     </group>
 
     <group id="Shelve.KeymapGroup" searchable="false">
@@ -523,8 +523,8 @@
     </group>
 
     <group id="FileHistory.KeymapGroup" searchable="false">
-      <reference id="Vcs.GetVersion"/>
-      <reference id="FileHistory.AnnotateRevision"/>
+      <reference ref="Vcs.GetVersion"/>
+      <reference ref="FileHistory.AnnotateRevision"/>
 
       <add-to-group group-id="Vcs.KeymapGroup"/>
     </group>
@@ -667,21 +667,21 @@
       <group id="Vcs.Operations.Popup.VcsAware" class="com.intellij.openapi.vcs.actions.VcsQuickListPopupAction$VcsAware">
         <group id="Vcs.Operations.Popup.VcsNameSeparator"
                class="com.intellij.openapi.vcs.actions.VcsQuickListPopupAction$VcsNameSeparator"/>
-        <reference id="ChangesView.AddUnversioned"/>
-        <reference id="CheckinProject"/>
+        <reference ref="ChangesView.AddUnversioned"/>
+        <reference ref="CheckinProject"/>
         <reference ref="ChangesView.ToggleCommitUi"/>
-        <reference id="CheckinFiles"/>
-        <reference id="ChangesView.Revert"/>
+        <reference ref="CheckinFiles"/>
+        <reference ref="ChangesView.Revert"/>
         <separator/>
-        <reference id="Vcs.ShowTabbedFileHistory"/>
-        <reference id="Annotate"/>
-        <reference id="Compare.SameVersion"/>
+        <reference ref="Vcs.ShowTabbedFileHistory"/>
+        <reference ref="Annotate"/>
+        <reference ref="Compare.SameVersion"/>
       </group>
       <separator/>
       <group id="Vcs.Operations.Popup.Vcs.Providers"
              class="com.intellij.openapi.vcs.actions.VcsQuickListPopupAction$Providers"/>
       <group id="Vcs.Operations.Popup.NonVcsAware" class="com.intellij.openapi.vcs.actions.VcsQuickListPopupAction$NonVcsAware">
-        <reference id="Start.Use.Vcs"/>
+        <reference ref="Start.Use.Vcs"/>
       </group>
       <separator/>
       <group class="com.intellij.openapi.vcs.actions.ShowAnnotateOperationsPopup$Group" popup="true" id="ShowAnnotateOperationsPopupGroup"/>
diff --git a/platform/vcs-log/impl/resources/intellij.platform.vcs.log.impl.xml b/platform/vcs-log/impl/resources/intellij.platform.vcs.log.impl.xml
index f42e7a985d21..8ec5911ab23d 100644
--- a/platform/vcs-log/impl/resources/intellij.platform.vcs.log.impl.xml
+++ b/platform/vcs-log/impl/resources/intellij.platform.vcs.log.impl.xml
@@ -181,130 +181,130 @@
 
     <group id="Vcs.Log.BranchActionsGroup" popup="false">
       <separator key="action.vcs.log.branches.separator"/>
-      <reference id="Vcs.Log.CollapseAll"/>
-      <reference id="Vcs.Log.ExpandAll"/>
+      <reference ref="Vcs.Log.CollapseAll"/>
+      <reference ref="Vcs.Log.ExpandAll"/>
     </group>
 
     <group id="Vcs.Log.PresentationSettings" class="com.intellij.vcs.log.ui.actions.VcsLogToolbarPopupActionGroup"
            icon="AllIcons.Actions.GroupBy" popup="true">
       <separator key="action.vcs.log.show.separator"/>
-      <reference id="Vcs.Log.ShowRootsColumnAction"/>
-      <reference id="Vcs.Log.CompactReferencesView"/>
-      <reference id="Vcs.Log.ShowTagNames"/>
-      <reference id="Vcs.Log.ShowLongEdges"/>
-      <reference id="Vcs.Log.PreferCommitDate"/>
-      <reference id="Vcs.Log.AlignLabels"/>
-      <reference id="Vcs.Log.ToggleColumns"/>
+      <reference ref="Vcs.Log.ShowRootsColumnAction"/>
+      <reference ref="Vcs.Log.CompactReferencesView"/>
+      <reference ref="Vcs.Log.ShowTagNames"/>
+      <reference ref="Vcs.Log.ShowLongEdges"/>
+      <reference ref="Vcs.Log.PreferCommitDate"/>
+      <reference ref="Vcs.Log.AlignLabels"/>
+      <reference ref="Vcs.Log.ToggleColumns"/>
       <separator/>
-      <reference id="Vcs.Log.HighlightersActionGroup"/>
+      <reference ref="Vcs.Log.HighlightersActionGroup"/>
     </group>
     <group id="Vcs.Log.TextFilterSettings"
            icon="AllIcons.General.GearPlain">
-      <reference id="Vcs.Log.EnableFilterByRegexAction"/>
-      <reference id="Vcs.Log.MatchCaseAction"/>
+      <reference ref="Vcs.Log.EnableFilterByRegexAction"/>
+      <reference ref="Vcs.Log.MatchCaseAction"/>
     </group>
     <group id="Vcs.Log.Toolbar.Internal">
       <reference ref="Vcs.Log.OpenAnotherTabInEditor"/>
     </group>
     <group id="Vcs.Log.ContextMenu">
-      <reference id="Vcs.CopyRevisionNumberAction"/>
-      <reference id="ChangesView.CreatePatchFromChanges"/>
+      <reference ref="Vcs.CopyRevisionNumberAction"/>
+      <reference ref="ChangesView.CreatePatchFromChanges"/>
       <separator/>
-      <reference id="Vcs.Log.CompareRevisions"/>
-      <reference id="Vcs.ShowDiffWithLocal"/>
+      <reference ref="Vcs.Log.CompareRevisions"/>
+      <reference ref="Vcs.ShowDiffWithLocal"/>
       <separator/>
-      <reference id="Vcs.Log.GoToChild"/>
-      <reference id="Vcs.Log.GoToParent"/>
+      <reference ref="Vcs.Log.GoToChild"/>
+      <reference ref="Vcs.Log.GoToParent"/>
       <separator/>
     </group>
     <group id="Vcs.Log.Toolbar.RightCorner">
-      <reference id="Vcs.Log.ResumeIndexing"/>
-      <reference id="Vcs.Log.Refresh"/>
+      <reference ref="Vcs.Log.ResumeIndexing"/>
+      <reference ref="Vcs.Log.Refresh"/>
       <group id="Vcs.Log.Toolbar"/>
-      <reference id="Vcs.Log.PresentationSettings"/>
-      <reference id="Vcs.Log.GoToRef"/>
+      <reference ref="Vcs.Log.PresentationSettings"/>
+      <reference ref="Vcs.Log.GoToRef"/>
     </group>
     <group id="Vcs.Log.Diff.Preview.Location" popup="true" class="com.intellij.vcs.log.ui.actions.DiffPreviewLocationActionGroup">
-      <reference id="Vcs.Log.MoveDiffPreviewToBottom"/>
-      <reference id="Vcs.Log.MoveDiffPreviewToRight"/>
+      <reference ref="Vcs.Log.MoveDiffPreviewToBottom"/>
+      <reference ref="Vcs.Log.MoveDiffPreviewToRight"/>
     </group>
     <group id="Vcs.Log.LayoutConfiguration" class="com.intellij.vcs.log.ui.actions.VcsLogToolbarPopupActionGroup"
            icon="AllIcons.Debugger.RestoreLayout" popup="false">
       <separator key="group.Vcs.Log.LayoutConfiguration.separator.text"/>
-      <reference id="Vcs.Log.ShowDetailsAction"/>
-      <reference id="Vcs.Log.ShowDiffPreview"/>
-      <reference id="Vcs.Log.Diff.Preview.Location"/>
+      <reference ref="Vcs.Log.ShowDetailsAction"/>
+      <reference ref="Vcs.Log.ShowDiffPreview"/>
+      <reference ref="Vcs.Log.Diff.Preview.Location"/>
     </group>
     <group id="Vcs.Log.ChangesBrowser.PresentationSettings"
            icon="AllIcons.Actions.GroupBy"
            popup="true">
-      <reference id="ChangesView.GroupBy"/>
-      <reference id="ChangesBrowser.FiltererGroup"/>
-      <reference id="Vcs.Log.LayoutConfiguration"/>
+      <reference ref="ChangesView.GroupBy"/>
+      <reference ref="ChangesBrowser.FiltererGroup"/>
+      <reference ref="Vcs.Log.LayoutConfiguration"/>
     </group>
     <group id="Vcs.Log.ChangesBrowser.Toolbar">
-      <reference id="Vcs.RepositoryChangesBrowserToolbar"/>
-      <reference id="Vcs.Log.ShowOnlyAffectedChanges"/>
-      <reference id="Vcs.Log.ChangesBrowser.PresentationSettings"/>
+      <reference ref="Vcs.RepositoryChangesBrowserToolbar"/>
+      <reference ref="Vcs.Log.ShowOnlyAffectedChanges"/>
+      <reference ref="Vcs.Log.ChangesBrowser.PresentationSettings"/>
     </group>
     <group id="Vcs.Log.ChangesBrowser.Popup">
-      <reference id="Vcs.RepositoryChangesBrowserMenu"/>
-      <reference id="Vcs.Log.ShowChangesFromParents"/>
+      <reference ref="Vcs.RepositoryChangesBrowserMenu"/>
+      <reference ref="Vcs.Log.ShowChangesFromParents"/>
     </group>
     <group id="Vcs.Log.ToolWindow.TabActions">
-      <reference id="Vcs.Log.OpenAnotherTab"/>
+      <reference ref="Vcs.Log.OpenAnotherTab"/>
       <group id="Vcs.Log.ToolWindow.TabActions.DropDown" icon="AllIcons.Toolbar.Expand" popup="true"
              class="com.intellij.vcs.log.ui.actions.VcsLogToolWindowDropdownActionGroup">
-        <reference id="Vcs.Log.OpenAnotherTabInEditor"/>
-        <reference id="Vcs.ShowTabbedFileHistory"/>
-        <reference id="Vcs.ShowConsoleTab"/>
+        <reference ref="Vcs.Log.OpenAnotherTabInEditor"/>
+        <reference ref="Vcs.ShowTabbedFileHistory"/>
+        <reference ref="Vcs.ShowConsoleTab"/>
         <separator/>
-        <reference id="Vcs.Log.ShowSettingsAction"/>
+        <reference ref="Vcs.Log.ShowSettingsAction"/>
       </group>
       <add-to-group group-id="LocalChangesView.TabActions"/>
     </group>
     <group id="Vcs.FileHistory.ContextMenu">
-      <reference id="Vcs.CopyRevisionNumberAction"/>
-      <reference id="ChangesView.CreatePatchFromChanges"/>
+      <reference ref="Vcs.CopyRevisionNumberAction"/>
+      <reference ref="ChangesView.CreatePatchFromChanges"/>
       <separator/>
-      <reference id="Vcs.GetVersion"/>
-      <reference id="Vcs.Log.OpenRepositoryVersion"/>
-      <reference id="Vcs.ShowDiffWithLocal"/>
-      <reference id="Diff.ShowDiff"/>
+      <reference ref="Vcs.GetVersion"/>
+      <reference ref="Vcs.Log.OpenRepositoryVersion"/>
+      <reference ref="Vcs.ShowDiffWithLocal"/>
+      <reference ref="Diff.ShowDiff"/>
       <reference ref="Diff.ShowStandaloneDiff"/>
-      <reference id="Vcs.Log.ShowAllAffected"/>
-      <reference id="Vcs.Log.AnnotateRevisionAction"/>
-      <reference id="Vcs.Log.SelectInLog"/>
-      <reference id="VcsHistoryActionsGroup"/>
+      <reference ref="Vcs.Log.ShowAllAffected"/>
+      <reference ref="Vcs.Log.AnnotateRevisionAction"/>
+      <reference ref="Vcs.Log.SelectInLog"/>
+      <reference ref="VcsHistoryActionsGroup"/>
     </group>
     <group id="Vcs.FileHistory.PresentationSettings"
            class="com.intellij.vcs.log.ui.actions.VcsLogToolbarPopupActionGroup"
            icon="AllIcons.Actions.GroupBy"
            popup="true">
       <separator key="action.vcs.log.show.separator"/>
-      <reference id="Vcs.Log.PreferCommitDate"/>
-      <reference id="Vcs.Log.ToggleColumns"/>
-      <reference id="Vcs.Log.LayoutConfiguration"/>
+      <reference ref="Vcs.Log.PreferCommitDate"/>
+      <reference ref="Vcs.Log.ToggleColumns"/>
+      <reference ref="Vcs.Log.LayoutConfiguration"/>
     </group>
     <group id="Vcs.FileHistory.Toolbar">
-      <reference id="Vcs.Log.Refresh"/>
-      <reference id="Diff.ShowDiff"/>
-      <reference id="Vcs.Log.ShowAllAffected"/>
+      <reference ref="Vcs.Log.Refresh"/>
+      <reference ref="Diff.ShowDiff"/>
+      <reference ref="Vcs.Log.ShowAllAffected"/>
       <separator/>
-      <reference id="Vcs.FileHistory.PresentationSettings"/>
+      <reference ref="Vcs.FileHistory.PresentationSettings"/>
       <separator/>
-      <reference id="VcsHistoryActionsGroup.Toolbar"/>
-      <reference id="Vcs.Log.ResumeIndexing"/>
+      <reference ref="VcsHistoryActionsGroup.Toolbar"/>
+      <reference ref="Vcs.Log.ResumeIndexing"/>
     </group>
     <group id="Vcs.FileHistory.Toolbar.RightCorner">
-      <reference id="Vcs.Log.SelectInLog"/>
+      <reference ref="Vcs.Log.SelectInLog"/>
     </group>
 
     <group id="Vcs.Log.Internal" internal="true" popup="true">
-      <reference id="Vcs.Log.InvalidateCaches"/>
-      <reference id="Vcs.Log.CheckFirstCommitsIndexData"/>
-      <reference id="Vcs.Log.CheckSelectedCommitsIndexData"/>
-      <reference id="Vcs.Log.ShowBigRepositories"/>
+      <reference ref="Vcs.Log.InvalidateCaches"/>
+      <reference ref="Vcs.Log.CheckFirstCommitsIndexData"/>
+      <reference ref="Vcs.Log.CheckSelectedCommitsIndexData"/>
+      <reference ref="Vcs.Log.ShowBigRepositories"/>
       <add-to-group group-id="Internal"/>
     </group>
 
@@ -331,27 +331,27 @@
       <reference ref="Vcs.Log.OpenAnotherTabInEditor"/>
       <reference ref="Vcs.Log.ResumeIndexing"/>
 
-      <reference id="Log.Unsorted.KeymapGroup"/>
+      <reference ref="Log.Unsorted.KeymapGroup"/>
 
       <add-to-group group-id="Vcs.KeymapGroup"/>
     </group>
 
     <group id="Log.FileHistory.KeymapGroup" popup="false">
-      <reference id="Vcs.Log.OpenRepositoryVersion"/>
-      <reference id="Diff.ShowDiff"/>
-      <reference id="Vcs.ShowDiffWithLocal"/>
-      <reference id="ChangesView.CreatePatchFromChanges"/>
-      <reference id="Vcs.Log.AnnotateRevisionAction"/>
-      <reference id="Vcs.Log.ShowAllAffected"/>
-      <reference id="Vcs.CopyRevisionNumberAction"/>
+      <reference ref="Vcs.Log.OpenRepositoryVersion"/>
+      <reference ref="Diff.ShowDiff"/>
+      <reference ref="Vcs.ShowDiffWithLocal"/>
+      <reference ref="ChangesView.CreatePatchFromChanges"/>
+      <reference ref="Vcs.Log.AnnotateRevisionAction"/>
+      <reference ref="Vcs.Log.ShowAllAffected"/>
+      <reference ref="Vcs.CopyRevisionNumberAction"/>
       <separator/>
-      <reference id="Vcs.Log.Refresh"/>
-      <reference id="Vcs.Log.ShowDetailsAction"/>
-      <reference id="Vcs.Log.ShowDiffPreview"/>
-      <reference id="Vcs.FileHistory.ContextMenu"/>
-      <reference id="Vcs.FileHistory.Toolbar"/>
-      <reference id="VcsHistoryActionsGroup"/>
-      <reference id="VcsHistoryActionsGroup.Toolbar"/>
+      <reference ref="Vcs.Log.Refresh"/>
+      <reference ref="Vcs.Log.ShowDetailsAction"/>
+      <reference ref="Vcs.Log.ShowDiffPreview"/>
+      <reference ref="Vcs.FileHistory.ContextMenu"/>
+      <reference ref="Vcs.FileHistory.Toolbar"/>
+      <reference ref="VcsHistoryActionsGroup"/>
+      <reference ref="VcsHistoryActionsGroup.Toolbar"/>
 
       <add-to-group group-id="FileHistory.KeymapGroup"/>
     </group>
diff --git a/plugins/commander/src/META-INF/plugin.xml b/plugins/commander/src/META-INF/plugin.xml
index 206626382eb2..c9e1d96d672a 100644
--- a/plugins/commander/src/META-INF/plugin.xml
+++ b/plugins/commander/src/META-INF/plugin.xml
@@ -25,12 +25,12 @@
     </action>
 
     <group id="ImagesCommanderActions1">
-      <reference id="Images.EditExternally"/>
+      <reference ref="Images.EditExternally"/>
       <add-to-group anchor="after" group-id="CommanderPopupMenu" relative-to-action="EditSource"/>
     </group>
 
     <group id="ImagesCommanderActions2">
-      <reference id="Images.ShowThumbnails"/>
+      <reference ref="Images.ShowThumbnails"/>
       <add-to-group anchor="last" group-id="CommanderPopupMenu"/>
     </group>
   </actions>
diff --git a/plugins/git4idea/resources/intellij.vcs.git.xml b/plugins/git4idea/resources/intellij.vcs.git.xml
index f0b5c4476d7d..2493a8cb1d4c 100644
--- a/plugins/git4idea/resources/intellij.vcs.git.xml
+++ b/plugins/git4idea/resources/intellij.vcs.git.xml
@@ -82,7 +82,7 @@
       <reference ref="Compare.Selected"/>
       <action id="Git.CompareWithBranch" class="git4idea.actions.GitCompareWithRefAction"/>
       <reference ref="Vcs.ShowTabbedFileHistory"/>
-      <reference id="Vcs.ShowHistoryForBlock"/>
+      <reference ref="Vcs.ShowHistoryForBlock"/>
     </group>
 
     <group id="Git.MainMenu.FileActions" class="git4idea.actions.GitFileActionGroup" popup="true">
@@ -133,14 +133,14 @@
       <action id="Git.Reset" class="git4idea.actions.GitResetHead"/>
       <separator/>
       <reference ref="Vcs.Show.Log"/>
-      <reference id="Patch.MainMenu"/>
-      <reference id="Git.MainMenu.LocalChanges"/>
-      <reference id="Git.MainMenu.FileActions"/>
+      <reference ref="Patch.MainMenu"/>
+      <reference ref="Git.MainMenu.LocalChanges"/>
+      <reference ref="Git.MainMenu.FileActions"/>
       <separator/>
       <action id="Git.Configure.Remotes" class="git4idea.remote.GitConfigureRemotesAction"/>
       <action id="Git.Clone" class="git4idea.actions.GitCloneAction"/>
       <separator/>
-      <reference id="Vcs.QuickListPopupAction"/>
+      <reference ref="Vcs.QuickListPopupAction"/>
       <separator/>
       <action id="Git.Revert.Abort" class="git4idea.actions.GitAbortOperationAction$Revert"/>
       <action id="Git.CherryPick.Abort" class="git4idea.actions.GitAbortOperationAction$CherryPick"/>
@@ -176,12 +176,12 @@
     <action id="git.update.force.pushed.branch" class="git4idea.actions.branch.GitForcePushedBranchUpdateAction" internal="true"/>
 
     <group id="Git.Ongoing.Rebase.Actions" popup="false">
-      <reference id="Git.Rebase.Abort"/>
-      <reference id="Git.Merge.Abort"/>
-      <reference id="Git.CherryPick.Abort"/>
-      <reference id="Git.Revert.Abort"/>
-      <reference id="Git.Rebase.Continue"/>
-      <reference id="Git.Rebase.Skip"/>
+      <reference ref="Git.Rebase.Abort"/>
+      <reference ref="Git.Merge.Abort"/>
+      <reference ref="Git.CherryPick.Abort"/>
+      <reference ref="Git.Revert.Abort"/>
+      <reference ref="Git.Rebase.Continue"/>
+      <reference ref="Git.Rebase.Skip"/>
     </group>
 
     <group id="Git.Branches.Popup.Settings" class="git4idea.ui.branch.popup.GitBranchesTreePopupSettings" icon="AllIcons.Actions.More">
@@ -276,36 +276,36 @@
     <group id="Git.LogContextMenu"/>
 
     <group id="Git.FileHistory.ContextMenu">
-      <reference id="Git.Revert.In.Log"/>
+      <reference ref="Git.Revert.In.Log"/>
       <separator/>
-      <reference id="Git.CreateNewTag"/>
+      <reference ref="Git.CreateNewTag"/>
       <separator/>
       <add-to-group group-id="Vcs.FileHistory.ContextMenu" relative-to-action="VcsHistoryActionsGroup" anchor="before"/>
     </group>
 
     <group id="Git.Log.ContextMenu.CheckoutBrowse">
-      <reference id="Git.CheckoutGroup"/>
-      <reference id="Git.BrowseRepoAtRevision"/>
+      <reference ref="Git.CheckoutGroup"/>
+      <reference ref="Git.BrowseRepoAtRevision"/>
 
       <add-to-group group-id="Vcs.Log.ContextMenu" relative-to-action="Vcs.Log.CompareRevisions" anchor="before"/>
     </group>
 
     <group id="Git.Log.ContextMenu">
-      <reference id="Git.Reset.In.Log"/>
-      <reference id="Git.Revert.In.Log"/>
-      <reference id="Git.Uncommit"/>
+      <reference ref="Git.Reset.In.Log"/>
+      <reference ref="Git.Revert.In.Log"/>
+      <reference ref="Git.Uncommit"/>
       <separator/>
-      <reference id="Git.Reword.Commit"/>
-      <reference id="Git.Fixup.To.Commit"/>
-      <reference id="Git.Squash.Into.Commit"/>
-      <reference id="Git.Drop.Commits"/>
-      <reference id="Git.Squash.Commits"/>
-      <reference id="Git.Interactive.Rebase"/>
-      <reference id="Git.PushUpToCommit"/>
+      <reference ref="Git.Reword.Commit"/>
+      <reference ref="Git.Fixup.To.Commit"/>
+      <reference ref="Git.Squash.Into.Commit"/>
+      <reference ref="Git.Drop.Commits"/>
+      <reference ref="Git.Squash.Commits"/>
+      <reference ref="Git.Interactive.Rebase"/>
+      <reference ref="Git.PushUpToCommit"/>
       <separator/>
-      <reference id="Git.BranchOperationGroup"/>
-      <reference id="Git.CreateNewBranch"/>
-      <reference id="Git.CreateNewTag"/>
+      <reference ref="Git.BranchOperationGroup"/>
+      <reference ref="Git.CreateNewBranch"/>
+      <reference ref="Git.CreateNewTag"/>
       <separator/>
       <add-to-group group-id="Vcs.Log.ContextMenu" relative-to-action="Vcs.Log.GoToChild" anchor="before"/>
     </group>
@@ -318,14 +318,14 @@
     <action id="Git.Log.GitUseSharedLogAction" class="git4idea.actions.GitUseSharedLogAction" internal="true"/>
     <action id="Git.Log.GitDumpLogIndexDataAction" class="git4idea.actions.GitDumpLogIndexDataAction" internal="true"/>
     <group id="Git.Log.ShareLogIndexData" internal="true">
-      <reference id="Git.Log.GitUseSharedLogAction"/>
-      <reference id="Git.Log.GitDumpLogIndexDataAction"/>
+      <reference ref="Git.Log.GitUseSharedLogAction"/>
+      <reference ref="Git.Log.GitDumpLogIndexDataAction"/>
     </group>
 
     <group id="Git.Log.Internal" internal="true">
-      <reference id="Git.Log.ShareLogIndexData"/>
+      <reference ref="Git.Log.ShareLogIndexData"/>
       <separator/>
-      <reference id="Git.Log.Show.Command"/>
+      <reference ref="Git.Log.Show.Command"/>
       <add-to-group group-id="Vcs.Log.Internal" anchor="last"/>
     </group>
 
@@ -385,56 +385,56 @@
 
     <group id="Git.Stage.Configure" popup="true">
       <separator key="separator.Git.Stage.Configure.display.as"/>
-      <reference id="Git.Stage.Enable"/>
-      <reference id="Git.Stage.Disable"/>
+      <reference ref="Git.Stage.Enable"/>
+      <reference ref="Git.Stage.Disable"/>
       <add-to-group group-id="CommitView.GearActions"/>
     </group>
 
     <group id="Git.Stage.Toolbar">
-      <reference id="Diff.ShowDiff"/>
-      <reference id="ChangesView.Refresh"/>
-      <reference id="Git.Stage.Add.Tracked"/>
-      <reference id="Git.Stash.Silently"/>
+      <reference ref="Diff.ShowDiff"/>
+      <reference ref="ChangesView.Refresh"/>
+      <reference ref="Git.Stage.Add.Tracked"/>
+      <reference ref="Git.Stash.Silently"/>
       <group id="Git.Stage.Ui.Settings" icon="AllIcons.Actions.GroupBy" popup="true">
-        <reference id="ChangesView.GroupBy"/>
+        <reference ref="ChangesView.GroupBy"/>
         <separator key="separator.show"/>
-        <reference id="Git.Stage.ToggleIgnored"/>
+        <reference ref="Git.Stage.ToggleIgnored"/>
       </group>
     </group>
     <group id="Git.Stage.Tree.Menu">
-      <reference id="Git.Stage.Merge"/>
-      <reference id="Git.Stage.AcceptTheirs"/>
-      <reference id="Git.Stage.AcceptYours"/>
-      <reference id="Git.Stage.Add"/>
-      <reference id="Git.Stage.Add.No.Content"/>
-      <reference id="Git.Stage.Reset"/>
+      <reference ref="Git.Stage.Merge"/>
+      <reference ref="Git.Stage.AcceptTheirs"/>
+      <reference ref="Git.Stage.AcceptYours"/>
+      <reference ref="Git.Stage.Add"/>
+      <reference ref="Git.Stage.Add.No.Content"/>
+      <reference ref="Git.Stage.Reset"/>
       <reference ref="Git.Stage.Stash.Files"/>
-      <reference id="Git.Stage.Revert"/>
-      <reference id="$Delete"/>
-      <reference id="Git.Ignore.File"/>
+      <reference ref="Git.Stage.Revert"/>
+      <reference ref="$Delete"/>
+      <reference ref="Git.Ignore.File"/>
       <separator/>
-      <reference id="Diff.ShowDiff"/>
+      <reference ref="Diff.ShowDiff"/>
       <reference ref="Diff.ShowStandaloneDiff"/>
-      <reference id="Git.Stage.ThreeSideDiff"/>
+      <reference ref="Git.Stage.ThreeSideDiff"/>
       <reference ref="EditSource"/>
       <reference ref="ChangesView.CreatePatchFromChanges"/>
       <reference ref="ChangesView.CreatePatchToClipboard"/>
       <separator/>
-      <reference id="Vcs.ShowTabbedFileHistory"/>
-      <reference id="LocalHistory"/>
+      <reference ref="Vcs.ShowTabbedFileHistory"/>
+      <reference ref="LocalHistory"/>
     </group>
     <group id="Git.Stage.Local.File.Menu" popup="false">
-      <reference id="Git.Stage.Show.Staged"/>
-      <reference id="Git.Stage.Compare.Local.Staged"/>
-      <reference id="Git.Stage.Compare.Three.Versions"/>
+      <reference ref="Git.Stage.Show.Staged"/>
+      <reference ref="Git.Stage.Compare.Local.Staged"/>
+      <reference ref="Git.Stage.Compare.Three.Versions"/>
 
       <add-to-group group-id="Git.ContextMenu" relative-to-action="ChangesView.RevertFiles" anchor="after"/>
     </group>
     <group id="Git.Stage.Index.File.Menu" popup="true" class="git4idea.index.actions.GitStageIndexFileMenuGroup">
-      <reference id="Git.Stage.Show.Local"/>
-      <reference id="Git.Stage.Compare.Staged.Head"/>
-      <reference id="Git.Stage.Compare.Staged.Local"/>
-      <reference id="Git.Stage.Compare.Three.Versions"/>
+      <reference ref="Git.Stage.Show.Local"/>
+      <reference ref="Git.Stage.Compare.Staged.Head"/>
+      <reference ref="Git.Stage.Compare.Staged.Local"/>
+      <reference ref="Git.Stage.Compare.Three.Versions"/>
 
       <add-to-group group-id="EditorPopupMenu"/>
     </group>
@@ -454,11 +454,11 @@
     </action>
 
     <group id="Git.Stash.Operations.ContextMenu" class="git4idea.stash.ui.GitStashOperationsGroup">
-      <reference id="Git.Stash.Pop"/>
-      <reference id="Git.Stash.Apply"/>
-      <reference id="Git.Stash.UnstashAs"/>
-      <reference id="Git.Stash.Drop"/>
-      <reference id="Git.Stash.Clear"/>
+      <reference ref="Git.Stash.Pop"/>
+      <reference ref="Git.Stash.Apply"/>
+      <reference ref="Git.Stash.UnstashAs"/>
+      <reference ref="Git.Stash.Drop"/>
+      <reference ref="Git.Stash.Clear"/>
       <add-to-group group-id="Vcs.SavedPatches.ContextMenu" anchor="first"/>
     </group>
 
@@ -479,11 +479,11 @@
 
     <group id="Vcs.ToolbarWidget.CreateRepository" searchable="false">
       <group id="Vcs.ToolbarWidget.ShareProject" popup="true" searchable="false">
-        <reference id="Start.Use.Vcs"/>
+        <reference ref="Start.Use.Vcs"/>
       </group>
-      <reference id="Git.Init"/>
+      <reference ref="Git.Init"/>
       <separator/>
-      <reference id="LocalHistory.ShowProjectHistory"/>
+      <reference ref="LocalHistory.ShowProjectHistory"/>
     </group>
 
     <group id="MainToolbarVCSGroup">
@@ -493,12 +493,12 @@
     </group>
 
     <group id="GitMergeRebaseWidgetGroup">
-      <reference id="Git.ResolveConflicts"/>
-      <reference id="Git.Rebase.Continue"/>
-      <reference id="Git.Rebase.Abort"/>
-      <reference id="Git.Merge.Abort"/>
-      <reference id="Git.CherryPick.Abort"/>
-      <reference id="Git.Revert.Abort"/>
+      <reference ref="Git.ResolveConflicts"/>
+      <reference ref="Git.Rebase.Continue"/>
+      <reference ref="Git.Rebase.Abort"/>
+      <reference ref="Git.Merge.Abort"/>
+      <reference ref="Git.CherryPick.Abort"/>
+      <reference ref="Git.Revert.Abort"/>
     </group>
 
     <group id="GitMainToolbarQuickActions" searchable="false" popup="false">
diff --git a/plugins/github/resources/META-INF/github-core-config.xml b/plugins/github/resources/META-INF/github-core-config.xml
index 6f429be0b834..34279b3c2455 100644
--- a/plugins/github/resources/META-INF/github-core-config.xml
+++ b/plugins/github/resources/META-INF/github-core-config.xml
@@ -157,52 +157,52 @@
     <group id="Github.PullRequest.ToolWindow.List.Popup">
       <action id="Github.PullRequest.Show"
               class="org.jetbrains.plugins.github.pullrequest.action.GHPROpenPullRequestAction"/>
-      <reference id="Github.PullRequest.Open.Link"/>
-      <reference id="Github.PullRequest.Copy.Link"/>
+      <reference ref="Github.PullRequest.Open.Link"/>
+      <reference ref="Github.PullRequest.Copy.Link"/>
       <separator/>
       <action id="Github.PullRequest.List.Reload"
               class="org.jetbrains.plugins.github.pullrequest.action.GHPRReloadListAction" use-shortcut-of="Refresh"/>
     </group>
     <group id="Github.PullRequest.Details.Popup">
-      <reference id="Github.PullRequest.Details.Reload"/>
-      <reference id="Github.PullRequest.Open.Link"/>
-      <reference id="Github.PullRequest.Copy.Link"/>
+      <reference ref="Github.PullRequest.Details.Reload"/>
+      <reference ref="Github.PullRequest.Open.Link"/>
+      <reference ref="Github.PullRequest.Copy.Link"/>
     </group>
 
     <action id="Github.PullRequest.Review.Submit"
             class="org.jetbrains.plugins.github.pullrequest.action.GHPRReviewSubmitAction"/>
 
     <group id="Github.PullRequest.Changes.Toolbar">
-      <reference id="Diff.ShowDiff"/>
+      <reference ref="Diff.ShowDiff"/>
       <separator/>
-      <reference id="ChangesView.GroupBy"/>
+      <reference ref="ChangesView.GroupBy"/>
     </group>
 
     <group id="Github.PullRequest.Changes.Popup">
-      <reference id="Diff.ShowDiff"/>
-      <reference id="Diff.ShowStandaloneDiff"/>
-      <reference id="EditSource"/>
+      <reference ref="Diff.ShowDiff"/>
+      <reference ref="Diff.ShowStandaloneDiff"/>
+      <reference ref="EditSource"/>
       <action id="Github.PullRequest.Changes.MarkViewed"
               class="org.jetbrains.plugins.github.pullrequest.action.GHPRMarkFilesViewedAction"/>
       <action id="Github.PullRequest.Changes.MarkNotViewed"
               class="org.jetbrains.plugins.github.pullrequest.action.GHPRMarkFilesNotViewedAction"/>
       <separator/>
       <group id="Github.PullRequest.Details.Commit.Tree.ViewOptions" icon="AllIcons.Actions.Show" popup="true">
-        <reference id="ChangesView.GroupBy"/>
+        <reference ref="ChangesView.GroupBy"/>
       </group>
       <reference ref="ExpandAll"/>
       <reference ref="CollapseAll"/>
       <separator/>
-      <reference id="Github.PullRequest.Details.Reload"/>
-      <reference id="Github.PullRequest.Open.Link"/>
-      <reference id="Github.PullRequest.Copy.Link"/>
+      <reference ref="Github.PullRequest.Details.Reload"/>
+      <reference ref="Github.PullRequest.Open.Link"/>
+      <reference ref="Github.PullRequest.Copy.Link"/>
     </group>
 
     <group id="Github.PullRequest.Timeline.Popup">
       <action id="Github.PullRequest.Timeline.Update"
               class="org.jetbrains.plugins.github.pullrequest.action.GHPRUpdateTimelineAction" use-shortcut-of="Refresh"/>
-      <reference id="Github.PullRequest.Open.Link"/>
-      <reference id="Github.PullRequest.Copy.Link"/>
+      <reference ref="Github.PullRequest.Open.Link"/>
+      <reference ref="Github.PullRequest.Copy.Link"/>
     </group>
 
     <action id="Github.Break.Api.Requests" internal="true"
@@ -224,7 +224,7 @@
               class="org.jetbrains.plugins.github.pullrequest.ui.review.GHPROnCurrentBranchService$ShowAction"
               icon="AllIcons.Vcs.Vendors.Github">
       </action>
-      <reference id="Github.PullRequest.Review.Submit"/>
+      <reference ref="Github.PullRequest.Review.Submit"/>
       <action id="Github.Pull.Request.Branch.Update"
               class="org.jetbrains.plugins.github.pullrequest.ui.review.GHPROnCurrentBranchService$UpdateAction"
               icon="org.jetbrains.plugins.github.GithubIcons.GithubWarning">
diff --git a/plugins/gitlab/gitlab-core/resources/META-INF/plugin.xml b/plugins/gitlab/gitlab-core/resources/META-INF/plugin.xml
index 31730eab41f2..608bd2760f22 100644
--- a/plugins/gitlab/gitlab-core/resources/META-INF/plugin.xml
+++ b/plugins/gitlab/gitlab-core/resources/META-INF/plugin.xml
@@ -160,57 +160,57 @@
     </action>
 
     <group id="GitLab.Main.Group" popup="true" class="com.intellij.ide.actions.NonTrivialActionGroup">
-      <reference id="GitLab.Merge.Request.Show.List"/>
+      <reference ref="GitLab.Merge.Request.Show.List"/>
 
       <add-to-group group-id="Git.MainMenu" relative-to-action="Git.Configure.Remotes" anchor="before"/>
     </group>
 
     <group id="GitLab.Merge.Request.List.Actions">
-      <reference id="GitLab.Merge.Request.Show"/>
-      <reference id="GitLab.Merge.Request.Open.Link"/>
-      <reference id="GitLab.Merge.Request.Copy.Link"/>
+      <reference ref="GitLab.Merge.Request.Show"/>
+      <reference ref="GitLab.Merge.Request.Open.Link"/>
+      <reference ref="GitLab.Merge.Request.Copy.Link"/>
       <separator/>
-      <reference id="GitLab.Merge.Request.List.Refresh"/>
+      <reference ref="GitLab.Merge.Request.List.Refresh"/>
     </group>
 
     <group id="GitLab.Merge.Request.Details.Popup">
-      <reference id="GitLab.Merge.Request.Refresh"/>
-      <reference id="GitLab.Merge.Request.Open.Link"/>
-      <reference id="GitLab.Merge.Request.Copy.Link"/>
+      <reference ref="GitLab.Merge.Request.Refresh"/>
+      <reference ref="GitLab.Merge.Request.Open.Link"/>
+      <reference ref="GitLab.Merge.Request.Copy.Link"/>
     </group>
 
     <group id="GitLab.Merge.Request.Timeline.Popup">
       <action id="GitLab.Merge.Request.Timeline.ShowEvents"
               class="org.jetbrains.plugins.gitlab.mergerequest.ui.timeline.action.GitLabMergeRequestTimelineShowEventsAction"/>
       <separator/>
-      <reference id="GitLab.Merge.Request.Refresh"/>
-      <reference id="GitLab.Merge.Request.Open.Link"/>
-      <reference id="GitLab.Merge.Request.Copy.Link"/>
+      <reference ref="GitLab.Merge.Request.Refresh"/>
+      <reference ref="GitLab.Merge.Request.Open.Link"/>
+      <reference ref="GitLab.Merge.Request.Copy.Link"/>
     </group>
 
     <group id="GitLab.Merge.Request.Timeline.Error.Popup">
-      <reference id="GitLab.Merge.Request.Open.Link"/>
-      <reference id="GitLab.Merge.Request.Copy.Link"/>
+      <reference ref="GitLab.Merge.Request.Open.Link"/>
+      <reference ref="GitLab.Merge.Request.Copy.Link"/>
     </group>
 
     <group id="GitLab.Merge.Request.Changes.Popup">
-      <reference id="Diff.ShowDiff"/>
-      <reference id="Diff.ShowStandaloneDiff"/>
-      <reference id="EditSource"/>
+      <reference ref="Diff.ShowDiff"/>
+      <reference ref="Diff.ShowStandaloneDiff"/>
+      <reference ref="EditSource"/>
       <action id="GitLab.Merge.Request.Changes.MarkViewed"
               class="org.jetbrains.plugins.gitlab.mergerequest.ui.details.GitLabMarkFilesViewedAction"/>
       <action id="GitLab.Merge.Request.Changes.MarkNotViewed"
               class="org.jetbrains.plugins.gitlab.mergerequest.ui.details.GitLabMarkFilesNotViewedAction"/>
       <group id="GitLab.Merge.Request.Details.Commit.Tree.ViewOptions" icon="AllIcons.Actions.Show" popup="true">
-        <reference id="ChangesView.GroupBy"/>
+        <reference ref="ChangesView.GroupBy"/>
       </group>
       <separator/>
       <reference ref="ExpandAll"/>
       <reference ref="CollapseAll"/>
       <separator/>
-      <reference id="GitLab.Merge.Request.Refresh"/>
-      <reference id="GitLab.Merge.Request.Open.Link"/>
-      <reference id="GitLab.Merge.Request.Copy.Link"/>
+      <reference ref="GitLab.Merge.Request.Refresh"/>
+      <reference ref="GitLab.Merge.Request.Open.Link"/>
+      <reference ref="GitLab.Merge.Request.Copy.Link"/>
     </group>
 
     <group id="GitLab.Merge.Request.Diff.Discussions.View.Options"
@@ -245,7 +245,7 @@
               class="org.jetbrains.plugins.gitlab.mergerequest.ui.review.GitLabMergeRequestOnCurrentBranchService$ShowAction"
               icon="org.jetbrains.plugins.gitlab.GitlabIcons.GitLabLogo">
       </action>
-      <reference id="GitLab.MergeRequest.Review.Submit"/>
+      <reference ref="GitLab.MergeRequest.Review.Submit"/>
       <action id="GitLab.Merge.Request.Branch.Update"
               class="org.jetbrains.plugins.gitlab.mergerequest.ui.review.GitLabMergeRequestOnCurrentBranchService$UpdateAction"
               icon="org.jetbrains.plugins.gitlab.GitlabIcons.GitLabWarning">
diff --git a/plugins/gradle/plugin-resources/META-INF/plugin.xml b/plugins/gradle/plugin-resources/META-INF/plugin.xml
index c41de7d93481..1173ef5211cf 100644
--- a/plugins/gradle/plugin-resources/META-INF/plugin.xml
+++ b/plugins/gradle/plugin-resources/META-INF/plugin.xml
@@ -278,43 +278,43 @@
 
     <group id="Gradle.View.ActionsToolbar.LeftPanel">
       <separator/>
-      <reference id="Gradle.DownloadSources"/>
-      <reference id="Gradle.ExecuteTask"/>
+      <reference ref="Gradle.DownloadSources"/>
+      <reference ref="Gradle.ExecuteTask"/>
       <add-to-group group-id="ExternalSystemView.ActionsToolbar.LeftPanel"/>
     </group>
 
     <group id="Gradle.View.ActionsToolbar.RightPanel">
-      <reference id="Gradle.ToggleOfflineAction"/>
+      <reference ref="Gradle.ToggleOfflineAction"/>
       <add-to-group group-id="ExternalSystemView.ActionsToolbar.RightPanel"/>
     </group>
 
     <group id="Gradle.View.ActionsToolbar.CenterPanel">
       <separator/>
-      <reference id="Gradle.OpenProjectCompositeConfiguration"/>
-      <reference id="Gradle.ToolbarDependencyAnalyzer"/>
+      <reference ref="Gradle.OpenProjectCompositeConfiguration"/>
+      <reference ref="Gradle.ToolbarDependencyAnalyzer"/>
       <separator/>
       <add-to-group group-id="ExternalSystemView.ActionsToolbar.CenterPanel" anchor="last"/>
     </group>
 
     <group id="Gradle.View.ProjectMenu">
       <separator/>
-      <reference id="Gradle.OpenProjectCompositeConfiguration"/>
-      <reference id="Gradle.RefreshDependencies"/>
-      <reference id="Gradle.ViewDependencyAnalyzer"/>
+      <reference ref="Gradle.OpenProjectCompositeConfiguration"/>
+      <reference ref="Gradle.RefreshDependencies"/>
+      <reference ref="Gradle.ViewDependencyAnalyzer"/>
       <separator/>
       <add-to-group group-id="ExternalSystemView.ProjectMenu" anchor="last"/>
     </group>
 
     <group id="Gradle.View.ModuleMenu">
       <separator/>
-      <reference id="Gradle.ViewDependencyAnalyzer"/>
+      <reference ref="Gradle.ViewDependencyAnalyzer"/>
       <separator/>
       <add-to-group group-id="ExternalSystemView.ModuleMenu" anchor="last"/>
     </group>
 
     <group id="Gradle.View.DependencyMenu">
       <separator/>
-      <reference id="Gradle.ViewDependencyAnalyzer"/>
+      <reference ref="Gradle.ViewDependencyAnalyzer"/>
       <separator/>
       <add-to-group group-id="ExternalSystemView.DependencyMenu" anchor="last"/>
     </group>
diff --git a/plugins/hg4idea/src/META-INF/plugin.xml b/plugins/hg4idea/src/META-INF/plugin.xml
index 54f7982dafee..881a39602f12 100644
--- a/plugins/hg4idea/src/META-INF/plugin.xml
+++ b/plugins/hg4idea/src/META-INF/plugin.xml
@@ -119,7 +119,7 @@
       <separator/>
       <action class="org.zmlx.hg4idea.action.mq.HgShowUnAppliedPatchesAction" id="hg4idea.mq.ShowUnAppliedPatches"
               icon="AllIcons.Debugger.Watch"/>
-      <reference id="ChangesView.Browse"/>
+      <reference ref="ChangesView.Browse"/>
       <separator/>
 
       <add-to-group group-id="VcsGroup" anchor="last"/>
@@ -162,23 +162,23 @@
 
 
     <group id="Hg.Log.ContextMenu">
-      <reference id="hg4idea.UpdateToRevision"/>
-      <reference id="hg4idea.CreateNewBranch"/>
-      <reference id="hg4idea.CreateNewTag"/>
-      <reference id="hg4idea.MergeWithRevision"/>
+      <reference ref="hg4idea.UpdateToRevision"/>
+      <reference ref="hg4idea.CreateNewBranch"/>
+      <reference ref="hg4idea.CreateNewTag"/>
+      <reference ref="hg4idea.MergeWithRevision"/>
       <separator/>
-      <reference id="Hg.Mq"/>
+      <reference ref="Hg.Mq"/>
       <add-to-group group-id="Vcs.Log.ContextMenu"/>
     </group>
 
     <group id="Mq.Patches.Toolbar">
-      <reference id="Hg.MQ.Unapplied"/>
+      <reference ref="Hg.MQ.Unapplied"/>
     </group>
 
     <group id="Mq.Patches.ContextMenu">
-      <reference id="Hg.MQ.Unapplied"/>
+      <reference ref="Hg.MQ.Unapplied"/>
       <separator/>
-      <reference id="ChangesView.ApplyPatch"/>
+      <reference ref="ChangesView.ApplyPatch"/>
     </group>
 
     <action id="Hg.Commit.And.Push.Executor" class="org.zmlx.hg4idea.action.HgCommitAndPushExecutorAction">
diff --git a/plugins/markdown/core/resources/META-INF/plugin.xml b/plugins/markdown/core/resources/META-INF/plugin.xml
index 525234336752..442d0ed4e608 100644
--- a/plugins/markdown/core/resources/META-INF/plugin.xml
+++ b/plugins/markdown/core/resources/META-INF/plugin.xml
@@ -476,22 +476,22 @@
              class="com.intellij.ide.actions.NonTrivialActionGroup"
              popup="true"
              compact="true">
-        <reference id="Markdown.Table.InsertTableColumn.InsertBefore"/>
-        <reference id="Markdown.Table.InsertTableColumn.InsertAfter"/>
-        <reference id="Markdown.Table.InsertRow.InsertAbove"/>
-        <reference id="Markdown.Table.InsertRow.InsertBelow"/>
+        <reference ref="Markdown.Table.InsertTableColumn.InsertBefore"/>
+        <reference ref="Markdown.Table.InsertTableColumn.InsertAfter"/>
+        <reference ref="Markdown.Table.InsertRow.InsertAbove"/>
+        <reference ref="Markdown.Table.InsertRow.InsertBelow"/>
         <separator/>
         <group id="Markdown.TableColumnActions.ColumnAlignmentActions.Popup"
                class="com.intellij.ide.actions.NonTrivialActionGroup"
                popup="true"
                compact="true">
-          <reference id="Markdown.Table.ColumnAlignmentActions"/>
+          <reference ref="Markdown.Table.ColumnAlignmentActions"/>
         </group>
-        <reference id="Markdown.Table.SwapColumns.SwapWithLeftColumn"/>
-        <reference id="Markdown.Table.SwapColumns.SwapWithRightColumn"/>
+        <reference ref="Markdown.Table.SwapColumns.SwapWithLeftColumn"/>
+        <reference ref="Markdown.Table.SwapColumns.SwapWithRightColumn"/>
         <separator/>
-        <reference id="Markdown.Table.RemoveCurrentColumn"/>
-        <reference id="Markdown.Table.RemoveCurrentRow"/>
+        <reference ref="Markdown.Table.RemoveCurrentColumn"/>
+        <reference ref="Markdown.Table.RemoveCurrentRow"/>
       </group>
     </group>
 
@@ -526,7 +526,7 @@
               icon="org.intellij.plugins.markdown.MarkdownIcons.EditorActions.Code_span">
         <keyboard-shortcut first-keystroke="control shift C" keymap="$default"/>
       </action>
-      <reference id="Markdown.Styling.CreateLink"/>
+      <reference ref="Markdown.Styling.CreateLink"/>
       <separator/>
       <action class="org.intellij.plugins.markdown.ui.actions.styling.CreateOrChangeListPopupAction"
               id="Markdown.Styling.CreateOrChangeList"
@@ -548,7 +548,7 @@
     <group id="Markdown.InsertGroup">
       <!-- Also add all insert actions into default generate popup -->
       <add-to-group group-id="GenerateGroup" anchor="last"/>
-      <reference id="Markdown.Styling.CreateLink"/>
+      <reference ref="Markdown.Styling.CreateLink"/>
       <action id="Markdown.InsertEmptyTable"
               class="org.intellij.plugins.markdown.editor.tables.actions.InsertEmptyTableAction"
               icon="org.intellij.plugins.markdown.MarkdownIcons.EditorActions.Table"/>
@@ -573,8 +573,8 @@
     <group id="Markdown.EditorContextMenuGroup">
       <add-to-group group-id="EditorPopupMenu" anchor="after" relative-to-action="EditorToggleColumnMode"/>
       <separator/>
-      <reference id="Markdown.TableContextMenuGroup"/>
-      <reference id="Markdown.Insert"/>
+      <reference ref="Markdown.TableContextMenuGroup"/>
+      <reference ref="Markdown.Insert"/>
     </group>
 
     <group id="Markdown.Toolbar.Left" class="com.intellij.openapi.actionSystem.DefaultActionGroup">
diff --git a/plugins/maven/src/main/resources/META-INF/plugin.xml b/plugins/maven/src/main/resources/META-INF/plugin.xml
index 192d4a7e2479..701adee39c69 100644
--- a/plugins/maven/src/main/resources/META-INF/plugin.xml
+++ b/plugins/maven/src/main/resources/META-INF/plugin.xml
@@ -706,8 +706,8 @@
     </action>
 
     <group id="Maven.ShowSettingsGroup" popup="true" icon="AllIcons.General.Settings">
-      <reference id="ExternalSystem.ShowCommonSettings"/>
-      <reference id="Maven.ShowSettings"/>
+      <reference ref="ExternalSystem.ShowCommonSettings"/>
+      <reference ref="Maven.ShowSettings"/>
     </group>
 
     <action id="Maven.ToggleOffline"
@@ -798,71 +798,71 @@
     </group>
 
     <group id="Maven.DownloadAllGroup">
-      <reference id="Maven.DownloadAllSources"/>
-      <reference id="Maven.DownloadAllDocs"/>
-      <reference id="Maven.DownloadAllSourcesAndDocs"/>
+      <reference ref="Maven.DownloadAllSources"/>
+      <reference ref="Maven.DownloadAllDocs"/>
+      <reference ref="Maven.DownloadAllSourcesAndDocs"/>
     </group>
 
     <group id="Maven.SyncAllGroup">
-      <reference id="Maven.SyncIncrementally"/>
-      <reference id="Maven.Reimport"/>
+      <reference ref="Maven.SyncIncrementally"/>
+      <reference ref="Maven.Reimport"/>
     </group>
 
     <group id="Maven.NavigatorActionsToolbar">
       <group id="Maven.SyncAllGroupPopup" popup="true" class="org.jetbrains.idea.maven.project.actions.SyncActionGroup"
              icon="AllIcons.Actions.Refresh">
-        <reference id="Maven.SyncAllGroup"/>
+        <reference ref="Maven.SyncAllGroup"/>
       </group>
-      <reference id="Maven.UpdateFolders"/>
+      <reference ref="Maven.UpdateFolders"/>
       <group id="Maven.DownloadAllGroupPopup" popup="true" class="org.jetbrains.idea.maven.project.actions.DownloadActionGroup"
              icon="AllIcons.Actions.Download">
-        <reference id="Maven.DownloadAllGroup"/>
+        <reference ref="Maven.DownloadAllGroup"/>
       </group>
       <separator/>
-      <reference id="Maven.AddManagedFiles"/>
+      <reference ref="Maven.AddManagedFiles"/>
       <separator/>
-      <reference id="Maven.RunBuild"/>
-      <reference id="Maven.ExecuteGoal"/>
-      <reference id="Maven.ToggleOffline"/>
-      <reference id="Maven.ToggleSkipTests"/>
-      <reference id="Maven.CollapseAll"/>
+      <reference ref="Maven.RunBuild"/>
+      <reference ref="Maven.ExecuteGoal"/>
+      <reference ref="Maven.ToggleOffline"/>
+      <reference ref="Maven.ToggleSkipTests"/>
+      <reference ref="Maven.CollapseAll"/>
       <separator/>
-      <reference id="Maven.NavigatorDependencyAnalyzer"/>
+      <reference ref="Maven.NavigatorDependencyAnalyzer"/>
       <separator/>
-      <reference id="Maven.ShowSettingsGroup"/>
+      <reference ref="Maven.ShowSettingsGroup"/>
     </group>
 
     <group id="Maven.DependencyMenu">
-      <reference id="Maven.DownloadSelectedSources"/>
-      <reference id="Maven.DownloadSelectedDocs"/>
-      <reference id="Maven.DownloadSelectedSourcesAndDocs"/>
+      <reference ref="Maven.DownloadSelectedSources"/>
+      <reference ref="Maven.DownloadSelectedDocs"/>
+      <reference ref="Maven.DownloadSelectedSourcesAndDocs"/>
       <separator/>
-      <reference id="Maven.ViewDependencyAnalyzer"/>
+      <reference ref="Maven.ViewDependencyAnalyzer"/>
     </group>
 
     <group id="Maven.BaseProjectMenu">
-      <reference id="Maven.ReimportProject"/>
-      <reference id="Maven.UpdateFoldersForProject"/>
+      <reference ref="Maven.ReimportProject"/>
+      <reference ref="Maven.UpdateFoldersForProject"/>
       <separator/>
-      <reference id="Maven.IgnoreProjects"/>
-      <reference id="Maven.RemoveManagedFiles"/>
+      <reference ref="Maven.IgnoreProjects"/>
+      <reference ref="Maven.RemoveManagedFiles"/>
       <separator/>
-      <reference id="Maven.OpenSettingsXml"/>
+      <reference ref="Maven.OpenSettingsXml"/>
       <separator/>
-      <reference id="Maven.DownloadAllGroup"/>
+      <reference ref="Maven.DownloadAllGroup"/>
       <separator/>
-      <reference id="Maven.ShowEffectivePom"/>
+      <reference ref="Maven.ShowEffectivePom"/>
     </group>
 
     <group id="Maven.NavigatorProjectMenu" popup="true">
       <reference ref="Maven.BaseProjectMenu"/>
       <separator/>
-      <reference id="Maven.NavigatorDependencyAnalyzer"/>
+      <reference ref="Maven.NavigatorDependencyAnalyzer"/>
       <separator/>
-      <reference id="Maven.RunBuild"/>
+      <reference ref="Maven.RunBuild"/>
       <reference ref="RunContextGroup"/>
       <separator/>
-      <reference id="EditSource"/>
+      <reference ref="EditSource"/>
     </group>
 
     <group id="Maven.ProfilesMenu" popup="true">
diff --git a/plugins/svn4idea/src/META-INF/plugin.xml b/plugins/svn4idea/src/META-INF/plugin.xml
index 6ad6b948ddaf..15cba876218c 100644
--- a/plugins/svn4idea/src/META-INF/plugin.xml
+++ b/plugins/svn4idea/src/META-INF/plugin.xml
@@ -50,45 +50,45 @@
       <action id="Subversion.Create.External" class="org.jetbrains.idea.svn.actions.CreateExternalAction"/>
       <separator/>
       <reference ref="ChangesView.AddUnversioned"/>
-      <reference id="CheckinFiles"/>
-      <reference id="UpdateFiles"/>
-      <reference id="IntegrateFiles"/>
-      <reference id="CheckStatusForFiles"/>
+      <reference ref="CheckinFiles"/>
+      <reference ref="UpdateFiles"/>
+      <reference ref="IntegrateFiles"/>
+      <reference ref="CheckStatusForFiles"/>
       <separator/>
       <action id="Subversion.ShowProperties" class="org.jetbrains.idea.svn.actions.ShowPropertiesAction"/>
       <action id="Subversion.SetProperty" class="org.jetbrains.idea.svn.actions.SetPropertyAction"/>
-      <reference id="ChangesView.Revert"/>
+      <reference ref="ChangesView.Revert"/>
       <action id="Subversion.Resolve" class="org.jetbrains.idea.svn.actions.ResolveAction"/>
       <action id="Subversion.MarkResolved" class="org.jetbrains.idea.svn.actions.MarkResolvedAction"/>
       <action id="Subversion.MarkTreeResolved" class="org.jetbrains.idea.svn.actions.MarkTreeConflictResolvedAction"/>
       <action id="Subversion.Clenaup" class="org.jetbrains.idea.svn.actions.CleanupAction"/>
       <separator/>
-      <reference id="Show.Current.Revision"/>
-      <reference id="Compare.SameVersion"/>
-      <reference id="Compare.LastVersion"/>
-      <reference id="Compare.Selected"/>
+      <reference ref="Show.Current.Revision"/>
+      <reference ref="Compare.SameVersion"/>
+      <reference ref="Compare.LastVersion"/>
+      <reference ref="Compare.Selected"/>
       <action id="Subversion.CompareWithBranch" class="org.jetbrains.idea.svn.diff.CompareWithBranchAction"/>
-      <reference id="Vcs.ShowTabbedFileHistory"/>
-      <reference id="Vcs.ShowHistoryForBlock"/>
-      <reference id="Annotate"/>
+      <reference ref="Vcs.ShowTabbedFileHistory"/>
+      <reference ref="Vcs.ShowHistoryForBlock"/>
+      <reference ref="Annotate"/>
       <action id="Subversion.Copy" class="org.jetbrains.idea.svn.branchConfig.CreateBranchOrTagAction"/>
       <separator/>
       <action id="Subversion.Lock" class="org.jetbrains.idea.svn.actions.LockAction"/>
       <action id="Subversion.Unlock" class="org.jetbrains.idea.svn.actions.UnlockAction"/>
       <action id="Subversion.Relocate" class="org.jetbrains.idea.svn.actions.RelocateAction"/>
       <separator/>
-      <reference id="ChangesView.Browse"/>
+      <reference ref="ChangesView.Browse"/>
       <separator/>
       <add-to-group group-id="SubversionFilePopupGroup" anchor="last"/>
     </group>
-    <reference id="Subversion.MarkTreeResolved">
+    <reference ref="Subversion.MarkTreeResolved">
       <add-to-group group-id="ChangesViewPopupMenu" anchor="after" relative-to-action="Diff.ShowStandaloneDiff"/>
     </reference>
     <group id="SubversionUpdateActionGroup" class="org.jetbrains.idea.svn.actions.SubversionGroup">
       <reference ref="ChangesView.AddUnversioned"/>
-      <reference id="ChangesView.Revert"/>
-      <reference id="Subversion.Resolve"/>
-      <reference id="Subversion.MarkResolved"/>
+      <reference ref="ChangesView.Revert"/>
+      <reference ref="Subversion.Resolve"/>
+      <reference ref="Subversion.MarkResolved"/>
       <separator/>
       <add-to-group group-id="UpdateActionGroup" anchor="first"/>
     </group>
diff --git a/plugins/tasks/tasks-core/resources/META-INF/plugin.xml b/plugins/tasks/tasks-core/resources/META-INF/plugin.xml
index c3020f871141..f8e91b7b3a73 100644
--- a/plugins/tasks/tasks-core/resources/META-INF/plugin.xml
+++ b/plugins/tasks/tasks-core/resources/META-INF/plugin.xml
@@ -32,7 +32,7 @@
     </action>
 
     <group id="task.actions">
-      <reference id="tasks.switch"/>
+      <reference ref="tasks.switch"/>
       <action id="tasks.goto" class="com.intellij.tasks.actions.GotoTaskAction">
         <keyboard-shortcut keymap="$default" first-keystroke="alt shift N"/>
       </action>
@@ -85,7 +85,7 @@
 
     <group id="tasks.toolbar">
       <separator/>
-      <reference id="tasks.switch"/>
+      <reference ref="tasks.switch"/>
       <add-to-group group-id="MainToolBar" anchor="last"/>
       <add-to-group group-id="NavBarToolBarOthers" anchor="last"/>
     </group>
diff --git a/plugins/terminal/resources/META-INF/plugin.xml b/plugins/terminal/resources/META-INF/plugin.xml
index 7478e9d79847..69006354ba31 100644
--- a/plugins/terminal/resources/META-INF/plugin.xml
+++ b/plugins/terminal/resources/META-INF/plugin.xml
@@ -189,7 +189,7 @@
     <action id="Terminal.EnableNewUi" class="org.jetbrains.plugins.terminal.action.EnableBlockTerminalUiAction"/>
 
     <group id="Terminal.ToolWindowActions">
-      <reference id="Terminal.EnableNewUi"/>
+      <reference ref="Terminal.EnableNewUi"/>
     </group>
 
     <group id="Terminal.PromptStyle" popup="true">
diff --git a/plugins/xpath/xpath-view/src/META-INF/plugin.xml b/plugins/xpath/xpath-view/src/META-INF/plugin.xml
index 11eb3ee48adc..b4be9631e3d7 100644
--- a/plugins/xpath/xpath-view/src/META-INF/plugin.xml
+++ b/plugins/xpath/xpath-view/src/META-INF/plugin.xml
@@ -210,27 +210,27 @@
     </action>
 
     <!-- Toolbar -->
-    <!--<reference id="XPathView.Actions.Evaluate">-->
+    <!--<reference ref="XPathView.Actions.Evaluate">-->
       <!--<add-to-group group-id="MainToolBar" anchor="before" relative-to-action="HelpTopics" />-->
     <!--</reference>-->
 
     <group id="XPathView.MainMenu.Search">
       <separator />
-      <reference id="XPathView.Actions.Evaluate" />
-      <reference id="XPathView.Actions.FindByExpression" />
+      <reference ref="XPathView.Actions.Evaluate" />
+      <reference ref="XPathView.Actions.FindByExpression" />
 
       <add-to-group group-id="FindMenuGroup" anchor="after" relative-to-action="StructuralSearchActions" />
     </group>
 
-    <reference id="XPathView.Actions.ShowPath">
+    <reference ref="XPathView.Actions.ShowPath">
       <add-to-group group-id="CodeEditorViewGroup" anchor="after" relative-to-action="ShowErrorDescription" />
     </reference>
 
     <!-- Editor Popup -->
     <group id="XPathView.EditorPopup">
       <separator />
-      <reference id="XPathView.Actions.Evaluate" />
-      <reference id="XPathView.Actions.ShowPath" />
+      <reference ref="XPathView.Actions.Evaluate" />
+      <reference ref="XPathView.Actions.ShowPath" />
 
       <add-to-group group-id="EditorPopupMenu" anchor="after" relative-to-action="RefactoringMenu" />
     </group>
diff --git a/resources/src/idea/JavaActions.xml b/resources/src/idea/JavaActions.xml
index 3497661eb1fd..0248a7d7b130 100644
--- a/resources/src/idea/JavaActions.xml
+++ b/resources/src/idea/JavaActions.xml
@@ -345,7 +345,7 @@
     </action>
 
     <group id="RefactoringMenuRenameFile">
-      <reference id="RenameFile"/>
+      <reference ref="RenameFile"/>
       <add-to-group group-id="RefactoringMenu" anchor="after" relative-to-action="RenameElement"/>
     </group>