diff --git a/org.springframework.integration.xml/src/main/java/org/springframework/integration/xml/transformer/ResultToDocumentTransformer.java b/org.springframework.integration.xml/src/main/java/org/springframework/integration/xml/transformer/ResultToDocumentTransformer.java
index d5362a9c76..1b3bae813e 100644
--- a/org.springframework.integration.xml/src/main/java/org/springframework/integration/xml/transformer/ResultToDocumentTransformer.java
+++ b/org.springframework.integration.xml/src/main/java/org/springframework/integration/xml/transformer/ResultToDocumentTransformer.java
@@ -66,7 +66,7 @@ public class ResultToDocumentTransformer implements MessageTransformer {
 			throw new MessagingException(message, "Failed to create document from payload type ["
 					+ message.getPayload().getClass().getName() + "]");
 		}
-		return new GenericMessage<Document>(doc, message.getHeader());
+		return new GenericMessage<Document>(doc, message.getHeaders());
 	}
 
 	@SuppressWarnings("unchecked")
diff --git a/org.springframework.integration.xml/src/main/java/org/springframework/integration/xml/transformer/SourceCreatingTransformer.java b/org.springframework.integration.xml/src/main/java/org/springframework/integration/xml/transformer/SourceCreatingTransformer.java
index 1ab2ebefee..8b845e56cc 100644
--- a/org.springframework.integration.xml/src/main/java/org/springframework/integration/xml/transformer/SourceCreatingTransformer.java
+++ b/org.springframework.integration.xml/src/main/java/org/springframework/integration/xml/transformer/SourceCreatingTransformer.java
@@ -45,7 +45,7 @@ public class SourceCreatingTransformer implements MessageTransformer {
 
 	public Message<?> transform(Message<?> message) {
 		Source source = this.sourceFactory.getSourceForMessage(message);
-		return new GenericMessage<Source>(source, message.getHeader());
+		return new GenericMessage<Source>(source, message.getHeaders());
 	}
 
 }
diff --git a/org.springframework.integration.xml/src/main/java/org/springframework/integration/xml/transformer/XmlPayloadMarshallingTransformer.java b/org.springframework.integration.xml/src/main/java/org/springframework/integration/xml/transformer/XmlPayloadMarshallingTransformer.java
index 99941cfd21..5b8eeb16ab 100644
--- a/org.springframework.integration.xml/src/main/java/org/springframework/integration/xml/transformer/XmlPayloadMarshallingTransformer.java
+++ b/org.springframework.integration.xml/src/main/java/org/springframework/integration/xml/transformer/XmlPayloadMarshallingTransformer.java
@@ -74,7 +74,7 @@ public class XmlPayloadMarshallingTransformer implements MessageTransformer {
 		if (transformedPayload == null) {
 			throw new MessageHandlingException(message, "failed to transform payload");
 		}
-		return new GenericMessage(transformedPayload, message.getHeader());
+		return new GenericMessage(transformedPayload, message.getHeaders());
 	}
 
 }
diff --git a/org.springframework.integration.xml/src/main/java/org/springframework/integration/xml/transformer/XmlPayloadUnmarshallingTransformer.java b/org.springframework.integration.xml/src/main/java/org/springframework/integration/xml/transformer/XmlPayloadUnmarshallingTransformer.java
index 6293a8255f..5f8b674299 100644
--- a/org.springframework.integration.xml/src/main/java/org/springframework/integration/xml/transformer/XmlPayloadUnmarshallingTransformer.java
+++ b/org.springframework.integration.xml/src/main/java/org/springframework/integration/xml/transformer/XmlPayloadUnmarshallingTransformer.java
@@ -69,7 +69,7 @@ public class XmlPayloadUnmarshallingTransformer implements MessageTransformer {
 
 		try {
 			Object unmarshalled = this.unmarshaller.unmarshal(source);
-			return new GenericMessage(unmarshalled, message.getHeader());
+			return new GenericMessage(unmarshalled, message.getHeaders());
 		}
 		catch (IOException e) {
 			throw new MessagingException(message, "Failed to unamrshal payload", e);
diff --git a/org.springframework.integration.xml/src/main/java/org/springframework/integration/xml/transformer/XsltPayloadTransformer.java b/org.springframework.integration.xml/src/main/java/org/springframework/integration/xml/transformer/XsltPayloadTransformer.java
index 2271c4bb4c..1cae87481d 100644
--- a/org.springframework.integration.xml/src/main/java/org/springframework/integration/xml/transformer/XsltPayloadTransformer.java
+++ b/org.springframework.integration.xml/src/main/java/org/springframework/integration/xml/transformer/XsltPayloadTransformer.java
@@ -77,7 +77,7 @@ public class XsltPayloadTransformer implements MessageTransformer {
 	protected Message<Result> transformSource(Message message, Source source) throws TransformerException {
 		Result result = resultFactory.getNewResult(message);
 		this.templates.newTransformer().transform(source, result);
-		return new GenericMessage<Result>(result, message.getHeader());
+		return new GenericMessage<Result>(result, message.getHeaders());
 	}
 
 	public void setSourceFactory(SourceFactory sourceFactory) {
diff --git a/org.springframework.integration.xml/src/test/java/org/springframework/integration/xml/config/TestTemplatesFactory.java b/org.springframework.integration.xml/src/test/java/org/springframework/integration/xml/config/TestTemplatesFactory.java
index f44077b758..2764a50e25 100644
--- a/org.springframework.integration.xml/src/test/java/org/springframework/integration/xml/config/TestTemplatesFactory.java
+++ b/org.springframework.integration.xml/src/test/java/org/springframework/integration/xml/config/TestTemplatesFactory.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2007 the original author or authors.
+ * Copyright 2002-2008 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -24,9 +24,7 @@ import org.springframework.beans.factory.FactoryBean;
 import org.springframework.core.io.ClassPathResource;
 
 /**
- * 
  * @author Jonas Partner
- * 
  */
 public class TestTemplatesFactory implements FactoryBean {
 
@@ -41,7 +39,6 @@ public class TestTemplatesFactory implements FactoryBean {
 	}
 
 	public boolean isSingleton() {
-		// TODO Auto-generated method stub
 		return false;
 	}