diff --git a/action_basics/src/main/resources/META-INF/plugin.xml b/action_basics/src/main/resources/META-INF/plugin.xml
index 72b4edc71..28adc5ac1 100644
--- a/action_basics/src/main/resources/META-INF/plugin.xml
+++ b/action_basics/src/main/resources/META-INF/plugin.xml
@@ -1,6 +1,7 @@
 <!-- Copyright 2000-2020 JetBrains s.r.o. and other contributors. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file. -->
 
 <idea-plugin>
+
   <!--  Unique id for this plugin. Must stay constant for the life of the plugin.  -->
   <id>org.intellij.sdk.action</id>
 
@@ -74,4 +75,4 @@
     </group>
   </actions>
 
-</idea-plugin>
\ No newline at end of file
+</idea-plugin>
diff --git a/comparing_references_inspection/src/main/resources/META-INF/plugin.xml b/comparing_references_inspection/src/main/resources/META-INF/plugin.xml
index 2b3bc05d2..2bc0ba363 100644
--- a/comparing_references_inspection/src/main/resources/META-INF/plugin.xml
+++ b/comparing_references_inspection/src/main/resources/META-INF/plugin.xml
@@ -1,6 +1,7 @@
 <!-- Copyright 2000-2020 JetBrains s.r.o. and other contributors. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file. -->
 
 <idea-plugin>
+
   <!--  Unique id for this plugin. Must stay constant for the life of the plugin.  -->
   <id>org.intelliJ.sdk.codeInspection</id>
 
diff --git a/conditional_operator_intention/src/main/resources/META-INF/plugin.xml b/conditional_operator_intention/src/main/resources/META-INF/plugin.xml
index fe4186e27..e60fabab2 100644
--- a/conditional_operator_intention/src/main/resources/META-INF/plugin.xml
+++ b/conditional_operator_intention/src/main/resources/META-INF/plugin.xml
@@ -1,11 +1,12 @@
 <!-- Copyright 2000-2020 JetBrains s.r.o. and other contributors. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file. -->
 
 <idea-plugin>
+
   <!--  Unique id for this plugin. Must stay constant for the life of the plugin.  -->
   <id>org.intellij.sdk.intention</id>
 
   <!-- Text to display as name on Preferences/Settings | Plugin page -->
-  <name>SDK Conditional Operator Converter</name>
+  <name>SDK: Conditional Operator Converter</name>
 
   <!-- The version of this plugin -->
   <version>2.0.0</version>
diff --git a/editor_basics/src/main/resources/META-INF/plugin.xml b/editor_basics/src/main/resources/META-INF/plugin.xml
index a24a55bc1..b5aaee1cb 100644
--- a/editor_basics/src/main/resources/META-INF/plugin.xml
+++ b/editor_basics/src/main/resources/META-INF/plugin.xml
@@ -5,7 +5,7 @@
   <!--  Unique id for this plugin. Must stay constant for the life of the plugin.  -->
   <id>org.intellij.sdk.editor</id>
 
-  <!-- Text to display as name on Preferences/Settings | Plugin page  -->
+  <!-- Text to display as name on Preferences/Settings | Plugin page -->
   <name>SDK: Editor Sample Project</name>
 
   <!-- The version of this plugin -->
@@ -65,4 +65,4 @@
     <typedHandler implementation="org.intellij.sdk.editor.MyTypedHandler"/>
   </extensions>
 
-</idea-plugin>
\ No newline at end of file
+</idea-plugin>
diff --git a/facet_basics/src/main/resources/META-INF/plugin.xml b/facet_basics/src/main/resources/META-INF/plugin.xml
index f4886e7f4..3f8a1d726 100644
--- a/facet_basics/src/main/resources/META-INF/plugin.xml
+++ b/facet_basics/src/main/resources/META-INF/plugin.xml
@@ -8,6 +8,15 @@
   <!-- Text to display as name on Preferences/Settings | Plugin page -->
   <name>SDK: Facet Basics</name>
 
+  <!-- The version of this plugin -->
+  <version>2.1</version>
+
+  <!-- Compatible with the following versions of IntelliJ Platform -->
+  <idea-version since-build="191"/>
+
+  <!-- Product and plugin compatibility requirements -->
+  <depends>com.intellij.modules.lang</depends>
+
   <!-- Text to display as description on Preferences/Settings | Plugin page  -->
   <description>
     <![CDATA[
@@ -25,18 +34,9 @@
   <!-- Text to display as company information on Preferences/Settings | Plugin page -->
   <vendor url="https://plugins.jetbrains.com">IntelliJ Platform SDK</vendor>
 
-  <!-- The version of this plugin -->
-  <version>2.1</version>
-
-  <!-- Compatible with the following versions of IntelliJ Platform -->
-  <idea-version since-build="191"/>
-
-  <!-- Product and plugin compatibility requirements -->
-  <depends>com.intellij.modules.lang</depends>
-
   <extensions defaultExtensionNs="com.intellij">
     <!-- Register the custom facet extension -->
     <facetType implementation="org.intellij.sdk.facet.DemoFacetType"/>
   </extensions>
 
-</idea-plugin>
\ No newline at end of file
+</idea-plugin>
diff --git a/framework_basics/src/main/resources/META-INF/plugin.xml b/framework_basics/src/main/resources/META-INF/plugin.xml
index 41b0b1c43..e054971d2 100644
--- a/framework_basics/src/main/resources/META-INF/plugin.xml
+++ b/framework_basics/src/main/resources/META-INF/plugin.xml
@@ -40,4 +40,4 @@
     <framework.type implementation="org.intellij.sdk.framework.DemoFramework"/>
   </extensions>
 
-</idea-plugin>
\ No newline at end of file
+</idea-plugin>
diff --git a/inspection_basics/src/main/resources/META-INF/plugin.xml b/inspection_basics/src/main/resources/META-INF/plugin.xml
index a1b05f262..744815c9f 100644
--- a/inspection_basics/src/main/resources/META-INF/plugin.xml
+++ b/inspection_basics/src/main/resources/META-INF/plugin.xml
@@ -1,9 +1,11 @@
 <!-- Copyright 2000-2020 JetBrains s.r.o. and other contributors. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file. -->
 
 <idea-plugin>
+
   <!--  Unique id for this plugin. Must stay constant for the life of the plugin.  -->
   <id>org.intellij.sdk.inspection</id>
 
+  <!-- Text to display as name on Preferences/Settings | Plugin page -->
   <name>SDK: Inspection Sample Project</name>
 
   <!-- The version of this plugin -->
@@ -19,7 +21,7 @@
   <description>
     <![CDATA[
         Basic example of working with code inspections. Adds entry to <b>Preferences | Editor | Inspections | SDK | Example Tools</b>.
-      ]]>
+    ]]>
   </description>
   <change-notes>
     <![CDATA[
@@ -31,7 +33,7 @@
     ]]>
   </change-notes>
 
-   <!-- Text to display as company information on Preferences/Settings | Plugin page -->
+  <!-- Text to display as company information on Preferences/Settings | Plugin page -->
   <vendor url="https://plugins.jetbrains.com">IntelliJ Platform SDK</vendor>
 
   <extensions defaultExtensionNs="com.intellij">
@@ -64,4 +66,4 @@
             level="WARNING"
             implementationClass="org.intellij.sdk.inspection.DemoCodeInspection"/>
   </extensions>
-</idea-plugin>
\ No newline at end of file
+</idea-plugin>
diff --git a/kotlin_demo/src/main/resources/META-INF/plugin.xml b/kotlin_demo/src/main/resources/META-INF/plugin.xml
index fbba78eb9..d302b7710 100644
--- a/kotlin_demo/src/main/resources/META-INF/plugin.xml
+++ b/kotlin_demo/src/main/resources/META-INF/plugin.xml
@@ -1,30 +1,28 @@
 <!-- Copyright 2000-2020 JetBrains s.r.o. and other contributors. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file. -->
+
 <idea-plugin>
 
-  <!-- Unique identifier of the plugin. Cannot be changed between the plugin versions. -->
+  <!--  Unique id for this plugin. Must stay constant for the life of the plugin.  -->
   <id>org.intellij.sdk.kotlin</id>
 
-  <!-- Plugin name -->
+  <!-- Text to display as name on Preferences/Settings | Plugin page -->
   <name>SDK: Kotlin Demo</name>
 
-  <!-- Plugin version, in MAJOR.MINOR.FIX format -->
+  <!-- The version of this plugin -->
   <version>2.0.0</version>
 
   <!-- Minimum and maximum build numbers of IDEA compatible with the plugin. -->
   <idea-version since-build="191.0"/>
 
-  <!-- Product and plugin compatibility requirements - uses action system and kotlin -->
+  <!-- Indicate this plugin can be loaded in all IntelliJ Platform-based products. -->
   <depends>com.intellij.modules.platform</depends>
 
-  <!-- Description of the plugin. Displayed in the "Plugins" settings dialog and in the
-         plugin repository Web interface. -->
+  <!-- Text to display as description on Preferences/Settings | Plugin page  -->
   <description>
     <![CDATA[
     Adds a <i>Greeting</i> menu group anchored last in the <b>Main Menu</b>
     ]]>
   </description>
-
-  <!-- Description of changes in each version of the plugin. -->
   <change-notes>
     <![CDATA[
       <ul>
@@ -34,10 +32,7 @@
     ]]>
   </change-notes>
 
-  <!-- The vendor of the plugin.
-         The optional "url" attribute specifies the URL of the vendor homepage.
-         The optional "email" attribute specifies the e-mail address of the vendor.
-  -->
+  <!-- Text to display as company information on Preferences/Settings | Plugin page -->
   <vendor url="https://plugins.jetbrains.com">IntelliJ Platform SDK</vendor>
 
   <actions>
diff --git a/live_templates/src/main/resources/META-INF/plugin.xml b/live_templates/src/main/resources/META-INF/plugin.xml
index 6d3e0fbbb..d3769be5a 100644
--- a/live_templates/src/main/resources/META-INF/plugin.xml
+++ b/live_templates/src/main/resources/META-INF/plugin.xml
@@ -5,9 +5,16 @@
   <!--  Unique id for this plugin. Must stay constant for the life of the plugin.  -->
   <id>org.intellij.sdk.liveTemplates</id>
 
-  <!-- Text to display as name on Preferences/Settings | Plugin page  -->
+  <!-- Text to display as name on Preferences/Settings | Plugin page -->
   <name>SDK: Live Templates Sample Project</name>
 
+  <!-- The version of this plugin -->
+  <version>2.0.0</version>
+
+  <!-- Compatible with the following versions of IntelliJ Platform:
+        version 2018.3 (build #183) and newer. -->
+  <idea-version since-build="191"/>
+
   <!-- Product and plugin compatibility requirements -->
   <depends>com.intellij.modules.lang</depends>
 
@@ -36,4 +43,4 @@
     <liveTemplateMacro implementation="org.intellij.sdk.liveTemplates.TitleCaseMacro"/>
   </extensions>
 
-</idea-plugin>
\ No newline at end of file
+</idea-plugin>
diff --git a/max_opened_projects/src/main/resources/META-INF/plugin.xml b/max_opened_projects/src/main/resources/META-INF/plugin.xml
index 3de5f48f9..337be6deb 100644
--- a/max_opened_projects/src/main/resources/META-INF/plugin.xml
+++ b/max_opened_projects/src/main/resources/META-INF/plugin.xml
@@ -42,4 +42,4 @@
   <extensions defaultExtensionNs="com.intellij">
     <applicationService serviceImplementation="org.intellij.sdk.maxOpenProjects.ProjectCountingService"/>
   </extensions>
-</idea-plugin>
\ No newline at end of file
+</idea-plugin>
diff --git a/module/src/main/resources/META-INF/plugin.xml b/module/src/main/resources/META-INF/plugin.xml
index 7a2103a96..ccdd32e98 100644
--- a/module/src/main/resources/META-INF/plugin.xml
+++ b/module/src/main/resources/META-INF/plugin.xml
@@ -39,4 +39,4 @@
     <moduleType id="DEMO_MODULE_TYPE" implementationClass="org.intellij.sdk.module.DemoModuleType"/>
   </extensions>
 
-</idea-plugin>
\ No newline at end of file
+</idea-plugin>
diff --git a/product_specific/pycharm_basics/src/main/resources/META-INF/plugin.xml b/product_specific/pycharm_basics/src/main/resources/META-INF/plugin.xml
index d9f99bfba..6ac37d9c3 100644
--- a/product_specific/pycharm_basics/src/main/resources/META-INF/plugin.xml
+++ b/product_specific/pycharm_basics/src/main/resources/META-INF/plugin.xml
@@ -43,4 +43,4 @@
     </group>
   </actions>
 
-</idea-plugin>
\ No newline at end of file
+</idea-plugin>
diff --git a/project_model/src/main/resources/META-INF/plugin.xml b/project_model/src/main/resources/META-INF/plugin.xml
index dd3e1c3d0..60d25fbb5 100644
--- a/project_model/src/main/resources/META-INF/plugin.xml
+++ b/project_model/src/main/resources/META-INF/plugin.xml
@@ -68,4 +68,5 @@
       <add-to-group group-id="EditorPopupMenu" anchor="last"/>
     </action>
   </actions>
-</idea-plugin>
\ No newline at end of file
+
+</idea-plugin>
diff --git a/project_view_pane/src/main/resources/META-INF/plugin.xml b/project_view_pane/src/main/resources/META-INF/plugin.xml
index a2f3ffe4d..c9b657cea 100644
--- a/project_view_pane/src/main/resources/META-INF/plugin.xml
+++ b/project_view_pane/src/main/resources/META-INF/plugin.xml
@@ -1,6 +1,6 @@
 <!-- Copyright 2000-2020 JetBrains s.r.o. and other contributors. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file. -->
 
-<idea-plugin url="www.jetbrains.com">
+<idea-plugin>
 
   <!--  Unique id for this plugin. Must stay constant for the life of the plugin.  -->
   <id>org.jetbrains.plugins.sample.ProjectViewPane</id>
@@ -39,4 +39,4 @@
     <projectViewPane implementation="org.intellij.sdk.view.pane.ImagesProjectViewPane"/>
   </extensions>
 
-</idea-plugin>
\ No newline at end of file
+</idea-plugin>
diff --git a/project_wizard/src/main/resources/META-INF/plugin.xml b/project_wizard/src/main/resources/META-INF/plugin.xml
index 1177ec3b1..e9c5b50fd 100644
--- a/project_wizard/src/main/resources/META-INF/plugin.xml
+++ b/project_wizard/src/main/resources/META-INF/plugin.xml
@@ -5,7 +5,7 @@
   <!--  Unique id for this plugin. Must stay constant for the life of the plugin.  -->
   <id>org.jetbrains.tutorials.ProjectWizard</id>
 
-  <!-- Text to display as name on Preferences/Settings | Plugin page  -->
+  <!-- Text to display as name on Preferences/Settings | Plugin page -->
   <name>SDK: Project Wizard Demo</name>
 
   <!-- The version of this plugin -->
@@ -41,4 +41,4 @@
                    order="first"/>
   </extensions>
 
-</idea-plugin>
\ No newline at end of file
+</idea-plugin>
diff --git a/psi_demo/src/main/java/org/jetbrains/sdk/psi/PsiNavigationDemoAction.java b/psi_demo/src/main/java/org/intellij/sdk/psi/PsiNavigationDemoAction.java
similarity index 98%
rename from psi_demo/src/main/java/org/jetbrains/sdk/psi/PsiNavigationDemoAction.java
rename to psi_demo/src/main/java/org/intellij/sdk/psi/PsiNavigationDemoAction.java
index 35810b803..26149ba77 100644
--- a/psi_demo/src/main/java/org/jetbrains/sdk/psi/PsiNavigationDemoAction.java
+++ b/psi_demo/src/main/java/org/intellij/sdk/psi/PsiNavigationDemoAction.java
@@ -1,6 +1,6 @@
 // Copyright 2000-2020 JetBrains s.r.o. and other contributors. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
 
-package org.jetbrains.sdk.psi;
+package org.intellij.sdk.psi;
 
 import com.intellij.openapi.actionSystem.AnAction;
 import com.intellij.openapi.actionSystem.AnActionEvent;
diff --git a/psi_demo/src/main/resources/META-INF/plugin.xml b/psi_demo/src/main/resources/META-INF/plugin.xml
index a140c9993..8df548edc 100644
--- a/psi_demo/src/main/resources/META-INF/plugin.xml
+++ b/psi_demo/src/main/resources/META-INF/plugin.xml
@@ -36,7 +36,7 @@
   <vendor url="https://plugins.jetbrains.com">IntelliJ Platform SDK</vendor>
 
   <actions>
-    <action class="org.jetbrains.sdk.psi.PsiNavigationDemoAction" id="PsiNavigationDemo"
+    <action class="org.intellij.sdk.psi.PsiNavigationDemoAction" id="PsiNavigationDemo"
             text="PSI Navigation Demo...">
       <add-to-group group-id="ToolsMenu" anchor="last"/>
     </action>
diff --git a/run_configuration/src/main/resources/META-INF/plugin.xml b/run_configuration/src/main/resources/META-INF/plugin.xml
index be214f851..258c8e2f4 100644
--- a/run_configuration/src/main/resources/META-INF/plugin.xml
+++ b/run_configuration/src/main/resources/META-INF/plugin.xml
@@ -6,7 +6,7 @@
   <id>org.intellij.sdk.runConfiguration</id>
 
   <!-- Text to display as name on Preferences/Settings | Plugin page  -->
-  <name>Run Configuration Demo</name>
+  <name>SDK: Run Configuration Demo</name>
 
   <!-- The version of this plugin -->
   <version>2.0.0</version>
diff --git a/theme_basics/resources/META-INF/plugin.xml b/theme_basics/resources/META-INF/plugin.xml
index 01e84b578..a64a92f0b 100644
--- a/theme_basics/resources/META-INF/plugin.xml
+++ b/theme_basics/resources/META-INF/plugin.xml
@@ -1,34 +1,42 @@
 <!-- Copyright 2000-2020 JetBrains s.r.o. and other contributors. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file. -->
 
 <idea-plugin>
-  <id>com.jetbrains.sdk.themeBasics</id>
-  <name>SDK Theme Basics</name>
+
+  <!--  Unique id for this plugin. Must stay constant for the life of the plugin.  -->
+  <id>org.intellij.sdk..themeBasics</id>
+
+  <!-- Text to display as name on Preferences/Settings | Plugin page -->
+  <name>SDK: Theme Basics</name>
+
+  <!-- The version of this plugin -->
   <version>0.1</version>
-  <vendor email="support-email@company.com" url="https://blog.jetbrains.com/platform/">JetBrains Plugin Platform SDK</vendor>
 
-  <description><![CDATA[
-      IntelliJ Platform SDK code sample to illustrate creating <em>UI Themes</em>.
-    ]]></description>
-
-  <change-notes><![CDATA[
-      <ul>
-      <li>0.1   Initial release. Basic theme functionality.</li>
-      </ul>
-    ]]></change-notes>
-
-  <!-- please see http://www.jetbrains.org/intellij/sdk/docs/basics/getting_started/build_number_ranges.html for description -->
+  <!-- Compatible with the following versions of IntelliJ Platform:
+        version 2018.3 (build #183) and newer. -->
   <idea-version since-build="191"/>
 
-  <!-- Product and plugin compatibility requirements -->
+  <!-- Indicate this plugin can be loaded in all IntelliJ Platform-based products. -->
   <depends>com.intellij.modules.platform</depends>
 
+  <description>
+    <![CDATA[
+      IntelliJ Platform SDK code sample to illustrate creating <em>UI Themes</em>.
+    ]]>
+  </description>
+  <change-notes>
+    <![CDATA[
+      <ul>
+        <li><b>0.1</b> Initial release. Basic theme functionality.</li>
+      </ul>
+    ]]>
+  </change-notes>
+
+  <!-- Text to display as company information on Preferences/Settings | Plugin page -->
+  <vendor url="https://plugins.jetbrains.com">IntelliJ Platform SDK</vendor>
+
   <extensions defaultExtensionNs="com.intellij">
     <!-- Add your extensions here -->
     <themeProvider id="eb9b7461-397b-4b98-a422-224fc0a74564" path="/theme_basics.theme.json"/>
   </extensions>
 
-  <actions>
-    <!-- Add your actions here -->
-  </actions>
-
-</idea-plugin>
\ No newline at end of file
+</idea-plugin>
diff --git a/tool_window/src/main/resources/META-INF/plugin.xml b/tool_window/src/main/resources/META-INF/plugin.xml
index 69e894045..bc1d03ab6 100644
--- a/tool_window/src/main/resources/META-INF/plugin.xml
+++ b/tool_window/src/main/resources/META-INF/plugin.xml
@@ -14,7 +14,7 @@
   <!-- Compatible with the following versions of IntelliJ Platform -->
   <idea-version since-build="193.3"/>
 
-  <!-- Product and plugin compatibility requirements -->
+  <!-- Indicate this plugin can be loaded in all IntelliJ Platform-based products. -->
   <depends>com.intellij.modules.platform</depends>
 
   <!-- Text to display as description on Preferences/Settings | Plugin page  -->
diff --git a/tree_structure_provider/src/main/resources/META-INF/plugin.xml b/tree_structure_provider/src/main/resources/META-INF/plugin.xml
index 14c1374f1..fb92ddf7d 100644
--- a/tree_structure_provider/src/main/resources/META-INF/plugin.xml
+++ b/tree_structure_provider/src/main/resources/META-INF/plugin.xml
@@ -14,7 +14,7 @@
   <!-- Compatible with the following versions of IntelliJ Platform -->
   <idea-version since-build="193.3"/>
 
-  <!-- Product and plugin compatibility requirements -->
+  <!-- Indicate this plugin can be loaded in all IntelliJ Platform-based products. -->
   <depends>com.intellij.modules.platform</depends>
 
   <!-- Text to display as description on Preferences/Settings | Plugin page  -->