diff --git a/_includes/download_widget.md b/_includes/download_widget.md
index 5776c711b..f652a974e 100644
--- a/_includes/download_widget.md
+++ b/_includes/download_widget.md
@@ -7,7 +7,7 @@ Download
         <div data-download-widget-controls style="display: inline-block"></div>
     </div>
     <div class="download-widget--body">
-        <p>The recommended way to get started with <code>{{ site.project }}</code> is to use <a href="http://start.spring.io/">Spring Initializr</a>. Just follow these <a href="https://docs.spring.io/spring-cloud-stream/docs/{{@= version @}}/reference/htmlsingle/#_quick_start"instructions</a>.
+        <p>The recommended way to get started with <code>{{ site.project }}</code> is to use <a href="http://start.spring.io/">Spring Initializr</a>. Just follow these <a href="https://docs.spring.io/spring-cloud-stream/docs/Elmhurst.RELEASE/reference/htmlsingle/#_quick_start"instructions</a>.
 		You can also start using it in your project with a dependency management system &ndash; the snippet below can
         be copied and pasted into your build. Need help? See our getting started guides
         on building with <a href="http://spring.io/guides/gs/maven/">Maven</a> and
diff --git a/index.html b/index.html
index afb0afea7..4ed27f3b5 100644
--- a/index.html
+++ b/index.html
@@ -52,7 +52,7 @@ The core building blocks of Spring Cloud Stream are:
 
 <img class="styled-image" src="img/SCSt-overview.png" alt="Spring Cloud Stream overview" title="Spring Cloud Stream overview" border="5"/>
 
-Currently Spring Cloud Stream supports [RabbitMQ](https://github.com/spring-cloud/spring-cloud-stream-binder-rabbit) and [Kafka](https://github.com/spring-cloud/spring-cloud-stream-binder-kafka) binders with more binder implementations in the pipeline _(such as: [Google PubSub](https://github.com/spring-cloud/spring-cloud-gcp/tree/master/spring-cloud-gcp-pubsub-stream-binder) and [AWS Kinesis](https://github.com/spring-cloud/spring-cloud-stream-binder-aws-kinesis))_.
+Currently Spring Cloud Stream supports [RabbitMQ](https://github.com/spring-cloud/spring-cloud-stream-binder-rabbit) and [Apache Kafka](https://github.com/spring-cloud/spring-cloud-stream-binder-kafka) binders with more binder implementations in the pipeline _(such as: [Google PubSub](https://github.com/spring-cloud/spring-cloud-gcp/tree/master/spring-cloud-gcp-pubsub-stream-binder) and [AWS Kinesis](https://github.com/spring-cloud/spring-cloud-stream-binder-aws-kinesis))_.
 
 <span id="quick-start"></span>
 
@@ -62,7 +62,7 @@ Currently Spring Cloud Stream supports [RabbitMQ](https://github.com/spring-clou
 {% include download_widget.md %}
 
 As long as Spring Cloud Stream and a Spring Cloud Stream Binder dependencies are on the classpath any Spring Boot application with `@EnableBinding` binds to the external 
-messaging system (e.g. [Rabbit MQ](https://github.com/spring-cloud/spring-cloud-stream-binder-rabbit) or [Kafka](https://github.com/spring-cloud/spring-cloud-stream-binder-kafka), 
+messaging system (e.g. [Rabbit MQ](https://github.com/spring-cloud/spring-cloud-stream-binder-rabbit) or [Apache Kafka](https://github.com/spring-cloud/spring-cloud-stream-binder-kafka), 
 depending on the binder-implementation of choice).
 
 For more comprehansive step-by-step _getting started_ experience please refer to the
@@ -108,8 +108,8 @@ payloads to type `Person`.
 
 You can start the application by simply running its `main(..)` method.
 
-### Kafka Client Compatibility
-Spring Cloud Stream supports a variety of Kafka Client releases. To learn more about it, please refer to the [Kafka Client Compatibility](https://github.com/spring-cloud/spring-cloud-stream/wiki/Kafka-Client-Compatibility) section in the Wiki page.
+### Apache Kafka Client Compatibility
+Spring Cloud Stream supports a variety of Apache Kafka Client releases. To learn more about it, please refer to the [Apache Kafka Client Compatibility](https://github.com/spring-cloud/spring-cloud-stream/wiki/Kafka-Client-Compatibility) section in the Wiki page.
 
 {% endcapture %}