diff --git a/src/main/java/org/springframework/data/jpa/domain/AbstractAuditable.java b/src/main/java/org/springframework/data/jpa/domain/AbstractAuditable.java
index 2ab819327..384fbe331 100644
--- a/src/main/java/org/springframework/data/jpa/domain/AbstractAuditable.java
+++ b/src/main/java/org/springframework/data/jpa/domain/AbstractAuditable.java
@@ -58,7 +58,7 @@ public abstract class AbstractAuditable<U, PK extends Serializable> extends
     /*
      * (non-Javadoc)
      * 
-     * @see org.synyx.hades.domain.auditing.Auditable#getCreatedBy()
+     * @see org.springframework.data.domain.Auditable#getCreatedBy()
      */
     public U getCreatedBy() {
 
@@ -70,7 +70,7 @@ public abstract class AbstractAuditable<U, PK extends Serializable> extends
      * (non-Javadoc)
      * 
      * @see
-     * org.synyx.hades.domain.auditing.Auditable#setCreatedBy(java.lang.Object)
+     * org.springframework.data.domain.Auditable#setCreatedBy(java.lang.Object)
      */
     public void setCreatedBy(final U createdBy) {
 
@@ -81,7 +81,7 @@ public abstract class AbstractAuditable<U, PK extends Serializable> extends
     /*
      * (non-Javadoc)
      * 
-     * @see org.synyx.hades.domain.auditing.Auditable#getCreatedDate()
+     * @see org.springframework.data.domain.Auditable#getCreatedDate()
      */
     public DateTime getCreatedDate() {
 
@@ -93,7 +93,7 @@ public abstract class AbstractAuditable<U, PK extends Serializable> extends
      * (non-Javadoc)
      * 
      * @see
-     * org.synyx.hades.domain.auditing.Auditable#setCreatedDate(org.joda.time
+     * org.springframework.data.domain.Auditable#setCreatedDate(org.joda.time
      * .DateTime)
      */
     public void setCreatedDate(final DateTime createdDate) {
@@ -105,7 +105,7 @@ public abstract class AbstractAuditable<U, PK extends Serializable> extends
     /*
      * (non-Javadoc)
      * 
-     * @see org.synyx.hades.domain.auditing.Auditable#getLastModifiedBy()
+     * @see org.springframework.data.domain.Auditable#getLastModifiedBy()
      */
     public U getLastModifiedBy() {
 
@@ -117,7 +117,7 @@ public abstract class AbstractAuditable<U, PK extends Serializable> extends
      * (non-Javadoc)
      * 
      * @see
-     * org.synyx.hades.domain.auditing.Auditable#setLastModifiedBy(java.lang
+     * org.springframework.data.domain.Auditable#setLastModifiedBy(java.lang
      * .Object)
      */
     public void setLastModifiedBy(final U lastModifiedBy) {
@@ -129,7 +129,7 @@ public abstract class AbstractAuditable<U, PK extends Serializable> extends
     /*
      * (non-Javadoc)
      * 
-     * @see org.synyx.hades.domain.auditing.Auditable#getLastModifiedDate()
+     * @see org.springframework.data.domain.Auditable#getLastModifiedDate()
      */
     public DateTime getLastModifiedDate() {
 
@@ -141,7 +141,7 @@ public abstract class AbstractAuditable<U, PK extends Serializable> extends
      * (non-Javadoc)
      * 
      * @see
-     * org.synyx.hades.domain.auditing.Auditable#setLastModifiedDate(org.joda
+     * org.springframework.data.domain.Auditable#setLastModifiedDate(org.joda
      * .time.DateTime)
      */
     public void setLastModifiedDate(final DateTime lastModifiedDate) {
diff --git a/src/main/java/org/springframework/data/jpa/domain/AbstractPersistable.java b/src/main/java/org/springframework/data/jpa/domain/AbstractPersistable.java
index aae7270bc..77156bcd5 100644
--- a/src/main/java/org/springframework/data/jpa/domain/AbstractPersistable.java
+++ b/src/main/java/org/springframework/data/jpa/domain/AbstractPersistable.java
@@ -48,7 +48,7 @@ public abstract class AbstractPersistable<PK extends Serializable> implements
     /*
      * (non-Javadoc)
      * 
-     * @see org.synyx.hades.hades.jpa.support.Entity#getId()
+     * @see org.springframework.data.domain.Persistable#getId()
      */
     public PK getId() {
 
@@ -70,7 +70,7 @@ public abstract class AbstractPersistable<PK extends Serializable> implements
     /*
      * (non-Javadoc)
      * 
-     * @see org.synyx.hades.hades.jpa.support.Entity#isNew()
+     * @see org.springframework.data.domain.Persistable#isNew()
      */
     public boolean isNew() {
 
diff --git a/src/main/java/org/springframework/data/jpa/domain/Specifications.java b/src/main/java/org/springframework/data/jpa/domain/Specifications.java
index 2a8bb1af4..70eb713bf 100644
--- a/src/main/java/org/springframework/data/jpa/domain/Specifications.java
+++ b/src/main/java/org/springframework/data/jpa/domain/Specifications.java
@@ -21,7 +21,6 @@ import javax.persistence.criteria.Predicate;
 import javax.persistence.criteria.Root;
 
 
-
 /**
  * Helper class to easily combine {@link Specification} instances.
  * 
@@ -122,9 +121,8 @@ public class Specifications<T> implements Specification<T> {
     /*
      * (non-Javadoc)
      * 
-     * @see
-     * org.synyx.hades.domain.Specification#toPredicate(javax.persistence.criteria
-     * .Root, javax.persistence.criteria.CriteriaQuery,
+     * @see org.springframework.data.jpa.domain.Specification#toPredicate(javax.
+     * persistence.criteria.Root, javax.persistence.criteria.CriteriaQuery,
      * javax.persistence.criteria.CriteriaBuilder)
      */
     public Predicate toPredicate(Root<T> root, CriteriaQuery<?> query,
diff --git a/src/main/java/org/springframework/data/jpa/domain/support/AuditingEntityListener.java b/src/main/java/org/springframework/data/jpa/domain/support/AuditingEntityListener.java
index 5fc374158..4f9d16a7f 100644
--- a/src/main/java/org/springframework/data/jpa/domain/support/AuditingEntityListener.java
+++ b/src/main/java/org/springframework/data/jpa/domain/support/AuditingEntityListener.java
@@ -45,7 +45,7 @@ import org.springframework.data.domain.AuditorAware;
  * After that it's just a matter of activating auditing in your Spring config:
  * 
  * <pre>
- * &lt;hades:auditing auditor-aware-ref="yourAuditorAwarebean" /&gt;
+ * &lt;jpa:auditing auditor-aware-ref="yourAuditorAwarebean" /&gt;
  * </pre>
  * 
  * @author Oliver Gierke
diff --git a/src/main/java/org/springframework/data/jpa/repository/config/SimpleJpaRepositoryConfiguration.java b/src/main/java/org/springframework/data/jpa/repository/config/SimpleJpaRepositoryConfiguration.java
index ff205d9a6..f022ca655 100644
--- a/src/main/java/org/springframework/data/jpa/repository/config/SimpleJpaRepositoryConfiguration.java
+++ b/src/main/java/org/springframework/data/jpa/repository/config/SimpleJpaRepositoryConfiguration.java
@@ -74,10 +74,10 @@ public class SimpleJpaRepositoryConfiguration
     }
 
 
-    /*
-     * (non-Javadoc)
+    /**
+     * Returns the name of the entity manager factory bean.
      * 
-     * @see org.synyx.hades.dao.config.DaoConfigContext#getEntityManagerRef()
+     * @return
      */
     public String getEntityManagerFactoryRef() {
 
@@ -89,10 +89,6 @@ public class SimpleJpaRepositoryConfiguration
             AutomaticRepositoryConfigInformation<SimpleJpaRepositoryConfiguration>
             implements JpaRepositoryConfiguration {
 
-        /**
-         * @param interfaceName
-         * @param parent
-         */
         public AutomaticJpaRepositoryConfigInformation(String interfaceName,
                 SimpleJpaRepositoryConfiguration parent) {
 
@@ -116,10 +112,6 @@ public class SimpleJpaRepositoryConfiguration
             ManualRepositoryConfigInformation<SimpleJpaRepositoryConfiguration>
             implements JpaRepositoryConfiguration {
 
-        /**
-         * @param element
-         * @param parent
-         */
         public ManualJpaRepositoryConfigInformation(Element element,
                 SimpleJpaRepositoryConfiguration parent) {
 
@@ -130,8 +122,9 @@ public class SimpleJpaRepositoryConfiguration
         /*
          * (non-Javadoc)
          * 
-         * @see
-         * org.synyx.hades.dao.config.DaoConfigContext#getEntityManagerRef()
+         * @see org.springframework.data.jpa.repository.config.
+         * SimpleJpaRepositoryConfiguration
+         * .JpaRepositoryConfiguration#getEntityManagerFactoryRef()
          */
         public String getEntityManagerFactoryRef() {
 
diff --git a/src/main/java/org/springframework/data/jpa/repository/query/JpaQueryExecution.java b/src/main/java/org/springframework/data/jpa/repository/query/JpaQueryExecution.java
index 336ed8c2e..cad02ccaf 100644
--- a/src/main/java/org/springframework/data/jpa/repository/query/JpaQueryExecution.java
+++ b/src/main/java/org/springframework/data/jpa/repository/query/JpaQueryExecution.java
@@ -21,6 +21,7 @@ import javax.persistence.EntityManager;
 import javax.persistence.NoResultException;
 import javax.persistence.Query;
 
+import org.springframework.data.domain.Page;
 import org.springframework.data.domain.PageImpl;
 import org.springframework.data.repository.query.Parameters;
 import org.springframework.data.repository.query.QueryMethod;
@@ -29,16 +30,17 @@ import org.springframework.util.Assert;
 
 
 /**
- * Enum to contain query execution strategies. Depending (mostly) on the return
- * type of a {@link QueryMethod} a {@link HadesQuery} can be executed in various
- * flavours.
+ * Set of classes to contain query execution strategies. Depending (mostly) on
+ * the return type of a {@link QueryMethod} a
+ * {@link AbstractStringBasedJpaQuery} can be executed in various flavours.
  * 
  * @author Oliver Gierke
  */
 public abstract class JpaQueryExecution {
 
     /**
-     * Executes the given {@link HadesQuery} with the given {@link Parameters}.
+     * Executes the given {@link AbstractStringBasedJpaQuery} with the given
+     * {@link ParameterBinder}.
      * 
      * @param query
      * @param binder
@@ -73,8 +75,8 @@ public abstract class JpaQueryExecution {
 
 
     /**
-     * Method to implement {@link AbstractHadesQuery} executions by single enum
-     * values.
+     * Method to implement {@link AbstractStringBasedJpaQuery} executions by
+     * single enum values.
      * 
      * @param query
      * @param binder
@@ -88,8 +90,8 @@ public abstract class JpaQueryExecution {
             Object[] parameters);
 
     /**
-     * Executes the {@link HadesQuery} to return a simple collection of
-     * entities.
+     * Executes the {@link AbstractStringBasedJpaQuery} to return a simple
+     * collection of entities.
      */
     static class CollectionExecution extends JpaQueryExecution {
 
@@ -117,8 +119,8 @@ public abstract class JpaQueryExecution {
     }
 
     /**
-     * Executes the {@link HadesQuery} to return a
-     * {@link org.synyx.hades.domain.Page} of entities.
+     * Executes the {@link AbstractStringBasedJpaQuery} to return a {@link Page}
+     * of entities.
      */
     static class PagedExecution extends JpaQueryExecution {
 
@@ -174,7 +176,7 @@ public abstract class JpaQueryExecution {
     }
 
     /**
-     * Executes a {@link HadesQuery} to return a single entity.
+     * Executes a {@link AbstractStringBasedJpaQuery} to return a single entity.
      */
     static class SingleEntityExecution extends JpaQueryExecution {
 
diff --git a/src/main/java/org/springframework/data/jpa/repository/query/JpaQueryLookupStrategy.java b/src/main/java/org/springframework/data/jpa/repository/query/JpaQueryLookupStrategy.java
index b32e5804b..caae815e6 100644
--- a/src/main/java/org/springframework/data/jpa/repository/query/JpaQueryLookupStrategy.java
+++ b/src/main/java/org/springframework/data/jpa/repository/query/JpaQueryLookupStrategy.java
@@ -116,7 +116,7 @@ public class JpaQueryLookupStrategy {
                 EntityManager em) {
 
             RepositoryQuery query =
-                    SimpleJpaQuery.fromHadesAnnotation(method, em);
+                    SimpleJpaQuery.fromQueryAnnotation(method, em);
 
             if (null != query) {
                 return query;
@@ -130,7 +130,7 @@ public class JpaQueryLookupStrategy {
 
             throw new IllegalStateException(
                     String.format(
-                            "Did neither find a NamedQuery nor a Hades Query for method %s!",
+                            "Did neither find a NamedQuery nor an annotated query for method %s!",
                             method));
         }
 
diff --git a/src/main/java/org/springframework/data/jpa/repository/query/NamedQuery.java b/src/main/java/org/springframework/data/jpa/repository/query/NamedQuery.java
index 1c64e467f..5c26d15be 100644
--- a/src/main/java/org/springframework/data/jpa/repository/query/NamedQuery.java
+++ b/src/main/java/org/springframework/data/jpa/repository/query/NamedQuery.java
@@ -117,8 +117,10 @@ final class NamedQuery extends AbstractStringBasedJpaQuery {
      * (non-Javadoc)
      * 
      * @see
-     * org.synyx.hades.dao.query.AbstractHadesQuery#createQuery(javax.persistence
-     * .EntityManager, org.synyx.hades.dao.query.ParameterBinder)
+     * org.springframework.data.jpa.repository.query.AbstractStringBasedJpaQuery
+     * #
+     * createQuery(org.springframework.data.jpa.repository.query.ParameterBinder
+     * )
      */
     @Override
     protected Query createQuery(ParameterBinder binder) {
@@ -130,8 +132,10 @@ final class NamedQuery extends AbstractStringBasedJpaQuery {
     /*
      * (non-Javadoc)
      * 
-     * @see org.synyx.hades.dao.query.AbstractHadesQuery#createCountQuery(javax.
-     * persistence.EntityManager)
+     * @see
+     * org.springframework.data.jpa.repository.query.AbstractStringBasedJpaQuery
+     * #createCountQuery(org.springframework.data.jpa.repository.query.
+     * ParameterBinder)
      */
     @Override
     protected Query createCountQuery(ParameterBinder binder) {
diff --git a/src/main/java/org/springframework/data/jpa/repository/query/SimpleJpaQuery.java b/src/main/java/org/springframework/data/jpa/repository/query/SimpleJpaQuery.java
index e1295f445..dec83bb02 100644
--- a/src/main/java/org/springframework/data/jpa/repository/query/SimpleJpaQuery.java
+++ b/src/main/java/org/springframework/data/jpa/repository/query/SimpleJpaQuery.java
@@ -28,9 +28,9 @@ import org.springframework.data.repository.query.RepositoryQuery;
 
 
 /**
- * {@link HadesQuery} implementation that inspects a {@link QueryMethod} for the
- * existanve of an {@link org.synyx.hades.dao.Query} annotation and creates a
- * JPA {@link Query} from it.
+ * {@link RepositoryQuery} implementation that inspects a {@link QueryMethod}
+ * for the existanve of an {@link org.springframework.data.jpa.repository.Query}
+ * annotation and creates a JPA {@link Query} from it.
  * 
  * @author Oliver Gierke
  */
@@ -66,8 +66,10 @@ final class SimpleJpaQuery extends AbstractStringBasedJpaQuery {
      * (non-Javadoc)
      * 
      * @see
-     * org.synyx.hades.dao.query.AbstractHadesQuery#createQuery(javax.persistence
-     * .EntityManager, org.synyx.hades.dao.query.ParameterBinder)
+     * org.springframework.data.jpa.repository.query.AbstractStringBasedJpaQuery
+     * #
+     * createQuery(org.springframework.data.jpa.repository.query.ParameterBinder
+     * )
      */
     @Override
     public Query createQuery(ParameterBinder binder) {
@@ -111,18 +113,19 @@ final class SimpleJpaQuery extends AbstractStringBasedJpaQuery {
 
 
     /**
-     * Creates a {@link HadesQuery} from the given {@link QueryMethod} that is
-     * potentially annotated with {@link org.synyx.hades.dao.Query}.
+     * Creates a {@link RepositoryQuery} from the given {@link QueryMethod} that
+     * is potentially annotated with
+     * {@link org.springframework.data.jpa.repository.Query}.
      * 
      * @param queryMethod
      * @param em
-     * @return the {@link HadesQuery} derived from the annotation or
+     * @return the {@link RepositoryQuery} derived from the annotation or
      *         {@code null} if no annotation found.
      */
-    public static RepositoryQuery fromHadesAnnotation(
+    public static RepositoryQuery fromQueryAnnotation(
             JpaQueryMethod queryMethod, EntityManager em) {
 
-        LOG.debug("Looking up Hades query for method %s", queryMethod.getName());
+        LOG.debug("Looking up query for method %s", queryMethod.getName());
 
         String query = queryMethod.getAnnotatedQuery();
 
diff --git a/src/main/java/org/springframework/data/jpa/repository/support/PersistenceProvider.java b/src/main/java/org/springframework/data/jpa/repository/support/PersistenceProvider.java
index 4cc0d72e8..ec2b01574 100644
--- a/src/main/java/org/springframework/data/jpa/repository/support/PersistenceProvider.java
+++ b/src/main/java/org/springframework/data/jpa/repository/support/PersistenceProvider.java
@@ -138,7 +138,9 @@ enum PersistenceProvider implements QueryExtractor {
     /*
      * (non-Javadoc)
      * 
-     * @see org.synyx.hades.dao.query.QueryExtractor#canExtractQuery()
+     * @see
+     * org.springframework.data.jpa.repository.query.QueryExtractor#canExtractQuery
+     * ()
      */
     public boolean canExtractQuery() {
 
diff --git a/src/test/java/org/springframework/data/jpa/domain/sample/AuditorAwareStub.java b/src/test/java/org/springframework/data/jpa/domain/sample/AuditorAwareStub.java
index 902460dfc..13b90124a 100644
--- a/src/test/java/org/springframework/data/jpa/domain/sample/AuditorAwareStub.java
+++ b/src/test/java/org/springframework/data/jpa/domain/sample/AuditorAwareStub.java
@@ -29,7 +29,7 @@ public class AuditorAwareStub implements AuditorAware<User> {
     /*
      * (non-Javadoc)
      * 
-     * @see org.synyx.hades.domain.auditing.AuditorAware#getCurrentAuditor()
+     * @see org.springframework.data.domain.AuditorAware#getCurrentAuditor()
      */
     public User getCurrentAuditor() {
 
diff --git a/src/test/java/org/springframework/data/jpa/domain/sample/Role.java b/src/test/java/org/springframework/data/jpa/domain/sample/Role.java
index d0823440e..a69556d6e 100644
--- a/src/test/java/org/springframework/data/jpa/domain/sample/Role.java
+++ b/src/test/java/org/springframework/data/jpa/domain/sample/Role.java
@@ -62,10 +62,10 @@ public class Role {
     }
 
 
-    /*
-     * (non-Javadoc)
+    /**
+     * Returns the id.
      * 
-     * @see org.synyx.hades.jpa.support.Entity#getId()
+     * @return
      */
     public Integer getId() {
 
@@ -85,10 +85,10 @@ public class Role {
     }
 
 
-    /*
-     * (non-Javadoc)
+    /**
+     * Returns whether the role is to be considered new.
      * 
-     * @see org.synyx.hades.jpa.support.Entity#isNew()
+     * @return
      */
     public boolean isNew() {
 
diff --git a/src/test/java/org/springframework/data/jpa/domain/support/AuditingNamespaceUnitTests.java b/src/test/java/org/springframework/data/jpa/domain/support/AuditingNamespaceUnitTests.java
index 5cba1a0f8..1a17b7e1a 100644
--- a/src/test/java/org/springframework/data/jpa/domain/support/AuditingNamespaceUnitTests.java
+++ b/src/test/java/org/springframework/data/jpa/domain/support/AuditingNamespaceUnitTests.java
@@ -20,11 +20,10 @@ import static org.junit.Assert.*;
 import org.junit.Test;
 import org.springframework.beans.factory.config.BeanDefinition;
 import org.springframework.beans.factory.config.RuntimeBeanReference;
-import org.springframework.data.jpa.domain.support.AuditingEntityListener;
 
 
 /**
- * Unit test for the Hades {@code auditing} namespace element.
+ * Unit test for the JPA {@code auditing} namespace element.
  * 
  * @author Oliver Gierke
  */
@@ -34,9 +33,8 @@ public class AuditingNamespaceUnitTests extends
     /*
      * (non-Javadoc)
      * 
-     * @see
-     * org.synyx.hades.domain.auditing.AuditingBeanFactoryPostProcessorUnitTest
-     * #getConfigFile()
+     * @see org.springframework.data.jpa.domain.support.
+     * AuditingBeanFactoryPostProcessorUnitTests#getConfigFile()
      */
     @Override
     protected String getConfigFile() {
diff --git a/src/test/java/org/springframework/data/jpa/repository/EclipseLinkNamespaceUserRepositoryTests.java b/src/test/java/org/springframework/data/jpa/repository/EclipseLinkNamespaceUserRepositoryTests.java
index 9f45d8240..d6b95b7fe 100644
--- a/src/test/java/org/springframework/data/jpa/repository/EclipseLinkNamespaceUserRepositoryTests.java
+++ b/src/test/java/org/springframework/data/jpa/repository/EclipseLinkNamespaceUserRepositoryTests.java
@@ -16,11 +16,12 @@
 package org.springframework.data.jpa.repository;
 
 import org.junit.Ignore;
+import org.springframework.data.jpa.repository.sample.UserRepository;
 
 
 /**
- * Testcase to run {@link org.synyx.hades.dao.UserDao} integration tests on top
- * of EclipseLink. So far not running as of an EclipseLink bug.
+ * Testcase to run {@link UserRepository} integration tests on top of
+ * EclipseLink. So far not running as of an EclipseLink bug.
  * 
  * @see https://bugs.eclipse.org/bugs/show_bug.cgi?id=312132
  * @author Oliver Gierke
diff --git a/src/test/java/org/springframework/data/jpa/repository/OpenJpaNamespaceUserDaoTests.java b/src/test/java/org/springframework/data/jpa/repository/OpenJpaNamespaceUserDaoTests.java
index 67509b35f..1d336d481 100644
--- a/src/test/java/org/springframework/data/jpa/repository/OpenJpaNamespaceUserDaoTests.java
+++ b/src/test/java/org/springframework/data/jpa/repository/OpenJpaNamespaceUserDaoTests.java
@@ -15,12 +15,12 @@
  */
 package org.springframework.data.jpa.repository;
 
+import org.springframework.data.jpa.repository.sample.UserRepository;
 import org.springframework.test.context.ContextConfiguration;
 
 
 /**
- * Testcase to run {@link org.synyx.hades.dao.UserDao} integration tests on top
- * of OpenJPA.
+ * Testcase to run {@link UserRepository} integration tests on top of OpenJPA.
  * 
  * @author Oliver Gierke
  */
diff --git a/src/test/java/org/springframework/data/jpa/repository/UserRepositoryTests.java b/src/test/java/org/springframework/data/jpa/repository/UserRepositoryTests.java
index a90869189..ba6c26d21 100644
--- a/src/test/java/org/springframework/data/jpa/repository/UserRepositoryTests.java
+++ b/src/test/java/org/springframework/data/jpa/repository/UserRepositoryTests.java
@@ -436,9 +436,9 @@ public class UserRepositoryTests {
 
 
     @Test
-    public void testUsesHadesQueryAnnotation() {
+    public void testUsesQueryAnnotation() {
 
-        assertEquals(null, repository.findByHadesQuery("gierke@synyx.de"));
+        assertEquals(null, repository.findByAnnotatedQuery("gierke@synyx.de"));
     }
 
 
diff --git a/src/test/java/org/springframework/data/jpa/repository/config/CustomRepositoryFactoryConfigTests.java b/src/test/java/org/springframework/data/jpa/repository/config/CustomRepositoryFactoryConfigTests.java
index b89bffe6f..2c116bfbf 100644
--- a/src/test/java/org/springframework/data/jpa/repository/config/CustomRepositoryFactoryConfigTests.java
+++ b/src/test/java/org/springframework/data/jpa/repository/config/CustomRepositoryFactoryConfigTests.java
@@ -25,14 +25,14 @@ import org.springframework.util.Assert;
 
 
 /**
- * Annotation to exclude DAO interfaces from being picked up by Hades and thus
- * in consequence getting an instance being created.
+ * Annotation to exclude DAO interfaces from being picked up and thus in
+ * consequence getting an instance being created.
  * <p>
  * This will typically be used when providing an extended base interface for all
  * DAOs in combination with a custom DAO base class to implement methods
  * declared in that intermediate interface. In this case you typically derive
- * your concrete DAO interfaces from the intermediate one but don't want Hades
- * to create a Spring bean for the intermediate interface.
+ * your concrete DAO interfaces from the intermediate one but don't want to
+ * create a Spring bean for the intermediate interface.
  * 
  * @author Oliver Gierke
  */
diff --git a/src/test/java/org/springframework/data/jpa/repository/config/TypeFilterConfigTest.java b/src/test/java/org/springframework/data/jpa/repository/config/TypeFilterConfigTest.java
index 3b5f1cd3c..7be0de813 100644
--- a/src/test/java/org/springframework/data/jpa/repository/config/TypeFilterConfigTest.java
+++ b/src/test/java/org/springframework/data/jpa/repository/config/TypeFilterConfigTest.java
@@ -33,8 +33,9 @@ public class TypeFilterConfigTest extends AbstractRepositoryConfigTests {
     /*
      * (non-Javadoc)
      * 
-     * @seeorg.synyx.hades.dao.config.AbstractDaoConfigIntegrationTest#
-     * testContextCreation()
+     * @see
+     * org.springframework.data.jpa.repository.config.AbstractRepositoryConfigTests
+     * #testContextCreation()
      */
     @Override
     public void testContextCreation() {
diff --git a/src/test/java/org/springframework/data/jpa/repository/custom/CustomGenericJpaRepository.java b/src/test/java/org/springframework/data/jpa/repository/custom/CustomGenericJpaRepository.java
index 199d8a27e..f5e733c25 100644
--- a/src/test/java/org/springframework/data/jpa/repository/custom/CustomGenericJpaRepository.java
+++ b/src/test/java/org/springframework/data/jpa/repository/custom/CustomGenericJpaRepository.java
@@ -47,8 +47,8 @@ public class CustomGenericJpaRepository<T, ID extends Serializable> extends
      * (non-Javadoc)
      * 
      * @see
-     * org.synyx.hades.customimpl.CustomExtendedGenericDao#customMethod(java
-     * .io.Serializable)
+     * org.springframework.data.jpa.repository.custom.CustomGenericRepository
+     * #customMethod(java.io.Serializable)
      */
     public T customMethod(ID id) {
 
diff --git a/src/test/java/org/springframework/data/jpa/repository/query/JpaQueryMethodUnitTests.java b/src/test/java/org/springframework/data/jpa/repository/query/JpaQueryMethodUnitTests.java
index bdb67e22e..8b30066d9 100644
--- a/src/test/java/org/springframework/data/jpa/repository/query/JpaQueryMethodUnitTests.java
+++ b/src/test/java/org/springframework/data/jpa/repository/query/JpaQueryMethodUnitTests.java
@@ -57,7 +57,7 @@ public class JpaQueryMethodUnitTests {
     EntityManager em;
 
     Method daoMethod, invalidReturnType, pageableAndSort, pageableTwice,
-    sortableTwice, modifyingMethod;
+            sortableTwice, modifyingMethod;
 
 
     /**
@@ -67,24 +67,24 @@ public class JpaQueryMethodUnitTests {
     public void setUp() throws Exception {
 
         daoMethod =
-            UserRepository.class.getMethod("findByLastname", String.class);
+                UserRepository.class.getMethod("findByLastname", String.class);
 
         invalidReturnType =
-            InvalidDao.class.getMethod(METHOD_NAME, String.class,
-                    Pageable.class);
+                InvalidDao.class.getMethod(METHOD_NAME, String.class,
+                        Pageable.class);
         pageableAndSort =
-            InvalidDao.class.getMethod(METHOD_NAME, String.class,
-                    Pageable.class, Sort.class);
+                InvalidDao.class.getMethod(METHOD_NAME, String.class,
+                        Pageable.class, Sort.class);
         pageableTwice =
-            InvalidDao.class.getMethod(METHOD_NAME, String.class,
-                    Pageable.class, Pageable.class);
+                InvalidDao.class.getMethod(METHOD_NAME, String.class,
+                        Pageable.class, Pageable.class);
 
         sortableTwice =
-            InvalidDao.class.getMethod(METHOD_NAME, String.class,
-                    Sort.class, Sort.class);
+                InvalidDao.class.getMethod(METHOD_NAME, String.class,
+                        Sort.class, Sort.class);
         modifyingMethod =
-            UserRepository.class
-            .getMethod("renameAllUsersTo", String.class);
+                UserRepository.class
+                        .getMethod("renameAllUsersTo", String.class);
     }
 
 
@@ -135,11 +135,11 @@ public class JpaQueryMethodUnitTests {
         assertNull(method.getAnnotatedQuery());
 
         Method daoMethod =
-            UserRepository.class
-            .getMethod("findByHadesQuery", String.class);
+                UserRepository.class.getMethod("findByAnnotatedQuery",
+                        String.class);
 
         assertNotNull(new JpaQueryMethod(daoMethod, extractor, em)
-        .getAnnotatedQuery());
+                .getAnnotatedQuery());
     }
 
 
@@ -190,11 +190,11 @@ public class JpaQueryMethodUnitTests {
 
     @Test(expected = IllegalArgumentException.class)
     public void rejectsPageablesOnPersistenceProvidersNotExtractingQueries()
-    throws Exception {
+            throws Exception {
 
         Method method =
-            UserRepository.class.getMethod("findByFirstname",
-                    Pageable.class, String.class);
+                UserRepository.class.getMethod("findByFirstname",
+                        Pageable.class, String.class);
 
         when(extractor.canExtractQuery()).thenReturn(false);
 
@@ -206,7 +206,7 @@ public class JpaQueryMethodUnitTests {
     public void recognizesModifyingMethod() {
 
         JpaQueryMethod method =
-            new JpaQueryMethod(modifyingMethod, extractor, em);
+                new JpaQueryMethod(modifyingMethod, extractor, em);
         assertTrue(method.isModifyingQuery());
     }
 
@@ -215,8 +215,8 @@ public class JpaQueryMethodUnitTests {
     public void rejectsModifyingMethodWithPageable() throws Exception {
 
         Method method =
-            InvalidDao.class.getMethod("updateMethod", String.class,
-                    Pageable.class);
+                InvalidDao.class.getMethod("updateMethod", String.class,
+                        Pageable.class);
 
         new JpaQueryMethod(method, extractor, em);
     }
@@ -226,8 +226,8 @@ public class JpaQueryMethodUnitTests {
     public void rejectsModifyingMethodWithSort() throws Exception {
 
         Method method =
-            InvalidDao.class.getMethod("updateMethod", String.class,
-                    Sort.class);
+                InvalidDao.class.getMethod("updateMethod", String.class,
+                        Sort.class);
 
         new JpaQueryMethod(method, extractor, em);
     }
diff --git a/src/test/java/org/springframework/data/jpa/repository/query/QueryUtilsUnitTests.java b/src/test/java/org/springframework/data/jpa/repository/query/QueryUtilsUnitTests.java
index b9b49c045..ca3bd7f7f 100644
--- a/src/test/java/org/springframework/data/jpa/repository/query/QueryUtilsUnitTests.java
+++ b/src/test/java/org/springframework/data/jpa/repository/query/QueryUtilsUnitTests.java
@@ -32,7 +32,7 @@ public class QueryUtilsUnitTests {
 
     static final String QUERY = "select u from User u";
     static final String FQ_QUERY =
-            "select u from org.synyx.hades.domain.User$Foo_Bar u";
+            "select u from org.acme.domain.User$Foo_Bar u";
     static final String SIMPLE_QUERY = "from User u";
     static final String COUNT_QUERY = "select count(u) from User u";
 
@@ -147,7 +147,7 @@ public class QueryUtilsUnitTests {
 
         assertThat(detectAlias(FQ_QUERY), IS_U);
         assertCountQuery(FQ_QUERY,
-                "select count(u) from org.synyx.hades.domain.User$Foo_Bar u");
+                "select count(u) from org.acme.domain.User$Foo_Bar u");
     }
 
 
diff --git a/src/test/java/org/springframework/data/jpa/repository/query/SimpleJpaQueryUnitTests.java b/src/test/java/org/springframework/data/jpa/repository/query/SimpleJpaQueryUnitTests.java
index d51c4f8e6..cb8b0dc2f 100644
--- a/src/test/java/org/springframework/data/jpa/repository/query/SimpleJpaQueryUnitTests.java
+++ b/src/test/java/org/springframework/data/jpa/repository/query/SimpleJpaQueryUnitTests.java
@@ -36,7 +36,7 @@ import org.springframework.data.jpa.repository.sample.UserRepository;
 
 
 /**
- * Unit test for {@link SimpleHadesQuery}.
+ * Unit test for {@link SimpleJpaQuery}.
  * 
  * @author Oliver Gierke
  */
@@ -68,8 +68,8 @@ public class SimpleJpaQueryUnitTests {
     @Test
     public void appliesHintsCorrectly() throws Exception {
 
-        SimpleJpaQuery hadesQuery = new SimpleJpaQuery(method, em, "foobar");
-        hadesQuery.createQuery(new ParameterBinder(method.getParameters(),
+        SimpleJpaQuery jpaQuery = new SimpleJpaQuery(method, em, "foobar");
+        jpaQuery.createQuery(new ParameterBinder(method.getParameters(),
                 new Object[] { "gierke" }));
 
         verify(query).setHint("foo", "bar");
@@ -83,9 +83,9 @@ public class SimpleJpaQueryUnitTests {
         when(method.getCountQuery()).thenReturn("foo");
         when(em.createQuery("foo")).thenReturn(query);
 
-        SimpleJpaQuery hadesQuery =
+        SimpleJpaQuery jpaQuery =
                 new SimpleJpaQuery(method, em, "select u from User u");
 
-        assertThat(hadesQuery.createCountQuery(null), is(query));
+        assertThat(jpaQuery.createCountQuery(null), is(query));
     }
 }
diff --git a/src/test/java/org/springframework/data/jpa/repository/sample/UserRepository.java b/src/test/java/org/springframework/data/jpa/repository/sample/UserRepository.java
index 1a40abdd4..f7f6d5d88 100644
--- a/src/test/java/org/springframework/data/jpa/repository/sample/UserRepository.java
+++ b/src/test/java/org/springframework/data/jpa/repository/sample/UserRepository.java
@@ -109,7 +109,7 @@ public interface UserRepository extends JpaRepository<User, Integer>,
      */
     @Query("select u from User u where u.emailAddress = ?1")
     @Transactional(readOnly = true)
-    User findByHadesQuery(String emailAddress);
+    User findByAnnotatedQuery(String emailAddress);
 
 
     /**
diff --git a/src/test/java/org/springframework/data/jpa/repository/sample/UserRepositoryImpl.java b/src/test/java/org/springframework/data/jpa/repository/sample/UserRepositoryImpl.java
index ce3aaaa6c..b32ac2c37 100644
--- a/src/test/java/org/springframework/data/jpa/repository/sample/UserRepositoryImpl.java
+++ b/src/test/java/org/springframework/data/jpa/repository/sample/UserRepositoryImpl.java
@@ -1,5 +1,7 @@
 package org.springframework.data.jpa.repository.sample;
 
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.data.jpa.domain.sample.User;
 
 
@@ -10,25 +12,30 @@ import org.springframework.data.jpa.domain.sample.User;
  */
 public class UserRepositoryImpl implements UserRepositoryCustom {
 
+    private static final Logger LOG = LoggerFactory
+            .getLogger(UserRepositoryImpl.class);
+
+
     /*
      * (non-Javadoc)
      * 
-     * @see
-     * org.synyx.hades.dao.UserDao#someOtherMethod(org.synyx.hades.domain.User)
+     * @see org.springframework.data.jpa.repository.sample.UserRepositoryCustom#
+     * someCustomMethod(org.springframework.data.jpa.domain.sample.User)
      */
     public void someCustomMethod(User u) {
 
-        System.out.println("Some custom method was invoked!");
+        LOG.debug("Some custom method was invoked!");
     }
 
 
     /*
      * (non-Javadoc)
      * 
-     * @see org.synyx.hades.dao.UserDaoCustom#findFooMethod()
+     * @see org.springframework.data.jpa.repository.sample.UserRepositoryCustom#
+     * findByOverrridingMethod()
      */
     public void findByOverrridingMethod() {
 
-        System.out.println("A mthod overriding a finder was invoked!");
+        LOG.debug("A method overriding a finder was invoked!");
     }
 }
diff --git a/src/test/java/org/springframework/data/jpa/repository/support/TransactionalRepositoryTests.java b/src/test/java/org/springframework/data/jpa/repository/support/TransactionalRepositoryTests.java
index c5d4a3eef..15baa6d43 100644
--- a/src/test/java/org/springframework/data/jpa/repository/support/TransactionalRepositoryTests.java
+++ b/src/test/java/org/springframework/data/jpa/repository/support/TransactionalRepositoryTests.java
@@ -67,7 +67,7 @@ public class TransactionalRepositoryTests extends
     @Test
     public void invokeTransactionalFinder() throws Exception {
 
-        repository.findByHadesQuery("foo@bar.de");
+        repository.findByAnnotatedQuery("foo@bar.de");
         assertThat(transactionManager.getTransactionRequests(), is(1));
     }
 
diff --git a/src/test/resources/auditing/auditing-namespace-context.xml b/src/test/resources/auditing/auditing-namespace-context.xml
index 4719dee5c..6ab9f4775 100644
--- a/src/test/resources/auditing/auditing-namespace-context.xml
+++ b/src/test/resources/auditing/auditing-namespace-context.xml
@@ -9,6 +9,6 @@
     
     <jpa:auditing auditor-aware-ref="auditorAware" />
     
-    <bean id="auditorAware" class="org.synyx.hades.domain.AuditorAwareStub" /> 
+    <bean id="auditorAware" class="org.springframework.data.jpa.domain.sample.AuditorAwareStub" /> 
 
 </beans>