diff --git a/Marechai.Database/Migrations/20180805214952_InitialMigration.Designer.cs b/Marechai.Database/Migrations/20180805214952_InitialMigration.Designer.cs
index 4076610c..fac3d453 100644
--- a/Marechai.Database/Migrations/20180805214952_InitialMigration.Designer.cs
+++ b/Marechai.Database/Migrations/20180805214952_InitialMigration.Designer.cs
@@ -37,7 +37,7 @@ using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
 
 namespace Marechai.Database.Migrations
 {
-    [DbContext(typeof(cicmContext))]
+    [DbContext(typeof(MarechaiContext))]
     [Migration("20180805214952_InitialMigration")]
     partial class InitialMigration
     {
diff --git a/Marechai.Database/Migrations/20180806184309_RenameModelFields.Designer.cs b/Marechai.Database/Migrations/20180806184309_RenameModelFields.Designer.cs
index 43176b14..0a3ad6d2 100644
--- a/Marechai.Database/Migrations/20180806184309_RenameModelFields.Designer.cs
+++ b/Marechai.Database/Migrations/20180806184309_RenameModelFields.Designer.cs
@@ -37,7 +37,7 @@ using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
 
 namespace Marechai.Database.Migrations
 {
-    [DbContext(typeof(cicmContext))]
+    [DbContext(typeof(MarechaiContext))]
     [Migration("20180806184309_RenameModelFields")]
     partial class RenameModelFields
     {
diff --git a/Marechai.Database/Migrations/20180806192514_UseExistingEnumerations.Designer.cs b/Marechai.Database/Migrations/20180806192514_UseExistingEnumerations.Designer.cs
index 6863a7e3..3dd74b3e 100644
--- a/Marechai.Database/Migrations/20180806192514_UseExistingEnumerations.Designer.cs
+++ b/Marechai.Database/Migrations/20180806192514_UseExistingEnumerations.Designer.cs
@@ -37,7 +37,7 @@ using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
 
 namespace Marechai.Database.Migrations
 {
-    [DbContext(typeof(cicmContext))]
+    [DbContext(typeof(MarechaiContext))]
     [Migration("20180806192514_UseExistingEnumerations")]
     partial class UseExistingEnumerations
     {
diff --git a/Marechai.Database/Migrations/20180806201559_SingularizeModelNames.Designer.cs b/Marechai.Database/Migrations/20180806201559_SingularizeModelNames.Designer.cs
index d6ee5f2f..05713e90 100644
--- a/Marechai.Database/Migrations/20180806201559_SingularizeModelNames.Designer.cs
+++ b/Marechai.Database/Migrations/20180806201559_SingularizeModelNames.Designer.cs
@@ -37,7 +37,7 @@ using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
 
 namespace Marechai.Database.Migrations
 {
-    [DbContext(typeof(cicmContext))]
+    [DbContext(typeof(MarechaiContext))]
     [Migration("20180806201559_SingularizeModelNames")]
     partial class SingularizeModelNames
     {
diff --git a/Marechai.Database/Migrations/20180806202841_BrowserTestFieldsAsBoolean.Designer.cs b/Marechai.Database/Migrations/20180806202841_BrowserTestFieldsAsBoolean.Designer.cs
index b548f282..f89e9950 100644
--- a/Marechai.Database/Migrations/20180806202841_BrowserTestFieldsAsBoolean.Designer.cs
+++ b/Marechai.Database/Migrations/20180806202841_BrowserTestFieldsAsBoolean.Designer.cs
@@ -8,7 +8,7 @@ using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
 
 namespace Marechai.Database.Migrations
 {
-    [DbContext(typeof(cicmContext))]
+    [DbContext(typeof(MarechaiContext))]
     [Migration("20180806202841_BrowserTestFieldsAsBoolean")]
     partial class BrowserTestFieldsAsBoolean
     {
diff --git a/Marechai.Database/Migrations/20180806222713_LogosGuid.Designer.cs b/Marechai.Database/Migrations/20180806222713_LogosGuid.Designer.cs
index c7bae696..e11190d3 100644
--- a/Marechai.Database/Migrations/20180806222713_LogosGuid.Designer.cs
+++ b/Marechai.Database/Migrations/20180806222713_LogosGuid.Designer.cs
@@ -37,7 +37,7 @@ using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
 
 namespace Marechai.Database.Migrations
 {
-    [DbContext(typeof(cicmContext))]
+    [DbContext(typeof(MarechaiContext))]
     [Migration("20180806222713_LogosGuid")]
     partial class LogosGuid
     {
diff --git a/Marechai.Database/Migrations/20180807193120_CorrectLogosInCompany.Designer.cs b/Marechai.Database/Migrations/20180807193120_CorrectLogosInCompany.Designer.cs
index 30e26f7c..64c90383 100644
--- a/Marechai.Database/Migrations/20180807193120_CorrectLogosInCompany.Designer.cs
+++ b/Marechai.Database/Migrations/20180807193120_CorrectLogosInCompany.Designer.cs
@@ -37,7 +37,7 @@ using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
 
 namespace Marechai.Database.Migrations
 {
-    [DbContext(typeof(cicmContext))]
+    [DbContext(typeof(MarechaiContext))]
     [Migration("20180807193120_CorrectLogosInCompany")]
     partial class CorrectLogosInCompany
     {
diff --git a/Marechai.Database/Migrations/20180811130603_CreateIdentitySchema.Designer.cs b/Marechai.Database/Migrations/20180811130603_CreateIdentitySchema.Designer.cs
index 7eff3277..09574e67 100644
--- a/Marechai.Database/Migrations/20180811130603_CreateIdentitySchema.Designer.cs
+++ b/Marechai.Database/Migrations/20180811130603_CreateIdentitySchema.Designer.cs
@@ -37,7 +37,7 @@ using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
 
 namespace Marechai.Database.Migrations
 {
-    [DbContext(typeof(cicmContext))]
+    [DbContext(typeof(MarechaiContext))]
     [Migration("20180811130603_CreateIdentitySchema")]
     partial class CreateIdentitySchema
     {
diff --git a/Marechai.Database/Migrations/20190518145625_RemoveCompanyDescriptions.Designer.cs b/Marechai.Database/Migrations/20190518145625_RemoveCompanyDescriptions.Designer.cs
index b8cbe312..a9682097 100644
--- a/Marechai.Database/Migrations/20190518145625_RemoveCompanyDescriptions.Designer.cs
+++ b/Marechai.Database/Migrations/20190518145625_RemoveCompanyDescriptions.Designer.cs
@@ -8,7 +8,7 @@ using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
 
 namespace Marechai.Database.Migrations
 {
-    [DbContext(typeof(cicmContext))]
+    [DbContext(typeof(MarechaiContext))]
     [Migration("20190518145625_RemoveCompanyDescriptions")]
     partial class RemoveCompanyDescriptions
     {
diff --git a/Marechai.Database/Migrations/20190518150032_AddCompanyDescriptions.Designer.cs b/Marechai.Database/Migrations/20190518150032_AddCompanyDescriptions.Designer.cs
index 42bc556d..a501aaa1 100644
--- a/Marechai.Database/Migrations/20190518150032_AddCompanyDescriptions.Designer.cs
+++ b/Marechai.Database/Migrations/20190518150032_AddCompanyDescriptions.Designer.cs
@@ -8,7 +8,7 @@ using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
 
 namespace Marechai.Database.Migrations
 {
-    [DbContext(typeof(cicmContext))]
+    [DbContext(typeof(MarechaiContext))]
     [Migration("20190518150032_AddCompanyDescriptions")]
     partial class AddCompanyDescriptions
     {
diff --git a/Marechai.Database/Migrations/20190518154700_AddCompanyDescriptionIndex.Designer.cs b/Marechai.Database/Migrations/20190518154700_AddCompanyDescriptionIndex.Designer.cs
index 21a7d881..a7e62964 100644
--- a/Marechai.Database/Migrations/20190518154700_AddCompanyDescriptionIndex.Designer.cs
+++ b/Marechai.Database/Migrations/20190518154700_AddCompanyDescriptionIndex.Designer.cs
@@ -8,7 +8,7 @@ using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
 
 namespace Marechai.Database.Migrations
 {
-    [DbContext(typeof(cicmContext))]
+    [DbContext(typeof(MarechaiContext))]
     [Migration("20190518154700_AddCompanyDescriptionIndex")]
     partial class AddCompanyDescriptionIndex
     {
diff --git a/Marechai.Database/Migrations/20190518164341_AnnotateCompanyDescription.Designer.cs b/Marechai.Database/Migrations/20190518164341_AnnotateCompanyDescription.Designer.cs
index bd9cadee..c693fa00 100644
--- a/Marechai.Database/Migrations/20190518164341_AnnotateCompanyDescription.Designer.cs
+++ b/Marechai.Database/Migrations/20190518164341_AnnotateCompanyDescription.Designer.cs
@@ -8,7 +8,7 @@ using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
 
 namespace Marechai.Database.Migrations
 {
-    [DbContext(typeof(cicmContext))]
+    [DbContext(typeof(MarechaiContext))]
     [Migration("20190518164341_AnnotateCompanyDescription")]
     partial class AnnotateCompanyDescription
     {
diff --git a/Marechai.Database/Migrations/20190518170817_AddPreRenderedCompanyDescription.Designer.cs b/Marechai.Database/Migrations/20190518170817_AddPreRenderedCompanyDescription.Designer.cs
index 7eaba44b..27d47d60 100644
--- a/Marechai.Database/Migrations/20190518170817_AddPreRenderedCompanyDescription.Designer.cs
+++ b/Marechai.Database/Migrations/20190518170817_AddPreRenderedCompanyDescription.Designer.cs
@@ -8,7 +8,7 @@ using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
 
 namespace Marechai.Database.Migrations
 {
-    [DbContext(typeof(cicmContext))]
+    [DbContext(typeof(MarechaiContext))]
     [Migration("20190518170817_AddPreRenderedCompanyDescription")]
     partial class AddPreRenderedCompanyDescription
     {
diff --git a/Marechai.Database/Migrations/20190518212800_NewsDateAsDateTime.Designer.cs b/Marechai.Database/Migrations/20190518212800_NewsDateAsDateTime.Designer.cs
index e5545f53..afc39471 100644
--- a/Marechai.Database/Migrations/20190518212800_NewsDateAsDateTime.Designer.cs
+++ b/Marechai.Database/Migrations/20190518212800_NewsDateAsDateTime.Designer.cs
@@ -8,7 +8,7 @@ using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
 
 namespace Marechai.Database.Migrations
 {
-    [DbContext(typeof(cicmContext))]
+    [DbContext(typeof(MarechaiContext))]
     [Migration("20190518212800_NewsDateAsDateTime")]
     partial class NewsDateAsDateTime
     {
diff --git a/Marechai.Database/Migrations/20190519012635_DropOldAdminsTable.Designer.cs b/Marechai.Database/Migrations/20190519012635_DropOldAdminsTable.Designer.cs
index 4e13d97f..76ecff49 100644
--- a/Marechai.Database/Migrations/20190519012635_DropOldAdminsTable.Designer.cs
+++ b/Marechai.Database/Migrations/20190519012635_DropOldAdminsTable.Designer.cs
@@ -8,7 +8,7 @@ using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
 
 namespace Marechai.Database.Migrations
 {
-    [DbContext(typeof(cicmContext))]
+    [DbContext(typeof(MarechaiContext))]
     [Migration("20190519012635_DropOldAdminsTable")]
     partial class DropOldAdminsTable
     {
diff --git a/Marechai.Database/Migrations/20190519144028_GrayscaleResolutions.Designer.cs b/Marechai.Database/Migrations/20190519144028_GrayscaleResolutions.Designer.cs
index ac785b44..d6fb8e75 100644
--- a/Marechai.Database/Migrations/20190519144028_GrayscaleResolutions.Designer.cs
+++ b/Marechai.Database/Migrations/20190519144028_GrayscaleResolutions.Designer.cs
@@ -8,7 +8,7 @@ using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
 
 namespace Marechai.Database.Migrations
 {
-    [DbContext(typeof(cicmContext))]
+    [DbContext(typeof(MarechaiContext))]
     [Migration("20190519144028_GrayscaleResolutions")]
     partial class GrayscaleResolutions
     {
diff --git a/Marechai.Database/Migrations/20190519171846_DataAnnotations.Designer.cs b/Marechai.Database/Migrations/20190519171846_DataAnnotations.Designer.cs
index eb7abe84..3d4b9ac2 100644
--- a/Marechai.Database/Migrations/20190519171846_DataAnnotations.Designer.cs
+++ b/Marechai.Database/Migrations/20190519171846_DataAnnotations.Designer.cs
@@ -8,7 +8,7 @@ using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
 
 namespace Marechai.Database.Migrations
 {
-    [DbContext(typeof(cicmContext))]
+    [DbContext(typeof(MarechaiContext))]
     [Migration("20190519171846_DataAnnotations")]
     partial class DataAnnotations
     {
diff --git a/Marechai.Database/Migrations/20190527020604_MachinePhotos.Designer.cs b/Marechai.Database/Migrations/20190527020604_MachinePhotos.Designer.cs
index b2fffdbd..63b6907d 100644
--- a/Marechai.Database/Migrations/20190527020604_MachinePhotos.Designer.cs
+++ b/Marechai.Database/Migrations/20190527020604_MachinePhotos.Designer.cs
@@ -8,7 +8,7 @@ using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
 
 namespace Marechai.Database.Migrations
 {
-    [DbContext(typeof(cicmContext))]
+    [DbContext(typeof(MarechaiContext))]
     [Migration("20190527020604_MachinePhotos")]
     partial class MachinePhotos
     {
diff --git a/Marechai.Database/Migrations/20190527160705_Licenses.Designer.cs b/Marechai.Database/Migrations/20190527160705_Licenses.Designer.cs
index 0a168ce2..7d27d671 100644
--- a/Marechai.Database/Migrations/20190527160705_Licenses.Designer.cs
+++ b/Marechai.Database/Migrations/20190527160705_Licenses.Designer.cs
@@ -8,7 +8,7 @@ using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
 
 namespace Marechai.Database.Migrations
 {
-    [DbContext(typeof(cicmContext))]
+    [DbContext(typeof(MarechaiContext))]
     [Migration("20190527160705_Licenses")]
     partial class Licenses
     {
diff --git a/Marechai.Database/Migrations/20190527165154_UseLicenseInMachinePhoto.Designer.cs b/Marechai.Database/Migrations/20190527165154_UseLicenseInMachinePhoto.Designer.cs
index 6ec889e8..d2f25ff0 100644
--- a/Marechai.Database/Migrations/20190527165154_UseLicenseInMachinePhoto.Designer.cs
+++ b/Marechai.Database/Migrations/20190527165154_UseLicenseInMachinePhoto.Designer.cs
@@ -8,7 +8,7 @@ using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
 
 namespace Marechai.Database.Migrations
 {
-    [DbContext(typeof(cicmContext))]
+    [DbContext(typeof(MarechaiContext))]
     [Migration("20190527165154_UseLicenseInMachinePhoto")]
     partial class UseLicenseInMachinePhoto
     {
diff --git a/Marechai.Database/Migrations/20190527220123_ChangeMachinePhotoFieldTypesToExifTypes.Designer.cs b/Marechai.Database/Migrations/20190527220123_ChangeMachinePhotoFieldTypesToExifTypes.Designer.cs
index 543c1f1d..51ef831a 100644
--- a/Marechai.Database/Migrations/20190527220123_ChangeMachinePhotoFieldTypesToExifTypes.Designer.cs
+++ b/Marechai.Database/Migrations/20190527220123_ChangeMachinePhotoFieldTypesToExifTypes.Designer.cs
@@ -8,7 +8,7 @@ using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
 
 namespace Marechai.Database.Migrations
 {
-    [DbContext(typeof(cicmContext))]
+    [DbContext(typeof(MarechaiContext))]
     [Migration("20190527220123_ChangeMachinePhotoFieldTypesToExifTypes")]
     partial class ChangeMachinePhotoFieldTypesToExifTypes
     {
diff --git a/Marechai.Database/Migrations/20190528222110_MachinePhotoForeignKeys.Designer.cs b/Marechai.Database/Migrations/20190528222110_MachinePhotoForeignKeys.Designer.cs
index 364d318d..9f1faf49 100644
--- a/Marechai.Database/Migrations/20190528222110_MachinePhotoForeignKeys.Designer.cs
+++ b/Marechai.Database/Migrations/20190528222110_MachinePhotoForeignKeys.Designer.cs
@@ -8,7 +8,7 @@ using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
 
 namespace Marechai.Database.Migrations
 {
-    [DbContext(typeof(cicmContext))]
+    [DbContext(typeof(MarechaiContext))]
     [Migration("20190528222110_MachinePhotoForeignKeys")]
     partial class MachinePhotoForeignKeys
     {
diff --git a/Marechai.Database/Migrations/20190528222220_ChangeMachinePhotoSharpnessTypeToExifType.Designer.cs b/Marechai.Database/Migrations/20190528222220_ChangeMachinePhotoSharpnessTypeToExifType.Designer.cs
index 98421c78..f41e243b 100644
--- a/Marechai.Database/Migrations/20190528222220_ChangeMachinePhotoSharpnessTypeToExifType.Designer.cs
+++ b/Marechai.Database/Migrations/20190528222220_ChangeMachinePhotoSharpnessTypeToExifType.Designer.cs
@@ -8,7 +8,7 @@ using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
 
 namespace Marechai.Database.Migrations
 {
-    [DbContext(typeof(cicmContext))]
+    [DbContext(typeof(MarechaiContext))]
     [Migration("20190528222220_ChangeMachinePhotoSharpnessTypeToExifType")]
     partial class ChangeMachinePhotoSharpnessTypeToExifType
     {
diff --git a/Marechai.Database/Migrations/20190528234633_AddMachinePhotoSourceUrl.Designer.cs b/Marechai.Database/Migrations/20190528234633_AddMachinePhotoSourceUrl.Designer.cs
index 5c5e8c05..6bc05222 100644
--- a/Marechai.Database/Migrations/20190528234633_AddMachinePhotoSourceUrl.Designer.cs
+++ b/Marechai.Database/Migrations/20190528234633_AddMachinePhotoSourceUrl.Designer.cs
@@ -8,7 +8,7 @@ using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
 
 namespace Marechai.Database.Migrations
 {
-    [DbContext(typeof(cicmContext))]
+    [DbContext(typeof(MarechaiContext))]
     [Migration("20190528234633_AddMachinePhotoSourceUrl")]
     partial class AddMachinePhotoSourceUrl
     {
diff --git a/Marechai.Database/Migrations/20190529194436_AddOwnedMachines.Designer.cs b/Marechai.Database/Migrations/20190529194436_AddOwnedMachines.Designer.cs
index 337644b1..c1658e14 100644
--- a/Marechai.Database/Migrations/20190529194436_AddOwnedMachines.Designer.cs
+++ b/Marechai.Database/Migrations/20190529194436_AddOwnedMachines.Designer.cs
@@ -8,7 +8,7 @@ using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
 
 namespace Marechai.Database.Migrations
 {
-    [DbContext(typeof(cicmContext))]
+    [DbContext(typeof(MarechaiContext))]
     [Migration("20190529194436_AddOwnedMachines")]
     partial class AddOwnedMachines
     {
diff --git a/Marechai.Database/Migrations/20190601122952_AddScreens.Designer.cs b/Marechai.Database/Migrations/20190601122952_AddScreens.Designer.cs
index 41c40262..5e02b31e 100644
--- a/Marechai.Database/Migrations/20190601122952_AddScreens.Designer.cs
+++ b/Marechai.Database/Migrations/20190601122952_AddScreens.Designer.cs
@@ -8,7 +8,7 @@ using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
 
 namespace Marechai.Database.Migrations
 {
-    [DbContext(typeof(cicmContext))]
+    [DbContext(typeof(MarechaiContext))]
     [Migration("20190601122952_AddScreens")]
     partial class AddScreens
     {
diff --git a/Marechai.Database/Migrations/20190602021943_AddPerson.Designer.cs b/Marechai.Database/Migrations/20190602021943_AddPerson.Designer.cs
index 4be076bc..6de6e7bb 100644
--- a/Marechai.Database/Migrations/20190602021943_AddPerson.Designer.cs
+++ b/Marechai.Database/Migrations/20190602021943_AddPerson.Designer.cs
@@ -8,7 +8,7 @@ using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
 
 namespace Marechai.Database.Migrations
 {
-    [DbContext(typeof(cicmContext))]
+    [DbContext(typeof(MarechaiContext))]
     [Migration("20190602021943_AddPerson")]
     partial class AddPerson
     {
diff --git a/Marechai.Database/Migrations/20190603165746_AddIso639.Designer.cs b/Marechai.Database/Migrations/20190603165746_AddIso639.Designer.cs
index 89e1e789..2f07b488 100644
--- a/Marechai.Database/Migrations/20190603165746_AddIso639.Designer.cs
+++ b/Marechai.Database/Migrations/20190603165746_AddIso639.Designer.cs
@@ -8,7 +8,7 @@ using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
 
 namespace Marechai.Database.Migrations
 {
-    [DbContext(typeof(cicmContext))]
+    [DbContext(typeof(MarechaiContext))]
     [Migration("20190603165746_AddIso639")]
     partial class AddIso639
     {
diff --git a/Marechai.Database/Migrations/20190605142832_AddPeopleByCompany.Designer.cs b/Marechai.Database/Migrations/20190605142832_AddPeopleByCompany.Designer.cs
index 77a2cc48..3c858e33 100644
--- a/Marechai.Database/Migrations/20190605142832_AddPeopleByCompany.Designer.cs
+++ b/Marechai.Database/Migrations/20190605142832_AddPeopleByCompany.Designer.cs
@@ -8,7 +8,7 @@ using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
 
 namespace Marechai.Database.Migrations
 {
-    [DbContext(typeof(cicmContext))]
+    [DbContext(typeof(MarechaiContext))]
     [Migration("20190605142832_AddPeopleByCompany")]
     partial class AddPeopleByCompany
     {
diff --git a/Marechai.Database/Migrations/20190616210450_AddDocuments.Designer.cs b/Marechai.Database/Migrations/20190616210450_AddDocuments.Designer.cs
index b55fd456..d79ee0b3 100644
--- a/Marechai.Database/Migrations/20190616210450_AddDocuments.Designer.cs
+++ b/Marechai.Database/Migrations/20190616210450_AddDocuments.Designer.cs
@@ -8,7 +8,7 @@ using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
 
 namespace Marechai.Database.Migrations
 {
-    [DbContext(typeof(cicmContext))]
+    [DbContext(typeof(MarechaiContext))]
     [Migration("20190616210450_AddDocuments")]
     partial class AddDocuments
     {
diff --git a/Marechai.Database/Migrations/20190616211045_AddDocumentRoles.Designer.cs b/Marechai.Database/Migrations/20190616211045_AddDocumentRoles.Designer.cs
index cb23da2f..ee8ac2db 100644
--- a/Marechai.Database/Migrations/20190616211045_AddDocumentRoles.Designer.cs
+++ b/Marechai.Database/Migrations/20190616211045_AddDocumentRoles.Designer.cs
@@ -8,7 +8,7 @@ using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
 
 namespace Marechai.Database.Migrations
 {
-    [DbContext(typeof(cicmContext))]
+    [DbContext(typeof(MarechaiContext))]
     [Migration("20190616211045_AddDocumentRoles")]
     partial class AddDocumentRoles
     {
diff --git a/Marechai.Database/Migrations/20190616232349_AddDocumentPeople.Designer.cs b/Marechai.Database/Migrations/20190616232349_AddDocumentPeople.Designer.cs
index 37fdc4f5..276e751f 100644
--- a/Marechai.Database/Migrations/20190616232349_AddDocumentPeople.Designer.cs
+++ b/Marechai.Database/Migrations/20190616232349_AddDocumentPeople.Designer.cs
@@ -8,7 +8,7 @@ using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
 
 namespace Marechai.Database.Migrations
 {
-    [DbContext(typeof(cicmContext))]
+    [DbContext(typeof(MarechaiContext))]
     [Migration("20190616232349_AddDocumentPeople")]
     partial class AddDocumentPeople
     {
diff --git a/Marechai.Database/Migrations/20190616233045_AddPeopleByDocument.Designer.cs b/Marechai.Database/Migrations/20190616233045_AddPeopleByDocument.Designer.cs
index b05c433e..73b8a7f7 100644
--- a/Marechai.Database/Migrations/20190616233045_AddPeopleByDocument.Designer.cs
+++ b/Marechai.Database/Migrations/20190616233045_AddPeopleByDocument.Designer.cs
@@ -8,7 +8,7 @@ using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
 
 namespace Marechai.Database.Migrations
 {
-    [DbContext(typeof(cicmContext))]
+    [DbContext(typeof(MarechaiContext))]
     [Migration("20190616233045_AddPeopleByDocument")]
     partial class AddPeopleByDocument
     {
diff --git a/Marechai.Database/Migrations/20190616233807_AddDocumentCompany.Designer.cs b/Marechai.Database/Migrations/20190616233807_AddDocumentCompany.Designer.cs
index 5fb9ed7d..3ac97920 100644
--- a/Marechai.Database/Migrations/20190616233807_AddDocumentCompany.Designer.cs
+++ b/Marechai.Database/Migrations/20190616233807_AddDocumentCompany.Designer.cs
@@ -8,7 +8,7 @@ using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
 
 namespace Marechai.Database.Migrations
 {
-    [DbContext(typeof(cicmContext))]
+    [DbContext(typeof(MarechaiContext))]
     [Migration("20190616233807_AddDocumentCompany")]
     partial class AddDocumentCompany
     {
diff --git a/Marechai.Database/Migrations/20190616234431_AddCompaniesByDocument.Designer.cs b/Marechai.Database/Migrations/20190616234431_AddCompaniesByDocument.Designer.cs
index 18ca7dc7..0bf5da1e 100644
--- a/Marechai.Database/Migrations/20190616234431_AddCompaniesByDocument.Designer.cs
+++ b/Marechai.Database/Migrations/20190616234431_AddCompaniesByDocument.Designer.cs
@@ -8,7 +8,7 @@ using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
 
 namespace Marechai.Database.Migrations
 {
-    [DbContext(typeof(cicmContext))]
+    [DbContext(typeof(MarechaiContext))]
     [Migration("20190616234431_AddCompaniesByDocument")]
     partial class AddCompaniesByDocument
     {
diff --git a/Marechai.Database/Migrations/20190616235255_AddDocumentsByMachine.Designer.cs b/Marechai.Database/Migrations/20190616235255_AddDocumentsByMachine.Designer.cs
index 3aebb508..c44d5724 100644
--- a/Marechai.Database/Migrations/20190616235255_AddDocumentsByMachine.Designer.cs
+++ b/Marechai.Database/Migrations/20190616235255_AddDocumentsByMachine.Designer.cs
@@ -8,7 +8,7 @@ using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
 
 namespace Marechai.Database.Migrations
 {
-    [DbContext(typeof(cicmContext))]
+    [DbContext(typeof(MarechaiContext))]
     [Migration("20190616235255_AddDocumentsByMachine")]
     partial class AddDocumentsByMachine
     {
diff --git a/Marechai.Database/Migrations/20190617010136_AddDocumentsByMachineFamily.Designer.cs b/Marechai.Database/Migrations/20190617010136_AddDocumentsByMachineFamily.Designer.cs
index 55320391..b9a3f583 100644
--- a/Marechai.Database/Migrations/20190617010136_AddDocumentsByMachineFamily.Designer.cs
+++ b/Marechai.Database/Migrations/20190617010136_AddDocumentsByMachineFamily.Designer.cs
@@ -8,7 +8,7 @@ using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
 
 namespace Marechai.Database.Migrations
 {
-    [DbContext(typeof(cicmContext))]
+    [DbContext(typeof(MarechaiContext))]
     [Migration("20190617010136_AddDocumentsByMachineFamily")]
     partial class AddDocumentsByMachineFamily
     {
diff --git a/Marechai.Database/Migrations/20190617012113_AddBooks.Designer.cs b/Marechai.Database/Migrations/20190617012113_AddBooks.Designer.cs
index 53405be9..12c6bf57 100644
--- a/Marechai.Database/Migrations/20190617012113_AddBooks.Designer.cs
+++ b/Marechai.Database/Migrations/20190617012113_AddBooks.Designer.cs
@@ -8,7 +8,7 @@ using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
 
 namespace Marechai.Database.Migrations
 {
-    [DbContext(typeof(cicmContext))]
+    [DbContext(typeof(MarechaiContext))]
     [Migration("20190617012113_AddBooks")]
     partial class AddBooks
     {
diff --git a/Marechai.Database/Migrations/20190617014131_AddCompaniesByBook.Designer.cs b/Marechai.Database/Migrations/20190617014131_AddCompaniesByBook.Designer.cs
index 67b7a5ea..8d75aaf0 100644
--- a/Marechai.Database/Migrations/20190617014131_AddCompaniesByBook.Designer.cs
+++ b/Marechai.Database/Migrations/20190617014131_AddCompaniesByBook.Designer.cs
@@ -8,7 +8,7 @@ using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
 
 namespace Marechai.Database.Migrations
 {
-    [DbContext(typeof(cicmContext))]
+    [DbContext(typeof(MarechaiContext))]
     [Migration("20190617014131_AddCompaniesByBook")]
     partial class AddCompaniesByBook
     {
diff --git a/Marechai.Database/Migrations/20190617015011_AddPeopleByBook.Designer.cs b/Marechai.Database/Migrations/20190617015011_AddPeopleByBook.Designer.cs
index bb013c7b..6dc3945c 100644
--- a/Marechai.Database/Migrations/20190617015011_AddPeopleByBook.Designer.cs
+++ b/Marechai.Database/Migrations/20190617015011_AddPeopleByBook.Designer.cs
@@ -8,7 +8,7 @@ using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
 
 namespace Marechai.Database.Migrations
 {
-    [DbContext(typeof(cicmContext))]
+    [DbContext(typeof(MarechaiContext))]
     [Migration("20190617015011_AddPeopleByBook")]
     partial class AddPeopleByBook
     {
diff --git a/Marechai.Database/Migrations/20190617020655_AddBooksByMachine.Designer.cs b/Marechai.Database/Migrations/20190617020655_AddBooksByMachine.Designer.cs
index a1a78302..0f178c8b 100644
--- a/Marechai.Database/Migrations/20190617020655_AddBooksByMachine.Designer.cs
+++ b/Marechai.Database/Migrations/20190617020655_AddBooksByMachine.Designer.cs
@@ -8,7 +8,7 @@ using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
 
 namespace Marechai.Database.Migrations
 {
-    [DbContext(typeof(cicmContext))]
+    [DbContext(typeof(MarechaiContext))]
     [Migration("20190617020655_AddBooksByMachine")]
     partial class AddBooksByMachine
     {
diff --git a/Marechai.Database/Migrations/20190617021725_AddBooksByMachineFamily.Designer.cs b/Marechai.Database/Migrations/20190617021725_AddBooksByMachineFamily.Designer.cs
index f5a979d2..2143266e 100644
--- a/Marechai.Database/Migrations/20190617021725_AddBooksByMachineFamily.Designer.cs
+++ b/Marechai.Database/Migrations/20190617021725_AddBooksByMachineFamily.Designer.cs
@@ -8,7 +8,7 @@ using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
 
 namespace Marechai.Database.Migrations
 {
-    [DbContext(typeof(cicmContext))]
+    [DbContext(typeof(MarechaiContext))]
     [Migration("20190617021725_AddBooksByMachineFamily")]
     partial class AddBooksByMachineFamily
     {
diff --git a/Marechai.Database/Migrations/20190617022849_AddMagazines.Designer.cs b/Marechai.Database/Migrations/20190617022849_AddMagazines.Designer.cs
index 4e7690fa..204792a2 100644
--- a/Marechai.Database/Migrations/20190617022849_AddMagazines.Designer.cs
+++ b/Marechai.Database/Migrations/20190617022849_AddMagazines.Designer.cs
@@ -8,7 +8,7 @@ using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
 
 namespace Marechai.Database.Migrations
 {
-    [DbContext(typeof(cicmContext))]
+    [DbContext(typeof(MarechaiContext))]
     [Migration("20190617022849_AddMagazines")]
     partial class AddMagazines
     {
diff --git a/Marechai.Database/Migrations/20190617024228_AddMagazineIssues.Designer.cs b/Marechai.Database/Migrations/20190617024228_AddMagazineIssues.Designer.cs
index 84740c23..54836c6d 100644
--- a/Marechai.Database/Migrations/20190617024228_AddMagazineIssues.Designer.cs
+++ b/Marechai.Database/Migrations/20190617024228_AddMagazineIssues.Designer.cs
@@ -8,7 +8,7 @@ using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
 
 namespace Marechai.Database.Migrations
 {
-    [DbContext(typeof(cicmContext))]
+    [DbContext(typeof(MarechaiContext))]
     [Migration("20190617024228_AddMagazineIssues")]
     partial class AddMagazineIssues
     {
diff --git a/Marechai.Database/Migrations/20190617025439_AddCompaniesByMagazine.Designer.cs b/Marechai.Database/Migrations/20190617025439_AddCompaniesByMagazine.Designer.cs
index bf51dd8a..e65541fa 100644
--- a/Marechai.Database/Migrations/20190617025439_AddCompaniesByMagazine.Designer.cs
+++ b/Marechai.Database/Migrations/20190617025439_AddCompaniesByMagazine.Designer.cs
@@ -8,7 +8,7 @@ using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
 
 namespace Marechai.Database.Migrations
 {
-    [DbContext(typeof(cicmContext))]
+    [DbContext(typeof(MarechaiContext))]
     [Migration("20190617025439_AddCompaniesByMagazine")]
     partial class AddCompaniesByMagazine
     {
diff --git a/Marechai.Database/Migrations/20190617030141_AddPeopleByMagazine.Designer.cs b/Marechai.Database/Migrations/20190617030141_AddPeopleByMagazine.Designer.cs
index c02b43a0..7eb7b6a3 100644
--- a/Marechai.Database/Migrations/20190617030141_AddPeopleByMagazine.Designer.cs
+++ b/Marechai.Database/Migrations/20190617030141_AddPeopleByMagazine.Designer.cs
@@ -8,7 +8,7 @@ using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
 
 namespace Marechai.Database.Migrations
 {
-    [DbContext(typeof(cicmContext))]
+    [DbContext(typeof(MarechaiContext))]
     [Migration("20190617030141_AddPeopleByMagazine")]
     partial class AddPeopleByMagazine
     {
diff --git a/Marechai.Database/Migrations/20190617031250_AddMagazinesByMachine.Designer.cs b/Marechai.Database/Migrations/20190617031250_AddMagazinesByMachine.Designer.cs
index 8c7ef981..098f9569 100644
--- a/Marechai.Database/Migrations/20190617031250_AddMagazinesByMachine.Designer.cs
+++ b/Marechai.Database/Migrations/20190617031250_AddMagazinesByMachine.Designer.cs
@@ -8,7 +8,7 @@ using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
 
 namespace Marechai.Database.Migrations
 {
-    [DbContext(typeof(cicmContext))]
+    [DbContext(typeof(MarechaiContext))]
     [Migration("20190617031250_AddMagazinesByMachine")]
     partial class AddMagazinesByMachine
     {
diff --git a/Marechai.Database/Migrations/20190617031843_AddMagazinesByMachineFamily.Designer.cs b/Marechai.Database/Migrations/20190617031843_AddMagazinesByMachineFamily.Designer.cs
index d4f9bf66..bb701e45 100644
--- a/Marechai.Database/Migrations/20190617031843_AddMagazinesByMachineFamily.Designer.cs
+++ b/Marechai.Database/Migrations/20190617031843_AddMagazinesByMachineFamily.Designer.cs
@@ -8,7 +8,7 @@ using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
 
 namespace Marechai.Database.Migrations
 {
-    [DbContext(typeof(cicmContext))]
+    [DbContext(typeof(MarechaiContext))]
     [Migration("20190617031843_AddMagazinesByMachineFamily")]
     partial class AddMagazinesByMachineFamily
     {
diff --git a/Marechai.Database/Migrations/20190630103617_FixDocumentCompanyOneToOne.Designer.cs b/Marechai.Database/Migrations/20190630103617_FixDocumentCompanyOneToOne.Designer.cs
index ba5180fc..458cccd5 100644
--- a/Marechai.Database/Migrations/20190630103617_FixDocumentCompanyOneToOne.Designer.cs
+++ b/Marechai.Database/Migrations/20190630103617_FixDocumentCompanyOneToOne.Designer.cs
@@ -8,7 +8,7 @@ using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
 
 namespace Marechai.Database.Migrations
 {
-    [DbContext(typeof(cicmContext))]
+    [DbContext(typeof(MarechaiContext))]
     [Migration("20190630103617_FixDocumentCompanyOneToOne")]
     partial class FixDocumentCompanyOneToOne
     {
diff --git a/Marechai.Database/Migrations/20190630202244_AddDisplayNameAndAliasToPerson.Designer.cs b/Marechai.Database/Migrations/20190630202244_AddDisplayNameAndAliasToPerson.Designer.cs
index 9117a18a..c15145dc 100644
--- a/Marechai.Database/Migrations/20190630202244_AddDisplayNameAndAliasToPerson.Designer.cs
+++ b/Marechai.Database/Migrations/20190630202244_AddDisplayNameAndAliasToPerson.Designer.cs
@@ -8,7 +8,7 @@ using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
 
 namespace Marechai.Database.Migrations
 {
-    [DbContext(typeof(cicmContext))]
+    [DbContext(typeof(MarechaiContext))]
     [Migration("20190630202244_AddDisplayNameAndAliasToPerson")]
     partial class AddDisplayNameAndAliasToPerson
     {
diff --git a/Marechai.Database/Migrations/20190630212811_AddDisplayNameAndAliasToDocumentPerson.Designer.cs b/Marechai.Database/Migrations/20190630212811_AddDisplayNameAndAliasToDocumentPerson.Designer.cs
index 83240e96..a6aa30ee 100644
--- a/Marechai.Database/Migrations/20190630212811_AddDisplayNameAndAliasToDocumentPerson.Designer.cs
+++ b/Marechai.Database/Migrations/20190630212811_AddDisplayNameAndAliasToDocumentPerson.Designer.cs
@@ -8,7 +8,7 @@ using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
 
 namespace Marechai.Database.Migrations
 {
-    [DbContext(typeof(cicmContext))]
+    [DbContext(typeof(MarechaiContext))]
     [Migration("20190630212811_AddDisplayNameAndAliasToDocumentPerson")]
     partial class AddDisplayNameAndAliasToDocumentPerson
     {
diff --git a/Marechai.Database/Migrations/cicmContextModelSnapshot.cs b/Marechai.Database/Migrations/cicmContextModelSnapshot.cs
index 113ad593..bee4a180 100644
--- a/Marechai.Database/Migrations/cicmContextModelSnapshot.cs
+++ b/Marechai.Database/Migrations/cicmContextModelSnapshot.cs
@@ -7,8 +7,8 @@ using Microsoft.EntityFrameworkCore.Infrastructure;
 
 namespace Marechai.Database.Migrations
 {
-    [DbContext(typeof(cicmContext))]
-    class cicmContextModelSnapshot : ModelSnapshot
+    [DbContext(typeof(MarechaiContext))]
+    class marechaiContextModelSnapshot : ModelSnapshot
     {
         protected override void BuildModel(ModelBuilder modelBuilder)
         {
diff --git a/Marechai.Database/Models/cicmContext.cs b/Marechai.Database/Models/MarechaiContext.cs
similarity index 99%
rename from Marechai.Database/Models/cicmContext.cs
rename to Marechai.Database/Models/MarechaiContext.cs
index 828341b4..4eb58856 100644
--- a/Marechai.Database/Models/cicmContext.cs
+++ b/Marechai.Database/Models/MarechaiContext.cs
@@ -2,7 +2,7 @@
 // MARECHAI: Master repository of computing history artifacts information
 // ----------------------------------------------------------------------------
 //
-// Filename       : cicmContext.cs
+// Filename       : MarechaiContext.cs
 // Author(s)      : Natalia Portillo <claunia@claunia.com>
 //
 // --[ Description ] ----------------------------------------------------------
@@ -33,11 +33,11 @@ using Microsoft.EntityFrameworkCore;
 
 namespace Marechai.Database.Models
 {
-    public class cicmContext : IdentityDbContext
+    public class MarechaiContext : IdentityDbContext
     {
-        public cicmContext() { }
+        public MarechaiContext() { }
 
-        public cicmContext(DbContextOptions<cicmContext> options) : base(options) { }
+        public MarechaiContext(DbContextOptions<MarechaiContext> options) : base(options) { }
 
         public virtual DbSet<Book>                                Books                               { get; set; }
         public virtual DbSet<BooksByMachine>                      BooksByMachines                     { get; set; }
diff --git a/Marechai/Areas/Admin/Controllers/BrowserTestsController.cs b/Marechai/Areas/Admin/Controllers/BrowserTestsController.cs
index 064a1ae9..022df63e 100644
--- a/Marechai/Areas/Admin/Controllers/BrowserTestsController.cs
+++ b/Marechai/Areas/Admin/Controllers/BrowserTestsController.cs
@@ -41,9 +41,9 @@ namespace Marechai.Areas.Admin.Controllers
     [Authorize]
     public class BrowserTestsController : Controller
     {
-        readonly cicmContext _context;
+        readonly MarechaiContext _context;
 
-        public BrowserTestsController(cicmContext context)
+        public BrowserTestsController(MarechaiContext context)
         {
             _context = context;
         }
diff --git a/Marechai/Areas/Admin/Controllers/CompaniesController.cs b/Marechai/Areas/Admin/Controllers/CompaniesController.cs
index be84d66b..80d1c576 100644
--- a/Marechai/Areas/Admin/Controllers/CompaniesController.cs
+++ b/Marechai/Areas/Admin/Controllers/CompaniesController.cs
@@ -44,9 +44,9 @@ namespace Marechai.Areas.Admin.Controllers
     [Authorize]
     public class CompaniesController : Controller
     {
-        readonly cicmContext _context;
+        readonly MarechaiContext _context;
 
-        public CompaniesController(cicmContext context)
+        public CompaniesController(MarechaiContext context)
         {
             _context = context;
         }
@@ -54,9 +54,9 @@ namespace Marechai.Areas.Admin.Controllers
         // GET: Admin/Companies
         public async Task<IActionResult> Index()
         {
-            IIncludableQueryable<Company, Company> cicmContext =
+            IIncludableQueryable<Company, Company> marechaiContext =
                 _context.Companies.Include(c => c.Country).Include(c => c.SoldTo);
-            return View(cicmContext.OrderBy(c => c.Name).Select(c => new CompanyViewModel
+            return View(marechaiContext.OrderBy(c => c.Name).Select(c => new CompanyViewModel
             {
                 Id      = c.Id,
                 Name    = c.Name,
diff --git a/Marechai/Areas/Admin/Controllers/CompanyDescriptionsController.cs b/Marechai/Areas/Admin/Controllers/CompanyDescriptionsController.cs
index 42c22b93..f9450ef9 100644
--- a/Marechai/Areas/Admin/Controllers/CompanyDescriptionsController.cs
+++ b/Marechai/Areas/Admin/Controllers/CompanyDescriptionsController.cs
@@ -45,10 +45,10 @@ namespace Marechai.Areas.Admin.Controllers
     [Authorize]
     public class CompanyDescriptionsController : Controller
     {
-        readonly cicmContext      _context;
+        readonly MarechaiContext      _context;
         readonly MarkdownPipeline pipeline;
 
-        public CompanyDescriptionsController(cicmContext context)
+        public CompanyDescriptionsController(MarechaiContext context)
         {
             pipeline = new MarkdownPipelineBuilder().UseAdvancedExtensions().Build();
             _context = context;
@@ -57,9 +57,9 @@ namespace Marechai.Areas.Admin.Controllers
         // GET: CompanyDescription
         public async Task<IActionResult> Index()
         {
-            IIncludableQueryable<CompanyDescription, Company> cicmContext =
+            IIncludableQueryable<CompanyDescription, Company> marechaiContext =
                 _context.CompanyDescriptions.Include(c => c.Company);
-            return View(await cicmContext.OrderBy(c => c.Company.Name)
+            return View(await marechaiContext.OrderBy(c => c.Company.Name)
                                          .Select(c => new CompanyDescriptionViewModel
                                           {
                                               Id = c.Id, Company = c.Company.Name
diff --git a/Marechai/Areas/Admin/Controllers/CompanyLogosController.cs b/Marechai/Areas/Admin/Controllers/CompanyLogosController.cs
index 30b5a43e..8e04fa45 100644
--- a/Marechai/Areas/Admin/Controllers/CompanyLogosController.cs
+++ b/Marechai/Areas/Admin/Controllers/CompanyLogosController.cs
@@ -21,10 +21,10 @@ namespace Marechai.Areas.Admin.Controllers
     [Authorize]
     public class CompanyLogosController : Controller
     {
-        readonly cicmContext         _context;
+        readonly MarechaiContext         _context;
         readonly IHostingEnvironment hostingEnvironment;
 
-        public CompanyLogosController(cicmContext context, IHostingEnvironment env)
+        public CompanyLogosController(MarechaiContext context, IHostingEnvironment env)
         {
             _context           = context;
             hostingEnvironment = env;
@@ -33,8 +33,8 @@ namespace Marechai.Areas.Admin.Controllers
         // GET: CompanyLogos
         public async Task<IActionResult> Index()
         {
-            IIncludableQueryable<CompanyLogo, Company> cicmContext = _context.CompanyLogos.Include(c => c.Company);
-            return View(await cicmContext.OrderBy(l => l.Company.Name).ThenBy(l => l.Year)
+            IIncludableQueryable<CompanyLogo, Company> marechaiContext = _context.CompanyLogos.Include(c => c.Company);
+            return View(await marechaiContext.OrderBy(l => l.Company.Name).ThenBy(l => l.Year)
                                          .Select(l => new CompanyLogoViewModel
                                           {
                                               Company = l.Company.Name, Id = l.Id, Year = l.Year
diff --git a/Marechai/Areas/Admin/Controllers/DocumentCompaniesController.cs b/Marechai/Areas/Admin/Controllers/DocumentCompaniesController.cs
index 131fa59b..aa5bdec0 100644
--- a/Marechai/Areas/Admin/Controllers/DocumentCompaniesController.cs
+++ b/Marechai/Areas/Admin/Controllers/DocumentCompaniesController.cs
@@ -13,9 +13,9 @@ namespace Marechai.Areas.Admin.Controllers
     [Authorize]
     public class DocumentCompaniesController : Controller
     {
-        readonly cicmContext _context;
+        readonly MarechaiContext _context;
 
-        public DocumentCompaniesController(cicmContext context)
+        public DocumentCompaniesController(MarechaiContext context)
         {
             _context = context;
         }
diff --git a/Marechai/Areas/Admin/Controllers/DocumentPeopleController.cs b/Marechai/Areas/Admin/Controllers/DocumentPeopleController.cs
index 5e43ad42..7ee445c3 100644
--- a/Marechai/Areas/Admin/Controllers/DocumentPeopleController.cs
+++ b/Marechai/Areas/Admin/Controllers/DocumentPeopleController.cs
@@ -13,9 +13,9 @@ namespace Marechai.Areas.Admin.Controllers
     [Authorize]
     public class DocumentPeopleController : Controller
     {
-        readonly cicmContext _context;
+        readonly MarechaiContext _context;
 
-        public DocumentPeopleController(cicmContext context)
+        public DocumentPeopleController(MarechaiContext context)
         {
             _context = context;
         }
diff --git a/Marechai/Areas/Admin/Controllers/GpusByMachineController.cs b/Marechai/Areas/Admin/Controllers/GpusByMachineController.cs
index eedd28d0..17ab2533 100644
--- a/Marechai/Areas/Admin/Controllers/GpusByMachineController.cs
+++ b/Marechai/Areas/Admin/Controllers/GpusByMachineController.cs
@@ -14,9 +14,9 @@ namespace Marechai.Areas.Admin.Controllers
     [Authorize]
     public class GpusByMachineController : Controller
     {
-        readonly cicmContext _context;
+        readonly MarechaiContext _context;
 
-        public GpusByMachineController(cicmContext context)
+        public GpusByMachineController(MarechaiContext context)
         {
             _context = context;
         }
@@ -24,9 +24,9 @@ namespace Marechai.Areas.Admin.Controllers
         // GET: GpusByMachine
         public async Task<IActionResult> Index()
         {
-            IIncludableQueryable<GpusByMachine, Machine> cicmContext =
+            IIncludableQueryable<GpusByMachine, Machine> marechaiContext =
                 _context.GpusByMachine.Include(g => g.Gpu).Include(g => g.Machine);
-            return View(await cicmContext.OrderBy(g => g.Machine.Name).ThenBy(g => g.Gpu.Name)
+            return View(await marechaiContext.OrderBy(g => g.Machine.Name).ThenBy(g => g.Gpu.Name)
                                          .Select(g => new GpusByMachineViewModel
                                           {
                                               Id = g.Id, Gpu = g.Gpu.Name, Machine = g.Machine.Name
diff --git a/Marechai/Areas/Admin/Controllers/GpusByOwnedMachineController.cs b/Marechai/Areas/Admin/Controllers/GpusByOwnedMachineController.cs
index 2b255d9f..c19c5f30 100644
--- a/Marechai/Areas/Admin/Controllers/GpusByOwnedMachineController.cs
+++ b/Marechai/Areas/Admin/Controllers/GpusByOwnedMachineController.cs
@@ -14,9 +14,9 @@ namespace Marechai.Areas.Admin.Controllers
     [Authorize]
     public class GpusByOwnedMachineController : Controller
     {
-        readonly cicmContext _context;
+        readonly MarechaiContext _context;
 
-        public GpusByOwnedMachineController(cicmContext context)
+        public GpusByOwnedMachineController(MarechaiContext context)
         {
             _context = context;
         }
@@ -24,9 +24,9 @@ namespace Marechai.Areas.Admin.Controllers
         // GET: GpusByOwnedMachine
         public async Task<IActionResult> Index()
         {
-            IIncludableQueryable<GpusByOwnedMachine, OwnedMachine> cicmContext =
+            IIncludableQueryable<GpusByOwnedMachine, OwnedMachine> marechaiContext =
                 _context.GpusByOwnedMachine.Include(g => g.Gpu).Include(g => g.OwnedMachine);
-            return View(await cicmContext.OrderBy(g => g.OwnedMachine.Machine.Name).ThenBy(g => g.Gpu.Name)
+            return View(await marechaiContext.OrderBy(g => g.OwnedMachine.Machine.Name).ThenBy(g => g.Gpu.Name)
                                          .Select(g => new GpusByMachineViewModel
                                           {
                                               Id  = g.Id,
diff --git a/Marechai/Areas/Admin/Controllers/GpusController.cs b/Marechai/Areas/Admin/Controllers/GpusController.cs
index b63f5893..2d68ee8a 100644
--- a/Marechai/Areas/Admin/Controllers/GpusController.cs
+++ b/Marechai/Areas/Admin/Controllers/GpusController.cs
@@ -44,9 +44,9 @@ namespace Marechai.Areas.Admin.Controllers
     [Authorize]
     public class GpusController : Controller
     {
-        readonly cicmContext _context;
+        readonly MarechaiContext _context;
 
-        public GpusController(cicmContext context)
+        public GpusController(MarechaiContext context)
         {
             _context = context;
         }
@@ -54,8 +54,8 @@ namespace Marechai.Areas.Admin.Controllers
         // GET: Admin/Gpus
         public async Task<IActionResult> Index()
         {
-            IIncludableQueryable<Gpu, Company> cicmContext = _context.Gpus.Include(g => g.Company);
-            return View(await cicmContext.OrderBy(g => g.Company.Name).ThenBy(g => g.Name).ThenBy(g => g.Introduced)
+            IIncludableQueryable<Gpu, Company> marechaiContext = _context.Gpus.Include(g => g.Company);
+            return View(await marechaiContext.OrderBy(g => g.Company.Name).ThenBy(g => g.Name).ThenBy(g => g.Introduced)
                                          .Select(g => new GpuViewModel
                                           {
                                               Id         = g.Id,
diff --git a/Marechai/Areas/Admin/Controllers/InstructionSetExtensionsByProcessorController.cs b/Marechai/Areas/Admin/Controllers/InstructionSetExtensionsByProcessorController.cs
index fc12314a..61bccf81 100644
--- a/Marechai/Areas/Admin/Controllers/InstructionSetExtensionsByProcessorController.cs
+++ b/Marechai/Areas/Admin/Controllers/InstructionSetExtensionsByProcessorController.cs
@@ -14,9 +14,9 @@ namespace Marechai.Areas.Admin.Controllers
     [Authorize]
     public class InstructionSetExtensionsByProcessorController : Controller
     {
-        readonly cicmContext _context;
+        readonly MarechaiContext _context;
 
-        public InstructionSetExtensionsByProcessorController(cicmContext context)
+        public InstructionSetExtensionsByProcessorController(MarechaiContext context)
         {
             _context = context;
         }
@@ -24,9 +24,9 @@ namespace Marechai.Areas.Admin.Controllers
         // GET: InstructionSetExtensionsByProcessor
         public async Task<IActionResult> Index()
         {
-            IIncludableQueryable<InstructionSetExtensionsByProcessor, Processor> cicmContext =
+            IIncludableQueryable<InstructionSetExtensionsByProcessor, Processor> marechaiContext =
                 _context.InstructionSetExtensionsByProcessor.Include(i => i.Extension).Include(i => i.Processor);
-            return View(await cicmContext.OrderBy(e => e.Processor.Name).ThenBy(e => e.Extension.Extension)
+            return View(await marechaiContext.OrderBy(e => e.Processor.Name).ThenBy(e => e.Extension.Extension)
                                          .Select(e => new InstructionSetExtensionsByProcessorViewModel
                                           {
                                               Id        = e.Id,
diff --git a/Marechai/Areas/Admin/Controllers/InstructionSetExtensionsController.cs b/Marechai/Areas/Admin/Controllers/InstructionSetExtensionsController.cs
index a04cfdee..4bbe9ac7 100644
--- a/Marechai/Areas/Admin/Controllers/InstructionSetExtensionsController.cs
+++ b/Marechai/Areas/Admin/Controllers/InstructionSetExtensionsController.cs
@@ -42,9 +42,9 @@ namespace Marechai.Areas.Admin.Controllers
     [Authorize]
     public class InstructionSetExtensionsController : Controller
     {
-        readonly cicmContext _context;
+        readonly MarechaiContext _context;
 
-        public InstructionSetExtensionsController(cicmContext context)
+        public InstructionSetExtensionsController(MarechaiContext context)
         {
             _context = context;
         }
diff --git a/Marechai/Areas/Admin/Controllers/InstructionSetsController.cs b/Marechai/Areas/Admin/Controllers/InstructionSetsController.cs
index d60706b4..015b4490 100644
--- a/Marechai/Areas/Admin/Controllers/InstructionSetsController.cs
+++ b/Marechai/Areas/Admin/Controllers/InstructionSetsController.cs
@@ -42,9 +42,9 @@ namespace Marechai.Areas.Admin.Controllers
     [Authorize]
     public class InstructionSetsController : Controller
     {
-        readonly cicmContext _context;
+        readonly MarechaiContext _context;
 
-        public InstructionSetsController(cicmContext context)
+        public InstructionSetsController(MarechaiContext context)
         {
             _context = context;
         }
diff --git a/Marechai/Areas/Admin/Controllers/LicensesController.cs b/Marechai/Areas/Admin/Controllers/LicensesController.cs
index 6a023666..4243c21a 100644
--- a/Marechai/Areas/Admin/Controllers/LicensesController.cs
+++ b/Marechai/Areas/Admin/Controllers/LicensesController.cs
@@ -11,9 +11,9 @@ namespace Marechai
     [Authorize]
     public class LicensesController : Controller
     {
-        readonly cicmContext _context;
+        readonly MarechaiContext _context;
 
-        public LicensesController(cicmContext context)
+        public LicensesController(MarechaiContext context)
         {
             _context = context;
         }
diff --git a/Marechai/Areas/Admin/Controllers/MachineFamiliesController.cs b/Marechai/Areas/Admin/Controllers/MachineFamiliesController.cs
index 35ac888c..0d87d2f3 100644
--- a/Marechai/Areas/Admin/Controllers/MachineFamiliesController.cs
+++ b/Marechai/Areas/Admin/Controllers/MachineFamiliesController.cs
@@ -44,9 +44,9 @@ namespace Marechai.Areas.Admin.Controllers
     [Authorize]
     public class MachineFamiliesController : Controller
     {
-        readonly cicmContext _context;
+        readonly MarechaiContext _context;
 
-        public MachineFamiliesController(cicmContext context)
+        public MachineFamiliesController(MarechaiContext context)
         {
             _context = context;
         }
@@ -54,8 +54,8 @@ namespace Marechai.Areas.Admin.Controllers
         // GET: Admin/MachineFamilies
         public async Task<IActionResult> Index()
         {
-            IIncludableQueryable<MachineFamily, Company> cicmContext = _context.MachineFamilies.Include(m => m.Company);
-            return View(await cicmContext.OrderBy(m => m.Company.Name).ThenBy(m => m.Name)
+            IIncludableQueryable<MachineFamily, Company> marechaiContext = _context.MachineFamilies.Include(m => m.Company);
+            return View(await marechaiContext.OrderBy(m => m.Company.Name).ThenBy(m => m.Name)
                                          .Select(m => new MachineFamilyViewModel
                                           {
                                               Id = m.Id, Company = m.Company.Name, Name = m.Name
diff --git a/Marechai/Areas/Admin/Controllers/MachinePhotosController.cs b/Marechai/Areas/Admin/Controllers/MachinePhotosController.cs
index 2dcaf655..e7f62307 100644
--- a/Marechai/Areas/Admin/Controllers/MachinePhotosController.cs
+++ b/Marechai/Areas/Admin/Controllers/MachinePhotosController.cs
@@ -20,11 +20,11 @@ namespace Marechai.Areas.Admin.Controllers
     [Authorize]
     public class MachinePhotosController : Controller
     {
-        readonly cicmContext                  _context;
+        readonly MarechaiContext                  _context;
         readonly IHostingEnvironment          hostingEnvironment;
         readonly UserManager<ApplicationUser> userManager;
 
-        public MachinePhotosController(cicmContext                  context, IHostingEnvironment hostingEnvironment,
+        public MachinePhotosController(MarechaiContext                  context, IHostingEnvironment hostingEnvironment,
                                        UserManager<ApplicationUser> userManager)
         {
             _context                = context;
diff --git a/Marechai/Areas/Admin/Controllers/MachinesController.cs b/Marechai/Areas/Admin/Controllers/MachinesController.cs
index 40f541c3..79ccc5b8 100644
--- a/Marechai/Areas/Admin/Controllers/MachinesController.cs
+++ b/Marechai/Areas/Admin/Controllers/MachinesController.cs
@@ -46,9 +46,9 @@ namespace Marechai.Areas.Admin.Controllers
     [Authorize]
     public class MachinesController : Controller
     {
-        readonly cicmContext _context;
+        readonly MarechaiContext _context;
 
-        public MachinesController(cicmContext context)
+        public MachinesController(MarechaiContext context)
         {
             _context = context;
         }
@@ -56,9 +56,9 @@ namespace Marechai.Areas.Admin.Controllers
         // GET: Admin/Machines
         public async Task<IActionResult> Index()
         {
-            IIncludableQueryable<Machine, MachineFamily> cicmContext =
+            IIncludableQueryable<Machine, MachineFamily> marechaiContext =
                 _context.Machines.Include(m => m.Company).Include(m => m.Family);
-            return View(await cicmContext.OrderBy(m => m.Company.Name).ThenBy(m => m.Name).ThenBy(m => m.Family.Name)
+            return View(await marechaiContext.OrderBy(m => m.Company.Name).ThenBy(m => m.Name).ThenBy(m => m.Family.Name)
                                          .Select(m => new MachineViewModel
                                           {
                                               Id         = m.Id,
diff --git a/Marechai/Areas/Admin/Controllers/MemoryByMachinesController.cs b/Marechai/Areas/Admin/Controllers/MemoryByMachinesController.cs
index 659c8c0a..d153bda7 100644
--- a/Marechai/Areas/Admin/Controllers/MemoryByMachinesController.cs
+++ b/Marechai/Areas/Admin/Controllers/MemoryByMachinesController.cs
@@ -44,9 +44,9 @@ namespace Marechai.Areas.Admin.Controllers
     [Authorize]
     public class MemoryByMachinesController : Controller
     {
-        readonly cicmContext _context;
+        readonly MarechaiContext _context;
 
-        public MemoryByMachinesController(cicmContext context)
+        public MemoryByMachinesController(MarechaiContext context)
         {
             _context = context;
         }
@@ -54,9 +54,9 @@ namespace Marechai.Areas.Admin.Controllers
         // GET: Admin/MemoryByMachines
         public async Task<IActionResult> Index()
         {
-            IIncludableQueryable<MemoryByMachine, Machine> cicmContext =
+            IIncludableQueryable<MemoryByMachine, Machine> marechaiContext =
                 _context.MemoryByMachine.Include(m => m.Machine);
-            return View(await cicmContext.OrderBy(m => m.Machine.Name).ThenBy(m => m.Usage).ThenBy(m => m.Size)
+            return View(await marechaiContext.OrderBy(m => m.Machine.Name).ThenBy(m => m.Usage).ThenBy(m => m.Size)
                                          .ThenBy(m => m.Type)
                                          .Select(m => new MemoryByMachineViewModel
                                           {
diff --git a/Marechai/Areas/Admin/Controllers/MemoryByOwnedMachinesController.cs b/Marechai/Areas/Admin/Controllers/MemoryByOwnedMachinesController.cs
index 2c76a9dc..67ed5446 100644
--- a/Marechai/Areas/Admin/Controllers/MemoryByOwnedMachinesController.cs
+++ b/Marechai/Areas/Admin/Controllers/MemoryByOwnedMachinesController.cs
@@ -44,9 +44,9 @@ namespace Marechai.Areas.Admin.Controllers
     [Authorize]
     public class MemoryByOwnedMachinesController : Controller
     {
-        readonly cicmContext _context;
+        readonly MarechaiContext _context;
 
-        public MemoryByOwnedMachinesController(cicmContext context)
+        public MemoryByOwnedMachinesController(MarechaiContext context)
         {
             _context = context;
         }
@@ -54,9 +54,9 @@ namespace Marechai.Areas.Admin.Controllers
         // GET: Admin/MemoryByOwnedMachines
         public async Task<IActionResult> Index()
         {
-            IIncludableQueryable<MemoryByOwnedMachine, OwnedMachine> cicmContext =
+            IIncludableQueryable<MemoryByOwnedMachine, OwnedMachine> marechaiContext =
                 _context.MemoryByOwnedMachine.Include(m => m.OwnedMachine);
-            return View(await cicmContext.OrderBy(m => m.OwnedMachine.Machine.Company.Name)
+            return View(await marechaiContext.OrderBy(m => m.OwnedMachine.Machine.Company.Name)
                                          .ThenBy(m => m.OwnedMachine.Machine.Name)
                                          .ThenBy(m => m.OwnedMachine.User.UserName).ThenBy(m => m.Usage)
                                          .ThenBy(m => m.Size).ThenBy(m => m.Type)
@@ -77,9 +77,9 @@ namespace Marechai.Areas.Admin.Controllers
         {
             if(id == null) return NotFound();
 
-            IIncludableQueryable<MemoryByOwnedMachine, OwnedMachine> cicmContext =
+            IIncludableQueryable<MemoryByOwnedMachine, OwnedMachine> marechaiContext =
                 _context.MemoryByOwnedMachine.Include(m => m.OwnedMachine);
-            MemoryByMachineViewModel memoryByOwnedMachine = await cicmContext
+            MemoryByMachineViewModel memoryByOwnedMachine = await marechaiContext
                                                                  .OrderBy(m => m.OwnedMachine.Machine.Company.Name)
                                                                  .ThenBy(m => m.OwnedMachine.Machine.Name)
                                                                  .ThenBy(m => m.OwnedMachine.User.UserName)
diff --git a/Marechai/Areas/Admin/Controllers/NewsController.cs b/Marechai/Areas/Admin/Controllers/NewsController.cs
index 285f6dc3..8188bc60 100644
--- a/Marechai/Areas/Admin/Controllers/NewsController.cs
+++ b/Marechai/Areas/Admin/Controllers/NewsController.cs
@@ -41,9 +41,9 @@ namespace Marechai.Areas.Admin.Controllers
     [Authorize]
     public class NewsController : Controller
     {
-        readonly cicmContext _context;
+        readonly MarechaiContext _context;
 
-        public NewsController(cicmContext context)
+        public NewsController(MarechaiContext context)
         {
             _context = context;
         }
diff --git a/Marechai/Areas/Admin/Controllers/OwnedMachineController.cs b/Marechai/Areas/Admin/Controllers/OwnedMachineController.cs
index 6b6165f7..34fd9f75 100644
--- a/Marechai/Areas/Admin/Controllers/OwnedMachineController.cs
+++ b/Marechai/Areas/Admin/Controllers/OwnedMachineController.cs
@@ -13,9 +13,9 @@ namespace Marechai.Areas.Admin.Controllers
     [Authorize]
     public class OwnedMachineController : Controller
     {
-        readonly cicmContext _context;
+        readonly MarechaiContext _context;
 
-        public OwnedMachineController(cicmContext context)
+        public OwnedMachineController(MarechaiContext context)
         {
             _context = context;
         }
@@ -23,7 +23,7 @@ namespace Marechai.Areas.Admin.Controllers
         // GET: OwnedMachine
         public async Task<IActionResult> Index()
         {
-            IQueryable<OwnedMachineViewModel> cicmContext = _context
+            IQueryable<OwnedMachineViewModel> marechaiContext = _context
                                                            .OwnedMachines.Include(o => o.Machine)
                                                            .OrderBy(o => o.Machine.Company.Name)
                                                            .ThenBy(o => o.Machine.Name).ThenBy(o => o.User.UserName)
@@ -38,7 +38,7 @@ namespace Marechai.Areas.Admin.Controllers
                                                                 User   = o.User.UserName
                                                             });
 
-            return View(await cicmContext.ToListAsync());
+            return View(await marechaiContext.ToListAsync());
         }
 
         // GET: OwnedMachine/Details/5
diff --git a/Marechai/Areas/Admin/Controllers/PeopleController.cs b/Marechai/Areas/Admin/Controllers/PeopleController.cs
index 1b32e007..c20caf60 100644
--- a/Marechai/Areas/Admin/Controllers/PeopleController.cs
+++ b/Marechai/Areas/Admin/Controllers/PeopleController.cs
@@ -13,9 +13,9 @@ namespace Marechai.Areas.Admin.Controllers
     [Authorize]
     public class PeopleController : Controller
     {
-        readonly cicmContext _context;
+        readonly MarechaiContext _context;
 
-        public PeopleController(cicmContext context)
+        public PeopleController(MarechaiContext context)
         {
             _context = context;
         }
@@ -23,8 +23,8 @@ namespace Marechai.Areas.Admin.Controllers
         // GET: People
         public async Task<IActionResult> Index()
         {
-            IIncludableQueryable<Person, Iso31661Numeric> cicmContext = _context.People.Include(p => p.CountryOfBirth);
-            return View(await cicmContext.OrderBy(p => p.FullName).ToListAsync());
+            IIncludableQueryable<Person, Iso31661Numeric> marechaiContext = _context.People.Include(p => p.CountryOfBirth);
+            return View(await marechaiContext.OrderBy(p => p.FullName).ToListAsync());
         }
 
         // GET: People/Details/5
diff --git a/Marechai/Areas/Admin/Controllers/ProcessorsByMachinesController.cs b/Marechai/Areas/Admin/Controllers/ProcessorsByMachinesController.cs
index 04280da9..27ef8bd8 100644
--- a/Marechai/Areas/Admin/Controllers/ProcessorsByMachinesController.cs
+++ b/Marechai/Areas/Admin/Controllers/ProcessorsByMachinesController.cs
@@ -44,9 +44,9 @@ namespace Marechai.Areas.Admin.Controllers
     [Authorize]
     public class ProcessorsByMachinesController : Controller
     {
-        readonly cicmContext _context;
+        readonly MarechaiContext _context;
 
-        public ProcessorsByMachinesController(cicmContext context)
+        public ProcessorsByMachinesController(MarechaiContext context)
         {
             _context = context;
         }
@@ -54,9 +54,9 @@ namespace Marechai.Areas.Admin.Controllers
         // GET: Admin/ProcessorsByMachines
         public async Task<IActionResult> Index()
         {
-            IIncludableQueryable<ProcessorsByMachine, Processor> cicmContext =
+            IIncludableQueryable<ProcessorsByMachine, Processor> marechaiContext =
                 _context.ProcessorsByMachine.Include(p => p.Machine).Include(p => p.Processor);
-            return View(await cicmContext.OrderBy(p => p.Machine.Name).ThenBy(p => p.Processor.Name)
+            return View(await marechaiContext.OrderBy(p => p.Machine.Name).ThenBy(p => p.Processor.Name)
                                          .Select(p => new ProcessorsByMachineViewModel
                                           {
                                               Id        = p.Id,
diff --git a/Marechai/Areas/Admin/Controllers/ProcessorsByOwnedMachinesController.cs b/Marechai/Areas/Admin/Controllers/ProcessorsByOwnedMachinesController.cs
index 4e7e4afd..c4cbb179 100644
--- a/Marechai/Areas/Admin/Controllers/ProcessorsByOwnedMachinesController.cs
+++ b/Marechai/Areas/Admin/Controllers/ProcessorsByOwnedMachinesController.cs
@@ -44,9 +44,9 @@ namespace Marechai.Areas.Admin.Controllers
     [Authorize]
     public class ProcessorsByOwnedMachinesController : Controller
     {
-        readonly cicmContext _context;
+        readonly MarechaiContext _context;
 
-        public ProcessorsByOwnedMachinesController(cicmContext context)
+        public ProcessorsByOwnedMachinesController(MarechaiContext context)
         {
             _context = context;
         }
@@ -54,9 +54,9 @@ namespace Marechai.Areas.Admin.Controllers
         // GET: Admin/ProcessorsByOwnedMachines
         public async Task<IActionResult> Index()
         {
-            IIncludableQueryable<ProcessorsByOwnedMachine, Processor> cicmContext =
+            IIncludableQueryable<ProcessorsByOwnedMachine, Processor> marechaiContext =
                 _context.ProcessorsByOwnedMachine.Include(p => p.OwnedMachine).Include(p => p.Processor);
-            return View(await cicmContext.OrderBy(p => p.OwnedMachine.Machine.Name).ThenBy(p => p.Processor.Name)
+            return View(await marechaiContext.OrderBy(p => p.OwnedMachine.Machine.Name).ThenBy(p => p.Processor.Name)
                                          .Select(p => new ProcessorsByMachineViewModel
                                           {
                                               Id = p.Id,
diff --git a/Marechai/Areas/Admin/Controllers/ProcessorsController.cs b/Marechai/Areas/Admin/Controllers/ProcessorsController.cs
index 850eaaeb..c74408f8 100644
--- a/Marechai/Areas/Admin/Controllers/ProcessorsController.cs
+++ b/Marechai/Areas/Admin/Controllers/ProcessorsController.cs
@@ -44,9 +44,9 @@ namespace Marechai.Areas.Admin.Controllers
     [Authorize]
     public class ProcessorsController : Controller
     {
-        readonly cicmContext _context;
+        readonly MarechaiContext _context;
 
-        public ProcessorsController(cicmContext context)
+        public ProcessorsController(MarechaiContext context)
         {
             _context = context;
         }
@@ -54,9 +54,9 @@ namespace Marechai.Areas.Admin.Controllers
         // GET: Admin/Processors
         public async Task<IActionResult> Index()
         {
-            IIncludableQueryable<Processor, InstructionSet> cicmContext =
+            IIncludableQueryable<Processor, InstructionSet> marechaiContext =
                 _context.Processors.Include(p => p.Company).Include(p => p.InstructionSet);
-            return View(await cicmContext.OrderBy(p => p.Company.Name).ThenBy(p => p.Name)
+            return View(await marechaiContext.OrderBy(p => p.Company.Name).ThenBy(p => p.Name)
                                          .Select(p => new ProcessorViewModel
                                           {
                                               Company        = p.Company.Name,
diff --git a/Marechai/Areas/Admin/Controllers/ResolutionsByGpuController.cs b/Marechai/Areas/Admin/Controllers/ResolutionsByGpuController.cs
index 4989fe7d..d9bf5cbe 100644
--- a/Marechai/Areas/Admin/Controllers/ResolutionsByGpuController.cs
+++ b/Marechai/Areas/Admin/Controllers/ResolutionsByGpuController.cs
@@ -14,9 +14,9 @@ namespace Marechai.Areas.Admin.Controllers
     [Authorize]
     public class ResolutionsByGpuController : Controller
     {
-        readonly cicmContext _context;
+        readonly MarechaiContext _context;
 
-        public ResolutionsByGpuController(cicmContext context)
+        public ResolutionsByGpuController(MarechaiContext context)
         {
             _context = context;
         }
@@ -24,9 +24,9 @@ namespace Marechai.Areas.Admin.Controllers
         // GET: ResolutionsByGpu
         public async Task<IActionResult> Index()
         {
-            IIncludableQueryable<ResolutionsByGpu, Resolution> cicmContext =
+            IIncludableQueryable<ResolutionsByGpu, Resolution> marechaiContext =
                 _context.ResolutionsByGpu.Include(r => r.Gpu).Include(r => r.Resolution);
-            return View(await cicmContext.OrderBy(r => r.Gpu.Company.Name).ThenBy(r => r.Gpu.Name)
+            return View(await marechaiContext.OrderBy(r => r.Gpu.Company.Name).ThenBy(r => r.Gpu.Name)
                                          .ThenBy(r => r.Resolution.Chars).ThenBy(r => r.Resolution.Width)
                                          .ThenBy(r => r.Resolution.Height).ThenBy(r => r.Resolution.Colors)
                                          .Select(r => new ResolutionsByGpuViewModel
diff --git a/Marechai/Areas/Admin/Controllers/ResolutionsByScreenController.cs b/Marechai/Areas/Admin/Controllers/ResolutionsByScreenController.cs
index 298e8018..d091e10c 100644
--- a/Marechai/Areas/Admin/Controllers/ResolutionsByScreenController.cs
+++ b/Marechai/Areas/Admin/Controllers/ResolutionsByScreenController.cs
@@ -13,9 +13,9 @@ namespace Marechai.Areas.Admin.Controllers
     [Authorize]
     public class ResolutionsByScreenController : Controller
     {
-        readonly cicmContext _context;
+        readonly MarechaiContext _context;
 
-        public ResolutionsByScreenController(cicmContext context)
+        public ResolutionsByScreenController(MarechaiContext context)
         {
             _context = context;
         }
@@ -23,9 +23,9 @@ namespace Marechai.Areas.Admin.Controllers
         // GET: ResolutionsByScreen
         public async Task<IActionResult> Index()
         {
-            IIncludableQueryable<ResolutionsByScreen, Screen> cicmContext =
+            IIncludableQueryable<ResolutionsByScreen, Screen> marechaiContext =
                 _context.ResolutionsByScreen.Include(r => r.Resolution).Include(r => r.Screen);
-            return View(await cicmContext.OrderBy(r => r.Screen.ToString()).ThenBy(r => r.Resolution.ToString())
+            return View(await marechaiContext.OrderBy(r => r.Screen.ToString()).ThenBy(r => r.Resolution.ToString())
                                          .ToListAsync());
         }
 
diff --git a/Marechai/Areas/Admin/Controllers/ResolutionsController.cs b/Marechai/Areas/Admin/Controllers/ResolutionsController.cs
index 0ac2e58d..07fbc6e6 100644
--- a/Marechai/Areas/Admin/Controllers/ResolutionsController.cs
+++ b/Marechai/Areas/Admin/Controllers/ResolutionsController.cs
@@ -41,9 +41,9 @@ namespace Marechai.Areas.Admin.Controllers
     [Authorize]
     public class ResolutionsController : Controller
     {
-        readonly cicmContext _context;
+        readonly MarechaiContext _context;
 
-        public ResolutionsController(cicmContext context)
+        public ResolutionsController(MarechaiContext context)
         {
             _context = context;
         }
diff --git a/Marechai/Areas/Admin/Controllers/ScreensByMachineController.cs b/Marechai/Areas/Admin/Controllers/ScreensByMachineController.cs
index 25e8b3fe..e0115eb9 100644
--- a/Marechai/Areas/Admin/Controllers/ScreensByMachineController.cs
+++ b/Marechai/Areas/Admin/Controllers/ScreensByMachineController.cs
@@ -14,9 +14,9 @@ namespace Marechai.Areas.Admin.Controllers
     [Authorize]
     public class ScreensByMachineController : Controller
     {
-        readonly cicmContext _context;
+        readonly MarechaiContext _context;
 
-        public ScreensByMachineController(cicmContext context)
+        public ScreensByMachineController(MarechaiContext context)
         {
             _context = context;
         }
@@ -24,9 +24,9 @@ namespace Marechai.Areas.Admin.Controllers
         // GET: ScreensByMachine
         public async Task<IActionResult> Index()
         {
-            IIncludableQueryable<ScreensByMachine, Screen> cicmContext =
+            IIncludableQueryable<ScreensByMachine, Screen> marechaiContext =
                 _context.ScreensByMachine.Include(s => s.Machine).Include(s => s.Screen);
-            return View(await cicmContext.Select(s => new ScreensByMachineViewModel
+            return View(await marechaiContext.Select(s => new ScreensByMachineViewModel
             {
                 Id = s.Id,
                 Screen = s.Screen.NativeResolution != null
diff --git a/Marechai/Areas/Admin/Controllers/ScreensController.cs b/Marechai/Areas/Admin/Controllers/ScreensController.cs
index 3f8a2071..0d5f63a6 100644
--- a/Marechai/Areas/Admin/Controllers/ScreensController.cs
+++ b/Marechai/Areas/Admin/Controllers/ScreensController.cs
@@ -12,9 +12,9 @@ namespace Marechai.Areas.Admin.Controllers
     [Authorize]
     public class ScreensController : Controller
     {
-        readonly cicmContext _context;
+        readonly MarechaiContext _context;
 
-        public ScreensController(cicmContext context)
+        public ScreensController(MarechaiContext context)
         {
             _context = context;
         }
diff --git a/Marechai/Areas/Admin/Controllers/SoundByMachineController.cs b/Marechai/Areas/Admin/Controllers/SoundByMachineController.cs
index 1b7c114f..c33108e7 100644
--- a/Marechai/Areas/Admin/Controllers/SoundByMachineController.cs
+++ b/Marechai/Areas/Admin/Controllers/SoundByMachineController.cs
@@ -14,9 +14,9 @@ namespace Marechai.Areas.Admin.Controllers
     [Authorize]
     public class SoundByMachineController : Controller
     {
-        readonly cicmContext _context;
+        readonly MarechaiContext _context;
 
-        public SoundByMachineController(cicmContext context)
+        public SoundByMachineController(MarechaiContext context)
         {
             _context = context;
         }
@@ -24,9 +24,9 @@ namespace Marechai.Areas.Admin.Controllers
         // GET: SoundByMachine
         public async Task<IActionResult> Index()
         {
-            IIncludableQueryable<SoundByMachine, SoundSynth> cicmContext =
+            IIncludableQueryable<SoundByMachine, SoundSynth> marechaiContext =
                 _context.SoundByMachine.Include(s => s.Machine).Include(s => s.SoundSynth);
-            return View(await cicmContext.OrderBy(s => s.Machine.Name).ThenBy(s => s.SoundSynth.Name)
+            return View(await marechaiContext.OrderBy(s => s.Machine.Name).ThenBy(s => s.SoundSynth.Name)
                                          .Select(s => new SoundByMachineViewModel
                                           {
                                               Id         = s.Id,
diff --git a/Marechai/Areas/Admin/Controllers/SoundByOwnedMachineController.cs b/Marechai/Areas/Admin/Controllers/SoundByOwnedMachineController.cs
index 5931f555..6e4f0ec2 100644
--- a/Marechai/Areas/Admin/Controllers/SoundByOwnedMachineController.cs
+++ b/Marechai/Areas/Admin/Controllers/SoundByOwnedMachineController.cs
@@ -14,9 +14,9 @@ namespace Marechai.Areas.Admin.Controllers
     [Authorize]
     public class SoundByOwnedMachineController : Controller
     {
-        readonly cicmContext _context;
+        readonly MarechaiContext _context;
 
-        public SoundByOwnedMachineController(cicmContext context)
+        public SoundByOwnedMachineController(MarechaiContext context)
         {
             _context = context;
         }
@@ -24,9 +24,9 @@ namespace Marechai.Areas.Admin.Controllers
         // GET: SoundByOwnedMachine
         public async Task<IActionResult> Index()
         {
-            IIncludableQueryable<SoundByOwnedMachine, SoundSynth> cicmContext =
+            IIncludableQueryable<SoundByOwnedMachine, SoundSynth> marechaiContext =
                 _context.SoundByOwnedMachine.Include(s => s.OwnedMachine).Include(s => s.SoundSynth);
-            return View(await cicmContext.OrderBy(s => s.OwnedMachine.Machine.Company.Name)
+            return View(await marechaiContext.OrderBy(s => s.OwnedMachine.Machine.Company.Name)
                                          .ThenBy(s => s.OwnedMachine.Machine.Name)
                                          .ThenBy(s => s.OwnedMachine.User.UserName).ThenBy(s => s.SoundSynth.Name)
                                          .Select(s => new SoundByMachineViewModel
diff --git a/Marechai/Areas/Admin/Controllers/SoundSynthsController.cs b/Marechai/Areas/Admin/Controllers/SoundSynthsController.cs
index c39465de..31ca4997 100644
--- a/Marechai/Areas/Admin/Controllers/SoundSynthsController.cs
+++ b/Marechai/Areas/Admin/Controllers/SoundSynthsController.cs
@@ -44,9 +44,9 @@ namespace Marechai.Areas.Admin.Controllers
     [Authorize]
     public class SoundSynthsController : Controller
     {
-        readonly cicmContext _context;
+        readonly MarechaiContext _context;
 
-        public SoundSynthsController(cicmContext context)
+        public SoundSynthsController(MarechaiContext context)
         {
             _context = context;
         }
@@ -54,8 +54,8 @@ namespace Marechai.Areas.Admin.Controllers
         // GET: Admin/SoundSynths
         public async Task<IActionResult> Index()
         {
-            IIncludableQueryable<SoundSynth, Company> cicmContext = _context.SoundSynths.Include(s => s.Company);
-            return View(await cicmContext.OrderBy(s => s.Company).ThenBy(s => s.Name).ThenBy(s => s.ModelCode)
+            IIncludableQueryable<SoundSynth, Company> marechaiContext = _context.SoundSynths.Include(s => s.Company);
+            return View(await marechaiContext.OrderBy(s => s.Company).ThenBy(s => s.Name).ThenBy(s => s.ModelCode)
                                          .Select(s => new SoundSynthViewModel
                                           {
                                               Company    = s.Company.Name,
diff --git a/Marechai/Areas/Admin/Controllers/StorageByMachinesController.cs b/Marechai/Areas/Admin/Controllers/StorageByMachinesController.cs
index 42a41e95..1c77c26a 100644
--- a/Marechai/Areas/Admin/Controllers/StorageByMachinesController.cs
+++ b/Marechai/Areas/Admin/Controllers/StorageByMachinesController.cs
@@ -44,9 +44,9 @@ namespace Marechai.Areas.Admin.Controllers
     [Authorize]
     public class StorageByMachinesController : Controller
     {
-        readonly cicmContext _context;
+        readonly MarechaiContext _context;
 
-        public StorageByMachinesController(cicmContext context)
+        public StorageByMachinesController(MarechaiContext context)
         {
             _context = context;
         }
@@ -54,9 +54,9 @@ namespace Marechai.Areas.Admin.Controllers
         // GET: Admin/StorageByMachines
         public async Task<IActionResult> Index()
         {
-            IIncludableQueryable<StorageByMachine, Machine> cicmContext =
+            IIncludableQueryable<StorageByMachine, Machine> marechaiContext =
                 _context.StorageByMachine.Include(s => s.Machine);
-            return View(await cicmContext.OrderBy(s => s.Machine.Company.Name).ThenBy(s => s.Machine.Name)
+            return View(await marechaiContext.OrderBy(s => s.Machine.Company.Name).ThenBy(s => s.Machine.Name)
                                          .Select(s => new StorageByMachineViewModel
                                           {
                                               Id        = s.Id,
diff --git a/Marechai/Areas/Admin/Controllers/StorageByOwnedMachinesController.cs b/Marechai/Areas/Admin/Controllers/StorageByOwnedMachinesController.cs
index 4ed6411a..a2a72a02 100644
--- a/Marechai/Areas/Admin/Controllers/StorageByOwnedMachinesController.cs
+++ b/Marechai/Areas/Admin/Controllers/StorageByOwnedMachinesController.cs
@@ -44,9 +44,9 @@ namespace Marechai.Areas.Admin.Controllers
     [Authorize]
     public class StorageByOwnedMachinesController : Controller
     {
-        readonly cicmContext _context;
+        readonly MarechaiContext _context;
 
-        public StorageByOwnedMachinesController(cicmContext context)
+        public StorageByOwnedMachinesController(MarechaiContext context)
         {
             _context = context;
         }
@@ -54,9 +54,9 @@ namespace Marechai.Areas.Admin.Controllers
         // GET: Admin/StorageByOwnedMachines
         public async Task<IActionResult> Index()
         {
-            IIncludableQueryable<StorageByOwnedMachine, OwnedMachine> cicmContext =
+            IIncludableQueryable<StorageByOwnedMachine, OwnedMachine> marechaiContext =
                 _context.StorageByOwnedMachine.Include(s => s.OwnedMachine);
-            return View(await cicmContext.OrderBy(s => s.OwnedMachine.Machine.Company.Name)
+            return View(await marechaiContext.OrderBy(s => s.OwnedMachine.Machine.Company.Name)
                                          .ThenBy(s => s.OwnedMachine.Machine.Name)
                                          .ThenBy(s => s.OwnedMachine.User.UserName)
                                          .Select(s => new StorageByMachineViewModel
diff --git a/Marechai/Areas/Api/Controllers/CompaniesController.cs b/Marechai/Areas/Api/Controllers/CompaniesController.cs
index 59c1d4d7..f7c7fc78 100644
--- a/Marechai/Areas/Api/Controllers/CompaniesController.cs
+++ b/Marechai/Areas/Api/Controllers/CompaniesController.cs
@@ -39,9 +39,9 @@ namespace Marechai.Areas.Api.Controllers
     [ApiController]
     public class CompaniesController : ControllerBase
     {
-        readonly cicmContext _context;
+        readonly MarechaiContext _context;
 
-        public CompaniesController(cicmContext context)
+        public CompaniesController(MarechaiContext context)
         {
             _context = context;
         }
diff --git a/Marechai/Areas/Api/Controllers/MachinesController.cs b/Marechai/Areas/Api/Controllers/MachinesController.cs
index 524d72eb..73e2e505 100644
--- a/Marechai/Areas/Api/Controllers/MachinesController.cs
+++ b/Marechai/Areas/Api/Controllers/MachinesController.cs
@@ -39,9 +39,9 @@ namespace Marechai.Areas.Api.Controllers
     [ApiController]
     public class MachinesController : ControllerBase
     {
-        readonly cicmContext _context;
+        readonly MarechaiContext _context;
 
-        public MachinesController(cicmContext context)
+        public MachinesController(MarechaiContext context)
         {
             _context = context;
         }
diff --git a/Marechai/Areas/Api/Controllers/NewsController.cs b/Marechai/Areas/Api/Controllers/NewsController.cs
index dc1d2d44..26f129d7 100644
--- a/Marechai/Areas/Api/Controllers/NewsController.cs
+++ b/Marechai/Areas/Api/Controllers/NewsController.cs
@@ -39,9 +39,9 @@ namespace Marechai.Areas.Api.Controllers
     [ApiController]
     public class NewsController : ControllerBase
     {
-        readonly cicmContext _context;
+        readonly MarechaiContext _context;
 
-        public NewsController(cicmContext context)
+        public NewsController(MarechaiContext context)
         {
             _context = context;
         }
diff --git a/Marechai/Areas/Identity/IdentityHostingStartup.cs b/Marechai/Areas/Identity/IdentityHostingStartup.cs
index 4a6b4529..36c127d3 100644
--- a/Marechai/Areas/Identity/IdentityHostingStartup.cs
+++ b/Marechai/Areas/Identity/IdentityHostingStartup.cs
@@ -44,7 +44,7 @@ namespace Marechai.Areas.Identity
             builder.ConfigureServices((context, services) =>
             {
                 services.AddDefaultIdentity<ApplicationUser>()
-                        .AddEntityFrameworkStores<cicmContext>();
+                        .AddEntityFrameworkStores<MarechaiContext>();
             });
         }
     }
diff --git a/Marechai/Controllers/CompanyController.cs b/Marechai/Controllers/CompanyController.cs
index c3f42bf2..50a8102d 100644
--- a/Marechai/Controllers/CompanyController.cs
+++ b/Marechai/Controllers/CompanyController.cs
@@ -39,10 +39,10 @@ namespace Marechai.Controllers
 {
     public class CompanyController : Controller
     {
-        readonly cicmContext         _context;
+        readonly MarechaiContext         _context;
         readonly IHostingEnvironment hostingEnvironment;
 
-        public CompanyController(IHostingEnvironment env, cicmContext context)
+        public CompanyController(IHostingEnvironment env, MarechaiContext context)
         {
             hostingEnvironment = env;
             _context           = context;
diff --git a/Marechai/Controllers/ComputerController.cs b/Marechai/Controllers/ComputerController.cs
index 8a69ef4a..4047bae9 100644
--- a/Marechai/Controllers/ComputerController.cs
+++ b/Marechai/Controllers/ComputerController.cs
@@ -38,10 +38,10 @@ namespace Marechai.Controllers
 {
     public class ComputerController : Controller
     {
-        readonly cicmContext         _context;
+        readonly MarechaiContext         _context;
         readonly IHostingEnvironment hostingEnvironment;
 
-        public ComputerController(IHostingEnvironment env, cicmContext context)
+        public ComputerController(IHostingEnvironment env, MarechaiContext context)
         {
             hostingEnvironment = env;
             _context           = context;
diff --git a/Marechai/Controllers/ConsoleController.cs b/Marechai/Controllers/ConsoleController.cs
index 93002ff9..498fe2c8 100644
--- a/Marechai/Controllers/ConsoleController.cs
+++ b/Marechai/Controllers/ConsoleController.cs
@@ -38,10 +38,10 @@ namespace Marechai.Controllers
 {
     public class ConsoleController : Controller
     {
-        readonly cicmContext         _context;
+        readonly MarechaiContext         _context;
         readonly IHostingEnvironment hostingEnvironment;
 
-        public ConsoleController(IHostingEnvironment env, cicmContext context)
+        public ConsoleController(IHostingEnvironment env, MarechaiContext context)
         {
             hostingEnvironment = env;
             _context           = context;
diff --git a/Marechai/Controllers/HomeController.cs b/Marechai/Controllers/HomeController.cs
index 901c671c..606155fc 100644
--- a/Marechai/Controllers/HomeController.cs
+++ b/Marechai/Controllers/HomeController.cs
@@ -41,10 +41,10 @@ namespace Marechai.Controllers
 {
     public class HomeController : Controller
     {
-        readonly cicmContext         _context;
+        readonly MarechaiContext         _context;
         readonly IHostingEnvironment hostingEnvironment;
 
-        public HomeController(IHostingEnvironment env, cicmContext context)
+        public HomeController(IHostingEnvironment env, MarechaiContext context)
         {
             hostingEnvironment = env;
             _context           = context;
diff --git a/Marechai/Controllers/MachineController.cs b/Marechai/Controllers/MachineController.cs
index 799ec842..af0e9982 100644
--- a/Marechai/Controllers/MachineController.cs
+++ b/Marechai/Controllers/MachineController.cs
@@ -37,10 +37,10 @@ namespace Marechai.Controllers
 {
     public class MachineController : Controller
     {
-        readonly cicmContext         _context;
+        readonly MarechaiContext         _context;
         readonly IHostingEnvironment hostingEnvironment;
 
-        public MachineController(IHostingEnvironment env, cicmContext context)
+        public MachineController(IHostingEnvironment env, MarechaiContext context)
         {
             hostingEnvironment = env;
             _context           = context;
diff --git a/Marechai/Helpers/AddPhoto.cs b/Marechai/Helpers/AddPhoto.cs
index 2edf9688..3663fc3c 100644
--- a/Marechai/Helpers/AddPhoto.cs
+++ b/Marechai/Helpers/AddPhoto.cs
@@ -213,7 +213,7 @@ namespace Marechai.Helpers
             return photo;
         }
 
-        public static void ImportPhotos(cicmContext context)
+        public static void ImportPhotos(MarechaiContext context)
         {
             if(!Directory.Exists("wwwroot/assets/photos/computers") &&
                !Directory.Exists("wwwroot/assets/photos/consoles")) return;
diff --git a/Marechai/Helpers/Iso639.cs b/Marechai/Helpers/Iso639.cs
index d100ca73..db71c6d7 100644
--- a/Marechai/Helpers/Iso639.cs
+++ b/Marechai/Helpers/Iso639.cs
@@ -11,7 +11,7 @@ namespace Marechai.Helpers
     {
         // TODO: Changes file
         // Data files can be found in https://iso639-3.sil.org/code_tables/download_tables
-        internal static void Import(cicmContext context)
+        internal static void Import(MarechaiContext context)
         {
             if(!Directory.Exists("iso639")) return;
 
diff --git a/Marechai/Helpers/SvgRender.cs b/Marechai/Helpers/SvgRender.cs
index fb83ed9f..29c313dd 100644
--- a/Marechai/Helpers/SvgRender.cs
+++ b/Marechai/Helpers/SvgRender.cs
@@ -103,7 +103,7 @@ namespace Marechai.Helpers
             }
         }
 
-        public static void ImportCompanyLogos(cicmContext context)
+        public static void ImportCompanyLogos(MarechaiContext context)
         {
             if(!Directory.Exists("wwwroot/assets/incoming")) return;
 
diff --git a/Marechai/Program.cs b/Marechai/Program.cs
index 221ea2fc..924f5e9a 100644
--- a/Marechai/Program.cs
+++ b/Marechai/Program.cs
@@ -139,7 +139,7 @@ namespace Marechai
                 {
                     start = DateTime.Now;
                     Console.WriteLine("\u001b[31;1mUpdating database with Entity Framework...\u001b[0m");
-                    cicmContext context = services.GetRequiredService<cicmContext>();
+                    MarechaiContext context = services.GetRequiredService<MarechaiContext>();
                     context.Database.Migrate();
                     end = DateTime.Now;
                     Console.WriteLine("\u001b[31;1mTook \u001b[32;1m{0} seconds\u001b[31;1m...\u001b[0m",
diff --git a/Marechai/Startup.cs b/Marechai/Startup.cs
index c04891e3..de1eed1e 100644
--- a/Marechai/Startup.cs
+++ b/Marechai/Startup.cs
@@ -58,7 +58,7 @@ namespace Marechai
                 options.MinimumSameSitePolicy = SameSiteMode.None;
             });
             #warning To protect potentially sensitive information in your connection string, you should move it out of source code. See http://go.microsoft.com/fwlink/?LinkId=723263 for guidance on storing connection strings.
-            services.AddDbContext<cicmContext>(options => options
+            services.AddDbContext<MarechaiContext>(options => options
                                                          .UseLazyLoadingProxies()
                                                          .UseMySql("server=localhost;port=3306;user=cicm;password=cicmpass;database=cicm;TreatTinyAsBoolean=false"));