diff --git a/Core.Thalos.BuildingBlocks/Adapters/ModuleAdapter.cs b/Core.Thalos.BuildingBlocks/Adapters/ModuleAdapter.cs
index c82e9eb..06dd20c 100644
--- a/Core.Thalos.BuildingBlocks/Adapters/ModuleAdapter.cs
+++ b/Core.Thalos.BuildingBlocks/Adapters/ModuleAdapter.cs
@@ -4,6 +4,7 @@
 // </copyright>
 // ***********************************************************************
 
+using Core.Blueprint.Mongo;
 using Core.Thalos.Adapters.Common.Enums;
 using MongoDB.Bson;
 using MongoDB.Bson.Serialization.Attributes;
@@ -14,6 +15,7 @@ namespace Core.Thalos.Adapters
     /// <summary>
     /// Adapter for representing a module.
     /// </summary>
+    [CollectionAttributeName("Modules")]
     public class ModuleAdapter : Document
     {
         /// <summary>
diff --git a/Core.Thalos.BuildingBlocks/Adapters/PermissionAdapter.cs b/Core.Thalos.BuildingBlocks/Adapters/PermissionAdapter.cs
index a795e18..3e58bc8 100644
--- a/Core.Thalos.BuildingBlocks/Adapters/PermissionAdapter.cs
+++ b/Core.Thalos.BuildingBlocks/Adapters/PermissionAdapter.cs
@@ -4,8 +4,8 @@
 // </copyright>
 // ***********************************************************************
 
+using Core.Blueprint.Mongo;
 using Core.Thalos.Adapters.Common.Constants;
-using Core.Thalos.Adapters.Common.Enums;
 using MongoDB.Bson;
 using MongoDB.Bson.Serialization.Attributes;
 using System.Text.Json.Serialization;
@@ -15,6 +15,7 @@ namespace Core.Thalos.Adapters
     /// <summary>
     /// Adapter for representing a permission.
     /// </summary>
+    [CollectionAttributeName("Permissions")]
     public class PermissionAdapter : Document
     {
         /// <summary>
diff --git a/Core.Thalos.BuildingBlocks/Adapters/RoleAdapter.cs b/Core.Thalos.BuildingBlocks/Adapters/RoleAdapter.cs
index 37ba5c6..a6c986c 100644
--- a/Core.Thalos.BuildingBlocks/Adapters/RoleAdapter.cs
+++ b/Core.Thalos.BuildingBlocks/Adapters/RoleAdapter.cs
@@ -4,6 +4,7 @@
 // </copyright>
 // ***********************************************************************
 
+using Core.Blueprint.Mongo;
 using Core.Thalos.Adapters.Common.Enums;
 using MongoDB.Bson;
 using MongoDB.Bson.Serialization.Attributes;
@@ -14,6 +15,7 @@ namespace Core.Thalos.Adapters
     /// <summary>
     /// Adapter representing a role.
     /// </summary>
+    [CollectionAttributeName("Roles")]
     public class RoleAdapter : Document
     {
         /// <summary>
diff --git a/Core.Thalos.BuildingBlocks/Adapters/UserAdapter.cs b/Core.Thalos.BuildingBlocks/Adapters/UserAdapter.cs
index e1c4158..116544c 100644
--- a/Core.Thalos.BuildingBlocks/Adapters/UserAdapter.cs
+++ b/Core.Thalos.BuildingBlocks/Adapters/UserAdapter.cs
@@ -3,7 +3,7 @@
 //     AgileWebs
 // </copyright>
 // ***********************************************************************
-using Core.Thalos.Adapters.Common.Enums;
+using Core.Blueprint.Mongo;
 using MongoDB.Bson;
 using MongoDB.Bson.Serialization.Attributes;
 using System.Text.Json.Serialization;
@@ -13,6 +13,7 @@ namespace Core.Thalos.Adapters
     /// <summary>
     /// Adapter representing a user.
     /// </summary>
+    [CollectionAttributeName("Users")]
     public class UserAdapter : Document
     {
         /// <summary>
diff --git a/Core.Thalos.BuildingBlocks/Common/Enums/ApplicationsEnum.cs b/Core.Thalos.BuildingBlocks/Common/Enums/ApplicationsEnum.cs
index 045b391..b1dac37 100644
--- a/Core.Thalos.BuildingBlocks/Common/Enums/ApplicationsEnum.cs
+++ b/Core.Thalos.BuildingBlocks/Common/Enums/ApplicationsEnum.cs
@@ -15,28 +15,13 @@ namespace Core.Thalos.Adapters.Common.Enums
     public enum ApplicationsEnum
     {
         /// <summary>
-        /// LSA Web Portal application.
+        /// Thalos application.
         /// </summary>
-        LSAWebPortal = 0,
+        Thalos = 0,
 
         /// <summary>
-        /// Customer DashBoard application.
+        /// DreamViewer application.
         /// </summary>
-        CustomerDashboard = 1,
-
-        /// <summary>
-        /// Discover application.
-        /// </summary>
-        Discover = 2,
-
-        /// <summary>
-        /// LSA Mobile application.
-        /// </summary>
-        LSAMobile = 3,
-
-        /// <summary>
-        /// BluePrint application.
-        /// </summary>
-        BluePrint = 4,
+        DreamViewer = 1,
     }
 }