diff --git a/docs/src/main/asciidoc/spring-cloud-connectors.adoc b/docs/src/main/asciidoc/spring-cloud-connectors.adoc
index 6e337cc..613a36f 100644
--- a/docs/src/main/asciidoc/spring-cloud-connectors.adoc
+++ b/docs/src/main/asciidoc/spring-cloud-connectors.adoc
@@ -121,7 +121,7 @@ Then follow the instructions in the <<Spring Service Connector>> documentation o
 
 === Non-Spring Applications
 
-The `spring-cloud-core` dependency is included by each cloud connector, so simply include the connectors for the platforms you want. Then follow the <<_spring_cloud_connectors_core,instructions on using the Spring Cloud Connectors API>>.
+The `spring-cloud-connectors-core` dependency is included by each cloud connector, so simply include the connectors for the platforms you want. Then follow the <<_spring_cloud_connectors_core,instructions on using the Spring Cloud Connectors API>>.
 
 == Spring Cloud Connectors Core
 
diff --git a/settings.gradle b/settings.gradle
index 1eca68b..9dbbe59 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -1,8 +1,9 @@
 rootProject.name = "spring-cloud"
 
-include "${rootProject.name}-core"
+include "${rootProject.name}-connectors-core"
 include "${rootProject.name}-cloudfoundry-connector"
 include "${rootProject.name}-spring-service-connector"
 include "${rootProject.name}-heroku-connector"
 include "${rootProject.name}-localconfig-connector"
 
+project(":${rootProject.name}-connectors-core").projectDir = file("${rootProject.name}-core")
diff --git a/spring-cloud-cloudfoundry-connector/build.gradle b/spring-cloud-cloudfoundry-connector/build.gradle
index 19e62f3..e11a248 100644
--- a/spring-cloud-cloudfoundry-connector/build.gradle
+++ b/spring-cloud-cloudfoundry-connector/build.gradle
@@ -1,4 +1,4 @@
-description = 'Spring-Cloud Cloud Foundry Connector'
+description = 'Spring Cloud Connectors Cloud Foundry Connector'
 
 buildscript {
 	repositories {
@@ -17,7 +17,7 @@ ext {
 }
 
 dependencies {
-	compile project(':spring-cloud-core')
+	compile project(':spring-cloud-connectors-core')
 	compile("com.fasterxml.jackson.core:jackson-core:$jacksonVersion")
 	compile("com.fasterxml.jackson.core:jackson-databind:$jacksonVersion")
 }
diff --git a/spring-cloud-core/build.gradle b/spring-cloud-core/build.gradle
index 32d8b2d..a61e2cb 100644
--- a/spring-cloud-core/build.gradle
+++ b/spring-cloud-core/build.gradle
@@ -1,4 +1,4 @@
-description = 'Spring-Cloud Core'
+description = 'Spring Cloud Connectors Core'
 
 configurations {
 	tests
@@ -7,18 +7,18 @@ configurations {
 
 task testJar(type: Jar) {
 	classifier = 'tests'
-	from sourceSets.test.output.classesDir
+	from sourceSets.test.output.classesDirs
 }
 
 testJar.dependsOn testClasses
 build.dependsOn testJar
 
 artifacts {
-    tests testJar
+	tests testJar
 }
 
-install { 
-    configuration = configurations.published 
+install {
+	configuration = configurations.published
 }
 
 tasks.findByPath("artifactoryPublish")?.publishConfigs ('published')
\ No newline at end of file
diff --git a/spring-cloud-heroku-connector/build.gradle b/spring-cloud-heroku-connector/build.gradle
index 03202c7..5f29839 100644
--- a/spring-cloud-heroku-connector/build.gradle
+++ b/spring-cloud-heroku-connector/build.gradle
@@ -1,5 +1,5 @@
-description = 'Spring-Cloud Heroku Connector'
+description = 'Spring Cloud Connectors Heroku Connector'
 
 dependencies {
-	compile project(':spring-cloud-core')
+	compile project(':spring-cloud-connectors-core')
 }
diff --git a/spring-cloud-localconfig-connector/build.gradle b/spring-cloud-localconfig-connector/build.gradle
index 93aa64b..c422aa8 100644
--- a/spring-cloud-localconfig-connector/build.gradle
+++ b/spring-cloud-localconfig-connector/build.gradle
@@ -1,6 +1,6 @@
-description = 'Spring Cloud local-configuration connector'
+description = 'Spring Cloud Connectors local-configuration Connector'
 
 dependencies {
-	compile project(':spring-cloud-core')
+	compile project(':spring-cloud-connectors-core')
 	compile 'org.apache.commons:commons-lang3:3.3.2'
 }
diff --git a/spring-cloud-spring-service-connector/build.gradle b/spring-cloud-spring-service-connector/build.gradle
index 9c7db84..ad86f53 100644
--- a/spring-cloud-spring-service-connector/build.gradle
+++ b/spring-cloud-spring-service-connector/build.gradle
@@ -1,4 +1,4 @@
-description = 'Service Connectors'
+description = 'Spring Cloud Connectors Spring Service Connectors'
 
 ext {
 	springVersion = "5.0.0.RELEASE"
@@ -27,8 +27,8 @@ ext {
 }
 
 dependencies {
-	testCompile project(path: ':spring-cloud-core', configuration: 'tests')
-	compile project(':spring-cloud-core')
+	testCompile project(path: ':spring-cloud-connectors-core', configuration: 'tests')
+	compile project(':spring-cloud-connectors-core')
 
 	compile("org.springframework:spring-context:$springVersion")