diff --git a/extensions/prompt-basics/package.json b/extensions/prompt-basics/package.json
index caeeb0b73ff..846766d297b 100644
--- a/extensions/prompt-basics/package.json
+++ b/extensions/prompt-basics/package.json
@@ -38,7 +38,7 @@
         "configuration": "./language-configuration.json"
       },
       {
-        "id": "agent",
+        "id": "chatagent",
         "aliases": [
           "Agent",
           "chat agent"
@@ -70,7 +70,7 @@
         ]
       },
       {
-        "language": "chatmode",
+        "language": "chatagent",
         "path": "./syntaxes/prompt.tmLanguage.json",
         "scopeName": "text.html.markdown.prompt",
         "unbalancedBracketScopes": [
@@ -102,7 +102,7 @@
           "other": "off"
         }
       },
-      "[chatmode]": {
+      "[chatagent]": {
         "editor.unicodeHighlight.ambiguousCharacters": false,
         "editor.unicodeHighlight.invisibleCharacters": false,
         "diffEditor.ignoreTrimWhitespace": false,
diff --git a/src/vs/workbench/contrib/chat/common/promptSyntax/promptTypes.ts b/src/vs/workbench/contrib/chat/common/promptSyntax/promptTypes.ts
index bae4b5626c4..9ae26e570af 100644
--- a/src/vs/workbench/contrib/chat/common/promptSyntax/promptTypes.ts
+++ b/src/vs/workbench/contrib/chat/common/promptSyntax/promptTypes.ts
@@ -25,7 +25,7 @@ export const INSTRUCTIONS_LANGUAGE_ID = 'instructions';
 /**
  * Language ID for agent syntax.
  */
-export const AGENT_LANGUAGE_ID = 'agent';
+export const AGENT_LANGUAGE_ID = 'chatagent';
 
 /**
  * Prompt and instructions files language selector.