diff --git a/specification/resources/resource-manager/Microsoft.Authorization/policy/main.tsp b/specification/resources/resource-manager/Microsoft.Authorization/policy/main.tsp
index fdf62b4fff30..d85112ba59c9 100644
--- a/specification/resources/resource-manager/Microsoft.Authorization/policy/main.tsp
+++ b/specification/resources/resource-manager/Microsoft.Authorization/policy/main.tsp
@@ -24,6 +24,7 @@ import "./PolicySetDefinitionVersion.tsp";
 import "./routes.tsp";
 import "./Variable.tsp";
 import "./VariableValue.tsp";
+import "./client.tsp";
 
 using Azure.Core;
 using Azure.ResourceManager;
diff --git a/specification/resources/resource-manager/Microsoft.Resources/deploymentStacks/main.tsp b/specification/resources/resource-manager/Microsoft.Resources/deploymentStacks/main.tsp
index d72c9f53ac0d..686677188720 100644
--- a/specification/resources/resource-manager/Microsoft.Resources/deploymentStacks/main.tsp
+++ b/specification/resources/resource-manager/Microsoft.Resources/deploymentStacks/main.tsp
@@ -14,6 +14,7 @@ import "@azure-tools/typespec-azure-resource-manager";
 import "./models.tsp";
 import "./models-whatIf.tsp";
 import "./back-compat.tsp";
+import "./client.tsp";
 
 using Azure.ResourceManager;
 using TypeSpec.Versioning;
diff --git a/specification/search/resource-manager/Microsoft.Search/Search/client.tsp b/specification/search/resource-manager/Microsoft.Search/Search/client.tsp
index cb66743673a4..a6172cbe7977 100644
--- a/specification/search/resource-manager/Microsoft.Search/Search/client.tsp
+++ b/specification/search/resource-manager/Microsoft.Search/Search/client.tsp
@@ -15,8 +15,9 @@ using Azure.Core;
 using Azure.ResourceManager;
 using Azure.ClientGenerator.Core;
 using TypeSpec.OpenAPI;
+using Microsoft.Search;
 
-namespace Microsoft.Search;
+namespace Customizations;
 
 #suppress "@azure-tools/typespec-azure-core/documentation-required" "FIXME: Update justification, follow aka.ms/tsp/conversion-fix for details"
 #suppress "@azure-tools/typespec-azure-core/casing-style" "FIXME: Update justification, follow aka.ms/tsp/conversion-fix for details"
@@ -414,7 +415,7 @@ op privateEndpointConnectionsGetCustomization(
 
   #suppress "@azure-tools/typespec-azure-core/documentation-required" "FIXME: Update justification, follow aka.ms/tsp/conversion-fix for details"
   params?: `search-management-request-options`,
-): ArmResponse<PrivateEndpointConnection> | CloudError;
+): ArmResponse<Microsoft.Search.PrivateEndpointConnection> | CloudError;
 
 /**
  * Updates a private endpoint connection to the search service in the given resource group.
@@ -448,7 +449,9 @@ op privateEndpointConnectionsUpdateCustomization(
 
   #suppress "@azure-tools/typespec-azure-core/documentation-required" "FIXME: Update justification, follow aka.ms/tsp/conversion-fix for details"
   params?: `search-management-request-options`,
-): ArmResourceUpdatedResponse<PrivateEndpointConnection> | CloudError;
+):
+  | ArmResourceUpdatedResponse<Microsoft.Search.PrivateEndpointConnection>
+  | CloudError;
 
 /**
  * Disconnects the private endpoint connection and deletes it from the search service.
@@ -477,7 +480,10 @@ op privateEndpointConnectionsDeleteCustomization(
 
   #suppress "@azure-tools/typespec-azure-core/documentation-required" "FIXME: Update justification, follow aka.ms/tsp/conversion-fix for details"
   params?: `search-management-request-options`,
-): ArmResponse<PrivateEndpointConnection> | NotFoundResponse | CloudError;
+):
+  | ArmResponse<Microsoft.Search.PrivateEndpointConnection>
+  | NotFoundResponse
+  | CloudError;
 
 /**
  * Gets a list of all supported private link resource types for the given service.
@@ -967,9 +973,17 @@ model AccessRulePropertiesSubscriptionsItem {
 
 @@clientName(SearchServiceProperties.eTag, "etag", "java");
 
-@@clientName(SearchResourceEncryptionKey.keyVaultKeyName, "keyName");
-@@clientName(SearchResourceEncryptionKey.keyVaultKeyVersion, "keyVersion");
-@@clientName(SearchResourceEncryptionKey.keyVaultUri, "vaultUri");
+@@clientName(
+  SearchResourceEncryptionKey.keyVaultKeyName,
+  "keyName",
+  "!autorest"
+);
+@@clientName(
+  SearchResourceEncryptionKey.keyVaultKeyVersion,
+  "keyVersion",
+  "!autorest"
+);
+@@clientName(SearchResourceEncryptionKey.keyVaultUri, "vaultUri", "!autorest");
 
 // C# settings
 #suppress "@azure-tools/typespec-azure-core/no-legacy-usage" "flatten sku for backward compat with C# SDK"
@@ -1068,12 +1082,12 @@ model AccessRulePropertiesSubscriptionsItem {
   "csharp"
 );
 @@clientName(
-  PrivateEndpointConnectionProperties,
+  Microsoft.Search.PrivateEndpointConnectionProperties,
   "SearchServicePrivateEndpointConnectionProperties",
   "csharp"
 );
 @@clientName(
-  PrivateEndpointConnectionProperties.privateLinkServiceConnectionState,
+  Microsoft.Search.PrivateEndpointConnectionProperties.privateLinkServiceConnectionState,
   "ConnectionState",
   "csharp"
 );
@@ -1151,7 +1165,7 @@ model AccessRulePropertiesSubscriptionsItem {
   "csharp"
 );
 @@clientName(
-  PrivateEndpointConnection,
+  Microsoft.Search.PrivateEndpointConnection,
   "SearchPrivateEndpointConnection",
   "csharp"
 );
diff --git a/specification/search/resource-manager/Microsoft.Search/Search/main.tsp b/specification/search/resource-manager/Microsoft.Search/Search/main.tsp
index eef9312df771..a9c428f36181 100644
--- a/specification/search/resource-manager/Microsoft.Search/Search/main.tsp
+++ b/specification/search/resource-manager/Microsoft.Search/Search/main.tsp
@@ -18,6 +18,7 @@ import "./PrivateEndpointConnection.tsp";
 import "./SharedPrivateLinkResource.tsp";
 import "./NetworkSecurityPerimeterConfiguration.tsp";
 import "./routes.tsp";
+import "./client.tsp";
 
 using TypeSpec.Rest;
 using TypeSpec.Http;