diff --git a/spring-batch-samples/src/main/java/org/springframework/batch/sample/dao/SqlGameDao.java b/spring-batch-samples/src/main/java/org/springframework/batch/sample/dao/JdbcGameDao.java
similarity index 92%
rename from spring-batch-samples/src/main/java/org/springframework/batch/sample/dao/SqlGameDao.java
rename to spring-batch-samples/src/main/java/org/springframework/batch/sample/dao/JdbcGameDao.java
index b983f7ed7..a4fff13ba 100644
--- a/spring-batch-samples/src/main/java/org/springframework/batch/sample/dao/SqlGameDao.java
+++ b/spring-batch-samples/src/main/java/org/springframework/batch/sample/dao/JdbcGameDao.java
@@ -5,7 +5,7 @@ import org.springframework.batch.sample.domain.Game;
 import org.springframework.jdbc.core.support.JdbcDaoSupport;
 import org.springframework.util.Assert;
 
-public class SqlGameDao extends JdbcDaoSupport implements ItemWriter {
+public class JdbcGameDao extends JdbcDaoSupport implements ItemWriter {
 
 	private static final String INSERT_GAME = "INSERT into GAMES(player_id,year_no,team,week,opponent,"
 			+ "completes,attempts,passing_yards,passing_td,interceptions,rushes,rush_yards,"
diff --git a/spring-batch-samples/src/main/java/org/springframework/batch/sample/dao/SqlPlayerDao.java b/spring-batch-samples/src/main/java/org/springframework/batch/sample/dao/JdbcPlayerDao.java
similarity index 86%
rename from spring-batch-samples/src/main/java/org/springframework/batch/sample/dao/SqlPlayerDao.java
rename to spring-batch-samples/src/main/java/org/springframework/batch/sample/dao/JdbcPlayerDao.java
index a645ed6fa..23c208f9c 100644
--- a/spring-batch-samples/src/main/java/org/springframework/batch/sample/dao/SqlPlayerDao.java
+++ b/spring-batch-samples/src/main/java/org/springframework/batch/sample/dao/JdbcPlayerDao.java
@@ -10,7 +10,7 @@ import org.springframework.jdbc.core.support.JdbcDaoSupport;
  * @author Lucas Ward
  *
  */
-public class SqlPlayerDao  extends JdbcDaoSupport implements PlayerDao  {
+public class JdbcPlayerDao  extends JdbcDaoSupport implements PlayerDao  {
 
 	public static final String INSERT_PLAYER = "INSERT into players(player_id, " +
 			"last_name, first_name, pos, year_of_birth, year_drafted)" +
diff --git a/spring-batch-samples/src/main/java/org/springframework/batch/sample/dao/SqlPlayerSummaryDao.java b/spring-batch-samples/src/main/java/org/springframework/batch/sample/dao/JdbcPlayerSummaryDao.java
similarity index 85%
rename from spring-batch-samples/src/main/java/org/springframework/batch/sample/dao/SqlPlayerSummaryDao.java
rename to spring-batch-samples/src/main/java/org/springframework/batch/sample/dao/JdbcPlayerSummaryDao.java
index 2501e38ff..d45535479 100644
--- a/spring-batch-samples/src/main/java/org/springframework/batch/sample/dao/SqlPlayerSummaryDao.java
+++ b/spring-batch-samples/src/main/java/org/springframework/batch/sample/dao/JdbcPlayerSummaryDao.java
@@ -5,7 +5,7 @@ import org.springframework.batch.sample.domain.PlayerSummary;
 import org.springframework.jdbc.core.support.JdbcDaoSupport;
 import org.springframework.util.Assert;
 
-public class SqlPlayerSummaryDao extends JdbcDaoSupport implements ItemWriter {
+public class JdbcPlayerSummaryDao extends JdbcDaoSupport implements ItemWriter {
 
 	private static final String INSERT_SUMMARY = "INSERT into PLAYER_SUMMARY(ID,YEAR_NO,COMPLETES,ATTEMPTS," +
 			"PASSING_YARDS,PASSING_TD,INTERCEPTIONS,RUSHES,RUSH_YARDS,RECEPTIONS,RECEPTIONS_YARDS," +
@@ -13,7 +13,7 @@ public class SqlPlayerSummaryDao extends JdbcDaoSupport implements ItemWriter {
 	
 	public void write(Object output) {
 		
-		Assert.isInstanceOf(PlayerSummary.class, output, SqlPlayerSummaryDao.class.getName() + " only " +
+		Assert.isInstanceOf(PlayerSummary.class, output, JdbcPlayerSummaryDao.class.getName() + " only " +
 				"supports outputing " + PlayerSummary.class.getName() + " instances.");
 		
 		PlayerSummary summary = (PlayerSummary)output;
diff --git a/spring-batch-samples/src/main/resources/jobs/footballJob.xml b/spring-batch-samples/src/main/resources/jobs/footballJob.xml
index d0a0df3e3..b60684019 100644
--- a/spring-batch-samples/src/main/resources/jobs/footballJob.xml
+++ b/spring-batch-samples/src/main/resources/jobs/footballJob.xml
@@ -33,7 +33,7 @@
 									class="org.springframework.batch.sample.item.processor.PlayerItemProcessor">
 									<property name="playerDao">
 										<bean
-											class="org.springframework.batch.sample.dao.SqlPlayerDao">
+											class="org.springframework.batch.sample.dao.JdbcPlayerDao">
 											<property name="dataSource"
 												ref="dataSource" />
 										</bean>
@@ -57,7 +57,7 @@
 									class="org.springframework.batch.item.processor.ItemWriterItemProcessor">
 									<property name="itemWriter">
 										<bean
-											class="org.springframework.batch.sample.dao.SqlGameDao">
+											class="org.springframework.batch.sample.dao.JdbcGameDao">
 											<property name="dataSource"
 												ref="dataSource" />
 										</bean>
@@ -81,7 +81,7 @@
 									class="org.springframework.batch.item.processor.ItemWriterItemProcessor">
 									<property name="itemWriter">
 										<bean
-											class="org.springframework.batch.sample.dao.SqlPlayerSummaryDao">
+											class="org.springframework.batch.sample.dao.JdbcPlayerSummaryDao">
 											<property name="dataSource"
 												ref="dataSource" />
 										</bean>
diff --git a/spring-batch-samples/src/main/resources/jobs/parallelJob.xml b/spring-batch-samples/src/main/resources/jobs/parallelJob.xml
index a45b46fde..aba1a9034 100644
--- a/spring-batch-samples/src/main/resources/jobs/parallelJob.xml
+++ b/spring-batch-samples/src/main/resources/jobs/parallelJob.xml
@@ -65,7 +65,7 @@
 									class="org.springframework.batch.sample.item.processor.PlayerItemProcessor">
 									<property name="playerDao">
 										<bean
-											class="org.springframework.batch.sample.dao.SqlPlayerDao">
+											class="org.springframework.batch.sample.dao.JdbcPlayerDao">
 											<property name="dataSource"
 												ref="dataSource" />
 										</bean>
@@ -110,7 +110,7 @@
 									class="org.springframework.batch.item.processor.ItemWriterItemProcessor">
 									<property name="itemWriter">
 										<bean
-											class="org.springframework.batch.sample.dao.SqlGameDao">
+											class="org.springframework.batch.sample.dao.JdbcGameDao">
 											<property name="dataSource"
 												ref="dataSource" />
 										</bean>
@@ -134,7 +134,7 @@
 									class="org.springframework.batch.item.processor.ItemWriterItemProcessor">
 									<property name="itemWriter">
 										<bean
-											class="org.springframework.batch.sample.dao.SqlPlayerSummaryDao">
+											class="org.springframework.batch.sample.dao.JdbcPlayerSummaryDao">
 											<property name="dataSource"
 												ref="dataSource" />
 										</bean>
diff --git a/spring-batch-samples/src/main/resources/simple-container-definition.xml b/spring-batch-samples/src/main/resources/simple-container-definition.xml
index 5a8d76630..ab4ece662 100644
--- a/spring-batch-samples/src/main/resources/simple-container-definition.xml
+++ b/spring-batch-samples/src/main/resources/simple-container-definition.xml
@@ -69,7 +69,7 @@
 	</bean>
 
 	<bean id="jobDao" lazy-init="true"
-		class="org.springframework.batch.execution.repository.dao.SqlJobDao">
+		class="org.springframework.batch.execution.repository.dao.JdbcJobDao">
 		<property name="jdbcTemplate" ref="jdbcTemplate" />
 		<property name="jobIncrementer" ref="jobIncrementer" />
 		<property name="jobExecutionIncrementer"
@@ -77,7 +77,7 @@
 	</bean>
 
 	<bean id="stepDao" lazy-init="true"
-		class="org.springframework.batch.execution.repository.dao.SqlStepDao">
+		class="org.springframework.batch.execution.repository.dao.JdbcStepDao">
 		<property name="jdbcTemplate" ref="jdbcTemplate" />
 		<property name="stepIncrementer" ref="stepIncrementer" />
 		<property name="stepExecutionIncrementer"
diff --git a/spring-batch-samples/src/test/java/org/springframework/batch/sample/dao/SqlGameDaoIntegrationTests.java b/spring-batch-samples/src/test/java/org/springframework/batch/sample/dao/JdbcGameDaoIntegrationTests.java
similarity index 93%
rename from spring-batch-samples/src/test/java/org/springframework/batch/sample/dao/SqlGameDaoIntegrationTests.java
rename to spring-batch-samples/src/test/java/org/springframework/batch/sample/dao/JdbcGameDaoIntegrationTests.java
index f01da06ae..1e0448d1b 100644
--- a/spring-batch-samples/src/test/java/org/springframework/batch/sample/dao/SqlGameDaoIntegrationTests.java
+++ b/spring-batch-samples/src/test/java/org/springframework/batch/sample/dao/JdbcGameDaoIntegrationTests.java
@@ -26,10 +26,10 @@ import org.springframework.test.AbstractTransactionalDataSourceSpringContextTest
  * @author Lucas Ward
  *
  */
-public class SqlGameDaoIntegrationTests extends
+public class JdbcGameDaoIntegrationTests extends
 	AbstractTransactionalDataSourceSpringContextTests {
 
-	SqlGameDao gameDao;
+	JdbcGameDao gameDao;
 	Game game = new Game();
 	
 	protected String[] getConfigLocations() {
@@ -39,7 +39,7 @@ public class SqlGameDaoIntegrationTests extends
 	protected void onSetUpBeforeTransaction() throws Exception {
 		super.onSetUpBeforeTransaction();
 		
-		gameDao = new SqlGameDao();
+		gameDao = new JdbcGameDao();
 		gameDao.setJdbcTemplate(getJdbcTemplate());
 		
 		game.setId("AbduKa00");
diff --git a/spring-batch-samples/src/test/java/org/springframework/batch/sample/dao/SqlJobRepositoryTests.java b/spring-batch-samples/src/test/java/org/springframework/batch/sample/dao/JdbcJobRepositoryTests.java
similarity index 96%
rename from spring-batch-samples/src/test/java/org/springframework/batch/sample/dao/SqlJobRepositoryTests.java
rename to spring-batch-samples/src/test/java/org/springframework/batch/sample/dao/JdbcJobRepositoryTests.java
index e88a10e19..2c1db1439 100644
--- a/spring-batch-samples/src/test/java/org/springframework/batch/sample/dao/SqlJobRepositoryTests.java
+++ b/spring-batch-samples/src/test/java/org/springframework/batch/sample/dao/JdbcJobRepositoryTests.java
@@ -19,7 +19,7 @@ import org.springframework.test.AbstractTransactionalDataSourceSpringContextTest
 import org.springframework.transaction.support.TransactionCallback;
 import org.springframework.transaction.support.TransactionTemplate;
 
-public class SqlJobRepositoryTests extends
+public class JdbcJobRepositoryTests extends
 		AbstractTransactionalDataSourceSpringContextTests {
 
 	private ScheduledJobIdentifier jobIdentifier;
diff --git a/spring-batch-samples/src/test/java/org/springframework/batch/sample/dao/SqlPlayerDaoIntegrationTests.java b/spring-batch-samples/src/test/java/org/springframework/batch/sample/dao/JdbcPlayerDaoIntegrationTests.java
similarity index 86%
rename from spring-batch-samples/src/test/java/org/springframework/batch/sample/dao/SqlPlayerDaoIntegrationTests.java
rename to spring-batch-samples/src/test/java/org/springframework/batch/sample/dao/JdbcPlayerDaoIntegrationTests.java
index de62f45e4..480d61bf7 100644
--- a/spring-batch-samples/src/test/java/org/springframework/batch/sample/dao/SqlPlayerDaoIntegrationTests.java
+++ b/spring-batch-samples/src/test/java/org/springframework/batch/sample/dao/JdbcPlayerDaoIntegrationTests.java
@@ -14,9 +14,9 @@ import org.springframework.test.AbstractTransactionalDataSourceSpringContextTest
  * @author Lucas Ward
  *
  */
-public class SqlPlayerDaoIntegrationTests extends AbstractTransactionalDataSourceSpringContextTests {
+public class JdbcPlayerDaoIntegrationTests extends AbstractTransactionalDataSourceSpringContextTests {
 	
-	private SqlPlayerDao playerDao;
+	private JdbcPlayerDao playerDao;
 	private Player player;
 	private static final String GET_PLAYER = "SELECT * from PLAYERS";
 	
@@ -29,7 +29,7 @@ public class SqlPlayerDaoIntegrationTests extends AbstractTransactionalDataSourc
 		// TODO Auto-generated method stub
 		super.onSetUpBeforeTransaction();
 		
-		playerDao = new SqlPlayerDao();
+		playerDao = new JdbcPlayerDao();
 		playerDao.setJdbcTemplate(this.jdbcTemplate);
 		
 		player = new Player();
diff --git a/spring-batch-samples/src/test/java/org/springframework/batch/sample/dao/SqlPlayerSummaryDaoIntegrationTests.java b/spring-batch-samples/src/test/java/org/springframework/batch/sample/dao/JdbcPlayerSummaryDaoIntegrationTests.java
similarity index 89%
rename from spring-batch-samples/src/test/java/org/springframework/batch/sample/dao/SqlPlayerSummaryDaoIntegrationTests.java
rename to spring-batch-samples/src/test/java/org/springframework/batch/sample/dao/JdbcPlayerSummaryDaoIntegrationTests.java
index 39aadea58..df1b537f4 100644
--- a/spring-batch-samples/src/test/java/org/springframework/batch/sample/dao/SqlPlayerSummaryDaoIntegrationTests.java
+++ b/spring-batch-samples/src/test/java/org/springframework/batch/sample/dao/JdbcPlayerSummaryDaoIntegrationTests.java
@@ -25,10 +25,10 @@ import org.springframework.test.AbstractTransactionalDataSourceSpringContextTest
  * @author Lucas Ward
  * 
  */
-public class SqlPlayerSummaryDaoIntegrationTests extends
+public class JdbcPlayerSummaryDaoIntegrationTests extends
 		AbstractTransactionalDataSourceSpringContextTests {
 
-	SqlPlayerSummaryDao playerSummaryDao;
+	JdbcPlayerSummaryDao playerSummaryDao;
 	PlayerSummary summary;
 
 	protected String[] getConfigLocations() {
@@ -38,7 +38,7 @@ public class SqlPlayerSummaryDaoIntegrationTests extends
 	protected void onSetUpBeforeTransaction() throws Exception {
 		super.onSetUpBeforeTransaction();
 
-		playerSummaryDao = new SqlPlayerSummaryDao();
+		playerSummaryDao = new JdbcPlayerSummaryDao();
 		playerSummaryDao.setJdbcTemplate(getJdbcTemplate());
 
 		summary = new PlayerSummary();