diff --git a/snippets/next-javascript.json b/snippets/next-javascript.json
index 3cce614..80998a0 100644
--- a/snippets/next-javascript.json
+++ b/snippets/next-javascript.json
@@ -6,8 +6,7 @@
       "  return {",
       "    props: {},",
       "  };",
-      "};",
-      ""
+      "};"
     ],
     "description": "Next.js Get Server Side Props Typescript"
   },
@@ -18,8 +17,7 @@
       "  return {",
       "    props: {},",
       "  };",
-      "};",
-      ""
+      "};"
     ],
     "description": "Next.js Get Static Props Typescript"
   }
diff --git a/snippets/next-typescript.json b/snippets/next-typescript.json
index 27c2695..1c70431 100644
--- a/snippets/next-typescript.json
+++ b/snippets/next-typescript.json
@@ -6,8 +6,7 @@
       "  return {",
       "    props: {},",
       "  };",
-      "};",
-      ""
+      "};"
     ],
     "description": "Next.js Get Server Side Props Typescript"
   },
@@ -18,8 +17,7 @@
       "  return {",
       "    props: {},",
       "  };",
-      "};",
-      ""
+      "};"
     ],
     "description": "Next.js Get Static Props Typescript"
   },
@@ -55,8 +53,10 @@
     "prefix": "nct",
     "body": [
       "import type { NextComponentType, NextPageContext } from \"next\";",
+      "",
       "interface Props {}",
-      "const ${1:${TM_FILENAME_BASE}}: NextComponentType<NextPageContext, {}, Props> = (",
+      "",
+      "const ${1:${TM_FILENAME_BASE/(.*)/${1:/capitalize}/}}: NextComponentType<NextPageContext, {}, Props> = (",
       "  props: Props,",
       ") => {",
       "  return (",
@@ -64,7 +64,7 @@
       "  )",
       "}",
       "",
-      "export default ${1:${TM_FILENAME_BASE}}"
+      "export default ${1:${TM_FILENAME_BASE/(.*)/${1:/capitalize}/}}"
     ],
     "description": "Next.js Component Typescript"
   }
diff --git a/snippets/react-javascript.json b/snippets/react-javascript.json
index 2e3bff5..e8e63c8 100644
--- a/snippets/react-javascript.json
+++ b/snippets/react-javascript.json
@@ -22,11 +22,10 @@
   "React functional component": {
     "prefix": "rfc",
     "body": [
-      "const ${1:${TM_FILENAME_BASE}} = () => {",
+      "const ${1:${TM_FILENAME_BASE/(.*)/${1:/capitalize}/}} = () => {",
       "  return <div></div>;",
       "};",
-      "export default ${1:${TM_FILENAME_BASE}};",
-      ""
+      "export default ${1:${TM_FILENAME_BASE/(.*)/${1:/capitalize}/}};"
     ],
     "description": "React functional component"
   },
diff --git a/snippets/react-typescript.json b/snippets/react-typescript.json
index 9f7125d..6e5f1dd 100644
--- a/snippets/react-typescript.json
+++ b/snippets/react-typescript.json
@@ -10,8 +10,7 @@
       "  return <div></div>;",
       "}",
       "",
-      "export default ${1:${TM_FILENAME_BASE}};",
-      ""
+      "export default ${1:${TM_FILENAME_BASE}};"
     ],
     "description": "React functional component Typescript"
   }