diff --git a/AspNetCore.Diagnostics.HealthChecks.sln b/AspNetCore.Diagnostics.HealthChecks.sln
index 34381a9559..c782d00ea9 100644
--- a/AspNetCore.Diagnostics.HealthChecks.sln
+++ b/AspNetCore.Diagnostics.HealthChecks.sln
@@ -13,6 +13,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "build", "build", "{A5A8CE48
 		Directory.Build.targets = Directory.Build.targets
 		docker-compose.yml = docker-compose.yml
 		.github\labeler.yml = .github\labeler.yml
+		build\strongNameKey.snk = build\strongNameKey.snk
 		build\versions.props = build\versions.props
 	EndProjectSection
 EndProject
diff --git a/src/HealthChecks.Azure.Data.Tables/DependencyInjection/AzureTablesServiceHealthChecksBuilderExtensions.cs b/src/HealthChecks.Azure.Data.Tables/DependencyInjection/AzureTablesServiceHealthChecksBuilderExtensions.cs
index 1e6c17cab5..8e652f08a4 100644
--- a/src/HealthChecks.Azure.Data.Tables/DependencyInjection/AzureTablesServiceHealthChecksBuilderExtensions.cs
+++ b/src/HealthChecks.Azure.Data.Tables/DependencyInjection/AzureTablesServiceHealthChecksBuilderExtensions.cs
@@ -9,7 +9,7 @@ namespace Microsoft.Extensions.DependencyInjection;
 /// </summary>
 public static class AzureTablesServiceHealthChecksBuilderExtensions
 {
-    private const string HEALTH_CHECK_NAME = "azure_tables";
+    private const string NAME = "azure_tables";
 
     /// <summary>
     /// Add a health check for Azure Tables Service by registering <see cref="AzureTableServiceHealthCheck"/> for given <paramref name="builder"/>.
@@ -23,7 +23,7 @@ public static class AzureTablesServiceHealthChecksBuilderExtensions
     /// An optional factory to obtain <see cref="AzureTableServiceHealthCheckOptions"/> used by the health check.
     /// When not provided, defaults are used.
     /// </param>
-    /// <param name="healthCheckName">The health check name. Optional. If <c>null</c> the name 'azure_tables' will be used.</param>
+    /// <param name="name">The health check name. Optional. If <c>null</c> the name 'azure_tables' will be used.</param>
     /// <param name="failureStatus">
     /// The <see cref="HealthStatus"/> that should be reported when the health check fails. Optional. If <c>null</c> then
     /// the default status of <see cref="HealthStatus.Unhealthy"/> will be reported.
@@ -35,13 +35,13 @@ public static IHealthChecksBuilder AddAzureTable(
         this IHealthChecksBuilder builder,
         Func<IServiceProvider, TableServiceClient>? clientFactory = default,
         Func<IServiceProvider, AzureTableServiceHealthCheckOptions>? optionsFactory = default,
-        string? healthCheckName = HEALTH_CHECK_NAME,
+        string? name = NAME,
         HealthStatus? failureStatus = default,
         IEnumerable<string>? tags = default,
         TimeSpan? timeout = default)
     {
         return builder.Add(new HealthCheckRegistration(
-           string.IsNullOrEmpty(healthCheckName) ? HEALTH_CHECK_NAME : healthCheckName!,
+           name ?? NAME,
            sp => new AzureTableServiceHealthCheck(
                     tableServiceClient: clientFactory?.Invoke(sp) ?? sp.GetRequiredService<TableServiceClient>(),
                     options: optionsFactory?.Invoke(sp)),
diff --git a/src/HealthChecks.Azure.Data.Tables/README.md b/src/HealthChecks.Azure.Data.Tables/README.md
index 79607c831f..641e95c992 100644
--- a/src/HealthChecks.Azure.Data.Tables/README.md
+++ b/src/HealthChecks.Azure.Data.Tables/README.md
@@ -20,7 +20,7 @@ You can additionally add the following parameters:
 
 - `clientFactory`: A factory method to provide `TableServiceClient` instance.
 - `optionsFactory`: A factory method to provide `AzureTableServiceHealthCheckOptions` instance. It allows to specify the table name.
-- `healthCheckName`: The health check name. The default is `azure_tables`.
+- `name`: The health check name. The default is `azure_tables`.
 - `failureStatus`: The `HealthStatus` that should be reported when the health check fails. Default is `HealthStatus.Unhealthy`.
 - `tags`: A list of tags that can be used to filter sets of health checks.
 - `timeout`: A `System.TimeSpan` representing the timeout of the check.
diff --git a/src/HealthChecks.Azure.KeyVault.Secrets/AzureKeyVaultSecretsHealthCheck.cs b/src/HealthChecks.Azure.KeyVault.Secrets/AzureKeyVaultSecretsHealthCheck.cs
index b7788c8584..57c5cfa529 100644
--- a/src/HealthChecks.Azure.KeyVault.Secrets/AzureKeyVaultSecretsHealthCheck.cs
+++ b/src/HealthChecks.Azure.KeyVault.Secrets/AzureKeyVaultSecretsHealthCheck.cs
@@ -24,8 +24,8 @@ public sealed class AzureKeyVaultSecretsHealthCheck : IHealthCheck
     /// <remarks>
     /// It uses the provided <paramref name="secretClient"/> to get given <see cref="AzureKeyVaultSecretsHealthCheckOptions.SecretName"/> secret via
     /// <see cref="SecretClient.GetSecretAsync(string, string, CancellationToken)"/> method.
-    /// When the secret is not found, it will try to create it if <see cref="AzureKeyVaultSecretsHealthCheckOptions.CreateWhenNotFound"/> is set to true.
-    /// When the secret is not found, but <see cref="AzureKeyVaultSecretsHealthCheckOptions.CreateWhenNotFound"/> is false, it returns <see cref="HealthStatus.Healthy"/> status,
+    /// When the secret is not found, it will try to create it if <see cref="AzureKeyVaultSecretsHealthCheckOptions.CreateWhenNotFound"/> is set to <see langword="true"/>.
+    /// When the secret is not found, but <see cref="AzureKeyVaultSecretsHealthCheckOptions.CreateWhenNotFound"/> is <see langword="false"/>, it returns <see cref="HealthStatus.Healthy"/> status,
     /// as the connection to the service itself can be made.
     /// </remarks>
     public AzureKeyVaultSecretsHealthCheck(SecretClient secretClient, AzureKeyVaultSecretsHealthCheckOptions? options = default)
diff --git a/src/HealthChecks.Azure.KeyVault.Secrets/AzureKeyVaultSecretsHealthCheckOptions.cs b/src/HealthChecks.Azure.KeyVault.Secrets/AzureKeyVaultSecretsHealthCheckOptions.cs
index c37a9ad424..b936121446 100644
--- a/src/HealthChecks.Azure.KeyVault.Secrets/AzureKeyVaultSecretsHealthCheckOptions.cs
+++ b/src/HealthChecks.Azure.KeyVault.Secrets/AzureKeyVaultSecretsHealthCheckOptions.cs
@@ -21,7 +21,7 @@ public string SecretName
 
     /// <summary>
     /// A boolean value that indicates whether the secret should be created when it's not found.
-    /// False by default.
+    /// <see langword="false"/> by default.
     /// </summary>
     /// <remarks>
     /// Enabling it requires secret set permissions and can be used to improve performance
diff --git a/src/HealthChecks.Azure.KeyVault.Secrets/DependencyInjection/AzureKeyVaultHealthChecksBuilderExtensions.cs b/src/HealthChecks.Azure.KeyVault.Secrets/DependencyInjection/AzureKeyVaultHealthChecksBuilderExtensions.cs
index 209cdf1969..9c5fb5b92e 100644
--- a/src/HealthChecks.Azure.KeyVault.Secrets/DependencyInjection/AzureKeyVaultHealthChecksBuilderExtensions.cs
+++ b/src/HealthChecks.Azure.KeyVault.Secrets/DependencyInjection/AzureKeyVaultHealthChecksBuilderExtensions.cs
@@ -9,7 +9,7 @@ namespace Microsoft.Extensions.DependencyInjection;
 /// </summary>
 public static class AzureKeyVaultHealthChecksBuilderExtensions
 {
-    private const string HEALTH_CHECK_NAME = "azure_key_vault_secret";
+    private const string NAME = "azure_key_vault_secret";
 
     /// <summary>
     /// Add a health check for Azure Key Vault Secrets by registering <see cref="AzureKeyVaultSecretsHealthCheck"/> for given <paramref name="builder"/>.
@@ -23,7 +23,7 @@ public static class AzureKeyVaultHealthChecksBuilderExtensions
     /// An optional factory to obtain <see cref="AzureKeyVaultSecretsHealthCheckOptions"/> used by the health check.
     /// When not provided, defaults are used.
     /// </param>
-    /// <param name="healthCheckName">The health check name. Optional. If <c>null</c> the name 'azure_key_vault_secret' will be used.</param>
+    /// <param name="name">The health check name. Optional. If <c>null</c> the name 'azure_key_vault_secret' will be used.</param>
     /// <param name="failureStatus">
     /// The <see cref="HealthStatus"/> that should be reported when the health check fails. Optional. If <c>null</c> then
     /// the default status of <see cref="HealthStatus.Unhealthy"/> will be reported.
@@ -35,13 +35,13 @@ public static IHealthChecksBuilder AddAzureKeyVaultSecrets(
         this IHealthChecksBuilder builder,
         Func<IServiceProvider, SecretClient>? clientFactory = default,
         Func<IServiceProvider, AzureKeyVaultSecretsHealthCheckOptions>? optionsFactory = default,
-        string? healthCheckName = HEALTH_CHECK_NAME,
+        string? name = NAME,
         HealthStatus? failureStatus = default,
         IEnumerable<string>? tags = default,
         TimeSpan? timeout = default)
     {
         return builder.Add(new HealthCheckRegistration(
-           string.IsNullOrEmpty(healthCheckName) ? HEALTH_CHECK_NAME : healthCheckName!,
+           name ?? NAME,
            sp => new AzureKeyVaultSecretsHealthCheck(
                     secretClient: clientFactory?.Invoke(sp) ?? sp.GetRequiredService<SecretClient>(),
                     options: optionsFactory?.Invoke(sp)),
diff --git a/src/HealthChecks.Azure.KeyVault.Secrets/README.md b/src/HealthChecks.Azure.KeyVault.Secrets/README.md
index 94dd53c4ca..c79a6ec8b6 100644
--- a/src/HealthChecks.Azure.KeyVault.Secrets/README.md
+++ b/src/HealthChecks.Azure.KeyVault.Secrets/README.md
@@ -1,4 +1,4 @@
-## Azure KeyVault Health Check
+## Azure KeyVault Secrets Health Check
 
 This health check verifies the ability to communicate with [Azure Key Vault Secrets](https://azure.microsoft.com/services/key-vault/). It uses the provided [SecretClient](https://learn.microsoft.com/dotnet/api/azure.security.keyvault.secrets.secretclient) to get configured secret. When the connection to the service itself can be made, but secret is not found, it returns `HealthStatus.Healthy` status.
 
@@ -20,7 +20,7 @@ You can additionally add the following parameters:
 
 - `clientFactory`: A factory method to provide `SecretClient` instance.
 - `optionsFactory`: A factory method to provide `AzureKeyVaultSecretsHealthCheckOptions` instance. It allows to specify the secret name and whether the secret should be created when it's not found.
-- `healthCheckName`: The health check name. The default is `azure_key_vault_secret`.
+- `name`: The health check name. The default is `azure_key_vault_secret`.
 - `failureStatus`: The `HealthStatus` that should be reported when the health check fails. Default is `HealthStatus.Unhealthy`.
 - `tags`: A list of tags that can be used to filter sets of health checks.
 - `timeout`: A `System.TimeSpan` representing the timeout of the check.
diff --git a/src/HealthChecks.Azure.Messaging.EventHubs/DependencyInjection/AzureEventHubHealthChecksBuilderExtensions.cs b/src/HealthChecks.Azure.Messaging.EventHubs/DependencyInjection/AzureEventHubHealthChecksBuilderExtensions.cs
index 96fbc34900..87a002eae9 100644
--- a/src/HealthChecks.Azure.Messaging.EventHubs/DependencyInjection/AzureEventHubHealthChecksBuilderExtensions.cs
+++ b/src/HealthChecks.Azure.Messaging.EventHubs/DependencyInjection/AzureEventHubHealthChecksBuilderExtensions.cs
@@ -9,7 +9,7 @@ namespace Microsoft.Extensions.DependencyInjection;
 /// </summary>
 public static class AzureEventHubHealthChecksBuilderExtensions
 {
-    private const string HEALTH_CHECK_NAME = "azure_event_hub";
+    private const string NAME = "azure_event_hub";
 
     /// <summary>
     /// Add a health check for Azure Event Hub by registering <see cref="AzureEventHubHealthCheck"/> for given <paramref name="builder"/>.
@@ -19,7 +19,7 @@ public static class AzureEventHubHealthChecksBuilderExtensions
     /// An optional factory to obtain <see cref="EventHubProducerClient" /> instance.
     /// When not provided, <see cref="EventHubProducerClient" /> is simply resolved from <see cref="IServiceProvider"/>.
     /// </param>
-    /// <param name="healthCheckName">The health check name. Optional. If <c>null</c> the name 'azure_event_hub' will be used.</param>
+    /// <param name="name">The health check name. Optional. If <c>null</c> the name 'azure_event_hub' will be used.</param>
     /// <param name="failureStatus">
     /// The <see cref="HealthStatus"/> that should be reported when the health check fails. Optional. If <c>null</c> then
     /// the default status of <see cref="HealthStatus.Unhealthy"/> will be reported.
@@ -30,13 +30,13 @@ public static class AzureEventHubHealthChecksBuilderExtensions
     public static IHealthChecksBuilder AddAzureEventHub(
         this IHealthChecksBuilder builder,
         Func<IServiceProvider, EventHubProducerClient>? clientFactory = default,
-        string? healthCheckName = HEALTH_CHECK_NAME,
+        string? name = NAME,
         HealthStatus? failureStatus = default,
         IEnumerable<string>? tags = default,
         TimeSpan? timeout = default)
     {
         return builder.Add(new HealthCheckRegistration(
-           string.IsNullOrEmpty(healthCheckName) ? HEALTH_CHECK_NAME : healthCheckName!,
+           name ?? NAME,
            sp => new AzureEventHubHealthCheck(clientFactory?.Invoke(sp) ?? sp.GetRequiredService<EventHubProducerClient>()),
            failureStatus,
            tags,
diff --git a/src/HealthChecks.Azure.Messaging.EventHubs/README.md b/src/HealthChecks.Azure.Messaging.EventHubs/README.md
index 92bcf362aa..99d065bfb1 100644
--- a/src/HealthChecks.Azure.Messaging.EventHubs/README.md
+++ b/src/HealthChecks.Azure.Messaging.EventHubs/README.md
@@ -30,8 +30,8 @@ void Configure(IHealthChecksBuilder builder)
         .AddKeyedSingleton(serviceKey: "eventHubName1", (serviceProvider, serviceKey) => new EventHubProducerClient("fullyQualifiedNamespace", "eventHubName1", new DefaultAzureCredential()))
         .AddKeyedSingleton(serviceKey: "eventHubName2", (serviceProvider, serviceKey) => new EventHubProducerClient("fullyQualifiedNamespace", "eventHubName2", new DefaultAzureCredential()))
         .AddHealthChecks()
-            .AddAzureKeyVaultSecrets(clientFactory: serviceProvider => serviceProvider.GetRequiredKeyedService<EventHubProducerClient>("eventHubName1"), healthCheckName: "event_hub_1")
-            .AddAzureKeyVaultSecrets(clientFactory: serviceProvider => serviceProvider.GetRequiredKeyedService<EventHubProducerClient>("eventHubName2"), healthCheckName: "event_hub_2");
+            .AddAzureKeyVaultSecrets(clientFactory: serviceProvider => serviceProvider.GetRequiredKeyedService<EventHubProducerClient>("eventHubName1"), name: "event_hub_1")
+            .AddAzureKeyVaultSecrets(clientFactory: serviceProvider => serviceProvider.GetRequiredKeyedService<EventHubProducerClient>("eventHubName2"), name: "event_hub_2");
 
 }
 ```
diff --git a/src/HealthChecks.Azure.Storage.Blobs/DependencyInjection/AzureBlobStorageHealthChecksBuilderExtensions.cs b/src/HealthChecks.Azure.Storage.Blobs/DependencyInjection/AzureBlobStorageHealthChecksBuilderExtensions.cs
index 2ef2fffe4c..aa0c35338d 100644
--- a/src/HealthChecks.Azure.Storage.Blobs/DependencyInjection/AzureBlobStorageHealthChecksBuilderExtensions.cs
+++ b/src/HealthChecks.Azure.Storage.Blobs/DependencyInjection/AzureBlobStorageHealthChecksBuilderExtensions.cs
@@ -9,7 +9,7 @@ namespace Microsoft.Extensions.DependencyInjection;
 /// </summary>
 public static class AzureBlobStorageHealthChecksBuilderExtensions
 {
-    private const string HEALTH_CHECK_NAME = "azure_blob_storage";
+    private const string NAME = "azure_blob_storage";
 
     /// <summary>
     /// Add a health check for Azure Blob Storage by registering <see cref="AzureBlobStorageHealthCheck"/> for given <paramref name="builder"/>.
@@ -23,7 +23,7 @@ public static class AzureBlobStorageHealthChecksBuilderExtensions
     /// An optional factory to obtain <see cref="AzureBlobStorageHealthCheckOptions"/> used by the health check.
     /// When not provided, defaults are used.
     /// </param>
-    /// <param name="healthCheckName">The health check name. Optional. If <c>null</c> the name 'azure_blob_storage' will be used.</param>
+    /// <param name="name">The health check name. Optional. If <c>null</c> the name 'azure_blob_storage' will be used.</param>
     /// <param name="failureStatus">
     /// The <see cref="HealthStatus"/> that should be reported when the health check fails. Optional. If <c>null</c> then
     /// the default status of <see cref="HealthStatus.Unhealthy"/> will be reported.
@@ -35,13 +35,13 @@ public static IHealthChecksBuilder AddAzureBlobStorage(
         this IHealthChecksBuilder builder,
         Func<IServiceProvider, BlobServiceClient>? clientFactory = default,
         Func<IServiceProvider, AzureBlobStorageHealthCheckOptions>? optionsFactory = default,
-        string? healthCheckName = HEALTH_CHECK_NAME,
+        string? name = NAME,
         HealthStatus? failureStatus = default,
         IEnumerable<string>? tags = default,
         TimeSpan? timeout = default)
     {
         return builder.Add(new HealthCheckRegistration(
-           string.IsNullOrEmpty(healthCheckName) ? HEALTH_CHECK_NAME : healthCheckName!,
+           name ?? NAME,
            sp => new AzureBlobStorageHealthCheck(
                     blobServiceClient: clientFactory?.Invoke(sp) ?? sp.GetRequiredService<BlobServiceClient>(),
                     options: optionsFactory?.Invoke(sp)),
diff --git a/src/HealthChecks.Azure.Storage.Blobs/README.md b/src/HealthChecks.Azure.Storage.Blobs/README.md
index 0dfde59389..c592572c36 100644
--- a/src/HealthChecks.Azure.Storage.Blobs/README.md
+++ b/src/HealthChecks.Azure.Storage.Blobs/README.md
@@ -20,7 +20,7 @@ You can additionally add the following parameters:
 
 - `clientFactory`: A factory method to provide `BlobServiceClient` instance.
 - `optionsFactory`: A factory method to provide `AzureBlobStorageHealthCheckOptions` instance. It allows to specify the container name.
-- `healthCheckName`: The health check name. The default is `azure_blob_storage`.
+- `name`: The health check name. The default is `azure_blob_storage`.
 - `failureStatus`: The `HealthStatus` that should be reported when the health check fails. Default is `HealthStatus.Unhealthy`.
 - `tags`: A list of tags that can be used to filter sets of health checks.
 - `timeout`: A `System.TimeSpan` representing the timeout of the check.
diff --git a/src/HealthChecks.Azure.Storage.Files.Shares/DependencyInjection/AzureQueueStorageHealthChecksBuilderExtensions.cs b/src/HealthChecks.Azure.Storage.Files.Shares/DependencyInjection/AzureQueueStorageHealthChecksBuilderExtensions.cs
index dabdd56481..4f56bdf7ff 100644
--- a/src/HealthChecks.Azure.Storage.Files.Shares/DependencyInjection/AzureQueueStorageHealthChecksBuilderExtensions.cs
+++ b/src/HealthChecks.Azure.Storage.Files.Shares/DependencyInjection/AzureQueueStorageHealthChecksBuilderExtensions.cs
@@ -9,7 +9,7 @@ namespace Microsoft.Extensions.DependencyInjection;
 /// </summary>
 public static class AzureFileShareStorageHealthChecksBuilderExtensions
 {
-    private const string HEALTH_CHECK_NAME = "azure_file_share";
+    private const string NAME = "azure_file_share";
 
     /// <summary>
     /// Add a health check for Azure Files by registering <see cref="AzureFileShareHealthCheck"/> for given <paramref name="builder"/>.
@@ -23,7 +23,7 @@ public static class AzureFileShareStorageHealthChecksBuilderExtensions
     /// An optional factory to obtain <see cref="AzureFileShareHealthCheckOptions"/> used by the health check.
     /// When not provided, defaults are used.
     /// </param>
-    /// <param name="healthCheckName">The health check name. Optional. If <c>null</c> the name 'azure_file_share' will be used.</param>
+    /// <param name="name">The health check name. Optional. If <c>null</c> the name 'azure_file_share' will be used.</param>
     /// <param name="failureStatus">
     /// The <see cref="HealthStatus"/> that should be reported when the health check fails. Optional. If <c>null</c> then
     /// the default status of <see cref="HealthStatus.Unhealthy"/> will be reported.
@@ -35,13 +35,13 @@ public static IHealthChecksBuilder AddAzureFileShare(
         this IHealthChecksBuilder builder,
         Func<IServiceProvider, ShareServiceClient>? clientFactory = default,
         Func<IServiceProvider, AzureFileShareHealthCheckOptions>? optionsFactory = default,
-        string? healthCheckName = HEALTH_CHECK_NAME,
+        string? name = NAME,
         HealthStatus? failureStatus = default,
         IEnumerable<string>? tags = default,
         TimeSpan? timeout = default)
     {
         return builder.Add(new HealthCheckRegistration(
-           string.IsNullOrEmpty(healthCheckName) ? HEALTH_CHECK_NAME : healthCheckName!,
+           name ?? NAME,
            sp => new AzureFileShareHealthCheck(
                     shareServiceClient: clientFactory?.Invoke(sp) ?? sp.GetRequiredService<ShareServiceClient>(),
                     options: optionsFactory?.Invoke(sp)),
diff --git a/src/HealthChecks.Azure.Storage.Files.Shares/README.md b/src/HealthChecks.Azure.Storage.Files.Shares/README.md
index 771c223304..a47aa50536 100644
--- a/src/HealthChecks.Azure.Storage.Files.Shares/README.md
+++ b/src/HealthChecks.Azure.Storage.Files.Shares/README.md
@@ -20,7 +20,7 @@ You can additionally add the following parameters:
 
 - `clientFactory`: A factory method to provide `ShareServiceClient` instance.
 - `optionsFactory`: A factory method to provide `AzureFileShareHealthCheckOptions` instance. It allows to specify the share name.
-- `healthCheckName`: The health check name. The default is `azure_file_share`.
+- `name`: The health check name. The default is `azure_file_share`.
 - `failureStatus`: The `HealthStatus` that should be reported when the health check fails. Default is `HealthStatus.Unhealthy`.
 - `tags`: A list of tags that can be used to filter sets of health checks.
 - `timeout`: A `System.TimeSpan` representing the timeout of the check.
diff --git a/src/HealthChecks.Azure.Storage.Queues/DependencyInjection/AzureQueueStorageHealthChecksBuilderExtensions.cs b/src/HealthChecks.Azure.Storage.Queues/DependencyInjection/AzureQueueStorageHealthChecksBuilderExtensions.cs
index 76fcf4c417..5bd8615918 100644
--- a/src/HealthChecks.Azure.Storage.Queues/DependencyInjection/AzureQueueStorageHealthChecksBuilderExtensions.cs
+++ b/src/HealthChecks.Azure.Storage.Queues/DependencyInjection/AzureQueueStorageHealthChecksBuilderExtensions.cs
@@ -9,7 +9,7 @@ namespace Microsoft.Extensions.DependencyInjection;
 /// </summary>
 public static class AzureQueueStorageHealthChecksBuilderExtensions
 {
-    private const string HEALTH_CHECK_NAME = "azure_queue_storage";
+    private const string NAME = "azure_queue_storage";
 
     /// <summary>
     /// Add a health check for Azure Queue Storage by registering <see cref="AzureQueueStorageHealthCheck"/> for given <paramref name="builder"/>.
@@ -23,7 +23,7 @@ public static class AzureQueueStorageHealthChecksBuilderExtensions
     /// An optional factory to obtain <see cref="AzureQueueStorageHealthCheckOptions"/> used by the health check.
     /// When not provided, defaults are used.
     /// </param>
-    /// <param name="healthCheckName">The health check name. Optional. If <c>null</c> the name 'azure_queue_storage' will be used.</param>
+    /// <param name="name">The health check name. Optional. If <c>null</c> the name 'azure_queue_storage' will be used.</param>
     /// <param name="failureStatus">
     /// The <see cref="HealthStatus"/> that should be reported when the health check fails. Optional. If <c>null</c> then
     /// the default status of <see cref="HealthStatus.Unhealthy"/> will be reported.
@@ -35,13 +35,13 @@ public static IHealthChecksBuilder AddAzureQueueStorage(
         this IHealthChecksBuilder builder,
         Func<IServiceProvider, QueueServiceClient>? clientFactory = default,
         Func<IServiceProvider, AzureQueueStorageHealthCheckOptions>? optionsFactory = default,
-        string? healthCheckName = HEALTH_CHECK_NAME,
+        string? name = NAME,
         HealthStatus? failureStatus = default,
         IEnumerable<string>? tags = default,
         TimeSpan? timeout = default)
     {
         return builder.Add(new HealthCheckRegistration(
-           string.IsNullOrEmpty(healthCheckName) ? HEALTH_CHECK_NAME : healthCheckName!,
+           name ?? NAME,
            sp => new AzureQueueStorageHealthCheck(
                     queueServiceClient: clientFactory?.Invoke(sp) ?? sp.GetRequiredService<QueueServiceClient>(),
                     options: optionsFactory?.Invoke(sp)),
diff --git a/src/HealthChecks.Azure.Storage.Queues/README.md b/src/HealthChecks.Azure.Storage.Queues/README.md
index 48ecbe1c0b..03926a4e84 100644
--- a/src/HealthChecks.Azure.Storage.Queues/README.md
+++ b/src/HealthChecks.Azure.Storage.Queues/README.md
@@ -20,7 +20,7 @@ You can additionally add the following parameters:
 
 - `clientFactory`: A factory method to provide `QueueServiceClient` instance.
 - `optionsFactory`: A factory method to provide `AzureQueueStorageHealthCheckOptions` instance. It allows to specify the queue name.
-- `healthCheckName`: The health check name. The default is `azure_queue_storage`.
+- `name`: The health check name. The default is `azure_queue_storage`.
 - `failureStatus`: The `HealthStatus` that should be reported when the health check fails. Default is `HealthStatus.Unhealthy`.
 - `tags`: A list of tags that can be used to filter sets of health checks.
 - `timeout`: A `System.TimeSpan` representing the timeout of the check.
diff --git a/src/HealthChecks.CosmosDb/DependencyInjection/CosmosDbHealthCheckBuilderExtensions.cs b/src/HealthChecks.CosmosDb/DependencyInjection/CosmosDbHealthCheckBuilderExtensions.cs
index 6d3ef9d23a..db572c12ab 100644
--- a/src/HealthChecks.CosmosDb/DependencyInjection/CosmosDbHealthCheckBuilderExtensions.cs
+++ b/src/HealthChecks.CosmosDb/DependencyInjection/CosmosDbHealthCheckBuilderExtensions.cs
@@ -9,7 +9,7 @@ namespace Microsoft.Extensions.DependencyInjection;
 /// </summary>
 public static class CosmosDbHealthCheckBuilderExtensions
 {
-    private const string HEALTH_CHECK_NAME = "azure_cosmosdb";
+    private const string NAME = "azure_cosmosdb";
 
     /// <summary>
     /// Add a health check for Azure Cosmos DB by registering <see cref="AzureCosmosDbHealthCheck"/> for given <paramref name="builder"/>.
@@ -23,7 +23,7 @@ public static class CosmosDbHealthCheckBuilderExtensions
     /// An optional factory to obtain <see cref="AzureCosmosDbHealthCheckOptions"/> used by the health check.
     /// When not provided, defaults are used.
     /// </param>
-    /// <param name="healthCheckName">The health check name. Optional. If <c>null</c> the name 'azure_cosmosdb' will be used.</param>
+    /// <param name="name">The health check name. Optional. If <c>null</c> the name 'azure_cosmosdb' will be used.</param>
     /// <param name="failureStatus">
     /// The <see cref="HealthStatus"/> that should be reported when the health check fails. Optional. If <c>null</c> then
     /// the default status of <see cref="HealthStatus.Unhealthy"/> will be reported.
@@ -35,13 +35,13 @@ public static IHealthChecksBuilder AddAzureCosmosDB(
         this IHealthChecksBuilder builder,
         Func<IServiceProvider, CosmosClient>? clientFactory = default,
         Func<IServiceProvider, AzureCosmosDbHealthCheckOptions>? optionsFactory = default,
-        string? healthCheckName = HEALTH_CHECK_NAME,
+        string? name = NAME,
         HealthStatus? failureStatus = default,
         IEnumerable<string>? tags = default,
         TimeSpan? timeout = default)
     {
         return builder.Add(new HealthCheckRegistration(
-           string.IsNullOrEmpty(healthCheckName) ? HEALTH_CHECK_NAME : healthCheckName!,
+           name ?? NAME,
            sp => new AzureCosmosDbHealthCheck(
                     cosmosClient: clientFactory?.Invoke(sp) ?? sp.GetRequiredService<CosmosClient>(),
                     options: optionsFactory?.Invoke(sp)),
diff --git a/src/HealthChecks.CosmosDb/README.md b/src/HealthChecks.CosmosDb/README.md
index af2b7c35fa..28933df28c 100644
--- a/src/HealthChecks.CosmosDb/README.md
+++ b/src/HealthChecks.CosmosDb/README.md
@@ -22,7 +22,7 @@ You can additionally add the following parameters:
 
 - `clientFactory`: A factory method to provide `CosmosClient` instance.
 - `optionsFactory`: A factory method to provide `AzureCosmosDbHealthCheckOptions` instance. It allows to specify the database id and/or container id(s).
-- `healthCheckName`: The health check name. The default is `azure_cosmosdb`.
+- `name`: The health check name. The default is `azure_cosmosdb`.
 - `failureStatus`: The `HealthStatus` that should be reported when the health check fails. Default is `HealthStatus.Unhealthy`.
 - `tags`: A list of tags that can be used to filter sets of health checks.
 - `timeout`: A `System.TimeSpan` representing the timeout of the check.
diff --git a/test/HealthChecks.Azure.Data.Tables.Tests/HealthChecks.Azure.Data.Tables.approved.txt b/test/HealthChecks.Azure.Data.Tables.Tests/HealthChecks.Azure.Data.Tables.approved.txt
index 5c42ac762f..4b1f8a3007 100644
--- a/test/HealthChecks.Azure.Data.Tables.Tests/HealthChecks.Azure.Data.Tables.approved.txt
+++ b/test/HealthChecks.Azure.Data.Tables.Tests/HealthChecks.Azure.Data.Tables.approved.txt
@@ -15,6 +15,6 @@ namespace Microsoft.Extensions.DependencyInjection
 {
     public static class AzureTablesServiceHealthChecksBuilderExtensions
     {
-        public static Microsoft.Extensions.DependencyInjection.IHealthChecksBuilder AddAzureTable(this Microsoft.Extensions.DependencyInjection.IHealthChecksBuilder builder, System.Func<System.IServiceProvider, Azure.Data.Tables.TableServiceClient>? clientFactory = null, System.Func<System.IServiceProvider, HealthChecks.Azure.Data.Tables.AzureTableServiceHealthCheckOptions>? optionsFactory = null, string? healthCheckName = "azure_tables", Microsoft.Extensions.Diagnostics.HealthChecks.HealthStatus? failureStatus = default, System.Collections.Generic.IEnumerable<string>? tags = null, System.TimeSpan? timeout = default) { }
+        public static Microsoft.Extensions.DependencyInjection.IHealthChecksBuilder AddAzureTable(this Microsoft.Extensions.DependencyInjection.IHealthChecksBuilder builder, System.Func<System.IServiceProvider, Azure.Data.Tables.TableServiceClient>? clientFactory = null, System.Func<System.IServiceProvider, HealthChecks.Azure.Data.Tables.AzureTableServiceHealthCheckOptions>? optionsFactory = null, string? name = "azure_tables", Microsoft.Extensions.Diagnostics.HealthChecks.HealthStatus? failureStatus = default, System.Collections.Generic.IEnumerable<string>? tags = null, System.TimeSpan? timeout = default) { }
     }
 }
\ No newline at end of file
diff --git a/test/HealthChecks.Azure.KeyVault.Secrets.Tests/HealthChecks.Azure.KeyVault.Secrets.approved.txt b/test/HealthChecks.Azure.KeyVault.Secrets.Tests/HealthChecks.Azure.KeyVault.Secrets.approved.txt
index a2d55e42eb..1e7a68ba4c 100644
--- a/test/HealthChecks.Azure.KeyVault.Secrets.Tests/HealthChecks.Azure.KeyVault.Secrets.approved.txt
+++ b/test/HealthChecks.Azure.KeyVault.Secrets.Tests/HealthChecks.Azure.KeyVault.Secrets.approved.txt
@@ -1,4 +1,4 @@
-namespace HealthChecks.Azure.KeyVault.Secrets
+namespace HealthChecks.Azure.KeyVault.Secrets
 {
     public sealed class AzureKeyVaultSecretsHealthCheck : Microsoft.Extensions.Diagnostics.HealthChecks.IHealthCheck
     {
@@ -16,6 +16,6 @@ namespace Microsoft.Extensions.DependencyInjection
 {
     public static class AzureKeyVaultHealthChecksBuilderExtensions
     {
-        public static Microsoft.Extensions.DependencyInjection.IHealthChecksBuilder AddAzureKeyVaultSecrets(this Microsoft.Extensions.DependencyInjection.IHealthChecksBuilder builder, System.Func<System.IServiceProvider, Azure.Security.KeyVault.Secrets.SecretClient>? clientFactory = null, System.Func<System.IServiceProvider, HealthChecks.Azure.KeyVault.Secrets.AzureKeyVaultSecretsHealthCheckOptions>? optionsFactory = null, string? healthCheckName = "azure_key_vault_secret", Microsoft.Extensions.Diagnostics.HealthChecks.HealthStatus? failureStatus = default, System.Collections.Generic.IEnumerable<string>? tags = null, System.TimeSpan? timeout = default) { }
+        public static Microsoft.Extensions.DependencyInjection.IHealthChecksBuilder AddAzureKeyVaultSecrets(this Microsoft.Extensions.DependencyInjection.IHealthChecksBuilder builder, System.Func<System.IServiceProvider, Azure.Security.KeyVault.Secrets.SecretClient>? clientFactory = null, System.Func<System.IServiceProvider, HealthChecks.Azure.KeyVault.Secrets.AzureKeyVaultSecretsHealthCheckOptions>? optionsFactory = null, string? name = "azure_key_vault_secret", Microsoft.Extensions.Diagnostics.HealthChecks.HealthStatus? failureStatus = default, System.Collections.Generic.IEnumerable<string>? tags = null, System.TimeSpan? timeout = default) { }
     }
 }
\ No newline at end of file
diff --git a/test/HealthChecks.Azure.Messaging.EventHubs.Tests/HealthChecks.Azure.Messaging.EventHubs.approved.txt b/test/HealthChecks.Azure.Messaging.EventHubs.Tests/HealthChecks.Azure.Messaging.EventHubs.approved.txt
index 6eb8437244..4e2c0c86dd 100644
--- a/test/HealthChecks.Azure.Messaging.EventHubs.Tests/HealthChecks.Azure.Messaging.EventHubs.approved.txt
+++ b/test/HealthChecks.Azure.Messaging.EventHubs.Tests/HealthChecks.Azure.Messaging.EventHubs.approved.txt
@@ -10,6 +10,6 @@ namespace Microsoft.Extensions.DependencyInjection
 {
     public static class AzureEventHubHealthChecksBuilderExtensions
     {
-        public static Microsoft.Extensions.DependencyInjection.IHealthChecksBuilder AddAzureEventHub(this Microsoft.Extensions.DependencyInjection.IHealthChecksBuilder builder, System.Func<System.IServiceProvider, Azure.Messaging.EventHubs.Producer.EventHubProducerClient>? clientFactory = null, string? healthCheckName = "azure_event_hub", Microsoft.Extensions.Diagnostics.HealthChecks.HealthStatus? failureStatus = default, System.Collections.Generic.IEnumerable<string>? tags = null, System.TimeSpan? timeout = default) { }
+        public static Microsoft.Extensions.DependencyInjection.IHealthChecksBuilder AddAzureEventHub(this Microsoft.Extensions.DependencyInjection.IHealthChecksBuilder builder, System.Func<System.IServiceProvider, Azure.Messaging.EventHubs.Producer.EventHubProducerClient>? clientFactory = null, string? name = "azure_event_hub", Microsoft.Extensions.Diagnostics.HealthChecks.HealthStatus? failureStatus = default, System.Collections.Generic.IEnumerable<string>? tags = null, System.TimeSpan? timeout = default) { }
     }
 }
\ No newline at end of file
diff --git a/test/HealthChecks.Azure.Storage.Blobs.Tests/HealthChecks.Azure.Storage.Blobs.approved.txt b/test/HealthChecks.Azure.Storage.Blobs.Tests/HealthChecks.Azure.Storage.Blobs.approved.txt
index 35f55fee35..746740b1aa 100644
--- a/test/HealthChecks.Azure.Storage.Blobs.Tests/HealthChecks.Azure.Storage.Blobs.approved.txt
+++ b/test/HealthChecks.Azure.Storage.Blobs.Tests/HealthChecks.Azure.Storage.Blobs.approved.txt
@@ -15,6 +15,6 @@ namespace Microsoft.Extensions.DependencyInjection
 {
     public static class AzureBlobStorageHealthChecksBuilderExtensions
     {
-        public static Microsoft.Extensions.DependencyInjection.IHealthChecksBuilder AddAzureBlobStorage(this Microsoft.Extensions.DependencyInjection.IHealthChecksBuilder builder, System.Func<System.IServiceProvider, Azure.Storage.Blobs.BlobServiceClient>? clientFactory = null, System.Func<System.IServiceProvider, HealthChecks.Azure.Storage.Blobs.AzureBlobStorageHealthCheckOptions>? optionsFactory = null, string? healthCheckName = "azure_blob_storage", Microsoft.Extensions.Diagnostics.HealthChecks.HealthStatus? failureStatus = default, System.Collections.Generic.IEnumerable<string>? tags = null, System.TimeSpan? timeout = default) { }
+        public static Microsoft.Extensions.DependencyInjection.IHealthChecksBuilder AddAzureBlobStorage(this Microsoft.Extensions.DependencyInjection.IHealthChecksBuilder builder, System.Func<System.IServiceProvider, Azure.Storage.Blobs.BlobServiceClient>? clientFactory = null, System.Func<System.IServiceProvider, HealthChecks.Azure.Storage.Blobs.AzureBlobStorageHealthCheckOptions>? optionsFactory = null, string? name = "azure_blob_storage", Microsoft.Extensions.Diagnostics.HealthChecks.HealthStatus? failureStatus = default, System.Collections.Generic.IEnumerable<string>? tags = null, System.TimeSpan? timeout = default) { }
     }
 }
\ No newline at end of file
diff --git a/test/HealthChecks.Azure.Storage.Files.Shares.Tests/HealthChecks.Azure.Storage.Files.Shares.approved.txt b/test/HealthChecks.Azure.Storage.Files.Shares.Tests/HealthChecks.Azure.Storage.Files.Shares.approved.txt
index 37ad8f1f4a..3496af58aa 100644
--- a/test/HealthChecks.Azure.Storage.Files.Shares.Tests/HealthChecks.Azure.Storage.Files.Shares.approved.txt
+++ b/test/HealthChecks.Azure.Storage.Files.Shares.Tests/HealthChecks.Azure.Storage.Files.Shares.approved.txt
@@ -15,6 +15,6 @@ namespace Microsoft.Extensions.DependencyInjection
 {
     public static class AzureFileShareStorageHealthChecksBuilderExtensions
     {
-        public static Microsoft.Extensions.DependencyInjection.IHealthChecksBuilder AddAzureFileShare(this Microsoft.Extensions.DependencyInjection.IHealthChecksBuilder builder, System.Func<System.IServiceProvider, Azure.Storage.Files.Shares.ShareServiceClient>? clientFactory = null, System.Func<System.IServiceProvider, HealthChecks.Azure.Storage.Files.Shares.AzureFileShareHealthCheckOptions>? optionsFactory = null, string? healthCheckName = "azure_file_share", Microsoft.Extensions.Diagnostics.HealthChecks.HealthStatus? failureStatus = default, System.Collections.Generic.IEnumerable<string>? tags = null, System.TimeSpan? timeout = default) { }
+        public static Microsoft.Extensions.DependencyInjection.IHealthChecksBuilder AddAzureFileShare(this Microsoft.Extensions.DependencyInjection.IHealthChecksBuilder builder, System.Func<System.IServiceProvider, Azure.Storage.Files.Shares.ShareServiceClient>? clientFactory = null, System.Func<System.IServiceProvider, HealthChecks.Azure.Storage.Files.Shares.AzureFileShareHealthCheckOptions>? optionsFactory = null, string? name = "azure_file_share", Microsoft.Extensions.Diagnostics.HealthChecks.HealthStatus? failureStatus = default, System.Collections.Generic.IEnumerable<string>? tags = null, System.TimeSpan? timeout = default) { }
     }
 }
\ No newline at end of file
diff --git a/test/HealthChecks.Azure.Storage.Queues.Tests/HealthChecks.Azure.Storage.Queues.approved.txt b/test/HealthChecks.Azure.Storage.Queues.Tests/HealthChecks.Azure.Storage.Queues.approved.txt
index 3cdad33a89..50350afce6 100644
--- a/test/HealthChecks.Azure.Storage.Queues.Tests/HealthChecks.Azure.Storage.Queues.approved.txt
+++ b/test/HealthChecks.Azure.Storage.Queues.Tests/HealthChecks.Azure.Storage.Queues.approved.txt
@@ -15,6 +15,6 @@ namespace Microsoft.Extensions.DependencyInjection
 {
     public static class AzureQueueStorageHealthChecksBuilderExtensions
     {
-        public static Microsoft.Extensions.DependencyInjection.IHealthChecksBuilder AddAzureQueueStorage(this Microsoft.Extensions.DependencyInjection.IHealthChecksBuilder builder, System.Func<System.IServiceProvider, Azure.Storage.Queues.QueueServiceClient>? clientFactory = null, System.Func<System.IServiceProvider, HealthChecks.Azure.Storage.Queues.AzureQueueStorageHealthCheckOptions>? optionsFactory = null, string? healthCheckName = "azure_queue_storage", Microsoft.Extensions.Diagnostics.HealthChecks.HealthStatus? failureStatus = default, System.Collections.Generic.IEnumerable<string>? tags = null, System.TimeSpan? timeout = default) { }
+        public static Microsoft.Extensions.DependencyInjection.IHealthChecksBuilder AddAzureQueueStorage(this Microsoft.Extensions.DependencyInjection.IHealthChecksBuilder builder, System.Func<System.IServiceProvider, Azure.Storage.Queues.QueueServiceClient>? clientFactory = null, System.Func<System.IServiceProvider, HealthChecks.Azure.Storage.Queues.AzureQueueStorageHealthCheckOptions>? optionsFactory = null, string? name = "azure_queue_storage", Microsoft.Extensions.Diagnostics.HealthChecks.HealthStatus? failureStatus = default, System.Collections.Generic.IEnumerable<string>? tags = null, System.TimeSpan? timeout = default) { }
     }
 }
\ No newline at end of file
diff --git a/test/HealthChecks.CosmosDb.Tests/HealthChecks.CosmosDb.approved.txt b/test/HealthChecks.CosmosDb.Tests/HealthChecks.CosmosDb.approved.txt
index a2e98ea3ce..5734c35a2b 100644
--- a/test/HealthChecks.CosmosDb.Tests/HealthChecks.CosmosDb.approved.txt
+++ b/test/HealthChecks.CosmosDb.Tests/HealthChecks.CosmosDb.approved.txt
@@ -16,6 +16,6 @@ namespace Microsoft.Extensions.DependencyInjection
 {
     public static class CosmosDbHealthCheckBuilderExtensions
     {
-        public static Microsoft.Extensions.DependencyInjection.IHealthChecksBuilder AddAzureCosmosDB(this Microsoft.Extensions.DependencyInjection.IHealthChecksBuilder builder, System.Func<System.IServiceProvider, Microsoft.Azure.Cosmos.CosmosClient>? clientFactory = null, System.Func<System.IServiceProvider, HealthChecks.CosmosDb.AzureCosmosDbHealthCheckOptions>? optionsFactory = null, string? healthCheckName = "azure_cosmosdb", Microsoft.Extensions.Diagnostics.HealthChecks.HealthStatus? failureStatus = default, System.Collections.Generic.IEnumerable<string>? tags = null, System.TimeSpan? timeout = default) { }
+        public static Microsoft.Extensions.DependencyInjection.IHealthChecksBuilder AddAzureCosmosDB(this Microsoft.Extensions.DependencyInjection.IHealthChecksBuilder builder, System.Func<System.IServiceProvider, Microsoft.Azure.Cosmos.CosmosClient>? clientFactory = null, System.Func<System.IServiceProvider, HealthChecks.CosmosDb.AzureCosmosDbHealthCheckOptions>? optionsFactory = null, string? name = "azure_cosmosdb", Microsoft.Extensions.Diagnostics.HealthChecks.HealthStatus? failureStatus = default, System.Collections.Generic.IEnumerable<string>? tags = null, System.TimeSpan? timeout = default) { }
     }
 }
\ No newline at end of file