diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/domain/JobExecution.java b/spring-batch-core/src/main/java/org/springframework/batch/core/domain/JobExecution.java
index 7da996f83..3dd3d4f0f 100644
--- a/spring-batch-core/src/main/java/org/springframework/batch/core/domain/JobExecution.java
+++ b/spring-batch-core/src/main/java/org/springframework/batch/core/domain/JobExecution.java
@@ -31,7 +31,7 @@ import org.springframework.batch.repeat.RepeatContext;
  */
 public class JobExecution extends Entity {
 
-	private JobInstance job;
+	private JobInstance jobInstance;
 
 	private transient Collection stepExecutions = new HashSet();
 
@@ -59,7 +59,7 @@ public class JobExecution extends Entity {
 	 *            the job of which this execution is a part
 	 */
 	public JobExecution(JobInstance job, Long id) {
-		this.job = job;
+		this.jobInstance = job;
 		setId(id);
 	}
 	
@@ -103,8 +103,8 @@ public class JobExecution extends Entity {
 	 * @return the id of the enclosing job
 	 */
 	public Long getJobId() {
-		if (job != null) {
-			return job.getId();
+		if (jobInstance != null) {
+			return jobInstance.getId();
 		}
 		return null;
 	}
@@ -206,8 +206,8 @@ public class JobExecution extends Entity {
 	/**
 	 * @return the Job that is executing.
 	 */
-	public JobInstance getJob() {
-		return job;
+	public JobInstance getJobInstance() {
+		return jobInstance;
 	}
 
 	/**
@@ -232,7 +232,7 @@ public class JobExecution extends Entity {
 	 * @see org.springframework.batch.core.domain.Entity#toString()
 	 */
 	public String toString() {
-		return super.toString()+", startTime="+startTime+", endTime="+endTime+", job=["+job+"]";
+		return super.toString()+", startTime="+startTime+", endTime="+endTime+", job=["+jobInstance+"]";
 	}
 
 	/**
diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/domain/JobIdentifier.java b/spring-batch-core/src/main/java/org/springframework/batch/core/domain/JobIdentifier.java
index b03b7b750..b4fd06b68 100644
--- a/spring-batch-core/src/main/java/org/springframework/batch/core/domain/JobIdentifier.java
+++ b/spring-batch-core/src/main/java/org/springframework/batch/core/domain/JobIdentifier.java
@@ -41,6 +41,6 @@ public interface JobIdentifier {
 	 * 
 	 * @return JobRuntimeParameters
 	 */
-	public JobInstanceProperties getRuntimeParameters();
+	public JobInstanceProperties getJobInstanceProperties();
 
 }
diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/runtime/SimpleJobIdentifier.java b/spring-batch-core/src/main/java/org/springframework/batch/core/runtime/SimpleJobIdentifier.java
index fb4379a64..e8da50f4c 100644
--- a/spring-batch-core/src/main/java/org/springframework/batch/core/runtime/SimpleJobIdentifier.java
+++ b/spring-batch-core/src/main/java/org/springframework/batch/core/runtime/SimpleJobIdentifier.java
@@ -62,7 +62,7 @@ public class SimpleJobIdentifier implements JobIdentifier {
 		return this.name;
 	}
 	
-	public JobInstanceProperties getRuntimeParameters() {
+	public JobInstanceProperties getJobInstanceProperties() {
 		return runtimeParameters;
 	}
 	
@@ -82,7 +82,7 @@ public class SimpleJobIdentifier implements JobIdentifier {
 		
 		SimpleJobIdentifier rhs = (SimpleJobIdentifier)obj;
 		return new EqualsBuilder().
-								append(runtimeParameters,rhs.getRuntimeParameters()).
+								append(runtimeParameters,rhs.getJobInstanceProperties()).
 								append(name, rhs.getName()).
 								isEquals();
 	}
diff --git a/spring-batch-core/src/test/java/org/springframework/batch/core/domain/JobExecutionTests.java b/spring-batch-core/src/test/java/org/springframework/batch/core/domain/JobExecutionTests.java
index 25f6fedfa..2c811f4a0 100644
--- a/spring-batch-core/src/test/java/org/springframework/batch/core/domain/JobExecutionTests.java
+++ b/spring-batch-core/src/test/java/org/springframework/batch/core/domain/JobExecutionTests.java
@@ -96,7 +96,7 @@ public class JobExecutionTests extends TestCase {
 	 * Test method for {@link org.springframework.batch.core.domain.JobExecution#getJobId()}.
 	 */
 	public void testGetJob() {
-		assertNotNull(execution.getJob());
+		assertNotNull(execution.getJobInstance());
 	}
 
 	/**
@@ -109,7 +109,7 @@ public class JobExecutionTests extends TestCase {
 	}
 
 	public void testContextContainsInfo() throws Exception {
-		assertEquals("foo", context.getJob().getIdentifier().getName());
+		assertEquals("foo", context.getJobInstance().getIdentifier().getName());
 	}
 
 	public void testNullContexts() throws Exception {