diff --git a/spring-batch-samples/src/main/resources/jobs/adhocLoopJob.xml b/spring-batch-samples/src/main/resources/jobs/adhocLoopJob.xml
index 2c53878ce..1b32f0328 100644
--- a/spring-batch-samples/src/main/resources/jobs/adhocLoopJob.xml
+++ b/spring-batch-samples/src/main/resources/jobs/adhocLoopJob.xml
@@ -70,7 +70,7 @@
 						<property name="interfaces">
 							<list>
 								<value>
-									org.springframework.batch.sample.ExportedJobConfigurationLoader
+									org.springframework.batch.sample.ExportedJobLoader
 								</value>
 							</list>
 						</property>
@@ -89,8 +89,8 @@
 							key="spring:service=batch,bean=jobLauncher"
 							value="org.springframework.batch.execution.bootstrap.support.ExportedJobLauncher" />
 						<entry
-							key="spring:service=batch,bean=configurationLoader"
-							value="org.springframework.batch.sample.JobConfigurationLoader" />
+							key="spring:service=batch,bean=jobLoader"
+							value="org.springframework.batch.sample.JobLoader" />
 					</map>
 				</property>
 			</bean>
diff --git a/spring-batch-samples/src/test/java/org/springframework/batch/sample/dao/JdbcJobRepositoryTests.java b/spring-batch-samples/src/test/java/org/springframework/batch/sample/dao/JdbcJobRepositoryTests.java
index 77e1e31a3..b1babec05 100644
--- a/spring-batch-samples/src/test/java/org/springframework/batch/sample/dao/JdbcJobRepositoryTests.java
+++ b/spring-batch-samples/src/test/java/org/springframework/batch/sample/dao/JdbcJobRepositoryTests.java
@@ -127,7 +127,7 @@ public class JdbcJobRepositoryTests extends AbstractTransactionalDataSourceSprin
 		cacheJobIds(execution);
 		execution.setEndTime(new Timestamp(System.currentTimeMillis()));
 		repository.saveOrUpdate(execution);
-		JobInstance job = execution.getJob();
+		JobInstance job = execution.getJobInstance();
 		job.setStatus(BatchStatus.FAILED);
 		repository.update(job);
 		setComplete();