diff --git a/doc/sphinx/ref/azure.appconfiguration.rst b/doc/sphinx/ref/azure.appconfiguration.rst
index b8a68fbe47c9..cab5f5529570 100644
--- a/doc/sphinx/ref/azure.appconfiguration.rst
+++ b/doc/sphinx/ref/azure.appconfiguration.rst
@@ -19,26 +19,18 @@ azure.appconfiguration.azure\_appconfiguration\_client module
    :undoc-members:
    :show-inheritance:
 
-azure.appconfiguration.azure\_appconfiguration\_requests module
----------------------------------------------------------------
+azure.appconfiguration.azure\_appconfiguration\_credential module
+-----------------------------------------------------------------
 
-.. automodule:: azure.appconfiguration.azure_appconfiguration_requests
+.. automodule:: azure.appconfiguration.azure_appconfiguration_credential
    :members:
    :undoc-members:
    :show-inheritance:
 
-azure.appconfiguration.utils module
------------------------------------
-
-.. automodule:: azure.appconfiguration.utils
-   :members:
-   :undoc-members:
-   :show-inheritance:
-
-azure.appconfiguration.version module
--------------------------------------
+azure.appconfiguration.azure\_appconfiguration\_requests module
+---------------------------------------------------------------
 
-.. automodule:: azure.appconfiguration.version
+.. automodule:: azure.appconfiguration.azure_appconfiguration_requests
    :members:
    :undoc-members:
    :show-inheritance:
diff --git a/sdk/appconfiguration/azure-appconfiguration/azure/appconfiguration/aio/azure_configuration_client_async.py b/sdk/appconfiguration/azure-appconfiguration/azure/appconfiguration/aio/azure_configuration_client_async.py
index ba62ee3083f3..5b4b4807a20d 100644
--- a/sdk/appconfiguration/azure-appconfiguration/azure/appconfiguration/aio/azure_configuration_client_async.py
+++ b/sdk/appconfiguration/azure-appconfiguration/azure/appconfiguration/aio/azure_configuration_client_async.py
@@ -6,10 +6,9 @@
 from requests.structures import CaseInsensitiveDict
 from azure.core import MatchConditions
 from azure.core.pipeline import AsyncPipeline
-from azure.core.pipeline.policies import UserAgentPolicy
+from azure.core.pipeline.policies import UserAgentPolicy, DistributedTracingPolicy
 from azure.core.tracing.decorator import distributed_trace
 from azure.core.tracing.decorator_async import distributed_trace_async
-from azure.core.pipeline.policies.distributed_tracing import DistributedTracingPolicy
 from azure.core.pipeline.transport import AsyncioRequestsTransport
 from azure.core.exceptions import (
     ResourceExistsError,
diff --git a/sdk/appconfiguration/azure-appconfiguration/azure/appconfiguration/azure_appconfiguration_client.py b/sdk/appconfiguration/azure-appconfiguration/azure/appconfiguration/azure_appconfiguration_client.py
index aa1cfe2af53e..8fbdf8cf3288 100644
--- a/sdk/appconfiguration/azure-appconfiguration/azure/appconfiguration/azure_appconfiguration_client.py
+++ b/sdk/appconfiguration/azure-appconfiguration/azure/appconfiguration/azure_appconfiguration_client.py
@@ -6,8 +6,7 @@
 from requests.structures import CaseInsensitiveDict
 from azure.core import MatchConditions
 from azure.core.pipeline import Pipeline
-from azure.core.pipeline.policies import UserAgentPolicy
-from azure.core.pipeline.policies.distributed_tracing import DistributedTracingPolicy
+from azure.core.pipeline.policies import UserAgentPolicy, DistributedTracingPolicy
 from azure.core.tracing.decorator import distributed_trace
 from azure.core.pipeline.transport import RequestsTransport
 from azure.core.exceptions import (
diff --git a/sdk/core/azure-core/azure/core/__init__.py b/sdk/core/azure-core/azure/core/__init__.py
index 6c7f2829123e..f1dcf57b8259 100644
--- a/sdk/core/azure-core/azure/core/__init__.py
+++ b/sdk/core/azure-core/azure/core/__init__.py
@@ -31,7 +31,7 @@
 from .pipeline_client import PipelineClient
 from .pipeline.transport import HttpRequest
 from .exceptions import HttpResponseError
-from .match_conditions import MatchConditions
+from ._match_conditions import MatchConditions
 
 
 __all__ = [
diff --git a/sdk/core/azure-core/azure/core/match_conditions.py b/sdk/core/azure-core/azure/core/_match_conditions.py
similarity index 100%
rename from sdk/core/azure-core/azure/core/match_conditions.py
rename to sdk/core/azure-core/azure/core/_match_conditions.py