diff --git a/.idea/libraries/Groovy.xml b/.idea/libraries/org_codehaus_groovy_groovy.xml
similarity index 86%
rename from .idea/libraries/Groovy.xml
rename to .idea/libraries/org_codehaus_groovy_groovy.xml
index fbb2499a57be..62e776cacc3f 100644
--- a/.idea/libraries/Groovy.xml
+++ b/.idea/libraries/org_codehaus_groovy_groovy.xml
@@ -1,5 +1,5 @@
 <component name="libraryTable">
-  <library name="Groovy" type="repository">
+  <library name="org.codehaus.groovy:groovy" type="repository">
     <properties maven-id="org.codehaus.groovy:groovy:2.4.17" />
     <CLASSES>
       <root url="jar://$MAVEN_REPOSITORY$/org/codehaus/groovy/groovy/2.4.17/groovy-2.4.17.jar!/" />
diff --git a/java/java-tests/intellij.java.tests.iml b/java/java-tests/intellij.java.tests.iml
index 26fab9e933b1..1f69a4579d0e 100644
--- a/java/java-tests/intellij.java.tests.iml
+++ b/java/java-tests/intellij.java.tests.iml
@@ -27,7 +27,7 @@
     <orderEntry type="module" module-name="intellij.java.compiler.impl" />
     <orderEntry type="library" name="ASM" level="project" />
     <orderEntry type="module" module-name="intellij.java.compiler.instrumentationUtil" />
-    <orderEntry type="library" name="Groovy" level="project" />
+    <orderEntry type="library" name="org.codehaus.groovy:groovy" level="project" />
     <orderEntry type="module" module-name="intellij.java.langInjection" scope="RUNTIME" />
     <orderEntry type="module" module-name="intellij.xml.langInjection" scope="RUNTIME" />
     <orderEntry type="module" module-name="intellij.junit" scope="TEST" />
diff --git a/jps/standalone-builder/intellij.tools.jps.build.standalone.iml b/jps/standalone-builder/intellij.tools.jps.build.standalone.iml
index bd9dfde44b24..4571d9c02b38 100644
--- a/jps/standalone-builder/intellij.tools.jps.build.standalone.iml
+++ b/jps/standalone-builder/intellij.tools.jps.build.standalone.iml
@@ -7,7 +7,7 @@
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="library" name="Groovy" level="project" />
+    <orderEntry type="library" name="org.codehaus.groovy:groovy" level="project" />
     <orderEntry type="module" module-name="intellij.platform.jps.build" exported="" />
     <orderEntry type="module" module-name="intellij.platform.jps.model" />
     <orderEntry type="library" name="cli-parser" level="project" />
diff --git a/platform/build-scripts/groovy/org/jetbrains/intellij/build/CommunityLibraryLicenses.groovy b/platform/build-scripts/groovy/org/jetbrains/intellij/build/CommunityLibraryLicenses.groovy
index edadea6a69d5..7c2a461afc83 100644
--- a/platform/build-scripts/groovy/org/jetbrains/intellij/build/CommunityLibraryLicenses.groovy
+++ b/platform/build-scripts/groovy/org/jetbrains/intellij/build/CommunityLibraryLicenses.groovy
@@ -238,7 +238,8 @@ class CommunityLibraryLicenses {
     new LibraryLicense(name: "Grazie Language Tool (English)", libraryName: "tanvd.grazi.languagetool:grazi-language-tool-en:4.7.10",
                        license: "LGPL 2.1",
                        licenseUrl: "http://www.gnu.org/licenses/lgpl-2.1.txt"),
-    new LibraryLicense(libraryName: "Groovy", license: "Apache 2.0", url: "https://groovy-lang.org/"),
+    new LibraryLicense(name: "Groovy", libraryName: "org.codehaus.groovy:groovy",
+                       license: "Apache 2.0", url: "https://groovy-lang.org/"),
     new LibraryLicense(name: "Groovy Ant", libraryName: "org.codehaus.groovy:groovy-ant",
                        license: "Apache 2.0", url: "https://groovy-lang.org/"),
     new LibraryLicense(name: "Groovy Doc", libraryName: "org.codehaus.groovy:groovy-groovydoc",
diff --git a/platform/external-system-impl/intellij.platform.externalSystem.impl.iml b/platform/external-system-impl/intellij.platform.externalSystem.impl.iml
index 3fd5b6adeecd..e8fc22071b51 100644
--- a/platform/external-system-impl/intellij.platform.externalSystem.impl.iml
+++ b/platform/external-system-impl/intellij.platform.externalSystem.impl.iml
@@ -14,7 +14,7 @@
     <orderEntry type="module" module-name="intellij.platform.lang.impl" />
     <orderEntry type="module" module-name="intellij.platform.execution.impl" />
     <orderEntry type="module" module-name="intellij.platform.vcs" />
-    <orderEntry type="library" name="Groovy" level="project" />
+    <orderEntry type="library" name="org.codehaus.groovy:groovy" level="project" />
     <orderEntry type="module" module-name="intellij.platform.testRunner" />
     <orderEntry type="module" module-name="intellij.platform.configurationStore.impl" />
     <orderEntry type="library" name="kotlin-reflect" level="project" />
diff --git a/platform/lang-impl/intellij.platform.lang.impl.iml b/platform/lang-impl/intellij.platform.lang.impl.iml
index 4eaff235d558..1c3b5d560a5f 100644
--- a/platform/lang-impl/intellij.platform.lang.impl.iml
+++ b/platform/lang-impl/intellij.platform.lang.impl.iml
@@ -29,7 +29,7 @@
     <orderEntry type="library" name="commons-logging" level="project" />
     <orderEntry type="module" module-name="intellij.platform.diff.impl" />
     <orderEntry type="module" module-name="intellij.platform.builtInServer" />
-    <orderEntry type="library" name="Groovy" level="project" />
+    <orderEntry type="library" name="org.codehaus.groovy:groovy" level="project" />
     <orderEntry type="library" name="XStream" level="project" />
     <orderEntry type="library" name="miglayout-swing" level="project" />
     <orderEntry type="library" name="jna" level="project" />
diff --git a/platform/lang-impl/intellij.platform.lang.tests.iml b/platform/lang-impl/intellij.platform.lang.tests.iml
index 5f7eb2ea9b59..4783de948598 100644
--- a/platform/lang-impl/intellij.platform.lang.tests.iml
+++ b/platform/lang-impl/intellij.platform.lang.tests.iml
@@ -18,7 +18,7 @@
     <orderEntry type="module" module-name="intellij.platform.indexing" />
     <orderEntry type="module" module-name="intellij.platform.indexing.impl" exported="" />
     <orderEntry type="module" module-name="intellij.platform.projectModel.impl" exported="" />
-    <orderEntry type="library" scope="TEST" name="Groovy" level="project" />
+    <orderEntry type="library" scope="TEST" name="org.codehaus.groovy:groovy" level="project" />
     <orderEntry type="library" name="swingx" level="project" />
     <orderEntry type="library" name="Guava" level="project" />
     <orderEntry type="library" name="gson" level="project" />
diff --git a/platform/platform-tests/intellij.platform.tests.iml b/platform/platform-tests/intellij.platform.tests.iml
index 45e08d1ae580..bb20572a8397 100644
--- a/platform/platform-tests/intellij.platform.tests.iml
+++ b/platform/platform-tests/intellij.platform.tests.iml
@@ -22,7 +22,7 @@
     <orderEntry type="module" module-name="intellij.spellchecker" />
     <orderEntry type="module" module-name="intellij.platform.debugger.impl" scope="RUNTIME" />
     <orderEntry type="module" module-name="intellij.xml" />
-    <orderEntry type="library" name="Groovy" level="project" />
+    <orderEntry type="library" name="org.codehaus.groovy:groovy" level="project" />
     <orderEntry type="library" name="http-client" level="project" />
     <orderEntry type="module" module-name="intellij.platform.jps.model.impl" scope="TEST" />
     <orderEntry type="library" name="gson" level="project" />
diff --git a/platform/structuralsearch/intellij.platform.structuralSearch.iml b/platform/structuralsearch/intellij.platform.structuralSearch.iml
index cf10784f152a..0370af656526 100644
--- a/platform/structuralsearch/intellij.platform.structuralSearch.iml
+++ b/platform/structuralsearch/intellij.platform.structuralSearch.iml
@@ -12,7 +12,7 @@
     <orderEntry type="library" name="JDOM" level="project" />
     <orderEntry type="library" name="Trove4j" level="project" />
     <orderEntry type="module" module-name="intellij.xml.impl" />
-    <orderEntry type="library" name="Groovy" level="project" />
+    <orderEntry type="library" name="org.codehaus.groovy:groovy" level="project" />
     <orderEntry type="module" module-name="intellij.platform.ide" />
     <orderEntry type="module" module-name="intellij.platform.lang" />
     <orderEntry type="module" module-name="intellij.java.psi" />
diff --git a/platform/structuralsearch/intellij.platform.structuralSearch.tests.iml b/platform/structuralsearch/intellij.platform.structuralSearch.tests.iml
index 6128db311b39..44fedcb1653d 100644
--- a/platform/structuralsearch/intellij.platform.structuralSearch.tests.iml
+++ b/platform/structuralsearch/intellij.platform.structuralSearch.tests.iml
@@ -7,7 +7,7 @@
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="library" name="Groovy" level="project" />
+    <orderEntry type="library" name="org.codehaus.groovy:groovy" level="project" />
     <orderEntry type="module" module-name="intellij.platform.structuralSearch" />
     <orderEntry type="module" module-name="intellij.java.testFramework" />
     <orderEntry type="module" module-name="intellij.xml.impl" />
diff --git a/platform/testFramework/intellij.platform.testFramework.iml b/platform/testFramework/intellij.platform.testFramework.iml
index 177fd7af6102..bf07fe76ec8a 100644
--- a/platform/testFramework/intellij.platform.testFramework.iml
+++ b/platform/testFramework/intellij.platform.testFramework.iml
@@ -18,7 +18,7 @@
     <orderEntry type="module" module-name="intellij.tools.testsBootstrap" />
     <orderEntry type="module" module-name="intellij.java.resources.en" scope="RUNTIME" />
     <orderEntry type="module" module-name="intellij.java.rt" exported="" />
-    <orderEntry type="library" exported="" name="Groovy" level="project" />
+    <orderEntry type="library" exported="" name="org.codehaus.groovy:groovy" level="project" />
     <orderEntry type="module" module-name="intellij.platform.resources" exported="" scope="RUNTIME" />
     <orderEntry type="module" module-name="intellij.xml.dom.impl" exported="" scope="RUNTIME" />
     <orderEntry type="module" module-name="intellij.platform.images" exported="" scope="RUNTIME" />
diff --git a/platform/util/testSrc/intellij.platform.util.tests.iml b/platform/util/testSrc/intellij.platform.util.tests.iml
index 7d5de0b5ac8f..766f3049b6a4 100644
--- a/platform/util/testSrc/intellij.platform.util.tests.iml
+++ b/platform/util/testSrc/intellij.platform.util.tests.iml
@@ -7,7 +7,7 @@
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="library" scope="TEST" name="Groovy" level="project" />
+    <orderEntry type="library" scope="TEST" name="org.codehaus.groovy:groovy" level="project" />
     <orderEntry type="module" module-name="intellij.platform.util" scope="TEST" />
     <orderEntry type="library" scope="TEST" name="JDOM" level="project" />
     <orderEntry type="library" scope="TEST" name="kotlin-stdlib-jdk8" level="project" />
diff --git a/plugins/gradle/intellij.gradle.common.iml b/plugins/gradle/intellij.gradle.common.iml
index 2172519d2031..55f2b28f9cd8 100644
--- a/plugins/gradle/intellij.gradle.common.iml
+++ b/plugins/gradle/intellij.gradle.common.iml
@@ -19,7 +19,7 @@
     <orderEntry type="module" module-name="intellij.platform.smRunner" exported="" />
     <orderEntry type="library" exported="" name="Slf4j" level="project" />
     <orderEntry type="library" exported="" name="Gradle" level="project" />
-    <orderEntry type="library" name="Groovy" level="project" />
+    <orderEntry type="library" name="org.codehaus.groovy:groovy" level="project" />
     <orderEntry type="library" name="gson" level="project" />
     <orderEntry type="module" module-name="intellij.platform.objectSerializer.annotations" />
     <orderEntry type="module" module-name="intellij.gradle.toolingLoaderRt" />
diff --git a/plugins/gradle/tooling-extension-api/intellij.gradle.toolingExtension.iml b/plugins/gradle/tooling-extension-api/intellij.gradle.toolingExtension.iml
index 250120d65816..79a26f50e3fe 100644
--- a/plugins/gradle/tooling-extension-api/intellij.gradle.toolingExtension.iml
+++ b/plugins/gradle/tooling-extension-api/intellij.gradle.toolingExtension.iml
@@ -14,7 +14,7 @@
     <orderEntry type="library" name="jetbrains-annotations-java5" level="project" />
     <orderEntry type="library" exported="" name="Slf4j" level="project" />
     <orderEntry type="library" exported="" name="Gradle" level="project" />
-    <orderEntry type="library" scope="PROVIDED" name="Groovy" level="project" />
+    <orderEntry type="library" scope="PROVIDED" name="org.codehaus.groovy:groovy" level="project" />
     <orderEntry type="library" scope="PROVIDED" name="org.codehaus.groovy:groovy-ant" level="project" />
   </component>
 </module>
\ No newline at end of file
diff --git a/plugins/gradle/tooling-extension-impl/intellij.gradle.toolingExtension.impl.iml b/plugins/gradle/tooling-extension-impl/intellij.gradle.toolingExtension.impl.iml
index 855c509d5440..849d54afb533 100644
--- a/plugins/gradle/tooling-extension-impl/intellij.gradle.toolingExtension.impl.iml
+++ b/plugins/gradle/tooling-extension-impl/intellij.gradle.toolingExtension.impl.iml
@@ -11,7 +11,7 @@
     <orderEntry type="module" module-name="intellij.platform.externalSystem.rt" />
     <orderEntry type="module" module-name="intellij.gradle.toolingExtension" />
     <orderEntry type="library" name="Gradle" level="project" />
-    <orderEntry type="library" name="Groovy" level="project" />
+    <orderEntry type="library" name="org.codehaus.groovy:groovy" level="project" />
     <orderEntry type="library" name="gson" level="project" />
     <orderEntry type="module" module-name="intellij.platform.objectSerializer.annotations" />
     <orderEntry type="library" name="Trove4j" level="project" />
diff --git a/plugins/groovy/groovy-psi/intellij.groovy.psi.iml b/plugins/groovy/groovy-psi/intellij.groovy.psi.iml
index 2f2874aae7ae..39479ac51824 100644
--- a/plugins/groovy/groovy-psi/intellij.groovy.psi.iml
+++ b/plugins/groovy/groovy-psi/intellij.groovy.psi.iml
@@ -9,7 +9,7 @@
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="library" exported="" name="Groovy" level="project" />
+    <orderEntry type="library" exported="" name="org.codehaus.groovy:groovy" level="project" />
     <orderEntry type="library" name="Guava" level="project" />
     <orderEntry type="module" module-name="intellij.java.testFramework" scope="TEST" />
     <orderEntry type="module" module-name="intellij.java" />
diff --git a/plugins/groovy/intellij.groovy.iml b/plugins/groovy/intellij.groovy.iml
index 75da5c22cfe3..6cbf9c9dbd94 100644
--- a/plugins/groovy/intellij.groovy.iml
+++ b/plugins/groovy/intellij.groovy.iml
@@ -20,7 +20,7 @@
     <orderEntry type="module" module-name="intellij.java.compiler" />
     <orderEntry type="module" module-name="intellij.java.execution" />
     <orderEntry type="module" module-name="intellij.java.ui" />
-    <orderEntry type="library" exported="" name="Groovy" level="project" />
+    <orderEntry type="library" exported="" name="org.codehaus.groovy:groovy" level="project" />
     <orderEntry type="module" module-name="intellij.java.impl" />
     <orderEntry type="module" module-name="intellij.copyright" />
     <orderEntry type="module" module-name="intellij.platform.langInjection" />
diff --git a/plugins/groovy/rt/intellij.groovy.rt.iml b/plugins/groovy/rt/intellij.groovy.rt.iml
index 27ce309ba8d0..e181ed9414e2 100644
--- a/plugins/groovy/rt/intellij.groovy.rt.iml
+++ b/plugins/groovy/rt/intellij.groovy.rt.iml
@@ -7,7 +7,7 @@
     </content>
     <orderEntry type="jdk" jdkName="IDEA jdk" jdkType="JavaSDK" />
     <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="library" exported="" name="Groovy" level="project" />
+    <orderEntry type="library" exported="" name="org.codehaus.groovy:groovy" level="project" />
     <orderEntry type="library" name="jetbrains-annotations-java5" level="project" />
     <orderEntry type="module" module-name="intellij.platform.util.classLoader" />
     <orderEntry type="module" module-name="intellij.groovy.constants.rt" />
diff --git a/python/build/dependencies/intellij.pycharm.community.build.dependencies.iml b/python/build/dependencies/intellij.pycharm.community.build.dependencies.iml
index 0a81ce4fb0dc..d8a4be276f3a 100644
--- a/python/build/dependencies/intellij.pycharm.community.build.dependencies.iml
+++ b/python/build/dependencies/intellij.pycharm.community.build.dependencies.iml
@@ -8,6 +8,6 @@
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="library" name="Groovy" level="project" />
+    <orderEntry type="library" name="org.codehaus.groovy:groovy" level="project" />
   </component>
 </module>
\ No newline at end of file
diff --git a/python/helpers/tests/intellij.python.helpers.tests.iml b/python/helpers/tests/intellij.python.helpers.tests.iml
index e04803a214ab..6db5f4e3baf6 100644
--- a/python/helpers/tests/intellij.python.helpers.tests.iml
+++ b/python/helpers/tests/intellij.python.helpers.tests.iml
@@ -12,6 +12,6 @@
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="module" module-name="intellij.python.helpers" scope="TEST" />
     <orderEntry type="library" scope="TEST" name="Ant" level="project" />
-    <orderEntry type="library" scope="TEST" name="Groovy" level="project" />
+    <orderEntry type="library" scope="TEST" name="org.codehaus.groovy:groovy" level="project" />
   </component>
 </module>
\ No newline at end of file
diff --git a/python/intellij.python.community.impl.iml b/python/intellij.python.community.impl.iml
index ee6795bd0e18..7cf9402d8a43 100644
--- a/python/intellij.python.community.impl.iml
+++ b/python/intellij.python.community.impl.iml
@@ -33,7 +33,7 @@
     <orderEntry type="library" name="netty-codec-http" level="project" />
     <orderEntry type="library" name="jsoup" level="project" />
     <orderEntry type="library" name="javax.annotation-api" level="project" />
-    <orderEntry type="library" scope="PROVIDED" name="Groovy" level="project" />
+    <orderEntry type="library" scope="PROVIDED" name="org.codehaus.groovy:groovy" level="project" />
     <orderEntry type="library" scope="PROVIDED" name="Ant" level="project" />
     <orderEntry type="module" module-name="intellij.python.psi.impl" exported="" />
     <orderEntry type="module" module-name="intellij.python.sdk" exported="" />
diff --git a/python/testSrc/intellij.python.community.tests.iml b/python/testSrc/intellij.python.community.tests.iml
index 466394b98823..54565464f639 100644
--- a/python/testSrc/intellij.python.community.tests.iml
+++ b/python/testSrc/intellij.python.community.tests.iml
@@ -13,7 +13,7 @@
     <orderEntry type="module" module-name="intellij.platform.debugger" scope="TEST" />
     <orderEntry type="library" name="Guava" level="project" />
     <orderEntry type="module" module-name="intellij.spellchecker" scope="TEST" />
-    <orderEntry type="library" name="Groovy" level="project" />
+    <orderEntry type="library" name="org.codehaus.groovy:groovy" level="project" />
     <orderEntry type="module" module-name="intellij.platform.debugger.impl" scope="TEST" />
     <orderEntry type="module" module-name="intellij.python.pydev" scope="TEST" />
     <orderEntry type="module" module-name="intellij.platform.smRunner" scope="TEST" />
diff --git a/xml/tests/intellij.xml.tests.iml b/xml/tests/intellij.xml.tests.iml
index 57a65e39b43f..2c56168fa43c 100644
--- a/xml/tests/intellij.xml.tests.iml
+++ b/xml/tests/intellij.xml.tests.iml
@@ -11,7 +11,7 @@
     <orderEntry type="module" module-name="intellij.xml.impl" />
     <orderEntry type="module" module-name="intellij.java.testFramework" />
     <orderEntry type="library" name="Xerces" level="project" />
-    <orderEntry type="library" scope="TEST" name="Groovy" level="project" />
+    <orderEntry type="library" scope="TEST" name="org.codehaus.groovy:groovy" level="project" />
     <orderEntry type="module" module-name="intellij.java.ui" scope="TEST" />
     <orderEntry type="module" module-name="intellij.java.impl" scope="TEST" />
     <orderEntry type="module" module-name="intellij.ant" scope="TEST" />