diff --git a/BUILD b/BUILD
index 3b4f1c0c99b..0e805ab6ca8 100644
--- a/BUILD
+++ b/BUILD
@@ -1243,7 +1243,7 @@ grpc_cc_library(
         "gpr",
         "grpc++_base_unsecure",
         "grpc++_codegen_proto",
-        "grpc_core_credentials",
+        "grpc_core_credentials_header",
         "grpc_public_hdrs",
         "grpc_security_base",
         "grpc_unsecure",
@@ -2266,7 +2266,7 @@ grpc_cc_library(
         "exec_ctx",
         "gpr",
         "grpc_base",
-        "grpc_core_credentials",
+        "grpc_core_credentials_header",
         "grpc_public_hdrs",
         "grpc_trace",
         "handshaker",
@@ -2330,7 +2330,7 @@ grpc_cc_library(
 
 # TODO(hork): split credentials types into their own source files and targets.
 grpc_cc_library(
-    name = "grpc_core_credentials",
+    name = "grpc_core_credentials_header",
     hdrs = ["include/grpc/credentials.h"],
     language = "c++",
     visibility = ["@grpc:core_credentials"],
@@ -2363,7 +2363,7 @@ grpc_cc_library(
     deps = [
         "alts_upb",
         "gpr",
-        "grpc_core_credentials",
+        "grpc_core_credentials_header",
         "grpc_public_hdrs",
     ],
 )
@@ -2437,7 +2437,7 @@ grpc_cc_library(
         "grpc",
         "grpc++_codegen_proto",
         "grpc_base",
-        "grpc_core_credentials",
+        "grpc_core_credentials_header",
         "grpc_credentials_util",
         "grpc_health_upb",
         "grpc_public_hdrs",
@@ -2519,7 +2519,7 @@ grpc_cc_library(
         "exec_ctx",
         "gpr",
         "grpc_base",
-        "grpc_core_credentials",
+        "grpc_core_credentials_header",
         "grpc_health_upb",
         "grpc_public_hdrs",
         "grpc_security_base",
@@ -3869,7 +3869,7 @@ grpc_cc_library(
         "exec_ctx",
         "gpr",
         "grpc_base",
-        "grpc_core_credentials",
+        "grpc_core_credentials_header",
         "grpc_public_hdrs",
         "grpc_security_base",
         "handshaker",
@@ -3939,7 +3939,7 @@ grpc_cc_library(
         "exec_ctx",
         "gpr",
         "grpc_base",
-        "grpc_core_credentials",
+        "grpc_core_credentials_header",
         "grpc_credentials_util",
         "grpc_security_base",
         "grpc_trace",
@@ -4028,7 +4028,7 @@ grpc_cc_library(
         "exec_ctx",
         "gpr",
         "grpc_base",
-        "grpc_core_credentials",
+        "grpc_core_credentials_header",
         "grpc_security_base",
         "tsi_alts_frame_protector",
         "tsi_base",
@@ -4146,7 +4146,7 @@ grpc_cc_library(
         "config_vars",
         "gpr",
         "grpc_base",
-        "grpc_core_credentials",
+        "grpc_core_credentials_header",
         "grpc_credentials_util",
         "grpc_public_hdrs",
         "grpc_security_base",
diff --git a/src/core/BUILD b/src/core/BUILD
index 5b0f4d9a17b..4c7caa2410d 100644
--- a/src/core/BUILD
+++ b/src/core/BUILD
@@ -3806,7 +3806,7 @@ grpc_cc_library(
         "//:exec_ctx",
         "//:gpr",
         "//:grpc_base",
-        "//:grpc_core_credentials",
+        "//:grpc_core_credentials_header",
         "//:grpc_security_base",
         "//:handshaker",
         "//:iomgr",
@@ -3845,7 +3845,7 @@ grpc_cc_library(
         "//:exec_ctx",
         "//:gpr",
         "//:grpc_base",
-        "//:grpc_core_credentials",
+        "//:grpc_core_credentials_header",
         "//:grpc_security_base",
         "//:handshaker",
         "//:iomgr",
@@ -3905,7 +3905,7 @@ grpc_cc_library(
         "//:gpr",
         "//:grpc_base",
         "//:grpc_client_channel",
-        "//:grpc_core_credentials",
+        "//:grpc_core_credentials_header",
         "//:grpc_security_base",
         "//:handshaker",
         "//:iomgr",
@@ -3949,7 +3949,7 @@ grpc_cc_library(
         "//:exec_ctx",
         "//:gpr",
         "//:grpc_base",
-        "//:grpc_core_credentials",
+        "//:grpc_core_credentials_header",
         "//:grpc_security_base",
         "//:grpc_trace",
         "//:handshaker",
@@ -4006,7 +4006,7 @@ grpc_cc_library(
         "//:gpr",
         "//:grpc_alts_credentials",
         "//:grpc_base",
-        "//:grpc_core_credentials",
+        "//:grpc_core_credentials_header",
         "//:grpc_jwt_credentials",
         "//:grpc_public_hdrs",
         "//:grpc_security_base",
@@ -4081,7 +4081,7 @@ grpc_cc_library(
         "//:exec_ctx",
         "//:gpr",
         "//:grpc_base",
-        "//:grpc_core_credentials",
+        "//:grpc_core_credentials_header",
         "//:grpc_credentials_util",
         "//:grpc_public_hdrs",
         "//:grpc_security_base",
@@ -4121,7 +4121,7 @@ grpc_cc_library(
         "//:exec_ctx",
         "//:gpr",
         "//:grpc_base",
-        "//:grpc_core_credentials",
+        "//:grpc_core_credentials_header",
         "//:grpc_security_base",
         "//:grpc_trace",
         "//:promise",
@@ -4169,7 +4169,7 @@ grpc_cc_library(
         "//:api_trace",
         "//:gpr",
         "//:grpc_base",
-        "//:grpc_core_credentials",
+        "//:grpc_core_credentials_header",
         "//:grpc_credentials_util",
         "//:grpc_security_base",
         "//:grpc_trace",
@@ -4225,7 +4225,7 @@ grpc_cc_library(
         "time",
         "//:gpr",
         "//:grpc_base",
-        "//:grpc_core_credentials",
+        "//:grpc_core_credentials_header",
         "//:grpc_credentials_util",
         "//:grpc_security_base",
         "//:httpcli",
@@ -4262,7 +4262,7 @@ grpc_cc_library(
         "//:exec_ctx",
         "//:gpr",
         "//:grpc_base",
-        "//:grpc_core_credentials",
+        "//:grpc_core_credentials_header",
         "//:grpc_security_base",
         "//:handshaker",
         "//:iomgr",
@@ -5151,7 +5151,7 @@ grpc_cc_library(
         "//:gpr",
         "//:grpc_base",
         "//:grpc_client_channel",
-        "//:grpc_core_credentials",
+        "//:grpc_core_credentials_header",
         "//:grpc_credentials_util",
         "//:grpc_public_hdrs",
         "//:grpc_security_base",
@@ -5231,7 +5231,7 @@ grpc_cc_library(
         "//:exec_ctx",
         "//:gpr",
         "//:grpc_base",
-        "//:grpc_core_credentials",
+        "//:grpc_core_credentials_header",
         "//:grpc_public_hdrs",
         "//:grpc_security_base",
         "//:grpc_service_config_impl",
@@ -5266,7 +5266,7 @@ grpc_cc_library(
         "//:config",
         "//:gpr",
         "//:gpr_platform",
-        "//:grpc_core_credentials",
+        "//:grpc_core_credentials_header",
         "//:grpc_security_base",
         "//:ref_counted_ptr",
     ],
@@ -6974,7 +6974,7 @@ grpc_cc_library(
         "//:gpr",
         "//:gpr_platform",
         "//:grpc_base",
-        "//:grpc_core_credentials",
+        "//:grpc_core_credentials_header",
         "//:grpc_security_base",
         "//:grpc_trace",
         "//:httpcli",