diff --git a/packages/create-rstack/README.md b/packages/create-rstack/README.md
index 27e303df..fcac4ec4 100644
--- a/packages/create-rstack/README.md
+++ b/packages/create-rstack/README.md
@@ -24,31 +24,31 @@ npx create-rstack --dir my-project --template app-vanilla-ts --no-git
 
 ## Templates
 
-- `app-vanilla-js` - JavaScript Vanilla application
+- `app-vanilla` - JavaScript Vanilla application
 - `app-vanilla-ts` - TypeScript Vanilla application
-- `app-react-js` - JavaScript React application
+- `app-react` - JavaScript React application
 - `app-react-ts` - TypeScript React application
-- `app-preact-js` - JavaScript Preact application
+- `app-preact` - JavaScript Preact application
 - `app-preact-ts` - TypeScript Preact application
-- `app-vue-js` - JavaScript Vue application
+- `app-vue` - JavaScript Vue application
 - `app-vue-ts` - TypeScript Vue application
-- `app-lit-js` - JavaScript Lit application
+- `app-lit` - JavaScript Lit application
 - `app-lit-ts` - TypeScript Lit application
-- `app-svelte-js` - JavaScript Svelte application
+- `app-svelte` - JavaScript Svelte application
 - `app-svelte-ts` - TypeScript Svelte application
-- `app-solid-js` - JavaScript Solid application
+- `app-solid` - JavaScript Solid application
 - `app-solid-ts` - TypeScript Solid application
-- `lib-node-js` - JavaScript Node.js library
+- `lib-node` - JavaScript Node.js library
 - `lib-node-ts` - TypeScript Node.js library
-- `lib-react-js` - JavaScript React library
+- `lib-react` - JavaScript React library
 - `lib-react-ts` - TypeScript React library
-- `lib-vue-js` - JavaScript Vue library
+- `lib-vue` - JavaScript Vue library
 - `lib-vue-ts` - TypeScript Vue library
-- `lib-svelte-js` - JavaScript Svelte library
+- `lib-svelte` - JavaScript Svelte library
 - `lib-svelte-ts` - TypeScript Svelte library
-- `lib-solid-js` - JavaScript Solid library
+- `lib-solid` - JavaScript Solid library
 - `lib-solid-ts` - TypeScript Solid library
-- `doc-basic` - Basic documentation site
+- `doc` - Basic documentation site
 - `doc-i18n` - Multilingual documentation site
 
 ## Documentation
diff --git a/packages/create-rstack/src/index.ts b/packages/create-rstack/src/index.ts
index a32490a5..f6f32f78 100644
--- a/packages/create-rstack/src/index.ts
+++ b/packages/create-rstack/src/index.ts
@@ -5,40 +5,55 @@ import {
   create,
   select,
 } from '@rstackjs/create-toolkit';
-import { appendFile, mkdir, readFile, writeFile } from 'node:fs/promises';
+import { access, appendFile, mkdir, readFile, writeFile } from 'node:fs/promises';
 import path from 'node:path';
 
 const packageRoot = path.join(import.meta.dirname, '..');
 
-const getTemplateName = async ({ template }: Argv): Promise<string> => {
-  if (typeof template === 'string') {
-    if (template === 'app' || template.startsWith('app-')) {
-      const [, framework = 'vanilla', language = 'js'] = template.split('-');
-
-      if (framework === 'js' || framework === 'ts') {
-        return `app-vanilla-${framework}`;
-      }
-
-      return `app-${framework}-${language}`;
-    }
-
-    if (template === 'lib' || template.startsWith('lib-')) {
-      const [, libraryType = 'node', language = 'js'] = template.split('-');
-
-      if (libraryType === 'js' || libraryType === 'ts') {
-        return `lib-node-${libraryType}`;
-      }
+const templateNames = [
+  'app-vanilla',
+  'app-vanilla-ts',
+  'app-react',
+  'app-react-ts',
+  'app-preact',
+  'app-preact-ts',
+  'app-vue',
+  'app-vue-ts',
+  'app-lit',
+  'app-lit-ts',
+  'app-svelte',
+  'app-svelte-ts',
+  'app-solid',
+  'app-solid-ts',
+  'lib-node',
+  'lib-node-ts',
+  'lib-react',
+  'lib-react-ts',
+  'lib-vue',
+  'lib-vue-ts',
+  'lib-svelte',
+  'lib-svelte-ts',
+  'lib-solid',
+  'lib-solid-ts',
+  'doc',
+  'doc-i18n',
+];
+
+const resolveTemplateName = (template: string): string => {
+  if (!templateNames.includes(template)) {
+    throw new Error(`Invalid input: template "${template}" not found.`);
+  }
 
-      return `lib-${libraryType}-${language}`;
-    }
+  return template;
+};
 
-    if (template === 'doc' || template.startsWith('doc-')) {
-      const [, documentationType = 'basic'] = template.split('-');
-      return `doc-${documentationType}`;
+const getTemplateName = async ({ template }: Argv): Promise<string> => {
+  if (typeof template === 'string') {
+    if (/^(?:app|lib|doc)(?:-|$)/u.test(template)) {
+      return resolveTemplateName(template);
     }
 
-    const [type, language = 'js'] = template.split('-');
-    return `${type}-${language}`;
+    return template;
   }
 
   const projectType = checkCancel<string>(
@@ -72,7 +87,7 @@ const getTemplateName = async ({ template }: Argv): Promise<string> => {
       }),
     );
 
-    return `doc-${documentationType}`;
+    return resolveTemplateName(documentationType === 'basic' ? 'doc' : 'doc-i18n');
   }
 
   const templateType = checkCancel<string>(
@@ -109,7 +124,8 @@ const getTemplateName = async ({ template }: Argv): Promise<string> => {
     }),
   );
 
-  return `${projectType}-${templateType}-${language}`;
+  const templateName = `${projectType}-${templateType}${language === 'ts' ? '-ts' : ''}`;
+  return resolveTemplateName(templateName);
 };
 
 const getStagedConfig = (templateName: string): string => {
@@ -141,7 +157,10 @@ const injectStagedSetup = async ({
     return;
   }
 
-  const configExtension = templateName.endsWith('-js') ? 'js' : 'ts';
+  const configExtension = await access(path.join(distFolder, 'rstack.config.ts')).then(
+    () => 'ts',
+    () => 'js',
+  );
   const packageJsonPath = path.join(distFolder, 'package.json');
   const packageJson = JSON.parse(await readFile(packageJsonPath, 'utf8')) as {
     scripts: Record<string, string>;
@@ -168,34 +187,7 @@ const injectStagedSetup = async ({
 await create({
   root: packageRoot,
   name: 'rstack',
-  templates: [
-    'app-vanilla-js',
-    'app-vanilla-ts',
-    'app-react-js',
-    'app-react-ts',
-    'app-preact-js',
-    'app-preact-ts',
-    'app-vue-js',
-    'app-vue-ts',
-    'app-lit-js',
-    'app-lit-ts',
-    'app-svelte-js',
-    'app-svelte-ts',
-    'app-solid-js',
-    'app-solid-ts',
-    'lib-node-js',
-    'lib-node-ts',
-    'lib-react-js',
-    'lib-react-ts',
-    'lib-vue-js',
-    'lib-vue-ts',
-    'lib-svelte-js',
-    'lib-svelte-ts',
-    'lib-solid-js',
-    'lib-solid-ts',
-    'doc-basic',
-    'doc-i18n',
-  ],
+  templates: templateNames,
   builtinTools: [],
   getTemplateName,
   onGitResolved: injectStagedSetup,
diff --git a/packages/create-rstack/template-app-lit-js/package.json b/packages/create-rstack/template-app-lit/package.json
similarity index 93%
rename from packages/create-rstack/template-app-lit-js/package.json
rename to packages/create-rstack/template-app-lit/package.json
index f1d1b0e6..51cbc430 100644
--- a/packages/create-rstack/template-app-lit-js/package.json
+++ b/packages/create-rstack/template-app-lit/package.json
@@ -1,5 +1,5 @@
 {
-  "name": "rstack-app-lit-js",
+  "name": "rstack-app-lit",
   "version": "1.0.0",
   "private": true,
   "type": "module",
diff --git a/packages/create-rstack/template-app-lit-js/rstack.config.js b/packages/create-rstack/template-app-lit/rstack.config.js
similarity index 100%
rename from packages/create-rstack/template-app-lit-js/rstack.config.js
rename to packages/create-rstack/template-app-lit/rstack.config.js
diff --git a/packages/create-rstack/template-app-lit-js/src/index.css b/packages/create-rstack/template-app-lit/src/index.css
similarity index 100%
rename from packages/create-rstack/template-app-lit-js/src/index.css
rename to packages/create-rstack/template-app-lit/src/index.css
diff --git a/packages/create-rstack/template-app-lit-js/src/index.html b/packages/create-rstack/template-app-lit/src/index.html
similarity index 100%
rename from packages/create-rstack/template-app-lit-js/src/index.html
rename to packages/create-rstack/template-app-lit/src/index.html
diff --git a/packages/create-rstack/template-app-lit-js/src/index.js b/packages/create-rstack/template-app-lit/src/index.js
similarity index 100%
rename from packages/create-rstack/template-app-lit-js/src/index.js
rename to packages/create-rstack/template-app-lit/src/index.js
diff --git a/packages/create-rstack/template-app-lit-js/src/my-element.js b/packages/create-rstack/template-app-lit/src/my-element.js
similarity index 100%
rename from packages/create-rstack/template-app-lit-js/src/my-element.js
rename to packages/create-rstack/template-app-lit/src/my-element.js
diff --git a/packages/create-rstack/template-app-lit-js/tests/index.test.js b/packages/create-rstack/template-app-lit/tests/index.test.js
similarity index 100%
rename from packages/create-rstack/template-app-lit-js/tests/index.test.js
rename to packages/create-rstack/template-app-lit/tests/index.test.js
diff --git a/packages/create-rstack/template-app-preact-js/package.json b/packages/create-rstack/template-app-preact/package.json
similarity index 94%
rename from packages/create-rstack/template-app-preact-js/package.json
rename to packages/create-rstack/template-app-preact/package.json
index 8ecc65df..52d75b7b 100644
--- a/packages/create-rstack/template-app-preact-js/package.json
+++ b/packages/create-rstack/template-app-preact/package.json
@@ -1,5 +1,5 @@
 {
-  "name": "rstack-app-preact-js",
+  "name": "rstack-app-preact",
   "version": "1.0.0",
   "private": true,
   "type": "module",
diff --git a/packages/create-rstack/template-app-preact-js/rstack.config.js b/packages/create-rstack/template-app-preact/rstack.config.js
similarity index 100%
rename from packages/create-rstack/template-app-preact-js/rstack.config.js
rename to packages/create-rstack/template-app-preact/rstack.config.js
diff --git a/packages/create-rstack/template-app-preact-js/src/App.css b/packages/create-rstack/template-app-preact/src/App.css
similarity index 100%
rename from packages/create-rstack/template-app-preact-js/src/App.css
rename to packages/create-rstack/template-app-preact/src/App.css
diff --git a/packages/create-rstack/template-app-preact-js/src/App.jsx b/packages/create-rstack/template-app-preact/src/App.jsx
similarity index 100%
rename from packages/create-rstack/template-app-preact-js/src/App.jsx
rename to packages/create-rstack/template-app-preact/src/App.jsx
diff --git a/packages/create-rstack/template-app-preact-js/src/index.jsx b/packages/create-rstack/template-app-preact/src/index.jsx
similarity index 100%
rename from packages/create-rstack/template-app-preact-js/src/index.jsx
rename to packages/create-rstack/template-app-preact/src/index.jsx
diff --git a/packages/create-rstack/template-app-preact-js/tests/index.test.jsx b/packages/create-rstack/template-app-preact/tests/index.test.jsx
similarity index 100%
rename from packages/create-rstack/template-app-preact-js/tests/index.test.jsx
rename to packages/create-rstack/template-app-preact/tests/index.test.jsx
diff --git a/packages/create-rstack/template-app-preact-js/tests/rstest.setup.js b/packages/create-rstack/template-app-preact/tests/rstest.setup.js
similarity index 100%
rename from packages/create-rstack/template-app-preact-js/tests/rstest.setup.js
rename to packages/create-rstack/template-app-preact/tests/rstest.setup.js
diff --git a/packages/create-rstack/template-app-react-js/package.json b/packages/create-rstack/template-app-react/package.json
similarity index 94%
rename from packages/create-rstack/template-app-react-js/package.json
rename to packages/create-rstack/template-app-react/package.json
index d25c91ab..6d277c55 100644
--- a/packages/create-rstack/template-app-react-js/package.json
+++ b/packages/create-rstack/template-app-react/package.json
@@ -1,5 +1,5 @@
 {
-  "name": "rstack-app-react-js",
+  "name": "rstack-app-react",
   "version": "1.0.0",
   "private": true,
   "type": "module",
diff --git a/packages/create-rstack/template-app-react-js/rstack.config.js b/packages/create-rstack/template-app-react/rstack.config.js
similarity index 100%
rename from packages/create-rstack/template-app-react-js/rstack.config.js
rename to packages/create-rstack/template-app-react/rstack.config.js
diff --git a/packages/create-rstack/template-app-react-js/src/App.css b/packages/create-rstack/template-app-react/src/App.css
similarity index 100%
rename from packages/create-rstack/template-app-react-js/src/App.css
rename to packages/create-rstack/template-app-react/src/App.css
diff --git a/packages/create-rstack/template-app-react-js/src/App.jsx b/packages/create-rstack/template-app-react/src/App.jsx
similarity index 100%
rename from packages/create-rstack/template-app-react-js/src/App.jsx
rename to packages/create-rstack/template-app-react/src/App.jsx
diff --git a/packages/create-rstack/template-app-react-js/src/index.jsx b/packages/create-rstack/template-app-react/src/index.jsx
similarity index 100%
rename from packages/create-rstack/template-app-react-js/src/index.jsx
rename to packages/create-rstack/template-app-react/src/index.jsx
diff --git a/packages/create-rstack/template-app-react-js/tests/index.test.jsx b/packages/create-rstack/template-app-react/tests/index.test.jsx
similarity index 100%
rename from packages/create-rstack/template-app-react-js/tests/index.test.jsx
rename to packages/create-rstack/template-app-react/tests/index.test.jsx
diff --git a/packages/create-rstack/template-app-react-js/tests/rstest.setup.js b/packages/create-rstack/template-app-react/tests/rstest.setup.js
similarity index 100%
rename from packages/create-rstack/template-app-react-js/tests/rstest.setup.js
rename to packages/create-rstack/template-app-react/tests/rstest.setup.js
diff --git a/packages/create-rstack/template-app-solid-js/package.json b/packages/create-rstack/template-app-solid/package.json
similarity index 94%
rename from packages/create-rstack/template-app-solid-js/package.json
rename to packages/create-rstack/template-app-solid/package.json
index 106ac167..11ae9b25 100644
--- a/packages/create-rstack/template-app-solid-js/package.json
+++ b/packages/create-rstack/template-app-solid/package.json
@@ -1,5 +1,5 @@
 {
-  "name": "rstack-app-solid-js",
+  "name": "rstack-app-solid",
   "version": "1.0.0",
   "private": true,
   "type": "module",
diff --git a/packages/create-rstack/template-app-solid-js/rstack.config.js b/packages/create-rstack/template-app-solid/rstack.config.js
similarity index 100%
rename from packages/create-rstack/template-app-solid-js/rstack.config.js
rename to packages/create-rstack/template-app-solid/rstack.config.js
diff --git a/packages/create-rstack/template-app-solid-js/src/App.css b/packages/create-rstack/template-app-solid/src/App.css
similarity index 100%
rename from packages/create-rstack/template-app-solid-js/src/App.css
rename to packages/create-rstack/template-app-solid/src/App.css
diff --git a/packages/create-rstack/template-app-solid-js/src/App.jsx b/packages/create-rstack/template-app-solid/src/App.jsx
similarity index 100%
rename from packages/create-rstack/template-app-solid-js/src/App.jsx
rename to packages/create-rstack/template-app-solid/src/App.jsx
diff --git a/packages/create-rstack/template-app-solid-js/src/index.jsx b/packages/create-rstack/template-app-solid/src/index.jsx
similarity index 100%
rename from packages/create-rstack/template-app-solid-js/src/index.jsx
rename to packages/create-rstack/template-app-solid/src/index.jsx
diff --git a/packages/create-rstack/template-app-solid-js/tests/index.test.jsx b/packages/create-rstack/template-app-solid/tests/index.test.jsx
similarity index 100%
rename from packages/create-rstack/template-app-solid-js/tests/index.test.jsx
rename to packages/create-rstack/template-app-solid/tests/index.test.jsx
diff --git a/packages/create-rstack/template-app-solid-js/tests/rstest.setup.js b/packages/create-rstack/template-app-solid/tests/rstest.setup.js
similarity index 100%
rename from packages/create-rstack/template-app-solid-js/tests/rstest.setup.js
rename to packages/create-rstack/template-app-solid/tests/rstest.setup.js
diff --git a/packages/create-rstack/template-app-svelte-js/package.json b/packages/create-rstack/template-app-svelte/package.json
similarity index 94%
rename from packages/create-rstack/template-app-svelte-js/package.json
rename to packages/create-rstack/template-app-svelte/package.json
index 7531f55f..dabe10bd 100644
--- a/packages/create-rstack/template-app-svelte-js/package.json
+++ b/packages/create-rstack/template-app-svelte/package.json
@@ -1,5 +1,5 @@
 {
-  "name": "rstack-app-svelte-js",
+  "name": "rstack-app-svelte",
   "version": "1.0.0",
   "private": true,
   "type": "module",
diff --git a/packages/create-rstack/template-app-svelte-js/pnpm-workspace.yaml b/packages/create-rstack/template-app-svelte/pnpm-workspace.yaml
similarity index 100%
rename from packages/create-rstack/template-app-svelte-js/pnpm-workspace.yaml
rename to packages/create-rstack/template-app-svelte/pnpm-workspace.yaml
diff --git a/packages/create-rstack/template-app-svelte-js/rstack.config.js b/packages/create-rstack/template-app-svelte/rstack.config.js
similarity index 100%
rename from packages/create-rstack/template-app-svelte-js/rstack.config.js
rename to packages/create-rstack/template-app-svelte/rstack.config.js
diff --git a/packages/create-rstack/template-app-svelte-js/src/App.svelte b/packages/create-rstack/template-app-svelte/src/App.svelte
similarity index 100%
rename from packages/create-rstack/template-app-svelte-js/src/App.svelte
rename to packages/create-rstack/template-app-svelte/src/App.svelte
diff --git a/packages/create-rstack/template-app-svelte-js/src/index.css b/packages/create-rstack/template-app-svelte/src/index.css
similarity index 100%
rename from packages/create-rstack/template-app-svelte-js/src/index.css
rename to packages/create-rstack/template-app-svelte/src/index.css
diff --git a/packages/create-rstack/template-app-svelte-js/src/index.js b/packages/create-rstack/template-app-svelte/src/index.js
similarity index 100%
rename from packages/create-rstack/template-app-svelte-js/src/index.js
rename to packages/create-rstack/template-app-svelte/src/index.js
diff --git a/packages/create-rstack/template-app-svelte-js/tests/index.test.js b/packages/create-rstack/template-app-svelte/tests/index.test.js
similarity index 100%
rename from packages/create-rstack/template-app-svelte-js/tests/index.test.js
rename to packages/create-rstack/template-app-svelte/tests/index.test.js
diff --git a/packages/create-rstack/template-app-svelte-js/tests/rstest.setup.js b/packages/create-rstack/template-app-svelte/tests/rstest.setup.js
similarity index 100%
rename from packages/create-rstack/template-app-svelte-js/tests/rstest.setup.js
rename to packages/create-rstack/template-app-svelte/tests/rstest.setup.js
diff --git a/packages/create-rstack/template-app-vanilla-js/package.json b/packages/create-rstack/template-app-vanilla/package.json
similarity index 93%
rename from packages/create-rstack/template-app-vanilla-js/package.json
rename to packages/create-rstack/template-app-vanilla/package.json
index 03d67e45..b2ba9908 100644
--- a/packages/create-rstack/template-app-vanilla-js/package.json
+++ b/packages/create-rstack/template-app-vanilla/package.json
@@ -1,5 +1,5 @@
 {
-  "name": "rstack-app-vanilla-js",
+  "name": "rstack-app-vanilla",
   "version": "1.0.0",
   "private": true,
   "type": "module",
diff --git a/packages/create-rstack/template-app-vanilla-js/rstack.config.js b/packages/create-rstack/template-app-vanilla/rstack.config.js
similarity index 100%
rename from packages/create-rstack/template-app-vanilla-js/rstack.config.js
rename to packages/create-rstack/template-app-vanilla/rstack.config.js
diff --git a/packages/create-rstack/template-app-vanilla-js/src/index.css b/packages/create-rstack/template-app-vanilla/src/index.css
similarity index 100%
rename from packages/create-rstack/template-app-vanilla-js/src/index.css
rename to packages/create-rstack/template-app-vanilla/src/index.css
diff --git a/packages/create-rstack/template-app-vanilla-js/src/index.js b/packages/create-rstack/template-app-vanilla/src/index.js
similarity index 100%
rename from packages/create-rstack/template-app-vanilla-js/src/index.js
rename to packages/create-rstack/template-app-vanilla/src/index.js
diff --git a/packages/create-rstack/template-app-vanilla-js/tests/dom.test.js b/packages/create-rstack/template-app-vanilla/tests/dom.test.js
similarity index 100%
rename from packages/create-rstack/template-app-vanilla-js/tests/dom.test.js
rename to packages/create-rstack/template-app-vanilla/tests/dom.test.js
diff --git a/packages/create-rstack/template-app-vanilla-js/tests/rstest.setup.js b/packages/create-rstack/template-app-vanilla/tests/rstest.setup.js
similarity index 100%
rename from packages/create-rstack/template-app-vanilla-js/tests/rstest.setup.js
rename to packages/create-rstack/template-app-vanilla/tests/rstest.setup.js
diff --git a/packages/create-rstack/template-app-vue-js/package.json b/packages/create-rstack/template-app-vue/package.json
similarity index 94%
rename from packages/create-rstack/template-app-vue-js/package.json
rename to packages/create-rstack/template-app-vue/package.json
index bd52f6d8..3baae5e9 100644
--- a/packages/create-rstack/template-app-vue-js/package.json
+++ b/packages/create-rstack/template-app-vue/package.json
@@ -1,5 +1,5 @@
 {
-  "name": "rstack-app-vue-js",
+  "name": "rstack-app-vue",
   "version": "1.0.0",
   "private": true,
   "type": "module",
diff --git a/packages/create-rstack/template-app-vue-js/rstack.config.js b/packages/create-rstack/template-app-vue/rstack.config.js
similarity index 100%
rename from packages/create-rstack/template-app-vue-js/rstack.config.js
rename to packages/create-rstack/template-app-vue/rstack.config.js
diff --git a/packages/create-rstack/template-app-vue-js/src/App.vue b/packages/create-rstack/template-app-vue/src/App.vue
similarity index 100%
rename from packages/create-rstack/template-app-vue-js/src/App.vue
rename to packages/create-rstack/template-app-vue/src/App.vue
diff --git a/packages/create-rstack/template-app-vue-js/src/index.css b/packages/create-rstack/template-app-vue/src/index.css
similarity index 100%
rename from packages/create-rstack/template-app-vue-js/src/index.css
rename to packages/create-rstack/template-app-vue/src/index.css
diff --git a/packages/create-rstack/template-app-vue-js/src/index.js b/packages/create-rstack/template-app-vue/src/index.js
similarity index 100%
rename from packages/create-rstack/template-app-vue-js/src/index.js
rename to packages/create-rstack/template-app-vue/src/index.js
diff --git a/packages/create-rstack/template-app-vue-js/tests/index.test.js b/packages/create-rstack/template-app-vue/tests/index.test.js
similarity index 100%
rename from packages/create-rstack/template-app-vue-js/tests/index.test.js
rename to packages/create-rstack/template-app-vue/tests/index.test.js
diff --git a/packages/create-rstack/template-app-vue-js/tests/rstest.setup.js b/packages/create-rstack/template-app-vue/tests/rstest.setup.js
similarity index 100%
rename from packages/create-rstack/template-app-vue-js/tests/rstest.setup.js
rename to packages/create-rstack/template-app-vue/tests/rstest.setup.js
diff --git a/packages/create-rstack/template-doc-basic/README.md b/packages/create-rstack/template-doc/README.md
similarity index 100%
rename from packages/create-rstack/template-doc-basic/README.md
rename to packages/create-rstack/template-doc/README.md
diff --git a/packages/create-rstack/template-doc-basic/docs/_nav.json b/packages/create-rstack/template-doc/docs/_nav.json
similarity index 100%
rename from packages/create-rstack/template-doc-basic/docs/_nav.json
rename to packages/create-rstack/template-doc/docs/_nav.json
diff --git a/packages/create-rstack/template-doc-basic/docs/api/_meta.json b/packages/create-rstack/template-doc/docs/api/_meta.json
similarity index 100%
rename from packages/create-rstack/template-doc-basic/docs/api/_meta.json
rename to packages/create-rstack/template-doc/docs/api/_meta.json
diff --git a/packages/create-rstack/template-doc-basic/docs/api/commands.mdx b/packages/create-rstack/template-doc/docs/api/commands.mdx
similarity index 100%
rename from packages/create-rstack/template-doc-basic/docs/api/commands.mdx
rename to packages/create-rstack/template-doc/docs/api/commands.mdx
diff --git a/packages/create-rstack/template-doc-basic/docs/api/index.mdx b/packages/create-rstack/template-doc/docs/api/index.mdx
similarity index 100%
rename from packages/create-rstack/template-doc-basic/docs/api/index.mdx
rename to packages/create-rstack/template-doc/docs/api/index.mdx
diff --git a/packages/create-rstack/template-doc-basic/docs/guide/_meta.json b/packages/create-rstack/template-doc/docs/guide/_meta.json
similarity index 100%
rename from packages/create-rstack/template-doc-basic/docs/guide/_meta.json
rename to packages/create-rstack/template-doc/docs/guide/_meta.json
diff --git a/packages/create-rstack/template-doc-basic/docs/guide/start/_meta.json b/packages/create-rstack/template-doc/docs/guide/start/_meta.json
similarity index 100%
rename from packages/create-rstack/template-doc-basic/docs/guide/start/_meta.json
rename to packages/create-rstack/template-doc/docs/guide/start/_meta.json
diff --git a/packages/create-rstack/template-doc-basic/docs/guide/start/introduction.md b/packages/create-rstack/template-doc/docs/guide/start/introduction.md
similarity index 100%
rename from packages/create-rstack/template-doc-basic/docs/guide/start/introduction.md
rename to packages/create-rstack/template-doc/docs/guide/start/introduction.md
diff --git a/packages/create-rstack/template-doc-basic/docs/index.md b/packages/create-rstack/template-doc/docs/index.md
similarity index 100%
rename from packages/create-rstack/template-doc-basic/docs/index.md
rename to packages/create-rstack/template-doc/docs/index.md
diff --git a/packages/create-rstack/template-doc-basic/gitignore b/packages/create-rstack/template-doc/gitignore
similarity index 100%
rename from packages/create-rstack/template-doc-basic/gitignore
rename to packages/create-rstack/template-doc/gitignore
diff --git a/packages/create-rstack/template-doc-basic/package.json b/packages/create-rstack/template-doc/package.json
similarity index 94%
rename from packages/create-rstack/template-doc-basic/package.json
rename to packages/create-rstack/template-doc/package.json
index 65aab45b..19b97570 100644
--- a/packages/create-rstack/template-doc-basic/package.json
+++ b/packages/create-rstack/template-doc/package.json
@@ -1,5 +1,5 @@
 {
-  "name": "rstack-doc-basic",
+  "name": "rstack-doc",
   "version": "0.0.0",
   "private": true,
   "type": "module",
diff --git a/packages/create-rstack/template-doc-basic/rstack.config.ts b/packages/create-rstack/template-doc/rstack.config.ts
similarity index 100%
rename from packages/create-rstack/template-doc-basic/rstack.config.ts
rename to packages/create-rstack/template-doc/rstack.config.ts
diff --git a/packages/create-rstack/template-doc-basic/tsconfig.json b/packages/create-rstack/template-doc/tsconfig.json
similarity index 100%
rename from packages/create-rstack/template-doc-basic/tsconfig.json
rename to packages/create-rstack/template-doc/tsconfig.json
diff --git a/packages/create-rstack/template-lib-node-js/README.md b/packages/create-rstack/template-lib-node/README.md
similarity index 100%
rename from packages/create-rstack/template-lib-node-js/README.md
rename to packages/create-rstack/template-lib-node/README.md
diff --git a/packages/create-rstack/template-lib-node-js/package.json b/packages/create-rstack/template-lib-node/package.json
similarity index 94%
rename from packages/create-rstack/template-lib-node-js/package.json
rename to packages/create-rstack/template-lib-node/package.json
index 4845aa72..daf60f92 100644
--- a/packages/create-rstack/template-lib-node-js/package.json
+++ b/packages/create-rstack/template-lib-node/package.json
@@ -1,5 +1,5 @@
 {
-  "name": "rstack-lib-node-js",
+  "name": "rstack-lib-node",
   "version": "0.0.0",
   "sideEffects": false,
   "type": "module",
diff --git a/packages/create-rstack/template-lib-node-js/rstack.config.js b/packages/create-rstack/template-lib-node/rstack.config.js
similarity index 100%
rename from packages/create-rstack/template-lib-node-js/rstack.config.js
rename to packages/create-rstack/template-lib-node/rstack.config.js
diff --git a/packages/create-rstack/template-lib-node-js/src/index.js b/packages/create-rstack/template-lib-node/src/index.js
similarity index 100%
rename from packages/create-rstack/template-lib-node-js/src/index.js
rename to packages/create-rstack/template-lib-node/src/index.js
diff --git a/packages/create-rstack/template-lib-node-js/tests/index.test.js b/packages/create-rstack/template-lib-node/tests/index.test.js
similarity index 100%
rename from packages/create-rstack/template-lib-node-js/tests/index.test.js
rename to packages/create-rstack/template-lib-node/tests/index.test.js
diff --git a/packages/create-rstack/template-lib-react-js/README.md b/packages/create-rstack/template-lib-react/README.md
similarity index 100%
rename from packages/create-rstack/template-lib-react-js/README.md
rename to packages/create-rstack/template-lib-react/README.md
diff --git a/packages/create-rstack/template-lib-react-js/package.json b/packages/create-rstack/template-lib-react/package.json
similarity index 96%
rename from packages/create-rstack/template-lib-react-js/package.json
rename to packages/create-rstack/template-lib-react/package.json
index 60da6ad3..362869bd 100644
--- a/packages/create-rstack/template-lib-react-js/package.json
+++ b/packages/create-rstack/template-lib-react/package.json
@@ -1,5 +1,5 @@
 {
-  "name": "rstack-lib-react-js",
+  "name": "rstack-lib-react",
   "version": "0.0.0",
   "type": "module",
   "exports": {
diff --git a/packages/create-rstack/template-lib-react-js/rstack.config.js b/packages/create-rstack/template-lib-react/rstack.config.js
similarity index 100%
rename from packages/create-rstack/template-lib-react-js/rstack.config.js
rename to packages/create-rstack/template-lib-react/rstack.config.js
diff --git a/packages/create-rstack/template-lib-react-js/src/Button.jsx b/packages/create-rstack/template-lib-react/src/Button.jsx
similarity index 100%
rename from packages/create-rstack/template-lib-react-js/src/Button.jsx
rename to packages/create-rstack/template-lib-react/src/Button.jsx
diff --git a/packages/create-rstack/template-lib-react-js/src/button.css b/packages/create-rstack/template-lib-react/src/button.css
similarity index 100%
rename from packages/create-rstack/template-lib-react-js/src/button.css
rename to packages/create-rstack/template-lib-react/src/button.css
diff --git a/packages/create-rstack/template-lib-react-js/src/index.jsx b/packages/create-rstack/template-lib-react/src/index.jsx
similarity index 100%
rename from packages/create-rstack/template-lib-react-js/src/index.jsx
rename to packages/create-rstack/template-lib-react/src/index.jsx
diff --git a/packages/create-rstack/template-lib-react-js/tests/index.test.jsx b/packages/create-rstack/template-lib-react/tests/index.test.jsx
similarity index 100%
rename from packages/create-rstack/template-lib-react-js/tests/index.test.jsx
rename to packages/create-rstack/template-lib-react/tests/index.test.jsx
diff --git a/packages/create-rstack/template-lib-react-js/tests/rstest.setup.js b/packages/create-rstack/template-lib-react/tests/rstest.setup.js
similarity index 100%
rename from packages/create-rstack/template-lib-react-js/tests/rstest.setup.js
rename to packages/create-rstack/template-lib-react/tests/rstest.setup.js
diff --git a/packages/create-rstack/template-lib-solid-js/README.md b/packages/create-rstack/template-lib-solid/README.md
similarity index 100%
rename from packages/create-rstack/template-lib-solid-js/README.md
rename to packages/create-rstack/template-lib-solid/README.md
diff --git a/packages/create-rstack/template-lib-solid-js/package.json b/packages/create-rstack/template-lib-solid/package.json
similarity index 96%
rename from packages/create-rstack/template-lib-solid-js/package.json
rename to packages/create-rstack/template-lib-solid/package.json
index 3574d3b5..f0aa394d 100644
--- a/packages/create-rstack/template-lib-solid-js/package.json
+++ b/packages/create-rstack/template-lib-solid/package.json
@@ -1,5 +1,5 @@
 {
-  "name": "rstack-lib-solid-js",
+  "name": "rstack-lib-solid",
   "version": "0.0.0",
   "type": "module",
   "exports": {
diff --git a/packages/create-rstack/template-lib-solid-js/rstack.config.js b/packages/create-rstack/template-lib-solid/rstack.config.js
similarity index 100%
rename from packages/create-rstack/template-lib-solid-js/rstack.config.js
rename to packages/create-rstack/template-lib-solid/rstack.config.js
diff --git a/packages/create-rstack/template-lib-solid-js/src/Button.jsx b/packages/create-rstack/template-lib-solid/src/Button.jsx
similarity index 100%
rename from packages/create-rstack/template-lib-solid-js/src/Button.jsx
rename to packages/create-rstack/template-lib-solid/src/Button.jsx
diff --git a/packages/create-rstack/template-lib-solid-js/src/button.css b/packages/create-rstack/template-lib-solid/src/button.css
similarity index 100%
rename from packages/create-rstack/template-lib-solid-js/src/button.css
rename to packages/create-rstack/template-lib-solid/src/button.css
diff --git a/packages/create-rstack/template-lib-solid-js/src/index.jsx b/packages/create-rstack/template-lib-solid/src/index.jsx
similarity index 100%
rename from packages/create-rstack/template-lib-solid-js/src/index.jsx
rename to packages/create-rstack/template-lib-solid/src/index.jsx
diff --git a/packages/create-rstack/template-lib-solid-js/tests/index.test.jsx b/packages/create-rstack/template-lib-solid/tests/index.test.jsx
similarity index 100%
rename from packages/create-rstack/template-lib-solid-js/tests/index.test.jsx
rename to packages/create-rstack/template-lib-solid/tests/index.test.jsx
diff --git a/packages/create-rstack/template-lib-solid-js/tests/rstest.setup.js b/packages/create-rstack/template-lib-solid/tests/rstest.setup.js
similarity index 100%
rename from packages/create-rstack/template-lib-solid-js/tests/rstest.setup.js
rename to packages/create-rstack/template-lib-solid/tests/rstest.setup.js
diff --git a/packages/create-rstack/template-lib-svelte-js/README.md b/packages/create-rstack/template-lib-svelte/README.md
similarity index 100%
rename from packages/create-rstack/template-lib-svelte-js/README.md
rename to packages/create-rstack/template-lib-svelte/README.md
diff --git a/packages/create-rstack/template-lib-svelte-js/package.json b/packages/create-rstack/template-lib-svelte/package.json
similarity index 95%
rename from packages/create-rstack/template-lib-svelte-js/package.json
rename to packages/create-rstack/template-lib-svelte/package.json
index c1ed333f..c6936892 100644
--- a/packages/create-rstack/template-lib-svelte-js/package.json
+++ b/packages/create-rstack/template-lib-svelte/package.json
@@ -1,5 +1,5 @@
 {
-  "name": "rstack-lib-svelte-js",
+  "name": "rstack-lib-svelte",
   "version": "0.0.0",
   "type": "module",
   "exports": {
diff --git a/packages/create-rstack/template-lib-svelte-js/pnpm-workspace.yaml b/packages/create-rstack/template-lib-svelte/pnpm-workspace.yaml
similarity index 100%
rename from packages/create-rstack/template-lib-svelte-js/pnpm-workspace.yaml
rename to packages/create-rstack/template-lib-svelte/pnpm-workspace.yaml
diff --git a/packages/create-rstack/template-lib-svelte-js/rstack.config.js b/packages/create-rstack/template-lib-svelte/rstack.config.js
similarity index 100%
rename from packages/create-rstack/template-lib-svelte-js/rstack.config.js
rename to packages/create-rstack/template-lib-svelte/rstack.config.js
diff --git a/packages/create-rstack/template-lib-svelte-js/src/Button.svelte b/packages/create-rstack/template-lib-svelte/src/Button.svelte
similarity index 100%
rename from packages/create-rstack/template-lib-svelte-js/src/Button.svelte
rename to packages/create-rstack/template-lib-svelte/src/Button.svelte
diff --git a/packages/create-rstack/template-lib-svelte-js/src/button.css b/packages/create-rstack/template-lib-svelte/src/button.css
similarity index 100%
rename from packages/create-rstack/template-lib-svelte-js/src/button.css
rename to packages/create-rstack/template-lib-svelte/src/button.css
diff --git a/packages/create-rstack/template-lib-svelte-js/src/index.js b/packages/create-rstack/template-lib-svelte/src/index.js
similarity index 100%
rename from packages/create-rstack/template-lib-svelte-js/src/index.js
rename to packages/create-rstack/template-lib-svelte/src/index.js
diff --git a/packages/create-rstack/template-lib-svelte-js/tests/index.test.js b/packages/create-rstack/template-lib-svelte/tests/index.test.js
similarity index 100%
rename from packages/create-rstack/template-lib-svelte-js/tests/index.test.js
rename to packages/create-rstack/template-lib-svelte/tests/index.test.js
diff --git a/packages/create-rstack/template-lib-vue-js/README.md b/packages/create-rstack/template-lib-vue/README.md
similarity index 100%
rename from packages/create-rstack/template-lib-vue-js/README.md
rename to packages/create-rstack/template-lib-vue/README.md
diff --git a/packages/create-rstack/template-lib-vue-js/package.json b/packages/create-rstack/template-lib-vue/package.json
similarity index 95%
rename from packages/create-rstack/template-lib-vue-js/package.json
rename to packages/create-rstack/template-lib-vue/package.json
index fcf773fc..e5b8dc91 100644
--- a/packages/create-rstack/template-lib-vue-js/package.json
+++ b/packages/create-rstack/template-lib-vue/package.json
@@ -1,5 +1,5 @@
 {
-  "name": "rstack-lib-vue-js",
+  "name": "rstack-lib-vue",
   "version": "0.0.0",
   "type": "module",
   "exports": {
diff --git a/packages/create-rstack/template-lib-vue-js/rstack.config.js b/packages/create-rstack/template-lib-vue/rstack.config.js
similarity index 100%
rename from packages/create-rstack/template-lib-vue-js/rstack.config.js
rename to packages/create-rstack/template-lib-vue/rstack.config.js
diff --git a/packages/create-rstack/template-lib-vue-js/src/Button.vue b/packages/create-rstack/template-lib-vue/src/Button.vue
similarity index 100%
rename from packages/create-rstack/template-lib-vue-js/src/Button.vue
rename to packages/create-rstack/template-lib-vue/src/Button.vue
diff --git a/packages/create-rstack/template-lib-vue-js/src/button.css b/packages/create-rstack/template-lib-vue/src/button.css
similarity index 100%
rename from packages/create-rstack/template-lib-vue-js/src/button.css
rename to packages/create-rstack/template-lib-vue/src/button.css
diff --git a/packages/create-rstack/template-lib-vue-js/src/index.js b/packages/create-rstack/template-lib-vue/src/index.js
similarity index 100%
rename from packages/create-rstack/template-lib-vue-js/src/index.js
rename to packages/create-rstack/template-lib-vue/src/index.js
diff --git a/packages/create-rstack/template-lib-vue-js/tests/index.test.js b/packages/create-rstack/template-lib-vue/tests/index.test.js
similarity index 100%
rename from packages/create-rstack/template-lib-vue-js/tests/index.test.js
rename to packages/create-rstack/template-lib-vue/tests/index.test.js
diff --git a/packages/create-rstack/template-lib-vue-js/tests/rstest.setup.js b/packages/create-rstack/template-lib-vue/tests/rstest.setup.js
similarity index 100%
rename from packages/create-rstack/template-lib-vue-js/tests/rstest.setup.js
rename to packages/create-rstack/template-lib-vue/tests/rstest.setup.js
diff --git a/packages/create-rstack/tests/create.test.ts b/packages/create-rstack/tests/create.test.ts
index d215dbf9..c9e26e87 100644
--- a/packages/create-rstack/tests/create.test.ts
+++ b/packages/create-rstack/tests/create.test.ts
@@ -30,35 +30,35 @@ type SourceTemplate = {
 };
 
 const sourceTemplates: SourceTemplate[] = [
-  { template: 'app-vanilla-js', sourceExtension: 'js', testFile: 'dom.test.js' },
+  { template: 'app-vanilla', sourceExtension: 'js', testFile: 'dom.test.js' },
   { template: 'app-vanilla-ts', sourceExtension: 'ts', testFile: 'dom.test.ts' },
-  { template: 'app-react-js', sourceExtension: 'jsx', testFile: 'index.test.jsx' },
+  { template: 'app-react', sourceExtension: 'jsx', testFile: 'index.test.jsx' },
   { template: 'app-react-ts', sourceExtension: 'tsx', testFile: 'index.test.tsx' },
-  { template: 'app-preact-js', sourceExtension: 'jsx', testFile: 'index.test.jsx' },
+  { template: 'app-preact', sourceExtension: 'jsx', testFile: 'index.test.jsx' },
   { template: 'app-preact-ts', sourceExtension: 'tsx', testFile: 'index.test.tsx' },
-  { template: 'app-vue-js', sourceExtension: 'js', testFile: 'index.test.js' },
+  { template: 'app-vue', sourceExtension: 'js', testFile: 'index.test.js' },
   { template: 'app-vue-ts', sourceExtension: 'ts', testFile: 'index.test.ts' },
-  { template: 'app-lit-js', sourceExtension: 'js', testFile: 'index.test.js' },
+  { template: 'app-lit', sourceExtension: 'js', testFile: 'index.test.js' },
   { template: 'app-lit-ts', sourceExtension: 'ts', testFile: 'index.test.ts' },
-  { template: 'app-svelte-js', sourceExtension: 'js', testFile: 'index.test.js' },
+  { template: 'app-svelte', sourceExtension: 'js', testFile: 'index.test.js' },
   { template: 'app-svelte-ts', sourceExtension: 'ts', testFile: 'index.test.ts' },
-  { template: 'app-solid-js', sourceExtension: 'jsx', testFile: 'index.test.jsx' },
+  { template: 'app-solid', sourceExtension: 'jsx', testFile: 'index.test.jsx' },
   { template: 'app-solid-ts', sourceExtension: 'tsx', testFile: 'index.test.tsx' },
-  { template: 'lib-node-js', sourceExtension: 'js', testFile: 'index.test.js' },
+  { template: 'lib-node', sourceExtension: 'js', testFile: 'index.test.js' },
   { template: 'lib-node-ts', sourceExtension: 'ts', testFile: 'index.test.ts' },
-  { template: 'lib-react-js', sourceExtension: 'jsx', testFile: 'index.test.jsx' },
+  { template: 'lib-react', sourceExtension: 'jsx', testFile: 'index.test.jsx' },
   { template: 'lib-react-ts', sourceExtension: 'tsx', testFile: 'index.test.tsx' },
-  { template: 'lib-vue-js', sourceExtension: 'js', testFile: 'index.test.js' },
+  { template: 'lib-vue', sourceExtension: 'js', testFile: 'index.test.js' },
   { template: 'lib-vue-ts', sourceExtension: 'ts', testFile: 'index.test.ts' },
-  { template: 'lib-svelte-js', sourceExtension: 'js', testFile: 'index.test.js' },
+  { template: 'lib-svelte', sourceExtension: 'js', testFile: 'index.test.js' },
   { template: 'lib-svelte-ts', sourceExtension: 'ts', testFile: 'index.test.ts' },
-  { template: 'lib-solid-js', sourceExtension: 'jsx', testFile: 'index.test.jsx' },
+  { template: 'lib-solid', sourceExtension: 'jsx', testFile: 'index.test.jsx' },
   { template: 'lib-solid-ts', sourceExtension: 'tsx', testFile: 'index.test.tsx' },
 ];
 
 const docTemplates = [
   {
-    template: 'doc-basic',
+    template: 'doc',
     files: [
       'README.md',
       '.gitignore',
diff --git a/website/docs/en/guide/quick-start.mdx b/website/docs/en/guide/quick-start.mdx
index 51e206e4..3c1d5f40 100644
--- a/website/docs/en/guide/quick-start.mdx
+++ b/website/docs/en/guide/quick-start.mdx
@@ -101,7 +101,7 @@ Options:
   --package-name <name>     specify the package name
   --template-version <ver>  specify the npm template version
 
-Available templates: app-vanilla-js, app-vanilla-ts, app-react-js, app-react-ts, app-preact-js, app-preact-ts, app-vue-js, app-vue-ts, app-lit-js, app-lit-ts, app-svelte-js, app-svelte-ts, app-solid-js, app-solid-ts, lib-node-js, lib-node-ts, lib-react-js, lib-react-ts, lib-vue-js, lib-vue-ts, lib-svelte-js, lib-svelte-ts, lib-solid-js, lib-solid-ts, doc-basic, doc-i18n
+Available templates: app-vanilla, app-vanilla-ts, app-react, app-react-ts, app-preact, app-preact-ts, app-vue, app-vue-ts, app-lit, app-lit-ts, app-svelte, app-svelte-ts, app-solid, app-solid-ts, lib-node, lib-node-ts, lib-react, lib-react-ts, lib-vue, lib-vue-ts, lib-svelte, lib-svelte-ts, lib-solid, lib-solid-ts, doc, doc-i18n
 ```
 
 ## Install Rstack
diff --git a/website/docs/zh/guide/quick-start.mdx b/website/docs/zh/guide/quick-start.mdx
index f1c40cac..996c58f0 100644
--- a/website/docs/zh/guide/quick-start.mdx
+++ b/website/docs/zh/guide/quick-start.mdx
@@ -101,7 +101,7 @@ Options:
   --package-name <name>     specify the package name
   --template-version <ver>  specify the npm template version
 
-Available templates: app-vanilla-js, app-vanilla-ts, app-react-js, app-react-ts, app-preact-js, app-preact-ts, app-vue-js, app-vue-ts, app-lit-js, app-lit-ts, app-svelte-js, app-svelte-ts, app-solid-js, app-solid-ts, lib-node-js, lib-node-ts, lib-react-js, lib-react-ts, lib-vue-js, lib-vue-ts, lib-svelte-js, lib-svelte-ts, lib-solid-js, lib-solid-ts, doc-basic, doc-i18n
+Available templates: app-vanilla, app-vanilla-ts, app-react, app-react-ts, app-preact, app-preact-ts, app-vue, app-vue-ts, app-lit, app-lit-ts, app-svelte, app-svelte-ts, app-solid, app-solid-ts, lib-node, lib-node-ts, lib-react, lib-react-ts, lib-vue, lib-vue-ts, lib-svelte, lib-svelte-ts, lib-solid, lib-solid-ts, doc, doc-i18n
 ```
 
 ## 安装 Rstack \{#install-rstack}