diff --git a/action_basics/src/main/resources/META-INF/plugin.xml b/action_basics/src/main/resources/META-INF/plugin.xml
index cfcb07b0c..d42fcbcb4 100644
--- a/action_basics/src/main/resources/META-INF/plugin.xml
+++ b/action_basics/src/main/resources/META-INF/plugin.xml
@@ -15,7 +15,7 @@
   <idea-version since-build="191"/>
 
   <!-- Indicate this plugin can be loaded in all IntelliJ Platform-based products. -->
-  <depends>com.intellij.modules.lang</depends>
+  <depends>com.intellij.modules.platform</depends>
 
   <!-- Text to display as description on Preferences/Settings | Plugin page  -->
   <description>
@@ -27,7 +27,7 @@
     <![CDATA[
       <ul>
         <li><b>2.0.0</b> Renamed from register_actions and converted to Gradle project.</li>
-        <li><b>1.1</b> Refactor to give users feedback when menu items are selected.</li>
+        <li><b>1.1</b> Refactor to give users feedback when selecting menu items.</li>
         <li><b>1.0</b> Release 2018.3 and earlier.</li>
       </ul>
     ]]>
@@ -41,7 +41,7 @@
           for information about the elements and attributes used for actions and groups. -->
     <!-- This <action> element adds a static menu item in first position of the Tools menu that shows PopupDialogAction. -->
     <action id="org.intellij.sdk.action.PopupDialogAction" class="org.intellij.sdk.action.PopupDialogAction"
-            text="Pop Dialog Action" description="SDK Action Example" icon="ActionBasicsIcons.Sdk_default_icon">
+            text="Pop Dialog Action" description="SDK action example" icon="ActionBasicsIcons.Sdk_default_icon">
       <keyboard-shortcut first-keystroke="control alt A" second-keystroke="C" keymap="$default"/>
       <mouse-shortcut keystroke="control button3 doubleClick" keymap="$default"/>
       <add-to-group group-id="ToolsMenu" anchor="first"/>
@@ -55,21 +55,21 @@
     <group id="org.intellij.sdk.action.GroupedActions" text="Static Grouped Actions" popup="true" icon="ActionBasicsIcons.Sdk_default_icon">
       <add-to-group group-id="ToolsMenu" anchor="after" relative-to-action="org.intellij.sdk.action.PopupDialogAction"/>
       <action class="org.intellij.sdk.action.PopupDialogAction" id="org.intellij.sdk.action.GroupPopDialogAction"
-              text="A Group Action" description="SDK Static Grouped Action Example" icon="ActionBasicsIcons.Sdk_default_icon">
+              text="A Group Action" description="SDK static grouped action example" icon="ActionBasicsIcons.Sdk_default_icon">
       </action>
     </group>
     <!-- CustomDefaultActionGroup demonstrates declaring an action group based on a ActionGroup class supplied by this plugin.
           This group is to be inserted atop the Editor Popup Menu. It declares one action in the group. -->
     <group id="org.intellij.sdk.action.CustomDefaultActionGroup" class="org.intellij.sdk.action.CustomDefaultActionGroup" popup="true"
-            text="Popup Grouped Actions" description="Custom DefaultActionGroup Demo" icon="ActionBasicsIcons.Sdk_default_icon">
+            text="Popup Grouped Actions" description="Custom defaultActionGroup demo" icon="ActionBasicsIcons.Sdk_default_icon">
       <add-to-group group-id="EditorPopupMenu" anchor="first"/>
       <action class="org.intellij.sdk.action.PopupDialogAction" id="org.intellij.sdk.action.CustomGroupedAction"
-              text="A Popup Action" description="SDK Popup Grouped Action Example" icon="ActionBasicsIcons.Sdk_default_icon"/>
+              text="A Popup Action" description="SDK popup grouped action example" icon="ActionBasicsIcons.Sdk_default_icon"/>
     </group>
     <!-- DynamicActionGroup demonstrates declaring an action group without a static action declaration.
           An action is added to the group programmatically in the DynamicActionGroup implementation. -->
     <group id="org.intellij.sdk.action.DynamicActionGroup" class="org.intellij.sdk.action.DynamicActionGroup" popup="true"
-            text="Dynamically Grouped Actions" description="SDK Dynamically Grouped Action Example" icon="ActionBasicsIcons.Sdk_default_icon">
+            text="Dynamically Grouped Actions" description="SDK dynamically grouped action example" icon="ActionBasicsIcons.Sdk_default_icon">
       <add-to-group group-id="ToolsMenu" anchor="after" relative-to-action="org.intellij.sdk.action.GroupedActions"/>
     </group>
   </actions>
diff --git a/comparing_references_inspection/resources/META-INF/plugin.xml b/comparing_references_inspection/resources/META-INF/plugin.xml
index ba29aa7e8..adfb1de83 100644
--- a/comparing_references_inspection/resources/META-INF/plugin.xml
+++ b/comparing_references_inspection/resources/META-INF/plugin.xml
@@ -32,7 +32,7 @@
   </change-notes>
 
   <!-- Text to display as company information on Preferences/Settings | Plugin page -->
-  <vendor email="faux-email@jetbrains.com" url="https://plugins.jetbrains.com">IntelliJ Platform SDK</vendor>
+  <vendor url="https://plugins.jetbrains.com">IntelliJ Platform SDK</vendor>
 
   <extensions defaultExtensionNs="com.intellij">
 
diff --git a/conditional_operator_intention/resources/META-INF/plugin.xml b/conditional_operator_intention/resources/META-INF/plugin.xml
index 77dbcfce4..63894c3d5 100644
--- a/conditional_operator_intention/resources/META-INF/plugin.xml
+++ b/conditional_operator_intention/resources/META-INF/plugin.xml
@@ -15,6 +15,7 @@
 
   <!-- Product and plugin compatibility requirements -->
   <depends>com.intellij.modules.java</depends>
+  <depends>com.intellij.modules.platform</depends>
 
   <!-- Text to display as description on Preferences/Settings | Plugin page  -->
   <description>
@@ -32,7 +33,7 @@
   </change-notes>
 
   <!-- Text to display as company information on Preferences/Settings | Plugin page -->
-  <vendor email="faux-email@jetbrains.com" url="https://plugins.jetbrains.com">IntelliJ Platform SDK</vendor>
+  <vendor url="https://plugins.jetbrains.com">IntelliJ Platform SDK</vendor>
 
   <extensions defaultExtensionNs="com.intellij">
     <intentionAction>
@@ -41,9 +42,4 @@
     </intentionAction>
   </extensions>
 
-  <project-components>
-    <component>
-      <implementation-class>com.intellij.codeInsight.intention.ConditionalOperatorConvertor</implementation-class>
-    </component>
-  </project-components>
 </idea-plugin>
diff --git a/editor_basics/src/main/resources/META-INF/plugin.xml b/editor_basics/src/main/resources/META-INF/plugin.xml
index c17fc5116..8fe9d60e1 100644
--- a/editor_basics/src/main/resources/META-INF/plugin.xml
+++ b/editor_basics/src/main/resources/META-INF/plugin.xml
@@ -15,7 +15,7 @@
   <idea-version since-build="191"/>
 
   <!-- Product and plugin compatibility requirements -->
-  <depends>com.intellij.modules.lang</depends>
+  <depends>com.intellij.modules.platform</depends>
 
   <!-- Text to display as description on Preferences/Settings | Plugin page  -->
   <description>
diff --git a/framework_basics/src/main/resources/META-INF/plugin.xml b/framework_basics/src/main/resources/META-INF/plugin.xml
index 736d23a3a..676670ee8 100644
--- a/framework_basics/src/main/resources/META-INF/plugin.xml
+++ b/framework_basics/src/main/resources/META-INF/plugin.xml
@@ -36,7 +36,7 @@
   <vendor url="https://plugins.jetbrains.com">IntelliJ Platform SDK</vendor>
 
 
-<extensions defaultExtensionNs="com.intellij">
+  <extensions defaultExtensionNs="com.intellij">
     <framework.type implementation="org.intellij.sdk.framework.DemoFramework"/>
   </extensions>
 
diff --git a/gradle_plugin_demo/src/main/resources/META-INF/plugin.xml b/gradle_plugin_demo/src/main/resources/META-INF/plugin.xml
index c0157b52f..2bdce9876 100644
--- a/gradle_plugin_demo/src/main/resources/META-INF/plugin.xml
+++ b/gradle_plugin_demo/src/main/resources/META-INF/plugin.xml
@@ -4,7 +4,7 @@
   <version>0.0.1</version>
   <vendor email="dummy" url="dummy">dummy</vendor>
 
-  <depends>com.intellij.modules.lang</depends>
+  <depends>com.intellij.modules.platform</depends>
 
   <idea-version since-build="191"/>
   <extensions defaultExtensionNs="com.intellij">
diff --git a/inspection_basics/src/main/resources/META-INF/plugin.xml b/inspection_basics/src/main/resources/META-INF/plugin.xml
index ec45b60f2..caa0f94bd 100644
--- a/inspection_basics/src/main/resources/META-INF/plugin.xml
+++ b/inspection_basics/src/main/resources/META-INF/plugin.xml
@@ -12,7 +12,7 @@
   <!-- Compatible with the following versions of IntelliJ Platform -->
   <idea-version since-build="191"/>
 
-  <!-- Product and plugin compatibility requirements -->
+  <!-- Product and plugin compatibility requirements - this inspects text, which is part of the lang module -->
   <depends>com.intellij.modules.lang</depends>
 
   <!-- Text to display as description on Preferences/Settings | Plugin page  -->
@@ -57,8 +57,8 @@
              implementationClass= FQN of inspection implementation
             -->
     <localInspection language="TEXT"
-            displayName="Inspection Basics"
-            groupName="Example Inspections"
+            displayName="Inspection basics"
+            groupName="Example inspections"
             groupPath="SDK"
             enabledByDefault="true"
             level="WARNING"
diff --git a/kotlin_demo/src/main/resources/META-INF/plugin.xml b/kotlin_demo/src/main/resources/META-INF/plugin.xml
index 762d99085..423017470 100644
--- a/kotlin_demo/src/main/resources/META-INF/plugin.xml
+++ b/kotlin_demo/src/main/resources/META-INF/plugin.xml
@@ -15,8 +15,8 @@
   <!-- Minimum and maximum build numbers of IDEA compatible with the plugin. -->
   <idea-version since-build="191.0"/>
 
-  <!-- Product and plugin compatibility requirements -->
-  <depends>com.intellij.modules.lang</depends>
+  <!-- Product and plugin compatibility requirements - uses action system and kotlin -->
+  <depends>com.intellij.modules.platform</depends>
   <depends>org.jetbrains.kotlin</depends>
 
   <!-- Description of the plugin. Displayed in the "Plugins" settings dialog and in the
@@ -41,7 +41,7 @@
          The optional "url" attribute specifies the URL of the vendor homepage.
          The optional "email" attribute specifies the e-mail address of the vendor.
   -->
-  <vendor email="support@yourcompany.com" url="http://www.yourcompany.com">YourCompany</vendor>
+  <vendor url="https://plugins.jetbrains.com">IntelliJ Platform SDK</vendor>
 
   <actions>
     <group id="MyPlugin.TestMeu" text="Greeting" description="Greeting menu">
diff --git a/live_templates/resources/META-INF/plugin.xml b/live_templates/resources/META-INF/plugin.xml
index 876f3b744..d2d187ccb 100644
--- a/live_templates/resources/META-INF/plugin.xml
+++ b/live_templates/resources/META-INF/plugin.xml
@@ -4,7 +4,12 @@
   <version>1.0</version>
   <vendor>JetBrains</vendor>
 
-  <description>Provides live templates for Markdown language</description>
+  <!-- Text to display as description on Preferences/Settings | Plugin page  -->
+  <description>
+    <![CDATA[
+      Demonstrates implementing live templates for Markdown language.<br> Adds an entry to the <b>Preferences | Editor | Live Templates</b> dialog.
+    ]]>
+  </description>
 
   <idea-version since-build="141.0"/>
 
diff --git a/live_templates/resources/liveTemplates/Markdown.xml b/live_templates/resources/liveTemplates/Markdown.xml
index 2f96a90da..725f104ee 100644
--- a/live_templates/resources/liveTemplates/Markdown.xml
+++ b/live_templates/resources/liveTemplates/Markdown.xml
@@ -1,7 +1,7 @@
 <templateSet group="Markdown">
   <template name="["
             value="[$TEXT$]($LINK$)$END$"
-            description="New link reference."
+            description="SDK: New link reference."
             toReformat="false"
             toShortenFQNames="false">
     <variable name="TEXT" expression="" defaultValue="" alwaysStopAt="true"/>
diff --git a/max_opened_projects/resources/META-INF/plugin.xml b/max_opened_projects/resources/META-INF/plugin.xml
index b14982b11..0ef80748b 100644
--- a/max_opened_projects/resources/META-INF/plugin.xml
+++ b/max_opened_projects/resources/META-INF/plugin.xml
@@ -6,7 +6,7 @@
   <idea-version since-build="131"/>
 
   <!-- Product and plugin compatibility requirements -->
-  <depends>com.intellij.modules.lang</depends>
+  <depends>com.intellij.modules.platform</depends>
 
   <project-components>
     <component>
diff --git a/module/resources/META-INF/plugin.xml b/module/resources/META-INF/plugin.xml
index 3606d0220..8a76b1823 100644
--- a/module/resources/META-INF/plugin.xml
+++ b/module/resources/META-INF/plugin.xml
@@ -9,7 +9,7 @@
   <idea-version since-build="131"/>
 
   <!-- Product and plugin compatibility requirements -->
-  <depends>com.intellij.modules.lang</depends>
+  <depends>com.intellij.modules.platform</depends>
 
   <extensions defaultExtensionNs="com.intellij">
     <moduleType id="DEMO_MODULE_TYPE" implementationClass="com.intellij.tutorials.module.DemoModuleType"/>
diff --git a/plugin_sample/resources/META-INF/plugin.xml b/plugin_sample/resources/META-INF/plugin.xml
index 3e5c5b65e..72c398865 100644
--- a/plugin_sample/resources/META-INF/plugin.xml
+++ b/plugin_sample/resources/META-INF/plugin.xml
@@ -16,8 +16,7 @@
 
   <!-- http://www.jetbrains.org/intellij/sdk/docs/basics/getting_started/plugin_compatibility.html -->
   <!-- The unique identifiers of the plugins on which this plugin depends -->
-  <!-- com.intellij.modules.lang is included in every IntelliJ-based IDE, plugin will be available as well -->
-  <depends>com.intellij.modules.lang</depends>
+  <depends>com.intellij.modules.platform</depends>
   <!-- Optional dependency on another plugin. If the plugin with the "MySecondPlugin" ID is installed, the contents of mysecondplugin.xml (the format of this file conforms to the format of plugin.xml) will be loaded. -->
   <!--<depends optional="true" config-file="custom-plugin.xml">CustomPlugin</depends>-->
 
@@ -87,7 +86,7 @@
       "first", "last", "before" and "after".
       The "relative-to-action" attribute is mandatory if the anchor is set to "before" and "after", and specifies the action before or after which
       the current action is inserted. -->
-      <add-to-group group-id="ToolsMenu" anchor="after"/>
+      <add-to-group group-id="ToolsMenu" anchor="first"/>
     </action>
     <!-- The <group> element defines an action group. <action>, <group> and <separator> elements defined within it are automatically included in the group.
               The mandatory "id" attribute specifies an unique identifier for the action.
@@ -98,13 +97,12 @@
               The optional "icon" attribute specifies the icon which is displayed on the toolbar button or next to the group.
               The optional "popup" attribute specifies how the group is presented in the menu. If a group has popup="true", actions in it
               are placed in a submenu; for popup="false", actions are displayed as a section of the same menu delimited by separators. -->
-    <group id="DummyDefaultActionGroup" text="Default action group">
+    <group id="DummyDefaultActionGroup" text="Default Action Group">
       <action class="org.jetbrains.tutorials.sample.actions.GroupedToDefaultAction"
               id="PluginSample.GroupedToDefaultAction"/>
     </group>
     <group class="org.jetbrains.tutorials.sample.actions.DummyActionGroup" id="DummyActionGroup" text="Action Group"
-           description="Illustration of an action group"
-           icon="icons/testgroup.png" popup="true">
+           description="Illustration of an action group">
       <action id="PluginSample.GroupedAction" class="org.jetbrains.tutorials.sample.actions.GroupedAction"
               text="Grouped Action" description="An action in the group"/>
       <!-- The <separator> element defines a separator between actions. It can also have an <add-to-group> child element. -->
@@ -127,7 +125,7 @@
 or to "com.intellij" if the extension point is defined by the IDEA core. The name of the
         tag within the <extensions> tag matches the name of the extension point, and the "implementation" class specifies the name of the
         class added to the extension point. -->
-  <extensions>
+  <extensions defaultExtensionNs="com.intellij">
     <!--<testExtensionPoint implementation="com.foo.impl.MyExtensionImpl"/>-->
   </extensions>
 </idea-plugin>
\ No newline at end of file
diff --git a/project_model/resources/META-INF/plugin.xml b/project_model/resources/META-INF/plugin.xml
index 6881b32ae..4fbd72dd8 100644
--- a/project_model/resources/META-INF/plugin.xml
+++ b/project_model/resources/META-INF/plugin.xml
@@ -15,12 +15,12 @@
     <action id="ProjectModel.SourceRoots" class="com.intellij.tutorials.project.model.ShowSourceRootsActions"
             text="Show Source Roots"
             description="Illustrates how to get source roots">
-      <add-to-group group-id="ToolsMenu" anchor="after"/>
+      <add-to-group group-id="ToolsMenu" anchor="first"/>
     </action>
     <action id="ProjectModel.ProjectSdk" class="com.intellij.tutorials.project.model.ProjectSdkAction"
             text="Show Sdk Info"
-            description="Illustrates how to get source roots">
-      <add-to-group group-id="ToolsMenu" anchor="after"/>
+            description="Illustrates how to get Sdk info">
+      <add-to-group group-id="ToolsMenu" anchor="after" relative-to-action="ProjectModel.SourceRoots"/>
     </action>
     <action id="ProjectModel.ProjectFileIndex"
             class="com.intellij.tutorials.project.model.ProjectFileIndexSampleAction"
@@ -34,7 +34,7 @@
       <add-to-group group-id="EditorPopupMenu" anchor="last"/>
     </action>
     <action id="ProjectModel.LibrariesAction" class="com.intellij.tutorials.project.model.LibrariesAction"
-            text="Libraries for file"
+            text="Libraries for File"
             description="Illustrates accessing libraries">
       <add-to-group group-id="EditorPopupMenu" anchor="last"/>
     </action>
diff --git a/project_view_pane/resources/META-INF/plugin.xml b/project_view_pane/resources/META-INF/plugin.xml
index a36beef2f..f1189e532 100644
--- a/project_view_pane/resources/META-INF/plugin.xml
+++ b/project_view_pane/resources/META-INF/plugin.xml
@@ -9,7 +9,7 @@
   <idea-version since-build="172.2103.15"/>
 
   <!-- Product and plugin compatibility requirements -->
-  <depends>com.intellij.modules.lang</depends>
+  <depends>com.intellij.modules.platform</depends>
 
   <extensions defaultExtensionNs="com.intellij">
     <projectViewPane implementation="org.jetbrains.tutorials.view.pane.ImagesProjectViewPane"/>
diff --git a/project_wizard/resources/META-INF/plugin.xml b/project_wizard/resources/META-INF/plugin.xml
index f40d9a3d4..a9b2fff7d 100644
--- a/project_wizard/resources/META-INF/plugin.xml
+++ b/project_wizard/resources/META-INF/plugin.xml
@@ -7,7 +7,7 @@
   <description>Illustration of working with Project Wizard</description>
 
   <idea-version since-build="131"/>
-  <depends>com.intellij.modules.lang</depends>
+  <depends>com.intellij.modules.platform</depends>
 
   <extensions defaultExtensionNs="com.intellij">
     <moduleBuilder builderClass="org.jetbrains.tutorials.project.wizard.DemoModuleWizardStep"
diff --git a/register_actions/resources/META-INF/plugin.xml b/register_actions/resources/META-INF/plugin.xml
index 341a81975..2d40c39e1 100644
--- a/register_actions/resources/META-INF/plugin.xml
+++ b/register_actions/resources/META-INF/plugin.xml
@@ -9,7 +9,7 @@
   <change-notes>Refactor to give users feedback when menu items are selected.</change-notes>
 
   <idea-version since-build="131"/>
-  <depends>com.intellij.modules.lang</depends>
+  <depends>com.intellij.modules.platform</depends>
 
   <actions>
     <!-- Add your actions here -->
@@ -21,7 +21,7 @@
     The optional "description" attribute specifies the text which is displayed in the status bar when the action is focused.
     The optional "icon" attribute specifies the icon which is displayed on the toolbar button or next to the menu item. -->
     <action id="org.jetbrains.tutorials.actions.SimpleAction" class="org.jetbrains.tutorials.actions.SimplePopDialogAction"
-            text="Simple Action" description="IntelliJ Action System Demo">
+            text="Simple Action" description="IntelliJ action system demo">
       <!-- The <keyboard-shortcut> node specifies the keyboard shortcut for the action. An action can have several keyboard shortcuts.
       The mandatory "first-keystroke" attribute specifies the first keystroke of the action. The key strokes are specified according to the regular Swing rules.
       The optional "second-keystroke" attribute specifies the second keystroke of the action.
@@ -66,22 +66,22 @@
     <group id="org.jetbrains.tutorials.actions.GroupedActions" text="Example Grouped Actions" popup="true">
       <add-to-group group-id="ToolsMenu" anchor="after" relative-to-action="org.jetbrains.tutorials.actions.SimpleAction"/>
       <action class="org.jetbrains.tutorials.actions.SimplePopDialogAction" id="org.jetbrains.tutorials.actions.SimpleGroupedAction"
-              text="A Grouped Action" description="Grouped Action Demo">
+              text="A Grouped Action" description="Grouped action demo">
       </action>
     </group>
     <!-- CustomDefaultActionGroup demonstrates declaring an action group based on a ActionGroup class supplied by this plugin.
       This group is to be inserted atop the Editor Popup Menu. It declares one action in the group. -->
     <group id="org.jetbrains.tutorials.actions.ExampleCustomDefaultActionGroup" class="org.jetbrains.tutorials.actions.CustomDefaultActionGroup" popup="true"
-           text="Example Custom DefaultActionGroup" description="Custom DefaultActionGroup Demo">
+           text="Example Custom DefaultActionGroup" description="Custom defaultActionGroup demo">
       <add-to-group group-id="EditorPopupMenu" anchor="first"/>
       <action class="org.jetbrains.tutorials.actions.SimplePopDialogAction" id="org.jetbrains.tutorials.actions.CustomGroupedAction"
-              text="A Custom Grouped Action" description="Custom Grouped Action Demo"/>
+              text="A Custom Grouped Action" description="Custom grouped action demo"/>
     </group>
     <!-- DynamicActionGroup demonstrates declaring an action group without a static action declaration.
      An action is added to the group programmatically in the DynamicActionGroup implementation. The group is added
      last in the tools menu. -->
     <group id="org.jetbrains.tutorials.actions.DynamicActionGroup" class="org.jetbrains.tutorials.actions.DynamicActionGroup" popup="true"
-           text="Dynamic ActionGroup" description="Dynamic ActionGroup Demo">
+           text="Dynamic ActionGroup" description="Dynamic actionGroup demo">
       <add-to-group group-id="ToolsMenu" anchor="last"/>
     </group>
   </actions>
diff --git a/run_configuration/resources/META-INF/plugin.xml b/run_configuration/resources/META-INF/plugin.xml
index c2e7f0426..857d9580d 100644
--- a/run_configuration/resources/META-INF/plugin.xml
+++ b/run_configuration/resources/META-INF/plugin.xml
@@ -7,7 +7,7 @@
   <description>Illustration of working with run configurations</description>
 
   <idea-version since-build="131"/>
-  <depends>com.intellij.modules.lang</depends>
+  <depends>com.intellij.modules.platform</depends>
 
   <extensions defaultExtensionNs="com.intellij">
     <configurationType implementation="org.jetbrains.tutorials.run.configuration.DemoRunConfigurationType"/>
diff --git a/theme_basics/resources/META-INF/plugin.xml b/theme_basics/resources/META-INF/plugin.xml
index 1d509fa7f..89953b277 100644
--- a/theme_basics/resources/META-INF/plugin.xml
+++ b/theme_basics/resources/META-INF/plugin.xml
@@ -18,7 +18,7 @@
   <idea-version since-build="191"/>
 
   <!-- Product and plugin compatibility requirements -->
-  <depends>com.intellij.modules.lang</depends>
+  <depends>com.intellij.modules.platform</depends>
 
   <extensions defaultExtensionNs="com.intellij">
     <!-- Add your extensions here -->
diff --git a/tool_window/resources/META-INF/plugin.xml b/tool_window/resources/META-INF/plugin.xml
index 6113a70b3..b9a3134a5 100644
--- a/tool_window/resources/META-INF/plugin.xml
+++ b/tool_window/resources/META-INF/plugin.xml
@@ -8,7 +8,7 @@
   <idea-version since-build="141.0"/>
 
   <!-- Product and plugin compatibility requirements -->
-  <depends>com.intellij.modules.lang</depends>
+  <depends>com.intellij.modules.platform</depends>
 
   <extensions defaultExtensionNs="com.intellij">
     <toolWindow id="Sample Calendar" secondary="true" icon="/myToolWindow/plus.png" anchor="right"
diff --git a/tree_structure_provider/resources/META-INF/plugin.xml b/tree_structure_provider/resources/META-INF/plugin.xml
index 571dace95..03f83ee19 100644
--- a/tree_structure_provider/resources/META-INF/plugin.xml
+++ b/tree_structure_provider/resources/META-INF/plugin.xml
@@ -7,7 +7,7 @@
   <description>Tree Structure Provider Demo showing only plain text files</description>
 
   <idea-version since-build="131"/>
-  <depends>com.intellij.modules.lang</depends>
+  <depends>com.intellij.modules.platform</depends>
 
   <extensions defaultExtensionNs="com.intellij">
     <treeStructureProvider implementation="org.jetbrains.tutorials.tree.structure.TextOnlyTreeStructureProvider"/>