diff --git a/thrift/lib/go/thrift/binary_protocol.go b/thrift/lib/go/thrift/binary_format.go
similarity index 100%
rename from thrift/lib/go/thrift/binary_protocol.go
rename to thrift/lib/go/thrift/binary_format.go
diff --git a/thrift/lib/go/thrift/binary_protocol_test.go b/thrift/lib/go/thrift/binary_format_test.go
similarity index 100%
rename from thrift/lib/go/thrift/binary_protocol_test.go
rename to thrift/lib/go/thrift/binary_format_test.go
diff --git a/thrift/lib/go/thrift/compact_protocol.go b/thrift/lib/go/thrift/compact_format.go
similarity index 100%
rename from thrift/lib/go/thrift/compact_protocol.go
rename to thrift/lib/go/thrift/compact_format.go
diff --git a/thrift/lib/go/thrift/compact_protocol_test.go b/thrift/lib/go/thrift/compact_format_test.go
similarity index 100%
rename from thrift/lib/go/thrift/compact_protocol_test.go
rename to thrift/lib/go/thrift/compact_format_test.go
diff --git a/thrift/lib/go/thrift/json_protocol.go b/thrift/lib/go/thrift/json_format.go
similarity index 100%
rename from thrift/lib/go/thrift/json_protocol.go
rename to thrift/lib/go/thrift/json_format.go
diff --git a/thrift/lib/go/thrift/json_protocol_test.go b/thrift/lib/go/thrift/json_format_test.go
similarity index 100%
rename from thrift/lib/go/thrift/json_protocol_test.go
rename to thrift/lib/go/thrift/json_format_test.go
diff --git a/thrift/lib/go/thrift/simple_json_protocol.go b/thrift/lib/go/thrift/simple_json_format.go
similarity index 100%
rename from thrift/lib/go/thrift/simple_json_protocol.go
rename to thrift/lib/go/thrift/simple_json_format.go
diff --git a/thrift/lib/go/thrift/simple_json_protocol_test.go b/thrift/lib/go/thrift/simple_json_format_test.go
similarity index 100%
rename from thrift/lib/go/thrift/simple_json_protocol_test.go
rename to thrift/lib/go/thrift/simple_json_format_test.go