diff --git a/api/versionpb/version.pb.go b/api/versionpb/version.pb.go
index db00d5a0c411..71c74eb71929 100644
--- a/api/versionpb/version.pb.go
+++ b/api/versionpb/version.pb.go
@@ -8,7 +8,7 @@ import (
 	math "math"
 
 	_ "github.com/gogo/protobuf/gogoproto"
-	protobuf "github.com/gogo/protobuf/protoc-gen-gogo/descriptor"
+	descriptor "github.com/gogo/protobuf/protoc-gen-gogo/descriptor"
 	proto "github.com/golang/protobuf/proto"
 )
 
@@ -24,7 +24,7 @@ var _ = math.Inf
 const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 var E_EtcdVersionMsg = &proto.ExtensionDesc{
-	ExtendedType:  (*protobuf.MessageOptions)(nil),
+	ExtendedType:  (*descriptor.MessageOptions)(nil),
 	ExtensionType: (*string)(nil),
 	Field:         50000,
 	Name:          "versionpb.etcd_version_msg",
@@ -33,7 +33,7 @@ var E_EtcdVersionMsg = &proto.ExtensionDesc{
 }
 
 var E_EtcdVersionField = &proto.ExtensionDesc{
-	ExtendedType:  (*protobuf.FieldOptions)(nil),
+	ExtendedType:  (*descriptor.FieldOptions)(nil),
 	ExtensionType: (*string)(nil),
 	Field:         50001,
 	Name:          "versionpb.etcd_version_field",
@@ -42,7 +42,7 @@ var E_EtcdVersionField = &proto.ExtensionDesc{
 }
 
 var E_EtcdVersionEnum = &proto.ExtensionDesc{
-	ExtendedType:  (*protobuf.EnumOptions)(nil),
+	ExtendedType:  (*descriptor.EnumOptions)(nil),
 	ExtensionType: (*string)(nil),
 	Field:         50002,
 	Name:          "versionpb.etcd_version_enum",
@@ -51,7 +51,7 @@ var E_EtcdVersionEnum = &proto.ExtensionDesc{
 }
 
 var E_EtcdVersionEnumValue = &proto.ExtensionDesc{
-	ExtendedType:  (*protobuf.EnumValueOptions)(nil),
+	ExtendedType:  (*descriptor.EnumValueOptions)(nil),
 	ExtensionType: (*string)(nil),
 	Field:         50003,
 	Name:          "versionpb.etcd_version_enum_value",
diff --git a/scripts/genproto.sh b/scripts/genproto.sh
index d574e2d62589..fb59d5bb6f0f 100755
--- a/scripts/genproto.sh
+++ b/scripts/genproto.sh
@@ -64,15 +64,11 @@ log_callout -e "\\nRunning gofast (gogo) proto generation..."
 for dir in ${DIRS}; do
   run pushd "${dir}"
     run protoc --gofast_out=plugins=grpc:. -I=".:${GOGOPROTO_PATH}:${ETCD_ROOT_DIR}/..:${RAFT_ROOT}:${ETCD_ROOT_DIR}:${GOOGLEAPI_ROOT}" \
-      --gofast_opt=paths=source_relative \
+      --gofast_opt=paths=source_relative,Mraftpb/raft.proto=go.etcd.io/raft/v3/raftpb,Mgoogle/protobuf/descriptor.proto=github.com/gogo/protobuf/protoc-gen-gogo/descriptor \
       -I"${GRPC_GATEWAY_ROOT}" \
       --plugin="${GOFAST_BIN}" ./**/*.proto
 
-    run sed -i.bak -E 's|"etcd/api/|"go.etcd.io/etcd/api/v3/|g' ./**/*.pb.go
-    run sed -i.bak -E 's|"raftpb"|"go.etcd.io/raft/v3/raftpb"|g' ./**/*.pb.go
-    run sed -i.bak -E 's|"google/protobuf"|"github.com/gogo/protobuf/protoc-gen-gogo/descriptor"|g' ./**/*.pb.go
 
-    rm -f ./**/*.bak
     run gofmt -s -w ./**/*.pb.go
     run_go_tool "golang.org/x/tools/cmd/goimports" -w ./**/*.pb.go
   run popd