diff --git a/documentation/spring-boot-docs/src/docs/antora/modules/reference/pages/messaging/amqp.adoc b/documentation/spring-boot-docs/src/docs/antora/modules/reference/pages/messaging/amqp.adoc
index aaa67268da6..a7b5befce73 100644
--- a/documentation/spring-boot-docs/src/docs/antora/modules/reference/pages/messaging/amqp.adoc
+++ b/documentation/spring-boot-docs/src/docs/antora/modules/reference/pages/messaging/amqp.adoc
@@ -3,7 +3,7 @@
 
 The Advanced Message Queuing Protocol (AMQP) is a platform-neutral, wire-level protocol for message-oriented middleware.
 The Spring AMQP project applies core Spring concepts to the development of AMQP-based messaging solutions.
-Spring Boot offers several conveniences for working with AMQP through RabbitMQ, including the `spring-boot-starter-amqp` starter.
+Spring Boot offers several conveniences for working with AMQP through RabbitMQ, including the `spring-boot-starter-rabbitmq` starter.
 
 
 
diff --git a/module/spring-boot-rabbitmq/build.gradle b/module/spring-boot-rabbitmq/build.gradle
index 0152cb160b8..4942083bfa4 100644
--- a/module/spring-boot-rabbitmq/build.gradle
+++ b/module/spring-boot-rabbitmq/build.gradle
@@ -23,7 +23,7 @@ plugins {
 	id "org.springframework.boot.optional-dependencies"
 }
 
-description = "Spring Boot AMQP"
+description = "Spring Boot RabbitMQ"
 
 dependencies {
 	api(project(":core:spring-boot"))
diff --git a/smoke-test/spring-boot-smoke-test-rabbitmq/build.gradle b/smoke-test/spring-boot-smoke-test-rabbitmq/build.gradle
index 6da49cf2ee9..48fe3815c2b 100644
--- a/smoke-test/spring-boot-smoke-test-rabbitmq/build.gradle
+++ b/smoke-test/spring-boot-smoke-test-rabbitmq/build.gradle
@@ -19,7 +19,7 @@ plugins {
 	id "org.springframework.boot.docker-test"
 }
 
-description = "Spring Boot AMQP smoke test"
+description = "Spring Boot RabbitMQ smoke test"
 
 dependencies {
 	implementation(project(":starter:spring-boot-starter-rabbitmq"))
diff --git a/starter/spring-boot-starter-rabbitmq-test/build.gradle b/starter/spring-boot-starter-rabbitmq-test/build.gradle
index 1ceffd67e6a..217f6ee7189 100644
--- a/starter/spring-boot-starter-rabbitmq-test/build.gradle
+++ b/starter/spring-boot-starter-rabbitmq-test/build.gradle
@@ -18,7 +18,7 @@ plugins {
 	id "org.springframework.boot.starter"
 }
 
-description = "Starter for testing Spring AMQP and Rabbit MQ"
+description = "Starter for testing RabbitMQ messaging and streaming broker"
 
 dependencies {
 	api(project(":starter:spring-boot-starter-rabbitmq"))
diff --git a/starter/spring-boot-starter-rabbitmq/build.gradle b/starter/spring-boot-starter-rabbitmq/build.gradle
index ff4e3da9c00..64879f96866 100644
--- a/starter/spring-boot-starter-rabbitmq/build.gradle
+++ b/starter/spring-boot-starter-rabbitmq/build.gradle
@@ -18,7 +18,7 @@ plugins {
 	id "org.springframework.boot.starter"
 }
 
-description = "Starter for using Spring AMQP and Rabbit MQ"
+description = "Starter for using RabbitMQ messaging and streaming broker"
 
 dependencies {
 	api(project(":starter:spring-boot-starter"))