diff --git a/org.springframework.context/src/main/java/org/springframework/scheduling/config/SchedulingNamespaceHandler.java b/org.springframework.context/src/main/java/org/springframework/scheduling/config/ConcurrentNamespaceHandler.java
similarity index 88%
rename from org.springframework.context/src/main/java/org/springframework/scheduling/config/SchedulingNamespaceHandler.java
rename to org.springframework.context/src/main/java/org/springframework/scheduling/config/ConcurrentNamespaceHandler.java
index 178bcf520d..0238c34ecd 100644
--- a/org.springframework.context/src/main/java/org/springframework/scheduling/config/SchedulingNamespaceHandler.java
+++ b/org.springframework.context/src/main/java/org/springframework/scheduling/config/ConcurrentNamespaceHandler.java
@@ -19,12 +19,12 @@ package org.springframework.scheduling.config;
 import org.springframework.beans.factory.xml.NamespaceHandlerSupport;
 
 /**
- * <code>NamespaceHandler</code> for the scheduling namespace. 
+ * <code>NamespaceHandler</code> for the 'concurrent' namespace. 
  * 
  * @author Mark Fisher
  * @since 3.0
  */
-public class SchedulingNamespaceHandler extends NamespaceHandlerSupport {
+public class ConcurrentNamespaceHandler extends NamespaceHandlerSupport {
 
 	public void init() {
 		this.registerBeanDefinitionParser("scheduled-tasks", new ScheduledTasksBeanDefinitionParser());
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 3fbbb2e367..b6ea1f1e83 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/scheduling=org.springframework.scheduling.config.SchedulingNamespaceHandler
+http\://www.springframework.org/schema/concurrent=org.springframework.scheduling.config.ConcurrentNamespaceHandler
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 10f3eec9e1..f14eaee717 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/scheduling/spring-scheduling-3.0.xsd=org/springframework/scheduling/config/spring-scheduling-3.0.xsd
-http\://www.springframework.org/schema/scheduling/spring-scheduling.xsd=org/springframework/scheduling/config/spring-scheduling-3.0.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
diff --git a/org.springframework.context/src/main/resources/org/springframework/scheduling/config/spring-scheduling-3.0.xsd b/org.springframework.context/src/main/resources/org/springframework/scheduling/config/spring-concurrent-3.0.xsd
similarity index 94%
rename from org.springframework.context/src/main/resources/org/springframework/scheduling/config/spring-scheduling-3.0.xsd
rename to org.springframework.context/src/main/resources/org/springframework/scheduling/config/spring-concurrent-3.0.xsd
index 86fd2bd316..c27efc8be6 100644
--- a/org.springframework.context/src/main/resources/org/springframework/scheduling/config/spring-scheduling-3.0.xsd
+++ b/org.springframework.context/src/main/resources/org/springframework/scheduling/config/spring-concurrent-3.0.xsd
@@ -1,16 +1,16 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 
-<xsd:schema xmlns="http://www.springframework.org/schema/scheduling"
+<xsd:schema xmlns="http://www.springframework.org/schema/concurrent"
 		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/scheduling"
+		targetNamespace="http://www.springframework.org/schema/concurrent"
 		elementFormDefault="qualified"
 		attributeFormDefault="unqualified">
 
 	<xsd:annotation>
 		<xsd:documentation><![CDATA[
-	Defines the elements used in the Spring Framework's scheduling support.
+	Defines the elements used in the Spring Framework's support for task execution and scheduling.
 		]]></xsd:documentation>
 	</xsd:annotation>