diff --git a/importer-db-api/src/models/AssessmentItem.js b/importer-db-api/src/models/AssessmentItem.js
index 6c65b12e..5b49ef54 100644
--- a/importer-db-api/src/models/AssessmentItem.js
+++ b/importer-db-api/src/models/AssessmentItem.js
@@ -28,12 +28,10 @@ AssessmentItem.init(
       autoIncrement: true
     },
     id: {
-      type: STRING,
-      unique: true
+      type: STRING
     },
     modificationOrdinal: {
-      type: BIGINT,
-      unique: true
+      type: BIGINT
     },
     documentState: {
       type: STRING
@@ -80,7 +78,7 @@ AssessmentItem.init(
     indexes: [
       {
         unique: true,
-        fields: ['id', 'modificationOrdinal']
+        fields: ['id', 'modification_ordinal']
       },
       {
         fields: ['id']
diff --git a/importer-db-api/src/models/Disclosure.js b/importer-db-api/src/models/Disclosure.js
index c24bd1f8..85e0dd43 100644
--- a/importer-db-api/src/models/Disclosure.js
+++ b/importer-db-api/src/models/Disclosure.js
@@ -33,7 +33,7 @@ Disclosure.init(
         fields: ['id']
       },
       {
-        fields: ['disclosureCategoryId']
+        fields: ['disclosure_category_id']
       }
     ]
   }
diff --git a/importer-db-api/src/models/Organisation.js b/importer-db-api/src/models/Organisation.js
index d1c5c901..8042f2b9 100644
--- a/importer-db-api/src/models/Organisation.js
+++ b/importer-db-api/src/models/Organisation.js
@@ -62,12 +62,10 @@ Organisation.init(
       autoIncrement: true
     },
     id: {
-      type: STRING,
-      unique: true
+      type: STRING
     },
     modificationOrdinal: {
-      type: BIGINT,
-      unique: true
+      type: BIGINT
     },
     documentState: {
       type: STRING
@@ -114,7 +112,7 @@ Organisation.init(
     indexes: [
       {
         unique: true,
-        fields: ['id', 'modificationOrdinal']
+        fields: ['id', 'modification_ordinal']
       },
       {
         fields: ['id']
diff --git a/importer-db-api/src/models/StudyRight.js b/importer-db-api/src/models/StudyRight.js
index e67f0cf0..afc4c7de 100644
--- a/importer-db-api/src/models/StudyRight.js
+++ b/importer-db-api/src/models/StudyRight.js
@@ -11,8 +11,7 @@ StudyRight.init(
       autoIncrement: true
     },
     id: {
-      type: STRING,
-      unique: true
+      type: STRING
     },
     personId: {
       type: STRING
@@ -27,8 +26,7 @@ StudyRight.init(
       type: STRING
     },
     modificationOrdinal: {
-      type: BIGINT,
-      unique: true
+      type: BIGINT
     },
     documentState: {
       type: STRING
@@ -96,7 +94,7 @@ StudyRight.init(
     indexes: [
       {
         unique: true,
-        fields: ['id', 'modificationOrdinal']
+        fields: ['id', 'modification_ordinal']
       },
       {
         fields: ['id']