diff --git a/.azdo/ci-pr.yaml b/.azdo/ci-pr.yaml
index 1eeb7e11..b8439344 100644
--- a/.azdo/ci-pr.yaml
+++ b/.azdo/ci-pr.yaml
@@ -49,11 +49,11 @@ steps:
 
 - script: |
     python -m pip install ./dist/microsoft_agents_core*.whl
-    python -m pip install ./dist/microsoft_agents_authentication*.whl
+    python -m pip install ./dist/microsoft_agents_authorization*.whl
     python -m pip install ./dist/microsoft_agents_connector*.whl
     python -m pip install ./dist/microsoft_agents_client*.whl
     python -m pip install ./dist/microsoft_agents_builder*.whl
-    python -m pip install ./dist/microsoft_agents_authorization_msal*.whl
+    python -m pip install ./dist/microsoft_agents_authentication_msal*.whl
     python -m pip install ./dist/microsoft_agents_copilotstudio_client*.whl
     python -m pip install ./dist/microsoft_agents_hosting_aiohttp*.whl
     python -m pip install ./dist/microsoft_agents_storage*.whl
diff --git a/.github/workflows/python-package.yml b/.github/workflows/python-package.yml
index 7ff20433..417e6183 100644
--- a/.github/workflows/python-package.yml
+++ b/.github/workflows/python-package.yml
@@ -52,11 +52,11 @@ jobs:
     - name: Install wheels
       run: |
         python -m pip install ./dist/microsoft_agents_core*.whl
-        python -m pip install ./dist/microsoft_agents_authentication*.whl
+        python -m pip install ./dist/microsoft_agents_authorization*.whl
         python -m pip install ./dist/microsoft_agents_connector*.whl
         python -m pip install ./dist/microsoft_agents_client*.whl
         python -m pip install ./dist/microsoft_agents_builder*.whl
-        python -m pip install ./dist/microsoft_agents_authorization_msal*.whl
+        python -m pip install ./dist/microsoft_agents_authentication_msal*.whl
         python -m pip install ./dist/microsoft_agents_copilotstudio_client*.whl
         python -m pip install ./dist/microsoft_agents_hosting_aiohttp*.whl
         python -m pip install ./dist/microsoft_agents_storage*.whl
diff --git a/libraries/Authentication/microsoft-agents-authorization-msal/microsoft/agents/authorization/msal/__init__.py b/libraries/Authentication/microsoft-agents-authentication-msal/microsoft/agents/authentication/msal/__init__.py
similarity index 100%
rename from libraries/Authentication/microsoft-agents-authorization-msal/microsoft/agents/authorization/msal/__init__.py
rename to libraries/Authentication/microsoft-agents-authentication-msal/microsoft/agents/authentication/msal/__init__.py
diff --git a/libraries/Authentication/microsoft-agents-authorization-msal/microsoft/agents/authorization/msal/auth_types.py b/libraries/Authentication/microsoft-agents-authentication-msal/microsoft/agents/authentication/msal/auth_types.py
similarity index 100%
rename from libraries/Authentication/microsoft-agents-authorization-msal/microsoft/agents/authorization/msal/auth_types.py
rename to libraries/Authentication/microsoft-agents-authentication-msal/microsoft/agents/authentication/msal/auth_types.py
diff --git a/libraries/Authentication/microsoft-agents-authorization-msal/microsoft/agents/authorization/msal/msal_auth.py b/libraries/Authentication/microsoft-agents-authentication-msal/microsoft/agents/authentication/msal/msal_auth.py
similarity index 98%
rename from libraries/Authentication/microsoft-agents-authorization-msal/microsoft/agents/authorization/msal/msal_auth.py
rename to libraries/Authentication/microsoft-agents-authentication-msal/microsoft/agents/authentication/msal/msal_auth.py
index baa186bb..51b2bd1a 100644
--- a/libraries/Authentication/microsoft-agents-authorization-msal/microsoft/agents/authorization/msal/msal_auth.py
+++ b/libraries/Authentication/microsoft-agents-authentication-msal/microsoft/agents/authentication/msal/msal_auth.py
@@ -13,7 +13,7 @@
 from cryptography.hazmat.backends import default_backend
 from cryptography.hazmat.primitives import hashes
 
-from microsoft.agents.authentication import AccessTokenProviderBase
+from microsoft.agents.authorization import AccessTokenProviderBase
 
 from .auth_types import AuthTypes
 from .msal_auth_configuration import MsalAuthConfiguration
diff --git a/libraries/Authentication/microsoft-agents-authorization-msal/microsoft/agents/authorization/msal/msal_auth_configuration.py b/libraries/Authentication/microsoft-agents-authentication-msal/microsoft/agents/authentication/msal/msal_auth_configuration.py
similarity index 86%
rename from libraries/Authentication/microsoft-agents-authorization-msal/microsoft/agents/authorization/msal/msal_auth_configuration.py
rename to libraries/Authentication/microsoft-agents-authentication-msal/microsoft/agents/authentication/msal/msal_auth_configuration.py
index 042a9674..73c3824b 100644
--- a/libraries/Authentication/microsoft-agents-authorization-msal/microsoft/agents/authorization/msal/msal_auth_configuration.py
+++ b/libraries/Authentication/microsoft-agents-authentication-msal/microsoft/agents/authentication/msal/msal_auth_configuration.py
@@ -1,6 +1,6 @@
 from typing import Protocol, Optional
 
-from microsoft.agents.authentication import AgentAuthConfiguration
+from microsoft.agents.authorization import AgentAuthConfiguration
 
 from .auth_types import AuthTypes
 
diff --git a/libraries/Authentication/microsoft-agents-authorization-msal/pyproject.toml b/libraries/Authentication/microsoft-agents-authentication-msal/pyproject.toml
similarity index 87%
rename from libraries/Authentication/microsoft-agents-authorization-msal/pyproject.toml
rename to libraries/Authentication/microsoft-agents-authentication-msal/pyproject.toml
index f05cfa9b..223a1f1d 100644
--- a/libraries/Authentication/microsoft-agents-authorization-msal/pyproject.toml
+++ b/libraries/Authentication/microsoft-agents-authentication-msal/pyproject.toml
@@ -3,7 +3,7 @@ requires = ["setuptools"]
 build-backend = "setuptools.build_meta"
 
 [project]
-name = "microsoft-agents-authorization-msal"
+name = "microsoft-agents-authentication-msal"
 version = "0.0.0a1"
 description = "A msal-based authentication library for Microsoft Agents"
 authors = [{name = "Microsoft Corporation"}]
@@ -14,7 +14,7 @@ classifiers = [
     "Operating System :: OS Independent",
 ]
 dependencies = [
-    "microsoft-agents-authentication",
+    "microsoft-agents-authorization",
     "msal>=1.31.1",
     "requests>=2.32.3",
     "cryptography>=44.0.0",
diff --git a/libraries/Builder/microsoft-agents-builder/microsoft/agents/builder/channel_adapter.py b/libraries/Builder/microsoft-agents-builder/microsoft/agents/builder/channel_adapter.py
index d77ad278..90c03755 100644
--- a/libraries/Builder/microsoft-agents-builder/microsoft/agents/builder/channel_adapter.py
+++ b/libraries/Builder/microsoft-agents-builder/microsoft/agents/builder/channel_adapter.py
@@ -4,7 +4,7 @@
 from abc import ABC, abstractmethod
 from collections.abc import Callable
 from typing import List, Awaitable
-from microsoft.agents.authentication import ClaimsIdentity
+from microsoft.agents.authorization import ClaimsIdentity
 from microsoft.agents.core import ChannelAdapterProtocol
 from microsoft.agents.core.models import (
     Activity,
diff --git a/libraries/Builder/microsoft-agents-builder/microsoft/agents/builder/channel_api_handler_protocol.py b/libraries/Builder/microsoft-agents-builder/microsoft/agents/builder/channel_api_handler_protocol.py
index 49b73d38..12d08fa4 100644
--- a/libraries/Builder/microsoft-agents-builder/microsoft/agents/builder/channel_api_handler_protocol.py
+++ b/libraries/Builder/microsoft-agents-builder/microsoft/agents/builder/channel_api_handler_protocol.py
@@ -13,7 +13,7 @@
     Transcript,
 )
 
-from microsoft.agents.authentication import ClaimsIdentity
+from microsoft.agents.authorization import ClaimsIdentity
 
 
 class ChannelApiHandlerProtocol(Protocol):
diff --git a/libraries/Builder/microsoft-agents-builder/microsoft/agents/builder/channel_service_adapter.py b/libraries/Builder/microsoft-agents-builder/microsoft/agents/builder/channel_service_adapter.py
index 37bd35c6..501e9e9f 100644
--- a/libraries/Builder/microsoft-agents-builder/microsoft/agents/builder/channel_service_adapter.py
+++ b/libraries/Builder/microsoft-agents-builder/microsoft/agents/builder/channel_service_adapter.py
@@ -31,7 +31,7 @@
     ConnectorClient,
     UserTokenClient,
 )
-from microsoft.agents.authentication import AuthenticationConstants, ClaimsIdentity
+from microsoft.agents.authorization import AuthenticationConstants, ClaimsIdentity
 from .channel_service_client_factory_base import ChannelServiceClientFactoryBase
 from .channel_adapter import ChannelAdapter
 from .turn_context import TurnContext
diff --git a/libraries/Builder/microsoft-agents-builder/microsoft/agents/builder/channel_service_client_factory_base.py b/libraries/Builder/microsoft-agents-builder/microsoft/agents/builder/channel_service_client_factory_base.py
index 2f2ef651..e6ebe806 100644
--- a/libraries/Builder/microsoft-agents-builder/microsoft/agents/builder/channel_service_client_factory_base.py
+++ b/libraries/Builder/microsoft-agents-builder/microsoft/agents/builder/channel_service_client_factory_base.py
@@ -1,7 +1,7 @@
 from typing import Protocol, Optional
 from abc import abstractmethod
 
-from microsoft.agents.authentication import ClaimsIdentity
+from microsoft.agents.authorization import ClaimsIdentity
 from microsoft.agents.connector import ConnectorClientBase, UserTokenClientBase
 
 
diff --git a/libraries/Builder/microsoft-agents-builder/microsoft/agents/builder/rest_channel_service_client_factory.py b/libraries/Builder/microsoft-agents-builder/microsoft/agents/builder/rest_channel_service_client_factory.py
index 0ddc00ff..66d642b0 100644
--- a/libraries/Builder/microsoft-agents-builder/microsoft/agents/builder/rest_channel_service_client_factory.py
+++ b/libraries/Builder/microsoft-agents-builder/microsoft/agents/builder/rest_channel_service_client_factory.py
@@ -1,6 +1,6 @@
 from typing import Any, Optional
 
-from microsoft.agents.authentication import (
+from microsoft.agents.authorization import (
     AuthenticationConstants,
     ClaimsIdentity,
     Connections,
diff --git a/libraries/Client/microsoft-agents-client/microsoft/agents/client/channel_factory_protocol.py b/libraries/Client/microsoft-agents-client/microsoft/agents/client/channel_factory_protocol.py
index 6ecd17ee..2d59e858 100644
--- a/libraries/Client/microsoft-agents-client/microsoft/agents/client/channel_factory_protocol.py
+++ b/libraries/Client/microsoft-agents-client/microsoft/agents/client/channel_factory_protocol.py
@@ -1,6 +1,6 @@
 from typing import Protocol
 
-from microsoft.agents.authentication import AccessTokenProviderBase
+from microsoft.agents.authorization import AccessTokenProviderBase
 
 from .channel_protocol import ChannelProtocol
 
diff --git a/libraries/Client/microsoft-agents-client/microsoft/agents/client/configuration_channel_host.py b/libraries/Client/microsoft-agents-client/microsoft/agents/client/configuration_channel_host.py
index d445255d..7cffbf71 100644
--- a/libraries/Client/microsoft-agents-client/microsoft/agents/client/configuration_channel_host.py
+++ b/libraries/Client/microsoft-agents-client/microsoft/agents/client/configuration_channel_host.py
@@ -1,6 +1,6 @@
 from copy import copy
 
-from microsoft.agents.authentication import Connections
+from microsoft.agents.authorization import Connections
 
 from .channels_configuration import ChannelsConfiguration
 from .channel_factory_protocol import ChannelFactoryProtocol
diff --git a/libraries/Client/microsoft-agents-client/microsoft/agents/client/http_agent_channel.py b/libraries/Client/microsoft-agents-client/microsoft/agents/client/http_agent_channel.py
index 374f32ed..25320d3c 100644
--- a/libraries/Client/microsoft-agents-client/microsoft/agents/client/http_agent_channel.py
+++ b/libraries/Client/microsoft-agents-client/microsoft/agents/client/http_agent_channel.py
@@ -1,7 +1,7 @@
 from copy import deepcopy, copy
 
 from aiohttp import ClientSession
-from microsoft.agents.authentication import AccessTokenProviderBase
+from microsoft.agents.authorization import AccessTokenProviderBase
 from microsoft.agents.core.models import (
     AgentsModel,
     Activity,
diff --git a/libraries/Client/microsoft-agents-client/microsoft/agents/client/http_agent_channel_factory.py b/libraries/Client/microsoft-agents-client/microsoft/agents/client/http_agent_channel_factory.py
index eb4acac0..73c31099 100644
--- a/libraries/Client/microsoft-agents-client/microsoft/agents/client/http_agent_channel_factory.py
+++ b/libraries/Client/microsoft-agents-client/microsoft/agents/client/http_agent_channel_factory.py
@@ -1,4 +1,4 @@
-from microsoft.agents.authentication import AccessTokenProviderBase
+from microsoft.agents.authorization import AccessTokenProviderBase
 
 from .channel_factory_protocol import ChannelFactoryProtocol
 from .channel_protocol import ChannelProtocol
diff --git a/libraries/Client/microsoft-agents-client/pyproject.toml b/libraries/Client/microsoft-agents-client/pyproject.toml
index d7b167c6..ad02799b 100644
--- a/libraries/Client/microsoft-agents-client/pyproject.toml
+++ b/libraries/Client/microsoft-agents-client/pyproject.toml
@@ -15,7 +15,7 @@ classifiers = [
 ]
 dependencies = [
     "microsoft-agents-core",
-    "microsoft-agents-authentication"
+    "microsoft-agents-authorization",
 ]
 
 [project.urls]
diff --git a/libraries/Client/microsoft-agents-connector/microsoft/agents/connector/_agents_token_credential_adapter.py b/libraries/Client/microsoft-agents-connector/microsoft/agents/connector/_agents_token_credential_adapter.py
index e44267e6..04457474 100644
--- a/libraries/Client/microsoft-agents-connector/microsoft/agents/connector/_agents_token_credential_adapter.py
+++ b/libraries/Client/microsoft-agents-connector/microsoft/agents/connector/_agents_token_credential_adapter.py
@@ -2,7 +2,7 @@
 
 from azure.core.credentials import AccessToken
 from azure.core.credentials_async import AsyncTokenCredential
-from microsoft.agents.authentication import AccessTokenProviderBase
+from microsoft.agents.authorization import AccessTokenProviderBase
 
 
 class AgentsTokenCredentialAdapter(AsyncTokenCredential):
diff --git a/libraries/Client/microsoft-agents-connector/microsoft/agents/connector/connector_client.py b/libraries/Client/microsoft-agents-connector/microsoft/agents/connector/connector_client.py
index 40fd7989..7583cfa2 100644
--- a/libraries/Client/microsoft-agents-connector/microsoft/agents/connector/connector_client.py
+++ b/libraries/Client/microsoft-agents-connector/microsoft/agents/connector/connector_client.py
@@ -12,7 +12,7 @@
 from azure.core.credentials_async import AsyncTokenCredential
 from azure.core.pipeline import policies
 from azure.core.rest import AsyncHttpResponse, HttpRequest
-from microsoft.agents.authentication import AccessTokenProviderBase
+from microsoft.agents.authorization import AccessTokenProviderBase
 
 from ._serialization import Deserializer, Serializer
 from ._connector_client_configuration import ConnectorConfiguration
diff --git a/libraries/Client/microsoft-agents-connector/pyproject.toml b/libraries/Client/microsoft-agents-connector/pyproject.toml
index 66df6e68..f59bd695 100644
--- a/libraries/Client/microsoft-agents-connector/pyproject.toml
+++ b/libraries/Client/microsoft-agents-connector/pyproject.toml
@@ -17,7 +17,7 @@ dependencies = [
     "isodate>=0.6.1",
     "azure-core>=1.30.0",
     "microsoft-agents-core",
-    "microsoft-agents-authentication",
+    "microsoft-agents-authorization",
 ]
 
 [project.urls]
diff --git a/libraries/Core/microsoft-agents-authentication/microsoft/agents/authentication/__init__.py b/libraries/Core/microsoft-agents-authorization/microsoft/agents/authorization/__init__.py
similarity index 100%
rename from libraries/Core/microsoft-agents-authentication/microsoft/agents/authentication/__init__.py
rename to libraries/Core/microsoft-agents-authorization/microsoft/agents/authorization/__init__.py
diff --git a/libraries/Core/microsoft-agents-authentication/microsoft/agents/authentication/access_token_provider_base.py b/libraries/Core/microsoft-agents-authorization/microsoft/agents/authorization/access_token_provider_base.py
similarity index 100%
rename from libraries/Core/microsoft-agents-authentication/microsoft/agents/authentication/access_token_provider_base.py
rename to libraries/Core/microsoft-agents-authorization/microsoft/agents/authorization/access_token_provider_base.py
diff --git a/libraries/Core/microsoft-agents-authentication/microsoft/agents/authentication/agent_auth_configuration.py b/libraries/Core/microsoft-agents-authorization/microsoft/agents/authorization/agent_auth_configuration.py
similarity index 100%
rename from libraries/Core/microsoft-agents-authentication/microsoft/agents/authentication/agent_auth_configuration.py
rename to libraries/Core/microsoft-agents-authorization/microsoft/agents/authorization/agent_auth_configuration.py
diff --git a/libraries/Core/microsoft-agents-authentication/microsoft/agents/authentication/authentication_constants.py b/libraries/Core/microsoft-agents-authorization/microsoft/agents/authorization/authentication_constants.py
similarity index 100%
rename from libraries/Core/microsoft-agents-authentication/microsoft/agents/authentication/authentication_constants.py
rename to libraries/Core/microsoft-agents-authorization/microsoft/agents/authorization/authentication_constants.py
diff --git a/libraries/Core/microsoft-agents-authentication/microsoft/agents/authentication/claims_identity.py b/libraries/Core/microsoft-agents-authorization/microsoft/agents/authorization/claims_identity.py
similarity index 100%
rename from libraries/Core/microsoft-agents-authentication/microsoft/agents/authentication/claims_identity.py
rename to libraries/Core/microsoft-agents-authorization/microsoft/agents/authorization/claims_identity.py
diff --git a/libraries/Core/microsoft-agents-authentication/microsoft/agents/authentication/connections.py b/libraries/Core/microsoft-agents-authorization/microsoft/agents/authorization/connections.py
similarity index 100%
rename from libraries/Core/microsoft-agents-authentication/microsoft/agents/authentication/connections.py
rename to libraries/Core/microsoft-agents-authorization/microsoft/agents/authorization/connections.py
diff --git a/libraries/Core/microsoft-agents-authentication/microsoft/agents/authentication/jwt_token_validator.py b/libraries/Core/microsoft-agents-authorization/microsoft/agents/authorization/jwt_token_validator.py
similarity index 100%
rename from libraries/Core/microsoft-agents-authentication/microsoft/agents/authentication/jwt_token_validator.py
rename to libraries/Core/microsoft-agents-authorization/microsoft/agents/authorization/jwt_token_validator.py
diff --git a/libraries/Core/microsoft-agents-authentication/pyproject.toml b/libraries/Core/microsoft-agents-authorization/pyproject.toml
similarity index 81%
rename from libraries/Core/microsoft-agents-authentication/pyproject.toml
rename to libraries/Core/microsoft-agents-authorization/pyproject.toml
index d70972dc..fd98db9d 100644
--- a/libraries/Core/microsoft-agents-authentication/pyproject.toml
+++ b/libraries/Core/microsoft-agents-authorization/pyproject.toml
@@ -3,9 +3,9 @@ requires = ["setuptools"]
 build-backend = "setuptools.build_meta"
 
 [project]
-name = "microsoft-agents-authentication"
+name = "microsoft-agents-authorization"
 version = "0.0.0a1"
-description = "An authentication library for Microsoft Agents"
+description = "An authorization library for Microsoft Agents"
 authors = [{name = "Microsoft Corporation"}]
 requires-python = ">=3.9"
 classifiers = [
diff --git a/libraries/Hosting/microsoft-agents-hosting-aiohttp/microsoft/agents/hosting/aiohttp/cloud_adapter.py b/libraries/Hosting/microsoft-agents-hosting-aiohttp/microsoft/agents/hosting/aiohttp/cloud_adapter.py
index b997b7bb..bcbfdf2a 100644
--- a/libraries/Hosting/microsoft-agents-hosting-aiohttp/microsoft/agents/hosting/aiohttp/cloud_adapter.py
+++ b/libraries/Hosting/microsoft-agents-hosting-aiohttp/microsoft/agents/hosting/aiohttp/cloud_adapter.py
@@ -12,7 +12,7 @@
     HTTPUnauthorized,
     HTTPUnsupportedMediaType,
 )
-from microsoft.agents.authentication import ClaimsIdentity
+from microsoft.agents.authorization import ClaimsIdentity
 from microsoft.agents.core.models import (
     Activity,
     DeliveryModes,
diff --git a/libraries/Hosting/microsoft-agents-hosting-aiohttp/microsoft/agents/hosting/aiohttp/jwt_authorization_middleware.py b/libraries/Hosting/microsoft-agents-hosting-aiohttp/microsoft/agents/hosting/aiohttp/jwt_authorization_middleware.py
index 69f8b717..e463b03a 100644
--- a/libraries/Hosting/microsoft-agents-hosting-aiohttp/microsoft/agents/hosting/aiohttp/jwt_authorization_middleware.py
+++ b/libraries/Hosting/microsoft-agents-hosting-aiohttp/microsoft/agents/hosting/aiohttp/jwt_authorization_middleware.py
@@ -1,6 +1,6 @@
 from aiohttp.web import Request, middleware, json_response
 
-from microsoft.agents.authentication import AgentAuthConfiguration, JwtTokenValidator
+from microsoft.agents.authorization import AgentAuthConfiguration, JwtTokenValidator
 
 
 @middleware
diff --git a/test_samples/agent_to_agent/agent_1/agent1.py b/test_samples/agent_to_agent/agent_1/agent1.py
index 7067b98d..37f2b205 100644
--- a/test_samples/agent_to_agent/agent_1/agent1.py
+++ b/test_samples/agent_to_agent/agent_1/agent1.py
@@ -17,7 +17,7 @@
     ConversationResourceResponse,
     ConversationsResult,
 )
-from microsoft.agents.authentication import ClaimsIdentity
+from microsoft.agents.authorization import ClaimsIdentity
 from microsoft.agents.client import (
     ChannelHostProtocol,
     ChannelInfoProtocol,
diff --git a/test_samples/agent_to_agent/agent_1/app.py b/test_samples/agent_to_agent/agent_1/app.py
index 2cf9f0a9..06786aaa 100644
--- a/test_samples/agent_to_agent/agent_1/app.py
+++ b/test_samples/agent_to_agent/agent_1/app.py
@@ -9,12 +9,12 @@
     jwt_authorization_middleware,
     channel_service_route_table,
 )
-from microsoft.agents.authentication import (
+from microsoft.agents.authorization import (
     Connections,
     AccessTokenProviderBase,
     ClaimsIdentity,
 )
-from microsoft.agents.authorization.msal import MsalAuth
+from microsoft.agents.authentication.msal import MsalAuth
 from microsoft.agents.client import (
     ConfigurationChannelHost,
     ConversationIdFactory,
diff --git a/test_samples/agent_to_agent/agent_1/config.py b/test_samples/agent_to_agent/agent_1/config.py
index 31e0a5ef..e4c8cc5c 100644
--- a/test_samples/agent_to_agent/agent_1/config.py
+++ b/test_samples/agent_to_agent/agent_1/config.py
@@ -1,4 +1,4 @@
-from microsoft.agents.authorization.msal import AuthTypes, MsalAuthConfiguration
+from microsoft.agents.authentication.msal import AuthTypes, MsalAuthConfiguration
 from microsoft.agents.client import (
     ChannelHostConfiguration,
     ChannelsConfiguration,
diff --git a/test_samples/agent_to_agent/agent_2/agent2.py b/test_samples/agent_to_agent/agent_2/agent2.py
index 10e0ab5b..a38a033d 100644
--- a/test_samples/agent_to_agent/agent_2/agent2.py
+++ b/test_samples/agent_to_agent/agent_2/agent2.py
@@ -1,4 +1,4 @@
-from microsoft.agents.builder import ActivityHandler, MessageFactory, TurnContext
+from microsoft.agents.builder import ActivityHandler, TurnContext
 from microsoft.agents.core.models import (
     ChannelAccount,
     Activity,
diff --git a/test_samples/agent_to_agent/agent_2/app.py b/test_samples/agent_to_agent/agent_2/app.py
index 67d74c1c..60f8713e 100644
--- a/test_samples/agent_to_agent/agent_2/app.py
+++ b/test_samples/agent_to_agent/agent_2/app.py
@@ -5,12 +5,12 @@
 
 from microsoft.agents.builder import RestChannelServiceClientFactory
 from microsoft.agents.hosting.aiohttp import CloudAdapter, jwt_authorization_middleware
-from microsoft.agents.authentication import (
+from microsoft.agents.authorization import (
     Connections,
     AccessTokenProviderBase,
     ClaimsIdentity,
 )
-from microsoft.agents.authorization.msal import MsalAuth
+from microsoft.agents.authentication.msal import MsalAuth
 
 from agent2 import Agent2
 from config import DefaultConfig
diff --git a/test_samples/agent_to_agent/agent_2/config.py b/test_samples/agent_to_agent/agent_2/config.py
index d1622e53..eb64d0d1 100644
--- a/test_samples/agent_to_agent/agent_2/config.py
+++ b/test_samples/agent_to_agent/agent_2/config.py
@@ -1,4 +1,4 @@
-from microsoft.agents.authorization.msal import AuthTypes, MsalAuthConfiguration
+from microsoft.agents.authentication.msal import AuthTypes, MsalAuthConfiguration
 
 
 class DefaultConfig(MsalAuthConfiguration):
diff --git a/test_samples/echo_agent/app.py b/test_samples/echo_agent/app.py
index fb6a11b8..d3122d79 100644
--- a/test_samples/echo_agent/app.py
+++ b/test_samples/echo_agent/app.py
@@ -5,12 +5,12 @@
 
 from microsoft.agents.builder import RestChannelServiceClientFactory
 from microsoft.agents.hosting.aiohttp import CloudAdapter, jwt_authorization_middleware
-from microsoft.agents.authentication import (
+from microsoft.agents.authorization import (
     Connections,
     AccessTokenProviderBase,
     ClaimsIdentity,
 )
-from microsoft.agents.authorization.msal import MsalAuth
+from microsoft.agents.authentication.msal import MsalAuth
 
 from echo_agent import EchoAgent
 from config import DefaultConfig
diff --git a/test_samples/echo_agent/config.py b/test_samples/echo_agent/config.py
index 1da53dbf..90074c76 100644
--- a/test_samples/echo_agent/config.py
+++ b/test_samples/echo_agent/config.py
@@ -1,4 +1,4 @@
-from microsoft.agents.authorization.msal import AuthTypes, MsalAuthConfiguration
+from microsoft.agents.authentication.msal import AuthTypes, MsalAuthConfiguration
 
 
 class DefaultConfig(MsalAuthConfiguration):