diff --git a/org.springframework.context/src/main/java/org/springframework/scheduling/annotation/AbstractAsyncConfiguration.java b/org.springframework.context/src/main/java/org/springframework/scheduling/annotation/AbstractAsyncConfiguration.java
index 903deebec96dc21003636743eec6ba9ed30111d3..1339998d481274bd55fa60b32e8d9eac947c44c1 100644
--- a/org.springframework.context/src/main/java/org/springframework/scheduling/annotation/AbstractAsyncConfiguration.java
+++ b/org.springframework.context/src/main/java/org/springframework/scheduling/annotation/AbstractAsyncConfiguration.java
@@ -68,6 +68,6 @@ public abstract class AbstractAsyncConfiguration implements ImportAware {
 		}
 
 		AsyncConfigurer configurer = configurers.iterator().next();
-		this.executor = configurer.getExecutor();
+		this.executor = configurer.getAsyncExecutor();
 	}
 }
diff --git a/org.springframework.context/src/main/java/org/springframework/scheduling/annotation/AsyncConfigurer.java b/org.springframework.context/src/main/java/org/springframework/scheduling/annotation/AsyncConfigurer.java
index a7b026c0dbc69ce28fc54a666b676fb7bac5729d..537c804eda427fe50edb78fa65e92e03069e93ed 100644
--- a/org.springframework.context/src/main/java/org/springframework/scheduling/annotation/AsyncConfigurer.java
+++ b/org.springframework.context/src/main/java/org/springframework/scheduling/annotation/AsyncConfigurer.java
@@ -36,6 +36,6 @@ public interface AsyncConfigurer {
 	 * The {@link Executor} instance to be used when processing async
 	 * method invocations.
 	 */
-	Executor getExecutor();
+	Executor getAsyncExecutor();
 
 }
diff --git a/org.springframework.context/src/main/java/org/springframework/scheduling/annotation/EnableAsync.java b/org.springframework.context/src/main/java/org/springframework/scheduling/annotation/EnableAsync.java
index 3749bc038385ba0698ee56e63e1eec0dd9220425..4b73c69be731336e329e5f917e579cab8199e9aa 100644
--- a/org.springframework.context/src/main/java/org/springframework/scheduling/annotation/EnableAsync.java
+++ b/org.springframework.context/src/main/java/org/springframework/scheduling/annotation/EnableAsync.java
@@ -23,6 +23,7 @@ import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
 
+import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Import;
 import org.springframework.context.config.AdviceMode;
 import org.springframework.core.Ordered;
@@ -52,7 +53,7 @@ import org.springframework.core.Ordered;
  * SimpleAsyncTaskExecutor} will be used to process async method invocations. To
  * customize this behavior, implement {@link AsyncConfigurer} and
  * provide your own {@link java.util.concurrent.Executor Executor} through the
- * {@link AsyncConfigurer#getExecutor() getExecutor()} method.
+ * {@link AsyncConfigurer#getAsyncExecutor() getExecutor()} method.
  *
  * <pre class="code">
  * &#064;Configuration
@@ -64,7 +65,8 @@ import org.springframework.core.Ordered;
  *         return new MyAsyncBean();
  *     }
  *
- *     public Executor getExecutor() {
+ *     &#064;Override
+ *     public Executor getAsyncExecutor() {
  *         ThreadPoolTaskExecutor executor = new ThreadPoolTaskExecutor();
  *         executor.setThreadNamePrefix("Custom-");
  *         executor.initialize();
diff --git a/org.springframework.context/src/test/java/org/springframework/scheduling/annotation/EnableAsyncTests.java b/org.springframework.context/src/test/java/org/springframework/scheduling/annotation/EnableAsyncTests.java
index 8a4ca9ce863d5886c69c7610ec20f1e898f6f085..8a79ddddf09c4f46712c95fdcc25b890446399fe 100644
--- a/org.springframework.context/src/test/java/org/springframework/scheduling/annotation/EnableAsyncTests.java
+++ b/org.springframework.context/src/test/java/org/springframework/scheduling/annotation/EnableAsyncTests.java
@@ -200,7 +200,7 @@ public class EnableAsyncTests {
 			return new AsyncBean();
 		}
 
-		public Executor getExecutor() {
+		public Executor getAsyncExecutor() {
 			ThreadPoolTaskExecutor executor = new ThreadPoolTaskExecutor();
 			executor.setThreadNamePrefix("Custom-");
 			executor.initialize();