diff --git a/include/grpcpp/create_channel_posix.h b/include/grpcpp/create_channel_posix.h
index 5c11120611a..36b8f6ab8ac 100644
--- a/include/grpcpp/create_channel_posix.h
+++ b/include/grpcpp/create_channel_posix.h
@@ -16,8 +16,8 @@
  *
  */
 
-#ifndef GRPCPP_CREATE_CHANNEL_POSIX_IMPL_H
-#define GRPCPP_CREATE_CHANNEL_POSIX_IMPL_H
+#ifndef GRPCPP_CREATE_CHANNEL_POSIX_H
+#define GRPCPP_CREATE_CHANNEL_POSIX_H
 
 #include <memory>
 
@@ -25,7 +25,7 @@
 #include <grpcpp/channel.h>
 #include <grpcpp/support/channel_arguments.h>
 
-namespace grpc_impl {
+namespace grpc {
 
 #ifdef GPR_SUPPORT_CHANNELS_FROM_FD
 
@@ -65,6 +65,6 @@ CreateCustomInsecureChannelWithInterceptorsFromFd(
 
 #endif  // GPR_SUPPORT_CHANNELS_FROM_FD
 
-}  // namespace grpc_impl
+}  // namespace grpc
 
-#endif  // GRPCPP_CREATE_CHANNEL_POSIX_IMPL_H
+#endif  // GRPCPP_CREATE_CHANNEL_POSIX_H
diff --git a/src/cpp/client/create_channel_posix.cc b/src/cpp/client/create_channel_posix.cc
index d591837e1e7..f4506fb8fc8 100644
--- a/src/cpp/client/create_channel_posix.cc
+++ b/src/cpp/client/create_channel_posix.cc
@@ -33,14 +33,14 @@ namespace grpc {
 
 #ifdef GPR_SUPPORT_CHANNELS_FROM_FD
 
-std::shared_ptr<Channel> CreateInsecureChannelFromFd(
-    const grpc::string& target, int fd) {
+std::shared_ptr<Channel> CreateInsecureChannelFromFd(const grpc::string& target,
+                                                     int fd) {
   grpc::internal::GrpcLibrary init_lib;
   init_lib.init();
   return CreateChannelInternal(
       "", grpc_insecure_channel_create_from_fd(target.c_str(), fd, nullptr),
-      std::vector<std::unique_ptr<
-          experimental::ClientInterceptorFactoryInterface>>());
+      std::vector<
+          std::unique_ptr<experimental::ClientInterceptorFactoryInterface>>());
 }
 
 std::shared_ptr<Channel> CreateCustomInsecureChannelFromFd(
@@ -52,14 +52,13 @@ std::shared_ptr<Channel> CreateCustomInsecureChannelFromFd(
   return CreateChannelInternal(
       "",
       grpc_insecure_channel_create_from_fd(target.c_str(), fd, &channel_args),
-      std::vector<std::unique_ptr<
-          experimental::ClientInterceptorFactoryInterface>>());
+      std::vector<
+          std::unique_ptr<experimental::ClientInterceptorFactoryInterface>>());
 }
 
 namespace experimental {
 
-std::shared_ptr<Channel>
-CreateCustomInsecureChannelWithInterceptorsFromFd(
+std::shared_ptr<Channel> CreateCustomInsecureChannelWithInterceptorsFromFd(
     const grpc::string& target, int fd, const ChannelArguments& args,
     std::vector<
         std::unique_ptr<grpc::experimental::ClientInterceptorFactoryInterface>>
@@ -78,5 +77,4 @@ CreateCustomInsecureChannelWithInterceptorsFromFd(
 
 #endif  // GPR_SUPPORT_CHANNELS_FROM_FD
 
-
 }  // namespace grpc