diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/document/mongodb/config/MongoMappingConverterParser.java b/spring-data-mongodb/src/main/java/org/springframework/data/document/mongodb/config/MappingMongoConverterParser.java
similarity index 98%
rename from spring-data-mongodb/src/main/java/org/springframework/data/document/mongodb/config/MongoMappingConverterParser.java
rename to spring-data-mongodb/src/main/java/org/springframework/data/document/mongodb/config/MappingMongoConverterParser.java
index a66113959..2e0f6ddfe 100644
--- a/spring-data-mongodb/src/main/java/org/springframework/data/document/mongodb/config/MongoMappingConverterParser.java
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/document/mongodb/config/MappingMongoConverterParser.java
@@ -43,7 +43,7 @@ import org.w3c.dom.Element;
  * @author Jon Brisbin <jbrisbin@vmware.com>
  * @author Oliver Gierke
  */
-public class MongoMappingConverterParser extends AbstractBeanDefinitionParser {
+public class MappingMongoConverterParser extends AbstractBeanDefinitionParser {
 
 	static final String MAPPING_CONTEXT = "mappingContext";
 
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/document/mongodb/config/MongoRepositoryConfigDefinitionParser.java b/spring-data-mongodb/src/main/java/org/springframework/data/document/mongodb/config/MongoRepositoryConfigParser.java
similarity index 95%
rename from spring-data-mongodb/src/main/java/org/springframework/data/document/mongodb/config/MongoRepositoryConfigDefinitionParser.java
rename to spring-data-mongodb/src/main/java/org/springframework/data/document/mongodb/config/MongoRepositoryConfigParser.java
index c4f39da30..a102093f2 100644
--- a/spring-data-mongodb/src/main/java/org/springframework/data/document/mongodb/config/MongoRepositoryConfigDefinitionParser.java
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/document/mongodb/config/MongoRepositoryConfigParser.java
@@ -30,11 +30,11 @@ import org.w3c.dom.Element;
  *
  * @author Oliver Gierke
  */
-public class MongoRepositoryConfigDefinitionParser
+public class MongoRepositoryConfigParser
     extends
     AbstractRepositoryConfigDefinitionParser<SimpleMongoRepositoryConfiguration, MongoRepositoryConfiguration> {
   
-  private static final String MAPPING_CONTEXT_DEFAULT = MongoMappingConverterParser.MAPPING_CONTEXT;
+  private static final String MAPPING_CONTEXT_DEFAULT = MappingMongoConverterParser.MAPPING_CONTEXT;
   
   /*
   * (non-Javadoc)
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/document/mongodb/config/MongoRepositoryNamespaceHandler.java b/spring-data-mongodb/src/main/java/org/springframework/data/document/mongodb/config/MongoRepositoryNamespaceHandler.java
index 120c1940a..67c42d644 100644
--- a/spring-data-mongodb/src/main/java/org/springframework/data/document/mongodb/config/MongoRepositoryNamespaceHandler.java
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/document/mongodb/config/MongoRepositoryNamespaceHandler.java
@@ -33,8 +33,8 @@ public class MongoRepositoryNamespaceHandler extends NamespaceHandlerSupport {
   */
   public void init() {
 
-    registerBeanDefinitionParser("repositories", new MongoRepositoryConfigDefinitionParser());
-    registerBeanDefinitionParser("mapping-converter", new MongoMappingConverterParser());
+    registerBeanDefinitionParser("repositories", new MongoRepositoryConfigParser());
+    registerBeanDefinitionParser("mapping-converter", new MappingMongoConverterParser());
     registerBeanDefinitionParser("mongo", new MongoParser());
     registerBeanDefinitionParser("jmx", new MongoJmxParser());
   }