diff --git a/src/main/java/com/dbnt/faisp/main/counterIntelligence/CounterIntelligenceController.java b/src/main/java/com/dbnt/faisp/main/counterIntelligence/CounterIntelligenceController.java
index 0d57c4de..a0658b9d 100644
--- a/src/main/java/com/dbnt/faisp/main/counterIntelligence/CounterIntelligenceController.java
+++ b/src/main/java/com/dbnt/faisp/main/counterIntelligence/CounterIntelligenceController.java
@@ -223,19 +223,19 @@ public class CounterIntelligenceController {
 
   @GetMapping("/ciaEditModal")
   public ModelAndView ciaEditModal(@AuthenticationPrincipal UserInfo loginUser, CounterIntelligenceActivity cia){
-    ModelAndView mav = null;
+    ModelAndView mav = new ModelAndView();
     switch (cia.getCiType()){
       case "SDI":
-        mav = new ModelAndView("counterIntelligence/ciaSafetyDemandEditModal");
+        mav.setViewName("counterIntelligence/ciaSafetyDemandEditModal");
         break;
       case "MCI":
-        mav = new ModelAndView("counterIntelligence/ciaManageCompanyEditModal");
+        mav.setViewName("counterIntelligence/ciaManageCompanyEditModal");
         break;
       case "FI":
-        mav = new ModelAndView("counterIntelligence/ciaForeignerEditModal");
+        mav.setViewName("counterIntelligence/ciaForeignerEditModal");
         break;
       case "EI":
-        mav = new ModelAndView("counterIntelligence/ciaEduEditModal");
+        mav.setViewName("counterIntelligence/ciaEduEditModal");
         break;
     }
     mav.addObject("mgtOrganList", loginUser.getDownOrganCdList());
@@ -245,26 +245,26 @@ public class CounterIntelligenceController {
 
   @GetMapping("/ciaViewModal")
   public ModelAndView ciaViewModal(@AuthenticationPrincipal UserInfo loginUser, CounterIntelligenceActivity cia){
-    ModelAndView mav = null;
+    ModelAndView mav = new ModelAndView();
     String accessAuth = null;
     switch (cia.getCiType()){
       case "SDI":
-        mav = new ModelAndView("counterIntelligence/ciaSafetyDemandViewModal");
+        mav.setViewName("counterIntelligence/ciaSafetyDemandViewModal");
         accessAuth = authMgtService.selectAccessConfigList
             (loginUser.getUserSeq(), "/counterIntelligence/ciaSafetyDemandList").get(0).getAccessAuth();
         break;
       case "MCI":
-        mav = new ModelAndView("counterIntelligence/ciaManageCompanyViewModal");
+        mav.setViewName("counterIntelligence/ciaManageCompanyViewModal");
         accessAuth = authMgtService.selectAccessConfigList
             (loginUser.getUserSeq(), "/counterIntelligence/ciaManageCompanyList").get(0).getAccessAuth();
         break;
       case "FI":
-        mav = new ModelAndView("counterIntelligence/ciaForeignerViewModal");
+        mav.setViewName("counterIntelligence/ciaForeignerViewModal");
         accessAuth = authMgtService.selectAccessConfigList
             (loginUser.getUserSeq(), "/counterIntelligence/ciaForeignerList").get(0).getAccessAuth();
         break;
       case "EI":
-        mav = new ModelAndView("counterIntelligence/ciaEduViewModal");
+        mav.setViewName("counterIntelligence/ciaEduViewModal");
         accessAuth = authMgtService.selectAccessConfigList
             (loginUser.getUserSeq(), "/counterIntelligence/ciaEduList").get(0).getAccessAuth();
         break;
diff --git a/src/main/resources/templates/counterIntelligence/ciaSafetyDemandviewModal.html b/src/main/resources/templates/counterIntelligence/ciaSafetyDemandViewModal.html
similarity index 100%
rename from src/main/resources/templates/counterIntelligence/ciaSafetyDemandviewModal.html
rename to src/main/resources/templates/counterIntelligence/ciaSafetyDemandViewModal.html