diff --git a/extensions/include/grpc++/impl/proto_server_reflection_plugin.h b/extensions/include/grpc++/impl/proto_server_reflection_plugin.h
index df0abb2b16f69b027aef2f069a97d3303dbdd9c6..5bf1ff1bfccd21b6813d7c1c9636bc3c5d9023ac 100644
--- a/extensions/include/grpc++/impl/proto_server_reflection_plugin.h
+++ b/extensions/include/grpc++/impl/proto_server_reflection_plugin.h
@@ -34,8 +34,6 @@
 #ifndef GRPCXX_PROTO_SERVER_REFLECTION_PLUGIN_H
 #define GRPCXX_PROTO_SERVER_REFLECTION_PLUGIN_H
 
-#include <memory>
-
 #include <grpc++/impl/server_builder_plugin.h>
 #include <grpc++/support/config.h>
 
@@ -58,7 +56,7 @@ class ProtoServerReflectionPlugin : public ::grpc::ServerBuilderPlugin {
   bool has_sync_methods() const GRPC_OVERRIDE;
 
  private:
-  std::shared_ptr<::grpc::ProtoServerReflection> reflection_service;
+  std::shared_ptr<::grpc::ProtoServerReflection> reflection_service_;
 };
 
 std::unique_ptr<::grpc::ServerBuilderPlugin> CreateProtoReflection();
@@ -70,7 +68,7 @@ static struct StaticPluginInitializer_reflection {
   StaticPluginInitializer_reflection() {
     grpc_AddServerBuilderPlugin_reflection();
   }
-} static_plugin_initializer_reflection_;
+} static_plugin_initializer_reflection;
 
 }  // namespace reflection
 }  // namespace grpc
diff --git a/extensions/reflection/proto_server_reflection.cc b/extensions/reflection/proto_server_reflection.cc
index e41c67cdbcfb8e2c36ebf219b8cd652b3a70040a..f3cf7958e84bc4f8c498dd02c27d71b89a2c9752 100644
--- a/extensions/reflection/proto_server_reflection.cc
+++ b/extensions/reflection/proto_server_reflection.cc
@@ -31,9 +31,6 @@
  *
  */
 
-#include <iostream>
-#include <memory>
-#include <string>
 #include <unordered_set>
 #include <vector>
 
diff --git a/extensions/reflection/proto_server_reflection.h b/extensions/reflection/proto_server_reflection.h
index f9b98c5fb3aaf6dc6468e6585797242ad8d907f0..71b316816c25241f6130a2e3d905205ef6e90c0b 100644
--- a/extensions/reflection/proto_server_reflection.h
+++ b/extensions/reflection/proto_server_reflection.h
@@ -34,9 +34,6 @@
 #ifndef GRPC_EXTENSIONS_REFLECTION_PROTO_SERVER_REFLECTION_H
 #define GRPC_EXTENSIONS_REFLECTION_PROTO_SERVER_REFLECTION_H
 
-#include <iostream>
-#include <memory>
-#include <string>
 #include <unordered_set>
 #include <vector>
 
diff --git a/extensions/reflection/proto_server_reflection_plugin.cc b/extensions/reflection/proto_server_reflection_plugin.cc
index d038a7fff59eb72d0c57a96f7275abfa53f20299..465a8b9442e25774f65604c83952220477b92472 100644
--- a/extensions/reflection/proto_server_reflection_plugin.cc
+++ b/extensions/reflection/proto_server_reflection_plugin.cc
@@ -42,31 +42,33 @@ namespace grpc {
 namespace reflection {
 
 ProtoServerReflectionPlugin::ProtoServerReflectionPlugin()
-    : reflection_service(new grpc::ProtoServerReflection()) {}
+    : reflection_service_(new grpc::ProtoServerReflection()) {}
 
-grpc::string ProtoServerReflectionPlugin::name() { return "p1"; }
+grpc::string ProtoServerReflectionPlugin::name() {
+  return "proto_server_reflection";
+}
 
 void ProtoServerReflectionPlugin::InitServer(grpc::ServerInitializer* si) {
-  si->RegisterService(reflection_service);
+  si->RegisterService(reflection_service_);
 }
 
 void ProtoServerReflectionPlugin::Finish(grpc::ServerInitializer* si) {
-  reflection_service->SetServiceList(si->GetServiceList());
+  reflection_service_->SetServiceList(si->GetServiceList());
 }
 
 void ProtoServerReflectionPlugin::ChangeArguments(const grpc::string& name,
                                                   void* value) {}
 
 bool ProtoServerReflectionPlugin::has_sync_methods() const {
-  if (reflection_service != nullptr) {
-    return reflection_service->has_synchronous_methods();
+  if (reflection_service_ != nullptr) {
+    return reflection_service_->has_synchronous_methods();
   }
   return false;
 }
 
 bool ProtoServerReflectionPlugin::has_async_methods() const {
-  if (reflection_service != nullptr) {
-    return reflection_service->has_async_methods();
+  if (reflection_service_ != nullptr) {
+    return reflection_service_->has_async_methods();
   }
   return false;
 }
diff --git a/test/cpp/util/proto_reflection_descriptor_database.h b/test/cpp/util/proto_reflection_descriptor_database.h
index bc25fb0f5c70f5c2e70eaa04e486a65872410b7f..c6f7b5f046611d2a0a8e9f49ddc94fffca165573 100644
--- a/test/cpp/util/proto_reflection_descriptor_database.h
+++ b/test/cpp/util/proto_reflection_descriptor_database.h
@@ -31,7 +31,6 @@
  *
  */
 
-#include <memory>
 #include <mutex>
 #include <unordered_map>
 #include <unordered_set>