diff --git a/spring-batch-core/.springBeans b/spring-batch-core/.springBeans
index 7ef294ee0..16e34f5c4 100644
--- a/spring-batch-core/.springBeans
+++ b/spring-batch-core/.springBeans
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <beansProjectDescription>
 	<version>1</version>
-	<pluginVersion><![CDATA[2.0.3.v200802061800]]></pluginVersion>
+	<pluginVersion><![CDATA[2.0.4.v200802202100]]></pluginVersion>
 	<configSuffixes>
 		<configSuffix><![CDATA[xml]]></configSuffix>
 	</configSuffixes>
@@ -10,8 +10,8 @@
 		<config>src/test/resources/org/springframework/batch/core/configuration/support/test-context.xml</config>
 		<config>src/test/resources/org/springframework/batch/core/launch/support/job.xml</config>
 		<config>src/test/resources/org/springframework/batch/core/launch/support/test-environment.xml</config>
-		<config>src/test/resources/org/springframework/batch/core/repository/support/dao/data-source-context.xml</config>
-		<config>src/test/resources/org/springframework/batch/core/repository/support/dao/sql-dao-test.xml</config>
+		<config>src/test/resources/org/springframework/batch/core/repository/dao/data-source-context.xml</config>
+		<config>src/test/resources/org/springframework/batch/core/repository/dao/sql-dao-test.xml</config>
 	</configs>
 	<configSets>
 		<configSet>
@@ -28,8 +28,6 @@
 			<allowBeanDefinitionOverriding>true</allowBeanDefinitionOverriding>
 			<incomplete>false</incomplete>
 			<configs>
-				<config>src/test/resources/org/springframework/batch/core/repository/support/dao/data-source-context.xml</config>
-				<config>src/test/resources/org/springframework/batch/core/repository/support/dao/sql-dao-test.xml</config>
 			</configs>
 		</configSet>
 	</configSets>
diff --git a/spring-batch-samples/src/main/resources/simple-job-launcher-context.xml b/spring-batch-samples/src/main/resources/simple-job-launcher-context.xml
index ff32159f7..a12976513 100644
--- a/spring-batch-samples/src/main/resources/simple-job-launcher-context.xml
+++ b/spring-batch-samples/src/main/resources/simple-job-launcher-context.xml
@@ -36,13 +36,13 @@
 		p:databaseType="hsql" p:dataSource-ref="dataSource" />
 
 	<bean id="mapJobInstanceDao" lazy-init="true"
-		class="org.springframework.batch.core.repository.support.dao.MapJobInstanceDao" />
+		class="org.springframework.batch.core.repository.dao.MapJobInstanceDao" />
 
 	<bean id="mapJobExecutionDao" lazy-init="true"
-		class="org.springframework.batch.core.repository.support.dao.MapJobExecutionDao" />
+		class="org.springframework.batch.core.repository.dao.MapJobExecutionDao" />
 
 	<bean id="mapStepExecutionDao" lazy-init="true"
-		class="org.springframework.batch.core.repository.support.dao.MapStepExecutionDao" />
+		class="org.springframework.batch.core.repository.dao.MapStepExecutionDao" />
 
 	<bean id="jdbcTemplate" class="org.springframework.jdbc.core.JdbcTemplate">
 		<property name="dataSource" ref="dataSource" />