diff --git a/spring-batch-samples/src/main/resources/jobs/skipSampleJob.xml b/spring-batch-samples/src/main/resources/jobs/skipSampleJob.xml
index 13661390c..a73ac7b0e 100644
--- a/spring-batch-samples/src/main/resources/jobs/skipSampleJob.xml
+++ b/spring-batch-samples/src/main/resources/jobs/skipSampleJob.xml
@@ -15,12 +15,12 @@
 			<list>
 				<bean id="step1" parent="skipLimitStep">
 					<property name="skipLimit" value="1" />
-					<property name="streams" ref="fileInputTemplate" />
+					<property name="streams" ref="fileItemReader" />
 					<property name="itemReader">
 						<bean
 							class="org.springframework.batch.item.validator.ValidatingItemReader">
 							<property name="itemReader"
-								ref="fileInputTemplate" />
+								ref="fileItemReader" />
 							<property name="validator"
 								ref="tradeValidator" />
 						</bean>
diff --git a/spring-batch-samples/src/main/resources/jobs/tradeJob.xml b/spring-batch-samples/src/main/resources/jobs/tradeJob.xml
index 644a3e292..b99ed91e9 100644
--- a/spring-batch-samples/src/main/resources/jobs/tradeJob.xml
+++ b/spring-batch-samples/src/main/resources/jobs/tradeJob.xml
@@ -14,12 +14,12 @@
 		<property name="steps">
 			<list>
 				<bean id="step1" parent="simpleStep">
-					<property name="streams" ref="fileInputTemplate" />
+					<property name="streams" ref="fileItemReader" />
 					<property name="itemReader">
 						<bean
 							class="org.springframework.batch.item.validator.ValidatingItemReader">
 							<property name="itemReader"
-								ref="fileInputTemplate" />
+								ref="fileItemReader" />
 							<property name="validator"
 								ref="tradeValidator" />
 						</bean>
@@ -45,7 +45,7 @@
 					<property name="itemWriter">
 						<bean
 							class="org.springframework.batch.sample.item.writer.CustomerCreditUpdateWriter"
-							p:dao-ref="customerReportOutputSource" />
+							p:dao-ref="customerReportItemWriter" />
 					</property>
 				</bean>
 			</list>
diff --git a/spring-batch-samples/src/main/resources/jobs/tradeJobIo.xml b/spring-batch-samples/src/main/resources/jobs/tradeJobIo.xml
index 5b5b9e343..002d6a41c 100644
--- a/spring-batch-samples/src/main/resources/jobs/tradeJobIo.xml
+++ b/spring-batch-samples/src/main/resources/jobs/tradeJobIo.xml
@@ -24,7 +24,7 @@
 
 	<bean
 		class="org.springframework.batch.sample.dao.FlatFileCustomerCreditDao"
-		id="customerReportOutputSource">
+		id="customerReportItemWriter">
 		<property name="itemWriter">
 			<bean
 				class="org.springframework.batch.item.file.FlatFileItemWriter"
@@ -39,7 +39,7 @@
 	</bean>
 
 	<bean class="org.springframework.batch.item.file.FlatFileItemReader"
-		id="fileInputTemplate">
+		id="fileItemReader">
 		<property name="resource" ref="fileLocator" />
 		<property name="lineTokenizer" ref="tradeFileDescriptor" />
 		<property name="fieldSetMapper">