diff --git a/.idea/libraries/cucumber_jvm.xml b/.idea/libraries/cucumber_core.xml
similarity index 90%
rename from .idea/libraries/cucumber_jvm.xml
rename to .idea/libraries/cucumber_core.xml
index ce5f19c44c58..6974c004732a 100644
--- a/.idea/libraries/cucumber_jvm.xml
+++ b/.idea/libraries/cucumber_core.xml
@@ -1,9 +1,9 @@
 <component name="libraryTable">
-  <library name="cucumber-jvm">
+  <library name="cucumber-core">
     <CLASSES>
-      <root url="jar://$PROJECT_DIR$/lib/cucumber-core-1.2.4.jar!/" />
-      <root url="jar://$PROJECT_DIR$/lib/cucumber-jvm-deps-1.0.3.jar!/" />
       <root url="jar://$PROJECT_DIR$/lib/gherkin-2.12.2.jar!/" />
+      <root url="jar://$PROJECT_DIR$/lib/cucumber-jvm-deps-1.0.3.jar!/" />
+      <root url="jar://$PROJECT_DIR$/lib/cucumber-core-1.2.4.jar!/" />
     </CLASSES>
     <JAVADOC />
     <SOURCES />
diff --git a/.idea/libraries/cucumber_java.xml b/.idea/libraries/cucumber_java.xml
index da3ae40aa4a5..ca0334a09801 100644
--- a/.idea/libraries/cucumber_java.xml
+++ b/.idea/libraries/cucumber_java.xml
@@ -1,9 +1,7 @@
 <component name="libraryTable">
   <library name="cucumber-java">
     <CLASSES>
-      <root url="jar://$PROJECT_DIR$/lib/cucumber-core-1.2.4.jar!/" />
       <root url="jar://$PROJECT_DIR$/lib/cucumber-java-1.2.4.jar!/" />
-      <root url="jar://$PROJECT_DIR$/lib/cucumber-java8-1.2.4.jar!/" />
     </CLASSES>
     <JAVADOC />
     <SOURCES />
diff --git a/build/cucumber-test-runner/cucumber-test-runner.iml b/build/cucumber-test-runner/cucumber-test-runner.iml
index fec4c99e596e..f38005088822 100644
--- a/build/cucumber-test-runner/cucumber-test-runner.iml
+++ b/build/cucumber-test-runner/cucumber-test-runner.iml
@@ -9,7 +9,7 @@
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="module" module-name="platform-api" />
     <orderEntry type="module" module-name="testFramework" />
-    <orderEntry type="library" name="cucumber-jvm" level="project" />
+    <orderEntry type="library" name="cucumber-core" level="project" />
     <orderEntry type="module" module-name="cucumber-jvm-formatter" scope="RUNTIME" />
     <orderEntry type="library" name="cucumber-java" level="project" />
   </component>
diff --git a/build/scripts/libLicenses.gant b/build/scripts/libLicenses.gant
index 2806c9c53f2a..1660907b6980 100644
--- a/build/scripts/libLicenses.gant
+++ b/build/scripts/libLicenses.gant
@@ -261,9 +261,9 @@ libraryLicense(name: "protobuf", version: "2.5.0", license: "New BSD", url: "htt
 libraryLicense(name: "Netty", libraryName: "Netty", version: "4.1.0.Beta3", license: "Apache 2.0", url: "http://netty.io", licenseUrl: "http://www.apache.org/licenses/LICENSE-2.0")
 libraryLicense(name: "Kryo", libraryName: "Kryo", version: "2.22", license: "New BSD License", url: "https://github.com/EsotericSoftware/kryo", licenseUrl: "https://github.com/EsotericSoftware/kryo/blob/master/license.txt")
 libraryLicense(name: "Snappy-Java", libraryName: "Snappy-Java", version: "0.3.1", license: "Apache 2.0", url: "https://github.com/dain/snappy", licenseUrl: "http://www.apache.org/licenses/LICENSE-2.0")
-libraryLicense(name: "Cucumber-Java", libraryName: "cucumber-java", version: "1.2.2", license: "MIT License", url: "https://github.com/cucumber/cucumber-jvm/", licenseUrl: "http://www.opensource.org/licenses/mit-license.html")
-libraryLicense(name: "Cucumber-JVM", libraryName: "cucumber-jvm", version: "1.2.2", license: "MIT License", url: "https://github.com/cucumber/cucumber-jvm/", licenseUrl: "http://www.opensource.org/licenses/mit-license.html")
-libraryLicense(name: "Cucumber-Groovy", libraryName: "cucumber-groovy", version: "1.2.2", license: "MIT License", url: "https://github.com/cucumber/cucumber-jvm/", licenseUrl: "http://www.opensource.org/licenses/mit-license.html")
+libraryLicense(name: "Cucumber-Java", libraryName: "cucumber-java", version: "1.2.4", license: "MIT License", url: "https://github.com/cucumber/cucumber-jvm/", licenseUrl: "http://www.opensource.org/licenses/mit-license.html")
+libraryLicense(name: "Cucumber-Core", libraryName: "cucumber-core", version: "1.2.4", license: "MIT License", url: "https://github.com/cucumber/cucumber-jvm/", licenseUrl: "http://www.opensource.org/licenses/mit-license.html")
+libraryLicense(name: "Cucumber-Groovy", libraryName: "cucumber-groovy", version: "1.2.4", license: "MIT License", url: "https://github.com/cucumber/cucumber-jvm/", licenseUrl: "http://www.opensource.org/licenses/mit-license.html")
 libraryLicense(name: "XStream", libraryName: "XStream", version: "1.4.2", license: "BSD License", url: "https://github.com/cucumber/cucumber-jvm-deps/", licenseUrl: "http://xstream.codehaus.org/license.html")
 libraryLicense(name: "Diffutils", libraryName: "Diffutils", version: "1.2.1", license: "The Apache Software License, Version 2.0", url: "http://www.apache.org/licenses/LICENSE-2.0", licenseUrl: "http://xstream.codehaus.org/license.html")
 libraryLicense(name: "proxy-vole", libraryName: "proxy-vole", version: "20131209", license: "New BSD License", url: "http://code.google.com/p/proxy-vole/", licenseUrl: "http://opensource.org/licenses/BSD-3-Clause")
diff --git a/plugins/cucumber-jvm-formatter/cucumber-jvm-formatter.iml b/plugins/cucumber-jvm-formatter/cucumber-jvm-formatter.iml
index e6fece368439..b432c44fb54f 100644
--- a/plugins/cucumber-jvm-formatter/cucumber-jvm-formatter.iml
+++ b/plugins/cucumber-jvm-formatter/cucumber-jvm-formatter.iml
@@ -7,7 +7,7 @@
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="library" name="cucumber-jvm" level="project" />
+    <orderEntry type="library" name="cucumber-core" level="project" />
     <orderEntry type="library" name="cucumber-java" level="project" />
   </component>
 </module>
\ No newline at end of file
diff --git a/plugins/git4idea/git4idea.iml b/plugins/git4idea/git4idea.iml
index c1bc9f22177a..eca33fc66784 100644
--- a/plugins/git4idea/git4idea.iml
+++ b/plugins/git4idea/git4idea.iml
@@ -50,8 +50,7 @@
     </orderEntry>
     <orderEntry type="library" scope="TEST" name="Groovy" level="project" />
     <orderEntry type="module" module-name="dvcs-impl" exported="" />
-    <orderEntry type="library" scope="TEST" name="cucumber-jvm" level="project" />
-    <orderEntry type="library" scope="TEST" name="cucumber-java" level="project" />
+    <orderEntry type="library" scope="TEST" name="cucumber-core" level="project" />
     <orderEntry type="library" name="JSch" level="project" />
     <orderEntry type="module" module-name="cucumber-test-runner" scope="TEST" />
     <orderEntry type="module" module-name="vcs-log-api" />
@@ -61,5 +60,6 @@
     <orderEntry type="module" module-name="built-in-server" scope="TEST" />
     <orderEntry type="module" module-name="built-in-server-api" />
     <orderEntry type="library" scope="TEST" name="mockito" level="project" />
+    <orderEntry type="library" scope="TEST" name="cucumber-java" level="project" />
   </component>
 </module>
\ No newline at end of file