diff --git a/dataflow-website/stream-developer-guides/streams/usage-cost-logger/pom.xml b/dataflow-website/stream-developer-guides/streams/usage-cost-logger/pom.xml
index 7545c24..f6bd695 100644
--- a/dataflow-website/stream-developer-guides/streams/usage-cost-logger/pom.xml
+++ b/dataflow-website/stream-developer-guides/streams/usage-cost-logger/pom.xml
@@ -8,11 +8,11 @@
2.1.4.RELEASE
- com.example
+ io.spring.dataflow.sample
usage-cost-logger
0.0.1-SNAPSHOT
usage-cost-logger
- Demo project for Spring Boot
+ Sample project for Spring Cloud Stream Sink
diff --git a/dataflow-website/stream-developer-guides/streams/usage-cost-logger/src/main/java/com/example/demo/UsageCostLogger.java b/dataflow-website/stream-developer-guides/streams/usage-cost-logger/src/main/java/io/spring/dataflow/sample/UsageCostLogger.java
similarity index 81%
rename from dataflow-website/stream-developer-guides/streams/usage-cost-logger/src/main/java/com/example/demo/UsageCostLogger.java
rename to dataflow-website/stream-developer-guides/streams/usage-cost-logger/src/main/java/io/spring/dataflow/sample/UsageCostLogger.java
index 8288c35..e50c3e2 100644
--- a/dataflow-website/stream-developer-guides/streams/usage-cost-logger/src/main/java/com/example/demo/UsageCostLogger.java
+++ b/dataflow-website/stream-developer-guides/streams/usage-cost-logger/src/main/java/io/spring/dataflow/sample/UsageCostLogger.java
@@ -1,7 +1,6 @@
-package com.example.demo;
+package io.spring.dataflow.sample;
-import com.example.demo.UsageCostLoggerApplication;
-import com.example.demo.domain.UsageCostDetail;
+import io.spring.dataflow.sample.domain.UsageCostDetail;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/dataflow-website/stream-developer-guides/streams/usage-cost-logger/src/main/java/com/example/demo/UsageCostLoggerApplication.java b/dataflow-website/stream-developer-guides/streams/usage-cost-logger/src/main/java/io/spring/dataflow/sample/UsageCostLoggerApplication.java
similarity index 89%
rename from dataflow-website/stream-developer-guides/streams/usage-cost-logger/src/main/java/com/example/demo/UsageCostLoggerApplication.java
rename to dataflow-website/stream-developer-guides/streams/usage-cost-logger/src/main/java/io/spring/dataflow/sample/UsageCostLoggerApplication.java
index 2465ba1..3ba551a 100644
--- a/dataflow-website/stream-developer-guides/streams/usage-cost-logger/src/main/java/com/example/demo/UsageCostLoggerApplication.java
+++ b/dataflow-website/stream-developer-guides/streams/usage-cost-logger/src/main/java/io/spring/dataflow/sample/UsageCostLoggerApplication.java
@@ -1,4 +1,4 @@
-package com.example.demo;
+package io.spring.dataflow.sample;
import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication;
diff --git a/dataflow-website/stream-developer-guides/streams/usage-cost-logger/src/main/java/com/example/demo/domain/UsageCostDetail.java b/dataflow-website/stream-developer-guides/streams/usage-cost-logger/src/main/java/io/spring/dataflow/sample/domain/UsageCostDetail.java
similarity index 94%
rename from dataflow-website/stream-developer-guides/streams/usage-cost-logger/src/main/java/com/example/demo/domain/UsageCostDetail.java
rename to dataflow-website/stream-developer-guides/streams/usage-cost-logger/src/main/java/io/spring/dataflow/sample/domain/UsageCostDetail.java
index cb50e79..0e0601e 100644
--- a/dataflow-website/stream-developer-guides/streams/usage-cost-logger/src/main/java/com/example/demo/domain/UsageCostDetail.java
+++ b/dataflow-website/stream-developer-guides/streams/usage-cost-logger/src/main/java/io/spring/dataflow/sample/domain/UsageCostDetail.java
@@ -1,4 +1,4 @@
-package com.example.demo.domain;
+package io.spring.dataflow.sample.domain;
public class UsageCostDetail {
diff --git a/dataflow-website/stream-developer-guides/streams/usage-cost-logger/src/test/java/com/example/demo/UsageCostLoggerApplicationTests.java b/dataflow-website/stream-developer-guides/streams/usage-cost-logger/src/test/java/io/spring/dataflow/sample/UsageCostLoggerApplicationTests.java
similarity index 90%
rename from dataflow-website/stream-developer-guides/streams/usage-cost-logger/src/test/java/com/example/demo/UsageCostLoggerApplicationTests.java
rename to dataflow-website/stream-developer-guides/streams/usage-cost-logger/src/test/java/io/spring/dataflow/sample/UsageCostLoggerApplicationTests.java
index 011082e..b7fe319 100644
--- a/dataflow-website/stream-developer-guides/streams/usage-cost-logger/src/test/java/com/example/demo/UsageCostLoggerApplicationTests.java
+++ b/dataflow-website/stream-developer-guides/streams/usage-cost-logger/src/test/java/io/spring/dataflow/sample/UsageCostLoggerApplicationTests.java
@@ -1,4 +1,4 @@
-package com.example.demo;
+package io.spring.dataflow.sample;
import org.junit.Test;
import org.junit.runner.RunWith;
diff --git a/dataflow-website/stream-developer-guides/streams/usage-cost-processor/pom.xml b/dataflow-website/stream-developer-guides/streams/usage-cost-processor/pom.xml
index 734376a..fd06700 100644
--- a/dataflow-website/stream-developer-guides/streams/usage-cost-processor/pom.xml
+++ b/dataflow-website/stream-developer-guides/streams/usage-cost-processor/pom.xml
@@ -8,11 +8,11 @@
2.1.4.RELEASE
- com.example
+ io.spring.dataflow.sample
usage-cost-processor
0.0.1-SNAPSHOT
usage-cost-processor
- Demo project for Spring Boot
+ Sample project for Spring Cloud Stream Processor
diff --git a/dataflow-website/stream-developer-guides/streams/usage-cost-processor/src/main/java/com/example/demo/UsageCostProcessor.java b/dataflow-website/stream-developer-guides/streams/usage-cost-processor/src/main/java/io/spring/dataflow/sample/UsageCostProcessor.java
similarity index 85%
rename from dataflow-website/stream-developer-guides/streams/usage-cost-processor/src/main/java/com/example/demo/UsageCostProcessor.java
rename to dataflow-website/stream-developer-guides/streams/usage-cost-processor/src/main/java/io/spring/dataflow/sample/UsageCostProcessor.java
index 33e92e7..c50c807 100644
--- a/dataflow-website/stream-developer-guides/streams/usage-cost-processor/src/main/java/com/example/demo/UsageCostProcessor.java
+++ b/dataflow-website/stream-developer-guides/streams/usage-cost-processor/src/main/java/io/spring/dataflow/sample/UsageCostProcessor.java
@@ -1,7 +1,7 @@
-package com.example.demo;
+package io.spring.dataflow.sample;
-import com.example.demo.domain.UsageCostDetail;
-import com.example.demo.domain.UsageDetail;
+import io.spring.dataflow.sample.domain.UsageCostDetail;
+import io.spring.dataflow.sample.domain.UsageDetail;
import org.springframework.cloud.stream.annotation.EnableBinding;
import org.springframework.cloud.stream.annotation.StreamListener;
diff --git a/dataflow-website/stream-developer-guides/streams/usage-cost-processor/src/main/java/com/example/demo/UsageCostProcessorApplication.java b/dataflow-website/stream-developer-guides/streams/usage-cost-processor/src/main/java/io/spring/dataflow/sample/UsageCostProcessorApplication.java
similarity index 89%
rename from dataflow-website/stream-developer-guides/streams/usage-cost-processor/src/main/java/com/example/demo/UsageCostProcessorApplication.java
rename to dataflow-website/stream-developer-guides/streams/usage-cost-processor/src/main/java/io/spring/dataflow/sample/UsageCostProcessorApplication.java
index cd86e99..c4dd38e 100644
--- a/dataflow-website/stream-developer-guides/streams/usage-cost-processor/src/main/java/com/example/demo/UsageCostProcessorApplication.java
+++ b/dataflow-website/stream-developer-guides/streams/usage-cost-processor/src/main/java/io/spring/dataflow/sample/UsageCostProcessorApplication.java
@@ -1,4 +1,4 @@
-package com.example.demo;
+package io.spring.dataflow.sample;
import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication;
diff --git a/dataflow-website/stream-developer-guides/streams/usage-cost-processor/src/main/java/com/example/demo/domain/UsageCostDetail.java b/dataflow-website/stream-developer-guides/streams/usage-cost-processor/src/main/java/io/spring/dataflow/sample/domain/UsageCostDetail.java
similarity index 94%
rename from dataflow-website/stream-developer-guides/streams/usage-cost-processor/src/main/java/com/example/demo/domain/UsageCostDetail.java
rename to dataflow-website/stream-developer-guides/streams/usage-cost-processor/src/main/java/io/spring/dataflow/sample/domain/UsageCostDetail.java
index c90faa3..b54eb57 100644
--- a/dataflow-website/stream-developer-guides/streams/usage-cost-processor/src/main/java/com/example/demo/domain/UsageCostDetail.java
+++ b/dataflow-website/stream-developer-guides/streams/usage-cost-processor/src/main/java/io/spring/dataflow/sample/domain/UsageCostDetail.java
@@ -1,4 +1,4 @@
-package com.example.demo.domain;
+package io.spring.dataflow.sample.domain;
public class UsageCostDetail {
diff --git a/dataflow-website/stream-developer-guides/streams/usage-cost-processor/src/main/java/com/example/demo/domain/UsageDetail.java b/dataflow-website/stream-developer-guides/streams/usage-cost-processor/src/main/java/io/spring/dataflow/sample/domain/UsageDetail.java
similarity index 91%
rename from dataflow-website/stream-developer-guides/streams/usage-cost-processor/src/main/java/com/example/demo/domain/UsageDetail.java
rename to dataflow-website/stream-developer-guides/streams/usage-cost-processor/src/main/java/io/spring/dataflow/sample/domain/UsageDetail.java
index e35ecd5..d36cccf 100644
--- a/dataflow-website/stream-developer-guides/streams/usage-cost-processor/src/main/java/com/example/demo/domain/UsageDetail.java
+++ b/dataflow-website/stream-developer-guides/streams/usage-cost-processor/src/main/java/io/spring/dataflow/sample/domain/UsageDetail.java
@@ -1,4 +1,4 @@
-package com.example.demo.domain;
+package io.spring.dataflow.sample.domain;
public class UsageDetail {
diff --git a/dataflow-website/stream-developer-guides/streams/usage-cost-processor/src/test/java/com/example/demo/UsageCostProcessorApplicationTests.java b/dataflow-website/stream-developer-guides/streams/usage-cost-processor/src/test/java/io/spring/dataflow/sample/UsageCostProcessorApplicationTests.java
similarity index 90%
rename from dataflow-website/stream-developer-guides/streams/usage-cost-processor/src/test/java/com/example/demo/UsageCostProcessorApplicationTests.java
rename to dataflow-website/stream-developer-guides/streams/usage-cost-processor/src/test/java/io/spring/dataflow/sample/UsageCostProcessorApplicationTests.java
index 9ed2b85..778e101 100644
--- a/dataflow-website/stream-developer-guides/streams/usage-cost-processor/src/test/java/com/example/demo/UsageCostProcessorApplicationTests.java
+++ b/dataflow-website/stream-developer-guides/streams/usage-cost-processor/src/test/java/io/spring/dataflow/sample/UsageCostProcessorApplicationTests.java
@@ -1,4 +1,4 @@
-package com.example.demo;
+package io.spring.dataflow.sample;
import org.junit.Test;
import org.junit.runner.RunWith;
diff --git a/dataflow-website/stream-developer-guides/streams/usage-detail-sender/pom.xml b/dataflow-website/stream-developer-guides/streams/usage-detail-sender/pom.xml
index 0a8f24a..3f1c18c 100644
--- a/dataflow-website/stream-developer-guides/streams/usage-detail-sender/pom.xml
+++ b/dataflow-website/stream-developer-guides/streams/usage-detail-sender/pom.xml
@@ -8,11 +8,11 @@
2.1.4.RELEASE
- com.example
+ io.spring.dataflow.sample
usage-detail-sender
0.0.1-SNAPSHOT
usage-detail-sender
- Demo project for Spring Boot
+ Sample project for Spring Cloud Stream Source
diff --git a/dataflow-website/stream-developer-guides/streams/usage-detail-sender/src/main/java/com/example/demo/UsageDetailSender.java b/dataflow-website/stream-developer-guides/streams/usage-detail-sender/src/main/java/io/spring/dataflow/sample/UsageDetailSender.java
similarity index 91%
rename from dataflow-website/stream-developer-guides/streams/usage-detail-sender/src/main/java/com/example/demo/UsageDetailSender.java
rename to dataflow-website/stream-developer-guides/streams/usage-detail-sender/src/main/java/io/spring/dataflow/sample/UsageDetailSender.java
index 13335e1..94d7782 100644
--- a/dataflow-website/stream-developer-guides/streams/usage-detail-sender/src/main/java/com/example/demo/UsageDetailSender.java
+++ b/dataflow-website/stream-developer-guides/streams/usage-detail-sender/src/main/java/io/spring/dataflow/sample/UsageDetailSender.java
@@ -1,8 +1,8 @@
-package com.example.demo;
+package io.spring.dataflow.sample;
import java.util.Random;
-import com.example.demo.domain.UsageDetail;
+import io.spring.dataflow.sample.domain.UsageDetail;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.cloud.stream.annotation.EnableBinding;
diff --git a/dataflow-website/stream-developer-guides/streams/usage-detail-sender/src/main/java/com/example/demo/UsageDetailSenderApplication.java b/dataflow-website/stream-developer-guides/streams/usage-detail-sender/src/main/java/io/spring/dataflow/sample/UsageDetailSenderApplication.java
similarity index 89%
rename from dataflow-website/stream-developer-guides/streams/usage-detail-sender/src/main/java/com/example/demo/UsageDetailSenderApplication.java
rename to dataflow-website/stream-developer-guides/streams/usage-detail-sender/src/main/java/io/spring/dataflow/sample/UsageDetailSenderApplication.java
index 8c8f41a..41e202d 100644
--- a/dataflow-website/stream-developer-guides/streams/usage-detail-sender/src/main/java/com/example/demo/UsageDetailSenderApplication.java
+++ b/dataflow-website/stream-developer-guides/streams/usage-detail-sender/src/main/java/io/spring/dataflow/sample/UsageDetailSenderApplication.java
@@ -1,4 +1,4 @@
-package com.example.demo;
+package io.spring.dataflow.sample;
import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication;
diff --git a/dataflow-website/stream-developer-guides/streams/usage-detail-sender/src/main/java/com/example/demo/domain/UsageDetail.java b/dataflow-website/stream-developer-guides/streams/usage-detail-sender/src/main/java/io/spring/dataflow/sample/domain/UsageDetail.java
similarity index 91%
rename from dataflow-website/stream-developer-guides/streams/usage-detail-sender/src/main/java/com/example/demo/domain/UsageDetail.java
rename to dataflow-website/stream-developer-guides/streams/usage-detail-sender/src/main/java/io/spring/dataflow/sample/domain/UsageDetail.java
index e35ecd5..d36cccf 100644
--- a/dataflow-website/stream-developer-guides/streams/usage-detail-sender/src/main/java/com/example/demo/domain/UsageDetail.java
+++ b/dataflow-website/stream-developer-guides/streams/usage-detail-sender/src/main/java/io/spring/dataflow/sample/domain/UsageDetail.java
@@ -1,4 +1,4 @@
-package com.example.demo.domain;
+package io.spring.dataflow.sample.domain;
public class UsageDetail {
diff --git a/dataflow-website/stream-developer-guides/streams/usage-detail-sender/src/test/java/com/example/demo/UsageDetailSenderApplicationTests.java b/dataflow-website/stream-developer-guides/streams/usage-detail-sender/src/test/java/io/spring/dataflow/sample/UsageDetailSenderApplicationTests.java
similarity index 90%
rename from dataflow-website/stream-developer-guides/streams/usage-detail-sender/src/test/java/com/example/demo/UsageDetailSenderApplicationTests.java
rename to dataflow-website/stream-developer-guides/streams/usage-detail-sender/src/test/java/io/spring/dataflow/sample/UsageDetailSenderApplicationTests.java
index f5139f2..6335299 100644
--- a/dataflow-website/stream-developer-guides/streams/usage-detail-sender/src/test/java/com/example/demo/UsageDetailSenderApplicationTests.java
+++ b/dataflow-website/stream-developer-guides/streams/usage-detail-sender/src/test/java/io/spring/dataflow/sample/UsageDetailSenderApplicationTests.java
@@ -1,4 +1,4 @@
-package com.example.demo;
+package io.spring.dataflow.sample;
import org.junit.Test;
import org.junit.runner.RunWith;