diff --git a/spring-batch-samples/src/main/java/org/springframework/batch/sample/dao/CustomerDebitWriter.java b/spring-batch-samples/src/main/java/org/springframework/batch/sample/dao/CustomerDebitDao.java
similarity index 95%
rename from spring-batch-samples/src/main/java/org/springframework/batch/sample/dao/CustomerDebitWriter.java
rename to spring-batch-samples/src/main/java/org/springframework/batch/sample/dao/CustomerDebitDao.java
index 0de40e558..2b6a6a331 100644
--- a/spring-batch-samples/src/main/java/org/springframework/batch/sample/dao/CustomerDebitWriter.java
+++ b/spring-batch-samples/src/main/java/org/springframework/batch/sample/dao/CustomerDebitDao.java
@@ -18,7 +18,7 @@ package org.springframework.batch.sample.dao;
 
 import org.springframework.batch.sample.domain.CustomerDebit;
 
-public interface CustomerDebitWriter {
+public interface CustomerDebitDao {
 	
 	void write(CustomerDebit customerDebit);
 }
diff --git a/spring-batch-samples/src/main/java/org/springframework/batch/sample/dao/FlatFileCustomerCreditWriter.java b/spring-batch-samples/src/main/java/org/springframework/batch/sample/dao/FlatFileCustomerCreditDao.java
similarity index 96%
rename from spring-batch-samples/src/main/java/org/springframework/batch/sample/dao/FlatFileCustomerCreditWriter.java
rename to spring-batch-samples/src/main/java/org/springframework/batch/sample/dao/FlatFileCustomerCreditDao.java
index 8b53edb0d..9beac44d8 100644
--- a/spring-batch-samples/src/main/java/org/springframework/batch/sample/dao/FlatFileCustomerCreditWriter.java
+++ b/spring-batch-samples/src/main/java/org/springframework/batch/sample/dao/FlatFileCustomerCreditDao.java
@@ -28,7 +28,7 @@ import org.springframework.beans.factory.DisposableBean;
  * @see CustomerCreditDao
  * @author Robert Kasanicky
  */
-public class FlatFileCustomerCreditWriter implements CustomerCreditDao,
+public class FlatFileCustomerCreditDao implements CustomerCreditDao,
 		DisposableBean {
 
 	private ItemWriter outputSource;
diff --git a/spring-batch-samples/src/main/java/org/springframework/batch/sample/dao/HibernateCreditWriter.java b/spring-batch-samples/src/main/java/org/springframework/batch/sample/dao/HibernateCreditDao.java
similarity index 94%
rename from spring-batch-samples/src/main/java/org/springframework/batch/sample/dao/HibernateCreditWriter.java
rename to spring-batch-samples/src/main/java/org/springframework/batch/sample/dao/HibernateCreditDao.java
index d1a2c4300..97839a1ca 100644
--- a/spring-batch-samples/src/main/java/org/springframework/batch/sample/dao/HibernateCreditWriter.java
+++ b/spring-batch-samples/src/main/java/org/springframework/batch/sample/dao/HibernateCreditDao.java
@@ -29,7 +29,7 @@ import org.springframework.orm.hibernate3.support.HibernateDaoSupport;
  * @author Dave Syer
  * 
  */
-public class HibernateCreditWriter extends HibernateDaoSupport implements
+public class HibernateCreditDao extends HibernateDaoSupport implements
 		CustomerCreditDao, RepeatListener {
 
 	private int failOnFlush = -1;
diff --git a/spring-batch-samples/src/main/java/org/springframework/batch/sample/dao/IbatisCustomerCreditWriter.java b/spring-batch-samples/src/main/java/org/springframework/batch/sample/dao/IbatisCustomerCreditDao.java
similarity index 92%
rename from spring-batch-samples/src/main/java/org/springframework/batch/sample/dao/IbatisCustomerCreditWriter.java
rename to spring-batch-samples/src/main/java/org/springframework/batch/sample/dao/IbatisCustomerCreditDao.java
index 4d909e7a7..0dd6e57a8 100644
--- a/spring-batch-samples/src/main/java/org/springframework/batch/sample/dao/IbatisCustomerCreditWriter.java
+++ b/spring-batch-samples/src/main/java/org/springframework/batch/sample/dao/IbatisCustomerCreditDao.java
@@ -22,7 +22,7 @@ import org.springframework.orm.ibatis.support.SqlMapClientDaoSupport;
  * @author Lucas Ward
  *
  */
-public class IbatisCustomerCreditWriter extends SqlMapClientDaoSupport
+public class IbatisCustomerCreditDao extends SqlMapClientDaoSupport
 		implements CustomerCreditDao {
 
 	String statementId;
diff --git a/spring-batch-samples/src/main/java/org/springframework/batch/sample/dao/JdbcCustomerDebitWriter.java b/spring-batch-samples/src/main/java/org/springframework/batch/sample/dao/JdbcCustomerDebitDao.java
similarity index 94%
rename from spring-batch-samples/src/main/java/org/springframework/batch/sample/dao/JdbcCustomerDebitWriter.java
rename to spring-batch-samples/src/main/java/org/springframework/batch/sample/dao/JdbcCustomerDebitDao.java
index ef919e7b8..449f8b355 100644
--- a/spring-batch-samples/src/main/java/org/springframework/batch/sample/dao/JdbcCustomerDebitWriter.java
+++ b/spring-batch-samples/src/main/java/org/springframework/batch/sample/dao/JdbcCustomerDebitDao.java
@@ -25,7 +25,7 @@ import org.springframework.jdbc.core.JdbcOperations;
  * 
  * @author Robert Kasanicky
  */
-public class JdbcCustomerDebitWriter implements CustomerDebitWriter {
+public class JdbcCustomerDebitDao implements CustomerDebitDao {
 	
     private static final String UPDATE_CREDIT = "UPDATE customer SET credit= credit-? WHERE name=?";
     
diff --git a/spring-batch-samples/src/main/java/org/springframework/batch/sample/item/writer/CustomerUpdateWriter.java b/spring-batch-samples/src/main/java/org/springframework/batch/sample/item/writer/CustomerUpdateWriter.java
index e97cbe83f..e0fff68cd 100644
--- a/spring-batch-samples/src/main/java/org/springframework/batch/sample/item/writer/CustomerUpdateWriter.java
+++ b/spring-batch-samples/src/main/java/org/springframework/batch/sample/item/writer/CustomerUpdateWriter.java
@@ -17,7 +17,7 @@
 package org.springframework.batch.sample.item.writer;
 
 import org.springframework.batch.item.writer.AbstractItemWriter;
-import org.springframework.batch.sample.dao.JdbcCustomerDebitWriter;
+import org.springframework.batch.sample.dao.JdbcCustomerDebitDao;
 import org.springframework.batch.sample.domain.CustomerDebit;
 import org.springframework.batch.sample.domain.Trade;
 
@@ -28,7 +28,7 @@ import org.springframework.batch.sample.domain.Trade;
  * @author Robert Kasanicky
  */
 public class CustomerUpdateWriter extends AbstractItemWriter {
-    private JdbcCustomerDebitWriter dao;
+    private JdbcCustomerDebitDao dao;
 
     public void write(Object data) {
         Trade trade = (Trade) data;
@@ -38,7 +38,7 @@ public class CustomerUpdateWriter extends AbstractItemWriter {
         dao.write(customerDebit);
     }
 
-    public void setDao(JdbcCustomerDebitWriter outputSource) {
+    public void setDao(JdbcCustomerDebitDao outputSource) {
         this.dao = outputSource;
     }
 
diff --git a/spring-batch-samples/src/main/resources/jobs/hibernateJob.xml b/spring-batch-samples/src/main/resources/jobs/hibernateJob.xml
index c1610e293..1ed87b650 100644
--- a/spring-batch-samples/src/main/resources/jobs/hibernateJob.xml
+++ b/spring-batch-samples/src/main/resources/jobs/hibernateJob.xml
@@ -38,7 +38,7 @@
 	</bean>
 
 	<bean id="customerCreditDao"
-		class="org.springframework.batch.sample.dao.HibernateCreditWriter">
+		class="org.springframework.batch.sample.dao.HibernateCreditDao">
 		<property name="sessionFactory" ref="sessionFactory" />
 	</bean>
 
diff --git a/spring-batch-samples/src/main/resources/jobs/ibatisJob.xml b/spring-batch-samples/src/main/resources/jobs/ibatisJob.xml
index b57e88d70..056f1bbc8 100644
--- a/spring-batch-samples/src/main/resources/jobs/ibatisJob.xml
+++ b/spring-batch-samples/src/main/resources/jobs/ibatisJob.xml
@@ -20,7 +20,7 @@
 						class="org.springframework.batch.sample.item.writer.CustomerCreditIncreaseWriter">
 						<property name="customerCreditDao">
 							<bean
-								class="org.springframework.batch.sample.dao.IbatisCustomerCreditWriter">
+								class="org.springframework.batch.sample.dao.IbatisCustomerCreditDao">
 								<property name="sqlMapClient"
 									ref="sqlMapClient" />
 								<property name="statementId"
diff --git a/spring-batch-samples/src/main/resources/jobs/tradeJobIo.xml b/spring-batch-samples/src/main/resources/jobs/tradeJobIo.xml
index c5cdfdcd1..cc5e73010 100644
--- a/spring-batch-samples/src/main/resources/jobs/tradeJobIo.xml
+++ b/spring-batch-samples/src/main/resources/jobs/tradeJobIo.xml
@@ -19,11 +19,11 @@
 	</bean>
 
 	<bean
-		class="org.springframework.batch.sample.dao.JdbcCustomerDebitWriter"
+		class="org.springframework.batch.sample.dao.JdbcCustomerDebitDao"
 		id="customerDao" p:jdbcTemplate-ref="jdbcTemplate" />
 
 	<bean
-		class="org.springframework.batch.sample.dao.FlatFileCustomerCreditWriter"
+		class="org.springframework.batch.sample.dao.FlatFileCustomerCreditDao"
 		id="customerReportOutputSource">
 		<property name="outputSource">
 			<bean
diff --git a/spring-batch-samples/src/test/java/org/springframework/batch/sample/HibernateFailureJobFunctionalTests.java b/spring-batch-samples/src/test/java/org/springframework/batch/sample/HibernateFailureJobFunctionalTests.java
index 4a85e0df1..7217c3c9a 100644
--- a/spring-batch-samples/src/test/java/org/springframework/batch/sample/HibernateFailureJobFunctionalTests.java
+++ b/spring-batch-samples/src/test/java/org/springframework/batch/sample/HibernateFailureJobFunctionalTests.java
@@ -5,7 +5,7 @@ import java.util.List;
 
 import org.springframework.batch.core.domain.JobParameters;
 import org.springframework.batch.core.domain.JobParametersBuilder;
-import org.springframework.batch.sample.dao.HibernateCreditWriter;
+import org.springframework.batch.sample.dao.HibernateCreditDao;
 import org.springframework.jdbc.UncategorizedSQLException;
 import org.springframework.orm.hibernate3.HibernateJdbcException;
 
@@ -18,15 +18,15 @@ import org.springframework.orm.hibernate3.HibernateJdbcException;
 public class HibernateFailureJobFunctionalTests extends
 		HibernateJobFunctionalTests {
 
-	private HibernateCreditWriter writer;
+	private HibernateCreditDao writer;
 
 	/**
-	 * Public setter for the {@link HibernateCreditWriter} property.
+	 * Public setter for the {@link HibernateCreditDao} property.
 	 * 
 	 * @param writer
 	 *            the writer to set
 	 */
-	public void setWriter(HibernateCreditWriter writer) {
+	public void setWriter(HibernateCreditDao writer) {
 		this.writer = writer;
 	}
 
diff --git a/spring-batch-samples/src/test/java/org/springframework/batch/sample/dao/FlatFileCustomerCreditWriterTests.java b/spring-batch-samples/src/test/java/org/springframework/batch/sample/dao/FlatFileCustomerCreditDaoTests.java
similarity index 88%
rename from spring-batch-samples/src/test/java/org/springframework/batch/sample/dao/FlatFileCustomerCreditWriterTests.java
rename to spring-batch-samples/src/test/java/org/springframework/batch/sample/dao/FlatFileCustomerCreditDaoTests.java
index 37f9d3177..8f30de677 100644
--- a/spring-batch-samples/src/test/java/org/springframework/batch/sample/dao/FlatFileCustomerCreditWriterTests.java
+++ b/spring-batch-samples/src/test/java/org/springframework/batch/sample/dao/FlatFileCustomerCreditDaoTests.java
@@ -10,11 +10,11 @@ import org.springframework.batch.item.ItemStream;
 import org.springframework.batch.item.ItemWriter;
 import org.springframework.batch.sample.domain.CustomerCredit;
 
-public class FlatFileCustomerCreditWriterTests extends TestCase {
+public class FlatFileCustomerCreditDaoTests extends TestCase {
 
 	private MockControl outputControl;
 	private ResourceLifecycleItemWriter output;
-	private FlatFileCustomerCreditWriter writer;
+	private FlatFileCustomerCreditDao writer;
 	
 	public void setUp() throws Exception {
 		super.setUp();
@@ -24,7 +24,7 @@ public class FlatFileCustomerCreditWriterTests extends TestCase {
 		output = (ResourceLifecycleItemWriter)outputControl.getMock();
 		
 		//create new writer
-		writer = new FlatFileCustomerCreditWriter();
+		writer = new FlatFileCustomerCreditDao();
 		writer.setOutputSource(output);
 	}
 
diff --git a/spring-batch-samples/src/test/java/org/springframework/batch/sample/dao/JdbcCustomerDebitWriterTests.java b/spring-batch-samples/src/test/java/org/springframework/batch/sample/dao/JdbcCustomerDebitDaoTests.java
similarity index 84%
rename from spring-batch-samples/src/test/java/org/springframework/batch/sample/dao/JdbcCustomerDebitWriterTests.java
rename to spring-batch-samples/src/test/java/org/springframework/batch/sample/dao/JdbcCustomerDebitDaoTests.java
index 252040678..2a8a78a39 100644
--- a/spring-batch-samples/src/test/java/org/springframework/batch/sample/dao/JdbcCustomerDebitWriterTests.java
+++ b/spring-batch-samples/src/test/java/org/springframework/batch/sample/dao/JdbcCustomerDebitDaoTests.java
@@ -8,7 +8,7 @@ import org.springframework.batch.sample.domain.CustomerDebit;
 import org.springframework.jdbc.core.RowCallbackHandler;
 import org.springframework.test.AbstractTransactionalDataSourceSpringContextTests;
 
-public class JdbcCustomerDebitWriterTests extends AbstractTransactionalDataSourceSpringContextTests {
+public class JdbcCustomerDebitDaoTests extends AbstractTransactionalDataSourceSpringContextTests {
 
 	protected String[] getConfigLocations() {
 		return new String[] { "data-source-context.xml" };
@@ -20,7 +20,7 @@ public class JdbcCustomerDebitWriterTests extends AbstractTransactionalDataSourc
 		jdbcTemplate.execute("INSERT INTO customer VALUES (99, 0, 'testName', 100)");
 
 		//create writer and set jdbcTemplate
-		JdbcCustomerDebitWriter writer = new JdbcCustomerDebitWriter();
+		JdbcCustomerDebitDao writer = new JdbcCustomerDebitDao();
 		writer.setJdbcTemplate(jdbcTemplate);
 
 		//create customer debit
diff --git a/spring-batch-samples/src/test/java/org/springframework/batch/sample/item/writer/CustomerUpdateProcessorTests.java b/spring-batch-samples/src/test/java/org/springframework/batch/sample/item/writer/CustomerUpdateProcessorTests.java
index cd91044b6..5526d878b 100644
--- a/spring-batch-samples/src/test/java/org/springframework/batch/sample/item/writer/CustomerUpdateProcessorTests.java
+++ b/spring-batch-samples/src/test/java/org/springframework/batch/sample/item/writer/CustomerUpdateProcessorTests.java
@@ -4,7 +4,7 @@ import java.math.BigDecimal;
 
 import junit.framework.TestCase;
 
-import org.springframework.batch.sample.dao.JdbcCustomerDebitWriter;
+import org.springframework.batch.sample.dao.JdbcCustomerDebitDao;
 import org.springframework.batch.sample.domain.CustomerDebit;
 import org.springframework.batch.sample.domain.Trade;
 import org.springframework.batch.sample.item.writer.CustomerUpdateWriter;
@@ -19,7 +19,7 @@ public class CustomerUpdateProcessorTests extends TestCase {
 		trade.setPrice(new BigDecimal(123.0));
 		
 		//create dao
-		JdbcCustomerDebitWriter dao = new JdbcCustomerDebitWriter() {
+		JdbcCustomerDebitDao dao = new JdbcCustomerDebitDao() {
 			public void write(CustomerDebit customerDebit) {
 				assertEquals("testCustomerName", customerDebit.getName());
 				assertEquals(new BigDecimal(123.0), customerDebit.getDebit());