diff --git a/channelz/internal/protoconv/sockopt_linux.go b/channelz/internal/protoconv/sockopt_linux.go
index 2ae76b565477..5f116412e0ae 100644
--- a/channelz/internal/protoconv/sockopt_linux.go
+++ b/channelz/internal/protoconv/sockopt_linux.go
@@ -22,11 +22,14 @@ import (
 	"time"
 
 	channelzpb "google.golang.org/grpc/channelz/grpc_channelz_v1"
+	"google.golang.org/grpc/grpclog"
 	"google.golang.org/grpc/internal/channelz"
 	"google.golang.org/protobuf/types/known/anypb"
 	"google.golang.org/protobuf/types/known/durationpb"
 )
 
+var logger = grpclog.Component("channelz")
+
 func convertToPbDuration(sec int64, usec int64) *durationpb.Duration {
 	return durationpb.New(time.Duration(sec*1e9 + usec*1e3))
 }
diff --git a/channelz/internal/protoconv/sockopt_nonlinux.go b/channelz/internal/protoconv/sockopt_nonlinux.go
index 2c303047bf3a..cf5d4ee09b2d 100644
--- a/channelz/internal/protoconv/sockopt_nonlinux.go
+++ b/channelz/internal/protoconv/sockopt_nonlinux.go
@@ -26,6 +26,6 @@ import (
 	"google.golang.org/grpc/internal/channelz"
 )
 
-func sockoptToProto(skopts *channelz.SocketOptionData) []*channelzpb.SocketOption {
+func sockoptToProto(_ *channelz.SocketOptionData) []*channelzpb.SocketOption {
 	return nil
 }
diff --git a/channelz/internal/protoconv/util.go b/channelz/internal/protoconv/util.go
index b41afe0cdce0..a4c14ecb9728 100644
--- a/channelz/internal/protoconv/util.go
+++ b/channelz/internal/protoconv/util.go
@@ -20,12 +20,6 @@
 // implementation and the protobuf representation of all the entities.
 package protoconv
 
-import (
-	"google.golang.org/grpc/grpclog"
-)
-
-var logger = grpclog.Component("channelz")
-
 func strFromPointer(s *string) string {
 	if s == nil {
 		return ""
diff --git a/reflection/test/grpc_testing_not_regenerate/dynamic.proto b/reflection/test/grpc_testing_not_regenerate/dynamic.proto
index 5eeba0892336..6d263cae8473 100644
--- a/reflection/test/grpc_testing_not_regenerate/dynamic.proto
+++ b/reflection/test/grpc_testing_not_regenerate/dynamic.proto
@@ -17,7 +17,7 @@
 
 syntax = "proto3";
 
-option go_package = "google.golang.org/grpc/reflection/grpc_testing_not_regenerate";
+option go_package = "google.golang.org/grpc/reflection/test/grpc_testing_not_regenerate";
 
 package grpc.testing;
 
diff --git a/reflection/test/grpc_testing_not_regenerate/testv3.proto b/reflection/test/grpc_testing_not_regenerate/testv3.proto
index 44f93ba8b076..9902ad67964b 100644
--- a/reflection/test/grpc_testing_not_regenerate/testv3.proto
+++ b/reflection/test/grpc_testing_not_regenerate/testv3.proto
@@ -17,7 +17,7 @@
 
 syntax = "proto3";
 
-option go_package = "google.golang.org/grpc/reflection/grpc_testing_not_regenerate";
+option go_package = "google.golang.org/grpc/reflection/test/grpc_testing_not_regenerate";
 
 package grpc.testingv3;
 
diff --git a/regenerate.sh b/regenerate.sh
index b4fe7666c720..bfaf723ebced 100755
--- a/regenerate.sh
+++ b/regenerate.sh
@@ -118,6 +118,6 @@ mv ${WORKDIR}/out/google.golang.org/grpc/lookup/grpc_lookup_v1/* ${WORKDIR}/out/
 
 # grpc_testing_not_regenerate/*.pb.go are not re-generated,
 # see grpc_testing_not_regenerate/README.md for details.
-rm ${WORKDIR}/out/google.golang.org/grpc/reflection/grpc_testing_not_regenerate/*.pb.go
+rm ${WORKDIR}/out/google.golang.org/grpc/reflection/test/grpc_testing_not_regenerate/*.pb.go
 
 cp -R ${WORKDIR}/out/google.golang.org/grpc/* .