diff --git a/multi-io-samples/log-sink-rabbit/.mvn/jvm.config b/multi-io-samples/multi-input-log-sink/.mvn/jvm.config
similarity index 100%
rename from multi-io-samples/log-sink-rabbit/.mvn/jvm.config
rename to multi-io-samples/multi-input-log-sink/.mvn/jvm.config
diff --git a/multi-io-samples/log-sink-rabbit/.mvn/maven.config b/multi-io-samples/multi-input-log-sink/.mvn/maven.config
similarity index 100%
rename from multi-io-samples/log-sink-rabbit/.mvn/maven.config
rename to multi-io-samples/multi-input-log-sink/.mvn/maven.config
diff --git a/multi-io-samples/log-sink-rabbit/.mvn/wrapper/MavenWrapperDownloader.java b/multi-io-samples/multi-input-log-sink/.mvn/wrapper/MavenWrapperDownloader.java
similarity index 100%
rename from multi-io-samples/log-sink-rabbit/.mvn/wrapper/MavenWrapperDownloader.java
rename to multi-io-samples/multi-input-log-sink/.mvn/wrapper/MavenWrapperDownloader.java
diff --git a/multi-io-samples/log-sink-rabbit/.mvn/wrapper/maven-wrapper.jar b/multi-io-samples/multi-input-log-sink/.mvn/wrapper/maven-wrapper.jar
similarity index 100%
rename from multi-io-samples/log-sink-rabbit/.mvn/wrapper/maven-wrapper.jar
rename to multi-io-samples/multi-input-log-sink/.mvn/wrapper/maven-wrapper.jar
diff --git a/multi-io-samples/log-sink-rabbit/.mvn/wrapper/maven-wrapper.properties b/multi-io-samples/multi-input-log-sink/.mvn/wrapper/maven-wrapper.properties
similarity index 100%
rename from multi-io-samples/log-sink-rabbit/.mvn/wrapper/maven-wrapper.properties
rename to multi-io-samples/multi-input-log-sink/.mvn/wrapper/maven-wrapper.properties
diff --git a/multi-io-samples/log-sink-rabbit/README.adoc b/multi-io-samples/multi-input-log-sink/README.adoc
similarity index 100%
rename from multi-io-samples/log-sink-rabbit/README.adoc
rename to multi-io-samples/multi-input-log-sink/README.adoc
diff --git a/multi-io-samples/log-sink-rabbit/mvnw b/multi-io-samples/multi-input-log-sink/mvnw
similarity index 100%
rename from multi-io-samples/log-sink-rabbit/mvnw
rename to multi-io-samples/multi-input-log-sink/mvnw
diff --git a/multi-io-samples/log-sink-rabbit/mvnw.cmd b/multi-io-samples/multi-input-log-sink/mvnw.cmd
similarity index 100%
rename from multi-io-samples/log-sink-rabbit/mvnw.cmd
rename to multi-io-samples/multi-input-log-sink/mvnw.cmd
diff --git a/multi-io-samples/log-sink-rabbit/pom.xml b/multi-io-samples/multi-input-log-sink/pom.xml
similarity index 99%
rename from multi-io-samples/log-sink-rabbit/pom.xml
rename to multi-io-samples/multi-input-log-sink/pom.xml
index 9309c22..466c6e2 100644
--- a/multi-io-samples/log-sink-rabbit/pom.xml
+++ b/multi-io-samples/multi-input-log-sink/pom.xml
@@ -10,9 +10,9 @@
 		<relativePath></relativePath>
 	</parent>
 	<groupId>org.springframework.cloud.stream.app</groupId>
-	<artifactId>log-sink-rabbit</artifactId>
+	<artifactId>multi-input-log-sink</artifactId>
 	<version>3.0.0-SNAPSHOT</version>
-	<name>log-sink-rabbit</name>
+	<name>multi-input-log-sink</name>
 	<description>Spring Cloud Stream Log Sink Rabbit Binder Application
 	</description>
 
diff --git a/multi-io-samples/log-sink-rabbit/src/main/java/org/springframework/cloud/stream/app/log/sink/rabbit/LogSinkRabbitApplication.java b/multi-io-samples/multi-input-log-sink/src/main/java/org/springframework/cloud/stream/app/log/sink/rabbit/LogSinkRabbitApplication.java
similarity index 100%
rename from multi-io-samples/log-sink-rabbit/src/main/java/org/springframework/cloud/stream/app/log/sink/rabbit/LogSinkRabbitApplication.java
rename to multi-io-samples/multi-input-log-sink/src/main/java/org/springframework/cloud/stream/app/log/sink/rabbit/LogSinkRabbitApplication.java
diff --git a/multi-io-samples/log-sink-rabbit/src/main/resources/META-INF/dataflow-configuration-metadata-whitelist.properties b/multi-io-samples/multi-input-log-sink/src/main/resources/META-INF/dataflow-configuration-metadata-whitelist.properties
similarity index 100%
rename from multi-io-samples/log-sink-rabbit/src/main/resources/META-INF/dataflow-configuration-metadata-whitelist.properties
rename to multi-io-samples/multi-input-log-sink/src/main/resources/META-INF/dataflow-configuration-metadata-whitelist.properties
diff --git a/multi-io-samples/log-sink-rabbit/src/main/resources/application.properties b/multi-io-samples/multi-input-log-sink/src/main/resources/application.properties
similarity index 100%
rename from multi-io-samples/log-sink-rabbit/src/main/resources/application.properties
rename to multi-io-samples/multi-input-log-sink/src/main/resources/application.properties
diff --git a/multi-io-samples/log-sink-rabbit/src/test/java/org/springframework/cloud/stream/app/log/sink/rabbit/LogSinkRabbitApplicationTests.java b/multi-io-samples/multi-input-log-sink/src/test/java/org/springframework/cloud/stream/app/log/sink/rabbit/LogSinkRabbitApplicationTests.java
similarity index 100%
rename from multi-io-samples/log-sink-rabbit/src/test/java/org/springframework/cloud/stream/app/log/sink/rabbit/LogSinkRabbitApplicationTests.java
rename to multi-io-samples/multi-input-log-sink/src/test/java/org/springframework/cloud/stream/app/log/sink/rabbit/LogSinkRabbitApplicationTests.java
diff --git a/multi-io-samples/time-source-rabbit/.mvn/jvm.config b/multi-io-samples/multi-output-time-source/.mvn/jvm.config
similarity index 100%
rename from multi-io-samples/time-source-rabbit/.mvn/jvm.config
rename to multi-io-samples/multi-output-time-source/.mvn/jvm.config
diff --git a/multi-io-samples/time-source-rabbit/.mvn/maven.config b/multi-io-samples/multi-output-time-source/.mvn/maven.config
similarity index 100%
rename from multi-io-samples/time-source-rabbit/.mvn/maven.config
rename to multi-io-samples/multi-output-time-source/.mvn/maven.config
diff --git a/multi-io-samples/time-source-rabbit/.mvn/wrapper/MavenWrapperDownloader.java b/multi-io-samples/multi-output-time-source/.mvn/wrapper/MavenWrapperDownloader.java
similarity index 100%
rename from multi-io-samples/time-source-rabbit/.mvn/wrapper/MavenWrapperDownloader.java
rename to multi-io-samples/multi-output-time-source/.mvn/wrapper/MavenWrapperDownloader.java
diff --git a/multi-io-samples/time-source-rabbit/.mvn/wrapper/maven-wrapper.jar b/multi-io-samples/multi-output-time-source/.mvn/wrapper/maven-wrapper.jar
similarity index 100%
rename from multi-io-samples/time-source-rabbit/.mvn/wrapper/maven-wrapper.jar
rename to multi-io-samples/multi-output-time-source/.mvn/wrapper/maven-wrapper.jar
diff --git a/multi-io-samples/time-source-rabbit/.mvn/wrapper/maven-wrapper.properties b/multi-io-samples/multi-output-time-source/.mvn/wrapper/maven-wrapper.properties
similarity index 100%
rename from multi-io-samples/time-source-rabbit/.mvn/wrapper/maven-wrapper.properties
rename to multi-io-samples/multi-output-time-source/.mvn/wrapper/maven-wrapper.properties
diff --git a/multi-io-samples/time-source-rabbit/README.adoc b/multi-io-samples/multi-output-time-source/README.adoc
similarity index 100%
rename from multi-io-samples/time-source-rabbit/README.adoc
rename to multi-io-samples/multi-output-time-source/README.adoc
diff --git a/multi-io-samples/time-source-rabbit/mvnw b/multi-io-samples/multi-output-time-source/mvnw
similarity index 100%
rename from multi-io-samples/time-source-rabbit/mvnw
rename to multi-io-samples/multi-output-time-source/mvnw
diff --git a/multi-io-samples/time-source-rabbit/mvnw.cmd b/multi-io-samples/multi-output-time-source/mvnw.cmd
similarity index 100%
rename from multi-io-samples/time-source-rabbit/mvnw.cmd
rename to multi-io-samples/multi-output-time-source/mvnw.cmd
diff --git a/multi-io-samples/time-source-rabbit/pom.xml b/multi-io-samples/multi-output-time-source/pom.xml
similarity index 99%
rename from multi-io-samples/time-source-rabbit/pom.xml
rename to multi-io-samples/multi-output-time-source/pom.xml
index 76ee0eb..a649dbd 100644
--- a/multi-io-samples/time-source-rabbit/pom.xml
+++ b/multi-io-samples/multi-output-time-source/pom.xml
@@ -10,9 +10,9 @@
 		<relativePath></relativePath>
 	</parent>
 	<groupId>org.springframework.cloud.stream.app</groupId>
-	<artifactId>time-source-rabbit</artifactId>
+	<artifactId>multi-output-time-source</artifactId>
 	<version>3.0.0-SNAPSHOT</version>
-	<name>time-source-rabbit</name>
+	<name>multi-output-time-source</name>
 	<description>Spring Cloud Stream Time Source Rabbit Binder Application
 	</description>
 
diff --git a/multi-io-samples/time-source-rabbit/src/main/java/org/springframework/cloud/stream/app/time/source/rabbit/TimeSourceRabbitApplication.java b/multi-io-samples/multi-output-time-source/src/main/java/org/springframework/cloud/stream/app/time/source/rabbit/TimeSourceRabbitApplication.java
similarity index 100%
rename from multi-io-samples/time-source-rabbit/src/main/java/org/springframework/cloud/stream/app/time/source/rabbit/TimeSourceRabbitApplication.java
rename to multi-io-samples/multi-output-time-source/src/main/java/org/springframework/cloud/stream/app/time/source/rabbit/TimeSourceRabbitApplication.java
diff --git a/multi-io-samples/time-source-rabbit/src/main/resources/META-INF/dataflow-configuration-metadata-whitelist.properties b/multi-io-samples/multi-output-time-source/src/main/resources/META-INF/dataflow-configuration-metadata-whitelist.properties
similarity index 100%
rename from multi-io-samples/time-source-rabbit/src/main/resources/META-INF/dataflow-configuration-metadata-whitelist.properties
rename to multi-io-samples/multi-output-time-source/src/main/resources/META-INF/dataflow-configuration-metadata-whitelist.properties
diff --git a/multi-io-samples/time-source-rabbit/src/main/resources/application.properties b/multi-io-samples/multi-output-time-source/src/main/resources/application.properties
similarity index 94%
rename from multi-io-samples/time-source-rabbit/src/main/resources/application.properties
rename to multi-io-samples/multi-output-time-source/src/main/resources/application.properties
index 53f57a1..39ad2d7 100644
--- a/multi-io-samples/time-source-rabbit/src/main/resources/application.properties
+++ b/multi-io-samples/multi-output-time-source/src/main/resources/application.properties
@@ -12,5 +12,8 @@ spring.cloud.stream.function.bindings.timeSupplier2-out-0=output2
 spring.cloud.stream.function.bindings.timeSupplier3-out-0=output3
 
 
+outputs=output1,output2
+inputs=
+
 
 
diff --git a/multi-io-samples/time-source-rabbit/src/test/java/org/springframework/cloud/stream/app/time/source/rabbit/TimeSourceRabbitApplicationTests.java b/multi-io-samples/multi-output-time-source/src/test/java/org/springframework/cloud/stream/app/time/source/rabbit/TimeSourceRabbitApplicationTests.java
similarity index 100%
rename from multi-io-samples/time-source-rabbit/src/test/java/org/springframework/cloud/stream/app/time/source/rabbit/TimeSourceRabbitApplicationTests.java
rename to multi-io-samples/multi-output-time-source/src/test/java/org/springframework/cloud/stream/app/time/source/rabbit/TimeSourceRabbitApplicationTests.java