diff --git a/Response/CMSExamResponseItem.cs b/Response/CMSExamResponseItem.cs
index 80f4f91..7f0bdde 100644
--- a/Response/CMSExamResponseItem.cs
+++ b/Response/CMSExamResponseItem.cs
@@ -7,11 +7,11 @@ namespace BMA.EHR.Recurit.Exam.Service.Response
     {
         public string? Id { get; set; }
         public string? Category { get; set; }
-        public string? Category_id { get; set; }
+        public string? CategoryId { get; set; }
         public string? Start { get; set; }
         public string? End { get; set; }
-        public string? Exam_date { get; set; }
-        public string? Announcement_date { get; set; }
+        public string? ExamDate { get; set; }
+        public string? Announcement_startDate { get; set; }
         public string? Announcement_endDate { get; set; }
         public bool? AnnouncementExam { get; set; }
         public string? Register_startDate { get; set; }
diff --git a/Services/CMSCandidateService.cs b/Services/CMSCandidateService.cs
index aa40dd1..01b686f 100644
--- a/Services/CMSCandidateService.cs
+++ b/Services/CMSCandidateService.cs
@@ -60,7 +60,7 @@ namespace BMA.EHR.Recurit.Exam.Service.Services
 
         #region " Methods "
 
-        public string GetNameCategory(string? category)
+        static public string GetNameCategory(string? category)
         {
             if (category == null)
                 return "-";
@@ -78,6 +78,7 @@ namespace BMA.EHR.Recurit.Exam.Service.Services
                     return "-";
             }
         }
+
         public async Task<CMSCandidate> GetsAsync()
         {
             var cms = await createCMS();
@@ -360,11 +361,11 @@ namespace BMA.EHR.Recurit.Exam.Service.Services
                             {
                                 Id = x.Id.ToString(),
                                 Category = GetNameCategory(x.Category),
-                                Category_id = x.Category,
+                                CategoryId = x.Category,
                                 Start = x.ExamDate.ToString("yyyy-MM-dd"),
                                 End = x.ExamDate.ToString("yyyy-MM-dd"),
-                                Exam_date = x.ExamDate.ToString("yyyy-MM-dd"),
-                                Announcement_date = x.AnnouncementStartDate.ToString("yyyy-MM-dd"),
+                                ExamDate = x.ExamDate.ToString("yyyy-MM-dd"),
+                                Announcement_startDate = x.AnnouncementStartDate.ToString("yyyy-MM-dd"),
                                 Announcement_endDate = x.AnnouncementEndDate.ToString("yyyy-MM-dd"),
                                 AnnouncementExam = x.AnnouncementExam,
                                 Register_startDate = x.RegisterStartDate.ToString("yyyy-MM-dd"),
@@ -404,11 +405,11 @@ namespace BMA.EHR.Recurit.Exam.Service.Services
                             {
                                 Id = x.Id.ToString(),
                                 Category = GetNameCategory(x.Category),
-                                Category_id = x.Category,
+                                CategoryId = x.Category,
                                 Start = x.ExamDate.ToString("yyyy-MM-dd"),
                                 End = x.ExamDate.ToString("yyyy-MM-dd"),
-                                Exam_date = x.ExamDate.ToString("yyyy-MM-dd"),
-                                Announcement_date = x.AnnouncementStartDate.ToString("yyyy-MM-dd"),
+                                ExamDate = x.ExamDate.ToString("yyyy-MM-dd"),
+                                Announcement_startDate = x.AnnouncementStartDate.ToString("yyyy-MM-dd"),
                                 Announcement_endDate = x.AnnouncementEndDate.ToString("yyyy-MM-dd"),
                                 AnnouncementExam = x.AnnouncementExam,
                                 Register_startDate = x.RegisterStartDate.ToString("yyyy-MM-dd"),
@@ -448,11 +449,11 @@ namespace BMA.EHR.Recurit.Exam.Service.Services
                             {
                                 Id = x.Id.ToString(),
                                 Category = GetNameCategory(x.Category),
-                                Category_id = x.Category,
+                                CategoryId = x.Category,
                                 Start = x.AnnouncementStartDate.ToString("yyyy-MM-dd"),
                                 End = x.AnnouncementEndDate.ToString("yyyy-MM-dd"),
-                                Exam_date = x.ExamDate.ToString("yyyy-MM-dd"),
-                                Announcement_date = x.AnnouncementStartDate.ToString("yyyy-MM-dd"),
+                                ExamDate = x.ExamDate.ToString("yyyy-MM-dd"),
+                                Announcement_startDate = x.AnnouncementStartDate.ToString("yyyy-MM-dd"),
                                 Announcement_endDate = x.AnnouncementEndDate.ToString("yyyy-MM-dd"),
                                 AnnouncementExam = x.AnnouncementExam,
                                 Register_startDate = x.RegisterStartDate.ToString("yyyy-MM-dd"),