diff --git a/samples/avro-samples/pom.xml b/samples/avro-samples/pom.xml
deleted file mode 100644
index 4fc438e20..000000000
--- a/samples/avro-samples/pom.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<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>avro-samples</artifactId>
-	<version>4.0.0-SNAPSHOT</version>
-	<name>avro-samples</name>
-	<description>avro-samples</description>
-	<packaging>pom</packaging>
-
-	<parent>
-		<groupId>org.springframework.cloud</groupId>
-		<artifactId>spring-cloud-stream-samples-parent</artifactId>
-		<version>4.0.0-SNAPSHOT</version>
-	</parent>
-
-	<modules>
-		<module>confluent-schema-registry-integration</module>
-	</modules>
-
-</project>
diff --git a/samples/avro-samples/confluent-schema-registry-integration/README.adoc b/samples/confluent-schema-registry-integration/README.adoc
similarity index 100%
rename from samples/avro-samples/confluent-schema-registry-integration/README.adoc
rename to samples/confluent-schema-registry-integration/README.adoc
diff --git a/samples/avro-samples/confluent-schema-registry-integration/confluent-schema-registry-integration-consumer/pom.xml b/samples/confluent-schema-registry-integration/confluent-schema-registry-integration-consumer/pom.xml
similarity index 100%
rename from samples/avro-samples/confluent-schema-registry-integration/confluent-schema-registry-integration-consumer/pom.xml
rename to samples/confluent-schema-registry-integration/confluent-schema-registry-integration-consumer/pom.xml
diff --git a/samples/avro-samples/confluent-schema-registry-integration/confluent-schema-registry-integration-consumer/src/main/java/sample/consumer/ConfluentAvroConsumerApplication.java b/samples/confluent-schema-registry-integration/confluent-schema-registry-integration-consumer/src/main/java/sample/consumer/ConfluentAvroConsumerApplication.java
similarity index 100%
rename from samples/avro-samples/confluent-schema-registry-integration/confluent-schema-registry-integration-consumer/src/main/java/sample/consumer/ConfluentAvroConsumerApplication.java
rename to samples/confluent-schema-registry-integration/confluent-schema-registry-integration-consumer/src/main/java/sample/consumer/ConfluentAvroConsumerApplication.java
diff --git a/samples/avro-samples/confluent-schema-registry-integration/confluent-schema-registry-integration-consumer/src/main/resources/application.yml b/samples/confluent-schema-registry-integration/confluent-schema-registry-integration-consumer/src/main/resources/application.yml
similarity index 100%
rename from samples/avro-samples/confluent-schema-registry-integration/confluent-schema-registry-integration-consumer/src/main/resources/application.yml
rename to samples/confluent-schema-registry-integration/confluent-schema-registry-integration-consumer/src/main/resources/application.yml
diff --git a/samples/avro-samples/confluent-schema-registry-integration/confluent-schema-registry-integration-consumer/src/main/resources/avro/sensor.avsc b/samples/confluent-schema-registry-integration/confluent-schema-registry-integration-consumer/src/main/resources/avro/sensor.avsc
similarity index 100%
rename from samples/avro-samples/confluent-schema-registry-integration/confluent-schema-registry-integration-consumer/src/main/resources/avro/sensor.avsc
rename to samples/confluent-schema-registry-integration/confluent-schema-registry-integration-consumer/src/main/resources/avro/sensor.avsc
diff --git a/samples/avro-samples/confluent-schema-registry-integration/confluent-schema-registry-integration-producer1/pom.xml b/samples/confluent-schema-registry-integration/confluent-schema-registry-integration-producer1/pom.xml
similarity index 100%
rename from samples/avro-samples/confluent-schema-registry-integration/confluent-schema-registry-integration-producer1/pom.xml
rename to samples/confluent-schema-registry-integration/confluent-schema-registry-integration-producer1/pom.xml
diff --git a/samples/avro-samples/confluent-schema-registry-integration/confluent-schema-registry-integration-producer1/src/main/java/sample/producer1/ConfluentAvroProducer1Application.java b/samples/confluent-schema-registry-integration/confluent-schema-registry-integration-producer1/src/main/java/sample/producer1/ConfluentAvroProducer1Application.java
similarity index 100%
rename from samples/avro-samples/confluent-schema-registry-integration/confluent-schema-registry-integration-producer1/src/main/java/sample/producer1/ConfluentAvroProducer1Application.java
rename to samples/confluent-schema-registry-integration/confluent-schema-registry-integration-producer1/src/main/java/sample/producer1/ConfluentAvroProducer1Application.java
diff --git a/samples/avro-samples/confluent-schema-registry-integration/confluent-schema-registry-integration-producer1/src/main/resources/application.yml b/samples/confluent-schema-registry-integration/confluent-schema-registry-integration-producer1/src/main/resources/application.yml
similarity index 100%
rename from samples/avro-samples/confluent-schema-registry-integration/confluent-schema-registry-integration-producer1/src/main/resources/application.yml
rename to samples/confluent-schema-registry-integration/confluent-schema-registry-integration-producer1/src/main/resources/application.yml
diff --git a/samples/avro-samples/confluent-schema-registry-integration/confluent-schema-registry-integration-producer1/src/main/resources/avro/sensor.avsc b/samples/confluent-schema-registry-integration/confluent-schema-registry-integration-producer1/src/main/resources/avro/sensor.avsc
similarity index 100%
rename from samples/avro-samples/confluent-schema-registry-integration/confluent-schema-registry-integration-producer1/src/main/resources/avro/sensor.avsc
rename to samples/confluent-schema-registry-integration/confluent-schema-registry-integration-producer1/src/main/resources/avro/sensor.avsc
diff --git a/samples/avro-samples/confluent-schema-registry-integration/confluent-schema-registry-integration-producer2/pom.xml b/samples/confluent-schema-registry-integration/confluent-schema-registry-integration-producer2/pom.xml
similarity index 100%
rename from samples/avro-samples/confluent-schema-registry-integration/confluent-schema-registry-integration-producer2/pom.xml
rename to samples/confluent-schema-registry-integration/confluent-schema-registry-integration-producer2/pom.xml
diff --git a/samples/avro-samples/confluent-schema-registry-integration/confluent-schema-registry-integration-producer2/src/main/java/sample/producer2/ConfluentAvroProducer2Application.java b/samples/confluent-schema-registry-integration/confluent-schema-registry-integration-producer2/src/main/java/sample/producer2/ConfluentAvroProducer2Application.java
similarity index 100%
rename from samples/avro-samples/confluent-schema-registry-integration/confluent-schema-registry-integration-producer2/src/main/java/sample/producer2/ConfluentAvroProducer2Application.java
rename to samples/confluent-schema-registry-integration/confluent-schema-registry-integration-producer2/src/main/java/sample/producer2/ConfluentAvroProducer2Application.java
diff --git a/samples/avro-samples/confluent-schema-registry-integration/confluent-schema-registry-integration-producer2/src/main/resources/application.yml b/samples/confluent-schema-registry-integration/confluent-schema-registry-integration-producer2/src/main/resources/application.yml
similarity index 100%
rename from samples/avro-samples/confluent-schema-registry-integration/confluent-schema-registry-integration-producer2/src/main/resources/application.yml
rename to samples/confluent-schema-registry-integration/confluent-schema-registry-integration-producer2/src/main/resources/application.yml
diff --git a/samples/avro-samples/confluent-schema-registry-integration/confluent-schema-registry-integration-producer2/src/main/resources/avro/sensor.avsc b/samples/confluent-schema-registry-integration/confluent-schema-registry-integration-producer2/src/main/resources/avro/sensor.avsc
similarity index 100%
rename from samples/avro-samples/confluent-schema-registry-integration/confluent-schema-registry-integration-producer2/src/main/resources/avro/sensor.avsc
rename to samples/confluent-schema-registry-integration/confluent-schema-registry-integration-producer2/src/main/resources/avro/sensor.avsc
diff --git a/samples/avro-samples/confluent-schema-registry-integration/mvnw b/samples/confluent-schema-registry-integration/mvnw
similarity index 100%
rename from samples/avro-samples/confluent-schema-registry-integration/mvnw
rename to samples/confluent-schema-registry-integration/mvnw
diff --git a/samples/avro-samples/confluent-schema-registry-integration/mvnw.cmd b/samples/confluent-schema-registry-integration/mvnw.cmd
similarity index 100%
rename from samples/avro-samples/confluent-schema-registry-integration/mvnw.cmd
rename to samples/confluent-schema-registry-integration/mvnw.cmd
diff --git a/samples/avro-samples/confluent-schema-registry-integration/pom.xml b/samples/confluent-schema-registry-integration/pom.xml
similarity index 98%
rename from samples/avro-samples/confluent-schema-registry-integration/pom.xml
rename to samples/confluent-schema-registry-integration/pom.xml
index a4300b4ac..28c254a98 100644
--- a/samples/avro-samples/confluent-schema-registry-integration/pom.xml
+++ b/samples/confluent-schema-registry-integration/pom.xml
@@ -10,7 +10,7 @@
 
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
-		<artifactId>avro-samples</artifactId>
+		<artifactId>spring-cloud-stream-samples-parent</artifactId>
 		<version>4.0.0-SNAPSHOT</version>
 	</parent>
 
diff --git a/samples/pom.xml b/samples/pom.xml
index 478e6ae33..b309bbcf5 100644
--- a/samples/pom.xml
+++ b/samples/pom.xml
@@ -22,7 +22,7 @@
 	</properties>
 
 	<modules>
-		<module>avro-samples</module>
+		<module>confluent-schema-registry-integration</module>
 	</modules>
 
 	<dependencyManagement>