diff --git a/src/lib/helpers/types/agentTypes.js b/src/lib/helpers/types/agentTypes.js
index efb131cf..ad7afc99 100644
--- a/src/lib/helpers/types/agentTypes.js
+++ b/src/lib/helpers/types/agentTypes.js
@@ -61,7 +61,7 @@
  * @property {AgentTemplate[]} templates
  * @property {Object[]} responses
  * @property {RoutingRule[]} routing_rules
- * @property {AgentEventRule[]} event_rules
+ * @property {AgentRule[]} rules
  * @property {AgentWelcomeInfo} welcome_info - Welcome information.
  * @property {string[]?} [actions]
  */
@@ -137,7 +137,7 @@
  */
 
 /**
- * @typedef {Object} AgentEventRule
+ * @typedef {Object} AgentRule
  * @property {string} name 
  * @property {string} event_name
  * @property {string} entity_type
diff --git a/src/lib/services/agent-service.js b/src/lib/services/agent-service.js
index 8188b18f..af3d4b74 100644
--- a/src/lib/services/agent-service.js
+++ b/src/lib/services/agent-service.js
@@ -93,11 +93,11 @@ export async function getAgentUtilityOptions() {
 }
 
 /**
- * Get agent event rule options
- * @returns {Promise<import('$agentTypes').AgentEventRule[]>}
+ * Get agent rule options
+ * @returns {Promise<import('$agentTypes').AgentRule[]>}
  */
-export async function getAgentEventRuleOptions() {
-    const url = endpoints.agentEventRuleOptionsUrl;
+export async function getAgentRuleOptions() {
+    const url = endpoints.agentRuleOptionsUrl;
     const response = await axios.get(url);
     return response.data;
 }
\ No newline at end of file
diff --git a/src/lib/services/api-endpoints.js b/src/lib/services/api-endpoints.js
index 656ad228..4974cc14 100644
--- a/src/lib/services/api-endpoints.js
+++ b/src/lib/services/api-endpoints.js
@@ -34,7 +34,7 @@ export const endpoints = {
     agentRefreshUrl: `${host}/refresh-agents`,
     agentCreateUrl: `${host}/agent`,
     agentUtilityOptionsUrl: `${host}/agent/utility/options`,
-    agentEventRuleOptionsUrl: `${host}/agent/event-rule/options`,
+    agentRuleOptionsUrl: `${host}/agent/rule/options`,
     
     // agent task
     agentTaskListUrl: `${host}/agent/tasks`,
diff --git a/src/routes/page/agent/[agentId]/+page.svelte b/src/routes/page/agent/[agentId]/+page.svelte
index 64749e3f..753bec9f 100644
--- a/src/routes/page/agent/[agentId]/+page.svelte
+++ b/src/routes/page/agent/[agentId]/+page.svelte
@@ -77,7 +77,7 @@
             profiles: agent.profiles?.filter((x, idx, self) => x?.trim()?.length > 0 && self.indexOf(x) === idx) || [],
             utilities: agent.utilities || [],
             knowledge_bases: agent.knowledge_bases || [],
-            event_rules: agent.event_rules || [],
+            rules: agent.rules || [],
             max_message_count: Number(agent.max_message_count) > 0 ? Number(agent.max_message_count) : null
         };
         isLoading = true;
@@ -121,7 +121,7 @@
         if (data) {
             agent.utilities = data.utilities || [];
             agent.knowledge_bases = data.knwoledgebases || [];
-            agent.event_rules = data.eventRules || [];
+            agent.rules = data.rules || [];
         }
     }
 
diff --git a/src/routes/page/agent/[agentId]/agent-components/agent-routing.svelte b/src/routes/page/agent/[agentId]/agent-components/agent-routing.svelte
index f74ff727..78efda9a 100644
--- a/src/routes/page/agent/[agentId]/agent-components/agent-routing.svelte
+++ b/src/routes/page/agent/[agentId]/agent-components/agent-routing.svelte
@@ -10,7 +10,7 @@
 <Card>
     <CardBody>
         <div class="text-center">
-            <h5 class="mt-1 mb-3">Routing Rules</h5>
+            <h5 class="mt-1 mb-3">Routing</h5>
         </div>
 
         {#each agent.routing_rules as rule, idx (idx)}
diff --git a/src/routes/page/agent/[agentId]/agent-components/agent-event-rule.svelte b/src/routes/page/agent/[agentId]/agent-components/agent-rule.svelte
similarity index 93%
rename from src/routes/page/agent/[agentId]/agent-components/agent-event-rule.svelte
rename to src/routes/page/agent/[agentId]/agent-components/agent-rule.svelte
index 75de6f5b..fd570605 100644
--- a/src/routes/page/agent/[agentId]/agent-components/agent-event-rule.svelte
+++ b/src/routes/page/agent/[agentId]/agent-components/agent-rule.svelte
@@ -1,7 +1,7 @@
 <script>
     import { onMount } from 'svelte';
     import { Card, CardBody, Input, Button } from '@sveltestrap/sveltestrap';
-	import { getAgentEventRuleOptions } from '$lib/services/agent-service';
+	import { getAgentRuleOptions } from '$lib/services/agent-service';
 
     const limit = 5;
     const textLimit = 50;
@@ -9,7 +9,7 @@
     /** @type {import('$agentTypes').AgentModel} */
     export let agent;
 
-    export const fetchEventRules = () => {
+    export const fetchRules = () => {
         const candidates = innerRules?.filter(x => !!x.name)?.map(x => {
             return {
                 name: x.name,
@@ -19,7 +19,7 @@
             };
         });
 
-        /** @type {import('$agentTypes').AgentEventRule[]} */
+        /** @type {import('$agentTypes').AgentRule[]} */
         const rules = [];
         const unique = new Set();
         candidates.forEach(x => {
@@ -36,11 +36,11 @@
     /** @type {any[]} */
     let ruleOptions = [];
 
-    /** @type {import('$agentTypes').AgentEventRule[]} */
+    /** @type {import('$agentTypes').AgentRule[]} */
     let innerRules = [];
 
     onMount(async () =>{
-        getAgentEventRuleOptions().then(data => {
+        getAgentRuleOptions().then(data => {
             const list = data?.map(x => {
                 return {
                     name: x.name,
@@ -56,7 +56,7 @@
     });
 
     function init() {
-        const list = agent.event_rules?.map(x => {
+        const list = agent.rules?.map(x => {
             return {
                 ...x,
                 displayName: "",
@@ -128,7 +128,7 @@
     }
 
 
-    /** @param {import('$agentTypes').AgentEventRule[]} list */
+    /** @param {import('$agentTypes').AgentRule[]} list */
     function refresh(list) {
         innerRules = list?.map(x => {
             return {
@@ -146,7 +146,7 @@
 <Card>
     <CardBody>
         <div class="text-center">
-            <h5 class="mt-1 mb-3">Event Rules</h5>
+            <h5 class="mt-1 mb-3">Rules</h5>
         </div>
 
         <div class="agent-utility-container">
@@ -154,7 +154,7 @@
                 <div class="utility-wrapper">
                     <div class="utility-row utility-row-primary">
                         <div class="utility-label fw-bold">
-                            <div class="line-align-center">{`Collection #${uid + 1}`}</div>
+                            <div class="line-align-center">{`Rule #${uid + 1}`}</div>
                             <div class="utility-tooltip">
                                 <div class="line-align-center">
                                     <Input
@@ -247,7 +247,7 @@
                     <Button color="primary" on:click={() => addRule()}>
                         <span>
                             <i class="bx bx-plus" />
-                            <span>Add Event Rule</span>
+                            <span>Add Rule</span>
                         </span>
                     </Button>
                 </div>
diff --git a/src/routes/page/agent/[agentId]/agent-tabs.svelte b/src/routes/page/agent/[agentId]/agent-tabs.svelte
index d57a7100..e17d5b5a 100644
--- a/src/routes/page/agent/[agentId]/agent-tabs.svelte
+++ b/src/routes/page/agent/[agentId]/agent-tabs.svelte
@@ -7,7 +7,7 @@
 	import AgentUtility from './agent-components/agent-utility.svelte';
 	import AgentKnowledgeBase from './agent-components/agent-knowledge-base.svelte';
 	import AgentRouting from './agent-components/agent-routing.svelte';
-	import AgentEventRule from './agent-components/agent-event-rule.svelte';
+	import AgentEventRule from './agent-components/agent-rule.svelte';
 
     /** @type {import('$agentTypes').AgentModel} */
     export let agent;
@@ -15,12 +15,12 @@
     export const fetchData = () => {
         const utilities = agentUtilityCmp?.fetchUtilities();
         const knwoledgebases = agentKnowledgeBaseCmp?.fetchKnowledgeBases();
-        const eventRules = agentEventRuleCmp?.fetchEventRules();
+        const rules = agentEventRuleCmp?.fetchRules();
 
         return {
             utilities: utilities || [],
             knwoledgebases: knwoledgebases || [],
-            eventRules: eventRules || []
+            rules: rules || []
         };
     };
 
@@ -37,10 +37,10 @@
     /** @type {any[]}*/
     let tabs = [
         { name: 'agent-llm-config', displayText: 'LLm Config' },
-        { name: 'agent-routing-rule', displayText: 'Routing Rules' },
+        { name: 'agent-routing-rule', displayText: 'Routing' },
         { name: 'agent-utility', displayText: 'Utilities' },
-        { name: 'agent-knowledgebase', displayText: 'Knowledge Bases' },
-        { name: 'agent-event-rule', displayText: 'Event Rules' }
+        { name: 'agent-knowledgebase', displayText: 'Knowledge Base' },
+        { name: 'agent-event-rule', displayText: 'Rules' }
     ];
 
     onMount(() => {