diff --git a/src/models/domain/attachment.ts b/src/models/domain/attachment.ts
index be345ce72f..cf50a18c03 100644
--- a/src/models/domain/attachment.ts
+++ b/src/models/domain/attachment.ts
@@ -1,7 +1,7 @@
 import { AttachmentData } from '../data/attachmentData';
 
 import { CipherString } from './cipherString';
-import Domain from './domain';
+import Domain from './domainBase';
 
 import { AttachmentView } from '../view/attachmentView';
 
diff --git a/src/models/domain/card.ts b/src/models/domain/card.ts
index a9a4791274..c1ef7a22d3 100644
--- a/src/models/domain/card.ts
+++ b/src/models/domain/card.ts
@@ -1,7 +1,7 @@
 import { CardData } from '../data/cardData';
 
 import { CipherString } from './cipherString';
-import Domain from './domain';
+import Domain from './domainBase';
 
 import { CardView } from '../view/cardView';
 
diff --git a/src/models/domain/cipher.ts b/src/models/domain/cipher.ts
index 1bbdd7675d..708774456c 100644
--- a/src/models/domain/cipher.ts
+++ b/src/models/domain/cipher.ts
@@ -7,7 +7,7 @@ import { CipherView } from '../view/cipherView';
 import { Attachment } from './attachment';
 import { Card } from './card';
 import { CipherString } from './cipherString';
-import Domain from './domain';
+import Domain from './domainBase';
 import { Field } from './field';
 import { Identity } from './identity';
 import { Login } from './login';
diff --git a/src/models/domain/collection.ts b/src/models/domain/collection.ts
index 42886902d2..5d308f66b3 100644
--- a/src/models/domain/collection.ts
+++ b/src/models/domain/collection.ts
@@ -3,7 +3,7 @@ import { CollectionData } from '../data/collectionData';
 import { CollectionView } from '../view/collectionView';
 
 import { CipherString } from './cipherString';
-import Domain from './domain';
+import Domain from './domainBase';
 
 export class Collection extends Domain {
     id: string;
diff --git a/src/models/domain/domain.ts b/src/models/domain/domainBase.ts
similarity index 98%
rename from src/models/domain/domain.ts
rename to src/models/domain/domainBase.ts
index f5d27b0340..b73297bcd5 100644
--- a/src/models/domain/domain.ts
+++ b/src/models/domain/domainBase.ts
@@ -2,7 +2,7 @@ import { CipherString } from './cipherString';
 
 import { View } from '../view/view';
 
-export default abstract class Domain {
+export default class Domain {
     protected buildDomainModel<D extends Domain>(domain: D, dataObj: any, map: any,
         alreadyEncrypted: boolean, notEncList: any[] = []) {
         for (const prop in map) {
diff --git a/src/models/domain/field.ts b/src/models/domain/field.ts
index 82a884c849..2dec447f2b 100644
--- a/src/models/domain/field.ts
+++ b/src/models/domain/field.ts
@@ -3,7 +3,7 @@ import { FieldType } from '../../enums/fieldType';
 import { FieldData } from '../data/fieldData';
 
 import { CipherString } from './cipherString';
-import Domain from './domain';
+import Domain from './domainBase';
 
 import { FieldView } from '../view/fieldView';
 
diff --git a/src/models/domain/folder.ts b/src/models/domain/folder.ts
index c0a8d179a9..fc67788569 100644
--- a/src/models/domain/folder.ts
+++ b/src/models/domain/folder.ts
@@ -3,7 +3,7 @@ import { FolderData } from '../data/folderData';
 import { FolderView } from '../view/folderView';
 
 import { CipherString } from './cipherString';
-import Domain from './domain';
+import Domain from './domainBase';
 
 export class Folder extends Domain {
     id: string;
diff --git a/src/models/domain/identity.ts b/src/models/domain/identity.ts
index 266d697579..87622e6c6a 100644
--- a/src/models/domain/identity.ts
+++ b/src/models/domain/identity.ts
@@ -1,7 +1,7 @@
 import { IdentityData } from '../data/identityData';
 
 import { CipherString } from './cipherString';
-import Domain from './domain';
+import Domain from './domainBase';
 
 import { IdentityView } from '../view/identityView';
 
diff --git a/src/models/domain/login.ts b/src/models/domain/login.ts
index dc721503f4..c40a830aba 100644
--- a/src/models/domain/login.ts
+++ b/src/models/domain/login.ts
@@ -5,7 +5,7 @@ import { LoginData } from '../data/loginData';
 import { LoginView } from '../view/loginView';
 
 import { CipherString } from './cipherString';
-import Domain from './domain';
+import Domain from './domainBase';
 
 export class Login extends Domain {
     uris: LoginUri[];
diff --git a/src/models/domain/loginUri.ts b/src/models/domain/loginUri.ts
index 1e1d9a93fc..631d5b0d02 100644
--- a/src/models/domain/loginUri.ts
+++ b/src/models/domain/loginUri.ts
@@ -5,7 +5,7 @@ import { LoginUriData } from '../data/loginUriData';
 import { LoginUriView } from '../view/loginUriView';
 
 import { CipherString } from './cipherString';
-import Domain from './domain';
+import Domain from './domainBase';
 
 export class LoginUri extends Domain {
     uri: CipherString;
diff --git a/src/models/domain/password.ts b/src/models/domain/password.ts
index ef735ba0e1..5ef38a2010 100644
--- a/src/models/domain/password.ts
+++ b/src/models/domain/password.ts
@@ -1,7 +1,7 @@
 import { PasswordHistoryData } from '../data/passwordHistoryData';
 
 import { CipherString } from './cipherString';
-import Domain from './domain';
+import Domain from './domainBase';
 
 import { PasswordHistoryView } from '../view/passwordHistoryView';
 
diff --git a/src/models/domain/secureNote.ts b/src/models/domain/secureNote.ts
index 52988f1b25..620571fbb7 100644
--- a/src/models/domain/secureNote.ts
+++ b/src/models/domain/secureNote.ts
@@ -2,7 +2,7 @@ import { SecureNoteType } from '../../enums/secureNoteType';
 
 import { SecureNoteData } from '../data/secureNoteData';
 
-import Domain from './domain';
+import Domain from './domainBase';
 
 import { SecureNoteView } from '../view/secureNoteView';
 
diff --git a/src/services/cipher.service.ts b/src/services/cipher.service.ts
index c6c6a7aa2b..b201c171bd 100644
--- a/src/services/cipher.service.ts
+++ b/src/services/cipher.service.ts
@@ -8,7 +8,7 @@ import { Attachment } from '../models/domain/attachment';
 import { Card } from '../models/domain/card';
 import { Cipher } from '../models/domain/cipher';
 import { CipherString } from '../models/domain/cipherString';
-import Domain from '../models/domain/domain';
+import Domain from '../models/domain/domainBase';
 import { Field } from '../models/domain/field';
 import { Identity } from '../models/domain/identity';
 import { Login } from '../models/domain/login';