diff --git a/org.springframework.context/src/main/java/org/springframework/scheduling/config/TaskSchedulerBeanDefinitionParser.java b/org.springframework.context/src/main/java/org/springframework/scheduling/config/SchedulerBeanDefinitionParser.java
similarity index 88%
rename from org.springframework.context/src/main/java/org/springframework/scheduling/config/TaskSchedulerBeanDefinitionParser.java
rename to org.springframework.context/src/main/java/org/springframework/scheduling/config/SchedulerBeanDefinitionParser.java
index 4017bfcf3e..274b84b631 100644
--- a/org.springframework.context/src/main/java/org/springframework/scheduling/config/TaskSchedulerBeanDefinitionParser.java
+++ b/org.springframework.context/src/main/java/org/springframework/scheduling/config/SchedulerBeanDefinitionParser.java
@@ -23,12 +23,12 @@ import org.springframework.beans.factory.xml.AbstractSingleBeanDefinitionParser;
 import org.springframework.util.StringUtils;
 
 /**
- * Parser for the 'task-scheduler' element of the scheduling namespace.
+ * Parser for the 'scheduler' element of the 'task' namespace.
  * 
  * @author Mark Fisher
  * @since 3.0
  */
-public class TaskSchedulerBeanDefinitionParser extends AbstractSingleBeanDefinitionParser {
+public class SchedulerBeanDefinitionParser extends AbstractSingleBeanDefinitionParser {
 
 	@Override
 	protected String getBeanClassName(Element element) {
diff --git a/org.springframework.context/src/main/java/org/springframework/scheduling/config/ConcurrentNamespaceHandler.java b/org.springframework.context/src/main/java/org/springframework/scheduling/config/TaskNamespaceHandler.java
similarity index 79%
rename from org.springframework.context/src/main/java/org/springframework/scheduling/config/ConcurrentNamespaceHandler.java
rename to org.springframework.context/src/main/java/org/springframework/scheduling/config/TaskNamespaceHandler.java
index 0238c34ecd..849b36f57f 100644
--- a/org.springframework.context/src/main/java/org/springframework/scheduling/config/ConcurrentNamespaceHandler.java
+++ b/org.springframework.context/src/main/java/org/springframework/scheduling/config/TaskNamespaceHandler.java
@@ -19,16 +19,16 @@ package org.springframework.scheduling.config;
 import org.springframework.beans.factory.xml.NamespaceHandlerSupport;
 
 /**
- * <code>NamespaceHandler</code> for the 'concurrent' namespace. 
+ * <code>NamespaceHandler</code> for the 'task' namespace. 
  * 
  * @author Mark Fisher
  * @since 3.0
  */
-public class ConcurrentNamespaceHandler extends NamespaceHandlerSupport {
+public class TaskNamespaceHandler extends NamespaceHandlerSupport {
 
 	public void init() {
 		this.registerBeanDefinitionParser("scheduled-tasks", new ScheduledTasksBeanDefinitionParser());
-		this.registerBeanDefinitionParser("task-scheduler", new TaskSchedulerBeanDefinitionParser());
+		this.registerBeanDefinitionParser("scheduler", new SchedulerBeanDefinitionParser());
 	}
 
 }
diff --git a/org.springframework.context/src/main/resources/META-INF/spring.handlers b/org.springframework.context/src/main/resources/META-INF/spring.handlers
index b6ea1f1e83..ffb273840d 100644
--- a/org.springframework.context/src/main/resources/META-INF/spring.handlers
+++ b/org.springframework.context/src/main/resources/META-INF/spring.handlers
@@ -1,4 +1,4 @@
 http\://www.springframework.org/schema/context=org.springframework.context.config.ContextNamespaceHandler
 http\://www.springframework.org/schema/jee=org.springframework.ejb.config.JeeNamespaceHandler
 http\://www.springframework.org/schema/lang=org.springframework.scripting.config.LangNamespaceHandler
-http\://www.springframework.org/schema/concurrent=org.springframework.scheduling.config.ConcurrentNamespaceHandler
+http\://www.springframework.org/schema/task=org.springframework.scheduling.config.TaskNamespaceHandler
diff --git a/org.springframework.context/src/main/resources/META-INF/spring.schemas b/org.springframework.context/src/main/resources/META-INF/spring.schemas
index f14eaee717..673fb91638 100644
--- a/org.springframework.context/src/main/resources/META-INF/spring.schemas
+++ b/org.springframework.context/src/main/resources/META-INF/spring.schemas
@@ -6,5 +6,5 @@ http\://www.springframework.org/schema/jee/spring-jee.xsd=org/springframework/ej
 http\://www.springframework.org/schema/lang/spring-lang-2.0.xsd=org/springframework/scripting/config/spring-lang-2.0.xsd
 http\://www.springframework.org/schema/lang/spring-lang-2.5.xsd=org/springframework/scripting/config/spring-lang-2.5.xsd
 http\://www.springframework.org/schema/lang/spring-lang.xsd=org/springframework/scripting/config/spring-lang-2.5.xsd
-http\://www.springframework.org/schema/concurrent/spring-concurrent-3.0.xsd=org/springframework/scheduling/config/spring-concurrent-3.0.xsd
-http\://www.springframework.org/schema/concurrent/spring-concurrent.xsd=org/springframework/scheduling/config/spring-concurrent-3.0.xsd
+http\://www.springframework.org/schema/task/spring-task-3.0.xsd=org/springframework/scheduling/config/spring-task-3.0.xsd
+http\://www.springframework.org/schema/task/spring-task.xsd=org/springframework/scheduling/config/spring-task-3.0.xsd
diff --git a/org.springframework.context/src/main/resources/org/springframework/scheduling/config/spring-concurrent-3.0.xsd b/org.springframework.context/src/main/resources/org/springframework/scheduling/config/spring-task-3.0.xsd
similarity index 96%
rename from org.springframework.context/src/main/resources/org/springframework/scheduling/config/spring-concurrent-3.0.xsd
rename to org.springframework.context/src/main/resources/org/springframework/scheduling/config/spring-task-3.0.xsd
index c27efc8be6..79a52e2888 100644
--- a/org.springframework.context/src/main/resources/org/springframework/scheduling/config/spring-concurrent-3.0.xsd
+++ b/org.springframework.context/src/main/resources/org/springframework/scheduling/config/spring-task-3.0.xsd
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 
-<xsd:schema xmlns="http://www.springframework.org/schema/concurrent"
+<xsd:schema xmlns="http://www.springframework.org/schema/task"
 		xmlns:xsd="http://www.w3.org/2001/XMLSchema"
 		xmlns:beans="http://www.springframework.org/schema/beans"
 		xmlns:tool="http://www.springframework.org/schema/tool"
-		targetNamespace="http://www.springframework.org/schema/concurrent"
+		targetNamespace="http://www.springframework.org/schema/task"
 		elementFormDefault="qualified"
 		attributeFormDefault="unqualified">
 
@@ -17,7 +17,7 @@
 	<xsd:import namespace="http://www.springframework.org/schema/beans"/>
 	<xsd:import namespace="http://www.springframework.org/schema/tool"/>
 
-	<xsd:element name="task-scheduler">
+	<xsd:element name="scheduler">
 		<xsd:annotation>
 			<xsd:documentation><![CDATA[
 	Defines a ThreadPoolTaskScheduler instance with configurable pool size.