diff --git a/spring-kafka/src/main/java/org/springframework/kafka/config/AbstractKafkaListenerEndpoint.java b/spring-kafka/src/main/java/org/springframework/kafka/config/AbstractKafkaListenerEndpoint.java
index ab255aec..efbbf0f4 100644
--- a/spring-kafka/src/main/java/org/springframework/kafka/config/AbstractKafkaListenerEndpoint.java
+++ b/spring-kafka/src/main/java/org/springframework/kafka/config/AbstractKafkaListenerEndpoint.java
@@ -145,7 +145,7 @@ public abstract class AbstractKafkaListenerEndpoint<K, V>
 
 	/**
 	 * Set the group id to override the {@code group.id} property in the
-	 * connectionFactory.
+	 * ContainerFactory.
 	 * @param groupId the group id.
 	 * @since 1.3
 	 */
diff --git a/spring-kafka/src/main/java/org/springframework/kafka/core/ProducerFactoryUtils.java b/spring-kafka/src/main/java/org/springframework/kafka/core/ProducerFactoryUtils.java
index 2b945b14..af5c74df 100644
--- a/spring-kafka/src/main/java/org/springframework/kafka/core/ProducerFactoryUtils.java
+++ b/spring-kafka/src/main/java/org/springframework/kafka/core/ProducerFactoryUtils.java
@@ -43,7 +43,7 @@ public final class ProducerFactoryUtils {
 
 	/**
 	 * Obtain a Producer that is synchronized with the current transaction, if any.
-	 * @param producerFactory the ConnectionFactory to obtain a Channel for
+	 * @param producerFactory the ProducerFactory to obtain a Channel for
 	 * @param <K> the key type.
 	 * @param <V> the value type.
 	 * @return the resource holder.
@@ -106,12 +106,12 @@ public final class ProducerFactoryUtils {
 	}
 
 	private static <K, V> void bindResourceToTransaction(KafkaResourceHolder<K, V> resourceHolder,
-			ProducerFactory<K, V> connectionFactory) {
-		TransactionSynchronizationManager.bindResource(connectionFactory, resourceHolder);
+			ProducerFactory<K, V> producerFactory) {
+		TransactionSynchronizationManager.bindResource(producerFactory, resourceHolder);
 		resourceHolder.setSynchronizedWithTransaction(true);
 		if (TransactionSynchronizationManager.isSynchronizationActive()) {
 			TransactionSynchronizationManager
-					.registerSynchronization(new KafkaResourceSynchronization<K, V>(resourceHolder, connectionFactory));
+					.registerSynchronization(new KafkaResourceSynchronization<K, V>(resourceHolder, producerFactory));
 		}
 	}
 
diff --git a/spring-kafka/src/main/java/org/springframework/kafka/transaction/KafkaTransactionManager.java b/spring-kafka/src/main/java/org/springframework/kafka/transaction/KafkaTransactionManager.java
index 830d4ed4..7a221b60 100644
--- a/spring-kafka/src/main/java/org/springframework/kafka/transaction/KafkaTransactionManager.java
+++ b/spring-kafka/src/main/java/org/springframework/kafka/transaction/KafkaTransactionManager.java
@@ -71,7 +71,7 @@ public class KafkaTransactionManager<K, V> extends AbstractPlatformTransactionMa
 	private final ProducerFactory<K, V> producerFactory;
 
 	/**
-	 * Create a new KafkaTransactionManager, given a ConnectionFactory.
+	 * Create a new KafkaTransactionManager, given a ProducerFactory.
 	 * Transaction synchronization is turned off by default, as this manager might be used alongside a datastore-based
 	 * Spring transaction manager like DataSourceTransactionManager, which has stronger needs for synchronization. Only
 	 * one manager is allowed to drive synchronization at any point of time.
diff --git a/src/reference/asciidoc/kafka.adoc b/src/reference/asciidoc/kafka.adoc
index 17c13f23..ed67781d 100644
--- a/src/reference/asciidoc/kafka.adoc
+++ b/src/reference/asciidoc/kafka.adoc
@@ -1517,12 +1517,12 @@ To configure this feature, set the `idleEventInterval` on the container:
 [source, java]
 ----
 @Bean
-public KafKaMessageListenerContainer(ConnectionFactory connectionFactory) {
+public KafkaMessageListenerContainer(ConsumerFactory<String, String> consumerFactory) {
     ContainerProperties containerProps = new ContainerProperties("topic1", "topic2");
     ...
     containerProps.setIdleEventInterval(60000L);
     ...
-    KafKaMessageListenerContainer<String, String> container = new KafKaMessageListenerContainer<>(...);
+    KafkaMessageListenerContainer<String, String> container = new KafKaMessageListenerContainer<>(...);
     return container;
 }
 ----