diff --git a/spring-batch-samples/.springBeans b/spring-batch-samples/.springBeans
index 5fb0921f1..3e96106b5 100644
--- a/spring-batch-samples/.springBeans
+++ b/spring-batch-samples/.springBeans
@@ -1,11 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <beansProjectDescription>
 	<version>1</version>
-	<pluginVersion><![CDATA[2.0.5.v200803132004]]></pluginVersion>
+	<pluginVersion><![CDATA[2.0.2.v200712142013]]></pluginVersion>
 	<configSuffixes>
 		<configSuffix><![CDATA[xml]]></configSuffix>
 	</configSuffixes>
-	<enableImports><![CDATA[false]]></enableImports>
 	<configs>
 		<config>src/main/resources/jobs/fixedLengthImportJob.xml</config>
 		<config>src/main/resources/jobs/multilineJob.xml</config>
@@ -22,7 +21,6 @@
 		<config>src/main/resources/jobs/xmlStaxJob.xml</config>
 		<config>src/main/resources/jobs/hibernateJob.xml</config>
 		<config>src/main/resources/jobs/ibatisJob.xml</config>
-		<config>src/main/resources/jobs/compositeProcessorSampleJob.xml</config>
 		<config>src/main/resources/jobs/footballJob.xml</config>
 		<config>src/main/resources/jobs/delegatingJob.xml</config>
 		<config>src/main/resources/jobs/parallelJob.xml</config>
@@ -37,6 +35,7 @@
 		<config>src/main/resources/jobs/multilineOrderInputTokenizers.xml</config>
 		<config>src/main/resources/jobs/multilineOrderOutputAggregators.xml</config>
 		<config>src/main/resources/jobs/taskletJob.xml</config>
+		<config>src/main/resources/jobs/compositeItemWriterSampleJob.xml</config>
 	</configs>
 	<configSets>
 		<configSet>
@@ -69,17 +68,6 @@
 				<config>src/main/resources/simple-job-launcher-context.xml</config>
 			</configs>
 		</configSet>
-		<configSet>
-			<name><![CDATA[compositeProcessor]]></name>
-			<allowBeanDefinitionOverriding>true</allowBeanDefinitionOverriding>
-			<incomplete>false</incomplete>
-			<configs>
-				<config>src/main/resources/data-source-context.xml</config>
-				<config>src/main/resources/data-source-context-init.xml</config>
-				<config>src/main/resources/jobs/compositeProcessorSampleJob.xml</config>
-				<config>src/main/resources/simple-job-launcher-context.xml</config>
-			</configs>
-		</configSet>
 		<configSet>
 			<name><![CDATA[delegating]]></name>
 			<allowBeanDefinitionOverriding>true</allowBeanDefinitionOverriding>
@@ -294,5 +282,16 @@
 				<config>src/main/resources/simple-job-launcher-context.xml</config>
 			</configs>
 		</configSet>
+		<configSet>
+			<name><![CDATA[compositeItemWriter]]></name>
+			<allowBeanDefinitionOverriding>true</allowBeanDefinitionOverriding>
+			<incomplete>false</incomplete>
+			<configs>
+				<config>src/main/resources/data-source-context.xml</config>
+				<config>src/main/resources/data-source-context-init.xml</config>
+				<config>src/main/resources/simple-job-launcher-context.xml</config>
+				<config>src/main/resources/jobs/compositeItemWriterSampleJob.xml</config>
+			</configs>
+		</configSet>
 	</configSets>
 </beansProjectDescription>
diff --git a/spring-batch-samples/src/main/resources/jobs/compositeProcessorSampleJob.xml b/spring-batch-samples/src/main/resources/jobs/compositeItemWriterSampleJob.xml
similarity index 95%
rename from spring-batch-samples/src/main/resources/jobs/compositeProcessorSampleJob.xml
rename to spring-batch-samples/src/main/resources/jobs/compositeItemWriterSampleJob.xml
index ad988911d..a5003ae26 100644
--- a/spring-batch-samples/src/main/resources/jobs/compositeProcessorSampleJob.xml
+++ b/spring-batch-samples/src/main/resources/jobs/compositeItemWriterSampleJob.xml
@@ -9,7 +9,7 @@
 		http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop-2.0.xsd
 		http://www.springframework.org/schema/tx http://www.springframework.org/schema/tx/spring-tx-2.0.xsd">
 
-	<bean id="compositeProcessorJob" parent="simpleJob">
+	<bean id="compositeItemWriterJob" parent="simpleJob">
 		<property name="steps">
 			<bean id="step1" parent="simpleStep">
 				<property name="streams">
diff --git a/spring-batch-samples/src/test/java/org/springframework/batch/sample/CompositeProcessorSampleFunctionalTests.java b/spring-batch-samples/src/test/java/org/springframework/batch/sample/CompositeItemWriterSampleFunctionalTests.java
similarity index 96%
rename from spring-batch-samples/src/test/java/org/springframework/batch/sample/CompositeProcessorSampleFunctionalTests.java
rename to spring-batch-samples/src/test/java/org/springframework/batch/sample/CompositeItemWriterSampleFunctionalTests.java
index 1fc6a5b02..815fe270f 100644
--- a/spring-batch-samples/src/test/java/org/springframework/batch/sample/CompositeProcessorSampleFunctionalTests.java
+++ b/spring-batch-samples/src/test/java/org/springframework/batch/sample/CompositeItemWriterSampleFunctionalTests.java
@@ -16,7 +16,7 @@ import org.springframework.jdbc.core.JdbcOperations;
 import org.springframework.jdbc.core.RowCallbackHandler;
 
 
-public class CompositeProcessorSampleFunctionalTests extends AbstractValidatingBatchLauncherTests {
+public class CompositeItemWriterSampleFunctionalTests extends AbstractValidatingBatchLauncherTests {
 
 	private static final String GET_TRADES = "SELECT isin, quantity, price, customer FROM trade order by isin";
 	
diff --git a/spring-batch-samples/src/test/resources/org/springframework/batch/sample/CompositeProcessorSampleFunctionalTests-context.xml b/spring-batch-samples/src/test/resources/org/springframework/batch/sample/CompositeItemWriterSampleFunctionalTests-context.xml
similarity index 83%
rename from spring-batch-samples/src/test/resources/org/springframework/batch/sample/CompositeProcessorSampleFunctionalTests-context.xml
rename to spring-batch-samples/src/test/resources/org/springframework/batch/sample/CompositeItemWriterSampleFunctionalTests-context.xml
index c39b58f55..1592a9da8 100644
--- a/spring-batch-samples/src/test/resources/org/springframework/batch/sample/CompositeProcessorSampleFunctionalTests-context.xml
+++ b/spring-batch-samples/src/test/resources/org/springframework/batch/sample/CompositeItemWriterSampleFunctionalTests-context.xml
@@ -5,6 +5,6 @@
 		http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd">
 
 	<import resource="classpath:/simple-job-launcher-context.xml" />
-	<import resource="classpath:/jobs/compositeProcessorSampleJob.xml" />
+	<import resource="classpath:/jobs/compositeItemWriterSampleJob.xml" />
 
 </beans>