diff --git a/managed-identity-wallets-app/src/main/java/org/eclipse/tractusx/managedidentitywallets/repository/entity/VerifiableCredentialIssuerIntersectionEntity.java b/managed-identity-wallets-app/src/main/java/org/eclipse/tractusx/managedidentitywallets/repository/entity/VerifiableCredentialIssuerIntersectionEntity.java
index 65095e8df..409cdd5f4 100644
--- a/managed-identity-wallets-app/src/main/java/org/eclipse/tractusx/managedidentitywallets/repository/entity/VerifiableCredentialIssuerIntersectionEntity.java
+++ b/managed-identity-wallets-app/src/main/java/org/eclipse/tractusx/managedidentitywallets/repository/entity/VerifiableCredentialIssuerIntersectionEntity.java
@@ -38,7 +38,7 @@
 @ToString
 public class VerifiableCredentialIssuerIntersectionEntity extends AbstractEntity {
 
-    public static final String TABLE_NAME = "verifiable_credential_issuer_intersection";
+    public static final String TABLE_NAME = "issuer_verifiable_credential_intersection";
     public static final String COLUMN_VERIFIABLE_CREDENTIAL_ID = "verifiable_credential_id";
     public static final String COLUMN_VERIFIABLE_CREDENTIAL_ISSUER_ID = "verifiable_credential_issuer_id";
 
diff --git a/managed-identity-wallets-app/src/main/java/org/eclipse/tractusx/managedidentitywallets/repository/entity/VerifiableCredentialTypeIntersectionEntity.java b/managed-identity-wallets-app/src/main/java/org/eclipse/tractusx/managedidentitywallets/repository/entity/VerifiableCredentialTypeIntersectionEntity.java
index 8c030ffde..d280d619f 100644
--- a/managed-identity-wallets-app/src/main/java/org/eclipse/tractusx/managedidentitywallets/repository/entity/VerifiableCredentialTypeIntersectionEntity.java
+++ b/managed-identity-wallets-app/src/main/java/org/eclipse/tractusx/managedidentitywallets/repository/entity/VerifiableCredentialTypeIntersectionEntity.java
@@ -37,7 +37,7 @@
 @ToString
 public class VerifiableCredentialTypeIntersectionEntity extends AbstractEntity {
 
-    public static final String TABLE_NAME = "verifiable_credential_type_intersection";
+    public static final String TABLE_NAME = "type_verifiable_credential_intersection";
     public static final String COLUMN_VERIFIABLE_CREDENTIAL_ID = "verifiable_credential_id";
     public static final String COLUMN_VERIFIABLE_CREDENTIAL_ISSUER_ID = "verifiable_credential_type_id";
 
diff --git a/managed-identity-wallets-app/src/main/resources/db/changelog/changes/init.sql b/managed-identity-wallets-app/src/main/resources/db/changelog/changes/init.sql
index 4031747f9..6a181d831 100644
--- a/managed-identity-wallets-app/src/main/resources/db/changelog/changes/init.sql
+++ b/managed-identity-wallets-app/src/main/resources/db/changelog/changes/init.sql
@@ -94,7 +94,7 @@ CREATE TABLE IF NOT EXISTS verifiable_credential_wallet_intersection
 );
 
 /* Verifiable Credential Type Intersection Table */
-CREATE TABLE IF NOT EXISTS verifiable_credential_type_intersection
+CREATE TABLE IF NOT EXISTS type_verifiable_credential_intersection
 (
     verifiable_credential_id      varchar(255) NOT NULL,
     verifiable_credential_type_id varchar(255) NOT NULL,
@@ -107,7 +107,7 @@ CREATE TABLE IF NOT EXISTS verifiable_credential_type_intersection
 );
 
 /* Verifiable Credential Issuer Intersection Table */
-CREATE TABLE IF NOT EXISTS verifiable_credential_issuer_intersection
+CREATE TABLE IF NOT EXISTS issuer_verifiable_credential_intersection
 (
     verifiable_credential_id        varchar(255) NOT NULL,
     verifiable_credential_issuer_id varchar(255) NOT NULL,