diff --git a/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/file/FlatFileItemWriter.java b/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/file/FlatFileItemWriter.java
index 5582aae8c..0465ac4b6 100644
--- a/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/file/FlatFileItemWriter.java
+++ b/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/file/FlatFileItemWriter.java
@@ -112,7 +112,7 @@ public class FlatFileItemWriter extends ExecutionContextUserSupport implements I
 	 * 
 	 * @param fieldSetCreator the {@link FieldSetCreator} to set
 	 */
-	public void setFieldSetUnmapper(FieldSetCreator fieldSetCreator) {
+	public void setFieldSetCreator(FieldSetCreator fieldSetCreator) {
 		this.fieldSetCreator = fieldSetCreator;
 	}
 
diff --git a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/file/FlatFileItemWriterTests.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/file/FlatFileItemWriterTests.java
index 814372379..143f28531 100644
--- a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/file/FlatFileItemWriterTests.java
+++ b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/file/FlatFileItemWriterTests.java
@@ -70,7 +70,7 @@ public class FlatFileItemWriterTests extends TestCase {
 		outputFile = File.createTempFile("flatfile-output-", ".tmp");
 
 		inputSource.setResource(new FileSystemResource(outputFile));
-		inputSource.setFieldSetUnmapper(new PassThroughFieldSetMapper());
+		inputSource.setFieldSetCreator(new PassThroughFieldSetMapper());
 		inputSource.afterPropertiesSet();
 		executionContext = new ExecutionContext();
 	}
@@ -118,7 +118,7 @@ public class FlatFileItemWriterTests extends TestCase {
 	 * @throws Exception
 	 */
 	public void testWriteWithConverter() throws Exception {
-		inputSource.setFieldSetUnmapper(new FieldSetCreator() {
+		inputSource.setFieldSetCreator(new FieldSetCreator() {
 			public FieldSet mapItem(Object data) {
 				return new DefaultFieldSet(new String[] { "FOO:" + data });
 			}
@@ -136,7 +136,7 @@ public class FlatFileItemWriterTests extends TestCase {
 	 * @throws Exception
 	 */
 	public void testWriteWithConverterAndInfiniteLoop() throws Exception {
-		inputSource.setFieldSetUnmapper(new FieldSetCreator() {
+		inputSource.setFieldSetCreator(new FieldSetCreator() {
 			public FieldSet mapItem(Object data) {
 				return new DefaultFieldSet(new String[] { "FOO:" + data });
 			}
@@ -154,7 +154,7 @@ public class FlatFileItemWriterTests extends TestCase {
 	 * @throws Exception
 	 */
 	public void testWriteWithConverterAndString() throws Exception {
-		inputSource.setFieldSetUnmapper(new FieldSetCreator() {
+		inputSource.setFieldSetCreator(new FieldSetCreator() {
 			public FieldSet mapItem(Object data) {
 				return new DefaultFieldSet(new String[] { "FOO:" + data });
 			}
@@ -263,7 +263,7 @@ public class FlatFileItemWriterTests extends TestCase {
 	public void testDefaultStreamContext() throws Exception {
 		inputSource = new FlatFileItemWriter();
 		inputSource.setResource(new FileSystemResource(outputFile));
-		inputSource.setFieldSetUnmapper(new PassThroughFieldSetMapper());
+		inputSource.setFieldSetCreator(new PassThroughFieldSetMapper());
 		inputSource.afterPropertiesSet();
 		inputSource.open(executionContext);
 		inputSource.update(executionContext);