diff --git a/spring-cloud-stream-binders/spring-cloud-stream-binder-kafka/src/main/java/org/springframework/cloud/stream/binder/kafka/config/KafkaMessageChannelBinderConfiguration.java b/spring-cloud-stream-binders/spring-cloud-stream-binder-kafka/src/main/java/org/springframework/cloud/stream/binder/kafka/config/KafkaMessageChannelBinderConfiguration.java
index 792c236ba..f2256a04f 100644
--- a/spring-cloud-stream-binders/spring-cloud-stream-binder-kafka/src/main/java/org/springframework/cloud/stream/binder/kafka/config/KafkaMessageChannelBinderConfiguration.java
+++ b/spring-cloud-stream-binders/spring-cloud-stream-binder-kafka/src/main/java/org/springframework/cloud/stream/binder/kafka/config/KafkaMessageChannelBinderConfiguration.java
@@ -28,6 +28,8 @@ import org.springframework.util.StringUtils;
 
 /**
  * @author David Turanski
+ * @author Marius Bogoevici
+ * @author Mark Fisher
  */
 @Configuration
 @EnableConfigurationProperties(KafkaBinderConfigurationProperties.class)
@@ -36,11 +38,11 @@ public class KafkaMessageChannelBinderConfiguration {
 
 	private String[] zkNodes;
 
-	private String zkDefaultPort;
+	private String defaultZkPort;
 
 	private String[] brokers;
 
-	private String brokersDefaultPort;
+	private String defaultBrokerPort;
 
 	private KafkaMessageChannelBinder.Mode mode;
 
@@ -115,16 +117,16 @@ public class KafkaMessageChannelBinderConfiguration {
 		this.zkNodes = zkNodes;
 	}
 
-	public void setZkDefaultPort(String zkDefaultPort) {
-		this.zkDefaultPort = zkDefaultPort;
+	public void setDefaultZkPort(String defaultZkPort) {
+		this.defaultZkPort = defaultZkPort;
 	}
 
 	public void setBrokers(String[] brokers) {
 		this.brokers = brokers;
 	}
 
-	public void setBrokersDefaultPort(String brokersDefaultPort) {
-		this.brokersDefaultPort = brokersDefaultPort;
+	public void setDefaultBrokerPort(String defaultBrokerPort) {
+		this.defaultBrokerPort = defaultBrokerPort;
 	}
 
 	public void setMode(KafkaMessageChannelBinder.Mode mode) {
@@ -176,11 +178,11 @@ public class KafkaMessageChannelBinderConfiguration {
 	}
 
 	public String getZkConnectionString() {
-		return toConnectionString(this.zkNodes, this.zkDefaultPort);
+		return toConnectionString(this.zkNodes, this.defaultZkPort);
 	}
 
 	public String getKafkaConnectionString() {
-		return toConnectionString(this.brokers, this.brokersDefaultPort);
+		return toConnectionString(this.brokers, this.defaultBrokerPort);
 	}
 
 	/**
diff --git a/spring-cloud-stream-binders/spring-cloud-stream-binder-kafka/src/main/resources/META-INF/spring-cloud-stream/kafka-binder.properties b/spring-cloud-stream-binders/spring-cloud-stream-binder-kafka/src/main/resources/META-INF/spring-cloud-stream/kafka-binder.properties
index 7787d6f14..d64b8fbc6 100644
--- a/spring-cloud-stream-binders/spring-cloud-stream-binder-kafka/src/main/resources/META-INF/spring-cloud-stream/kafka-binder.properties
+++ b/spring-cloud-stream-binders/spring-cloud-stream-binder-kafka/src/main/resources/META-INF/spring-cloud-stream/kafka-binder.properties
@@ -1,7 +1,7 @@
 spring.cloud.stream.binder.kafka.brokers=${vcap.services.kafka.credentials.kafka.node_ips:localhost}
-spring.cloud.stream.binder.kafka.brokersDefaultPort=${vcap.services.kafka.credentials.kafka.port:9092}
+spring.cloud.stream.binder.kafka.defaultBrokerPort=${vcap.services.kafka.credentials.kafka.port:9092}
 spring.cloud.stream.binder.kafka.zkNodes=${vcap.services.kafka.credentials.zookeeper.node_ips:localhost}
-spring.cloud.stream.binder.kafka.zkDefaultPort=${vcap.services.kafka.credentials.zookeeper.port:2181}
+spring.cloud.stream.binder.kafka.defaultZkPort=${vcap.services.kafka.credentials.zookeeper.port:2181}
 spring.cloud.stream.binder.kafka.mode=embeddedHeaders
 spring.cloud.stream.binder.kafka.offsetStoreTopic=SpringXdOffsets
 spring.cloud.stream.binder.kafka.offsetStoreSegmentSize=25000000