diff --git a/chat-agent-sample/.eslintrc.json b/chat-sample/.eslintrc.json
similarity index 100%
rename from chat-agent-sample/.eslintrc.json
rename to chat-sample/.eslintrc.json
diff --git a/chat-agent-sample/.gitignore b/chat-sample/.gitignore
similarity index 100%
rename from chat-agent-sample/.gitignore
rename to chat-sample/.gitignore
diff --git a/chat-agent-sample/.vscode/launch.json b/chat-sample/.vscode/launch.json
similarity index 100%
rename from chat-agent-sample/.vscode/launch.json
rename to chat-sample/.vscode/launch.json
diff --git a/chat-agent-sample/.vscode/tasks.json b/chat-sample/.vscode/tasks.json
similarity index 100%
rename from chat-agent-sample/.vscode/tasks.json
rename to chat-sample/.vscode/tasks.json
diff --git a/chat-agent-sample/.vscodeignore b/chat-sample/.vscodeignore
similarity index 100%
rename from chat-agent-sample/.vscodeignore
rename to chat-sample/.vscodeignore
diff --git a/chat-agent-sample/README.md b/chat-sample/README.md
similarity index 87%
rename from chat-agent-sample/README.md
rename to chat-sample/README.md
index a9719f85..32fe5c65 100644
--- a/chat-agent-sample/README.md
+++ b/chat-sample/README.md
@@ -1,8 +1,8 @@
-# Chat Agent Example
+# Chat Example
 
 This sample shows
 
-- How to contribute a chat agent.
+- How to contribute a chat participant.
 - How to use the chatRequestAccess API to request access to the chat.
 - How to respond with follow-ups.
 
diff --git a/chat-agent-sample/cat.jpeg b/chat-sample/cat.jpeg
similarity index 100%
rename from chat-agent-sample/cat.jpeg
rename to chat-sample/cat.jpeg
diff --git a/chat-agent-sample/demo.png b/chat-sample/demo.png
similarity index 100%
rename from chat-agent-sample/demo.png
rename to chat-sample/demo.png
diff --git a/chat-agent-sample/package-lock.json b/chat-sample/package-lock.json
similarity index 99%
rename from chat-agent-sample/package-lock.json
rename to chat-sample/package-lock.json
index c8f79ed6..8c54fdb1 100644
--- a/chat-agent-sample/package-lock.json
+++ b/chat-sample/package-lock.json
@@ -1,11 +1,11 @@
 {
-    "name": "chat-agent-sample",
+    "name": "chat-sample",
     "version": "0.1.0",
     "lockfileVersion": 3,
     "requires": true,
     "packages": {
         "": {
-            "name": "chat-agent-sample",
+            "name": "chat-sample",
             "version": "0.1.0",
             "devDependencies": {
                 "@types/node": "^20.5.9",
@@ -15,7 +15,7 @@
                 "typescript": "^4.0.3"
             },
             "engines": {
-                "vscode": "^1.84.0"
+                "vscode": "^1.86.0"
             }
         },
         "node_modules/@aashutoshrathi/word-wrap": {
diff --git a/chat-agent-sample/package.json b/chat-sample/package.json
similarity index 83%
rename from chat-agent-sample/package.json
rename to chat-sample/package.json
index 707504e9..0e515359 100644
--- a/chat-agent-sample/package.json
+++ b/chat-sample/package.json
@@ -1,8 +1,8 @@
 {
-    "name": "chat-agent-sample",
+    "name": "chat-sample",
     "publisher": "vscode-samples",
-    "displayName": "Copilot Chat Sample Agent",
-    "description": "Sample chat agent extension, a trusty cat that will help you with your code.",
+    "displayName": "Copilot Chat Sample",
+    "description": "Sample chat extension, a trusty cat that will help you with your code.",
     "repository": {
         "type": "git",
         "url": "https://github.com/Microsoft/vscode-extension-samples"
diff --git a/chat-agent-sample/src/extension.ts b/chat-sample/src/extension.ts
similarity index 93%
rename from chat-agent-sample/src/extension.ts
rename to chat-sample/src/extension.ts
index 9b0c1f05..e14cfdbf 100644
--- a/chat-agent-sample/src/extension.ts
+++ b/chat-sample/src/extension.ts
@@ -12,7 +12,7 @@ const LANGUAGE_MODEL_ID = 'copilot-gpt-4';
 
 export function activate(context: vscode.ExtensionContext) {
 
-    // Define a Cat chat agent handler. 
+    // Define a Cat chat handler. 
     const handler: vscode.ChatRequestHandler = async (request: vscode.ChatRequest, context: vscode.ChatContext, stream: vscode.ChatResponseStream, token: vscode.CancellationToken): Promise<ICatChatResult> => {
         // To talk to an LLM in your subcommand handler implementation, your
         // extension can use VS Code's `requestChatAccess` API to access the Copilot API.
@@ -66,13 +66,13 @@ export function activate(context: vscode.ExtensionContext) {
         }
     };
 
-    // Agents appear as top-level options in the chat input
+    // Chat participants appear as top-level options in the chat input
     // when you type `@`, and can contribute sub-commands in the chat input
     // that appear when you type `/`.
-    const agent = vscode.chat.createChatParticipant('cat', handler);
-    agent.iconPath = vscode.Uri.joinPath(context.extensionUri, 'cat.jpeg');
-    agent.description = vscode.l10n.t('Meow! What can I help you with?');
-    agent.commandProvider = {
+    const cat = vscode.chat.createChatParticipant('cat', handler);
+    cat.iconPath = vscode.Uri.joinPath(context.extensionUri, 'cat.jpeg');
+    cat.description = vscode.l10n.t('Meow! What can I help you with?');
+    cat.commandProvider = {
         provideCommands(token) {
             return [
                 { name: 'teach', description: 'Pick at random a computer science concept then explain it in purfect way of a cat' },
@@ -81,7 +81,7 @@ export function activate(context: vscode.ExtensionContext) {
         }
     };
 
-    agent.followupProvider = {
+    cat.followupProvider = {
         provideFollowups(result: ICatChatResult, token: vscode.CancellationToken) {
             return [{
                 prompt: 'let us play',
@@ -114,7 +114,7 @@ export function activate(context: vscode.ExtensionContext) {
     });
 
     context.subscriptions.push(
-        agent,
+        cat,
         // Register the command handler for the /meow followup
         vscode.commands.registerCommand(MEOW_COMMAND_ID, async () => {
             vscode.window.showInformationMessage('Meow!');
diff --git a/chat-agent-sample/src/vscode.proposed.chatParticipant.d.ts b/chat-sample/src/vscode.proposed.chatParticipant.d.ts
similarity index 100%
rename from chat-agent-sample/src/vscode.proposed.chatParticipant.d.ts
rename to chat-sample/src/vscode.proposed.chatParticipant.d.ts
diff --git a/chat-agent-sample/src/vscode.proposed.chatVariableResolver.d.ts b/chat-sample/src/vscode.proposed.chatVariableResolver.d.ts
similarity index 100%
rename from chat-agent-sample/src/vscode.proposed.chatVariableResolver.d.ts
rename to chat-sample/src/vscode.proposed.chatVariableResolver.d.ts
diff --git a/chat-agent-sample/src/vscode.proposed.languageModels.d.ts b/chat-sample/src/vscode.proposed.languageModels.d.ts
similarity index 100%
rename from chat-agent-sample/src/vscode.proposed.languageModels.d.ts
rename to chat-sample/src/vscode.proposed.languageModels.d.ts
diff --git a/chat-agent-sample/tsconfig.json b/chat-sample/tsconfig.json
similarity index 100%
rename from chat-agent-sample/tsconfig.json
rename to chat-sample/tsconfig.json