diff --git a/schema-registry-samples/kafka-streams-schema-evolution/README.adoc b/schema-registry-samples/kafka-streams-schema-evolution/README.adoc
index 467dc26..9fd10b6 100644
--- a/schema-registry-samples/kafka-streams-schema-evolution/README.adoc
+++ b/schema-registry-samples/kafka-streams-schema-evolution/README.adoc
@@ -1,7 +1,7 @@
 == Spring Cloud Stream, Kafka Streams and Schema Evolution in Action with Confluent Schema Registry Server!
 
 This repo includes three Spring Boot applications to demonstrate Schema Evolution using Spring Cloud Stream Kafka and Kafka Streams binders support.
-Producer V1 (`kafka-streams-confluent-producer1`), Producer V2 (`kafka-streams-confluent-producer2`), and Consumer (`kafka-streams-confluent-consumer`) are included in this project.
+Producer V1 (`custom-confluent-producer1`), Producer V2 (`custom-confluent-producer2`), and Consumer (`kafka-streams-confluent-consumer`) are included in this project.
 
 Both producers are standard spring cloud stream sources that use the kafka binder.
 They both skip the framework provided serialization on the outbound and relies on Kafka's native serialization mechanism.
@@ -34,15 +34,15 @@ In order to run this sample, you need to set compatibility to `NONE` on Confluen
 ----
 java -jar kafka-streams-confluent-consumer/target/kafka-streams-confluent-consumer-0.0.1-SNAPSHOT.jar
 ----
-- Start `kafka-streams-confluent-producer1` on another terminal session
+- Start `custom-confluent-producer1` on another terminal session
 [source,bash]
 ----
-java -jar kafka-streams-confluent-producer1/target/kafka-streams-confluent-producer1-0.0.1-SNAPSHOT.jar
+java -jar custom-confluent-producer1/target/custom-confluent-producer1-0.0.1-SNAPSHOT.jar
 ----
-- Start `kafka-streams-confluent-producer2` on another terminal session
+- Start `custom-confluent-producer2` on another terminal session
 [source,bash]
 ----
-java -jar kafka-streams-confluent-producer1/target/kafka-streams-confluent-producer1-0.0.1-SNAPSHOT.jar
+java -jar custom-confluent-producer1/target/custom-confluent-producer1-0.0.1-SNAPSHOT.jar
 ----
 
 === Sample Data
diff --git a/schema-registry-samples/kafka-streams-schema-evolution/kafka-streams-confluent-producer1/.gitignore b/schema-registry-samples/kafka-streams-schema-evolution/custom-confluent-producer1/.gitignore
similarity index 100%
rename from schema-registry-samples/kafka-streams-schema-evolution/kafka-streams-confluent-producer1/.gitignore
rename to schema-registry-samples/kafka-streams-schema-evolution/custom-confluent-producer1/.gitignore
diff --git a/schema-registry-samples/kafka-streams-schema-evolution/kafka-streams-confluent-producer1/.mvn/jvm.config b/schema-registry-samples/kafka-streams-schema-evolution/custom-confluent-producer1/.mvn/jvm.config
similarity index 100%
rename from schema-registry-samples/kafka-streams-schema-evolution/kafka-streams-confluent-producer1/.mvn/jvm.config
rename to schema-registry-samples/kafka-streams-schema-evolution/custom-confluent-producer1/.mvn/jvm.config
diff --git a/schema-registry-samples/kafka-streams-schema-evolution/kafka-streams-confluent-producer1/.mvn/maven.config b/schema-registry-samples/kafka-streams-schema-evolution/custom-confluent-producer1/.mvn/maven.config
similarity index 100%
rename from schema-registry-samples/kafka-streams-schema-evolution/kafka-streams-confluent-producer1/.mvn/maven.config
rename to schema-registry-samples/kafka-streams-schema-evolution/custom-confluent-producer1/.mvn/maven.config
diff --git a/schema-registry-samples/kafka-streams-schema-evolution/kafka-streams-confluent-producer1/.mvn/wrapper/maven-wrapper.jar b/schema-registry-samples/kafka-streams-schema-evolution/custom-confluent-producer1/.mvn/wrapper/maven-wrapper.jar
similarity index 100%
rename from schema-registry-samples/kafka-streams-schema-evolution/kafka-streams-confluent-producer1/.mvn/wrapper/maven-wrapper.jar
rename to schema-registry-samples/kafka-streams-schema-evolution/custom-confluent-producer1/.mvn/wrapper/maven-wrapper.jar
diff --git a/schema-registry-samples/kafka-streams-schema-evolution/kafka-streams-confluent-producer1/.mvn/wrapper/maven-wrapper.properties b/schema-registry-samples/kafka-streams-schema-evolution/custom-confluent-producer1/.mvn/wrapper/maven-wrapper.properties
similarity index 100%
rename from schema-registry-samples/kafka-streams-schema-evolution/kafka-streams-confluent-producer1/.mvn/wrapper/maven-wrapper.properties
rename to schema-registry-samples/kafka-streams-schema-evolution/custom-confluent-producer1/.mvn/wrapper/maven-wrapper.properties
diff --git a/schema-registry-samples/kafka-streams-schema-evolution/kafka-streams-confluent-producer1/mvnw b/schema-registry-samples/kafka-streams-schema-evolution/custom-confluent-producer1/mvnw
similarity index 100%
rename from schema-registry-samples/kafka-streams-schema-evolution/kafka-streams-confluent-producer1/mvnw
rename to schema-registry-samples/kafka-streams-schema-evolution/custom-confluent-producer1/mvnw
diff --git a/schema-registry-samples/kafka-streams-schema-evolution/kafka-streams-confluent-producer1/mvnw.cmd b/schema-registry-samples/kafka-streams-schema-evolution/custom-confluent-producer1/mvnw.cmd
similarity index 100%
rename from schema-registry-samples/kafka-streams-schema-evolution/kafka-streams-confluent-producer1/mvnw.cmd
rename to schema-registry-samples/kafka-streams-schema-evolution/custom-confluent-producer1/mvnw.cmd
diff --git a/schema-registry-samples/kafka-streams-schema-evolution/kafka-streams-confluent-producer1/pom.xml b/schema-registry-samples/kafka-streams-schema-evolution/custom-confluent-producer1/pom.xml
similarity index 95%
rename from schema-registry-samples/kafka-streams-schema-evolution/kafka-streams-confluent-producer1/pom.xml
rename to schema-registry-samples/kafka-streams-schema-evolution/custom-confluent-producer1/pom.xml
index 272b690..785d8fc 100644
--- a/schema-registry-samples/kafka-streams-schema-evolution/kafka-streams-confluent-producer1/pom.xml
+++ b/schema-registry-samples/kafka-streams-schema-evolution/custom-confluent-producer1/pom.xml
@@ -2,11 +2,11 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
 
-    <artifactId>kafka-streams-confluent-producer1</artifactId>
+    <artifactId>custom-confluent-producer1</artifactId>
     <version>0.0.1-SNAPSHOT</version>
     <packaging>jar</packaging>
-    <name>kafka-streams-confluent-producer1</name>
-    <description>Kafka Streams Confluent Producer1</description>
+    <name>custom-confluent-producer1</name>
+    <description>Custom Confluent Producer1</description>
 
     <parent>
         <groupId>io.spring.cloud.stream.sample</groupId>
diff --git a/schema-registry-samples/kafka-streams-schema-evolution/kafka-streams-confluent-producer1/src/main/java/sample/producer1/FooSerde.java b/schema-registry-samples/kafka-streams-schema-evolution/custom-confluent-producer1/src/main/java/sample/producer1/FooSerde.java
similarity index 100%
rename from schema-registry-samples/kafka-streams-schema-evolution/kafka-streams-confluent-producer1/src/main/java/sample/producer1/FooSerde.java
rename to schema-registry-samples/kafka-streams-schema-evolution/custom-confluent-producer1/src/main/java/sample/producer1/FooSerde.java
diff --git a/schema-registry-samples/kafka-streams-schema-evolution/kafka-streams-confluent-producer1/src/main/java/sample/producer1/Producer1Application.java b/schema-registry-samples/kafka-streams-schema-evolution/custom-confluent-producer1/src/main/java/sample/producer1/Producer1Application.java
similarity index 100%
rename from schema-registry-samples/kafka-streams-schema-evolution/kafka-streams-confluent-producer1/src/main/java/sample/producer1/Producer1Application.java
rename to schema-registry-samples/kafka-streams-schema-evolution/custom-confluent-producer1/src/main/java/sample/producer1/Producer1Application.java
diff --git a/schema-registry-samples/kafka-streams-schema-evolution/kafka-streams-confluent-producer1/src/main/resources/application.yml b/schema-registry-samples/kafka-streams-schema-evolution/custom-confluent-producer1/src/main/resources/application.yml
similarity index 100%
rename from schema-registry-samples/kafka-streams-schema-evolution/kafka-streams-confluent-producer1/src/main/resources/application.yml
rename to schema-registry-samples/kafka-streams-schema-evolution/custom-confluent-producer1/src/main/resources/application.yml
diff --git a/schema-registry-samples/kafka-streams-schema-evolution/kafka-streams-confluent-producer1/src/main/resources/avro/sensor.avsc b/schema-registry-samples/kafka-streams-schema-evolution/custom-confluent-producer1/src/main/resources/avro/sensor.avsc
similarity index 100%
rename from schema-registry-samples/kafka-streams-schema-evolution/kafka-streams-confluent-producer1/src/main/resources/avro/sensor.avsc
rename to schema-registry-samples/kafka-streams-schema-evolution/custom-confluent-producer1/src/main/resources/avro/sensor.avsc
diff --git a/schema-registry-samples/kafka-streams-schema-evolution/kafka-streams-confluent-producer2/.gitignore b/schema-registry-samples/kafka-streams-schema-evolution/custom-confluent-producer2/.gitignore
similarity index 100%
rename from schema-registry-samples/kafka-streams-schema-evolution/kafka-streams-confluent-producer2/.gitignore
rename to schema-registry-samples/kafka-streams-schema-evolution/custom-confluent-producer2/.gitignore
diff --git a/schema-registry-samples/kafka-streams-schema-evolution/kafka-streams-confluent-producer2/.mvn/jvm.config b/schema-registry-samples/kafka-streams-schema-evolution/custom-confluent-producer2/.mvn/jvm.config
similarity index 100%
rename from schema-registry-samples/kafka-streams-schema-evolution/kafka-streams-confluent-producer2/.mvn/jvm.config
rename to schema-registry-samples/kafka-streams-schema-evolution/custom-confluent-producer2/.mvn/jvm.config
diff --git a/schema-registry-samples/kafka-streams-schema-evolution/kafka-streams-confluent-producer2/.mvn/maven.config b/schema-registry-samples/kafka-streams-schema-evolution/custom-confluent-producer2/.mvn/maven.config
similarity index 100%
rename from schema-registry-samples/kafka-streams-schema-evolution/kafka-streams-confluent-producer2/.mvn/maven.config
rename to schema-registry-samples/kafka-streams-schema-evolution/custom-confluent-producer2/.mvn/maven.config
diff --git a/schema-registry-samples/kafka-streams-schema-evolution/kafka-streams-confluent-producer2/.mvn/wrapper/maven-wrapper.jar b/schema-registry-samples/kafka-streams-schema-evolution/custom-confluent-producer2/.mvn/wrapper/maven-wrapper.jar
similarity index 100%
rename from schema-registry-samples/kafka-streams-schema-evolution/kafka-streams-confluent-producer2/.mvn/wrapper/maven-wrapper.jar
rename to schema-registry-samples/kafka-streams-schema-evolution/custom-confluent-producer2/.mvn/wrapper/maven-wrapper.jar
diff --git a/schema-registry-samples/kafka-streams-schema-evolution/kafka-streams-confluent-producer2/.mvn/wrapper/maven-wrapper.properties b/schema-registry-samples/kafka-streams-schema-evolution/custom-confluent-producer2/.mvn/wrapper/maven-wrapper.properties
similarity index 100%
rename from schema-registry-samples/kafka-streams-schema-evolution/kafka-streams-confluent-producer2/.mvn/wrapper/maven-wrapper.properties
rename to schema-registry-samples/kafka-streams-schema-evolution/custom-confluent-producer2/.mvn/wrapper/maven-wrapper.properties
diff --git a/schema-registry-samples/kafka-streams-schema-evolution/kafka-streams-confluent-producer2/mvnw b/schema-registry-samples/kafka-streams-schema-evolution/custom-confluent-producer2/mvnw
similarity index 100%
rename from schema-registry-samples/kafka-streams-schema-evolution/kafka-streams-confluent-producer2/mvnw
rename to schema-registry-samples/kafka-streams-schema-evolution/custom-confluent-producer2/mvnw
diff --git a/schema-registry-samples/kafka-streams-schema-evolution/kafka-streams-confluent-producer2/mvnw.cmd b/schema-registry-samples/kafka-streams-schema-evolution/custom-confluent-producer2/mvnw.cmd
similarity index 100%
rename from schema-registry-samples/kafka-streams-schema-evolution/kafka-streams-confluent-producer2/mvnw.cmd
rename to schema-registry-samples/kafka-streams-schema-evolution/custom-confluent-producer2/mvnw.cmd
diff --git a/schema-registry-samples/kafka-streams-schema-evolution/kafka-streams-confluent-producer2/pom.xml b/schema-registry-samples/kafka-streams-schema-evolution/custom-confluent-producer2/pom.xml
similarity index 95%
rename from schema-registry-samples/kafka-streams-schema-evolution/kafka-streams-confluent-producer2/pom.xml
rename to schema-registry-samples/kafka-streams-schema-evolution/custom-confluent-producer2/pom.xml
index cc9dc57..0fd9dfc 100644
--- a/schema-registry-samples/kafka-streams-schema-evolution/kafka-streams-confluent-producer2/pom.xml
+++ b/schema-registry-samples/kafka-streams-schema-evolution/custom-confluent-producer2/pom.xml
@@ -2,11 +2,11 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
 
-    <artifactId>kafka-streams-confluent-producer2</artifactId>
+    <artifactId>custom-confluent-producer2</artifactId>
     <version>0.0.1-SNAPSHOT</version>
     <packaging>jar</packaging>
-    <name>kafka-streams-confluent-producer2</name>
-    <description>Kafka Streams Confluent Producer2</description>
+    <name>custom-confluent-producer2</name>
+    <description>Custom Confluent Producer2</description>
 
     <parent>
         <groupId>io.spring.cloud.stream.sample</groupId>
diff --git a/schema-registry-samples/kafka-streams-schema-evolution/kafka-streams-confluent-producer2/src/main/java/sample/producer2/FooSerde.java b/schema-registry-samples/kafka-streams-schema-evolution/custom-confluent-producer2/src/main/java/sample/producer2/FooSerde.java
similarity index 100%
rename from schema-registry-samples/kafka-streams-schema-evolution/kafka-streams-confluent-producer2/src/main/java/sample/producer2/FooSerde.java
rename to schema-registry-samples/kafka-streams-schema-evolution/custom-confluent-producer2/src/main/java/sample/producer2/FooSerde.java
diff --git a/schema-registry-samples/kafka-streams-schema-evolution/kafka-streams-confluent-producer2/src/main/java/sample/producer2/Producer2Application.java b/schema-registry-samples/kafka-streams-schema-evolution/custom-confluent-producer2/src/main/java/sample/producer2/Producer2Application.java
similarity index 100%
rename from schema-registry-samples/kafka-streams-schema-evolution/kafka-streams-confluent-producer2/src/main/java/sample/producer2/Producer2Application.java
rename to schema-registry-samples/kafka-streams-schema-evolution/custom-confluent-producer2/src/main/java/sample/producer2/Producer2Application.java
diff --git a/schema-registry-samples/kafka-streams-schema-evolution/kafka-streams-confluent-producer2/src/main/resources/application.yml b/schema-registry-samples/kafka-streams-schema-evolution/custom-confluent-producer2/src/main/resources/application.yml
similarity index 100%
rename from schema-registry-samples/kafka-streams-schema-evolution/kafka-streams-confluent-producer2/src/main/resources/application.yml
rename to schema-registry-samples/kafka-streams-schema-evolution/custom-confluent-producer2/src/main/resources/application.yml
diff --git a/schema-registry-samples/kafka-streams-schema-evolution/kafka-streams-confluent-producer2/src/main/resources/avro/sensor.avsc b/schema-registry-samples/kafka-streams-schema-evolution/custom-confluent-producer2/src/main/resources/avro/sensor.avsc
similarity index 100%
rename from schema-registry-samples/kafka-streams-schema-evolution/kafka-streams-confluent-producer2/src/main/resources/avro/sensor.avsc
rename to schema-registry-samples/kafka-streams-schema-evolution/custom-confluent-producer2/src/main/resources/avro/sensor.avsc
diff --git a/schema-registry-samples/kafka-streams-schema-evolution/pom.xml b/schema-registry-samples/kafka-streams-schema-evolution/pom.xml
index 6ef6f87..25279d8 100644
--- a/schema-registry-samples/kafka-streams-schema-evolution/pom.xml
+++ b/schema-registry-samples/kafka-streams-schema-evolution/pom.xml
@@ -9,8 +9,8 @@
     <description>Kafka Streams Schema Evolution Sample</description>
 
     <modules>
-        <module>kafka-streams-confluent-producer1</module>
-        <module>kafka-streams-confluent-producer2</module>
+        <module>custom-confluent-producer1</module>
+        <module>custom-confluent-producer2</module>
         <module>kafka-streams-confluent-consumer</module>
     </modules>
 </project>