diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/document/mongodb/config/AbstractMongoConfiguration.java b/spring-data-mongodb/src/main/java/org/springframework/data/document/mongodb/config/AbstractMongoConfiguration.java
index 4c4f743b0..6ce624af9 100644
--- a/spring-data-mongodb/src/main/java/org/springframework/data/document/mongodb/config/AbstractMongoConfiguration.java
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/document/mongodb/config/AbstractMongoConfiguration.java
@@ -29,7 +29,7 @@ import org.springframework.data.document.mongodb.convert.MappingMongoConverter;
 import org.springframework.data.document.mongodb.mapping.Document;
 import org.springframework.data.document.mongodb.mapping.MongoMappingContext;
 import org.springframework.data.document.mongodb.mapping.MongoPersistentEntityIndexCreator;
-import org.springframework.data.document.mongodb.mapping.event.MappingEventListener;
+import org.springframework.data.document.mongodb.mapping.event.LoggingEventListener;
 import org.springframework.data.document.mongodb.mapping.event.MongoMappingEvent;
 import org.springframework.data.mapping.context.MappingContextAwareBeanPostProcessor;
 import org.springframework.util.ClassUtils;
@@ -50,11 +50,7 @@ public abstract class AbstractMongoConfiguration {
   public String getMappingBasePackage() { 
     return "";
   }
-  
-  @Bean
-  public MappingEventListener<MongoMappingEvent> mappingEventsListener() {
-    return new MappingEventListener<MongoMappingEvent>();
-  }
+ 
   
   @Bean
   public MongoMappingContext mongoMappingContext() throws ClassNotFoundException, LinkageError {
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/document/mongodb/mapping/event/MappingEventListener.java b/spring-data-mongodb/src/main/java/org/springframework/data/document/mongodb/mapping/event/LoggingEventListener.java
similarity index 95%
rename from spring-data-mongodb/src/main/java/org/springframework/data/document/mongodb/mapping/event/MappingEventListener.java
rename to spring-data-mongodb/src/main/java/org/springframework/data/document/mongodb/mapping/event/LoggingEventListener.java
index 7114561b7..cf37b14c0 100644
--- a/spring-data-mongodb/src/main/java/org/springframework/data/document/mongodb/mapping/event/MappingEventListener.java
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/document/mongodb/mapping/event/LoggingEventListener.java
@@ -23,7 +23,7 @@ import org.apache.commons.logging.LogFactory;
 /**
  * @author Jon Brisbin <jbrisbin@vmware.com>
  */
-public class MappingEventListener<MongoMappingEvent> extends AbstractMappingEventListener {
+public class LoggingEventListener<MongoMappingEvent> extends AbstractMappingEventListener {
 
   private Log log = LogFactory.getLog(getClass());
 
diff --git a/spring-data-mongodb/src/test/java/org/springframework/data/document/mongodb/GeoSpatialAppConfig.java b/spring-data-mongodb/src/test/java/org/springframework/data/document/mongodb/GeoSpatialAppConfig.java
index 1af00e463..dedec015f 100644
--- a/spring-data-mongodb/src/test/java/org/springframework/data/document/mongodb/GeoSpatialAppConfig.java
+++ b/spring-data-mongodb/src/test/java/org/springframework/data/document/mongodb/GeoSpatialAppConfig.java
@@ -18,6 +18,8 @@ package org.springframework.data.document.mongodb;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.data.document.mongodb.config.AbstractMongoConfiguration;
+import org.springframework.data.document.mongodb.mapping.event.LoggingEventListener;
+import org.springframework.data.document.mongodb.mapping.event.MongoMappingEvent;
 
 import com.mongodb.Mongo;
 
@@ -34,6 +36,11 @@ public class GeoSpatialAppConfig extends AbstractMongoConfiguration {
     return new MongoTemplate(mongo(), "geospatial", "newyork", mappingMongoConverter());
   }
   
+  @Bean
+  public LoggingEventListener<MongoMappingEvent> mappingEventsListener() {
+    return new LoggingEventListener<MongoMappingEvent>();
+  }
+  
 
   public String getMappingBasePackage() {
     return "org.springframework.data.document.mongodb";
diff --git a/spring-data-mongodb/src/test/resources/mapping.xml b/spring-data-mongodb/src/test/resources/mapping.xml
index 8873a1ef8..4dff919f5 100644
--- a/spring-data-mongodb/src/test/resources/mapping.xml
+++ b/spring-data-mongodb/src/test/resources/mapping.xml
@@ -15,6 +15,6 @@
     <constructor-arg ref="mappingConverter"/>
   </bean>
 
-  <bean class="org.springframework.data.document.mongodb.mapping.event.MappingEventListener"/>
+  <bean class="org.springframework.data.document.mongodb.mapping.event.LoggingEventListener"/>
 
 </beans>