diff --git a/spring-batch-core/src/main/resources/org/springframework/batch/core/schema-drop-db2.sql b/spring-batch-core/src/main/resources/org/springframework/batch/core/schema-drop-db2.sql
index 891182071..247ae2076 100644
--- a/spring-batch-core/src/main/resources/org/springframework/batch/core/schema-drop-db2.sql
+++ b/spring-batch-core/src/main/resources/org/springframework/batch/core/schema-drop-db2.sql
@@ -1,12 +1,12 @@
 -- Autogenerated: do not edit this file
 
-DROP TABLE  BATCH_STEP_EXECUTION_CONTEXT ;
-DROP TABLE  BATCH_JOB_EXECUTION_CONTEXT ;
-DROP TABLE  BATCH_STEP_EXECUTION ;
-DROP TABLE  BATCH_JOB_EXECUTION_PARAMS ;
-DROP TABLE  BATCH_JOB_EXECUTION ;
-DROP TABLE  BATCH_JOB_INSTANCE ;
+DROP TABLE  BATCH_STEP_EXECUTION_CONTEXT;
+DROP TABLE  BATCH_JOB_EXECUTION_CONTEXT;
+DROP TABLE  BATCH_STEP_EXECUTION;
+DROP TABLE  BATCH_JOB_EXECUTION_PARAMS;
+DROP TABLE  BATCH_JOB_EXECUTION;
+DROP TABLE  BATCH_JOB_INSTANCE;
 
-DROP SEQUENCE  BATCH_STEP_EXECUTION_SEQ ;
-DROP SEQUENCE  BATCH_JOB_EXECUTION_SEQ ;
-DROP SEQUENCE  BATCH_JOB_SEQ ;
+DROP SEQUENCE  BATCH_STEP_EXECUTION_SEQ;
+DROP SEQUENCE  BATCH_JOB_EXECUTION_SEQ;
+DROP SEQUENCE  BATCH_JOB_SEQ;
diff --git a/spring-batch-core/src/main/resources/org/springframework/batch/core/schema-drop-derby.sql b/spring-batch-core/src/main/resources/org/springframework/batch/core/schema-drop-derby.sql
index d63d1c074..d217ec569 100644
--- a/spring-batch-core/src/main/resources/org/springframework/batch/core/schema-drop-derby.sql
+++ b/spring-batch-core/src/main/resources/org/springframework/batch/core/schema-drop-derby.sql
@@ -1,12 +1,12 @@
 -- Autogenerated: do not edit this file
 
-DROP TABLE  BATCH_STEP_EXECUTION_CONTEXT ;
-DROP TABLE  BATCH_JOB_EXECUTION_CONTEXT ;
-DROP TABLE  BATCH_STEP_EXECUTION ;
-DROP TABLE  BATCH_JOB_EXECUTION_PARAMS ;
-DROP TABLE  BATCH_JOB_EXECUTION ;
-DROP TABLE  BATCH_JOB_INSTANCE ;
+DROP TABLE  BATCH_STEP_EXECUTION_CONTEXT;
+DROP TABLE  BATCH_JOB_EXECUTION_CONTEXT;
+DROP TABLE  BATCH_STEP_EXECUTION;
+DROP TABLE  BATCH_JOB_EXECUTION_PARAMS;
+DROP TABLE  BATCH_JOB_EXECUTION;
+DROP TABLE  BATCH_JOB_INSTANCE;
 
-DROP TABLE  BATCH_STEP_EXECUTION_SEQ ;
-DROP TABLE  BATCH_JOB_EXECUTION_SEQ ;
-DROP TABLE  BATCH_JOB_SEQ ;
+DROP TABLE  BATCH_STEP_EXECUTION_SEQ;
+DROP TABLE  BATCH_JOB_EXECUTION_SEQ;
+DROP TABLE  BATCH_JOB_SEQ;
diff --git a/spring-batch-core/src/main/resources/org/springframework/batch/core/schema-drop-mysql.sql b/spring-batch-core/src/main/resources/org/springframework/batch/core/schema-drop-mysql.sql
index 28fe65bac..dc51cdacd 100644
--- a/spring-batch-core/src/main/resources/org/springframework/batch/core/schema-drop-mysql.sql
+++ b/spring-batch-core/src/main/resources/org/springframework/batch/core/schema-drop-mysql.sql
@@ -1,12 +1,12 @@
 -- Autogenerated: do not edit this file
 
-DROP TABLE IF EXISTS BATCH_STEP_EXECUTION_CONTEXT ;
-DROP TABLE IF EXISTS BATCH_JOB_EXECUTION_CONTEXT ;
-DROP TABLE IF EXISTS BATCH_STEP_EXECUTION ;
-DROP TABLE IF EXISTS BATCH_JOB_EXECUTION_PARAMS ;
-DROP TABLE IF EXISTS BATCH_JOB_EXECUTION ;
-DROP TABLE IF EXISTS BATCH_JOB_INSTANCE ;
+DROP TABLE IF EXISTS BATCH_STEP_EXECUTION_CONTEXT;
+DROP TABLE IF EXISTS BATCH_JOB_EXECUTION_CONTEXT;
+DROP TABLE IF EXISTS BATCH_STEP_EXECUTION;
+DROP TABLE IF EXISTS BATCH_JOB_EXECUTION_PARAMS;
+DROP TABLE IF EXISTS BATCH_JOB_EXECUTION;
+DROP TABLE IF EXISTS BATCH_JOB_INSTANCE;
 
-DROP TABLE IF EXISTS BATCH_STEP_EXECUTION_SEQ ;
-DROP TABLE IF EXISTS BATCH_JOB_EXECUTION_SEQ ;
-DROP TABLE IF EXISTS BATCH_JOB_SEQ ;
+DROP TABLE IF EXISTS BATCH_STEP_EXECUTION_SEQ;
+DROP TABLE IF EXISTS BATCH_JOB_EXECUTION_SEQ;
+DROP TABLE IF EXISTS BATCH_JOB_SEQ;
diff --git a/spring-batch-core/src/main/resources/org/springframework/batch/core/schema-drop-oracle10g.sql b/spring-batch-core/src/main/resources/org/springframework/batch/core/schema-drop-oracle10g.sql
index 891182071..247ae2076 100644
--- a/spring-batch-core/src/main/resources/org/springframework/batch/core/schema-drop-oracle10g.sql
+++ b/spring-batch-core/src/main/resources/org/springframework/batch/core/schema-drop-oracle10g.sql
@@ -1,12 +1,12 @@
 -- Autogenerated: do not edit this file
 
-DROP TABLE  BATCH_STEP_EXECUTION_CONTEXT ;
-DROP TABLE  BATCH_JOB_EXECUTION_CONTEXT ;
-DROP TABLE  BATCH_STEP_EXECUTION ;
-DROP TABLE  BATCH_JOB_EXECUTION_PARAMS ;
-DROP TABLE  BATCH_JOB_EXECUTION ;
-DROP TABLE  BATCH_JOB_INSTANCE ;
+DROP TABLE  BATCH_STEP_EXECUTION_CONTEXT;
+DROP TABLE  BATCH_JOB_EXECUTION_CONTEXT;
+DROP TABLE  BATCH_STEP_EXECUTION;
+DROP TABLE  BATCH_JOB_EXECUTION_PARAMS;
+DROP TABLE  BATCH_JOB_EXECUTION;
+DROP TABLE  BATCH_JOB_INSTANCE;
 
-DROP SEQUENCE  BATCH_STEP_EXECUTION_SEQ ;
-DROP SEQUENCE  BATCH_JOB_EXECUTION_SEQ ;
-DROP SEQUENCE  BATCH_JOB_SEQ ;
+DROP SEQUENCE  BATCH_STEP_EXECUTION_SEQ;
+DROP SEQUENCE  BATCH_JOB_EXECUTION_SEQ;
+DROP SEQUENCE  BATCH_JOB_SEQ;
diff --git a/spring-batch-core/src/main/resources/org/springframework/batch/core/schema-drop-postgresql.sql b/spring-batch-core/src/main/resources/org/springframework/batch/core/schema-drop-postgresql.sql
index 3253af008..852211838 100644
--- a/spring-batch-core/src/main/resources/org/springframework/batch/core/schema-drop-postgresql.sql
+++ b/spring-batch-core/src/main/resources/org/springframework/batch/core/schema-drop-postgresql.sql
@@ -6,6 +6,6 @@ DROP TABLE  IF EXISTS BATCH_JOB_EXECUTION_PARAMS;
 DROP TABLE  IF EXISTS BATCH_JOB_EXECUTION;
 DROP TABLE  IF EXISTS BATCH_JOB_INSTANCE;
 
-DROP SEQUENCE  IF EXISTS BATCH_STEP_EXECUTION_SEQ ;
-DROP SEQUENCE  IF EXISTS BATCH_JOB_EXECUTION_SEQ ;
-DROP SEQUENCE  IF EXISTS BATCH_JOB_SEQ ;
+DROP SEQUENCE  IF EXISTS BATCH_STEP_EXECUTION_SEQ;
+DROP SEQUENCE  IF EXISTS BATCH_JOB_EXECUTION_SEQ;
+DROP SEQUENCE  IF EXISTS BATCH_JOB_SEQ;
diff --git a/spring-batch-core/src/main/resources/org/springframework/batch/core/schema-drop-sqlite.sql b/spring-batch-core/src/main/resources/org/springframework/batch/core/schema-drop-sqlite.sql
index 1b4e01390..b40b16ab5 100644
--- a/spring-batch-core/src/main/resources/org/springframework/batch/core/schema-drop-sqlite.sql
+++ b/spring-batch-core/src/main/resources/org/springframework/batch/core/schema-drop-sqlite.sql
@@ -1,12 +1,12 @@
 -- Autogenerated: do not edit this file
- DROP TABLE IF EXISTS BATCH_STEP_EXECUTION_CONTEXT ;
-DROP TABLE IF EXISTS BATCH_JOB_EXECUTION_CONTEXT ;
-DROP TABLE IF EXISTS BATCH_JOB_EXECUTION_PARAMS ;
-DROP TABLE IF EXISTS BATCH_STEP_EXECUTION ;
-DROP TABLE IF EXISTS BATCH_JOB_EXECUTION ;
-DROP TABLE IF EXISTS BATCH_JOB_PARAMS ;
-DROP TABLE IF EXISTS BATCH_JOB_INSTANCE ;
+ DROP TABLE IF EXISTS BATCH_STEP_EXECUTION_CONTEXT;
+DROP TABLE IF EXISTS BATCH_JOB_EXECUTION_CONTEXT;
+DROP TABLE IF EXISTS BATCH_JOB_EXECUTION_PARAMS;
+DROP TABLE IF EXISTS BATCH_STEP_EXECUTION;
+DROP TABLE IF EXISTS BATCH_JOB_EXECUTION;
+DROP TABLE IF EXISTS BATCH_JOB_PARAMS;
+DROP TABLE IF EXISTS BATCH_JOB_INSTANCE;
 
-DROP TABLE IF EXISTS BATCH_STEP_EXECUTION_SEQ ;
-DROP TABLE IF EXISTS BATCH_JOB_EXECUTION_SEQ ;
-DROP TABLE IF EXISTS BATCH_JOB_SEQ ;
+DROP TABLE IF EXISTS BATCH_STEP_EXECUTION_SEQ;
+DROP TABLE IF EXISTS BATCH_JOB_EXECUTION_SEQ;
+DROP TABLE IF EXISTS BATCH_JOB_SEQ;
diff --git a/spring-batch-core/src/main/resources/org/springframework/batch/core/schema-drop-sqlserver.sql b/spring-batch-core/src/main/resources/org/springframework/batch/core/schema-drop-sqlserver.sql
index d63d1c074..d217ec569 100644
--- a/spring-batch-core/src/main/resources/org/springframework/batch/core/schema-drop-sqlserver.sql
+++ b/spring-batch-core/src/main/resources/org/springframework/batch/core/schema-drop-sqlserver.sql
@@ -1,12 +1,12 @@
 -- Autogenerated: do not edit this file
 
-DROP TABLE  BATCH_STEP_EXECUTION_CONTEXT ;
-DROP TABLE  BATCH_JOB_EXECUTION_CONTEXT ;
-DROP TABLE  BATCH_STEP_EXECUTION ;
-DROP TABLE  BATCH_JOB_EXECUTION_PARAMS ;
-DROP TABLE  BATCH_JOB_EXECUTION ;
-DROP TABLE  BATCH_JOB_INSTANCE ;
+DROP TABLE  BATCH_STEP_EXECUTION_CONTEXT;
+DROP TABLE  BATCH_JOB_EXECUTION_CONTEXT;
+DROP TABLE  BATCH_STEP_EXECUTION;
+DROP TABLE  BATCH_JOB_EXECUTION_PARAMS;
+DROP TABLE  BATCH_JOB_EXECUTION;
+DROP TABLE  BATCH_JOB_INSTANCE;
 
-DROP TABLE  BATCH_STEP_EXECUTION_SEQ ;
-DROP TABLE  BATCH_JOB_EXECUTION_SEQ ;
-DROP TABLE  BATCH_JOB_SEQ ;
+DROP TABLE  BATCH_STEP_EXECUTION_SEQ;
+DROP TABLE  BATCH_JOB_EXECUTION_SEQ;
+DROP TABLE  BATCH_JOB_SEQ;
diff --git a/spring-batch-core/src/main/resources/org/springframework/batch/core/schema-drop-sybase.sql b/spring-batch-core/src/main/resources/org/springframework/batch/core/schema-drop-sybase.sql
index d63d1c074..d217ec569 100644
--- a/spring-batch-core/src/main/resources/org/springframework/batch/core/schema-drop-sybase.sql
+++ b/spring-batch-core/src/main/resources/org/springframework/batch/core/schema-drop-sybase.sql
@@ -1,12 +1,12 @@
 -- Autogenerated: do not edit this file
 
-DROP TABLE  BATCH_STEP_EXECUTION_CONTEXT ;
-DROP TABLE  BATCH_JOB_EXECUTION_CONTEXT ;
-DROP TABLE  BATCH_STEP_EXECUTION ;
-DROP TABLE  BATCH_JOB_EXECUTION_PARAMS ;
-DROP TABLE  BATCH_JOB_EXECUTION ;
-DROP TABLE  BATCH_JOB_INSTANCE ;
+DROP TABLE  BATCH_STEP_EXECUTION_CONTEXT;
+DROP TABLE  BATCH_JOB_EXECUTION_CONTEXT;
+DROP TABLE  BATCH_STEP_EXECUTION;
+DROP TABLE  BATCH_JOB_EXECUTION_PARAMS;
+DROP TABLE  BATCH_JOB_EXECUTION;
+DROP TABLE  BATCH_JOB_INSTANCE;
 
-DROP TABLE  BATCH_STEP_EXECUTION_SEQ ;
-DROP TABLE  BATCH_JOB_EXECUTION_SEQ ;
-DROP TABLE  BATCH_JOB_SEQ ;
+DROP TABLE  BATCH_STEP_EXECUTION_SEQ;
+DROP TABLE  BATCH_JOB_EXECUTION_SEQ;
+DROP TABLE  BATCH_JOB_SEQ;