diff --git a/bank-account/account/account-impl/build.gradle b/bank-account/account/account-impl/build.gradle
index 430ba04..0558dc1 100644
--- a/bank-account/account/account-impl/build.gradle
+++ b/bank-account/account/account-impl/build.gradle
@@ -3,7 +3,7 @@ description('account implementation of infrastructure layer')
 dependencies {
     api project(':common-api')
     api project(':common-components')
-    api project(':common-persistence')
+    api project(':common-persistence-api')
     api project(':bank-account:transaction:transaction-domain-api')
     api project(':bank-account:account:account-domain-api')
     api project(':bank-account:account:account-api')
diff --git a/bank-account/bank-account-application/build.gradle b/bank-account/bank-account-application/build.gradle
index c3cf33f..b2110e6 100644
--- a/bank-account/bank-account-application/build.gradle
+++ b/bank-account/bank-account-application/build.gradle
@@ -7,7 +7,7 @@ dependencies {
     implementation 'org.springframework.boot:spring-boot-starter-webflux'
     implementation project(':common-api')
     implementation project(':common-components')
-    implementation project(':common-persistence')
+    implementation project(':common-persistence-api')
     implementation project(':bank-account:account:account-impl')
     implementation project(':bank-account:account:account-api')
     implementation project(':bank-account:account:account-http-api')
diff --git a/bank-account/transaction/transaction-impl/build.gradle b/bank-account/transaction/transaction-impl/build.gradle
index eb1106d..064c835 100644
--- a/bank-account/transaction/transaction-impl/build.gradle
+++ b/bank-account/transaction/transaction-impl/build.gradle
@@ -3,7 +3,7 @@ description('transaction-impl module')
 dependencies {
     api project(':common-api')
     api project(':common-components')
-    api project(':common-persistence')
+    api project(':common-persistence-api')
     api project(':bank-account:account:account-domain-api')
     api project(':bank-account:transaction:transaction-domain-api')
     api project(':bank-account:transaction:transaction-api')
diff --git a/common-persistence/build.gradle b/common-persistence-api/build.gradle
similarity index 100%
rename from common-persistence/build.gradle
rename to common-persistence-api/build.gradle
diff --git a/common-persistence/src/main/java/com/mz/reactor/ddd/reactorddd/persistance/aggregate/AggregateActor.java b/common-persistence-api/src/main/java/com/mz/reactor/ddd/reactorddd/persistance/aggregate/AggregateActor.java
similarity index 100%
rename from common-persistence/src/main/java/com/mz/reactor/ddd/reactorddd/persistance/aggregate/AggregateActor.java
rename to common-persistence-api/src/main/java/com/mz/reactor/ddd/reactorddd/persistance/aggregate/AggregateActor.java
diff --git a/common-persistence/src/main/java/com/mz/reactor/ddd/reactorddd/persistance/aggregate/AggregateFacade.java b/common-persistence-api/src/main/java/com/mz/reactor/ddd/reactorddd/persistance/aggregate/AggregateFacade.java
similarity index 100%
rename from common-persistence/src/main/java/com/mz/reactor/ddd/reactorddd/persistance/aggregate/AggregateFacade.java
rename to common-persistence-api/src/main/java/com/mz/reactor/ddd/reactorddd/persistance/aggregate/AggregateFacade.java
diff --git a/common-persistence/src/main/java/com/mz/reactor/ddd/reactorddd/persistance/aggregate/AggregateFactory.java b/common-persistence-api/src/main/java/com/mz/reactor/ddd/reactorddd/persistance/aggregate/AggregateFactory.java
similarity index 100%
rename from common-persistence/src/main/java/com/mz/reactor/ddd/reactorddd/persistance/aggregate/AggregateFactory.java
rename to common-persistence-api/src/main/java/com/mz/reactor/ddd/reactorddd/persistance/aggregate/AggregateFactory.java
diff --git a/common-persistence/src/main/java/com/mz/reactor/ddd/reactorddd/persistance/aggregate/AggregateRepository.java b/common-persistence-api/src/main/java/com/mz/reactor/ddd/reactorddd/persistance/aggregate/AggregateRepository.java
similarity index 100%
rename from common-persistence/src/main/java/com/mz/reactor/ddd/reactorddd/persistance/aggregate/AggregateRepository.java
rename to common-persistence-api/src/main/java/com/mz/reactor/ddd/reactorddd/persistance/aggregate/AggregateRepository.java
diff --git a/common-persistence/src/main/java/com/mz/reactor/ddd/reactorddd/persistance/aggregate/impl/AggregateActorImpl.java b/common-persistence-api/src/main/java/com/mz/reactor/ddd/reactorddd/persistance/aggregate/impl/AggregateActorImpl.java
similarity index 100%
rename from common-persistence/src/main/java/com/mz/reactor/ddd/reactorddd/persistance/aggregate/impl/AggregateActorImpl.java
rename to common-persistence-api/src/main/java/com/mz/reactor/ddd/reactorddd/persistance/aggregate/impl/AggregateActorImpl.java
diff --git a/common-persistence/src/main/java/com/mz/reactor/ddd/reactorddd/persistance/aggregate/impl/AggregateFacadeImpl.java b/common-persistence-api/src/main/java/com/mz/reactor/ddd/reactorddd/persistance/aggregate/impl/AggregateFacadeImpl.java
similarity index 100%
rename from common-persistence/src/main/java/com/mz/reactor/ddd/reactorddd/persistance/aggregate/impl/AggregateFacadeImpl.java
rename to common-persistence-api/src/main/java/com/mz/reactor/ddd/reactorddd/persistance/aggregate/impl/AggregateFacadeImpl.java
diff --git a/common-persistence/src/main/java/com/mz/reactor/ddd/reactorddd/persistance/aggregate/impl/AggregateRepositoryImpl.java b/common-persistence-api/src/main/java/com/mz/reactor/ddd/reactorddd/persistance/aggregate/impl/AggregateRepositoryImpl.java
similarity index 100%
rename from common-persistence/src/main/java/com/mz/reactor/ddd/reactorddd/persistance/aggregate/impl/AggregateRepositoryImpl.java
rename to common-persistence-api/src/main/java/com/mz/reactor/ddd/reactorddd/persistance/aggregate/impl/AggregateRepositoryImpl.java
diff --git a/common-persistence/src/main/java/com/mz/reactor/ddd/reactorddd/persistance/view/impl/ViewRepository.java b/common-persistence-api/src/main/java/com/mz/reactor/ddd/reactorddd/persistance/view/impl/ViewRepository.java
similarity index 100%
rename from common-persistence/src/main/java/com/mz/reactor/ddd/reactorddd/persistance/view/impl/ViewRepository.java
rename to common-persistence-api/src/main/java/com/mz/reactor/ddd/reactorddd/persistance/view/impl/ViewRepository.java
diff --git a/common-persistence/src/main/java/com/mz/reactor/ddd/reactorddd/persistance/view/impl/impl/ViewRepositoryImpl.java b/common-persistence-api/src/main/java/com/mz/reactor/ddd/reactorddd/persistance/view/impl/impl/ViewRepositoryImpl.java
similarity index 100%
rename from common-persistence/src/main/java/com/mz/reactor/ddd/reactorddd/persistance/view/impl/impl/ViewRepositoryImpl.java
rename to common-persistence-api/src/main/java/com/mz/reactor/ddd/reactorddd/persistance/view/impl/impl/ViewRepositoryImpl.java
diff --git a/common-persistence/src/test/java/com/mz/reactor/ddd/reactorddd/persistance/aggregate/impl/AggregateActorTest.java b/common-persistence-api/src/test/java/com/mz/reactor/ddd/reactorddd/persistance/aggregate/impl/AggregateActorTest.java
similarity index 100%
rename from common-persistence/src/test/java/com/mz/reactor/ddd/reactorddd/persistance/aggregate/impl/AggregateActorTest.java
rename to common-persistence-api/src/test/java/com/mz/reactor/ddd/reactorddd/persistance/aggregate/impl/AggregateActorTest.java
diff --git a/common-persistence/src/test/java/com/mz/reactor/ddd/reactorddd/persistance/aggregate/impl/AggregateRepositoryImplTest.java b/common-persistence-api/src/test/java/com/mz/reactor/ddd/reactorddd/persistance/aggregate/impl/AggregateRepositoryImplTest.java
similarity index 100%
rename from common-persistence/src/test/java/com/mz/reactor/ddd/reactorddd/persistance/aggregate/impl/AggregateRepositoryImplTest.java
rename to common-persistence-api/src/test/java/com/mz/reactor/ddd/reactorddd/persistance/aggregate/impl/AggregateRepositoryImplTest.java
diff --git a/common-persistence/src/test/java/com/mz/reactor/ddd/reactorddd/persistance/aggregate/impl/Person.java b/common-persistence-api/src/test/java/com/mz/reactor/ddd/reactorddd/persistance/aggregate/impl/Person.java
similarity index 100%
rename from common-persistence/src/test/java/com/mz/reactor/ddd/reactorddd/persistance/aggregate/impl/Person.java
rename to common-persistence-api/src/test/java/com/mz/reactor/ddd/reactorddd/persistance/aggregate/impl/Person.java
diff --git a/common-persistence/src/test/java/com/mz/reactor/ddd/reactorddd/persistance/aggregate/impl/TestAggregate.java b/common-persistence-api/src/test/java/com/mz/reactor/ddd/reactorddd/persistance/aggregate/impl/TestAggregate.java
similarity index 100%
rename from common-persistence/src/test/java/com/mz/reactor/ddd/reactorddd/persistance/aggregate/impl/TestAggregate.java
rename to common-persistence-api/src/test/java/com/mz/reactor/ddd/reactorddd/persistance/aggregate/impl/TestAggregate.java
diff --git a/common-persistence/src/test/java/com/mz/reactor/ddd/reactorddd/persistance/aggregate/impl/TestAggregateCommand.java b/common-persistence-api/src/test/java/com/mz/reactor/ddd/reactorddd/persistance/aggregate/impl/TestAggregateCommand.java
similarity index 100%
rename from common-persistence/src/test/java/com/mz/reactor/ddd/reactorddd/persistance/aggregate/impl/TestAggregateCommand.java
rename to common-persistence-api/src/test/java/com/mz/reactor/ddd/reactorddd/persistance/aggregate/impl/TestAggregateCommand.java
diff --git a/common-persistence/src/test/java/com/mz/reactor/ddd/reactorddd/persistance/aggregate/impl/TestAggregateEvent.java b/common-persistence-api/src/test/java/com/mz/reactor/ddd/reactorddd/persistance/aggregate/impl/TestAggregateEvent.java
similarity index 100%
rename from common-persistence/src/test/java/com/mz/reactor/ddd/reactorddd/persistance/aggregate/impl/TestAggregateEvent.java
rename to common-persistence-api/src/test/java/com/mz/reactor/ddd/reactorddd/persistance/aggregate/impl/TestAggregateEvent.java
diff --git a/common-persistence/src/test/java/com/mz/reactor/ddd/reactorddd/persistance/aggregate/impl/TestData.java b/common-persistence-api/src/test/java/com/mz/reactor/ddd/reactorddd/persistance/aggregate/impl/TestData.java
similarity index 100%
rename from common-persistence/src/test/java/com/mz/reactor/ddd/reactorddd/persistance/aggregate/impl/TestData.java
rename to common-persistence-api/src/test/java/com/mz/reactor/ddd/reactorddd/persistance/aggregate/impl/TestData.java
diff --git a/common-persistence/src/test/java/com/mz/reactor/ddd/reactorddd/persistance/aggregate/impl/TestFunctions.java b/common-persistence-api/src/test/java/com/mz/reactor/ddd/reactorddd/persistance/aggregate/impl/TestFunctions.java
similarity index 100%
rename from common-persistence/src/test/java/com/mz/reactor/ddd/reactorddd/persistance/aggregate/impl/TestFunctions.java
rename to common-persistence-api/src/test/java/com/mz/reactor/ddd/reactorddd/persistance/aggregate/impl/TestFunctions.java
diff --git a/common-persistence/src/test/java/com/mz/reactor/ddd/reactorddd/persistance/model/TestView.java b/common-persistence-api/src/test/java/com/mz/reactor/ddd/reactorddd/persistance/model/TestView.java
similarity index 100%
rename from common-persistence/src/test/java/com/mz/reactor/ddd/reactorddd/persistance/model/TestView.java
rename to common-persistence-api/src/test/java/com/mz/reactor/ddd/reactorddd/persistance/model/TestView.java
diff --git a/common-persistence/src/test/java/com/mz/reactor/ddd/reactorddd/persistance/view/impl/ViewRepositoryImplTest.java b/common-persistence-api/src/test/java/com/mz/reactor/ddd/reactorddd/persistance/view/impl/ViewRepositoryImplTest.java
similarity index 100%
rename from common-persistence/src/test/java/com/mz/reactor/ddd/reactorddd/persistance/view/impl/ViewRepositoryImplTest.java
rename to common-persistence-api/src/test/java/com/mz/reactor/ddd/reactorddd/persistance/view/impl/ViewRepositoryImplTest.java
diff --git a/settings.gradle b/settings.gradle
index 8761044..e53de56 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -1,7 +1,7 @@
 rootProject.name = 'reactor-ddd'
 include 'common-api'
 include 'shared-dependencies'
-include 'common-persistence'
+include 'common-persistence-api'
 include 'common-components'
 include 'bank-account:bank-account-application'
 include 'bank-account:account:account-domain'