diff --git a/packages/fx-core/src/question/constants.ts b/packages/fx-core/src/question/constants.ts
index cb8b9b50cb..716203e47d 100644
--- a/packages/fx-core/src/question/constants.ts
+++ b/packages/fx-core/src/question/constants.ts
@@ -255,7 +255,7 @@ export class ProjectTypeOptions {
 
   static copilotExtension(platform?: Platform): OptionItem {
     return {
-      id: "copilot-extension-type",
+      id: "copilot-agent-type",
       label: `${
         platform === Platform.VSCode ? "$(teamsfx-copilot-plugin) " : ""
       }${getLocalizedString("core.createProjectQuestion.projectType.copilotExtension.label")}`,
@@ -725,7 +725,7 @@ export class CapabilityOptions {
   // copilot extension - declarative copilot
   static declarativeCopilot(): OptionItem {
     return {
-      id: "declarative-copilot",
+      id: "declarative-agent",
       label: getLocalizedString("core.createProjectQuestion.projectType.declarativeCopilot.label"),
       detail: getLocalizedString(
         "core.createProjectQuestion.projectType.declarativeCopilot.detail"
diff --git a/packages/fx-core/src/question/inputs/CreateProjectInputs.ts b/packages/fx-core/src/question/inputs/CreateProjectInputs.ts
index 0002aff373..5c7e494c2c 100644
--- a/packages/fx-core/src/question/inputs/CreateProjectInputs.ts
+++ b/packages/fx-core/src/question/inputs/CreateProjectInputs.ts
@@ -31,7 +31,7 @@ export interface CreateProjectInputs extends Inputs {
     | "search-message-extension"
     | "link-unfurling"
     | "api-plugin"
-    | "declarative-copilot"
+    | "declarative-agent"
     | "custom-copilot-basic"
     | "custom-copilot-rag"
     | "custom-copilot-agent"
diff --git a/packages/fx-core/src/question/options/CreateProjectOptions.ts b/packages/fx-core/src/question/options/CreateProjectOptions.ts
index f25ab5d572..3d56ccab0e 100644
--- a/packages/fx-core/src/question/options/CreateProjectOptions.ts
+++ b/packages/fx-core/src/question/options/CreateProjectOptions.ts
@@ -41,7 +41,7 @@ export const CreateProjectOptions: CLICommandOption[] = [
       "search-message-extension",
       "link-unfurling",
       "api-plugin",
-      "declarative-copilot",
+      "declarative-agent",
       "custom-copilot-basic",
       "custom-copilot-rag",
       "custom-copilot-agent",
diff --git a/packages/fx-core/tests/component/generator/apiSpecGenerator.test.ts b/packages/fx-core/tests/component/generator/apiSpecGenerator.test.ts
index 2e1d4f4cce..1feef321a8 100644
--- a/packages/fx-core/tests/component/generator/apiSpecGenerator.test.ts
+++ b/packages/fx-core/tests/component/generator/apiSpecGenerator.test.ts
@@ -2335,7 +2335,7 @@ describe("SpecGenerator", async () => {
         [QuestionNames.Capabilities]: CapabilityOptions.apiPlugin().id,
         [QuestionNames.ApiPluginType]: ApiPluginStartOptions.apiSpec().id,
         [QuestionNames.ApiPluginManifestPath]: "test.json",
-        [QuestionNames.ProjectType]: "copilot-extension-type",
+        [QuestionNames.ProjectType]: "copilot-agent-type",
         getTemplateInfosState: {
           templateName: "api-plugin-existing-api",
           isPlugin: true,
diff --git a/packages/vscode-extension/package.nls.json b/packages/vscode-extension/package.nls.json
index a0fce0471c..3419b0a7f6 100644
--- a/packages/vscode-extension/package.nls.json
+++ b/packages/vscode-extension/package.nls.json
@@ -541,7 +541,7 @@
   "teamstoolkit.walkthroughs.buildIntelligentApps.copilotPlugin.description": "Transform your app into a plugin to enhance Copilot's skills and boost user productivity in daily tasks and workflows. Explore [Copilot Extensibility](https://learn.microsoft.com/en-us/microsoft-365-copilot/extensibility/)\n[Check Copilot Access](command:fx-extension.checkCopilotAccess?%5B%22WalkThrough%22%5D)",
 
   "teamstoolkit.walkthroughs.buildIntelligentApps.buildPlugin.title": "Build a Plugin",
-  "teamstoolkit.walkthroughs.buildIntelligentApps.buildPlugin.description": "Expand, enrich, and customize Copilot with plugins and Graph connectors in any of the following ways\n[OpenAPI Description Document](command:fx-extension.createFromWalkthrough?%5B%22WalkThrough%22%2C%20%7B%22project-type%22%3A%20%22copilot-extension-type%22%2C%20%22capabilities%22%3A%20%22api-plugin%22%7D%5D)\n[Teams Message Extension](command:fx-extension.createFromWalkthrough?%5B%22WalkThrough%22%2C%20%7B%22capabilities%22%3A%20%22search-app%22%2C%20%22project-type%22%3A%20%22me-type%22%2C%20%22me-architecture%22%3A%20%22bot-plugin%22%7D%5D)\n[Graph Connector](command:fx-extension.openSamples?%5B%22WalkThrough%22%2C%20%22gc-nodejs-typescript-food-catalog%22%5D)",
+  "teamstoolkit.walkthroughs.buildIntelligentApps.buildPlugin.description": "Expand, enrich, and customize Copilot with plugins and Graph connectors in any of the following ways\n[OpenAPI Description Document](command:fx-extension.createFromWalkthrough?%5B%22WalkThrough%22%2C%20%7B%22project-type%22%3A%20%22copilot-agent-type%22%2C%20%22capabilities%22%3A%20%22api-plugin%22%7D%5D)\n[Teams Message Extension](command:fx-extension.createFromWalkthrough?%5B%22WalkThrough%22%2C%20%7B%22capabilities%22%3A%20%22search-app%22%2C%20%22project-type%22%3A%20%22me-type%22%2C%20%22me-architecture%22%3A%20%22bot-plugin%22%7D%5D)\n[Graph Connector](command:fx-extension.openSamples?%5B%22WalkThrough%22%2C%20%22gc-nodejs-typescript-food-catalog%22%5D)",
 
   "teamstoolkit.walkthroughs.buildIntelligentApps.customCopilot.title": "Custom Engine Agent",
   "teamstoolkit.walkthroughs.buildIntelligentApps.customCopilot.description": "Build your intelligent, natural language-driven experiences in Teams, leveraging its vast user base for collaboration. \nTeams toolkit integrates with Azure OpenAI and Teams AI Library to streamline copilot development and offer unique Teams-based capabilities. \nExplore [Teams AI Library](https://learn.microsoft.com/en-us/microsoftteams/platform/bots/how-to/teams%20conversational%20ai/teams-conversation-ai-overview) and [Azure OpenAI Service](https://learn.microsoft.com/en-us/azure/ai-services/openai/overview)",