diff --git a/Makefile b/Makefile
index 598f250b9b..4f695245fe 100644
--- a/Makefile
+++ b/Makefile
@@ -181,7 +181,7 @@ contributors:
 js:
 ifeq (go1.12, $(findstring go1.12, $(GO_VERSION)))
 	go get -u github.com/gopherjs/gopherjs
-	gopherjs build github.com/gogo/protobuf/protoc-gen-gogo
+	gopherjs build github.com/tron-us/protobuf/protoc-gen-gogo
 endif
 
 purego:
diff --git a/Readme.md b/Readme.md
index 7e2d538a91..7eead52f76 100644
--- a/Readme.md
+++ b/Readme.md
@@ -153,7 +153,7 @@ Install protoc-gen-gogo:
 
     go get github.com/gogo/protobuf/proto
     go get github.com/gogo/protobuf/jsonpb
-    go get github.com/gogo/protobuf/protoc-gen-gogo
+    go get github.com/tron-us/protobuf/protoc-gen-gogo
     go get github.com/gogo/protobuf/gogoproto
 
 ## GRPC
diff --git a/gogoproto/Makefile b/gogoproto/Makefile
index 0b4659b731..234a0561df 100644
--- a/gogoproto/Makefile
+++ b/gogoproto/Makefile
@@ -27,8 +27,8 @@
 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 regenerate:
-	go install github.com/gogo/protobuf/protoc-gen-gogo
-	protoc --gogo_out=Mgoogle/protobuf/descriptor.proto=github.com/gogo/protobuf/protoc-gen-gogo/descriptor:../../../../ --proto_path=../../../../:../protobuf/:. *.proto
+	go install github.com/tron-us/protobuf/protoc-gen-gogo
+	protoc --gogo_out=Mgoogle/protobuf/descriptor.proto=github.com/tron-us/protobuf/protoc-gen-gogo/descriptor:../../../../ --proto_path=../../../../:../protobuf/:. *.proto
 
 restore:
 	cp gogo.pb.golden gogo.pb.go
diff --git a/gogoproto/gogo.pb.go b/gogoproto/gogo.pb.go
index 1e91766aee..4b0a57b3ca 100644
--- a/gogoproto/gogo.pb.go
+++ b/gogoproto/gogo.pb.go
@@ -6,7 +6,7 @@ package gogoproto
 import (
 	fmt "fmt"
 	proto "github.com/gogo/protobuf/proto"
-	descriptor "github.com/gogo/protobuf/protoc-gen-gogo/descriptor"
+	descriptor "github.com/tron-us/protobuf/protoc-gen-gogo/descriptor"
 	math "math"
 )
 
diff --git a/gogoproto/gogo.pb.golden b/gogoproto/gogo.pb.golden
index f6502e4b90..7ce592a8b8 100644
--- a/gogoproto/gogo.pb.golden
+++ b/gogoproto/gogo.pb.golden
@@ -7,7 +7,7 @@ package gogoproto
 import proto "github.com/gogo/protobuf/proto"
 import json "encoding/json"
 import math "math"
-import google_protobuf "github.com/gogo/protobuf/protoc-gen-gogo/descriptor"
+import google_protobuf "github.com/tron-us/protobuf/protoc-gen-gogo/descriptor"
 
 // Reference proto, json, and math imports to suppress error if they are not otherwise used.
 var _ = proto.Marshal
diff --git a/gogoproto/helper.go b/gogoproto/helper.go
index 390d4e4be6..1303b3097f 100644
--- a/gogoproto/helper.go
+++ b/gogoproto/helper.go
@@ -28,7 +28,7 @@
 
 package gogoproto
 
-import google_protobuf "github.com/gogo/protobuf/protoc-gen-gogo/descriptor"
+import google_protobuf "github.com/tron-us/protobuf/protoc-gen-gogo/descriptor"
 import proto "github.com/gogo/protobuf/proto"
 
 func IsEmbed(field *google_protobuf.FieldDescriptorProto) bool {
diff --git a/plugin/compare/compare.go b/plugin/compare/compare.go
index 4fcdba8d47..9197683f07 100644
--- a/plugin/compare/compare.go
+++ b/plugin/compare/compare.go
@@ -31,8 +31,8 @@ package compare
 import (
 	"github.com/gogo/protobuf/gogoproto"
 	"github.com/gogo/protobuf/proto"
-	descriptor "github.com/gogo/protobuf/protoc-gen-gogo/descriptor"
 	"github.com/gogo/protobuf/vanity"
+	descriptor "github.com/tron-us/protobuf/protoc-gen-gogo/descriptor"
 	"github.com/tron-us/protobuf/protoc-gen-gogo/generator"
 )
 
diff --git a/plugin/description/description.go b/plugin/description/description.go
index 98c31b1af5..03f26adc21 100644
--- a/plugin/description/description.go
+++ b/plugin/description/description.go
@@ -81,7 +81,7 @@ import (
 	"fmt"
 	"github.com/gogo/protobuf/gogoproto"
 	"github.com/gogo/protobuf/proto"
-	descriptor "github.com/gogo/protobuf/protoc-gen-gogo/descriptor"
+	descriptor "github.com/tron-us/protobuf/protoc-gen-gogo/descriptor"
 	"github.com/tron-us/protobuf/protoc-gen-gogo/generator"
 )
 
@@ -107,7 +107,7 @@ func (p *plugin) Generate(file *generator.FileDescriptor) {
 	localName := generator.FileName(file)
 
 	p.PluginImports = generator.NewPluginImports(p.Generator)
-	descriptorPkg := p.NewImport("github.com/gogo/protobuf/protoc-gen-gogo/descriptor")
+	descriptorPkg := p.NewImport("github.com/tron-us/protobuf/protoc-gen-gogo/descriptor")
 	protoPkg := p.NewImport("github.com/gogo/protobuf/proto")
 	gzipPkg := p.NewImport("compress/gzip")
 	bytesPkg := p.NewImport("bytes")
diff --git a/plugin/equal/equal.go b/plugin/equal/equal.go
index 9120d0f5c5..a655d58ca2 100644
--- a/plugin/equal/equal.go
+++ b/plugin/equal/equal.go
@@ -159,8 +159,8 @@ package equal
 import (
 	"github.com/gogo/protobuf/gogoproto"
 	"github.com/gogo/protobuf/proto"
-	descriptor "github.com/gogo/protobuf/protoc-gen-gogo/descriptor"
 	"github.com/gogo/protobuf/vanity"
+	descriptor "github.com/tron-us/protobuf/protoc-gen-gogo/descriptor"
 	"github.com/tron-us/protobuf/protoc-gen-gogo/generator"
 )
 
diff --git a/plugin/marshalto/marshalto.go b/plugin/marshalto/marshalto.go
index 901d9c6b4a..8ccfad06d9 100644
--- a/plugin/marshalto/marshalto.go
+++ b/plugin/marshalto/marshalto.go
@@ -151,8 +151,8 @@ import (
 
 	"github.com/gogo/protobuf/gogoproto"
 	"github.com/gogo/protobuf/proto"
-	descriptor "github.com/gogo/protobuf/protoc-gen-gogo/descriptor"
 	"github.com/gogo/protobuf/vanity"
+	descriptor "github.com/tron-us/protobuf/protoc-gen-gogo/descriptor"
 	"github.com/tron-us/protobuf/protoc-gen-gogo/generator"
 )
 
diff --git a/plugin/populate/populate.go b/plugin/populate/populate.go
index d89298981f..bac6f218cb 100644
--- a/plugin/populate/populate.go
+++ b/plugin/populate/populate.go
@@ -91,8 +91,8 @@ import (
 
 	"github.com/gogo/protobuf/gogoproto"
 	"github.com/gogo/protobuf/proto"
-	descriptor "github.com/gogo/protobuf/protoc-gen-gogo/descriptor"
 	"github.com/gogo/protobuf/vanity"
+	descriptor "github.com/tron-us/protobuf/protoc-gen-gogo/descriptor"
 	"github.com/tron-us/protobuf/protoc-gen-gogo/generator"
 )
 
diff --git a/plugin/size/size.go b/plugin/size/size.go
index 3c26d22117..c534cfb74c 100644
--- a/plugin/size/size.go
+++ b/plugin/size/size.go
@@ -130,8 +130,8 @@ import (
 
 	"github.com/gogo/protobuf/gogoproto"
 	"github.com/gogo/protobuf/proto"
-	descriptor "github.com/gogo/protobuf/protoc-gen-gogo/descriptor"
 	"github.com/gogo/protobuf/vanity"
+	descriptor "github.com/tron-us/protobuf/protoc-gen-gogo/descriptor"
 	"github.com/tron-us/protobuf/protoc-gen-gogo/generator"
 )
 
diff --git a/plugin/unmarshal/unmarshal.go b/plugin/unmarshal/unmarshal.go
index 9e17c440b6..a8dfbf5eff 100644
--- a/plugin/unmarshal/unmarshal.go
+++ b/plugin/unmarshal/unmarshal.go
@@ -181,7 +181,7 @@ import (
 
 	"github.com/gogo/protobuf/gogoproto"
 	"github.com/gogo/protobuf/proto"
-	descriptor "github.com/gogo/protobuf/protoc-gen-gogo/descriptor"
+	descriptor "github.com/tron-us/protobuf/protoc-gen-gogo/descriptor"
 	"github.com/tron-us/protobuf/protoc-gen-gogo/generator"
 )
 
diff --git a/proto/all_test.go b/proto/all_test.go
index 966ceb567d..827fd65262 100644
--- a/proto/all_test.go
+++ b/proto/all_test.go
@@ -49,7 +49,7 @@ import (
 	. "github.com/gogo/protobuf/proto"
 	pb3 "github.com/gogo/protobuf/proto/proto3_proto"
 	. "github.com/gogo/protobuf/proto/test_proto"
-	descriptorpb "github.com/gogo/protobuf/protoc-gen-gogo/descriptor"
+	descriptorpb "github.com/tron-us/protobuf/protoc-gen-gogo/descriptor"
 )
 
 var globalO *Buffer
diff --git a/protobuf/Makefile b/protobuf/Makefile
index e3e107663e..a99c28df80 100644
--- a/protobuf/Makefile
+++ b/protobuf/Makefile
@@ -2,7 +2,7 @@ VERSION=3.9.1
 URL="https://raw.githubusercontent.com/protocolbuffers/protobuf/v${VERSION}/src/google/protobuf"
 
 regenerate:
-	go install github.com/gogo/protobuf/protoc-gen-gogotypes
+	go install github.com/tron-us/protobuf/protoc-gen-gogotypes
 	go install github.com/gogo/protobuf/protoc-min-version
 
 	protoc-min-version \
diff --git a/protoc-gen-gogo/descriptor/Makefile b/protoc-gen-gogo/descriptor/Makefile
index 3496dc99d5..f423dba7a2 100644
--- a/protoc-gen-gogo/descriptor/Makefile
+++ b/protoc-gen-gogo/descriptor/Makefile
@@ -30,7 +30,7 @@
 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 regenerate:
-	go install github.com/gogo/protobuf/protoc-gen-gogo
+	go install github.com/tron-us/protobuf/protoc-gen-gogo
 	go install github.com/gogo/protobuf/protoc-gen-gostring
 	protoc --gogo_out=. -I=../../protobuf/google/protobuf ../../protobuf/google/protobuf/descriptor.proto
 	protoc --gostring_out=. -I=../../protobuf/google/protobuf ../../protobuf/google/protobuf/descriptor.proto
diff --git a/protoc-gen-gogo/descriptor/descriptor_test.go b/protoc-gen-gogo/descriptor/descriptor_test.go
index fb55e2720e..dba6d9d474 100644
--- a/protoc-gen-gogo/descriptor/descriptor_test.go
+++ b/protoc-gen-gogo/descriptor/descriptor_test.go
@@ -5,7 +5,7 @@ import (
 	"testing"
 
 	tpb "github.com/gogo/protobuf/proto/test_proto"
-	"github.com/gogo/protobuf/protoc-gen-gogo/descriptor"
+	"github.com/tron-us/protobuf/protoc-gen-gogo/descriptor"
 )
 
 func TestMessage(t *testing.T) {
diff --git a/protoc-gen-gogo/generator/generator.go b/protoc-gen-gogo/generator/generator.go
index 2e7779f26f..93861e5a95 100644
--- a/protoc-gen-gogo/generator/generator.go
+++ b/protoc-gen-gogo/generator/generator.go
@@ -64,9 +64,9 @@ import (
 
 	"github.com/gogo/protobuf/gogoproto"
 	"github.com/gogo/protobuf/proto"
-	descriptor "github.com/gogo/protobuf/protoc-gen-gogo/descriptor"
-	plugin "github.com/gogo/protobuf/protoc-gen-gogo/plugin"
+	descriptor "github.com/tron-us/protobuf/protoc-gen-gogo/descriptor"
 	"github.com/tron-us/protobuf/protoc-gen-gogo/generator/internal/remap"
+	plugin "github.com/tron-us/protobuf/protoc-gen-gogo/plugin"
 )
 
 // generatedCodeVersion indicates a version of the generated code.
diff --git a/protoc-gen-gogo/generator/helper.go b/protoc-gen-gogo/generator/helper.go
index 7091e281cb..fbd3c0cd1b 100644
--- a/protoc-gen-gogo/generator/helper.go
+++ b/protoc-gen-gogo/generator/helper.go
@@ -38,8 +38,8 @@ import (
 
 	"github.com/gogo/protobuf/gogoproto"
 	"github.com/gogo/protobuf/proto"
-	descriptor "github.com/gogo/protobuf/protoc-gen-gogo/descriptor"
-	plugin "github.com/gogo/protobuf/protoc-gen-gogo/plugin"
+	descriptor "github.com/tron-us/protobuf/protoc-gen-gogo/descriptor"
+	plugin "github.com/tron-us/protobuf/protoc-gen-gogo/plugin"
 )
 
 func (d *FileDescriptor) Messages() []*Descriptor {
diff --git a/protoc-gen-gogo/generator/name_test.go b/protoc-gen-gogo/generator/name_test.go
index 080bffb592..6d68b7ef6e 100644
--- a/protoc-gen-gogo/generator/name_test.go
+++ b/protoc-gen-gogo/generator/name_test.go
@@ -34,7 +34,7 @@ package generator
 import (
 	"testing"
 
-	"github.com/gogo/protobuf/protoc-gen-gogo/descriptor"
+	"github.com/tron-us/protobuf/protoc-gen-gogo/descriptor"
 )
 
 func TestCamelCase(t *testing.T) {
diff --git a/protoc-gen-gogo/grpc/grpc.go b/protoc-gen-gogo/grpc/grpc.go
index 08e14fdd9b..b54eb14740 100755
--- a/protoc-gen-gogo/grpc/grpc.go
+++ b/protoc-gen-gogo/grpc/grpc.go
@@ -39,7 +39,7 @@ import (
 	"strconv"
 	"strings"
 
-	pb "github.com/gogo/protobuf/protoc-gen-gogo/descriptor"
+	pb "github.com/tron-us/protobuf/protoc-gen-gogo/descriptor"
 	"github.com/tron-us/protobuf/protoc-gen-gogo/generator"
 )
 
diff --git a/protoc-gen-gogo/plugin/Makefile b/protoc-gen-gogo/plugin/Makefile
index 95234a7553..6ab5a3419f 100644
--- a/protoc-gen-gogo/plugin/Makefile
+++ b/protoc-gen-gogo/plugin/Makefile
@@ -33,5 +33,5 @@
 # at src/google/protobuf/compiler/plugin.proto
 # Also we need to fix an import.
 regenerate:
-	go install github.com/gogo/protobuf/protoc-gen-gogo
-	protoc --gogo_out=Mgoogle/protobuf/descriptor.proto=github.com/gogo/protobuf/protoc-gen-gogo/descriptor:. -I=../../protobuf/google/protobuf/compiler/:../../protobuf/ ../../protobuf/google/protobuf/compiler/plugin.proto
+	go install github.com/tron-us/protobuf/protoc-gen-gogo
+	protoc --gogo_out=Mgoogle/protobuf/descriptor.proto=github.com/tron-us/protobuf/protoc-gen-gogo/descriptor:. -I=../../protobuf/google/protobuf/compiler/:../../protobuf/ ../../protobuf/google/protobuf/compiler/plugin.proto
diff --git a/protoc-gen-gogo/plugin/plugin.pb.go b/protoc-gen-gogo/plugin/plugin.pb.go
index 8c9cb58b0d..90cfbd0840 100644
--- a/protoc-gen-gogo/plugin/plugin.pb.go
+++ b/protoc-gen-gogo/plugin/plugin.pb.go
@@ -6,7 +6,7 @@ package plugin_go
 import (
 	fmt "fmt"
 	proto "github.com/gogo/protobuf/proto"
-	descriptor "github.com/gogo/protobuf/protoc-gen-gogo/descriptor"
+	descriptor "github.com/tron-us/protobuf/protoc-gen-gogo/descriptor"
 	math "math"
 )
 
diff --git a/protoc-gen-gogo/testdata/deprecated/deprecated.pb.go b/protoc-gen-gogo/testdata/deprecated/deprecated.pb.go
index eac2845776..e42d8c173f 100644
--- a/protoc-gen-gogo/testdata/deprecated/deprecated.pb.go
+++ b/protoc-gen-gogo/testdata/deprecated/deprecated.pb.go
@@ -169,25 +169,25 @@ func init() {
 func init() { proto.RegisterFile("deprecated/deprecated.proto", fileDescriptor_f64ba265cd7eae3f) }
 
 var fileDescriptor_f64ba265cd7eae3f = []byte{
-	// 284 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0x92, 0x4e, 0x49, 0x2d, 0x28,
-	0x4a, 0x4d, 0x4e, 0x2c, 0x49, 0x4d, 0xd1, 0x47, 0x30, 0xf5, 0x0a, 0x8a, 0xf2, 0x4b, 0xf2, 0x85,
-	0xb8, 0x10, 0x22, 0x4a, 0xe2, 0x5c, 0x82, 0x2e, 0x70, 0x5e, 0x50, 0x6a, 0x61, 0x69, 0x6a, 0x71,
-	0x89, 0x15, 0x93, 0x04, 0xa3, 0xd2, 0x66, 0x46, 0x2e, 0x21, 0x64, 0x99, 0xe2, 0x82, 0xfc, 0xbc,
-	0xe2, 0x54, 0x21, 0x4f, 0x2e, 0x01, 0x84, 0xee, 0xf8, 0xb4, 0xcc, 0xd4, 0x9c, 0x14, 0x09, 0x46,
-	0x05, 0x46, 0x0d, 0x3e, 0x23, 0x29, 0x3d, 0x24, 0x8b, 0x10, 0x3a, 0x5d, 0xf3, 0x4a, 0x73, 0x9d,
-	0x98, 0x24, 0x18, 0x83, 0xf8, 0x11, 0xd2, 0x6e, 0x20, 0x6d, 0x42, 0x56, 0x5c, 0x62, 0x48, 0x46,
-	0xe5, 0xe7, 0xa5, 0xe6, 0xa7, 0x41, 0x0d, 0x64, 0x52, 0x60, 0xd4, 0xe0, 0x04, 0x69, 0xf2, 0x60,
-	0x08, 0x12, 0x41, 0xa8, 0xf1, 0x07, 0x29, 0x01, 0xeb, 0x05, 0xb9, 0xd0, 0x49, 0x08, 0xc5, 0x29,
-	0x60, 0xfd, 0x5a, 0x1a, 0x5c, 0x7c, 0xa8, 0x56, 0x0b, 0x09, 0x71, 0x71, 0xb9, 0xb8, 0x06, 0x04,
-	0xb9, 0x3a, 0x3b, 0x86, 0xb8, 0xba, 0x08, 0x30, 0x48, 0x31, 0x71, 0x30, 0x4a, 0x31, 0x49, 0x30,
-	0x1a, 0xe5, 0x21, 0x7b, 0x3c, 0x38, 0xb5, 0xa8, 0x2c, 0x33, 0x39, 0x55, 0x28, 0x04, 0x59, 0xbb,
-	0x73, 0x62, 0x4e, 0x8e, 0x90, 0x2c, 0x76, 0x5f, 0x41, 0x43, 0x4a, 0x4a, 0x0e, 0x97, 0x34, 0x24,
-	0xb8, 0x94, 0x98, 0x3b, 0x98, 0x18, 0xa5, 0x40, 0x84, 0x93, 0x63, 0x94, 0x4d, 0x7a, 0x66, 0x49,
-	0x46, 0x69, 0x92, 0x5e, 0x72, 0x7e, 0xae, 0x7e, 0x7a, 0x7e, 0x7a, 0xbe, 0x3e, 0x38, 0x36, 0x92,
-	0x4a, 0xd3, 0x20, 0x8c, 0x64, 0xdd, 0xf4, 0xd4, 0x3c, 0x5d, 0xb0, 0x44, 0x49, 0x6a, 0x71, 0x49,
-	0x4a, 0x62, 0x49, 0x22, 0x52, 0xd4, 0xed, 0x60, 0x64, 0x4c, 0x62, 0x03, 0xab, 0x33, 0x06, 0x04,
-	0x00, 0x00, 0xff, 0xff, 0xf0, 0x08, 0x22, 0x8d, 0xdd, 0x01, 0x00, 0x00,
+	// 287 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x74, 0x91, 0xcb, 0x4a, 0xc3, 0x40,
+	0x14, 0x86, 0x7b, 0x46, 0x10, 0x9d, 0x45, 0xad, 0x83, 0x68, 0x88, 0x28, 0xa5, 0xab, 0x20, 0x24,
+	0x81, 0xba, 0xeb, 0x46, 0x4c, 0x13, 0xd1, 0x95, 0x12, 0xbb, 0x72, 0x23, 0xb9, 0x9c, 0xc4, 0x40,
+	0x3a, 0x13, 0x93, 0x89, 0xcf, 0xe0, 0xfb, 0xb8, 0xf1, 0xf1, 0x64, 0xd2, 0xe2, 0x4c, 0x41, 0x37,
+	0xe1, 0x64, 0xfe, 0xff, 0x3b, 0x57, 0x7a, 0x9e, 0x63, 0xd3, 0x62, 0x96, 0x48, 0xcc, 0x7d, 0x1d,
+	0x7a, 0x4d, 0x2b, 0xa4, 0x60, 0x54, 0xbf, 0xcc, 0xce, 0xe8, 0x71, 0xf8, 0xfb, 0x17, 0xe3, 0x7b,
+	0x8f, 0x9d, 0x5c, 0x10, 0x0b, 0x66, 0x5f, 0x40, 0x99, 0xa9, 0x74, 0x8d, 0xe0, 0x1d, 0xb2, 0x07,
+	0x3a, 0xd1, 0xf4, 0x6b, 0x51, 0x61, 0x9d, 0x5b, 0x30, 0x05, 0x67, 0x3c, 0xb7, 0x3d, 0xa3, 0x90,
+	0x26, 0x23, 0xde, 0xaf, 0x03, 0x62, 0x41, 0x7c, 0xa4, 0xe5, 0x3b, 0x85, 0xb1, 0x05, 0x3d, 0x35,
+	0x52, 0x09, 0x8e, 0xa2, 0xd8, 0x26, 0x24, 0x53, 0x70, 0x0e, 0x15, 0x74, 0x3f, 0x8a, 0x4f, 0xb4,
+	0xe7, 0x51, 0x59, 0x06, 0x56, 0x75, 0x18, 0xb0, 0x9d, 0x56, 0x06, 0xfe, 0xca, 0xa1, 0xe3, 0xdd,
+	0xd2, 0x8c, 0x51, 0x1a, 0x46, 0x4f, 0x71, 0xb4, 0xbc, 0x5d, 0x45, 0xe1, 0x64, 0x64, 0x93, 0x03,
+	0xb0, 0x89, 0x05, 0x73, 0x6e, 0x0e, 0xfe, 0x8c, 0xed, 0x47, 0x95, 0x21, 0x5b, 0x99, 0xf8, 0x32,
+	0xa9, 0x6b, 0x76, 0xf1, 0xf7, 0x54, 0xdb, 0x4d, 0xd9, 0x97, 0xff, 0xc9, 0x9b, 0x75, 0xcd, 0xf6,
+	0x3e, 0x09, 0xd8, 0xea, 0x13, 0x84, 0x2f, 0x37, 0x65, 0x25, 0xdf, 0xfa, 0xd4, 0xcb, 0xc4, 0xda,
+	0x97, 0xad, 0xe0, 0x6e, 0xdf, 0xf9, 0xc3, 0x41, 0xd2, 0xbe, 0xd8, 0x04, 0x99, 0x5b, 0x22, 0x77,
+	0x4b, 0x51, 0x0a, 0x5f, 0x62, 0x27, 0xf3, 0x44, 0x26, 0xc6, 0xf5, 0xbe, 0x01, 0xd2, 0xfd, 0xc1,
+	0x77, 0xfd, 0x13, 0x00, 0x00, 0xff, 0xff, 0xd8, 0xda, 0xbc, 0x2e, 0xe0, 0x01, 0x00, 0x00,
 }
 
 // Reference imports to suppress errors if they are not otherwise used.
diff --git a/protoc-gen-gogo/testdata/deprecated/deprecated.proto b/protoc-gen-gogo/testdata/deprecated/deprecated.proto
index f6ab65f731..b7dfd43272 100644
--- a/protoc-gen-gogo/testdata/deprecated/deprecated.proto
+++ b/protoc-gen-gogo/testdata/deprecated/deprecated.proto
@@ -34,7 +34,7 @@ syntax = "proto3";
 // package deprecated contains only deprecated messages and services.
 package deprecated;
 
-option go_package = "github.com/gogo/protobuf/protoc-gen-gogo/testdata/deprecated";
+option go_package = "github.com/tron-us/protobuf/protoc-gen-gogo/testdata/deprecated";
 
 option deprecated = true; // file-level deprecation
 
diff --git a/protoc-gen-gogo/testdata/extension_base/extension_base.pb.go b/protoc-gen-gogo/testdata/extension_base/extension_base.pb.go
index 6fa4ac1ed3..91fccb8389 100644
--- a/protoc-gen-gogo/testdata/extension_base/extension_base.pb.go
+++ b/protoc-gen-gogo/testdata/extension_base/extension_base.pb.go
@@ -120,7 +120,7 @@ func init() {
 }
 
 var fileDescriptor_2fbd53bac0b7ca8a = []byte{
-	// 175 bytes of a gzipped FileDescriptorProto
+	// 182 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0x52, 0x4e, 0xad, 0x28, 0x49,
 	0xcd, 0x2b, 0xce, 0xcc, 0xcf, 0x8b, 0x4f, 0x4a, 0x2c, 0x4e, 0xd5, 0x47, 0xe5, 0xea, 0x15, 0x14,
 	0xe5, 0x97, 0xe4, 0x0b, 0xf1, 0xa1, 0x8a, 0x2a, 0x99, 0x72, 0x71, 0x3b, 0x25, 0x16, 0xa7, 0xfa,
@@ -128,8 +128,9 @@ var fileDescriptor_2fbd53bac0b7ca8a = []byte{
 	0x48, 0x30, 0x2a, 0x30, 0x6a, 0xb0, 0x06, 0x41, 0x79, 0x5a, 0x2c, 0x1c, 0x2c, 0x02, 0x5c, 0x5a,
 	0x1c, 0x1c, 0x02, 0x02, 0x0d, 0x0d, 0x0d, 0x0d, 0x4c, 0x4a, 0xf2, 0x5c, 0xfc, 0xfe, 0x39, 0x29,
 	0xc1, 0x25, 0x95, 0x39, 0x30, 0xad, 0x5a, 0x1c, 0x1c, 0x29, 0x02, 0xff, 0xff, 0xff, 0xff, 0xcf,
-	0x6e, 0xc5, 0xc4, 0xc1, 0xe8, 0xe4, 0x14, 0xe5, 0x90, 0x9e, 0x59, 0x92, 0x51, 0x9a, 0xa4, 0x97,
-	0x9c, 0x9f, 0xab, 0x9f, 0x9e, 0x9f, 0x9e, 0xaf, 0x0f, 0x76, 0x40, 0x52, 0x69, 0x1a, 0x84, 0x91,
-	0xac, 0x9b, 0x9e, 0x9a, 0xa7, 0x0b, 0x96, 0x28, 0x49, 0x2d, 0x2e, 0x49, 0x49, 0x2c, 0x49, 0x44,
-	0x73, 0x31, 0x20, 0x00, 0x00, 0xff, 0xff, 0x60, 0xef, 0xa3, 0xb7, 0xd1, 0x00, 0x00, 0x00,
+	0x6e, 0xc5, 0xc4, 0xc1, 0xe8, 0xe4, 0x1a, 0xe5, 0x9c, 0x9e, 0x59, 0x92, 0x51, 0x9a, 0xa4, 0x97,
+	0x9c, 0x9f, 0xab, 0x5f, 0x52, 0x94, 0x9f, 0xa7, 0x5b, 0x5a, 0xac, 0x0f, 0x76, 0x43, 0x52, 0x69,
+	0x1a, 0x84, 0x91, 0xac, 0x9b, 0x9e, 0x9a, 0xa7, 0x9b, 0x9e, 0x9f, 0x9e, 0xaf, 0x5f, 0x92, 0x5a,
+	0x5c, 0x92, 0x92, 0x58, 0x92, 0x88, 0xe6, 0x68, 0x40, 0x00, 0x00, 0x00, 0xff, 0xff, 0xcb, 0xa7,
+	0x06, 0xdf, 0xd4, 0x00, 0x00, 0x00,
 }
diff --git a/protoc-gen-gogo/testdata/extension_base/extension_base.proto b/protoc-gen-gogo/testdata/extension_base/extension_base.proto
index 055f31ac13..77d51bed81 100644
--- a/protoc-gen-gogo/testdata/extension_base/extension_base.proto
+++ b/protoc-gen-gogo/testdata/extension_base/extension_base.proto
@@ -33,7 +33,7 @@ syntax = "proto2";
 
 package extension_base;
 
-option go_package = "github.com/gogo/protobuf/protoc-gen-gogo/testdata/extension_base";
+option go_package = "github.com/tron-us/protobuf/protoc-gen-gogo/testdata/extension_base";
 
 message BaseMessage {
   optional int32 height = 1;
diff --git a/protoc-gen-gogo/testdata/extension_extra/extension_extra.pb.go b/protoc-gen-gogo/testdata/extension_extra/extension_extra.pb.go
index be243f26c0..1a655eb429 100644
--- a/protoc-gen-gogo/testdata/extension_extra/extension_extra.pb.go
+++ b/protoc-gen-gogo/testdata/extension_extra/extension_extra.pb.go
@@ -67,14 +67,14 @@ func init() {
 }
 
 var fileDescriptor_fce75f5a63502cd5 = []byte{
-	// 130 bytes of a gzipped FileDescriptorProto
+	// 136 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0x52, 0x4d, 0xad, 0x28, 0x49,
 	0xcd, 0x2b, 0xce, 0xcc, 0xcf, 0x8b, 0x4f, 0xad, 0x28, 0x29, 0x4a, 0xd4, 0x47, 0xe3, 0xeb, 0x15,
 	0x14, 0xe5, 0x97, 0xe4, 0x0b, 0xf1, 0xa3, 0x09, 0x2b, 0xa9, 0x70, 0xf1, 0xb8, 0x82, 0x18, 0xbe,
 	0xa9, 0xc5, 0xc5, 0x89, 0xe9, 0xa9, 0x42, 0x22, 0x5c, 0xac, 0xe5, 0x99, 0x29, 0x25, 0x19, 0x12,
-	0x8c, 0x0a, 0x8c, 0x1a, 0xac, 0x41, 0x10, 0x8e, 0x93, 0x73, 0x94, 0x63, 0x7a, 0x66, 0x49, 0x46,
-	0x69, 0x92, 0x5e, 0x72, 0x7e, 0xae, 0x7e, 0x7a, 0x7e, 0x7a, 0xbe, 0x3e, 0xd8, 0xbc, 0xa4, 0xd2,
-	0x34, 0x08, 0x23, 0x59, 0x37, 0x3d, 0x35, 0x4f, 0x17, 0x2c, 0x51, 0x92, 0x5a, 0x5c, 0x92, 0x92,
-	0x58, 0x82, 0xe1, 0x02, 0x40, 0x00, 0x00, 0x00, 0xff, 0xff, 0x1b, 0x01, 0x1c, 0x4a, 0xa3, 0x00,
-	0x00, 0x00,
+	0x8c, 0x0a, 0x8c, 0x1a, 0xac, 0x41, 0x10, 0x8e, 0x93, 0x5b, 0x94, 0x4b, 0x7a, 0x66, 0x49, 0x46,
+	0x69, 0x92, 0x5e, 0x72, 0x7e, 0xae, 0x7e, 0x49, 0x51, 0x7e, 0x9e, 0x6e, 0x69, 0xb1, 0x3e, 0xd8,
+	0xc8, 0xa4, 0xd2, 0x34, 0x08, 0x23, 0x59, 0x37, 0x3d, 0x35, 0x4f, 0x37, 0x3d, 0x3f, 0x3d, 0x5f,
+	0xbf, 0x24, 0xb5, 0xb8, 0x24, 0x25, 0xb1, 0x04, 0xc3, 0x11, 0x80, 0x00, 0x00, 0x00, 0xff, 0xff,
+	0x98, 0xf8, 0xaa, 0xb9, 0xa6, 0x00, 0x00, 0x00,
 }
diff --git a/protoc-gen-gogo/testdata/extension_extra/extension_extra.proto b/protoc-gen-gogo/testdata/extension_extra/extension_extra.proto
index 26fafed3cd..176692417a 100644
--- a/protoc-gen-gogo/testdata/extension_extra/extension_extra.proto
+++ b/protoc-gen-gogo/testdata/extension_extra/extension_extra.proto
@@ -33,7 +33,7 @@ syntax = "proto2";
 
 package extension_extra;
 
-option go_package = "github.com/gogo/protobuf/protoc-gen-gogo/testdata/extension_extra";
+option go_package = "github.com/tron-us/protobuf/protoc-gen-gogo/testdata/extension_extra";
 
 message ExtraMessage {
   optional int32 width = 1;
diff --git a/protoc-gen-gogo/testdata/extension_test.go b/protoc-gen-gogo/testdata/extension_test.go
index 645c1e9969..991b9f9b20 100644
--- a/protoc-gen-gogo/testdata/extension_test.go
+++ b/protoc-gen-gogo/testdata/extension_test.go
@@ -39,8 +39,8 @@ import (
 	"testing"
 
 	"github.com/gogo/protobuf/proto"
-	base "github.com/gogo/protobuf/protoc-gen-gogo/testdata/extension_base"
-	user "github.com/gogo/protobuf/protoc-gen-gogo/testdata/extension_user"
+	base "github.com/tron-us/protobuf/protoc-gen-gogo/testdata/extension_base"
+	user "github.com/tron-us/protobuf/protoc-gen-gogo/testdata/extension_user"
 )
 
 func TestSingleFieldExtension(t *testing.T) {
diff --git a/protoc-gen-gogo/testdata/extension_user/extension_user.pb.go b/protoc-gen-gogo/testdata/extension_user/extension_user.pb.go
index 7a7a590f00..7b5d4e6d9a 100644
--- a/protoc-gen-gogo/testdata/extension_user/extension_user.pb.go
+++ b/protoc-gen-gogo/testdata/extension_user/extension_user.pb.go
@@ -6,8 +6,8 @@ package extension_user
 import (
 	fmt "fmt"
 	proto "github.com/gogo/protobuf/proto"
-	extension_base "github.com/gogo/protobuf/protoc-gen-gogo/testdata/extension_base"
-	extension_extra "github.com/gogo/protobuf/protoc-gen-gogo/testdata/extension_extra"
+	extension_base "github.com/tron-us/protobuf/protoc-gen-gogo/testdata/extension_base"
+	extension_extra "github.com/tron-us/protobuf/protoc-gen-gogo/testdata/extension_extra"
 	math "math"
 )
 
@@ -368,36 +368,36 @@ func init() {
 }
 
 var fileDescriptor_359ba8abf543ca10 = []byte{
-	// 490 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x94, 0x54, 0xc1, 0x6e, 0xd3, 0x40,
-	0x10, 0x95, 0xdb, 0xc6, 0x4d, 0xc7, 0x69, 0x29, 0x06, 0xaa, 0xa8, 0x40, 0xb1, 0x8c, 0x90, 0x2c,
-	0xa4, 0xc6, 0xc2, 0x88, 0x8b, 0x4f, 0x10, 0x91, 0x13, 0x41, 0x20, 0x17, 0x2e, 0x70, 0xb0, 0x36,
-	0xf6, 0xe0, 0x58, 0xb5, 0x77, 0xd1, 0xee, 0x9a, 0x06, 0x4e, 0xf9, 0x26, 0xfe, 0x84, 0x3f, 0x42,
-	0x5e, 0xaf, 0x5b, 0xc7, 0x48, 0x11, 0xbd, 0x44, 0xfb, 0x66, 0xdf, 0xbc, 0x99, 0x7d, 0x33, 0x31,
-	0x3c, 0xc5, 0x95, 0x44, 0x2a, 0x72, 0x46, 0xe3, 0x4a, 0x20, 0xf7, 0x37, 0xe1, 0xe4, 0x3b, 0x67,
-	0x92, 0xd9, 0x47, 0x9b, 0xd1, 0xd3, 0x4e, 0xd2, 0x82, 0x08, 0xf4, 0x37, 0x61, 0x93, 0x74, 0xfa,
-	0xec, 0x26, 0x8a, 0x2b, 0xc9, 0x89, 0xdf, 0xc3, 0x0d, 0xcd, 0x7d, 0x05, 0xd6, 0x67, 0x81, 0xfc,
-	0x3d, 0x0a, 0x41, 0x32, 0xb4, 0x6d, 0xd8, 0xa3, 0xa4, 0xc4, 0xb1, 0xe1, 0x18, 0xde, 0x41, 0xa4,
-	0xce, 0x75, 0x8c, 0x13, 0x7a, 0x39, 0xde, 0x69, 0x62, 0xf5, 0xd9, 0x9d, 0x83, 0x35, 0x67, 0x55,
-	0xaa, 0xd3, 0x9e, 0x0f, 0x87, 0xe9, 0xf1, 0x7a, 0xbd, 0x5e, 0xef, 0x04, 0x2f, 0xc1, 0xfc, 0xc1,
-	0x8a, 0xaa, 0x44, 0xfb, 0xe1, 0xa4, 0xd7, 0xd7, 0x94, 0x08, 0xd4, 0x09, 0xe3, 0xa1, 0x63, 0x78,
-	0x87, 0x91, 0xa6, 0xba, 0x97, 0x30, 0x9a, 0xb3, 0x2c, 0xa7, 0xfa, 0x36, 0xf8, 0x0a, 0xa3, 0xfa,
-	0xa1, 0x71, 0xa9, 0xbb, 0xda, 0x2a, 0x75, 0xec, 0x18, 0x9e, 0x15, 0x74, 0x29, 0xca, 0xba, 0xce,
-	0xab, 0x22, 0xab, 0xba, 0x01, 0xee, 0x19, 0x98, 0x6f, 0x51, 0x92, 0xbc, 0xb0, 0xef, 0xc3, 0x20,
-	0x61, 0x05, 0xe3, 0xfa, 0xb5, 0x0d, 0x70, 0x7f, 0xc1, 0xe8, 0x0d, 0xa5, 0xac, 0xa2, 0x09, 0x96,
-	0x48, 0x65, 0xcd, 0xba, 0x62, 0x3c, 0x15, 0x2d, 0x4b, 0x81, 0xe0, 0x13, 0x0c, 0x0b, 0x56, 0xa5,
-	0xb5, 0x97, 0xf6, 0x3f, 0xb5, 0x3b, 0xd6, 0x8c, 0x53, 0xd5, 0xde, 0xa3, 0x3e, 0xa5, 0x5b, 0x22,
-	0xda, 0xaf, 0xa5, 0x66, 0x2b, 0xe9, 0xfe, 0x36, 0xe0, 0xe8, 0x43, 0x91, 0x5e, 0xc8, 0x9f, 0x05,
-	0x7e, 0x24, 0x3c, 0xc1, 0xa2, 0x33, 0x91, 0x9d, 0xeb, 0x89, 0x9c, 0x80, 0xb9, 0xc4, 0x3c, 0x5b,
-	0x4a, 0x35, 0x93, 0x41, 0xa4, 0x51, 0x20, 0xe1, 0x81, 0xb6, 0x2c, 0x16, 0x28, 0xe3, 0xeb, 0x92,
-	0xf6, 0x93, 0xbe, 0x81, 0x6d, 0x91, 0xb6, 0xcb, 0x3f, 0x77, 0x54, 0x9b, 0x67, 0xfd, 0x36, 0x37,
-	0x9b, 0x89, 0xee, 0x69, 0xf9, 0x0b, 0x94, 0xb3, 0x96, 0x18, 0xde, 0x6a, 0x5a, 0x83, 0xdb, 0x4d,
-	0x2b, 0x8c, 0xe1, 0x50, 0xad, 0xeb, 0xff, 0xa9, 0x1f, 0x28, 0xf5, 0xc7, 0x93, 0xfe, 0xae, 0xcf,
-	0xea, 0xdf, 0x56, 0x7f, 0x84, 0x1d, 0x14, 0xbe, 0x80, 0xc1, 0x55, 0x9e, 0xca, 0xe5, 0x76, 0x61,
-	0x53, 0xf9, 0xdc, 0x30, 0x43, 0x1f, 0xf6, 0x08, 0x47, 0xb2, 0x3d, 0x63, 0xdf, 0x31, 0xbc, 0xdd,
-	0x48, 0x11, 0xc3, 0x77, 0x60, 0xa6, 0xcd, 0xca, 0x6d, 0x4d, 0xb9, 0xeb, 0xec, 0x7a, 0x56, 0x70,
-	0xd2, 0xf7, 0xa6, 0xd9, 0xd6, 0x48, 0x4b, 0x4c, 0xa7, 0x5f, 0x5e, 0x67, 0xb9, 0x5c, 0x56, 0x8b,
-	0x49, 0xc2, 0x4a, 0x3f, 0x63, 0x19, 0xf3, 0xd5, 0x5f, 0x79, 0x51, 0x7d, 0x6b, 0x0e, 0xc9, 0x79,
-	0x86, 0xf4, 0x5c, 0x5d, 0x48, 0x14, 0x32, 0x25, 0x92, 0xf4, 0xbe, 0x2b, 0x7f, 0x03, 0x00, 0x00,
-	0xff, 0xff, 0xc5, 0x88, 0x70, 0x88, 0x77, 0x04, 0x00, 0x00,
+	// 493 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x94, 0x54, 0x51, 0x6f, 0x94, 0x40,
+	0x10, 0x0e, 0x6d, 0x8f, 0x5e, 0x87, 0x6b, 0xad, 0xa8, 0xcd, 0xa5, 0x6a, 0x25, 0x18, 0x13, 0x62,
+	0x72, 0x47, 0xc4, 0xf8, 0xc2, 0x9b, 0xd5, 0x7b, 0xf2, 0x8c, 0x86, 0xea, 0x8b, 0x3e, 0x90, 0x3d,
+	0x18, 0x39, 0x52, 0xd8, 0x35, 0xbb, 0x8b, 0x3d, 0x7d, 0xba, 0xdf, 0xe4, 0x3f, 0xf1, 0x1f, 0x19,
+	0x96, 0xa5, 0xe5, 0x30, 0xb9, 0xd8, 0x17, 0xb2, 0xdf, 0xf0, 0xcd, 0x37, 0xb3, 0xdf, 0x0c, 0xc0,
+	0x53, 0x5c, 0x49, 0xa4, 0x22, 0x67, 0x34, 0xae, 0x04, 0x72, 0x7f, 0x13, 0x4e, 0xbf, 0x73, 0x26,
+	0x99, 0x7d, 0xb4, 0x19, 0x3d, 0xed, 0x24, 0x2d, 0x88, 0x40, 0x7f, 0x13, 0x36, 0x49, 0xa7, 0xcf,
+	0x6e, 0xa2, 0xb8, 0x92, 0x9c, 0xf8, 0x3d, 0xdc, 0xd0, 0xdc, 0x57, 0x60, 0x7d, 0x16, 0xc8, 0xdf,
+	0xa3, 0x10, 0x24, 0x43, 0xdb, 0x86, 0x3d, 0x4a, 0x4a, 0x1c, 0x1b, 0x8e, 0xe1, 0x1d, 0x44, 0xea,
+	0x5c, 0xc7, 0x38, 0xa1, 0x97, 0xe3, 0x9d, 0x26, 0x56, 0x9f, 0xdd, 0x39, 0x58, 0x73, 0x56, 0xa5,
+	0x3a, 0xed, 0xf9, 0x70, 0x98, 0x1e, 0xaf, 0xd7, 0xeb, 0xf5, 0x4e, 0xf0, 0x12, 0xcc, 0x1f, 0xac,
+	0xa8, 0x4a, 0xb4, 0x1f, 0x4e, 0x7b, 0x7d, 0x9d, 0x13, 0x81, 0x3a, 0x61, 0x3c, 0x74, 0x0c, 0xef,
+	0x30, 0xd2, 0x54, 0xf7, 0x12, 0x46, 0x73, 0x96, 0xe5, 0x54, 0xbf, 0x0d, 0xbe, 0xc2, 0xa8, 0xbe,
+	0x68, 0x5c, 0xea, 0xae, 0xb6, 0x4a, 0x1d, 0x3b, 0x86, 0x67, 0x05, 0x5d, 0x8a, 0xb2, 0xae, 0x73,
+	0xab, 0xc8, 0xaa, 0x6e, 0x80, 0x7b, 0x06, 0xe6, 0x5b, 0x94, 0x24, 0x2f, 0xec, 0xfb, 0x30, 0x48,
+	0x58, 0xc1, 0xb8, 0xbe, 0x6d, 0x03, 0xdc, 0x5f, 0x30, 0x7a, 0x4d, 0x29, 0xab, 0x68, 0x82, 0x25,
+	0x52, 0x59, 0xb3, 0xae, 0x18, 0x4f, 0x45, 0xcb, 0x52, 0x20, 0xf8, 0x04, 0xc3, 0x82, 0x55, 0x69,
+	0xed, 0xa5, 0xfd, 0x4f, 0xed, 0x8e, 0x35, 0xe3, 0x54, 0xb5, 0xf7, 0xa8, 0x4f, 0xe9, 0x96, 0x88,
+	0xf6, 0x6b, 0xa9, 0xd9, 0x4a, 0xba, 0xbf, 0x0d, 0x38, 0xfa, 0x50, 0xa4, 0x17, 0xf2, 0x67, 0x81,
+	0x1f, 0x09, 0x4f, 0xb0, 0xe8, 0x4c, 0x64, 0xe7, 0x7a, 0x22, 0x27, 0x60, 0x2e, 0x31, 0xcf, 0x96,
+	0x52, 0xcd, 0x64, 0x10, 0x69, 0x14, 0x48, 0x78, 0xa0, 0x2d, 0x8b, 0x05, 0xca, 0xf8, 0xba, 0xa4,
+	0xfd, 0xa4, 0x6f, 0x60, 0x5b, 0xa4, 0xed, 0xf2, 0xcf, 0x1d, 0xd5, 0xe6, 0x59, 0xbf, 0xcd, 0xcd,
+	0x66, 0xa2, 0x7b, 0x5a, 0xfe, 0x02, 0xe5, 0xac, 0x25, 0x86, 0xb7, 0x9a, 0xd6, 0xe0, 0x76, 0xd3,
+	0x0a, 0x63, 0x38, 0x54, 0xeb, 0xfa, 0x7f, 0xea, 0x07, 0x4a, 0xfd, 0xf1, 0xb4, 0xbf, 0xeb, 0xb3,
+	0xfa, 0xd9, 0xea, 0x8f, 0xb0, 0x83, 0xc2, 0x17, 0x30, 0xb8, 0xca, 0x53, 0xb9, 0xdc, 0x2e, 0x6c,
+	0x2a, 0x9f, 0x1b, 0x66, 0xe8, 0xc3, 0x1e, 0xe1, 0x48, 0xb6, 0x67, 0xec, 0x3b, 0x86, 0xb7, 0x1b,
+	0x29, 0x62, 0xf8, 0x0e, 0xcc, 0xb4, 0x59, 0xb9, 0xad, 0x29, 0x77, 0x9d, 0x5d, 0xcf, 0x0a, 0x4e,
+	0xfa, 0xde, 0x34, 0xdb, 0x1a, 0x69, 0x89, 0xf3, 0xd9, 0x97, 0x37, 0x59, 0x2e, 0x97, 0xd5, 0x62,
+	0x9a, 0xb0, 0xd2, 0x97, 0x9c, 0xd1, 0x49, 0x25, 0x7c, 0xf5, 0x35, 0x2f, 0xaa, 0x6f, 0xcd, 0x21,
+	0x99, 0x64, 0x48, 0x27, 0x19, 0xcb, 0x98, 0x2f, 0x51, 0xc8, 0x94, 0x48, 0xd2, 0xfb, 0xb5, 0xfc,
+	0x0d, 0x00, 0x00, 0xff, 0xff, 0x8d, 0x62, 0xfd, 0xb6, 0x7a, 0x04, 0x00, 0x00,
 }
diff --git a/protoc-gen-gogo/testdata/extension_user/extension_user.proto b/protoc-gen-gogo/testdata/extension_user/extension_user.proto
index 6eaacebc9b..ed0a55b8cc 100644
--- a/protoc-gen-gogo/testdata/extension_user/extension_user.proto
+++ b/protoc-gen-gogo/testdata/extension_user/extension_user.proto
@@ -36,7 +36,7 @@ import "extension_extra/extension_extra.proto";
 
 package extension_user;
 
-option go_package = "github.com/gogo/protobuf/protoc-gen-gogo/testdata/extension_user";
+option go_package = "github.com/tron-us/protobuf/protoc-gen-gogo/testdata/extension_user";
 
 message UserMessage {
   optional string name = 1;
diff --git a/protoc-gen-gogo/testdata/grpc/grpc.pb.go b/protoc-gen-gogo/testdata/grpc/grpc.pb.go
index d621c2aa41..5fdd6dc497 100644
--- a/protoc-gen-gogo/testdata/grpc/grpc.pb.go
+++ b/protoc-gen-gogo/testdata/grpc/grpc.pb.go
@@ -154,7 +154,7 @@ func init() {
 func init() { proto.RegisterFile("grpc/grpc.proto", fileDescriptor_81ea47a3f88c2082) }
 
 var fileDescriptor_81ea47a3f88c2082 = []byte{
-	// 241 bytes of a gzipped FileDescriptorProto
+	// 247 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0xe2, 0x4f, 0x2f, 0x2a, 0x48,
 	0xd6, 0x07, 0x11, 0x7a, 0x05, 0x45, 0xf9, 0x25, 0xf9, 0x42, 0x3c, 0x60, 0x76, 0x49, 0x6a, 0x71,
 	0x49, 0x66, 0x5e, 0xba, 0x12, 0x3f, 0x17, 0x6f, 0x70, 0x66, 0x6e, 0x41, 0x4e, 0x6a, 0x50, 0x6a,
@@ -166,11 +166,11 @@ var fileDescriptor_81ea47a3f88c2082 = []byte{
 	0xe7, 0x15, 0x83, 0xad, 0xc0, 0x6f, 0x90, 0x38, 0x9a, 0x24, 0xcc, 0x55, 0x06, 0x8c, 0x42, 0xce,
 	0x5c, 0x1c, 0xa1, 0x05, 0x50, 0x33, 0x70, 0x29, 0xc3, 0xef, 0x10, 0x0d, 0x46, 0x21, 0x5b, 0x2e,
 	0x16, 0xa7, 0xcc, 0x94, 0x4c, 0xdc, 0x06, 0x48, 0xe0, 0x90, 0x30, 0xd2, 0x60, 0x34, 0x60, 0x74,
-	0x72, 0x88, 0xb2, 0x4b, 0xcf, 0x2c, 0xc9, 0x28, 0x4d, 0xd2, 0x4b, 0xce, 0xcf, 0xd5, 0x4f, 0xcf,
-	0x4f, 0xcf, 0xd7, 0x07, 0x87, 0x7f, 0x52, 0x69, 0x1a, 0x84, 0x91, 0xac, 0x9b, 0x9e, 0x9a, 0xa7,
-	0x0b, 0x96, 0x00, 0x19, 0x91, 0x92, 0x58, 0x92, 0x08, 0x8e, 0x26, 0x6b, 0xa8, 0x81, 0x49, 0x6c,
-	0x60, 0x65, 0xc6, 0x80, 0x00, 0x00, 0x00, 0xff, 0xff, 0x16, 0x54, 0x6e, 0x1b, 0xc2, 0x01, 0x00,
-	0x00,
+	0x72, 0x8e, 0x72, 0x4c, 0xcf, 0x2c, 0xc9, 0x28, 0x4d, 0xd2, 0x4b, 0xce, 0xcf, 0xd5, 0x2f, 0x29,
+	0xca, 0xcf, 0xd3, 0x2d, 0x2d, 0xd6, 0x07, 0x47, 0x41, 0x52, 0x69, 0x1a, 0x84, 0x91, 0xac, 0x9b,
+	0x9e, 0x9a, 0xa7, 0x9b, 0x9e, 0x9f, 0x9e, 0xaf, 0x0f, 0x32, 0x25, 0x25, 0xb1, 0x24, 0x11, 0x1c,
+	0x53, 0xd6, 0x50, 0x33, 0x93, 0xd8, 0xc0, 0xca, 0x8c, 0x01, 0x01, 0x00, 0x00, 0xff, 0xff, 0xb9,
+	0xcd, 0x18, 0x0e, 0xc5, 0x01, 0x00, 0x00,
 }
 
 // Reference imports to suppress errors if they are not otherwise used.
diff --git a/protoc-gen-gogo/testdata/grpc/grpc.proto b/protoc-gen-gogo/testdata/grpc/grpc.proto
index 2b7b8a86a4..7d10ac2a24 100644
--- a/protoc-gen-gogo/testdata/grpc/grpc.proto
+++ b/protoc-gen-gogo/testdata/grpc/grpc.proto
@@ -33,7 +33,7 @@ syntax = "proto3";
 
 package grpc.testing;
 
-option go_package = "github.com/gogo/protobuf/protoc-gen-gogo/testdata/grpc;testing";
+option go_package = "github.com/tron-us/protobuf/protoc-gen-gogo/testdata/grpc;testing";
 
 message SimpleRequest {
 }
diff --git a/protoc-gen-gogo/testdata/grpc/grpc_empty.pb.go b/protoc-gen-gogo/testdata/grpc/grpc_empty.pb.go
index 6f1cbfc318..4667da2bda 100644
--- a/protoc-gen-gogo/testdata/grpc/grpc_empty.pb.go
+++ b/protoc-gen-gogo/testdata/grpc/grpc_empty.pb.go
@@ -25,15 +25,15 @@ const _ = proto.GoGoProtoPackageIsVersion3 // please upgrade the proto package
 func init() { proto.RegisterFile("grpc/grpc_empty.proto", fileDescriptor_c580a37f1c90e9b1) }
 
 var fileDescriptor_c580a37f1c90e9b1 = []byte{
-	// 121 bytes of a gzipped FileDescriptorProto
+	// 128 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0x12, 0x4d, 0x2f, 0x2a, 0x48,
 	0xd6, 0x07, 0x11, 0xf1, 0xa9, 0xb9, 0x05, 0x25, 0x95, 0x7a, 0x05, 0x45, 0xf9, 0x25, 0xf9, 0x42,
 	0x3c, 0x20, 0x11, 0xbd, 0x92, 0xd4, 0xe2, 0x92, 0xcc, 0xbc, 0x74, 0x23, 0x3e, 0x2e, 0x1e, 0x57,
-	0x90, 0x64, 0x70, 0x6a, 0x51, 0x59, 0x66, 0x72, 0xaa, 0x93, 0x43, 0x94, 0x5d, 0x7a, 0x66, 0x49,
-	0x46, 0x69, 0x92, 0x5e, 0x72, 0x7e, 0xae, 0x7e, 0x7a, 0x7e, 0x7a, 0xbe, 0x3e, 0x58, 0x5b, 0x52,
-	0x69, 0x1a, 0x84, 0x91, 0xac, 0x9b, 0x9e, 0x9a, 0xa7, 0x0b, 0x96, 0x00, 0x99, 0x91, 0x92, 0x58,
-	0x92, 0x08, 0xb6, 0xc3, 0x1a, 0x6a, 0x62, 0x12, 0x1b, 0x58, 0x99, 0x31, 0x20, 0x00, 0x00, 0xff,
-	0xff, 0x15, 0xf0, 0x09, 0x1e, 0x7f, 0x00, 0x00, 0x00,
+	0x90, 0x64, 0x70, 0x6a, 0x51, 0x59, 0x66, 0x72, 0xaa, 0x93, 0x73, 0x94, 0x63, 0x7a, 0x66, 0x49,
+	0x46, 0x69, 0x92, 0x5e, 0x72, 0x7e, 0xae, 0x7e, 0x49, 0x51, 0x7e, 0x9e, 0x6e, 0x69, 0xb1, 0x3e,
+	0x58, 0x67, 0x52, 0x69, 0x1a, 0x84, 0x91, 0xac, 0x9b, 0x9e, 0x9a, 0xa7, 0x9b, 0x9e, 0x9f, 0x9e,
+	0xaf, 0x0f, 0x32, 0x26, 0x25, 0xb1, 0x24, 0x11, 0x6c, 0x8d, 0x35, 0xd4, 0xd0, 0x24, 0x36, 0xb0,
+	0x32, 0x63, 0x40, 0x00, 0x00, 0x00, 0xff, 0xff, 0xf3, 0xfe, 0xe3, 0x15, 0x82, 0x00, 0x00, 0x00,
 }
 
 // Reference imports to suppress errors if they are not otherwise used.
diff --git a/protoc-gen-gogo/testdata/grpc/grpc_empty.proto b/protoc-gen-gogo/testdata/grpc/grpc_empty.proto
index dd7e6c1271..6fdbf5ce05 100755
--- a/protoc-gen-gogo/testdata/grpc/grpc_empty.proto
+++ b/protoc-gen-gogo/testdata/grpc/grpc_empty.proto
@@ -33,6 +33,6 @@ syntax = "proto3";
 
 package grpc.testing;
 
-option go_package = "github.com/gogo/protobuf/protoc-gen-gogo/testdata/grpc;testing";
+option go_package = "github.com/tron-us/protobuf/protoc-gen-gogo/testdata/grpc;testing";
 
 service EmptyService {}
diff --git a/protoc-gen-gogo/testdata/import_public/a.pb.go b/protoc-gen-gogo/testdata/import_public/a.pb.go
index 878550e88f..b7beefdb4a 100644
--- a/protoc-gen-gogo/testdata/import_public/a.pb.go
+++ b/protoc-gen-gogo/testdata/import_public/a.pb.go
@@ -6,7 +6,7 @@ package import_public
 import (
 	fmt "fmt"
 	proto "github.com/gogo/protobuf/proto"
-	sub "github.com/gogo/protobuf/protoc-gen-gogo/testdata/import_public/sub"
+	sub "github.com/tron-us/protobuf/protoc-gen-gogo/testdata/import_public/sub"
 	math "math"
 )
 
@@ -123,17 +123,18 @@ func init() {
 func init() { proto.RegisterFile("import_public/a.proto", fileDescriptor_73b7577c95fa6b70) }
 
 var fileDescriptor_73b7577c95fa6b70 = []byte{
-	// 192 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0x12, 0xcd, 0xcc, 0x2d, 0xc8,
-	0x2f, 0x2a, 0x89, 0x2f, 0x28, 0x4d, 0xca, 0xc9, 0x4c, 0xd6, 0x4f, 0xd4, 0x2b, 0x28, 0xca, 0x2f,
-	0xc9, 0x17, 0x92, 0x4a, 0xcf, 0x07, 0x33, 0xf4, 0x4a, 0x52, 0x8b, 0x4b, 0xf4, 0x50, 0xd4, 0x48,
-	0x49, 0xa2, 0x6a, 0x29, 0x2e, 0x4d, 0x82, 0x69, 0x93, 0x42, 0x33, 0x2d, 0x09, 0x22, 0xac, 0xb4,
-	0x98, 0x91, 0x8b, 0x2d, 0x00, 0x2c, 0x24, 0xa4, 0xcf, 0xc5, 0x98, 0x2b, 0xc1, 0xa8, 0xc0, 0xa8,
-	0xc1, 0x6d, 0xa4, 0xa8, 0x87, 0xdb, 0x12, 0xbd, 0xe2, 0xd2, 0x24, 0x3d, 0xdf, 0x20, 0xc6, 0x5c,
-	0x90, 0x86, 0x54, 0x09, 0x26, 0x05, 0x46, 0x0d, 0x3e, 0xc2, 0x1a, 0x5c, 0x83, 0x18, 0x53, 0x85,
-	0xcc, 0xb9, 0x58, 0x73, 0xf2, 0x93, 0x13, 0x73, 0x24, 0x98, 0x09, 0xdb, 0xe2, 0x03, 0x52, 0x18,
-	0x04, 0x51, 0xef, 0xe4, 0x18, 0x65, 0x9f, 0x9e, 0x59, 0x92, 0x51, 0x9a, 0xa4, 0x97, 0x9c, 0x9f,
-	0xab, 0x9f, 0x9e, 0x9f, 0x9e, 0xaf, 0x0f, 0xd6, 0x98, 0x54, 0x9a, 0x06, 0x61, 0x24, 0xeb, 0xa6,
-	0xa7, 0xe6, 0xe9, 0x82, 0x25, 0x40, 0x66, 0xa5, 0x24, 0x96, 0x24, 0xea, 0xa3, 0x98, 0x17, 0xc0,
-	0x10, 0xc0, 0x08, 0x08, 0x00, 0x00, 0xff, 0xff, 0x4b, 0xfb, 0x07, 0xae, 0x52, 0x01, 0x00, 0x00,
+	// 198 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x84, 0x8d, 0x31, 0xcb, 0xc2, 0x30,
+	0x18, 0x84, 0xbf, 0xf7, 0x13, 0x1d, 0x22, 0x38, 0x14, 0x84, 0xda, 0xa9, 0x3a, 0x75, 0x69, 0x02,
+	0x2e, 0xee, 0x45, 0x37, 0x85, 0xd2, 0xd1, 0x45, 0x92, 0x18, 0x63, 0xa1, 0xe9, 0x5b, 0x9a, 0xe4,
+	0x17, 0xf9, 0x47, 0xa5, 0x2d, 0x0e, 0x15, 0xa4, 0xdb, 0x71, 0xdc, 0xf3, 0x1c, 0x59, 0x97, 0xa6,
+	0xc1, 0xd6, 0xdd, 0x1a, 0x2f, 0xaa, 0x52, 0x32, 0x4e, 0x9b, 0x16, 0x1d, 0x06, 0x91, 0xc6, 0x3e,
+	0x50, 0xa7, 0xac, 0xa3, 0xa3, 0x4d, 0xb4, 0x19, 0x23, 0xd6, 0x8b, 0x0f, 0x16, 0x7d, 0xd9, 0xc4,
+	0x50, 0xef, 0x5e, 0x40, 0x16, 0x79, 0x5f, 0x05, 0x8c, 0x80, 0x09, 0x21, 0x86, 0x64, 0xb9, 0xdf,
+	0xd2, 0xdf, 0x27, 0xd4, 0x7a, 0x41, 0x2f, 0x05, 0x98, 0x0e, 0x50, 0xe1, 0x7f, 0x0c, 0xc9, 0x6a,
+	0x1a, 0x38, 0x15, 0xa0, 0x82, 0x03, 0x99, 0x57, 0x28, 0x79, 0x15, 0xce, 0xa6, 0x5f, 0xce, 0xdd,
+	0xb0, 0x18, 0xf6, 0xd9, 0xf1, 0x9a, 0xe9, 0xd2, 0x3d, 0xbd, 0xa0, 0x12, 0x0d, 0x73, 0x2d, 0xd6,
+	0xa9, 0xb7, 0xac, 0x67, 0x85, 0x7f, 0x0c, 0x41, 0xa6, 0x5a, 0xd5, 0xa9, 0x46, 0x8d, 0xac, 0xd3,
+	0xdd, 0xb9, 0xe3, 0x6c, 0xa4, 0xcc, 0xff, 0x72, 0x78, 0x07, 0x00, 0x00, 0xff, 0xff, 0x69, 0xe2,
+	0x5d, 0xf0, 0x55, 0x01, 0x00, 0x00,
 }
diff --git a/protoc-gen-gogo/testdata/import_public/a.proto b/protoc-gen-gogo/testdata/import_public/a.proto
index 955a707b9c..4a49d6723e 100644
--- a/protoc-gen-gogo/testdata/import_public/a.proto
+++ b/protoc-gen-gogo/testdata/import_public/a.proto
@@ -33,7 +33,7 @@ syntax = "proto2";
 
 package goproto.test.import_public;
 
-option go_package = "github.com/gogo/protobuf/protoc-gen-gogo/testdata/import_public";
+option go_package = "github.com/tron-us/protobuf/protoc-gen-gogo/testdata/import_public";
 
 import public "import_public/sub/a.proto"; // Different Go package.
 import public "import_public/b.proto";     // Same Go package.
diff --git a/protoc-gen-gogo/testdata/import_public/b.pb.go b/protoc-gen-gogo/testdata/import_public/b.pb.go
index b0923e6289..1cc2359953 100644
--- a/protoc-gen-gogo/testdata/import_public/b.pb.go
+++ b/protoc-gen-gogo/testdata/import_public/b.pb.go
@@ -6,7 +6,7 @@ package import_public
 import (
 	fmt "fmt"
 	proto "github.com/gogo/protobuf/proto"
-	sub "github.com/gogo/protobuf/protoc-gen-gogo/testdata/import_public/sub"
+	sub "github.com/tron-us/protobuf/protoc-gen-gogo/testdata/import_public/sub"
 	math "math"
 )
 
@@ -74,16 +74,16 @@ func init() {
 func init() { proto.RegisterFile("import_public/b.proto", fileDescriptor_84995586b3d09710) }
 
 var fileDescriptor_84995586b3d09710 = []byte{
-	// 166 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0x12, 0xcd, 0xcc, 0x2d, 0xc8,
-	0x2f, 0x2a, 0x89, 0x2f, 0x28, 0x4d, 0xca, 0xc9, 0x4c, 0xd6, 0x4f, 0xd2, 0x2b, 0x28, 0xca, 0x2f,
-	0xc9, 0x17, 0x92, 0x4a, 0xcf, 0x07, 0x33, 0xf4, 0x4a, 0x52, 0x8b, 0x4b, 0xf4, 0x50, 0xd4, 0x48,
-	0x49, 0xa2, 0x6a, 0x29, 0x2e, 0x4d, 0xd2, 0x4f, 0x84, 0x68, 0x53, 0xca, 0xe4, 0x62, 0xf5, 0xc9,
-	0x4f, 0x4e, 0xcc, 0x11, 0xd2, 0xe7, 0x62, 0xcc, 0x95, 0x60, 0x54, 0x60, 0xd4, 0xe0, 0x36, 0x52,
-	0xd4, 0xc3, 0x6d, 0x96, 0x5e, 0x71, 0x69, 0x92, 0x9e, 0x6f, 0x10, 0x63, 0x2e, 0x48, 0x43, 0xaa,
-	0x04, 0x93, 0x02, 0xa3, 0x06, 0x1f, 0x61, 0x0d, 0xae, 0x41, 0x8c, 0xa9, 0x4e, 0x8e, 0x51, 0xf6,
-	0xe9, 0x99, 0x25, 0x19, 0xa5, 0x49, 0x7a, 0xc9, 0xf9, 0xb9, 0xfa, 0xe9, 0xf9, 0xe9, 0xf9, 0xfa,
-	0x60, 0x4d, 0x49, 0xa5, 0x69, 0x10, 0x46, 0xb2, 0x6e, 0x7a, 0x6a, 0x9e, 0x2e, 0x58, 0x02, 0x64,
-	0x4e, 0x4a, 0x62, 0x49, 0xa2, 0x3e, 0x8a, 0x59, 0x80, 0x00, 0x00, 0x00, 0xff, 0xff, 0xb0, 0xbb,
-	0x8d, 0x44, 0xfc, 0x00, 0x00, 0x00,
+	// 171 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x84, 0xcc, 0x31, 0xcb, 0xc2, 0x30,
+	0x10, 0xc6, 0x71, 0xf2, 0xc2, 0xbb, 0x54, 0x70, 0x28, 0x08, 0xb5, 0x53, 0x75, 0xea, 0xd2, 0x3b,
+	0xf0, 0x23, 0x14, 0xdd, 0x74, 0xe9, 0xe8, 0x22, 0x49, 0x8c, 0x31, 0xd0, 0xf4, 0x4a, 0x73, 0xf9,
+	0xfe, 0xd2, 0x76, 0xca, 0x20, 0x6e, 0xcf, 0xf0, 0xfc, 0xfe, 0xd9, 0xce, 0xf9, 0x91, 0x26, 0x7e,
+	0x8c, 0x51, 0xf5, 0x4e, 0xa3, 0x82, 0x71, 0x22, 0xa6, 0xbc, 0xb4, 0xb4, 0x0c, 0x60, 0x13, 0x18,
+	0x92, 0x4f, 0xb9, 0x4f, 0x49, 0x88, 0x0a, 0xe5, 0xca, 0x8e, 0x2e, 0xfb, 0xbf, 0x92, 0x96, 0x7d,
+	0x8e, 0x99, 0xf0, 0x85, 0xa8, 0x44, 0xbd, 0x39, 0x1d, 0xe0, 0x7b, 0x0b, 0x42, 0x54, 0x70, 0xeb,
+	0x84, 0x9f, 0x81, 0x29, 0xfe, 0x2a, 0x51, 0x6f, 0x7f, 0x83, 0x4b, 0x27, 0x4c, 0x7b, 0xbe, 0xb7,
+	0xd6, 0xf1, 0x3b, 0x2a, 0xd0, 0xe4, 0x91, 0x27, 0x1a, 0x9a, 0x18, 0x70, 0x71, 0x2a, 0xbe, 0xd6,
+	0xa1, 0x1b, 0x6b, 0x86, 0xc6, 0x92, 0x25, 0x9c, 0x53, 0x4f, 0xc9, 0x12, 0x93, 0xdc, 0x27, 0x00,
+	0x00, 0xff, 0xff, 0x8c, 0x49, 0x40, 0x30, 0xff, 0x00, 0x00, 0x00,
 }
diff --git a/protoc-gen-gogo/testdata/import_public/b.proto b/protoc-gen-gogo/testdata/import_public/b.proto
index 22bcff009c..ec73a21290 100644
--- a/protoc-gen-gogo/testdata/import_public/b.proto
+++ b/protoc-gen-gogo/testdata/import_public/b.proto
@@ -33,7 +33,7 @@ syntax = "proto2";
 
 package goproto.test.import_public;
 
-option go_package = "github.com/gogo/protobuf/protoc-gen-gogo/testdata/import_public";
+option go_package = "github.com/tron-us/protobuf/protoc-gen-gogo/testdata/import_public";
 
 import "import_public/sub/a.proto";
 
diff --git a/protoc-gen-gogo/testdata/import_public/importing/importing.pb.go b/protoc-gen-gogo/testdata/import_public/importing/importing.pb.go
index 6415759449..355c42bac2 100644
--- a/protoc-gen-gogo/testdata/import_public/importing/importing.pb.go
+++ b/protoc-gen-gogo/testdata/import_public/importing/importing.pb.go
@@ -6,8 +6,8 @@ package importing
 import (
 	fmt "fmt"
 	proto "github.com/gogo/protobuf/proto"
-	_ "github.com/gogo/protobuf/protoc-gen-gogo/testdata/import_public"
-	sub "github.com/gogo/protobuf/protoc-gen-gogo/testdata/import_public/sub"
+	_ "github.com/tron-us/protobuf/protoc-gen-gogo/testdata/import_public"
+	sub "github.com/tron-us/protobuf/protoc-gen-gogo/testdata/import_public/sub"
 	math "math"
 )
 
diff --git a/protoc-gen-gogo/testdata/import_public/sub/a.pb.go b/protoc-gen-gogo/testdata/import_public/sub/a.pb.go
index f8430ef02f..33089a08aa 100644
--- a/protoc-gen-gogo/testdata/import_public/sub/a.pb.go
+++ b/protoc-gen-gogo/testdata/import_public/sub/a.pb.go
@@ -372,31 +372,31 @@ func init() {
 func init() { proto.RegisterFile("import_public/sub/a.proto", fileDescriptor_382f7805394b5c4e) }
 
 var fileDescriptor_382f7805394b5c4e = []byte{
-	// 407 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x8c, 0x92, 0xcf, 0x6e, 0x9b, 0x40,
-	0x10, 0xc6, 0xb3, 0xc6, 0x49, 0x9d, 0x71, 0xdd, 0x3f, 0xab, 0xa6, 0xa2, 0x39, 0xb4, 0x94, 0x13,
-	0x4a, 0x94, 0x45, 0xa2, 0x88, 0x43, 0x6e, 0x75, 0x45, 0xd2, 0xaa, 0x42, 0x91, 0x40, 0xbd, 0xe4,
-	0x82, 0x58, 0xb3, 0x6c, 0x91, 0x0c, 0x8b, 0xcc, 0xae, 0xd4, 0x47, 0xe8, 0x7b, 0xf5, 0xc5, 0x2a,
-	0x16, 0xb0, 0x63, 0xd5, 0x6d, 0x73, 0x5b, 0xe6, 0xfb, 0x7e, 0x33, 0x9a, 0x8f, 0x81, 0x37, 0x65,
-	0xd5, 0x88, 0x8d, 0x4c, 0x1b, 0x45, 0xd7, 0xe5, 0xca, 0x6d, 0x15, 0x75, 0x33, 0xd2, 0x6c, 0x84,
-	0x14, 0xf8, 0x2d, 0x17, 0xfa, 0x41, 0x24, 0x6b, 0x25, 0xd9, 0xf3, 0x91, 0x56, 0xd1, 0xf3, 0x03,
-	0x28, 0xed, 0x51, 0xfb, 0xe7, 0x14, 0x50, 0x84, 0x3d, 0x98, 0x54, 0x9e, 0x89, 0x2c, 0xe4, 0xcc,
-	0x3d, 0x9b, 0xfc, 0xbb, 0x1b, 0x89, 0xbc, 0x78, 0x52, 0x79, 0xf8, 0x3d, 0xcc, 0x45, 0xcd, 0x44,
-	0x91, 0x96, 0xb5, 0xfc, 0xe0, 0x99, 0x13, 0x0b, 0x39, 0xc7, 0x9f, 0x8f, 0x62, 0xd0, 0xc5, 0x2f,
-	0x5d, 0x6d, 0xcf, 0x12, 0xf8, 0xa6, 0x61, 0x21, 0xc7, 0x78, 0x68, 0x09, 0x7c, 0x7c, 0x03, 0x33,
-	0xbe, 0x11, 0xaa, 0x29, 0x6b, 0x6e, 0x4e, 0x2d, 0xe4, 0x80, 0x77, 0xf1, 0xdf, 0xf9, 0xe4, 0x76,
-	0x20, 0xe2, 0x2d, 0x8b, 0x1d, 0x58, 0xe4, 0xac, 0xc8, 0xd4, 0x5a, 0xa6, 0x45, 0xc9, 0xd6, 0xb9,
-	0x79, 0x62, 0x21, 0xe7, 0xf4, 0xda, 0xc8, 0x59, 0x11, 0x3f, 0x1d, 0x94, 0x9b, 0x4e, 0x38, 0xbf,
-	0x84, 0xd9, 0xc8, 0xe3, 0x77, 0x30, 0xd7, 0x1d, 0x06, 0xe6, 0xb8, 0x63, 0x62, 0xd0, 0xa5, 0xde,
-	0xfc, 0x0b, 0x01, 0x24, 0x8a, 0x56, 0xac, 0x6d, 0x33, 0xce, 0x70, 0x00, 0xaf, 0xdb, 0xed, 0x57,
-	0xfa, 0x70, 0x7d, 0x34, 0xac, 0xff, 0x6a, 0xa7, 0xdf, 0xed, 0x82, 0xf8, 0x0b, 0x17, 0xf8, 0x3a,
-	0x36, 0xe3, 0x30, 0x17, 0xf8, 0xf6, 0x25, 0xe0, 0xdd, 0xf4, 0x34, 0x51, 0x94, 0xd5, 0xaa, 0xc2,
-	0x67, 0xf0, 0x32, 0x4a, 0x93, 0x6f, 0xcb, 0x28, 0x4c, 0x92, 0x8f, 0xb7, 0x61, 0x7a, 0x1f, 0xc6,
-	0x77, 0x2f, 0x8e, 0x96, 0xe6, 0x81, 0x21, 0x7a, 0x2f, 0xfb, 0x0c, 0x9e, 0x8c, 0x2c, 0xc0, 0x49,
-	0x34, 0x02, 0x8b, 0xf1, 0xf7, 0x68, 0xd7, 0xc5, 0x02, 0x50, 0x88, 0x67, 0x30, 0xed, 0xd5, 0xeb,
-	0xaf, 0xf0, 0x9c, 0xfd, 0x90, 0xac, 0x6e, 0x4b, 0x51, 0xf7, 0x0e, 0xfc, 0x88, 0xd3, 0xd0, 0x41,
-	0x9c, 0xc6, 0xcf, 0xb6, 0xa8, 0xce, 0x71, 0x19, 0xde, 0x7f, 0xe2, 0xa5, 0xfc, 0xae, 0x28, 0x59,
-	0x89, 0xca, 0xe5, 0x82, 0x0b, 0x57, 0x37, 0xa2, 0xaa, 0xe8, 0x1f, 0xab, 0x2b, 0xce, 0xea, 0x2b,
-	0x2d, 0x74, 0xbd, 0xf3, 0x4c, 0x66, 0xee, 0x1f, 0x57, 0xfb, 0x3b, 0x00, 0x00, 0xff, 0xff, 0x4f,
-	0x37, 0x1b, 0x7d, 0x04, 0x03, 0x00, 0x00,
+	// 413 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x8c, 0x92, 0xdf, 0x6a, 0xdb, 0x30,
+	0x14, 0xc6, 0xab, 0x24, 0xed, 0xd2, 0x93, 0x65, 0x7f, 0xc4, 0x3a, 0xbc, 0x5e, 0x6c, 0x5e, 0xae,
+	0x4c, 0x4b, 0x64, 0xf0, 0x82, 0x2f, 0x7a, 0xb7, 0x40, 0xd2, 0x8e, 0x61, 0x0a, 0x36, 0xbb, 0xe9,
+	0x8d, 0xb1, 0x12, 0x59, 0x33, 0xc4, 0x52, 0xb0, 0x24, 0xd8, 0x23, 0xec, 0xbd, 0xf6, 0x62, 0xc3,
+	0xb2, 0x9d, 0x34, 0x2c, 0xdb, 0x7a, 0x27, 0x9f, 0xf3, 0xfd, 0xbe, 0xc3, 0xf9, 0x7c, 0xe0, 0x5d,
+	0x51, 0x6e, 0x65, 0xa5, 0xd3, 0xad, 0xa1, 0x9b, 0x62, 0xe5, 0x2b, 0x43, 0xfd, 0x8c, 0x6c, 0x2b,
+	0xa9, 0x25, 0x7e, 0xcf, 0xa5, 0x7d, 0x10, 0xcd, 0x94, 0x26, 0x07, 0x3a, 0xa2, 0x0c, 0xbd, 0x3c,
+	0x82, 0xd2, 0x06, 0x9d, 0xfc, 0x1c, 0x00, 0x8a, 0x70, 0x00, 0xbd, 0x32, 0x70, 0x90, 0x8b, 0xbc,
+	0x51, 0x30, 0x21, 0xff, 0x76, 0x23, 0x51, 0x10, 0xf7, 0xca, 0x00, 0x7f, 0x84, 0x91, 0x14, 0x4c,
+	0xe6, 0x69, 0x21, 0xf4, 0xa7, 0xc0, 0xe9, 0xb9, 0xc8, 0x3b, 0xbd, 0x3b, 0x89, 0xc1, 0x16, 0xbf,
+	0xd4, 0xb5, 0x03, 0x49, 0x38, 0x73, 0xfa, 0x2e, 0xf2, 0xfa, 0x8f, 0x25, 0xe1, 0x0c, 0x2f, 0x61,
+	0xc8, 0x2b, 0x69, 0xb6, 0x85, 0xe0, 0xce, 0xc0, 0x45, 0x1e, 0x04, 0x57, 0xff, 0x9d, 0x4f, 0x6e,
+	0x5b, 0x22, 0xde, 0xb1, 0xd8, 0x83, 0xf1, 0x9a, 0xe5, 0x99, 0xd9, 0xe8, 0x34, 0x2f, 0xd8, 0x66,
+	0xed, 0x9c, 0xb9, 0xc8, 0x3b, 0xbf, 0xe9, 0xaf, 0x59, 0x1e, 0x3f, 0x6f, 0x3b, 0xcb, 0xba, 0x71,
+	0x79, 0x0d, 0xc3, 0x8e, 0xc7, 0x1f, 0x60, 0x64, 0x1d, 0x5a, 0xe6, 0xb4, 0x66, 0x62, 0xb0, 0xa5,
+	0x46, 0xfc, 0x0b, 0x01, 0x24, 0x86, 0x96, 0x4c, 0xa9, 0x8c, 0x33, 0x1c, 0xc2, 0x5b, 0xb5, 0xfb,
+	0x4a, 0x1f, 0xaf, 0x8f, 0xda, 0xf5, 0xdf, 0xec, 0xfb, 0xf7, 0xfb, 0x20, 0xfe, 0xc2, 0x85, 0x33,
+	0x1b, 0x5b, 0xff, 0x38, 0x17, 0xce, 0x26, 0xd7, 0x80, 0xf7, 0xd3, 0xd3, 0xc4, 0x50, 0x26, 0x4c,
+	0x89, 0x2f, 0xe0, 0x75, 0x94, 0x26, 0xdf, 0xe6, 0xd1, 0x22, 0x49, 0x3e, 0xdf, 0x2e, 0xd2, 0x87,
+	0x45, 0x7c, 0xff, 0xea, 0x64, 0xee, 0x1c, 0x19, 0x62, 0xf7, 0x9a, 0x5c, 0xc0, 0xb3, 0x8e, 0x05,
+	0x38, 0x8b, 0x3a, 0x60, 0xdc, 0xfd, 0x1e, 0xab, 0xba, 0x1a, 0x03, 0x5a, 0xe0, 0x21, 0x0c, 0x9a,
+	0xee, 0xcd, 0x57, 0x78, 0xc9, 0x7e, 0x68, 0x26, 0x54, 0x21, 0x45, 0xa3, 0xc0, 0x4f, 0x38, 0x0d,
+	0x1b, 0xc4, 0x79, 0xfc, 0x62, 0x87, 0xda, 0x1c, 0xe7, 0x77, 0x0f, 0x4b, 0x5e, 0xe8, 0xef, 0x86,
+	0x92, 0x95, 0x2c, 0x7d, 0x5d, 0x49, 0x31, 0x35, 0xca, 0xb7, 0x5e, 0xd4, 0xe4, 0xcd, 0x63, 0x35,
+	0xe5, 0x4c, 0x4c, 0xb9, 0xe4, 0xd2, 0xaf, 0xed, 0xd7, 0x99, 0xce, 0xfc, 0x3f, 0x0e, 0xf7, 0x77,
+	0x00, 0x00, 0x00, 0xff, 0xff, 0x1d, 0x04, 0x14, 0xdb, 0x07, 0x03, 0x00, 0x00,
 }
diff --git a/protoc-gen-gogo/testdata/import_public/sub/a.proto b/protoc-gen-gogo/testdata/import_public/sub/a.proto
index 4ca0cacca1..32fd3582fc 100644
--- a/protoc-gen-gogo/testdata/import_public/sub/a.proto
+++ b/protoc-gen-gogo/testdata/import_public/sub/a.proto
@@ -33,7 +33,7 @@ syntax = "proto2";
 
 package goproto.test.import_public.sub;
 
-option go_package = "github.com/gogo/protobuf/protoc-gen-gogo/testdata/import_public/sub";
+option go_package = "github.com/tron-us/protobuf/protoc-gen-gogo/testdata/import_public/sub";
 
 import "import_public/sub/b.proto";
 
diff --git a/protoc-gen-gogo/testdata/import_public/sub/b.pb.go b/protoc-gen-gogo/testdata/import_public/sub/b.pb.go
index ed178f929d..dc620f2bb4 100644
--- a/protoc-gen-gogo/testdata/import_public/sub/b.pb.go
+++ b/protoc-gen-gogo/testdata/import_public/sub/b.pb.go
@@ -67,14 +67,14 @@ func init() {
 func init() { proto.RegisterFile("import_public/sub/b.proto", fileDescriptor_fc66afda3d7c2232) }
 
 var fileDescriptor_fc66afda3d7c2232 = []byte{
-	// 129 bytes of a gzipped FileDescriptorProto
+	// 135 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0x92, 0xcc, 0xcc, 0x2d, 0xc8,
 	0x2f, 0x2a, 0x89, 0x2f, 0x28, 0x4d, 0xca, 0xc9, 0x4c, 0xd6, 0x2f, 0x2e, 0x4d, 0xd2, 0x4f, 0xd2,
 	0x2b, 0x28, 0xca, 0x2f, 0xc9, 0x17, 0x92, 0x4b, 0xcf, 0x07, 0x33, 0xf4, 0x4a, 0x52, 0x8b, 0x4b,
 	0xf4, 0x50, 0xd4, 0xe9, 0x15, 0x97, 0x26, 0x29, 0xf1, 0x71, 0x31, 0xf9, 0x1a, 0x69, 0x71, 0x70,
-	0x30, 0x0a, 0x34, 0x34, 0x34, 0x34, 0x30, 0x39, 0xb9, 0x46, 0x39, 0xa7, 0x67, 0x96, 0x64, 0x94,
-	0x26, 0xe9, 0x25, 0xe7, 0xe7, 0xea, 0xa7, 0xe7, 0xa7, 0xe7, 0xeb, 0x83, 0xf5, 0x27, 0x95, 0xa6,
-	0x41, 0x18, 0xc9, 0xba, 0xe9, 0xa9, 0x79, 0xba, 0x60, 0x09, 0x90, 0x91, 0x29, 0x89, 0x25, 0x89,
-	0xfa, 0x18, 0xd6, 0x03, 0x02, 0x00, 0x00, 0xff, 0xff, 0xdb, 0x3c, 0x08, 0x57, 0x92, 0x00, 0x00,
-	0x00,
+	0x30, 0x0a, 0x34, 0x34, 0x34, 0x34, 0x30, 0x39, 0x79, 0x44, 0xb9, 0xa5, 0x67, 0x96, 0x64, 0x94,
+	0x26, 0xe9, 0x25, 0xe7, 0xe7, 0xea, 0x97, 0x14, 0xe5, 0xe7, 0xe9, 0x96, 0x16, 0xeb, 0x83, 0x8d,
+	0x48, 0x2a, 0x4d, 0x83, 0x30, 0x92, 0x75, 0xd3, 0x53, 0xf3, 0x74, 0xd3, 0xf3, 0xd3, 0xf3, 0xf5,
+	0x41, 0xa6, 0xa6, 0x24, 0x96, 0x24, 0xea, 0x63, 0xb8, 0x00, 0x10, 0x00, 0x00, 0xff, 0xff, 0x0e,
+	0x8c, 0x44, 0x46, 0x95, 0x00, 0x00, 0x00,
 }
diff --git a/protoc-gen-gogo/testdata/import_public/sub/b.proto b/protoc-gen-gogo/testdata/import_public/sub/b.proto
index e9044823f0..142ea50ab6 100644
--- a/protoc-gen-gogo/testdata/import_public/sub/b.proto
+++ b/protoc-gen-gogo/testdata/import_public/sub/b.proto
@@ -33,7 +33,7 @@ syntax = "proto2";
 
 package goproto.test.import_public.sub;
 
-option go_package = "github.com/gogo/protobuf/protoc-gen-gogo/testdata/import_public/sub";
+option go_package = "github.com/tron-us/protobuf/protoc-gen-gogo/testdata/import_public/sub";
 
 message M2 {
   extensions 1 to max;
diff --git a/protoc-gen-gogo/testdata/imports/fmt/m.pb.go b/protoc-gen-gogo/testdata/imports/fmt/m.pb.go
index 1f2d716548..ff8afa548c 100644
--- a/protoc-gen-gogo/testdata/imports/fmt/m.pb.go
+++ b/protoc-gen-gogo/testdata/imports/fmt/m.pb.go
@@ -57,12 +57,12 @@ func init() {
 func init() { proto.RegisterFile("imports/fmt/m.proto", fileDescriptor_72c126fcd452e392) }
 
 var fileDescriptor_72c126fcd452e392 = []byte{
-	// 106 bytes of a gzipped FileDescriptorProto
+	// 112 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0x12, 0xce, 0xcc, 0x2d, 0xc8,
 	0x2f, 0x2a, 0x29, 0xd6, 0x4f, 0xcb, 0x2d, 0xd1, 0xcf, 0xd5, 0x2b, 0x28, 0xca, 0x2f, 0xc9, 0x17,
-	0x62, 0x4e, 0xcb, 0x2d, 0x51, 0x62, 0xe6, 0x62, 0xf4, 0x75, 0xb2, 0x8f, 0xb2, 0x4d, 0xcf, 0x2c,
-	0xc9, 0x28, 0x4d, 0xd2, 0x4b, 0xce, 0xcf, 0xd5, 0x4f, 0xcf, 0x4f, 0xcf, 0xd7, 0x07, 0x2b, 0x49,
-	0x2a, 0x4d, 0x83, 0x30, 0x92, 0x75, 0xd3, 0x53, 0xf3, 0x74, 0xc1, 0x12, 0x25, 0xa9, 0xc5, 0x25,
-	0x29, 0x89, 0x25, 0x89, 0xfa, 0x48, 0x46, 0x26, 0xb1, 0x81, 0x55, 0x19, 0x03, 0x02, 0x00, 0x00,
-	0xff, 0xff, 0xb8, 0x58, 0x3e, 0xf6, 0x68, 0x00, 0x00, 0x00,
+	0x62, 0x4e, 0xcb, 0x2d, 0x51, 0x62, 0xe6, 0x62, 0xf4, 0x75, 0x72, 0x8a, 0x72, 0x48, 0xcf, 0x2c,
+	0xc9, 0x28, 0x4d, 0xd2, 0x4b, 0xce, 0xcf, 0xd5, 0x2f, 0x29, 0xca, 0xcf, 0xd3, 0x2d, 0x2d, 0xd6,
+	0x07, 0xab, 0x4a, 0x2a, 0x4d, 0x83, 0x30, 0x92, 0x75, 0xd3, 0x53, 0xf3, 0x74, 0xd3, 0xf3, 0xd3,
+	0xf3, 0xf5, 0x4b, 0x52, 0x8b, 0x4b, 0x52, 0x12, 0x4b, 0x12, 0xf5, 0x91, 0x4c, 0x4d, 0x62, 0x03,
+	0xab, 0x32, 0x06, 0x04, 0x00, 0x00, 0xff, 0xff, 0x1e, 0x83, 0xd2, 0xc0, 0x6b, 0x00, 0x00, 0x00,
 }
diff --git a/protoc-gen-gogo/testdata/imports/fmt/m.proto b/protoc-gen-gogo/testdata/imports/fmt/m.proto
index 8331868144..587a7a19dc 100644
--- a/protoc-gen-gogo/testdata/imports/fmt/m.proto
+++ b/protoc-gen-gogo/testdata/imports/fmt/m.proto
@@ -31,5 +31,5 @@
 
 syntax = "proto3";
 package fmt;
-option go_package = "github.com/gogo/protobuf/protoc-gen-gogo/testdata/imports/fmt";
+option go_package = "github.com/tron-us/protobuf/protoc-gen-gogo/testdata/imports/fmt";
 message M {}
diff --git a/protoc-gen-gogo/testdata/imports/test_a_1/m1.pb.go b/protoc-gen-gogo/testdata/imports/test_a_1/m1.pb.go
index f76cdedcc8..cd29908c8e 100644
--- a/protoc-gen-gogo/testdata/imports/test_a_1/m1.pb.go
+++ b/protoc-gen-gogo/testdata/imports/test_a_1/m1.pb.go
@@ -119,16 +119,16 @@ func init() {
 func init() { proto.RegisterFile("imports/test_a_1/m1.proto", fileDescriptor_c1091de3fa870a14) }
 
 var fileDescriptor_c1091de3fa870a14 = []byte{
-	// 163 bytes of a gzipped FileDescriptorProto
+	// 168 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0x92, 0xcc, 0xcc, 0x2d, 0xc8,
 	0x2f, 0x2a, 0x29, 0xd6, 0x2f, 0x49, 0x2d, 0x2e, 0x89, 0x4f, 0x8c, 0x37, 0xd4, 0xcf, 0x35, 0xd4,
 	0x2b, 0x28, 0xca, 0x2f, 0xc9, 0x17, 0x62, 0x03, 0x09, 0xe9, 0x25, 0x2a, 0xb1, 0x70, 0x31, 0xf9,
 	0x1a, 0x2a, 0x29, 0x71, 0xb1, 0xf8, 0x1a, 0xc6, 0x1b, 0x0a, 0x49, 0x71, 0x31, 0xe5, 0x1a, 0x4a,
 	0x30, 0x2a, 0x30, 0x6a, 0x70, 0x1b, 0x71, 0xe9, 0x41, 0x94, 0xe8, 0xf9, 0x1a, 0x06, 0x31, 0xe5,
 	0x1a, 0x6a, 0x09, 0x72, 0x31, 0xb9, 0x1a, 0x0a, 0x71, 0x73, 0xb1, 0xbb, 0x1a, 0xc6, 0x47, 0xb9,
-	0x06, 0xf9, 0x0b, 0x30, 0x38, 0xb9, 0x44, 0x39, 0xa5, 0x67, 0x96, 0x64, 0x94, 0x26, 0xe9, 0x25,
-	0xe7, 0xe7, 0xea, 0xa7, 0xe7, 0xa7, 0xe7, 0xeb, 0x83, 0x4d, 0x4f, 0x2a, 0x4d, 0x83, 0x30, 0x92,
-	0x75, 0xd3, 0x53, 0xf3, 0x74, 0xc1, 0x12, 0x20, 0xc3, 0x52, 0x12, 0x4b, 0x12, 0xf5, 0xd1, 0xdd,
-	0x94, 0xc4, 0x06, 0x56, 0x6a, 0x0c, 0x08, 0x00, 0x00, 0xff, 0xff, 0xfe, 0xd5, 0x3e, 0x41, 0xae,
-	0x00, 0x00, 0x00,
+	0x06, 0xf9, 0x0b, 0x30, 0x38, 0xb9, 0x47, 0xb9, 0xa6, 0x67, 0x96, 0x64, 0x94, 0x26, 0xe9, 0x25,
+	0xe7, 0xe7, 0xea, 0x97, 0x14, 0xe5, 0xe7, 0xe9, 0x96, 0x16, 0xeb, 0x83, 0x2d, 0x48, 0x2a, 0x4d,
+	0x83, 0x30, 0x92, 0x75, 0xd3, 0x53, 0xf3, 0x74, 0xd3, 0xf3, 0xd3, 0xf3, 0xc1, 0xae, 0x48, 0x49,
+	0x2c, 0x49, 0xd4, 0x47, 0x77, 0x56, 0x12, 0x1b, 0x58, 0xa9, 0x31, 0x20, 0x00, 0x00, 0xff, 0xff,
+	0x30, 0xdd, 0x37, 0x1b, 0xb1, 0x00, 0x00, 0x00,
 }
diff --git a/protoc-gen-gogo/testdata/imports/test_a_1/m1.proto b/protoc-gen-gogo/testdata/imports/test_a_1/m1.proto
index 21dcee2cd4..9901006bd1 100644
--- a/protoc-gen-gogo/testdata/imports/test_a_1/m1.proto
+++ b/protoc-gen-gogo/testdata/imports/test_a_1/m1.proto
@@ -31,7 +31,7 @@
 
 syntax = "proto3";
 package test.a;
-option go_package = "github.com/gogo/protobuf/protoc-gen-gogo/testdata/imports/test_a_1";
+option go_package = "github.com/tron-us/protobuf/protoc-gen-gogo/testdata/imports/test_a_1";
 
 message M1 {}
 
diff --git a/protoc-gen-gogo/testdata/imports/test_a_1/m2.pb.go b/protoc-gen-gogo/testdata/imports/test_a_1/m2.pb.go
index 2f34f8046d..7c1fd01b49 100644
--- a/protoc-gen-gogo/testdata/imports/test_a_1/m2.pb.go
+++ b/protoc-gen-gogo/testdata/imports/test_a_1/m2.pb.go
@@ -57,12 +57,13 @@ func init() {
 func init() { proto.RegisterFile("imports/test_a_1/m2.proto", fileDescriptor_20cf27515c0d621c) }
 
 var fileDescriptor_20cf27515c0d621c = []byte{
-	// 112 bytes of a gzipped FileDescriptorProto
+	// 117 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0x92, 0xcc, 0xcc, 0x2d, 0xc8,
 	0x2f, 0x2a, 0x29, 0xd6, 0x2f, 0x49, 0x2d, 0x2e, 0x89, 0x4f, 0x8c, 0x37, 0xd4, 0xcf, 0x35, 0xd2,
 	0x2b, 0x28, 0xca, 0x2f, 0xc9, 0x17, 0x62, 0x03, 0x09, 0xe9, 0x25, 0x2a, 0xb1, 0x70, 0x31, 0xf9,
-	0x1a, 0x39, 0xb9, 0x44, 0x39, 0xa5, 0x67, 0x96, 0x64, 0x94, 0x26, 0xe9, 0x25, 0xe7, 0xe7, 0xea,
-	0xa7, 0xe7, 0xa7, 0xe7, 0xeb, 0x83, 0x95, 0x25, 0x95, 0xa6, 0x41, 0x18, 0xc9, 0xba, 0xe9, 0xa9,
-	0x79, 0xba, 0x60, 0x09, 0x90, 0xc6, 0x94, 0xc4, 0x92, 0x44, 0x7d, 0x74, 0xc3, 0x93, 0xd8, 0xc0,
-	0x4a, 0x8d, 0x01, 0x01, 0x00, 0x00, 0xff, 0xff, 0xd1, 0x9b, 0x89, 0x4c, 0x77, 0x00, 0x00, 0x00,
+	0x1a, 0x39, 0xb9, 0x47, 0xb9, 0xa6, 0x67, 0x96, 0x64, 0x94, 0x26, 0xe9, 0x25, 0xe7, 0xe7, 0xea,
+	0x97, 0x14, 0xe5, 0xe7, 0xe9, 0x96, 0x16, 0xeb, 0x83, 0x55, 0x26, 0x95, 0xa6, 0x41, 0x18, 0xc9,
+	0xba, 0xe9, 0xa9, 0x79, 0xba, 0xe9, 0xf9, 0xe9, 0xf9, 0x60, 0xe3, 0x52, 0x12, 0x4b, 0x12, 0xf5,
+	0xd1, 0xcd, 0x4f, 0x62, 0x03, 0x2b, 0x35, 0x06, 0x04, 0x00, 0x00, 0xff, 0xff, 0x44, 0x98, 0xd9,
+	0x13, 0x7a, 0x00, 0x00, 0x00,
 }
diff --git a/protoc-gen-gogo/testdata/imports/test_a_1/m2.proto b/protoc-gen-gogo/testdata/imports/test_a_1/m2.proto
index bc79954f74..91d9863611 100644
--- a/protoc-gen-gogo/testdata/imports/test_a_1/m2.proto
+++ b/protoc-gen-gogo/testdata/imports/test_a_1/m2.proto
@@ -31,5 +31,5 @@
 
 syntax = "proto3";
 package test.a;
-option go_package = "github.com/gogo/protobuf/protoc-gen-gogo/testdata/imports/test_a_1";
+option go_package = "github.com/tron-us/protobuf/protoc-gen-gogo/testdata/imports/test_a_1";
 message M2 {}
diff --git a/protoc-gen-gogo/testdata/imports/test_a_2/m3.pb.go b/protoc-gen-gogo/testdata/imports/test_a_2/m3.pb.go
index 4d5d608fc1..6ffc04b838 100644
--- a/protoc-gen-gogo/testdata/imports/test_a_2/m3.pb.go
+++ b/protoc-gen-gogo/testdata/imports/test_a_2/m3.pb.go
@@ -57,12 +57,13 @@ func init() {
 func init() { proto.RegisterFile("imports/test_a_2/m3.proto", fileDescriptor_ff9d8f834875c9c5) }
 
 var fileDescriptor_ff9d8f834875c9c5 = []byte{
-	// 112 bytes of a gzipped FileDescriptorProto
+	// 117 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0x92, 0xcc, 0xcc, 0x2d, 0xc8,
 	0x2f, 0x2a, 0x29, 0xd6, 0x2f, 0x49, 0x2d, 0x2e, 0x89, 0x4f, 0x8c, 0x37, 0xd2, 0xcf, 0x35, 0xd6,
 	0x2b, 0x28, 0xca, 0x2f, 0xc9, 0x17, 0x62, 0x03, 0x09, 0xe9, 0x25, 0x2a, 0xb1, 0x70, 0x31, 0xf9,
-	0x1a, 0x3b, 0xb9, 0x44, 0x39, 0xa5, 0x67, 0x96, 0x64, 0x94, 0x26, 0xe9, 0x25, 0xe7, 0xe7, 0xea,
-	0xa7, 0xe7, 0xa7, 0xe7, 0xeb, 0x83, 0x95, 0x25, 0x95, 0xa6, 0x41, 0x18, 0xc9, 0xba, 0xe9, 0xa9,
-	0x79, 0xba, 0x60, 0x09, 0x90, 0xc6, 0x94, 0xc4, 0x92, 0x44, 0x7d, 0x74, 0xc3, 0x93, 0xd8, 0xc0,
-	0x4a, 0x8d, 0x01, 0x01, 0x00, 0x00, 0xff, 0xff, 0x11, 0xfd, 0xd0, 0xcb, 0x77, 0x00, 0x00, 0x00,
+	0x1a, 0x3b, 0xb9, 0x47, 0xb9, 0xa6, 0x67, 0x96, 0x64, 0x94, 0x26, 0xe9, 0x25, 0xe7, 0xe7, 0xea,
+	0x97, 0x14, 0xe5, 0xe7, 0xe9, 0x96, 0x16, 0xeb, 0x83, 0x55, 0x26, 0x95, 0xa6, 0x41, 0x18, 0xc9,
+	0xba, 0xe9, 0xa9, 0x79, 0xba, 0xe9, 0xf9, 0xe9, 0xf9, 0x60, 0xe3, 0x52, 0x12, 0x4b, 0x12, 0xf5,
+	0xd1, 0xcd, 0x4f, 0x62, 0x03, 0x2b, 0x35, 0x06, 0x04, 0x00, 0x00, 0xff, 0xff, 0xc7, 0xc5, 0x75,
+	0xed, 0x7a, 0x00, 0x00, 0x00,
 }
diff --git a/protoc-gen-gogo/testdata/imports/test_a_2/m3.proto b/protoc-gen-gogo/testdata/imports/test_a_2/m3.proto
index d007b05ae0..345249b69c 100644
--- a/protoc-gen-gogo/testdata/imports/test_a_2/m3.proto
+++ b/protoc-gen-gogo/testdata/imports/test_a_2/m3.proto
@@ -31,5 +31,5 @@
 
 syntax = "proto3";
 package test.a;
-option go_package = "github.com/gogo/protobuf/protoc-gen-gogo/testdata/imports/test_a_2";
+option go_package = "github.com/tron-us/protobuf/protoc-gen-gogo/testdata/imports/test_a_2";
 message M3 {}
diff --git a/protoc-gen-gogo/testdata/imports/test_a_2/m4.pb.go b/protoc-gen-gogo/testdata/imports/test_a_2/m4.pb.go
index 7046d81480..8a9cd4cc10 100644
--- a/protoc-gen-gogo/testdata/imports/test_a_2/m4.pb.go
+++ b/protoc-gen-gogo/testdata/imports/test_a_2/m4.pb.go
@@ -57,12 +57,13 @@ func init() {
 func init() { proto.RegisterFile("imports/test_a_2/m4.proto", fileDescriptor_fdd24f82f6c5a786) }
 
 var fileDescriptor_fdd24f82f6c5a786 = []byte{
-	// 112 bytes of a gzipped FileDescriptorProto
+	// 117 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0x92, 0xcc, 0xcc, 0x2d, 0xc8,
 	0x2f, 0x2a, 0x29, 0xd6, 0x2f, 0x49, 0x2d, 0x2e, 0x89, 0x4f, 0x8c, 0x37, 0xd2, 0xcf, 0x35, 0xd1,
 	0x2b, 0x28, 0xca, 0x2f, 0xc9, 0x17, 0x62, 0x03, 0x09, 0xe9, 0x25, 0x2a, 0xb1, 0x70, 0x31, 0xf9,
-	0x9a, 0x38, 0xb9, 0x44, 0x39, 0xa5, 0x67, 0x96, 0x64, 0x94, 0x26, 0xe9, 0x25, 0xe7, 0xe7, 0xea,
-	0xa7, 0xe7, 0xa7, 0xe7, 0xeb, 0x83, 0x95, 0x25, 0x95, 0xa6, 0x41, 0x18, 0xc9, 0xba, 0xe9, 0xa9,
-	0x79, 0xba, 0x60, 0x09, 0x90, 0xc6, 0x94, 0xc4, 0x92, 0x44, 0x7d, 0x74, 0xc3, 0x93, 0xd8, 0xc0,
-	0x4a, 0x8d, 0x01, 0x01, 0x00, 0x00, 0xff, 0xff, 0x6a, 0xb0, 0xe7, 0x44, 0x77, 0x00, 0x00, 0x00,
+	0x9a, 0x38, 0xb9, 0x47, 0xb9, 0xa6, 0x67, 0x96, 0x64, 0x94, 0x26, 0xe9, 0x25, 0xe7, 0xe7, 0xea,
+	0x97, 0x14, 0xe5, 0xe7, 0xe9, 0x96, 0x16, 0xeb, 0x83, 0x55, 0x26, 0x95, 0xa6, 0x41, 0x18, 0xc9,
+	0xba, 0xe9, 0xa9, 0x79, 0xba, 0xe9, 0xf9, 0xe9, 0xf9, 0x60, 0xe3, 0x52, 0x12, 0x4b, 0x12, 0xf5,
+	0xd1, 0xcd, 0x4f, 0x62, 0x03, 0x2b, 0x35, 0x06, 0x04, 0x00, 0x00, 0xff, 0xff, 0xbe, 0xd6, 0xbb,
+	0x48, 0x7a, 0x00, 0x00, 0x00,
 }
diff --git a/protoc-gen-gogo/testdata/imports/test_a_2/m4.proto b/protoc-gen-gogo/testdata/imports/test_a_2/m4.proto
index 1240520aeb..68d2b3aac7 100644
--- a/protoc-gen-gogo/testdata/imports/test_a_2/m4.proto
+++ b/protoc-gen-gogo/testdata/imports/test_a_2/m4.proto
@@ -31,5 +31,5 @@
 
 syntax = "proto3";
 package test.a;
-option go_package = "github.com/gogo/protobuf/protoc-gen-gogo/testdata/imports/test_a_2";
+option go_package = "github.com/tron-us/protobuf/protoc-gen-gogo/testdata/imports/test_a_2";
 message M4 {}
diff --git a/protoc-gen-gogo/testdata/imports/test_b_1/m1.pb.go b/protoc-gen-gogo/testdata/imports/test_b_1/m1.pb.go
index a2d7978eeb..0feb6095e9 100644
--- a/protoc-gen-gogo/testdata/imports/test_b_1/m1.pb.go
+++ b/protoc-gen-gogo/testdata/imports/test_b_1/m1.pb.go
@@ -57,13 +57,13 @@ func init() {
 func init() { proto.RegisterFile("imports/test_b_1/m1.proto", fileDescriptor_7f49573d035512a8) }
 
 var fileDescriptor_7f49573d035512a8 = []byte{
-	// 123 bytes of a gzipped FileDescriptorProto
+	// 128 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0x92, 0xcc, 0xcc, 0x2d, 0xc8,
 	0x2f, 0x2a, 0x29, 0xd6, 0x2f, 0x49, 0x2d, 0x2e, 0x89, 0x4f, 0x8a, 0x37, 0xd4, 0xcf, 0x35, 0xd4,
 	0x2b, 0x28, 0xca, 0x2f, 0xc9, 0x17, 0xe2, 0x01, 0x09, 0xe9, 0x25, 0xe9, 0x15, 0x24, 0x16, 0x95,
-	0x18, 0x2a, 0xb1, 0x70, 0x31, 0xf9, 0x1a, 0x3a, 0x79, 0x46, 0xb9, 0xa7, 0x67, 0x96, 0x64, 0x94,
-	0x26, 0xe9, 0x25, 0xe7, 0xe7, 0xea, 0xa7, 0xe7, 0xa7, 0xe7, 0xeb, 0x83, 0x15, 0x27, 0x95, 0xa6,
-	0x41, 0x18, 0xc9, 0xba, 0xe9, 0xa9, 0x79, 0xba, 0x60, 0x09, 0x90, 0xf6, 0x94, 0xc4, 0x92, 0x44,
-	0x7d, 0x74, 0x2b, 0xac, 0x93, 0x52, 0x4b, 0x12, 0x93, 0xd8, 0xc0, 0xea, 0x8d, 0x01, 0x01, 0x00,
-	0x00, 0xff, 0xff, 0x23, 0x8f, 0x59, 0x3f, 0x82, 0x00, 0x00, 0x00,
+	0x18, 0x2a, 0xb1, 0x70, 0x31, 0xf9, 0x1a, 0x3a, 0xf9, 0x44, 0x79, 0xa5, 0x67, 0x96, 0x64, 0x94,
+	0x26, 0xe9, 0x25, 0xe7, 0xe7, 0xea, 0x97, 0x14, 0xe5, 0xe7, 0xe9, 0x96, 0x16, 0xeb, 0x83, 0xd5,
+	0x27, 0x95, 0xa6, 0x41, 0x18, 0xc9, 0xba, 0xe9, 0xa9, 0x79, 0xba, 0xe9, 0xf9, 0xe9, 0xf9, 0x60,
+	0x43, 0x53, 0x12, 0x4b, 0x12, 0xf5, 0xd1, 0x6d, 0xb1, 0x4e, 0x4a, 0x2d, 0x49, 0x4c, 0x62, 0x03,
+	0xab, 0x37, 0x06, 0x04, 0x00, 0x00, 0xff, 0xff, 0x99, 0xd9, 0x5c, 0x8d, 0x85, 0x00, 0x00, 0x00,
 }
diff --git a/protoc-gen-gogo/testdata/imports/test_b_1/m1.proto b/protoc-gen-gogo/testdata/imports/test_b_1/m1.proto
index ef445b7066..3816a92a22 100644
--- a/protoc-gen-gogo/testdata/imports/test_b_1/m1.proto
+++ b/protoc-gen-gogo/testdata/imports/test_b_1/m1.proto
@@ -31,5 +31,5 @@
 
 syntax = "proto3";
 package test.b.part1;
-option go_package = "github.com/gogo/protobuf/protoc-gen-gogo/testdata/imports/test_b_1;beta";
+option go_package = "github.com/tron-us/protobuf/protoc-gen-gogo/testdata/imports/test_b_1;beta";
 message M1 {}
diff --git a/protoc-gen-gogo/testdata/imports/test_b_1/m2.pb.go b/protoc-gen-gogo/testdata/imports/test_b_1/m2.pb.go
index b3f1d6937c..e1f1597270 100644
--- a/protoc-gen-gogo/testdata/imports/test_b_1/m2.pb.go
+++ b/protoc-gen-gogo/testdata/imports/test_b_1/m2.pb.go
@@ -57,13 +57,13 @@ func init() {
 func init() { proto.RegisterFile("imports/test_b_1/m2.proto", fileDescriptor_a1becddceeb586f2) }
 
 var fileDescriptor_a1becddceeb586f2 = []byte{
-	// 123 bytes of a gzipped FileDescriptorProto
+	// 128 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0x92, 0xcc, 0xcc, 0x2d, 0xc8,
 	0x2f, 0x2a, 0x29, 0xd6, 0x2f, 0x49, 0x2d, 0x2e, 0x89, 0x4f, 0x8a, 0x37, 0xd4, 0xcf, 0x35, 0xd2,
 	0x2b, 0x28, 0xca, 0x2f, 0xc9, 0x17, 0xe2, 0x01, 0x09, 0xe9, 0x25, 0xe9, 0x15, 0x24, 0x16, 0x95,
-	0x18, 0x29, 0xb1, 0x70, 0x31, 0xf9, 0x1a, 0x39, 0x79, 0x46, 0xb9, 0xa7, 0x67, 0x96, 0x64, 0x94,
-	0x26, 0xe9, 0x25, 0xe7, 0xe7, 0xea, 0xa7, 0xe7, 0xa7, 0xe7, 0xeb, 0x83, 0x15, 0x27, 0x95, 0xa6,
-	0x41, 0x18, 0xc9, 0xba, 0xe9, 0xa9, 0x79, 0xba, 0x60, 0x09, 0x90, 0xf6, 0x94, 0xc4, 0x92, 0x44,
-	0x7d, 0x74, 0x2b, 0xac, 0x93, 0x52, 0x4b, 0x12, 0x93, 0xd8, 0xc0, 0xea, 0x8d, 0x01, 0x01, 0x00,
-	0x00, 0xff, 0xff, 0x2d, 0x57, 0xdc, 0x2d, 0x82, 0x00, 0x00, 0x00,
+	0x18, 0x29, 0xb1, 0x70, 0x31, 0xf9, 0x1a, 0x39, 0xf9, 0x44, 0x79, 0xa5, 0x67, 0x96, 0x64, 0x94,
+	0x26, 0xe9, 0x25, 0xe7, 0xe7, 0xea, 0x97, 0x14, 0xe5, 0xe7, 0xe9, 0x96, 0x16, 0xeb, 0x83, 0xd5,
+	0x27, 0x95, 0xa6, 0x41, 0x18, 0xc9, 0xba, 0xe9, 0xa9, 0x79, 0xba, 0xe9, 0xf9, 0xe9, 0xf9, 0x60,
+	0x43, 0x53, 0x12, 0x4b, 0x12, 0xf5, 0xd1, 0x6d, 0xb1, 0x4e, 0x4a, 0x2d, 0x49, 0x4c, 0x62, 0x03,
+	0xab, 0x37, 0x06, 0x04, 0x00, 0x00, 0xff, 0xff, 0x39, 0xcc, 0xf1, 0x53, 0x85, 0x00, 0x00, 0x00,
 }
diff --git a/protoc-gen-gogo/testdata/imports/test_b_1/m2.proto b/protoc-gen-gogo/testdata/imports/test_b_1/m2.proto
index 1150399436..da84d70ab3 100644
--- a/protoc-gen-gogo/testdata/imports/test_b_1/m2.proto
+++ b/protoc-gen-gogo/testdata/imports/test_b_1/m2.proto
@@ -31,5 +31,5 @@
 
 syntax = "proto3";
 package test.b.part2;
-option go_package = "github.com/gogo/protobuf/protoc-gen-gogo/testdata/imports/test_b_1;beta";
+option go_package = "github.com/tron-us/protobuf/protoc-gen-gogo/testdata/imports/test_b_1;beta";
 message M2 {}
diff --git a/protoc-gen-gogo/testdata/imports/test_import_a1m1.pb.go b/protoc-gen-gogo/testdata/imports/test_import_a1m1.pb.go
index c39fa8eff0..1780ce68e6 100644
--- a/protoc-gen-gogo/testdata/imports/test_import_a1m1.pb.go
+++ b/protoc-gen-gogo/testdata/imports/test_import_a1m1.pb.go
@@ -6,7 +6,7 @@ package imports
 import (
 	fmt "fmt"
 	proto "github.com/gogo/protobuf/proto"
-	test_a_1 "github.com/gogo/protobuf/protoc-gen-gogo/testdata/imports/test_a_1"
+	test_a_1 "github.com/tron-us/protobuf/protoc-gen-gogo/testdata/imports/test_a_1"
 	math "math"
 )
 
@@ -66,15 +66,15 @@ func init() {
 func init() { proto.RegisterFile("imports/test_import_a1m1.proto", fileDescriptor_3b904a47327455f3) }
 
 var fileDescriptor_3b904a47327455f3 = []byte{
-	// 147 bytes of a gzipped FileDescriptorProto
+	// 152 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0x92, 0xcb, 0xcc, 0x2d, 0xc8,
 	0x2f, 0x2a, 0x29, 0xd6, 0x2f, 0x49, 0x2d, 0x2e, 0x89, 0x87, 0x70, 0xe2, 0x13, 0x0d, 0x73, 0x0d,
 	0xf5, 0x0a, 0x8a, 0xf2, 0x4b, 0xf2, 0x85, 0x58, 0x40, 0xe2, 0x52, 0x92, 0x28, 0xaa, 0x12, 0xe3,
 	0x0d, 0xf5, 0x61, 0x0a, 0x94, 0x14, 0xb8, 0x58, 0x1c, 0x0d, 0x7d, 0x0d, 0x85, 0x24, 0xb8, 0x18,
 	0xd3, 0x24, 0x18, 0x15, 0x18, 0x35, 0xb8, 0x8d, 0xb8, 0xf4, 0x40, 0xca, 0xf4, 0x12, 0xf5, 0x7c,
-	0x0d, 0x83, 0x18, 0xd3, 0x9c, 0xac, 0xa3, 0x2c, 0xd3, 0x33, 0x4b, 0x32, 0x4a, 0x93, 0xf4, 0x92,
-	0xf3, 0x73, 0xf5, 0xd3, 0xf3, 0xd3, 0xf3, 0xf5, 0xc1, 0x5a, 0x93, 0x4a, 0xd3, 0x20, 0x8c, 0x64,
-	0xdd, 0xf4, 0xd4, 0x3c, 0x5d, 0xb0, 0x04, 0x48, 0x63, 0x4a, 0x62, 0x49, 0xa2, 0x3e, 0xd4, 0xc2,
-	0x24, 0x36, 0xb0, 0x0a, 0x63, 0x40, 0x00, 0x00, 0x00, 0xff, 0xff, 0x6e, 0xc2, 0xe7, 0xde, 0xa8,
-	0x00, 0x00, 0x00,
+	0x0d, 0x83, 0x18, 0xd3, 0x9c, 0xec, 0xa2, 0x6c, 0xd2, 0x33, 0x4b, 0x32, 0x4a, 0x93, 0xf4, 0x92,
+	0xf3, 0x73, 0xf5, 0x4b, 0x8a, 0xf2, 0xf3, 0x74, 0x4b, 0x8b, 0xf5, 0xc1, 0xba, 0x93, 0x4a, 0xd3,
+	0x20, 0x8c, 0x64, 0xdd, 0xf4, 0xd4, 0x3c, 0xdd, 0xf4, 0xfc, 0xf4, 0x7c, 0xb0, 0x15, 0x29, 0x89,
+	0x25, 0x89, 0xfa, 0x50, 0x3b, 0x93, 0xd8, 0xc0, 0x2a, 0x8c, 0x01, 0x01, 0x00, 0x00, 0xff, 0xff,
+	0x91, 0x00, 0x81, 0x81, 0xab, 0x00, 0x00, 0x00,
 }
diff --git a/protoc-gen-gogo/testdata/imports/test_import_a1m1.proto b/protoc-gen-gogo/testdata/imports/test_import_a1m1.proto
index 7d38ad5c29..2f3a025716 100644
--- a/protoc-gen-gogo/testdata/imports/test_import_a1m1.proto
+++ b/protoc-gen-gogo/testdata/imports/test_import_a1m1.proto
@@ -33,7 +33,7 @@ syntax = "proto3";
 
 package test;
 
-option go_package = "github.com/gogo/protobuf/protoc-gen-gogo/testdata/imports";
+option go_package = "github.com/tron-us/protobuf/protoc-gen-gogo/testdata/imports";
 
 import "imports/test_a_1/m1.proto";
 
diff --git a/protoc-gen-gogo/testdata/imports/test_import_a1m2.pb.go b/protoc-gen-gogo/testdata/imports/test_import_a1m2.pb.go
index 15f3824f2c..8127cf15d8 100644
--- a/protoc-gen-gogo/testdata/imports/test_import_a1m2.pb.go
+++ b/protoc-gen-gogo/testdata/imports/test_import_a1m2.pb.go
@@ -6,7 +6,7 @@ package imports
 import (
 	fmt "fmt"
 	proto "github.com/gogo/protobuf/proto"
-	test_a_1 "github.com/gogo/protobuf/protoc-gen-gogo/testdata/imports/test_a_1"
+	test_a_1 "github.com/tron-us/protobuf/protoc-gen-gogo/testdata/imports/test_a_1"
 	math "math"
 )
 
@@ -66,15 +66,15 @@ func init() {
 func init() { proto.RegisterFile("imports/test_import_a1m2.proto", fileDescriptor_bdb27b114687957d) }
 
 var fileDescriptor_bdb27b114687957d = []byte{
-	// 147 bytes of a gzipped FileDescriptorProto
+	// 152 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0x92, 0xcb, 0xcc, 0x2d, 0xc8,
 	0x2f, 0x2a, 0x29, 0xd6, 0x2f, 0x49, 0x2d, 0x2e, 0x89, 0x87, 0x70, 0xe2, 0x13, 0x0d, 0x73, 0x8d,
 	0xf4, 0x0a, 0x8a, 0xf2, 0x4b, 0xf2, 0x85, 0x58, 0x40, 0xe2, 0x52, 0x92, 0x28, 0xaa, 0x12, 0xe3,
 	0x0d, 0xf5, 0x61, 0x0a, 0x94, 0x14, 0xb8, 0x58, 0x1c, 0x0d, 0x7d, 0x8d, 0x84, 0x24, 0xb8, 0x18,
 	0xd3, 0x24, 0x18, 0x15, 0x18, 0x35, 0xb8, 0x8d, 0xb8, 0xf4, 0x40, 0xca, 0xf4, 0x12, 0xf5, 0x7c,
-	0x8d, 0x82, 0x18, 0xd3, 0x9c, 0xac, 0xa3, 0x2c, 0xd3, 0x33, 0x4b, 0x32, 0x4a, 0x93, 0xf4, 0x92,
-	0xf3, 0x73, 0xf5, 0xd3, 0xf3, 0xd3, 0xf3, 0xf5, 0xc1, 0x5a, 0x93, 0x4a, 0xd3, 0x20, 0x8c, 0x64,
-	0xdd, 0xf4, 0xd4, 0x3c, 0x5d, 0xb0, 0x04, 0x48, 0x63, 0x4a, 0x62, 0x49, 0xa2, 0x3e, 0xd4, 0xc2,
-	0x24, 0x36, 0xb0, 0x0a, 0x63, 0x40, 0x00, 0x00, 0x00, 0xff, 0xff, 0xf5, 0x65, 0x04, 0x17, 0xa8,
-	0x00, 0x00, 0x00,
+	0x8d, 0x82, 0x18, 0xd3, 0x9c, 0xec, 0xa2, 0x6c, 0xd2, 0x33, 0x4b, 0x32, 0x4a, 0x93, 0xf4, 0x92,
+	0xf3, 0x73, 0xf5, 0x4b, 0x8a, 0xf2, 0xf3, 0x74, 0x4b, 0x8b, 0xf5, 0xc1, 0xba, 0x93, 0x4a, 0xd3,
+	0x20, 0x8c, 0x64, 0xdd, 0xf4, 0xd4, 0x3c, 0xdd, 0xf4, 0xfc, 0xf4, 0x7c, 0xb0, 0x15, 0x29, 0x89,
+	0x25, 0x89, 0xfa, 0x50, 0x3b, 0x93, 0xd8, 0xc0, 0x2a, 0x8c, 0x01, 0x01, 0x00, 0x00, 0xff, 0xff,
+	0xa5, 0xce, 0x82, 0xa8, 0xab, 0x00, 0x00, 0x00,
 }
diff --git a/protoc-gen-gogo/testdata/imports/test_import_a1m2.proto b/protoc-gen-gogo/testdata/imports/test_import_a1m2.proto
index f1445c08cf..c162378d7d 100644
--- a/protoc-gen-gogo/testdata/imports/test_import_a1m2.proto
+++ b/protoc-gen-gogo/testdata/imports/test_import_a1m2.proto
@@ -33,7 +33,7 @@ syntax = "proto3";
 
 package test;
 
-option go_package = "github.com/gogo/protobuf/protoc-gen-gogo/testdata/imports";
+option go_package = "github.com/tron-us/protobuf/protoc-gen-gogo/testdata/imports";
 
 import "imports/test_a_1/m2.proto";
 
diff --git a/protoc-gen-gogo/testdata/imports/test_import_all.pb.go b/protoc-gen-gogo/testdata/imports/test_import_all.pb.go
index c05e0a90ed..eeb5b0a3aa 100644
--- a/protoc-gen-gogo/testdata/imports/test_import_all.pb.go
+++ b/protoc-gen-gogo/testdata/imports/test_import_all.pb.go
@@ -6,10 +6,10 @@ package imports
 import (
 	fmt "fmt"
 	proto "github.com/gogo/protobuf/proto"
-	fmt1 "github.com/gogo/protobuf/protoc-gen-gogo/testdata/imports/fmt"
-	test_a_1 "github.com/gogo/protobuf/protoc-gen-gogo/testdata/imports/test_a_1"
-	test_a_2 "github.com/gogo/protobuf/protoc-gen-gogo/testdata/imports/test_a_2"
-	test_b_1 "github.com/gogo/protobuf/protoc-gen-gogo/testdata/imports/test_b_1"
+	fmt1 "github.com/tron-us/protobuf/protoc-gen-gogo/testdata/imports/fmt"
+	test_a_1 "github.com/tron-us/protobuf/protoc-gen-gogo/testdata/imports/test_a_1"
+	test_a_2 "github.com/tron-us/protobuf/protoc-gen-gogo/testdata/imports/test_a_2"
+	test_b_1 "github.com/tron-us/protobuf/protoc-gen-gogo/testdata/imports/test_b_1"
 	math "math"
 )
 
@@ -117,22 +117,22 @@ func init() {
 func init() { proto.RegisterFile("imports/test_import_all.proto", fileDescriptor_324466f0afc16f77) }
 
 var fileDescriptor_324466f0afc16f77 = []byte{
-	// 258 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x74, 0xd0, 0x31, 0x4f, 0xf3, 0x30,
-	0x10, 0x06, 0x60, 0xe5, 0x73, 0xbf, 0x20, 0x99, 0x05, 0x85, 0xc5, 0x20, 0x90, 0x50, 0x27, 0x96,
-	0xda, 0xb2, 0x9d, 0x05, 0x31, 0xc1, 0xde, 0xa5, 0x23, 0x4b, 0xe4, 0x2b, 0x4d, 0xa8, 0x94, 0xc3,
-	0x51, 0x7a, 0xfd, 0xbd, 0xfc, 0x15, 0x64, 0x1f, 0x48, 0x10, 0x9a, 0x2d, 0x79, 0x9f, 0xd7, 0x3e,
-	0xdb, 0xf2, 0x76, 0x8f, 0x43, 0x1c, 0xe9, 0x60, 0x68, 0x77, 0xa0, 0x86, 0x7f, 0x9a, 0xd0, 0xf7,
-	0x7a, 0x18, 0x23, 0xc5, 0x6a, 0x91, 0xe2, 0xeb, 0xab, 0x5f, 0xa5, 0xd0, 0x58, 0x83, 0x96, 0x0b,
-	0xa7, 0xc8, 0xcd, 0x90, 0x33, 0xe8, 0xe7, 0xa9, 0x3e, 0x49, 0x30, 0x3f, 0x0b, 0x7e, 0xce, 0xba,
-	0xfc, 0xa6, 0x16, 0xc9, 0x20, 0x87, 0xcb, 0x8f, 0x42, 0x8a, 0xa7, 0xbe, 0xaf, 0x6e, 0xa4, 0x08,
-	0x68, 0x55, 0x71, 0x57, 0xdc, 0x9f, 0x3b, 0xa9, 0xd3, 0x6a, 0x1d, 0xf4, 0xda, 0x6e, 0x52, 0xcc,
-	0xea, 0xd4, 0xbf, 0x89, 0xba, 0xa4, 0x8e, 0xd5, 0x2b, 0x31, 0x51, 0x9f, 0xd4, 0xb3, 0xd6, 0x6a,
-	0x31, 0xd1, 0x3a, 0x69, 0x5d, 0x2d, 0xa5, 0x00, 0xb4, 0xea, 0x7f, 0xd6, 0x0b, 0x56, 0xd0, 0x43,
-	0x18, 0xc9, 0xe6, 0xe9, 0x80, 0x96, 0x3b, 0x4e, 0x95, 0x7f, 0x3b, 0x2e, 0x9f, 0x01, 0xd0, 0x55,
-	0x4a, 0x8a, 0x16, 0x49, 0x9d, 0xe5, 0x4e, 0xa9, 0x5b, 0x24, 0xbd, 0xde, 0xa4, 0xe8, 0xf9, 0xf1,
-	0xe5, 0xa1, 0xdb, 0xd3, 0xdb, 0x11, 0xf4, 0x36, 0xa2, 0xe9, 0x62, 0x17, 0x4d, 0xbe, 0x3a, 0x1c,
-	0x5b, 0xfe, 0xd8, 0xae, 0xba, 0xdd, 0xfb, 0x2a, 0x43, 0xda, 0xfa, 0x35, 0x50, 0x30, 0x5f, 0x4f,
-	0x05, 0x65, 0x6e, 0xf8, 0xcf, 0x00, 0x00, 0x00, 0xff, 0xff, 0x7f, 0xd4, 0x5c, 0x7f, 0x03, 0x02,
-	0x00, 0x00,
+	// 260 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x74, 0xd0, 0x31, 0x4b, 0xc4, 0x30,
+	0x14, 0x07, 0x70, 0x6a, 0xce, 0x0a, 0x71, 0x91, 0xba, 0x44, 0x51, 0x90, 0x9b, 0x5c, 0x9a, 0x90,
+	0xa4, 0xa3, 0x08, 0xba, 0xdf, 0x72, 0xa3, 0x4b, 0x49, 0xce, 0x6b, 0x3d, 0xe8, 0xbb, 0x94, 0xf6,
+	0xf5, 0xf3, 0xfa, 0x55, 0x24, 0x79, 0x0a, 0x5a, 0xaf, 0x5b, 0xfb, 0xff, 0xfd, 0xc3, 0x4b, 0x1e,
+	0xbf, 0x3f, 0x40, 0x1f, 0x06, 0x1c, 0x15, 0xee, 0x47, 0xac, 0xe9, 0xa7, 0x76, 0x5d, 0x27, 0xfb,
+	0x21, 0x60, 0x28, 0x56, 0x31, 0xbe, 0xbd, 0xf9, 0x53, 0x72, 0xb5, 0x56, 0xa0, 0xa9, 0x70, 0x8a,
+	0xcc, 0x02, 0x19, 0x05, 0x76, 0x99, 0xaa, 0x93, 0xe4, 0x97, 0x67, 0xf9, 0xdf, 0xb3, 0xae, 0x7f,
+	0xa8, 0x01, 0x54, 0x40, 0xe1, 0xfa, 0x33, 0xe3, 0xec, 0xa5, 0xeb, 0x8a, 0x3b, 0xce, 0x1c, 0x68,
+	0x91, 0x3d, 0x64, 0x8f, 0x97, 0x86, 0xcb, 0x78, 0x5a, 0x3a, 0xb9, 0xd1, 0xdb, 0x18, 0x93, 0x1a,
+	0x71, 0x36, 0x53, 0x13, 0xd5, 0x90, 0x5a, 0xc1, 0x66, 0x6a, 0xa3, 0x5a, 0xd2, 0x4a, 0xac, 0x66,
+	0x5a, 0x45, 0xad, 0x8a, 0x35, 0x67, 0x1e, 0xb4, 0x38, 0x4f, 0x7a, 0x45, 0xea, 0x65, 0xef, 0x06,
+	0xd4, 0x69, 0xba, 0x07, 0x4d, 0x1d, 0x23, 0xf2, 0xff, 0x1d, 0x93, 0xee, 0xe0, 0xc1, 0x14, 0x82,
+	0xb3, 0x06, 0x50, 0x5c, 0xa4, 0x4e, 0x2e, 0x1b, 0x40, 0xb9, 0xd9, 0xc6, 0xe8, 0xf5, 0xf9, 0xed,
+	0xa9, 0x3d, 0xe0, 0xc7, 0xe4, 0xe5, 0x2e, 0x80, 0xc2, 0x21, 0x1c, 0xcb, 0x69, 0x54, 0xe9, 0xf5,
+	0x7e, 0x6a, 0xe8, 0x63, 0x57, 0xb6, 0xfb, 0x63, 0xd9, 0x86, 0x36, 0xa4, 0xbd, 0xbd, 0x3b, 0x74,
+	0xea, 0x7b, 0x5b, 0x3e, 0x4f, 0x0d, 0xfb, 0x15, 0x00, 0x00, 0xff, 0xff, 0xa4, 0x16, 0x4e, 0xdc,
+	0x06, 0x02, 0x00, 0x00,
 }
diff --git a/protoc-gen-gogo/testdata/imports/test_import_all.proto b/protoc-gen-gogo/testdata/imports/test_import_all.proto
index ee57d46bd7..f7c5311471 100644
--- a/protoc-gen-gogo/testdata/imports/test_import_all.proto
+++ b/protoc-gen-gogo/testdata/imports/test_import_all.proto
@@ -33,7 +33,7 @@ syntax = "proto3";
 
 package test;
 
-option go_package = "github.com/gogo/protobuf/protoc-gen-gogo/testdata/imports";
+option go_package = "github.com/tron-us/protobuf/protoc-gen-gogo/testdata/imports";
 
 // test_a_1/m*.proto are in the same Go package and proto package.
 // test_a_*/*.proto are in different Go packages, but the same proto package.
diff --git a/protoc-gen-gogo/testdata/main_test.go b/protoc-gen-gogo/testdata/main_test.go
index acf010a599..358e803972 100644
--- a/protoc-gen-gogo/testdata/main_test.go
+++ b/protoc-gen-gogo/testdata/main_test.go
@@ -36,9 +36,9 @@ package testdata
 import (
 	"testing"
 
-	importspb "github.com/gogo/protobuf/protoc-gen-gogo/testdata/imports"
-	multipb "github.com/gogo/protobuf/protoc-gen-gogo/testdata/multi"
-	mytestpb "github.com/gogo/protobuf/protoc-gen-gogo/testdata/my_test"
+	importspb "github.com/tron-us/protobuf/protoc-gen-gogo/testdata/imports"
+	multipb "github.com/tron-us/protobuf/protoc-gen-gogo/testdata/multi"
+	mytestpb "github.com/tron-us/protobuf/protoc-gen-gogo/testdata/my_test"
 )
 
 func TestLink(t *testing.T) {
diff --git a/protoc-gen-gogo/testdata/multi/multi1.proto b/protoc-gen-gogo/testdata/multi/multi1.proto
index 899c5b1f65..084e4fbd9f 100644
--- a/protoc-gen-gogo/testdata/multi/multi1.proto
+++ b/protoc-gen-gogo/testdata/multi/multi1.proto
@@ -36,7 +36,7 @@ import "multi/multi3.proto";
 
 package multitest;
 
-option go_package = "github.com/gogo/protobuf/protoc-gen-gogo/testdata/multi;multitest";
+option go_package = "github.com/tron-us/protobuf/protoc-gen-gogo/testdata/multi;multitest";
 
 message Multi1 {
   required Multi2 multi2 = 1;
diff --git a/protoc-gen-gogo/testdata/multi/multi2.proto b/protoc-gen-gogo/testdata/multi/multi2.proto
index 8445126f07..b052591cc5 100644
--- a/protoc-gen-gogo/testdata/multi/multi2.proto
+++ b/protoc-gen-gogo/testdata/multi/multi2.proto
@@ -33,7 +33,7 @@ syntax = "proto2";
 
 package multitest;
 
-option go_package = "github.com/gogo/protobuf/protoc-gen-gogo/testdata/multi;multitest";
+option go_package = "github.com/tron-us/protobuf/protoc-gen-gogo/testdata/multi;multitest";
 
 message Multi2 {
   required int32 required_value = 1;
diff --git a/protoc-gen-gogo/testdata/multi/multi3.proto b/protoc-gen-gogo/testdata/multi/multi3.proto
index 66c30fd543..fbc9496df8 100644
--- a/protoc-gen-gogo/testdata/multi/multi3.proto
+++ b/protoc-gen-gogo/testdata/multi/multi3.proto
@@ -33,7 +33,7 @@ syntax = "proto2";
 
 package multitest;
 
-option go_package = "github.com/gogo/protobuf/protoc-gen-gogo/testdata/multi;multitest";
+option go_package = "github.com/tron-us/protobuf/protoc-gen-gogo/testdata/multi;multitest";
 
 message Multi3 {
   enum HatType {
diff --git a/protoc-gen-gogo/testdata/my_test/test.pb.go b/protoc-gen-gogo/testdata/my_test/test.pb.go
index 6978d1b23b..9b9b246fd8 100644
--- a/protoc-gen-gogo/testdata/my_test/test.pb.go
+++ b/protoc-gen-gogo/testdata/my_test/test.pb.go
@@ -8,7 +8,7 @@ package test
 import (
 	fmt "fmt"
 	proto "github.com/gogo/protobuf/proto"
-	_ "github.com/gogo/protobuf/protoc-gen-gogo/testdata/multi"
+	_ "github.com/tron-us/protobuf/protoc-gen-gogo/testdata/multi"
 	math "math"
 )
 
@@ -998,77 +998,77 @@ func init() {
 func init() { proto.RegisterFile("my_test/test.proto", fileDescriptor_2c9b60a40d5131b9) }
 
 var fileDescriptor_2c9b60a40d5131b9 = []byte{
-	// 1145 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x7c, 0x56, 0xdd, 0x6e, 0xdb, 0x46,
-	0x13, 0x35, 0x49, 0x51, 0x3f, 0x23, 0x7f, 0x36, 0xbf, 0x85, 0x6b, 0xb3, 0x2a, 0x92, 0xb0, 0x4a,
-	0x5c, 0x28, 0x6e, 0x23, 0xc7, 0x6a, 0x81, 0xa6, 0x2a, 0x1a, 0xc4, 0xb2, 0xe8, 0x38, 0x88, 0x2d,
-	0x17, 0x1b, 0xe7, 0xa2, 0xb9, 0x21, 0x68, 0x71, 0x45, 0xb1, 0xd6, 0x92, 0x8c, 0xb8, 0x2c, 0xcc,
-	0x3b, 0x3f, 0x45, 0xfb, 0x1a, 0xbd, 0xef, 0x33, 0xf4, 0x99, 0x5c, 0xec, 0xac, 0x22, 0xc9, 0x56,
-	0x51, 0x5d, 0x10, 0x9c, 0x33, 0x67, 0xce, 0x72, 0x67, 0x66, 0x67, 0x05, 0x84, 0x17, 0x9e, 0x60,
-	0x99, 0xd8, 0x97, 0x8f, 0x76, 0x3a, 0x4d, 0x44, 0x42, 0x2a, 0xbc, 0x68, 0x4b, 0xb3, 0x41, 0x78,
-	0x3e, 0x11, 0xd1, 0x3e, 0x3e, 0x0f, 0x94, 0xb3, 0xf9, 0x77, 0x19, 0x2a, 0x94, 0x7d, 0xcc, 0x59,
-	0x26, 0x88, 0x05, 0xc6, 0x15, 0x2b, 0x6c, 0xcd, 0x31, 0x5a, 0x06, 0x95, 0xaf, 0xa4, 0x05, 0xc6,
-	0x38, 0x67, 0xb6, 0xe1, 0x68, 0xad, 0x8d, 0xce, 0x76, 0x7b, 0x26, 0xd4, 0x9e, 0x05, 0xb4, 0x8f,
-	0x92, 0x49, 0x32, 0xa5, 0x92, 0x42, 0xf6, 0xc0, 0x18, 0xfb, 0xc2, 0x2e, 0x21, 0xd3, 0x9a, 0x33,
-	0x4f, 0x7c, 0x71, 0x51, 0xa4, 0xac, 0x5b, 0x3e, 0x76, 0xfb, 0xe7, 0xf4, 0x90, 0x4a, 0x12, 0x79,
-	0x04, 0xd5, 0x80, 0xf9, 0xc1, 0x24, 0x8a, 0x99, 0x5d, 0x71, 0xb4, 0x96, 0xde, 0x35, 0xa2, 0x78,
-	0x44, 0xe7, 0x20, 0x79, 0x01, 0xb5, 0x2c, 0xe1, 0x2c, 0x9c, 0x26, 0x79, 0x6a, 0x57, 0x1d, 0xad,
-	0x05, 0x9d, 0xc6, 0xca, 0xe2, 0xef, 0x12, 0xce, 0x5e, 0x4b, 0x06, 0x5d, 0x90, 0x49, 0x1f, 0xd6,
-	0x63, 0x9f, 0x33, 0x8f, 0xfb, 0x69, 0x1a, 0xc5, 0xa1, 0xbd, 0xe1, 0x18, 0xad, 0x7a, 0xe7, 0xcb,
-	0x95, 0xe0, 0x81, 0xcf, 0xd9, 0x99, 0xe2, 0xb8, 0xb1, 0x98, 0x16, 0xb4, 0x1e, 0x2f, 0x10, 0x72,
-	0x08, 0x75, 0x9e, 0x85, 0x73, 0x91, 0x4d, 0x14, 0x71, 0x56, 0x44, 0xce, 0xb2, 0xf0, 0x8e, 0x06,
-	0xf0, 0x39, 0x40, 0xb6, 0xc0, 0x9c, 0xb2, 0x8c, 0x09, 0x7b, 0xdd, 0xd1, 0x5a, 0x26, 0x55, 0x06,
-	0xd9, 0x81, 0x4a, 0xc8, 0x84, 0x27, 0xb3, 0x6c, 0x39, 0x5a, 0xab, 0x46, 0xcb, 0x21, 0x13, 0x6f,
-	0x59, 0x41, 0x1e, 0x03, 0x8c, 0x26, 0x89, 0x2f, 0xbc, 0x38, 0x8a, 0x47, 0xf6, 0x16, 0x26, 0xa5,
-	0xf4, 0x4c, 0x66, 0xa5, 0x86, 0xf8, 0x20, 0x8a, 0x47, 0xa4, 0xf9, 0x89, 0x94, 0x4a, 0xd2, 0x67,
-	0x8b, 0xcc, 0x29, 0xce, 0xcf, 0x8a, 0xa3, 0x0c, 0x8f, 0x5d, 0xa7, 0xf6, 0x36, 0x52, 0xcc, 0x03,
-	0xf6, 0xf5, 0xf3, 0x1f, 0x68, 0x15, 0x71, 0xf7, 0x3a, 0x25, 0xbb, 0x50, 0x0f, 0x92, 0xfc, 0x72,
-	0xc2, 0xd4, 0x6a, 0x3b, 0x8e, 0xd6, 0xd2, 0x66, 0xab, 0x81, 0x72, 0xe0, 0x72, 0x4f, 0xe6, 0x34,
-	0x5c, 0xcf, 0x46, 0x9a, 0xb1, 0xc4, 0xc2, 0x05, 0x9f, 0xc2, 0xcc, 0xc2, 0x15, 0x3f, 0x47, 0x12,
-	0x1c, 0x3c, 0xff, 0xf4, 0xa3, 0x35, 0xe5, 0x75, 0xaf, 0xd3, 0xc6, 0x37, 0x50, 0x9b, 0x17, 0x8d,
-	0x3c, 0x82, 0x3a, 0x96, 0xcc, 0x1b, 0x45, 0x6c, 0x12, 0xd8, 0x35, 0x4c, 0x13, 0x20, 0x74, 0x2c,
-	0x91, 0xc6, 0x4b, 0xb0, 0xee, 0x57, 0x69, 0xd1, 0xa1, 0x92, 0x8c, 0x1d, 0xba, 0x05, 0xe6, 0x6f,
-	0xfe, 0x24, 0x67, 0xb6, 0x8e, 0xf9, 0x54, 0x46, 0x57, 0x7f, 0xa1, 0x35, 0xce, 0x60, 0xf3, 0x5e,
-	0x81, 0x96, 0xc3, 0x89, 0x0a, 0x7f, 0xb2, 0x1c, 0x5e, 0xef, 0x6c, 0x2c, 0xd5, 0x38, 0x9d, 0x14,
-	0x4b, 0x72, 0xcd, 0x5d, 0x30, 0xb1, 0xdd, 0x49, 0x05, 0x0c, 0xea, 0xf6, 0xad, 0x35, 0x52, 0x03,
-	0xf3, 0x35, 0x75, 0xdd, 0x81, 0xa5, 0x91, 0x2a, 0x94, 0x7a, 0xa7, 0xef, 0x5d, 0x4b, 0x6f, 0xfe,
-	0xa1, 0x83, 0x89, 0xb1, 0x64, 0x0f, 0xcc, 0x51, 0x92, 0xc7, 0x01, 0x9e, 0xa7, 0x7a, 0x67, 0xeb,
-	0xae, 0x74, 0x5b, 0xb5, 0x8c, 0xa2, 0x90, 0x5d, 0x58, 0x1f, 0x26, 0x3c, 0xf5, 0x87, 0xd8, 0x1b,
-	0x99, 0xad, 0x3b, 0x46, 0xcb, 0xec, 0xe9, 0x96, 0x46, 0xeb, 0x33, 0xfc, 0x2d, 0x2b, 0xb2, 0xc6,
-	0x9f, 0x1a, 0x98, 0x6a, 0x27, 0x7d, 0x78, 0x74, 0xc5, 0x0a, 0x4f, 0x8c, 0x65, 0xcb, 0x30, 0x16,
-	0x64, 0xde, 0x41, 0xe7, 0xdb, 0xef, 0x86, 0x3e, 0x67, 0x13, 0xef, 0xc8, 0xcf, 0xde, 0xc4, 0xa1,
-	0xad, 0x39, 0x7a, 0xcb, 0xa0, 0x5f, 0x5c, 0xb1, 0xe2, 0x62, 0xec, 0x8b, 0x81, 0x24, 0xcd, 0x39,
-	0x8a, 0x42, 0x76, 0x96, 0x77, 0x6f, 0x74, 0xb5, 0xef, 0x67, 0x1b, 0x26, 0x5f, 0x81, 0xe5, 0xf1,
-	0x42, 0x95, 0xc6, 0xc3, 0x03, 0xd5, 0xc1, 0x21, 0x60, 0xd0, 0xf5, 0xb3, 0x02, 0xcb, 0x23, 0x4b,
-	0xd3, 0x69, 0x3a, 0x50, 0x7a, 0xed, 0x73, 0x46, 0xd6, 0xa1, 0x7a, 0x7c, 0x7e, 0x7e, 0xd1, 0x3b,
-	0x3c, 0x3d, 0xb5, 0x34, 0x02, 0x50, 0xbe, 0x70, 0x07, 0x83, 0x37, 0xef, 0x2c, 0x7d, 0xaf, 0x5a,
-	0x0d, 0xac, 0x9b, 0x9b, 0x9b, 0x1b, 0xbd, 0xf9, 0x14, 0x6a, 0xe7, 0x62, 0xcc, 0xa6, 0x3d, 0x3f,
-	0x63, 0x84, 0x40, 0x49, 0xca, 0x62, 0x29, 0x6a, 0x14, 0xdf, 0x97, 0xa8, 0x7f, 0x69, 0xb0, 0x89,
-	0x59, 0x72, 0xaf, 0x05, 0x8b, 0xb3, 0x28, 0x89, 0xb3, 0x4e, 0x13, 0x4a, 0x22, 0xe2, 0x8c, 0xdc,
-	0x2b, 0x91, 0xcd, 0x64, 0xc7, 0x51, 0xf4, 0x75, 0x5e, 0x41, 0x79, 0xe8, 0x4f, 0xa7, 0x89, 0x58,
-	0x61, 0x45, 0x58, 0x5e, 0xfb, 0x2e, 0xba, 0x50, 0xa7, 0xb3, 0xb8, 0x4e, 0x0f, 0xcc, 0x20, 0x89,
-	0x73, 0x41, 0xc8, 0x9c, 0x3a, 0xff, 0x68, 0x5c, 0xea, 0xbf, 0x44, 0x54, 0x68, 0xb3, 0x05, 0x5b,
-	0x18, 0x73, 0xcf, 0xbd, 0xda, 0xbc, 0x4d, 0x1b, 0xaa, 0xe7, 0x93, 0x00, 0x79, 0xb8, 0xfb, 0xdb,
-	0xdb, 0xdb, 0xdb, 0x4a, 0x57, 0xaf, 0x6a, 0xcd, 0xdf, 0x0d, 0x80, 0xa3, 0x84, 0xf3, 0x3c, 0x8e,
-	0x3e, 0xe6, 0x8c, 0x3c, 0x84, 0x3a, 0xf7, 0xaf, 0x98, 0xc7, 0x99, 0x37, 0x9c, 0x2a, 0x89, 0x2a,
-	0xad, 0x49, 0xe8, 0x8c, 0x1d, 0x4d, 0x0b, 0x62, 0x43, 0x39, 0xce, 0xf9, 0x25, 0x9b, 0xda, 0xa6,
-	0x54, 0x3f, 0x59, 0xa3, 0x33, 0x9b, 0x6c, 0xcd, 0x12, 0x5d, 0x96, 0x89, 0x3e, 0x59, 0x53, 0xa9,
-	0x96, 0x68, 0xe0, 0x0b, 0x1f, 0xa7, 0xef, 0xba, 0x44, 0xa5, 0x45, 0x76, 0xa0, 0x2c, 0x18, 0x4f,
-	0xbd, 0x21, 0xce, 0x5c, 0xed, 0x64, 0x8d, 0x9a, 0xd2, 0x3e, 0x92, 0xf2, 0x63, 0x16, 0x85, 0x63,
-	0x81, 0xc7, 0x54, 0x97, 0xf2, 0xca, 0x26, 0xbb, 0x60, 0x8a, 0x24, 0xf0, 0x0b, 0x1b, 0x70, 0xf0,
-	0xff, 0x6f, 0x9e, 0x9b, 0xbe, 0x5f, 0x64, 0x28, 0x20, 0xbd, 0x64, 0x1b, 0x4c, 0xee, 0x17, 0x97,
-	0xcc, 0xae, 0xcb, 0x2f, 0x97, 0x38, 0x9a, 0x12, 0x0f, 0xd8, 0x44, 0xf8, 0x38, 0x25, 0xff, 0x2f,
-	0x71, 0x34, 0x49, 0x13, 0x0c, 0x9e, 0x85, 0x38, 0x23, 0x57, 0x0e, 0xe5, 0xc9, 0x1a, 0x95, 0x4e,
-	0xf2, 0xd3, 0xf2, 0x25, 0xb1, 0x81, 0x97, 0xc4, 0x83, 0x39, 0x73, 0x91, 0xbb, 0xc5, 0x3d, 0x71,
-	0xb2, 0xb6, 0x74, 0x53, 0x34, 0x1e, 0x2f, 0x0f, 0xa3, 0x6d, 0x28, 0x73, 0x86, 0xf9, 0xdb, 0x54,
-	0x63, 0x59, 0x59, 0x8d, 0x0a, 0x98, 0x7d, 0xf9, 0x41, 0xbd, 0x0a, 0x98, 0x79, 0x1c, 0x25, 0xf1,
-	0xde, 0x43, 0xa8, 0xcc, 0xee, 0x34, 0xd9, 0xe6, 0xea, 0x56, 0xb3, 0x34, 0x39, 0x14, 0x8e, 0xdd,
-	0x0f, 0x96, 0xbe, 0xd7, 0x86, 0x92, 0xdc, 0xba, 0x74, 0x9e, 0x9d, 0x0f, 0xfa, 0x87, 0xbf, 0x58,
-	0x1a, 0xa9, 0x43, 0xe5, 0xe2, 0xbd, 0xfb, 0x4e, 0x1a, 0xba, 0x9c, 0x1a, 0xa7, 0xef, 0x07, 0xfd,
-	0x37, 0x96, 0xd6, 0xd0, 0x2d, 0xad, 0xeb, 0x80, 0x21, 0xfc, 0x70, 0xa5, 0x5f, 0x43, 0xfc, 0x0c,
-	0xe9, 0xea, 0x1e, 0x7d, 0x6a, 0xc9, 0xfb, 0x9c, 0x5f, 0x31, 0x3b, 0x0f, 0xee, 0x36, 0xea, 0xbf,
-	0xf7, 0x64, 0xef, 0xd5, 0x87, 0x97, 0x61, 0x24, 0xc6, 0xf9, 0x65, 0x7b, 0x98, 0xf0, 0xfd, 0x30,
-	0x09, 0x93, 0x7d, 0xbc, 0xff, 0x2f, 0xf3, 0x91, 0x7a, 0x19, 0x3e, 0x0b, 0x59, 0xfc, 0x0c, 0x1d,
-	0x52, 0x4c, 0xf6, 0xc3, 0xfe, 0xec, 0xbf, 0xc4, 0x8f, 0xf2, 0xf1, 0x4f, 0x00, 0x00, 0x00, 0xff,
-	0xff, 0x0b, 0xc8, 0x22, 0xdb, 0x5a, 0x08, 0x00, 0x00,
+	// 1149 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x7c, 0x56, 0xdb, 0x6e, 0xdb, 0x46,
+	0x13, 0x36, 0x49, 0x51, 0x87, 0x91, 0x7f, 0x9b, 0xff, 0xc2, 0xb5, 0x59, 0x15, 0x49, 0x58, 0x25,
+	0x2e, 0x14, 0xb7, 0x96, 0x63, 0xb5, 0x40, 0x53, 0x15, 0x2d, 0x6a, 0x1d, 0x1c, 0x07, 0xb1, 0xa5,
+	0x62, 0xe3, 0x5c, 0x34, 0x37, 0x04, 0x2d, 0xad, 0x28, 0xd6, 0x5a, 0x92, 0x21, 0x97, 0x85, 0x79,
+	0xe7, 0xa7, 0x68, 0x5f, 0xa3, 0xf7, 0x7d, 0x86, 0x3e, 0x93, 0x8b, 0x9d, 0x55, 0x24, 0xd9, 0x2a,
+	0xca, 0x0b, 0x82, 0x33, 0xf3, 0xcd, 0x37, 0xbb, 0x33, 0xb3, 0xb3, 0x04, 0xc2, 0x73, 0x57, 0xb0,
+	0x54, 0x1c, 0xc9, 0x57, 0x33, 0x4e, 0x22, 0x11, 0x91, 0x12, 0xcf, 0x9b, 0x52, 0xac, 0x11, 0x9e,
+	0xcd, 0x44, 0x70, 0x84, 0xef, 0x63, 0x65, 0xac, 0xff, 0x5d, 0x84, 0x12, 0x65, 0x1f, 0x32, 0x96,
+	0x0a, 0x62, 0x81, 0x71, 0xcd, 0x72, 0x5b, 0x73, 0x8c, 0x86, 0x41, 0xe5, 0x27, 0x69, 0x80, 0x31,
+	0xcd, 0x98, 0x6d, 0x38, 0x5a, 0x63, 0xab, 0xb5, 0xdb, 0x9c, 0x13, 0x35, 0xe7, 0x0e, 0xcd, 0x6e,
+	0x34, 0x8b, 0x12, 0x2a, 0x21, 0xe4, 0x00, 0x8c, 0xa9, 0x27, 0xec, 0x02, 0x22, 0xad, 0x05, 0xf2,
+	0xcc, 0x13, 0x97, 0x79, 0xcc, 0xda, 0xc5, 0xd3, 0x7e, 0x6f, 0x48, 0x4f, 0xa8, 0x04, 0x91, 0x27,
+	0x50, 0x1e, 0x33, 0x6f, 0x3c, 0x0b, 0x42, 0x66, 0x97, 0x1c, 0xad, 0xa1, 0xb7, 0x8d, 0x20, 0x9c,
+	0xd0, 0x85, 0x92, 0xbc, 0x84, 0x4a, 0x1a, 0x71, 0xe6, 0x27, 0x51, 0x16, 0xdb, 0x65, 0x47, 0x6b,
+	0x40, 0xab, 0xb6, 0x16, 0xfc, 0x6d, 0xc4, 0xd9, 0x2b, 0x89, 0xa0, 0x4b, 0x30, 0xe9, 0xc1, 0x66,
+	0xe8, 0x71, 0xe6, 0x72, 0x2f, 0x8e, 0x83, 0xd0, 0xb7, 0xb7, 0x1c, 0xa3, 0x51, 0x6d, 0x7d, 0xbe,
+	0xe6, 0x3c, 0xf0, 0x38, 0xbb, 0x50, 0x98, 0x7e, 0x28, 0x92, 0x9c, 0x56, 0xc3, 0xa5, 0x86, 0x9c,
+	0x40, 0x95, 0xa7, 0xfe, 0x82, 0x64, 0x1b, 0x49, 0x9c, 0x35, 0x92, 0x8b, 0xd4, 0xbf, 0xc7, 0x01,
+	0x7c, 0xa1, 0x20, 0x3b, 0x60, 0x26, 0x2c, 0x65, 0xc2, 0xde, 0x74, 0xb4, 0x86, 0x49, 0x95, 0x40,
+	0xf6, 0xa0, 0xe4, 0x33, 0xe1, 0xca, 0x2c, 0x5b, 0x8e, 0xd6, 0xa8, 0xd0, 0xa2, 0xcf, 0xc4, 0x1b,
+	0x96, 0x93, 0xa7, 0x00, 0x93, 0x59, 0xe4, 0x09, 0x37, 0x0c, 0xc2, 0x89, 0xbd, 0x83, 0x49, 0x29,
+	0x1c, 0xca, 0xac, 0x54, 0x50, 0x3f, 0x08, 0xc2, 0x09, 0xa9, 0x7f, 0x04, 0xc5, 0x12, 0xf4, 0xc9,
+	0x32, 0x73, 0x0a, 0xf3, 0xb3, 0xc2, 0x28, 0xc1, 0x65, 0x37, 0xb1, 0xbd, 0x8b, 0x10, 0xf3, 0x98,
+	0x7d, 0xf9, 0xe2, 0x3b, 0x5a, 0x46, 0x7d, 0xff, 0x26, 0x26, 0xfb, 0x50, 0x1d, 0x47, 0xd9, 0xd5,
+	0x8c, 0xa9, 0x68, 0x7b, 0x8e, 0xd6, 0xd0, 0xe6, 0xd1, 0x40, 0x19, 0x30, 0xdc, 0xb3, 0x05, 0x0c,
+	0xe3, 0xd9, 0x08, 0x33, 0x56, 0x50, 0x18, 0xf0, 0x39, 0xcc, 0x25, 0x8c, 0xf8, 0x29, 0x82, 0xe0,
+	0xf8, 0xc5, 0xc7, 0x87, 0x56, 0x94, 0xb5, 0x7f, 0x13, 0xd7, 0xbe, 0x82, 0xca, 0xa2, 0x68, 0xe4,
+	0x09, 0x54, 0xb1, 0x64, 0xee, 0x24, 0x60, 0xb3, 0xb1, 0x5d, 0xc1, 0x34, 0x01, 0xaa, 0x4e, 0xa5,
+	0xa6, 0xf6, 0x23, 0x58, 0x0f, 0xab, 0xb4, 0xec, 0x50, 0x09, 0xc6, 0x0e, 0xdd, 0x01, 0xf3, 0x37,
+	0x6f, 0x96, 0x31, 0x5b, 0xc7, 0x7c, 0x2a, 0xa1, 0xad, 0xbf, 0xd4, 0x6a, 0x17, 0xb0, 0xfd, 0xa0,
+	0x40, 0xab, 0xee, 0x44, 0xb9, 0x3f, 0x5b, 0x75, 0xaf, 0xb6, 0xb6, 0x56, 0x6a, 0x1c, 0xcf, 0xf2,
+	0x15, 0xba, 0xfa, 0x3e, 0x98, 0xd8, 0xee, 0xa4, 0x04, 0x06, 0xed, 0xf7, 0xac, 0x0d, 0x52, 0x01,
+	0xf3, 0x15, 0xed, 0xf7, 0x07, 0x96, 0x46, 0xca, 0x50, 0xe8, 0x9c, 0xbf, 0xeb, 0x5b, 0x7a, 0xfd,
+	0x0f, 0x1d, 0x4c, 0xf4, 0x25, 0x07, 0x60, 0x4e, 0xa2, 0x2c, 0x1c, 0xe3, 0x79, 0xaa, 0xb6, 0x76,
+	0xee, 0x53, 0x37, 0x55, 0xcb, 0x28, 0x08, 0xd9, 0x87, 0xcd, 0x51, 0xc4, 0x63, 0x6f, 0x84, 0xbd,
+	0x91, 0xda, 0xba, 0x63, 0x34, 0xcc, 0x8e, 0x6e, 0x69, 0xb4, 0x3a, 0xd7, 0xbf, 0x61, 0x79, 0x5a,
+	0xfb, 0x53, 0x03, 0x53, 0xed, 0xa4, 0x07, 0x4f, 0xae, 0x59, 0xee, 0x8a, 0xa9, 0x6c, 0x19, 0xc6,
+	0xc6, 0xa9, 0x7b, 0xdc, 0xfa, 0xfa, 0x9b, 0x91, 0xc7, 0xd9, 0xcc, 0xed, 0x7a, 0xe9, 0xeb, 0xd0,
+	0xb7, 0x35, 0x47, 0x6f, 0x18, 0xf4, 0xb3, 0x6b, 0x96, 0x5f, 0x4e, 0x3d, 0x31, 0x90, 0xa0, 0x05,
+	0x46, 0x41, 0xc8, 0xde, 0xea, 0xee, 0x8d, 0xb6, 0xf6, 0xed, 0x7c, 0xc3, 0xe4, 0x0b, 0xb0, 0x5c,
+	0x9e, 0xab, 0xd2, 0xb8, 0x78, 0xa0, 0x5a, 0x38, 0x04, 0x0c, 0xba, 0x79, 0x91, 0x63, 0x79, 0x64,
+	0x69, 0x5a, 0x75, 0x07, 0x0a, 0xaf, 0x3c, 0xce, 0xc8, 0x26, 0x94, 0x4f, 0x87, 0xc3, 0xcb, 0xce,
+	0xc9, 0xf9, 0xb9, 0xa5, 0x11, 0x80, 0xe2, 0x65, 0x7f, 0x30, 0x78, 0xfd, 0xd6, 0xd2, 0x0f, 0xca,
+	0xe5, 0xb1, 0x75, 0x7b, 0x7b, 0x7b, 0xab, 0xd7, 0x9f, 0x43, 0x65, 0x28, 0xa6, 0x2c, 0xe9, 0x78,
+	0x29, 0x23, 0x04, 0x0a, 0x92, 0x16, 0x4b, 0x51, 0xa1, 0xf8, 0xbd, 0x02, 0xfd, 0x4b, 0x83, 0x6d,
+	0xcc, 0x52, 0xff, 0x46, 0xb0, 0x30, 0x0d, 0xa2, 0x30, 0x6d, 0xd5, 0xa1, 0x20, 0x02, 0xce, 0xc8,
+	0x83, 0x12, 0xd9, 0x4c, 0x76, 0x1c, 0x45, 0x5b, 0xeb, 0x27, 0x28, 0x8e, 0xbc, 0x24, 0x89, 0xc4,
+	0x1a, 0x2a, 0xc0, 0xf2, 0xda, 0xf7, 0xb5, 0x4b, 0x76, 0x3a, 0xf7, 0x6b, 0x75, 0xc0, 0x1c, 0x47,
+	0x61, 0x26, 0x08, 0x59, 0x40, 0x17, 0x8b, 0xc6, 0x50, 0xff, 0x45, 0xa2, 0x5c, 0xeb, 0x0d, 0xd8,
+	0x41, 0x9f, 0x07, 0xe6, 0xf5, 0xe6, 0xad, 0xdb, 0x50, 0x1e, 0xce, 0xc6, 0x88, 0xc3, 0xdd, 0xdf,
+	0xdd, 0xdd, 0xdd, 0x95, 0xda, 0x7a, 0x59, 0xab, 0xff, 0x6e, 0x00, 0x74, 0x23, 0xce, 0xb3, 0x30,
+	0xf8, 0x90, 0x31, 0xf2, 0x18, 0xaa, 0xdc, 0xbb, 0x66, 0x2e, 0x67, 0xee, 0x28, 0x51, 0x14, 0x65,
+	0x5a, 0x91, 0xaa, 0x0b, 0xd6, 0x4d, 0x72, 0x62, 0x43, 0x31, 0xcc, 0xf8, 0x15, 0x4b, 0x6c, 0x53,
+	0xb2, 0x9f, 0x6d, 0xd0, 0xb9, 0x4c, 0x76, 0xe6, 0x89, 0x2e, 0xca, 0x44, 0x9f, 0x6d, 0xa8, 0x54,
+	0x4b, 0xed, 0xd8, 0x13, 0x1e, 0x4e, 0xdf, 0x4d, 0xa9, 0x95, 0x12, 0xd9, 0x83, 0xa2, 0x60, 0x3c,
+	0x76, 0x47, 0x38, 0x73, 0xb5, 0xb3, 0x0d, 0x6a, 0x4a, 0xb9, 0x2b, 0xe9, 0xa7, 0x2c, 0xf0, 0xa7,
+	0x02, 0x8f, 0xa9, 0x2e, 0xe9, 0x95, 0x4c, 0xf6, 0xc1, 0x14, 0xd1, 0xd8, 0xcb, 0x6d, 0xc0, 0xc1,
+	0xff, 0xbf, 0x45, 0x6e, 0x7a, 0x5e, 0x9e, 0x22, 0x81, 0xb4, 0x92, 0x5d, 0x30, 0xb9, 0x97, 0x5f,
+	0x31, 0xbb, 0x2a, 0x57, 0x2e, 0xf5, 0x28, 0x4a, 0xfd, 0x98, 0xcd, 0x84, 0x87, 0x53, 0xf2, 0xff,
+	0x52, 0x8f, 0x22, 0xa9, 0x83, 0xc1, 0x53, 0x1f, 0x67, 0xe4, 0xda, 0xa1, 0x3c, 0xdb, 0xa0, 0xd2,
+	0x48, 0x7e, 0x58, 0xbd, 0x24, 0xb6, 0xf0, 0x92, 0x78, 0xb4, 0x40, 0x2e, 0x73, 0xb7, 0xbc, 0x27,
+	0xce, 0x36, 0x56, 0x6e, 0x8a, 0xda, 0xd3, 0xd5, 0x61, 0xb4, 0x0b, 0x45, 0xce, 0x30, 0x7f, 0xdb,
+	0x6a, 0x2c, 0x2b, 0xa9, 0x56, 0x02, 0xb3, 0x27, 0x17, 0xd4, 0x29, 0x81, 0x99, 0x85, 0x41, 0x14,
+	0x1e, 0x3c, 0x86, 0xd2, 0xfc, 0x4e, 0x93, 0x6d, 0xae, 0x6e, 0x35, 0x4b, 0x93, 0x43, 0xe1, 0xb4,
+	0xff, 0xde, 0xd2, 0x0f, 0x9a, 0x50, 0x90, 0x5b, 0x97, 0xc6, 0x8b, 0xe1, 0xa0, 0x77, 0xf2, 0x8b,
+	0xa5, 0x91, 0x2a, 0x94, 0x2e, 0xdf, 0xf5, 0xdf, 0x4a, 0x41, 0x97, 0x53, 0xe3, 0xfc, 0xdd, 0xa0,
+	0xf7, 0xda, 0xd2, 0x6a, 0xba, 0xa5, 0xb5, 0x1d, 0x30, 0x84, 0xe7, 0xaf, 0xf5, 0xab, 0x8f, 0xcb,
+	0x90, 0xa6, 0x76, 0xf7, 0x63, 0x4b, 0x3e, 0xc4, 0xfc, 0x8a, 0xd9, 0x79, 0x74, 0xbf, 0x51, 0xff,
+	0xbd, 0x27, 0x3b, 0xdd, 0xf7, 0x27, 0x7e, 0x20, 0xa6, 0xd9, 0x55, 0x73, 0x14, 0xf1, 0x23, 0x91,
+	0x44, 0xe1, 0x61, 0x96, 0x1e, 0xe1, 0x2f, 0xc0, 0x55, 0x36, 0x51, 0x1f, 0xa3, 0x43, 0x9f, 0x85,
+	0x87, 0x7e, 0xe4, 0x47, 0xf8, 0xf7, 0x20, 0x5b, 0xe2, 0x68, 0xfe, 0x3b, 0xf1, 0xbd, 0x7c, 0xfd,
+	0x13, 0x00, 0x00, 0xff, 0xff, 0x9a, 0xe8, 0x5b, 0xe3, 0x5d, 0x08, 0x00, 0x00,
 }
diff --git a/protoc-gen-gogo/testdata/my_test/test.proto b/protoc-gen-gogo/testdata/my_test/test.proto
index 87071ba302..79f817312a 100644
--- a/protoc-gen-gogo/testdata/my_test/test.proto
+++ b/protoc-gen-gogo/testdata/my_test/test.proto
@@ -34,7 +34,7 @@ syntax = "proto2";
 // This package holds interesting messages.
 package my.test;  // dotted package name
 
-option go_package = "github.com/gogo/protobuf/protoc-gen-gogo/testdata/my_test;test";
+option go_package = "github.com/tron-us/protobuf/protoc-gen-gogo/testdata/my_test;test";
 
 //import "imp.proto";
 import "multi/multi1.proto";  // unused import
diff --git a/protoc-gen-gogo/testdata/proto3/proto3.pb.go b/protoc-gen-gogo/testdata/proto3/proto3.pb.go
index 923678f142..4f7331eb9b 100644
--- a/protoc-gen-gogo/testdata/proto3/proto3.pb.go
+++ b/protoc-gen-gogo/testdata/proto3/proto3.pb.go
@@ -176,24 +176,25 @@ func init() {
 func init() { proto.RegisterFile("proto3/proto3.proto", fileDescriptor_ab04eb4084a521db) }
 
 var fileDescriptor_ab04eb4084a521db = []byte{
-	// 303 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x3c, 0x90, 0x4d, 0x4f, 0xf2, 0x40,
-	0x14, 0x85, 0x99, 0x7e, 0xbc, 0xc0, 0x7d, 0xd1, 0x8c, 0x57, 0x13, 0xc7, 0x8d, 0x99, 0xb0, 0xea,
-	0x86, 0x92, 0xe0, 0x42, 0x63, 0xdc, 0x88, 0xa2, 0x92, 0x48, 0x30, 0x83, 0xc4, 0xc4, 0x8d, 0x99,
-	0xc2, 0x58, 0x49, 0x81, 0xc1, 0x76, 0x2a, 0xf1, 0xcf, 0xfa, 0x5b, 0x4c, 0x3b, 0xc5, 0xd5, 0x3d,
-	0xf7, 0x23, 0xcf, 0xc9, 0x3d, 0x70, 0xb8, 0x49, 0xb5, 0xd1, 0x67, 0x5d, 0x5b, 0xc2, 0xb2, 0xe0,
-	0x3f, 0xdb, 0xb5, 0x7f, 0x08, 0xd4, 0x85, 0xfa, 0xcc, 0x55, 0x66, 0x10, 0xc1, 0x5b, 0xcb, 0x95,
-	0x62, 0x84, 0x93, 0xa0, 0x29, 0x4a, 0x8d, 0x14, 0xdc, 0x44, 0x7d, 0x33, 0x87, 0xbb, 0x81, 0x2b,
-	0x0a, 0x89, 0x1d, 0xf0, 0x8d, 0xcc, 0x8c, 0x62, 0x2e, 0x27, 0xc1, 0x7e, 0xef, 0x38, 0xac, 0xb8,
-	0x15, 0x25, 0xbc, 0x5b, 0xca, 0x2f, 0x9d, 0xa7, 0xc2, 0x5e, 0x21, 0x07, 0x2f, 0xd2, 0x3a, 0x61,
-	0x1e, 0x27, 0xc1, 0xff, 0x5e, 0x6b, 0x77, 0xdd, 0xd7, 0x3a, 0x11, 0xe5, 0x06, 0x4f, 0xa1, 0x91,
-	0xaf, 0x37, 0x72, 0x96, 0xa8, 0x39, 0xf3, 0x0b, 0x9f, 0xbe, 0x43, 0x6b, 0xe2, 0x6f, 0xd6, 0xbe,
-	0x82, 0x7a, 0xc5, 0xc4, 0x26, 0xf8, 0x93, 0x97, 0xc1, 0xe0, 0x99, 0xd6, 0xb0, 0x01, 0xde, 0x64,
-	0x3c, 0x15, 0x94, 0x14, 0xc3, 0xe9, 0xe8, 0x7a, 0x34, 0xa4, 0x0e, 0x1e, 0xc0, 0xde, 0xfd, 0xf8,
-	0xe9, 0x61, 0x20, 0x1e, 0x87, 0x37, 0xc3, 0xf1, 0x74, 0x42, 0xdd, 0xf6, 0x39, 0x78, 0x85, 0x17,
-	0x1e, 0x81, 0x6f, 0x16, 0x66, 0xb9, 0xfb, 0xce, 0x36, 0x78, 0x02, 0x8d, 0x54, 0x6e, 0xdf, 0xe6,
-	0xd2, 0x48, 0xe6, 0x70, 0x12, 0xb4, 0x44, 0x3d, 0x95, 0xdb, 0x5b, 0x69, 0x64, 0xff, 0xf2, 0xf5,
-	0x22, 0x5e, 0x98, 0x8f, 0x3c, 0x0a, 0x67, 0x7a, 0xd5, 0x8d, 0x75, 0xac, 0x6d, 0x82, 0x51, 0xfe,
-	0x6e, 0xc5, 0xac, 0x13, 0xab, 0x75, 0xa7, 0x5c, 0x18, 0x95, 0x99, 0x82, 0x51, 0x65, 0x1c, 0x55,
-	0xe9, 0xfe, 0x06, 0x00, 0x00, 0xff, 0xff, 0xf6, 0xe1, 0xfa, 0x46, 0x7b, 0x01, 0x00, 0x00,
+	// 308 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x3c, 0x90, 0xcf, 0x4f, 0xfa, 0x40,
+	0x10, 0xc5, 0xd9, 0xfe, 0xf8, 0x02, 0xf3, 0x45, 0x53, 0x47, 0x13, 0xeb, 0xc5, 0x34, 0x9c, 0x7a,
+	0x69, 0x49, 0xf0, 0xe0, 0x41, 0x3d, 0x88, 0xa2, 0x92, 0x48, 0x30, 0x8b, 0xc4, 0xc4, 0x8b, 0xd9,
+	0xc2, 0x5a, 0x49, 0xa1, 0x8b, 0xed, 0x54, 0xe2, 0x3f, 0xeb, 0xdf, 0x62, 0xda, 0x2d, 0x9e, 0xe6,
+	0xcd, 0xec, 0xcb, 0xe7, 0x65, 0x1f, 0x1c, 0x6e, 0x32, 0x45, 0xea, 0xac, 0xa7, 0x47, 0x58, 0x0d,
+	0xfc, 0xa7, 0xb7, 0xee, 0x0f, 0x83, 0x26, 0x97, 0x9f, 0x85, 0xcc, 0x09, 0x11, 0xac, 0x54, 0xac,
+	0xa5, 0xcb, 0x3c, 0xe6, 0xb7, 0x79, 0xa5, 0xd1, 0x01, 0x33, 0x91, 0xdf, 0xae, 0xe1, 0x99, 0xbe,
+	0xc9, 0x4b, 0x89, 0x01, 0xd8, 0x24, 0x72, 0x92, 0xae, 0xe9, 0x31, 0x7f, 0xbf, 0x7f, 0x1c, 0xd6,
+	0xdc, 0x9a, 0x12, 0xde, 0xad, 0xc4, 0x97, 0x2a, 0x32, 0xae, 0x5d, 0xe8, 0x81, 0x15, 0x29, 0x95,
+	0xb8, 0x96, 0xc7, 0xfc, 0xff, 0xfd, 0xce, 0xce, 0x3d, 0x50, 0x2a, 0xe1, 0xd5, 0x0b, 0x9e, 0x42,
+	0xab, 0x48, 0x37, 0x62, 0x9e, 0xc8, 0x85, 0x6b, 0x97, 0x39, 0x03, 0xc3, 0x69, 0xf0, 0xbf, 0x5b,
+	0xf7, 0x12, 0x9a, 0x35, 0x13, 0xdb, 0x60, 0x4f, 0x5f, 0x86, 0xc3, 0x67, 0xa7, 0x81, 0x2d, 0xb0,
+	0xa6, 0x93, 0x19, 0x77, 0x58, 0x79, 0x9c, 0x8d, 0xaf, 0xc7, 0x23, 0xc7, 0xc0, 0x03, 0xd8, 0xbb,
+	0x9f, 0x3c, 0x3d, 0x0c, 0xf9, 0xe3, 0xe8, 0x66, 0x34, 0x99, 0x4d, 0x1d, 0xb3, 0x7b, 0x0e, 0x56,
+	0x99, 0x85, 0x47, 0x60, 0xd3, 0x92, 0x56, 0xbb, 0xdf, 0xe9, 0x05, 0x4f, 0xa0, 0x95, 0x89, 0xed,
+	0xdb, 0x42, 0x90, 0x70, 0x0d, 0x8f, 0xf9, 0x1d, 0xde, 0xcc, 0xc4, 0xf6, 0x56, 0x90, 0x18, 0x5c,
+	0xbd, 0x5e, 0xc4, 0x4b, 0xfa, 0x28, 0xa2, 0x70, 0xae, 0xd6, 0x3d, 0xca, 0x54, 0x1a, 0x14, 0xb9,
+	0x2e, 0x31, 0x2a, 0xde, 0xb5, 0x98, 0x07, 0xb1, 0x4c, 0x83, 0x58, 0xc5, 0xaa, 0x47, 0x32, 0xa7,
+	0x12, 0x53, 0xd7, 0x1c, 0xd5, 0x05, 0xff, 0x06, 0x00, 0x00, 0xff, 0xff, 0x29, 0xff, 0xfb, 0x74,
+	0x7e, 0x01, 0x00, 0x00,
 }
diff --git a/protoc-gen-gogo/testdata/proto3/proto3.proto b/protoc-gen-gogo/testdata/proto3/proto3.proto
index 08539761ae..f3ee4b1e00 100644
--- a/protoc-gen-gogo/testdata/proto3/proto3.proto
+++ b/protoc-gen-gogo/testdata/proto3/proto3.proto
@@ -33,7 +33,7 @@ syntax = "proto3";
 
 package proto3;
 
-option go_package = "github.com/gogo/protobuf/protoc-gen-gogo/testdata/proto3";
+option go_package = "github.com/tron-us/protobuf/protoc-gen-gogo/testdata/proto3";
 
 message Request {
   enum Flavour {
diff --git a/test/Makefile b/test/Makefile
index f252009707..455e79ce60 100644
--- a/test/Makefile
+++ b/test/Makefile
@@ -27,7 +27,7 @@
 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 regenerate:
-	go install github.com/gogo/protobuf/protoc-gen-gogo
+	go install github.com/tron-us/protobuf/protoc-gen-gogo
 	go install github.com/gogo/protobuf/protoc-gen-combo
 	protoc --gogo_out=. --proto_path=../protobuf/:../:../../../../:. thetest.proto
 	protoc-gen-combo --default=false --gogo_out=. --proto_path=../protobuf/:../:../../../../:. thetest.proto
diff --git a/test/casttype/Makefile b/test/casttype/Makefile
index ab86741cab..62cc7a5ea0 100644
--- a/test/casttype/Makefile
+++ b/test/casttype/Makefile
@@ -28,5 +28,5 @@
 
 regenerate:
 	go install github.com/gogo/protobuf/protoc-gen-combo
-	go install github.com/gogo/protobuf/protoc-gen-gogo
+	go install github.com/tron-us/protobuf/protoc-gen-gogo
 	protoc-gen-combo --gogo_out=. --version="3.0.0" --proto_path=../../protobuf/:../../../../../:. casttype.proto
diff --git a/test/castvalue/Makefile b/test/castvalue/Makefile
index 74ab2d084d..aadec4568e 100644
--- a/test/castvalue/Makefile
+++ b/test/castvalue/Makefile
@@ -29,7 +29,7 @@
 regenerate:
 	rm -rf combos
 	go install github.com/gogo/protobuf/protoc-gen-combo
-	go install github.com/gogo/protobuf/protoc-gen-gogo
+	go install github.com/tron-us/protobuf/protoc-gen-gogo
 	protoc-min-version --version="3.0.0" --gogo_out=. --proto_path=../../protobuf/:../../../../../:. castvalue.proto
 	protoc-gen-combo --default=false --version="3.0.0" --gogo_out=. --proto_path=../../protobuf/:../../../../../:. castvalue.proto
 	cp mytypes.go ./combos/both/ || true
diff --git a/test/data/Makefile b/test/data/Makefile
index eeb3f50919..2fb23ca2e5 100644
--- a/test/data/Makefile
+++ b/test/data/Makefile
@@ -28,6 +28,6 @@
 
 regenerate:
 	go install github.com/gogo/protobuf/protoc-min-version
-	go install github.com/gogo/protobuf/protoc-gen-gogo
+	go install github.com/tron-us/protobuf/protoc-gen-gogo
 	protoc-min-version --version="3.0.0" --gogo_out=. \
 	--proto_path=../../../../../:../../protobuf/:. data.proto
diff --git a/test/enumdecl/Makefile b/test/enumdecl/Makefile
index 75d9417ab8..f3ac94ccc6 100644
--- a/test/enumdecl/Makefile
+++ b/test/enumdecl/Makefile
@@ -1,3 +1,3 @@
 regenerate:
-	go install github.com/gogo/protobuf/protoc-gen-gogo
+	go install github.com/tron-us/protobuf/protoc-gen-gogo
 	protoc-min-version --version="3.0.0" --gogo_out=. --proto_path=../../../../../:../../protobuf/:. enumdecl.proto
diff --git a/test/enumdecl_all/Makefile b/test/enumdecl_all/Makefile
index 56316b509e..2b4340073b 100644
--- a/test/enumdecl_all/Makefile
+++ b/test/enumdecl_all/Makefile
@@ -1,3 +1,3 @@
 regenerate:
-	go install github.com/gogo/protobuf/protoc-gen-gogo
+	go install github.com/tron-us/protobuf/protoc-gen-gogo
 	protoc-min-version --version="3.0.0" --gogo_out=. --proto_path=../../../../../:../../protobuf/:. enumdeclall.proto
diff --git a/test/filedotname/Makefile b/test/filedotname/Makefile
index d0f6d4d65f..1b1d978a95 100644
--- a/test/filedotname/Makefile
+++ b/test/filedotname/Makefile
@@ -27,5 +27,5 @@
 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 regenerate:
-	go install github.com/gogo/protobuf/protoc-gen-gogo
+	go install github.com/tron-us/protobuf/protoc-gen-gogo
 	protoc --gogo_out=. --proto_path=../../protobuf/:../../../../../:. file.dot.proto
diff --git a/test/fuzztests/Makefile b/test/fuzztests/Makefile
index aa82b00fc8..7fe98e6993 100644
--- a/test/fuzztests/Makefile
+++ b/test/fuzztests/Makefile
@@ -27,5 +27,5 @@
 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 regenerate:
-	go install github.com/gogo/protobuf/protoc-gen-gogofast
+	go install github.com/tron-us/protobuf/protoc-gen-gogofast
 	protoc  --proto_path=../../../../../:../../protobuf/:. --gogofast_out=. fuzz.proto
diff --git a/test/importcustom-issue389/imported/Makefile b/test/importcustom-issue389/imported/Makefile
index c5f75100d9..84dd7a8bae 100644
--- a/test/importcustom-issue389/imported/Makefile
+++ b/test/importcustom-issue389/imported/Makefile
@@ -1,4 +1,4 @@
 regenerate:
-	go install github.com/gogo/protobuf/protoc-gen-gogo
+	go install github.com/tron-us/protobuf/protoc-gen-gogo
 	go install github.com/gogo/protobuf/protoc-min-version
 	protoc-min-version --version="3.0.0" --proto_path=../../../../../../:../../../protobuf/:. --gogo_out=. a.proto
\ No newline at end of file
diff --git a/test/importcustom-issue389/importing/Makefile b/test/importcustom-issue389/importing/Makefile
index f29f969c4a..3937b5d958 100644
--- a/test/importcustom-issue389/importing/Makefile
+++ b/test/importcustom-issue389/importing/Makefile
@@ -1,4 +1,4 @@
 regenerate:
-	go install github.com/gogo/protobuf/protoc-gen-gogo
+	go install github.com/tron-us/protobuf/protoc-gen-gogo
 	go install github.com/gogo/protobuf/protoc-min-version
 	protoc-min-version --version="3.0.0" --proto_path=../../../../../../:../../../protobuf/:. --gogo_out=. c.proto
\ No newline at end of file
diff --git a/test/importduplicate/Makefile b/test/importduplicate/Makefile
index efd3ea2486..09ee8e22cd 100644
--- a/test/importduplicate/Makefile
+++ b/test/importduplicate/Makefile
@@ -28,7 +28,7 @@
 
 regenerate:
 	go install github.com/gogo/protobuf/protoc-min-version
-	go install github.com/gogo/protobuf/protoc-gen-gogo
+	go install github.com/tron-us/protobuf/protoc-gen-gogo
 	protoc-min-version --version="3.0.0" --gogo_out=:. \
 	--proto_path=../../../../../:../../protobuf/:. importduplicate.proto
 	protoc-min-version --version="3.0.0" --gogo_out=:. \
diff --git a/test/issue260/Makefile b/test/issue260/Makefile
index a0f5e52943..b33a5ee805 100644
--- a/test/issue260/Makefile
+++ b/test/issue260/Makefile
@@ -1,3 +1,3 @@
 regenerate:
-	go install github.com/gogo/protobuf/protoc-gen-gogo
+	go install github.com/tron-us/protobuf/protoc-gen-gogo
 	protoc-min-version --version="3.0.0" --gogo_out=Mgoogle/protobuf/timestamp.proto=github.com/gogo/protobuf/types:. --proto_path=../../../../../:../../protobuf/:. issue260.proto
diff --git a/test/issue261/Makefile b/test/issue261/Makefile
index 8e2d9a5972..ab5090a993 100644
--- a/test/issue261/Makefile
+++ b/test/issue261/Makefile
@@ -1,6 +1,6 @@
 regenerate:
 	go install github.com/gogo/protobuf/protoc-min-version
-	go install github.com/gogo/protobuf/protoc-gen-gogoslick
+	go install github.com/tron-us/protobuf/protoc-gen-gogoslick
 	protoc-min-version --version="3.0.0" --gogoslick_out=\
 	Mgoogle/protobuf/duration.proto=github.com/gogo/protobuf/types,\
 	:. \
diff --git a/test/issue262/Makefile b/test/issue262/Makefile
index 5554779096..4507db3d1a 100644
--- a/test/issue262/Makefile
+++ b/test/issue262/Makefile
@@ -1,5 +1,5 @@
 regenerate:
 	go install github.com/gogo/protobuf/protoc-min-version
-	go install github.com/gogo/protobuf/protoc-gen-gogoslick
+	go install github.com/tron-us/protobuf/protoc-gen-gogoslick
 	protoc-min-version --version="3.0.0" --proto_path=.:$(GOPATH)/src/:$(GOPATH)/src/github.com/gogo/protobuf/protobuf/ \
 	--gogoslick_out=Mgoogle/protobuf/timestamp.proto=github.com/gogo/protobuf/types:. timefail.proto 
diff --git a/test/issue312/events/Makefile b/test/issue312/events/Makefile
index fc6be53f55..ef8bc006cc 100644
--- a/test/issue312/events/Makefile
+++ b/test/issue312/events/Makefile
@@ -1,4 +1,4 @@
 regenerate:
-	go install github.com/gogo/protobuf/protoc-gen-gogo
+	go install github.com/tron-us/protobuf/protoc-gen-gogo
 	protoc --proto_path=.:$(GOPATH)/src/:$(GOPATH)/src/github.com/gogo/protobuf/protobuf/ \
 	--gogo_out=. events.proto 
diff --git a/test/issue322/Makefile b/test/issue322/Makefile
index c7748e4435..ec88349037 100644
--- a/test/issue322/Makefile
+++ b/test/issue322/Makefile
@@ -1,3 +1,3 @@
 regenerate:
-	go install github.com/gogo/protobuf/protoc-gen-gogofast
-	protoc-min-version --version="3.0.0" --gogofast_out=Mgoogle/protobuf/descriptor.proto=github.com/gogo/protobuf/protoc-gen-gogo/descriptor:. --proto_path=../../../../../:../../protobuf/:. *.proto
+	go install github.com/tron-us/protobuf/protoc-gen-gogofast
+	protoc-min-version --version="3.0.0" --gogofast_out=Mgoogle/protobuf/descriptor.proto=github.com/tron-us/protobuf/protoc-gen-gogo/descriptor:. --proto_path=../../../../../:../../protobuf/:. *.proto
diff --git a/test/issue330/Makefile b/test/issue330/Makefile
index e085e13d20..7cdeee8834 100644
--- a/test/issue330/Makefile
+++ b/test/issue330/Makefile
@@ -1,3 +1,3 @@
 regenerate:
-	go install github.com/gogo/protobuf/protoc-gen-gogo
-	protoc-min-version --version="3.0.0" --gogo_out=Mgoogle/protobuf/descriptor.proto=github.com/gogo/protobuf/protoc-gen-gogo/descriptor:. --proto_path=../../../../../:../../protobuf/:. *.proto
+	go install github.com/tron-us/protobuf/protoc-gen-gogo
+	protoc-min-version --version="3.0.0" --gogo_out=Mgoogle/protobuf/descriptor.proto=github.com/tron-us/protobuf/protoc-gen-gogo/descriptor:. --proto_path=../../../../../:../../protobuf/:. *.proto
diff --git a/test/issue411/Makefile b/test/issue411/Makefile
index 7e0573b61e..54a5283007 100644
--- a/test/issue411/Makefile
+++ b/test/issue411/Makefile
@@ -1,3 +1,3 @@
 regenerate:
-	go install github.com/gogo/protobuf/protoc-gen-gogo
+	go install github.com/tron-us/protobuf/protoc-gen-gogo
 	protoc-min-version --version="3.0.0" --gogo_out=Mgoogle/protobuf/timestamp.proto=github.com/gogo/protobuf/types:. --proto_path=../../../../../:../../protobuf/:. issue411.proto
diff --git a/test/issue427/Makefile b/test/issue427/Makefile
index 5eb2c16859..8a8126a124 100644
--- a/test/issue427/Makefile
+++ b/test/issue427/Makefile
@@ -1,5 +1,5 @@
 test:
-	go install github.com/gogo/protobuf/protoc-gen-gogo
+	go install github.com/tron-us/protobuf/protoc-gen-gogo
 	go install github.com/gogo/protobuf/protoc-min-version
 	go get -u golang.org/x/net/context
 	go get -u google.golang.org/grpc
diff --git a/test/issue435/Makefile b/test/issue435/Makefile
index 9f5ceb9946..c432df3ad2 100644
--- a/test/issue435/Makefile
+++ b/test/issue435/Makefile
@@ -1,3 +1,3 @@
 regenerate:
-	go install github.com/gogo/protobuf/protoc-gen-gogo
+	go install github.com/tron-us/protobuf/protoc-gen-gogo
 	protoc --gogo_out=. --proto_path=../../../../../:../../protobuf/:. *.proto
diff --git a/test/issue438/Makefile b/test/issue438/Makefile
index 241e9cd9e8..5c1b3366db 100644
--- a/test/issue438/Makefile
+++ b/test/issue438/Makefile
@@ -1,5 +1,5 @@
 regenerate:
-	go install github.com/gogo/protobuf/protoc-gen-gogo
+	go install github.com/tron-us/protobuf/protoc-gen-gogo
 	go install github.com/gogo/protobuf/protoc-min-version
 	protoc-min-version --version="3.0.0" --gogo_out=\
 	Mgoogle/protobuf/any.proto=github.com/gogo/protobuf/types,\
diff --git a/test/issue449/Makefile b/test/issue449/Makefile
index 509db1a5ed..04ab9d8a45 100644
--- a/test/issue449/Makefile
+++ b/test/issue449/Makefile
@@ -27,7 +27,7 @@
 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 regenerate:
-	go install github.com/gogo/protobuf/protoc-gen-gogo
+	go install github.com/tron-us/protobuf/protoc-gen-gogo
 	go install github.com/gogo/protobuf/protoc-min-version
 	protoc-min-version --version="3.0.0" \
 	--proto_path=../../../../../:../../protobuf/:. \
diff --git a/test/issue498/Makefile b/test/issue498/Makefile
index 72a3314e5f..27aac2d25c 100644
--- a/test/issue498/Makefile
+++ b/test/issue498/Makefile
@@ -28,7 +28,7 @@
 
 regenerate:
 	go install github.com/gogo/protobuf/protoc-min-version
-	go install github.com/gogo/protobuf/protoc-gen-gogo
+	go install github.com/tron-us/protobuf/protoc-gen-gogo
 	protoc-min-version --version="3.0.0" --proto_path=\
 	.:$(GOPATH)/src/:$(GOPATH)/src/github.com/gogo/protobuf/protobuf/ \
 	--gogofast_out=. issue498.proto
diff --git a/test/issue503/Makefile b/test/issue503/Makefile
index b9d5c75efa..1564f19f37 100644
--- a/test/issue503/Makefile
+++ b/test/issue503/Makefile
@@ -27,6 +27,6 @@
 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 regenerate:
-	go install github.com/gogo/protobuf/protoc-gen-gogo
+	go install github.com/tron-us/protobuf/protoc-gen-gogo
 	go install github.com/gogo/protobuf/protoc-min-version
 	protoc-min-version --version="3.0.0" --gogo_out=. --proto_path=../../../../../:../../protobuf/:. *.proto
diff --git a/test/issue530/Makefile b/test/issue530/Makefile
index b9d5c75efa..1564f19f37 100644
--- a/test/issue530/Makefile
+++ b/test/issue530/Makefile
@@ -27,6 +27,6 @@
 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 regenerate:
-	go install github.com/gogo/protobuf/protoc-gen-gogo
+	go install github.com/tron-us/protobuf/protoc-gen-gogo
 	go install github.com/gogo/protobuf/protoc-min-version
 	protoc-min-version --version="3.0.0" --gogo_out=. --proto_path=../../../../../:../../protobuf/:. *.proto
diff --git a/test/issue617/Makefile b/test/issue617/Makefile
index b9d5c75efa..1564f19f37 100644
--- a/test/issue617/Makefile
+++ b/test/issue617/Makefile
@@ -27,6 +27,6 @@
 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 regenerate:
-	go install github.com/gogo/protobuf/protoc-gen-gogo
+	go install github.com/tron-us/protobuf/protoc-gen-gogo
 	go install github.com/gogo/protobuf/protoc-min-version
 	protoc-min-version --version="3.0.0" --gogo_out=. --proto_path=../../../../../:../../protobuf/:. *.proto
diff --git a/test/issue620/Makefile b/test/issue620/Makefile
index e5bb3f58b8..32b40b8ca2 100644
--- a/test/issue620/Makefile
+++ b/test/issue620/Makefile
@@ -27,5 +27,5 @@
 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 regenerate:
-	go install github.com/gogo/protobuf/protoc-gen-gogo
+	go install github.com/tron-us/protobuf/protoc-gen-gogo
 	protoc --proto_path=../../../../../:../../protobuf/:. --gogo_out=. issue620.proto
diff --git a/test/mapdefaults/Makefile b/test/mapdefaults/Makefile
index 597c0db311..5d83d6bf4b 100644
--- a/test/mapdefaults/Makefile
+++ b/test/mapdefaults/Makefile
@@ -28,7 +28,7 @@
 
 regenerate:
 	go install github.com/gogo/protobuf/protoc-gen-combo
-	go install github.com/gogo/protobuf/protoc-gen-gogofast
+	go install github.com/tron-us/protobuf/protoc-gen-gogofast
 	protoc-gen-combo --version="3.0.0" --proto_path=../../protobuf/:../../../../../:. --gogo_out=. map.proto
 	find combos -type d -not -name combos -exec cp map_test.go.in {}/map_test.go \;
 	cp unknown_test.go.in ./combos/unmarshaler/unknown_test.go
diff --git a/test/mapsproto2/Makefile b/test/mapsproto2/Makefile
index cc115227f7..ac3c420306 100644
--- a/test/mapsproto2/Makefile
+++ b/test/mapsproto2/Makefile
@@ -28,7 +28,7 @@
 
 regenerate:
 	go install github.com/gogo/protobuf/protoc-gen-combo
-	go install github.com/gogo/protobuf/protoc-gen-gogo
+	go install github.com/tron-us/protobuf/protoc-gen-gogo
 	cp header.proto mapsproto2.proto
 	cat ../theproto3/maps.proto >> mapsproto2.proto
 	find combos -type d -not -name combos -exec cp mapsproto2_test.go.in {}/mapsproto2_test.go \;
diff --git a/test/merge/Makefile b/test/merge/Makefile
index 4e1176296b..81ed3b24cf 100644
--- a/test/merge/Makefile
+++ b/test/merge/Makefile
@@ -1,5 +1,5 @@
 regenerate:
 	go install github.com/gogo/protobuf/protoc-min-version
-	go install github.com/gogo/protobuf/protoc-gen-gogo
+	go install github.com/tron-us/protobuf/protoc-gen-gogo
 	protoc-min-version --version="3.0.0" --gogo_out=. \
 	--proto_path=../../../../../:../../protobuf/:. merge.proto
diff --git a/test/oneof/Makefile b/test/oneof/Makefile
index 0ac3b93a41..fdf36f719c 100644
--- a/test/oneof/Makefile
+++ b/test/oneof/Makefile
@@ -28,5 +28,5 @@
 
 regenerate:
 	go install github.com/gogo/protobuf/protoc-gen-combo
-	go install github.com/gogo/protobuf/protoc-gen-gogo
+	go install github.com/tron-us/protobuf/protoc-gen-gogo
 	protoc-gen-combo --version="2.6.0" --gogo_out=. --proto_path=../../protobuf/:../../../../../:. one.proto
diff --git a/test/oneof3/Makefile b/test/oneof3/Makefile
index eb8e06210a..9e5f8f28dd 100644
--- a/test/oneof3/Makefile
+++ b/test/oneof3/Makefile
@@ -28,5 +28,5 @@
 
 regenerate:
 	go install github.com/gogo/protobuf/protoc-gen-combo
-	go install github.com/gogo/protobuf/protoc-gen-gogo
+	go install github.com/tron-us/protobuf/protoc-gen-gogo
 	protoc-gen-combo --version="3.0.0" --gogo_out=. --proto_path=../../protobuf/:../../../../../:. one.proto
diff --git a/test/proto3extension/Makefile b/test/proto3extension/Makefile
index 4477b52d36..0d533ee8ce 100644
--- a/test/proto3extension/Makefile
+++ b/test/proto3extension/Makefile
@@ -27,6 +27,6 @@
 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 regenerate:
-	go install github.com/gogo/protobuf/protoc-gen-gogo
+	go install github.com/tron-us/protobuf/protoc-gen-gogo
 	go install github.com/gogo/protobuf/protoc-min-version
-	protoc-min-version --version="3.0.0" --gogo_out=Mgoogle/protobuf/descriptor.proto=github.com/gogo/protobuf/protoc-gen-gogo/descriptor:. --proto_path=../../../../../:../../protobuf/:. *.proto
\ No newline at end of file
+	protoc-min-version --version="3.0.0" --gogo_out=Mgoogle/protobuf/descriptor.proto=github.com/tron-us/protobuf/protoc-gen-gogo/descriptor:. --proto_path=../../../../../:../../protobuf/:. *.proto
\ No newline at end of file
diff --git a/test/proto3extension/proto3ext.pb.go b/test/proto3extension/proto3ext.pb.go
index 5935603ce5..5fb17e2849 100644
--- a/test/proto3extension/proto3ext.pb.go
+++ b/test/proto3extension/proto3ext.pb.go
@@ -6,7 +6,7 @@ package proto3extension
 import (
 	fmt "fmt"
 	proto "github.com/gogo/protobuf/proto"
-	descriptor "github.com/gogo/protobuf/protoc-gen-gogo/descriptor"
+	descriptor "github.com/tron-us/protobuf/protoc-gen-gogo/descriptor"
 	math "math"
 )
 
diff --git a/test/protobuffer/Makefile b/test/protobuffer/Makefile
index 00e39f73f4..0a6af63802 100644
--- a/test/protobuffer/Makefile
+++ b/test/protobuffer/Makefile
@@ -27,5 +27,5 @@
 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 regenerate:
-	go install github.com/gogo/protobuf/protoc-gen-gogo
+	go install github.com/tron-us/protobuf/protoc-gen-gogo
 	protoc --gogo_out=. --proto_path=../../../../../:../../protobuf/:. *.proto
diff --git a/test/registration/Makefile b/test/registration/Makefile
index 03a096d898..87f555af40 100644
--- a/test/registration/Makefile
+++ b/test/registration/Makefile
@@ -27,7 +27,7 @@
 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 test:
-	go install github.com/gogo/protobuf/protoc-gen-gogo
+	go install github.com/tron-us/protobuf/protoc-gen-gogo
 	(protoc --proto_path=../../../../../:../../protobuf/:. --gogo_out=. registration.proto)
 	cp registration_test.go.in registration_test.go
 	go test ./...
diff --git a/test/setextensionbytes/Makefile b/test/setextensionbytes/Makefile
index 00e39f73f4..0a6af63802 100644
--- a/test/setextensionbytes/Makefile
+++ b/test/setextensionbytes/Makefile
@@ -27,5 +27,5 @@
 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 regenerate:
-	go install github.com/gogo/protobuf/protoc-gen-gogo
+	go install github.com/tron-us/protobuf/protoc-gen-gogo
 	protoc --gogo_out=. --proto_path=../../../../../:../../protobuf/:. *.proto
diff --git a/test/stdtypes/Makefile b/test/stdtypes/Makefile
index a8d105cce0..cc66ed8af2 100644
--- a/test/stdtypes/Makefile
+++ b/test/stdtypes/Makefile
@@ -28,7 +28,7 @@
 
 regenerate:
 	go install github.com/gogo/protobuf/protoc-min-version
-	go install github.com/gogo/protobuf/protoc-gen-gogo
+	go install github.com/tron-us/protobuf/protoc-gen-gogo
 	protoc-min-version --version="3.0.0" --gogo_out=\
 	Mgoogle/protobuf/duration.proto=github.com/gogo/protobuf/types,\
 	Mgoogle/protobuf/timestamp.proto=github.com/gogo/protobuf/types,\
diff --git a/test/theproto3/Makefile b/test/theproto3/Makefile
index ef424685fd..7a71371497 100644
--- a/test/theproto3/Makefile
+++ b/test/theproto3/Makefile
@@ -28,7 +28,7 @@
 
 regenerate:
 	go install github.com/gogo/protobuf/protoc-gen-combo
-	go install github.com/gogo/protobuf/protoc-gen-gogo
+	go install github.com/tron-us/protobuf/protoc-gen-gogo
 	cp header.proto theproto3.proto
 	cat maps.proto >> theproto3.proto
 	cat footer.proto >> theproto3.proto
diff --git a/test/typedecl/Makefile b/test/typedecl/Makefile
index 5b924dfe7f..19b9e6705e 100644
--- a/test/typedecl/Makefile
+++ b/test/typedecl/Makefile
@@ -1,3 +1,3 @@
 regenerate:
-	go install github.com/gogo/protobuf/protoc-gen-gogo
+	go install github.com/tron-us/protobuf/protoc-gen-gogo
 	protoc-min-version --version="3.0.0" --gogo_out=. --proto_path=../../../../../:../../protobuf/:. typedecl.proto
diff --git a/test/typedecl_all/Makefile b/test/typedecl_all/Makefile
index 994417461b..4661db6bee 100644
--- a/test/typedecl_all/Makefile
+++ b/test/typedecl_all/Makefile
@@ -1,3 +1,3 @@
 regenerate:
-	go install github.com/gogo/protobuf/protoc-gen-gogo
+	go install github.com/tron-us/protobuf/protoc-gen-gogo
 	protoc-min-version --version="3.0.0" --gogo_out=. --proto_path=../../../../../:../../protobuf/:. typedeclall.proto
diff --git a/test/typedeclimport/Makefile b/test/typedeclimport/Makefile
index d8a8e1f3f4..b6a947e9aa 100644
--- a/test/typedeclimport/Makefile
+++ b/test/typedeclimport/Makefile
@@ -1,4 +1,4 @@
 regenerate:
-	go install github.com/gogo/protobuf/protoc-gen-gogo
+	go install github.com/tron-us/protobuf/protoc-gen-gogo
 	protoc-min-version --version="3.0.0" --gogo_out=. --proto_path=../../../../../:../../protobuf/:. typedeclimport.proto
 	protoc-min-version --version="3.0.0" --gogo_out=. --proto_path=../../../../../:../../protobuf/:. ./subpkg/subpkg.proto
\ No newline at end of file
diff --git a/test/types/Makefile b/test/types/Makefile
index 7f489b367c..e49f9d190e 100644
--- a/test/types/Makefile
+++ b/test/types/Makefile
@@ -28,7 +28,7 @@
 
 regenerate:
 	go install github.com/gogo/protobuf/protoc-gen-combo
-	go install github.com/gogo/protobuf/protoc-gen-gogo
+	go install github.com/tron-us/protobuf/protoc-gen-gogo
 	protoc-gen-combo --version="3.0.0" --gogo_out=\
 	Mgoogle/protobuf/any.proto=github.com/gogo/protobuf/types,\
 	Mgoogle/protobuf/duration.proto=github.com/gogo/protobuf/types,\
diff --git a/test/xxxfields/Makefile b/test/xxxfields/Makefile
index ed62b39bd0..41d9975b49 100644
--- a/test/xxxfields/Makefile
+++ b/test/xxxfields/Makefile
@@ -28,5 +28,5 @@
 
 regenerate:
 	go install github.com/gogo/protobuf/protoc-gen-combo
-	go install github.com/gogo/protobuf/protoc-gen-gogo
+	go install github.com/tron-us/protobuf/protoc-gen-gogo
 	protoc-min-version --version="3.0.0" --gogo_out=. --proto_path=../../../../../:../../protobuf/:. xxxfields.proto
diff --git a/types/any_test.go b/types/any_test.go
index 5e41cb2e39..c3a86fcb57 100644
--- a/types/any_test.go
+++ b/types/any_test.go
@@ -35,7 +35,7 @@ import (
 	"testing"
 
 	"github.com/gogo/protobuf/proto"
-	pb "github.com/gogo/protobuf/protoc-gen-gogo/descriptor"
+	pb "github.com/tron-us/protobuf/protoc-gen-gogo/descriptor"
 )
 
 func TestMarshalUnmarshal(t *testing.T) {
diff --git a/vanity/command/command.go b/vanity/command/command.go
index efcbc7ddb1..e613373ea6 100644
--- a/vanity/command/command.go
+++ b/vanity/command/command.go
@@ -52,9 +52,9 @@ import (
 	_ "github.com/gogo/protobuf/plugin/union"
 	_ "github.com/gogo/protobuf/plugin/unmarshal"
 	"github.com/gogo/protobuf/proto"
-	_ "github.com/gogo/protobuf/protoc-gen-gogo/grpc"
-	plugin "github.com/gogo/protobuf/protoc-gen-gogo/plugin"
 	"github.com/tron-us/protobuf/protoc-gen-gogo/generator"
+	_ "github.com/tron-us/protobuf/protoc-gen-gogo/grpc"
+	plugin "github.com/tron-us/protobuf/protoc-gen-gogo/plugin"
 )
 
 func Read() *plugin.CodeGeneratorRequest {
diff --git a/vanity/enum.go b/vanity/enum.go
index 466d07b54e..e510b83da7 100644
--- a/vanity/enum.go
+++ b/vanity/enum.go
@@ -31,7 +31,7 @@ package vanity
 import (
 	"github.com/gogo/protobuf/gogoproto"
 	"github.com/gogo/protobuf/proto"
-	descriptor "github.com/gogo/protobuf/protoc-gen-gogo/descriptor"
+	descriptor "github.com/tron-us/protobuf/protoc-gen-gogo/descriptor"
 )
 
 func EnumHasBoolExtension(enum *descriptor.EnumDescriptorProto, extension *proto.ExtensionDesc) bool {
diff --git a/vanity/field.go b/vanity/field.go
index 62cdddfabb..ae4889223b 100644
--- a/vanity/field.go
+++ b/vanity/field.go
@@ -31,7 +31,7 @@ package vanity
 import (
 	"github.com/gogo/protobuf/gogoproto"
 	"github.com/gogo/protobuf/proto"
-	descriptor "github.com/gogo/protobuf/protoc-gen-gogo/descriptor"
+	descriptor "github.com/tron-us/protobuf/protoc-gen-gogo/descriptor"
 )
 
 func FieldHasBoolExtension(field *descriptor.FieldDescriptorProto, extension *proto.ExtensionDesc) bool {
diff --git a/vanity/file.go b/vanity/file.go
index 2055c66152..49b3f4c6c9 100644
--- a/vanity/file.go
+++ b/vanity/file.go
@@ -33,7 +33,7 @@ import (
 
 	"github.com/gogo/protobuf/gogoproto"
 	"github.com/gogo/protobuf/proto"
-	descriptor "github.com/gogo/protobuf/protoc-gen-gogo/descriptor"
+	descriptor "github.com/tron-us/protobuf/protoc-gen-gogo/descriptor"
 )
 
 func NotGoogleProtobufDescriptorProto(file *descriptor.FileDescriptorProto) bool {
diff --git a/vanity/foreach.go b/vanity/foreach.go
index 888b6d04d5..66560ba0f1 100644
--- a/vanity/foreach.go
+++ b/vanity/foreach.go
@@ -28,7 +28,7 @@
 
 package vanity
 
-import descriptor "github.com/gogo/protobuf/protoc-gen-gogo/descriptor"
+import descriptor "github.com/tron-us/protobuf/protoc-gen-gogo/descriptor"
 
 func ForEachFile(files []*descriptor.FileDescriptorProto, f func(file *descriptor.FileDescriptorProto)) {
 	for _, file := range files {
diff --git a/vanity/msg.go b/vanity/msg.go
index 390ff5ad44..f2505d03d7 100644
--- a/vanity/msg.go
+++ b/vanity/msg.go
@@ -31,7 +31,7 @@ package vanity
 import (
 	"github.com/gogo/protobuf/gogoproto"
 	"github.com/gogo/protobuf/proto"
-	descriptor "github.com/gogo/protobuf/protoc-gen-gogo/descriptor"
+	descriptor "github.com/tron-us/protobuf/protoc-gen-gogo/descriptor"
 )
 
 func MessageHasBoolExtension(msg *descriptor.DescriptorProto, extension *proto.ExtensionDesc) bool {
diff --git a/vanity/test/Makefile b/vanity/test/Makefile
index 0958c4a9ee..0d57c39d30 100644
--- a/vanity/test/Makefile
+++ b/vanity/test/Makefile
@@ -27,15 +27,15 @@
 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 regenerate:
-	go install github.com/gogo/protobuf/protoc-gen-gogofast
+	go install github.com/tron-us/protobuf/protoc-gen-gogofast
 	protoc --gogofast_out=./fast/ vanity.proto
 	protoc --proto_path=../../:../../../../../:../../protobuf/:. --gogofast_out=./fast/ gogovanity.proto
 	protoc-min-version -version="3.0.0" --proto_path=../../:../../../../../:../../protobuf/:. --gogofast_out=./fast/ proto3.proto
-	go install github.com/gogo/protobuf/protoc-gen-gogofaster
+	go install github.com/tron-us/protobuf/protoc-gen-gogofaster
 	protoc --gogofaster_out=./faster/ vanity.proto
 	protoc --proto_path=../../:../../../../../:../../protobuf/:. --gogofaster_out=./faster/ gogovanity.proto
 	protoc-min-version -version="3.0.0" --proto_path=../../:../../../../../:../../protobuf/:. --gogofaster_out=./faster/ proto3.proto
-	go install github.com/gogo/protobuf/protoc-gen-gogoslick
+	go install github.com/tron-us/protobuf/protoc-gen-gogoslick
 	protoc --gogoslick_out=./slick/ vanity.proto
 	protoc --proto_path=../../:../../../../../:../../protobuf/:. --gogoslick_out=./slick/ gogovanity.proto
 	protoc-min-version -version="3.0.0" --proto_path=../../:../../../../../:../../protobuf/:. --gogoslick_out=./slick/ proto3.proto