diff --git a/spring-batch-execution/src/test/java/org/springframework/batch/execution/launch/SimpleJobTests.java b/spring-batch-execution/src/test/java/org/springframework/batch/execution/launch/SimpleJobTests.java
index bed5b911f..4889bb276 100644
--- a/spring-batch-execution/src/test/java/org/springframework/batch/execution/launch/SimpleJobTests.java
+++ b/spring-batch-execution/src/test/java/org/springframework/batch/execution/launch/SimpleJobTests.java
@@ -43,7 +43,7 @@ import org.springframework.batch.execution.tasklet.ItemOrientedTasklet;
 import org.springframework.batch.item.ItemProcessor;
 import org.springframework.batch.item.ItemReader;
 import org.springframework.batch.item.ItemRecoverer;
-import org.springframework.batch.item.provider.ListItemReader;
+import org.springframework.batch.item.reader.ListItemReader;
 import org.springframework.batch.repeat.RepeatContext;
 import org.springframework.batch.repeat.exception.handler.ExceptionHandler;
 import org.springframework.batch.repeat.support.RepeatTemplate;
diff --git a/spring-batch-execution/src/test/java/org/springframework/batch/execution/step/simple/DefaultStepExecutorTests.java b/spring-batch-execution/src/test/java/org/springframework/batch/execution/step/simple/DefaultStepExecutorTests.java
index 2a56dbcee..1c927c3dd 100644
--- a/spring-batch-execution/src/test/java/org/springframework/batch/execution/step/simple/DefaultStepExecutorTests.java
+++ b/spring-batch-execution/src/test/java/org/springframework/batch/execution/step/simple/DefaultStepExecutorTests.java
@@ -40,7 +40,7 @@ import org.springframework.batch.execution.step.SimpleStepConfiguration;
 import org.springframework.batch.execution.tasklet.ItemOrientedTasklet;
 import org.springframework.batch.item.ItemProcessor;
 import org.springframework.batch.item.ItemReader;
-import org.springframework.batch.item.provider.ListItemReader;
+import org.springframework.batch.item.reader.ListItemReader;
 import org.springframework.batch.repeat.ExitStatus;
 import org.springframework.batch.repeat.RepeatContext;
 import org.springframework.batch.repeat.exception.handler.DefaultExceptionHandler;
diff --git a/spring-batch-execution/src/test/java/org/springframework/batch/execution/tasklet/ItemOrientedTaskletTests.java b/spring-batch-execution/src/test/java/org/springframework/batch/execution/tasklet/ItemOrientedTaskletTests.java
index 18ba4ab4c..8570fe744 100644
--- a/spring-batch-execution/src/test/java/org/springframework/batch/execution/tasklet/ItemOrientedTaskletTests.java
+++ b/spring-batch-execution/src/test/java/org/springframework/batch/execution/tasklet/ItemOrientedTaskletTests.java
@@ -27,7 +27,7 @@ import org.springframework.batch.io.Skippable;
 import org.springframework.batch.item.ItemProcessor;
 import org.springframework.batch.item.ItemReader;
 import org.springframework.batch.item.ItemRecoverer;
-import org.springframework.batch.item.provider.AbstractItemReader;
+import org.springframework.batch.item.reader.AbstractItemReader;
 import org.springframework.batch.repeat.context.RepeatContextSupport;
 import org.springframework.batch.repeat.synch.RepeatSynchronizationManager;
 import org.springframework.batch.retry.policy.SimpleRetryPolicy;
diff --git a/spring-batch-execution/src/test/resources/job-configuration.xml b/spring-batch-execution/src/test/resources/job-configuration.xml
index d2f17ff35..bc6514cba 100644
--- a/spring-batch-execution/src/test/resources/job-configuration.xml
+++ b/spring-batch-execution/src/test/resources/job-configuration.xml
@@ -19,7 +19,7 @@
 						class="org.springframework.batch.execution.tasklet.ItemOrientedTasklet">
 						<property name="itemReader">
 							<bean 
-								class="org.springframework.batch.item.provider.ListItemReader">
+								class="org.springframework.batch.item.reader.ListItemReader">
 								<constructor-arg value="foo,bar,spam"/>
 							</bean>
 						</property>
diff --git a/spring-batch-execution/src/test/resources/org/springframework/batch/execution/configuration/test-context.xml b/spring-batch-execution/src/test/resources/org/springframework/batch/execution/configuration/test-context.xml
index 7b0b16bef..f46669d54 100644
--- a/spring-batch-execution/src/test/resources/org/springframework/batch/execution/configuration/test-context.xml
+++ b/spring-batch-execution/src/test/resources/org/springframework/batch/execution/configuration/test-context.xml
@@ -21,7 +21,7 @@
 						class="org.springframework.batch.execution.tasklet.ItemOrientedTasklet">
 						<property name="itemReader">
 							<bean 
-								class="org.springframework.batch.item.provider.ListItemReader">
+								class="org.springframework.batch.item.reader.ListItemReader">
 								<constructor-arg value="foo,bar,spam"/>
 							</bean>
 						</property>
diff --git a/spring-batch-infrastructure/.springBeans b/spring-batch-infrastructure/.springBeans
index 67c29fdd4..8b7328766 100644
--- a/spring-batch-infrastructure/.springBeans
+++ b/spring-batch-infrastructure/.springBeans
@@ -9,7 +9,6 @@
 		<config>src/test/resources/org/springframework/batch/io/sql/data-source-context.xml</config>
 		<config>src/test/resources/org/springframework/batch/item/processor/delegating-item-processor.xml</config>
 		<config>src/test/resources/org/springframework/batch/item/processor/pe-delegating-item-processor.xml</config>
-		<config>src/test/resources/org/springframework/batch/item/provider/delegating-item-provider.xml</config>
 		<config>src/test/resources/org/springframework/batch/retry/aop/retry-transaction-test.xml</config>
 	</configs>
 	<configSets>
diff --git a/spring-batch-infrastructure/src/main/java/org/springframework/batch/io/cursor/HibernateCursorItemReader.java b/spring-batch-infrastructure/src/main/java/org/springframework/batch/io/cursor/HibernateCursorItemReader.java
index 40775b123..188bba5b0 100644
--- a/spring-batch-infrastructure/src/main/java/org/springframework/batch/io/cursor/HibernateCursorItemReader.java
+++ b/spring-batch-infrastructure/src/main/java/org/springframework/batch/io/cursor/HibernateCursorItemReader.java
@@ -26,7 +26,7 @@ import org.hibernate.StatelessSession;
 import org.springframework.batch.io.Skippable;
 import org.springframework.batch.item.ItemReader;
 import org.springframework.batch.item.ResourceLifecycle;
-import org.springframework.batch.item.provider.AbstractItemReader;
+import org.springframework.batch.item.reader.AbstractItemReader;
 import org.springframework.batch.repeat.synch.BatchTransactionSynchronizationManager;
 import org.springframework.batch.restart.GenericRestartData;
 import org.springframework.batch.restart.RestartData;
diff --git a/spring-batch-infrastructure/src/main/java/org/springframework/batch/io/file/SimpleFlatFileItemReader.java b/spring-batch-infrastructure/src/main/java/org/springframework/batch/io/file/SimpleFlatFileItemReader.java
index a231bf7b9..812a501bb 100644
--- a/spring-batch-infrastructure/src/main/java/org/springframework/batch/io/file/SimpleFlatFileItemReader.java
+++ b/spring-batch-infrastructure/src/main/java/org/springframework/batch/io/file/SimpleFlatFileItemReader.java
@@ -29,7 +29,7 @@ import org.springframework.batch.io.file.transform.DelimitedLineTokenizer;
 import org.springframework.batch.io.file.transform.LineTokenizer;
 import org.springframework.batch.item.ItemReader;
 import org.springframework.batch.item.ResourceLifecycle;
-import org.springframework.batch.item.provider.AbstractItemReader;
+import org.springframework.batch.item.reader.AbstractItemReader;
 import org.springframework.beans.factory.DisposableBean;
 import org.springframework.beans.factory.InitializingBean;
 import org.springframework.core.io.Resource;
diff --git a/spring-batch-infrastructure/src/main/java/org/springframework/batch/io/file/separator/ResourceLineReader.java b/spring-batch-infrastructure/src/main/java/org/springframework/batch/io/file/separator/ResourceLineReader.java
index 8f9bea8b4..60e8523e3 100644
--- a/spring-batch-infrastructure/src/main/java/org/springframework/batch/io/file/separator/ResourceLineReader.java
+++ b/spring-batch-infrastructure/src/main/java/org/springframework/batch/io/file/separator/ResourceLineReader.java
@@ -28,7 +28,7 @@ import java.util.Iterator;
 import org.springframework.batch.io.exception.BatchEnvironmentException;
 import org.springframework.batch.item.ItemReader;
 import org.springframework.batch.item.ResourceLifecycle;
-import org.springframework.batch.item.provider.AbstractItemReader;
+import org.springframework.batch.item.reader.AbstractItemReader;
 import org.springframework.beans.factory.DisposableBean;
 import org.springframework.core.io.Resource;
 import org.springframework.util.Assert;
@@ -127,7 +127,7 @@ public class ResourceLineReader extends AbstractItemReader implements LineReader
 	 *             if there is an IOException while accessing the input
 	 *             resource.
 	 * 
-	 * @see org.springframework.batch.item.provider.support.ItemReader#read()
+	 * @see org.springframework.batch.item.reader.support.ItemReader#read()
 	 */
 	public synchronized Object read() {
 		// Make a copy of the recordSeparatorPolicy reference, in case it is
diff --git a/spring-batch-infrastructure/src/main/java/org/springframework/batch/io/xml/StaxEventItemReader.java b/spring-batch-infrastructure/src/main/java/org/springframework/batch/io/xml/StaxEventItemReader.java
index 1e5228337..eefdb0b52 100644
--- a/spring-batch-infrastructure/src/main/java/org/springframework/batch/io/xml/StaxEventItemReader.java
+++ b/spring-batch-infrastructure/src/main/java/org/springframework/batch/io/xml/StaxEventItemReader.java
@@ -19,7 +19,7 @@ import org.springframework.batch.io.xml.stax.FragmentEventReader;
 import org.springframework.batch.io.xml.stax.TransactionalEventReader;
 import org.springframework.batch.item.ItemReader;
 import org.springframework.batch.item.ResourceLifecycle;
-import org.springframework.batch.item.provider.AbstractItemReader;
+import org.springframework.batch.item.reader.AbstractItemReader;
 import org.springframework.batch.repeat.synch.BatchTransactionSynchronizationManager;
 import org.springframework.batch.restart.GenericRestartData;
 import org.springframework.batch.restart.RestartData;
diff --git a/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/provider/AbstractItemReader.java b/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/reader/AbstractItemReader.java
similarity index 95%
rename from spring-batch-infrastructure/src/main/java/org/springframework/batch/item/provider/AbstractItemReader.java
rename to spring-batch-infrastructure/src/main/java/org/springframework/batch/item/reader/AbstractItemReader.java
index 79f4076f4..879013b3d 100644
--- a/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/provider/AbstractItemReader.java
+++ b/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/reader/AbstractItemReader.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.batch.item.provider;
+package org.springframework.batch.item.reader;
 
 import org.springframework.batch.item.ItemReader;
 
diff --git a/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/provider/AggregateItemReader.java b/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/reader/AggregateItemReader.java
similarity index 95%
rename from spring-batch-infrastructure/src/main/java/org/springframework/batch/item/provider/AggregateItemReader.java
rename to spring-batch-infrastructure/src/main/java/org/springframework/batch/item/reader/AggregateItemReader.java
index 96a3eac38..3869c871d 100644
--- a/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/provider/AggregateItemReader.java
+++ b/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/reader/AggregateItemReader.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.batch.item.provider;
+package org.springframework.batch.item.reader;
 
 import java.util.ArrayList;
 import java.util.Collection;
diff --git a/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/provider/DelegatingItemReader.java b/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/reader/DelegatingItemReader.java
similarity index 95%
rename from spring-batch-infrastructure/src/main/java/org/springframework/batch/item/provider/DelegatingItemReader.java
rename to spring-batch-infrastructure/src/main/java/org/springframework/batch/item/reader/DelegatingItemReader.java
index 58399a50c..d592b5d90 100644
--- a/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/provider/DelegatingItemReader.java
+++ b/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/reader/DelegatingItemReader.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.batch.item.provider;
+package org.springframework.batch.item.reader;
 
 import java.util.Properties;
 
diff --git a/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/provider/ItemReaderAdapter.java b/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/reader/ItemReaderAdapter.java
similarity index 93%
rename from spring-batch-infrastructure/src/main/java/org/springframework/batch/item/provider/ItemReaderAdapter.java
rename to spring-batch-infrastructure/src/main/java/org/springframework/batch/item/reader/ItemReaderAdapter.java
index 8ce4318ba..167ecca75 100644
--- a/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/provider/ItemReaderAdapter.java
+++ b/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/reader/ItemReaderAdapter.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.batch.item.provider;
+package org.springframework.batch.item.reader;
 
 import org.springframework.batch.item.ItemReader;
 import org.springframework.batch.support.AbstractMethodInvokingDelegator;
diff --git a/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/provider/JmsItemReader.java b/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/reader/JmsItemReader.java
similarity index 95%
rename from spring-batch-infrastructure/src/main/java/org/springframework/batch/item/provider/JmsItemReader.java
rename to spring-batch-infrastructure/src/main/java/org/springframework/batch/item/reader/JmsItemReader.java
index 45e7e1244..f31f037dd 100644
--- a/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/provider/JmsItemReader.java
+++ b/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/reader/JmsItemReader.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.batch.item.provider;
+package org.springframework.batch.item.reader;
 
 import javax.jms.Destination;
 import javax.jms.JMSException;
@@ -108,7 +108,7 @@ public class JmsItemReader extends AbstractItemReader implements FailedItemIdent
 	 * Send the message back to the proovider using the specified error
 	 * destination property of this provider.
 	 * 
-	 * @see org.springframework.batch.item.provider.AbstractItemReader#recover(java.lang.Object,
+	 * @see org.springframework.batch.item.reader.AbstractItemReader#recover(java.lang.Object,
 	 * Throwable)
 	 */
 	public boolean recover(Object item, Throwable cause) {
@@ -137,7 +137,7 @@ public class JmsItemReader extends AbstractItemReader implements FailedItemIdent
 	 * If the message is a {@link Message} then returns the JMS message ID.
 	 * Otherwise just delegate to parent class.
 	 * 
-	 * @see org.springframework.batch.item.provider.AbstractItemReader#getKey(java.lang.Object)
+	 * @see org.springframework.batch.item.reader.AbstractItemReader#getKey(java.lang.Object)
 	 * 
 	 * @throws UnexpectedInputException if the JMS id cannot be determined from
 	 * a JMS Message
diff --git a/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/provider/ListItemReader.java b/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/reader/ListItemReader.java
similarity index 96%
rename from spring-batch-infrastructure/src/main/java/org/springframework/batch/item/provider/ListItemReader.java
rename to spring-batch-infrastructure/src/main/java/org/springframework/batch/item/reader/ListItemReader.java
index 4a34514a2..538daede6 100644
--- a/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/provider/ListItemReader.java
+++ b/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/reader/ListItemReader.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.batch.item.provider;
+package org.springframework.batch.item.reader;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/provider/ValidatingItemReader.java b/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/reader/ValidatingItemReader.java
similarity index 93%
rename from spring-batch-infrastructure/src/main/java/org/springframework/batch/item/provider/ValidatingItemReader.java
rename to spring-batch-infrastructure/src/main/java/org/springframework/batch/item/reader/ValidatingItemReader.java
index a4d5f9836..b4681a508 100644
--- a/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/provider/ValidatingItemReader.java
+++ b/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/reader/ValidatingItemReader.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.batch.item.provider;
+package org.springframework.batch.item.reader;
 
 import org.springframework.batch.item.validator.Validator;
 import org.springframework.util.Assert;
diff --git a/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/provider/package.html b/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/reader/package.html
similarity index 100%
rename from spring-batch-infrastructure/src/main/java/org/springframework/batch/item/provider/package.html
rename to spring-batch-infrastructure/src/main/java/org/springframework/batch/item/reader/package.html
diff --git a/spring-batch-infrastructure/src/test/java/org/springframework/batch/io/driving/FooInputSource.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/io/driving/FooInputSource.java
index 8fd1c4d07..0da0be0db 100644
--- a/spring-batch-infrastructure/src/test/java/org/springframework/batch/io/driving/FooInputSource.java
+++ b/spring-batch-infrastructure/src/test/java/org/springframework/batch/io/driving/FooInputSource.java
@@ -1,7 +1,7 @@
 package org.springframework.batch.io.driving;
 
 import org.springframework.batch.item.ItemReader;
-import org.springframework.batch.item.provider.AbstractItemReader;
+import org.springframework.batch.item.reader.AbstractItemReader;
 import org.springframework.batch.restart.RestartData;
 import org.springframework.batch.restart.Restartable;
 import org.springframework.beans.factory.DisposableBean;
diff --git a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/ItemProviderTests.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/ItemProviderTests.java
index 24f55b8b1..ea6cc4182 100644
--- a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/ItemProviderTests.java
+++ b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/ItemProviderTests.java
@@ -18,7 +18,7 @@ package org.springframework.batch.item;
 
 import junit.framework.TestCase;
 
-import org.springframework.batch.item.provider.AbstractItemReader;
+import org.springframework.batch.item.reader.AbstractItemReader;
 
 public class ItemProviderTests extends TestCase {
 
diff --git a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/provider/AggregateItemReaderTests.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/reader/AggregateItemReaderTests.java
similarity index 89%
rename from spring-batch-infrastructure/src/test/java/org/springframework/batch/item/provider/AggregateItemReaderTests.java
rename to spring-batch-infrastructure/src/test/java/org/springframework/batch/item/reader/AggregateItemReaderTests.java
index c3d245210..0e44a1afe 100644
--- a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/provider/AggregateItemReaderTests.java
+++ b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/reader/AggregateItemReaderTests.java
@@ -1,4 +1,4 @@
-package org.springframework.batch.item.provider;
+package org.springframework.batch.item.reader;
 
 import java.util.Collection;
 import java.util.Iterator;
@@ -7,6 +7,7 @@ import junit.framework.TestCase;
 
 import org.easymock.MockControl;
 import org.springframework.batch.item.ItemReader;
+import org.springframework.batch.item.reader.AggregateItemReader;
 
 public class AggregateItemReaderTests extends TestCase {
 
diff --git a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/provider/DelegatingItemReaderIntegrationTests.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/reader/DelegatingItemReaderIntegrationTests.java
similarity index 89%
rename from spring-batch-infrastructure/src/test/java/org/springframework/batch/item/provider/DelegatingItemReaderIntegrationTests.java
rename to spring-batch-infrastructure/src/test/java/org/springframework/batch/item/reader/DelegatingItemReaderIntegrationTests.java
index 3881a8ba9..330e9b88a 100644
--- a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/provider/DelegatingItemReaderIntegrationTests.java
+++ b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/reader/DelegatingItemReaderIntegrationTests.java
@@ -1,9 +1,10 @@
-package org.springframework.batch.item.provider;
+package org.springframework.batch.item.reader;
 
 import java.util.ArrayList;
 import java.util.List;
 
 import org.springframework.batch.io.sample.domain.FooService;
+import org.springframework.batch.item.reader.ItemReaderAdapter;
 import org.springframework.test.AbstractDependencyInjectionSpringContextTests;
 
 /**
diff --git a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/provider/DelegatingItemReaderTests.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/reader/DelegatingItemReaderTests.java
similarity index 92%
rename from spring-batch-infrastructure/src/test/java/org/springframework/batch/item/provider/DelegatingItemReaderTests.java
rename to spring-batch-infrastructure/src/test/java/org/springframework/batch/item/reader/DelegatingItemReaderTests.java
index 27493b345..3964c4766 100644
--- a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/provider/DelegatingItemReaderTests.java
+++ b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/reader/DelegatingItemReaderTests.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.batch.item.provider;
+package org.springframework.batch.item.reader;
 
 import java.util.Properties;
 
@@ -22,6 +22,8 @@ import junit.framework.TestCase;
 
 import org.springframework.batch.io.Skippable;
 import org.springframework.batch.item.ItemReader;
+import org.springframework.batch.item.reader.AbstractItemReader;
+import org.springframework.batch.item.reader.DelegatingItemReader;
 import org.springframework.batch.restart.GenericRestartData;
 import org.springframework.batch.restart.RestartData;
 import org.springframework.batch.restart.Restartable;
diff --git a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/provider/JmsItemReaderTests.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/reader/JmsItemReaderTests.java
similarity index 98%
rename from spring-batch-infrastructure/src/test/java/org/springframework/batch/item/provider/JmsItemReaderTests.java
rename to spring-batch-infrastructure/src/test/java/org/springframework/batch/item/reader/JmsItemReaderTests.java
index f4a937097..88f1336ed 100644
--- a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/provider/JmsItemReaderTests.java
+++ b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/reader/JmsItemReaderTests.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.batch.item.provider;
+package org.springframework.batch.item.reader;
 
 import java.util.Date;
 
@@ -25,6 +25,7 @@ import javax.jms.Queue;
 import junit.framework.TestCase;
 
 import org.easymock.MockControl;
+import org.springframework.batch.item.reader.JmsItemReader;
 import org.springframework.jms.core.JmsOperations;
 
 public class JmsItemReaderTests extends TestCase {
diff --git a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/provider/ListItemReaderTests.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/reader/ListItemReaderTests.java
similarity index 92%
rename from spring-batch-infrastructure/src/test/java/org/springframework/batch/item/provider/ListItemReaderTests.java
rename to spring-batch-infrastructure/src/test/java/org/springframework/batch/item/reader/ListItemReaderTests.java
index 4ec61ddc7..091d0d9e5 100644
--- a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/provider/ListItemReaderTests.java
+++ b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/reader/ListItemReaderTests.java
@@ -14,12 +14,14 @@
  * limitations under the License.
  */
 
-package org.springframework.batch.item.provider;
+package org.springframework.batch.item.reader;
 
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 
+import org.springframework.batch.item.reader.ListItemReader;
+
 import junit.framework.TestCase;
 
 public class ListItemReaderTests extends TestCase {
diff --git a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/provider/TransactionAwareListItemReaderTests.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/reader/TransactionAwareListItemReaderTests.java
similarity index 97%
rename from spring-batch-infrastructure/src/test/java/org/springframework/batch/item/provider/TransactionAwareListItemReaderTests.java
rename to spring-batch-infrastructure/src/test/java/org/springframework/batch/item/reader/TransactionAwareListItemReaderTests.java
index ff773390f..24fee76bc 100644
--- a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/provider/TransactionAwareListItemReaderTests.java
+++ b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/reader/TransactionAwareListItemReaderTests.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.batch.item.provider;
+package org.springframework.batch.item.reader;
 
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -22,6 +22,7 @@ import java.util.List;
 
 import junit.framework.TestCase;
 
+import org.springframework.batch.item.reader.ListItemReader;
 import org.springframework.batch.support.transaction.ResourcelessTransactionManager;
 import org.springframework.batch.support.transaction.TransactionAwareProxyFactory;
 import org.springframework.transaction.PlatformTransactionManager;
diff --git a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/provider/ValidatingItemReaderTests.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/reader/ValidatingItemReaderTests.java
similarity index 90%
rename from spring-batch-infrastructure/src/test/java/org/springframework/batch/item/provider/ValidatingItemReaderTests.java
rename to spring-batch-infrastructure/src/test/java/org/springframework/batch/item/reader/ValidatingItemReaderTests.java
index ed968e516..abc9f23b1 100644
--- a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/provider/ValidatingItemReaderTests.java
+++ b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/reader/ValidatingItemReaderTests.java
@@ -13,13 +13,15 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.batch.item.provider;
+package org.springframework.batch.item.reader;
 
 import junit.framework.TestCase;
 
 import org.easymock.MockControl;
 import org.springframework.batch.io.exception.ValidationException;
 import org.springframework.batch.item.ItemReader;
+import org.springframework.batch.item.reader.AbstractItemReader;
+import org.springframework.batch.item.reader.ValidatingItemReader;
 import org.springframework.batch.item.validator.Validator;
 
 /**
diff --git a/spring-batch-infrastructure/src/test/java/org/springframework/batch/repeat/callback/ItemReaderRepeatCallbackTests.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/repeat/callback/ItemReaderRepeatCallbackTests.java
index 055376890..26fbce997 100644
--- a/spring-batch-infrastructure/src/test/java/org/springframework/batch/repeat/callback/ItemReaderRepeatCallbackTests.java
+++ b/spring-batch-infrastructure/src/test/java/org/springframework/batch/repeat/callback/ItemReaderRepeatCallbackTests.java
@@ -23,7 +23,7 @@ import java.util.List;
 import junit.framework.TestCase;
 
 import org.springframework.batch.item.ItemProcessor;
-import org.springframework.batch.item.provider.ListItemReader;
+import org.springframework.batch.item.reader.ListItemReader;
 
 public class ItemReaderRepeatCallbackTests extends TestCase {
 
diff --git a/spring-batch-infrastructure/src/test/java/org/springframework/batch/repeat/support/AbstractTradeBatchTests.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/repeat/support/AbstractTradeBatchTests.java
index a2c3f68f3..30cb732f8 100644
--- a/spring-batch-infrastructure/src/test/java/org/springframework/batch/repeat/support/AbstractTradeBatchTests.java
+++ b/spring-batch-infrastructure/src/test/java/org/springframework/batch/repeat/support/AbstractTradeBatchTests.java
@@ -22,7 +22,7 @@ import org.springframework.batch.io.file.SimpleFlatFileItemReader;
 import org.springframework.batch.io.file.mapping.FieldSet;
 import org.springframework.batch.io.file.mapping.FieldSetMapper;
 import org.springframework.batch.item.ItemProcessor;
-import org.springframework.batch.item.provider.DelegatingItemReader;
+import org.springframework.batch.item.reader.DelegatingItemReader;
 import org.springframework.core.io.ClassPathResource;
 import org.springframework.core.io.Resource;
 
diff --git a/spring-batch-infrastructure/src/test/java/org/springframework/batch/repeat/support/ChunkedRepeatTests.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/repeat/support/ChunkedRepeatTests.java
index 3219d2bda..56cdbfbbd 100644
--- a/spring-batch-infrastructure/src/test/java/org/springframework/batch/repeat/support/ChunkedRepeatTests.java
+++ b/spring-batch-infrastructure/src/test/java/org/springframework/batch/repeat/support/ChunkedRepeatTests.java
@@ -17,7 +17,7 @@
 package org.springframework.batch.repeat.support;
 
 import org.springframework.batch.item.ItemReader;
-import org.springframework.batch.item.provider.AbstractItemReader;
+import org.springframework.batch.item.reader.AbstractItemReader;
 import org.springframework.batch.repeat.RepeatCallback;
 import org.springframework.batch.repeat.RepeatContext;
 import org.springframework.batch.repeat.ExitStatus;
diff --git a/spring-batch-infrastructure/src/test/java/org/springframework/batch/retry/ListItemReaderRecoverer.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/retry/ListItemReaderRecoverer.java
index e0209f3cf..89ec8b16c 100644
--- a/spring-batch-infrastructure/src/test/java/org/springframework/batch/retry/ListItemReaderRecoverer.java
+++ b/spring-batch-infrastructure/src/test/java/org/springframework/batch/retry/ListItemReaderRecoverer.java
@@ -20,7 +20,7 @@ import java.util.List;
 
 import org.springframework.batch.item.ItemReader;
 import org.springframework.batch.item.ItemRecoverer;
-import org.springframework.batch.item.provider.ListItemReader;
+import org.springframework.batch.item.reader.ListItemReader;
 
 public class ListItemReaderRecoverer extends ListItemReader implements ItemReader, ItemRecoverer {
 
diff --git a/spring-batch-infrastructure/src/test/java/org/springframework/batch/retry/callback/ItemReaderRetryCallbackTests.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/retry/callback/ItemReaderRetryCallbackTests.java
index b121da78c..10301a8d5 100644
--- a/spring-batch-infrastructure/src/test/java/org/springframework/batch/retry/callback/ItemReaderRetryCallbackTests.java
+++ b/spring-batch-infrastructure/src/test/java/org/springframework/batch/retry/callback/ItemReaderRetryCallbackTests.java
@@ -23,7 +23,7 @@ import java.util.List;
 import junit.framework.TestCase;
 
 import org.springframework.batch.item.ItemProcessor;
-import org.springframework.batch.item.provider.ListItemReader;
+import org.springframework.batch.item.reader.ListItemReader;
 import org.springframework.batch.retry.ListItemReaderRecoverer;
 import org.springframework.batch.retry.RetryContext;
 import org.springframework.batch.retry.context.RetryContextSupport;
diff --git a/spring-batch-infrastructure/src/test/java/org/springframework/batch/retry/policy/ItemReaderRetryPolicyTests.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/retry/policy/ItemReaderRetryPolicyTests.java
index 4eea2feff..139884786 100644
--- a/spring-batch-infrastructure/src/test/java/org/springframework/batch/retry/policy/ItemReaderRetryPolicyTests.java
+++ b/spring-batch-infrastructure/src/test/java/org/springframework/batch/retry/policy/ItemReaderRetryPolicyTests.java
@@ -26,7 +26,7 @@ import junit.framework.TestCase;
 import org.springframework.batch.item.FailedItemIdentifier;
 import org.springframework.batch.item.ItemProcessor;
 import org.springframework.batch.item.ItemReader;
-import org.springframework.batch.item.provider.ListItemReader;
+import org.springframework.batch.item.reader.ListItemReader;
 import org.springframework.batch.repeat.RepeatContext;
 import org.springframework.batch.repeat.context.RepeatContextSupport;
 import org.springframework.batch.repeat.synch.RepeatSynchronizationManager;
diff --git a/spring-batch-infrastructure/src/test/resources/org/springframework/batch/item/provider/delegating-item-provider.xml b/spring-batch-infrastructure/src/test/resources/org/springframework/batch/item/reader/delegating-item-provider.xml
similarity index 83%
rename from spring-batch-infrastructure/src/test/resources/org/springframework/batch/item/provider/delegating-item-provider.xml
rename to spring-batch-infrastructure/src/test/resources/org/springframework/batch/item/reader/delegating-item-provider.xml
index 7d0057b9f..caeb5da97 100644
--- a/spring-batch-infrastructure/src/test/resources/org/springframework/batch/item/provider/delegating-item-provider.xml
+++ b/spring-batch-infrastructure/src/test/resources/org/springframework/batch/item/reader/delegating-item-provider.xml
@@ -2,7 +2,7 @@
 <beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd">
 
-	<bean id="provider" class="org.springframework.batch.item.provider.ItemReaderAdapter">
+	<bean id="provider" class="org.springframework.batch.item.reader.ItemReaderAdapter">
 		<property name="targetObject" ref="fooService" />
 		<property name="targetMethod" value="generateFoo" />
 	</bean>
diff --git a/spring-batch-integration/src/test/java/org/springframework/batch/item/AbstractItemReaderRecoverer.java b/spring-batch-integration/src/test/java/org/springframework/batch/item/AbstractItemReaderRecoverer.java
index 98f067121..55d7dcd51 100644
--- a/spring-batch-integration/src/test/java/org/springframework/batch/item/AbstractItemReaderRecoverer.java
+++ b/spring-batch-integration/src/test/java/org/springframework/batch/item/AbstractItemReaderRecoverer.java
@@ -15,7 +15,7 @@
  */
 package org.springframework.batch.item;
 
-import org.springframework.batch.item.provider.AbstractItemReader;
+import org.springframework.batch.item.reader.AbstractItemReader;
 
 /**
  * @author Dave Syer
diff --git a/spring-batch-integration/src/test/java/org/springframework/batch/retry/jms/SynchronousTests.java b/spring-batch-integration/src/test/java/org/springframework/batch/retry/jms/SynchronousTests.java
index 14045554e..2616a78fa 100644
--- a/spring-batch-integration/src/test/java/org/springframework/batch/retry/jms/SynchronousTests.java
+++ b/spring-batch-integration/src/test/java/org/springframework/batch/retry/jms/SynchronousTests.java
@@ -20,7 +20,7 @@ import java.util.ArrayList;
 import java.util.List;
 
 import org.springframework.batch.item.ItemProcessor;
-import org.springframework.batch.item.provider.JmsItemReader;
+import org.springframework.batch.item.reader.JmsItemReader;
 import org.springframework.batch.retry.RetryCallback;
 import org.springframework.batch.retry.RetryContext;
 import org.springframework.batch.retry.callback.ItemReaderRetryCallback;
diff --git a/spring-batch-integration/src/test/java/org/springframework/retry/jms/SynchronousTests.java b/spring-batch-integration/src/test/java/org/springframework/retry/jms/SynchronousTests.java
index 5b34ec4ae..9f5d2892f 100644
--- a/spring-batch-integration/src/test/java/org/springframework/retry/jms/SynchronousTests.java
+++ b/spring-batch-integration/src/test/java/org/springframework/retry/jms/SynchronousTests.java
@@ -20,7 +20,7 @@ import java.util.ArrayList;
 import java.util.List;
 
 import org.springframework.batch.item.ItemProcessor;
-import org.springframework.batch.item.provider.JmsItemReader;
+import org.springframework.batch.item.reader.JmsItemReader;
 import org.springframework.batch.retry.RetryCallback;
 import org.springframework.batch.retry.RetryContext;
 import org.springframework.batch.retry.callback.ItemReaderRetryCallback;
diff --git a/spring-batch-samples/src/main/java/org/springframework/batch/sample/item/provider/OrderItemReader.java b/spring-batch-samples/src/main/java/org/springframework/batch/sample/item/reader/OrderItemReader.java
similarity index 98%
rename from spring-batch-samples/src/main/java/org/springframework/batch/sample/item/provider/OrderItemReader.java
rename to spring-batch-samples/src/main/java/org/springframework/batch/sample/item/reader/OrderItemReader.java
index 27ac45cc4..5c62dfd94 100644
--- a/spring-batch-samples/src/main/java/org/springframework/batch/sample/item/provider/OrderItemReader.java
+++ b/spring-batch-samples/src/main/java/org/springframework/batch/sample/item/reader/OrderItemReader.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.batch.sample.item.provider;
+package org.springframework.batch.sample.item.reader;
 
 import java.util.ArrayList;
 
@@ -25,7 +25,7 @@ import org.springframework.batch.core.domain.StepExecution;
 import org.springframework.batch.io.file.mapping.FieldSet;
 import org.springframework.batch.io.file.mapping.FieldSetMapper;
 import org.springframework.batch.item.ItemReader;
-import org.springframework.batch.item.provider.AbstractItemReader;
+import org.springframework.batch.item.reader.AbstractItemReader;
 import org.springframework.batch.item.validator.Validator;
 import org.springframework.batch.sample.domain.Address;
 import org.springframework.batch.sample.domain.BillingInfo;
diff --git a/spring-batch-samples/src/main/java/org/springframework/batch/sample/item/provider/StagingItemReader.java b/spring-batch-samples/src/main/java/org/springframework/batch/sample/item/reader/StagingItemReader.java
similarity index 95%
rename from spring-batch-samples/src/main/java/org/springframework/batch/sample/item/provider/StagingItemReader.java
rename to spring-batch-samples/src/main/java/org/springframework/batch/sample/item/reader/StagingItemReader.java
index edeb51354..35e421097 100644
--- a/spring-batch-samples/src/main/java/org/springframework/batch/sample/item/provider/StagingItemReader.java
+++ b/spring-batch-samples/src/main/java/org/springframework/batch/sample/item/reader/StagingItemReader.java
@@ -1,4 +1,4 @@
-package org.springframework.batch.sample.item.provider;
+package org.springframework.batch.sample.item.reader;
 
 import java.sql.ResultSet;
 import java.sql.SQLException;
diff --git a/spring-batch-samples/src/main/java/org/springframework/batch/sample/mapping/TradeFieldSetMapper.java b/spring-batch-samples/src/main/java/org/springframework/batch/sample/mapping/TradeFieldSetMapper.java
index 0ab3c18d9..7cee9fe6a 100644
--- a/spring-batch-samples/src/main/java/org/springframework/batch/sample/mapping/TradeFieldSetMapper.java
+++ b/spring-batch-samples/src/main/java/org/springframework/batch/sample/mapping/TradeFieldSetMapper.java
@@ -18,7 +18,7 @@ package org.springframework.batch.sample.mapping;
 
 import org.springframework.batch.io.file.mapping.FieldSet;
 import org.springframework.batch.io.file.mapping.FieldSetMapper;
-import org.springframework.batch.item.provider.AggregateItemReader;
+import org.springframework.batch.item.reader.AggregateItemReader;
 import org.springframework.batch.sample.domain.Trade;
 
 
diff --git a/spring-batch-samples/src/main/resources/jobs/beanWrapperMapperSampleJob.xml b/spring-batch-samples/src/main/resources/jobs/beanWrapperMapperSampleJob.xml
index a56009d4b..78e1c1f8b 100644
--- a/spring-batch-samples/src/main/resources/jobs/beanWrapperMapperSampleJob.xml
+++ b/spring-batch-samples/src/main/resources/jobs/beanWrapperMapperSampleJob.xml
@@ -19,7 +19,7 @@
 							class="org.springframework.batch.execution.tasklet.RestartableItemOrientedTasklet">
 							<property name="itemReader">
 								<bean
-									class="org.springframework.batch.item.provider.ValidatingItemReader">
+									class="org.springframework.batch.item.reader.ValidatingItemReader">
 									<property name="itemReader" ref="fileInputTemplate" />
 									<property name="validator" ref="fixedValidator" />
 								</bean>
diff --git a/spring-batch-samples/src/main/resources/jobs/compositeProcessorSampleJob.xml b/spring-batch-samples/src/main/resources/jobs/compositeProcessorSampleJob.xml
index 310090154..4386057b0 100644
--- a/spring-batch-samples/src/main/resources/jobs/compositeProcessorSampleJob.xml
+++ b/spring-batch-samples/src/main/resources/jobs/compositeProcessorSampleJob.xml
@@ -18,7 +18,7 @@
 						class="org.springframework.batch.execution.tasklet.RestartableItemOrientedTasklet">
 						<property name="itemReader">
 							<bean
-								class="org.springframework.batch.item.provider.ValidatingItemReader">
+								class="org.springframework.batch.item.reader.ValidatingItemReader">
 								<property name="itemReader" ref="fileInputTemplate" />
 								<property name="validator" ref="fixedValidator" />
 							</bean>
diff --git a/spring-batch-samples/src/main/resources/jobs/delegatingJob.xml b/spring-batch-samples/src/main/resources/jobs/delegatingJob.xml
index 9add438f6..3a3609fe7 100644
--- a/spring-batch-samples/src/main/resources/jobs/delegatingJob.xml
+++ b/spring-batch-samples/src/main/resources/jobs/delegatingJob.xml
@@ -24,7 +24,7 @@
 					<bean
 						class="org.springframework.batch.execution.tasklet.ItemOrientedTasklet">
 						<property name="itemReader">
-							<bean class="org.springframework.batch.item.provider.ItemReaderAdapter">
+							<bean class="org.springframework.batch.item.reader.ItemReaderAdapter">
 								<property name="targetObject" ref="delegatingObject" />
 								<property name="targetMethod" value="getData" />
 							</bean>
diff --git a/spring-batch-samples/src/main/resources/jobs/fixedLengthImportJob.xml b/spring-batch-samples/src/main/resources/jobs/fixedLengthImportJob.xml
index 836a4fd7f..702fa9a36 100644
--- a/spring-batch-samples/src/main/resources/jobs/fixedLengthImportJob.xml
+++ b/spring-batch-samples/src/main/resources/jobs/fixedLengthImportJob.xml
@@ -18,7 +18,7 @@
 						class="org.springframework.batch.execution.tasklet.RestartableItemOrientedTasklet">
 						<property name="itemReader">
 							<bean
-								class="org.springframework.batch.item.provider.ValidatingItemReader">
+								class="org.springframework.batch.item.reader.ValidatingItemReader">
 								<property name="itemReader" ref="fileInputTemplate" />
 								<property name="validator" ref="fixedValidator" />
 							</bean>
diff --git a/spring-batch-samples/src/main/resources/jobs/multilineJob.xml b/spring-batch-samples/src/main/resources/jobs/multilineJob.xml
index 4fc6b01c5..70362e09e 100644
--- a/spring-batch-samples/src/main/resources/jobs/multilineJob.xml
+++ b/spring-batch-samples/src/main/resources/jobs/multilineJob.xml
@@ -18,7 +18,7 @@
 						class="org.springframework.batch.execution.tasklet.RestartableItemOrientedTasklet">
 						<property name="itemReader">
 							<bean
-								class="org.springframework.batch.item.provider.AggregateItemReader">
+								class="org.springframework.batch.item.reader.AggregateItemReader">
 								<property name="itemReader"
 									ref="fileItemReader" />
 							</bean>
diff --git a/spring-batch-samples/src/main/resources/jobs/multilineOrderJob.xml b/spring-batch-samples/src/main/resources/jobs/multilineOrderJob.xml
index 05309bf24..fabc01335 100644
--- a/spring-batch-samples/src/main/resources/jobs/multilineOrderJob.xml
+++ b/spring-batch-samples/src/main/resources/jobs/multilineOrderJob.xml
@@ -20,7 +20,7 @@
 					<bean
 						class="org.springframework.batch.execution.tasklet.RestartableItemOrientedTasklet">
 						<property name="itemReader">
-							<bean class="org.springframework.batch.sample.item.provider.OrderItemReader">
+							<bean class="org.springframework.batch.sample.item.reader.OrderItemReader">
 								<property name="itemReader" ref="fileInputTemplate" />
 								<property name="headerMapper" ref="headerFieldSetMapper" />
 								<property name="customerMapper" ref="customerFieldSetMapper" />
diff --git a/spring-batch-samples/src/main/resources/jobs/parallelJob.xml b/spring-batch-samples/src/main/resources/jobs/parallelJob.xml
index e176983ad..4e10a1414 100644
--- a/spring-batch-samples/src/main/resources/jobs/parallelJob.xml
+++ b/spring-batch-samples/src/main/resources/jobs/parallelJob.xml
@@ -21,7 +21,7 @@
 							class="org.springframework.batch.execution.tasklet.RestartableItemOrientedTasklet">
 							<property name="itemReader">
 								<bean
-									class="org.springframework.batch.item.provider.ValidatingItemReader">
+									class="org.springframework.batch.item.reader.ValidatingItemReader">
 									<property name="itemReader"
 										ref="fileInputTemplate" />
 									<property name="validator"
@@ -58,7 +58,7 @@
 							class="org.springframework.batch.execution.tasklet.ItemOrientedTasklet">
 							<property name="itemReader">
 								<bean
-									class="org.springframework.batch.sample.item.provider.StagingItemReader"
+									class="org.springframework.batch.sample.item.reader.StagingItemReader"
 									scope="step">
 									<aop:scoped-proxy />
 									<property name="dataSource"
diff --git a/spring-batch-samples/src/main/resources/jobs/restartSample.xml b/spring-batch-samples/src/main/resources/jobs/restartSample.xml
index 294deff58..0ae8921a2 100644
--- a/spring-batch-samples/src/main/resources/jobs/restartSample.xml
+++ b/spring-batch-samples/src/main/resources/jobs/restartSample.xml
@@ -18,7 +18,7 @@
 					<bean class="org.springframework.batch.sample.tasklet.ExceptionRestartableTasklet">
 						<property name="itemReader">
 							<bean
-								class="org.springframework.batch.item.provider.ValidatingItemReader">
+								class="org.springframework.batch.item.reader.ValidatingItemReader">
 								<property name="itemReader" ref="fileItemReader" />
 								<property name="validator" ref="fixedValidator" />
 							</bean>
diff --git a/spring-batch-samples/src/main/resources/jobs/rollbackJob.xml b/spring-batch-samples/src/main/resources/jobs/rollbackJob.xml
index 22ac14d3d..a9236b113 100644
--- a/spring-batch-samples/src/main/resources/jobs/rollbackJob.xml
+++ b/spring-batch-samples/src/main/resources/jobs/rollbackJob.xml
@@ -46,7 +46,7 @@
 							class="org.springframework.batch.execution.tasklet.RestartableItemOrientedTasklet">
 							<property name="itemReader">
 								<bean
-									class="org.springframework.batch.item.provider.ValidatingItemReader">
+									class="org.springframework.batch.item.reader.ValidatingItemReader">
 									<property name="itemReader"
 										ref="fileInputTemplate" />
 									<property name="validator"
diff --git a/spring-batch-samples/src/main/resources/jobs/tradeJob.xml b/spring-batch-samples/src/main/resources/jobs/tradeJob.xml
index 5cab4d3a6..9f31dfa64 100644
--- a/spring-batch-samples/src/main/resources/jobs/tradeJob.xml
+++ b/spring-batch-samples/src/main/resources/jobs/tradeJob.xml
@@ -22,7 +22,7 @@
 							class="org.springframework.batch.execution.tasklet.RestartableItemOrientedTasklet">
 							<property name="itemReader">
 								<bean
-									class="org.springframework.batch.item.provider.ValidatingItemReader">
+									class="org.springframework.batch.item.reader.ValidatingItemReader">
 									<property name="itemReader"
 										ref="fileInputTemplate" />
 									<property name="validator"
diff --git a/spring-batch-samples/src/test/java/org/springframework/batch/sample/item/provider/OrderItemReaderTests.java b/spring-batch-samples/src/test/java/org/springframework/batch/sample/item/reader/OrderItemReaderTests.java
similarity index 95%
rename from spring-batch-samples/src/test/java/org/springframework/batch/sample/item/provider/OrderItemReaderTests.java
rename to spring-batch-samples/src/test/java/org/springframework/batch/sample/item/reader/OrderItemReaderTests.java
index 9c9f6127f..c91ca3caf 100644
--- a/spring-batch-samples/src/test/java/org/springframework/batch/sample/item/provider/OrderItemReaderTests.java
+++ b/spring-batch-samples/src/test/java/org/springframework/batch/sample/item/reader/OrderItemReaderTests.java
@@ -1,4 +1,4 @@
-package org.springframework.batch.sample.item.provider;
+package org.springframework.batch.sample.item.reader;
 
 import java.util.Iterator;
 
@@ -15,6 +15,7 @@ import org.springframework.batch.sample.domain.Customer;
 import org.springframework.batch.sample.domain.LineItem;
 import org.springframework.batch.sample.domain.Order;
 import org.springframework.batch.sample.domain.ShippingInfo;
+import org.springframework.batch.sample.item.reader.OrderItemReader;
 
 public class OrderItemReaderTests extends TestCase {
 
diff --git a/spring-batch-samples/src/test/java/org/springframework/batch/sample/item/provider/StagingItemReaderTests.java b/spring-batch-samples/src/test/java/org/springframework/batch/sample/item/reader/StagingItemReaderTests.java
similarity index 95%
rename from spring-batch-samples/src/test/java/org/springframework/batch/sample/item/provider/StagingItemReaderTests.java
rename to spring-batch-samples/src/test/java/org/springframework/batch/sample/item/reader/StagingItemReaderTests.java
index 8081d4e25..ca86328a8 100644
--- a/spring-batch-samples/src/test/java/org/springframework/batch/sample/item/provider/StagingItemReaderTests.java
+++ b/spring-batch-samples/src/test/java/org/springframework/batch/sample/item/reader/StagingItemReaderTests.java
@@ -1,4 +1,4 @@
-package org.springframework.batch.sample.item.provider;
+package org.springframework.batch.sample.item.reader;
 
 import org.springframework.batch.core.domain.JobExecution;
 import org.springframework.batch.core.domain.JobInstance;
@@ -11,6 +11,7 @@ import org.springframework.batch.repeat.context.RepeatContextSupport;
 import org.springframework.batch.repeat.synch.BatchTransactionSynchronizationManager;
 import org.springframework.batch.repeat.synch.RepeatSynchronizationManager;
 import org.springframework.batch.sample.item.processor.StagingItemProcessor;
+import org.springframework.batch.sample.item.reader.StagingItemReader;
 import org.springframework.test.AbstractTransactionalDataSourceSpringContextTests;
 import org.springframework.util.ClassUtils;
 
diff --git a/spring-batch-samples/src/test/java/org/springframework/batch/sample/mapping/TradeFieldSetMapperTests.java b/spring-batch-samples/src/test/java/org/springframework/batch/sample/mapping/TradeFieldSetMapperTests.java
index 25f1a2373..ea06d7b85 100644
--- a/spring-batch-samples/src/test/java/org/springframework/batch/sample/mapping/TradeFieldSetMapperTests.java
+++ b/spring-batch-samples/src/test/java/org/springframework/batch/sample/mapping/TradeFieldSetMapperTests.java
@@ -4,7 +4,7 @@ import java.math.BigDecimal;
 
 import org.springframework.batch.io.file.mapping.FieldSet;
 import org.springframework.batch.io.file.mapping.FieldSetMapper;
-import org.springframework.batch.item.provider.AggregateItemReader;
+import org.springframework.batch.item.reader.AggregateItemReader;
 import org.springframework.batch.sample.domain.Trade;
 import org.springframework.batch.sample.mapping.TradeFieldSetMapper;
 
diff --git a/spring-batch-samples/src/test/java/org/springframework/batch/sample/tasklet/ExceptionRestartableTaskletTests.java b/spring-batch-samples/src/test/java/org/springframework/batch/sample/tasklet/ExceptionRestartableTaskletTests.java
index f70c9fe77..ff9f29a71 100644
--- a/spring-batch-samples/src/test/java/org/springframework/batch/sample/tasklet/ExceptionRestartableTaskletTests.java
+++ b/spring-batch-samples/src/test/java/org/springframework/batch/sample/tasklet/ExceptionRestartableTaskletTests.java
@@ -7,7 +7,7 @@ import junit.framework.TestCase;
 import org.easymock.MockControl;
 import org.springframework.batch.io.exception.BatchCriticalException;
 import org.springframework.batch.item.ItemProcessor;
-import org.springframework.batch.item.provider.ListItemReader;
+import org.springframework.batch.item.reader.ListItemReader;
 import org.springframework.batch.repeat.context.RepeatContextSupport;
 import org.springframework.batch.repeat.synch.RepeatSynchronizationManager;
 import org.springframework.batch.sample.tasklet.ExceptionRestartableTasklet;
diff --git a/spring-batch-samples/src/test/resources/org/springframework/batch/sample/item/processor/staging-test-context.xml b/spring-batch-samples/src/test/resources/org/springframework/batch/sample/item/processor/staging-test-context.xml
index ea9ad0a49..a3ce8907b 100644
--- a/spring-batch-samples/src/test/resources/org/springframework/batch/sample/item/processor/staging-test-context.xml
+++ b/spring-batch-samples/src/test/resources/org/springframework/batch/sample/item/processor/staging-test-context.xml
@@ -24,7 +24,7 @@
 	</bean>
 
 	<bean id="provider"
-		class="org.springframework.batch.sample.item.provider.StagingItemReader"
+		class="org.springframework.batch.sample.item.reader.StagingItemReader"
 		scope="step">
 		<property name="dataSource" ref="dataSource" />
 	</bean>