@@ -122,8 +122,8 @@ The CLI passes both values to the Select AI SDK as `wallet_location` and
 The server accepts both A2A 1.x and the A2A v0.3 JSON-RPC streaming protocol
 for compatibility with Gemini Enterprise.
 
-See the [A2A user guide](doc/source/user_guide/a2a.rst) for the dynamic
-gateway, A2UI connection flow, persistent task state, task polling and
+See the [A2A user guide](doc/source/user_guide/a2a.rst) for dynamic sessions,
+the A2UI connection flow, persistent task state, task polling and
 cancellation, wallet configuration, and Google Cloud deployment modes.
 
 Generate the A2A v0.3 Agent Card to paste into Gemini Enterprise after the
 
@@ -487,17 +487,17 @@ session routing metadata. The credentials remain in the worker child process
 for the lifetime of that session, so use TLS for client-to-gateway traffic and
 follow the security policies for any client that renders the form.
 
-The gateway samples perform this handshake automatically. They use the
+The dynamic-session samples perform this handshake automatically. They use the
 repository-local helper module
-`samples/a2a/gateway/_common.py <https://github.com/oracle/python-select-ai/blob/main/samples/a2a/gateway/_common.py>`__;
+`samples/a2a/dynamic/_common.py <https://github.com/oracle/python-select-ai/blob/main/samples/a2a/dynamic/_common.py>`__;
 ``_common``
 is not a package that users install with ``pip``. Running the samples from the
 repository root as shown below makes that helper available automatically.
 
 The helper functions are:
 
 ``call(method, params)``
-   Sends one A2A v0.3 JSON-RPC request to the configured gateway endpoint.
+   Sends one A2A v0.3 JSON-RPC request to the configured server endpoint.
 
 ``connect(prompt)``
    Sends the initial prompt, reads the A2UI connection form, submits the
@@ -506,26 +506,26 @@ The helper functions are:
    A2A context ID for the connected session.
 
 ``send_prompt(prompt, context_id, blocking=None)``
-   Sends a database prompt in an existing gateway context. Passing
+   Sends a database prompt in an existing dynamic session. Passing
    ``blocking=False`` adds the non-blocking request option.
 
 ``print_task_summary(task)``
    Prints the task state, result artifact name, and text parts without dumping
    the connection-form details.
 
-If you copy a gateway sample into another directory, copy the
-`_common.py helper <https://github.com/oracle/python-select-ai/blob/main/samples/a2a/gateway/_common.py>`__
+If you copy a dynamic-session sample into another directory, copy the
+`_common.py helper <https://github.com/oracle/python-select-ai/blob/main/samples/a2a/dynamic/_common.py>`__
 with it, or replace these helpers with an A2A client implementation of your
 own.
 
-The complete gateway setup is also documented in the
-`gateway sample README <https://github.com/oracle/python-select-ai/blob/main/samples/a2a/gateway/README.md>`__.
+The complete dynamic-session setup is also documented in the
+`dynamic sample README <https://github.com/oracle/python-select-ai/blob/main/samples/a2a/dynamic/README.md>`__.
 The examples below are the
-`blocking_task.py sample <https://github.com/oracle/python-select-ai/blob/main/samples/a2a/gateway/blocking_task.py>`__
+`blocking_task.py sample <https://github.com/oracle/python-select-ai/blob/main/samples/a2a/dynamic/blocking_task.py>`__
 and the
-`task_poll.py sample <https://github.com/oracle/python-select-ai/blob/main/samples/a2a/gateway/task_poll.py>`__.
+`task_poll.py sample <https://github.com/oracle/python-select-ai/blob/main/samples/a2a/dynamic/task_poll.py>`__.
 
-.. literalinclude:: ../../../samples/a2a/gateway/blocking_task.py
+.. literalinclude:: ../../../samples/a2a/dynamic/blocking_task.py
    :language: python
    :lines: 8-
 
@@ -542,7 +542,7 @@ Run it with:
 
 .. code-block:: bash
 
-   python samples/a2a/gateway/blocking_task.py
+   python samples/a2a/dynamic/blocking_task.py
 
 Representative output is:
 
@@ -552,10 +552,10 @@ Representative output is:
    Artifact: database-agent-result
    The database contains ...
 
-The gateway polling sample uses the same connection-form handshake, then
+The dynamic polling sample uses the same connection-form handshake, then
 passes ``configuration.blocking: false`` and polls ``tasks/get``:
 
-.. literalinclude:: ../../../samples/a2a/gateway/task_poll.py
+.. literalinclude:: ../../../samples/a2a/dynamic/task_poll.py
    :language: python
    :lines: 8-
 
 
@@ -103,7 +103,7 @@ Both deployments expose the public A2A endpoint at:
 
 Both accept A2A 1.0 method names and the A2A v0.3 compatibility method names.
 The gateway client flow is documented in the
-[gateway samples](../samples/a2a/gateway/README.md).
+[dynamic-session samples](../samples/a2a/dynamic/README.md).
 
 ## Which deployment should you choose?
 
 
@@ -219,22 +219,22 @@ Task 7e1...: completed
 }
 ```
 
-## A2A dynamic gateway
+## Dynamic A2A sessions
 
-The dynamic gateway samples submit the A2UI database connection form, open a
-temporary worker session, and execute database tasks. The gateway advertises
+The dynamic session samples submit the A2UI database connection form, open a
+temporary database session, and execute database tasks. The server advertises
 `streaming: false` and supports non-blocking task execution with
 `configuration.blocking: false` and `tasks/get`.
 
-Gateway-specific samples that perform the form handshake and then execute a
-real database task are in [a2a/gateway](a2a/gateway/README.md):
+Dynamic-session samples that perform the form handshake and then execute a
+real database task are in [a2a/dynamic](a2a/dynamic/README.md):
 
 ```bash
-python samples/a2a/gateway/blocking_task.py
-python samples/a2a/gateway/task_poll.py
+python samples/a2a/dynamic/blocking_task.py
+python samples/a2a/dynamic/task_poll.py
 ```
 
-See that README for local Consul, worker, and gateway startup instructions.
+See that README for standalone and clustered startup instructions.
 
 The full A2A architecture, protocol details, session lifecycle, and Google
 Cloud deployment explanation are in the
 
@@ -19,13 +19,13 @@ The server accepts both versions, but streaming is disabled in both.
 
 The sample scripts import `call`, `connect`, `send_prompt`, and
 `print_task_summary` from the adjacent
-[`_common.py`](https://github.com/oracle/python-select-ai/blob/main/samples/a2a/gateway/_common.py)
+[`_common.py`](https://github.com/oracle/python-select-ai/blob/main/samples/a2a/dynamic/_common.py)
 file. This is a
 repository-local sample helper, not an additional Python dependency. It sends
 the JSON-RPC requests, reads the fields requested by the returned A2UI form,
 submits only those fields from the environment variables below, and formats
 the final task result. If you copy a script elsewhere, copy
-[`_common.py`](https://github.com/oracle/python-select-ai/blob/main/samples/a2a/gateway/_common.py)
+[`_common.py`](https://github.com/oracle/python-select-ai/blob/main/samples/a2a/dynamic/_common.py)
 with it or replace those helpers with your own A2A client code.
 
 ## Local setup
@@ -83,7 +83,7 @@ select-ai a2a worker \
   --worker-endpoint http://127.0.0.1:8081
 ```
 
-Terminal 3, the gateway:
+Terminal 3, the dynamic server:
 
 ```bash
 source .venv/bin/activate
@@ -127,7 +127,7 @@ First inspect the exact A2UI artifact and requested fields without submitting
 credentials:
 
 ```bash
-python samples/a2a/gateway/inspect_form.py
+python samples/a2a/dynamic/inspect_form.py
 ```
 
 The task samples perform the connection-form handshake automatically and
@@ -137,13 +137,13 @@ validate that the final artifact is
 Blocking database task:
 
 ```bash
-python samples/a2a/gateway/blocking_task.py
+python samples/a2a/dynamic/blocking_task.py
 ```
 
 Non-blocking database task with polling:
 
 ```bash
-python samples/a2a/gateway/task_poll.py
+python samples/a2a/dynamic/task_poll.py
 ```
 
 Expected task output is similar to:
 
@@ -148,7 +148,7 @@ def send_prompt(
     context_id: str,
     blocking: bool | None = None,
 ) -> dict:
-    """Send a normal database prompt through an existing gateway session."""
+    """Send a normal database prompt through an existing dynamic session."""
     params = {"message": _message(prompt, context_id)}
     if blocking is False:
         params["configuration"] = {"blocking": False}