diff --git a/org.springframework.integration.file/src/main/java/org/springframework/integration/file/DefaultFileNameGenerator.java b/org.springframework.integration.file/src/main/java/org/springframework/integration/file/DefaultFileNameGenerator.java
index 325d017284..0f7b83a18f 100644
--- a/org.springframework.integration.file/src/main/java/org/springframework/integration/file/DefaultFileNameGenerator.java
+++ b/org.springframework.integration.file/src/main/java/org/springframework/integration/file/DefaultFileNameGenerator.java
@@ -32,7 +32,7 @@ import org.springframework.util.StringUtils;
 public class DefaultFileNameGenerator implements FileNameGenerator {
 
 	public String generateFileName(Message<?> message) {
-		String filenameProperty = message.getHeaders().get(FILENAME_PROPERTY_KEY, String.class);
+		String filenameProperty = message.getHeaders().get(FileHeaders.FILENAME, String.class);
 		if (StringUtils.hasText(filenameProperty)) {
 			return filenameProperty;
 		}
diff --git a/org.springframework.integration.file/src/main/java/org/springframework/integration/file/FileHeaders.java b/org.springframework.integration.file/src/main/java/org/springframework/integration/file/FileHeaders.java
new file mode 100644
index 0000000000..b50b3cb873
--- /dev/null
+++ b/org.springframework.integration.file/src/main/java/org/springframework/integration/file/FileHeaders.java
@@ -0,0 +1,31 @@
+/*
+ * 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.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.springframework.integration.file;
+
+/**
+ * Pre-defined header names to be used when storing or retrieving
+ * File-related values to/from integration Message Headers.
+ * 
+ * @author Mark Fisher
+ */
+public abstract class FileHeaders {
+
+	public static final String PREFIX = "spring.integration.file.";
+
+	public static final String FILENAME = PREFIX + "name";
+
+}
diff --git a/org.springframework.integration.file/src/main/java/org/springframework/integration/file/FileNameGenerator.java b/org.springframework.integration.file/src/main/java/org/springframework/integration/file/FileNameGenerator.java
index 3e0318ddef..d838ec4d5b 100644
--- a/org.springframework.integration.file/src/main/java/org/springframework/integration/file/FileNameGenerator.java
+++ b/org.springframework.integration.file/src/main/java/org/springframework/integration/file/FileNameGenerator.java
@@ -25,9 +25,6 @@ import org.springframework.integration.core.Message;
  */
 public interface FileNameGenerator {
 
-	String FILENAME_PROPERTY_KEY = "filename";
-
-
 	String generateFileName(Message<?> message);
 
 }
diff --git a/org.springframework.integration.file/src/main/java/org/springframework/integration/file/transformer/AbstractFilePayloadTransformer.java b/org.springframework.integration.file/src/main/java/org/springframework/integration/file/transformer/AbstractFilePayloadTransformer.java
index 530a7f4091..f7381d80ff 100644
--- a/org.springframework.integration.file/src/main/java/org/springframework/integration/file/transformer/AbstractFilePayloadTransformer.java
+++ b/org.springframework.integration.file/src/main/java/org/springframework/integration/file/transformer/AbstractFilePayloadTransformer.java
@@ -23,7 +23,7 @@ import org.apache.commons.logging.LogFactory;
 
 import org.springframework.integration.core.Message;
 import org.springframework.integration.core.MessagingException;
-import org.springframework.integration.file.FileNameGenerator;
+import org.springframework.integration.file.FileHeaders;
 import org.springframework.integration.message.MessageBuilder;
 import org.springframework.integration.transformer.Transformer;
 import org.springframework.util.Assert;
@@ -58,7 +58,7 @@ public abstract class AbstractFilePayloadTransformer<T> implements Transformer {
 	        T result = this.transformFile(file);
 	        Message<?> transformedMessage = MessageBuilder.withPayload(result)
 	        		.copyHeaders(message.getHeaders())
-	        		.setHeaderIfAbsent(FileNameGenerator.FILENAME_PROPERTY_KEY, file.getName())
+	        		.setHeaderIfAbsent(FileHeaders.FILENAME, file.getName())
 	        		.build();
 			if (this.deleteFiles) {
 				if (!file.delete() && this.logger.isWarnEnabled()) {
diff --git a/org.springframework.integration.mail/src/main/java/org/springframework/integration/mail/MailHeaders.java b/org.springframework.integration.mail/src/main/java/org/springframework/integration/mail/MailHeaders.java
index bbd66ab69f..5f34ff8289 100644
--- a/org.springframework.integration.mail/src/main/java/org/springframework/integration/mail/MailHeaders.java
+++ b/org.springframework.integration.mail/src/main/java/org/springframework/integration/mail/MailHeaders.java
@@ -22,7 +22,7 @@ package org.springframework.integration.mail;
  * 
  * @author Mark Fisher
  */
-public class MailHeaders {
+public abstract class MailHeaders {
 
 	public static final String PREFIX = "spring.integration.mail.";
 
diff --git a/org.springframework.integration.ws/src/main/java/org/springframework/integration/ws/WebServiceHeaders.java b/org.springframework.integration.ws/src/main/java/org/springframework/integration/ws/WebServiceHeaders.java
index 4896afaaeb..bed2c9f098 100644
--- a/org.springframework.integration.ws/src/main/java/org/springframework/integration/ws/WebServiceHeaders.java
+++ b/org.springframework.integration.ws/src/main/java/org/springframework/integration/ws/WebServiceHeaders.java
@@ -22,7 +22,7 @@ package org.springframework.integration.ws;
  * 
  * @author Mark Fisher
  */
-public class WebServiceHeaders {
+public abstract class WebServiceHeaders {
 
 	public static final String PREFIX = "spring.integration.ws.";