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 96c40dd8f5..1f592d9bb4 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
@@ -106,13 +106,13 @@ public final class MessageHeaders implements Map<String, Object>, Serializable {
 	}
 
 
-	public static void setMessageIdGenerationStrategy(IdGenerator messageIdGenerationStrategy) {
+	public static void setIdGenerator(IdGenerator messageIdGenerator) {
 		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);
+			logger.info("Message IDs will be generated using custom ID generation strategy: " + messageIdGenerator);
 		}
-		MessageHeaders.messageIdGenerator = messageIdGenerationStrategy;
+		MessageHeaders.messageIdGenerator = messageIdGenerator;
 	}
 	
 	public static void resetIdGenerator(){
diff --git a/spring-integration-core/src/main/java/org/springframework/integration/config/IdGeneratorConfigurer.java b/spring-integration-core/src/main/java/org/springframework/integration/config/IdGeneratorConfigurer.java
index 2c17894e4c..b5a65749f3 100644
--- a/spring-integration-core/src/main/java/org/springframework/integration/config/IdGeneratorConfigurer.java
+++ b/spring-integration-core/src/main/java/org/springframework/integration/config/IdGeneratorConfigurer.java
@@ -53,7 +53,7 @@ public class IdGeneratorConfigurer implements ApplicationListener<ContextRefresh
 			if (logger.isDebugEnabled()) {
 				logger.debug("Using MessageHeaders.IdGenerator [" + idGenerationStrategy + "]");
 			}
-			MessageHeaders.setMessageIdGenerationStrategy(idGenerationStrategy);
+			MessageHeaders.setIdGenerator(idGenerationStrategy);
 		}
 		catch (NoSuchBeanDefinitionException ex) {
 			// We need to use the default.
diff --git a/spring-integration-core/src/test/java/org/springframework/integration/core/MessageIdGenerationTests.java b/spring-integration-core/src/test/java/org/springframework/integration/core/MessageIdGenerationTests.java
index c91448409a..861e7a835b 100644
--- a/spring-integration-core/src/test/java/org/springframework/integration/core/MessageIdGenerationTests.java
+++ b/spring-integration-core/src/test/java/org/springframework/integration/core/MessageIdGenerationTests.java
@@ -62,7 +62,7 @@ public class MessageIdGenerationTests {
 		watch.stop();
 		double defaultGeneratorElapsedTime = watch.getTotalTimeSeconds();
 		
-		MessageHeaders.setMessageIdGenerationStrategy(new IdGenerator() {
+		MessageHeaders.setIdGenerator(new IdGenerator() {
 			public UUID generateId() {
 				return TimeBasedUUIDGenerator.generateId();
 			}