diff --git a/src/CSharp/EasyMicroservices.Cores.Database/Database/Entities/DateTimeEntity.cs b/src/CSharp/EasyMicroservices.Cores.Database/Database/Schemas/DateTimeSchema.cs
similarity index 77%
rename from src/CSharp/EasyMicroservices.Cores.Database/Database/Entities/DateTimeEntity.cs
rename to src/CSharp/EasyMicroservices.Cores.Database/Database/Schemas/DateTimeSchema.cs
index eddda06..bb30137 100644
--- a/src/CSharp/EasyMicroservices.Cores.Database/Database/Entities/DateTimeEntity.cs
+++ b/src/CSharp/EasyMicroservices.Cores.Database/Database/Schemas/DateTimeSchema.cs
@@ -1,12 +1,12 @@
 using EasyMicroservices.Cores.Interfaces;
 using System;
 
-namespace EasyMicroservices.Cores.Database.Entities
+namespace EasyMicroservices.Cores.Database.Schemas
 {
     /// <summary>
     /// 
     /// </summary>
-    public class DateTimeEntity : IDateTimeSchema
+    public class DateTimeSchema : IDateTimeSchema
     {
         /// <summary>
         /// 
diff --git a/src/CSharp/EasyMicroservices.Cores.Database/Database/Entities/FullAbilityIdEntity.cs b/src/CSharp/EasyMicroservices.Cores.Database/Database/Schemas/FullAbilityIdSchema.cs
similarity index 69%
rename from src/CSharp/EasyMicroservices.Cores.Database/Database/Entities/FullAbilityIdEntity.cs
rename to src/CSharp/EasyMicroservices.Cores.Database/Database/Schemas/FullAbilityIdSchema.cs
index 6f4ed09..c7b0b26 100644
--- a/src/CSharp/EasyMicroservices.Cores.Database/Database/Entities/FullAbilityIdEntity.cs
+++ b/src/CSharp/EasyMicroservices.Cores.Database/Database/Schemas/FullAbilityIdSchema.cs
@@ -1,12 +1,12 @@
 using EasyMicroservices.Cores.Interfaces;
 
-namespace EasyMicroservices.Cores.Database.Entities
+namespace EasyMicroservices.Cores.Database.Schemas
 {
     /// <summary>
     /// 
     /// </summary>
     /// <typeparam name="TId"></typeparam>
-    public class FullAbilityIdEntity<TId> : FullAbilityEntity, IIdSchema<TId>
+    public class FullAbilityIdSchema<TId> : FullAbilitySchema, IIdSchema<TId>
     {
         /// <summary>
         /// 
diff --git a/src/CSharp/EasyMicroservices.Cores.Database/Database/Entities/FullAbilityEntity.cs b/src/CSharp/EasyMicroservices.Cores.Database/Database/Schemas/FullAbilitySchema.cs
similarity index 86%
rename from src/CSharp/EasyMicroservices.Cores.Database/Database/Entities/FullAbilityEntity.cs
rename to src/CSharp/EasyMicroservices.Cores.Database/Database/Schemas/FullAbilitySchema.cs
index f4b9ed9..3bbc63c 100644
--- a/src/CSharp/EasyMicroservices.Cores.Database/Database/Entities/FullAbilityEntity.cs
+++ b/src/CSharp/EasyMicroservices.Cores.Database/Database/Schemas/FullAbilitySchema.cs
@@ -3,12 +3,12 @@
 using System.Collections.Generic;
 using System.Text;
 
-namespace EasyMicroservices.Cores.Database.Entities
+namespace EasyMicroservices.Cores.Database.Schemas
 {
     /// <summary>
     /// 
     /// </summary>
-    public class FullAbilityEntity : IUniqueIdentitySchema, ISoftDeleteSchema, IDateTimeSchema
+    public class FullAbilitySchema : IUniqueIdentitySchema, ISoftDeleteSchema, IDateTimeSchema
     {
         /// <summary>
         /// 
diff --git a/src/CSharp/EasyMicroservices.Cores.Database/Database/Entities/LongIdEntity.cs b/src/CSharp/EasyMicroservices.Cores.Database/Database/Schemas/IdSchema.cs
similarity index 54%
rename from src/CSharp/EasyMicroservices.Cores.Database/Database/Entities/LongIdEntity.cs
rename to src/CSharp/EasyMicroservices.Cores.Database/Database/Schemas/IdSchema.cs
index d924fcf..0de191b 100644
--- a/src/CSharp/EasyMicroservices.Cores.Database/Database/Entities/LongIdEntity.cs
+++ b/src/CSharp/EasyMicroservices.Cores.Database/Database/Schemas/IdSchema.cs
@@ -1,15 +1,15 @@
 using EasyMicroservices.Cores.Interfaces;
 
-namespace EasyMicroservices.Cores.Database.Entities
+namespace EasyMicroservices.Cores.Database.Schemas
 {
     /// <summary>
     /// 
     /// </summary>
-    public class LongIdEntity : IIdSchema<long>
+    public class IdSchema<TId> : IIdSchema<TId>
     {
         /// <summary>
         /// 
         /// </summary>
-        public long Id { get; set; }
+        public TId Id { get; set; }
     }
 }
diff --git a/src/CSharp/EasyMicroservices.Cores.Database/Database/Schemas/LongIdSchema.cs b/src/CSharp/EasyMicroservices.Cores.Database/Database/Schemas/LongIdSchema.cs
new file mode 100644
index 0000000..b7e1d79
--- /dev/null
+++ b/src/CSharp/EasyMicroservices.Cores.Database/Database/Schemas/LongIdSchema.cs
@@ -0,0 +1,12 @@
+using EasyMicroservices.Cores.Interfaces;
+
+namespace EasyMicroservices.Cores.Database.Schemas
+{
+    /// <summary>
+    /// 
+    /// </summary>
+    public class LongIdSchema : IdSchema<long>
+    {
+
+    }
+}
diff --git a/src/CSharp/EasyMicroservices.Cores.Database/Database/Entities/SoftDeleteEntity.cs b/src/CSharp/EasyMicroservices.Cores.Database/Database/Schemas/SoftDeleteSchema.cs
similarity index 76%
rename from src/CSharp/EasyMicroservices.Cores.Database/Database/Entities/SoftDeleteEntity.cs
rename to src/CSharp/EasyMicroservices.Cores.Database/Database/Schemas/SoftDeleteSchema.cs
index aa3f7f0..202c8d8 100644
--- a/src/CSharp/EasyMicroservices.Cores.Database/Database/Entities/SoftDeleteEntity.cs
+++ b/src/CSharp/EasyMicroservices.Cores.Database/Database/Schemas/SoftDeleteSchema.cs
@@ -1,12 +1,12 @@
 using EasyMicroservices.Cores.Interfaces;
 using System;
 
-namespace EasyMicroservices.Cores.Database.Entities
+namespace EasyMicroservices.Cores.Database.Schemas
 {
     /// <summary>
     /// 
     /// </summary>
-    public class SoftDeleteEntity : ISoftDeleteSchema
+    public class SoftDeleteSchema : ISoftDeleteSchema
     {
         /// <summary>
         /// 
diff --git a/src/CSharp/EasyMicroservices.Cores.Database/EasyMicroservices.Cores.Database.csproj b/src/CSharp/EasyMicroservices.Cores.Database/EasyMicroservices.Cores.Database.csproj
index 31d8ec7..0a36b7f 100644
--- a/src/CSharp/EasyMicroservices.Cores.Database/EasyMicroservices.Cores.Database.csproj
+++ b/src/CSharp/EasyMicroservices.Cores.Database/EasyMicroservices.Cores.Database.csproj
@@ -24,6 +24,7 @@
   </ItemGroup>
 
   <ItemGroup>
+    <Folder Include="Database\Entities\" />
     <Folder Include="Database\ReadableLogics\" />
     <Folder Include="Database\WritableLogics\" />
   </ItemGroup>
diff --git a/src/CSharp/EasyMicroservices.Cores.Tests/DatabaseLogics/Database/Entities/ProfileEntity.cs b/src/CSharp/EasyMicroservices.Cores.Tests/DatabaseLogics/Database/Entities/ProfileEntity.cs
index 19f81ed..bf925a6 100644
--- a/src/CSharp/EasyMicroservices.Cores.Tests/DatabaseLogics/Database/Entities/ProfileEntity.cs
+++ b/src/CSharp/EasyMicroservices.Cores.Tests/DatabaseLogics/Database/Entities/ProfileEntity.cs
@@ -1,8 +1,8 @@
-using EasyMicroservices.Cores.Database.Entities;
+using EasyMicroservices.Cores.Database.Schemas;
 
 namespace EasyMicroservices.Cores.Tests.DatabaseLogics.Database.Entities
 {
-    public class ProfileEntity : FullAbilityIdEntity<long>
+    public class ProfileEntity : FullAbilityIdSchema<long>
     {
         public string FirstName { get; set; }
         public string LastName { get; set; }