diff --git a/spring-cloud-cloudfoundry-connector/src/main/java/org/springframework/cloud/cloudfoundry/PostgresqlServiceInfoCreator.java b/spring-cloud-cloudfoundry-connector/src/main/java/org/springframework/cloud/cloudfoundry/PostgresqlServiceInfoCreator.java
index da8be3e..4b38fbf 100644
--- a/spring-cloud-cloudfoundry-connector/src/main/java/org/springframework/cloud/cloudfoundry/PostgresqlServiceInfoCreator.java
+++ b/spring-cloud-cloudfoundry-connector/src/main/java/org/springframework/cloud/cloudfoundry/PostgresqlServiceInfoCreator.java
@@ -3,14 +3,14 @@ package org.springframework.cloud.cloudfoundry;
 import org.springframework.cloud.service.common.PostgresqlServiceInfo;
 
 /**
- * 
+ *
  * @author Ramnivas Laddad
  *
  */
 public class PostgresqlServiceInfoCreator extends RelationalServiceInfoCreator<PostgresqlServiceInfo> {
 
 	public PostgresqlServiceInfoCreator() {
-		super(new Tags("postgresql"), "postgres");
+		super(new Tags("postgresql"), PostgresqlServiceInfo.URI_SCHEMA);
 	}
 
 	@Override
diff --git a/spring-cloud-cloudfoundry-connector/src/test/java/org/springframework/cloud/cloudfoundry/AbstractCloudFoundryConnectorRelationalServiceTest.java b/spring-cloud-cloudfoundry-connector/src/test/java/org/springframework/cloud/cloudfoundry/AbstractCloudFoundryConnectorRelationalServiceTest.java
index 35a790a..9588e50 100644
--- a/spring-cloud-cloudfoundry-connector/src/test/java/org/springframework/cloud/cloudfoundry/AbstractCloudFoundryConnectorRelationalServiceTest.java
+++ b/spring-cloud-cloudfoundry-connector/src/test/java/org/springframework/cloud/cloudfoundry/AbstractCloudFoundryConnectorRelationalServiceTest.java
@@ -1,7 +1,7 @@
 package org.springframework.cloud.cloudfoundry;
 
 /**
- * 
+ *
  * @author Ramnivas Laddad
  *
  */
@@ -20,12 +20,13 @@ public abstract class AbstractCloudFoundryConnectorRelationalServiceTest extends
 	}
 
 	protected static String getJdbcUrl(String databaseType, String name) {
+	    // this should be cleaned up more broadly; pull into RelationalServiceInfo interface?
 		String jdbcUrlDatabaseType = databaseType;
 		if (databaseType.equals("postgres")) {
 			jdbcUrlDatabaseType = "postgresql";
 		}
 
-		return "jdbc:" + jdbcUrlDatabaseType + "://" + hostname + ":" + port + "/" + name + 
+		return "jdbc:" + jdbcUrlDatabaseType + "://" + hostname + ":" + port + "/" + name +
 			   "?user=" + username + "&password=" + password;
 	}
 
diff --git a/spring-cloud-core/src/main/java/org/springframework/cloud/service/common/MysqlServiceInfo.java b/spring-cloud-core/src/main/java/org/springframework/cloud/service/common/MysqlServiceInfo.java
index 2eccab0..f4609eb 100644
--- a/spring-cloud-core/src/main/java/org/springframework/cloud/service/common/MysqlServiceInfo.java
+++ b/spring-cloud-core/src/main/java/org/springframework/cloud/service/common/MysqlServiceInfo.java
@@ -10,9 +10,11 @@ import org.springframework.cloud.service.ServiceInfo.ServiceLabel;
 @ServiceLabel("mysql")
 public class MysqlServiceInfo extends RelationalServiceInfo {
 
-    public static final String URI_SCHEME = "mysql";
+    public static final String JDBC_URL_TYPE = "mysql";
 
-	public MysqlServiceInfo(String id, String url) {
-		super(id, url, URI_SCHEME);
-	}
+    public static final String URI_SCHEME = JDBC_URL_TYPE;
+
+    public MysqlServiceInfo(String id, String url) {
+        super(id, url, URI_SCHEME);
+    }
 }
diff --git a/spring-cloud-core/src/main/java/org/springframework/cloud/service/common/OracleServiceInfo.java b/spring-cloud-core/src/main/java/org/springframework/cloud/service/common/OracleServiceInfo.java
index 8aef0c4..6d2289d 100644
--- a/spring-cloud-core/src/main/java/org/springframework/cloud/service/common/OracleServiceInfo.java
+++ b/spring-cloud-core/src/main/java/org/springframework/cloud/service/common/OracleServiceInfo.java
@@ -5,10 +5,12 @@ import org.springframework.cloud.service.ServiceInfo;
 @ServiceInfo.ServiceLabel("oracle")
 public class OracleServiceInfo extends RelationalServiceInfo {
 
-    public static final String URI_SCHEME = "oracle";
+    public static final String JDBC_URL_TYPE = "oracle";
+
+    public static final String URI_SCHEME = JDBC_URL_TYPE;
 
 	public OracleServiceInfo(String id, String url) {
-		super(id, url, URI_SCHEME);
+		super(id, url, JDBC_URL_TYPE);
 	}
 
 	@Override
diff --git a/spring-cloud-core/src/main/java/org/springframework/cloud/service/common/PostgresqlServiceInfo.java b/spring-cloud-core/src/main/java/org/springframework/cloud/service/common/PostgresqlServiceInfo.java
index 98e478c..2927782 100644
--- a/spring-cloud-core/src/main/java/org/springframework/cloud/service/common/PostgresqlServiceInfo.java
+++ b/spring-cloud-core/src/main/java/org/springframework/cloud/service/common/PostgresqlServiceInfo.java
@@ -4,13 +4,18 @@ import org.springframework.cloud.service.ServiceInfo.ServiceLabel;
 
 
 /**
- * 
+ *
  * @author Ramnivas Laddad
  *
  */
 @ServiceLabel("postgresql")
 public class PostgresqlServiceInfo extends RelationalServiceInfo {
+
+    public static final String JDBC_URL_TYPE = "postgresql";
+
+    public static final String URI_SCHEMA = "postgres";
+
 	public PostgresqlServiceInfo(String id, String url) {
-		super(id, url, "postgresql");
+		super(id, url, JDBC_URL_TYPE);
 	}
 }
diff --git a/spring-cloud-heroku-connector/src/main/java/org/springframework/cloud/heroku/PostgresqlServiceInfoCreator.java b/spring-cloud-heroku-connector/src/main/java/org/springframework/cloud/heroku/PostgresqlServiceInfoCreator.java
index 57a4e67..7a44ea0 100644
--- a/spring-cloud-heroku-connector/src/main/java/org/springframework/cloud/heroku/PostgresqlServiceInfoCreator.java
+++ b/spring-cloud-heroku-connector/src/main/java/org/springframework/cloud/heroku/PostgresqlServiceInfoCreator.java
@@ -3,14 +3,14 @@ package org.springframework.cloud.heroku;
 import org.springframework.cloud.service.common.PostgresqlServiceInfo;
 
 /**
- * 
+ *
  * @author Ramnivas Laddad
  *
  */
 public class PostgresqlServiceInfoCreator extends RelationalServiceInfoCreator<PostgresqlServiceInfo> {
 
 	public PostgresqlServiceInfoCreator() {
-		super("postgres");
+		super(PostgresqlServiceInfo.URI_SCHEMA);
 	}
 
 	@Override
diff --git a/spring-cloud-heroku-connector/src/test/java/org/springframework/cloud/heroku/HerokuConnectorPostgresqlServiceTest.java b/spring-cloud-heroku-connector/src/test/java/org/springframework/cloud/heroku/HerokuConnectorPostgresqlServiceTest.java
index 35bf83b..9915ffa 100644
--- a/spring-cloud-heroku-connector/src/test/java/org/springframework/cloud/heroku/HerokuConnectorPostgresqlServiceTest.java
+++ b/spring-cloud-heroku-connector/src/test/java/org/springframework/cloud/heroku/HerokuConnectorPostgresqlServiceTest.java
@@ -13,15 +13,15 @@ import org.springframework.cloud.service.ServiceInfo;
 import org.springframework.cloud.service.common.PostgresqlServiceInfo;
 
 /**
- * 
+ *
  * @author Ramnivas Laddad
  *
  */
 public class HerokuConnectorPostgresqlServiceTest extends AbstractHerokuConnectorRelationalServiceTest {
     public HerokuConnectorPostgresqlServiceTest() {
-        super("postgres");
+        super(PostgresqlServiceInfo.URI_SCHEMA);
     }
-    
+
     @Test
     public void postgresqlServiceCreation() {
         Map<String, String> env = new HashMap<String, String>();