diff --git a/templates/src/core/lib/surface/version.cc.template b/templates/src/core/lib/surface/version.cc.template
index d2efa565e5a..d9fa4479db3 100644
--- a/templates/src/core/lib/surface/version.cc.template
+++ b/templates/src/core/lib/surface/version.cc.template
@@ -23,6 +23,6 @@
 
   #include <grpc/grpc.h>
 
-  const char *grpc_version_string(void) { return "${settings.core_version}"; }
+  const char* grpc_version_string(void) { return "${settings.core_version}"; }
 
-  const char *grpc_g_stands_for(void) { return "${settings.g_stands_for}"; }
+  const char* grpc_g_stands_for(void) { return "${settings.g_stands_for}"; }
diff --git a/templates/src/cpp/common/version_cc.cc.template b/templates/src/cpp/common/version_cc.cc.template
index d2e19fe2646..98828787270 100644
--- a/templates/src/cpp/common/version_cc.cc.template
+++ b/templates/src/cpp/common/version_cc.cc.template
@@ -25,4 +25,4 @@
 
   namespace grpc {
   grpc::string Version() { return "${settings.cpp_version}"; }
-  }
+  }  // namespace grpc