diff --git a/spring-binding/src/main/java/org/springframework/binding/format/registry/DefaultFormatterRegistry.java b/spring-binding/src/main/java/org/springframework/binding/format/registry/DefaultFormatterRegistry.java
index 8e869a66..b2acbb8b 100644
--- a/spring-binding/src/main/java/org/springframework/binding/format/registry/DefaultFormatterRegistry.java
+++ b/spring-binding/src/main/java/org/springframework/binding/format/registry/DefaultFormatterRegistry.java
@@ -10,7 +10,7 @@ import org.springframework.binding.format.formatters.BooleanFormatter;
 import org.springframework.binding.format.formatters.DateFormatter;
 import org.springframework.binding.format.formatters.NumberFormatter;
 
-public class DefaultFormatterRegistry extends FormatterRegistryImpl {
+public class DefaultFormatterRegistry extends GenericFormatterRegistry {
 
 	/**
 	 * A singleton shared instance. Should never be modified.
diff --git a/spring-binding/src/main/java/org/springframework/binding/format/registry/FormatterRegistryImpl.java b/spring-binding/src/main/java/org/springframework/binding/format/registry/GenericFormatterRegistry.java
similarity index 98%
rename from spring-binding/src/main/java/org/springframework/binding/format/registry/FormatterRegistryImpl.java
rename to spring-binding/src/main/java/org/springframework/binding/format/registry/GenericFormatterRegistry.java
index d34d0754..87c5d6a6 100644
--- a/spring-binding/src/main/java/org/springframework/binding/format/registry/FormatterRegistryImpl.java
+++ b/spring-binding/src/main/java/org/springframework/binding/format/registry/GenericFormatterRegistry.java
@@ -29,7 +29,7 @@ import org.springframework.util.Assert;
  * 
  * @author Keith Donald
  */
-public class FormatterRegistryImpl implements FormatterRegistry {
+public class GenericFormatterRegistry implements FormatterRegistry {
 
 	private Map formattersById = new HashMap();
 
diff --git a/spring-binding/src/test/java/org/springframework/binding/format/impl/FormatterRegistryImplTests.java b/spring-binding/src/test/java/org/springframework/binding/format/impl/FormatterRegistryImplTests.java
index 92c2fd57..629913cf 100644
--- a/spring-binding/src/test/java/org/springframework/binding/format/impl/FormatterRegistryImplTests.java
+++ b/spring-binding/src/test/java/org/springframework/binding/format/impl/FormatterRegistryImplTests.java
@@ -7,11 +7,11 @@ import junit.framework.TestCase;
 import org.springframework.binding.format.Formatter;
 import org.springframework.binding.format.InvalidFormatException;
 import org.springframework.binding.format.formatters.NumberFormatter;
-import org.springframework.binding.format.registry.FormatterRegistryImpl;
+import org.springframework.binding.format.registry.GenericFormatterRegistry;
 
 public class FormatterRegistryImplTests extends TestCase {
 
-	FormatterRegistryImpl registry = new FormatterRegistryImpl();
+	GenericFormatterRegistry registry = new GenericFormatterRegistry();
 
 	public void testRegisterAndGetFormatter() {
 		registry.registerFormatter(Integer.class, new NumberFormatter(Integer.class));