7 files changed, 14 insertions, 18 deletions
diff --git a/Timeline/Entities/DatabaseContext.cs b/Timeline/Entities/DatabaseContext.cs
index ffb6158a..738440b2 100644
--- a/Timeline/Entities/DatabaseContext.cs
+++ b/Timeline/Entities/DatabaseContext.cs
@@ -13,13 +13,13 @@ namespace Timeline.Entities
         [System.Diagnostics.CodeAnalysis.SuppressMessage("Design", "CA1062:Validate arguments of public methods")]
         protected override void OnModelCreating(ModelBuilder modelBuilder)
         {
-            modelBuilder.Entity<User>().Property(e => e.Version).HasDefaultValue(0);
-            modelBuilder.Entity<User>().HasIndex(e => e.Name).IsUnique();
+            modelBuilder.Entity<UserEntity>().Property(e => e.Version).HasDefaultValue(0);
+            modelBuilder.Entity<UserEntity>().HasIndex(e => e.Name).IsUnique();
         }
 
-        public DbSet<User> Users { get; set; } = default!;
-        public DbSet<UserAvatar> UserAvatars { get; set; } = default!;
-        public DbSet<UserDetail> UserDetails { get; set; } = default!;
+        public DbSet<UserEntity> Users { get; set; } = default!;
+        public DbSet<UserAvatarEntity> UserAvatars { get; set; } = default!;
+        public DbSet<UserDetailEntity> UserDetails { get; set; } = default!;
         public DbSet<TimelineEntity> Timelines { get; set; } = default!;
         public DbSet<TimelinePostEntity> TimelinePosts { get; set; } = default!;
         public DbSet<TimelineMemberEntity> TimelineMembers { get; set; } = default!;
diff --git a/Timeline/Entities/TimelineEntity.cs b/Timeline/Entities/TimelineEntity.cs
index 9cacfcae..2bfd6107 100644
--- a/Timeline/Entities/TimelineEntity.cs
+++ b/Timeline/Entities/TimelineEntity.cs
@@ -26,7 +26,7 @@ namespace Timeline.Entities
         public long OwnerId { get; set; }
 
         [ForeignKey(nameof(OwnerId))]
-        public User Owner { get; set; } = default!;
+        public UserEntity Owner { get; set; } = default!;
 
         [Column("visibility")]
         public TimelineVisibility Visibility { get; set; }
diff --git a/Timeline/Entities/TimelineMemberEntity.cs b/Timeline/Entities/TimelineMemberEntity.cs
index dbe861bd..e76f2099 100644
--- a/Timeline/Entities/TimelineMemberEntity.cs
+++ b/Timeline/Entities/TimelineMemberEntity.cs
@@ -13,7 +13,7 @@ namespace Timeline.Entities
         public long UserId { get; set; }
 
         [ForeignKey(nameof(UserId))]
-        public User User { get; set; } = default!;
+        public UserEntity User { get; set; } = default!;
 
         [Column("timeline")]
         public long TimelineId { get; set; }
diff --git a/Timeline/Entities/TimelinePostEntity.cs b/Timeline/Entities/TimelinePostEntity.cs
index efef3ab5..a615c61f 100644
--- a/Timeline/Entities/TimelinePostEntity.cs
+++ b/Timeline/Entities/TimelinePostEntity.cs
@@ -20,7 +20,7 @@ namespace Timeline.Entities
         public long AuthorId { get; set; }
 
         [ForeignKey(nameof(AuthorId))]
-        public User Author { get; set; } = default!;
+        public UserEntity Author { get; set; } = default!;
 
         [Column("content")]
         public string? Content { get; set; }
diff --git a/Timeline/Entities/UserAvatar.cs b/Timeline/Entities/UserAvatarEntity.cs
index 114246f3..eed819bc 100644
--- a/Timeline/Entities/UserAvatar.cs
+++ b/Timeline/Entities/UserAvatarEntity.cs
@@ -6,7 +6,7 @@ namespace Timeline.Entities
 {
     [System.Diagnostics.CodeAnalysis.SuppressMessage("Performance", "CA1819:Properties should not return arrays", Justification = "This is data base entity.")]
     [Table("user_avatars")]
-    public class UserAvatar
+    public class UserAvatarEntity
     {
         [Column("id"), Key, DatabaseGenerated(DatabaseGeneratedOption.Identity)]
         public long Id { get; set; }
diff --git a/Timeline/Entities/UserDetail.cs b/Timeline/Entities/UserDetailEntity.cs
index 45f87e2b..7a525294 100644
--- a/Timeline/Entities/UserDetail.cs
+++ b/Timeline/Entities/UserDetailEntity.cs
@@ -1,14 +1,10 @@
-using System;
-using System.Collections.Generic;
-using System.ComponentModel.DataAnnotations;
+using System.ComponentModel.DataAnnotations;
 using System.ComponentModel.DataAnnotations.Schema;
-using System.Linq;
-using System.Threading.Tasks;
 
 namespace Timeline.Entities
 {
     [Table("user_details")]
-    public class UserDetail
+    public class UserDetailEntity
     {
         [Column("id"), Key, DatabaseGenerated(DatabaseGeneratedOption.Identity)]
         public long Id { get; set; }
diff --git a/Timeline/Entities/User.cs b/Timeline/Entities/UserEntity.cs
index e725a69a..83ef5621 100644
--- a/Timeline/Entities/User.cs
+++ b/Timeline/Entities/UserEntity.cs
@@ -12,7 +12,7 @@ namespace Timeline.Entities
 
     [System.Diagnostics.CodeAnalysis.SuppressMessage("Usage", "CA2227:Collection properties should be read only", Justification = "This is an entity class.")]
     [Table("users")]
-    public class User
+    public class UserEntity
     {
         [Column("id"), Key, DatabaseGenerated(DatabaseGeneratedOption.Identity)]
         public long Id { get; set; }
@@ -29,9 +29,9 @@ namespace Timeline.Entities
         [Column("version"), Required]
         public long Version { get; set; }
 
-        public UserAvatar? Avatar { get; set; }
+        public UserAvatarEntity? Avatar { get; set; }
 
-        public UserDetail? Detail { get; set; }
+        public UserDetailEntity? Detail { get; set; }
 
         public List<TimelineEntity> Timelines { get; set; } = default!;