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 e15745afaa..0b062bd1c0 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
@@ -58,7 +58,7 @@ public final class MessageHeaders implements Map<String, Object>, Serializable {
 
 	private static final Log logger = LogFactory.getLog(MessageHeaders.class);
 	
-	private static volatile IdGenerator messageIdGenerator = null;
+	private static volatile IdGenerator idGenerator = null;
 
 	/**
 	 * The key for the Message ID. This is an automatically generated UUID and
@@ -92,11 +92,11 @@ public final class MessageHeaders implements Map<String, Object>, Serializable {
 
 	public MessageHeaders(Map<String, Object> headers) {
 		this.headers = (headers != null) ? new HashMap<String, Object>(headers) : new HashMap<String, Object>();
-		if (MessageHeaders.messageIdGenerator == null){
+		if (MessageHeaders.idGenerator == null){
 			this.headers.put(ID, UUID.randomUUID());
 		}
 		else {
-			this.headers.put(ID, MessageHeaders.messageIdGenerator.generateId());
+			this.headers.put(ID, MessageHeaders.idGenerator.generateId());
 		}
 		
 		this.headers.put(TIMESTAMP, new Long(System.currentTimeMillis()));