diff --git a/org.springframework.context/src/main/java/org/springframework/format/support/FormattingConversionService.java b/org.springframework.context/src/main/java/org/springframework/format/support/FormattingConversionService.java
index 24b64ec8285..7f37f3d011b 100644
--- a/org.springframework.context/src/main/java/org/springframework/format/support/FormattingConversionService.java
+++ b/org.springframework.context/src/main/java/org/springframework/format/support/FormattingConversionService.java
@@ -73,8 +73,8 @@ public class FormattingConversionService extends GenericConversionService
 				public Class<?>[][] getConvertibleTypes() {
 					return new Class<?>[][] {{fieldType, String.class}};
 				}
-				public boolean matches(TypeDescriptor sourceFieldType, TypeDescriptor targetFieldType) {
-					return (sourceFieldType.getAnnotation(annotationType) != null);
+				public boolean matches(TypeDescriptor sourceType, TypeDescriptor targetType) {
+					return (sourceType.getAnnotation(annotationType) != null);
 				}
 				public Object convert(Object source, TypeDescriptor sourceType, TypeDescriptor targetType) {
 					Printer<?> printer = annotationFormatterFactory.getPrinter(sourceType.getAnnotation(annotationType), sourceType.getType());
@@ -89,8 +89,8 @@ public class FormattingConversionService extends GenericConversionService
 				public Class<?>[][] getConvertibleTypes() {
 					return new Class<?>[][] {{String.class, fieldType}};
 				}
-				public boolean matches(TypeDescriptor sourceFieldType, TypeDescriptor targetFieldType) {
-					return (targetFieldType.getAnnotation(annotationType) != null);
+				public boolean matches(TypeDescriptor sourceType, TypeDescriptor targetType) {
+					return (targetType.getAnnotation(annotationType) != null);
 				}
 				public Object convert(Object source, TypeDescriptor sourceType, TypeDescriptor targetType) {
 					Parser<?> parser = annotationFormatterFactory.getParser(targetType.getAnnotation(annotationType), targetType.getType());
diff --git a/org.springframework.core/src/main/java/org/springframework/core/convert/support/ConversionServiceFactory.java b/org.springframework.core/src/main/java/org/springframework/core/convert/support/ConversionServiceFactory.java
index 0434ea78216..9e438b26a85 100644
--- a/org.springframework.core/src/main/java/org/springframework/core/convert/support/ConversionServiceFactory.java
+++ b/org.springframework.core/src/main/java/org/springframework/core/convert/support/ConversionServiceFactory.java
@@ -16,11 +16,9 @@
 
 package org.springframework.core.convert.support;
 
-import org.springframework.core.convert.ConversionService;
-import org.springframework.core.convert.converter.ConverterRegistry;
 
 /**
- * A factory for creating common ConversionService configurations.
+ * A factory for common ConversionService configurations.
  *
  * @author Keith Donald
  * @author Juergen Hoeller
@@ -31,7 +29,7 @@ public abstract class ConversionServiceFactory {
 	/**
 	 * Create a new default ConversionService instance that can be safely modified.
 	 */
-	public static ConversionService createDefaultConversionService() {
+	public static GenericConversionService createDefaultConversionService() {
 		GenericConversionService conversionService = new GenericConversionService();
 		addDefaultConverters(conversionService);
 		return conversionService;
@@ -39,7 +37,6 @@ public abstract class ConversionServiceFactory {
 
 	/**
 	 * Populate the given ConversionService instance with all applicable default converters.
-	 * Callers may cast the returned ConversionService to a {@link ConverterRegistry} to supplement or override the default converters. 
 	 */
 	public static void addDefaultConverters(GenericConversionService conversionService) {
 		conversionService.addGenericConverter(new ArrayToArrayConverter(conversionService));