diff --git a/spring-integration-adapters/src/main/java/META-INF/spring-integration.parsers b/spring-integration-adapters/src/main/java/META-INF/spring-integration.parsers
index 352e771b7c..ff2ac60cea 100644
--- a/spring-integration-adapters/src/main/java/META-INF/spring-integration.parsers
+++ b/spring-integration-adapters/src/main/java/META-INF/spring-integration.parsers
@@ -1,4 +1,4 @@
-file-source=org.springframework.integration.adapter.file.config.FileSourceAdapterParser
+file-source=org.springframework.integration.adapter.file.config.FileSourceParser
 file-target=org.springframework.integration.adapter.file.config.FileTargetAdapterParser
 ftp-source=org.springframework.integration.adapter.ftp.config.FtpSourceParser
 httpinvoker-source=org.springframework.integration.adapter.httpinvoker.config.HttpInvokerSourceAdapterParser
diff --git a/spring-integration-adapters/src/main/java/org/springframework/integration/adapter/file/FileTargetAdapter.java b/spring-integration-adapters/src/main/java/org/springframework/integration/adapter/file/FileTarget.java
similarity index 86%
rename from spring-integration-adapters/src/main/java/org/springframework/integration/adapter/file/FileTargetAdapter.java
rename to spring-integration-adapters/src/main/java/org/springframework/integration/adapter/file/FileTarget.java
index 97f1b4d2cd..ba0c14cdc7 100644
--- a/spring-integration-adapters/src/main/java/org/springframework/integration/adapter/file/FileTargetAdapter.java
+++ b/spring-integration-adapters/src/main/java/org/springframework/integration/adapter/file/FileTarget.java
@@ -23,21 +23,21 @@ import org.springframework.integration.message.Target;
 import org.springframework.util.Assert;
 
 /**
- * A convenience adapter for writing files. The actual file writing occurs in
+ * A message target for writing files. The actual file writing occurs in
  * the message mapper ({@link TextFileMapper} or {@link ByteArrayFileMapper}).
  * 
  * @author Mark Fisher
  */
-public class FileTargetAdapter implements Target {
+public class FileTarget implements Target {
 
 	private AbstractFileMapper<?> mapper;
 
 
-	public FileTargetAdapter(File directory) {
+	public FileTarget(File directory) {
 		this(directory, true);
 	}
 
-	public FileTargetAdapter(File directory, boolean isTextBased) {
+	public FileTarget(File directory, boolean isTextBased) {
 		if (isTextBased) {
 			this.mapper = new TextFileMapper(directory);
 		}
diff --git a/spring-integration-adapters/src/main/java/org/springframework/integration/adapter/file/config/FileSourceAdapterParser.java b/spring-integration-adapters/src/main/java/org/springframework/integration/adapter/file/config/FileSourceParser.java
similarity index 94%
rename from spring-integration-adapters/src/main/java/org/springframework/integration/adapter/file/config/FileSourceAdapterParser.java
rename to spring-integration-adapters/src/main/java/org/springframework/integration/adapter/file/config/FileSourceParser.java
index b72d038810..5d1463e08a 100644
--- a/spring-integration-adapters/src/main/java/org/springframework/integration/adapter/file/config/FileSourceAdapterParser.java
+++ b/spring-integration-adapters/src/main/java/org/springframework/integration/adapter/file/config/FileSourceParser.java
@@ -27,7 +27,7 @@ import org.springframework.integration.adapter.file.FileSource;
  * 
  * @author Mark Fisher
  */
-public class FileSourceAdapterParser extends AbstractSimpleBeanDefinitionParser {
+public class FileSourceParser extends AbstractSimpleBeanDefinitionParser {
 
 	@Override
 	protected Class<?> getBeanClass(Element element) {
diff --git a/spring-integration-adapters/src/main/java/org/springframework/integration/adapter/file/config/FileTargetAdapterParser.java b/spring-integration-adapters/src/main/java/org/springframework/integration/adapter/file/config/FileTargetAdapterParser.java
index cca236b4b5..8d513cf9f3 100644
--- a/spring-integration-adapters/src/main/java/org/springframework/integration/adapter/file/config/FileTargetAdapterParser.java
+++ b/spring-integration-adapters/src/main/java/org/springframework/integration/adapter/file/config/FileTargetAdapterParser.java
@@ -23,7 +23,7 @@ import org.springframework.beans.factory.support.BeanDefinitionBuilder;
 import org.springframework.beans.factory.support.RootBeanDefinition;
 import org.springframework.beans.factory.xml.AbstractSingleBeanDefinitionParser;
 import org.springframework.beans.factory.xml.ParserContext;
-import org.springframework.integration.adapter.file.FileTargetAdapter;
+import org.springframework.integration.adapter.file.FileTarget;
 import org.springframework.integration.endpoint.TargetEndpoint;
 import org.springframework.integration.scheduling.Subscription;
 
@@ -47,7 +47,7 @@ public class FileTargetAdapterParser extends AbstractSingleBeanDefinitionParser
 	}
 
 	protected void doParse(Element element, ParserContext parserContext, BeanDefinitionBuilder builder) {
-		RootBeanDefinition adapterDef = new RootBeanDefinition(FileTargetAdapter.class);
+		RootBeanDefinition adapterDef = new RootBeanDefinition(FileTarget.class);
 		adapterDef.getConstructorArgumentValues().addGenericArgumentValue(element.getAttribute("directory"));
 		String adapterBeanName = parserContext.getReaderContext().generateBeanName(adapterDef);
 		parserContext.registerBeanComponent(new BeanComponentDefinition(adapterDef, adapterBeanName));
diff --git a/spring-integration-adapters/src/test/java/org/springframework/integration/adapter/file/config/FileTargetAdapterParserTests.java b/spring-integration-adapters/src/test/java/org/springframework/integration/adapter/file/config/FileTargetAdapterParserTests.java
index c6683944ae..0a973601d3 100644
--- a/spring-integration-adapters/src/test/java/org/springframework/integration/adapter/file/config/FileTargetAdapterParserTests.java
+++ b/spring-integration-adapters/src/test/java/org/springframework/integration/adapter/file/config/FileTargetAdapterParserTests.java
@@ -22,7 +22,7 @@ import org.junit.Test;
 
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.support.ClassPathXmlApplicationContext;
-import org.springframework.integration.adapter.file.FileTargetAdapter;
+import org.springframework.integration.adapter.file.FileTarget;
 import org.springframework.integration.endpoint.TargetEndpoint;
 
 /**
@@ -34,7 +34,7 @@ public class FileTargetAdapterParserTests {
 	public void testFileTargetAdapterParser() {
 		ApplicationContext context = new ClassPathXmlApplicationContext("fileTargetAdapterParserTests.xml", this.getClass());
 		TargetEndpoint endpoint = (TargetEndpoint) context.getBean("adapter");
-		assertEquals(FileTargetAdapter.class, endpoint.getTarget().getClass());
+		assertEquals(FileTarget.class, endpoint.getTarget().getClass());
 		assertEquals("adapter", endpoint.getName());
 		assertEquals("testChannel", endpoint.getSubscription().getChannelName());
 	}