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 28c5e1493a..e422853a7f 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,7 +1,7 @@
 console-source=org.springframework.integration.adapter.stream.config.ConsoleSourceParser
 console-target=org.springframework.integration.adapter.stream.config.ConsoleTargetParser
 file-source=org.springframework.integration.adapter.file.config.FileSourceParser
-file-target=org.springframework.integration.adapter.file.config.FileTargetAdapterParser
+file-target=org.springframework.integration.adapter.file.config.FileTargetParser
 ftp-source=org.springframework.integration.adapter.ftp.config.FtpSourceParser
 httpinvoker-source=org.springframework.integration.adapter.httpinvoker.config.HttpInvokerSourceAdapterParser
 httpinvoker-target=org.springframework.integration.adapter.httpinvoker.config.HttpInvokerTargetAdapterParser
diff --git a/spring-integration-adapters/src/main/java/org/springframework/integration/adapter/config/spring-integration-adapters-1.0.xsd b/spring-integration-adapters/src/main/java/org/springframework/integration/adapter/config/spring-integration-adapters-1.0.xsd
index 43f0d73dc8..52d5ac6035 100644
--- a/spring-integration-adapters/src/main/java/org/springframework/integration/adapter/config/spring-integration-adapters-1.0.xsd
+++ b/spring-integration-adapters/src/main/java/org/springframework/integration/adapter/config/spring-integration-adapters-1.0.xsd
@@ -32,12 +32,11 @@
 		<xsd:complexType>
 			<xsd:annotation>
 				<xsd:documentation>
-	Defines a file-based target channel adapter.
+	Defines a file-based target.
 				</xsd:documentation>
 			</xsd:annotation>
 			<xsd:attribute name="id" type="xsd:string"/>
 			<xsd:attribute name="directory" type="xsd:string" use="required"/>
-			<xsd:attribute name="channel" type="xsd:string" use="required"/>
 		</xsd:complexType>
 	</xsd: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/FileTargetParser.java
similarity index 58%
rename from spring-integration-adapters/src/main/java/org/springframework/integration/adapter/file/config/FileTargetAdapterParser.java
rename to spring-integration-adapters/src/main/java/org/springframework/integration/adapter/file/config/FileTargetParser.java
index 8d513cf9f3..7ac778b54c 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/FileTargetParser.java
@@ -18,24 +18,20 @@ package org.springframework.integration.adapter.file.config;
 
 import org.w3c.dom.Element;
 
-import org.springframework.beans.factory.parsing.BeanComponentDefinition;
 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.FileTarget;
-import org.springframework.integration.endpoint.TargetEndpoint;
-import org.springframework.integration.scheduling.Subscription;
 
 /**
  * Parser for the &lt;file-target/&gt; element. 
  * 
  * @author Mark Fisher
  */
-public class FileTargetAdapterParser extends AbstractSingleBeanDefinitionParser {
+public class FileTargetParser extends AbstractSingleBeanDefinitionParser {
 
 	protected Class<?> getBeanClass(Element element) {
-		return TargetEndpoint.class;
+		return FileTarget.class;
 	}
 
 	protected boolean shouldGenerateId() {
@@ -47,14 +43,7 @@ public class FileTargetAdapterParser extends AbstractSingleBeanDefinitionParser
 	}
 
 	protected void doParse(Element element, ParserContext parserContext, BeanDefinitionBuilder builder) {
-		RootBeanDefinition adapterDef = new RootBeanDefinition(FileTarget.class);
-		adapterDef.getConstructorArgumentValues().addGenericArgumentValue(element.getAttribute("directory"));
-		String adapterBeanName = parserContext.getReaderContext().generateBeanName(adapterDef);
-		parserContext.registerBeanComponent(new BeanComponentDefinition(adapterDef, adapterBeanName));
-		builder.addConstructorArgReference(adapterBeanName);
-		String channel = element.getAttribute("channel");
-		Subscription subscription = new Subscription(channel);
-		builder.addPropertyValue("subscription", subscription);
+		builder.addConstructorArgValue(element.getAttribute("directory"));
 	}
 
 }
diff --git a/spring-integration-adapters/src/test/java/org/springframework/integration/adapter/file/config/FileSourceAdapterParserTests.java b/spring-integration-adapters/src/test/java/org/springframework/integration/adapter/file/config/FileSourceParserTests.java
similarity index 90%
rename from spring-integration-adapters/src/test/java/org/springframework/integration/adapter/file/config/FileSourceAdapterParserTests.java
rename to spring-integration-adapters/src/test/java/org/springframework/integration/adapter/file/config/FileSourceParserTests.java
index 9ddded6c0a..893f887b1c 100644
--- a/spring-integration-adapters/src/test/java/org/springframework/integration/adapter/file/config/FileSourceAdapterParserTests.java
+++ b/spring-integration-adapters/src/test/java/org/springframework/integration/adapter/file/config/FileSourceParserTests.java
@@ -30,11 +30,11 @@ import org.springframework.integration.adapter.file.FileSource;
 /**
  * @author Mark Fisher
  */
-public class FileSourceAdapterParserTests {
+public class FileSourceParserTests {
 
 	@Test
-	public void testFileSourceAdapterParser() {
-		ApplicationContext context = new ClassPathXmlApplicationContext("fileSourceAdapterParserTests.xml", this.getClass());
+	public void testFileSource() {
+		ApplicationContext context = new ClassPathXmlApplicationContext("fileSourceParserTests.xml", this.getClass());
 		FileSource fileSource = (FileSource) context.getBean("fileSource");
 		DirectFieldAccessor sourceAccessor = new DirectFieldAccessor(fileSource);
 		File directory = (File) sourceAccessor.getPropertyValue("directory");
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/FileTargetParserTests.java
similarity index 69%
rename from spring-integration-adapters/src/test/java/org/springframework/integration/adapter/file/config/FileTargetAdapterParserTests.java
rename to spring-integration-adapters/src/test/java/org/springframework/integration/adapter/file/config/FileTargetParserTests.java
index 0a973601d3..dccf4248b5 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/FileTargetParserTests.java
@@ -23,20 +23,18 @@ import org.junit.Test;
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.support.ClassPathXmlApplicationContext;
 import org.springframework.integration.adapter.file.FileTarget;
-import org.springframework.integration.endpoint.TargetEndpoint;
+import org.springframework.integration.message.Target;
 
 /**
  * @author Mark Fisher
  */
-public class FileTargetAdapterParserTests {
+public class FileTargetParserTests {
 
 	@Test
-	public void testFileTargetAdapterParser() {
-		ApplicationContext context = new ClassPathXmlApplicationContext("fileTargetAdapterParserTests.xml", this.getClass());
-		TargetEndpoint endpoint = (TargetEndpoint) context.getBean("adapter");
-		assertEquals(FileTarget.class, endpoint.getTarget().getClass());
-		assertEquals("adapter", endpoint.getName());
-		assertEquals("testChannel", endpoint.getSubscription().getChannelName());
+	public void testFileTarget() {
+		ApplicationContext context = new ClassPathXmlApplicationContext("fileTargetParserTests.xml", this.getClass());
+		Target target = (Target) context.getBean("target");
+		assertEquals(FileTarget.class, target.getClass());
 	}
 
 }
diff --git a/spring-integration-adapters/src/test/java/org/springframework/integration/adapter/file/config/fileSourceAdapterParserTests.xml b/spring-integration-adapters/src/test/java/org/springframework/integration/adapter/file/config/fileSourceParserTests.xml
similarity index 100%
rename from spring-integration-adapters/src/test/java/org/springframework/integration/adapter/file/config/fileSourceAdapterParserTests.xml
rename to spring-integration-adapters/src/test/java/org/springframework/integration/adapter/file/config/fileSourceParserTests.xml
diff --git a/spring-integration-adapters/src/test/java/org/springframework/integration/adapter/file/config/fileTargetAdapterParserTests.xml b/spring-integration-adapters/src/test/java/org/springframework/integration/adapter/file/config/fileTargetParserTests.xml
similarity index 90%
rename from spring-integration-adapters/src/test/java/org/springframework/integration/adapter/file/config/fileTargetAdapterParserTests.xml
rename to spring-integration-adapters/src/test/java/org/springframework/integration/adapter/file/config/fileTargetParserTests.xml
index 88a4ae1cac..46b6197d2e 100644
--- a/spring-integration-adapters/src/test/java/org/springframework/integration/adapter/file/config/fileTargetAdapterParserTests.xml
+++ b/spring-integration-adapters/src/test/java/org/springframework/integration/adapter/file/config/fileTargetParserTests.xml
@@ -14,7 +14,7 @@
 
 	<si:channel id="testChannel"/>
 
-	<si:file-target id="adapter" directory="${java.io.tmpdir}" channel="testChannel"/>
+	<si:file-target id="target" directory="${java.io.tmpdir}"/>
 
 	<context:property-placeholder/>
 
diff --git a/spring-integration-samples/src/main/java/org/springframework/integration/samples/filecopy/fileCopyDemo.xml b/spring-integration-samples/src/main/java/org/springframework/integration/samples/filecopy/fileCopyDemo.xml
index ecfeb2c9d2..ccc1998598 100644
--- a/spring-integration-samples/src/main/java/org/springframework/integration/samples/filecopy/fileCopyDemo.xml
+++ b/spring-integration-samples/src/main/java/org/springframework/integration/samples/filecopy/fileCopyDemo.xml
@@ -22,9 +22,11 @@
 	<handler-endpoint input-channel="channel1" output-channel="channel2"
               handler="exclaimer" method="exclaim"/>
 
+	<target-endpoint input-channel="channel2" target="fileTarget"/>
+
 	<file-source id="fileSource" directory="${java.io.tmpdir}/spring-integration-samples/input"/>
 
-	<file-target directory="${java.io.tmpdir}/spring-integration-samples/output" channel="channel2"/>
+	<file-target id="fileTarget" directory="${java.io.tmpdir}/spring-integration-samples/output"/>
 
 	<beans:bean id="exclaimer" class="org.springframework.integration.samples.filecopy.Exclaimer"/>