diff --git a/spring-integration-xml/src/main/java/org/springframework/integration/xml/config/XPathHeaderEnricherParser.java b/spring-integration-xml/src/main/java/org/springframework/integration/xml/config/XPathHeaderEnricherParser.java
index ec6036643a..4e1df1e79e 100644
--- a/spring-integration-xml/src/main/java/org/springframework/integration/xml/config/XPathHeaderEnricherParser.java
+++ b/spring-integration-xml/src/main/java/org/springframework/integration/xml/config/XPathHeaderEnricherParser.java
@@ -35,9 +35,12 @@ import org.springframework.util.StringUtils;
  */
 public class XPathHeaderEnricherParser extends AbstractTransformerParser {
 
+	private static final String PACKAGE = "org.springframework.integration.xml.transformer";
+
+
 	@Override
 	protected final String getTransformerClassName() {
-		return "org.springframework.integration.xml.enricher.XPathHeaderEnricher";
+		return PACKAGE + ".XPathHeaderEnricher";
 	}
 
 	@Override
@@ -59,7 +62,7 @@ public class XPathHeaderEnricherParser extends AbstractTransformerParser {
 				String elementName = node.getLocalName();
 				if ("header".equals(elementName)) {
 					BeanDefinitionBuilder builder = BeanDefinitionBuilder.genericBeanDefinition(
-							"org.springframework.integration.xml.enricher.XPathHeaderEnricher$XPathExpressionEvaluatingHeaderValueMessageProcessor");
+							PACKAGE + ".XPathHeaderEnricher$XPathExpressionEvaluatingHeaderValueMessageProcessor");
 					String expressionString = headerElement.getAttribute("xpath-expression");
 					String expressionRef = headerElement.getAttribute("xpath-expression-ref");
 					boolean isExpressionString = StringUtils.hasText(expressionString);
diff --git a/spring-integration-xml/src/main/java/org/springframework/integration/xml/enricher/XPathHeaderEnricher.java b/spring-integration-xml/src/main/java/org/springframework/integration/xml/transformer/XPathHeaderEnricher.java
similarity index 98%
rename from spring-integration-xml/src/main/java/org/springframework/integration/xml/enricher/XPathHeaderEnricher.java
rename to spring-integration-xml/src/main/java/org/springframework/integration/xml/transformer/XPathHeaderEnricher.java
index 5719ea2052..5d2592dffe 100644
--- a/spring-integration-xml/src/main/java/org/springframework/integration/xml/enricher/XPathHeaderEnricher.java
+++ b/spring-integration-xml/src/main/java/org/springframework/integration/xml/transformer/XPathHeaderEnricher.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.integration.xml.enricher;
+package org.springframework.integration.xml.transformer;
 
 import java.util.Map;
 
diff --git a/spring-integration-xml/src/test/java/org/springframework/integration/xml/enricher/XPathHeaderEnricherTests.java b/spring-integration-xml/src/test/java/org/springframework/integration/xml/transformer/XPathHeaderEnricherTests.java
similarity index 94%
rename from spring-integration-xml/src/test/java/org/springframework/integration/xml/enricher/XPathHeaderEnricherTests.java
rename to spring-integration-xml/src/test/java/org/springframework/integration/xml/transformer/XPathHeaderEnricherTests.java
index 30e1eff81d..2219fcc863 100644
--- a/spring-integration-xml/src/test/java/org/springframework/integration/xml/enricher/XPathHeaderEnricherTests.java
+++ b/spring-integration-xml/src/test/java/org/springframework/integration/xml/transformer/XPathHeaderEnricherTests.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.integration.xml.enricher;
+package org.springframework.integration.xml.transformer;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
@@ -28,7 +28,8 @@ import org.junit.Test;
 import org.springframework.integration.core.Message;
 import org.springframework.integration.core.MessageHeaders;
 import org.springframework.integration.message.MessageBuilder;
-import org.springframework.integration.xml.enricher.XPathHeaderEnricher.XPathExpressionEvaluatingHeaderValueMessageProcessor;
+import org.springframework.integration.xml.transformer.XPathHeaderEnricher;
+import org.springframework.integration.xml.transformer.XPathHeaderEnricher.XPathExpressionEvaluatingHeaderValueMessageProcessor;
 import org.springframework.integration.xml.xpath.XPathEvaluationType;
 
 /**