diff --git a/spring-batch-execution/src/main/java/org/springframework/batch/execution/repository/dao/JdbcJobDao.java b/spring-batch-execution/src/main/java/org/springframework/batch/execution/repository/dao/JdbcJobDao.java
index 6aab7bfa0..4e4222029 100644
--- a/spring-batch-execution/src/main/java/org/springframework/batch/execution/repository/dao/JdbcJobDao.java
+++ b/spring-batch-execution/src/main/java/org/springframework/batch/execution/repository/dao/JdbcJobDao.java
@@ -66,7 +66,7 @@ public class JdbcJobDao implements JobDao, InitializingBean {
 	private static final String CHECK_JOB_EXECUTION_EXISTS = "SELECT COUNT(*) FROM %PREFIX%JOB_EXECUTION WHERE ID=?";
 
 	// Job SQL statements
-	private static final String CREATE_JOB = "INSERT into %PREFIX%JOB(ID, JOB_NAME, JOB_KEY)"
+	private static final String CREATE_JOB = "INSERT into %PREFIX%JOB_INSTANCE(ID, JOB_NAME, JOB_KEY)"
 			+ " values (?, ?, ?)";
 	
 	private static final String CREATE_JOB_PARAMETERS = "INSERT into %PREFIX%JOB_INSTANCE_PROPERTIES(JOB_ID, KEY, TYPE_CD, " +
@@ -79,7 +79,7 @@ public class JdbcJobDao implements JobDao, InitializingBean {
 
 	private static final int EXIT_MESSAGE_LENGTH = 250;
 
-	private static final String FIND_JOBS = "SELECT ID, STATUS from %PREFIX%JOB where JOB_NAME = ? and JOB_KEY = ?";
+	private static final String FIND_JOBS = "SELECT ID, STATUS from %PREFIX%JOB_INSTANCE where JOB_NAME = ? and JOB_KEY = ?";
 
 	private static final String GET_JOB_EXECUTION_COUNT = "SELECT count(ID) from %PREFIX%JOB_EXECUTION "
 			+ "where JOB_ID = ?";
@@ -89,7 +89,7 @@ public class JdbcJobDao implements JobDao, InitializingBean {
 	private static final String SAVE_JOB_EXECUTION = "INSERT into %PREFIX%JOB_EXECUTION(ID, JOB_ID, START_TIME, "
 			+ "END_TIME, STATUS, CONTINUABLE, EXIT_CODE, EXIT_MESSAGE) values (?, ?, ?, ?, ?, ?, ?, ?)";
 
-	private static final String UPDATE_JOB = "UPDATE %PREFIX%JOB set STATUS = ? where ID = ?";
+	private static final String UPDATE_JOB = "UPDATE %PREFIX%JOB_INSTANCE set STATUS = ? where ID = ?";
 
 	// Job Execution SqlStatements
 	private static final String UPDATE_JOB_EXECUTION = "UPDATE %PREFIX%JOB_EXECUTION set START_TIME = ?, END_TIME = ?, "
@@ -288,10 +288,10 @@ public class JdbcJobDao implements JobDao, InitializingBean {
 		int[] argTypes = new int[]{Types.INTEGER, Types.VARCHAR, Types.VARCHAR, Types.VARCHAR, Types.TIMESTAMP, Types.INTEGER};
 		
 		if(type == ParameterType.STRING){
-			args = new Object[]{jobId, key, type, value, new Timestamp(System.currentTimeMillis()), new Long(0)};
+			args = new Object[]{jobId, key, type, value, new Timestamp(0L), new Long(0)};
 		}
 		else if(type == ParameterType.LONG){
-			args = new Object[]{jobId, key, type, "", new Timestamp(System.currentTimeMillis()), value};
+			args = new Object[]{jobId, key, type, "", new Timestamp(0L), value};
 		}
 		else if(type == ParameterType.DATE){
 			args = new Object[]{jobId, key, type, "", value, new Long(0)};
diff --git a/spring-batch-execution/src/main/java/org/springframework/batch/execution/repository/dao/JdbcStepDao.java b/spring-batch-execution/src/main/java/org/springframework/batch/execution/repository/dao/JdbcStepDao.java
index 44e2e9c6c..56460272d 100644
--- a/spring-batch-execution/src/main/java/org/springframework/batch/execution/repository/dao/JdbcStepDao.java
+++ b/spring-batch-execution/src/main/java/org/springframework/batch/execution/repository/dao/JdbcStepDao.java
@@ -63,18 +63,18 @@ import org.springframework.util.StringUtils;
  */
 public class JdbcStepDao implements StepDao, InitializingBean {
 
-	private static final String CREATE_STEP = "INSERT into %PREFIX%STEP(ID, JOB_ID, STEP_NAME) values (?, ?, ?)";
+	private static final String CREATE_STEP = "INSERT into %PREFIX%STEP_INSTANCE(ID, JOB_ID, STEP_NAME) values (?, ?, ?)";
 
 	private static final int EXIT_MESSAGE_LENGTH = 250;
 
-	private static final String FIND_STEP = "SELECT ID, STATUS, RESTART_DATA from %PREFIX%STEP where JOB_ID = ? "
+	private static final String FIND_STEP = "SELECT ID, STATUS, RESTART_DATA from %PREFIX%STEP_INSTANCE where JOB_ID = ? "
 			+ "and STEP_NAME = ?";
 
 	private static final String FIND_STEP_EXECUTIONS = "SELECT ID, JOB_EXECUTION_ID, START_TIME, END_TIME, STATUS, COMMIT_COUNT,"
 			+ " TASK_COUNT, TASK_STATISTICS, CONTINUABLE, EXIT_CODE, EXIT_MESSAGE from %PREFIX%STEP_EXECUTION where STEP_ID = ?";
 
 	// Step SQL statements
-	private static final String FIND_STEPS = "SELECT ID, STEP_NAME, STATUS, RESTART_DATA from %PREFIX%STEP where JOB_ID = ?";
+	private static final String FIND_STEPS = "SELECT ID, STEP_NAME, STATUS, RESTART_DATA from %PREFIX%STEP_INSTANCE where JOB_ID = ?";
 
 	private static final String GET_STEP_EXECUTION_COUNT = "SELECT count(ID) from %PREFIX%STEP_EXECUTION where "
 			+ "STEP_ID = ?";
@@ -86,7 +86,7 @@ public class JdbcStepDao implements StepDao, InitializingBean {
 			+ "END_TIME, STATUS, COMMIT_COUNT, TASK_COUNT, TASK_STATISTICS, CONTINUABLE, EXIT_CODE, EXIT_MESSAGE) "
 			+ "values(?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)";
 
-	private static final String UPDATE_STEP = "UPDATE %PREFIX%STEP set STATUS = ?, RESTART_DATA = ? where ID = ?";
+	private static final String UPDATE_STEP = "UPDATE %PREFIX%STEP_INSTANCE set STATUS = ?, RESTART_DATA = ? where ID = ?";
 
 	private static final String UPDATE_STEP_EXECUTION = "UPDATE %PREFIX%STEP_EXECUTION set START_TIME = ?, END_TIME = ?, "
 			+ "STATUS = ?, COMMIT_COUNT = ?, TASK_COUNT = ?, TASK_STATISTICS = ?, CONTINUABLE = ? , EXIT_CODE = ?, "
diff --git a/spring-batch-execution/src/main/resources/schema-db2.sql b/spring-batch-execution/src/main/resources/schema-db2.sql
index 32522fdfd..3714842f1 100644
--- a/spring-batch-execution/src/main/resources/schema-db2.sql
+++ b/spring-batch-execution/src/main/resources/schema-db2.sql
@@ -1,8 +1,8 @@
 -- Autogenerated: do not edit this file
 DROP TABLE BATCH_STEP_EXECUTION ;
 DROP TABLE BATCH_JOB_EXECUTION ;
-DROP TABLE BATCH_STEP ;
-DROP TABLE BATCH_JOB ;
+DROP TABLE BATCH_STEP_INSTANCE ;
+DROP TABLE BATCH_JOB_INSTANCE ;
 
 DROP SEQUENCE BATCH_STEP_EXECUTION_SEQ ;
 DROP SEQUENCE BATCH_STEP_SEQ ;
@@ -10,7 +10,7 @@ DROP SEQUENCE BATCH_JOB_EXECUTION_SEQ ;
 DROP SEQUENCE BATCH_JOB_SEQ ;
 
 -- Autogenerated: do not edit this file
-CREATE TABLE BATCH_JOB  (
+CREATE TABLE BATCH_JOB_INSTANCE  (
 	ID BIGINT  PRIMARY KEY ,  
 	VERSION BIGINT,  
 	JOB_NAME VARCHAR(100) NOT NULL , 
@@ -36,7 +36,7 @@ CREATE TABLE BATCH_JOB_INSTANCE_PROPERTIES  (
 	DATE_VAL TIMESTAMP ,
 	LONG_VAL VARCHAR(10) );
 
-CREATE TABLE BATCH_STEP  (
+CREATE TABLE BATCH_STEP_INSTANCE  (
 	ID BIGINT  PRIMARY KEY ,
 	VERSION BIGINT,  
 	JOB_ID BIGINT NOT NULL,
diff --git a/spring-batch-execution/src/main/resources/schema-derby.sql b/spring-batch-execution/src/main/resources/schema-derby.sql
index 255b91dc7..7f79d6987 100644
--- a/spring-batch-execution/src/main/resources/schema-derby.sql
+++ b/spring-batch-execution/src/main/resources/schema-derby.sql
@@ -1,8 +1,8 @@
 -- Autogenerated: do not edit this file
 DROP TABLE BATCH_STEP_EXECUTION ;
 DROP TABLE BATCH_JOB_EXECUTION ;
-DROP TABLE BATCH_STEP ;
-DROP TABLE BATCH_JOB ;
+DROP TABLE BATCH_STEP_INSTANCE ;
+DROP TABLE BATCH_JOB_INSTANCE ;
 
 DROP TABLE BATCH_STEP_EXECUTION_SEQ ;
 DROP TABLE BATCH_STEP_SEQ ;
@@ -10,7 +10,7 @@ DROP TABLE BATCH_JOB_EXECUTION_SEQ ;
 DROP TABLE BATCH_JOB_SEQ ;
 
 -- Autogenerated: do not edit this file
-CREATE TABLE BATCH_JOB  (
+CREATE TABLE BATCH_JOB_INSTANCE  (
 	ID BIGINT  PRIMARY KEY GENERATED BY DEFAULT AS IDENTITY,  
 	VERSION BIGINT,  
 	JOB_NAME VARCHAR(100) NOT NULL , 
@@ -36,7 +36,7 @@ CREATE TABLE BATCH_JOB_INSTANCE_PROPERTIES  (
 	DATE_VAL TIMESTAMP ,
 	LONG_VAL VARCHAR(10) );
 
-CREATE TABLE BATCH_STEP  (
+CREATE TABLE BATCH_STEP_INSTANCE  (
 	ID BIGINT  PRIMARY KEY GENERATED BY DEFAULT AS IDENTITY,
 	VERSION BIGINT,  
 	JOB_ID BIGINT NOT NULL,
diff --git a/spring-batch-execution/src/main/resources/schema-hsqldb.sql b/spring-batch-execution/src/main/resources/schema-hsqldb.sql
index 62c2368ed..b3291ec07 100644
--- a/spring-batch-execution/src/main/resources/schema-hsqldb.sql
+++ b/spring-batch-execution/src/main/resources/schema-hsqldb.sql
@@ -1,8 +1,8 @@
 -- Autogenerated: do not edit this file
 DROP TABLE BATCH_STEP_EXECUTION IF EXISTS;
 DROP TABLE BATCH_JOB_EXECUTION IF EXISTS;
-DROP TABLE BATCH_STEP IF EXISTS;
-DROP TABLE BATCH_JOB IF EXISTS;
+DROP TABLE BATCH_STEP_INSTANCE IF EXISTS;
+DROP TABLE BATCH_JOB_INSTANCE IF EXISTS;
 
 DROP TABLE BATCH_STEP_EXECUTION_SEQ IF EXISTS;
 DROP TABLE BATCH_STEP_SEQ IF EXISTS;
@@ -10,7 +10,7 @@ DROP TABLE BATCH_JOB_EXECUTION_SEQ IF EXISTS;
 DROP TABLE BATCH_JOB_SEQ IF EXISTS;
 
 -- Autogenerated: do not edit this file
-CREATE TABLE BATCH_JOB  (
+CREATE TABLE BATCH_JOB_INSTANCE  (
 	ID BIGINT IDENTITY PRIMARY KEY ,  
 	VERSION BIGINT,  
 	JOB_NAME VARCHAR(100) NOT NULL , 
@@ -36,7 +36,7 @@ CREATE TABLE BATCH_JOB_INSTANCE_PROPERTIES  (
 	DATE_VAL TIMESTAMP ,
 	LONG_VAL VARCHAR(10) );
 
-CREATE TABLE BATCH_STEP  (
+CREATE TABLE BATCH_STEP_INSTANCE  (
 	ID BIGINT IDENTITY PRIMARY KEY ,
 	VERSION BIGINT,  
 	JOB_ID BIGINT NOT NULL,
diff --git a/spring-batch-execution/src/main/resources/schema-mysql.sql b/spring-batch-execution/src/main/resources/schema-mysql.sql
index 9d61b4fa4..a01cd85eb 100644
--- a/spring-batch-execution/src/main/resources/schema-mysql.sql
+++ b/spring-batch-execution/src/main/resources/schema-mysql.sql
@@ -1,8 +1,8 @@
 -- Autogenerated: do not edit this file
 DROP TABLE BATCH_STEP_EXECUTION IF EXISTS;
 DROP TABLE BATCH_JOB_EXECUTION IF EXISTS;
-DROP TABLE BATCH_STEP IF EXISTS;
-DROP TABLE BATCH_JOB IF EXISTS;
+DROP TABLE BATCH_STEP_INSTANCE IF EXISTS;
+DROP TABLE BATCH_JOB_INSTANCE IF EXISTS;
 
 DROP TABLE BATCH_STEP_EXECUTION_SEQ IF EXISTS;
 DROP TABLE BATCH_STEP_SEQ IF EXISTS;
@@ -10,12 +10,11 @@ DROP TABLE BATCH_JOB_EXECUTION_SEQ IF EXISTS;
 DROP TABLE BATCH_JOB_SEQ IF EXISTS;
 
 -- Autogenerated: do not edit this file
-CREATE TABLE BATCH_JOB  (
+CREATE TABLE BATCH_JOB_INSTANCE  (
 	ID BIGINT unsigned PRIMARY KEY ,  
 	VERSION BIGINT,  
 	JOB_NAME VARCHAR(100) NOT NULL , 
 	JOB_KEY VARCHAR(250) , 
-	SCHEDULE_DATE DATE ,
 	STATUS VARCHAR(10) );
 
 CREATE TABLE BATCH_JOB_EXECUTION  (
@@ -28,8 +27,16 @@ CREATE TABLE BATCH_JOB_EXECUTION  (
 	CONTINUABLE CHAR(1),
 	EXIT_CODE VARCHAR(20),
 	EXIT_MESSAGE VARCHAR(250));
+	
+CREATE TABLE BATCH_JOB_INSTANCE_PROPERTIES  (
+	JOB_ID BIGINT NOT NULL ,
+    TYPE_CD VARCHAR(6) NOT NULL ,
+	KEY VARCHAR(100) NOT NULL , 
+	STRING_VAL VARCHAR(250) , 
+	DATE_VAL TIMESTAMP ,
+	LONG_VAL VARCHAR(10) );
 
-CREATE TABLE BATCH_STEP  (
+CREATE TABLE BATCH_STEP_INSTANCE  (
 	ID BIGINT unsigned PRIMARY KEY ,
 	VERSION BIGINT,  
 	JOB_ID BIGINT NOT NULL,
diff --git a/spring-batch-execution/src/main/resources/schema-oracle10g.sql b/spring-batch-execution/src/main/resources/schema-oracle10g.sql
index 0bb3b3d6a..6255a38ab 100644
--- a/spring-batch-execution/src/main/resources/schema-oracle10g.sql
+++ b/spring-batch-execution/src/main/resources/schema-oracle10g.sql
@@ -1,8 +1,8 @@
 -- Autogenerated: do not edit this file
 DROP TABLE BATCH_STEP_EXECUTION ;
 DROP TABLE BATCH_JOB_EXECUTION ;
-DROP TABLE BATCH_STEP ;
-DROP TABLE BATCH_JOB ;
+DROP TABLE BATCH_STEP_INSTANCE ;
+DROP TABLE BATCH_JOB_INSTANCE ;
 
 DROP SEQUENCE BATCH_STEP_EXECUTION_SEQ ;
 DROP SEQUENCE BATCH_STEP_SEQ ;
@@ -10,7 +10,7 @@ DROP SEQUENCE BATCH_JOB_EXECUTION_SEQ ;
 DROP SEQUENCE BATCH_JOB_SEQ ;
 
 -- Autogenerated: do not edit this file
-CREATE TABLE BATCH_JOB  (
+CREATE TABLE BATCH_JOB_INSTANCE  (
 	ID NUMBER(38)  PRIMARY KEY ,  
 	VERSION NUMBER(38),  
 	JOB_NAME VARCHAR(100) NOT NULL , 
@@ -36,7 +36,7 @@ CREATE TABLE BATCH_JOB_INSTANCE_PROPERTIES  (
 	DATE_VAL TIMESTAMP ,
 	LONG_VAL VARCHAR(10) );
 
-CREATE TABLE BATCH_STEP  (
+CREATE TABLE BATCH_STEP_INSTANCE  (
 	ID NUMBER(38)  PRIMARY KEY ,
 	VERSION NUMBER(38),  
 	JOB_ID NUMBER(38) NOT NULL,
diff --git a/spring-batch-execution/src/main/resources/schema-postgresql.sql b/spring-batch-execution/src/main/resources/schema-postgresql.sql
index 32522fdfd..3714842f1 100644
--- a/spring-batch-execution/src/main/resources/schema-postgresql.sql
+++ b/spring-batch-execution/src/main/resources/schema-postgresql.sql
@@ -1,8 +1,8 @@
 -- Autogenerated: do not edit this file
 DROP TABLE BATCH_STEP_EXECUTION ;
 DROP TABLE BATCH_JOB_EXECUTION ;
-DROP TABLE BATCH_STEP ;
-DROP TABLE BATCH_JOB ;
+DROP TABLE BATCH_STEP_INSTANCE ;
+DROP TABLE BATCH_JOB_INSTANCE ;
 
 DROP SEQUENCE BATCH_STEP_EXECUTION_SEQ ;
 DROP SEQUENCE BATCH_STEP_SEQ ;
@@ -10,7 +10,7 @@ DROP SEQUENCE BATCH_JOB_EXECUTION_SEQ ;
 DROP SEQUENCE BATCH_JOB_SEQ ;
 
 -- Autogenerated: do not edit this file
-CREATE TABLE BATCH_JOB  (
+CREATE TABLE BATCH_JOB_INSTANCE  (
 	ID BIGINT  PRIMARY KEY ,  
 	VERSION BIGINT,  
 	JOB_NAME VARCHAR(100) NOT NULL , 
@@ -36,7 +36,7 @@ CREATE TABLE BATCH_JOB_INSTANCE_PROPERTIES  (
 	DATE_VAL TIMESTAMP ,
 	LONG_VAL VARCHAR(10) );
 
-CREATE TABLE BATCH_STEP  (
+CREATE TABLE BATCH_STEP_INSTANCE  (
 	ID BIGINT  PRIMARY KEY ,
 	VERSION BIGINT,  
 	JOB_ID BIGINT NOT NULL,
diff --git a/spring-batch-execution/src/main/sql/destroy.sql.vpp b/spring-batch-execution/src/main/sql/destroy.sql.vpp
index df3a8eb03..a14db1e8f 100644
--- a/spring-batch-execution/src/main/sql/destroy.sql.vpp
+++ b/spring-batch-execution/src/main/sql/destroy.sql.vpp
@@ -1,8 +1,8 @@
 -- Autogenerated: do not edit this file
 DROP TABLE BATCH_STEP_EXECUTION $!{IFEXISTS};
 DROP TABLE BATCH_JOB_EXECUTION $!{IFEXISTS};
-DROP TABLE BATCH_STEP $!{IFEXISTS};
-DROP TABLE BATCH_JOB $!{IFEXISTS};
+DROP TABLE BATCH_STEP_INSTANCE $!{IFEXISTS};
+DROP TABLE BATCH_JOB_INSTANCE $!{IFEXISTS};
 
 DROP ${SEQUENCE} BATCH_STEP_EXECUTION_SEQ $!{IFEXISTS};
 DROP ${SEQUENCE} BATCH_STEP_SEQ $!{IFEXISTS};
diff --git a/spring-batch-execution/src/main/sql/init.sql.vpp b/spring-batch-execution/src/main/sql/init.sql.vpp
index 33dfdc3e9..51ea29af8 100644
--- a/spring-batch-execution/src/main/sql/init.sql.vpp
+++ b/spring-batch-execution/src/main/sql/init.sql.vpp
@@ -1,5 +1,5 @@
 -- Autogenerated: do not edit this file
-CREATE TABLE BATCH_JOB  (
+CREATE TABLE BATCH_JOB_INSTANCE  (
 	ID ${BIGINT} $!{IDENTITY} PRIMARY KEY $!{GENERATED},  
 	VERSION ${BIGINT},  
 	JOB_NAME VARCHAR(100) NOT NULL , 
@@ -25,7 +25,7 @@ CREATE TABLE BATCH_JOB_INSTANCE_PROPERTIES  (
 	DATE_VAL TIMESTAMP ,
 	LONG_VAL VARCHAR(10) );
 
-CREATE TABLE BATCH_STEP  (
+CREATE TABLE BATCH_STEP_INSTANCE  (
 	ID ${BIGINT} $!{IDENTITY} PRIMARY KEY $!{GENERATED},
 	VERSION ${BIGINT},  
 	JOB_ID ${BIGINT} NOT NULL,
diff --git a/spring-batch-execution/src/test/java/org/springframework/batch/execution/repository/dao/AbstractJobDaoTests.java b/spring-batch-execution/src/test/java/org/springframework/batch/execution/repository/dao/AbstractJobDaoTests.java
index 5ace6e95f..adb02f29c 100644
--- a/spring-batch-execution/src/test/java/org/springframework/batch/execution/repository/dao/AbstractJobDaoTests.java
+++ b/spring-batch-execution/src/test/java/org/springframework/batch/execution/repository/dao/AbstractJobDaoTests.java
@@ -80,7 +80,7 @@ public abstract class AbstractJobDaoTests extends
 
 	public void testVersionIsNotNullForJob() throws Exception {
 		int version = jdbcTemplate
-				.queryForInt("select version from BATCH_JOB where ID="
+				.queryForInt("select version from BATCH_JOB_INSTANCE where ID="
 						+ job.getId());
 		assertEquals(0, version);
 	}
@@ -250,7 +250,7 @@ public abstract class AbstractJobDaoTests extends
 		job = jobDao.createJob(jobIdentifier);
 
 		List jobs = jdbcTemplate.queryForList(
-				"SELECT * FROM BATCH_JOB where ID=?", new Object[] { job
+				"SELECT * FROM BATCH_JOB_INSTANCE where ID=?", new Object[] { job
 						.getId() });
 		assertEquals(1, jobs.size());
 		assertEquals(job.getName(), ((Map) jobs.get(0)).get("JOB_NAME"));
@@ -278,6 +278,11 @@ public abstract class AbstractJobDaoTests extends
 		assertEquals(results.size(), 1);
 		validateJobExecution(jobExecution, (JobExecution)results.get(0));
 	}
+	
+	public void testFindJobsWithProperties() throws Exception{
+		
+		
+	}
 
 	private void validateJobExecution(JobExecution lhs, JobExecution rhs){
 
diff --git a/spring-batch-execution/src/test/java/org/springframework/batch/execution/repository/dao/AbstractStepDaoTests.java b/spring-batch-execution/src/test/java/org/springframework/batch/execution/repository/dao/AbstractStepDaoTests.java
index c563e91a0..9afc4d57f 100644
--- a/spring-batch-execution/src/test/java/org/springframework/batch/execution/repository/dao/AbstractStepDaoTests.java
+++ b/spring-batch-execution/src/test/java/org/springframework/batch/execution/repository/dao/AbstractStepDaoTests.java
@@ -93,7 +93,7 @@ public abstract class AbstractStepDaoTests extends AbstractTransactionalDataSour
 	}
 	
 	public void testVersionIsNotNullForStep() throws Exception {
-		int version = jdbcTemplate.queryForInt("select version from BATCH_STEP where ID="+step1.getId());
+		int version = jdbcTemplate.queryForInt("select version from BATCH_STEP_INSTANCE where ID="+step1.getId());
 		assertEquals(0, version);
 	}
 	
diff --git a/spring-batch-execution/src/test/resources/org/springframework/batch/execution/repository/dao/destroy.sql b/spring-batch-execution/src/test/resources/org/springframework/batch/execution/repository/dao/destroy.sql
index 377fdc36b..46008eae7 100644
--- a/spring-batch-execution/src/test/resources/org/springframework/batch/execution/repository/dao/destroy.sql
+++ b/spring-batch-execution/src/test/resources/org/springframework/batch/execution/repository/dao/destroy.sql
@@ -1,8 +1,8 @@
 -- Autogenerated: do not edit this file
 DROP TABLE BATCH_STEP_EXECUTION IF EXISTS;
 DROP TABLE BATCH_JOB_EXECUTION IF EXISTS;
-DROP TABLE BATCH_STEP IF EXISTS;
-DROP TABLE BATCH_JOB IF EXISTS;
+DROP TABLE BATCH_STEP_INSTANCE IF EXISTS;
+DROP TABLE BATCH_JOB_INSTANCE IF EXISTS;
 
 DROP TABLE BATCH_STEP_EXECUTION_SEQ IF EXISTS;
 DROP TABLE BATCH_STEP_SEQ IF EXISTS;
diff --git a/spring-batch-execution/src/test/resources/org/springframework/batch/execution/repository/dao/init.sql b/spring-batch-execution/src/test/resources/org/springframework/batch/execution/repository/dao/init.sql
index 909e21ac9..e88d694a3 100644
--- a/spring-batch-execution/src/test/resources/org/springframework/batch/execution/repository/dao/init.sql
+++ b/spring-batch-execution/src/test/resources/org/springframework/batch/execution/repository/dao/init.sql
@@ -1,5 +1,5 @@
 -- Autogenerated: do not edit this file
-CREATE TABLE BATCH_JOB  (
+CREATE TABLE BATCH_JOB_INSTANCE  (
 	ID BIGINT IDENTITY PRIMARY KEY ,  
 	VERSION BIGINT,  
 	JOB_NAME VARCHAR(100) NOT NULL , 
@@ -25,7 +25,7 @@ CREATE TABLE BATCH_JOB_INSTANCE_PROPERTIES  (
 	DATE_VAL TIMESTAMP ,
 	LONG_VAL VARCHAR(10) );
 
-CREATE TABLE BATCH_STEP  (
+CREATE TABLE BATCH_STEP_INSTANCE  (
 	ID BIGINT IDENTITY PRIMARY KEY ,
 	VERSION BIGINT,  
 	JOB_ID BIGINT NOT NULL,