diff --git a/samples/agent/adk/contact_multiple_surfaces/README.md b/samples/agent/adk/custom-components-example/README.md
similarity index 97%
rename from samples/agent/adk/contact_multiple_surfaces/README.md
rename to samples/agent/adk/custom-components-example/README.md
index f561a2c9e..2c6a763a4 100644
--- a/samples/agent/adk/contact_multiple_surfaces/README.md
+++ b/samples/agent/adk/custom-components-example/README.md
@@ -13,7 +13,7 @@ This sample uses the Agent Development Kit (ADK) along with the A2A protocol to
 1. Navigate to the samples directory:
 
     ```bash
-    cd samples/agent/adk/contact_multiple_surfaces
+    cd samples/agent/adk/custom-components-example
     ```
 
 2. Create an environment file with your API key:
diff --git a/samples/agent/adk/contact_multiple_surfaces/README_CUSTOM_COMPONENTS.md b/samples/agent/adk/custom-components-example/README_CUSTOM_COMPONENTS.md
similarity index 96%
rename from samples/agent/adk/contact_multiple_surfaces/README_CUSTOM_COMPONENTS.md
rename to samples/agent/adk/custom-components-example/README_CUSTOM_COMPONENTS.md
index c56716c41..8e29877fa 100644
--- a/samples/agent/adk/contact_multiple_surfaces/README_CUSTOM_COMPONENTS.md
+++ b/samples/agent/adk/custom-components-example/README_CUSTOM_COMPONENTS.md
@@ -8,7 +8,7 @@ Unlike standard A2UI agents that rely solely on the core component library, this
 
 1.  **Client Defines Components**: The web client (`contact` sample) defines custom components (`OrgChart`, `WebFrame`) and their schemas.
 2.  **Inline Catalog Negotiation**: When the client connects to the agent, it sends these schemas in its connection handshake (Client Event) under `metadata.inlineCatalog`.
-3.  **Agent Adaptation**: The agent (`contact_multiple_surfaces`) dynamically reads this catalog and injects the schema into the LLM's system prompt (via `[SYSTEM]` messages).
+3.  **Agent Adaptation**: The agent (`custom-components-example`) dynamically reads this catalog and injects the schema into the LLM's system prompt (via `[SYSTEM]` messages).
 4.  **Rich Rendering**: The LLM can then instruct the client to render these custom components.
 
 ## Key Features
@@ -36,7 +36,7 @@ A powerful component that allows embedding external web content or local static
 
 1.  **Start the Agent**:
     ```bash
-    cd samples/agent/adk/contact_multiple_surfaces
+    cd samples/agent/adk/custom-components-example
     uv run .
     ```
     *Runs on port 10004.*
diff --git a/samples/agent/adk/contact_multiple_surfaces/__init__.py b/samples/agent/adk/custom-components-example/__init__.py
similarity index 100%
rename from samples/agent/adk/contact_multiple_surfaces/__init__.py
rename to samples/agent/adk/custom-components-example/__init__.py
diff --git a/samples/agent/adk/contact_multiple_surfaces/__main__.py b/samples/agent/adk/custom-components-example/__main__.py
similarity index 100%
rename from samples/agent/adk/contact_multiple_surfaces/__main__.py
rename to samples/agent/adk/custom-components-example/__main__.py
diff --git a/samples/agent/adk/contact_multiple_surfaces/a2ui_examples.py b/samples/agent/adk/custom-components-example/a2ui_examples.py
similarity index 100%
rename from samples/agent/adk/contact_multiple_surfaces/a2ui_examples.py
rename to samples/agent/adk/custom-components-example/a2ui_examples.py
diff --git a/samples/agent/adk/contact_multiple_surfaces/agent.py b/samples/agent/adk/custom-components-example/agent.py
similarity index 100%
rename from samples/agent/adk/contact_multiple_surfaces/agent.py
rename to samples/agent/adk/custom-components-example/agent.py
diff --git a/samples/agent/adk/contact_multiple_surfaces/agent_executor.py b/samples/agent/adk/custom-components-example/agent_executor.py
similarity index 100%
rename from samples/agent/adk/contact_multiple_surfaces/agent_executor.py
rename to samples/agent/adk/custom-components-example/agent_executor.py
diff --git a/samples/agent/adk/contact_multiple_surfaces/contact_data.json b/samples/agent/adk/custom-components-example/contact_data.json
similarity index 100%
rename from samples/agent/adk/contact_multiple_surfaces/contact_data.json
rename to samples/agent/adk/custom-components-example/contact_data.json
diff --git a/samples/agent/adk/contact_multiple_surfaces/examples/0.8/action_confirmation.json b/samples/agent/adk/custom-components-example/examples/0.8/action_confirmation.json
similarity index 100%
rename from samples/agent/adk/contact_multiple_surfaces/examples/0.8/action_confirmation.json
rename to samples/agent/adk/custom-components-example/examples/0.8/action_confirmation.json
diff --git a/samples/agent/adk/contact_multiple_surfaces/examples/0.8/chart_node_click.json b/samples/agent/adk/custom-components-example/examples/0.8/chart_node_click.json
similarity index 100%
rename from samples/agent/adk/contact_multiple_surfaces/examples/0.8/chart_node_click.json
rename to samples/agent/adk/custom-components-example/examples/0.8/chart_node_click.json
diff --git a/samples/agent/adk/contact_multiple_surfaces/examples/0.8/contact_card.json b/samples/agent/adk/custom-components-example/examples/0.8/contact_card.json
similarity index 100%
rename from samples/agent/adk/contact_multiple_surfaces/examples/0.8/contact_card.json
rename to samples/agent/adk/custom-components-example/examples/0.8/contact_card.json
diff --git a/samples/agent/adk/contact_multiple_surfaces/examples/0.8/contact_list.json b/samples/agent/adk/custom-components-example/examples/0.8/contact_list.json
similarity index 100%
rename from samples/agent/adk/contact_multiple_surfaces/examples/0.8/contact_list.json
rename to samples/agent/adk/custom-components-example/examples/0.8/contact_list.json
diff --git a/samples/agent/adk/contact_multiple_surfaces/examples/0.8/floor_plan.json b/samples/agent/adk/custom-components-example/examples/0.8/floor_plan.json
similarity index 100%
rename from samples/agent/adk/contact_multiple_surfaces/examples/0.8/floor_plan.json
rename to samples/agent/adk/custom-components-example/examples/0.8/floor_plan.json
diff --git a/samples/agent/adk/contact_multiple_surfaces/examples/0.8/multi_surface.json b/samples/agent/adk/custom-components-example/examples/0.8/multi_surface.json
similarity index 100%
rename from samples/agent/adk/contact_multiple_surfaces/examples/0.8/multi_surface.json
rename to samples/agent/adk/custom-components-example/examples/0.8/multi_surface.json
diff --git a/samples/agent/adk/contact_multiple_surfaces/examples/0.8/org_chart.json b/samples/agent/adk/custom-components-example/examples/0.8/org_chart.json
similarity index 100%
rename from samples/agent/adk/contact_multiple_surfaces/examples/0.8/org_chart.json
rename to samples/agent/adk/custom-components-example/examples/0.8/org_chart.json
diff --git a/samples/agent/adk/contact_multiple_surfaces/examples/0.9/action_confirmation.json b/samples/agent/adk/custom-components-example/examples/0.9/action_confirmation.json
similarity index 100%
rename from samples/agent/adk/contact_multiple_surfaces/examples/0.9/action_confirmation.json
rename to samples/agent/adk/custom-components-example/examples/0.9/action_confirmation.json
diff --git a/samples/agent/adk/contact_multiple_surfaces/examples/0.9/chart_node_click.json b/samples/agent/adk/custom-components-example/examples/0.9/chart_node_click.json
similarity index 100%
rename from samples/agent/adk/contact_multiple_surfaces/examples/0.9/chart_node_click.json
rename to samples/agent/adk/custom-components-example/examples/0.9/chart_node_click.json
diff --git a/samples/agent/adk/contact_multiple_surfaces/examples/0.9/contact_card.json b/samples/agent/adk/custom-components-example/examples/0.9/contact_card.json
similarity index 100%
rename from samples/agent/adk/contact_multiple_surfaces/examples/0.9/contact_card.json
rename to samples/agent/adk/custom-components-example/examples/0.9/contact_card.json
diff --git a/samples/agent/adk/contact_multiple_surfaces/examples/0.9/contact_list.json b/samples/agent/adk/custom-components-example/examples/0.9/contact_list.json
similarity index 100%
rename from samples/agent/adk/contact_multiple_surfaces/examples/0.9/contact_list.json
rename to samples/agent/adk/custom-components-example/examples/0.9/contact_list.json
diff --git a/samples/agent/adk/contact_multiple_surfaces/examples/0.9/floor_plan.json b/samples/agent/adk/custom-components-example/examples/0.9/floor_plan.json
similarity index 100%
rename from samples/agent/adk/contact_multiple_surfaces/examples/0.9/floor_plan.json
rename to samples/agent/adk/custom-components-example/examples/0.9/floor_plan.json
diff --git a/samples/agent/adk/contact_multiple_surfaces/examples/0.9/multi_surface.json b/samples/agent/adk/custom-components-example/examples/0.9/multi_surface.json
similarity index 100%
rename from samples/agent/adk/contact_multiple_surfaces/examples/0.9/multi_surface.json
rename to samples/agent/adk/custom-components-example/examples/0.9/multi_surface.json
diff --git a/samples/agent/adk/contact_multiple_surfaces/examples/0.9/org_chart.json b/samples/agent/adk/custom-components-example/examples/0.9/org_chart.json
similarity index 100%
rename from samples/agent/adk/contact_multiple_surfaces/examples/0.9/org_chart.json
rename to samples/agent/adk/custom-components-example/examples/0.9/org_chart.json
diff --git a/samples/agent/adk/contact_multiple_surfaces/floor_plan_server.py b/samples/agent/adk/custom-components-example/floor_plan_server.py
similarity index 100%
rename from samples/agent/adk/contact_multiple_surfaces/floor_plan_server.py
rename to samples/agent/adk/custom-components-example/floor_plan_server.py
diff --git a/samples/agent/adk/contact_multiple_surfaces/floor_plan_template.html b/samples/agent/adk/custom-components-example/floor_plan_template.html
similarity index 100%
rename from samples/agent/adk/contact_multiple_surfaces/floor_plan_template.html
rename to samples/agent/adk/custom-components-example/floor_plan_template.html
diff --git a/samples/agent/adk/contact_multiple_surfaces/images/floorplan.html b/samples/agent/adk/custom-components-example/images/floorplan.html
similarity index 100%
rename from samples/agent/adk/contact_multiple_surfaces/images/floorplan.html
rename to samples/agent/adk/custom-components-example/images/floorplan.html
diff --git a/samples/agent/adk/contact_multiple_surfaces/images/floorplan.png b/samples/agent/adk/custom-components-example/images/floorplan.png
similarity index 100%
rename from samples/agent/adk/contact_multiple_surfaces/images/floorplan.png
rename to samples/agent/adk/custom-components-example/images/floorplan.png
diff --git a/samples/agent/adk/contact_multiple_surfaces/images/profile1.png b/samples/agent/adk/custom-components-example/images/profile1.png
similarity index 100%
rename from samples/agent/adk/contact_multiple_surfaces/images/profile1.png
rename to samples/agent/adk/custom-components-example/images/profile1.png
diff --git a/samples/agent/adk/contact_multiple_surfaces/images/profile2.png b/samples/agent/adk/custom-components-example/images/profile2.png
similarity index 100%
rename from samples/agent/adk/contact_multiple_surfaces/images/profile2.png
rename to samples/agent/adk/custom-components-example/images/profile2.png
diff --git a/samples/agent/adk/contact_multiple_surfaces/images/profile3.png b/samples/agent/adk/custom-components-example/images/profile3.png
similarity index 100%
rename from samples/agent/adk/contact_multiple_surfaces/images/profile3.png
rename to samples/agent/adk/custom-components-example/images/profile3.png
diff --git a/samples/agent/adk/contact_multiple_surfaces/images/profile4.png b/samples/agent/adk/custom-components-example/images/profile4.png
similarity index 100%
rename from samples/agent/adk/contact_multiple_surfaces/images/profile4.png
rename to samples/agent/adk/custom-components-example/images/profile4.png
diff --git a/samples/agent/adk/contact_multiple_surfaces/inline_catalog_0.9.json b/samples/agent/adk/custom-components-example/inline_catalog_0.9.json
similarity index 100%
rename from samples/agent/adk/contact_multiple_surfaces/inline_catalog_0.9.json
rename to samples/agent/adk/custom-components-example/inline_catalog_0.9.json
diff --git a/samples/agent/adk/contact_multiple_surfaces/prompt_builder.py b/samples/agent/adk/custom-components-example/prompt_builder.py
similarity index 98%
rename from samples/agent/adk/contact_multiple_surfaces/prompt_builder.py
rename to samples/agent/adk/custom-components-example/prompt_builder.py
index 1c8e4a102..172e53be4 100644
--- a/samples/agent/adk/contact_multiple_surfaces/prompt_builder.py
+++ b/samples/agent/adk/custom-components-example/prompt_builder.py
@@ -75,7 +75,7 @@ def get_text_prompt() -> str:
       my_version,
       catalogs=[
           CatalogConfig.from_path(
-              name="contact_multiple_surfaces_inline_catalog",
+              name="custom-components-example_inline_catalog",
               catalog_path=inline_catalog_path,
               examples_path=f"examples/{my_version}",
           ),
diff --git a/samples/agent/adk/contact_multiple_surfaces/pyproject.toml b/samples/agent/adk/custom-components-example/pyproject.toml
similarity index 96%
rename from samples/agent/adk/contact_multiple_surfaces/pyproject.toml
rename to samples/agent/adk/custom-components-example/pyproject.toml
index 4d8e2615e..271ae864e 100644
--- a/samples/agent/adk/contact_multiple_surfaces/pyproject.toml
+++ b/samples/agent/adk/custom-components-example/pyproject.toml
@@ -13,7 +13,7 @@
 # limitations under the License.
 
 [project]
-name = "a2ui-contact-multiple-surfaces"
+name = "a2ui-custom-components-example"
 version = "0.1.0"
 description = "Sample Google ADK-based Contact Lookup agent that uses a2ui extension and is hosted as an A2A server agent."
 readme = "README.md"
diff --git a/samples/agent/adk/contact_multiple_surfaces/tools.py b/samples/agent/adk/custom-components-example/tools.py
similarity index 100%
rename from samples/agent/adk/contact_multiple_surfaces/tools.py
rename to samples/agent/adk/custom-components-example/tools.py
diff --git a/samples/agent/adk/pyproject.toml b/samples/agent/adk/pyproject.toml
index 184fea9c5..334636774 100644
--- a/samples/agent/adk/pyproject.toml
+++ b/samples/agent/adk/pyproject.toml
@@ -17,7 +17,7 @@ url = "https://pypi.org/simple"
 default = true
 
 [tool.uv.workspace]
-members = ["contact_lookup", "contact_multiple_surfaces", "orchestrator", "restaurant_finder", "rizzcharts", "mcp_app_proxy"]
+members = ["contact_lookup", "custom-components-example", "orchestrator", "restaurant_finder", "rizzcharts", "mcp_app_proxy"]
 
 [tool.uv.sources]
 a2ui-agent = { path = "../../../agent_sdks/python", editable = true }
diff --git a/samples/agent/adk/tests/test_examples_validation.py b/samples/agent/adk/tests/test_examples_validation.py
index 3cdd386c6..0f179e673 100644
--- a/samples/agent/adk/tests/test_examples_validation.py
+++ b/samples/agent/adk/tests/test_examples_validation.py
@@ -42,11 +42,11 @@
         "validate": False,  # Use invalid examples to test retry logic
     },
     {
-        "name": "contact_multiple_surfaces",
-        "path": SAMPLES_DIR / "contact_multiple_surfaces",
+        "name": "custom-components-example",
+        "path": SAMPLES_DIR / "custom-components-example",
         "catalogs": [
             CatalogConfig.from_path(
-                name="contact_multiple_surfaces_inline_catalog",
+                name="custom-components-example_inline_catalog",
                 catalog_path="inline_catalog_0.9.json",
                 examples_path=f"examples/{VERSION_0_9}",
             ),
diff --git a/samples/agent/adk/uv.lock b/samples/agent/adk/uv.lock
index 5b2d2bffc..65ec05fef 100644
--- a/samples/agent/adk/uv.lock
+++ b/samples/agent/adk/uv.lock
@@ -9,7 +9,7 @@ resolution-markers = [
 [manifest]
 members = [
     "a2ui-contact-lookup",
-    "a2ui-contact-multiple-surfaces",
+    "a2ui-custom-components-example",
     "a2ui-restaurant-finder",
     "mcp-app-proxy",
     "orchestrator",
@@ -89,9 +89,9 @@ requires-dist = [
 ]
 
 [[package]]
-name = "a2ui-contact-multiple-surfaces"
+name = "a2ui-custom-components-example"
 version = "0.1.0"
-source = { editable = "contact_multiple_surfaces" }
+source = { editable = "custom-components-example" }
 dependencies = [
     { name = "a2a-sdk" },
     { name = "a2ui-agent" },
diff --git a/samples/client/lit/contact/.env.example b/samples/client/lit/custom-components-example/.env.example
similarity index 100%
rename from samples/client/lit/contact/.env.example
rename to samples/client/lit/custom-components-example/.env.example
diff --git a/samples/client/lit/contact/README.md b/samples/client/lit/custom-components-example/README.md
similarity index 54%
rename from samples/client/lit/contact/README.md
rename to samples/client/lit/custom-components-example/README.md
index 433712b33..b161f8236 100644
--- a/samples/client/lit/contact/README.md
+++ b/samples/client/lit/custom-components-example/README.md
@@ -24,10 +24,23 @@ This sample depends on the Lit renderer. Before running this sample, you need to
    ```
 
 3. **Run the servers:**
-   - Run the [A2A server](../../../agent/adk/contact_multiple_surfaces/)
+   - Run the [A2A server](../../../agent/adk/custom-components-example/)
      - By default, the server uses the `McpAppsCustomComponent` which wraps MCP Apps in a secure, isolated double-iframe sandbox (`sandbox.html`) communicating strictly via JSON-RPC.
      - Optionally run the server using `USE_MCP_SANDBOX=false uv run .` to bypass this security and use the standard `WebFrame` element. 
      - **Observing the difference**: Search for "Alex Jordan" in the UI and click the Location button to open the floor plan. If you inspect the DOM using your browser's Developer Tools, you will see that `McpAppsCustomComponent` securely points the iframe `src` to the local proxy (`/sandbox.html`). In contrast, `WebFrame` directly injects the untrusted HTML via a data blob/srcdoc, lacking defense-in-depth origin isolation.
    - Run the dev server: `npm run dev`
 
-After starting the dev server, you can open http://localhost:5173/ to view the sample.
\ No newline at end of file
+After starting the dev server, you can open http://localhost:5173/ to view the sample.
+
+## Available Custom Components
+
+This sample showcases several custom components that go beyond standard A2UI rendering:
+
+-   **MCP Apps (`mcp-apps-component.ts`)**: Sandboxed UI widgets using the MCP protocol, communicating securely via a JSON-RPC channel.
+-   **Secure iFrame Web Frame (`web-frame.ts`)**: Powerful component that allows rendering raw HTML in an isolated context (used for the Office Floor Plan).
+-   **Org Chart (`org-chart.ts`)**: A custom tree structure visualization component.
+
+## Mix and Match A2UI Surfaces
+
+This sample demonstrates how standard A2UI surfaces (such as contact profile cards using standard `Card` and list items) can live on the same canvas as custom extensions. 
+The A2UI renderer library seamlessly manages the standard component catalog, while custom components (like the Org Chart or iframe-based floor plans) hook into the same event lifecycle. You can swap between standard profile views and rich custom widgets using a unified routing layer.
\ No newline at end of file
diff --git a/samples/client/lit/contact/README_CUSTOM_COMPONENTS.md b/samples/client/lit/custom-components-example/README_CUSTOM_COMPONENTS.md
similarity index 100%
rename from samples/client/lit/contact/README_CUSTOM_COMPONENTS.md
rename to samples/client/lit/custom-components-example/README_CUSTOM_COMPONENTS.md
diff --git a/samples/client/lit/contact/client.ts b/samples/client/lit/custom-components-example/client.ts
similarity index 100%
rename from samples/client/lit/contact/client.ts
rename to samples/client/lit/custom-components-example/client.ts
diff --git a/samples/client/lit/contact/contact.ts b/samples/client/lit/custom-components-example/contact.ts
similarity index 100%
rename from samples/client/lit/contact/contact.ts
rename to samples/client/lit/custom-components-example/contact.ts
diff --git a/samples/client/lit/contact/events/events.ts b/samples/client/lit/custom-components-example/events/events.ts
similarity index 100%
rename from samples/client/lit/contact/events/events.ts
rename to samples/client/lit/custom-components-example/events/events.ts
diff --git a/samples/client/lit/contact/index.html b/samples/client/lit/custom-components-example/index.html
similarity index 100%
rename from samples/client/lit/contact/index.html
rename to samples/client/lit/custom-components-example/index.html
diff --git a/samples/client/lit/contact/middleware/a2a.ts b/samples/client/lit/custom-components-example/middleware/a2a.ts
similarity index 100%
rename from samples/client/lit/contact/middleware/a2a.ts
rename to samples/client/lit/custom-components-example/middleware/a2a.ts
diff --git a/samples/client/lit/contact/middleware/index.ts b/samples/client/lit/custom-components-example/middleware/index.ts
similarity index 100%
rename from samples/client/lit/contact/middleware/index.ts
rename to samples/client/lit/custom-components-example/middleware/index.ts
diff --git a/samples/client/lit/contact/package.json b/samples/client/lit/custom-components-example/package.json
similarity index 91%
rename from samples/client/lit/contact/package.json
rename to samples/client/lit/custom-components-example/package.json
index 5205caa09..d63afd4cf 100644
--- a/samples/client/lit/contact/package.json
+++ b/samples/client/lit/custom-components-example/package.json
@@ -1,8 +1,8 @@
 {
-  "name": "@a2ui/contact",
+  "name": "@a2ui/custom-components-example",
   "private": true,
   "version": "0.8.1",
-  "description": "A2UI Contact Demo",
+  "description": "A2UI Custom Components Example Demo",
   "main": "./dist/contact.js",
   "types": "./dist/contact.d.ts",
   "type": "module",
@@ -53,7 +53,7 @@
     }
   },
   "repository": {
-    "directory": "samples/client/lit/contact",
+    "directory": "samples/client/lit/custom-components-example",
     "type": "git",
     "url": "git+https://github.com/google/A2UI.git"
   },
diff --git a/samples/client/lit/contact/theme/theme.ts b/samples/client/lit/custom-components-example/theme/theme.ts
similarity index 100%
rename from samples/client/lit/contact/theme/theme.ts
rename to samples/client/lit/custom-components-example/theme/theme.ts
diff --git a/samples/client/lit/contact/tsconfig.json b/samples/client/lit/custom-components-example/tsconfig.json
similarity index 100%
rename from samples/client/lit/contact/tsconfig.json
rename to samples/client/lit/custom-components-example/tsconfig.json
diff --git a/samples/client/lit/contact/types/types.ts b/samples/client/lit/custom-components-example/types/types.ts
similarity index 100%
rename from samples/client/lit/contact/types/types.ts
rename to samples/client/lit/custom-components-example/types/types.ts
diff --git a/samples/client/lit/contact/ui/custom-components/README.md b/samples/client/lit/custom-components-example/ui/custom-components/README.md
similarity index 100%
rename from samples/client/lit/contact/ui/custom-components/README.md
rename to samples/client/lit/custom-components-example/ui/custom-components/README.md
diff --git a/samples/client/lit/contact/ui/custom-components/mcp-apps-component.ts b/samples/client/lit/custom-components-example/ui/custom-components/mcp-apps-component.ts
similarity index 100%
rename from samples/client/lit/contact/ui/custom-components/mcp-apps-component.ts
rename to samples/client/lit/custom-components-example/ui/custom-components/mcp-apps-component.ts
diff --git a/samples/client/lit/contact/ui/custom-components/org-chart.ts b/samples/client/lit/custom-components-example/ui/custom-components/org-chart.ts
similarity index 100%
rename from samples/client/lit/contact/ui/custom-components/org-chart.ts
rename to samples/client/lit/custom-components-example/ui/custom-components/org-chart.ts
diff --git a/samples/client/lit/contact/ui/custom-components/premium-text-field.ts b/samples/client/lit/custom-components-example/ui/custom-components/premium-text-field.ts
similarity index 100%
rename from samples/client/lit/contact/ui/custom-components/premium-text-field.ts
rename to samples/client/lit/custom-components-example/ui/custom-components/premium-text-field.ts
diff --git a/samples/client/lit/contact/ui/custom-components/register-components.ts b/samples/client/lit/custom-components-example/ui/custom-components/register-components.ts
similarity index 100%
rename from samples/client/lit/contact/ui/custom-components/register-components.ts
rename to samples/client/lit/custom-components-example/ui/custom-components/register-components.ts
diff --git a/samples/client/lit/contact/ui/custom-components/test/README.md b/samples/client/lit/custom-components-example/ui/custom-components/test/README.md
similarity index 100%
rename from samples/client/lit/contact/ui/custom-components/test/README.md
rename to samples/client/lit/custom-components-example/ui/custom-components/test/README.md
diff --git a/samples/client/lit/contact/ui/custom-components/test/org-chart-test.html b/samples/client/lit/custom-components-example/ui/custom-components/test/org-chart-test.html
similarity index 100%
rename from samples/client/lit/contact/ui/custom-components/test/org-chart-test.html
rename to samples/client/lit/custom-components-example/ui/custom-components/test/org-chart-test.html
diff --git a/samples/client/lit/contact/ui/custom-components/test/override-test.html b/samples/client/lit/custom-components-example/ui/custom-components/test/override-test.html
similarity index 100%
rename from samples/client/lit/contact/ui/custom-components/test/override-test.html
rename to samples/client/lit/custom-components-example/ui/custom-components/test/override-test.html
diff --git a/samples/client/lit/contact/ui/custom-components/test/override-test.ts b/samples/client/lit/custom-components-example/ui/custom-components/test/override-test.ts
similarity index 100%
rename from samples/client/lit/contact/ui/custom-components/test/override-test.ts
rename to samples/client/lit/custom-components-example/ui/custom-components/test/override-test.ts
diff --git a/samples/client/lit/contact/ui/custom-components/web-frame.ts b/samples/client/lit/custom-components-example/ui/custom-components/web-frame.ts
similarity index 100%
rename from samples/client/lit/contact/ui/custom-components/web-frame.ts
rename to samples/client/lit/custom-components-example/ui/custom-components/web-frame.ts
diff --git a/samples/client/lit/contact/ui/shared-constants.ts b/samples/client/lit/custom-components-example/ui/shared-constants.ts
similarity index 100%
rename from samples/client/lit/contact/ui/shared-constants.ts
rename to samples/client/lit/custom-components-example/ui/shared-constants.ts
diff --git a/samples/client/lit/contact/ui/snackbar.ts b/samples/client/lit/custom-components-example/ui/snackbar.ts
similarity index 100%
rename from samples/client/lit/contact/ui/snackbar.ts
rename to samples/client/lit/custom-components-example/ui/snackbar.ts
diff --git a/samples/client/lit/contact/ui/ui.ts b/samples/client/lit/custom-components-example/ui/ui.ts
similarity index 100%
rename from samples/client/lit/contact/ui/ui.ts
rename to samples/client/lit/custom-components-example/ui/ui.ts
diff --git a/samples/client/lit/contact/vite.config.ts b/samples/client/lit/custom-components-example/vite.config.ts
similarity index 100%
rename from samples/client/lit/contact/vite.config.ts
rename to samples/client/lit/custom-components-example/vite.config.ts
diff --git a/samples/client/lit/package.json b/samples/client/lit/package.json
index 0b66302d7..aad576110 100644
--- a/samples/client/lit/package.json
+++ b/samples/client/lit/package.json
@@ -4,7 +4,7 @@
   "version": "0.8.1",
   "description": "A2UI Lit Samples",
   "workspaces": [
-    "contact",
+    "custom-components-example",
     "shell"
   ],
   "scripts": {