diff --git a/maven-core/src/main/java/org/apache/maven/toolchain/java/DefaultJavaToolchainFactory.java b/maven-core/src/main/java/org/apache/maven/toolchain/java/JavaToolchainFactory.java
similarity index 94%
rename from maven-core/src/main/java/org/apache/maven/toolchain/java/DefaultJavaToolchainFactory.java
rename to maven-core/src/main/java/org/apache/maven/toolchain/java/JavaToolchainFactory.java
index d95f2fe9c1..f47a3d02f4 100644
--- a/maven-core/src/main/java/org/apache/maven/toolchain/java/DefaultJavaToolchainFactory.java
+++ b/maven-core/src/main/java/org/apache/maven/toolchain/java/JavaToolchainFactory.java
@@ -36,12 +36,14 @@ import org.codehaus.plexus.util.xml.Xpp3Dom;
 
 /**
  * JDK toolchain factory.
+ * This is a <code>ToolchainFactory</code> Plexus component registered with
+ * <code>jdk</code> hint.
  * 
  * @author mkleint
- * @since 2.0.9
+ * @since 2.0.9, renamed from <code>DefaultJavaToolchainFactory</code> in 3.2.4
  */
 @Component( role = ToolchainFactory.class, hint = "jdk" )
-public class DefaultJavaToolchainFactory
+public class JavaToolchainFactory
     implements ToolchainFactory
 {
 
diff --git a/maven-core/src/site/apt/index.apt b/maven-core/src/site/apt/index.apt
index f44c7560df..d847b0d363 100644
--- a/maven-core/src/site/apt/index.apt
+++ b/maven-core/src/site/apt/index.apt
@@ -69,7 +69,7 @@ Maven Core
  with its <<<DefaultToolchainManagerPrivate>>> implementation ({{{./xref/org/apache/maven/toolchain/DefaultToolchainManagerPrivate.html}source}}),
  to manage toolchain selection,
 
- * <<<JavaToolchain>>> component ({{{./apidocs/org/apache/maven/toolchain/java/JavaToolchain.html}javadoc}}),
+ * <<<JavaToolchain>>> interface ({{{./apidocs/org/apache/maven/toolchain/java/JavaToolchain.html}javadoc}}),
  with its <<<DefaultJavaToolchain>>> implementation
- ({{{./xref/org/apache/maven/toolchain/java/DefaultJavaToolchain.html}source}}) and <<<DefaultJavaToolchainFactory>>>
- factory ({{{./xref/org/apache/maven/toolchain/java/DefaultJavaToolchainFactory.html}source}}).
+ ({{{./xref/org/apache/maven/toolchain/java/DefaultJavaToolchain.html}source}}) and <<<JavaToolchainFactory>>>
+ factory ({{{./xref/org/apache/maven/toolchain/java/JavaToolchainFactory.html}source}}).