diff --git a/pom.xml b/pom.xml
index 782304e30..7e5b3c9ce 100644
--- a/pom.xml
+++ b/pom.xml
@@ -3,15 +3,15 @@
 	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>org.springframework.data</groupId>
-	<artifactId>spring-datastore-document-dist</artifactId>
-	<name>Spring Datastore Document Distribution</name>
+	<artifactId>spring-data-document-dist</artifactId>
+	<name>Spring Data Document Distribution</name>
 	<version>1.0.0.BUILD-SNAPSHOT</version>
 	<packaging>pom</packaging>
 	<modules>
-		<module>spring-datastore-document-parent</module>
-		<module>spring-datastore-document-core</module>
-		<module>spring-datastore-mongodb</module>
-		<module>spring-datastore-couchdb</module>
+		<module>spring-data-document-parent</module>
+		<module>spring-data-document-core</module>
+		<module>spring-data-mongodb</module>
+		<module>spring-data-couchdb</module>
 	</modules>
 
 	<developers>
@@ -55,8 +55,8 @@
 	<properties>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 		<!-- dist.* properties are used by the antrun tasks below -->
-		<dist.id>spring-datastore-document</dist.id>
-		<dist.name>Spring Datastore Document</dist.name>
+		<dist.id>spring-data-document</dist.id>
+		<dist.name>Spring Data Document</dist.name>
 		<dist.key>DATADOC</dist.key>
 		<dist.version>${project.version}</dist.version>
 		<dist.releaseType>snapshot</dist.releaseType>
@@ -75,15 +75,15 @@
 			<distributionManagement>
 				<site>
 					<id>spring-site-staging</id>
-					<url>file:///${java.io.tmpdir}/spring-data/datastore-document/docs/${project.version}</url>
+					<url>file:///${java.io.tmpdir}/spring-data/data-document/docs/${project.version}</url>
 				</site>
 				<repository>
 					<id>spring-milestone-staging</id>
-					<url>file:///${java.io.tmpdir}/spring-data/datastore-document/milestone</url>
+					<url>file:///${java.io.tmpdir}/spring-data/data-document/milestone</url>
 				</repository>
 				<snapshotRepository>
 					<id>spring-snapshot-staging</id>
-					<url>file:///${java.io.tmpdir}/spring-data/datastore-document/snapshot</url>
+					<url>file:///${java.io.tmpdir}/spring-data/data-document/snapshot</url>
 				</snapshotRepository>
 			</distributionManagement>
 		</profile>
@@ -93,7 +93,7 @@
 		<downloadUrl>http://www.springsource.com/download/community</downloadUrl>
 		<site>
 			<id>static.springframework.org</id>
-			<url>scp://static.springframework.org/var/www/domains/springframework.org/static/htdocs/spring-data/datastore-document/docs/${project.version}</url>
+			<url>scp://static.springframework.org/var/www/domains/springframework.org/static/htdocs/spring-data/data-document/docs/${project.version}</url>
 		</site>
 		<repository>
 			<id>spring-milestone</id>
@@ -172,7 +172,7 @@
 							</fileset>
 						</copy>
 						<move file="${project.basedir}/target/site/reference/pdf/index.pdf"
-							tofile="${project.basedir}/target/site/reference/pdf/spring-datastore-document-reference.pdf"
+							tofile="${project.basedir}/target/site/reference/pdf/spring-data-document-reference.pdf"
 							failonerror="false" />
 					</postProcess>
 				</configuration>
@@ -190,7 +190,7 @@
 						<configuration>
 							<javadoc:aggregate>true</javadoc:aggregate>
 							<breakiterator>true</breakiterator>
-							<header>Spring Datastore Document</header>
+							<header>Spring Data Document</header>
 							<source>1.5</source>
 							<quiet>true</quiet>
 							<javadocDirectory>${project.basedir}/src/main/javadoc</javadocDirectory>
diff --git a/spring-datastore-couchdb/.classpath b/spring-data-couchdb/.classpath
similarity index 100%
rename from spring-datastore-couchdb/.classpath
rename to spring-data-couchdb/.classpath
diff --git a/spring-datastore-couchdb/.project b/spring-data-couchdb/.project
similarity index 92%
rename from spring-datastore-couchdb/.project
rename to spring-data-couchdb/.project
index 705d28a4c..b05e22d3a 100644
--- a/spring-datastore-couchdb/.project
+++ b/spring-data-couchdb/.project
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <projectDescription>
-	<name>spring-datastore-couchdb</name>
+	<name>spring-data-couchdb</name>
 	<comment></comment>
 	<projects>
 	</projects>
diff --git a/spring-datastore-couchdb/.settings/org.eclipse.jdt.core.prefs b/spring-data-couchdb/.settings/org.eclipse.jdt.core.prefs
similarity index 100%
rename from spring-datastore-couchdb/.settings/org.eclipse.jdt.core.prefs
rename to spring-data-couchdb/.settings/org.eclipse.jdt.core.prefs
diff --git a/spring-datastore-couchdb/.settings/org.maven.ide.eclipse.prefs b/spring-data-couchdb/.settings/org.maven.ide.eclipse.prefs
similarity index 100%
rename from spring-datastore-couchdb/.settings/org.maven.ide.eclipse.prefs
rename to spring-data-couchdb/.settings/org.maven.ide.eclipse.prefs
diff --git a/spring-datastore-couchdb/pom.xml b/spring-data-couchdb/pom.xml
similarity index 89%
rename from spring-datastore-couchdb/pom.xml
rename to spring-data-couchdb/pom.xml
index 1247524f8..e9fbd9cbb 100644
--- a/spring-datastore-couchdb/pom.xml
+++ b/spring-data-couchdb/pom.xml
@@ -3,13 +3,13 @@
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
 		<groupId>org.springframework.data</groupId>
-		<artifactId>spring-datastore-document-parent</artifactId>
+		<artifactId>spring-data-document-parent</artifactId>
 		<version>1.0.0.BUILD-SNAPSHOT</version>
-		<relativePath>../spring-datastore-document-parent/pom.xml</relativePath>
+		<relativePath>../spring-data-document-parent/pom.xml</relativePath>
 	</parent>
-	<artifactId>spring-datastore-couchdb</artifactId>
+	<artifactId>spring-data-couchdb</artifactId>
 	<packaging>jar</packaging>
-	<name>Spring Datastore CouchDB Support</name>
+	<name>Spring Data CouchDB Support</name>
 	<dependencies>
 
 		<!--  Spring -->
@@ -25,7 +25,7 @@
 		<!--  Spring Data -->
 		<dependency>
 			<groupId>org.springframework.data</groupId>
-			<artifactId>spring-datastore-document-core</artifactId>
+			<artifactId>spring-data-document-core</artifactId>
 		</dependency>
 
 		<!-- Logging -->
diff --git a/spring-datastore-couchdb/src/main/java/org/springframework/datastore/document/couchdb/CannotGetCouchDbConnectionException.java b/spring-data-couchdb/src/main/java/org/springframework/data/document/couchdb/CannotGetCouchDbConnectionException.java
similarity index 82%
rename from spring-datastore-couchdb/src/main/java/org/springframework/datastore/document/couchdb/CannotGetCouchDbConnectionException.java
rename to spring-data-couchdb/src/main/java/org/springframework/data/document/couchdb/CannotGetCouchDbConnectionException.java
index 246a9abed..a2fb40054 100644
--- a/spring-datastore-couchdb/src/main/java/org/springframework/datastore/document/couchdb/CannotGetCouchDbConnectionException.java
+++ b/spring-data-couchdb/src/main/java/org/springframework/data/document/couchdb/CannotGetCouchDbConnectionException.java
@@ -1,4 +1,4 @@
-package org.springframework.datastore.document.couchdb;
+package org.springframework.data.document.couchdb;
 
 import org.springframework.dao.DataAccessResourceFailureException;
 
diff --git a/spring-datastore-couchdb/src/main/java/org/springframework/datastore/document/couchdb/CouchDbFactoryBean.java b/spring-data-couchdb/src/main/java/org/springframework/data/document/couchdb/CouchDbFactoryBean.java
similarity index 97%
rename from spring-datastore-couchdb/src/main/java/org/springframework/datastore/document/couchdb/CouchDbFactoryBean.java
rename to spring-data-couchdb/src/main/java/org/springframework/data/document/couchdb/CouchDbFactoryBean.java
index 63d629794..e243dee4c 100644
--- a/spring-datastore-couchdb/src/main/java/org/springframework/datastore/document/couchdb/CouchDbFactoryBean.java
+++ b/spring-data-couchdb/src/main/java/org/springframework/data/document/couchdb/CouchDbFactoryBean.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.datastore.document.couchdb;
+package org.springframework.data.document.couchdb;
 
 import org.jcouchdb.db.Database;
 import org.springframework.beans.factory.FactoryBean;
diff --git a/spring-datastore-couchdb/src/main/java/org/springframework/datastore/document/couchdb/CouchDbUtils.java b/spring-data-couchdb/src/main/java/org/springframework/data/document/couchdb/CouchDbUtils.java
similarity index 93%
rename from spring-datastore-couchdb/src/main/java/org/springframework/datastore/document/couchdb/CouchDbUtils.java
rename to spring-data-couchdb/src/main/java/org/springframework/data/document/couchdb/CouchDbUtils.java
index e79dbfcf0..65c7084d3 100644
--- a/spring-datastore-couchdb/src/main/java/org/springframework/datastore/document/couchdb/CouchDbUtils.java
+++ b/spring-data-couchdb/src/main/java/org/springframework/data/document/couchdb/CouchDbUtils.java
@@ -14,11 +14,11 @@
  * limitations under the License.
  */
 
-package org.springframework.datastore.document.couchdb;
+package org.springframework.data.document.couchdb;
 
 import org.jcouchdb.exception.CouchDBException;
 import org.springframework.dao.DataAccessException;
-import org.springframework.datastore.document.UncategorizedDocumentStoreException;
+import org.springframework.data.document.UncategorizedDocumentStoreException;
 
 /**
  * Helper class featuring helper methods for internal MongoDb classes.
diff --git a/spring-datastore-couchdb/src/main/java/org/springframework/datastore/document/couchdb/CouchDocumentSource.java b/spring-data-couchdb/src/main/java/org/springframework/data/document/couchdb/CouchDocumentSource.java
similarity index 51%
rename from spring-datastore-couchdb/src/main/java/org/springframework/datastore/document/couchdb/CouchDocumentSource.java
rename to spring-data-couchdb/src/main/java/org/springframework/data/document/couchdb/CouchDocumentSource.java
index 1f4cd070b..e6c44d5d1 100644
--- a/spring-datastore-couchdb/src/main/java/org/springframework/datastore/document/couchdb/CouchDocumentSource.java
+++ b/spring-data-couchdb/src/main/java/org/springframework/data/document/couchdb/CouchDocumentSource.java
@@ -1,7 +1,7 @@
-package org.springframework.datastore.document.couchdb;
+package org.springframework.data.document.couchdb;
 
 import org.jcouchdb.document.BaseDocument;
-import org.springframework.datastore.document.DocumentSource;
+import org.springframework.data.document.DocumentSource;
 
 public interface CouchDocumentSource extends DocumentSource<BaseDocument> {
 
diff --git a/spring-datastore-couchdb/src/main/java/org/springframework/datastore/document/couchdb/CouchTemplate.java b/spring-data-couchdb/src/main/java/org/springframework/data/document/couchdb/CouchTemplate.java
similarity index 86%
rename from spring-datastore-couchdb/src/main/java/org/springframework/datastore/document/couchdb/CouchTemplate.java
rename to spring-data-couchdb/src/main/java/org/springframework/data/document/couchdb/CouchTemplate.java
index 927a54c61..ca4bcc7ba 100644
--- a/spring-datastore-couchdb/src/main/java/org/springframework/datastore/document/couchdb/CouchTemplate.java
+++ b/spring-data-couchdb/src/main/java/org/springframework/data/document/couchdb/CouchTemplate.java
@@ -14,13 +14,13 @@
  * limitations under the License.
  */
 
-package org.springframework.datastore.document.couchdb;
+package org.springframework.data.document.couchdb;
 
 
 import org.jcouchdb.db.Database;
 import org.jcouchdb.document.BaseDocument;
-import org.springframework.datastore.document.AbstractDocumentStoreTemplate;
-import org.springframework.datastore.document.DocumentSource;
+import org.springframework.data.document.AbstractDocumentStoreTemplate;
+import org.springframework.data.document.DocumentSource;
 
 	public class CouchTemplate extends AbstractDocumentStoreTemplate<Database> {
 
diff --git a/spring-datastore-couchdb/template.mf b/spring-data-couchdb/template.mf
similarity index 73%
rename from spring-datastore-couchdb/template.mf
rename to spring-data-couchdb/template.mf
index 0433dcb21..85fadd8fd 100644
--- a/spring-datastore-couchdb/template.mf
+++ b/spring-data-couchdb/template.mf
@@ -1,5 +1,5 @@
-Bundle-SymbolicName: org.springframework.datastore.couchdb
-Bundle-Name: Spring Datastore Couch DB Support
+Bundle-SymbolicName: org.springframework.data.couchdb
+Bundle-Name: Spring Data Couch DB Support
 Bundle-Vendor: SpringSource
 Bundle-ManifestVersion: 2
 Import-Package: 
@@ -10,8 +10,6 @@ Import-Template:
  org.springframework.dao.*;version="[3.0.0, 4.0.0)",
  org.springframework.util.*;version="[3.0.0, 4.0.0)",
  org.springframework.data.core.*;version="[1.0.0, 2.0.0)",
- org.springframework.datastore.core.*;version="[1.0.0, 2.0.0)",
- org.springframework.datastore.persistence.*;version="[1.0.0, 2.0.0)",
  org.springframework.datastore.document.*;version="[1.0.0, 2.0.0)",
  org.jcouchdb.*;version="0",
  org.aopalliance.*;version="[1.0.0, 2.0.0)";resolution:=optional,
diff --git a/spring-datastore-document-core/.classpath b/spring-data-document-core/.classpath
similarity index 100%
rename from spring-datastore-document-core/.classpath
rename to spring-data-document-core/.classpath
diff --git a/spring-datastore-document-core/.project b/spring-data-document-core/.project
similarity index 92%
rename from spring-datastore-document-core/.project
rename to spring-data-document-core/.project
index 98098d5e5..903baba7a 100644
--- a/spring-datastore-document-core/.project
+++ b/spring-data-document-core/.project
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <projectDescription>
-	<name>spring-datastore-document-core</name>
+	<name>spring-data-document-core</name>
 	<comment></comment>
 	<projects>
 	</projects>
diff --git a/spring-datastore-document-core/.settings/org.eclipse.jdt.core.prefs b/spring-data-document-core/.settings/org.eclipse.jdt.core.prefs
similarity index 100%
rename from spring-datastore-document-core/.settings/org.eclipse.jdt.core.prefs
rename to spring-data-document-core/.settings/org.eclipse.jdt.core.prefs
diff --git a/spring-datastore-document-core/.settings/org.eclipse.wst.common.component b/spring-data-document-core/.settings/org.eclipse.wst.common.component
similarity index 100%
rename from spring-datastore-document-core/.settings/org.eclipse.wst.common.component
rename to spring-data-document-core/.settings/org.eclipse.wst.common.component
diff --git a/spring-datastore-document-core/.settings/org.eclipse.wst.common.project.facet.core.xml b/spring-data-document-core/.settings/org.eclipse.wst.common.project.facet.core.xml
similarity index 100%
rename from spring-datastore-document-core/.settings/org.eclipse.wst.common.project.facet.core.xml
rename to spring-data-document-core/.settings/org.eclipse.wst.common.project.facet.core.xml
diff --git a/spring-datastore-document-core/.settings/org.maven.ide.eclipse.prefs b/spring-data-document-core/.settings/org.maven.ide.eclipse.prefs
similarity index 100%
rename from spring-datastore-document-core/.settings/org.maven.ide.eclipse.prefs
rename to spring-data-document-core/.settings/org.maven.ide.eclipse.prefs
diff --git a/spring-datastore-document-core/pom.xml b/spring-data-document-core/pom.xml
similarity index 93%
rename from spring-datastore-document-core/pom.xml
rename to spring-data-document-core/pom.xml
index 544b3b25d..ac325d868 100644
--- a/spring-datastore-document-core/pom.xml
+++ b/spring-data-document-core/pom.xml
@@ -3,13 +3,13 @@
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
 		<groupId>org.springframework.data</groupId>
-		<artifactId>spring-datastore-document-parent</artifactId>
+		<artifactId>spring-data-document-parent</artifactId>
 		<version>1.0.0.BUILD-SNAPSHOT</version>
-		<relativePath>../spring-datastore-document-parent/pom.xml</relativePath>
+		<relativePath>../spring-data-document-parent/pom.xml</relativePath>
 	</parent>
-	<artifactId>spring-datastore-document-core</artifactId>
+	<artifactId>spring-data-document-core</artifactId>
 	<packaging>jar</packaging>
-	<name>Spring Datastore Document Datastore Support</name>
+	<name>Spring Data Document Support</name>
 	<dependencies>
 
 		<!--  Spring -->
diff --git a/spring-datastore-document-core/src/main/java/META-INF/MANIFEST.MF b/spring-data-document-core/src/main/java/META-INF/MANIFEST.MF
similarity index 100%
rename from spring-datastore-document-core/src/main/java/META-INF/MANIFEST.MF
rename to spring-data-document-core/src/main/java/META-INF/MANIFEST.MF
diff --git a/spring-datastore-document-core/src/main/java/org/springframework/datastore/document/AbstractDocumentStoreTemplate.java b/spring-data-document-core/src/main/java/org/springframework/data/document/AbstractDocumentStoreTemplate.java
similarity index 95%
rename from spring-datastore-document-core/src/main/java/org/springframework/datastore/document/AbstractDocumentStoreTemplate.java
rename to spring-data-document-core/src/main/java/org/springframework/data/document/AbstractDocumentStoreTemplate.java
index fddf117fd..97439420b 100644
--- a/spring-datastore-document-core/src/main/java/org/springframework/datastore/document/AbstractDocumentStoreTemplate.java
+++ b/spring-data-document-core/src/main/java/org/springframework/data/document/AbstractDocumentStoreTemplate.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.datastore.document;
+package org.springframework.data.document;
 
 
 public abstract class AbstractDocumentStoreTemplate<C> {
diff --git a/spring-datastore-document-core/src/main/java/org/springframework/datastore/document/DocumentMapper.java b/spring-data-document-core/src/main/java/org/springframework/data/document/DocumentMapper.java
similarity index 94%
rename from spring-datastore-document-core/src/main/java/org/springframework/datastore/document/DocumentMapper.java
rename to spring-data-document-core/src/main/java/org/springframework/data/document/DocumentMapper.java
index 69d8bc381..48cf9919b 100644
--- a/spring-datastore-document-core/src/main/java/org/springframework/datastore/document/DocumentMapper.java
+++ b/spring-data-document-core/src/main/java/org/springframework/data/document/DocumentMapper.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.datastore.document;
+package org.springframework.data.document;
 
 /**
  * Class used to map a Document to a business object.
diff --git a/spring-datastore-document-core/src/main/java/org/springframework/datastore/document/DocumentSource.java b/spring-data-document-core/src/main/java/org/springframework/data/document/DocumentSource.java
similarity index 94%
rename from spring-datastore-document-core/src/main/java/org/springframework/datastore/document/DocumentSource.java
rename to spring-data-document-core/src/main/java/org/springframework/data/document/DocumentSource.java
index eaada09a8..87dcaea5d 100644
--- a/spring-datastore-document-core/src/main/java/org/springframework/datastore/document/DocumentSource.java
+++ b/spring-data-document-core/src/main/java/org/springframework/data/document/DocumentSource.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.datastore.document;
+package org.springframework.data.document;
 
 /**
  * Class used to map a business object to an object providing the source data for a Document.
diff --git a/spring-datastore-document-core/src/main/java/org/springframework/datastore/document/DocumentStoreConnectionCallback.java b/spring-data-document-core/src/main/java/org/springframework/data/document/DocumentStoreConnectionCallback.java
similarity index 93%
rename from spring-datastore-document-core/src/main/java/org/springframework/datastore/document/DocumentStoreConnectionCallback.java
rename to spring-data-document-core/src/main/java/org/springframework/data/document/DocumentStoreConnectionCallback.java
index 0c2faa23d..5711adaa6 100644
--- a/spring-datastore-document-core/src/main/java/org/springframework/datastore/document/DocumentStoreConnectionCallback.java
+++ b/spring-data-document-core/src/main/java/org/springframework/data/document/DocumentStoreConnectionCallback.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.datastore.document;
+package org.springframework.data.document;
 
 public interface DocumentStoreConnectionCallback<C, T> {
 
diff --git a/spring-datastore-document-core/src/main/java/org/springframework/datastore/document/InvalidDocumentStoreApiUageException.java b/spring-data-document-core/src/main/java/org/springframework/data/document/InvalidDocumentStoreApiUageException.java
similarity index 95%
rename from spring-datastore-document-core/src/main/java/org/springframework/datastore/document/InvalidDocumentStoreApiUageException.java
rename to spring-data-document-core/src/main/java/org/springframework/data/document/InvalidDocumentStoreApiUageException.java
index f3379734a..7d5355f28 100644
--- a/spring-datastore-document-core/src/main/java/org/springframework/datastore/document/InvalidDocumentStoreApiUageException.java
+++ b/spring-data-document-core/src/main/java/org/springframework/data/document/InvalidDocumentStoreApiUageException.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.datastore.document;
+package org.springframework.data.document;
 
 import org.springframework.dao.InvalidDataAccessApiUsageException;
 
diff --git a/spring-datastore-document-core/src/main/java/org/springframework/datastore/document/UncategorizedDocumentStoreException.java b/spring-data-document-core/src/main/java/org/springframework/data/document/UncategorizedDocumentStoreException.java
similarity index 94%
rename from spring-datastore-document-core/src/main/java/org/springframework/datastore/document/UncategorizedDocumentStoreException.java
rename to spring-data-document-core/src/main/java/org/springframework/data/document/UncategorizedDocumentStoreException.java
index af80155a3..44ee8b879 100644
--- a/spring-datastore-document-core/src/main/java/org/springframework/datastore/document/UncategorizedDocumentStoreException.java
+++ b/spring-data-document-core/src/main/java/org/springframework/data/document/UncategorizedDocumentStoreException.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.datastore.document;
+package org.springframework.data.document;
 
 import org.springframework.dao.UncategorizedDataAccessException;
 
diff --git a/spring-datastore-document-core/src/main/java/org/springframework/datastore/document/analytics/ControllerCounter.java b/spring-data-document-core/src/main/java/org/springframework/data/document/analytics/ControllerCounter.java
similarity index 86%
rename from spring-datastore-document-core/src/main/java/org/springframework/datastore/document/analytics/ControllerCounter.java
rename to spring-data-document-core/src/main/java/org/springframework/data/document/analytics/ControllerCounter.java
index bab8a0ccc..459feeaed 100644
--- a/spring-datastore-document-core/src/main/java/org/springframework/datastore/document/analytics/ControllerCounter.java
+++ b/spring-data-document-core/src/main/java/org/springframework/data/document/analytics/ControllerCounter.java
@@ -1,4 +1,4 @@
-package org.springframework.datastore.document.analytics;
+package org.springframework.data.document.analytics;
 
 import java.util.Date;
 import java.util.Map;
diff --git a/spring-datastore-document-core/src/main/java/org/springframework/datastore/document/analytics/MvcEvent.java b/spring-data-document-core/src/main/java/org/springframework/data/document/analytics/MvcEvent.java
similarity index 90%
rename from spring-datastore-document-core/src/main/java/org/springframework/datastore/document/analytics/MvcEvent.java
rename to spring-data-document-core/src/main/java/org/springframework/data/document/analytics/MvcEvent.java
index a270283f8..a63fe2ee6 100644
--- a/spring-datastore-document-core/src/main/java/org/springframework/datastore/document/analytics/MvcEvent.java
+++ b/spring-data-document-core/src/main/java/org/springframework/data/document/analytics/MvcEvent.java
@@ -1,4 +1,4 @@
-package org.springframework.datastore.document.analytics;
+package org.springframework.data.document.analytics;
 
 import java.util.Date;
 
diff --git a/spring-datastore-document-core/src/main/java/org/springframework/datastore/document/analytics/Parameters.java b/spring-data-document-core/src/main/java/org/springframework/data/document/analytics/Parameters.java
similarity index 80%
rename from spring-datastore-document-core/src/main/java/org/springframework/datastore/document/analytics/Parameters.java
rename to spring-data-document-core/src/main/java/org/springframework/data/document/analytics/Parameters.java
index 2a58898ad..a8c9eaef0 100644
--- a/spring-datastore-document-core/src/main/java/org/springframework/datastore/document/analytics/Parameters.java
+++ b/spring-data-document-core/src/main/java/org/springframework/data/document/analytics/Parameters.java
@@ -1,4 +1,4 @@
-package org.springframework.datastore.document.analytics;
+package org.springframework.data.document.analytics;
 
 public class Parameters {
 
diff --git a/spring-datastore-document-core/src/main/java/org/springframework/datastore/document/web/bind/annotation/support/HandlerMethodInvoker.java b/spring-data-document-core/src/main/java/org/springframework/data/document/web/bind/annotation/support/HandlerMethodInvoker.java
similarity index 97%
rename from spring-datastore-document-core/src/main/java/org/springframework/datastore/document/web/bind/annotation/support/HandlerMethodInvoker.java
rename to spring-data-document-core/src/main/java/org/springframework/data/document/web/bind/annotation/support/HandlerMethodInvoker.java
index 2fa6fc96d..a5d7c4416 100644
--- a/spring-datastore-document-core/src/main/java/org/springframework/datastore/document/web/bind/annotation/support/HandlerMethodInvoker.java
+++ b/spring-data-document-core/src/main/java/org/springframework/data/document/web/bind/annotation/support/HandlerMethodInvoker.java
@@ -15,7 +15,7 @@
  */
 
 
-package org.springframework.datastore.document.web.bind.annotation.support;
+package org.springframework.data.document.web.bind.annotation.support;
 
 import java.lang.annotation.Annotation;
 import java.lang.reflect.Array;
diff --git a/spring-datastore-document-core/src/main/java/org/springframework/datastore/document/web/servlet/ActionExecutedContext.java b/spring-data-document-core/src/main/java/org/springframework/data/document/web/servlet/ActionExecutedContext.java
similarity index 93%
rename from spring-datastore-document-core/src/main/java/org/springframework/datastore/document/web/servlet/ActionExecutedContext.java
rename to spring-data-document-core/src/main/java/org/springframework/data/document/web/servlet/ActionExecutedContext.java
index 79a44d2c3..33726acd2 100644
--- a/spring-datastore-document-core/src/main/java/org/springframework/datastore/document/web/servlet/ActionExecutedContext.java
+++ b/spring-data-document-core/src/main/java/org/springframework/data/document/web/servlet/ActionExecutedContext.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.datastore.document.web.servlet;
+package org.springframework.data.document.web.servlet;
 
 import java.util.Arrays;
 
diff --git a/spring-datastore-document-core/src/main/java/org/springframework/datastore/document/web/servlet/ActionExecutingContext.java b/spring-data-document-core/src/main/java/org/springframework/data/document/web/servlet/ActionExecutingContext.java
similarity index 93%
rename from spring-datastore-document-core/src/main/java/org/springframework/datastore/document/web/servlet/ActionExecutingContext.java
rename to spring-data-document-core/src/main/java/org/springframework/data/document/web/servlet/ActionExecutingContext.java
index 7065dea43..45c839c6a 100644
--- a/spring-datastore-document-core/src/main/java/org/springframework/datastore/document/web/servlet/ActionExecutingContext.java
+++ b/spring-data-document-core/src/main/java/org/springframework/data/document/web/servlet/ActionExecutingContext.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.datastore.document.web.servlet;
+package org.springframework.data.document.web.servlet;
 
 import java.lang.reflect.Method;
 import java.util.Arrays;
diff --git a/spring-datastore-document-core/src/main/java/org/springframework/datastore/document/web/servlet/ActionInterceptor.java b/spring-data-document-core/src/main/java/org/springframework/data/document/web/servlet/ActionInterceptor.java
similarity index 91%
rename from spring-datastore-document-core/src/main/java/org/springframework/datastore/document/web/servlet/ActionInterceptor.java
rename to spring-data-document-core/src/main/java/org/springframework/data/document/web/servlet/ActionInterceptor.java
index df0f829a0..30f440540 100644
--- a/spring-datastore-document-core/src/main/java/org/springframework/datastore/document/web/servlet/ActionInterceptor.java
+++ b/spring-data-document-core/src/main/java/org/springframework/data/document/web/servlet/ActionInterceptor.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.datastore.document.web.servlet;
+package org.springframework.data.document.web.servlet;
 
 public interface ActionInterceptor {
 
diff --git a/spring-datastore-document-core/src/main/java/org/springframework/datastore/document/web/servlet/mvc/annotation/AnnotationMethodHandlerAdapter.java b/spring-data-document-core/src/main/java/org/springframework/data/document/web/servlet/mvc/annotation/AnnotationMethodHandlerAdapter.java
similarity index 99%
rename from spring-datastore-document-core/src/main/java/org/springframework/datastore/document/web/servlet/mvc/annotation/AnnotationMethodHandlerAdapter.java
rename to spring-data-document-core/src/main/java/org/springframework/data/document/web/servlet/mvc/annotation/AnnotationMethodHandlerAdapter.java
index e9ad372b6..5038ed1cd 100644
--- a/spring-datastore-document-core/src/main/java/org/springframework/datastore/document/web/servlet/mvc/annotation/AnnotationMethodHandlerAdapter.java
+++ b/spring-data-document-core/src/main/java/org/springframework/data/document/web/servlet/mvc/annotation/AnnotationMethodHandlerAdapter.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.datastore.document.web.servlet.mvc.annotation;
+package org.springframework.data.document.web.servlet.mvc.annotation;
 
 import java.io.IOException;
 import java.io.InputStream;
@@ -61,10 +61,10 @@ import org.springframework.core.LocalVariableTableParameterNameDiscoverer;
 import org.springframework.core.Ordered;
 import org.springframework.core.ParameterNameDiscoverer;
 import org.springframework.core.annotation.AnnotationUtils;
-import org.springframework.datastore.document.web.servlet.ActionExecutedContext;
-import org.springframework.datastore.document.web.servlet.ActionExecutingContext;
-import org.springframework.datastore.document.web.servlet.ActionInterceptor;
-import org.springframework.datastore.document.web.servlet.mvc.annotation.support.InterceptingHandlerMethodInvoker;
+import org.springframework.data.document.web.servlet.ActionExecutedContext;
+import org.springframework.data.document.web.servlet.ActionExecutingContext;
+import org.springframework.data.document.web.servlet.ActionInterceptor;
+import org.springframework.data.document.web.servlet.mvc.annotation.support.InterceptingHandlerMethodInvoker;
 import org.springframework.format.support.FormattingConversionService;
 import org.springframework.http.HttpEntity;
 import org.springframework.http.HttpHeaders;
diff --git a/spring-datastore-document-core/src/main/java/org/springframework/datastore/document/web/servlet/mvc/annotation/ServletAnnotationMappingUtils.java b/spring-data-document-core/src/main/java/org/springframework/data/document/web/servlet/mvc/annotation/ServletAnnotationMappingUtils.java
similarity index 98%
rename from spring-datastore-document-core/src/main/java/org/springframework/datastore/document/web/servlet/mvc/annotation/ServletAnnotationMappingUtils.java
rename to spring-data-document-core/src/main/java/org/springframework/data/document/web/servlet/mvc/annotation/ServletAnnotationMappingUtils.java
index 23307bdb3..279c8904b 100644
--- a/spring-datastore-document-core/src/main/java/org/springframework/datastore/document/web/servlet/mvc/annotation/ServletAnnotationMappingUtils.java
+++ b/spring-data-document-core/src/main/java/org/springframework/data/document/web/servlet/mvc/annotation/ServletAnnotationMappingUtils.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.datastore.document.web.servlet.mvc.annotation;
+package org.springframework.data.document.web.servlet.mvc.annotation;
 
 import java.util.Iterator;
 import java.util.List;
diff --git a/spring-datastore-document-core/src/main/java/org/springframework/datastore/document/web/servlet/mvc/annotation/support/InterceptingHandlerMethodInvoker.java b/spring-data-document-core/src/main/java/org/springframework/data/document/web/servlet/mvc/annotation/support/InterceptingHandlerMethodInvoker.java
similarity index 97%
rename from spring-datastore-document-core/src/main/java/org/springframework/datastore/document/web/servlet/mvc/annotation/support/InterceptingHandlerMethodInvoker.java
rename to spring-data-document-core/src/main/java/org/springframework/data/document/web/servlet/mvc/annotation/support/InterceptingHandlerMethodInvoker.java
index 340b42792..8918ace3b 100644
--- a/spring-datastore-document-core/src/main/java/org/springframework/datastore/document/web/servlet/mvc/annotation/support/InterceptingHandlerMethodInvoker.java
+++ b/spring-data-document-core/src/main/java/org/springframework/data/document/web/servlet/mvc/annotation/support/InterceptingHandlerMethodInvoker.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.datastore.document.web.servlet.mvc.annotation.support;
+package org.springframework.data.document.web.servlet.mvc.annotation.support;
 
 import java.lang.annotation.Annotation;
 import java.lang.reflect.Array;
@@ -43,7 +43,7 @@ import org.springframework.core.GenericTypeResolver;
 import org.springframework.core.MethodParameter;
 import org.springframework.core.ParameterNameDiscoverer;
 import org.springframework.core.annotation.AnnotationUtils;
-import org.springframework.datastore.document.web.servlet.ActionInterceptor;
+import org.springframework.data.document.web.servlet.ActionInterceptor;
 import org.springframework.http.HttpEntity;
 import org.springframework.http.HttpHeaders;
 import org.springframework.http.HttpInputMessage;
diff --git a/spring-datastore-document-core/template.mf b/spring-data-document-core/template.mf
similarity index 86%
rename from spring-datastore-document-core/template.mf
rename to spring-data-document-core/template.mf
index cbb81f793..f8e76f43e 100644
--- a/spring-datastore-document-core/template.mf
+++ b/spring-data-document-core/template.mf
@@ -1,5 +1,5 @@
-Bundle-SymbolicName: org.springframework.datastore.document
-Bundle-Name: Spring Datastore Document
+Bundle-SymbolicName: org.springframework.data.document
+Bundle-Name: Spring Data Document
 Bundle-Vendor: SpringSource
 Bundle-ManifestVersion: 2
 Import-Package: 
@@ -25,8 +25,6 @@ Import-Template:
  org.springframework.dao.*;version="[3.0.0, 4.0.0)",
  org.springframework.util.*;version="[3.0.0, 4.0.0)",
  org.springframework.data.core.*;version="[1.0.0, 2.0.0)",
- org.springframework.datastore.core.*;version="[1.0.0, 2.0.0)",
- org.springframework.datastore.persistence.*;version="[1.0.0, 2.0.0)",
  org.aopalliance.*;version="[1.0.0, 2.0.0)";resolution:=optional,
  org.apache.commons.logging.*;version="[1.1.1, 2.0.0)",
  org.w3c.dom.*;version="0"
diff --git a/spring-datastore-document-parent/.project b/spring-data-document-parent/.project
similarity index 100%
rename from spring-datastore-document-parent/.project
rename to spring-data-document-parent/.project
diff --git a/spring-datastore-document-parent/.settings/org.maven.ide.eclipse.prefs b/spring-data-document-parent/.settings/org.maven.ide.eclipse.prefs
similarity index 100%
rename from spring-datastore-document-parent/.settings/org.maven.ide.eclipse.prefs
rename to spring-data-document-parent/.settings/org.maven.ide.eclipse.prefs
diff --git a/spring-datastore-document-parent/pom.xml b/spring-data-document-parent/pom.xml
similarity index 94%
rename from spring-datastore-document-parent/pom.xml
rename to spring-data-document-parent/pom.xml
index 2d6b22cdc..82251043a 100644
--- a/spring-datastore-document-parent/pom.xml
+++ b/spring-data-document-parent/pom.xml
@@ -3,9 +3,9 @@
 	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>org.springframework.data</groupId>
-	<artifactId>spring-datastore-document-parent</artifactId>
-	<name>Spring Datastore Document Parent</name>
-	<url>http://www.springsource.org/spring-data/datastore-document</url>
+	<artifactId>spring-data-document-parent</artifactId>
+	<name>Spring Data Document Parent</name>
+	<url>http://www.springsource.org/spring-data/data-document</url>
 	<version>1.0.0.BUILD-SNAPSHOT</version>
 	<packaging>pom</packaging>
 	<properties>
@@ -36,15 +36,15 @@
 			<distributionManagement>
 				<site>
 					<id>spring-site-staging</id>
-					<url>file:///${java.io.tmpdir}/spring-data/datastore-document/docs</url>
+					<url>file:///${java.io.tmpdir}/spring-data/data-document/docs</url>
 				</site>
 				<repository>
 					<id>spring-milestone-staging</id>
-					<url>file:///${java.io.tmpdir}/spring-data/datastore-document/milestone</url>
+					<url>file:///${java.io.tmpdir}/spring-data/data-document/milestone</url>
 				</repository>
 				<snapshotRepository>
 					<id>spring-snapshot-staging</id>
-					<url>file:///${java.io.tmpdir}/spring-data/datastore-document/snapshot</url>
+					<url>file:///${java.io.tmpdir}/spring-data/data-document/snapshot</url>
 				</snapshotRepository>
 			</distributionManagement>
 		</profile>
@@ -59,7 +59,7 @@
 		</downloadUrl>
 		<site>
 			<id>static.springframework.org</id>
-			<url>scp://static.springframework.org/var/www/domains/springframework.org/static/htdocs/spring-data/datastore-document/docs/${project.version}
+			<url>scp://static.springframework.org/var/www/domains/springframework.org/static/htdocs/spring-data/data-document/docs/${project.version}
 			</url>
 		</site>
 		<repository>
@@ -121,17 +121,17 @@
 			<!--  Spring Data -->
 			<dependency>
 				<groupId>org.springframework.data</groupId>
-				<artifactId>spring-datastore-document-core</artifactId>
+				<artifactId>spring-data-document-core</artifactId>
 				<version>${project.version}</version>
 			</dependency>
 			<dependency>
 				<groupId>org.springframework.data</groupId>
-				<artifactId>spring-datastore-couchdb</artifactId>
+				<artifactId>spring-data-couchdb</artifactId>
 				<version>${project.version}</version>
 			</dependency>
 			<dependency>
 				<groupId>org.springframework.data</groupId>
-				<artifactId>spring-datastore-mongodb</artifactId>
+				<artifactId>spring-data-mongodb</artifactId>
 				<version>${project.version}</version>
 			</dependency>
 
diff --git a/spring-datastore-mongodb/.classpath b/spring-data-mongodb/.classpath
similarity index 100%
rename from spring-datastore-mongodb/.classpath
rename to spring-data-mongodb/.classpath
diff --git a/spring-data-mongodb/.project b/spring-data-mongodb/.project
new file mode 100644
index 000000000..942129127
--- /dev/null
+++ b/spring-data-mongodb/.project
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>spring-data-mongodb</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.wst.common.project.facet.core.builder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.maven.ide.eclipse.maven2Builder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.wst.validation.validationbuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.jem.workbench.JavaEMFNature</nature>
+		<nature>org.eclipse.wst.common.modulecore.ModuleCoreNature</nature>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+		<nature>org.maven.ide.eclipse.maven2Nature</nature>
+		<nature>org.eclipse.wst.common.project.facet.core.nature</nature>
+	</natures>
+</projectDescription>
diff --git a/spring-datastore-mongodb/.settings/org.eclipse.jdt.core.prefs b/spring-data-mongodb/.settings/org.eclipse.jdt.core.prefs
similarity index 100%
rename from spring-datastore-mongodb/.settings/org.eclipse.jdt.core.prefs
rename to spring-data-mongodb/.settings/org.eclipse.jdt.core.prefs
diff --git a/spring-datastore-mongodb/.settings/org.eclipse.wst.common.component b/spring-data-mongodb/.settings/org.eclipse.wst.common.component
similarity index 100%
rename from spring-datastore-mongodb/.settings/org.eclipse.wst.common.component
rename to spring-data-mongodb/.settings/org.eclipse.wst.common.component
diff --git a/spring-datastore-mongodb/.settings/org.eclipse.wst.common.project.facet.core.xml b/spring-data-mongodb/.settings/org.eclipse.wst.common.project.facet.core.xml
similarity index 100%
rename from spring-datastore-mongodb/.settings/org.eclipse.wst.common.project.facet.core.xml
rename to spring-data-mongodb/.settings/org.eclipse.wst.common.project.facet.core.xml
diff --git a/spring-datastore-mongodb/.settings/org.maven.ide.eclipse.prefs b/spring-data-mongodb/.settings/org.maven.ide.eclipse.prefs
similarity index 100%
rename from spring-datastore-mongodb/.settings/org.maven.ide.eclipse.prefs
rename to spring-data-mongodb/.settings/org.maven.ide.eclipse.prefs
diff --git a/spring-datastore-mongodb/pom.xml b/spring-data-mongodb/pom.xml
similarity index 89%
rename from spring-datastore-mongodb/pom.xml
rename to spring-data-mongodb/pom.xml
index fc11c2d07..78f88b85f 100644
--- a/spring-datastore-mongodb/pom.xml
+++ b/spring-data-mongodb/pom.xml
@@ -3,13 +3,13 @@
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
 		<groupId>org.springframework.data</groupId>
-		<artifactId>spring-datastore-document-parent</artifactId>
+		<artifactId>spring-data-document-parent</artifactId>
 		<version>1.0.0.BUILD-SNAPSHOT</version>
-		<relativePath>../spring-datastore-document-parent/pom.xml</relativePath>
+		<relativePath>../spring-data-document-parent/pom.xml</relativePath>
 	</parent>
-	<artifactId>spring-datastore-mongodb</artifactId>
+	<artifactId>spring-data-mongodb</artifactId>
 	<packaging>jar</packaging>
-	<name>Spring Datastore MongoDB Support</name>
+	<name>Spring Data MongoDB Support</name>
 	<dependencies>
 
 		<!--  Spring -->
@@ -25,7 +25,7 @@
 		<!--  Spring Data -->
 		<dependency>
 			<groupId>org.springframework.data</groupId>
-			<artifactId>spring-datastore-document-core</artifactId>
+			<artifactId>spring-data-document-core</artifactId>
 		</dependency>
 
 		<!-- Logging -->
diff --git a/spring-datastore-mongodb/src/main/java/META-INF/MANIFEST.MF b/spring-data-mongodb/src/main/java/META-INF/MANIFEST.MF
similarity index 100%
rename from spring-datastore-mongodb/src/main/java/META-INF/MANIFEST.MF
rename to spring-data-mongodb/src/main/java/META-INF/MANIFEST.MF
diff --git a/spring-datastore-mongodb/src/main/java/org/springframework/data/document/mongodb/CannotGetMongoDbConnectionException.java b/spring-data-mongodb/src/main/java/org/springframework/data/document/mongodb/CannotGetMongoDbConnectionException.java
similarity index 100%
rename from spring-datastore-mongodb/src/main/java/org/springframework/data/document/mongodb/CannotGetMongoDbConnectionException.java
rename to spring-data-mongodb/src/main/java/org/springframework/data/document/mongodb/CannotGetMongoDbConnectionException.java
diff --git a/spring-datastore-mongodb/src/main/java/org/springframework/data/document/mongodb/CollectionCallback.java b/spring-data-mongodb/src/main/java/org/springframework/data/document/mongodb/CollectionCallback.java
similarity index 100%
rename from spring-datastore-mongodb/src/main/java/org/springframework/data/document/mongodb/CollectionCallback.java
rename to spring-data-mongodb/src/main/java/org/springframework/data/document/mongodb/CollectionCallback.java
diff --git a/spring-datastore-mongodb/src/main/java/org/springframework/data/document/mongodb/CollectionOptions.java b/spring-data-mongodb/src/main/java/org/springframework/data/document/mongodb/CollectionOptions.java
similarity index 100%
rename from spring-datastore-mongodb/src/main/java/org/springframework/data/document/mongodb/CollectionOptions.java
rename to spring-data-mongodb/src/main/java/org/springframework/data/document/mongodb/CollectionOptions.java
diff --git a/spring-datastore-mongodb/src/main/java/org/springframework/data/document/mongodb/DBCallback.java b/spring-data-mongodb/src/main/java/org/springframework/data/document/mongodb/DBCallback.java
similarity index 100%
rename from spring-datastore-mongodb/src/main/java/org/springframework/data/document/mongodb/DBCallback.java
rename to spring-data-mongodb/src/main/java/org/springframework/data/document/mongodb/DBCallback.java
diff --git a/spring-datastore-mongodb/src/main/java/org/springframework/data/document/mongodb/DBHolder.java b/spring-data-mongodb/src/main/java/org/springframework/data/document/mongodb/DBHolder.java
similarity index 100%
rename from spring-datastore-mongodb/src/main/java/org/springframework/data/document/mongodb/DBHolder.java
rename to spring-data-mongodb/src/main/java/org/springframework/data/document/mongodb/DBHolder.java
diff --git a/spring-datastore-mongodb/src/main/java/org/springframework/data/document/mongodb/FluentDbObject.java b/spring-data-mongodb/src/main/java/org/springframework/data/document/mongodb/FluentDbObject.java
similarity index 100%
rename from spring-datastore-mongodb/src/main/java/org/springframework/data/document/mongodb/FluentDbObject.java
rename to spring-data-mongodb/src/main/java/org/springframework/data/document/mongodb/FluentDbObject.java
diff --git a/spring-datastore-mongodb/src/main/java/org/springframework/data/document/mongodb/MongoConverter.java b/spring-data-mongodb/src/main/java/org/springframework/data/document/mongodb/MongoConverter.java
similarity index 100%
rename from spring-datastore-mongodb/src/main/java/org/springframework/data/document/mongodb/MongoConverter.java
rename to spring-data-mongodb/src/main/java/org/springframework/data/document/mongodb/MongoConverter.java
diff --git a/spring-datastore-mongodb/src/main/java/org/springframework/data/document/mongodb/MongoDbUtils.java b/spring-data-mongodb/src/main/java/org/springframework/data/document/mongodb/MongoDbUtils.java
similarity index 98%
rename from spring-datastore-mongodb/src/main/java/org/springframework/data/document/mongodb/MongoDbUtils.java
rename to spring-data-mongodb/src/main/java/org/springframework/data/document/mongodb/MongoDbUtils.java
index 1a00e5c03..2ec5add79 100644
--- a/spring-datastore-mongodb/src/main/java/org/springframework/data/document/mongodb/MongoDbUtils.java
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/document/mongodb/MongoDbUtils.java
@@ -21,7 +21,7 @@ import org.apache.commons.logging.LogFactory;
 import org.springframework.dao.DataAccessException;
 import org.springframework.dao.DataAccessResourceFailureException;
 import org.springframework.dao.DataIntegrityViolationException;
-import org.springframework.datastore.document.UncategorizedDocumentStoreException;
+import org.springframework.data.document.UncategorizedDocumentStoreException;
 import org.springframework.transaction.support.TransactionSynchronizationManager;
 import org.springframework.util.Assert;
 
diff --git a/spring-datastore-mongodb/src/main/java/org/springframework/data/document/mongodb/MongoDocumentSource.java b/spring-data-mongodb/src/main/java/org/springframework/data/document/mongodb/MongoDocumentSource.java
similarity index 92%
rename from spring-datastore-mongodb/src/main/java/org/springframework/data/document/mongodb/MongoDocumentSource.java
rename to spring-data-mongodb/src/main/java/org/springframework/data/document/mongodb/MongoDocumentSource.java
index 1e3bcd40a..22fd66be6 100644
--- a/spring-datastore-mongodb/src/main/java/org/springframework/data/document/mongodb/MongoDocumentSource.java
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/document/mongodb/MongoDocumentSource.java
@@ -15,7 +15,7 @@
  */
 package org.springframework.data.document.mongodb;
 
-import org.springframework.datastore.document.DocumentSource;
+import org.springframework.data.document.DocumentSource;
 
 import com.mongodb.DBObject;
 
diff --git a/spring-datastore-mongodb/src/main/java/org/springframework/data/document/mongodb/MongoDocumentWriter.java b/spring-data-mongodb/src/main/java/org/springframework/data/document/mongodb/MongoDocumentWriter.java
similarity index 100%
rename from spring-datastore-mongodb/src/main/java/org/springframework/data/document/mongodb/MongoDocumentWriter.java
rename to spring-data-mongodb/src/main/java/org/springframework/data/document/mongodb/MongoDocumentWriter.java
diff --git a/spring-datastore-mongodb/src/main/java/org/springframework/data/document/mongodb/MongoReader.java b/spring-data-mongodb/src/main/java/org/springframework/data/document/mongodb/MongoReader.java
similarity index 100%
rename from spring-datastore-mongodb/src/main/java/org/springframework/data/document/mongodb/MongoReader.java
rename to spring-data-mongodb/src/main/java/org/springframework/data/document/mongodb/MongoReader.java
diff --git a/spring-datastore-mongodb/src/main/java/org/springframework/data/document/mongodb/MongoReaderWriter.java b/spring-data-mongodb/src/main/java/org/springframework/data/document/mongodb/MongoReaderWriter.java
similarity index 100%
rename from spring-datastore-mongodb/src/main/java/org/springframework/data/document/mongodb/MongoReaderWriter.java
rename to spring-data-mongodb/src/main/java/org/springframework/data/document/mongodb/MongoReaderWriter.java
diff --git a/spring-datastore-mongodb/src/main/java/org/springframework/data/document/mongodb/MongoSynchronization.java b/spring-data-mongodb/src/main/java/org/springframework/data/document/mongodb/MongoSynchronization.java
similarity index 100%
rename from spring-datastore-mongodb/src/main/java/org/springframework/data/document/mongodb/MongoSynchronization.java
rename to spring-data-mongodb/src/main/java/org/springframework/data/document/mongodb/MongoSynchronization.java
diff --git a/spring-datastore-mongodb/src/main/java/org/springframework/data/document/mongodb/MongoTemplate.java b/spring-data-mongodb/src/main/java/org/springframework/data/document/mongodb/MongoTemplate.java
similarity index 99%
rename from spring-datastore-mongodb/src/main/java/org/springframework/data/document/mongodb/MongoTemplate.java
rename to spring-data-mongodb/src/main/java/org/springframework/data/document/mongodb/MongoTemplate.java
index 3ce01e6f9..7511994f8 100644
--- a/spring-datastore-mongodb/src/main/java/org/springframework/data/document/mongodb/MongoTemplate.java
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/document/mongodb/MongoTemplate.java
@@ -23,8 +23,8 @@ import java.util.List;
 import org.springframework.beans.factory.InitializingBean;
 import org.springframework.dao.DataRetrievalFailureException;
 import org.springframework.dao.InvalidDataAccessApiUsageException;
+import org.springframework.data.document.AbstractDocumentStoreTemplate;
 import org.springframework.data.document.mongodb.query.Query;
-import org.springframework.datastore.document.AbstractDocumentStoreTemplate;
 
 import com.mongodb.BasicDBObject;
 import com.mongodb.CommandResult;
diff --git a/spring-datastore-mongodb/src/main/java/org/springframework/data/document/mongodb/MongoWriter.java b/spring-data-mongodb/src/main/java/org/springframework/data/document/mongodb/MongoWriter.java
similarity index 100%
rename from spring-datastore-mongodb/src/main/java/org/springframework/data/document/mongodb/MongoWriter.java
rename to spring-data-mongodb/src/main/java/org/springframework/data/document/mongodb/MongoWriter.java
diff --git a/spring-datastore-mongodb/src/main/java/org/springframework/data/document/mongodb/SimpleMongoConverter.java b/spring-data-mongodb/src/main/java/org/springframework/data/document/mongodb/SimpleMongoConverter.java
similarity index 100%
rename from spring-datastore-mongodb/src/main/java/org/springframework/data/document/mongodb/SimpleMongoConverter.java
rename to spring-data-mongodb/src/main/java/org/springframework/data/document/mongodb/SimpleMongoConverter.java
diff --git a/spring-datastore-mongodb/src/main/java/org/springframework/data/document/mongodb/bean/factory/MongoFactoryBean.java b/spring-data-mongodb/src/main/java/org/springframework/data/document/mongodb/bean/factory/MongoFactoryBean.java
similarity index 100%
rename from spring-datastore-mongodb/src/main/java/org/springframework/data/document/mongodb/bean/factory/MongoFactoryBean.java
rename to spring-data-mongodb/src/main/java/org/springframework/data/document/mongodb/bean/factory/MongoFactoryBean.java
diff --git a/spring-datastore-mongodb/src/main/java/org/springframework/data/document/mongodb/bean/factory/MongoOptionsFactoryBean.java b/spring-data-mongodb/src/main/java/org/springframework/data/document/mongodb/bean/factory/MongoOptionsFactoryBean.java
similarity index 100%
rename from spring-datastore-mongodb/src/main/java/org/springframework/data/document/mongodb/bean/factory/MongoOptionsFactoryBean.java
rename to spring-data-mongodb/src/main/java/org/springframework/data/document/mongodb/bean/factory/MongoOptionsFactoryBean.java
diff --git a/spring-datastore-mongodb/src/main/java/org/springframework/data/document/mongodb/query/BasicQuery.java b/spring-data-mongodb/src/main/java/org/springframework/data/document/mongodb/query/BasicQuery.java
similarity index 100%
rename from spring-datastore-mongodb/src/main/java/org/springframework/data/document/mongodb/query/BasicQuery.java
rename to spring-data-mongodb/src/main/java/org/springframework/data/document/mongodb/query/BasicQuery.java
diff --git a/spring-datastore-mongodb/src/main/java/org/springframework/data/document/mongodb/query/Criteria.java b/spring-data-mongodb/src/main/java/org/springframework/data/document/mongodb/query/Criteria.java
similarity index 97%
rename from spring-datastore-mongodb/src/main/java/org/springframework/data/document/mongodb/query/Criteria.java
rename to spring-data-mongodb/src/main/java/org/springframework/data/document/mongodb/query/Criteria.java
index 62c65c040..5acf58f04 100644
--- a/spring-datastore-mongodb/src/main/java/org/springframework/data/document/mongodb/query/Criteria.java
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/document/mongodb/query/Criteria.java
@@ -19,7 +19,7 @@ import java.util.ArrayList;
 import java.util.LinkedHashMap;
 import java.util.List;
 
-import org.springframework.datastore.document.InvalidDocumentStoreApiUageException;
+import org.springframework.data.document.InvalidDocumentStoreApiUageException;
 
 import com.mongodb.BasicDBObject;
 import com.mongodb.DBObject;
diff --git a/spring-datastore-mongodb/src/main/java/org/springframework/data/document/mongodb/query/CriteriaSpec.java b/spring-data-mongodb/src/main/java/org/springframework/data/document/mongodb/query/CriteriaSpec.java
similarity index 100%
rename from spring-datastore-mongodb/src/main/java/org/springframework/data/document/mongodb/query/CriteriaSpec.java
rename to spring-data-mongodb/src/main/java/org/springframework/data/document/mongodb/query/CriteriaSpec.java
diff --git a/spring-datastore-mongodb/src/main/java/org/springframework/data/document/mongodb/query/FieldSpecification.java b/spring-data-mongodb/src/main/java/org/springframework/data/document/mongodb/query/FieldSpecification.java
similarity index 100%
rename from spring-datastore-mongodb/src/main/java/org/springframework/data/document/mongodb/query/FieldSpecification.java
rename to spring-data-mongodb/src/main/java/org/springframework/data/document/mongodb/query/FieldSpecification.java
diff --git a/spring-datastore-mongodb/src/main/java/org/springframework/data/document/mongodb/query/OrCriteria.java b/spring-data-mongodb/src/main/java/org/springframework/data/document/mongodb/query/OrCriteria.java
similarity index 100%
rename from spring-datastore-mongodb/src/main/java/org/springframework/data/document/mongodb/query/OrCriteria.java
rename to spring-data-mongodb/src/main/java/org/springframework/data/document/mongodb/query/OrCriteria.java
diff --git a/spring-datastore-mongodb/src/main/java/org/springframework/data/document/mongodb/query/Query.java b/spring-data-mongodb/src/main/java/org/springframework/data/document/mongodb/query/Query.java
similarity index 100%
rename from spring-datastore-mongodb/src/main/java/org/springframework/data/document/mongodb/query/Query.java
rename to spring-data-mongodb/src/main/java/org/springframework/data/document/mongodb/query/Query.java
diff --git a/spring-datastore-mongodb/src/main/java/org/springframework/data/document/mongodb/query/QueryBuilder.java b/spring-data-mongodb/src/main/java/org/springframework/data/document/mongodb/query/QueryBuilder.java
similarity index 100%
rename from spring-datastore-mongodb/src/main/java/org/springframework/data/document/mongodb/query/QueryBuilder.java
rename to spring-data-mongodb/src/main/java/org/springframework/data/document/mongodb/query/QueryBuilder.java
diff --git a/spring-datastore-mongodb/src/main/java/org/springframework/data/document/mongodb/query/SliceSpecification.java b/spring-data-mongodb/src/main/java/org/springframework/data/document/mongodb/query/SliceSpecification.java
similarity index 100%
rename from spring-datastore-mongodb/src/main/java/org/springframework/data/document/mongodb/query/SliceSpecification.java
rename to spring-data-mongodb/src/main/java/org/springframework/data/document/mongodb/query/SliceSpecification.java
diff --git a/spring-datastore-mongodb/src/main/java/org/springframework/data/document/mongodb/query/SortSpecification.java b/spring-data-mongodb/src/main/java/org/springframework/data/document/mongodb/query/SortSpecification.java
similarity index 100%
rename from spring-datastore-mongodb/src/main/java/org/springframework/data/document/mongodb/query/SortSpecification.java
rename to spring-data-mongodb/src/main/java/org/springframework/data/document/mongodb/query/SortSpecification.java
diff --git a/spring-datastore-mongodb/src/test/java/org/springframework/data/document/mongodb/Person.java b/spring-data-mongodb/src/test/java/org/springframework/data/document/mongodb/Person.java
similarity index 100%
rename from spring-datastore-mongodb/src/test/java/org/springframework/data/document/mongodb/Person.java
rename to spring-data-mongodb/src/test/java/org/springframework/data/document/mongodb/Person.java
diff --git a/spring-datastore-mongodb/src/test/java/org/springframework/data/document/mongodb/Portfolio.java b/spring-data-mongodb/src/test/java/org/springframework/data/document/mongodb/Portfolio.java
similarity index 100%
rename from spring-datastore-mongodb/src/test/java/org/springframework/data/document/mongodb/Portfolio.java
rename to spring-data-mongodb/src/test/java/org/springframework/data/document/mongodb/Portfolio.java
diff --git a/spring-datastore-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
similarity index 100%
rename from spring-datastore-mongodb/src/test/java/org/springframework/data/document/mongodb/SimpleMongoConverterTests.java
rename to spring-data-mongodb/src/test/java/org/springframework/data/document/mongodb/SimpleMongoConverterTests.java
diff --git a/spring-datastore-mongodb/src/test/java/org/springframework/data/document/mongodb/Trade.java b/spring-data-mongodb/src/test/java/org/springframework/data/document/mongodb/Trade.java
similarity index 100%
rename from spring-datastore-mongodb/src/test/java/org/springframework/data/document/mongodb/Trade.java
rename to spring-data-mongodb/src/test/java/org/springframework/data/document/mongodb/Trade.java
diff --git a/spring-datastore-mongodb/src/test/java/org/springframework/data/document/mongodb/User.java b/spring-data-mongodb/src/test/java/org/springframework/data/document/mongodb/User.java
similarity index 100%
rename from spring-datastore-mongodb/src/test/java/org/springframework/data/document/mongodb/User.java
rename to spring-data-mongodb/src/test/java/org/springframework/data/document/mongodb/User.java
diff --git a/spring-datastore-mongodb/src/test/java/org/springframework/data/document/mongodb/analytics/MvcAnalyticsTests.java b/spring-data-mongodb/src/test/java/org/springframework/data/document/mongodb/analytics/MvcAnalyticsTests.java
similarity index 94%
rename from spring-datastore-mongodb/src/test/java/org/springframework/data/document/mongodb/analytics/MvcAnalyticsTests.java
rename to spring-data-mongodb/src/test/java/org/springframework/data/document/mongodb/analytics/MvcAnalyticsTests.java
index 631af6a1a..c18225a40 100644
--- a/spring-datastore-mongodb/src/test/java/org/springframework/data/document/mongodb/analytics/MvcAnalyticsTests.java
+++ b/spring-data-mongodb/src/test/java/org/springframework/data/document/mongodb/analytics/MvcAnalyticsTests.java
@@ -11,11 +11,11 @@ import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Ignore;
 import org.junit.Test;
+import org.springframework.data.document.analytics.ControllerCounter;
+import org.springframework.data.document.analytics.MvcEvent;
+import org.springframework.data.document.analytics.Parameters;
 import org.springframework.data.document.mongodb.MongoReader;
 import org.springframework.data.document.mongodb.MongoTemplate;
-import org.springframework.datastore.document.analytics.ControllerCounter;
-import org.springframework.datastore.document.analytics.MvcEvent;
-import org.springframework.datastore.document.analytics.Parameters;
 
 import com.mongodb.BasicDBList;
 import com.mongodb.BasicDBObject;
diff --git a/spring-datastore-mongodb/src/test/resources/log4j.properties b/spring-data-mongodb/src/test/resources/log4j.properties
similarity index 100%
rename from spring-datastore-mongodb/src/test/resources/log4j.properties
rename to spring-data-mongodb/src/test/resources/log4j.properties
diff --git a/spring-datastore-mongodb/src/test/resources/org/springframework/datastore/document/mongodb/MongoBeanPropertyDocumentMapper-context.xml b/spring-data-mongodb/src/test/resources/org/springframework/datastore/document/mongodb/MongoBeanPropertyDocumentMapper-context.xml
similarity index 100%
rename from spring-datastore-mongodb/src/test/resources/org/springframework/datastore/document/mongodb/MongoBeanPropertyDocumentMapper-context.xml
rename to spring-data-mongodb/src/test/resources/org/springframework/datastore/document/mongodb/MongoBeanPropertyDocumentMapper-context.xml
diff --git a/spring-datastore-mongodb/template.mf b/spring-data-mongodb/template.mf
similarity index 68%
rename from spring-datastore-mongodb/template.mf
rename to spring-data-mongodb/template.mf
index 773426f68..66246669d 100644
--- a/spring-datastore-mongodb/template.mf
+++ b/spring-data-mongodb/template.mf
@@ -1,5 +1,5 @@
-Bundle-SymbolicName: org.springframework.datastore.mongodb
-Bundle-Name: Spring Datastore Mongo DB Support
+Bundle-SymbolicName: org.springframework.data.mongodb
+Bundle-Name: Spring Data Mongo DB Support
 Bundle-Vendor: SpringSource
 Bundle-ManifestVersion: 2
 Import-Package: 
@@ -11,9 +11,7 @@ Import-Template:
  org.springframework.util.*;version="[3.0.0, 4.0.0)",
  org.springframework.transaction.*;version="[3.0.0, 4.0.0)",
  org.springframework.data.core.*;version="[1.0.0, 2.0.0)",
- org.springframework.datastore.core.*;version="[1.0.0, 2.0.0)",
- org.springframework.datastore.persistence.*;version="[1.0.0, 2.0.0)",
- org.springframework.datastore.document.*;version="[1.0.0, 2.0.0)",
+ org.springframework.data.document.*;version="[1.0.0, 2.0.0)",
  com.mongodb.*;version="0",
  org.bson.*;version="0",
  org.aopalliance.*;version="[1.0.0, 2.0.0)";resolution:=optional,