diff --git a/axhub-common/src/main/java/io/shinhanlife/axhub/common/util/ToolScaffolder.java b/axhub-common/src/main/java/io/shinhanlife/axhub/common/util/ToolScaffolder.java
index e360cae..c5c8d69 100644
--- a/axhub-common/src/main/java/io/shinhanlife/axhub/common/util/ToolScaffolder.java
+++ b/axhub-common/src/main/java/io/shinhanlife/axhub/common/util/ToolScaffolder.java
@@ -159,7 +159,7 @@ public class ToolScaffolder {
             """.formatted(BASE_PACKAGE, BASE_PACKAGE, baseName, author, createDate, createDate, author, baseName);
         Files.writeString(dtoDir.resolve(baseName + "Res.java"), resContent);
 
-        String toolName = baseName.toLowerCase();
+        String toolName = baseName.isEmpty() ? baseName : Character.toLowerCase(baseName.charAt(0)) + baseName.substring(1);
 
         // Generate Service
         String serviceContent = """
@@ -170,8 +170,8 @@ public class ToolScaffolder {
             import %s.dto.%sReq;
             import %s.dto.%sRes;
             import %s.%s.converter.%sLegacyConverter;
-            import lombok.RequiredArgsConstructor;
             import org.springframework.stereotype.Service;
+            import org.mapstruct.factory.Mappers;
 
             /**
              * @package %s.service
@@ -188,14 +188,13 @@ public class ToolScaffolder {
              * </pre>
              */
             @Service
-            @RequiredArgsConstructor
             @McpTool(
                 routingType = "%s",
                 categoryKey = "%s"
             )
             public class %sService extends AbstractMcpToolService {
 
-                private final %sLegacyConverter converter;
+                private final %sLegacyConverter converter = Mappers.getMapper(%sLegacyConverter.class);
 
                 @McpFunction(
                     displayName = "%s 툴",
@@ -212,15 +211,24 @@ public class ToolScaffolder {
                 }
             }
             """.formatted(
+                BASE_PACKAGE,
+                BASE_PACKAGE,
                 BASE_PACKAGE,
                 BASE_PACKAGE, baseName,
                 BASE_PACKAGE, baseName,
                 BASE_PACKAGE, shortName, baseName,
-                BASE_PACKAGE, baseName,
-                BASE_PACKAGE, baseName, author, createDate, createDate, author,
-                routingType, group.toLowerCase(), baseName, baseName,
+                BASE_PACKAGE,
+                baseName,
+                author,
+                createDate,
+                createDate, author,
+                routingType, group.toLowerCase(),
+                baseName,
+                baseName, baseName,
                 baseName, toolName, description, description + " 해줘.", interfaceId, register,
-                baseName, baseName, routingType, interfaceId
+                baseName,
+                baseName,
+                routingType, interfaceId
             );
         
         Files.writeString(serviceDir.resolve(baseName + "Service.java"), serviceContent);