diff --git a/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/file/mapping/DefaultLineMapper.java b/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/file/mapping/DefaultLineMapper.java
index 2d94dd360..fed622bbe 100644
--- a/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/file/mapping/DefaultLineMapper.java
+++ b/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/file/mapping/DefaultLineMapper.java
@@ -20,7 +20,7 @@ public class DefaultLineMapper<T> implements LineMapper<T> {
 		return fieldSetMapper.process(tokenizer.process(line));
 	}
 
-	public void setTokenizer(LineTokenizer tokenizer) {
+	public void setLineTokenizer(LineTokenizer tokenizer) {
 		this.tokenizer = tokenizer;
 	}
 
diff --git a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/file/mapping/DefaultLineMapperTests.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/file/mapping/DefaultLineMapperTests.java
index 9a8cc43c8..8b03846e4 100644
--- a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/file/mapping/DefaultLineMapperTests.java
+++ b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/file/mapping/DefaultLineMapperTests.java
@@ -28,7 +28,7 @@ public class DefaultLineMapperTests {
 		expect(fsMapper.process(fs)).andReturn(item);
 		replay(fsMapper);
 		
-		tested.setTokenizer(tokenizer);
+		tested.setLineTokenizer(tokenizer);
 		tested.setFieldSetMapper(fsMapper);
 		
 		assertSame(item, tested.mapLine(line, 1));
diff --git a/spring-batch-samples/src/main/resources/jobs/fixedLengthImportJob.xml b/spring-batch-samples/src/main/resources/jobs/fixedLengthImportJob.xml
index b9b3fb98d..321ed9328 100644
--- a/spring-batch-samples/src/main/resources/jobs/fixedLengthImportJob.xml
+++ b/spring-batch-samples/src/main/resources/jobs/fixedLengthImportJob.xml
@@ -33,7 +33,7 @@
 			value="classpath:data/fixedLengthImportJob/input/20070122.teststream.ImportTradeDataStep.txt" />
 		<property name="lineMapper">
 			<bean class="org.springframework.batch.item.file.mapping.DefaultLineMapper">
-				<property name="tokenizer" ref="fixedFileTokenizer" />
+				<property name="lineTokenizer" ref="fixedFileTokenizer" />
 				<property name="fieldSetMapper" ref="fieldSetMapper" />
 			</bean>
 		</property>