diff --git a/spring-batch-samples/src/main/resources/jobs/compositeItemWriterSampleJob.xml b/spring-batch-samples/src/main/resources/jobs/compositeItemWriterSampleJob.xml
index a5003ae26..d6bfa529b 100644
--- a/spring-batch-samples/src/main/resources/jobs/compositeItemWriterSampleJob.xml
+++ b/spring-batch-samples/src/main/resources/jobs/compositeItemWriterSampleJob.xml
@@ -93,7 +93,7 @@
 			value="file:target/test-outputs/20070122.testStream.ParallelCustomerReportStep.TEMP.txt" />
 		<property name="fieldSetCreator">
 			<bean
-				class="org.springframework.batch.item.file.mapping.PassThroughFieldSetMapper" />
+				class="org.springframework.batch.item.file.mapping.PassThroughFieldSetCreator" />
 		</property>
 	</bean>
 
diff --git a/spring-batch-samples/src/main/resources/jobs/multilineJob.xml b/spring-batch-samples/src/main/resources/jobs/multilineJob.xml
index 63404999c..c1500317f 100644
--- a/spring-batch-samples/src/main/resources/jobs/multilineJob.xml
+++ b/spring-batch-samples/src/main/resources/jobs/multilineJob.xml
@@ -24,7 +24,7 @@
 						<property name="resource"
 							value="file:target/test-outputs/20070122.testStream.multilineStep.txt" />
 							<property name="fieldSetCreator">
-								<bean class="org.springframework.batch.item.file.mapping.PassThroughFieldSetMapper"/>
+								<bean class="org.springframework.batch.item.file.mapping.PassThroughFieldSetCreator"/>
 							</property>
 					</bean>
 				</property>
diff --git a/spring-batch-samples/src/main/resources/jobs/multilineOrderIo.xml b/spring-batch-samples/src/main/resources/jobs/multilineOrderIo.xml
index 80c426ef3..3b5ef045a 100644
--- a/spring-batch-samples/src/main/resources/jobs/multilineOrderIo.xml
+++ b/spring-batch-samples/src/main/resources/jobs/multilineOrderIo.xml
@@ -32,7 +32,7 @@
 		<property name="resource" ref="fileOutputLocator" />
 		<property name="fieldSetCreator">
 			<bean
-				class="org.springframework.batch.item.file.mapping.PassThroughFieldSetMapper" />
+				class="org.springframework.batch.item.file.mapping.PassThroughFieldSetCreator" />
 		</property>
 	</bean>
 
diff --git a/spring-batch-samples/src/main/resources/jobs/tradeJobIo.xml b/spring-batch-samples/src/main/resources/jobs/tradeJobIo.xml
index 5224d49c4..827a58c6c 100644
--- a/spring-batch-samples/src/main/resources/jobs/tradeJobIo.xml
+++ b/spring-batch-samples/src/main/resources/jobs/tradeJobIo.xml
@@ -32,7 +32,7 @@
 				<property name="resource" ref="customerFileLocator" />
 				<property name="fieldSetCreator">
 					<bean
-						class="org.springframework.batch.item.file.mapping.PassThroughFieldSetMapper" />
+						class="org.springframework.batch.item.file.mapping.PassThroughFieldSetCreator" />
 				</property>
 			</bean>
 		</property>