diff --git a/CHANGELOG.md b/CHANGELOG.md
index 39e51f9..a07fcce 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,6 @@
 # Change Log
 
-All notable changes to the "alitacodechat" extension will be documented in this file.
+All notable changes to the "eliteacodechat" extension will be documented in this file.
 
 Check [Keep a Changelog](http://keepachangelog.com/) for recommendations on how to structure this file.
 
diff --git a/package.json b/package.json
index 73f3380..ef3fafb 100644
--- a/package.json
+++ b/package.json
@@ -15,6 +15,7 @@
     "Other"
   ],
   "keywords": [
+    "elitea",
     "alita",
     "codechat",
     "openai",
@@ -39,24 +40,24 @@
     "viewsContainers": {
       "activitybar": [
         {
-          "id": "alitacode",
-          "title": "Alita Code",
+          "id": "eliteacode",
+          "title": "Elitea Code",
           "icon": "static/icon.png"
         }
       ]
     },
     "views": {
-      "alitacode": [
+      "eliteacode": [
         {
           "type": "webview",
-          "id": "alitacodechat.view",
+          "id": "eliteacodechat.view",
           "name": "Chat"
         }
       ]
     },
     "commands": [
       {
-        "command": "alitacodechat.helloWorld",
+        "command": "eliteacodechat.helloWorld",
         "title": "Hello World"
       }
     ]
diff --git a/packages/extension/package.json b/packages/extension/package.json
index e8e0f72..5b6e3c8 100644
--- a/packages/extension/package.json
+++ b/packages/extension/package.json
@@ -1,6 +1,6 @@
 {
   "name": "alitacodechat",
-  "displayName": "Alita Code Chat",
+  "displayName": "Elitea Code Chat",
   "version": "0.0.10",
   "publisher": "ProjectAlita",
   "icon": "images/icon.png",
diff --git a/packages/extension/src/ChatViewProvider.js b/packages/extension/src/ChatViewProvider.js
index 7de47f3..8730c3d 100644
--- a/packages/extension/src/ChatViewProvider.js
+++ b/packages/extension/src/ChatViewProvider.js
@@ -216,7 +216,7 @@ class ChatViewProvider {
           href="https://fonts.googleapis.com/css2?family=Montserrat:wght@300;400;500;600;700&display=swap" />
         <base target="_top" href="/">
         <meta name="viewport" content="width=device-width, initial-scale=1.0">
-        <title>Alita Code Chat</title>
+        <title>Elitea Code Chat</title>
         <script> window.__webview_public_path__ = "${publicPath}"</script>
         <link rel="stylesheet" href="${styleIndexUri}">
         <link rel="stylesheet" href="${styleMainUri}">
@@ -229,7 +229,7 @@ class ChatViewProvider {
   }
 }
 
-ChatViewProvider.viewType = 'alitacodechat.view';
-ChatViewProvider.toWebView = 'alitacodechat.toWebView';
+ChatViewProvider.viewType = 'eliteacodechat.view';
+ChatViewProvider.toWebView = 'eliteacodechat.toWebView';
 
 module.exports = ChatViewProvider;
\ No newline at end of file
diff --git a/packages/extension/src/extension.js b/packages/extension/src/extension.js
index 0e38065..31cc006 100644
--- a/packages/extension/src/extension.js
+++ b/packages/extension/src/extension.js
@@ -10,11 +10,11 @@ function registerWebView(context) {
       webviewOptions: { retainContextWhenHidden: true },
     }),
     vscode.workspace.onDidChangeConfiguration((event) => {
-      const changed = event.affectsConfiguration('alitacode.serviceProviderForLLM') ||
-        event.affectsConfiguration('alitacode.LLMServerUrl') ||
-        event.affectsConfiguration('alitacode.projectId') ||
-        event.affectsConfiguration('alitacode.integrationUid') ||
-        event.affectsConfiguration('alitacode.LLMAuthToken')
+      const changed = event.affectsConfiguration('eliteacode.serviceProviderForLLM') ||
+        event.affectsConfiguration('eliteacode.LLMServerUrl') ||
+        event.affectsConfiguration('eliteacode.projectId') ||
+        event.affectsConfiguration('eliteacode.integrationUid') ||
+        event.affectsConfiguration('eliteacode.LLMAuthToken')
       if (changed) {
         provider.sendSettingChanged()
       }
diff --git a/packages/ui/dist-webpack/index.html b/packages/ui/dist-webpack/index.html
index 771910b..26c30f9 100644
--- a/packages/ui/dist-webpack/index.html
+++ b/packages/ui/dist-webpack/index.html
@@ -2,7 +2,7 @@
 <html>
   <head>
     <meta charset="utf-8" />
-    <title>AlitaCodeChat</title>
+    <title>EliteaCodeChat</title>
   </head>
   <body>
     <div id="root"></div>
diff --git a/packages/ui/index.html b/packages/ui/index.html
index 1ffc311..944a88c 100644
--- a/packages/ui/index.html
+++ b/packages/ui/index.html
@@ -5,7 +5,7 @@
       href="https://fonts.googleapis.com/css2?family=Montserrat:wght@300;400;500;600;700&display=swap" />
     <link rel="icon" type="image/svg+xml" href="https://avatars.githubusercontent.com/u/147170315?s=100" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-    <title>AlitaCodeChatUI</title>
+    <title>EliteaCodeChatUI</title>
   </head>
 
   <body>
diff --git a/packages/ui/src/components/ChatBox/ActionButtons.jsx b/packages/ui/src/components/ChatBox/ActionButtons.jsx
index 09e742e..87f22e8 100644
--- a/packages/ui/src/components/ChatBox/ActionButtons.jsx
+++ b/packages/ui/src/components/ChatBox/ActionButtons.jsx
@@ -19,7 +19,7 @@ export default function ActionButtons({
             <StopCircleOutlinedIcon sx={{ fontSize: '1.13rem' }} color="icon" />
           </ActionButton>
         </StyledTooltip>}
-      <StyledTooltip title={'Reload Alita Code settings, prompt and datasource options'} placement="top">
+      <StyledTooltip title={'Reload Elitea Code settings, prompt and datasource options'} placement="top">
         <ActionButton onClick={onRefresh}>
           <RefreshOutlinedIcon sx={{ fontSize: '1.13rem' }} color="icon" />
         </ActionButton>
diff --git a/packages/ui/src/components/ChatBox/ChatBox.jsx b/packages/ui/src/components/ChatBox/ChatBox.jsx
index d7f4b36..20f7b96 100644
--- a/packages/ui/src/components/ChatBox/ChatBox.jsx
+++ b/packages/ui/src/components/ChatBox/ChatBox.jsx
@@ -447,7 +447,7 @@ const ChatBox = forwardRef(({
 
     const projectId = socketConfig?.projectId
     if (!projectId) {
-      toastError('Alita Code extension Project ID setting is missing. Please set it to continue chat.');
+      toastError('Elitea Code extension Project ID setting is missing. Please set it to continue chat.');
       return
     }
       
@@ -508,14 +508,14 @@ const ChatBox = forwardRef(({
           payloadData.model_settings = modelSettings
           payloadData.model_settings.model = getDefaultModel(modelSettings.model, deployments)
           if (!payloadData.model_settings.model.model_name) {
-            toastError('Alita Code extension model settings are missing.');
+            toastError('Elitea Code extension model settings are missing.');
             return
           } else if (!payloadData.model_settings.model.integration_uid) {
-            toastError('Alita Code extension integration Uid is missing.');
+            toastError('Elitea Code extension integration Uid is missing.');
             return
           }
         } else {
-          toastError('Alita Code extension model settings are missing.');
+          toastError('Elitea Code extension model settings are missing.');
           return
         }
       }