diff --git a/demo/ui/components/agent_list.py b/demo/ui/components/agent_list.py
index 782d3deb..f555b43e 100644
--- a/demo/ui/components/agent_list.py
+++ b/demo/ui/components/agent_list.py
@@ -1,7 +1,7 @@
 import mesop as me
 import pandas as pd
 
-from common.types import AgentCard
+from a2a.types import AgentCard
 from state.agent_state import AgentState
 
 
diff --git a/demo/ui/components/conversation.py b/demo/ui/components/conversation.py
index 8f9c4878..287b1045 100644
--- a/demo/ui/components/conversation.py
+++ b/demo/ui/components/conversation.py
@@ -2,7 +2,7 @@
 
 import mesop as me
 
-from common.types import Message, TextPart
+from a2a.types import Message, TextPart
 from state.host_agent_service import (
     ListConversations,
     SendMessage,
diff --git a/demo/ui/components/form_render.py b/demo/ui/components/form_render.py
index 06ade9a8..709df7a9 100644
--- a/demo/ui/components/form_render.py
+++ b/demo/ui/components/form_render.py
@@ -6,7 +6,7 @@
 
 import mesop as me
 
-from common.types import DataPart, Message, TextPart
+from a2a.types import DataPart, Message, TextPart
 from state.host_agent_service import SendMessage
 from state.state import AppState, StateMessage
 
diff --git a/demo/ui/pyproject.toml b/demo/ui/pyproject.toml
index 773a3c37..0170fbe4 100644
--- a/demo/ui/pyproject.toml
+++ b/demo/ui/pyproject.toml
@@ -12,7 +12,7 @@ dependencies = [
     "fastapi>=0.115.0",
     "uvicorn>=0.34.0",
     "mesop>=1.0.0",
-    "a2a-samples",
+    "a2a",
     "pandas>=2.2.0",
     "google-genai>=1.9.0",
     "google-adk>=0.0.3",
@@ -23,7 +23,7 @@ packages = ["a2a_ui"]
 
 [tool.uv.sources]
 a2a_ui = { workspace = true }
-a2a_samples = { path = "../../samples/python", editable = true }
+a2a = { path = "../../a2a-python-sdk", editable = true }
 
 [build-system]
 requires = ["hatchling"]
diff --git a/demo/ui/service/server/adk_host_manager.py b/demo/ui/service/server/adk_host_manager.py
index 58a6ee0e..fe2a61e2 100644
--- a/demo/ui/service/server/adk_host_manager.py
+++ b/demo/ui/service/server/adk_host_manager.py
@@ -4,7 +4,7 @@
 import os
 import uuid
 
-from common.types import (
+from a2a.types import (
     AgentCard,
     DataPart,
     FileContent,
diff --git a/demo/ui/service/server/application_manager.py b/demo/ui/service/server/application_manager.py
index 579576b0..7702b38e 100644
--- a/demo/ui/service/server/application_manager.py
+++ b/demo/ui/service/server/application_manager.py
@@ -1,6 +1,6 @@
 from abc import ABC, abstractmethod
 
-from common.types import AgentCard, Message, Task
+from a2a.types import AgentCard, Message, Task
 from service.types import Conversation, Event
 
 
diff --git a/demo/ui/service/server/in_memory_manager.py b/demo/ui/service/server/in_memory_manager.py
index 28761657..e11b5369 100644
--- a/demo/ui/service/server/in_memory_manager.py
+++ b/demo/ui/service/server/in_memory_manager.py
@@ -2,7 +2,7 @@
 import datetime
 import uuid
 
-from common.types import (
+from a2a.types import (
     AgentCard,
     Artifact,
     DataPart,
diff --git a/demo/ui/service/server/server.py b/demo/ui/service/server/server.py
index a75734f9..f7d7b5f8 100644
--- a/demo/ui/service/server/server.py
+++ b/demo/ui/service/server/server.py
@@ -4,7 +4,7 @@
 import threading
 import uuid
 
-from common.types import FileContent, FilePart, Message
+from a2a.types import FileContent, FilePart, Message
 from fastapi import APIRouter, Request, Response
 from service.types import (
     CreateConversationResponse,
diff --git a/demo/ui/service/server/test_image.py b/demo/ui/service/server/test_image.py
index 39f57a6e..02e5cf38 100644
--- a/demo/ui/service/server/test_image.py
+++ b/demo/ui/service/server/test_image.py
@@ -1,4 +1,4 @@
-from common.types import (
+from a2a.types import (
     FileContent,
     FilePart,
     Message,
diff --git a/demo/ui/service/types.py b/demo/ui/service/types.py
index 06dc3c50..5a5efd8f 100644
--- a/demo/ui/service/types.py
+++ b/demo/ui/service/types.py
@@ -1,6 +1,6 @@
 from typing import Annotated, Literal
 
-from common.types import (
+from a2a.types import (
     AgentCard,
     JSONRPCRequest,
     JSONRPCResponse,
diff --git a/demo/ui/state/host_agent_service.py b/demo/ui/state/host_agent_service.py
index 6df20a4e..9f10ccd7 100644
--- a/demo/ui/state/host_agent_service.py
+++ b/demo/ui/state/host_agent_service.py
@@ -5,7 +5,7 @@
 
 from typing import Any
 
-from common.types import Message, Part, Task
+from a2a.types import Message, Part, Task
 from service.client.client import ConversationClient
 from service.types import (
     Conversation,
diff --git a/demo/ui/tests/test_adk_host_manager.py b/demo/ui/tests/test_adk_host_manager.py
index 4359e6fe..77a3985d 100644
--- a/demo/ui/tests/test_adk_host_manager.py
+++ b/demo/ui/tests/test_adk_host_manager.py
@@ -1,6 +1,6 @@
 import unittest
 
-from common.types import DataPart, FilePart, TextPart
+from a2a.types import DataPart, FilePart, TextPart
 from google.genai import types
 from service.server.adk_host_manager import ADKHostManager
 
diff --git a/demo/ui/utils/agent_card.py b/demo/ui/utils/agent_card.py
index 025e0cf1..81229bef 100644
--- a/demo/ui/utils/agent_card.py
+++ b/demo/ui/utils/agent_card.py
@@ -1,6 +1,6 @@
 import requests
 
-from common.types import AgentCard
+from a2a.types import AgentCard
 
 
 def get_agent_card(remote_agent_address: str) -> AgentCard: