diff --git a/jakarta.ls/src/main/resources/persistence.json b/jakarta.ls/src/main/resources/persistence.json
index 54b87382..3810b91e 100644
--- a/jakarta.ls/src/main/resources/persistence.json
+++ b/jakarta.ls/src/main/resources/persistence.json
@@ -51,7 +51,7 @@
 	      "@Entity",
 	      "@Table(name = \"${2:entityName}\")",
 	      "@NamedQuery(name=\"\", query=\"\")",
-	      "public class ${2:classname} {",
+	      "public class ${TM_FILENAME_BASE} {",
 	      "",
 	      "\t@GeneratedValue(strategy = GenerationType.AUTO)",
 	      "\t@Id",
diff --git a/jakarta.ls/src/main/resources/restfulWs.json b/jakarta.ls/src/main/resources/restfulWs.json
index 98a74d96..64462351 100644
--- a/jakarta.ls/src/main/resources/restfulWs.json
+++ b/jakarta.ls/src/main/resources/restfulWs.json
@@ -10,7 +10,7 @@
         "import jakarta.ws.rs.core.MediaType;",
         "",
         "@Path(\"${2:/path}\")",
-        "public class ${3:classname} {",
+        "public class ${TM_FILENAME_BASE} {",
         "",
         "\t@GET",
         "\t@Produces(MediaType.TEXT_PLAIN)",
diff --git a/jakarta.ls/src/main/resources/servlet.json b/jakarta.ls/src/main/resources/servlet.json
index f62cc0a0..2eee7a0c 100644
--- a/jakarta.ls/src/main/resources/servlet.json
+++ b/jakarta.ls/src/main/resources/servlet.json
@@ -10,7 +10,7 @@
           "import jakarta.servlet.ServletException;",
           "import java.io.IOException;",
           "",
-          "public class ${2:classname} extends GenericServlet {",
+          "public class ${TM_FILENAME_BASE} extends GenericServlet {",
           "\t@Override",
           "\tpublic void service(ServletRequest req, ServletResponse res) throws ServletException, IOException {",
           "\t\tres.setContentType(\"text/html\");",
@@ -37,7 +37,7 @@
             "import java.io.IOException;",
             "",
             "@WebServlet(name = \"${2:servletName}\", urlPatterns = { \"/${3:path}\" })",
-            "public class ${4:classname} extends HttpServlet {",
+            "public class ${TM_FILENAME_BASE} extends HttpServlet {",
             "\t@Override",
             "\tprotected void doGet(HttpServletRequest req, HttpServletResponse res) throws ServletException, IOException {",
             "\t\tres.setContentType(\"text/html;charset=UTF-8\");",
@@ -64,7 +64,7 @@
             "import java.io.IOException;",
             "",
             "@WebServlet(name = \"${2:servletName}\", urlPatterns = { \"/${3:path}\" })",
-            "public class ${4:classname} extends HttpServlet {",
+            "public class ${TM_FILENAME_BASE} extends HttpServlet {",
             "\t@Override",
             "\tprotected void doPost(HttpServletRequest req, HttpServletResponse res) throws ServletException, IOException {",
             "\t\tres.setContentType(\"text/html;charset=UTF-8\");",
@@ -95,7 +95,7 @@
           "import java.io.IOException;",
           "",
           "@WebFilter(filterName = \"${2:filterName}\", urlPatterns = {\"${3:urlPattern}\"})",
-          "public class ${4:classname} implements Filter {",
+          "public class ${TM_FILENAME_BASE} implements Filter {",
           "\t@Override",
           "\tpublic void doFilter(ServletRequest req, ServletResponse res, FilterChain chain) throws IOException, ServletException{",
           "\t\tchain.doFilter(req, res);",