diff --git a/README.adoc b/README.adoc
index 0ab79899c..88f3e92ca 100644
--- a/README.adoc
+++ b/README.adoc
@@ -1,15 +1,16 @@
 // Do not edit this file (e.g. go instead to docs/src/main/asciidoc)
 
-image::https://travis-ci.org/spring-cloud/spring-cloud-stream.svg?branch=master[Build Status, link=https://travis-ci.org/spring-cloud/spring-cloud-streams]
+image::https://travis-ci.org/spring-cloud/spring-cloud-stream.svg?branch=master[Build Status, link=https://travis-ci.org/spring-cloud/spring-cloud-stream]
 
-This project 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` annotated with `@Input` and `@Output` and add `@EnableModule` 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. The sample uses Redis.
+This project 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. The sample uses Redis.
 
 Here's a sample source module (output channel only):
 
 [source,java]
 ----
 @SpringBootApplication
-@ComponentScan(basePackageClasses=TimeSource.class)
+@EnableChannelBinding
+@ComponentScan(basePackageClasses=ModuleDefinition.class)
 public class ModuleApplication {
 
   public static void main(String[] args) throws InterruptedException {
@@ -19,14 +20,15 @@ public class ModuleApplication {
 }
 
 @Configuration
-@EnableModule
-public class TimeSource {
+public class ModuleDefinition {
 
   @Value("${format}")
   private String format;
 
-  @Input
-  public MessageChannel output;
+  @Bean
+  public MessageChannel output() {
+    return new DirectChannel();
+  }
 
   @Bean
   @InboundChannelAdapter(value = "output", autoStartup = "false", poller = @Poller(fixedDelay = "${fixedDelay}", maxMessagesPerPoll = "1"))
@@ -52,8 +54,7 @@ To be deployable as an XD module in a "traditional" way you need `/config/*.prop
 
 == Multiple Input or Output Channels
 
-A module can have multiple input or output channels. Instead of just one channel named "input" or "output" you can add multiple `MessageChannel` beans
- annotated with `@Input` and `@Output` and the names are converted to external channel names on the broker. The external channel names are the `spring.cloud.streams.[input|output]ChannelName` plus the `MessageChannel` bean name, period separated. In addition, the bean name can be `input.[queue|topic|tap]:*` or `output.[queue|topic]:*` (i.e. with a channel type as a colon-separated prefix), and the semantics of the external bus channel changes accordingly (a tap is like a topic). For example, you can have two `MessageChannels` called "output" and "output.topic:foo" in a module with `outputChannelName=bar`, and the result is 2 external channels called "bar" and "topic:foo.bar".
+A module can have multiple input or output channels. Instead of just one channel named "input" or "output" you can add multiple `MessageChannel` beans named `input.*` or `output.*` and the names are converted to external channel names on the broker. The external channel names are the `spring.cloud.streams.[input|output]ChannelName` plus the `MessageChannel` bean name, period separated. In addition, the bean name can be `input.[queue|topic|tap]:*` or `output.[queue|topic]:*` (i.e. with a channel type as a colon-separated prefix), and the semantics of the external bus channel changes accordingly (a tap is like a topic). For example, you can have two `MessageChannels` called "output" and "output.topic:foo" in a module with `outputChannelName=bar`, and the result is 2 external channels called "bar" and "topic:foo.bar".
 
 == Samples
 
@@ -276,4 +277,4 @@ added after the original pull request but before a merge.
   other target branch in the main project).
 * When writing a commit message please follow http://tbaggery.com/2008/04/19/a-note-about-git-commit-messages.html[these conventions],
   if you are fixing an existing issue please add `Fixes gh-XXXX` at the end of the commit
-  message (where XXXX is the issue number).
+  message (where XXXX is the issue number).
\ No newline at end of file
diff --git a/docs/src/main/asciidoc/README.adoc b/docs/src/main/asciidoc/README.adoc
index 5cf1d6f70..b41b1e730 100644
--- a/docs/src/main/asciidoc/README.adoc
+++ b/docs/src/main/asciidoc/README.adoc
@@ -1,4 +1,4 @@
-image::https://travis-ci.org/spring-cloud/spring-cloud-streams.svg?branch=master[Build Status, link=https://travis-ci.org/spring-cloud/spring-cloud-streams]
+image::https://travis-ci.org/spring-cloud/spring-cloud-stream.svg?branch=master[Build Status, link=https://travis-ci.org/spring-cloud/spring-cloud-stream]
 
 include::intro.adoc[]
 
diff --git a/docs/src/main/asciidoc/spring-cloud-streams.adoc b/docs/src/main/asciidoc/spring-cloud-stream.adoc
similarity index 100%
rename from docs/src/main/asciidoc/spring-cloud-streams.adoc
rename to docs/src/main/asciidoc/spring-cloud-stream.adoc