diff --git a/spring-batch-execution/src/main/java/org/springframework/batch/execution/repository/dao/JdbcStepExecutionDao.java b/spring-batch-execution/src/main/java/org/springframework/batch/execution/repository/dao/JdbcStepExecutionDao.java
index 42f897753..ce7a3aaee 100644
--- a/spring-batch-execution/src/main/java/org/springframework/batch/execution/repository/dao/JdbcStepExecutionDao.java
+++ b/spring-batch-execution/src/main/java/org/springframework/batch/execution/repository/dao/JdbcStepExecutionDao.java
@@ -57,20 +57,20 @@ public class JdbcStepExecutionDao extends AbstractJdbcBatchMetadataDao
 
 	private static final Log logger = LogFactory.getLog(JdbcStepExecutionDao.class);
 
-	private static final String FIND_STEP_EXECUTION_ATTRS = "SELECT TYPE_CD, KEY_NAME, STRING_VAL, DOUBLE_VAL, LONG_VAL, OBJECT_VAL "
-			+ "from %PREFIX%STEP_EXECUTION_ATTRS where STEP_EXECUTION_ID = ?";
+	private static final String FIND_STEP_EXECUTION_CONTEXT = "SELECT TYPE_CD, KEY_NAME, STRING_VAL, DOUBLE_VAL, LONG_VAL, OBJECT_VAL "
+			+ "from %PREFIX%STEP_EXECUTION_CONTEXT where STEP_EXECUTION_ID = ?";
 
 	private static final String GET_STEP_EXECUTION_COUNT = "SELECT count(STEP_EXECUTION_ID) from %PREFIX%STEP_EXECUTION where "
 			+ "STEP_INSTANCE_ID = ?";
 
-	private static final String INSERT_STEP_EXECUTION_ATTRS = "INSERT into %PREFIX%STEP_EXECUTION_ATTRS(STEP_EXECUTION_ID, TYPE_CD,"
+	private static final String INSERT_STEP_EXECUTION_CONTEXT = "INSERT into %PREFIX%STEP_EXECUTION_CONTEXT(STEP_EXECUTION_ID, TYPE_CD,"
 			+ " KEY_NAME, STRING_VAL, DOUBLE_VAL, LONG_VAL, OBJECT_VAL) values(?,?,?,?,?,?,?)";
 
 	private static final String SAVE_STEP_EXECUTION = "INSERT into %PREFIX%STEP_EXECUTION(STEP_EXECUTION_ID, VERSION, STEP_INSTANCE_ID, JOB_EXECUTION_ID, START_TIME, "
 			+ "END_TIME, STATUS, COMMIT_COUNT, TASK_COUNT, TASK_STATISTICS, CONTINUABLE, EXIT_CODE, EXIT_MESSAGE) "
 			+ "values(?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)";
 
-	private static final String UPDATE_STEP_EXECUTION_ATTRS = "UPDATE %PREFIX%STEP_EXECUTION_ATTRS set "
+	private static final String UPDATE_STEP_EXECUTION_CONTEXT = "UPDATE %PREFIX%STEP_EXECUTION_CONTEXT set "
 			+ "TYPE_CD = ?, STRING_VAL = ?, DOUBLE_VAL = ?, LONG_VAL = ?, OBJECT_VAL = ? where STEP_EXECUTION_ID = ? and KEY_NAME = ?";
 
 	private static final String UPDATE_STEP_EXECUTION = "UPDATE %PREFIX%STEP_EXECUTION set START_TIME = ?, END_TIME = ?, "
@@ -121,7 +121,7 @@ public class JdbcStepExecutionDao extends AbstractJdbcBatchMetadataDao
 			}
 		};
 
-		getJdbcTemplate().query(getQuery(FIND_STEP_EXECUTION_ATTRS), new Object[] { executionId }, callback);
+		getJdbcTemplate().query(getQuery(FIND_STEP_EXECUTION_CONTEXT), new Object[] { executionId }, callback);
 
 		return executionContext;
 	}
@@ -219,7 +219,7 @@ public class JdbcStepExecutionDao extends AbstractJdbcBatchMetadataDao
 				}
 			}
 		};
-		getJdbcTemplate().execute(getQuery(INSERT_STEP_EXECUTION_ATTRS), callback);
+		getJdbcTemplate().execute(getQuery(INSERT_STEP_EXECUTION_CONTEXT), callback);
 	}
 
 	/**
@@ -339,7 +339,7 @@ public class JdbcStepExecutionDao extends AbstractJdbcBatchMetadataDao
 		// LobCreating callbacks always return the affect row count for SQL DML
 		// statements, if less than 1 row
 		// is affected, then this row is new and should be inserted.
-		Integer affectedRows = (Integer) getJdbcTemplate().execute(getQuery(UPDATE_STEP_EXECUTION_ATTRS), callback);
+		Integer affectedRows = (Integer) getJdbcTemplate().execute(getQuery(UPDATE_STEP_EXECUTION_CONTEXT), callback);
 		if (affectedRows.intValue() < 1) {
 			insertExecutionAttribute(executionId, key, value, type);
 		}
diff --git a/spring-batch-execution/src/main/resources/schema-db2.sql b/spring-batch-execution/src/main/resources/schema-db2.sql
index ca3cdfa53..80cd5e94f 100644
--- a/spring-batch-execution/src/main/resources/schema-db2.sql
+++ b/spring-batch-execution/src/main/resources/schema-db2.sql
@@ -4,7 +4,7 @@ DROP TABLE  BATCH_JOB_EXECUTION ;
 DROP TABLE  BATCH_STEP_INSTANCE ;
 DROP TABLE  BATCH_JOB_INSTANCE ;
 DROP TABLE  BATCH_JOB_PARAMS ;
-DROP TABLE  BATCH_STEP_EXECUTION_ATTRS ;
+DROP TABLE  BATCH_STEP_EXECUTION_CONTEXT ;
 
 DROP SEQUENCE  BATCH_STEP_EXECUTION_SEQ ;
 DROP SEQUENCE  BATCH_STEP_SEQ ;
@@ -58,7 +58,7 @@ CREATE TABLE BATCH_STEP_EXECUTION  (
 	EXIT_CODE VARCHAR(20),
 	EXIT_MESSAGE VARCHAR(2500));
 	
-CREATE TABLE BATCH_STEP_EXECUTION_ATTRS  (
+CREATE TABLE BATCH_STEP_EXECUTION_CONTEXT  (
 	STEP_EXECUTION_ID BIGINT NOT NULL ,
     TYPE_CD VARCHAR(6) NOT NULL ,
 	KEY_NAME VARCHAR(1000) 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 3c10bab65..9d0b8ce90 100644
--- a/spring-batch-execution/src/main/resources/schema-derby.sql
+++ b/spring-batch-execution/src/main/resources/schema-derby.sql
@@ -4,7 +4,7 @@ DROP TABLE  BATCH_JOB_EXECUTION ;
 DROP TABLE  BATCH_STEP_INSTANCE ;
 DROP TABLE  BATCH_JOB_INSTANCE ;
 DROP TABLE  BATCH_JOB_PARAMS ;
-DROP TABLE  BATCH_STEP_EXECUTION_ATTRS ;
+DROP TABLE  BATCH_STEP_EXECUTION_CONTEXT ;
 
 DROP TABLE  BATCH_STEP_EXECUTION_SEQ ;
 DROP TABLE  BATCH_STEP_SEQ ;
@@ -58,7 +58,7 @@ CREATE TABLE BATCH_STEP_EXECUTION  (
 	EXIT_CODE VARCHAR(20),
 	EXIT_MESSAGE VARCHAR(2500));
 	
-CREATE TABLE BATCH_STEP_EXECUTION_ATTRS  (
+CREATE TABLE BATCH_STEP_EXECUTION_CONTEXT  (
 	STEP_EXECUTION_ID BIGINT NOT NULL ,
     TYPE_CD VARCHAR(6) NOT NULL ,
 	KEY_NAME VARCHAR(1000) 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 50c7c2084..bd2e09a93 100644
--- a/spring-batch-execution/src/main/resources/schema-hsqldb.sql
+++ b/spring-batch-execution/src/main/resources/schema-hsqldb.sql
@@ -4,7 +4,7 @@ DROP TABLE  BATCH_JOB_EXECUTION IF EXISTS;
 DROP TABLE  BATCH_STEP_INSTANCE IF EXISTS;
 DROP TABLE  BATCH_JOB_INSTANCE IF EXISTS;
 DROP TABLE  BATCH_JOB_PARAMS IF EXISTS;
-DROP TABLE  BATCH_STEP_EXECUTION_ATTRS IF EXISTS;
+DROP TABLE  BATCH_STEP_EXECUTION_CONTEXT IF EXISTS;
 
 DROP TABLE  BATCH_STEP_EXECUTION_SEQ IF EXISTS;
 DROP TABLE  BATCH_STEP_SEQ IF EXISTS;
@@ -58,7 +58,7 @@ CREATE TABLE BATCH_STEP_EXECUTION  (
 	EXIT_CODE VARCHAR(20),
 	EXIT_MESSAGE VARCHAR(2500));
 	
-CREATE TABLE BATCH_STEP_EXECUTION_ATTRS  (
+CREATE TABLE BATCH_STEP_EXECUTION_CONTEXT  (
 	STEP_EXECUTION_ID BIGINT NOT NULL ,
     TYPE_CD VARCHAR(6) NOT NULL ,
 	KEY_NAME VARCHAR(1000) 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 72f0b364c..25059f9db 100644
--- a/spring-batch-execution/src/main/resources/schema-mysql.sql
+++ b/spring-batch-execution/src/main/resources/schema-mysql.sql
@@ -4,7 +4,7 @@ DROP TABLE IF EXISTS BATCH_JOB_EXECUTION ;
 DROP TABLE IF EXISTS BATCH_STEP_INSTANCE ;
 DROP TABLE IF EXISTS BATCH_JOB_INSTANCE ;
 DROP TABLE IF EXISTS BATCH_JOB_PARAMS ;
-DROP TABLE IF EXISTS BATCH_STEP_EXECUTION_ATTRS ;
+DROP TABLE IF EXISTS BATCH_STEP_EXECUTION_CONTEXT ;
 
 DROP TABLE IF EXISTS BATCH_STEP_EXECUTION_SEQ ;
 DROP TABLE IF EXISTS BATCH_STEP_SEQ ;
@@ -58,7 +58,7 @@ CREATE TABLE BATCH_STEP_EXECUTION  (
 	EXIT_CODE VARCHAR(20),
 	EXIT_MESSAGE VARCHAR(2500));
 	
-CREATE TABLE BATCH_STEP_EXECUTION_ATTRS  (
+CREATE TABLE BATCH_STEP_EXECUTION_CONTEXT  (
 	STEP_EXECUTION_ID BIGINT NOT NULL ,
     TYPE_CD VARCHAR(6) NOT NULL ,
 	KEY_NAME VARCHAR(1000) 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 ed6735483..896e9a323 100644
--- a/spring-batch-execution/src/main/resources/schema-oracle10g.sql
+++ b/spring-batch-execution/src/main/resources/schema-oracle10g.sql
@@ -4,7 +4,7 @@ DROP TABLE  BATCH_JOB_EXECUTION ;
 DROP TABLE  BATCH_STEP_INSTANCE ;
 DROP TABLE  BATCH_JOB_INSTANCE ;
 DROP TABLE  BATCH_JOB_PARAMS ;
-DROP TABLE  BATCH_STEP_EXECUTION_ATTRS ;
+DROP TABLE  BATCH_STEP_EXECUTION_CONTEXT ;
 
 DROP SEQUENCE  BATCH_STEP_EXECUTION_SEQ ;
 DROP SEQUENCE  BATCH_STEP_SEQ ;
@@ -58,7 +58,7 @@ CREATE TABLE BATCH_STEP_EXECUTION  (
 	EXIT_CODE VARCHAR(20),
 	EXIT_MESSAGE VARCHAR(2500));
 	
-CREATE TABLE BATCH_STEP_EXECUTION_ATTRS  (
+CREATE TABLE BATCH_STEP_EXECUTION_CONTEXT  (
 	STEP_EXECUTION_ID NUMBER(38) NOT NULL ,
     TYPE_CD VARCHAR(6) NOT NULL ,
 	KEY_NAME VARCHAR(1000) 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 ca3cdfa53..80cd5e94f 100644
--- a/spring-batch-execution/src/main/resources/schema-postgresql.sql
+++ b/spring-batch-execution/src/main/resources/schema-postgresql.sql
@@ -4,7 +4,7 @@ DROP TABLE  BATCH_JOB_EXECUTION ;
 DROP TABLE  BATCH_STEP_INSTANCE ;
 DROP TABLE  BATCH_JOB_INSTANCE ;
 DROP TABLE  BATCH_JOB_PARAMS ;
-DROP TABLE  BATCH_STEP_EXECUTION_ATTRS ;
+DROP TABLE  BATCH_STEP_EXECUTION_CONTEXT ;
 
 DROP SEQUENCE  BATCH_STEP_EXECUTION_SEQ ;
 DROP SEQUENCE  BATCH_STEP_SEQ ;
@@ -58,7 +58,7 @@ CREATE TABLE BATCH_STEP_EXECUTION  (
 	EXIT_CODE VARCHAR(20),
 	EXIT_MESSAGE VARCHAR(2500));
 	
-CREATE TABLE BATCH_STEP_EXECUTION_ATTRS  (
+CREATE TABLE BATCH_STEP_EXECUTION_CONTEXT  (
 	STEP_EXECUTION_ID BIGINT NOT NULL ,
     TYPE_CD VARCHAR(6) NOT NULL ,
 	KEY_NAME VARCHAR(1000) 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 ab9453646..ede2ae0b7 100644
--- a/spring-batch-execution/src/main/sql/destroy.sql.vpp
+++ b/spring-batch-execution/src/main/sql/destroy.sql.vpp
@@ -4,7 +4,7 @@ DROP TABLE $!{IFEXISTSBEFORE} BATCH_JOB_EXECUTION $!{IFEXISTS};
 DROP TABLE $!{IFEXISTSBEFORE} BATCH_STEP_INSTANCE $!{IFEXISTS};
 DROP TABLE $!{IFEXISTSBEFORE} BATCH_JOB_INSTANCE $!{IFEXISTS};
 DROP TABLE $!{IFEXISTSBEFORE} BATCH_JOB_PARAMS $!{IFEXISTS};
-DROP TABLE $!{IFEXISTSBEFORE} BATCH_STEP_EXECUTION_ATTRS $!{IFEXISTS};
+DROP TABLE $!{IFEXISTSBEFORE} BATCH_STEP_EXECUTION_CONTEXT $!{IFEXISTS};
 
 DROP ${SEQUENCE} $!{IFEXISTSBEFORE} BATCH_STEP_EXECUTION_SEQ $!{IFEXISTS};
 DROP ${SEQUENCE} $!{IFEXISTSBEFORE} 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 cd85fc0d3..ed40fa365 100644
--- a/spring-batch-execution/src/main/sql/init.sql.vpp
+++ b/spring-batch-execution/src/main/sql/init.sql.vpp
@@ -45,7 +45,7 @@ CREATE TABLE BATCH_STEP_EXECUTION  (
 	EXIT_CODE VARCHAR(20),
 	EXIT_MESSAGE VARCHAR(2500));
 	
-CREATE TABLE BATCH_STEP_EXECUTION_ATTRS  (
+CREATE TABLE BATCH_STEP_EXECUTION_CONTEXT  (
 	STEP_EXECUTION_ID ${BIGINT} NOT NULL ,
     TYPE_CD VARCHAR(6) NOT NULL ,
 	KEY_NAME VARCHAR(1000) NOT NULL , 
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 0974a9770..4722ad067 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
@@ -4,7 +4,7 @@ DROP TABLE  BATCH_JOB_EXECUTION IF EXISTS;
 DROP TABLE  BATCH_STEP_INSTANCE IF EXISTS;
 DROP TABLE  BATCH_JOB_INSTANCE IF EXISTS;
 DROP TABLE  BATCH_JOB_PARAMS IF EXISTS;
-DROP TABLE  BATCH_STEP_EXECUTION_ATTRS IF EXISTS;
+DROP TABLE  BATCH_STEP_EXECUTION_CONTEXT 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 cff8fb2da..5c24d8327 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
@@ -45,7 +45,7 @@ CREATE TABLE BATCH_STEP_EXECUTION  (
 	EXIT_CODE VARCHAR(20),
 	EXIT_MESSAGE VARCHAR(2500));
 	
-CREATE TABLE BATCH_STEP_EXECUTION_ATTRS  (
+CREATE TABLE BATCH_STEP_EXECUTION_CONTEXT  (
 	STEP_EXECUTION_ID BIGINT NOT NULL ,
     TYPE_CD VARCHAR(6) NOT NULL ,
 	KEY_NAME VARCHAR(1000) NOT NULL ,