diff --git a/include/grpcpp/server_builder_impl.h b/include/grpcpp/server_builder_impl.h
index 939c848a794..0de72cc397c 100644
--- a/include/grpcpp/server_builder_impl.h
+++ b/include/grpcpp/server_builder_impl.h
@@ -272,7 +272,7 @@ class ServerBuilder {
         grpc::experimental::CallbackGenericService* service);
 
     enum class ExternalConnectionType {
-      CONNECTION_FROM_FD = 0  // in the form of a file descriptor
+      FROM_FD = 0  // in the form of a file descriptor
     };
 
     /// Register an acceptor to handle the externally accepted connection in
diff --git a/src/cpp/server/external_connection_acceptor_impl.cc b/src/cpp/server/external_connection_acceptor_impl.cc
index 39048be4aab..afc90679398 100644
--- a/src/cpp/server/external_connection_acceptor_impl.cc
+++ b/src/cpp/server/external_connection_acceptor_impl.cc
@@ -46,8 +46,8 @@ ExternalConnectionAcceptorImpl::ExternalConnectionAcceptorImpl(
     ServerBuilder::experimental_type::ExternalConnectionType type,
     std::shared_ptr<ServerCredentials> creds)
     : name_(name), creds_(std::move(creds)) {
-  GPR_ASSERT(type == ServerBuilder::experimental_type::ExternalConnectionType::
-                         CONNECTION_FROM_FD);
+  GPR_ASSERT(type ==
+             ServerBuilder::experimental_type::ExternalConnectionType::FROM_FD);
 }
 
 std::unique_ptr<experimental::ExternalConnectionAcceptor>
diff --git a/test/cpp/end2end/port_sharing_end2end_test.cc b/test/cpp/end2end/port_sharing_end2end_test.cc
index 597ba3e4f29..a2b9417d172 100644
--- a/test/cpp/end2end/port_sharing_end2end_test.cc
+++ b/test/cpp/end2end/port_sharing_end2end_test.cc
@@ -223,13 +223,11 @@ class PortSharingEnd2endTest : public ::testing::TestWithParam<TestScenario> {
     auto server_creds = GetCredentialsProvider()->GetServerCredentials(
         GetParam().credentials_type);
     auto acceptor1 = builder.experimental().AddExternalConnectionAcceptor(
-        ServerBuilder::experimental_type::ExternalConnectionType::
-            CONNECTION_FROM_FD,
+        ServerBuilder::experimental_type::ExternalConnectionType::FROM_FD,
         server_creds);
     tcp_server1_.SetAcceptor(std::move(acceptor1));
     auto acceptor2 = builder.experimental().AddExternalConnectionAcceptor(
-        ServerBuilder::experimental_type::ExternalConnectionType::
-            CONNECTION_FROM_FD,
+        ServerBuilder::experimental_type::ExternalConnectionType::FROM_FD,
         server_creds);
     tcp_server2_.SetAcceptor(std::move(acceptor2));
     builder.RegisterService(&service_);