diff --git a/src/cpp/client/secure_credentials.cc b/src/cpp/client/secure_credentials.cc
index 0eefd0645b4930e36f549f5382a3c5af33fc0513..057a058a3fb24969d5222bbf51109088b350f5b7 100644
--- a/src/cpp/client/secure_credentials.cc
+++ b/src/cpp/client/secure_credentials.cc
@@ -207,7 +207,7 @@ void MetadataCredentialsPluginWrapper::InvokePlugin(
 
 MetadataCredentialsPluginWrapper::MetadataCredentialsPluginWrapper(
     std::unique_ptr<MetadataCredentialsPlugin> plugin)
-    : thread_pool_(CreateThreadPool()), plugin_(std::move(plugin)) {}
+    : thread_pool_(CreateDefaultThreadPool()), plugin_(std::move(plugin)) {}
 
 std::shared_ptr<CallCredentials> MetadataCredentialsFromPlugin(
     std::unique_ptr<MetadataCredentialsPlugin> plugin) {
diff --git a/src/cpp/server/create_default_thread_pool.cc b/src/cpp/server/create_default_thread_pool.cc
index bf76303b45478a5b28e1bef090b0f3260fcf5d73..57faa17f6b969515f070f491fded358cc5d5fc0f 100644
--- a/src/cpp/server/create_default_thread_pool.cc
+++ b/src/cpp/server/create_default_thread_pool.cc
@@ -24,21 +24,17 @@
 
 namespace grpc {
 
-static ThreadPoolInterface* CreateDefaultThreadPool() {
+static ThreadPoolInterface* CreateDefaultThreadPoolImpl() {
   int cores = gpr_cpu_num_cores();
   if (!cores) cores = 4;
   return new DynamicThreadPool(cores);
 }
 
-static CreateThreadPoolFunc g_ctp_impl = CreateDefaultThreadPool;
+static CreateThreadPoolFunc g_ctp_impl = CreateDefaultThreadPoolImpl;
 
-ThreadPoolInterface* CreateThreadPool() {
-  return g_ctp_impl();
-}
+ThreadPoolInterface* CreateDefaultThreadPool() { return g_ctp_impl(); }
 
-void SetCreateThreadPool(CreateThreadPoolFunc func) {
-  g_ctp_impl = func;
-}
+void SetCreateThreadPool(CreateThreadPoolFunc func) { g_ctp_impl = func; }
 
 }  // namespace grpc
 
diff --git a/src/cpp/server/secure_server_credentials.h b/src/cpp/server/secure_server_credentials.h
index 30ee1c7a3667d5c33d789a4c423c50bf7b7ef407..212f0d1df3bfa261333e6e01c13c973b58559488 100644
--- a/src/cpp/server/secure_server_credentials.h
+++ b/src/cpp/server/secure_server_credentials.h
@@ -39,7 +39,7 @@ class AuthMetadataProcessorAyncWrapper final {
 
   AuthMetadataProcessorAyncWrapper(
       const std::shared_ptr<AuthMetadataProcessor>& processor)
-      : thread_pool_(CreateThreadPool()), processor_(processor) {}
+      : thread_pool_(CreateDefaultThreadPool()), processor_(processor) {}
 
  private:
   void InvokeProcessor(grpc_auth_context* context, const grpc_metadata* md,
diff --git a/src/cpp/server/thread_pool_interface.h b/src/cpp/server/thread_pool_interface.h
index 5a1829829681b197f1d732924844fca0021e184a..028842a776f8ac7cec8fcdb6bdda7c24fd01728c 100644
--- a/src/cpp/server/thread_pool_interface.h
+++ b/src/cpp/server/thread_pool_interface.h
@@ -36,7 +36,7 @@ class ThreadPoolInterface {
 typedef ThreadPoolInterface* (*CreateThreadPoolFunc)(void);
 void SetCreateThreadPool(CreateThreadPoolFunc func);
 
-ThreadPoolInterface* CreateThreadPool();
+ThreadPoolInterface* CreateDefaultThreadPool();
 
 }  // namespace grpc