diff --git a/comparing_references_inspection/resources/META-INF/plugin.xml b/comparing_references_inspection/resources/META-INF/plugin.xml
index 8b98734f3..6823355cb 100644
--- a/comparing_references_inspection/resources/META-INF/plugin.xml
+++ b/comparing_references_inspection/resources/META-INF/plugin.xml
@@ -29,7 +29,7 @@
   </change-notes>
 
   <!-- Text to display as company information on Preferences/Settings | Plugin page -->
-  <vendor email="sdk-example@jetbrains.com" url="https://plugins.jetbrains.com">IntelliJ Platform SDK</vendor>
+  <vendor email="faux-email@jetbrains.com" url="https://plugins.jetbrains.com">IntelliJ Platform SDK</vendor>
 
   <extensions defaultExtensionNs="com.intellij">
 
@@ -40,9 +40,8 @@
               @see intellij.platform.resources.LangExtensionPoints
               @see com.intellij.codeInspection.InspectionProfileEntry
           Attributes:
-            language= Defines the type of file (in this case java source) for this inspection. Not localized
-            shortName= The default name for the inspection, e.g. the default
-                for name for the description file "ComparingReferences.html". Not localized.
+            language= Language ID
+            shortName= Not specified, will be computed by the underlying implementation classes.
             displayName= The string to be shown in the Preferences | Editor | Inspections panel
                 The displayName gets registered to identify this inspection.
                 Can be localized using key= and bundle= attributes instead.
@@ -55,10 +54,9 @@
             enabledByDefault= Inspection state when Inspections panel is created.
             level= The default level of error found by this inspection, e.g. INFO, ERROR, etc.
                 @see com.intellij.codeHighlighting.HighlightDisplayLevel
-            inplementationClass= package.className of implementation
+            inplementationClass= FQN of inspection implementation
            -->
     <localInspection language="JAVA"
-            shortName="ComparingReferences"
             displayName="SDK: '==' or '!=' used instead of 'equals()'"
             groupPath="Java"
             groupBundle="messages.InspectionsBundle"
diff --git a/comparing_references_inspection/source/com/intellij/codeInspection/ComparingReferencesProvider.java b/comparing_references_inspection/source/com/intellij/codeInspection/ComparingReferencesProvider.java
deleted file mode 100644
index 6553f9857..000000000
--- a/comparing_references_inspection/source/com/intellij/codeInspection/ComparingReferencesProvider.java
+++ /dev/null
@@ -1,12 +0,0 @@
-package com.intellij.codeInspection;
-
-/**
- * This class provides a list of inspections (classes) for this plugin.
- * Each inspection class should have a corresponding entry in plugin.xml
- * @author max
- */
-public class ComparingReferencesProvider implements InspectionToolProvider {
-  public Class[] getInspectionClasses() {
-    return new Class[]{ComparingReferencesInspection.class};
-  }
-}
diff --git a/conditional_operator_intention/resources/META-INF/plugin.xml b/conditional_operator_intention/resources/META-INF/plugin.xml
index 532489fcd..bc2b465b8 100644
--- a/conditional_operator_intention/resources/META-INF/plugin.xml
+++ b/conditional_operator_intention/resources/META-INF/plugin.xml
@@ -29,7 +29,7 @@
   </change-notes>
 
   <!-- Text to display as company information on Preferences/Settings | Plugin page -->
-  <vendor email="sdk-example@jetbrains.com" url="https://plugins.jetbrains.com">IntelliJ Platform SDK</vendor>
+  <vendor email="faux-email@jetbrains.com" url="https://plugins.jetbrains.com">IntelliJ Platform SDK</vendor>
 
   <extensions defaultExtensionNs="com.intellij">
     <intentionAction>
diff --git a/inspection/resources/META-INF/plugin.xml b/inspection/resources/META-INF/plugin.xml
index c52688c36..42d4becf3 100644
--- a/inspection/resources/META-INF/plugin.xml
+++ b/inspection/resources/META-INF/plugin.xml
@@ -29,7 +29,7 @@
   </change-notes>
 
   <!-- Text to display as company information on Preferences/Settings | Plugin page -->
-  <vendor email="sdk-example@jetbrains.com" url="https://plugins.jetbrains.com">IntelliJ Platform SDK</vendor>
+  <vendor email="faux-email@jetbrains.com" url="https://plugins.jetbrains.com">IntelliJ Platform SDK</vendor>
 
   <extensions defaultExtensionNs="com.intellij">
 
@@ -40,9 +40,8 @@
                @see intellij.platform.resources.LangExtensionPoints
                @see com.intellij.codeInspection.InspectionProfileEntry
            Attributes:
-             language= Defines the type of file (in this case java source) for this inspection. Not localized
-             shortName= The default name for the inspection, e.g. the default
-                 for name for the description file "DemoCode.html". Not localized.
+             language= Language ID
+             shortName= Not specified, will be computed by the underlying implementation classes.
              displayName= The string to be shown in the Preferences | Editor | Inspections panel
                  The displayName gets registered to identify this inspection.
                  Can be localized using key= and bundle= attributes instead.
@@ -52,10 +51,9 @@
              enabledByDefault= Inspection state when Inspections panel is created.
              level= The default level of error found by this inspection, e.g. INFO, ERROR, etc.
                  @see com.intellij.codeHighlighting.HighlightDisplayLevel
-             inplementationClass= package.className of inspection implementation
+             inplementationClass= FQN of inspection implementation
             -->
     <localInspection language="JAVA"
-            shortName="DemoCode"
             displayName="Demo Inspection"
             groupName="Example Inspections"
             groupPath="SDK"
diff --git a/inspection/src/com/intellij/tutorials/inspection/DemoInspectionToolProvider.java b/inspection/src/com/intellij/tutorials/inspection/DemoInspectionToolProvider.java
deleted file mode 100644
index 67d57a7c8..000000000
--- a/inspection/src/com/intellij/tutorials/inspection/DemoInspectionToolProvider.java
+++ /dev/null
@@ -1,14 +0,0 @@
-// Copyright 2000-2019 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
-
-package com.intellij.tutorials.inspection;
-
-import com.intellij.codeInspection.InspectionToolProvider;
-
-/**
- * @author Anna Bulenkova
- */
-public class DemoInspectionToolProvider implements InspectionToolProvider {
-  public Class[] getInspectionClasses() {
-    return new Class[]{DemoCodeInspection.class};
-  }
-}