diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/configuration/xml/StepParser.java b/spring-batch-core/src/main/java/org/springframework/batch/core/configuration/xml/StepParser.java
index 1a2f3206c..5e4818f5b 100644
--- a/spring-batch-core/src/main/java/org/springframework/batch/core/configuration/xml/StepParser.java
+++ b/spring-batch-core/src/main/java/org/springframework/batch/core/configuration/xml/StepParser.java
@@ -72,14 +72,14 @@ public class StepParser {
 		@SuppressWarnings("unchecked")
 		List<Element> taskElements = (List<Element>) DomUtils.getChildElementsByTagName(element, "task");
 		@SuppressWarnings("unchecked")
-		List<Element> chunkOrientedElements = (List<Element>) DomUtils.getChildElementsByTagName(element, "chunk-oriented");
+		List<Element> chunkElements = (List<Element>) DomUtils.getChildElementsByTagName(element, "chunk");
 		if (taskElements.size() > 0) {
 			Object task = parseTask(taskElements.get(0), parserContext);
 			stateBuilder.addConstructorArgValue(stepRef);
 			stateBuilder.addConstructorArgValue(task);
 		}
-		else if (chunkOrientedElements.size() > 0) {
-			Object task = parseChunkOriented(chunkOrientedElements.get(0), parserContext);
+		else if (chunkElements.size() > 0) {
+			Object task = parseChunk(chunkElements.get(0), parserContext);
 			stateBuilder.addConstructorArgValue(stepRef);
 			stateBuilder.addConstructorArgValue(task);
 		}
@@ -196,7 +196,7 @@ public class StepParser {
 	 * @param parserContext
 	 * @return the TaskletStep bean
 	 */
-	protected RootBeanDefinition parseChunkOriented(Element element, ParserContext parserContext) {
+	protected RootBeanDefinition parseChunk(Element element, ParserContext parserContext) {
 
     	RootBeanDefinition bd;
     	
@@ -237,30 +237,32 @@ public class StepParser {
         RuntimeBeanReference tx = new RuntimeBeanReference(transactionManager);
         bd.getPropertyValues().addPropertyValue("transactionManager", tx);
 
-        String commitInterval = element.getAttribute("commit-interval");
+        String commitInterval = element.getAttribute("chunk-size");
         if (StringUtils.hasText(commitInterval)) {
             bd.getPropertyValues().addPropertyValue("commitInterval", commitInterval);
         }
 
-        if (isFaultTolerant) {
-            String skipLimit = element.getAttribute("skip-limit");
-            if (StringUtils.hasText(skipLimit)) {
-                bd.getPropertyValues().addPropertyValue("skipLimit", skipLimit);
-            }
+        String skipLimit = element.getAttribute("skip-limit");
+        if (StringUtils.hasText(skipLimit)) {
+        	if (!isFaultTolerant) {
+				throw new BeanCreationException("skip-limit can only be specified if fault-tolerant is set to 'true'");
+        	}
+            bd.getPropertyValues().addPropertyValue("skipLimit", skipLimit);
         }
 
-        if (isFaultTolerant) {
-            String retryLimit = element.getAttribute("retry-limit");
-            if (StringUtils.hasText(retryLimit)) {
-                bd.getPropertyValues().addPropertyValue("retryLimit", retryLimit);
-            }
+        String retryLimit = element.getAttribute("retry-limit");
+        if (StringUtils.hasText(retryLimit)) {
+        	if (!isFaultTolerant) {
+				throw new BeanCreationException("retry-limit can only be specified if fault-tolerant is set to 'true'");
+        	}
+            bd.getPropertyValues().addPropertyValue("retryLimit", retryLimit);
         }
 
-        handleExceptionElement(element, bd, "skippable-exception-classes", "skippableExceptionClasses");
+        handleExceptionElement(element, bd, "skippable-exception-classes", "skippableExceptionClasses", isFaultTolerant);
         
-        handleExceptionElement(element, bd, "retryable-exception-classes", "retryableExceptionClasses");
+        handleExceptionElement(element, bd, "retryable-exception-classes", "retryableExceptionClasses",isFaultTolerant);
         
-        handleExceptionElement(element, bd, "fatal-exception-classes", "fatalExceptionClasses");
+        handleExceptionElement(element, bd, "fatal-exception-classes", "fatalExceptionClasses",isFaultTolerant);
 
         handleListenersElement(element, bd, parserContext);
         
@@ -271,10 +273,13 @@ public class StepParser {
 	}
 
 	private void handleExceptionElement(Element element, RootBeanDefinition bd, 
-			String attributeName, String propertyName) {
+			String attributeName, String propertyName, boolean isFaultTolerant) {
 		String exceptions = 
         	DomUtils.getChildElementValueByTagName(element, attributeName);
         if (StringUtils.hasLength(exceptions)) {
+        	if (!isFaultTolerant) {
+				throw new BeanCreationException(attributeName + " can only be specified if fault-tolerant is set to 'true'");
+        	}
 	        String[] exceptionArray = StringUtils.tokenizeToStringArray(
 	        		StringUtils.delete(exceptions, ","), "\n");
 	        if (exceptionArray.length > 0) {
diff --git a/spring-batch-core/src/main/resources/org/springframework/batch/core/configuration/xml/spring-batch-2.0.xsd b/spring-batch-core/src/main/resources/org/springframework/batch/core/configuration/xml/spring-batch-2.0.xsd
index 1b86334a0..1f1194c1e 100644
--- a/spring-batch-core/src/main/resources/org/springframework/batch/core/configuration/xml/spring-batch-2.0.xsd
+++ b/spring-batch-core/src/main/resources/org/springframework/batch/core/configuration/xml/spring-batch-2.0.xsd
@@ -175,10 +175,10 @@
 			<xsd:extension base="nextType">
 				<xsd:sequence>
 					<xsd:choice>
-						<xsd:element name="chunk-oriented" minOccurs="0" maxOccurs="1">
+						<xsd:element name="chunk" minOccurs="0" maxOccurs="1">
 							<xsd:complexType>
 								<xsd:complexContent>
-									<xsd:extension base="chunkOrientedType"/>
+									<xsd:extension base="chunkType"/>
 								</xsd:complexContent>
 							</xsd:complexType>
 						</xsd:element>
@@ -201,13 +201,6 @@
 			<xsd:extension base="beans:identifiedType">
 				<xsd:attributeGroup ref="jobRepository"/>
 				<xsd:attributeGroup ref="transactionManager"/>
-				<xsd:attribute name="commit-interval" type="xsd:integer" use="optional">
-					<xsd:annotation>
-						<xsd:documentation><![CDATA[
-						The number of items that will be processed before commit is called for the transaction.
-						]]></xsd:documentation>
-					</xsd:annotation>
-				</xsd:attribute>
 			</xsd:extension>
 		</xsd:complexContent>
 	</xsd:complexType>
@@ -226,7 +219,7 @@
 		</xsd:complexContent>
 	</xsd:complexType>
 
-	<xsd:complexType name="chunkOrientedType">
+	<xsd:complexType name="chunkType">
 		<xsd:complexContent>
 			<xsd:extension base="stepDefType">
 				<xsd:sequence>
@@ -283,6 +276,13 @@
 						</xsd:simpleType>
 					</xsd:element>
 				</xsd:sequence>
+				<xsd:attribute name="chunk-size" type="xsd:integer" use="required">
+					<xsd:annotation>
+						<xsd:documentation><![CDATA[
+						The number of items that will be processed before commit is called for the transaction.
+						]]></xsd:documentation>
+					</xsd:annotation>
+				</xsd:attribute>
 				<xsd:attribute name="fault-tolerant" type="xsd:boolean" default="false" use="optional">
 					<xsd:annotation>
 						<xsd:documentation><![CDATA[
diff --git a/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/xml/StepWithChunkOrientedJobParserTests.java b/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/xml/StepWithChunkJobParserTests.java
similarity index 97%
rename from spring-batch-core/src/test/java/org/springframework/batch/core/configuration/xml/StepWithChunkOrientedJobParserTests.java
rename to spring-batch-core/src/test/java/org/springframework/batch/core/configuration/xml/StepWithChunkJobParserTests.java
index 004d96911..74a6c7720 100644
--- a/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/xml/StepWithChunkOrientedJobParserTests.java
+++ b/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/xml/StepWithChunkJobParserTests.java
@@ -40,7 +40,7 @@ import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
  */
 @ContextConfiguration
 @RunWith(SpringJUnit4ClassRunner.class)
-public class StepWithChunkOrientedJobParserTests {
+public class StepWithChunkJobParserTests {
 	
 	@Autowired
 	private Job job;
diff --git a/spring-batch-core/src/test/resources/org/springframework/batch/core/configuration/xml/StepWithChunkOrientedJobParserTests-context.xml b/spring-batch-core/src/test/resources/org/springframework/batch/core/configuration/xml/StepWithChunkJobParserTests-context.xml
similarity index 86%
rename from spring-batch-core/src/test/resources/org/springframework/batch/core/configuration/xml/StepWithChunkOrientedJobParserTests-context.xml
rename to spring-batch-core/src/test/resources/org/springframework/batch/core/configuration/xml/StepWithChunkJobParserTests-context.xml
index 196fe08cf..159687878 100644
--- a/spring-batch-core/src/test/resources/org/springframework/batch/core/configuration/xml/StepWithChunkOrientedJobParserTests-context.xml
+++ b/spring-batch-core/src/test/resources/org/springframework/batch/core/configuration/xml/StepWithChunkJobParserTests-context.xml
@@ -8,13 +8,13 @@
 	
 	<job id="job">
 		<step name="step1">
-			<chunk-oriented reader="reader" processor="processor" writer="writer"
-					fault-tolerant="true" commit-interval="10" skip-limit="20" retry-limit="3">
+			<chunk reader="reader" processor="processor" writer="writer"
+					fault-tolerant="true" chunk-size="10" skip-limit="20" retry-limit="3">
 				<listeners>
 					<listener class="org.springframework.batch.core.configuration.xml.TestListener"/>
 					<listener ref="listener"/>
 				</listeners>
-			</chunk-oriented>
+			</chunk>
 		</step>
 	</job>