diff --git a/core/.classpath b/core/.classpath
index aeb7e3266..c7aaa6fdf 100644
--- a/core/.classpath
+++ b/core/.classpath
@@ -5,6 +5,6 @@
 	<classpathentry kind="src" path="src/main/resources"/>
 	<classpathentry kind="src" path="src/test/resources"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-	<classpathentry exported="true" kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER"/>
+	<classpathentry kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>
diff --git a/core/.project b/core/.project
index 9b1422bb6..4884a205f 100644
--- a/core/.project
+++ b/core/.project
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <projectDescription>
-	<name>batch-core</name>
+	<name>core</name>
 	<comment>Simple container application for batch processing, using the
 		Spring Batch Framework to express a domain of Jobs, Steps,
 		Chunks, etc.</comment>
diff --git a/execution/.classpath b/execution/.classpath
index 208a63cea..b9f24a16d 100644
--- a/execution/.classpath
+++ b/execution/.classpath
@@ -5,6 +5,6 @@
 	<classpathentry kind="src" output="bin/test-classes" path="src/test/resources"/>
 	<classpathentry kind="src" path="src/main/resources"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-	<classpathentry exported="true" kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER"/>
+	<classpathentry kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER"/>
 	<classpathentry kind="output" path="bin/classes"/>
 </classpath>
diff --git a/execution/.project b/execution/.project
index 904b540ed..9f2aeae2a 100644
--- a/execution/.project
+++ b/execution/.project
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <projectDescription>
-	<name>batch-execution</name>
+	<name>execution</name>
 	<comment>Execution tools and implementations of Spring Batch Core interfaces</comment>
 	<projects>
 	</projects>
@@ -11,19 +11,19 @@
 			</arguments>
 		</buildCommand>
 		<buildCommand>
-			<name>org.maven.ide.eclipse.maven2Builder</name>
+			<name>org.springframework.ide.eclipse.core.springbuilder</name>
 			<arguments>
 			</arguments>
 		</buildCommand>
 		<buildCommand>
-			<name>org.springframework.ide.eclipse.core.springbuilder</name>
+			<name>org.maven.ide.eclipse.maven2Builder</name>
 			<arguments>
 			</arguments>
 		</buildCommand>
 	</buildSpec>
 	<natures>
-		<nature>org.springframework.ide.eclipse.core.springnature</nature>
 		<nature>org.eclipse.jdt.core.javanature</nature>
 		<nature>org.maven.ide.eclipse.maven2Nature</nature>
+		<nature>org.springframework.ide.eclipse.core.springnature</nature>
 	</natures>
 </projectDescription>
diff --git a/integration/src/test/resources/data-source.xml b/integration/src/test/resources/data-source.xml
index d20a65734..f1723b5f8 100644
--- a/integration/src/test/resources/data-source.xml
+++ b/integration/src/test/resources/data-source.xml
@@ -3,7 +3,7 @@
 	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd">
 
 	<bean id="dataSource" class="test.jdbc.datasource.InitializingDataSourceFactoryBean">
-		<property name="dataSource" ref="derby" />
+		<property name="dataSource" ref="hsql" />
 		<property name="initScript" value="org/springframework/batch/jms/init.sql" />
 		<property name="destroyScript" value="org/springframework/batch/jms/destroy.sql" />
 	</bean>
@@ -29,11 +29,11 @@
 			</list>
 		</property>
 		<property name="persistenceAdapter">
-			<!-- bean class="org.apache.activemq.store.memory.MemoryPersistenceAdapter"/-->
-			<bean class="org.apache.activemq.store.jdbc.JDBCPersistenceAdapter">
+			<bean class="org.apache.activemq.store.memory.MemoryPersistenceAdapter"/>
+			<!-- bean class="org.apache.activemq.store.jdbc.JDBCPersistenceAdapter">
 				<property name="dataSource" ref="dataSource"/>
 				<property name="createTablesOnStartup" value="true" />
-			</bean>
+			</bean-->
 		</property>
 	</bean>
 
diff --git a/samples/pom.xml b/samples/pom.xml
index 56cede786..1b11c1aaa 100644
--- a/samples/pom.xml
+++ b/samples/pom.xml
@@ -61,7 +61,6 @@
 		<dependency>
 			<groupId>aspectj</groupId>
 			<artifactId>aspectjweaver</artifactId>
-			<version>1.5.3</version>
 			<scope>test</scope>
 		</dependency>
 		<dependency>
diff --git a/samples/src/main/resources/jobs/tradeJob.xml b/samples/src/main/resources/jobs/tradeJob.xml
index 4eaac9aa6..4f33170ff 100644
--- a/samples/src/main/resources/jobs/tradeJob.xml
+++ b/samples/src/main/resources/jobs/tradeJob.xml
@@ -49,7 +49,7 @@
 								<bean
 									class="org.springframework.batch.item.provider.InputSourceItemProvider">
 									<property name="inputSource"
-										ref="tradeSqlInputSOurce" />
+										ref="tradeSqlInputSource" />
 								</bean>
 							</property>
 							<property name="itemProcessor">
@@ -82,7 +82,7 @@
 		</property>
 	</bean>
 
-	<bean id="tradeSqlInputSOurce"
+	<bean id="tradeSqlInputSource"
 		class="org.springframework.batch.io.cursor.JdbcCursorInputSource"
 		scope="step">
 		<aop:scoped-proxy />
@@ -120,8 +120,4 @@
 			value="target/test-outputs/20070122.testStream.CustomerReportStep.TEMP.txt" />
 	</bean>
 
-	<!-- register the step scope with the application context -->
-	<bean class="org.springframework.batch.execution.scope.StepScope" />
-
-
 </beans>
\ No newline at end of file