diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/document/mongodb/config/MongoDbFactoryParser.java b/spring-data-mongodb/src/main/java/org/springframework/data/document/mongodb/config/MongoDbFactoryParser.java
index 534a8554c..c4cafd021 100644
--- a/spring-data-mongodb/src/main/java/org/springframework/data/document/mongodb/config/MongoDbFactoryParser.java
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/document/mongodb/config/MongoDbFactoryParser.java
@@ -73,11 +73,11 @@ public class MongoDbFactoryParser extends AbstractBeanDefinitionParser {
 		}
 
 		// Database name
-		String db = element.getAttribute("db");
-		if (!StringUtils.hasText(db)) {
-			db = "db";
+		String dbname = element.getAttribute("dbname");
+		if (!StringUtils.hasText(dbname)) {
+			dbname = "db";
 		}
-		dbFactoryBuilder.addPropertyValue("databaseName", db);
+		dbFactoryBuilder.addPropertyValue("databaseName", dbname);
 
 		// Create or reference a MongoFactory instance.
 		// Also respect embedded "mongo:mongo" definitions.
diff --git a/spring-data-mongodb/src/main/resources/org/springframework/data/document/mongodb/config/spring-mongo-1.0.xsd b/spring-data-mongodb/src/main/resources/org/springframework/data/document/mongodb/config/spring-mongo-1.0.xsd
index 2e49ec8a0..6a8e9c7e3 100644
--- a/spring-data-mongodb/src/main/resources/org/springframework/data/document/mongodb/config/spring-mongo-1.0.xsd
+++ b/spring-data-mongodb/src/main/resources/org/springframework/data/document/mongodb/config/spring-mongo-1.0.xsd
@@ -61,7 +61,7 @@ The name of the mongo definition (by default "mongoDbFactory").]]></xsd:document
 					</xsd:documentation>
 				</xsd:annotation>
 			</xsd:attribute>
-			<xsd:attribute name="db" type="xsd:string" use="optional">
+			<xsd:attribute name="dbname" type="xsd:string" use="optional">
 				<xsd:annotation>
 					<xsd:documentation><![CDATA[
 The name of the database to connect to. Default is 'db'.
diff --git a/spring-data-mongodb/src/test/resources/mapping.xml b/spring-data-mongodb/src/test/resources/mapping.xml
index 9cef168d8..d81079d25 100644
--- a/spring-data-mongodb/src/test/resources/mapping.xml
+++ b/spring-data-mongodb/src/test/resources/mapping.xml
@@ -7,7 +7,7 @@
 
 	<bean id="mongoTemplate" class="org.springframework.data.document.mongodb.MongoTemplate">
 		<constructor-arg>
-			<mongo:db-factory db="database"/>
+			<mongo:db-factory dbname="database"/>
 		</constructor-arg>
 	</bean>
 
diff --git a/spring-data-mongodb/src/test/resources/org/springframework/data/document/mongodb/config/MongoNamespaceTests-context.xml b/spring-data-mongodb/src/test/resources/org/springframework/data/document/mongodb/config/MongoNamespaceTests-context.xml
index 91be74b52..2168283d4 100644
--- a/spring-data-mongodb/src/test/resources/org/springframework/data/document/mongodb/config/MongoNamespaceTests-context.xml
+++ b/spring-data-mongodb/src/test/resources/org/springframework/data/document/mongodb/config/MongoNamespaceTests-context.xml
@@ -10,7 +10,7 @@
 	<context:property-placeholder
 			location="classpath:/org/springframework/data/document/mongodb/config/mongo.properties"/>
 
-	<mongo:db-factory db="database">
+	<mongo:db-factory dbname="database">
 		<mongo:mongo host="${mongo.host}" port="${mongo.port}">
 			<mongo:options
 					connectionsPerHost="${mongo.connectionsPerHost}"
diff --git a/spring-data-mongodb/src/test/resources/org/springframework/data/document/mongodb/repository/PersonRepositoryIntegrationTests-context.xml b/spring-data-mongodb/src/test/resources/org/springframework/data/document/mongodb/repository/PersonRepositoryIntegrationTests-context.xml
index 7850886d5..64942ebfe 100644
--- a/spring-data-mongodb/src/test/resources/org/springframework/data/document/mongodb/repository/PersonRepositoryIntegrationTests-context.xml
+++ b/spring-data-mongodb/src/test/resources/org/springframework/data/document/mongodb/repository/PersonRepositoryIntegrationTests-context.xml
@@ -5,7 +5,7 @@
 			 xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.0.xsd
        http://www.springframework.org/schema/data/mongo http://www.springframework.org/schema/data/mongo/spring-mongo-1.0.xsd">
 
-	<mongo:db-factory db="repositories"/>
+	<mongo:db-factory dbname="repositories"/>
 	<mongo:mapping-converter base-package="org.springframework.data.document.mongodb.repository"/>
 
 	<bean id="mongoTemplate" class="org.springframework.data.document.mongodb.MongoTemplate">
diff --git a/spring-data-mongodb/src/test/resources/org/springframework/data/document/mongodb/repository/config/MongoNamespaceIntegrationTests-context.xml b/spring-data-mongodb/src/test/resources/org/springframework/data/document/mongodb/repository/config/MongoNamespaceIntegrationTests-context.xml
index b9757262f..5fdb420ec 100644
--- a/spring-data-mongodb/src/test/resources/org/springframework/data/document/mongodb/repository/config/MongoNamespaceIntegrationTests-context.xml
+++ b/spring-data-mongodb/src/test/resources/org/springframework/data/document/mongodb/repository/config/MongoNamespaceIntegrationTests-context.xml
@@ -7,7 +7,7 @@
 			 http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.0.xsd
 			 http://www.springframework.org/schema/data/repository http://www.springframework.org/schema/data/repository/spring-repository-1.0.xsd">
 
-	<mongo:db-factory db="repositories"/>
+	<mongo:db-factory dbname="repositories"/>
 
 	<bean id="mongoTemplate" class="org.springframework.data.document.mongodb.MongoTemplate">
 		<constructor-arg name="mongoDbFactory" ref="mongoDbFactory"/>
diff --git a/spring-data-mongodb/src/test/resources/template-mapping.xml b/spring-data-mongodb/src/test/resources/template-mapping.xml
index d0c19805b..d71ac4a78 100644
--- a/spring-data-mongodb/src/test/resources/template-mapping.xml
+++ b/spring-data-mongodb/src/test/resources/template-mapping.xml
@@ -7,7 +7,7 @@
 
   <bean class="org.springframework.data.document.mongodb.TestMongoConfiguration"/>
   
-  <mongo:db-factory db="database"/>
+  <mongo:db-factory dbname="database"/>
 
   <bean id="mappingConverter1" class="org.springframework.data.document.mongodb.convert.MappingMongoConverter">
     <constructor-arg ref="mappingContext" />