diff --git a/spring-batch-samples/src/main/java/org/springframework/batch/sample/dao/FlatFileCustomerCreditDao.java b/spring-batch-samples/src/main/java/org/springframework/batch/sample/dao/FlatFileCustomerCreditDao.java
index 2c6149ce9..d9c1a613c 100644
--- a/spring-batch-samples/src/main/java/org/springframework/batch/sample/dao/FlatFileCustomerCreditDao.java
+++ b/spring-batch-samples/src/main/java/org/springframework/batch/sample/dao/FlatFileCustomerCreditDao.java
@@ -31,7 +31,7 @@ import org.springframework.beans.factory.DisposableBean;
 public class FlatFileCustomerCreditDao implements CustomerCreditDao,
 		DisposableBean {
 
-	private ItemWriter itemWriter;
+	private ItemWriter<String> itemWriter;
 
 	private String separator = "\t";
 
@@ -53,7 +53,7 @@ public class FlatFileCustomerCreditDao implements CustomerCreditDao,
 		this.separator = separator;
 	}
 
-	public void setItemWriter(ItemWriter itemWriter) {
+	public void setItemWriter(ItemWriter<String> itemWriter) {
 		this.itemWriter = itemWriter;
 	}
 
diff --git a/spring-batch-samples/src/main/java/org/springframework/batch/sample/dao/FlatFileOrderWriter.java b/spring-batch-samples/src/main/java/org/springframework/batch/sample/dao/FlatFileOrderWriter.java
deleted file mode 100644
index 4a4074373..000000000
--- a/spring-batch-samples/src/main/java/org/springframework/batch/sample/dao/FlatFileOrderWriter.java
+++ /dev/null
@@ -1,54 +0,0 @@
-/*
- * Copyright 2006-2007 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.batch.sample.dao;
-
-import org.springframework.batch.item.support.DelegatingItemWriter;
-import org.springframework.batch.item.transform.ItemTransformer;
-import org.springframework.batch.sample.item.writer.OrderWriter;
-
-
-/**
- * Writes <code>Order</code> objects to a file.
- * 
- * @see OrderWriter
- * 
- * @author Dave Syer
- */
-public class FlatFileOrderWriter extends DelegatingItemWriter {
-
-    /**
-     * Converter for order
-     */
-    private ItemTransformer transformer = new OrderTransformer();
-    
-    /**
-	 * Public setter for the converter.
-	 *
-	 * @param transformer the converter to set
-	 */
-	public void setTransformer(ItemTransformer transformer) {
-		this.transformer = transformer;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.springframework.batch.item.writer.DelegatingItemWriter#doProcess(java.lang.Object)
-	 */
-	protected Object doProcess(Object item) throws Exception {
-        return transformer.transform(item);
-    }
-
-}
diff --git a/spring-batch-samples/src/main/resources/jobs/multilineOrderJob.xml b/spring-batch-samples/src/main/resources/jobs/multilineOrderJob.xml
index 4c8659ac4..a897e8d5a 100644
--- a/spring-batch-samples/src/main/resources/jobs/multilineOrderJob.xml
+++ b/spring-batch-samples/src/main/resources/jobs/multilineOrderJob.xml
@@ -56,9 +56,9 @@
 	</bean>
 
 	<bean id="orderWriter"
-		class="org.springframework.batch.sample.dao.FlatFileOrderWriter">
+		class="org.springframework.batch.item.transform.ItemTransformerItemWriter">
 		<property name="delegate" ref="flatFileTransformerWriter" />
-		<property name="transformer">
+		<property name="itemTransformer">
 			<bean
 				class="org.springframework.batch.sample.dao.OrderTransformer">
 				<property name="aggregators" ref="outputAggregators" />
diff --git a/spring-batch-samples/src/test/java/org/springframework/batch/sample/dao/FlatFileOrderWriterTests.java b/spring-batch-samples/src/test/java/org/springframework/batch/sample/dao/FlatFileOrderWriterTests.java
index 1c4641585..026e4e969 100644
--- a/spring-batch-samples/src/test/java/org/springframework/batch/sample/dao/FlatFileOrderWriterTests.java
+++ b/spring-batch-samples/src/test/java/org/springframework/batch/sample/dao/FlatFileOrderWriterTests.java
@@ -30,6 +30,7 @@ import junit.framework.TestCase;
 import org.springframework.batch.item.ItemWriter;
 import org.springframework.batch.item.file.transform.LineAggregator;
 import org.springframework.batch.item.support.AbstractItemWriter;
+import org.springframework.batch.item.transform.ItemTransformerItemWriter;
 import org.springframework.batch.sample.StubLineAggregator;
 import org.springframework.batch.sample.domain.Address;
 import org.springframework.batch.sample.domain.BillingInfo;
@@ -49,12 +50,12 @@ public class FlatFileOrderWriterTests {
 		}
 	};
 
-	private FlatFileOrderWriter writer;
+	private ItemTransformerItemWriter writer;
 	
 	@Before
 	public void setUp() throws Exception {
 		//create new writer
-		writer = new FlatFileOrderWriter();
+		writer = new ItemTransformerItemWriter();
 		writer.setDelegate(output);
 	}
 
@@ -90,7 +91,7 @@ public class FlatFileOrderWriterTests {
 		aggregators.put("item", aggregator);
 		aggregators.put("footer", aggregator);
 		converter.setAggregators(aggregators);
-		writer.setTransformer(converter);
+		writer.setItemTransformer(converter);
 				
 		//call tested method
 		writer.write(order);