diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/document/mongodb/config/MappingMongoConverterParser.java b/spring-data-mongodb/src/main/java/org/springframework/data/document/mongodb/config/MappingMongoConverterParser.java
index 69c9a46eb..21fe7deeb 100644
--- a/spring-data-mongodb/src/main/java/org/springframework/data/document/mongodb/config/MappingMongoConverterParser.java
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/document/mongodb/config/MappingMongoConverterParser.java
@@ -125,7 +125,7 @@ public class MappingMongoConverterParser extends AbstractBeanDefinitionParser {
 					converterBeans.add(parseConverter(listenerElement, parserContext));
 				}
 			}
-			converterBuilder.addPropertyValue("converters", converterBeans);
+			converterBuilder.addPropertyValue("customConverters", converterBeans);
 		}
 
 		return converterBuilder.getBeanDefinition();
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/document/mongodb/convert/MappingMongoConverter.java b/spring-data-mongodb/src/main/java/org/springframework/data/document/mongodb/convert/MappingMongoConverter.java
index 9e539978b..0c97dee72 100644
--- a/spring-data-mongodb/src/main/java/org/springframework/data/document/mongodb/convert/MappingMongoConverter.java
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/document/mongodb/convert/MappingMongoConverter.java
@@ -113,7 +113,7 @@ public class MappingMongoConverter extends AbstractMongoConverter implements App
 	 * 
 	 * @param converters
 	 */
-	public void setConverters(List<Converter<?, ?>> converters) {
+	public void setCustomConverters(List<Converter<?, ?>> converters) {
 		if (null != converters) {
 			for (Converter<?, ?> c : converters) {
 				registerConverter(c);
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/document/mongodb/convert/SimpleMongoConverter.java b/spring-data-mongodb/src/main/java/org/springframework/data/document/mongodb/convert/SimpleMongoConverter.java
index 7bae4b1ca..f0dcbed1c 100644
--- a/spring-data-mongodb/src/main/java/org/springframework/data/document/mongodb/convert/SimpleMongoConverter.java
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/document/mongodb/convert/SimpleMongoConverter.java
@@ -171,7 +171,7 @@ public class SimpleMongoConverter extends AbstractMongoConverter implements Init
 	 * 
 	 * @param converters
 	 */
-	public void setConverters(Set<?> converters) {
+	public void setCustomConverters(List<Converter<?, ?>> converters) {
 		for (Object converter : converters) {
 			boolean added = false;
 			if (converter instanceof Converter) {
diff --git a/spring-data-mongodb/src/test/java/org/springframework/data/document/mongodb/SimpleMongoConverterTests.java b/spring-data-mongodb/src/test/java/org/springframework/data/document/mongodb/SimpleMongoConverterTests.java
index 4b099d367..80c24c58b 100644
--- a/spring-data-mongodb/src/test/java/org/springframework/data/document/mongodb/SimpleMongoConverterTests.java
+++ b/spring-data-mongodb/src/test/java/org/springframework/data/document/mongodb/SimpleMongoConverterTests.java
@@ -15,22 +15,22 @@
  */
 package org.springframework.data.document.mongodb;
 
-import static org.hamcrest.Matchers.*;
-import static org.junit.Assert.*;
+import static org.hamcrest.Matchers.is;
+import static org.hamcrest.Matchers.notNullValue;
+import static org.hamcrest.Matchers.nullValue;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertThat;
+import static org.junit.Assert.assertTrue;
 
 import java.lang.reflect.Field;
 import java.math.BigInteger;
+import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Date;
 import java.util.HashMap;
-import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
-import java.util.Set;
-
-import com.mongodb.BasicDBObject;
-import com.mongodb.DBObject;
-import com.mongodb.util.JSON;
 
 import org.hamcrest.CoreMatchers;
 import org.joda.time.LocalDate;
@@ -42,6 +42,10 @@ import org.springframework.data.document.mongodb.SomeEnumTest.StringEnum;
 import org.springframework.data.document.mongodb.convert.SimpleMongoConverter;
 import org.springframework.util.ReflectionUtils;
 
+import com.mongodb.BasicDBObject;
+import com.mongodb.DBObject;
+import com.mongodb.util.JSON;
+
 public class SimpleMongoConverterTests {
 
 	static final String SIMPLE_JSON = "{ \"map\" : { \"foo\" : 3 , \"bar\" : 4}, \"number\" : 15 }";
@@ -323,11 +327,11 @@ public class SimpleMongoConverterTests {
 	@Test
 	public void convertsJodaTimeTypesCorrectly() {
 
-		Set<Converter<?, ?>> converters = new HashSet<Converter<?, ?>>();
+		List<Converter<?, ?>> converters = new ArrayList<Converter<?, ?>>();
 		converters.add(new LocalDateToDateConverter());
 		converters.add(new DateToLocalDateConverter());
 
-		converter.setConverters(converters);
+		converter.setCustomConverters(converters);
 
 		AnotherPerson person = new AnotherPerson();
 		person.birthDate = new LocalDate();
diff --git a/spring-data-mongodb/src/test/java/org/springframework/data/document/mongodb/TestMongoConfiguration.java b/spring-data-mongodb/src/test/java/org/springframework/data/document/mongodb/TestMongoConfiguration.java
index ef9ff3f86..3573a003e 100644
--- a/spring-data-mongodb/src/test/java/org/springframework/data/document/mongodb/TestMongoConfiguration.java
+++ b/spring-data-mongodb/src/test/java/org/springframework/data/document/mongodb/TestMongoConfiguration.java
@@ -34,7 +34,7 @@ public class TestMongoConfiguration extends AbstractMongoConfiguration {
 		List<Converter<?, ?>> converterList = new ArrayList<Converter<?, ?>>();
 		converterList.add(new org.springframework.data.document.mongodb.PersonReadConverter());
 		converterList.add(new org.springframework.data.document.mongodb.PersonWriteConverter());
-		converter.setConverters(converterList);
+		converter.setCustomConverters(converterList);
 	}
 	
 	
diff --git a/spring-data-mongodb/src/test/java/org/springframework/data/document/mongodb/convert/CustomConvertersUnitTests.java b/spring-data-mongodb/src/test/java/org/springframework/data/document/mongodb/convert/CustomConvertersUnitTests.java
index f0d971aaa..630adfad8 100644
--- a/spring-data-mongodb/src/test/java/org/springframework/data/document/mongodb/convert/CustomConvertersUnitTests.java
+++ b/spring-data-mongodb/src/test/java/org/springframework/data/document/mongodb/convert/CustomConvertersUnitTests.java
@@ -68,7 +68,7 @@ public class CustomConvertersUnitTests {
 		when(dbObjectToBarConverter.convert(any(DBObject.class))).thenReturn(new Bar());
 
 		converter = new MappingMongoConverter(context);
-		converter.setConverters(Arrays.asList(barToDBObjectConverter, dbObjectToBarConverter));
+		converter.setCustomConverters(Arrays.asList(barToDBObjectConverter, dbObjectToBarConverter));
 	}
 
 	@Test
diff --git a/spring-data-mongodb/src/test/java/org/springframework/data/document/mongodb/mapping/MappingMongoConverterUnitTests.java b/spring-data-mongodb/src/test/java/org/springframework/data/document/mongodb/mapping/MappingMongoConverterUnitTests.java
index dd2c05ac1..f9dfe5959 100644
--- a/spring-data-mongodb/src/test/java/org/springframework/data/document/mongodb/mapping/MappingMongoConverterUnitTests.java
+++ b/spring-data-mongodb/src/test/java/org/springframework/data/document/mongodb/mapping/MappingMongoConverterUnitTests.java
@@ -80,7 +80,7 @@ public class MappingMongoConverterUnitTests {
 		mappingContext.setCustomSimpleTypes(customSimpleTypes);
 
 		converter = new MappingMongoConverter(mappingContext);
-		converter.setConverters(converters);
+		converter.setCustomConverters(converters);
 		converter.afterPropertiesSet();
 
 		Person person = new Person();
diff --git a/spring-data-mongodb/src/test/resources/template-mapping.xml b/spring-data-mongodb/src/test/resources/template-mapping.xml
index 9b66c6394..8441112c3 100644
--- a/spring-data-mongodb/src/test/resources/template-mapping.xml
+++ b/spring-data-mongodb/src/test/resources/template-mapping.xml
@@ -16,7 +16,7 @@
   
   <bean id="mappingConverter1" class="org.springframework.data.document.mongodb.convert.MappingMongoConverter">
     <constructor-arg ref="mappingContext" />
-    <property name="converters">
+    <property name="customConverters">
       <list>
         <bean class="org.springframework.data.document.mongodb.PersonReadConverter"/>
         <bean class="org.springframework.data.document.mongodb.PersonWriteConverter"/>