diff --git a/spring-data-mongodb-cross-store/src/main/java/org/springframework/data/persistence/mongodb/DocumentBacked.java b/spring-data-mongodb-cross-store/src/main/java/org/springframework/data/mongodb/crossstore/DocumentBacked.java
similarity index 69%
rename from spring-data-mongodb-cross-store/src/main/java/org/springframework/data/persistence/mongodb/DocumentBacked.java
rename to spring-data-mongodb-cross-store/src/main/java/org/springframework/data/mongodb/crossstore/DocumentBacked.java
index 466a039c4..066cc8bb7 100644
--- a/spring-data-mongodb-cross-store/src/main/java/org/springframework/data/persistence/mongodb/DocumentBacked.java
+++ b/spring-data-mongodb-cross-store/src/main/java/org/springframework/data/mongodb/crossstore/DocumentBacked.java
@@ -1,4 +1,4 @@
-package org.springframework.data.persistence.mongodb;
+package org.springframework.data.mongodb.crossstore;
 
 import org.springframework.data.persistence.ChangeSetBacked;
 
diff --git a/spring-data-mongodb-cross-store/src/main/java/org/springframework/data/persistence/mongodb/MongoChangeSetPersister.java b/spring-data-mongodb-cross-store/src/main/java/org/springframework/data/mongodb/crossstore/MongoChangeSetPersister.java
similarity index 96%
rename from spring-data-mongodb-cross-store/src/main/java/org/springframework/data/persistence/mongodb/MongoChangeSetPersister.java
rename to spring-data-mongodb-cross-store/src/main/java/org/springframework/data/mongodb/crossstore/MongoChangeSetPersister.java
index c895eb069..bceb0ed54 100644
--- a/spring-data-mongodb-cross-store/src/main/java/org/springframework/data/persistence/mongodb/MongoChangeSetPersister.java
+++ b/spring-data-mongodb-cross-store/src/main/java/org/springframework/data/mongodb/crossstore/MongoChangeSetPersister.java
@@ -1,4 +1,4 @@
-package org.springframework.data.persistence.mongodb;
+package org.springframework.data.mongodb.crossstore;
 
 import javax.persistence.EntityManagerFactory;
 
diff --git a/spring-data-mongodb-cross-store/src/main/java/org/springframework/data/persistence/mongodb/MongoDocumentBacking.aj b/spring-data-mongodb-cross-store/src/main/java/org/springframework/data/mongodb/crossstore/MongoDocumentBacking.aj
similarity index 98%
rename from spring-data-mongodb-cross-store/src/main/java/org/springframework/data/persistence/mongodb/MongoDocumentBacking.aj
rename to spring-data-mongodb-cross-store/src/main/java/org/springframework/data/mongodb/crossstore/MongoDocumentBacking.aj
index 45af4e4e4..7cd18d9b9 100644
--- a/spring-data-mongodb-cross-store/src/main/java/org/springframework/data/persistence/mongodb/MongoDocumentBacking.aj
+++ b/spring-data-mongodb-cross-store/src/main/java/org/springframework/data/mongodb/crossstore/MongoDocumentBacking.aj
@@ -1,4 +1,4 @@
-package org.springframework.data.persistence.mongodb;
+package org.springframework.data.mongodb.crossstore;
 
 import java.lang.reflect.Field;
 
@@ -13,8 +13,8 @@ import org.aspectj.lang.reflect.FieldSignature;
 
 import org.springframework.dao.DataAccessException;
 
-import org.springframework.data.persistence.mongodb.RelatedDocument;
-import org.springframework.data.persistence.mongodb.DocumentBacked;
+import org.springframework.data.mongodb.crossstore.RelatedDocument;
+import org.springframework.data.mongodb.crossstore.DocumentBacked;
 import org.springframework.data.persistence.ChangeSetBackedTransactionSynchronization;
 import org.springframework.data.persistence.ChangeSet;
 import org.springframework.data.persistence.ChangeSetPersister;
diff --git a/spring-data-mongodb-cross-store/src/main/java/org/springframework/data/persistence/mongodb/RelatedDocument.java b/spring-data-mongodb-cross-store/src/main/java/org/springframework/data/mongodb/crossstore/RelatedDocument.java
similarity index 94%
rename from spring-data-mongodb-cross-store/src/main/java/org/springframework/data/persistence/mongodb/RelatedDocument.java
rename to spring-data-mongodb-cross-store/src/main/java/org/springframework/data/mongodb/crossstore/RelatedDocument.java
index 353a4d313..ab65928bb 100644
--- a/spring-data-mongodb-cross-store/src/main/java/org/springframework/data/persistence/mongodb/RelatedDocument.java
+++ b/spring-data-mongodb-cross-store/src/main/java/org/springframework/data/mongodb/crossstore/RelatedDocument.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.data.persistence.mongodb;
+package org.springframework.data.mongodb.crossstore;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
diff --git a/spring-data-mongodb-cross-store/src/test/java/org/springframework/data/document/persistence/CrossStoreMongoTests.java b/spring-data-mongodb-cross-store/src/test/java/org/springframework/data/mongodb/crossstore/CrossStoreMongoTests.java
similarity index 95%
rename from spring-data-mongodb-cross-store/src/test/java/org/springframework/data/document/persistence/CrossStoreMongoTests.java
rename to spring-data-mongodb-cross-store/src/test/java/org/springframework/data/mongodb/crossstore/CrossStoreMongoTests.java
index 545f17eb8..733d7ac32 100644
--- a/spring-data-mongodb-cross-store/src/test/java/org/springframework/data/document/persistence/CrossStoreMongoTests.java
+++ b/spring-data-mongodb-cross-store/src/test/java/org/springframework/data/mongodb/crossstore/CrossStoreMongoTests.java
@@ -1,4 +1,4 @@
-package org.springframework.data.document.persistence;
+package org.springframework.data.mongodb.crossstore;
 
 import javax.persistence.EntityManager;
 import javax.persistence.PersistenceContext;
@@ -7,10 +7,10 @@ import org.junit.Assert;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.data.document.persistence.test.Address;
-import org.springframework.data.document.persistence.test.Person;
-import org.springframework.data.document.persistence.test.Resume;
 import org.springframework.data.mongodb.core.MongoTemplate;
+import org.springframework.data.mongodb.crossstore.test.Address;
+import org.springframework.data.mongodb.crossstore.test.Person;
+import org.springframework.data.mongodb.crossstore.test.Resume;
 import org.springframework.test.annotation.Rollback;
 import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
diff --git a/spring-data-mongodb-cross-store/src/test/java/org/springframework/data/document/persistence/test/Address.java b/spring-data-mongodb-cross-store/src/test/java/org/springframework/data/mongodb/crossstore/test/Address.java
similarity index 94%
rename from spring-data-mongodb-cross-store/src/test/java/org/springframework/data/document/persistence/test/Address.java
rename to spring-data-mongodb-cross-store/src/test/java/org/springframework/data/mongodb/crossstore/test/Address.java
index fb8f77ab4..911ac4f38 100644
--- a/spring-data-mongodb-cross-store/src/test/java/org/springframework/data/document/persistence/test/Address.java
+++ b/spring-data-mongodb-cross-store/src/test/java/org/springframework/data/mongodb/crossstore/test/Address.java
@@ -1,4 +1,4 @@
-package org.springframework.data.document.persistence.test;
+package org.springframework.data.mongodb.crossstore.test;
 
 public class Address {
 	
diff --git a/spring-data-mongodb-cross-store/src/test/java/org/springframework/data/document/persistence/test/Person.java b/spring-data-mongodb-cross-store/src/test/java/org/springframework/data/mongodb/crossstore/test/Person.java
similarity index 90%
rename from spring-data-mongodb-cross-store/src/test/java/org/springframework/data/document/persistence/test/Person.java
rename to spring-data-mongodb-cross-store/src/test/java/org/springframework/data/mongodb/crossstore/test/Person.java
index 33a4db2ec..c7649888e 100644
--- a/spring-data-mongodb-cross-store/src/test/java/org/springframework/data/document/persistence/test/Person.java
+++ b/spring-data-mongodb-cross-store/src/test/java/org/springframework/data/mongodb/crossstore/test/Person.java
@@ -1,9 +1,9 @@
-package org.springframework.data.document.persistence.test;
+package org.springframework.data.mongodb.crossstore.test;
 
 import javax.persistence.Entity;
 import javax.persistence.Id;
 
-import org.springframework.data.persistence.mongodb.RelatedDocument;
+import org.springframework.data.mongodb.crossstore.RelatedDocument;
 
 @Entity
 public class Person {
diff --git a/spring-data-mongodb-cross-store/src/test/java/org/springframework/data/document/persistence/test/Resume.java b/spring-data-mongodb-cross-store/src/test/java/org/springframework/data/mongodb/crossstore/test/Resume.java
similarity index 94%
rename from spring-data-mongodb-cross-store/src/test/java/org/springframework/data/document/persistence/test/Resume.java
rename to spring-data-mongodb-cross-store/src/test/java/org/springframework/data/mongodb/crossstore/test/Resume.java
index f5e439848..d977ce7e1 100644
--- a/spring-data-mongodb-cross-store/src/test/java/org/springframework/data/document/persistence/test/Resume.java
+++ b/spring-data-mongodb-cross-store/src/test/java/org/springframework/data/mongodb/crossstore/test/Resume.java
@@ -1,4 +1,4 @@
-package org.springframework.data.document.persistence.test;
+package org.springframework.data.mongodb.crossstore.test;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
diff --git a/spring-data-mongodb-cross-store/src/test/resources/META-INF/persistence.xml b/spring-data-mongodb-cross-store/src/test/resources/META-INF/persistence.xml
index 60ff84633..878fff47b 100644
--- a/spring-data-mongodb-cross-store/src/test/resources/META-INF/persistence.xml
+++ b/spring-data-mongodb-cross-store/src/test/resources/META-INF/persistence.xml
@@ -4,7 +4,7 @@
              xsi:schemaLocation="http://java.sun.com/xml/ns/persistence http://java.sun.com/xml/ns/persistence/persistence_2_0.xsd">
   <persistence-unit name="test" transaction-type="RESOURCE_LOCAL">
     <provider>org.hibernate.ejb.HibernatePersistence</provider>
-    <class>org.springframework.data.document.persistence.test.Person</class>
+    <class>org.springframework.data.mongodb.crossstore.test.Person</class>
     <properties>
       <property name="hibernate.dialect" value="org.hibernate.dialect.HSQLDialect"/>
       <!--value='create' to build a new database on each run; value='update' to modify an existing database; value='create-drop' means the same as 'create' but also drops tables when Hibernate closes; value='validate' makes no changes to the database-->
diff --git a/spring-data-mongodb-cross-store/src/test/resources/META-INF/spring/applicationContext.xml b/spring-data-mongodb-cross-store/src/test/resources/META-INF/spring/applicationContext.xml
index 41e5d9571..946829665 100644
--- a/spring-data-mongodb-cross-store/src/test/resources/META-INF/spring/applicationContext.xml
+++ b/spring-data-mongodb-cross-store/src/test/resources/META-INF/spring/applicationContext.xml
@@ -13,7 +13,7 @@
 
   <context:spring-configured/>
 
-  <context:component-scan base-package="org.springframework.persistence.test">
+  <context:component-scan base-package="org.springframework.persistence.mongodb.test">
     <context:exclude-filter expression="org.springframework.stereotype.Controller" type="annotation"/>
   </context:component-scan>
 
@@ -38,12 +38,12 @@
   <bean class="org.springframework.data.mongodb.core.MongoExceptionTranslator"/>
 
   <!--  Mongo aspect config -->
-  <bean class="org.springframework.data.persistence.mongodb.MongoDocumentBacking"
+  <bean class="org.springframework.data.mongodb.crossstore.MongoDocumentBacking"
         factory-method="aspectOf">
     <property name="changeSetPersister" ref="mongoChangeSetPersister"/>
   </bean>
   <bean id="mongoChangeSetPersister" 
-      class="org.springframework.data.persistence.mongodb.MongoChangeSetPersister">
+      class="org.springframework.data.mongodb.crossstore.MongoChangeSetPersister">
     <property name="mongoTemplate" ref="mongoTemplate"/>
     <property name="entityManagerFactory" ref="entityManagerFactory"/>
   </bean>