diff --git a/settings.gradle b/settings.gradle
index 59143b4..c22faa4 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -2,6 +2,5 @@ rootProject.name = "spring-cloud"
 
 include "${rootProject.name}-core"
 include "${rootProject.name}-cloudfoundry-connector"
-include "${rootProject.name}-cloudfoundry-ups-connector"
 include "${rootProject.name}-spring-service-connector"
 include "${rootProject.name}-heroku-connector"
\ No newline at end of file
diff --git a/spring-cloud-cloudfoundry-ups-connector/src/main/java/org/springframework/cloud/cloudfoundry/UserProvidedOracleServiceInfoCreator.java b/spring-cloud-cloudfoundry-connector/src/main/java/org/springframework/cloud/cloudfoundry/OracleServiceInfoCreator.java
similarity index 63%
rename from spring-cloud-cloudfoundry-ups-connector/src/main/java/org/springframework/cloud/cloudfoundry/UserProvidedOracleServiceInfoCreator.java
rename to spring-cloud-cloudfoundry-connector/src/main/java/org/springframework/cloud/cloudfoundry/OracleServiceInfoCreator.java
index 5246def..1b8159f 100644
--- a/spring-cloud-cloudfoundry-ups-connector/src/main/java/org/springframework/cloud/cloudfoundry/UserProvidedOracleServiceInfoCreator.java
+++ b/spring-cloud-cloudfoundry-connector/src/main/java/org/springframework/cloud/cloudfoundry/OracleServiceInfoCreator.java
@@ -2,8 +2,8 @@ package org.springframework.cloud.cloudfoundry;
 
 import org.springframework.cloud.service.common.OracleServiceInfo;
 
-public class UserProvidedOracleServiceInfoCreator extends RelationalServiceInfoCreator<OracleServiceInfo> {
-	public UserProvidedOracleServiceInfoCreator() {
+public class OracleServiceInfoCreator extends RelationalServiceInfoCreator<OracleServiceInfo> {
+	public OracleServiceInfoCreator() {
 		super(new Tags(), "oracle");
 	}
 
diff --git a/spring-cloud-cloudfoundry-connector/src/main/resources/META-INF/services/org.springframework.cloud.cloudfoundry.CloudFoundryServiceInfoCreator b/spring-cloud-cloudfoundry-connector/src/main/resources/META-INF/services/org.springframework.cloud.cloudfoundry.CloudFoundryServiceInfoCreator
index 7e40f4f..134b582 100644
--- a/spring-cloud-cloudfoundry-connector/src/main/resources/META-INF/services/org.springframework.cloud.cloudfoundry.CloudFoundryServiceInfoCreator
+++ b/spring-cloud-cloudfoundry-connector/src/main/resources/META-INF/services/org.springframework.cloud.cloudfoundry.CloudFoundryServiceInfoCreator
@@ -5,3 +5,4 @@ org.springframework.cloud.cloudfoundry.MongoServiceInfoCreator
 org.springframework.cloud.cloudfoundry.AmqpServiceInfoCreator
 org.springframework.cloud.cloudfoundry.MonitoringServiceInfoCreator
 org.springframework.cloud.cloudfoundry.SmtpServiceInfoCreator
+org.springframework.cloud.cloudfoundry.OracleServiceInfoCreator
diff --git a/spring-cloud-cloudfoundry-ups-connector/src/test/java/org/springframework/cloud/cloudfoundry/AbstractUserProvidedServiceInfoCreatorTest.java b/spring-cloud-cloudfoundry-connector/src/test/java/org/springframework/cloud/cloudfoundry/AbstractUserProvidedServiceInfoCreatorTest.java
similarity index 100%
rename from spring-cloud-cloudfoundry-ups-connector/src/test/java/org/springframework/cloud/cloudfoundry/AbstractUserProvidedServiceInfoCreatorTest.java
rename to spring-cloud-cloudfoundry-connector/src/test/java/org/springframework/cloud/cloudfoundry/AbstractUserProvidedServiceInfoCreatorTest.java
diff --git a/spring-cloud-cloudfoundry-ups-connector/src/test/java/org/springframework/cloud/cloudfoundry/UserProvidedOracleServiceInfoCreatorTest.java b/spring-cloud-cloudfoundry-connector/src/test/java/org/springframework/cloud/cloudfoundry/CloudFoundryConnectorOracleServiceTest.java
similarity index 94%
rename from spring-cloud-cloudfoundry-ups-connector/src/test/java/org/springframework/cloud/cloudfoundry/UserProvidedOracleServiceInfoCreatorTest.java
rename to spring-cloud-cloudfoundry-connector/src/test/java/org/springframework/cloud/cloudfoundry/CloudFoundryConnectorOracleServiceTest.java
index ff8fe2c..d11ecf0 100644
--- a/spring-cloud-cloudfoundry-ups-connector/src/test/java/org/springframework/cloud/cloudfoundry/UserProvidedOracleServiceInfoCreatorTest.java
+++ b/spring-cloud-cloudfoundry-connector/src/test/java/org/springframework/cloud/cloudfoundry/CloudFoundryConnectorOracleServiceTest.java
@@ -13,7 +13,7 @@ import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertNotNull;
 import static org.mockito.Mockito.when;
 
-public class UserProvidedOracleServiceInfoCreatorTest extends AbstractUserProvidedServiceInfoCreatorTest {
+public class CloudFoundryConnectorOracleServiceTest extends AbstractUserProvidedServiceInfoCreatorTest {
 
 	private static final String INSTANCE_NAME = "database";
 	private static final String ORACLE_SCHEME = "oracle:";
diff --git a/spring-cloud-cloudfoundry-ups-connector/src/test/resources/org/springframework/cloud/cloudfoundry/test-ups-info-no-uri.json b/spring-cloud-cloudfoundry-connector/src/test/resources/org/springframework/cloud/cloudfoundry/test-ups-info-no-uri.json
similarity index 100%
rename from spring-cloud-cloudfoundry-ups-connector/src/test/resources/org/springframework/cloud/cloudfoundry/test-ups-info-no-uri.json
rename to spring-cloud-cloudfoundry-connector/src/test/resources/org/springframework/cloud/cloudfoundry/test-ups-info-no-uri.json
diff --git a/spring-cloud-cloudfoundry-ups-connector/src/test/resources/org/springframework/cloud/cloudfoundry/test-ups-info.json b/spring-cloud-cloudfoundry-connector/src/test/resources/org/springframework/cloud/cloudfoundry/test-ups-info.json
similarity index 100%
rename from spring-cloud-cloudfoundry-ups-connector/src/test/resources/org/springframework/cloud/cloudfoundry/test-ups-info.json
rename to spring-cloud-cloudfoundry-connector/src/test/resources/org/springframework/cloud/cloudfoundry/test-ups-info.json
diff --git a/spring-cloud-cloudfoundry-ups-connector/src/main/resources/META-INF/services/org.springframework.cloud.cloudfoundry.CloudFoundryServiceInfoCreator b/spring-cloud-cloudfoundry-ups-connector/src/main/resources/META-INF/services/org.springframework.cloud.cloudfoundry.CloudFoundryServiceInfoCreator
deleted file mode 100644
index 1155ddd..0000000
--- a/spring-cloud-cloudfoundry-ups-connector/src/main/resources/META-INF/services/org.springframework.cloud.cloudfoundry.CloudFoundryServiceInfoCreator
+++ /dev/null
@@ -1 +0,0 @@
-org.springframework.cloud.cloudfoundry.UserProvidedOracleServiceInfoCreator