diff --git a/sdk/appconfiguration/Azure.Data.AppConfiguration/src/AzureClientBuilderExtensions.cs b/sdk/appconfiguration/Azure.Data.AppConfiguration/src/ConfigurationClientBuilderExtensions.cs
similarity index 96%
rename from sdk/appconfiguration/Azure.Data.AppConfiguration/src/AzureClientBuilderExtensions.cs
rename to sdk/appconfiguration/Azure.Data.AppConfiguration/src/ConfigurationClientBuilderExtensions.cs
index 85d4026a08f5..2a3dc12320f5 100644
--- a/sdk/appconfiguration/Azure.Data.AppConfiguration/src/AzureClientBuilderExtensions.cs
+++ b/sdk/appconfiguration/Azure.Data.AppConfiguration/src/ConfigurationClientBuilderExtensions.cs
@@ -11,7 +11,7 @@ namespace Microsoft.Extensions.Azure
     /// <summary>
     /// Extension methods to add <see cref="ConfigurationClient"/> client to clients builder
     /// </summary>
-    public static class AzureClientBuilderExtensions
+    public static class ConfigurationClientBuilderExtensions
     {
         /// <summary>
         /// Registers a <see cref="ConfigurationClient"/> instance with the provided <paramref name="connectionString"/>
diff --git a/sdk/eventhub/Azure.Messaging.EventHubs/src/Compatibility/AzureClientBuilderExtensions.cs b/sdk/eventhub/Azure.Messaging.EventHubs/src/Compatibility/EventHubClientBuilderExtensions.cs
old mode 100755
new mode 100644
similarity index 98%
rename from sdk/eventhub/Azure.Messaging.EventHubs/src/Compatibility/AzureClientBuilderExtensions.cs
rename to sdk/eventhub/Azure.Messaging.EventHubs/src/Compatibility/EventHubClientBuilderExtensions.cs
index 7a90b49b1651..571e62d27785
--- a/sdk/eventhub/Azure.Messaging.EventHubs/src/Compatibility/AzureClientBuilderExtensions.cs
+++ b/sdk/eventhub/Azure.Messaging.EventHubs/src/Compatibility/EventHubClientBuilderExtensions.cs
@@ -11,7 +11,7 @@ namespace Microsoft.Extensions.Azure
     /// <summary>
     /// Extension methods to add <see cref="EventHubClient"/> client to clients builder
     /// </summary>
-    public static class AzureClientBuilderExtensions
+    public static class EventHubClientBuilderExtensions
     {
         /// <summary>
         /// Registers a <see cref="EventHubClient"/> instance with the provided <paramref name="connectionString"/>
diff --git a/sdk/keyvault/Azure.Security.KeyVault.Certificates/src/AzureClientBuilderExtensions.cs b/sdk/keyvault/Azure.Security.KeyVault.Certificates/src/CertificateClientBuilderExtensions.cs
similarity index 96%
rename from sdk/keyvault/Azure.Security.KeyVault.Certificates/src/AzureClientBuilderExtensions.cs
rename to sdk/keyvault/Azure.Security.KeyVault.Certificates/src/CertificateClientBuilderExtensions.cs
index a161f665fd0f..fd2e17103470 100644
--- a/sdk/keyvault/Azure.Security.KeyVault.Certificates/src/AzureClientBuilderExtensions.cs
+++ b/sdk/keyvault/Azure.Security.KeyVault.Certificates/src/CertificateClientBuilderExtensions.cs
@@ -12,7 +12,7 @@ namespace Microsoft.Extensions.Azure
     /// <summary>
     /// Extension methods to add <see cref="CertificateClient"/> to clients builder
     /// </summary>
-    public static class AzureClientBuilderExtensions
+    public static class CertificateClientBuilderExtensions
     {
         /// <summary>
         /// Registers a <see cref="CertificateClient"/> instance with the provided <paramref name="vaultUri"/>
diff --git a/sdk/keyvault/Azure.Security.KeyVault.Keys/src/AzureClientBuilderExtensions.cs b/sdk/keyvault/Azure.Security.KeyVault.Keys/src/KeyClientBuilderExtensions.cs
similarity index 98%
rename from sdk/keyvault/Azure.Security.KeyVault.Keys/src/AzureClientBuilderExtensions.cs
rename to sdk/keyvault/Azure.Security.KeyVault.Keys/src/KeyClientBuilderExtensions.cs
index 4beb58223000..d4c6cf7d3e9e 100644
--- a/sdk/keyvault/Azure.Security.KeyVault.Keys/src/AzureClientBuilderExtensions.cs
+++ b/sdk/keyvault/Azure.Security.KeyVault.Keys/src/KeyClientBuilderExtensions.cs
@@ -13,7 +13,7 @@ namespace Microsoft.Extensions.Azure
     /// <summary>
     /// Extension methods to <see cref="KeyClient"/> or <see cref="CryptographyClient"/> to clients builder
     /// </summary>
-    public static class AzureClientBuilderExtensions
+    public static class KeyClientBuilderExtensions
     {
         /// <summary>
         /// Registers a <see cref="KeyClient"/> instance with the provided <paramref name="vaultEndpoint"/>
diff --git a/sdk/keyvault/Azure.Security.KeyVault.Secrets/src/AzureClientBuilderExtensions.cs b/sdk/keyvault/Azure.Security.KeyVault.Secrets/src/SecretClientBuilderExtensions.cs
similarity index 96%
rename from sdk/keyvault/Azure.Security.KeyVault.Secrets/src/AzureClientBuilderExtensions.cs
rename to sdk/keyvault/Azure.Security.KeyVault.Secrets/src/SecretClientBuilderExtensions.cs
index 6f3c176ba738..6178b4f1b53f 100644
--- a/sdk/keyvault/Azure.Security.KeyVault.Secrets/src/AzureClientBuilderExtensions.cs
+++ b/sdk/keyvault/Azure.Security.KeyVault.Secrets/src/SecretClientBuilderExtensions.cs
@@ -12,7 +12,7 @@ namespace Microsoft.Extensions.Azure
     /// <summary>
     /// Extension methods to add <see cref="SecretClient"/> to clients builder
     /// </summary>
-    public static class AzureClientBuilderExtensions
+    public static class SecretClientBuilderExtensions
     {
         /// <summary>
         /// Registers a <see cref="SecretClient"/> instance with the provided <paramref name="vaultEndpoint"/>
diff --git a/sdk/storage/Azure.Storage.Blobs/src/AzureClientBuilderExtensions.cs b/sdk/storage/Azure.Storage.Blobs/src/BlobClientBuilderExtensions.cs
similarity index 98%
rename from sdk/storage/Azure.Storage.Blobs/src/AzureClientBuilderExtensions.cs
rename to sdk/storage/Azure.Storage.Blobs/src/BlobClientBuilderExtensions.cs
index ce5ec7bc39c0..13c1a00f7ba3 100644
--- a/sdk/storage/Azure.Storage.Blobs/src/AzureClientBuilderExtensions.cs
+++ b/sdk/storage/Azure.Storage.Blobs/src/BlobClientBuilderExtensions.cs
@@ -13,7 +13,7 @@ namespace Microsoft.Extensions.Azure
     /// <summary>
     /// Extension methods to add <see cref="BlobServiceClient"/> client to clients builder
     /// </summary>
-    public static class AzureClientBuilderExtensions
+    public static class BlobClientBuilderExtensions
     {
         /// <summary>
         /// Registers a <see cref="BlobServiceClient"/> instance with the provided <paramref name="connectionString"/>
diff --git a/sdk/storage/Azure.Storage.Files/src/AzureClientBuilderExtensions.cs b/sdk/storage/Azure.Storage.Files/src/FileClientBuilderExtensions.cs
similarity index 98%
rename from sdk/storage/Azure.Storage.Files/src/AzureClientBuilderExtensions.cs
rename to sdk/storage/Azure.Storage.Files/src/FileClientBuilderExtensions.cs
index 02cc52f0f552..b7450b5cb667 100644
--- a/sdk/storage/Azure.Storage.Files/src/AzureClientBuilderExtensions.cs
+++ b/sdk/storage/Azure.Storage.Files/src/FileClientBuilderExtensions.cs
@@ -13,7 +13,7 @@ namespace Microsoft.Extensions.Azure
     /// <summary>
     /// Extension methods to add <see cref="FileServiceClient"/> client to clients builder
     /// </summary>
-    public static class AzureClientBuilderExtensions
+    public static class FileClientBuilderExtensions
     {
         /// <summary>
         /// Registers a <see cref="FileServiceClient"/> instance with the provided <paramref name="connectionString"/>
diff --git a/sdk/storage/Azure.Storage.Queues/src/AzureClientBuilderExtensions.cs b/sdk/storage/Azure.Storage.Queues/src/QueueClientBuilderExtensions.cs
similarity index 98%
rename from sdk/storage/Azure.Storage.Queues/src/AzureClientBuilderExtensions.cs
rename to sdk/storage/Azure.Storage.Queues/src/QueueClientBuilderExtensions.cs
index 721c7071cff5..367d63bc93e4 100644
--- a/sdk/storage/Azure.Storage.Queues/src/AzureClientBuilderExtensions.cs
+++ b/sdk/storage/Azure.Storage.Queues/src/QueueClientBuilderExtensions.cs
@@ -13,7 +13,7 @@ namespace Microsoft.Extensions.Azure
     /// <summary>
     /// Extension methods to add <see cref="QueueClientOptions"/> client to clients builder
     /// </summary>
-    public static class AzureClientBuilderExtensions
+    public static class QueueClientBuilderExtensions
     {
         /// <summary>
         /// Registers a <see cref="QueueServiceClient"/> instance with the provided <paramref name="connectionString"/>