diff --git a/dat-was-lib/src/main/java/io/shinhanlife/dat/lib/util/ToolScaffolder.java b/dat-was-lib/src/main/java/io/shinhanlife/dat/lib/util/ToolScaffolder.java
index dc352041b..37603702a 100644
--- a/dat-was-lib/src/main/java/io/shinhanlife/dat/lib/util/ToolScaffolder.java
+++ b/dat-was-lib/src/main/java/io/shinhanlife/dat/lib/util/ToolScaffolder.java
@@ -179,10 +179,10 @@ public class ToolScaffolder {
         writeStructuredFieldTypes(dtoDir, bizPackage + ".dto", baseName + "Request", tool.inputFields());
         writeStructuredFieldTypes(dtoDir, bizPackage + ".dto", baseName + "Response", tool.outputFields());
         if (mci) {
-            writeUtf8(ioDir.resolve(baseName + "_I.java"),
-                    mciIoContent("infra.itrf.mci." + code, baseName + "_I", tool.inputFields(), "", ""));
-            writeUtf8(ioDir.resolve(baseName + "_O.java"),
-                    mciIoContent("infra.itrf.mci." + code, baseName + "_O", tool.outputFields(), "", ""));
+            writeUtf8(ioDir.resolve(tool.interfaceId() + "_I.java"),
+                    mciIoContent("infra.itrf.mci." + code.replace("/", "."), tool.interfaceId() + "_I", tool.inputFields(), "", ""));
+            writeUtf8(ioDir.resolve(tool.interfaceId() + "_O.java"),
+                    mciIoContent("infra.itrf.mci." + code.replace("/", "."), tool.interfaceId() + "_O", tool.outputFields(), "", ""));
             writeStructuredFieldTypes(ioDir, ioPackage + ".io", tool.interfaceId() + "_I", tool.inputFields());
             writeStructuredFieldTypes(ioDir, ioPackage + ".io", tool.interfaceId() + "_O", tool.outputFields());
             String sysCode = tool.clientSystemCode();
@@ -286,7 +286,7 @@ public class ToolScaffolder {
                 clientVariable = Character.toLowerCase(baseName.charAt(0)) + baseName.substring(1) + "Client";
             }
             String converterVariable = Character.toLowerCase(baseName.charAt(0)) + baseName.substring(1) + "Converter";
-            String integrationPackage = BASE_PACKAGE + (mci ? ".infra.itrf.mci." + tool.clientSystemCode().toLowerCase(Locale.ROOT)
+            String integrationPackage = BASE_PACKAGE + (mci ? ".infra.itrf.mci." + (tool.clientSystemCode().length() == 4 ? tool.clientSystemCode().substring(0,3).toLowerCase(Locale.ROOT) + "." + tool.clientSystemCode().substring(3).toLowerCase(Locale.ROOT) : tool.clientSystemCode().toLowerCase(Locale.ROOT))
                     : ".infra.itrf.http." + toPackageSegment(tool.httpApiName()));
             imports.append("import ").append(bizPackage).append(".dto.").append(baseName).append("Request;\n")
                     .append("import ").append(bizPackage).append(".dto.").append(baseName).append("Response;\n")
@@ -364,7 +364,7 @@ public class ToolScaffolder {
                 throw new IllegalArgumentException("Tool method or MCP Tool name already exists: " + methodName);
             }
             boolean mci = "MCI".equalsIgnoreCase(tool.routingType());
-            String integrationPackage = BASE_PACKAGE + (mci ? ".infra.itrf.mci." + tool.clientSystemCode().toLowerCase(Locale.ROOT)
+            String integrationPackage = BASE_PACKAGE + (mci ? ".infra.itrf.mci." + (tool.clientSystemCode().length() == 4 ? tool.clientSystemCode().substring(0,3).toLowerCase(Locale.ROOT) + "." + tool.clientSystemCode().substring(3).toLowerCase(Locale.ROOT) : tool.clientSystemCode().toLowerCase(Locale.ROOT))
                     : ".infra.itrf.http." + toPackageSegment(tool.httpApiName()));
             String requestType = baseName + "Request";
             String responseType = baseName + "Response";