diff --git a/src/main/java/org/springframework/data/jdbc/core/CascadingDataAccessStrategy.java b/src/main/java/org/springframework/data/jdbc/core/CascadingDataAccessStrategy.java
index 65ae92d7..86cbb916 100644
--- a/src/main/java/org/springframework/data/jdbc/core/CascadingDataAccessStrategy.java
+++ b/src/main/java/org/springframework/data/jdbc/core/CascadingDataAccessStrategy.java
@@ -21,8 +21,8 @@ import java.util.Map;
 import java.util.function.Consumer;
 import java.util.function.Function;
 
-import org.springframework.data.jdbc.core.mapping.JdbcPersistentProperty;
 import org.springframework.data.mapping.PropertyPath;
+import org.springframework.data.relational.core.mapping.JdbcPersistentProperty;
 
 /**
  * Delegates each methods to the {@link DataAccessStrategy}s passed to the constructor in turn until the first that does
@@ -100,7 +100,9 @@ public class CascadingDataAccessStrategy implements DataAccessStrategy {
 	}
 
 	private <T> T collect(Function<DataAccessStrategy, T> function) {
-		return strategies.stream().collect(new FunctionCollector<>(function));
+
+		// Keep <T> as Eclipse fails to compile if <> is used.
+		return strategies.stream().collect(new FunctionCollector<T>(function));
 	}
 
 	private void collectVoid(Consumer<DataAccessStrategy> consumer) {
diff --git a/src/main/java/org/springframework/data/jdbc/core/DataAccessStrategy.java b/src/main/java/org/springframework/data/jdbc/core/DataAccessStrategy.java
index 308b4c88..cdfb1b8c 100644
--- a/src/main/java/org/springframework/data/jdbc/core/DataAccessStrategy.java
+++ b/src/main/java/org/springframework/data/jdbc/core/DataAccessStrategy.java
@@ -17,8 +17,8 @@ package org.springframework.data.jdbc.core;
 
 import java.util.Map;
 
-import org.springframework.data.jdbc.core.mapping.JdbcPersistentProperty;
 import org.springframework.data.mapping.PropertyPath;
+import org.springframework.data.relational.core.mapping.JdbcPersistentProperty;
 import org.springframework.lang.Nullable;
 
 /**
diff --git a/src/main/java/org/springframework/data/jdbc/core/DefaultDataAccessStrategy.java b/src/main/java/org/springframework/data/jdbc/core/DefaultDataAccessStrategy.java
index 5dfefca7..346598f3 100644
--- a/src/main/java/org/springframework/data/jdbc/core/DefaultDataAccessStrategy.java
+++ b/src/main/java/org/springframework/data/jdbc/core/DefaultDataAccessStrategy.java
@@ -28,14 +28,14 @@ import org.springframework.dao.EmptyResultDataAccessException;
 import org.springframework.dao.InvalidDataAccessApiUsageException;
 import org.springframework.dao.NonTransientDataAccessException;
 import org.springframework.data.convert.EntityInstantiators;
-import org.springframework.data.jdbc.core.mapping.JdbcMappingContext;
-import org.springframework.data.jdbc.core.mapping.JdbcPersistentEntity;
-import org.springframework.data.jdbc.core.mapping.JdbcPersistentProperty;
 import org.springframework.data.jdbc.support.JdbcUtil;
 import org.springframework.data.mapping.PersistentPropertyAccessor;
 import org.springframework.data.mapping.PropertyHandler;
 import org.springframework.data.mapping.PropertyPath;
 import org.springframework.data.mapping.model.ConvertingPropertyAccessor;
+import org.springframework.data.relational.core.mapping.JdbcMappingContext;
+import org.springframework.data.relational.core.mapping.JdbcPersistentEntity;
+import org.springframework.data.relational.core.mapping.JdbcPersistentProperty;
 import org.springframework.jdbc.core.RowMapper;
 import org.springframework.jdbc.core.namedparam.MapSqlParameterSource;
 import org.springframework.jdbc.core.namedparam.NamedParameterJdbcOperations;
diff --git a/src/main/java/org/springframework/data/jdbc/core/DefaultJdbcInterpreter.java b/src/main/java/org/springframework/data/jdbc/core/DefaultJdbcInterpreter.java
index ed8dd1d4..3f7a588c 100644
--- a/src/main/java/org/springframework/data/jdbc/core/DefaultJdbcInterpreter.java
+++ b/src/main/java/org/springframework/data/jdbc/core/DefaultJdbcInterpreter.java
@@ -18,15 +18,15 @@ package org.springframework.data.jdbc.core;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.springframework.data.jdbc.core.conversion.DbAction;
-import org.springframework.data.jdbc.core.conversion.DbAction.Delete;
-import org.springframework.data.jdbc.core.conversion.DbAction.DeleteAll;
-import org.springframework.data.jdbc.core.conversion.DbAction.Insert;
-import org.springframework.data.jdbc.core.conversion.DbAction.Update;
-import org.springframework.data.jdbc.core.mapping.JdbcMappingContext;
-import org.springframework.data.jdbc.core.mapping.JdbcPersistentEntity;
-import org.springframework.data.jdbc.core.conversion.Interpreter;
 import org.springframework.data.mapping.PropertyPath;
+import org.springframework.data.relational.core.conversion.DbAction;
+import org.springframework.data.relational.core.conversion.Interpreter;
+import org.springframework.data.relational.core.conversion.DbAction.Delete;
+import org.springframework.data.relational.core.conversion.DbAction.DeleteAll;
+import org.springframework.data.relational.core.conversion.DbAction.Insert;
+import org.springframework.data.relational.core.conversion.DbAction.Update;
+import org.springframework.data.relational.core.mapping.JdbcMappingContext;
+import org.springframework.data.relational.core.mapping.JdbcPersistentEntity;
 import org.springframework.lang.Nullable;
 import org.springframework.util.Assert;
 
diff --git a/src/main/java/org/springframework/data/jdbc/core/DelegatingDataAccessStrategy.java b/src/main/java/org/springframework/data/jdbc/core/DelegatingDataAccessStrategy.java
index 03b3b20d..32588959 100644
--- a/src/main/java/org/springframework/data/jdbc/core/DelegatingDataAccessStrategy.java
+++ b/src/main/java/org/springframework/data/jdbc/core/DelegatingDataAccessStrategy.java
@@ -17,8 +17,8 @@ package org.springframework.data.jdbc.core;
 
 import java.util.Map;
 
-import org.springframework.data.jdbc.core.mapping.JdbcPersistentProperty;
 import org.springframework.data.mapping.PropertyPath;
+import org.springframework.data.relational.core.mapping.JdbcPersistentProperty;
 import org.springframework.util.Assert;
 
 /**
diff --git a/src/main/java/org/springframework/data/jdbc/core/EntityRowMapper.java b/src/main/java/org/springframework/data/jdbc/core/EntityRowMapper.java
index 9c8a626e..68f3d7cf 100644
--- a/src/main/java/org/springframework/data/jdbc/core/EntityRowMapper.java
+++ b/src/main/java/org/springframework/data/jdbc/core/EntityRowMapper.java
@@ -25,15 +25,15 @@ import java.util.Map;
 import org.springframework.core.convert.ConversionService;
 import org.springframework.core.convert.converter.Converter;
 import org.springframework.data.convert.EntityInstantiators;
-import org.springframework.data.jdbc.core.mapping.JdbcMappingContext;
-import org.springframework.data.jdbc.core.mapping.JdbcPersistentEntity;
-import org.springframework.data.jdbc.core.mapping.JdbcPersistentProperty;
 import org.springframework.data.mapping.MappingException;
 import org.springframework.data.mapping.PersistentProperty;
 import org.springframework.data.mapping.PersistentPropertyAccessor;
 import org.springframework.data.mapping.PreferredConstructor.Parameter;
 import org.springframework.data.mapping.model.ConvertingPropertyAccessor;
 import org.springframework.data.mapping.model.ParameterValueProvider;
+import org.springframework.data.relational.core.mapping.JdbcMappingContext;
+import org.springframework.data.relational.core.mapping.JdbcPersistentEntity;
+import org.springframework.data.relational.core.mapping.JdbcPersistentProperty;
 import org.springframework.jdbc.core.RowMapper;
 import org.springframework.lang.Nullable;
 import org.springframework.util.Assert;
diff --git a/src/main/java/org/springframework/data/jdbc/core/JdbcAggregateTemplate.java b/src/main/java/org/springframework/data/jdbc/core/JdbcAggregateTemplate.java
index a362280b..77e19cf9 100644
--- a/src/main/java/org/springframework/data/jdbc/core/JdbcAggregateTemplate.java
+++ b/src/main/java/org/springframework/data/jdbc/core/JdbcAggregateTemplate.java
@@ -18,21 +18,21 @@ package org.springframework.data.jdbc.core;
 import java.util.Optional;
 
 import org.springframework.context.ApplicationEventPublisher;
-import org.springframework.data.jdbc.core.conversion.AggregateChange;
-import org.springframework.data.jdbc.core.conversion.AggregateChange.Kind;
-import org.springframework.data.jdbc.core.conversion.Interpreter;
-import org.springframework.data.jdbc.core.conversion.JdbcEntityDeleteWriter;
-import org.springframework.data.jdbc.core.conversion.JdbcEntityWriter;
-import org.springframework.data.jdbc.core.mapping.JdbcMappingContext;
-import org.springframework.data.jdbc.core.mapping.JdbcPersistentEntity;
-import org.springframework.data.jdbc.core.mapping.event.AfterDeleteEvent;
-import org.springframework.data.jdbc.core.mapping.event.AfterLoadEvent;
-import org.springframework.data.jdbc.core.mapping.event.AfterSaveEvent;
-import org.springframework.data.jdbc.core.mapping.event.BeforeDeleteEvent;
-import org.springframework.data.jdbc.core.mapping.event.BeforeSaveEvent;
-import org.springframework.data.jdbc.core.mapping.event.Identifier;
-import org.springframework.data.jdbc.core.mapping.event.Identifier.Specified;
 import org.springframework.data.mapping.IdentifierAccessor;
+import org.springframework.data.relational.core.conversion.AggregateChange;
+import org.springframework.data.relational.core.conversion.Interpreter;
+import org.springframework.data.relational.core.conversion.JdbcEntityDeleteWriter;
+import org.springframework.data.relational.core.conversion.JdbcEntityWriter;
+import org.springframework.data.relational.core.conversion.AggregateChange.Kind;
+import org.springframework.data.relational.core.mapping.JdbcMappingContext;
+import org.springframework.data.relational.core.mapping.JdbcPersistentEntity;
+import org.springframework.data.relational.core.mapping.event.AfterDeleteEvent;
+import org.springframework.data.relational.core.mapping.event.AfterLoadEvent;
+import org.springframework.data.relational.core.mapping.event.AfterSaveEvent;
+import org.springframework.data.relational.core.mapping.event.BeforeDeleteEvent;
+import org.springframework.data.relational.core.mapping.event.BeforeSaveEvent;
+import org.springframework.data.relational.core.mapping.event.Identifier;
+import org.springframework.data.relational.core.mapping.event.Identifier.Specified;
 import org.springframework.lang.Nullable;
 import org.springframework.util.Assert;
 
diff --git a/src/main/java/org/springframework/data/jdbc/core/SqlGenerator.java b/src/main/java/org/springframework/data/jdbc/core/SqlGenerator.java
index e05fd31e..76452c77 100644
--- a/src/main/java/org/springframework/data/jdbc/core/SqlGenerator.java
+++ b/src/main/java/org/springframework/data/jdbc/core/SqlGenerator.java
@@ -24,12 +24,12 @@ import java.util.Set;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
-import org.springframework.data.jdbc.core.mapping.JdbcMappingContext;
-import org.springframework.data.jdbc.core.mapping.JdbcPersistentEntity;
-import org.springframework.data.jdbc.core.mapping.JdbcPersistentProperty;
 import org.springframework.data.jdbc.repository.support.SimpleJdbcRepository;
 import org.springframework.data.mapping.PropertyHandler;
 import org.springframework.data.mapping.PropertyPath;
+import org.springframework.data.relational.core.mapping.JdbcMappingContext;
+import org.springframework.data.relational.core.mapping.JdbcPersistentEntity;
+import org.springframework.data.relational.core.mapping.JdbcPersistentProperty;
 import org.springframework.data.util.Lazy;
 import org.springframework.data.util.StreamUtils;
 import org.springframework.lang.Nullable;
diff --git a/src/main/java/org/springframework/data/jdbc/core/SqlGeneratorSource.java b/src/main/java/org/springframework/data/jdbc/core/SqlGeneratorSource.java
index 166a9d8d..e560d130 100644
--- a/src/main/java/org/springframework/data/jdbc/core/SqlGeneratorSource.java
+++ b/src/main/java/org/springframework/data/jdbc/core/SqlGeneratorSource.java
@@ -20,7 +20,7 @@ import lombok.RequiredArgsConstructor;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.springframework.data.jdbc.core.mapping.JdbcMappingContext;
+import org.springframework.data.relational.core.mapping.JdbcMappingContext;
 
 /**
  * Provides {@link SqlGenerator}s per domain type. Instances get cached, so when asked multiple times for the same domain
diff --git a/src/main/java/org/springframework/data/jdbc/mybatis/MyBatisDataAccessStrategy.java b/src/main/java/org/springframework/data/jdbc/mybatis/MyBatisDataAccessStrategy.java
index 1c37824c..4bf32a3a 100644
--- a/src/main/java/org/springframework/data/jdbc/mybatis/MyBatisDataAccessStrategy.java
+++ b/src/main/java/org/springframework/data/jdbc/mybatis/MyBatisDataAccessStrategy.java
@@ -28,9 +28,9 @@ import org.springframework.data.jdbc.core.DataAccessStrategy;
 import org.springframework.data.jdbc.core.DefaultDataAccessStrategy;
 import org.springframework.data.jdbc.core.DelegatingDataAccessStrategy;
 import org.springframework.data.jdbc.core.SqlGeneratorSource;
-import org.springframework.data.jdbc.core.mapping.JdbcMappingContext;
-import org.springframework.data.jdbc.core.mapping.JdbcPersistentProperty;
 import org.springframework.data.mapping.PropertyPath;
+import org.springframework.data.relational.core.mapping.JdbcMappingContext;
+import org.springframework.data.relational.core.mapping.JdbcPersistentProperty;
 import org.springframework.jdbc.core.namedparam.NamedParameterJdbcOperations;
 import org.springframework.util.Assert;
 
diff --git a/src/main/java/org/springframework/data/jdbc/repository/config/JdbcAuditingRegistrar.java b/src/main/java/org/springframework/data/jdbc/repository/config/JdbcAuditingRegistrar.java
index 6e5159bd..f52f2953 100644
--- a/src/main/java/org/springframework/data/jdbc/repository/config/JdbcAuditingRegistrar.java
+++ b/src/main/java/org/springframework/data/jdbc/repository/config/JdbcAuditingRegistrar.java
@@ -24,7 +24,7 @@ import org.springframework.context.annotation.ImportBeanDefinitionRegistrar;
 import org.springframework.data.auditing.IsNewAwareAuditingHandler;
 import org.springframework.data.auditing.config.AuditingBeanDefinitionRegistrarSupport;
 import org.springframework.data.auditing.config.AuditingConfiguration;
-import org.springframework.data.jdbc.domain.support.JdbcAuditingEventListener;
+import org.springframework.data.relational.domain.support.JdbcAuditingEventListener;
 import org.springframework.util.Assert;
 
 /**
diff --git a/src/main/java/org/springframework/data/jdbc/repository/config/JdbcConfiguration.java b/src/main/java/org/springframework/data/jdbc/repository/config/JdbcConfiguration.java
index 911bff51..6eef73e0 100644
--- a/src/main/java/org/springframework/data/jdbc/repository/config/JdbcConfiguration.java
+++ b/src/main/java/org/springframework/data/jdbc/repository/config/JdbcConfiguration.java
@@ -19,9 +19,9 @@ import java.util.Optional;
 
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
-import org.springframework.data.jdbc.core.mapping.ConversionCustomizer;
-import org.springframework.data.jdbc.core.mapping.JdbcMappingContext;
-import org.springframework.data.jdbc.core.mapping.NamingStrategy;
+import org.springframework.data.relational.core.mapping.ConversionCustomizer;
+import org.springframework.data.relational.core.mapping.JdbcMappingContext;
+import org.springframework.data.relational.core.mapping.NamingStrategy;
 
 /**
  * Beans that must be registered for Spring Data JDBC to work.
diff --git a/src/main/java/org/springframework/data/jdbc/repository/support/JdbcQueryLookupStrategy.java b/src/main/java/org/springframework/data/jdbc/repository/support/JdbcQueryLookupStrategy.java
index ca292882..60837b16 100644
--- a/src/main/java/org/springframework/data/jdbc/repository/support/JdbcQueryLookupStrategy.java
+++ b/src/main/java/org/springframework/data/jdbc/repository/support/JdbcQueryLookupStrategy.java
@@ -21,9 +21,9 @@ import org.springframework.core.convert.ConversionService;
 import org.springframework.data.convert.EntityInstantiators;
 import org.springframework.data.jdbc.core.DataAccessStrategy;
 import org.springframework.data.jdbc.core.EntityRowMapper;
-import org.springframework.data.jdbc.core.mapping.JdbcMappingContext;
 import org.springframework.data.jdbc.repository.RowMapperMap;
 import org.springframework.data.projection.ProjectionFactory;
+import org.springframework.data.relational.core.mapping.JdbcMappingContext;
 import org.springframework.data.repository.core.NamedQueries;
 import org.springframework.data.repository.core.RepositoryMetadata;
 import org.springframework.data.repository.query.QueryLookupStrategy;
diff --git a/src/main/java/org/springframework/data/jdbc/repository/support/JdbcRepositoryFactory.java b/src/main/java/org/springframework/data/jdbc/repository/support/JdbcRepositoryFactory.java
index 322b62ed..a59c3a69 100644
--- a/src/main/java/org/springframework/data/jdbc/repository/support/JdbcRepositoryFactory.java
+++ b/src/main/java/org/springframework/data/jdbc/repository/support/JdbcRepositoryFactory.java
@@ -21,9 +21,9 @@ import org.springframework.context.ApplicationEventPublisher;
 import org.springframework.data.convert.EntityInstantiators;
 import org.springframework.data.jdbc.core.DataAccessStrategy;
 import org.springframework.data.jdbc.core.JdbcAggregateTemplate;
-import org.springframework.data.jdbc.core.mapping.JdbcMappingContext;
-import org.springframework.data.jdbc.core.mapping.JdbcPersistentEntity;
 import org.springframework.data.jdbc.repository.RowMapperMap;
+import org.springframework.data.relational.core.mapping.JdbcMappingContext;
+import org.springframework.data.relational.core.mapping.JdbcPersistentEntity;
 import org.springframework.data.repository.core.EntityInformation;
 import org.springframework.data.repository.core.RepositoryInformation;
 import org.springframework.data.repository.core.RepositoryMetadata;
diff --git a/src/main/java/org/springframework/data/jdbc/repository/support/JdbcRepositoryFactoryBean.java b/src/main/java/org/springframework/data/jdbc/repository/support/JdbcRepositoryFactoryBean.java
index f6bab3b8..efbb218a 100644
--- a/src/main/java/org/springframework/data/jdbc/repository/support/JdbcRepositoryFactoryBean.java
+++ b/src/main/java/org/springframework/data/jdbc/repository/support/JdbcRepositoryFactoryBean.java
@@ -24,8 +24,8 @@ import org.springframework.data.convert.EntityInstantiators;
 import org.springframework.data.jdbc.core.DataAccessStrategy;
 import org.springframework.data.jdbc.core.DefaultDataAccessStrategy;
 import org.springframework.data.jdbc.core.SqlGeneratorSource;
-import org.springframework.data.jdbc.core.mapping.JdbcMappingContext;
 import org.springframework.data.jdbc.repository.RowMapperMap;
+import org.springframework.data.relational.core.mapping.JdbcMappingContext;
 import org.springframework.data.repository.Repository;
 import org.springframework.data.repository.core.support.RepositoryFactorySupport;
 import org.springframework.data.repository.core.support.TransactionalRepositoryFactoryBeanSupport;
diff --git a/src/main/java/org/springframework/data/jdbc/repository/support/JdbcRepositoryQuery.java b/src/main/java/org/springframework/data/jdbc/repository/support/JdbcRepositoryQuery.java
index 4ad11af0..9cd2ae09 100644
--- a/src/main/java/org/springframework/data/jdbc/repository/support/JdbcRepositoryQuery.java
+++ b/src/main/java/org/springframework/data/jdbc/repository/support/JdbcRepositoryQuery.java
@@ -17,7 +17,7 @@ package org.springframework.data.jdbc.repository.support;
 
 import org.springframework.beans.BeanUtils;
 import org.springframework.dao.EmptyResultDataAccessException;
-import org.springframework.data.jdbc.core.mapping.JdbcMappingContext;
+import org.springframework.data.relational.core.mapping.JdbcMappingContext;
 import org.springframework.data.repository.query.RepositoryQuery;
 import org.springframework.jdbc.core.RowMapper;
 import org.springframework.jdbc.core.namedparam.MapSqlParameterSource;
diff --git a/src/main/java/org/springframework/data/jdbc/core/conversion/AggregateChange.java b/src/main/java/org/springframework/data/relational/core/conversion/AggregateChange.java
similarity index 96%
rename from src/main/java/org/springframework/data/jdbc/core/conversion/AggregateChange.java
rename to src/main/java/org/springframework/data/relational/core/conversion/AggregateChange.java
index 6098070d..9b261052 100644
--- a/src/main/java/org/springframework/data/jdbc/core/conversion/AggregateChange.java
+++ b/src/main/java/org/springframework/data/relational/core/conversion/AggregateChange.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.data.jdbc.core.conversion;
+package org.springframework.data.relational.core.conversion;
 
 import lombok.Getter;
 import lombok.RequiredArgsConstructor;
diff --git a/src/main/java/org/springframework/data/jdbc/core/conversion/DbAction.java b/src/main/java/org/springframework/data/relational/core/conversion/DbAction.java
similarity index 99%
rename from src/main/java/org/springframework/data/jdbc/core/conversion/DbAction.java
rename to src/main/java/org/springframework/data/relational/core/conversion/DbAction.java
index b585ddbb..f915d6b0 100644
--- a/src/main/java/org/springframework/data/jdbc/core/conversion/DbAction.java
+++ b/src/main/java/org/springframework/data/relational/core/conversion/DbAction.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.data.jdbc.core.conversion;
+package org.springframework.data.relational.core.conversion;
 
 import lombok.Getter;
 import lombok.ToString;
diff --git a/src/main/java/org/springframework/data/jdbc/core/conversion/DbActionExecutionException.java b/src/main/java/org/springframework/data/relational/core/conversion/DbActionExecutionException.java
similarity index 96%
rename from src/main/java/org/springframework/data/jdbc/core/conversion/DbActionExecutionException.java
rename to src/main/java/org/springframework/data/relational/core/conversion/DbActionExecutionException.java
index d44ebcaf..cfccdf4e 100644
--- a/src/main/java/org/springframework/data/jdbc/core/conversion/DbActionExecutionException.java
+++ b/src/main/java/org/springframework/data/relational/core/conversion/DbActionExecutionException.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.data.jdbc.core.conversion;
+package org.springframework.data.relational.core.conversion;
 
 /**
  * Exception thrown when during the execution of a {@link DbAction} an exception gets thrown. Provides additional
diff --git a/src/main/java/org/springframework/data/jdbc/core/conversion/Interpreter.java b/src/main/java/org/springframework/data/relational/core/conversion/Interpreter.java
similarity index 80%
rename from src/main/java/org/springframework/data/jdbc/core/conversion/Interpreter.java
rename to src/main/java/org/springframework/data/relational/core/conversion/Interpreter.java
index e9a56684..b21fb535 100644
--- a/src/main/java/org/springframework/data/jdbc/core/conversion/Interpreter.java
+++ b/src/main/java/org/springframework/data/relational/core/conversion/Interpreter.java
@@ -13,12 +13,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.data.jdbc.core.conversion;
+package org.springframework.data.relational.core.conversion;
 
-import org.springframework.data.jdbc.core.conversion.DbAction.Delete;
-import org.springframework.data.jdbc.core.conversion.DbAction.DeleteAll;
-import org.springframework.data.jdbc.core.conversion.DbAction.Insert;
-import org.springframework.data.jdbc.core.conversion.DbAction.Update;
+import org.springframework.data.relational.core.conversion.DbAction.Delete;
+import org.springframework.data.relational.core.conversion.DbAction.DeleteAll;
+import org.springframework.data.relational.core.conversion.DbAction.Insert;
+import org.springframework.data.relational.core.conversion.DbAction.Update;
 
 /**
  * An {@link Interpreter} gets called by a {@link AggregateChange} for each {@link DbAction} and is tasked with
diff --git a/src/main/java/org/springframework/data/jdbc/core/conversion/JdbcEntityDeleteWriter.java b/src/main/java/org/springframework/data/relational/core/conversion/JdbcEntityDeleteWriter.java
similarity index 94%
rename from src/main/java/org/springframework/data/jdbc/core/conversion/JdbcEntityDeleteWriter.java
rename to src/main/java/org/springframework/data/relational/core/conversion/JdbcEntityDeleteWriter.java
index 25bc53eb..7ecfdba2 100644
--- a/src/main/java/org/springframework/data/jdbc/core/conversion/JdbcEntityDeleteWriter.java
+++ b/src/main/java/org/springframework/data/relational/core/conversion/JdbcEntityDeleteWriter.java
@@ -13,9 +13,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.data.jdbc.core.conversion;
+package org.springframework.data.relational.core.conversion;
 
-import org.springframework.data.jdbc.core.mapping.JdbcMappingContext;
+import org.springframework.data.relational.core.mapping.JdbcMappingContext;
 import org.springframework.lang.Nullable;
 
 /**
diff --git a/src/main/java/org/springframework/data/jdbc/core/conversion/JdbcEntityWriter.java b/src/main/java/org/springframework/data/relational/core/conversion/JdbcEntityWriter.java
similarity index 94%
rename from src/main/java/org/springframework/data/jdbc/core/conversion/JdbcEntityWriter.java
rename to src/main/java/org/springframework/data/relational/core/conversion/JdbcEntityWriter.java
index df280b26..9fff8532 100644
--- a/src/main/java/org/springframework/data/jdbc/core/conversion/JdbcEntityWriter.java
+++ b/src/main/java/org/springframework/data/relational/core/conversion/JdbcEntityWriter.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.data.jdbc.core.conversion;
+package org.springframework.data.relational.core.conversion;
 
 import lombok.Data;
 
@@ -23,15 +23,15 @@ import java.util.Map;
 import java.util.concurrent.atomic.AtomicInteger;
 import java.util.stream.Stream;
 
-import org.springframework.data.jdbc.core.conversion.DbAction.Insert;
-import org.springframework.data.jdbc.core.conversion.DbAction.Update;
-import org.springframework.data.jdbc.core.mapping.JdbcMappingContext;
-import org.springframework.data.jdbc.core.mapping.JdbcPersistentEntity;
-import org.springframework.data.jdbc.core.mapping.JdbcPersistentProperty;
 import org.springframework.data.mapping.IdentifierAccessor;
 import org.springframework.data.mapping.PersistentEntity;
 import org.springframework.data.mapping.PersistentProperty;
 import org.springframework.data.mapping.PersistentPropertyAccessor;
+import org.springframework.data.relational.core.conversion.DbAction.Insert;
+import org.springframework.data.relational.core.conversion.DbAction.Update;
+import org.springframework.data.relational.core.mapping.JdbcMappingContext;
+import org.springframework.data.relational.core.mapping.JdbcPersistentEntity;
+import org.springframework.data.relational.core.mapping.JdbcPersistentProperty;
 import org.springframework.data.util.StreamUtils;
 
 /**
diff --git a/src/main/java/org/springframework/data/jdbc/core/conversion/JdbcEntityWriterSupport.java b/src/main/java/org/springframework/data/relational/core/conversion/JdbcEntityWriterSupport.java
similarity index 86%
rename from src/main/java/org/springframework/data/jdbc/core/conversion/JdbcEntityWriterSupport.java
rename to src/main/java/org/springframework/data/relational/core/conversion/JdbcEntityWriterSupport.java
index 64a2a645..b908b89c 100644
--- a/src/main/java/org/springframework/data/jdbc/core/conversion/JdbcEntityWriterSupport.java
+++ b/src/main/java/org/springframework/data/relational/core/conversion/JdbcEntityWriterSupport.java
@@ -13,10 +13,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.data.jdbc.core.conversion;
+package org.springframework.data.relational.core.conversion;
 
 import org.springframework.data.convert.EntityWriter;
-import org.springframework.data.jdbc.core.mapping.JdbcMappingContext;
+import org.springframework.data.relational.core.mapping.JdbcMappingContext;
 import org.springframework.util.Assert;
 
 /**
@@ -36,7 +36,7 @@ abstract class JdbcEntityWriterSupport implements EntityWriter<Object, Aggregate
 	}
 
 	/**
-	 * add {@link org.springframework.data.jdbc.core.conversion.DbAction.Delete} actions to the {@link AggregateChange}
+	 * add {@link org.springframework.data.relational.core.conversion.DbAction.Delete} actions to the {@link AggregateChange}
 	 * for deleting all referenced entities.
 	 *
 	 * @param id id of the aggregate root, of which the referenced entities get deleted.
diff --git a/src/main/java/org/springframework/data/jdbc/core/conversion/JdbcPropertyPath.java b/src/main/java/org/springframework/data/relational/core/conversion/JdbcPropertyPath.java
similarity index 96%
rename from src/main/java/org/springframework/data/jdbc/core/conversion/JdbcPropertyPath.java
rename to src/main/java/org/springframework/data/relational/core/conversion/JdbcPropertyPath.java
index e09ec636..760a29b5 100644
--- a/src/main/java/org/springframework/data/jdbc/core/conversion/JdbcPropertyPath.java
+++ b/src/main/java/org/springframework/data/relational/core/conversion/JdbcPropertyPath.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.data.jdbc.core.conversion;
+package org.springframework.data.relational.core.conversion;
 
 import org.springframework.data.mapping.PropertyPath;
 import org.springframework.util.Assert;
diff --git a/src/main/java/org/springframework/data/jdbc/core/mapping/package-info.java b/src/main/java/org/springframework/data/relational/core/conversion/package-info.java
similarity index 59%
rename from src/main/java/org/springframework/data/jdbc/core/mapping/package-info.java
rename to src/main/java/org/springframework/data/relational/core/conversion/package-info.java
index 20856e12..f616aaa8 100644
--- a/src/main/java/org/springframework/data/jdbc/core/mapping/package-info.java
+++ b/src/main/java/org/springframework/data/relational/core/conversion/package-info.java
@@ -2,6 +2,6 @@
  * @author Jens Schauder
  */
 @NonNullApi
-package org.springframework.data.jdbc.core.mapping;
+package org.springframework.data.relational.core.conversion;
 
 import org.springframework.lang.NonNullApi;
diff --git a/src/main/java/org/springframework/data/jdbc/core/mapping/BasicJdbcPersistentProperty.java b/src/main/java/org/springframework/data/relational/core/mapping/BasicJdbcPersistentProperty.java
similarity index 98%
rename from src/main/java/org/springframework/data/jdbc/core/mapping/BasicJdbcPersistentProperty.java
rename to src/main/java/org/springframework/data/relational/core/mapping/BasicJdbcPersistentProperty.java
index c53c5c20..cae32cef 100644
--- a/src/main/java/org/springframework/data/jdbc/core/mapping/BasicJdbcPersistentProperty.java
+++ b/src/main/java/org/springframework/data/relational/core/mapping/BasicJdbcPersistentProperty.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.data.jdbc.core.mapping;
+package org.springframework.data.relational.core.mapping;
 
 import java.time.ZonedDateTime;
 import java.time.temporal.Temporal;
diff --git a/src/main/java/org/springframework/data/jdbc/core/mapping/Column.java b/src/main/java/org/springframework/data/relational/core/mapping/Column.java
similarity index 95%
rename from src/main/java/org/springframework/data/jdbc/core/mapping/Column.java
rename to src/main/java/org/springframework/data/relational/core/mapping/Column.java
index 1adcd81a..56c460a9 100644
--- a/src/main/java/org/springframework/data/jdbc/core/mapping/Column.java
+++ b/src/main/java/org/springframework/data/relational/core/mapping/Column.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.data.jdbc.core.mapping;
+package org.springframework.data.relational.core.mapping;
 
 import java.lang.annotation.Documented;
 import java.lang.annotation.ElementType;
diff --git a/src/main/java/org/springframework/data/jdbc/core/mapping/ConversionCustomizer.java b/src/main/java/org/springframework/data/relational/core/mapping/ConversionCustomizer.java
similarity index 95%
rename from src/main/java/org/springframework/data/jdbc/core/mapping/ConversionCustomizer.java
rename to src/main/java/org/springframework/data/relational/core/mapping/ConversionCustomizer.java
index b823a444..92679eb2 100644
--- a/src/main/java/org/springframework/data/jdbc/core/mapping/ConversionCustomizer.java
+++ b/src/main/java/org/springframework/data/relational/core/mapping/ConversionCustomizer.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.data.jdbc.core.mapping;
+package org.springframework.data.relational.core.mapping;
 
 import org.springframework.core.convert.support.GenericConversionService;
 
diff --git a/src/main/java/org/springframework/data/jdbc/core/mapping/JdbcMappingContext.java b/src/main/java/org/springframework/data/relational/core/mapping/JdbcMappingContext.java
similarity index 98%
rename from src/main/java/org/springframework/data/jdbc/core/mapping/JdbcMappingContext.java
rename to src/main/java/org/springframework/data/relational/core/mapping/JdbcMappingContext.java
index 2fe859c4..b737bcb0 100644
--- a/src/main/java/org/springframework/data/jdbc/core/mapping/JdbcMappingContext.java
+++ b/src/main/java/org/springframework/data/relational/core/mapping/JdbcMappingContext.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.data.jdbc.core.mapping;
+package org.springframework.data.relational.core.mapping;
 
 import static java.util.Arrays.*;
 
diff --git a/src/main/java/org/springframework/data/jdbc/core/mapping/JdbcPersistentEntity.java b/src/main/java/org/springframework/data/relational/core/mapping/JdbcPersistentEntity.java
similarity index 95%
rename from src/main/java/org/springframework/data/jdbc/core/mapping/JdbcPersistentEntity.java
rename to src/main/java/org/springframework/data/relational/core/mapping/JdbcPersistentEntity.java
index f3a4ed47..d07f7bb6 100644
--- a/src/main/java/org/springframework/data/jdbc/core/mapping/JdbcPersistentEntity.java
+++ b/src/main/java/org/springframework/data/relational/core/mapping/JdbcPersistentEntity.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.data.jdbc.core.mapping;
+package org.springframework.data.relational.core.mapping;
 
 import org.springframework.data.mapping.model.MutablePersistentEntity;
 
diff --git a/src/main/java/org/springframework/data/jdbc/core/mapping/JdbcPersistentEntityImpl.java b/src/main/java/org/springframework/data/relational/core/mapping/JdbcPersistentEntityImpl.java
similarity index 97%
rename from src/main/java/org/springframework/data/jdbc/core/mapping/JdbcPersistentEntityImpl.java
rename to src/main/java/org/springframework/data/relational/core/mapping/JdbcPersistentEntityImpl.java
index d759fde1..5abe3ae7 100644
--- a/src/main/java/org/springframework/data/jdbc/core/mapping/JdbcPersistentEntityImpl.java
+++ b/src/main/java/org/springframework/data/relational/core/mapping/JdbcPersistentEntityImpl.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.data.jdbc.core.mapping;
+package org.springframework.data.relational.core.mapping;
 
 import java.util.Optional;
 
diff --git a/src/main/java/org/springframework/data/jdbc/core/mapping/JdbcPersistentProperty.java b/src/main/java/org/springframework/data/relational/core/mapping/JdbcPersistentProperty.java
similarity index 96%
rename from src/main/java/org/springframework/data/jdbc/core/mapping/JdbcPersistentProperty.java
rename to src/main/java/org/springframework/data/relational/core/mapping/JdbcPersistentProperty.java
index cc4c03e8..54e4e493 100644
--- a/src/main/java/org/springframework/data/jdbc/core/mapping/JdbcPersistentProperty.java
+++ b/src/main/java/org/springframework/data/relational/core/mapping/JdbcPersistentProperty.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.data.jdbc.core.mapping;
+package org.springframework.data.relational.core.mapping;
 
 import org.springframework.data.mapping.PersistentProperty;
 import org.springframework.lang.Nullable;
diff --git a/src/main/java/org/springframework/data/jdbc/core/mapping/NamingStrategy.java b/src/main/java/org/springframework/data/relational/core/mapping/NamingStrategy.java
similarity index 98%
rename from src/main/java/org/springframework/data/jdbc/core/mapping/NamingStrategy.java
rename to src/main/java/org/springframework/data/relational/core/mapping/NamingStrategy.java
index 99fd8902..093e0273 100644
--- a/src/main/java/org/springframework/data/jdbc/core/mapping/NamingStrategy.java
+++ b/src/main/java/org/springframework/data/relational/core/mapping/NamingStrategy.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.data.jdbc.core.mapping;
+package org.springframework.data.relational.core.mapping;
 
 import org.springframework.data.util.ParsingUtils;
 import org.springframework.util.Assert;
diff --git a/src/main/java/org/springframework/data/jdbc/core/mapping/Table.java b/src/main/java/org/springframework/data/relational/core/mapping/Table.java
similarity index 95%
rename from src/main/java/org/springframework/data/jdbc/core/mapping/Table.java
rename to src/main/java/org/springframework/data/relational/core/mapping/Table.java
index 3c68c53d..6707b2f3 100644
--- a/src/main/java/org/springframework/data/jdbc/core/mapping/Table.java
+++ b/src/main/java/org/springframework/data/relational/core/mapping/Table.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.data.jdbc.core.mapping;
+package org.springframework.data.relational.core.mapping;
 
 import java.lang.annotation.Documented;
 import java.lang.annotation.ElementType;
diff --git a/src/main/java/org/springframework/data/jdbc/core/mapping/event/AfterDeleteEvent.java b/src/main/java/org/springframework/data/relational/core/mapping/event/AfterDeleteEvent.java
similarity index 85%
rename from src/main/java/org/springframework/data/jdbc/core/mapping/event/AfterDeleteEvent.java
rename to src/main/java/org/springframework/data/relational/core/mapping/event/AfterDeleteEvent.java
index d072ba49..691d4c83 100644
--- a/src/main/java/org/springframework/data/jdbc/core/mapping/event/AfterDeleteEvent.java
+++ b/src/main/java/org/springframework/data/relational/core/mapping/event/AfterDeleteEvent.java
@@ -13,12 +13,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.data.jdbc.core.mapping.event;
+package org.springframework.data.relational.core.mapping.event;
 
 import java.util.Optional;
 
-import org.springframework.data.jdbc.core.conversion.AggregateChange;
-import org.springframework.data.jdbc.core.mapping.event.Identifier.Specified;
+import org.springframework.data.relational.core.conversion.AggregateChange;
+import org.springframework.data.relational.core.mapping.event.Identifier.Specified;
 
 /**
  * Gets published after deletion of an entity. It will have a {@link Specified} identifier. If the entity is empty or
diff --git a/src/main/java/org/springframework/data/jdbc/core/mapping/event/AfterLoadEvent.java b/src/main/java/org/springframework/data/relational/core/mapping/event/AfterLoadEvent.java
similarity index 88%
rename from src/main/java/org/springframework/data/jdbc/core/mapping/event/AfterLoadEvent.java
rename to src/main/java/org/springframework/data/relational/core/mapping/event/AfterLoadEvent.java
index 1d30a1ee..528fb103 100644
--- a/src/main/java/org/springframework/data/jdbc/core/mapping/event/AfterLoadEvent.java
+++ b/src/main/java/org/springframework/data/relational/core/mapping/event/AfterLoadEvent.java
@@ -13,9 +13,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.data.jdbc.core.mapping.event;
+package org.springframework.data.relational.core.mapping.event;
 
-import org.springframework.data.jdbc.core.mapping.event.Identifier.Specified;
+import org.springframework.data.relational.core.mapping.event.Identifier.Specified;
 
 /**
  * Gets published after instantiation and setting of all the properties of an entity. This allows to do some
diff --git a/src/main/java/org/springframework/data/jdbc/core/mapping/event/AfterSaveEvent.java b/src/main/java/org/springframework/data/relational/core/mapping/event/AfterSaveEvent.java
similarity index 84%
rename from src/main/java/org/springframework/data/jdbc/core/mapping/event/AfterSaveEvent.java
rename to src/main/java/org/springframework/data/relational/core/mapping/event/AfterSaveEvent.java
index fb827a9a..a19ded42 100644
--- a/src/main/java/org/springframework/data/jdbc/core/mapping/event/AfterSaveEvent.java
+++ b/src/main/java/org/springframework/data/relational/core/mapping/event/AfterSaveEvent.java
@@ -13,10 +13,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.data.jdbc.core.mapping.event;
+package org.springframework.data.relational.core.mapping.event;
 
-import org.springframework.data.jdbc.core.conversion.AggregateChange;
-import org.springframework.data.jdbc.core.mapping.event.Identifier.Specified;
+import org.springframework.data.relational.core.conversion.AggregateChange;
+import org.springframework.data.relational.core.mapping.event.Identifier.Specified;
 
 /**
  * Gets published after a new instance or a changed instance was saved in the database.
diff --git a/src/main/java/org/springframework/data/jdbc/core/mapping/event/BeforeDeleteEvent.java b/src/main/java/org/springframework/data/relational/core/mapping/event/BeforeDeleteEvent.java
similarity index 86%
rename from src/main/java/org/springframework/data/jdbc/core/mapping/event/BeforeDeleteEvent.java
rename to src/main/java/org/springframework/data/relational/core/mapping/event/BeforeDeleteEvent.java
index f879f901..6e37cfbe 100644
--- a/src/main/java/org/springframework/data/jdbc/core/mapping/event/BeforeDeleteEvent.java
+++ b/src/main/java/org/springframework/data/relational/core/mapping/event/BeforeDeleteEvent.java
@@ -13,12 +13,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.data.jdbc.core.mapping.event;
+package org.springframework.data.relational.core.mapping.event;
 
 import java.util.Optional;
 
-import org.springframework.data.jdbc.core.conversion.AggregateChange;
-import org.springframework.data.jdbc.core.mapping.event.Identifier.Specified;
+import org.springframework.data.relational.core.conversion.AggregateChange;
+import org.springframework.data.relational.core.mapping.event.Identifier.Specified;
 
 /**
  * Gets published when an entity is about to get deleted. The contained {@link AggregateChange} is mutable and may be
diff --git a/src/main/java/org/springframework/data/jdbc/core/mapping/event/BeforeSaveEvent.java b/src/main/java/org/springframework/data/relational/core/mapping/event/BeforeSaveEvent.java
similarity index 90%
rename from src/main/java/org/springframework/data/jdbc/core/mapping/event/BeforeSaveEvent.java
rename to src/main/java/org/springframework/data/relational/core/mapping/event/BeforeSaveEvent.java
index 8e777c3e..71de990d 100644
--- a/src/main/java/org/springframework/data/jdbc/core/mapping/event/BeforeSaveEvent.java
+++ b/src/main/java/org/springframework/data/relational/core/mapping/event/BeforeSaveEvent.java
@@ -13,9 +13,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.data.jdbc.core.mapping.event;
+package org.springframework.data.relational.core.mapping.event;
 
-import org.springframework.data.jdbc.core.conversion.AggregateChange;
+import org.springframework.data.relational.core.conversion.AggregateChange;
 
 /**
  * Gets published before an entity gets saved to the database. The contained {@link AggregateChange} is mutable and may
diff --git a/src/main/java/org/springframework/data/jdbc/core/mapping/event/Identifier.java b/src/main/java/org/springframework/data/relational/core/mapping/event/Identifier.java
similarity index 97%
rename from src/main/java/org/springframework/data/jdbc/core/mapping/event/Identifier.java
rename to src/main/java/org/springframework/data/relational/core/mapping/event/Identifier.java
index 7e2c7668..e5850830 100644
--- a/src/main/java/org/springframework/data/jdbc/core/mapping/event/Identifier.java
+++ b/src/main/java/org/springframework/data/relational/core/mapping/event/Identifier.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.data.jdbc.core.mapping.event;
+package org.springframework.data.relational.core.mapping.event;
 
 import java.util.Optional;
 
diff --git a/src/main/java/org/springframework/data/jdbc/core/mapping/event/JdbcEvent.java b/src/main/java/org/springframework/data/relational/core/mapping/event/JdbcEvent.java
similarity index 94%
rename from src/main/java/org/springframework/data/jdbc/core/mapping/event/JdbcEvent.java
rename to src/main/java/org/springframework/data/relational/core/mapping/event/JdbcEvent.java
index cdabab25..fb611ebb 100644
--- a/src/main/java/org/springframework/data/jdbc/core/mapping/event/JdbcEvent.java
+++ b/src/main/java/org/springframework/data/relational/core/mapping/event/JdbcEvent.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.data.jdbc.core.mapping.event;
+package org.springframework.data.relational.core.mapping.event;
 
 import java.util.Optional;
 
diff --git a/src/main/java/org/springframework/data/jdbc/core/mapping/event/JdbcEventWithEntity.java b/src/main/java/org/springframework/data/relational/core/mapping/event/JdbcEventWithEntity.java
similarity index 88%
rename from src/main/java/org/springframework/data/jdbc/core/mapping/event/JdbcEventWithEntity.java
rename to src/main/java/org/springframework/data/relational/core/mapping/event/JdbcEventWithEntity.java
index 9e0bef83..681854dd 100644
--- a/src/main/java/org/springframework/data/jdbc/core/mapping/event/JdbcEventWithEntity.java
+++ b/src/main/java/org/springframework/data/relational/core/mapping/event/JdbcEventWithEntity.java
@@ -13,11 +13,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.data.jdbc.core.mapping.event;
+package org.springframework.data.relational.core.mapping.event;
 
 import java.util.Optional;
 
-import org.springframework.data.jdbc.core.conversion.AggregateChange;
+import org.springframework.data.relational.core.conversion.AggregateChange;
 
 /**
  * A {@link SimpleJdbcEvent} which is guaranteed to have an entity.
diff --git a/src/main/java/org/springframework/data/jdbc/core/mapping/event/JdbcEventWithId.java b/src/main/java/org/springframework/data/relational/core/mapping/event/JdbcEventWithId.java
similarity index 85%
rename from src/main/java/org/springframework/data/jdbc/core/mapping/event/JdbcEventWithId.java
rename to src/main/java/org/springframework/data/relational/core/mapping/event/JdbcEventWithId.java
index 48f15d10..44761cb0 100644
--- a/src/main/java/org/springframework/data/jdbc/core/mapping/event/JdbcEventWithId.java
+++ b/src/main/java/org/springframework/data/relational/core/mapping/event/JdbcEventWithId.java
@@ -13,12 +13,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.data.jdbc.core.mapping.event;
+package org.springframework.data.relational.core.mapping.event;
 
 import java.util.Optional;
 
-import org.springframework.data.jdbc.core.conversion.AggregateChange;
-import org.springframework.data.jdbc.core.mapping.event.Identifier.Specified;
+import org.springframework.data.relational.core.conversion.AggregateChange;
+import org.springframework.data.relational.core.mapping.event.Identifier.Specified;
 import org.springframework.lang.Nullable;
 
 /**
diff --git a/src/main/java/org/springframework/data/jdbc/core/mapping/event/JdbcEventWithIdAndEntity.java b/src/main/java/org/springframework/data/relational/core/mapping/event/JdbcEventWithIdAndEntity.java
similarity index 83%
rename from src/main/java/org/springframework/data/jdbc/core/mapping/event/JdbcEventWithIdAndEntity.java
rename to src/main/java/org/springframework/data/relational/core/mapping/event/JdbcEventWithIdAndEntity.java
index 672c59cc..8cc4ef86 100644
--- a/src/main/java/org/springframework/data/jdbc/core/mapping/event/JdbcEventWithIdAndEntity.java
+++ b/src/main/java/org/springframework/data/relational/core/mapping/event/JdbcEventWithIdAndEntity.java
@@ -13,14 +13,14 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.data.jdbc.core.mapping.event;
+package org.springframework.data.relational.core.mapping.event;
 
 import lombok.Getter;
 
 import java.util.Optional;
 
-import org.springframework.data.jdbc.core.conversion.AggregateChange;
-import org.springframework.data.jdbc.core.mapping.event.Identifier.Specified;
+import org.springframework.data.relational.core.conversion.AggregateChange;
+import org.springframework.data.relational.core.mapping.event.Identifier.Specified;
 import org.springframework.lang.Nullable;
 
 /**
diff --git a/src/main/java/org/springframework/data/jdbc/core/mapping/event/SimpleJdbcEvent.java b/src/main/java/org/springframework/data/relational/core/mapping/event/SimpleJdbcEvent.java
similarity index 92%
rename from src/main/java/org/springframework/data/jdbc/core/mapping/event/SimpleJdbcEvent.java
rename to src/main/java/org/springframework/data/relational/core/mapping/event/SimpleJdbcEvent.java
index 6ed75070..960d7310 100644
--- a/src/main/java/org/springframework/data/jdbc/core/mapping/event/SimpleJdbcEvent.java
+++ b/src/main/java/org/springframework/data/relational/core/mapping/event/SimpleJdbcEvent.java
@@ -13,12 +13,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.data.jdbc.core.mapping.event;
+package org.springframework.data.relational.core.mapping.event;
 
 import java.util.Optional;
 
 import org.springframework.context.ApplicationEvent;
-import org.springframework.data.jdbc.core.conversion.AggregateChange;
+import org.springframework.data.relational.core.conversion.AggregateChange;
 import org.springframework.lang.Nullable;
 
 /**
diff --git a/src/main/java/org/springframework/data/jdbc/core/mapping/event/SpecifiedIdentifier.java b/src/main/java/org/springframework/data/relational/core/mapping/event/SpecifiedIdentifier.java
similarity index 88%
rename from src/main/java/org/springframework/data/jdbc/core/mapping/event/SpecifiedIdentifier.java
rename to src/main/java/org/springframework/data/relational/core/mapping/event/SpecifiedIdentifier.java
index 92cd82e7..4ae30690 100644
--- a/src/main/java/org/springframework/data/jdbc/core/mapping/event/SpecifiedIdentifier.java
+++ b/src/main/java/org/springframework/data/relational/core/mapping/event/SpecifiedIdentifier.java
@@ -13,14 +13,14 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.data.jdbc.core.mapping.event;
+package org.springframework.data.relational.core.mapping.event;
 
 import lombok.NonNull;
 import lombok.Value;
 
 import java.util.Optional;
 
-import org.springframework.data.jdbc.core.mapping.event.Identifier.Specified;
+import org.springframework.data.relational.core.mapping.event.Identifier.Specified;
 
 /**
  * Simple value object for {@link Specified}.
diff --git a/src/main/java/org/springframework/data/jdbc/core/mapping/event/Unset.java b/src/main/java/org/springframework/data/relational/core/mapping/event/Unset.java
similarity index 94%
rename from src/main/java/org/springframework/data/jdbc/core/mapping/event/Unset.java
rename to src/main/java/org/springframework/data/relational/core/mapping/event/Unset.java
index 436db34f..0ec4cca9 100644
--- a/src/main/java/org/springframework/data/jdbc/core/mapping/event/Unset.java
+++ b/src/main/java/org/springframework/data/relational/core/mapping/event/Unset.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.data.jdbc.core.mapping.event;
+package org.springframework.data.relational.core.mapping.event;
 
 import java.util.Optional;
 
diff --git a/src/main/java/org/springframework/data/jdbc/core/mapping/event/WithEntity.java b/src/main/java/org/springframework/data/relational/core/mapping/event/WithEntity.java
similarity index 94%
rename from src/main/java/org/springframework/data/jdbc/core/mapping/event/WithEntity.java
rename to src/main/java/org/springframework/data/relational/core/mapping/event/WithEntity.java
index 324a2650..1cd6e923 100644
--- a/src/main/java/org/springframework/data/jdbc/core/mapping/event/WithEntity.java
+++ b/src/main/java/org/springframework/data/relational/core/mapping/event/WithEntity.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.data.jdbc.core.mapping.event;
+package org.springframework.data.relational.core.mapping.event;
 
 /**
  * Interface for {@link SimpleJdbcEvent}s which are guaranteed to have an entity. Allows direct access to that entity,
diff --git a/src/main/java/org/springframework/data/jdbc/core/mapping/event/WithId.java b/src/main/java/org/springframework/data/relational/core/mapping/event/WithId.java
similarity index 86%
rename from src/main/java/org/springframework/data/jdbc/core/mapping/event/WithId.java
rename to src/main/java/org/springframework/data/relational/core/mapping/event/WithId.java
index be03ed53..a3910f27 100644
--- a/src/main/java/org/springframework/data/jdbc/core/mapping/event/WithId.java
+++ b/src/main/java/org/springframework/data/relational/core/mapping/event/WithId.java
@@ -13,9 +13,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.data.jdbc.core.mapping.event;
+package org.springframework.data.relational.core.mapping.event;
 
-import org.springframework.data.jdbc.core.mapping.event.Identifier.Specified;
+import org.springframework.data.relational.core.mapping.event.Identifier.Specified;
 
 /**
  * Interface for {@link SimpleJdbcEvent}s which are guaranteed to have a {@link Specified} identifier. Offers direct
diff --git a/src/main/java/org/springframework/data/jdbc/domain/support/package-info.java b/src/main/java/org/springframework/data/relational/core/mapping/event/package-info.java
similarity index 58%
rename from src/main/java/org/springframework/data/jdbc/domain/support/package-info.java
rename to src/main/java/org/springframework/data/relational/core/mapping/event/package-info.java
index bcf2b5b5..4d855d2e 100644
--- a/src/main/java/org/springframework/data/jdbc/domain/support/package-info.java
+++ b/src/main/java/org/springframework/data/relational/core/mapping/event/package-info.java
@@ -2,6 +2,6 @@
  * @author Jens Schauder
  */
 @NonNullApi
-package org.springframework.data.jdbc.domain.support;
+package org.springframework.data.relational.core.mapping.event;
 
 import org.springframework.lang.NonNullApi;
diff --git a/src/main/java/org/springframework/data/jdbc/core/conversion/package-info.java b/src/main/java/org/springframework/data/relational/core/mapping/package-info.java
similarity index 60%
rename from src/main/java/org/springframework/data/jdbc/core/conversion/package-info.java
rename to src/main/java/org/springframework/data/relational/core/mapping/package-info.java
index db476569..9617ea16 100644
--- a/src/main/java/org/springframework/data/jdbc/core/conversion/package-info.java
+++ b/src/main/java/org/springframework/data/relational/core/mapping/package-info.java
@@ -2,6 +2,6 @@
  * @author Jens Schauder
  */
 @NonNullApi
-package org.springframework.data.jdbc.core.conversion;
+package org.springframework.data.relational.core.mapping;
 
 import org.springframework.lang.NonNullApi;
diff --git a/src/main/java/org/springframework/data/jdbc/domain/support/JdbcAuditingEventListener.java b/src/main/java/org/springframework/data/relational/domain/support/JdbcAuditingEventListener.java
similarity index 91%
rename from src/main/java/org/springframework/data/jdbc/domain/support/JdbcAuditingEventListener.java
rename to src/main/java/org/springframework/data/relational/domain/support/JdbcAuditingEventListener.java
index ebc4549d..d78f69cb 100644
--- a/src/main/java/org/springframework/data/jdbc/domain/support/JdbcAuditingEventListener.java
+++ b/src/main/java/org/springframework/data/relational/domain/support/JdbcAuditingEventListener.java
@@ -13,14 +13,14 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.data.jdbc.domain.support;
+package org.springframework.data.relational.domain.support;
 
 import lombok.RequiredArgsConstructor;
 
 import org.springframework.context.ApplicationListener;
 import org.springframework.data.auditing.IsNewAwareAuditingHandler;
-import org.springframework.data.jdbc.core.mapping.event.BeforeSaveEvent;
 import org.springframework.data.jdbc.repository.config.EnableJdbcAuditing;
+import org.springframework.data.relational.core.mapping.event.BeforeSaveEvent;
 
 /**
  * Spring JDBC event listener to capture auditing information on persisting and updating entities.
diff --git a/src/main/java/org/springframework/data/jdbc/core/mapping/event/package-info.java b/src/main/java/org/springframework/data/relational/domain/support/package-info.java
similarity index 60%
rename from src/main/java/org/springframework/data/jdbc/core/mapping/event/package-info.java
rename to src/main/java/org/springframework/data/relational/domain/support/package-info.java
index f6780356..fcf7b85e 100644
--- a/src/main/java/org/springframework/data/jdbc/core/mapping/event/package-info.java
+++ b/src/main/java/org/springframework/data/relational/domain/support/package-info.java
@@ -2,6 +2,6 @@
  * @author Jens Schauder
  */
 @NonNullApi
-package org.springframework.data.jdbc.core.mapping.event;
+package org.springframework.data.relational.domain.support;
 
 import org.springframework.lang.NonNullApi;
diff --git a/src/test/java/org/springframework/data/jdbc/core/CascadingDataAccessStrategyUnitTests.java b/src/test/java/org/springframework/data/jdbc/core/CascadingDataAccessStrategyUnitTests.java
index b58788dd..9f5ac890 100644
--- a/src/test/java/org/springframework/data/jdbc/core/CascadingDataAccessStrategyUnitTests.java
+++ b/src/test/java/org/springframework/data/jdbc/core/CascadingDataAccessStrategyUnitTests.java
@@ -25,7 +25,7 @@ import java.util.Collections;
 
 import org.junit.Test;
 import org.springframework.data.jdbc.core.FunctionCollector.CombinedDataAccessException;
-import org.springframework.data.jdbc.core.mapping.JdbcPersistentProperty;
+import org.springframework.data.relational.core.mapping.JdbcPersistentProperty;
 
 /**
  * Unit tests for {@link CascadingDataAccessStrategy}.
diff --git a/src/test/java/org/springframework/data/jdbc/core/DefaultDataAccessStrategyUnitTests.java b/src/test/java/org/springframework/data/jdbc/core/DefaultDataAccessStrategyUnitTests.java
index 402df657..91fd56fd 100644
--- a/src/test/java/org/springframework/data/jdbc/core/DefaultDataAccessStrategyUnitTests.java
+++ b/src/test/java/org/springframework/data/jdbc/core/DefaultDataAccessStrategyUnitTests.java
@@ -28,7 +28,7 @@ import org.junit.Test;
 import org.mockito.ArgumentCaptor;
 import org.springframework.data.annotation.Id;
 import org.springframework.data.convert.EntityInstantiators;
-import org.springframework.data.jdbc.core.mapping.JdbcMappingContext;
+import org.springframework.data.relational.core.mapping.JdbcMappingContext;
 import org.springframework.jdbc.core.namedparam.NamedParameterJdbcOperations;
 import org.springframework.jdbc.core.namedparam.SqlParameterSource;
 import org.springframework.jdbc.support.KeyHolder;
diff --git a/src/test/java/org/springframework/data/jdbc/core/DefaultJdbcInterpreterUnitTests.java b/src/test/java/org/springframework/data/jdbc/core/DefaultJdbcInterpreterUnitTests.java
index e97ec4f8..2c7c88c0 100644
--- a/src/test/java/org/springframework/data/jdbc/core/DefaultJdbcInterpreterUnitTests.java
+++ b/src/test/java/org/springframework/data/jdbc/core/DefaultJdbcInterpreterUnitTests.java
@@ -25,12 +25,12 @@ import java.util.Map;
 import org.junit.Test;
 import org.mockito.ArgumentCaptor;
 import org.springframework.data.annotation.Id;
-import org.springframework.data.jdbc.core.conversion.DbAction;
-import org.springframework.data.jdbc.core.conversion.DbAction.Insert;
-import org.springframework.data.jdbc.core.mapping.JdbcMappingContext;
-import org.springframework.data.jdbc.core.mapping.JdbcPersistentProperty;
-import org.springframework.data.jdbc.core.mapping.NamingStrategy;
-import org.springframework.data.jdbc.core.conversion.JdbcPropertyPath;
+import org.springframework.data.relational.core.conversion.DbAction;
+import org.springframework.data.relational.core.conversion.JdbcPropertyPath;
+import org.springframework.data.relational.core.conversion.DbAction.Insert;
+import org.springframework.data.relational.core.mapping.JdbcMappingContext;
+import org.springframework.data.relational.core.mapping.JdbcPersistentProperty;
+import org.springframework.data.relational.core.mapping.NamingStrategy;
 import org.springframework.jdbc.core.namedparam.NamedParameterJdbcOperations;
 
 /**
diff --git a/src/test/java/org/springframework/data/jdbc/core/EntityRowMapperUnitTests.java b/src/test/java/org/springframework/data/jdbc/core/EntityRowMapperUnitTests.java
index 16d6c281..71d59ff7 100644
--- a/src/test/java/org/springframework/data/jdbc/core/EntityRowMapperUnitTests.java
+++ b/src/test/java/org/springframework/data/jdbc/core/EntityRowMapperUnitTests.java
@@ -43,10 +43,10 @@ import org.springframework.core.convert.support.GenericConversionService;
 import org.springframework.data.annotation.Id;
 import org.springframework.data.convert.EntityInstantiators;
 import org.springframework.data.convert.Jsr310Converters;
-import org.springframework.data.jdbc.core.mapping.JdbcMappingContext;
-import org.springframework.data.jdbc.core.mapping.JdbcPersistentEntity;
-import org.springframework.data.jdbc.core.mapping.JdbcPersistentProperty;
-import org.springframework.data.jdbc.core.mapping.NamingStrategy;
+import org.springframework.data.relational.core.mapping.JdbcMappingContext;
+import org.springframework.data.relational.core.mapping.JdbcPersistentEntity;
+import org.springframework.data.relational.core.mapping.JdbcPersistentProperty;
+import org.springframework.data.relational.core.mapping.NamingStrategy;
 import org.springframework.util.Assert;
 
 /**
diff --git a/src/test/java/org/springframework/data/jdbc/core/JdbcEntityTemplateIntegrationTests.java b/src/test/java/org/springframework/data/jdbc/core/JdbcEntityTemplateIntegrationTests.java
index 5c7425b0..e2434b1f 100644
--- a/src/test/java/org/springframework/data/jdbc/core/JdbcEntityTemplateIntegrationTests.java
+++ b/src/test/java/org/springframework/data/jdbc/core/JdbcEntityTemplateIntegrationTests.java
@@ -31,8 +31,8 @@ import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Import;
 import org.springframework.data.annotation.Id;
-import org.springframework.data.jdbc.core.mapping.JdbcMappingContext;
 import org.springframework.data.jdbc.testing.TestConfiguration;
+import org.springframework.data.relational.core.mapping.JdbcMappingContext;
 import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.junit4.rules.SpringClassRule;
 import org.springframework.test.context.junit4.rules.SpringMethodRule;
diff --git a/src/test/java/org/springframework/data/jdbc/core/MyBatisDataAccessStrategyUnitTests.java b/src/test/java/org/springframework/data/jdbc/core/MyBatisDataAccessStrategyUnitTests.java
index 8908c70a..92f478c4 100644
--- a/src/test/java/org/springframework/data/jdbc/core/MyBatisDataAccessStrategyUnitTests.java
+++ b/src/test/java/org/springframework/data/jdbc/core/MyBatisDataAccessStrategyUnitTests.java
@@ -27,10 +27,10 @@ import org.junit.Before;
 import org.junit.Test;
 import org.mockito.ArgumentCaptor;
 import org.mockito.Mockito;
-import org.springframework.data.jdbc.core.mapping.JdbcPersistentProperty;
 import org.springframework.data.jdbc.mybatis.MyBatisContext;
 import org.springframework.data.jdbc.mybatis.MyBatisDataAccessStrategy;
 import org.springframework.data.mapping.PropertyPath;
+import org.springframework.data.relational.core.mapping.JdbcPersistentProperty;
 
 /**
  * Unit tests for the {@link MyBatisDataAccessStrategy}, mainly ensuring that the correct statements get's looked up.
diff --git a/src/test/java/org/springframework/data/jdbc/core/SqlGeneratorContextBasedNamingStrategyUnitTests.java b/src/test/java/org/springframework/data/jdbc/core/SqlGeneratorContextBasedNamingStrategyUnitTests.java
index a1215f5c..07742ab7 100644
--- a/src/test/java/org/springframework/data/jdbc/core/SqlGeneratorContextBasedNamingStrategyUnitTests.java
+++ b/src/test/java/org/springframework/data/jdbc/core/SqlGeneratorContextBasedNamingStrategyUnitTests.java
@@ -25,10 +25,10 @@ import java.util.function.Consumer;
 import org.assertj.core.api.SoftAssertions;
 import org.junit.Test;
 import org.springframework.data.annotation.Id;
-import org.springframework.data.jdbc.core.mapping.JdbcMappingContext;
-import org.springframework.data.jdbc.core.mapping.JdbcPersistentEntity;
-import org.springframework.data.jdbc.core.mapping.NamingStrategy;
 import org.springframework.data.mapping.PropertyPath;
+import org.springframework.data.relational.core.mapping.JdbcMappingContext;
+import org.springframework.data.relational.core.mapping.JdbcPersistentEntity;
+import org.springframework.data.relational.core.mapping.NamingStrategy;
 
 /**
  * Unit tests to verify a contextual {@link NamingStrategy} implementation that customizes using a user-centric
diff --git a/src/test/java/org/springframework/data/jdbc/core/SqlGeneratorFixedNamingStrategyUnitTests.java b/src/test/java/org/springframework/data/jdbc/core/SqlGeneratorFixedNamingStrategyUnitTests.java
index 9430673f..c08fd914 100644
--- a/src/test/java/org/springframework/data/jdbc/core/SqlGeneratorFixedNamingStrategyUnitTests.java
+++ b/src/test/java/org/springframework/data/jdbc/core/SqlGeneratorFixedNamingStrategyUnitTests.java
@@ -20,11 +20,11 @@ import static org.assertj.core.api.Assertions.*;
 import org.assertj.core.api.SoftAssertions;
 import org.junit.Test;
 import org.springframework.data.annotation.Id;
-import org.springframework.data.jdbc.core.mapping.JdbcMappingContext;
-import org.springframework.data.jdbc.core.mapping.JdbcPersistentEntity;
-import org.springframework.data.jdbc.core.mapping.JdbcPersistentProperty;
-import org.springframework.data.jdbc.core.mapping.NamingStrategy;
 import org.springframework.data.mapping.PropertyPath;
+import org.springframework.data.relational.core.mapping.JdbcMappingContext;
+import org.springframework.data.relational.core.mapping.JdbcPersistentEntity;
+import org.springframework.data.relational.core.mapping.JdbcPersistentProperty;
+import org.springframework.data.relational.core.mapping.NamingStrategy;
 
 /**
  * Unit tests the {@link SqlGenerator} with a fixed {@link NamingStrategy} implementation containing a hard wired
diff --git a/src/test/java/org/springframework/data/jdbc/core/SqlGeneratorUnitTests.java b/src/test/java/org/springframework/data/jdbc/core/SqlGeneratorUnitTests.java
index d6e3bf7c..d71eb7fa 100644
--- a/src/test/java/org/springframework/data/jdbc/core/SqlGeneratorUnitTests.java
+++ b/src/test/java/org/springframework/data/jdbc/core/SqlGeneratorUnitTests.java
@@ -24,11 +24,11 @@ import org.assertj.core.api.SoftAssertions;
 import org.junit.Before;
 import org.junit.Test;
 import org.springframework.data.annotation.Id;
-import org.springframework.data.jdbc.core.mapping.JdbcMappingContext;
-import org.springframework.data.jdbc.core.mapping.JdbcPersistentEntity;
-import org.springframework.data.jdbc.core.mapping.JdbcPersistentProperty;
-import org.springframework.data.jdbc.core.mapping.NamingStrategy;
 import org.springframework.data.mapping.PropertyPath;
+import org.springframework.data.relational.core.mapping.JdbcMappingContext;
+import org.springframework.data.relational.core.mapping.JdbcPersistentEntity;
+import org.springframework.data.relational.core.mapping.JdbcPersistentProperty;
+import org.springframework.data.relational.core.mapping.NamingStrategy;
 
 /**
  * Unit tests for the {@link SqlGenerator}.
diff --git a/src/test/java/org/springframework/data/jdbc/mapping/model/JdbcMappingContextUnitTests.java b/src/test/java/org/springframework/data/jdbc/mapping/model/JdbcMappingContextUnitTests.java
index 0d25f840..2f2c48e5 100644
--- a/src/test/java/org/springframework/data/jdbc/mapping/model/JdbcMappingContextUnitTests.java
+++ b/src/test/java/org/springframework/data/jdbc/mapping/model/JdbcMappingContextUnitTests.java
@@ -22,8 +22,8 @@ import java.util.Map;
 import java.util.Set;
 
 import org.junit.Test;
-import org.springframework.data.jdbc.core.mapping.JdbcMappingContext;
 import org.springframework.data.mapping.PropertyPath;
+import org.springframework.data.relational.core.mapping.JdbcMappingContext;
 
 /**
  * @author Jens Schauder
diff --git a/src/test/java/org/springframework/data/jdbc/mapping/model/NamingStrategyUnitTests.java b/src/test/java/org/springframework/data/jdbc/mapping/model/NamingStrategyUnitTests.java
index 97d7f472..0f17d0d2 100644
--- a/src/test/java/org/springframework/data/jdbc/mapping/model/NamingStrategyUnitTests.java
+++ b/src/test/java/org/springframework/data/jdbc/mapping/model/NamingStrategyUnitTests.java
@@ -25,10 +25,10 @@ import java.util.List;
 
 import org.junit.Test;
 import org.springframework.data.annotation.Id;
-import org.springframework.data.jdbc.core.mapping.ConversionCustomizer;
-import org.springframework.data.jdbc.core.mapping.JdbcMappingContext;
-import org.springframework.data.jdbc.core.mapping.JdbcPersistentEntity;
-import org.springframework.data.jdbc.core.mapping.NamingStrategy;
+import org.springframework.data.relational.core.mapping.ConversionCustomizer;
+import org.springframework.data.relational.core.mapping.JdbcMappingContext;
+import org.springframework.data.relational.core.mapping.JdbcPersistentEntity;
+import org.springframework.data.relational.core.mapping.NamingStrategy;
 
 /**
  * Unit tests for the default {@link NamingStrategy}.
diff --git a/src/test/java/org/springframework/data/jdbc/mybatis/MyBatisHsqlIntegrationTests.java b/src/test/java/org/springframework/data/jdbc/mybatis/MyBatisHsqlIntegrationTests.java
index 491af56b..4f22b998 100644
--- a/src/test/java/org/springframework/data/jdbc/mybatis/MyBatisHsqlIntegrationTests.java
+++ b/src/test/java/org/springframework/data/jdbc/mybatis/MyBatisHsqlIntegrationTests.java
@@ -31,9 +31,9 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Import;
 import org.springframework.data.jdbc.core.DataAccessStrategy;
-import org.springframework.data.jdbc.core.mapping.JdbcMappingContext;
 import org.springframework.data.jdbc.repository.config.EnableJdbcRepositories;
 import org.springframework.data.jdbc.testing.TestConfiguration;
+import org.springframework.data.relational.core.mapping.JdbcMappingContext;
 import org.springframework.data.repository.CrudRepository;
 import org.springframework.jdbc.core.namedparam.NamedParameterJdbcTemplate;
 import org.springframework.jdbc.datasource.embedded.EmbeddedDatabase;
diff --git a/src/test/java/org/springframework/data/jdbc/repository/JdbcRepositoryIdGenerationIntegrationTests.java b/src/test/java/org/springframework/data/jdbc/repository/JdbcRepositoryIdGenerationIntegrationTests.java
index 8661f81c..cdbeb62b 100644
--- a/src/test/java/org/springframework/data/jdbc/repository/JdbcRepositoryIdGenerationIntegrationTests.java
+++ b/src/test/java/org/springframework/data/jdbc/repository/JdbcRepositoryIdGenerationIntegrationTests.java
@@ -29,10 +29,10 @@ import org.springframework.context.annotation.ComponentScan;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Import;
 import org.springframework.data.annotation.Id;
-import org.springframework.data.jdbc.core.mapping.NamingStrategy;
 import org.springframework.data.jdbc.repository.config.EnableJdbcRepositories;
 import org.springframework.data.jdbc.repository.support.JdbcRepositoryFactory;
 import org.springframework.data.jdbc.repository.support.SimpleJdbcRepository;
+import org.springframework.data.relational.core.mapping.NamingStrategy;
 import org.springframework.data.repository.CrudRepository;
 import org.springframework.jdbc.core.namedparam.NamedParameterJdbcTemplate;
 import org.springframework.test.context.ContextConfiguration;
diff --git a/src/test/java/org/springframework/data/jdbc/repository/JdbcRepositoryManipulateDbActionsIntegrationTests.java b/src/test/java/org/springframework/data/jdbc/repository/JdbcRepositoryManipulateDbActionsIntegrationTests.java
index c094d129..9eca36b8 100644
--- a/src/test/java/org/springframework/data/jdbc/repository/JdbcRepositoryManipulateDbActionsIntegrationTests.java
+++ b/src/test/java/org/springframework/data/jdbc/repository/JdbcRepositoryManipulateDbActionsIntegrationTests.java
@@ -37,11 +37,11 @@ import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Import;
 import org.springframework.data.annotation.Id;
 import org.springframework.data.annotation.PersistenceConstructor;
-import org.springframework.data.jdbc.core.conversion.DbAction;
-import org.springframework.data.jdbc.core.mapping.event.BeforeDeleteEvent;
-import org.springframework.data.jdbc.core.mapping.event.BeforeSaveEvent;
 import org.springframework.data.jdbc.repository.config.EnableJdbcRepositories;
 import org.springframework.data.jdbc.testing.TestConfiguration;
+import org.springframework.data.relational.core.conversion.DbAction;
+import org.springframework.data.relational.core.mapping.event.BeforeDeleteEvent;
+import org.springframework.data.relational.core.mapping.event.BeforeSaveEvent;
 import org.springframework.data.repository.CrudRepository;
 import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.junit4.rules.SpringClassRule;
diff --git a/src/test/java/org/springframework/data/jdbc/repository/JdbcRepositoryPropertyConversionIntegrationTests.java b/src/test/java/org/springframework/data/jdbc/repository/JdbcRepositoryPropertyConversionIntegrationTests.java
index 47d7b408..04ca4bff 100644
--- a/src/test/java/org/springframework/data/jdbc/repository/JdbcRepositoryPropertyConversionIntegrationTests.java
+++ b/src/test/java/org/springframework/data/jdbc/repository/JdbcRepositoryPropertyConversionIntegrationTests.java
@@ -39,9 +39,9 @@ import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Import;
 import org.springframework.data.annotation.Id;
-import org.springframework.data.jdbc.core.mapping.event.BeforeSaveEvent;
 import org.springframework.data.jdbc.repository.support.JdbcRepositoryFactory;
 import org.springframework.data.jdbc.testing.TestConfiguration;
+import org.springframework.data.relational.core.mapping.event.BeforeSaveEvent;
 import org.springframework.data.repository.CrudRepository;
 import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.junit4.rules.SpringClassRule;
diff --git a/src/test/java/org/springframework/data/jdbc/repository/SimpleJdbcRepositoryEventsUnitTests.java b/src/test/java/org/springframework/data/jdbc/repository/SimpleJdbcRepositoryEventsUnitTests.java
index cf914113..73a5e69b 100644
--- a/src/test/java/org/springframework/data/jdbc/repository/SimpleJdbcRepositoryEventsUnitTests.java
+++ b/src/test/java/org/springframework/data/jdbc/repository/SimpleJdbcRepositoryEventsUnitTests.java
@@ -39,16 +39,16 @@ import org.springframework.data.annotation.Id;
 import org.springframework.data.convert.EntityInstantiators;
 import org.springframework.data.jdbc.core.DefaultDataAccessStrategy;
 import org.springframework.data.jdbc.core.SqlGeneratorSource;
-import org.springframework.data.jdbc.core.mapping.JdbcMappingContext;
-import org.springframework.data.jdbc.core.mapping.event.AfterDeleteEvent;
-import org.springframework.data.jdbc.core.mapping.event.AfterLoadEvent;
-import org.springframework.data.jdbc.core.mapping.event.AfterSaveEvent;
-import org.springframework.data.jdbc.core.mapping.event.BeforeDeleteEvent;
-import org.springframework.data.jdbc.core.mapping.event.BeforeSaveEvent;
-import org.springframework.data.jdbc.core.mapping.event.Identifier;
-import org.springframework.data.jdbc.core.mapping.event.JdbcEvent;
 import org.springframework.data.jdbc.repository.support.JdbcRepositoryFactory;
 import org.springframework.data.jdbc.repository.support.SimpleJdbcRepository;
+import org.springframework.data.relational.core.mapping.JdbcMappingContext;
+import org.springframework.data.relational.core.mapping.event.AfterDeleteEvent;
+import org.springframework.data.relational.core.mapping.event.AfterLoadEvent;
+import org.springframework.data.relational.core.mapping.event.AfterSaveEvent;
+import org.springframework.data.relational.core.mapping.event.BeforeDeleteEvent;
+import org.springframework.data.relational.core.mapping.event.BeforeSaveEvent;
+import org.springframework.data.relational.core.mapping.event.Identifier;
+import org.springframework.data.relational.core.mapping.event.JdbcEvent;
 import org.springframework.data.repository.CrudRepository;
 import org.springframework.jdbc.core.namedparam.NamedParameterJdbcOperations;
 import org.springframework.jdbc.core.namedparam.SqlParameterSource;
diff --git a/src/test/java/org/springframework/data/jdbc/repository/config/EnableJdbcAuditingHsqlIntegrationTests.java b/src/test/java/org/springframework/data/jdbc/repository/config/EnableJdbcAuditingHsqlIntegrationTests.java
index 68e5980a..16e566a3 100644
--- a/src/test/java/org/springframework/data/jdbc/repository/config/EnableJdbcAuditingHsqlIntegrationTests.java
+++ b/src/test/java/org/springframework/data/jdbc/repository/config/EnableJdbcAuditingHsqlIntegrationTests.java
@@ -41,7 +41,7 @@ import org.springframework.data.annotation.LastModifiedBy;
 import org.springframework.data.annotation.LastModifiedDate;
 import org.springframework.data.auditing.DateTimeProvider;
 import org.springframework.data.domain.AuditorAware;
-import org.springframework.data.jdbc.core.mapping.NamingStrategy;
+import org.springframework.data.relational.core.mapping.NamingStrategy;
 import org.springframework.data.repository.CrudRepository;
 import org.springframework.test.context.ActiveProfiles;
 
diff --git a/src/test/java/org/springframework/data/jdbc/repository/support/JdbcQueryLookupStrategyUnitTests.java b/src/test/java/org/springframework/data/jdbc/repository/support/JdbcQueryLookupStrategyUnitTests.java
index 572641dd..aafc5f0d 100644
--- a/src/test/java/org/springframework/data/jdbc/repository/support/JdbcQueryLookupStrategyUnitTests.java
+++ b/src/test/java/org/springframework/data/jdbc/repository/support/JdbcQueryLookupStrategyUnitTests.java
@@ -27,11 +27,11 @@ import org.junit.Before;
 import org.junit.Test;
 import org.springframework.data.convert.EntityInstantiators;
 import org.springframework.data.jdbc.core.DataAccessStrategy;
-import org.springframework.data.jdbc.core.mapping.JdbcMappingContext;
 import org.springframework.data.jdbc.repository.RowMapperMap;
 import org.springframework.data.jdbc.repository.config.ConfigurableRowMapperMap;
 import org.springframework.data.jdbc.repository.query.Query;
 import org.springframework.data.projection.ProjectionFactory;
+import org.springframework.data.relational.core.mapping.JdbcMappingContext;
 import org.springframework.data.repository.core.NamedQueries;
 import org.springframework.data.repository.core.RepositoryMetadata;
 import org.springframework.data.repository.query.RepositoryQuery;
diff --git a/src/test/java/org/springframework/data/jdbc/repository/support/JdbcRepositoryFactoryBeanUnitTests.java b/src/test/java/org/springframework/data/jdbc/repository/support/JdbcRepositoryFactoryBeanUnitTests.java
index 8830b5aa..05b7465d 100644
--- a/src/test/java/org/springframework/data/jdbc/repository/support/JdbcRepositoryFactoryBeanUnitTests.java
+++ b/src/test/java/org/springframework/data/jdbc/repository/support/JdbcRepositoryFactoryBeanUnitTests.java
@@ -28,8 +28,8 @@ import org.springframework.context.ApplicationEventPublisher;
 import org.springframework.data.annotation.Id;
 import org.springframework.data.jdbc.core.DataAccessStrategy;
 import org.springframework.data.jdbc.core.DefaultDataAccessStrategy;
-import org.springframework.data.jdbc.core.mapping.JdbcMappingContext;
 import org.springframework.data.jdbc.repository.RowMapperMap;
+import org.springframework.data.relational.core.mapping.JdbcMappingContext;
 import org.springframework.data.repository.CrudRepository;
 import org.springframework.test.util.ReflectionTestUtils;
 
diff --git a/src/test/java/org/springframework/data/jdbc/testing/TestConfiguration.java b/src/test/java/org/springframework/data/jdbc/testing/TestConfiguration.java
index 3b8b1727..7d9f474e 100644
--- a/src/test/java/org/springframework/data/jdbc/testing/TestConfiguration.java
+++ b/src/test/java/org/springframework/data/jdbc/testing/TestConfiguration.java
@@ -29,10 +29,10 @@ import org.springframework.data.convert.EntityInstantiators;
 import org.springframework.data.jdbc.core.DataAccessStrategy;
 import org.springframework.data.jdbc.core.DefaultDataAccessStrategy;
 import org.springframework.data.jdbc.core.SqlGeneratorSource;
-import org.springframework.data.jdbc.core.mapping.ConversionCustomizer;
-import org.springframework.data.jdbc.core.mapping.JdbcMappingContext;
-import org.springframework.data.jdbc.core.mapping.NamingStrategy;
 import org.springframework.data.jdbc.repository.support.JdbcRepositoryFactory;
+import org.springframework.data.relational.core.mapping.ConversionCustomizer;
+import org.springframework.data.relational.core.mapping.JdbcMappingContext;
+import org.springframework.data.relational.core.mapping.NamingStrategy;
 import org.springframework.jdbc.core.namedparam.NamedParameterJdbcOperations;
 import org.springframework.jdbc.core.namedparam.NamedParameterJdbcTemplate;
 import org.springframework.jdbc.datasource.DataSourceTransactionManager;
diff --git a/src/test/java/org/springframework/data/jdbc/core/conversion/DbActionExecutionExceptionTest.java b/src/test/java/org/springframework/data/relational/core/conversion/DbActionExecutionExceptionTest.java
similarity index 81%
rename from src/test/java/org/springframework/data/jdbc/core/conversion/DbActionExecutionExceptionTest.java
rename to src/test/java/org/springframework/data/relational/core/conversion/DbActionExecutionExceptionTest.java
index 6e114ab9..a5fceb2a 100644
--- a/src/test/java/org/springframework/data/jdbc/core/conversion/DbActionExecutionExceptionTest.java
+++ b/src/test/java/org/springframework/data/relational/core/conversion/DbActionExecutionExceptionTest.java
@@ -13,11 +13,13 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.data.jdbc.core.conversion;
+package org.springframework.data.relational.core.conversion;
 
 import static org.mockito.Mockito.*;
 
 import org.junit.Test;
+import org.springframework.data.relational.core.conversion.DbAction;
+import org.springframework.data.relational.core.conversion.DbActionExecutionException;
 
 /**
  * @author Jens Schauder
diff --git a/src/test/java/org/springframework/data/jdbc/core/conversion/DbActionUnitTests.java b/src/test/java/org/springframework/data/relational/core/conversion/DbActionUnitTests.java
similarity index 82%
rename from src/test/java/org/springframework/data/jdbc/core/conversion/DbActionUnitTests.java
rename to src/test/java/org/springframework/data/relational/core/conversion/DbActionUnitTests.java
index 03b4e950..0d74a186 100644
--- a/src/test/java/org/springframework/data/jdbc/core/conversion/DbActionUnitTests.java
+++ b/src/test/java/org/springframework/data/relational/core/conversion/DbActionUnitTests.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.data.jdbc.core.conversion;
+package org.springframework.data.relational.core.conversion;
 
 import static org.assertj.core.api.Assertions.assertThatExceptionOfType;
 import static org.mockito.ArgumentMatchers.any;
@@ -21,6 +21,10 @@ import static org.mockito.Mockito.doThrow;
 import static org.mockito.Mockito.mock;
 
 import org.junit.Test;
+import org.springframework.data.relational.core.conversion.DbAction;
+import org.springframework.data.relational.core.conversion.DbActionExecutionException;
+import org.springframework.data.relational.core.conversion.Interpreter;
+import org.springframework.data.relational.core.conversion.JdbcPropertyPath;
 
 /**
  * Unit tests for {@link DbAction}s
diff --git a/src/test/java/org/springframework/data/jdbc/core/conversion/JdbcEntityDeleteWriterUnitTests.java b/src/test/java/org/springframework/data/relational/core/conversion/JdbcEntityDeleteWriterUnitTests.java
similarity index 81%
rename from src/test/java/org/springframework/data/jdbc/core/conversion/JdbcEntityDeleteWriterUnitTests.java
rename to src/test/java/org/springframework/data/relational/core/conversion/JdbcEntityDeleteWriterUnitTests.java
index cc6adfda..bc61afa7 100644
--- a/src/test/java/org/springframework/data/jdbc/core/conversion/JdbcEntityDeleteWriterUnitTests.java
+++ b/src/test/java/org/springframework/data/relational/core/conversion/JdbcEntityDeleteWriterUnitTests.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.data.jdbc.core.conversion;
+package org.springframework.data.relational.core.conversion;
 
 import lombok.Data;
 
@@ -23,10 +23,14 @@ import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mockito.junit.MockitoJUnitRunner;
 import org.springframework.data.annotation.Id;
-import org.springframework.data.jdbc.core.conversion.AggregateChange.Kind;
-import org.springframework.data.jdbc.core.conversion.DbAction.Delete;
-import org.springframework.data.jdbc.core.conversion.DbAction.DeleteAll;
-import org.springframework.data.jdbc.core.mapping.JdbcMappingContext;
+import org.springframework.data.relational.core.conversion.AggregateChange;
+import org.springframework.data.relational.core.conversion.DbAction;
+import org.springframework.data.relational.core.conversion.JdbcEntityDeleteWriter;
+import org.springframework.data.relational.core.conversion.JdbcPropertyPath;
+import org.springframework.data.relational.core.conversion.AggregateChange.Kind;
+import org.springframework.data.relational.core.conversion.DbAction.Delete;
+import org.springframework.data.relational.core.conversion.DbAction.DeleteAll;
+import org.springframework.data.relational.core.mapping.JdbcMappingContext;
 
 /**
  * Unit tests for the {@link JdbcEntityDeleteWriter}
diff --git a/src/test/java/org/springframework/data/jdbc/core/conversion/JdbcEntityWriterUnitTests.java b/src/test/java/org/springframework/data/relational/core/conversion/JdbcEntityWriterUnitTests.java
similarity index 95%
rename from src/test/java/org/springframework/data/jdbc/core/conversion/JdbcEntityWriterUnitTests.java
rename to src/test/java/org/springframework/data/relational/core/conversion/JdbcEntityWriterUnitTests.java
index f72deb9e..3a426784 100644
--- a/src/test/java/org/springframework/data/jdbc/core/conversion/JdbcEntityWriterUnitTests.java
+++ b/src/test/java/org/springframework/data/relational/core/conversion/JdbcEntityWriterUnitTests.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.data.jdbc.core.conversion;
+package org.springframework.data.relational.core.conversion;
 
 import static org.assertj.core.api.Assertions.*;
 
@@ -30,12 +30,15 @@ import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mockito.junit.MockitoJUnitRunner;
 import org.springframework.data.annotation.Id;
-import org.springframework.data.jdbc.core.conversion.AggregateChange.Kind;
-import org.springframework.data.jdbc.core.conversion.DbAction.Delete;
-import org.springframework.data.jdbc.core.conversion.DbAction.DeleteAll;
-import org.springframework.data.jdbc.core.conversion.DbAction.Insert;
-import org.springframework.data.jdbc.core.conversion.DbAction.Update;
-import org.springframework.data.jdbc.core.mapping.JdbcMappingContext;
+import org.springframework.data.relational.core.conversion.AggregateChange;
+import org.springframework.data.relational.core.conversion.DbAction;
+import org.springframework.data.relational.core.conversion.JdbcEntityWriter;
+import org.springframework.data.relational.core.conversion.AggregateChange.Kind;
+import org.springframework.data.relational.core.conversion.DbAction.Delete;
+import org.springframework.data.relational.core.conversion.DbAction.DeleteAll;
+import org.springframework.data.relational.core.conversion.DbAction.Insert;
+import org.springframework.data.relational.core.conversion.DbAction.Update;
+import org.springframework.data.relational.core.mapping.JdbcMappingContext;
 
 /**
  * Unit tests for the {@link JdbcEntityWriter}
diff --git a/src/test/java/org/springframework/data/jdbc/core/mapping/BasicJdbcPersistentPropertyUnitTests.java b/src/test/java/org/springframework/data/relational/core/mapping/BasicJdbcPersistentPropertyUnitTests.java
similarity index 84%
rename from src/test/java/org/springframework/data/jdbc/core/mapping/BasicJdbcPersistentPropertyUnitTests.java
rename to src/test/java/org/springframework/data/relational/core/mapping/BasicJdbcPersistentPropertyUnitTests.java
index 812f5f46..e3cf2d37 100644
--- a/src/test/java/org/springframework/data/jdbc/core/mapping/BasicJdbcPersistentPropertyUnitTests.java
+++ b/src/test/java/org/springframework/data/relational/core/mapping/BasicJdbcPersistentPropertyUnitTests.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.data.jdbc.core.mapping;
+package org.springframework.data.relational.core.mapping;
 
 import static org.assertj.core.api.Assertions.*;
 
@@ -25,6 +25,11 @@ import java.util.Date;
 
 import org.junit.Test;
 import org.springframework.data.mapping.PropertyHandler;
+import org.springframework.data.relational.core.mapping.BasicJdbcPersistentProperty;
+import org.springframework.data.relational.core.mapping.Column;
+import org.springframework.data.relational.core.mapping.JdbcMappingContext;
+import org.springframework.data.relational.core.mapping.JdbcPersistentEntity;
+import org.springframework.data.relational.core.mapping.JdbcPersistentProperty;
 
 /**
  * Unit tests for the {@link BasicJdbcPersistentProperty}.
diff --git a/src/test/java/org/springframework/data/jdbc/core/mapping/JdbcMappingContextUnitTests.java b/src/test/java/org/springframework/data/relational/core/mapping/JdbcMappingContextUnitTests.java
similarity index 93%
rename from src/test/java/org/springframework/data/jdbc/core/mapping/JdbcMappingContextUnitTests.java
rename to src/test/java/org/springframework/data/relational/core/mapping/JdbcMappingContextUnitTests.java
index d61ad7bb..06ccbc3c 100644
--- a/src/test/java/org/springframework/data/jdbc/core/mapping/JdbcMappingContextUnitTests.java
+++ b/src/test/java/org/springframework/data/relational/core/mapping/JdbcMappingContextUnitTests.java
@@ -13,15 +13,15 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.data.jdbc.core.mapping;
+package org.springframework.data.relational.core.mapping;
 
 import static org.assertj.core.api.Assertions.*;
 
 import java.util.List;
 
 import org.junit.Test;
-import org.springframework.data.jdbc.core.mapping.JdbcMappingContext;
 import org.springframework.data.mapping.PropertyPath;
+import org.springframework.data.relational.core.mapping.JdbcMappingContext;
 
 /**
  * Unit tests for {@link JdbcMappingContext}.
diff --git a/src/test/java/org/springframework/data/jdbc/core/mapping/JdbcPersistentEntityImplUnitTests.java b/src/test/java/org/springframework/data/relational/core/mapping/JdbcPersistentEntityImplUnitTests.java
similarity index 77%
rename from src/test/java/org/springframework/data/jdbc/core/mapping/JdbcPersistentEntityImplUnitTests.java
rename to src/test/java/org/springframework/data/relational/core/mapping/JdbcPersistentEntityImplUnitTests.java
index 353e81c8..1ef5b9c8 100644
--- a/src/test/java/org/springframework/data/jdbc/core/mapping/JdbcPersistentEntityImplUnitTests.java
+++ b/src/test/java/org/springframework/data/relational/core/mapping/JdbcPersistentEntityImplUnitTests.java
@@ -13,11 +13,15 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.data.jdbc.core.mapping;
+package org.springframework.data.relational.core.mapping;
 
 import static org.assertj.core.api.Assertions.*;
 
 import org.junit.Test;
+import org.springframework.data.relational.core.mapping.JdbcMappingContext;
+import org.springframework.data.relational.core.mapping.JdbcPersistentEntity;
+import org.springframework.data.relational.core.mapping.JdbcPersistentEntityImpl;
+import org.springframework.data.relational.core.mapping.Table;
 
 /**
  * Unit tests for {@link JdbcPersistentEntityImpl}.
diff --git a/src/test/java/org/springframework/data/jdbc/core/mapping/NamingStrategyUnitTests.java b/src/test/java/org/springframework/data/relational/core/mapping/NamingStrategyUnitTests.java
similarity index 87%
rename from src/test/java/org/springframework/data/jdbc/core/mapping/NamingStrategyUnitTests.java
rename to src/test/java/org/springframework/data/relational/core/mapping/NamingStrategyUnitTests.java
index 78163f75..8936be34 100644
--- a/src/test/java/org/springframework/data/jdbc/core/mapping/NamingStrategyUnitTests.java
+++ b/src/test/java/org/springframework/data/relational/core/mapping/NamingStrategyUnitTests.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.data.jdbc.core.mapping;
+package org.springframework.data.relational.core.mapping;
 
 import static org.assertj.core.api.Assertions.*;
 
@@ -22,10 +22,10 @@ import java.util.List;
 
 import org.junit.Test;
 import org.springframework.data.annotation.Id;
-import org.springframework.data.jdbc.core.mapping.JdbcMappingContext;
-import org.springframework.data.jdbc.core.mapping.JdbcPersistentEntity;
-import org.springframework.data.jdbc.core.mapping.NamingStrategy;
-import org.springframework.data.jdbc.core.mapping.JdbcPersistentEntityImplUnitTests.DummySubEntity;
+import org.springframework.data.relational.core.mapping.JdbcMappingContext;
+import org.springframework.data.relational.core.mapping.JdbcPersistentEntity;
+import org.springframework.data.relational.core.mapping.NamingStrategy;
+import org.springframework.data.relational.core.mapping.JdbcPersistentEntityImplUnitTests.DummySubEntity;
 
 /**
  * Unit tests for the {@link NamingStrategy}.
diff --git a/src/test/java/org/springframework/data/jdbc/core/mapping/event/IdentifierTest.java b/src/test/java/org/springframework/data/relational/core/mapping/event/IdentifierTest.java
similarity index 91%
rename from src/test/java/org/springframework/data/jdbc/core/mapping/event/IdentifierTest.java
rename to src/test/java/org/springframework/data/relational/core/mapping/event/IdentifierTest.java
index 7f992b44..bc7c12b4 100644
--- a/src/test/java/org/springframework/data/jdbc/core/mapping/event/IdentifierTest.java
+++ b/src/test/java/org/springframework/data/relational/core/mapping/event/IdentifierTest.java
@@ -13,9 +13,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.data.jdbc.core.mapping.event;
+package org.springframework.data.relational.core.mapping.event;
 
 import org.junit.Test;
+import org.springframework.data.relational.core.mapping.event.Identifier;
 
 import java.util.Optional;