diff --git a/.github/vale/styles/OpenSearch/SubstitutionsSuggestion.yml b/.github/vale/styles/OpenSearch/SubstitutionsSuggestion.yml
index 9607fbc5cd..0e5402700a 100644
--- a/.github/vale/styles/OpenSearch/SubstitutionsSuggestion.yml
+++ b/.github/vale/styles/OpenSearch/SubstitutionsSuggestion.yml
@@ -20,6 +20,7 @@ swap:
   'clean up': remove or normalize
   'cleans up': removes or normalizes
   'cleaning up': removing or normalizing
+  'cleaned up': removed or normalized
   'covers': includes, describes, or provides
   'deal with': process or resolve
   'deals with': processes or resolves
@@ -93,7 +94,6 @@ swap:
   'scale up': scale or increase capacity
   'scales up': scales or increases capacity
   'scaling up': scaling or increasing capacity
-  'see': view or display
   'sees': detects or finds
   'set up': configure or initialize
   'sets up': configures or initializes
@@ -135,7 +135,6 @@ swap:
   'thinking': evaluating or determining
   'under the hood': internally
   'walks you through': describes or explains
-  'want': require or expect
   'wants': requires or expects
   'wire up': connect or configure
   'wires up': connects or configures
@@ -143,7 +142,6 @@ swap:
   'wiring': configuration or networking
   'wish|desire': want
   'work around': mitigate or bypass
-  'working': functioning
   'works around': mitigates or bypasses
   'working around': mitigating or bypassing
   'workaround': mitigation or alternative approach
diff --git a/.github/vale/styles/Vocab/OpenSearch/Words/accept.txt b/.github/vale/styles/Vocab/OpenSearch/Words/accept.txt
index dd4eddef70..68a4d822ca 100644
--- a/.github/vale/styles/Vocab/OpenSearch/Words/accept.txt
+++ b/.github/vale/styles/Vocab/OpenSearch/Words/accept.txt
@@ -88,6 +88,7 @@ gzip
 [Hh]ostname
 [Hh]otspots?
 [Hh]yperparameters
+[Ii]dempotent
 [Ii]mpactful
 [Ii]nfographics?
 [Ii]ngress
diff --git a/_ml-commons-plugin/agentic-memory-retention.md b/_ml-commons-plugin/agentic-memory-retention.md
new file mode 100644
index 0000000000..d9d234082e
--- /dev/null
+++ b/_ml-commons-plugin/agentic-memory-retention.md
@@ -0,0 +1,228 @@
+---
+layout: default
+title: Agentic memory retention
+parent: Agentic memory
+grand_parent: Memory and context
+nav_order: 30
+---
+
+# Agentic memory retention
+**Introduced 3.8**
+{: .label .label-purple }
+
+This is an experimental feature and is not recommended for use in a production environment. For updates on the progress of the feature or if you want to leave feedback, join the discussion on the [OpenSearch forum](https://forum.opensearch.org/).
+{: .warning}
+
+By default, agentic memories accumulate indefinitely, which increases storage use and can cause agents to retrieve outdated memories. To automatically delete old or excess memories, define a _retention policy_ for a [memory container]({{site.url}}{{site.baseurl}}/ml-commons-plugin/agentic-memory/#memory-containers). The retention policy specifies an age limit, a count limit, or both for each memory type. A background job enforces the policy on a schedule (by default, every 24 hours). It deletes `sessions`, `long-term`, and `history` memories that exceed a count limit, or `sessions` and `long-term` memories that exceed an age limit. In contrast, `working` memory is not subject to the retention policy and is deleted when its parent session no longer exists. To control the amount of time that `working` memories are retained, configure retention for `sessions`.
+
+You can exclude `sessions` and `long-term` memories from the retention policy by pinning them. For more information, see [Pinning memories](#pinning-memories).
+
+## Enabling memory retention
+
+Retention is disabled by default. To enable it cluster-wide, configure the following dynamic cluster setting:
+
+```json
+PUT /_cluster/settings
+{
+  "persistent": {
+    "plugins.ml_commons.memory.retention_enabled": true
+  }
+}
+```
+{% include copy-curl.html %}
+
+## Defining a retention policy
+
+The `retention_policy` object is specified in the container's `configuration` object and maps each memory type to the retention limits for that type. Replace `{memory_type}` with `sessions`, `long-term`, or `history`:
+
+```json
+"configuration": {
+  "retention_policy": {
+    "{memory_type}": {
+      "retention_days": 90,
+      "max_count": 5000
+    }
+  }
+}
+```
+
+Each `{memory_type}` object accepts the following optional fields. When both fields are set, a memory is deleted if it violates either rule.
+
+Field | Data type | Supported memory types | Description
+:--- | :--- | :--- | :---
+`retention_days` | Integer | `sessions`, `long-term` | Deletes memories older than this many days, measured from the memory's `last_updated_time`.
+`max_count` | Integer | `sessions`, `long-term`, `history` | Keeps at most this many memories, deleting the oldest first. Sessions and long-term memory are ordered by `last_updated_time`; history is ordered by `created_time`.
+
+A retention rule takes effect only if the container stores that memory type. For `long-term` and `history` memories to be stored, you must configure `strategies`; otherwise, retention rules for those types have no effect. For more information, see [The created indexes]({{site.url}}{{site.baseurl}}/ml-commons-plugin/api/agentic-memory-apis/create-memory-container/#the-created-indexes).
+{: .note}
+
+### Configuring a retention policy
+
+To configure a policy when you create a memory container, include the `retention_policy` field in the create request. The following example creates a container with session tracking, a strategy, and a retention policy that retains up to 5,000 sessions for 90 days and limits long-term memory to 2,000 entries:
+
+```json
+POST /_plugins/_ml/memory_containers/_create
+{
+  "name": "my-agent-memory",
+  "configuration": {
+    "embedding_model_type": "TEXT_EMBEDDING",
+    "embedding_model_id": "your-embedding-model-id",
+    "embedding_dimension": 1024,
+    "llm_id": "your-llm-model-id",
+    "strategies": [
+      {
+        "type": "SEMANTIC",
+        "namespace": ["user_id"]
+      }
+    ],
+    "retention_policy": {
+      "sessions": {
+        "retention_days": 90,
+        "max_count": 5000
+      },
+      "long-term": {
+        "max_count": 2000
+      }
+    }
+  }
+}
+```
+{% include copy-curl.html %}
+
+You can also add a retention policy for an existing container at any time by sending the `retention_policy` object in an update request:
+
+```json
+PUT /_plugins/_ml/memory_containers/{memory_container_id}
+{
+  "configuration": {
+    "retention_policy": {
+      "sessions": {
+        "retention_days": 90,
+        "max_count": 5000
+      },
+      "long-term": {
+        "max_count": 2000
+      }
+    }
+  }
+}
+```
+{% include copy-curl.html %}
+
+### Viewing a retention policy
+
+To view the stored policy, retrieve the container using the [Get Memory Container API]({{site.url}}{{site.baseurl}}/ml-commons-plugin/api/agentic-memory-apis/get-memory-container/):
+
+```json
+GET /_plugins/_ml/memory_containers/{memory_container_id}
+```
+{% include copy-curl.html %}
+
+### Updating a retention policy
+
+Updating a `retention_policy` merges your changes into the existing policy rather than replacing it. Memory types and fields that you omit are left unchanged.
+
+To remove a single field, set it to `null`. For example, the following request updates the policy in the [Configuring a retention policy](#configuring-a-retention-policy) example by removing `retention_days` from `sessions` while keeping the `max_count` of 5,000:
+
+```json
+PUT /_plugins/_ml/memory_containers/{memory_container_id}
+{
+  "configuration": {
+    "retention_policy": {
+      "sessions": {
+        "retention_days": null
+      }
+    }
+  }
+}
+```
+{% include copy-curl.html %}
+
+### Disabling retention for a container
+
+To disable retention for the entire container, set `retention_policy` to `null`:
+
+```json
+PUT /_plugins/_ml/memory_containers/{memory_container_id}
+{
+  "configuration": {
+    "retention_policy": null
+  }
+}
+```
+{% include copy-curl.html %}
+
+Setting `retention_policy` to `null` differs from omitting it. Omitting the policy leaves the container eligible for [cluster-level default settings](#memory-retention-settings); setting it to `null` exempts the container from those defaults. You can send this request even when retention is disabled cluster-wide.
+
+## Pinning memories
+
+Pinning a memory exempts it from deletion under a container's [retention policy](#defining-a-retention-policy). You can pin `sessions` and `long-term` memories. Pinning `sessions` retains all of their `working` memories. Because pinned memories are never deleted, they can accumulate over time. To reduce the container size, unpin `sessions` that no longer require protection.
+
+Pinning protects a memory from deletion but does not change its age. A memory's age is measured from its `last_updated_time`, which advances only when its content changes, such as when you add messages to a session or edit memory content. Pinning does not update this timestamp, so if you later unpin the memory, its age still reflects its last content change and it may become immediately eligible for deletion.
+
+Use the following request field to pin a memory.
+
+Field | Data type | Description
+:--- | :--- | :---
+`pinned` | Boolean | Set to `true` to pin a memory or `false` to unpin it. Valid for `sessions` and `long-term` memories.
+
+The following example pins a memory (specify either `sessions` or `long-term` as `memory_type`):
+
+```json
+PUT /_plugins/_ml/memory_containers/{memory_container_id}/memories/{memory_type}/{memory_id}
+{
+  "pinned": true
+}
+```
+{% include copy-curl.html %}
+
+## Retention job
+
+A background job enforces retention policies on a schedule (by default, every 24 hours). Because enforcement is scheduled rather than continuous, note the following details about when and how memories are deleted:
+
+- A memory that has passed its age or count limit is still returned in search results until the job next runs and deletes it.
+- The `retention_days` limit is measured from a memory's `last_updated_time`. Adding messages to a session advances this timestamp, so active conversations are retained. Pinning a memory does not advance the timestamp.
+- When a memory type sets both `retention_days` and `max_count`, a memory is deleted if it exceeds either limit. The count limit applies regardless of age: if a container holds more than `max_count` non-pinned memories, the oldest are deleted until `max_count` remain, even if they are newer than `retention_days`.
+- Each run deletes at most 50,000 memories per memory type per container. A larger backlog is reduced over successive runs, so a container that far exceeds its `max_count` may take several runs to reach the limit.
+- The job is disabled when multi-tenancy is active. In this case, no retention is enforced, even for containers that have a policy.
+- Deleting a session does not immediately remove its messages. Working memories whose parent sessions no longer exists are removed only after they are older than `orphan_ttl_days` (by default, 7 days). The first time the job observes a container, it records a baseline and deletes no orphaned memory, deferring orphan deletion until the interval elapses.
+
+## Pausing retention
+
+To pause retention while preserving configured retention policies, set `plugins.ml_commons.memory.retention_enabled` to `false`. Setting it back to `true` resumes enforcement.
+
+## Memory retention settings
+
+You can customize retention behavior using the following dynamic cluster settings, which take effect without a cluster restart.
+
+Setting | Data type | Default | Description
+:--- | :--- | :--- | :---
+`plugins.ml_commons.memory.retention_enabled` | Boolean | `false` | Enables retention cluster-wide.
+`plugins.ml_commons.memory.retention_job_throttle_seconds` | Integer | `5` | The delay between containers during a job run, in seconds. Valid values are `1`--`60`. Used to reduce cluster load.
+`plugins.ml_commons.memory.working_memory_ttl_days` | Integer | `-1` (disabled) | Deletes working memory after this many days in containers created with `disable_session` set to `true`. Valid values are `1`--`365`.
+`plugins.ml_commons.memory.orphan_ttl_days` | Integer | `7` | Deletes working memory whose parent session no longer exists after this many days. Valid values are `1`--`365`.
+`plugins.ml_commons.memory.default_session_retention_days` | Integer | `-1` (disabled) | Applies a default `retention_days` to sessions in containers that have no explicit policy. Valid values are `1`--`3650`.
+`plugins.ml_commons.memory.default_session_max_count` | Integer | `-1` (disabled) | Applies a default `max_count` to sessions in containers that have no explicit policy. Valid values are `1`--`1000000`.
+`plugins.ml_commons.memory.default_long_term_max_count` | Integer | `-1` (disabled) | Applies a default `max_count` to long-term memory in containers that have no explicit policy. Valid values are `1`--`1000000`.
+`plugins.ml_commons.memory.default_history_max_count` | Integer | `-1` (disabled) | Applies a default `max_count` to history in containers that have no explicit policy. Valid values are `1`--`10000000`.
+
+### Default settings
+
+The `default_` settings apply to any container that has not set its own retention policy. They take effect only after [retention is enabled for the cluster](#enabling-memory-retention); until then, they are stored but have no effect. Once retention is enabled, the next scheduled job applies these defaults to those containers and deletes any memories that exceed the default values, including memories that were created before you set the defaults.
+
+Defaults are applied to a container only once; changing the `default_` settings later does not update containers to which they were already applied. To exempt a container from the defaults, set its `retention_policy` to `null`. To update a container's policy after the defaults are applied, use the [Update Memory Container API]({{site.url}}{{site.baseurl}}/ml-commons-plugin/api/agentic-memory-apis/update-memory-container/).
+
+### Retention job schedule
+
+<!-- TODO: When this feature goes GA, revisit the retention_job_interval_hours behavior (currently static-like; dynamic interval updates are planned for a future release). -->
+
+The following setting controls the retention job schedule. Set it in `opensearch.yml` before starting the cluster. The job reads it once, when it is first scheduled at startup; updating it through the Cluster Settings API on a running cluster has no effect.
+
+Setting | Data type | Default | Description
+:--- | :--- | :--- | :---
+`plugins.ml_commons.memory.retention_job_interval_hours` | Integer | `24` | How often the retention job runs, in hours. Valid values are `1`--`168`.
+
+## Next steps
+
+- For more information about memory containers and agentic memory, see [Agentic memory]({{site.url}}{{site.baseurl}}/ml-commons-plugin/agentic-memory/).
+- For the container creation API reference, see [Create Memory Container API]({{site.url}}{{site.baseurl}}/ml-commons-plugin/api/agentic-memory-apis/create-memory-container/).
diff --git a/_ml-commons-plugin/agentic-memory.md b/_ml-commons-plugin/agentic-memory.md
index 4f68c6fb6e..2a4f714b41 100644
--- a/_ml-commons-plugin/agentic-memory.md
+++ b/_ml-commons-plugin/agentic-memory.md
@@ -2,6 +2,8 @@
 layout: default
 title: Agentic memory
 parent: Memory and context
+has_children: true
+has_toc: false
 nav_order: 10
 ---
 
@@ -263,5 +265,6 @@ GET /_plugins/_ml/memory_containers/{memory_container_id}/memories/working/_sear
 
 ## Next steps
 
+- Learn about [agentic memory retention]({{site.url}}{{site.baseurl}}/ml-commons-plugin/agentic-memory-retention/).
 - Explore [memory container configuration]({{site.url}}{{site.baseurl}}/ml-commons-plugin/api/agentic-memory-apis/create-memory-container/) options.
 - Review the complete [Agentic Memory API reference]({{site.url}}{{site.baseurl}}/ml-commons-plugin/api/agentic-memory-apis/).
\ No newline at end of file
diff --git a/_ml-commons-plugin/api/agentic-memory-apis/add-memory.md b/_ml-commons-plugin/api/agentic-memory-apis/add-memory.md
index f619166702..a9199d4312 100644
--- a/_ml-commons-plugin/api/agentic-memory-apis/add-memory.md
+++ b/_ml-commons-plugin/api/agentic-memory-apis/add-memory.md
@@ -39,7 +39,7 @@ Field | Data type | Required/Optional | Description
 `structured_data` | Object | Conditional | Structured data content for data memory. Required when `payload_type` is `data`.
 `binary_data` | String | Optional | Binary data content encoded as a Base64 string for binary payloads.
 `payload_type` | String | Required | The type of payload. Valid values are `conversational` or `data`. See [Payload types]({{site.url}}{{site.baseurl}}/ml-commons-plugin/agentic-memory/#payload-types).
-`namespace` | Object | Optional | The [namespace]({{site.url}}{{site.baseurl}}/ml-commons-plugin/agentic-memory/#namespaces) context for organizing memories (for example, `user_id`, `session_id`, or `agent_id`). If `session_id` is not specified in the `namespace` field and `disable_session: false` (default is `true`), a new session with a new session ID is created.
+`namespace` | Object | Optional | The [namespace]({{site.url}}{{site.baseurl}}/ml-commons-plugin/agentic-memory/#namespaces) context for organizing memories (for example, `user_id`, `session_id`, or `agent_id`). If `session_id` is not specified in the `namespace` field and `disable_session` is `false` (the default), a new session with a new session ID is created.
 `metadata` | Object | Optional | Additional metadata for the memory (for example, `status`, `branch`, or custom fields).
 `tags` | Object | Optional | Tags for categorizing and organizing memories.
 `infer` | Boolean | Optional | Whether to use a large language model (LLM) to extract key information from messages. Default is `false`. When `true`, the LLM extracts key information from the original text and stores it as a memory. See [Inference mode]({{site.url}}{{site.baseurl}}/ml-commons-plugin/agentic-memory/#inference-mode).
diff --git a/_ml-commons-plugin/api/agentic-memory-apis/create-memory-container.md b/_ml-commons-plugin/api/agentic-memory-apis/create-memory-container.md
index 2e9e1bda70..358444a4cb 100644
--- a/_ml-commons-plugin/api/agentic-memory-apis/create-memory-container.md
+++ b/_ml-commons-plugin/api/agentic-memory-apis/create-memory-container.md
@@ -28,13 +28,13 @@ The indexes created for a memory container depend on the `configuration` you pro
 
 Configuration | Indexes created | Capabilities
 :--- | :--- | :---
-No `configuration` or no `strategies` | Working memory only (+ session if `disable_session` is `false`) | Raw message storage and retrieval. No semantic search, no long-term memory, no fact extraction.
-With `strategies` (requires `llm_id`, `embedding_model_id`, and `embedding_model_type`) | Working memory + long-term memory + history (+ session if `disable_session` is `false`) | Semantic search, fact extraction, memory consolidation (ADD/UPDATE/DELETE decisions), and an audit trail of all long-term memory changes.
+No `configuration` or no `strategies` | Working memory + session (unless `disable_session` is `true`) | Raw message storage and retrieval. No semantic search, no long-term memory, no fact extraction.
+With `strategies` (requires `llm_id`, `embedding_model_id`, and `embedding_model_type`) | Working memory + session + long-term memory + history (unless `disable_session` is `true`) | Semantic search, fact extraction, memory consolidation (ADD/UPDATE/DELETE decisions), and an audit trail of all long-term memory changes.
 
 Each index type serves a specific purpose:
 
 - **Working memory**: Stores raw messages as they are received. Always created.
-- **Session**: Tracks conversation sessions and their metadata. Created only when `disable_session` is `false` (disabled by default).
+- **Session**: Tracks conversation sessions and their metadata. Created by default. To disable session tracking, set `disable_session` to `true`.
 - **Long-term memory**: Stores extracted facts and persistent knowledge produced by strategies. Created only when strategies are configured.
 - **History**: An audit trail that records every ADD, UPDATE, and DELETE operation on long-term memory. Created only when strategies are configured. Can be opted out of by setting `disable_history` to `true`.
 
@@ -176,19 +176,20 @@ Field | Data type | Required/Optional | Description
 `index_prefix` | String | Optional | A custom prefix for memory indexes. If not specified, a default prefix is used: `default` when `use_system_index` is `true`, or an 8-character random UUID when `use_system_index` is `false`.
 `use_system_index` | Boolean | Optional | Whether to use system indexes (hidden indexes prefixed with `.plugins-ml-agentic-memory-`). Default is `true`.
 `disable_history`  | Boolean | Optional | Whether to disable the history audit trail index. Default is `false`. This setting only takes effect when strategies are configured, because the history index records changes to long-term memory. Without strategies, no long-term memory or history index is created regardless of this setting.
-`disable_session`  | Boolean | Optional | Whether to disable the session tracking index. Default is `true` (sessions are disabled by default). Set to `false` to enable session tracking for organizing conversations.
+`disable_session`  | Boolean | Optional | Whether to disable the session tracking index. Default is `false` (sessions are enabled by default). Set to `true` to disable session tracking.
 `max_infer_size`   | Integer | Optional | The maximum number of similar existing memories retrieved during memory consolidation to make ADD/UPDATE/DELETE decisions. Default is `5`. Maximum is `10`.
-`index_settings`   | Object | Optional | Custom OpenSearch index settings for the memory storage indexes that will be created for this container. Each memory type (`sessions`, `working`, `long_term`, and `history`) uses its own index. See [Index settings](#index-settings).
+`index_settings`   | Object | Optional | Custom OpenSearch index settings for the memory storage indexes that will be created for this container. Each memory type (`sessions`, `working`, `long_term`, and `history`) uses its own index. See [The `index_settings` object](#the-index_settings-object).
 `strategies` | Array | Optional | An array of [memory processing strategies]({{site.url}}{{site.baseurl}}/ml-commons-plugin/agentic-memory/#memory-processing-strategies). When strategies are provided, both `llm_id` and embedding model fields (`embedding_model_id`, `embedding_model_type`) are required. See [The `strategies` array](#the-strategies-array).
 `parameters` | Object | Optional | Global parameters for the memory container. See [The `parameters` object](#the-parameters-object).
 
-### Index settings
+### The index_settings object
 
 You can customize the OpenSearch index settings for the storage indexes that will be created to store memory data. Each memory type uses a dedicated index, and you can configure settings like the number of shards and replicas for performance optimization.
 
 The following example shows you how to specify custom index settings in the `configuration` object:
 
 ```json
+POST /_plugins/_ml/memory_containers/_create
 {
   "name": "my-memory-container",
   "configuration": {
@@ -200,7 +201,7 @@ The following example shows you how to specify custom index settings in the `con
           "number_of_replicas": "2"
         }
       },
-      "short_term_memory_index": {
+      "working_memory_index": {
         "index": {
           "number_of_shards": "2",
           "number_of_replicas": "2"
@@ -222,7 +223,7 @@ The following example shows you how to specify custom index settings in the `con
   }
 }
 ```
-{% include copy.html %}
+{% include copy-curl.html %}
 
 ### The strategies array
 
@@ -232,12 +233,12 @@ Field | Data type | Required/Optional | Description
 :--- | :--- | :--- | :---
 `type` | String | Required | The strategy type. Valid values are `SEMANTIC`, `USER_PREFERENCE`, and `SUMMARY`.
 `namespace` | Array | Required | An array of [namespace]({{site.url}}{{site.baseurl}}/ml-commons-plugin/agentic-memory/#namespaces) dimensions for organizing memories (for example, `["user_id"]` or `["agent_id", "session_id"]`).
-`configuration` | Object | Optional | Strategy-specific configuration. See [The strategy `configuration` object](#the-strategy-configuration-object).
+`configuration` | Object | Optional | Strategy-specific configuration. See [The `strategies.configuration` object](#the-strategies-configuration-object).
 `enabled`       | Boolean             | Optional | Whether to enable the strategy in the memory container. Default is `true`.
 
-### The strategy configuration object
+### The strategies configuration object
 
-The strategy `configuration` object supports the following fields.
+The `strategies.configuration` object supports the following fields.
 
 Field | Data type | Required/Optional | Description
 :--- | :--- | :--- | :---
@@ -246,6 +247,7 @@ Field | Data type | Required/Optional | Description
 `llm_id` | String | Optional | The LLM model ID for this strategy. Overrides the global LLM setting.
 
 ### The parameters object
+
 The `parameters` object supports the following field.
 
 Field | Data type | Required/Optional | Description
diff --git a/_ml-commons-plugin/api/agentic-memory-apis/delete-memory.md b/_ml-commons-plugin/api/agentic-memory-apis/delete-memory.md
index 46971a668d..4a62dc32e2 100644
--- a/_ml-commons-plugin/api/agentic-memory-apis/delete-memory.md
+++ b/_ml-commons-plugin/api/agentic-memory-apis/delete-memory.md
@@ -1,6 +1,6 @@
 ---
 layout: default
-title: Delete memory
+title: Delete agentic memory
 parent: Agentic memory APIs
 grand_parent: ML Commons APIs
 nav_order: 53
diff --git a/_ml-commons-plugin/api/agentic-memory-apis/get-memory.md b/_ml-commons-plugin/api/agentic-memory-apis/get-memory.md
index ed2b38d47d..5ac732fc91 100644
--- a/_ml-commons-plugin/api/agentic-memory-apis/get-memory.md
+++ b/_ml-commons-plugin/api/agentic-memory-apis/get-memory.md
@@ -1,6 +1,6 @@
 ---
 layout: default
-title: Get memory
+title: Get agentic memory
 parent: Agentic memory APIs
 grand_parent: ML Commons APIs
 nav_order: 51
diff --git a/_ml-commons-plugin/api/agentic-memory-apis/hybrid-search-memory.md b/_ml-commons-plugin/api/agentic-memory-apis/hybrid-search-memory.md
index 327d788aa2..f0fc10229f 100644
--- a/_ml-commons-plugin/api/agentic-memory-apis/hybrid-search-memory.md
+++ b/_ml-commons-plugin/api/agentic-memory-apis/hybrid-search-memory.md
@@ -1,12 +1,12 @@
 ---
 layout: default
-title: Hybrid search memory
+title: Hybrid search agentic memory
 parent: Agentic memory APIs
 grand_parent: ML Commons APIs
 nav_order: 70
 ---
 
-# Hybrid search memory API
+# Hybrid Search Agentic Memory API
 **Introduced 3.6**
 {: .label .label-purple }
 
diff --git a/_ml-commons-plugin/api/agentic-memory-apis/search-memory.md b/_ml-commons-plugin/api/agentic-memory-apis/search-memory.md
index c55b0808b2..6e91cd849d 100644
--- a/_ml-commons-plugin/api/agentic-memory-apis/search-memory.md
+++ b/_ml-commons-plugin/api/agentic-memory-apis/search-memory.md
@@ -1,6 +1,6 @@
 ---
 layout: default
-title: Search memory
+title: Search agentic memory
 parent: Agentic memory APIs
 grand_parent: ML Commons APIs
 nav_order: 54
diff --git a/_ml-commons-plugin/api/agentic-memory-apis/semantic-search-memory.md b/_ml-commons-plugin/api/agentic-memory-apis/semantic-search-memory.md
index 0ee429b700..5e839df3b1 100644
--- a/_ml-commons-plugin/api/agentic-memory-apis/semantic-search-memory.md
+++ b/_ml-commons-plugin/api/agentic-memory-apis/semantic-search-memory.md
@@ -1,12 +1,12 @@
 ---
 layout: default
-title: Semantic search memory
+title: Semantic search agentic memory
 parent: Agentic memory APIs
 grand_parent: ML Commons APIs
 nav_order: 60
 ---
 
-# Semantic Search Memory API
+# Semantic Search Agentic Memory API
 **Introduced 3.6**
 {: .label .label-purple }
 
diff --git a/_ml-commons-plugin/api/agentic-memory-apis/update-memory.md b/_ml-commons-plugin/api/agentic-memory-apis/update-memory.md
index f4b1dd73a5..607e3b5164 100644
--- a/_ml-commons-plugin/api/agentic-memory-apis/update-memory.md
+++ b/_ml-commons-plugin/api/agentic-memory-apis/update-memory.md
@@ -1,6 +1,6 @@
 ---
 layout: default
-title: Update memory
+title: Update agentic memory
 parent: Agentic memory APIs
 grand_parent: ML Commons APIs
 nav_order: 52