diff --git a/json/src/com/jetbrains/jsonSchema/extension/JsonLikePsiWalkerFactory.java b/json/src/com/jetbrains/jsonSchema/extension/JsonLikePsiWalkerFactory.java
index fa9d94ab8fc5..b2a94d763eb8 100644
--- a/json/src/com/jetbrains/jsonSchema/extension/JsonLikePsiWalkerFactory.java
+++ b/json/src/com/jetbrains/jsonSchema/extension/JsonLikePsiWalkerFactory.java
@@ -24,7 +24,7 @@ import org.jetbrains.annotations.NotNull;
  * @author Irina.Chernushina on 3/7/2017.
  */
 public interface JsonLikePsiWalkerFactory {
-  ExtensionPointName<JsonLikePsiWalkerFactory> EXTENSION_POINT_NAME = ExtensionPointName.create("Json.Like.Psi.Walker.Factory");
+  ExtensionPointName<JsonLikePsiWalkerFactory> EXTENSION_POINT_NAME = ExtensionPointName.create("com.intellij.json.Json.Like.Psi.Walker.Factory");
 
   boolean handles(@NotNull PsiElement element);
 
diff --git a/json/src/com/jetbrains/jsonSchema/extension/JsonSchemaEnabler.java b/json/src/com/jetbrains/jsonSchema/extension/JsonSchemaEnabler.java
index 9cf5bf36ee83..6504ad82c3ef 100644
--- a/json/src/com/jetbrains/jsonSchema/extension/JsonSchemaEnabler.java
+++ b/json/src/com/jetbrains/jsonSchema/extension/JsonSchemaEnabler.java
@@ -11,7 +11,7 @@ import com.intellij.openapi.vfs.VirtualFile;
  * This API is new in IntelliJ IDEA Platform 2018.2
  */
 public interface JsonSchemaEnabler {
-  ExtensionPointName<JsonSchemaEnabler> EXTENSION_POINT_NAME = ExtensionPointName.create("Json.Schema.Enabler");
+  ExtensionPointName<JsonSchemaEnabler> EXTENSION_POINT_NAME = ExtensionPointName.create("com.intellij.json.Json.Schema.Enabler");
 
   /**
    * This method should return true if JSON schema mechanism should become applicable to corresponding file.
diff --git a/json/src/com/jetbrains/jsonSchema/extension/JsonWidgetSuppressor.java b/json/src/com/jetbrains/jsonSchema/extension/JsonWidgetSuppressor.java
index e21331f7aee1..4ebac9cd8877 100644
--- a/json/src/com/jetbrains/jsonSchema/extension/JsonWidgetSuppressor.java
+++ b/json/src/com/jetbrains/jsonSchema/extension/JsonWidgetSuppressor.java
@@ -7,7 +7,7 @@ import com.intellij.openapi.vfs.VirtualFile;
 import org.jetbrains.annotations.NotNull;
 
 public interface JsonWidgetSuppressor {
-  ExtensionPointName<JsonWidgetSuppressor> EXTENSION_POINT_NAME = ExtensionPointName.create("Json.Widget.Suppressor");
+  ExtensionPointName<JsonWidgetSuppressor> EXTENSION_POINT_NAME = ExtensionPointName.create("com.intellij.json.Json.Widget.Suppressor");
 
   /**
    * Allows to suppress JSON widget for particular files
diff --git a/platform/platform-resources/src/META-INF/JsonPlugin.xml b/platform/platform-resources/src/META-INF/JsonPlugin.xml
index e0dc004a44e1..e35d71001b16 100644
--- a/platform/platform-resources/src/META-INF/JsonPlugin.xml
+++ b/platform/platform-resources/src/META-INF/JsonPlugin.xml
@@ -99,18 +99,18 @@
     <JsonSchema.ProviderFactory implementation="com.jetbrains.jsonSchema.extension.JsonSchemaProjectSelfProviderFactory"/>
   </extensions>
 
-  <extensions defaultExtensionNs="Json">
-    <Like.Psi.Walker.Factory implementation="com.intellij.json.json5.Json5PsiWalkerFactory"/>
-    <Schema.Enabler implementation="com.jetbrains.jsonSchema.impl.JsonSchemaInJsonFilesEnabler" />
+  <extensions defaultExtensionNs="com.intellij.json">
+    <Json.Like.Psi.Walker.Factory implementation="com.intellij.json.json5.Json5PsiWalkerFactory"/>
+    <Json.Schema.Enabler implementation="com.jetbrains.jsonSchema.impl.JsonSchemaInJsonFilesEnabler" />
   </extensions>
 
   <extensionPoints>
     <extensionPoint qualifiedName="com.intellij.json.jsonStandardComplianceProvider"
                     interface="com.intellij.json.codeinsight.JsonStandardComplianceProvider"/>
     <extensionPoint qualifiedName="JavaScript.JsonSchema.ProviderFactory" interface="com.jetbrains.jsonSchema.extension.JsonSchemaProviderFactory"/>
-    <extensionPoint qualifiedName="Json.Like.Psi.Walker.Factory" interface="com.jetbrains.jsonSchema.extension.JsonLikePsiWalkerFactory"/>
-    <extensionPoint qualifiedName="Json.Schema.Enabler" interface="com.jetbrains.jsonSchema.extension.JsonSchemaEnabler"/>
-    <extensionPoint qualifiedName="Json.Widget.Suppressor" interface="com.jetbrains.jsonSchema.extension.JsonWidgetSuppressor"/>
+    <extensionPoint qualifiedName="com.intellij.json.Json.Like.Psi.Walker.Factory" interface="com.jetbrains.jsonSchema.extension.JsonLikePsiWalkerFactory"/>
+    <extensionPoint qualifiedName="com.intellij.json.Json.Schema.Enabler" interface="com.jetbrains.jsonSchema.extension.JsonSchemaEnabler"/>
+    <extensionPoint qualifiedName="com.intellij.json.Json.Widget.Suppressor" interface="com.jetbrains.jsonSchema.extension.JsonWidgetSuppressor"/>
     <extensionPoint qualifiedName="com.intellij.json.jsonLiteralChecker" interface="com.intellij.json.codeinsight.JsonLiteralChecker"/>
     <extensionPoint qualifiedName="com.intellij.json.catalog.exclusion" interface="com.jetbrains.jsonSchema.remote.JsonSchemaCatalogExclusion"/>
   </extensionPoints>
diff --git a/plugins/yaml/resources/META-INF/plugin.xml b/plugins/yaml/resources/META-INF/plugin.xml
index fe7c509ea360..753bbe5f9ea2 100644
--- a/plugins/yaml/resources/META-INF/plugin.xml
+++ b/plugins/yaml/resources/META-INF/plugin.xml
@@ -72,9 +72,9 @@
                      implementationClass="org.jetbrains.yaml.schema.YamlJsonSchemaHighlightingInspection"/>
   </extensions>
 
-  <extensions defaultExtensionNs="Json">
-    <Like.Psi.Walker.Factory implementation="org.jetbrains.yaml.schema.YamlJsonLikePsiWalkerFactory"/>
-    <Schema.Enabler implementation="org.jetbrains.yaml.schema.YamlJsonEnabler" />
+  <extensions defaultExtensionNs="com.intellij.json">
+    <Json.Like.Psi.Walker.Factory implementation="org.jetbrains.yaml.schema.YamlJsonLikePsiWalkerFactory"/>
+    <Json.Schema.Enabler implementation="org.jetbrains.yaml.schema.YamlJsonEnabler" />
   </extensions>
 
   <extensions defaultExtensionNs="com.intellij.spellchecker">