diff --git a/_config.yml b/_config.yml
index 1e27c6bc8..4060dcfef 100644
--- a/_config.yml
+++ b/_config.yml
@@ -10,17 +10,17 @@ redcarpet:
 ### The following properties will change on a project-by-project basis
 
 # Context path in the remote website (usually /<project>), will be prepended to absolute URLs for static resources
-baseurl: /spring-cloud-streams
+baseurl: /spring-cloud-stream
 
 # Name of the project for display in places like page titles
-name: Spring Cloud Streams
+name: Spring Cloud Stream
 
 # ID of the project in the metadata API at spring.io (if this is not a
 # valid project ID the javascript widgets in the home page will not work)
-project: spring-cloud-streams
+project: spring-cloud-stream
 
 # Project github URL
-github_repo_url: http://github.com/spring-cloud/spring-cloud-streams
+github_repo_url: http://github.com/spring-cloud/spring-cloud-stream
 
 # Project forum URL
 forum: http://stackoverflow.com/questions/tagged/spring-cloud
diff --git a/index.html b/index.html
index a502e3892..6b4c681f3 100644
--- a/index.html
+++ b/index.html
@@ -1,13 +1,13 @@
 ---
 # The name of your project
-title: Spring Cloud Streams
+title: Spring Cloud Stream
 
 badges:
 
   # Customize your project's badges. Delete any entries that do not apply.
   custom:
     - name: Source (GitHub)
-      url:  https://github.com/spring-cloud/spring-cloud-streams
+      url:  https://github.com/spring-cloud/spring-cloud-stream
       icon: github
 
     - name: StackOverflow
@@ -26,7 +26,7 @@ badges:
 
 {% capture billboard_description %}
 
-Spring Cloud Streams allows a user to develop and run messaging microservices using Spring Integration and run them locally, or in the cloud, or even on Spring XD. Just create `MessageChannels` "input" and/or "output" and add `@EnableChannelBinding` and run your app as a Spring Boot app (single application context).  You just need to connect to the physical broker for the bus, which is automatic if the relevant bus implementation is available on the classpath. 
+Spring Cloud Stream allows a user to develop and run messaging microservices using Spring Integration and run them locally, or in the cloud, or even on Spring XD. Just create `MessageChannels` "input" and/or "output" and add `@EnableChannelBinding` and run your app as a Spring Boot app (single application context).  You just need to connect to the physical broker for the bus, which is automatic if the relevant bus implementation is available on the classpath. 
 
 {% endcapture %}
 
@@ -38,7 +38,7 @@ Spring Cloud Streams allows a user to develop and run messaging microservices us
 <script type="text/javascript">{% include custom.js %}</script>
 {% include download_widget.md %}
 
-As long as Spring Cloud Streams and a Spring XD Message Bus is on the
+As long as Spring Cloud Stream and a Spring XD Message Bus is on the
 classpath any Spring Boot application with `@EnableChannelBinding` will bind to an external broker provided by the bus (e.g. redis, rabbit, kafka, depending on the implementation you choose). Sample application:
 
 ```java
@@ -79,10 +79,10 @@ public class ModuleDefinition {
 
 ### Sample Projects
 
-* [Source](https://github.com/spring-cloud/spring-cloud-streams/tree/master/spring-cloud-streams-samples/source)
-* [Sink](https://github.com/spring-cloud/spring-cloud-streams/tree/master/spring-cloud-streams-samples/sink)
-* [Transformer](https://github.com/spring-cloud/spring-cloud-streams/tree/master/spring-cloud-streams-samples/transformer)
-* [Mashup](https://github.com/spring-cloud/spring-cloud-streams/tree/master/spring-cloud-streams-samples/extended)
+* [Source](https://github.com/spring-cloud/spring-cloud-stream/tree/master/spring-cloud-stream-samples/source)
+* [Sink](https://github.com/spring-cloud/spring-cloud-stream/tree/master/spring-cloud-stream-samples/sink)
+* [Transformer](https://github.com/spring-cloud/spring-cloud-stream/tree/master/spring-cloud-stream-samples/transformer)
+* [Mashup](https://github.com/spring-cloud/spring-cloud-stream/tree/master/spring-cloud-stream-samples/extended)
 
 {% endcapture %}