diff --git a/spring-rabbit/src/main/java/org/springframework/amqp/rabbit/listener/SimpleMessageListenerContainer.java b/spring-rabbit/src/main/java/org/springframework/amqp/rabbit/listener/SimpleMessageListenerContainer.java
index f47e042890..9856b9aa5e 100644
--- a/spring-rabbit/src/main/java/org/springframework/amqp/rabbit/listener/SimpleMessageListenerContainer.java
+++ b/spring-rabbit/src/main/java/org/springframework/amqp/rabbit/listener/SimpleMessageListenerContainer.java
@@ -48,7 +48,7 @@
 import org.springframework.amqp.rabbit.connection.RabbitResourceHolder;
 import org.springframework.amqp.rabbit.connection.RabbitUtils;
 import org.springframework.amqp.rabbit.connection.SimpleResourceHolder;
-import org.springframework.amqp.rabbit.listener.api.ChannelAwareBatchMessagelistener;
+import org.springframework.amqp.rabbit.listener.api.ChannelAwareBatchMessageListener;
 import org.springframework.amqp.rabbit.listener.exception.FatalListenerExecutionException;
 import org.springframework.amqp.rabbit.listener.exception.FatalListenerStartupException;
 import org.springframework.amqp.rabbit.support.ActiveObjectCounter;
@@ -516,7 +516,7 @@ protected final boolean sharedConnectionEnabled() {
 	@Override
 	protected void doInitialize() {
 		Assert.state(!this.consumerBatchEnabled || getMessageListener() instanceof BatchMessageListener
-				|| getMessageListener() instanceof ChannelAwareBatchMessagelistener,
+				|| getMessageListener() instanceof ChannelAwareBatchMessageListener,
 				"When setting 'consumerBatchEnabled' to true, the listener must support batching");
 		Assert.state(!this.consumerBatchEnabled  || isDeBatchingEnabled(),
 				"When setting 'consumerBatchEnabled' to true, 'deBatchingEnabled' must also be true");
diff --git a/spring-rabbit/src/main/java/org/springframework/amqp/rabbit/listener/adapter/BatchMessagingMessageListenerAdapter.java b/spring-rabbit/src/main/java/org/springframework/amqp/rabbit/listener/adapter/BatchMessagingMessageListenerAdapter.java
index 997f66646d..6667a7b94f 100644
--- a/spring-rabbit/src/main/java/org/springframework/amqp/rabbit/listener/adapter/BatchMessagingMessageListenerAdapter.java
+++ b/spring-rabbit/src/main/java/org/springframework/amqp/rabbit/listener/adapter/BatchMessagingMessageListenerAdapter.java
@@ -22,7 +22,7 @@
 
 import org.springframework.amqp.rabbit.batch.BatchingStrategy;
 import org.springframework.amqp.rabbit.batch.SimpleBatchingStrategy;
-import org.springframework.amqp.rabbit.listener.api.ChannelAwareBatchMessagelistener;
+import org.springframework.amqp.rabbit.listener.api.ChannelAwareBatchMessageListener;
 import org.springframework.amqp.rabbit.listener.api.RabbitListenerErrorHandler;
 import org.springframework.amqp.rabbit.support.RabbitExceptionTranslator;
 import org.springframework.lang.Nullable;
@@ -40,7 +40,7 @@
  *
  */
 public class BatchMessagingMessageListenerAdapter extends MessagingMessageListenerAdapter
-			implements ChannelAwareBatchMessagelistener {
+			implements ChannelAwareBatchMessageListener {
 
 	private final MessagingMessageConverterAdapter converterAdapter;
 
diff --git a/spring-rabbit/src/main/java/org/springframework/amqp/rabbit/listener/api/ChannelAwareBatchMessagelistener.java b/spring-rabbit/src/main/java/org/springframework/amqp/rabbit/listener/api/ChannelAwareBatchMessageListener.java
similarity index 94%
rename from spring-rabbit/src/main/java/org/springframework/amqp/rabbit/listener/api/ChannelAwareBatchMessagelistener.java
rename to spring-rabbit/src/main/java/org/springframework/amqp/rabbit/listener/api/ChannelAwareBatchMessageListener.java
index ca74e0428f..f80cad7523 100644
--- a/spring-rabbit/src/main/java/org/springframework/amqp/rabbit/listener/api/ChannelAwareBatchMessagelistener.java
+++ b/spring-rabbit/src/main/java/org/springframework/amqp/rabbit/listener/api/ChannelAwareBatchMessageListener.java
@@ -29,7 +29,7 @@
  * @since 2.2
  *
  */
-public interface ChannelAwareBatchMessagelistener extends ChannelAwareMessageListener {
+public interface ChannelAwareBatchMessageListener extends ChannelAwareMessageListener {
 
 	@Override
 	default void onMessage(Message message, Channel channel) throws Exception {