diff --git a/conditional_operator_intention/build.gradle b/conditional_operator_intention/build.gradle
index 644cd3b93..fba32a0da 100644
--- a/conditional_operator_intention/build.gradle
+++ b/conditional_operator_intention/build.gradle
@@ -27,7 +27,7 @@ test {
 // See https://github.com/JetBrains/gradle-intellij-plugin/
 intellij {
   version = '2020.2'
-  plugins = ['java']
+  plugins = ['com.intellij.java']
 }
 
 buildSearchableOptions {
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 516b989e4..e82f8b347 100644
--- a/conditional_operator_intention/src/main/resources/META-INF/plugin.xml
+++ b/conditional_operator_intention/src/main/resources/META-INF/plugin.xml
@@ -9,7 +9,7 @@
   <name>SDK: Conditional Operator Converter</name>
 
   <!-- Product and plugin compatibility requirements -->
-  <depends>com.intellij.modules.java</depends>
+  <depends>com.intellij.java</depends>
   <depends>com.intellij.modules.platform</depends>
 
   <!-- Text to display as description on Preferences/Settings | Plugin page -->
diff --git a/framework_basics/build.gradle b/framework_basics/build.gradle
index 58464ae6f..f79ea1763 100644
--- a/framework_basics/build.gradle
+++ b/framework_basics/build.gradle
@@ -17,7 +17,7 @@ repositories {
 // See https://github.com/JetBrains/gradle-intellij-plugin/
 intellij {
   version = '2020.2'
-  plugins = ['java']
+  plugins = ['com.intellij.java']
 }
 
 buildSearchableOptions {
diff --git a/framework_basics/src/main/resources/META-INF/plugin.xml b/framework_basics/src/main/resources/META-INF/plugin.xml
index 9680c92ef..7f06deafe 100644
--- a/framework_basics/src/main/resources/META-INF/plugin.xml
+++ b/framework_basics/src/main/resources/META-INF/plugin.xml
@@ -9,7 +9,7 @@
   <name>SDK: Framework Sample</name>
 
   <!-- Product and plugin compatibility requirements -->
-  <depends>com.intellij.modules.java</depends>
+  <depends>com.intellij.java</depends>
 
   <!-- Text to display as description on Preferences/Settings | Plugin page -->
   <description>
diff --git a/project_model/build.gradle b/project_model/build.gradle
index 58464ae6f..f79ea1763 100644
--- a/project_model/build.gradle
+++ b/project_model/build.gradle
@@ -17,7 +17,7 @@ repositories {
 // See https://github.com/JetBrains/gradle-intellij-plugin/
 intellij {
   version = '2020.2'
-  plugins = ['java']
+  plugins = ['com.intellij.java']
 }
 
 buildSearchableOptions {
diff --git a/project_model/src/main/resources/META-INF/plugin.xml b/project_model/src/main/resources/META-INF/plugin.xml
index 039c3d87e..140d8cfb8 100644
--- a/project_model/src/main/resources/META-INF/plugin.xml
+++ b/project_model/src/main/resources/META-INF/plugin.xml
@@ -9,7 +9,7 @@
   <name>SDK: Project Model Sample</name>
 
   <!-- Product and plugin compatibility requirements -->
-  <depends>com.intellij.modules.java</depends>
+  <depends>com.intellij.java</depends>
 
   <!-- Text to display as description on Preferences/Settings | Plugin page -->
   <description>
diff --git a/psi_demo/build.gradle b/psi_demo/build.gradle
index 58464ae6f..f79ea1763 100644
--- a/psi_demo/build.gradle
+++ b/psi_demo/build.gradle
@@ -17,7 +17,7 @@ repositories {
 // See https://github.com/JetBrains/gradle-intellij-plugin/
 intellij {
   version = '2020.2'
-  plugins = ['java']
+  plugins = ['com.intellij.java']
 }
 
 buildSearchableOptions {
diff --git a/psi_demo/src/main/resources/META-INF/plugin.xml b/psi_demo/src/main/resources/META-INF/plugin.xml
index 741deaffe..2ad9b291a 100644
--- a/psi_demo/src/main/resources/META-INF/plugin.xml
+++ b/psi_demo/src/main/resources/META-INF/plugin.xml
@@ -9,7 +9,7 @@
   <name>SDK: PSI Demo</name>
 
   <!-- Product and plugin compatibility requirements -->
-  <depends>com.intellij.modules.java</depends>
+  <depends>com.intellij.java</depends>
 
   <!-- Text to display as description on Preferences/Settings | Plugin page -->
   <description>
diff --git a/simple_language_plugin/build.gradle b/simple_language_plugin/build.gradle
index 8444b3251..a7ecd23dd 100644
--- a/simple_language_plugin/build.gradle
+++ b/simple_language_plugin/build.gradle
@@ -33,7 +33,7 @@ dependencies {
 // See https://github.com/JetBrains/gradle-intellij-plugin/
 intellij {
   version = '2020.2'
-  plugins = ['java']
+  plugins = ['com.intellij.java']
 }
 
 buildSearchableOptions {
diff --git a/simple_language_plugin/src/main/resources/META-INF/plugin.xml b/simple_language_plugin/src/main/resources/META-INF/plugin.xml
index 1c372dfdb..dbdca421f 100644
--- a/simple_language_plugin/src/main/resources/META-INF/plugin.xml
+++ b/simple_language_plugin/src/main/resources/META-INF/plugin.xml
@@ -10,7 +10,7 @@
 
   <!-- Product and plugin compatibility requirements -->
   <depends>com.intellij.modules.platform</depends>
-  <depends>com.intellij.modules.java</depends>
+  <depends>com.intellij.java</depends>
 
   <!-- Text to display as description on Preferences/Settings | Plugin page -->
   <description>