diff --git a/src/proto/grpc/testing/messages.proto b/src/proto/grpc/testing/messages.proto
index f59cfc5834465..3e26bdb5f56aa 100644
--- a/src/proto/grpc/testing/messages.proto
+++ b/src/proto/grpc/testing/messages.proto
@@ -219,7 +219,7 @@ message LoadBalancerStatsResponse {
   message RpcMetadata {
     // metadata values for each rpc for the keys specified in
     // LoadBalancerStatsRequest.metadata_keys.
-    // metadata keys and values are returned exactly as was recieved
+    // metadata keys and values are returned exactly as was received
     // from the server.
     repeated MetadataEntry metadata = 1;
   }
diff --git a/src/proto/grpc/testing/test.proto b/src/proto/grpc/testing/test.proto
index 517afd6352487..23a7707191bd7 100644
--- a/src/proto/grpc/testing/test.proto
+++ b/src/proto/grpc/testing/test.proto
@@ -23,6 +23,8 @@ import "src/proto/grpc/testing/messages.proto";
 
 package grpc.testing;
 
+option java_package = "io.grpc.testing.integration";
+
 // A simple service to test the various types of RPCs and experiment with
 // performance with various types of payload.
 service TestService {
diff --git a/test/cpp/interop/pre_stop_hook_server.cc b/test/cpp/interop/pre_stop_hook_server.cc
index 68a5376e78577..cb324da774b2c 100644
--- a/test/cpp/interop/pre_stop_hook_server.cc
+++ b/test/cpp/interop/pre_stop_hook_server.cc
@@ -201,8 +201,8 @@ bool PreStopHookServerManager::ExpectRequests(size_t expected_requests_count,
 }
 
 void PreStopHookServerManager::PreStopHookServerDeleter::operator()(
-    PreStopHookServer* holder) {
-  delete holder;
+    PreStopHookServer* server) {
+  delete server;
 }
 
 }  // namespace testing