diff --git a/spring-cloud-cloudfoundry-connector/src/main/java/org/springframework/cloud/cloudfoundry/AmqpServiceInfoCreator.java b/spring-cloud-cloudfoundry-connector/src/main/java/org/springframework/cloud/cloudfoundry/AmqpServiceInfoCreator.java
index 11bd81a..92b7518 100644
--- a/spring-cloud-cloudfoundry-connector/src/main/java/org/springframework/cloud/cloudfoundry/AmqpServiceInfoCreator.java
+++ b/spring-cloud-cloudfoundry-connector/src/main/java/org/springframework/cloud/cloudfoundry/AmqpServiceInfoCreator.java
@@ -20,7 +20,7 @@ public class AmqpServiceInfoCreator extends CloudFoundryServiceInfoCreator<AmqpS
 	public AmqpServiceInfo createServiceInfo(Map<String,Object> serviceData) {
 		Map<String,Object> credentials = getCredentials(serviceData);
 
-		String id = (String) serviceData.get("name");
+		String id = getId(serviceData);
 
 		String uri = getUriFromCredentials(credentials);
 		String managementUri = getStringFromCredentials(credentials, "http_api_uri");
diff --git a/spring-cloud-cloudfoundry-connector/src/main/java/org/springframework/cloud/cloudfoundry/CloudFoundryServiceInfoCreator.java b/spring-cloud-cloudfoundry-connector/src/main/java/org/springframework/cloud/cloudfoundry/CloudFoundryServiceInfoCreator.java
index 141cea4..89f720e 100644
--- a/spring-cloud-cloudfoundry-connector/src/main/java/org/springframework/cloud/cloudfoundry/CloudFoundryServiceInfoCreator.java
+++ b/spring-cloud-cloudfoundry-connector/src/main/java/org/springframework/cloud/cloudfoundry/CloudFoundryServiceInfoCreator.java
@@ -70,6 +70,10 @@ public abstract class CloudFoundryServiceInfoCreator<SI extends ServiceInfo> imp
 		return false;
 	}
 
+	protected String getId(Map<String, Object> serviceData) {
+		return (String) serviceData.get("name");
+	}
+
 	@SuppressWarnings("unchecked")
 	protected Map<String, Object> getCredentials(Map<String, Object> serviceData) {
 		return (Map<String, Object>) serviceData.get("credentials");
diff --git a/spring-cloud-cloudfoundry-connector/src/main/java/org/springframework/cloud/cloudfoundry/MongoServiceInfoCreator.java b/spring-cloud-cloudfoundry-connector/src/main/java/org/springframework/cloud/cloudfoundry/MongoServiceInfoCreator.java
index 1749e77..8bb2539 100644
--- a/spring-cloud-cloudfoundry-connector/src/main/java/org/springframework/cloud/cloudfoundry/MongoServiceInfoCreator.java
+++ b/spring-cloud-cloudfoundry-connector/src/main/java/org/springframework/cloud/cloudfoundry/MongoServiceInfoCreator.java
@@ -17,7 +17,7 @@ public class MongoServiceInfoCreator extends CloudFoundryServiceInfoCreator<Mong
 	}
 
 	public MongoServiceInfo createServiceInfo(Map<String,Object> serviceData) {
-		String id = (String) serviceData.get("name");
+		String id = getId(serviceData);
 
 		String uri = getUriFromCredentials(getCredentials(serviceData));
 
diff --git a/spring-cloud-cloudfoundry-connector/src/main/java/org/springframework/cloud/cloudfoundry/MonitoringServiceInfoCreator.java b/spring-cloud-cloudfoundry-connector/src/main/java/org/springframework/cloud/cloudfoundry/MonitoringServiceInfoCreator.java
index 1a637a8..da4b5b8 100644
--- a/spring-cloud-cloudfoundry-connector/src/main/java/org/springframework/cloud/cloudfoundry/MonitoringServiceInfoCreator.java
+++ b/spring-cloud-cloudfoundry-connector/src/main/java/org/springframework/cloud/cloudfoundry/MonitoringServiceInfoCreator.java
@@ -20,7 +20,7 @@ public class MonitoringServiceInfoCreator extends CloudFoundryServiceInfoCreator
 
 	@Override
 	public MonitoringServiceInfo createServiceInfo(Map<String, Object> serviceData) {
-		String id = (String) serviceData.get("name");
+		String id = getId(serviceData);
 		return new MonitoringServiceInfo(id);
 	}
 }
\ No newline at end of file
diff --git a/spring-cloud-cloudfoundry-connector/src/main/java/org/springframework/cloud/cloudfoundry/RedisServiceInfoCreator.java b/spring-cloud-cloudfoundry-connector/src/main/java/org/springframework/cloud/cloudfoundry/RedisServiceInfoCreator.java
index d038cd3..7efdf79 100644
--- a/spring-cloud-cloudfoundry-connector/src/main/java/org/springframework/cloud/cloudfoundry/RedisServiceInfoCreator.java
+++ b/spring-cloud-cloudfoundry-connector/src/main/java/org/springframework/cloud/cloudfoundry/RedisServiceInfoCreator.java
@@ -17,7 +17,7 @@ public class RedisServiceInfoCreator extends CloudFoundryServiceInfoCreator<Redi
 	}
 
 	public RedisServiceInfo createServiceInfo(Map<String,Object> serviceData) {
-		String id = (String) serviceData.get("name");
+		String id = getId(serviceData);
 
 		Map<String, Object> credentials = getCredentials(serviceData);
 		String uri = getUriFromCredentials(credentials);
diff --git a/spring-cloud-cloudfoundry-connector/src/main/java/org/springframework/cloud/cloudfoundry/RelationalServiceInfoCreator.java b/spring-cloud-cloudfoundry-connector/src/main/java/org/springframework/cloud/cloudfoundry/RelationalServiceInfoCreator.java
index 44c1aa3..37fae6f 100644
--- a/spring-cloud-cloudfoundry-connector/src/main/java/org/springframework/cloud/cloudfoundry/RelationalServiceInfoCreator.java
+++ b/spring-cloud-cloudfoundry-connector/src/main/java/org/springframework/cloud/cloudfoundry/RelationalServiceInfoCreator.java
@@ -45,7 +45,7 @@ public abstract class RelationalServiceInfoCreator<SI extends RelationalServiceI
 	public abstract SI createServiceInfo(String id, String uri);
 
 	public SI createServiceInfo(Map<String, Object> serviceData) {
-		String id = (String) serviceData.get("name");
+		String id = getId(serviceData);
 
 		Map<String,Object> credentials = getCredentials(serviceData);
 
diff --git a/spring-cloud-cloudfoundry-connector/src/main/java/org/springframework/cloud/cloudfoundry/SmtpServiceInfoCreator.java b/spring-cloud-cloudfoundry-connector/src/main/java/org/springframework/cloud/cloudfoundry/SmtpServiceInfoCreator.java
index 36cbdf6..e37a319 100644
--- a/spring-cloud-cloudfoundry-connector/src/main/java/org/springframework/cloud/cloudfoundry/SmtpServiceInfoCreator.java
+++ b/spring-cloud-cloudfoundry-connector/src/main/java/org/springframework/cloud/cloudfoundry/SmtpServiceInfoCreator.java
@@ -20,7 +20,7 @@ public class SmtpServiceInfoCreator extends CloudFoundryServiceInfoCreator<SmtpS
 	}
 
 	public SmtpServiceInfo createServiceInfo(Map<String, Object> serviceData) {
-		String id = (String) serviceData.get("name");
+		String id = getId(serviceData);
 
 		Map<String, Object> credentials = getCredentials(serviceData);