diff --git a/spring-integration-core/src/main/java/org/springframework/integration/IntegrationContextRefreshListener.java b/spring-integration-core/src/main/java/org/springframework/integration/IntegrationContextRefreshListener.java
index 14fc1a9778..1ed22d0eca 100644
--- a/spring-integration-core/src/main/java/org/springframework/integration/IntegrationContextRefreshListener.java
+++ b/spring-integration-core/src/main/java/org/springframework/integration/IntegrationContextRefreshListener.java
@@ -50,14 +50,14 @@ public class IntegrationContextRefreshListener implements ApplicationListener<Co
 			IdGenerator idGenerationStrategy = 
 				event.getApplicationContext().getBean(IdGenerator.class);
 			if (logger.isDebugEnabled()) {
-				logger.debug("Using MessageHeaders.MessageIdGenerationStrategy [" + idGenerationStrategy + "]");
+				logger.debug("Using MessageHeaders.IdGenerator [" + idGenerationStrategy + "]");
 			}
 			MessageHeaders.setMessageIdGenerationStrategy(idGenerationStrategy);
 		}
 		catch (NoSuchBeanDefinitionException ex) {
 			// We need to use the default.
 			if (logger.isDebugEnabled()) {
-				logger.debug("Unable to locate MessageHeaders.MessageIdGenerationStrategy. Will use default UUID.randomUUID()");
+				logger.debug("Unable to locate MessageHeaders.IdGenerator. Will use default UUID.randomUUID()");
 			}
 		}
 	}
diff --git a/spring-integration-core/src/main/java/org/springframework/integration/MessageHeaders.java b/spring-integration-core/src/main/java/org/springframework/integration/MessageHeaders.java
index 291910ca40..96c40dd8f5 100644
--- a/spring-integration-core/src/main/java/org/springframework/integration/MessageHeaders.java
+++ b/spring-integration-core/src/main/java/org/springframework/integration/MessageHeaders.java
@@ -107,7 +107,7 @@ public final class MessageHeaders implements Map<String, Object>, Serializable {
 
 
 	public static void setMessageIdGenerationStrategy(IdGenerator messageIdGenerationStrategy) {
-		Assert.state(MessageHeaders.messageIdGenerator instanceof DefaultIdGenerator, "'MessageHeaders.messageIdGenerationStrategy' " +
+		Assert.state(MessageHeaders.messageIdGenerator instanceof DefaultIdGenerator, "'MessageHeaders.messageIdGenerator' " +
 			"has already been set and can not be set again, unless reset() method is called");
 		if (logger.isInfoEnabled()){
 			logger.info("Message IDs will be generated using custom ID generation strategy: " + messageIdGenerationStrategy);