diff --git a/src/main/java/com/example/Jinus/controller/v2/CafeteriaControllerV2.java b/src/main/java/com/example/Jinus/controller/CafeteriaController.java
similarity index 65%
rename from src/main/java/com/example/Jinus/controller/v2/CafeteriaControllerV2.java
rename to src/main/java/com/example/Jinus/controller/CafeteriaController.java
index 8639664..545cc0b 100644
--- a/src/main/java/com/example/Jinus/controller/v2/CafeteriaControllerV2.java
+++ b/src/main/java/com/example/Jinus/controller/CafeteriaController.java
@@ -1,12 +1,9 @@
-package com.example.Jinus.controller.v2;
+package com.example.Jinus.controller;
 
 import com.example.Jinus.dto.request.RequestDto;
-import com.example.Jinus.service.v2.cafeteria.CafeteriaServiceV2;
-import com.example.Jinus.service.v2.userInfo.UserServiceV2;
-import com.fasterxml.jackson.core.JsonProcessingException;
-import com.fasterxml.jackson.databind.ObjectMapper;
+import com.example.Jinus.service.cafeteria.CafeteriaService;
+import com.example.Jinus.service.userInfo.UserService;
 import lombok.RequiredArgsConstructor;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -15,10 +12,10 @@
 @RestController
 @RequiredArgsConstructor
 @RequestMapping("/api/spring")
-public class CafeteriaControllerV2 {
+public class CafeteriaController {
 
-    private final UserServiceV2 userServiceV2;
-    private final CafeteriaServiceV2 cafeteriaServiceV2;
+    private final UserService userServiceV2;
+    private final CafeteriaService cafeteriaServiceV2;
 
     // 사용자 존재 여부에 따라 응답
     @PostMapping("/v2/cafeteria")
diff --git a/src/main/java/com/example/Jinus/controller/v2/DietControllerV2.java b/src/main/java/com/example/Jinus/controller/DietController.java
similarity index 76%
rename from src/main/java/com/example/Jinus/controller/v2/DietControllerV2.java
rename to src/main/java/com/example/Jinus/controller/DietController.java
index a4e95fa..d3b0ccf 100644
--- a/src/main/java/com/example/Jinus/controller/v2/DietControllerV2.java
+++ b/src/main/java/com/example/Jinus/controller/DietController.java
@@ -1,7 +1,7 @@
-package com.example.Jinus.controller.v2;
+package com.example.Jinus.controller;
 
 import com.example.Jinus.dto.request.RequestDto;
-import com.example.Jinus.service.v2.cafeteria.DietServiceV2;
+import com.example.Jinus.service.diet.DietService;
 import lombok.RequiredArgsConstructor;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -11,8 +11,8 @@
 @RestController
 @RequestMapping("/api/spring")
 @RequiredArgsConstructor
-public class DietControllerV2 {
-    private final DietServiceV2 dietServiceV2;
+public class DietController {
+    private final DietService dietServiceV2;
 
     @PostMapping("/v2/dish")
     public String handleRequest(@RequestBody RequestDto requestDto) {
diff --git a/src/main/java/com/example/Jinus/controller/v2/NoticeControllerV2.java b/src/main/java/com/example/Jinus/controller/NoticeController.java
similarity index 79%
rename from src/main/java/com/example/Jinus/controller/v2/NoticeControllerV2.java
rename to src/main/java/com/example/Jinus/controller/NoticeController.java
index 1f653f1..12dbbe3 100644
--- a/src/main/java/com/example/Jinus/controller/v2/NoticeControllerV2.java
+++ b/src/main/java/com/example/Jinus/controller/NoticeController.java
@@ -1,9 +1,9 @@
-package com.example.Jinus.controller.v2;
+package com.example.Jinus.controller;
 
 import com.example.Jinus.dto.request.RequestDto;
-import com.example.Jinus.service.v2.notice.NoticeServiceV2;
-import com.example.Jinus.service.v2.userInfo.DepartmentServiceV2;
-import com.example.Jinus.service.v2.userInfo.UserServiceV2;
+import com.example.Jinus.service.notice.NoticeService;
+import com.example.Jinus.service.userInfo.DepartmentService;
+import com.example.Jinus.service.userInfo.UserService;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import lombok.RequiredArgsConstructor;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -15,11 +15,11 @@
 @RestController
 @RequiredArgsConstructor
 @RequestMapping("/api/spring")
-public class NoticeControllerV2 {
+public class NoticeController {
 
-    private final NoticeServiceV2 noticeServiceV2;
-    private final DepartmentServiceV2 departmentServiceV2;
-    private final UserServiceV2 userServiceV2;
+    private final NoticeService noticeServiceV2;
+    private final DepartmentService departmentServiceV2;
+    private final UserService userServiceV2;
     @Autowired
     private ObjectMapper objectMapper;
 
diff --git a/src/main/java/com/example/Jinus/repository/v2/cafeteria/CafeteriaRepositoryV2.java b/src/main/java/com/example/Jinus/repository/cafeteria/CafeteriaRepository.java
similarity index 88%
rename from src/main/java/com/example/Jinus/repository/v2/cafeteria/CafeteriaRepositoryV2.java
rename to src/main/java/com/example/Jinus/repository/cafeteria/CafeteriaRepository.java
index 72a9e2f..0bf62c4 100644
--- a/src/main/java/com/example/Jinus/repository/v2/cafeteria/CafeteriaRepositoryV2.java
+++ b/src/main/java/com/example/Jinus/repository/cafeteria/CafeteriaRepository.java
@@ -1,4 +1,4 @@
-package com.example.Jinus.repository.v2.cafeteria;
+package com.example.Jinus.repository.cafeteria;
 
 import com.example.Jinus.dto.data.CafeteriaDto;
 import com.example.Jinus.entity.cafeteria.CafeteriaEntity;
@@ -6,11 +6,10 @@
 import org.springframework.data.jpa.repository.Query;
 import org.springframework.data.repository.query.Param;
 
-import java.util.HashMap;
 import java.util.List;
 import java.util.Optional;
 
-public interface CafeteriaRepositoryV2 extends JpaRepository<CafeteriaEntity, Integer> {
+public interface CafeteriaRepository extends JpaRepository<CafeteriaEntity, Integer> {
     // 사용자 campusId와 동일한 식당이름과 url 찾기
     @Query(
             "SELECT new com.example.Jinus.dto.data.CafeteriaDto(c.cafeteriaNameKo, c.thumbnailUrl) " +
diff --git a/src/main/java/com/example/Jinus/repository/v2/cafeteria/CampusRepositoryV2.java b/src/main/java/com/example/Jinus/repository/cafeteria/CampusRepository.java
similarity index 86%
rename from src/main/java/com/example/Jinus/repository/v2/cafeteria/CampusRepositoryV2.java
rename to src/main/java/com/example/Jinus/repository/cafeteria/CampusRepository.java
index cebcdf5..4b901a8 100644
--- a/src/main/java/com/example/Jinus/repository/v2/cafeteria/CampusRepositoryV2.java
+++ b/src/main/java/com/example/Jinus/repository/cafeteria/CampusRepository.java
@@ -1,4 +1,4 @@
-package com.example.Jinus.repository.v2.cafeteria;
+package com.example.Jinus.repository.cafeteria;
 
 import com.example.Jinus.entity.cafeteria.CampusEntity;
 import org.springframework.data.jpa.repository.JpaRepository;
@@ -9,7 +9,7 @@
 import java.util.List;
 
 @Repository
-public interface CampusRepositoryV2 extends JpaRepository<CampusEntity, Integer> {
+public interface CampusRepository extends JpaRepository<CampusEntity, Integer> {
     // 사용자 campusId로 캠퍼스 이름 찾기
     @Query("SELECT c.campusNameKo FROM CampusEntity c WHERE c.id = :campusId")
     String findCampusNameByCampusId(@Param("campusId") int campusId);
diff --git a/src/main/java/com/example/Jinus/repository/v2/cafeteria/DietRepositoryV2.java b/src/main/java/com/example/Jinus/repository/cafeteria/DietRepository.java
similarity index 85%
rename from src/main/java/com/example/Jinus/repository/v2/cafeteria/DietRepositoryV2.java
rename to src/main/java/com/example/Jinus/repository/cafeteria/DietRepository.java
index 978aa4e..4787ac2 100644
--- a/src/main/java/com/example/Jinus/repository/v2/cafeteria/DietRepositoryV2.java
+++ b/src/main/java/com/example/Jinus/repository/cafeteria/DietRepository.java
@@ -1,4 +1,4 @@
-package com.example.Jinus.repository.v2.cafeteria;
+package com.example.Jinus.repository.cafeteria;
 
 import com.example.Jinus.dto.data.DietDto;
 import com.example.Jinus.entity.cafeteria.CafeteriaDietEntity;
@@ -11,7 +11,7 @@
 import java.util.List;
 
 @Repository
-public interface DietRepositoryV2 extends JpaRepository<CafeteriaDietEntity, Integer> {
+public interface DietRepository extends JpaRepository<CafeteriaDietEntity, Integer> {
     @Query("SELECT new com.example.Jinus.dto.data.DietDto(c.dishCategory, c.dishName, c.dishType) " +
             "FROM CafeteriaDietEntity c " +
             "WHERE c.dietDate = :dietDate " +
diff --git a/src/main/java/com/example/Jinus/repository/v2/notice/CategoryRepositoryV2.java b/src/main/java/com/example/Jinus/repository/notice/CategoryRepository.java
similarity index 77%
rename from src/main/java/com/example/Jinus/repository/v2/notice/CategoryRepositoryV2.java
rename to src/main/java/com/example/Jinus/repository/notice/CategoryRepository.java
index 23e56ba..1af931c 100644
--- a/src/main/java/com/example/Jinus/repository/v2/notice/CategoryRepositoryV2.java
+++ b/src/main/java/com/example/Jinus/repository/notice/CategoryRepository.java
@@ -1,4 +1,4 @@
-package com.example.Jinus.repository.v2.notice;
+package com.example.Jinus.repository.notice;
 
 import com.example.Jinus.entity.notice.NoticeCategoryEntity;
 import org.springframework.data.jpa.repository.JpaRepository;
@@ -7,7 +7,7 @@
 
 import java.util.List;
 
-public interface CategoryRepositoryV2 extends JpaRepository<NoticeCategoryEntity, Integer> {
+public interface CategoryRepository extends JpaRepository<NoticeCategoryEntity, Integer> {
     @Query("SELECT n FROM NoticeCategoryEntity n" +
             " WHERE n.departmentId = :departmentId AND n.lastNttSn != 0")
     List<NoticeCategoryEntity> findCategoryListByDepartmentId(@Param("departmentId")int departmentId);
diff --git a/src/main/java/com/example/Jinus/repository/v2/notice/NoticeRepositoryV2.java b/src/main/java/com/example/Jinus/repository/notice/NoticeRepository.java
similarity index 78%
rename from src/main/java/com/example/Jinus/repository/v2/notice/NoticeRepositoryV2.java
rename to src/main/java/com/example/Jinus/repository/notice/NoticeRepository.java
index 4376317..22b7480 100644
--- a/src/main/java/com/example/Jinus/repository/v2/notice/NoticeRepositoryV2.java
+++ b/src/main/java/com/example/Jinus/repository/notice/NoticeRepository.java
@@ -1,4 +1,4 @@
-package com.example.Jinus.repository.v2.notice;
+package com.example.Jinus.repository.notice;
 
 import com.example.Jinus.entity.notice.NoticeEntity;
 import org.springframework.data.jpa.repository.JpaRepository;
@@ -7,7 +7,7 @@
 
 import java.util.List;
 
-public interface NoticeRepositoryV2 extends JpaRepository<NoticeEntity, Integer> {
+public interface NoticeRepository extends JpaRepository<NoticeEntity, Integer> {
     @Query("SELECT n FROM NoticeEntity n WHERE n.categoryId = :categoryId " +
             "ORDER BY n.createdAt DESC LIMIT 4")
     List<NoticeEntity> findNoticeListByCategoryId(@Param("categoryId")int categoryId);
diff --git a/src/main/java/com/example/Jinus/repository/v2/userInfo/DepartmentRepositoryV2.java b/src/main/java/com/example/Jinus/repository/userInfo/DepartmentRepository.java
similarity index 76%
rename from src/main/java/com/example/Jinus/repository/v2/userInfo/DepartmentRepositoryV2.java
rename to src/main/java/com/example/Jinus/repository/userInfo/DepartmentRepository.java
index b88985f..95a980d 100644
--- a/src/main/java/com/example/Jinus/repository/v2/userInfo/DepartmentRepositoryV2.java
+++ b/src/main/java/com/example/Jinus/repository/userInfo/DepartmentRepository.java
@@ -1,4 +1,4 @@
-package com.example.Jinus.repository.v2.userInfo;
+package com.example.Jinus.repository.userInfo;
 
 import com.example.Jinus.entity.userInfo.DepartmentEntity;
 import org.springframework.data.jpa.repository.JpaRepository;
@@ -7,7 +7,7 @@
 import org.springframework.stereotype.Repository;
 
 @Repository
-public interface DepartmentRepositoryV2 extends JpaRepository<DepartmentEntity, Integer> {
+public interface DepartmentRepository extends JpaRepository<DepartmentEntity, Integer> {
     // 학과 영문명 찾기
     @Query("SELECT d.departmentEn FROM DepartmentEntity d WHERE d.id = :id")
     String findDepartmentEngById(@Param("id")Integer id);
diff --git a/src/main/java/com/example/Jinus/repository/v2/userInfo/UserRepositoryV2.java b/src/main/java/com/example/Jinus/repository/userInfo/UserRepository.java
similarity index 84%
rename from src/main/java/com/example/Jinus/repository/v2/userInfo/UserRepositoryV2.java
rename to src/main/java/com/example/Jinus/repository/userInfo/UserRepository.java
index 9c8a138..adbf816 100644
--- a/src/main/java/com/example/Jinus/repository/v2/userInfo/UserRepositoryV2.java
+++ b/src/main/java/com/example/Jinus/repository/userInfo/UserRepository.java
@@ -1,4 +1,4 @@
-package com.example.Jinus.repository.v2.userInfo;
+package com.example.Jinus.repository.userInfo;
 
 import com.example.Jinus.entity.userInfo.UserEntity;
 import org.springframework.data.jpa.repository.JpaRepository;
@@ -9,7 +9,7 @@
 import java.util.Optional;
 
 @Repository
-public interface UserRepositoryV2 extends JpaRepository<UserEntity, String> {
+public interface UserRepository extends JpaRepository<UserEntity, String> {
     // 사용자 등록여부 확인(존재한다면 campusId 찾기)
     @Query("SELECT u.campusId FROM UserEntity u WHERE u.kakaoId = :kakaoId")
     Optional<Integer> findCampusIdById(@Param("kakaoId") String id);
diff --git a/src/main/java/com/example/Jinus/service/v2/cafeteria/CacheServiceV2.java b/src/main/java/com/example/Jinus/service/cafeteria/CacheService.java
similarity index 85%
rename from src/main/java/com/example/Jinus/service/v2/cafeteria/CacheServiceV2.java
rename to src/main/java/com/example/Jinus/service/cafeteria/CacheService.java
index 6eb741b..c2c246c 100644
--- a/src/main/java/com/example/Jinus/service/v2/cafeteria/CacheServiceV2.java
+++ b/src/main/java/com/example/Jinus/service/cafeteria/CacheService.java
@@ -1,15 +1,14 @@
-package com.example.Jinus.service.v2.cafeteria;
+package com.example.Jinus.service.cafeteria;
 
 import com.example.Jinus.config.RedisConfig;
 import com.example.Jinus.dto.data.CafeteriaDto;
 import com.example.Jinus.dto.data.DietDto;
 import com.example.Jinus.dto.data.HandleRequestDto;
-import com.example.Jinus.repository.v2.cafeteria.CafeteriaRepositoryV2;
-import com.example.Jinus.repository.v2.cafeteria.DietRepositoryV2;
+import com.example.Jinus.repository.cafeteria.CafeteriaRepository;
+import com.example.Jinus.repository.cafeteria.DietRepository;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.cache.annotation.Cacheable;
-import org.springframework.data.redis.core.RedisTemplate;
 import org.springframework.stereotype.Service;
 
 import java.sql.Date;
@@ -20,9 +19,9 @@
 @Service
 @Slf4j
 @RequiredArgsConstructor
-public class CacheServiceV2 {
-    private final DietRepositoryV2 dietRepositoryV2;
-    private final CafeteriaRepositoryV2 cafeteriaRepositoryV2;
+public class CacheService {
+    private final DietRepository dietRepositoryV2;
+    private final CafeteriaRepository cafeteriaRepositoryV2;
     private final RedisConfig redisConfig;
 
     public List<DietDto> getDietList(HandleRequestDto parameters, int cafeteriaId) {
diff --git a/src/main/java/com/example/Jinus/service/v2/cafeteria/CafeteriaQueryServiceV2.java b/src/main/java/com/example/Jinus/service/cafeteria/CafeteriaQueryService.java
similarity index 78%
rename from src/main/java/com/example/Jinus/service/v2/cafeteria/CafeteriaQueryServiceV2.java
rename to src/main/java/com/example/Jinus/service/cafeteria/CafeteriaQueryService.java
index b974ae5..0dcc2f0 100644
--- a/src/main/java/com/example/Jinus/service/v2/cafeteria/CafeteriaQueryServiceV2.java
+++ b/src/main/java/com/example/Jinus/service/cafeteria/CafeteriaQueryService.java
@@ -1,6 +1,6 @@
-package com.example.Jinus.service.v2.cafeteria;
+package com.example.Jinus.service.cafeteria;
 
-import com.example.Jinus.repository.v2.cafeteria.CafeteriaRepositoryV2;
+import com.example.Jinus.repository.cafeteria.CafeteriaRepository;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.cache.annotation.Cacheable;
@@ -9,8 +9,8 @@
 @Service
 @RequiredArgsConstructor
 @Slf4j
-public class CafeteriaQueryServiceV2 {
-    private final CafeteriaRepositoryV2 cafeteriaRepositoryV2;
+public class CafeteriaQueryService {
+    private final CafeteriaRepository cafeteriaRepositoryV2;
 
     @Cacheable(
             value = "cafeteriaId",
diff --git a/src/main/java/com/example/Jinus/service/v2/cafeteria/CafeteriaResponseServiceV2.java b/src/main/java/com/example/Jinus/service/cafeteria/CafeteriaResponseService.java
similarity index 95%
rename from src/main/java/com/example/Jinus/service/v2/cafeteria/CafeteriaResponseServiceV2.java
rename to src/main/java/com/example/Jinus/service/cafeteria/CafeteriaResponseService.java
index 22bdb5c..6e4367d 100644
--- a/src/main/java/com/example/Jinus/service/v2/cafeteria/CafeteriaResponseServiceV2.java
+++ b/src/main/java/com/example/Jinus/service/cafeteria/CafeteriaResponseService.java
@@ -1,4 +1,4 @@
-package com.example.Jinus.service.v2.cafeteria;
+package com.example.Jinus.service.cafeteria;
 
 import com.example.Jinus.dto.data.CafeteriaDto;
 import com.example.Jinus.dto.response.ButtonDto;
@@ -16,7 +16,7 @@
 
 @Service
 @RequiredArgsConstructor
-public class CafeteriaResponseServiceV2 {
+public class CafeteriaResponseService {
 
     // 식당 리스트 카드 생성
     public String createCafeteriaListCard(String campusName, List<CafeteriaDto> cafeteriaList) {
diff --git a/src/main/java/com/example/Jinus/service/v2/cafeteria/CafeteriaServiceV2.java b/src/main/java/com/example/Jinus/service/cafeteria/CafeteriaService.java
similarity index 80%
rename from src/main/java/com/example/Jinus/service/v2/cafeteria/CafeteriaServiceV2.java
rename to src/main/java/com/example/Jinus/service/cafeteria/CafeteriaService.java
index 532828e..2e06780 100644
--- a/src/main/java/com/example/Jinus/service/v2/cafeteria/CafeteriaServiceV2.java
+++ b/src/main/java/com/example/Jinus/service/cafeteria/CafeteriaService.java
@@ -1,4 +1,4 @@
-package com.example.Jinus.service.v2.cafeteria;
+package com.example.Jinus.service.cafeteria;
 
 import com.example.Jinus.dto.data.CafeteriaDto;
 import lombok.RequiredArgsConstructor;
@@ -8,12 +8,12 @@
 
 @Service
 @RequiredArgsConstructor
-public class CafeteriaServiceV2 {
+public class CafeteriaService {
 
-    private final CampusServiceV2 campusServiceV2;
-    private final CampusResponseServiceV2 campusResponseServiceV2;
-    private final CacheServiceV2 cacheServiceV2;
-    private final CafeteriaResponseServiceV2 cafeteriaResponseServiceV2;
+    private final CampusService campusServiceV2;
+    private final CampusResponseService campusResponseServiceV2;
+    private final CacheService cacheServiceV2;
+    private final CafeteriaResponseService cafeteriaResponseServiceV2;
 
     // 사용자가 선택한 블록 ID값에 따라 반환 조건 설정
     // campusId가 -1이면 사용자 정보가 존재하지 않는 경우임
diff --git a/src/main/java/com/example/Jinus/service/v2/cafeteria/CampusResponseServiceV2.java b/src/main/java/com/example/Jinus/service/cafeteria/CampusResponseService.java
similarity index 92%
rename from src/main/java/com/example/Jinus/service/v2/cafeteria/CampusResponseServiceV2.java
rename to src/main/java/com/example/Jinus/service/cafeteria/CampusResponseService.java
index efb3b0f..732cbed 100644
--- a/src/main/java/com/example/Jinus/service/v2/cafeteria/CampusResponseServiceV2.java
+++ b/src/main/java/com/example/Jinus/service/cafeteria/CampusResponseService.java
@@ -1,4 +1,4 @@
-package com.example.Jinus.service.v2.cafeteria;
+package com.example.Jinus.service.cafeteria;
 
 import com.example.Jinus.dto.response.ListItemDto;
 import com.example.Jinus.dto.response.ResponseDto;
@@ -15,9 +15,9 @@
 
 @Service
 @RequiredArgsConstructor
-public class CampusResponseServiceV2 {
+public class CampusResponseService {
 
-    private final CampusServiceV2 campusServiceV2;
+    private final CampusService campusServiceV2;
 
     // 캠퍼스 리스트 반환 메소드
     public String makeCampusListCard() {
diff --git a/src/main/java/com/example/Jinus/service/v2/cafeteria/CampusServiceV2.java b/src/main/java/com/example/Jinus/service/cafeteria/CampusService.java
similarity index 83%
rename from src/main/java/com/example/Jinus/service/v2/cafeteria/CampusServiceV2.java
rename to src/main/java/com/example/Jinus/service/cafeteria/CampusService.java
index 8e4c1bc..6d4f35f 100644
--- a/src/main/java/com/example/Jinus/service/v2/cafeteria/CampusServiceV2.java
+++ b/src/main/java/com/example/Jinus/service/cafeteria/CampusService.java
@@ -1,7 +1,7 @@
-package com.example.Jinus.service.v2.cafeteria;
+package com.example.Jinus.service.cafeteria;
 
 import com.example.Jinus.entity.cafeteria.CampusEntity;
-import com.example.Jinus.repository.v2.cafeteria.CampusRepositoryV2;
+import com.example.Jinus.repository.cafeteria.CampusRepository;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.cache.annotation.Cacheable;
@@ -12,8 +12,8 @@
 @Service
 @RequiredArgsConstructor
 @Slf4j
-public class CampusServiceV2 {
-    private final CampusRepositoryV2 campusRepositoryV2;
+public class CampusService {
+    private final CampusRepository campusRepositoryV2;
 
     @Cacheable(
             value = "campusId",
diff --git a/src/main/java/com/example/Jinus/service/v2/cafeteria/DietParameterServiceV2.java b/src/main/java/com/example/Jinus/service/diet/DietParameterService.java
similarity index 92%
rename from src/main/java/com/example/Jinus/service/v2/cafeteria/DietParameterServiceV2.java
rename to src/main/java/com/example/Jinus/service/diet/DietParameterService.java
index c13a527..15b3829 100644
--- a/src/main/java/com/example/Jinus/service/v2/cafeteria/DietParameterServiceV2.java
+++ b/src/main/java/com/example/Jinus/service/diet/DietParameterService.java
@@ -1,9 +1,10 @@
-package com.example.Jinus.service.v2.cafeteria;
+package com.example.Jinus.service.diet;
 
 import com.example.Jinus.dto.data.HandleRequestDto;
 import com.example.Jinus.dto.request.DetailParamsItemFieldDto;
 import com.example.Jinus.dto.request.RequestDto;
-import com.example.Jinus.service.v2.userInfo.UserServiceV2;
+import com.example.Jinus.service.cafeteria.CampusService;
+import com.example.Jinus.service.userInfo.UserService;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
@@ -16,10 +17,10 @@
 @Service
 @RequiredArgsConstructor
 @Slf4j
-public class DietParameterServiceV2 {
+public class DietParameterService {
 
-    private final UserServiceV2 userServiceV2;
-    private final CampusServiceV2 campusServiceV2;
+    private final UserService userServiceV2;
+    private final CampusService campusServiceV2;
 
     // 요청 파라미터 객체 생성
     public HandleRequestDto setParameters(String kakaoId, LocalTime time, RequestDto requestDto) {
diff --git a/src/main/java/com/example/Jinus/service/v2/cafeteria/DietQueryServiceV2.java b/src/main/java/com/example/Jinus/service/diet/DietQueryService.java
similarity index 88%
rename from src/main/java/com/example/Jinus/service/v2/cafeteria/DietQueryServiceV2.java
rename to src/main/java/com/example/Jinus/service/diet/DietQueryService.java
index 5cd0c6f..0ae8d03 100644
--- a/src/main/java/com/example/Jinus/service/v2/cafeteria/DietQueryServiceV2.java
+++ b/src/main/java/com/example/Jinus/service/diet/DietQueryService.java
@@ -1,15 +1,15 @@
-package com.example.Jinus.service.v2.cafeteria;
+package com.example.Jinus.service.diet;
 
 import com.example.Jinus.dto.data.DietDto;
 import com.example.Jinus.dto.data.HandleRequestDto;
-import com.example.Jinus.repository.v2.cafeteria.DietRepositoryV2;
+import com.example.Jinus.repository.cafeteria.DietRepository;
+import com.example.Jinus.service.cafeteria.CacheService;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
 import org.springframework.util.LinkedMultiValueMap;
 import org.springframework.util.MultiValueMap;
 
-import java.sql.Date;
 import java.util.List;
 import java.util.Set;
 import java.util.TreeSet;
@@ -17,10 +17,10 @@
 @Service
 @RequiredArgsConstructor
 @Slf4j
-public class DietQueryServiceV2 {
+public class DietQueryService {
 
-    private final CacheServiceV2 cacheServiceV2;
-    private final DietRepositoryV2 dietRepositoryV2;
+    private final CacheService cacheServiceV2;
+    private final DietRepository dietRepositoryV2;
 
     // 메뉴 존재 여부에 따른 반환값 처리 로직
     public String getDietResponse(HandleRequestDto parameters, int cafeteriaId) {
diff --git a/src/main/java/com/example/Jinus/service/v2/cafeteria/DietResponseServiceV2.java b/src/main/java/com/example/Jinus/service/diet/DietResponseService.java
similarity index 96%
rename from src/main/java/com/example/Jinus/service/v2/cafeteria/DietResponseServiceV2.java
rename to src/main/java/com/example/Jinus/service/diet/DietResponseService.java
index a033a1f..5f4d239 100644
--- a/src/main/java/com/example/Jinus/service/v2/cafeteria/DietResponseServiceV2.java
+++ b/src/main/java/com/example/Jinus/service/diet/DietResponseService.java
@@ -1,4 +1,4 @@
-package com.example.Jinus.service.v2.cafeteria;
+package com.example.Jinus.service.diet;
 
 import com.example.Jinus.dto.data.HandleRequestDto;
 import com.example.Jinus.dto.response.*;
@@ -12,7 +12,7 @@
 
 @Service
 @RequiredArgsConstructor
-public class DietResponseServiceV2 {
+public class DietResponseService {
 
     // 응답 객체 매핑
     public String mappingResponse(HandleRequestDto parameters, String imgUrl, String title, String description) {
diff --git a/src/main/java/com/example/Jinus/service/v2/cafeteria/DietServiceV2.java b/src/main/java/com/example/Jinus/service/diet/DietService.java
similarity index 85%
rename from src/main/java/com/example/Jinus/service/v2/cafeteria/DietServiceV2.java
rename to src/main/java/com/example/Jinus/service/diet/DietService.java
index 9439e14..5a6a8d0 100644
--- a/src/main/java/com/example/Jinus/service/v2/cafeteria/DietServiceV2.java
+++ b/src/main/java/com/example/Jinus/service/diet/DietService.java
@@ -1,7 +1,9 @@
-package com.example.Jinus.service.v2.cafeteria;
+package com.example.Jinus.service.diet;
 
 import com.example.Jinus.dto.data.HandleRequestDto;
 import com.example.Jinus.dto.request.RequestDto;
+import com.example.Jinus.service.cafeteria.CafeteriaQueryService;
+import com.example.Jinus.service.cafeteria.CampusService;
 import com.example.Jinus.utility.DateUtils;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
@@ -15,13 +17,13 @@
 @Service
 @Slf4j
 @RequiredArgsConstructor
-public class DietServiceV2 {
+public class DietService {
 
-    private final CampusServiceV2 campusServiceV2;
-    private final CafeteriaQueryServiceV2 cafeteriaQueryServiceV2;
-    private final DietParameterServiceV2 dietParameterServiceV2;
-    private final DietResponseServiceV2 dietResponseServiceV2;
-    private final DietQueryServiceV2 dietQueryServiceV2;
+    private final CampusService campusServiceV2;
+    private final CafeteriaQueryService cafeteriaQueryServiceV2;
+    private final DietParameterService dietParameterServiceV2;
+    private final DietResponseService dietResponseServiceV2;
+    private final DietQueryService dietQueryServiceV2;
 
     // 식단 데이터 찾기 위해 필요한 파라미터 추출 및 초기화
     public String requestHandler(RequestDto requestDto) {
diff --git a/src/main/java/com/example/Jinus/service/v2/notice/CategoryServiceV2.java b/src/main/java/com/example/Jinus/service/notice/CategoryService.java
similarity index 67%
rename from src/main/java/com/example/Jinus/service/v2/notice/CategoryServiceV2.java
rename to src/main/java/com/example/Jinus/service/notice/CategoryService.java
index 9689039..90630ec 100644
--- a/src/main/java/com/example/Jinus/service/v2/notice/CategoryServiceV2.java
+++ b/src/main/java/com/example/Jinus/service/notice/CategoryService.java
@@ -1,7 +1,7 @@
-package com.example.Jinus.service.v2.notice;
+package com.example.Jinus.service.notice;
 
 import com.example.Jinus.entity.notice.NoticeCategoryEntity;
-import com.example.Jinus.repository.v2.notice.CategoryRepositoryV2;
+import com.example.Jinus.repository.notice.CategoryRepository;
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
 
@@ -9,9 +9,9 @@
 
 @Service
 @RequiredArgsConstructor
-public class CategoryServiceV2 {
+public class CategoryService {
 
-    private final CategoryRepositoryV2 noticeCategoryRepository;
+    private final CategoryRepository noticeCategoryRepository;
 
     // 사용자 학과id와 일치하는 카테고리 찾기
     public List<NoticeCategoryEntity> getCategoryEntity(int departmentId) {
diff --git a/src/main/java/com/example/Jinus/service/v2/notice/NoticeServiceV2.java b/src/main/java/com/example/Jinus/service/notice/NoticeService.java
similarity index 95%
rename from src/main/java/com/example/Jinus/service/v2/notice/NoticeServiceV2.java
rename to src/main/java/com/example/Jinus/service/notice/NoticeService.java
index 6074534..e0bfd1d 100644
--- a/src/main/java/com/example/Jinus/service/v2/notice/NoticeServiceV2.java
+++ b/src/main/java/com/example/Jinus/service/notice/NoticeService.java
@@ -1,9 +1,9 @@
-package com.example.Jinus.service.v2.notice;
+package com.example.Jinus.service.notice;
 
 import com.example.Jinus.dto.response.*;
 import com.example.Jinus.entity.notice.NoticeCategoryEntity;
 import com.example.Jinus.entity.notice.NoticeEntity;
-import com.example.Jinus.repository.v2.notice.NoticeRepositoryV2;
+import com.example.Jinus.repository.notice.NoticeRepository;
 import com.example.Jinus.utility.JsonUtils;
 import com.example.Jinus.utility.TextCardResponse;
 import lombok.RequiredArgsConstructor;
@@ -16,10 +16,10 @@
 
 @Service
 @RequiredArgsConstructor
-public class NoticeServiceV2 {
+public class NoticeService {
 
-    private final NoticeRepositoryV2 noticeRepositoryV2;
-    private final CategoryServiceV2 categoryServiceV2;
+    private final NoticeRepository noticeRepositoryV2;
+    private final CategoryService categoryServiceV2;
 
     // db에 학과정보가 있는 경우 -> 공지리스트 반환
     public String existUserReturnNotice(String departmentEng, int departmentId) {
diff --git a/src/main/java/com/example/Jinus/service/v2/userInfo/DepartmentServiceV2.java b/src/main/java/com/example/Jinus/service/userInfo/DepartmentService.java
similarity index 57%
rename from src/main/java/com/example/Jinus/service/v2/userInfo/DepartmentServiceV2.java
rename to src/main/java/com/example/Jinus/service/userInfo/DepartmentService.java
index 09e49ff..1f42b30 100644
--- a/src/main/java/com/example/Jinus/service/v2/userInfo/DepartmentServiceV2.java
+++ b/src/main/java/com/example/Jinus/service/userInfo/DepartmentService.java
@@ -1,14 +1,14 @@
-package com.example.Jinus.service.v2.userInfo;
+package com.example.Jinus.service.userInfo;
 
-import com.example.Jinus.repository.v2.userInfo.DepartmentRepositoryV2;
+import com.example.Jinus.repository.userInfo.DepartmentRepository;
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
 
 @Service
 @RequiredArgsConstructor
-public class DepartmentServiceV2 {
+public class DepartmentService {
 
-    private final DepartmentRepositoryV2 departmentRepository;
+    private final DepartmentRepository departmentRepository;
 
     // 학과 영문명 찾기
     public String getDepartmentEng(int departmentId) {
diff --git a/src/main/java/com/example/Jinus/service/v2/userInfo/UserServiceV2.java b/src/main/java/com/example/Jinus/service/userInfo/UserService.java
similarity index 88%
rename from src/main/java/com/example/Jinus/service/v2/userInfo/UserServiceV2.java
rename to src/main/java/com/example/Jinus/service/userInfo/UserService.java
index 9a331cb..b1613c2 100644
--- a/src/main/java/com/example/Jinus/service/v2/userInfo/UserServiceV2.java
+++ b/src/main/java/com/example/Jinus/service/userInfo/UserService.java
@@ -1,6 +1,6 @@
-package com.example.Jinus.service.v2.userInfo;
+package com.example.Jinus.service.userInfo;
 
-import com.example.Jinus.repository.v2.userInfo.UserRepositoryV2;
+import com.example.Jinus.repository.userInfo.UserRepository;
 import jakarta.transaction.Transactional;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
@@ -12,9 +12,9 @@
 @Service
 @RequiredArgsConstructor
 @Slf4j
-public class UserServiceV2 {
+public class UserService {
 
-    private final UserRepositoryV2 userRepositoryV2;
+    private final UserRepository userRepositoryV2;
 
     public int getUserCampusId(String userId) {
         Optional<Integer> campusId = userRepositoryV2.findCampusIdById(userId);
diff --git a/src/test/java/com/example/Jinus/controller/CafeteriaControllerV2Test.java b/src/test/java/com/example/Jinus/controller/CafeteriaControllerTest.java
similarity index 58%
rename from src/test/java/com/example/Jinus/controller/CafeteriaControllerV2Test.java
rename to src/test/java/com/example/Jinus/controller/CafeteriaControllerTest.java
index 9d1f072..1e05992 100644
--- a/src/test/java/com/example/Jinus/controller/CafeteriaControllerV2Test.java
+++ b/src/test/java/com/example/Jinus/controller/CafeteriaControllerTest.java
@@ -1,37 +1,32 @@
 package com.example.Jinus.controller;
 
-import com.example.Jinus.controller.v2.CafeteriaControllerV2;
-import com.example.Jinus.service.v2.cafeteria.CafeteriaServiceV2;
-import com.example.Jinus.service.v2.cafeteria.CampusServiceV2;
-import com.example.Jinus.service.v2.userInfo.UserServiceV2;
+import com.example.Jinus.service.cafeteria.CafeteriaService;
+import com.example.Jinus.service.cafeteria.CampusService;
+import com.example.Jinus.service.userInfo.UserService;
 import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
 import org.mockito.junit.jupiter.MockitoExtension;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.test.autoconfigure.jdbc.AutoConfigureTestDatabase;
 import org.springframework.boot.test.autoconfigure.web.servlet.WebMvcTest;
-import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.boot.test.mock.mockito.MockBean;
-import org.springframework.test.context.ActiveProfiles;
-import org.springframework.test.context.junit4.SpringRunner;
 import org.springframework.test.web.servlet.MockMvc;
 
 import java.util.ArrayList;
 import java.util.List;
 
 @ExtendWith(MockitoExtension.class)
-@WebMvcTest(CafeteriaControllerV2.class)  // 해당 클래스만 테스트
-public class CafeteriaControllerV2Test {
+@WebMvcTest(CafeteriaController.class)  // 해당 클래스만 테스트
+public class CafeteriaControllerTest {
 
     @Autowired
     private MockMvc mockMvc;  // HTTP 요청을 모의
     @MockBean
-    private CafeteriaServiceV2 cafeteriaServiceV2;  // Service를 mock 처리
+    private CafeteriaService cafeteriaServiceV2;  // Service를 mock 처리
     @MockBean
-    private CampusServiceV2 campusServiceV2;
+    private CampusService campusServiceV2;
     @MockBean
-    private UserServiceV2 userServiceV2;
+    private UserService userServiceV2;
 
     @Test
     @DisplayName("식당 리스트 반환")
diff --git a/src/test/java/com/example/Jinus/repository/cafeteria/CafeteriaRepositoryV2Test.java b/src/test/java/com/example/Jinus/repository/cafeteria/CafeteriaRepositoryTest.java
similarity index 92%
rename from src/test/java/com/example/Jinus/repository/cafeteria/CafeteriaRepositoryV2Test.java
rename to src/test/java/com/example/Jinus/repository/cafeteria/CafeteriaRepositoryTest.java
index 8caf17d..9b5c4ab 100644
--- a/src/test/java/com/example/Jinus/repository/cafeteria/CafeteriaRepositoryV2Test.java
+++ b/src/test/java/com/example/Jinus/repository/cafeteria/CafeteriaRepositoryTest.java
@@ -2,7 +2,6 @@
 
 import com.example.Jinus.dto.data.CafeteriaDto;
 import com.example.Jinus.entity.cafeteria.CafeteriaEntity;
-import com.example.Jinus.repository.v2.cafeteria.CafeteriaRepositoryV2;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.Test;
@@ -23,7 +22,7 @@
 @DataJpaTest
 @ActiveProfiles("test")  // application-test.properties 적용
 @AutoConfigureTestDatabase(replace = AutoConfigureTestDatabase.Replace.ANY)  // H2 사용
-public class CafeteriaRepositoryV2Test {
+public class CafeteriaRepositoryTest {
 
     @BeforeEach
     void setUp() {
@@ -31,7 +30,7 @@ void setUp() {
         cafeteriaRepositoryV2.save(cafeteriaEntity);
     }
     @Autowired
-    private CafeteriaRepositoryV2 cafeteriaRepositoryV2;
+    private CafeteriaRepository cafeteriaRepositoryV2;
 
     @Test
     @DisplayName("사용자 캠퍼스에 해당하는 식당리스트 찾기")
diff --git a/src/test/java/com/example/Jinus/repository/cafeteria/CampusRepositoryV2Test.java b/src/test/java/com/example/Jinus/repository/cafeteria/CampusRepositoryTest.java
similarity index 93%
rename from src/test/java/com/example/Jinus/repository/cafeteria/CampusRepositoryV2Test.java
rename to src/test/java/com/example/Jinus/repository/cafeteria/CampusRepositoryTest.java
index 5219920..82071fd 100644
--- a/src/test/java/com/example/Jinus/repository/cafeteria/CampusRepositoryV2Test.java
+++ b/src/test/java/com/example/Jinus/repository/cafeteria/CampusRepositoryTest.java
@@ -1,7 +1,6 @@
 package com.example.Jinus.repository.cafeteria;
 
 import com.example.Jinus.entity.cafeteria.CampusEntity;
-import com.example.Jinus.repository.v2.cafeteria.CampusRepositoryV2;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.Test;
@@ -22,10 +21,10 @@
 @DataJpaTest
 @ActiveProfiles("test")  // application-test.properties 적용
 @AutoConfigureTestDatabase(replace = AutoConfigureTestDatabase.Replace.ANY)  // H2 사용
-public class CampusRepositoryV2Test {
+public class CampusRepositoryTest {
 
     @Autowired
-    private CampusRepositoryV2 campusRepositoryV2;
+    private CampusRepository campusRepositoryV2;
 
     @BeforeEach
     void setUp() {
diff --git a/src/test/java/com/example/Jinus/repository/notice/NoticeCategoryRepositoryV2Test.java b/src/test/java/com/example/Jinus/repository/notice/NoticeCategoryRepositoryTest.java
similarity index 92%
rename from src/test/java/com/example/Jinus/repository/notice/NoticeCategoryRepositoryV2Test.java
rename to src/test/java/com/example/Jinus/repository/notice/NoticeCategoryRepositoryTest.java
index 0ca8929..2b0dcfc 100644
--- a/src/test/java/com/example/Jinus/repository/notice/NoticeCategoryRepositoryV2Test.java
+++ b/src/test/java/com/example/Jinus/repository/notice/NoticeCategoryRepositoryTest.java
@@ -1,7 +1,6 @@
 package com.example.Jinus.repository.notice;
 
 import com.example.Jinus.entity.notice.NoticeCategoryEntity;
-import com.example.Jinus.repository.v2.notice.CategoryRepositoryV2;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.Test;
@@ -22,10 +21,10 @@
 @DataJpaTest
 @ActiveProfiles("test")  // application-test.properties 적용
 @AutoConfigureTestDatabase(replace = AutoConfigureTestDatabase.Replace.ANY)  // H2 사용
-public class NoticeCategoryRepositoryV2Test {
+public class NoticeCategoryRepositoryTest {
 
     @Autowired
-    private CategoryRepositoryV2 noticeCategoryRepository;
+    private CategoryRepository noticeCategoryRepository;
 
     @BeforeEach
     void setUp() {
diff --git a/src/test/java/com/example/Jinus/repository/notice/NoticeRepositoryV2Test.java b/src/test/java/com/example/Jinus/repository/notice/NoticeRepositoryTest.java
similarity index 92%
rename from src/test/java/com/example/Jinus/repository/notice/NoticeRepositoryV2Test.java
rename to src/test/java/com/example/Jinus/repository/notice/NoticeRepositoryTest.java
index ad3c07e..97ddfed 100644
--- a/src/test/java/com/example/Jinus/repository/notice/NoticeRepositoryV2Test.java
+++ b/src/test/java/com/example/Jinus/repository/notice/NoticeRepositoryTest.java
@@ -1,7 +1,6 @@
 package com.example.Jinus.repository.notice;
 
 import com.example.Jinus.entity.notice.NoticeEntity;
-import com.example.Jinus.repository.v2.notice.NoticeRepositoryV2;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.Test;
@@ -21,10 +20,10 @@
 @DataJpaTest
 @ActiveProfiles("test")  // application-test.properties 적용
 @AutoConfigureTestDatabase(replace = AutoConfigureTestDatabase.Replace.ANY)  // H2 사용
-public class NoticeRepositoryV2Test {
+public class NoticeRepositoryTest {
 
     @Autowired
-    NoticeRepositoryV2 noticeRepositoryV2;
+    NoticeRepository noticeRepositoryV2;
 
     @BeforeEach
     void setUp() {
diff --git a/src/test/java/com/example/Jinus/repository/userInfo/DepartmentRepostoryV2Test.java b/src/test/java/com/example/Jinus/repository/userInfo/DepartmentRepostoryTest.java
similarity index 88%
rename from src/test/java/com/example/Jinus/repository/userInfo/DepartmentRepostoryV2Test.java
rename to src/test/java/com/example/Jinus/repository/userInfo/DepartmentRepostoryTest.java
index ffebf90..bf0acbf 100644
--- a/src/test/java/com/example/Jinus/repository/userInfo/DepartmentRepostoryV2Test.java
+++ b/src/test/java/com/example/Jinus/repository/userInfo/DepartmentRepostoryTest.java
@@ -1,7 +1,6 @@
 package com.example.Jinus.repository.userInfo;
 
 import com.example.Jinus.entity.userInfo.DepartmentEntity;
-import com.example.Jinus.repository.v2.userInfo.DepartmentRepositoryV2;
 import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
@@ -17,10 +16,10 @@
 @DataJpaTest
 @ActiveProfiles("test")  // application-test.properties 적용
 @AutoConfigureTestDatabase(replace = AutoConfigureTestDatabase.Replace.ANY)  // H2 사용
-public class DepartmentRepostoryV2Test {
+public class DepartmentRepostoryTest {
 
     @Autowired
-    private DepartmentRepositoryV2 departmentRepository;
+    private DepartmentRepository departmentRepository;
 
     @Test
     @DisplayName("학과 영문명 찾기")
diff --git a/src/test/java/com/example/Jinus/repository/userInfo/UserRepositoryV2Test.java b/src/test/java/com/example/Jinus/repository/userInfo/UserRepositoryTest.java
similarity index 94%
rename from src/test/java/com/example/Jinus/repository/userInfo/UserRepositoryV2Test.java
rename to src/test/java/com/example/Jinus/repository/userInfo/UserRepositoryTest.java
index 00591cc..e4927d2 100644
--- a/src/test/java/com/example/Jinus/repository/userInfo/UserRepositoryV2Test.java
+++ b/src/test/java/com/example/Jinus/repository/userInfo/UserRepositoryTest.java
@@ -1,7 +1,6 @@
 package com.example.Jinus.repository.userInfo;
 
 import com.example.Jinus.entity.userInfo.UserEntity;
-import com.example.Jinus.repository.v2.userInfo.UserRepositoryV2;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.Test;
@@ -20,7 +19,7 @@
 @DataJpaTest
 @ActiveProfiles("test")  // application-test.properties 적용
 @AutoConfigureTestDatabase(replace = AutoConfigureTestDatabase.Replace.ANY)  // H2 사용
-public class UserRepositoryV2Test {
+public class UserRepositoryTest {
 
     @BeforeEach
     void setUp() {
@@ -29,7 +28,7 @@ void setUp() {
     }
 
     @Autowired
-    private UserRepositoryV2 userRepositoryV2;
+    private UserRepository userRepositoryV2;
 
     @Test
     @DisplayName("사용자 등록여부 확인")
diff --git a/src/test/java/com/example/Jinus/service/cafeteria/CafeteriaServiceV2Test.java b/src/test/java/com/example/Jinus/service/cafeteria/CafeteriaServiceTest.java
similarity index 61%
rename from src/test/java/com/example/Jinus/service/cafeteria/CafeteriaServiceV2Test.java
rename to src/test/java/com/example/Jinus/service/cafeteria/CafeteriaServiceTest.java
index 2a57bbd..846f50a 100644
--- a/src/test/java/com/example/Jinus/service/cafeteria/CafeteriaServiceV2Test.java
+++ b/src/test/java/com/example/Jinus/service/cafeteria/CafeteriaServiceTest.java
@@ -1,10 +1,7 @@
 package com.example.Jinus.service.cafeteria;
 
-import com.example.Jinus.config.RedisCacheManager;
 import com.example.Jinus.dto.data.CafeteriaDto;
-import com.example.Jinus.repository.v2.cafeteria.CafeteriaRepositoryV2;
-import com.example.Jinus.service.v2.cafeteria.CacheServiceV2;
-import com.example.Jinus.service.v2.cafeteria.CafeteriaServiceV2;
+import com.example.Jinus.repository.cafeteria.CafeteriaRepository;
 import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
@@ -12,27 +9,20 @@
 import org.mockito.Mock;
 import org.mockito.Mockito;
 import org.mockito.junit.jupiter.MockitoExtension;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.boot.test.mock.mockito.MockBean;
-import org.springframework.data.redis.core.RedisTemplate;
-import org.springframework.data.redis.core.ValueOperations;
 
 import java.util.ArrayList;
 import java.util.List;
-import java.util.Optional;
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.mockito.Mockito.verify;
-import static org.springframework.test.web.client.ExpectedCount.times;
 
 @ExtendWith(MockitoExtension.class)
-public class CafeteriaServiceV2Test {
+public class CafeteriaServiceTest {
 
     @InjectMocks
-    private CacheServiceV2 cacheServiceV2;
+    private CacheService cacheServiceV2;
     @Mock
-    private CafeteriaRepositoryV2 cafeteriaRepositoryV2;
+    private CafeteriaRepository cafeteriaRepositoryV2;
 
     @Test
     @DisplayName("사용자 캠퍼스id에 해당하는 식당리스트 찾기")
diff --git a/src/test/java/com/example/Jinus/service/cafeteria/CampusServiceV2Test.java b/src/test/java/com/example/Jinus/service/cafeteria/CampusServiceTest.java
similarity index 86%
rename from src/test/java/com/example/Jinus/service/cafeteria/CampusServiceV2Test.java
rename to src/test/java/com/example/Jinus/service/cafeteria/CampusServiceTest.java
index 1ca2b10..f475f0d 100644
--- a/src/test/java/com/example/Jinus/service/cafeteria/CampusServiceV2Test.java
+++ b/src/test/java/com/example/Jinus/service/cafeteria/CampusServiceTest.java
@@ -1,8 +1,7 @@
 package com.example.Jinus.service.cafeteria;
 
 import com.example.Jinus.entity.cafeteria.CampusEntity;
-import com.example.Jinus.repository.v2.cafeteria.CampusRepositoryV2;
-import com.example.Jinus.service.v2.cafeteria.CampusServiceV2;
+import com.example.Jinus.repository.cafeteria.CampusRepository;
 import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
@@ -17,12 +16,12 @@
 import static org.assertj.core.api.Assertions.assertThat;
 
 @ExtendWith(MockitoExtension.class)
-public class CampusServiceV2Test {
+public class CampusServiceTest {
 
     @InjectMocks
-    private CampusServiceV2 campusServiceV2;
+    private CampusService campusServiceV2;
     @Mock
-    private CampusRepositoryV2 campusRepositoryV2;
+    private CampusRepository campusRepositoryV2;
 
     @Test
     @DisplayName("사용자 캠퍼스 찾기")
diff --git a/src/test/java/com/example/Jinus/service/notice/CategoryServiceV2Test.java b/src/test/java/com/example/Jinus/service/notice/CategoryServiceTest.java
similarity index 85%
rename from src/test/java/com/example/Jinus/service/notice/CategoryServiceV2Test.java
rename to src/test/java/com/example/Jinus/service/notice/CategoryServiceTest.java
index 67117b5..1e7e692 100644
--- a/src/test/java/com/example/Jinus/service/notice/CategoryServiceV2Test.java
+++ b/src/test/java/com/example/Jinus/service/notice/CategoryServiceTest.java
@@ -1,8 +1,7 @@
 package com.example.Jinus.service.notice;
 
 import com.example.Jinus.entity.notice.NoticeCategoryEntity;
-import com.example.Jinus.repository.v2.notice.CategoryRepositoryV2;
-import com.example.Jinus.service.v2.notice.CategoryServiceV2;
+import com.example.Jinus.repository.notice.CategoryRepository;
 import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
@@ -17,12 +16,12 @@
 
 
 @ExtendWith(MockitoExtension.class)
-public class CategoryServiceV2Test {
+public class CategoryServiceTest {
 
     @Mock
-    private CategoryRepositoryV2 noticeCategoryRepository;
+    private CategoryRepository noticeCategoryRepository;
     @InjectMocks
-    private CategoryServiceV2 categoryService;
+    private CategoryService categoryService;
 
     @Test
     @DisplayName("사용자 학과id와 일치하는 카테고리 찾기")
diff --git a/src/test/java/com/example/Jinus/service/notice/NoticeServiceV2Test.java b/src/test/java/com/example/Jinus/service/notice/NoticeServiceTest.java
similarity index 92%
rename from src/test/java/com/example/Jinus/service/notice/NoticeServiceV2Test.java
rename to src/test/java/com/example/Jinus/service/notice/NoticeServiceTest.java
index 4bbdf53..23cd712 100644
--- a/src/test/java/com/example/Jinus/service/notice/NoticeServiceV2Test.java
+++ b/src/test/java/com/example/Jinus/service/notice/NoticeServiceTest.java
@@ -3,9 +3,7 @@
 import com.example.Jinus.dto.response.ListItemDto;
 import com.example.Jinus.entity.notice.NoticeCategoryEntity;
 import com.example.Jinus.entity.notice.NoticeEntity;
-import com.example.Jinus.repository.v2.notice.NoticeRepositoryV2;
-import com.example.Jinus.service.v2.notice.CategoryServiceV2;
-import com.example.Jinus.service.v2.notice.NoticeServiceV2;
+import com.example.Jinus.repository.notice.NoticeRepository;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.Test;
@@ -21,14 +19,14 @@
 import static org.mockito.Mockito.*;
 
 @ExtendWith(MockitoExtension.class)
-public class NoticeServiceV2Test {
+public class NoticeServiceTest {
 
     @InjectMocks
-    private NoticeServiceV2 noticeServiceV2;
+    private NoticeService noticeServiceV2;
     @Mock
-    private CategoryServiceV2 categoryServiceV2;
+    private CategoryService categoryServiceV2;
     @Mock
-    private NoticeRepositoryV2 noticeRepositoryV2;
+    private NoticeRepository noticeRepositoryV2;
 
     private List<NoticeCategoryEntity> mockCategoryEntities;
     private List<NoticeEntity> mockNoticeEntities;
diff --git a/src/test/java/com/example/Jinus/service/userInfo/DepartmentServiceV2Test.java b/src/test/java/com/example/Jinus/service/userInfo/DepartmentServiceTest.java
similarity index 74%
rename from src/test/java/com/example/Jinus/service/userInfo/DepartmentServiceV2Test.java
rename to src/test/java/com/example/Jinus/service/userInfo/DepartmentServiceTest.java
index feaa043..4f84fa0 100644
--- a/src/test/java/com/example/Jinus/service/userInfo/DepartmentServiceV2Test.java
+++ b/src/test/java/com/example/Jinus/service/userInfo/DepartmentServiceTest.java
@@ -1,7 +1,6 @@
 package com.example.Jinus.service.userInfo;
 
-import com.example.Jinus.repository.v2.userInfo.DepartmentRepositoryV2;
-import com.example.Jinus.service.v2.userInfo.DepartmentServiceV2;
+import com.example.Jinus.repository.userInfo.DepartmentRepository;
 import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
@@ -13,11 +12,11 @@
 import static org.assertj.core.api.Assertions.assertThat;
 
 @ExtendWith(MockitoExtension.class)
-public class DepartmentServiceV2Test {
+public class DepartmentServiceTest {
     @InjectMocks
-    private DepartmentServiceV2 departmentServiceV2;
+    private DepartmentService departmentServiceV2;
     @Mock
-    private DepartmentRepositoryV2 departmentRepositoryV2;
+    private DepartmentRepository departmentRepositoryV2;
 
     @Test
     @DisplayName("학과 영문명 찾기")
diff --git a/src/test/java/com/example/Jinus/service/userInfo/UserServiceHikariCPTest.java b/src/test/java/com/example/Jinus/service/userInfo/UserServiceHikariCPTest.java
index 91592df..ab62bef 100644
--- a/src/test/java/com/example/Jinus/service/userInfo/UserServiceHikariCPTest.java
+++ b/src/test/java/com/example/Jinus/service/userInfo/UserServiceHikariCPTest.java
@@ -1,6 +1,5 @@
 package com.example.Jinus.service.userInfo;
 
-import com.example.Jinus.service.v2.userInfo.UserServiceV2;
 import com.zaxxer.hikari.HikariDataSource;
 import com.zaxxer.hikari.HikariPoolMXBean;
 import lombok.extern.slf4j.Slf4j;
@@ -21,7 +20,7 @@
 public class UserServiceHikariCPTest {
 
     @Autowired
-    private UserServiceV2 userService;
+    private UserService userService;
 
     @Autowired
     private DataSource dataSource;
diff --git a/src/test/java/com/example/Jinus/service/userInfo/UserServiceV2Test.java b/src/test/java/com/example/Jinus/service/userInfo/UserServiceTest.java
similarity index 90%
rename from src/test/java/com/example/Jinus/service/userInfo/UserServiceV2Test.java
rename to src/test/java/com/example/Jinus/service/userInfo/UserServiceTest.java
index 7d323d1..005142f 100644
--- a/src/test/java/com/example/Jinus/service/userInfo/UserServiceV2Test.java
+++ b/src/test/java/com/example/Jinus/service/userInfo/UserServiceTest.java
@@ -1,7 +1,6 @@
 package com.example.Jinus.service.userInfo;
 
-import com.example.Jinus.repository.v2.userInfo.UserRepositoryV2;
-import com.example.Jinus.service.v2.userInfo.UserServiceV2;
+import com.example.Jinus.repository.userInfo.UserRepository;
 import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
@@ -15,12 +14,12 @@
 import static org.assertj.core.api.Assertions.assertThat;
 
 @ExtendWith(MockitoExtension.class)
-public class UserServiceV2Test {
+public class UserServiceTest {
 
     @InjectMocks
-    private UserServiceV2 userServiceV2;
+    private UserService userServiceV2;
     @Mock
-    private UserRepositoryV2 userRepositoryV2;
+    private UserRepository userRepositoryV2;
 
     @Test
     @DisplayName("등록된 사용자 campusId 확인")