diff --git a/spring-batch-core/src/test/java/org/springframework/batch/core/resource/JdbcCursorItemReaderPreparedStatementIntegrationTests.java b/spring-batch-core/src/test/java/org/springframework/batch/core/resource/JdbcCursorItemReaderPreparedStatementIntegrationTests.java
index e38ada18b..262babefa 100644
--- a/spring-batch-core/src/test/java/org/springframework/batch/core/resource/JdbcCursorItemReaderPreparedStatementIntegrationTests.java
+++ b/spring-batch-core/src/test/java/org/springframework/batch/core/resource/JdbcCursorItemReaderPreparedStatementIntegrationTests.java
@@ -44,7 +44,7 @@ public class JdbcCursorItemReaderPreparedStatementIntegrationTests {
 		itemReader.setIgnoreWarnings(true);
 		itemReader.setVerifyCursorPosition(true);
 		
-		itemReader.setMapper(new FooRowMapper());
+		itemReader.setRowMapper(new FooRowMapper());
 		itemReader.setFetchSize(10);
 		itemReader.setMaxRows(100);
 		itemReader.setQueryTimeout(1000);
diff --git a/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/database/JdbcCursorItemReader.java b/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/database/JdbcCursorItemReader.java
index dcf968974..eadf35d2c 100644
--- a/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/database/JdbcCursorItemReader.java
+++ b/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/database/JdbcCursorItemReader.java
@@ -142,7 +142,7 @@ public class JdbcCursorItemReader<T> extends AbstractItemCountingItemStreamItemR
 
 	private SQLExceptionTranslator exceptionTranslator;
 
-	private RowMapper mapper;
+	private RowMapper rowMapper;
 
 	private boolean initialized = false;
 
@@ -163,7 +163,7 @@ public class JdbcCursorItemReader<T> extends AbstractItemCountingItemStreamItemR
 	public void afterPropertiesSet() throws Exception {
 		Assert.notNull(dataSource, "DataSource must be provided");
 		Assert.notNull(sql, "The SQL query must be provided");
-		Assert.notNull(mapper, "RowMapper must be provided");
+		Assert.notNull(rowMapper, "RowMapper must be provided");
 	}
 
 	/**
@@ -359,10 +359,10 @@ public class JdbcCursorItemReader<T> extends AbstractItemCountingItemStreamItemR
 	/**
 	 * Set the RowMapper to be used for all calls to read().
 	 * 
-	 * @param mapper
+	 * @param rowMapper
 	 */
-	public void setMapper(RowMapper mapper) {
-		this.mapper = mapper;
+	public void setRowMapper(RowMapper rowMapper) {
+		this.rowMapper = rowMapper;
 	}
 
 	/**
@@ -474,7 +474,7 @@ public class JdbcCursorItemReader<T> extends AbstractItemCountingItemStreamItemR
 				return null;
 			}
 			int currentRow = getCurrentItemCount();
-			T item = (T) mapper.mapRow(rs, currentRow);
+			T item = (T) rowMapper.mapRow(rs, currentRow);
 			verifyCursorPosition(currentRow);
 			return item;
 		}
diff --git a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/database/JdbcCursorItemReaderCommonTests.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/database/JdbcCursorItemReaderCommonTests.java
index b7f91b054..c8723dc34 100644
--- a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/database/JdbcCursorItemReaderCommonTests.java
+++ b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/database/JdbcCursorItemReaderCommonTests.java
@@ -18,7 +18,7 @@ public class JdbcCursorItemReaderCommonTests extends AbstractDatabaseItemStreamI
 		result.setIgnoreWarnings(true);
 		result.setVerifyCursorPosition(true);
 
-		result.setMapper(new FooRowMapper());
+		result.setRowMapper(new FooRowMapper());
 		result.setFetchSize(10);
 		result.setMaxRows(100);
 		result.setQueryTimeout(1000);
diff --git a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/database/JdbcCursorItemReaderIntegrationTests.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/database/JdbcCursorItemReaderIntegrationTests.java
index c8cf803f3..f7f521d7f 100644
--- a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/database/JdbcCursorItemReaderIntegrationTests.java
+++ b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/database/JdbcCursorItemReaderIntegrationTests.java
@@ -22,7 +22,7 @@ public class JdbcCursorItemReaderIntegrationTests extends AbstractDataSourceItem
 		result.setIgnoreWarnings(true);
 		result.setVerifyCursorPosition(true);
 		
-		result.setMapper(new FooRowMapper());
+		result.setRowMapper(new FooRowMapper());
 		result.setFetchSize(10);
 		result.setMaxRows(100);
 		result.setQueryTimeout(1000);
diff --git a/spring-batch-samples/src/main/resources/jobs/footballJob.xml b/spring-batch-samples/src/main/resources/jobs/footballJob.xml
index 9a16915c0..72333d647 100644
--- a/spring-batch-samples/src/main/resources/jobs/footballJob.xml
+++ b/spring-batch-samples/src/main/resources/jobs/footballJob.xml
@@ -78,7 +78,7 @@
 
 	<beans:bean id="playerSummarizationSource" class="org.springframework.batch.item.database.JdbcCursorItemReader">
 		<beans:property name="dataSource" ref="dataSource" />
-		<beans:property name="mapper">
+		<beans:property name="rowMapper">
 			<beans:bean class="org.springframework.batch.sample.domain.football.internal.PlayerSummaryMapper" />
 		</beans:property>
 		<beans:property name="sql">
diff --git a/spring-batch-samples/src/main/resources/jobs/iosample/jdbcCursor.xml b/spring-batch-samples/src/main/resources/jobs/iosample/jdbcCursor.xml
index e3cedda39..207fa4f91 100644
--- a/spring-batch-samples/src/main/resources/jobs/iosample/jdbcCursor.xml
+++ b/spring-batch-samples/src/main/resources/jobs/iosample/jdbcCursor.xml
@@ -14,7 +14,7 @@
 	<bean id="itemReader" class="org.springframework.batch.item.database.JdbcCursorItemReader">
 		<property name="dataSource" ref="dataSource"/>
 		<property name="sql" value="select ID, NAME, CREDIT from CUSTOMER"/>
-		<property name="mapper">
+		<property name="rowMapper">
 			<bean class="org.springframework.batch.sample.domain.trade.internal.CustomerCreditRowMapper"/>
 		</property>
 	</bean>
diff --git a/spring-batch-samples/src/main/resources/jobs/skipSampleJob.xml b/spring-batch-samples/src/main/resources/jobs/skipSampleJob.xml
index 14dad4ec2..f211eba31 100644
--- a/spring-batch-samples/src/main/resources/jobs/skipSampleJob.xml
+++ b/spring-batch-samples/src/main/resources/jobs/skipSampleJob.xml
@@ -101,7 +101,7 @@
 	<beans:bean id="tradeSqlItemReader" class="org.springframework.batch.item.database.JdbcCursorItemReader">
 		<beans:property name="dataSource" ref="dataSource" />
 		<beans:property name="sql" value="SELECT isin, quantity, price, customer from TRADE" />
-		<beans:property name="mapper">
+		<beans:property name="rowMapper">
 			<beans:bean class="org.springframework.batch.sample.domain.trade.internal.TradeRowMapper" />
 		</beans:property>
 	</beans:bean>
diff --git a/spring-batch-samples/src/main/resources/jobs/tradeJob.xml b/spring-batch-samples/src/main/resources/jobs/tradeJob.xml
index 037ed3fa1..073043698 100644
--- a/spring-batch-samples/src/main/resources/jobs/tradeJob.xml
+++ b/spring-batch-samples/src/main/resources/jobs/tradeJob.xml
@@ -51,7 +51,7 @@
 	<beans:bean id="tradeSqlItemReader" class="org.springframework.batch.item.database.JdbcCursorItemReader">
 		<beans:property name="dataSource" ref="dataSource" />
 		<beans:property name="sql" value="SELECT id, quantity, price, customer from TRADE" />
-		<beans:property name="mapper">
+		<beans:property name="rowMapper">
 			<beans:bean class="org.springframework.batch.sample.domain.trade.internal.TradeRowMapper" />
 		</beans:property>
 	</beans:bean>
@@ -59,7 +59,7 @@
 	<beans:bean id="customerSqlItemReader" class="org.springframework.batch.item.database.JdbcCursorItemReader">
 		<beans:property name="dataSource" ref="dataSource" />
 		<beans:property name="sql" value="SELECT id, name, credit FROM customer " />
-		<beans:property name="mapper">
+		<beans:property name="rowMapper">
 			<beans:bean class="org.springframework.batch.sample.domain.trade.internal.CustomerCreditRowMapper" />
 		</beans:property>
 	</beans:bean>