diff --git a/CheckDrive.Api/CheckDrive.Api/Controllers/Reviews/DispatcherReviewsController.cs b/CheckDrive.Api/CheckDrive.Api/Controllers/Reviews/DispatcherReviewsController.cs
index 42a7ee9..dae6d5a 100644
--- a/CheckDrive.Api/CheckDrive.Api/Controllers/Reviews/DispatcherReviewsController.cs
+++ b/CheckDrive.Api/CheckDrive.Api/Controllers/Reviews/DispatcherReviewsController.cs
@@ -21,9 +21,9 @@ public async Task<ActionResult<DispatcherReviewDto>> CreateAsync(
         [FromRoute] int dispatcherId,
         [FromBody] CreateDispatcherReviewDto review)
     {
-        if (review.DispatcherId != dispatcherId)
+        if (review.ReviewerId != dispatcherId)
         {
-            return BadRequest($"Route id: {dispatcherId} does not match with body id: {review.DispatcherId}.");
+            return BadRequest($"Route id: {dispatcherId} does not match with body id: {review.ReviewerId}.");
         }
 
         var createdReview = await reviewService.CreateAsync(review);
diff --git a/CheckDrive.Api/CheckDrive.Api/Controllers/Reviews/DoctorReviewsController.cs b/CheckDrive.Api/CheckDrive.Api/Controllers/Reviews/DoctorReviewsController.cs
index 1e08686..710644c 100644
--- a/CheckDrive.Api/CheckDrive.Api/Controllers/Reviews/DoctorReviewsController.cs
+++ b/CheckDrive.Api/CheckDrive.Api/Controllers/Reviews/DoctorReviewsController.cs
@@ -21,9 +21,9 @@ public async Task<ActionResult<DoctorReviewDto>> CreateReview(
         [FromRoute] int doctorId,
         [FromBody] CreateDoctorReviewDto review)
     {
-        if (doctorId != review.DoctorId)
+        if (doctorId != review.ReviewerId)
         {
-            return BadRequest($"Route id: {doctorId} does not match with body id: {review.DoctorId}.");
+            return BadRequest($"Route id: {doctorId} does not match with body id: {review.ReviewerId}.");
         }
 
         var createdReview = await reviewService.CreateAsync(review);
diff --git a/CheckDrive.Api/CheckDrive.Api/Controllers/Reviews/MechanicAcceptancesController.cs b/CheckDrive.Api/CheckDrive.Api/Controllers/Reviews/MechanicAcceptancesController.cs
index 5437c95..9b80dbd 100644
--- a/CheckDrive.Api/CheckDrive.Api/Controllers/Reviews/MechanicAcceptancesController.cs
+++ b/CheckDrive.Api/CheckDrive.Api/Controllers/Reviews/MechanicAcceptancesController.cs
@@ -21,9 +21,9 @@ public async Task<ActionResult<MechanicAcceptanceReviewDto>> CreateAcceptanceRev
         [FromRoute] int mechanicId,
         [FromBody] CreateMechanicAcceptanceReviewDto review)
     {
-        if (review.MechanicId != mechanicId)
+        if (review.ReviewerId != mechanicId)
         {
-            return BadRequest($"Route id: {mechanicId} does not match with body id: {review.MechanicId}.");
+            return BadRequest($"Route id: {mechanicId} does not match with body id: {review.ReviewerId}.");
         }
 
         var createdReview = await reviewService.CreateAsync(review);
diff --git a/CheckDrive.Api/CheckDrive.Api/Controllers/Reviews/MechanicHandoversController.cs b/CheckDrive.Api/CheckDrive.Api/Controllers/Reviews/MechanicHandoversController.cs
index ccde6da..cc1a599 100644
--- a/CheckDrive.Api/CheckDrive.Api/Controllers/Reviews/MechanicHandoversController.cs
+++ b/CheckDrive.Api/CheckDrive.Api/Controllers/Reviews/MechanicHandoversController.cs
@@ -21,9 +21,9 @@ public async Task<ActionResult<MechanicHandoverReviewDto>> CreateHandoverReviewA
         [FromRoute] int mechanicId,
         [FromBody] CreateMechanicHandoverReviewDto review)
     {
-        if (review.MechanicId != mechanicId)
+        if (review.ReviewerId != mechanicId)
         {
-            return BadRequest($"Route id: {mechanicId} does not match with body id: {review.MechanicId}.");
+            return BadRequest($"Route id: {mechanicId} does not match with body id: {review.ReviewerId}.");
         }
 
         var createdReview = await reviewService.CreateAsync(review);
diff --git a/CheckDrive.Api/CheckDrive.Api/Controllers/Reviews/OperatorReviewsController.cs b/CheckDrive.Api/CheckDrive.Api/Controllers/Reviews/OperatorReviewsController.cs
index 96c8b3b..15ebad9 100644
--- a/CheckDrive.Api/CheckDrive.Api/Controllers/Reviews/OperatorReviewsController.cs
+++ b/CheckDrive.Api/CheckDrive.Api/Controllers/Reviews/OperatorReviewsController.cs
@@ -21,9 +21,9 @@ public async Task<ActionResult<OperatorReviewDto>> CreateAsync(
         [FromRoute] int operatorId,
         [FromBody] CreateOperatorReviewDto review)
     {
-        if (review.OperatorId != operatorId)
+        if (review.ReviewerId != operatorId)
         {
-            return BadRequest($"Route id: {operatorId} does not match with body id: {review.OperatorId}.");
+            return BadRequest($"Route id: {operatorId} does not match with body id: {review.ReviewerId}.");
         }
 
         var createdReview = await reviewService.CreateAsync(review);
diff --git a/CheckDrive.Api/CheckDrive.Application/Constants/TimeConstants.cs b/CheckDrive.Api/CheckDrive.Application/Constants/TimeConstants.cs
deleted file mode 100644
index f3a1243..0000000
--- a/CheckDrive.Api/CheckDrive.Application/Constants/TimeConstants.cs
+++ /dev/null
@@ -1,6 +0,0 @@
-namespace CheckDrive.Application.Constants;
-
-internal static class TimeConstants
-{
-    public const int TashkentTimeUtc = 5;
-}
diff --git a/CheckDrive.Api/CheckDrive.Application/DTOs/CheckPoint/CheckPointProgress.cs b/CheckDrive.Api/CheckDrive.Application/DTOs/CheckPoint/CheckPointProgress.cs
deleted file mode 100644
index 7fa8261..0000000
--- a/CheckDrive.Api/CheckDrive.Application/DTOs/CheckPoint/CheckPointProgress.cs
+++ /dev/null
@@ -1,5 +0,0 @@
-using CheckDrive.Domain.Enums;
-
-namespace CheckDrive.Application.DTOs.CheckPoint;
-
-public sealed record CheckPointProgress(int Id, CheckPointStage Stage);
diff --git a/CheckDrive.Api/CheckDrive.Application/DTOs/CheckPoint/DriverCheckPointDto.cs b/CheckDrive.Api/CheckDrive.Application/DTOs/CheckPoint/DriverCheckPointDto.cs
deleted file mode 100644
index 508cd3b..0000000
--- a/CheckDrive.Api/CheckDrive.Application/DTOs/CheckPoint/DriverCheckPointDto.cs
+++ /dev/null
@@ -1,14 +0,0 @@
-using CheckDrive.Application.DTOs.Car;
-using CheckDrive.Application.DTOs.Review;
-using CheckDrive.Domain.Enums;
-
-namespace CheckDrive.Application.DTOs.CheckPoint;
-
-public sealed record DriverCheckPointDto(
-    int Id,
-    DateTime StartDate,
-    CheckPointStage Stage,
-    CheckPointStatus Status,
-    string DriverName,
-    CarDto? Car,
-    List<DriverReviewDto> Reviews);
diff --git a/CheckDrive.Api/CheckDrive.Application/DTOs/DispatcherReview/CreateDispatcherReviewDto.cs b/CheckDrive.Api/CheckDrive.Application/DTOs/DispatcherReview/CreateDispatcherReviewDto.cs
index 5e8e762..6fe626e 100644
--- a/CheckDrive.Api/CheckDrive.Application/DTOs/DispatcherReview/CreateDispatcherReviewDto.cs
+++ b/CheckDrive.Api/CheckDrive.Application/DTOs/DispatcherReview/CreateDispatcherReviewDto.cs
@@ -1,9 +1,12 @@
-namespace CheckDrive.Application.DTOs.DispatcherReview;
+using CheckDrive.Application.DTOs.Review;
+
+namespace CheckDrive.Application.DTOs.DispatcherReview;
 
 public sealed record CreateDispatcherReviewDto(
     int CheckPointId,
-    int DispatcherId,
+    int ReviewerId,
     string? Notes,
     int FinalMileage,
     decimal FuelConsumptionAmount,
-    decimal RemainingFuelAmount);
+    decimal RemainingFuelAmount)
+    : CreateReviewDtoBase(ReviewerId, Notes);
diff --git a/CheckDrive.Api/CheckDrive.Application/DTOs/DoctorReview/CreateDoctorReviewDto.cs b/CheckDrive.Api/CheckDrive.Application/DTOs/DoctorReview/CreateDoctorReviewDto.cs
index a2fb685..eb80907 100644
--- a/CheckDrive.Api/CheckDrive.Application/DTOs/DoctorReview/CreateDoctorReviewDto.cs
+++ b/CheckDrive.Api/CheckDrive.Application/DTOs/DoctorReview/CreateDoctorReviewDto.cs
@@ -1,7 +1,10 @@
-namespace CheckDrive.Application.DTOs.DoctorReview;
+using CheckDrive.Application.DTOs.Review;
+
+namespace CheckDrive.Application.DTOs.DoctorReview;
 
 public sealed record CreateDoctorReviewDto(
     int DriverId,
-    int DoctorId,
+    int ReviewerId,
     string? Notes,
-    bool IsHealthy);
+    bool IsHealthy)
+    : CreateReviewDtoBase(ReviewerId, Notes);
diff --git a/CheckDrive.Api/CheckDrive.Application/DTOs/ManagerReview/CreateManagerReviewDto.cs b/CheckDrive.Api/CheckDrive.Application/DTOs/ManagerReview/CreateManagerReviewDto.cs
index 4cdbed4..980859e 100644
--- a/CheckDrive.Api/CheckDrive.Application/DTOs/ManagerReview/CreateManagerReviewDto.cs
+++ b/CheckDrive.Api/CheckDrive.Application/DTOs/ManagerReview/CreateManagerReviewDto.cs
@@ -11,6 +11,4 @@ public sealed record CreateManagerReviewDto(
     decimal FuelConsumption,
     decimal RemainingFuelAmount,
     decimal DebtAmount)
-    : CreateReviewDtoBase(
-        ReviewerId: ReviewerId,
-        Notes: Notes);
+    : CreateReviewDtoBase(ReviewerId, Notes);
diff --git a/CheckDrive.Api/CheckDrive.Application/DTOs/MechanicAcceptance/CreateMechanicAcceptanceReviewDto.cs b/CheckDrive.Api/CheckDrive.Application/DTOs/MechanicAcceptance/CreateMechanicAcceptanceReviewDto.cs
index 02d87d5..b46986f 100644
--- a/CheckDrive.Api/CheckDrive.Application/DTOs/MechanicAcceptance/CreateMechanicAcceptanceReviewDto.cs
+++ b/CheckDrive.Api/CheckDrive.Application/DTOs/MechanicAcceptance/CreateMechanicAcceptanceReviewDto.cs
@@ -1,8 +1,11 @@
-namespace CheckDrive.Application.DTOs.MechanicAcceptance;
+using CheckDrive.Application.DTOs.Review;
+
+namespace CheckDrive.Application.DTOs.MechanicAcceptance;
 
 public sealed record CreateMechanicAcceptanceReviewDto(
     int CheckPointId,
-    int MechanicId,
+    int ReviewerId,
     string? Notes,
     int FinalMileage,
-    bool IsCarInGoodCondition);
+    bool IsCarInGoodCondition)
+    : CreateReviewDtoBase(ReviewerId, Notes);
diff --git a/CheckDrive.Api/CheckDrive.Application/DTOs/MechanicHandover/CreateMechanicHandoverReviewDto.cs b/CheckDrive.Api/CheckDrive.Application/DTOs/MechanicHandover/CreateMechanicHandoverReviewDto.cs
index 979e58a..1535439 100644
--- a/CheckDrive.Api/CheckDrive.Application/DTOs/MechanicHandover/CreateMechanicHandoverReviewDto.cs
+++ b/CheckDrive.Api/CheckDrive.Application/DTOs/MechanicHandover/CreateMechanicHandoverReviewDto.cs
@@ -1,8 +1,11 @@
-namespace CheckDrive.Application.DTOs.MechanicHandover;
+using CheckDrive.Application.DTOs.Review;
+
+namespace CheckDrive.Application.DTOs.MechanicHandover;
 
 public sealed record CreateMechanicHandoverReviewDto(
     int CheckPointId,
+    int ReviewerId,
     int CarId,
-    int MechanicId,
     string? Notes,
-    int InitialMileage);
+    int InitialMileage)
+    : CreateReviewDtoBase(ReviewerId, Notes);
diff --git a/CheckDrive.Api/CheckDrive.Application/DTOs/OperatorReview/CreateOperatorReviewDto.cs b/CheckDrive.Api/CheckDrive.Application/DTOs/OperatorReview/CreateOperatorReviewDto.cs
index 197bb58..641376d 100644
--- a/CheckDrive.Api/CheckDrive.Application/DTOs/OperatorReview/CreateOperatorReviewDto.cs
+++ b/CheckDrive.Api/CheckDrive.Application/DTOs/OperatorReview/CreateOperatorReviewDto.cs
@@ -1,9 +1,12 @@
-namespace CheckDrive.Application.DTOs.OperatorReview;
+using CheckDrive.Application.DTOs.Review;
+
+namespace CheckDrive.Application.DTOs.OperatorReview;
 
 public sealed record CreateOperatorReviewDto(
     int CheckPointId,
-    int OperatorId,
+    int ReviewerId,
     int OilMarkId,
     string? Notes,
     decimal InitialOilAmount,
-    decimal OilRefillAmount);
+    decimal OilRefillAmount)
+    : CreateReviewDtoBase(ReviewerId, Notes);
diff --git a/CheckDrive.Api/CheckDrive.Application/DTOs/Review/DriverReviewDto.cs b/CheckDrive.Api/CheckDrive.Application/DTOs/Review/DriverReviewDto.cs
deleted file mode 100644
index 4cc72bd..0000000
--- a/CheckDrive.Api/CheckDrive.Application/DTOs/Review/DriverReviewDto.cs
+++ /dev/null
@@ -1,9 +0,0 @@
-using CheckDrive.Domain.Enums;
-
-namespace CheckDrive.Application.DTOs.Review;
-
-public sealed record DriverReviewDto(
-    string? Notes,
-    string ReviewerName,
-    DateTime Date,
-    ReviewType Type);
diff --git a/CheckDrive.Api/CheckDrive.Application/DTOs/Review/ReviewConfirmationDto.cs b/CheckDrive.Api/CheckDrive.Application/DTOs/Review/ReviewConfirmationDto.cs
deleted file mode 100644
index 76b444d..0000000
--- a/CheckDrive.Api/CheckDrive.Application/DTOs/Review/ReviewConfirmationDto.cs
+++ /dev/null
@@ -1,8 +0,0 @@
-using CheckDrive.Domain.Enums;
-
-namespace CheckDrive.Application.DTOs.Review;
-
-public sealed record ReviewConfirmationDto(
-    int CheckPointId,
-    ReviewType ReviewType,
-    string Message);
diff --git a/CheckDrive.Api/CheckDrive.Application/Services/Review/DispatcherReviewService.cs b/CheckDrive.Api/CheckDrive.Application/Services/Review/DispatcherReviewService.cs
index 424e6bb..614cfa8 100644
--- a/CheckDrive.Api/CheckDrive.Application/Services/Review/DispatcherReviewService.cs
+++ b/CheckDrive.Api/CheckDrive.Application/Services/Review/DispatcherReviewService.cs
@@ -31,7 +31,7 @@ public async Task<DispatcherReviewDto> CreateAsync(CreateDispatcherReviewDto rev
         ArgumentNullException.ThrowIfNull(review);
 
         var checkPoint = await GetAndValidateCheckPointAsync(review.CheckPointId);
-        var dispatcher = await GetAndValidateDispatcherAsync(review.DispatcherId);
+        var dispatcher = await GetAndValidateDispatcherAsync(review.ReviewerId);
 
         checkPoint.Stage = CheckPointStage.DispatcherReview;
 
diff --git a/CheckDrive.Api/CheckDrive.Application/Services/Review/DoctorReviewService.cs b/CheckDrive.Api/CheckDrive.Application/Services/Review/DoctorReviewService.cs
index a3895fe..09068ec 100644
--- a/CheckDrive.Api/CheckDrive.Application/Services/Review/DoctorReviewService.cs
+++ b/CheckDrive.Api/CheckDrive.Application/Services/Review/DoctorReviewService.cs
@@ -30,7 +30,7 @@ public async Task<DoctorReviewDto> CreateAsync(CreateDoctorReviewDto review)
     {
         ArgumentNullException.ThrowIfNull(review);
 
-        var doctor = await GetAndValidateDoctorAsync(review.DoctorId);
+        var doctor = await GetAndValidateDoctorAsync(review.ReviewerId);
         var driver = await GetAndValidateDriverAsync(review.DriverId);
 
         var reviewEntity = CreateReview(review, doctor, driver);
diff --git a/CheckDrive.Api/CheckDrive.Application/Services/Review/MechanicAcceptanceService.cs b/CheckDrive.Api/CheckDrive.Application/Services/Review/MechanicAcceptanceService.cs
index dbd0130..dfbadf4 100644
--- a/CheckDrive.Api/CheckDrive.Application/Services/Review/MechanicAcceptanceService.cs
+++ b/CheckDrive.Api/CheckDrive.Application/Services/Review/MechanicAcceptanceService.cs
@@ -31,7 +31,7 @@ public async Task<MechanicAcceptanceReviewDto> CreateAsync(CreateMechanicAccepta
         ArgumentNullException.ThrowIfNull(review);
 
         var checkPoint = await GetAndValidateCheckPointAsync(review.CheckPointId);
-        var mechanic = await GetAndValidateMechanicAsync(review.MechanicId);
+        var mechanic = await GetAndValidateMechanicAsync(review.ReviewerId);
 
         ValidateMileage(checkPoint, review);
         var reviewEntity = await CreateReviewAsync(checkPoint, mechanic, review);
diff --git a/CheckDrive.Api/CheckDrive.Application/Services/Review/MechanicHandoverService.cs b/CheckDrive.Api/CheckDrive.Application/Services/Review/MechanicHandoverService.cs
index 418953c..f4fe6f1 100644
--- a/CheckDrive.Api/CheckDrive.Application/Services/Review/MechanicHandoverService.cs
+++ b/CheckDrive.Api/CheckDrive.Application/Services/Review/MechanicHandoverService.cs
@@ -35,7 +35,7 @@ public async Task<MechanicHandoverReviewDto> CreateAsync(CreateMechanicHandoverR
         ArgumentNullException.ThrowIfNull(review);
 
         var checkPoint = await GetAndValidateCheckPointAsync(review.CheckPointId);
-        var mechanic = await GetAndValidateMechanicAsync(review.MechanicId);
+        var mechanic = await GetAndValidateMechanicAsync(review.ReviewerId);
         var car = await GetAndValidateCarAsync(review.CarId);
 
         ValidateMileage(car, review);
diff --git a/CheckDrive.Api/CheckDrive.Application/Services/Review/OperatorReviewService.cs b/CheckDrive.Api/CheckDrive.Application/Services/Review/OperatorReviewService.cs
index 3daae05..c9ed7ca 100644
--- a/CheckDrive.Api/CheckDrive.Application/Services/Review/OperatorReviewService.cs
+++ b/CheckDrive.Api/CheckDrive.Application/Services/Review/OperatorReviewService.cs
@@ -36,7 +36,7 @@ public async Task<OperatorReviewDto> CreateAsync(CreateOperatorReviewDto review)
         ArgumentNullException.ThrowIfNull(review);
 
         var checkPoint = await GetAndValidateCheckPointAsync(review.CheckPointId);
-        var @operator = await GetAndValidateOperatorAsync(review.OperatorId);
+        var @operator = await GetAndValidateOperatorAsync(review.ReviewerId);
         var oilMark = await GetAndValidateOilMarkAsync(review.OilMarkId);
 
         ValidateOilAmount(checkPoint, review);
diff --git a/CheckDrive.Api/CheckDrive.Domain/Enums/EmailType.cs b/CheckDrive.Api/CheckDrive.Domain/Enums/EmailType.cs
index e26015a..e457af0 100644
--- a/CheckDrive.Api/CheckDrive.Domain/Enums/EmailType.cs
+++ b/CheckDrive.Api/CheckDrive.Domain/Enums/EmailType.cs
@@ -4,11 +4,10 @@
 using System.Text;
 using System.Threading.Tasks;
 
-namespace CheckDrive.Domain.Enums
+namespace CheckDrive.Domain.Enums;
+
+public enum EmailType
 {
-    public enum EmailType
-    {
-        ForgotPassword,
-        EmailConfirmation
-    }
+    ForgotPassword,
+    EmailConfirmation
 }
diff --git a/CheckDrive.Api/CheckDrive.Domain/Enums/SendingMessageStatus.cs b/CheckDrive.Api/CheckDrive.Domain/Enums/SendingMessageStatus.cs
index 50644bf..d229f0f 100644
--- a/CheckDrive.Api/CheckDrive.Domain/Enums/SendingMessageStatus.cs
+++ b/CheckDrive.Api/CheckDrive.Domain/Enums/SendingMessageStatus.cs
@@ -1,9 +1,8 @@
-namespace CheckDrive.Domain.Enums
+namespace CheckDrive.Domain.Enums;
+
+public enum SendingMessageStatus
 {
-    public enum SendingMessageStatus
-    {
-        MechanicHandover,
-        OperatorReview,
-        MechanicAcceptance
-    }
+    MechanicHandover,
+    OperatorReview,
+    MechanicAcceptance
 }
diff --git a/CheckDrive.Api/Tests/CheckDrive.Tests.Unit/Services/DoctorReviewServiceTests.cs b/CheckDrive.Api/Tests/CheckDrive.Tests.Unit/Services/DoctorReviewServiceTests.cs
index 382eb91..12bbf99 100644
--- a/CheckDrive.Api/Tests/CheckDrive.Tests.Unit/Services/DoctorReviewServiceTests.cs
+++ b/CheckDrive.Api/Tests/CheckDrive.Tests.Unit/Services/DoctorReviewServiceTests.cs
@@ -36,7 +36,7 @@ public async Task CreateAsync_ValidInput_ReturnsCreatedDoctorReviewDto()
         var driver = _fixture.Create<Driver>();
         var createDto = _fixture.Build<CreateDoctorReviewDto>()
             .With(d => d.DriverId, driver.Id)
-            .With(d => d.DoctorId, doctor.Id)
+            .With(d => d.ReviewerId, doctor.Id)
             .Create();
 
         _mockContext.Setup(c => c.Doctors).ReturnsDbSet(new List<Doctor> { doctor });
@@ -72,7 +72,7 @@ public async Task CreateAsync_DriverNotFound_ThrowsEntityNotFoundException()
         // Arrange
         var doctor = _fixture.Create<Doctor>();
         var createDto = _fixture.Build<CreateDoctorReviewDto>()
-            .With(d => d.DoctorId, doctor.Id)
+            .With(d => d.ReviewerId, doctor.Id)
             .Create();
 
         _mockContext.Setup(c => c.Doctors).ReturnsDbSet(new List<Doctor> { doctor });
@@ -97,7 +97,7 @@ public async Task CreateAsync_RejectedReview_CreatesCheckPointWithCorrectStatus(
         var driver = _fixture.Create<Driver>();
         var createDto = _fixture.Build<CreateDoctorReviewDto>()
             .With(d => d.DriverId, driver.Id)
-            .With(d => d.DoctorId, doctor.Id)
+            .With(d => d.ReviewerId, doctor.Id)
             .Create();
 
         _mockContext.Setup(c => c.Doctors).ReturnsDbSet(new List<Doctor> { doctor });