diff --git a/src/main/java/com/mangkyu/employment/interview/app/mail/service/MailController.java b/src/main/java/com/mangkyu/employment/interview/app/mail/controller/MailController.java
similarity index 97%
rename from src/main/java/com/mangkyu/employment/interview/app/mail/service/MailController.java
rename to src/main/java/com/mangkyu/employment/interview/app/mail/controller/MailController.java
index 5db1bc1..b8315d0 100644
--- a/src/main/java/com/mangkyu/employment/interview/app/mail/service/MailController.java
+++ b/src/main/java/com/mangkyu/employment/interview/app/mail/controller/MailController.java
@@ -1,5 +1,6 @@
-package com.mangkyu.employment.interview.app.mail.service;
+package com.mangkyu.employment.interview.app.mail.controller;
 
+import com.mangkyu.employment.interview.app.mail.service.SendMailService;
 import com.mangkyu.employment.interview.app.member.entity.Member;
 import com.mangkyu.employment.interview.app.quiz.entity.Quiz;
 import com.mangkyu.employment.interview.app.quiz.repository.QuizRepository;
@@ -20,7 +21,7 @@ import java.util.*;
 @RequiredArgsConstructor
 public class MailController {
 
-    private final MailService mailService;
+    private final SendMailService mailService;
     private final MemberRepository memberRepository;
     private final GetQuizService quizService;
     private final QuizRepository quizRepository;
diff --git a/src/main/java/com/mangkyu/employment/interview/app/mail/service/MailService.java b/src/main/java/com/mangkyu/employment/interview/app/mail/service/SendMailService.java
similarity index 83%
rename from src/main/java/com/mangkyu/employment/interview/app/mail/service/MailService.java
rename to src/main/java/com/mangkyu/employment/interview/app/mail/service/SendMailService.java
index 634a727..37dc500 100644
--- a/src/main/java/com/mangkyu/employment/interview/app/mail/service/MailService.java
+++ b/src/main/java/com/mangkyu/employment/interview/app/mail/service/SendMailService.java
@@ -18,7 +18,7 @@ import java.util.List;
 @Service
 @RequiredArgsConstructor
 @Slf4j
-public class MailService {
+public class SendMailService {
 
     private final JavaMailSender mailSender;
     private String START_MAIL_FORMAT;
@@ -72,11 +72,12 @@ public class MailService {
     private String createBodyMailText(final List<Quiz> quizList) {
         final StringBuilder stringBuilder = new StringBuilder();
         for (Quiz quiz : quizList) {
-            final String indexReplacedText = BODY_MAIL_FORMAT.replaceAll("\\{index}", String.valueOf(quizList.indexOf(quiz) + 1));
-            final String titleReplacedText = indexReplacedText.replaceAll("\\$\\{quiz.title}", quiz.getTitle());
-            final String categoryReplacedText = titleReplacedText.replaceAll("\\$\\{quiz.category}", quiz.getQuizCategory().name());
-            final String finalText = categoryReplacedText.replaceAll("\\$\\{quiz.level}", quiz.getQuizLevel().toString());
-            stringBuilder.append(finalText);
+            String replaceBody = BODY_MAIL_FORMAT
+                    .replaceAll("\\{index}", String.valueOf(quizList.indexOf(quiz) + 1))
+                    .replaceAll("\\$\\{quiz.title}", quiz.getTitle())
+                    .replaceAll("\\$\\{quiz.category}", quiz.getQuizCategory().name())
+                    .replaceAll("\\$\\{quiz.level}", quiz.getQuizLevel().toString());
+            stringBuilder.append(replaceBody);
         }
 
         return stringBuilder.toString();
diff --git a/src/main/java/com/mangkyu/employment/interview/app/quiz/service/GetQuizService.java b/src/main/java/com/mangkyu/employment/interview/app/quiz/service/GetQuizService.java
index b356059..e461d11 100644
--- a/src/main/java/com/mangkyu/employment/interview/app/quiz/service/GetQuizService.java
+++ b/src/main/java/com/mangkyu/employment/interview/app/quiz/service/GetQuizService.java
@@ -45,8 +45,6 @@ public class GetQuizService {
         return new Quizzes(quizRepository.customFindByIdNotInAndQuizCategoryInAndQuizLevel(solvedQuizIdList, quizCategorySet, quizLevel));
     }
 
-    // TODO: do not use GetQuizResponseHolder in service layer
-
     public PagingQuizzes getQuizList(final GetQuizRequest request) {
         final PageRequest pageRequest = PageRequest.of(request.getPage(), request.getSize());
         final Page<Quiz> quizPage = quizRepository.findByQuizCategoryIsAndIsEnableTrue(request.getCategory(), pageRequest);
diff --git a/src/main/java/com/mangkyu/employment/interview/cron/SendQuizCronJob.java b/src/main/java/com/mangkyu/employment/interview/cron/SendQuizCronJob.java
index d9dec5e..0464bd7 100644
--- a/src/main/java/com/mangkyu/employment/interview/cron/SendQuizCronJob.java
+++ b/src/main/java/com/mangkyu/employment/interview/cron/SendQuizCronJob.java
@@ -1,6 +1,6 @@
 package com.mangkyu.employment.interview.cron;
 
-import com.mangkyu.employment.interview.app.mail.service.MailService;
+import com.mangkyu.employment.interview.app.mail.service.SendMailService;
 import com.mangkyu.employment.interview.app.member.entity.Member;
 import com.mangkyu.employment.interview.app.member.service.GetMemberService;
 import com.mangkyu.employment.interview.app.quiz.entity.Quiz;
@@ -25,7 +25,7 @@ public class SendQuizCronJob {
 
     private final GetMemberService memberService;
     private final GetQuizService quizService;
-    private final MailService mailService;
+    private final SendMailService mailService;
     private final SolvedQuizService solvedQuizService;
 
     /**
diff --git a/src/test/java/com/mangkyu/employment/interview/app/mail/service/MailServiceTest.java b/src/test/java/com/mangkyu/employment/interview/app/mail/service/SendMailServiceTest.java
similarity index 95%
rename from src/test/java/com/mangkyu/employment/interview/app/mail/service/MailServiceTest.java
rename to src/test/java/com/mangkyu/employment/interview/app/mail/service/SendMailServiceTest.java
index 8c2e5cb..fa480e4 100644
--- a/src/test/java/com/mangkyu/employment/interview/app/mail/service/MailServiceTest.java
+++ b/src/test/java/com/mangkyu/employment/interview/app/mail/service/SendMailServiceTest.java
@@ -14,18 +14,16 @@ import org.springframework.test.util.ReflectionTestUtils;
 
 import javax.mail.Session;
 import javax.mail.internet.MimeMessage;
-import java.util.Arrays;
-import java.util.Collections;
 import java.util.List;
 import java.util.Properties;
 
 import static org.mockito.Mockito.doReturn;
 
 @ExtendWith(MockitoExtension.class)
-class MailServiceTest {
+class SendMailServiceTest {
 
     @InjectMocks
-    private MailService target;
+    private SendMailService target;
 
     @Mock
     private JavaMailSender javaMailSender;
diff --git a/src/test/java/com/mangkyu/employment/interview/cron/SendQuizCronJobTest.java b/src/test/java/com/mangkyu/employment/interview/cron/SendQuizCronJobTest.java
index 333553b..09a9278 100644
--- a/src/test/java/com/mangkyu/employment/interview/cron/SendQuizCronJobTest.java
+++ b/src/test/java/com/mangkyu/employment/interview/cron/SendQuizCronJobTest.java
@@ -1,6 +1,6 @@
 package com.mangkyu.employment.interview.cron;
 
-import com.mangkyu.employment.interview.app.mail.service.MailService;
+import com.mangkyu.employment.interview.app.mail.service.SendMailService;
 import com.mangkyu.employment.interview.app.member.entity.Member;
 import com.mangkyu.employment.interview.app.member.service.GetMemberService;
 import com.mangkyu.employment.interview.app.quiz.entity.Quiz;
@@ -33,7 +33,7 @@ class SendQuizCronJobTest {
     @Mock
     private GetQuizService quizService;
     @Mock
-    private MailService mailService;
+    private SendMailService mailService;
     @Mock
     private SolvedQuizService solvedQuizService;