diff --git a/org.springframework.integration/src/main/java/org/springframework/integration/config/xml/ApplicationEventMulticasterParser.java b/org.springframework.integration/src/main/java/org/springframework/integration/config/xml/ApplicationEventMulticasterParser.java
index e6a971a820..db1927a324 100644
--- a/org.springframework.integration/src/main/java/org/springframework/integration/config/xml/ApplicationEventMulticasterParser.java
+++ b/org.springframework.integration/src/main/java/org/springframework/integration/config/xml/ApplicationEventMulticasterParser.java
@@ -57,7 +57,7 @@ public class ApplicationEventMulticasterParser extends AbstractSingleBeanDefinit
 			builder.addPropertyReference("taskExecutor", taskExecutorRef);
 		}
 		else {
-			TaskExecutor taskExecutor = IntegrationContextUtils.createTaskExecutor(1, 10, 0, "event-multicaster-");
+			TaskExecutor taskExecutor = IntegrationContextUtils.createThreadPoolTaskExecutor(1, 10, 0, "event-multicaster-");
 			builder.addPropertyValue("taskExecutor", taskExecutor);
 		}
 		builder.addPropertyValue("collectionClass", CopyOnWriteArraySet.class);
diff --git a/org.springframework.integration/src/main/java/org/springframework/integration/config/xml/IntegrationNamespaceHandler.java b/org.springframework.integration/src/main/java/org/springframework/integration/config/xml/IntegrationNamespaceHandler.java
index cd0b9bd7d0..73f6d43abf 100644
--- a/org.springframework.integration/src/main/java/org/springframework/integration/config/xml/IntegrationNamespaceHandler.java
+++ b/org.springframework.integration/src/main/java/org/springframework/integration/config/xml/IntegrationNamespaceHandler.java
@@ -77,7 +77,7 @@ public class IntegrationNamespaceHandler implements NamespaceHandler {
 		}
 		TaskExecutor taskExecutor = null;
 		if (!registry.containsBeanDefinition(IntegrationContextUtils.TASK_SCHEDULER_BEAN_NAME)) {
-			taskExecutor = IntegrationContextUtils.createTaskExecutor(2, 100, 0, "task-scheduler-");
+			taskExecutor = IntegrationContextUtils.createThreadPoolTaskExecutor(2, 100, 0, "task-scheduler-");
 			BeanDefinitionBuilder schedulerBuilder = BeanDefinitionBuilder.genericBeanDefinition(SimpleTaskScheduler.class);
 			schedulerBuilder.addConstructorArgValue(taskExecutor);
 			BeanDefinitionBuilder errorHandlerBuilder = BeanDefinitionBuilder.genericBeanDefinition(MessagePublishingErrorHandler.class);
@@ -111,7 +111,7 @@ public class IntegrationNamespaceHandler implements NamespaceHandler {
 			registerBeanDefinitionParser("selector-chain", new SelectorChainParser());
 			registerBeanDefinitionParser("annotation-config", new AnnotationConfigParser());
 			registerBeanDefinitionParser("application-event-multicaster", new ApplicationEventMulticasterParser());
-			registerBeanDefinitionParser("thread-pool-task-executor", new PoolExecutorParser());
+			registerBeanDefinitionParser("thread-pool-task-executor", new ThreadPoolTaskExecutorParser());
 		}
 	}
 
diff --git a/org.springframework.integration/src/main/java/org/springframework/integration/config/xml/PoolExecutorParser.java b/org.springframework.integration/src/main/java/org/springframework/integration/config/xml/ThreadPoolTaskExecutorParser.java
similarity index 96%
rename from org.springframework.integration/src/main/java/org/springframework/integration/config/xml/PoolExecutorParser.java
rename to org.springframework.integration/src/main/java/org/springframework/integration/config/xml/ThreadPoolTaskExecutorParser.java
index bc4a7af2e9..8d660496e6 100644
--- a/org.springframework.integration/src/main/java/org/springframework/integration/config/xml/PoolExecutorParser.java
+++ b/org.springframework.integration/src/main/java/org/springframework/integration/config/xml/ThreadPoolTaskExecutorParser.java
@@ -28,7 +28,7 @@ import org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor;
 /**
  * @author Mark Fisher
  */
-public class PoolExecutorParser extends AbstractSimpleBeanDefinitionParser {
+public class ThreadPoolTaskExecutorParser extends AbstractSimpleBeanDefinitionParser {
 
 	private static final String REJECTION_POLICY_ATTRIBUTE = "rejection-policy";
 
diff --git a/org.springframework.integration/src/main/java/org/springframework/integration/context/IntegrationContextUtils.java b/org.springframework.integration/src/main/java/org/springframework/integration/context/IntegrationContextUtils.java
index 1a20798e95..b3c44c52af 100644
--- a/org.springframework.integration/src/main/java/org/springframework/integration/context/IntegrationContextUtils.java
+++ b/org.springframework.integration/src/main/java/org/springframework/integration/context/IntegrationContextUtils.java
@@ -19,7 +19,6 @@ package org.springframework.integration.context;
 import java.util.concurrent.ThreadPoolExecutor.CallerRunsPolicy;
 
 import org.springframework.beans.factory.BeanFactory;
-import org.springframework.core.task.TaskExecutor;
 import org.springframework.integration.core.MessageChannel;
 import org.springframework.integration.scheduling.TaskScheduler;
 import org.springframework.scheduling.concurrent.CustomizableThreadFactory;
@@ -62,7 +61,7 @@ public abstract class IntegrationContextUtils {
 		return (T) bean;
 	}
 
-	public static TaskExecutor createTaskExecutor(int coreSize, int maxSize, int queueCapacity, String threadPrefix) {
+	public static ThreadPoolTaskExecutor createThreadPoolTaskExecutor(int coreSize, int maxSize, int queueCapacity, String threadPrefix) {
 		ThreadPoolTaskExecutor executor = new ThreadPoolTaskExecutor();
 		executor.setCorePoolSize(coreSize);
 		executor.setMaxPoolSize(maxSize);