diff --git a/BUILD.gn b/BUILD.gn
index 7d811a692af..d4a5fda2d56 100644
--- a/BUILD.gn
+++ b/BUILD.gn
@@ -793,8 +793,8 @@ config("grpc_config") {
         "src/core/lib/security/credentials/credentials_metadata.cc",
         "src/core/lib/security/credentials/fake/fake_credentials.cc",
         "src/core/lib/security/credentials/fake/fake_credentials.h",
+        "src/core/lib/security/credentials/google_default/compute_engine_channel_credentials.cc",
         "src/core/lib/security/credentials/google_default/credentials_generic.cc",
-        "src/core/lib/security/credentials/google_default/gce_channel_credentials.cc",
         "src/core/lib/security/credentials/google_default/google_default_credentials.cc",
         "src/core/lib/security/credentials/google_default/google_default_credentials.h",
         "src/core/lib/security/credentials/iam/iam_credentials.cc",
diff --git a/CMakeLists.txt b/CMakeLists.txt
index b91b9883a72..ac4bb93a6df 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1639,8 +1639,8 @@ add_library(grpc
   src/core/lib/security/credentials/credentials.cc
   src/core/lib/security/credentials/credentials_metadata.cc
   src/core/lib/security/credentials/fake/fake_credentials.cc
+  src/core/lib/security/credentials/google_default/compute_engine_channel_credentials.cc
   src/core/lib/security/credentials/google_default/credentials_generic.cc
-  src/core/lib/security/credentials/google_default/gce_channel_credentials.cc
   src/core/lib/security/credentials/google_default/google_default_credentials.cc
   src/core/lib/security/credentials/iam/iam_credentials.cc
   src/core/lib/security/credentials/jwt/json_token.cc
diff --git a/Makefile b/Makefile
index e0ce6675fda..575b676f834 100644
--- a/Makefile
+++ b/Makefile
@@ -3941,8 +3941,8 @@ LIBGRPC_SRC = \
     src/core/lib/security/credentials/credentials.cc \
     src/core/lib/security/credentials/credentials_metadata.cc \
     src/core/lib/security/credentials/fake/fake_credentials.cc \
+    src/core/lib/security/credentials/google_default/compute_engine_channel_credentials.cc \
     src/core/lib/security/credentials/google_default/credentials_generic.cc \
-    src/core/lib/security/credentials/google_default/gce_channel_credentials.cc \
     src/core/lib/security/credentials/google_default/google_default_credentials.cc \
     src/core/lib/security/credentials/iam/iam_credentials.cc \
     src/core/lib/security/credentials/jwt/json_token.cc \
@@ -20033,8 +20033,8 @@ src/core/lib/security/credentials/composite/composite_credentials.cc: $(OPENSSL_
 src/core/lib/security/credentials/credentials.cc: $(OPENSSL_DEP)
 src/core/lib/security/credentials/credentials_metadata.cc: $(OPENSSL_DEP)
 src/core/lib/security/credentials/fake/fake_credentials.cc: $(OPENSSL_DEP)
+src/core/lib/security/credentials/google_default/compute_engine_channel_credentials.cc: $(OPENSSL_DEP)
 src/core/lib/security/credentials/google_default/credentials_generic.cc: $(OPENSSL_DEP)
-src/core/lib/security/credentials/google_default/gce_channel_credentials.cc: $(OPENSSL_DEP)
 src/core/lib/security/credentials/google_default/google_default_credentials.cc: $(OPENSSL_DEP)
 src/core/lib/security/credentials/iam/iam_credentials.cc: $(OPENSSL_DEP)
 src/core/lib/security/credentials/jwt/json_token.cc: $(OPENSSL_DEP)
diff --git a/build_autogenerated.yaml b/build_autogenerated.yaml
index 4ba94d0b12e..079aed25c11 100644
--- a/build_autogenerated.yaml
+++ b/build_autogenerated.yaml
@@ -1057,8 +1057,8 @@ libs:
   - src/core/lib/security/credentials/credentials.cc
   - src/core/lib/security/credentials/credentials_metadata.cc
   - src/core/lib/security/credentials/fake/fake_credentials.cc
+  - src/core/lib/security/credentials/google_default/compute_engine_channel_credentials.cc
   - src/core/lib/security/credentials/google_default/credentials_generic.cc
-  - src/core/lib/security/credentials/google_default/gce_channel_credentials.cc
   - src/core/lib/security/credentials/google_default/google_default_credentials.cc
   - src/core/lib/security/credentials/iam/iam_credentials.cc
   - src/core/lib/security/credentials/jwt/json_token.cc
diff --git a/config.m4 b/config.m4
index 25489f9fb62..e1e39b23453 100644
--- a/config.m4
+++ b/config.m4
@@ -397,8 +397,8 @@ if test "$PHP_GRPC" != "no"; then
     src/core/lib/security/credentials/credentials.cc \
     src/core/lib/security/credentials/credentials_metadata.cc \
     src/core/lib/security/credentials/fake/fake_credentials.cc \
+    src/core/lib/security/credentials/google_default/compute_engine_channel_credentials.cc \
     src/core/lib/security/credentials/google_default/credentials_generic.cc \
-    src/core/lib/security/credentials/google_default/gce_channel_credentials.cc \
     src/core/lib/security/credentials/google_default/google_default_credentials.cc \
     src/core/lib/security/credentials/iam/iam_credentials.cc \
     src/core/lib/security/credentials/jwt/json_token.cc \
diff --git a/config.w32 b/config.w32
index 5e7ba8c252a..e6c10e3d46d 100644
--- a/config.w32
+++ b/config.w32
@@ -366,8 +366,8 @@ if (PHP_GRPC != "no") {
     "src\\core\\lib\\security\\credentials\\credentials.cc " +
     "src\\core\\lib\\security\\credentials\\credentials_metadata.cc " +
     "src\\core\\lib\\security\\credentials\\fake\\fake_credentials.cc " +
+    "src\\core\\lib\\security\\credentials\\google_default\\compute_engine_channel_credentials.cc " +
     "src\\core\\lib\\security\\credentials\\google_default\\credentials_generic.cc " +
-    "src\\core\\lib\\security\\credentials\\google_default\\gce_channel_credentials.cc " +
     "src\\core\\lib\\security\\credentials\\google_default\\google_default_credentials.cc " +
     "src\\core\\lib\\security\\credentials\\iam\\iam_credentials.cc " +
     "src\\core\\lib\\security\\credentials\\jwt\\json_token.cc " +
diff --git a/gRPC-Core.podspec b/gRPC-Core.podspec
index 393072c6fc6..d33bbe6d040 100644
--- a/gRPC-Core.podspec
+++ b/gRPC-Core.podspec
@@ -846,8 +846,8 @@ Pod::Spec.new do |s|
                       'src/core/lib/security/credentials/credentials_metadata.cc',
                       'src/core/lib/security/credentials/fake/fake_credentials.cc',
                       'src/core/lib/security/credentials/fake/fake_credentials.h',
+                      'src/core/lib/security/credentials/google_default/compute_engine_channel_credentials.cc',
                       'src/core/lib/security/credentials/google_default/credentials_generic.cc',
-                      'src/core/lib/security/credentials/google_default/gce_channel_credentials.cc',
                       'src/core/lib/security/credentials/google_default/google_default_credentials.cc',
                       'src/core/lib/security/credentials/google_default/google_default_credentials.h',
                       'src/core/lib/security/credentials/iam/iam_credentials.cc',
diff --git a/grpc.def b/grpc.def
index c45eb9c29d9..797c1ae6ec3 100644
--- a/grpc.def
+++ b/grpc.def
@@ -106,7 +106,7 @@ EXPORTS
     grpc_composite_channel_credentials_create
     grpc_composite_call_credentials_create
     grpc_google_compute_engine_credentials_create
-    grpc_gce_channel_credentials_create
+    grpc_compute_engine_channel_credentials_create
     grpc_max_auth_token_lifetime
     grpc_service_account_jwt_access_credentials_create
     grpc_google_refresh_token_credentials_create
diff --git a/grpc.gemspec b/grpc.gemspec
index 68160c44093..c2681db3e87 100644
--- a/grpc.gemspec
+++ b/grpc.gemspec
@@ -768,8 +768,8 @@ Gem::Specification.new do |s|
   s.files += %w( src/core/lib/security/credentials/credentials_metadata.cc )
   s.files += %w( src/core/lib/security/credentials/fake/fake_credentials.cc )
   s.files += %w( src/core/lib/security/credentials/fake/fake_credentials.h )
+  s.files += %w( src/core/lib/security/credentials/google_default/compute_engine_channel_credentials.cc )
   s.files += %w( src/core/lib/security/credentials/google_default/credentials_generic.cc )
-  s.files += %w( src/core/lib/security/credentials/google_default/gce_channel_credentials.cc )
   s.files += %w( src/core/lib/security/credentials/google_default/google_default_credentials.cc )
   s.files += %w( src/core/lib/security/credentials/google_default/google_default_credentials.h )
   s.files += %w( src/core/lib/security/credentials/iam/iam_credentials.cc )
diff --git a/grpc.gyp b/grpc.gyp
index 379dc659e3a..554a6214721 100644
--- a/grpc.gyp
+++ b/grpc.gyp
@@ -751,8 +751,8 @@
         'src/core/lib/security/credentials/credentials.cc',
         'src/core/lib/security/credentials/credentials_metadata.cc',
         'src/core/lib/security/credentials/fake/fake_credentials.cc',
+        'src/core/lib/security/credentials/google_default/compute_engine_channel_credentials.cc',
         'src/core/lib/security/credentials/google_default/credentials_generic.cc',
-        'src/core/lib/security/credentials/google_default/gce_channel_credentials.cc',
         'src/core/lib/security/credentials/google_default/google_default_credentials.cc',
         'src/core/lib/security/credentials/iam/iam_credentials.cc',
         'src/core/lib/security/credentials/jwt/json_token.cc',
diff --git a/package.xml b/package.xml
index da31ccf4bfd..6349909ff74 100644
--- a/package.xml
+++ b/package.xml
@@ -748,8 +748,8 @@
     <file baseinstalldir="/" name="src/core/lib/security/credentials/credentials_metadata.cc" role="src" />
     <file baseinstalldir="/" name="src/core/lib/security/credentials/fake/fake_credentials.cc" role="src" />
     <file baseinstalldir="/" name="src/core/lib/security/credentials/fake/fake_credentials.h" role="src" />
+    <file baseinstalldir="/" name="src/core/lib/security/credentials/google_default/compute_engine_channel_credentials.cc" role="src" />
     <file baseinstalldir="/" name="src/core/lib/security/credentials/google_default/credentials_generic.cc" role="src" />
-    <file baseinstalldir="/" name="src/core/lib/security/credentials/google_default/gce_channel_credentials.cc" role="src" />
     <file baseinstalldir="/" name="src/core/lib/security/credentials/google_default/google_default_credentials.cc" role="src" />
     <file baseinstalldir="/" name="src/core/lib/security/credentials/google_default/google_default_credentials.h" role="src" />
     <file baseinstalldir="/" name="src/core/lib/security/credentials/iam/iam_credentials.cc" role="src" />
diff --git a/src/python/grpcio/grpc_core_dependencies.py b/src/python/grpcio/grpc_core_dependencies.py
index 0fc2efb9485..a39691002d2 100644
--- a/src/python/grpcio/grpc_core_dependencies.py
+++ b/src/python/grpcio/grpc_core_dependencies.py
@@ -375,8 +375,8 @@ CORE_SOURCE_FILES = [
     'src/core/lib/security/credentials/credentials.cc',
     'src/core/lib/security/credentials/credentials_metadata.cc',
     'src/core/lib/security/credentials/fake/fake_credentials.cc',
+    'src/core/lib/security/credentials/google_default/compute_engine_channel_credentials.cc',
     'src/core/lib/security/credentials/google_default/credentials_generic.cc',
-    'src/core/lib/security/credentials/google_default/gce_channel_credentials.cc',
     'src/core/lib/security/credentials/google_default/google_default_credentials.cc',
     'src/core/lib/security/credentials/iam/iam_credentials.cc',
     'src/core/lib/security/credentials/jwt/json_token.cc',
diff --git a/src/ruby/ext/grpc/rb_grpc_imports.generated.c b/src/ruby/ext/grpc/rb_grpc_imports.generated.c
index 151602e3fe4..c88b646d62c 100644
--- a/src/ruby/ext/grpc/rb_grpc_imports.generated.c
+++ b/src/ruby/ext/grpc/rb_grpc_imports.generated.c
@@ -129,7 +129,7 @@ grpc_call_credentials_release_type grpc_call_credentials_release_import;
 grpc_composite_channel_credentials_create_type grpc_composite_channel_credentials_create_import;
 grpc_composite_call_credentials_create_type grpc_composite_call_credentials_create_import;
 grpc_google_compute_engine_credentials_create_type grpc_google_compute_engine_credentials_create_import;
-grpc_gce_channel_credentials_create_type grpc_gce_channel_credentials_create_import;
+grpc_compute_engine_channel_credentials_create_type grpc_compute_engine_channel_credentials_create_import;
 grpc_max_auth_token_lifetime_type grpc_max_auth_token_lifetime_import;
 grpc_service_account_jwt_access_credentials_create_type grpc_service_account_jwt_access_credentials_create_import;
 grpc_google_refresh_token_credentials_create_type grpc_google_refresh_token_credentials_create_import;
@@ -402,7 +402,7 @@ void grpc_rb_load_imports(HMODULE library) {
   grpc_composite_channel_credentials_create_import = (grpc_composite_channel_credentials_create_type) GetProcAddress(library, "grpc_composite_channel_credentials_create");
   grpc_composite_call_credentials_create_import = (grpc_composite_call_credentials_create_type) GetProcAddress(library, "grpc_composite_call_credentials_create");
   grpc_google_compute_engine_credentials_create_import = (grpc_google_compute_engine_credentials_create_type) GetProcAddress(library, "grpc_google_compute_engine_credentials_create");
-  grpc_gce_channel_credentials_create_import = (grpc_gce_channel_credentials_create_type) GetProcAddress(library, "grpc_gce_channel_credentials_create");
+  grpc_compute_engine_channel_credentials_create_import = (grpc_compute_engine_channel_credentials_create_type) GetProcAddress(library, "grpc_compute_engine_channel_credentials_create");
   grpc_max_auth_token_lifetime_import = (grpc_max_auth_token_lifetime_type) GetProcAddress(library, "grpc_max_auth_token_lifetime");
   grpc_service_account_jwt_access_credentials_create_import = (grpc_service_account_jwt_access_credentials_create_type) GetProcAddress(library, "grpc_service_account_jwt_access_credentials_create");
   grpc_google_refresh_token_credentials_create_import = (grpc_google_refresh_token_credentials_create_type) GetProcAddress(library, "grpc_google_refresh_token_credentials_create");
diff --git a/src/ruby/ext/grpc/rb_grpc_imports.generated.h b/src/ruby/ext/grpc/rb_grpc_imports.generated.h
index 3b72491e601..bcf6c6001f1 100644
--- a/src/ruby/ext/grpc/rb_grpc_imports.generated.h
+++ b/src/ruby/ext/grpc/rb_grpc_imports.generated.h
@@ -362,9 +362,9 @@ extern grpc_composite_call_credentials_create_type grpc_composite_call_credentia
 typedef grpc_call_credentials*(*grpc_google_compute_engine_credentials_create_type)(void* reserved);
 extern grpc_google_compute_engine_credentials_create_type grpc_google_compute_engine_credentials_create_import;
 #define grpc_google_compute_engine_credentials_create grpc_google_compute_engine_credentials_create_import
-typedef grpc_channel_credentials*(*grpc_gce_channel_credentials_create_type)(grpc_call_credentials* call_credentials, void* reserved);
-extern grpc_gce_channel_credentials_create_type grpc_gce_channel_credentials_create_import;
-#define grpc_gce_channel_credentials_create grpc_gce_channel_credentials_create_import
+typedef grpc_channel_credentials*(*grpc_compute_engine_channel_credentials_create_type)(void* reserved);
+extern grpc_compute_engine_channel_credentials_create_type grpc_compute_engine_channel_credentials_create_import;
+#define grpc_compute_engine_channel_credentials_create grpc_compute_engine_channel_credentials_create_import
 typedef gpr_timespec(*grpc_max_auth_token_lifetime_type)(void);
 extern grpc_max_auth_token_lifetime_type grpc_max_auth_token_lifetime_import;
 #define grpc_max_auth_token_lifetime grpc_max_auth_token_lifetime_import
diff --git a/test/core/surface/public_headers_must_be_c89.c b/test/core/surface/public_headers_must_be_c89.c
index ff7a47f5dfa..b4e1166bd01 100644
--- a/test/core/surface/public_headers_must_be_c89.c
+++ b/test/core/surface/public_headers_must_be_c89.c
@@ -173,7 +173,7 @@ int main(int argc, char **argv) {
   printf("%lx", (unsigned long) grpc_composite_channel_credentials_create);
   printf("%lx", (unsigned long) grpc_composite_call_credentials_create);
   printf("%lx", (unsigned long) grpc_google_compute_engine_credentials_create);
-  printf("%lx", (unsigned long) grpc_gce_channel_credentials_create);
+  printf("%lx", (unsigned long) grpc_compute_engine_channel_credentials_create);
   printf("%lx", (unsigned long) grpc_max_auth_token_lifetime);
   printf("%lx", (unsigned long) grpc_service_account_jwt_access_credentials_create);
   printf("%lx", (unsigned long) grpc_google_refresh_token_credentials_create);
diff --git a/tools/doxygen/Doxyfile.c++.internal b/tools/doxygen/Doxyfile.c++.internal
index 89b2a437379..9a6df168bc0 100644
--- a/tools/doxygen/Doxyfile.c++.internal
+++ b/tools/doxygen/Doxyfile.c++.internal
@@ -1731,8 +1731,8 @@ src/core/lib/security/credentials/credentials.h \
 src/core/lib/security/credentials/credentials_metadata.cc \
 src/core/lib/security/credentials/fake/fake_credentials.cc \
 src/core/lib/security/credentials/fake/fake_credentials.h \
+src/core/lib/security/credentials/google_default/compute_engine_channel_credentials.cc \
 src/core/lib/security/credentials/google_default/credentials_generic.cc \
-src/core/lib/security/credentials/google_default/gce_channel_credentials.cc \
 src/core/lib/security/credentials/google_default/google_default_credentials.cc \
 src/core/lib/security/credentials/google_default/google_default_credentials.h \
 src/core/lib/security/credentials/iam/iam_credentials.cc \
diff --git a/tools/doxygen/Doxyfile.core.internal b/tools/doxygen/Doxyfile.core.internal
index 8cce3e161d4..a0826adc4ed 100644
--- a/tools/doxygen/Doxyfile.core.internal
+++ b/tools/doxygen/Doxyfile.core.internal
@@ -1543,8 +1543,8 @@ src/core/lib/security/credentials/credentials.h \
 src/core/lib/security/credentials/credentials_metadata.cc \
 src/core/lib/security/credentials/fake/fake_credentials.cc \
 src/core/lib/security/credentials/fake/fake_credentials.h \
+src/core/lib/security/credentials/google_default/compute_engine_channel_credentials.cc \
 src/core/lib/security/credentials/google_default/credentials_generic.cc \
-src/core/lib/security/credentials/google_default/gce_channel_credentials.cc \
 src/core/lib/security/credentials/google_default/google_default_credentials.cc \
 src/core/lib/security/credentials/google_default/google_default_credentials.h \
 src/core/lib/security/credentials/iam/iam_credentials.cc \