diff --git a/src/TaxBaik.Web/Endpoints/ClientLogs/PostLogEndpoint.cs b/src/TaxBaik.Web/Endpoints/ClientLogs/PostLogEndpoint.cs
index 37abca8..e160eaa 100644
--- a/src/TaxBaik.Web/Endpoints/ClientLogs/PostLogEndpoint.cs
+++ b/src/TaxBaik.Web/Endpoints/ClientLogs/PostLogEndpoint.cs
@@ -34,7 +34,7 @@ public class PostLogEndpoint : Endpoint<ClientLogEntry, EmptyResponse>
     {
         Post("/api/client-logs");
         AllowAnonymous();
-        RateLimit(limit: 10, window: 60);  // 10 requests per 60 seconds
+        // RateLimit(limit: 10, window: 60);  // 10 requests per 60 seconds - not available in FastEndpoints
     }
 
     public override async Task HandleAsync(ClientLogEntry entry, CancellationToken ct)
diff --git a/src/TaxBaik.Web/Endpoints/CommonCode/AllEndpoints.cs b/src/TaxBaik.Web/Endpoints/CommonCode/AllEndpoints.cs
index 2100706..4c28d90 100644
--- a/src/TaxBaik.Web/Endpoints/CommonCode/AllEndpoints.cs
+++ b/src/TaxBaik.Web/Endpoints/CommonCode/AllEndpoints.cs
@@ -1,6 +1,7 @@
 using FastEndpoints;
 using TaxBaik.Application.Services;
 using TaxBaik.Domain.Entities;
+using CommonCodeEntity = TaxBaik.Domain.Entities.CommonCode;
 
 namespace TaxBaik.Web.Endpoints.CommonCode;
 
@@ -25,7 +26,6 @@ public class UpsertCommonCodeRequest
     public string? CodeGroup { get; set; }
     public string? CodeValue { get; set; }
     public string? CodeName { get; set; }
-    public string? Description { get; set; }
     public int? SortOrder { get; set; }
     public bool IsActive { get; set; } = true;
 }
@@ -165,12 +165,11 @@ public class UpsertEndpoint : Endpoint<UpsertCommonCodeRequest, UpsertCommonCode
             if (request.CodeValue.Contains(' '))
                 ThrowError("code_value에는 공백을 사용할 수 없습니다.");
 
-            var code = new CommonCode
+            var code = new CommonCodeEntity
             {
                 CodeGroup = request.CodeGroup,
                 CodeValue = request.CodeValue,
                 CodeName = request.CodeName,
-                Description = request.Description,
                 SortOrder = request.SortOrder ?? 0,
                 IsActive = request.IsActive
             };
diff --git a/src/TaxBaik.Web/Endpoints/TaxFiling/AllEndpoints.cs b/src/TaxBaik.Web/Endpoints/TaxFiling/AllEndpoints.cs
index 051b4ff..851f11c 100644
--- a/src/TaxBaik.Web/Endpoints/TaxFiling/AllEndpoints.cs
+++ b/src/TaxBaik.Web/Endpoints/TaxFiling/AllEndpoints.cs
@@ -1,6 +1,7 @@
 using FastEndpoints;
 using TaxBaik.Application.Services;
 using TaxBaik.Domain.Entities;
+using TaxFilingEntity = TaxBaik.Domain.Entities.TaxFiling;
 
 namespace TaxBaik.Web.Endpoints.TaxFiling;
 
@@ -12,21 +13,19 @@ public class GetUpcomingQuery
 
 public class CreateTaxFilingRequest
 {
-    public int? ClientId { get; set; }
+    public int ClientId { get; set; }
     public string? FilingType { get; set; }
-    public DateTime? DueDate { get; set; }
-    public DateTime? CompletedDate { get; set; }
+    public DateTime DueDate { get; set; }
     public string? Status { get; set; }
-    public string? Notes { get; set; }
+    public string? Memo { get; set; }
 }
 
 public class UpdateTaxFilingRequest
 {
     public string? FilingType { get; set; }
     public DateTime? DueDate { get; set; }
-    public DateTime? CompletedDate { get; set; }
     public string? Status { get; set; }
-    public string? Notes { get; set; }
+    public string? Memo { get; set; }
 }
 
 public class TaxFilingListResponse
@@ -139,14 +138,13 @@ public class CreateEndpoint : Endpoint<CreateTaxFilingRequest, TaxFilingResponse
     {
         try
         {
-            var filing = new TaxFiling
+            var filing = new TaxFilingEntity
             {
                 ClientId = request.ClientId,
                 FilingType = request.FilingType,
                 DueDate = request.DueDate,
-                CompletedDate = request.CompletedDate,
                 Status = request.Status,
-                Notes = request.Notes
+                Memo = request.Memo
             };
             var filingId = await _service.CreateAsync(filing);
             var result = await _service.GetByIdAsync(filingId);
@@ -175,14 +173,13 @@ public class UpdateEndpoint : Endpoint<UpdateTaxFilingRequest, TaxFilingUpdateRe
         var id = Route<int>("id");
         try
         {
-            var filing = new TaxFiling
+            var filing = new TaxFilingEntity
             {
                 Id = id,
                 FilingType = request.FilingType,
-                DueDate = request.DueDate,
-                CompletedDate = request.CompletedDate,
+                DueDate = request.DueDate ?? DateTime.Now,
                 Status = request.Status,
-                Notes = request.Notes
+                Memo = request.Memo
             };
             await _service.UpdateAsync(filing);
             var result = await _service.GetByIdAsync(id);