diff --git a/spring-batch-execution/src/main/java/org/springframework/batch/execution/configuration/JobRegistryBeanPostProcessor.java b/spring-batch-execution/src/main/java/org/springframework/batch/execution/configuration/JobRegistryBeanPostProcessor.java
index 15d366496..63ec01dc0 100644
--- a/spring-batch-execution/src/main/java/org/springframework/batch/execution/configuration/JobRegistryBeanPostProcessor.java
+++ b/spring-batch-execution/src/main/java/org/springframework/batch/execution/configuration/JobRegistryBeanPostProcessor.java
@@ -50,10 +50,10 @@ public class JobRegistryBeanPostProcessor implements BeanPostProcessor, Initiali
 	/**
 	 * Injection setter for {@link JobRegistry}.
 	 * 
-	 * @param jobConfigurationRegistry the jobConfigurationRegistry to set
+	 * @param jobRegistry the jobConfigurationRegistry to set
 	 */
-	public void setJobConfigurationRegistry(JobRegistry jobConfigurationRegistry) {
-		this.jobConfigurationRegistry = jobConfigurationRegistry;
+	public void setJobRegistry(JobRegistry jobRegistry) {
+		this.jobConfigurationRegistry = jobRegistry;
 	}
 
 	/**
diff --git a/spring-batch-execution/src/test/java/org/springframework/batch/execution/configuration/JobRegistryBeanPostProcessorTests.java b/spring-batch-execution/src/test/java/org/springframework/batch/execution/configuration/JobRegistryBeanPostProcessorTests.java
index 5d6907d2b..548934cbc 100644
--- a/spring-batch-execution/src/test/java/org/springframework/batch/execution/configuration/JobRegistryBeanPostProcessorTests.java
+++ b/spring-batch-execution/src/test/java/org/springframework/batch/execution/configuration/JobRegistryBeanPostProcessorTests.java
@@ -57,7 +57,7 @@ public class JobRegistryBeanPostProcessorTests extends TestCase {
 
 	public void testAfterInitializationWithCorrectType() throws Exception {
 		MapJobRegistry registry = new MapJobRegistry();
-		processor.setJobConfigurationRegistry(registry);
+		processor.setJobRegistry(registry);
 		JobSupport configuration = new JobSupport();
 		configuration.setBeanName("foo");
 		assertEquals(configuration, processor.postProcessAfterInitialization(
@@ -67,7 +67,7 @@ public class JobRegistryBeanPostProcessorTests extends TestCase {
 
 	public void testAfterInitializationWithDuplicate() throws Exception {
 		MapJobRegistry registry = new MapJobRegistry();
-		processor.setJobConfigurationRegistry(registry);
+		processor.setJobRegistry(registry);
 		JobSupport configuration = new JobSupport();
 		configuration.setBeanName("foo");
 		processor.postProcessAfterInitialization(configuration, "bar");
@@ -82,7 +82,7 @@ public class JobRegistryBeanPostProcessorTests extends TestCase {
 
 	public void testUnregisterOnDestroy() throws Exception {
 		MapJobRegistry registry = new MapJobRegistry();
-		processor.setJobConfigurationRegistry(registry);
+		processor.setJobRegistry(registry);
 		JobSupport configuration = new JobSupport();
 		configuration.setBeanName("foo");
 		assertEquals(configuration, processor.postProcessAfterInitialization(
diff --git a/spring-batch-execution/src/test/resources/job-configuration.xml b/spring-batch-execution/src/test/resources/job-configuration.xml
index 08a4bce53..c7580e372 100644
--- a/spring-batch-execution/src/test/resources/job-configuration.xml
+++ b/spring-batch-execution/src/test/resources/job-configuration.xml
@@ -11,7 +11,7 @@
 
 	<bean
 		class="org.springframework.batch.execution.configuration.JobRegistryBeanPostProcessor">
-		<property name="jobConfigurationRegistry" ref="jobRegistry" />
+		<property name="jobRegistry" ref="jobRegistry" />
 	</bean>
 
 	<bean id="test-job"
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 f0f64e17b..4c84c2588 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
@@ -11,7 +11,7 @@
 
 	<bean
 		class="org.springframework.batch.execution.configuration.JobRegistryBeanPostProcessor">
-		<property name="jobConfigurationRegistry" ref="registry" />
+		<property name="jobRegistry" ref="registry" />
 	</bean>
 
 	<bean id="registry"