diff --git a/gossip/comm/comm.go b/gossip/comm/comm.go
index 89f0acb52bf..3603f2f78a6 100644
--- a/gossip/comm/comm.go
+++ b/gossip/comm/comm.go
@@ -20,7 +20,7 @@ import (
 	"fmt"
 
 	"github.com/hyperledger/fabric/gossip/common"
-	"github.com/hyperledger/fabric/protos/gossip"
+	proto "github.com/hyperledger/fabric/protos/gossip"
 )
 
 // Comm is an object that enables to communicate with other peers
diff --git a/gossip/comm/comm_impl.go b/gossip/comm/comm_impl.go
index c397df28398..48415fc878c 100644
--- a/gossip/comm/comm_impl.go
+++ b/gossip/comm/comm_impl.go
@@ -31,7 +31,7 @@ import (
 	"github.com/hyperledger/fabric/gossip/common"
 	"github.com/hyperledger/fabric/gossip/identity"
 	"github.com/hyperledger/fabric/gossip/util"
-	"github.com/hyperledger/fabric/protos/gossip"
+	proto "github.com/hyperledger/fabric/protos/gossip"
 	"github.com/op/go-logging"
 	"golang.org/x/net/context"
 	"google.golang.org/grpc"
diff --git a/gossip/comm/comm_test.go b/gossip/comm/comm_test.go
index c970e692859..47daa18206c 100644
--- a/gossip/comm/comm_test.go
+++ b/gossip/comm/comm_test.go
@@ -29,7 +29,7 @@ import (
 	"github.com/hyperledger/fabric/gossip/api"
 	"github.com/hyperledger/fabric/gossip/common"
 	"github.com/hyperledger/fabric/gossip/identity"
-	"github.com/hyperledger/fabric/protos/gossip"
+	proto "github.com/hyperledger/fabric/protos/gossip"
 	"github.com/stretchr/testify/assert"
 	"golang.org/x/net/context"
 	"google.golang.org/grpc"
diff --git a/gossip/comm/conn.go b/gossip/comm/conn.go
index 513f313e275..92a817cca7f 100644
--- a/gossip/comm/conn.go
+++ b/gossip/comm/conn.go
@@ -22,7 +22,7 @@ import (
 	"sync/atomic"
 
 	"github.com/hyperledger/fabric/gossip/common"
-	"github.com/hyperledger/fabric/protos/gossip"
+	proto "github.com/hyperledger/fabric/protos/gossip"
 	"github.com/op/go-logging"
 	"google.golang.org/grpc"
 )
diff --git a/gossip/comm/crypto_test.go b/gossip/comm/crypto_test.go
index 5419dc2195c..5e53596644c 100644
--- a/gossip/comm/crypto_test.go
+++ b/gossip/comm/crypto_test.go
@@ -25,7 +25,7 @@ import (
 	"testing"
 	"time"
 
-	"github.com/hyperledger/fabric/protos/gossip"
+	proto "github.com/hyperledger/fabric/protos/gossip"
 	"github.com/stretchr/testify/assert"
 	"golang.org/x/net/context"
 	"google.golang.org/grpc"
diff --git a/gossip/comm/mock/mock_comm.go b/gossip/comm/mock/mock_comm.go
index ff094a7e899..c9b037786ef 100644
--- a/gossip/comm/mock/mock_comm.go
+++ b/gossip/comm/mock/mock_comm.go
@@ -20,7 +20,7 @@ import (
 	"github.com/hyperledger/fabric/gossip/comm"
 	"github.com/hyperledger/fabric/gossip/common"
 	"github.com/hyperledger/fabric/gossip/util"
-	"github.com/hyperledger/fabric/protos/gossip"
+	proto "github.com/hyperledger/fabric/protos/gossip"
 )
 
 // Mock which aims to simulate socket
diff --git a/gossip/comm/mock/mock_comm_test.go b/gossip/comm/mock/mock_comm_test.go
index 6e76d8f6578..7d2d85b0742 100644
--- a/gossip/comm/mock/mock_comm_test.go
+++ b/gossip/comm/mock/mock_comm_test.go
@@ -21,7 +21,7 @@ import (
 
 	"github.com/hyperledger/fabric/gossip/comm"
 	"github.com/hyperledger/fabric/gossip/common"
-	"github.com/hyperledger/fabric/protos/gossip"
+	proto "github.com/hyperledger/fabric/protos/gossip"
 	"github.com/stretchr/testify/assert"
 )
 
diff --git a/gossip/comm/msg.go b/gossip/comm/msg.go
index 297314ab88c..f52b797e41d 100644
--- a/gossip/comm/msg.go
+++ b/gossip/comm/msg.go
@@ -20,7 +20,7 @@ import (
 	"sync"
 
 	"github.com/hyperledger/fabric/gossip/common"
-	"github.com/hyperledger/fabric/protos/gossip"
+	proto "github.com/hyperledger/fabric/protos/gossip"
 )
 
 // ReceivedMessageImpl is an implementation of ReceivedMessage
diff --git a/gossip/discovery/discovery.go b/gossip/discovery/discovery.go
index 2c5cc925a63..542d0b44dc9 100644
--- a/gossip/discovery/discovery.go
+++ b/gossip/discovery/discovery.go
@@ -18,7 +18,7 @@ package discovery
 
 import (
 	"github.com/hyperledger/fabric/gossip/common"
-	"github.com/hyperledger/fabric/protos/gossip"
+	proto "github.com/hyperledger/fabric/protos/gossip"
 )
 
 // CryptoService is an interface that the discovery expects to be implemented and passed on creation
diff --git a/gossip/discovery/discovery_impl.go b/gossip/discovery/discovery_impl.go
index 9e42951eafc..2140d7b8c3a 100644
--- a/gossip/discovery/discovery_impl.go
+++ b/gossip/discovery/discovery_impl.go
@@ -25,7 +25,7 @@ import (
 
 	"github.com/hyperledger/fabric/gossip/common"
 	"github.com/hyperledger/fabric/gossip/util"
-	"github.com/hyperledger/fabric/protos/gossip"
+	proto "github.com/hyperledger/fabric/protos/gossip"
 	"github.com/op/go-logging"
 )
 
diff --git a/gossip/discovery/discovery_test.go b/gossip/discovery/discovery_test.go
index 76dbfbeeac3..a03ab96ffd1 100644
--- a/gossip/discovery/discovery_test.go
+++ b/gossip/discovery/discovery_test.go
@@ -26,7 +26,7 @@ import (
 	"time"
 
 	"github.com/hyperledger/fabric/gossip/common"
-	"github.com/hyperledger/fabric/protos/gossip"
+	proto "github.com/hyperledger/fabric/protos/gossip"
 	"github.com/stretchr/testify/assert"
 	"golang.org/x/net/context"
 	"google.golang.org/grpc"
diff --git a/gossip/election/adapter.go b/gossip/election/adapter.go
index 5a071cf2e4c..586b8eed23a 100644
--- a/gossip/election/adapter.go
+++ b/gossip/election/adapter.go
@@ -26,7 +26,7 @@ import (
 	"github.com/hyperledger/fabric/gossip/comm"
 	"github.com/hyperledger/fabric/gossip/common"
 	"github.com/hyperledger/fabric/gossip/discovery"
-	"github.com/hyperledger/fabric/protos/gossip"
+	proto "github.com/hyperledger/fabric/protos/gossip"
 	"github.com/op/go-logging"
 )
 
diff --git a/gossip/election/adapter_test.go b/gossip/election/adapter_test.go
index 94fa4980a01..b2aa4bfc41c 100644
--- a/gossip/election/adapter_test.go
+++ b/gossip/election/adapter_test.go
@@ -27,7 +27,7 @@ import (
 	"github.com/hyperledger/fabric/gossip/comm"
 	"github.com/hyperledger/fabric/gossip/common"
 	"github.com/hyperledger/fabric/gossip/discovery"
-	"github.com/hyperledger/fabric/protos/gossip"
+	proto "github.com/hyperledger/fabric/protos/gossip"
 )
 
 func TestNewAdapter(t *testing.T) {
diff --git a/gossip/gossip/certstore.go b/gossip/gossip/certstore.go
index c05b10ddfab..7ea855506c1 100644
--- a/gossip/gossip/certstore.go
+++ b/gossip/gossip/certstore.go
@@ -27,7 +27,7 @@ import (
 	"github.com/hyperledger/fabric/gossip/gossip/pull"
 	"github.com/hyperledger/fabric/gossip/identity"
 	"github.com/hyperledger/fabric/gossip/util"
-	"github.com/hyperledger/fabric/protos/gossip"
+	proto "github.com/hyperledger/fabric/protos/gossip"
 	"github.com/op/go-logging"
 )
 
diff --git a/gossip/gossip/certstore_test.go b/gossip/gossip/certstore_test.go
index 69846578f2f..05a4abc8081 100644
--- a/gossip/gossip/certstore_test.go
+++ b/gossip/gossip/certstore_test.go
@@ -28,7 +28,7 @@ import (
 	"github.com/hyperledger/fabric/gossip/gossip/algo"
 	"github.com/hyperledger/fabric/gossip/gossip/pull"
 	"github.com/hyperledger/fabric/gossip/identity"
-	"github.com/hyperledger/fabric/protos/gossip"
+	proto "github.com/hyperledger/fabric/protos/gossip"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/mock"
 )
diff --git a/gossip/gossip/channel/channel.go b/gossip/gossip/channel/channel.go
index 50b4a86dd1a..3571b1f77d0 100644
--- a/gossip/gossip/channel/channel.go
+++ b/gossip/gossip/channel/channel.go
@@ -31,7 +31,7 @@ import (
 	"github.com/hyperledger/fabric/gossip/gossip/msgstore"
 	"github.com/hyperledger/fabric/gossip/gossip/pull"
 	"github.com/hyperledger/fabric/gossip/util"
-	"github.com/hyperledger/fabric/protos/gossip"
+	proto "github.com/hyperledger/fabric/protos/gossip"
 	"github.com/op/go-logging"
 )
 
diff --git a/gossip/gossip/channel/channel_test.go b/gossip/gossip/channel/channel_test.go
index ff43c776a59..ae39fcf8bda 100644
--- a/gossip/gossip/channel/channel_test.go
+++ b/gossip/gossip/channel/channel_test.go
@@ -29,7 +29,7 @@ import (
 	"github.com/hyperledger/fabric/gossip/common"
 	"github.com/hyperledger/fabric/gossip/discovery"
 	"github.com/hyperledger/fabric/gossip/gossip/algo"
-	"github.com/hyperledger/fabric/protos/gossip"
+	proto "github.com/hyperledger/fabric/protos/gossip"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/mock"
 )
@@ -211,8 +211,8 @@ func TestChannelPeriodicalPublishStateInfo(t *testing.T) {
 
 	adapter := new(gossipAdapterMock)
 	configureAdapter(adapter)
-	adapter.On("Send", mock.AnythingOfType("*proto.GossipMessage"), mock.Anything)
-	adapter.On("Gossip", mock.AnythingOfType("*proto.GossipMessage")).Run(func(arg mock.Arguments) {
+	adapter.On("Send", mock.AnythingOfType("*gossip.GossipMessage"), mock.Anything)
+	adapter.On("Gossip", mock.AnythingOfType("*gossip.GossipMessage")).Run(func(arg mock.Arguments) {
 		if atomic.LoadInt32(&receivedMsg) == int32(1) {
 			return
 		}
@@ -246,8 +246,8 @@ func TestChannelPull(t *testing.T) {
 	receivedBlocksChan := make(chan *proto.GossipMessage)
 	adapter := new(gossipAdapterMock)
 	configureAdapter(adapter, discovery.NetworkMember{PKIid: pkiIDInOrg1})
-	adapter.On("Gossip", mock.AnythingOfType("*proto.GossipMessage"))
-	adapter.On("DeMultiplex", mock.AnythingOfType("*proto.GossipMessage")).Run(func(arg mock.Arguments) {
+	adapter.On("Gossip", mock.AnythingOfType("*gossip.GossipMessage"))
+	adapter.On("DeMultiplex", mock.AnythingOfType("*gossip.GossipMessage")).Run(func(arg mock.Arguments) {
 		msg := arg.Get(0).(*proto.GossipMessage)
 		if !msg.IsDataMsg() {
 			return
@@ -261,7 +261,7 @@ func TestChannelPull(t *testing.T) {
 
 	var wg sync.WaitGroup
 	pullPhase := simulatePullPhase(gc, t, &wg, func(*proto.GossipMessage) {})
-	adapter.On("Send", mock.AnythingOfType("*proto.GossipMessage"), mock.Anything).Run(pullPhase)
+	adapter.On("Send", mock.AnythingOfType("*gossip.GossipMessage"), mock.Anything).Run(pullPhase)
 
 	wg.Wait()
 	for expectedSeq := 10; expectedSeq < 11; expectedSeq++ {
@@ -282,7 +282,7 @@ func TestChannelPeerNotInChannel(t *testing.T) {
 	gossipMessagesSentFromChannel := make(chan *proto.GossipMessage, 1)
 	adapter := new(gossipAdapterMock)
 	configureAdapter(adapter)
-	adapter.On("Gossip", mock.AnythingOfType("*proto.GossipMessage"))
+	adapter.On("Gossip", mock.AnythingOfType("*gossip.GossipMessage"))
 	adapter.On("Send", mock.Anything, mock.Anything)
 	adapter.On("DeMultiplex", mock.Anything)
 	gc := NewGossipChannel(cs, channelA, adapter, &joinChanMsg{})
@@ -306,7 +306,7 @@ func TestChannelPeerNotInChannel(t *testing.T) {
 	}
 	// First, ensure it does that for pull messages from peers that are in the channel
 	helloMsg := createHelloMsg(pkiIDInOrg1)
-	helloMsg.On("Respond", mock.AnythingOfType("*proto.GossipMessage")).Run(messageRelayer)
+	helloMsg.On("Respond", mock.AnythingOfType("*gossip.GossipMessage")).Run(messageRelayer)
 	gc.HandleMessage(helloMsg)
 	select {
 	case <-gossipMessagesSentFromChannel:
@@ -315,7 +315,7 @@ func TestChannelPeerNotInChannel(t *testing.T) {
 	}
 	// And now for peers that are not in the channel (should not send back a message)
 	helloMsg = createHelloMsg(pkiIDinOrg2)
-	helloMsg.On("Respond", mock.AnythingOfType("*proto.GossipMessage")).Run(messageRelayer)
+	helloMsg.On("Respond", mock.AnythingOfType("*gossip.GossipMessage")).Run(messageRelayer)
 	gc.HandleMessage(helloMsg)
 	select {
 	case <-gossipMessagesSentFromChannel:
@@ -329,7 +329,7 @@ func TestChannelPeerNotInChannel(t *testing.T) {
 		msg:   req,
 		PKIID: pkiIDInOrg1,
 	}
-	validReceivedMsg.On("Respond", mock.AnythingOfType("*proto.GossipMessage")).Run(messageRelayer)
+	validReceivedMsg.On("Respond", mock.AnythingOfType("*gossip.GossipMessage")).Run(messageRelayer)
 	gc.HandleMessage(validReceivedMsg)
 	select {
 	case <-gossipMessagesSentFromChannel:
@@ -342,7 +342,7 @@ func TestChannelPeerNotInChannel(t *testing.T) {
 		msg:   req,
 		PKIID: pkiIDinOrg2,
 	}
-	invalidReceivedMsg.On("Respond", mock.AnythingOfType("*proto.GossipMessage")).Run(messageRelayer)
+	invalidReceivedMsg.On("Respond", mock.AnythingOfType("*gossip.GossipMessage")).Run(messageRelayer)
 	gc.HandleMessage(invalidReceivedMsg)
 	select {
 	case <-gossipMessagesSentFromChannel:
@@ -357,7 +357,7 @@ func TestChannelPeerNotInChannel(t *testing.T) {
 		msg:   req2,
 		PKIID: pkiIDInOrg1,
 	}
-	invalidReceivedMsg2.On("Respond", mock.AnythingOfType("*proto.GossipMessage")).Run(messageRelayer)
+	invalidReceivedMsg2.On("Respond", mock.AnythingOfType("*gossip.GossipMessage")).Run(messageRelayer)
 	gc.HandleMessage(invalidReceivedMsg2)
 	select {
 	case <-gossipMessagesSentFromChannel:
@@ -374,7 +374,7 @@ func TestChannelIsInChannel(t *testing.T) {
 	adapter := new(gossipAdapterMock)
 	configureAdapter(adapter)
 	gc := NewGossipChannel(cs, channelA, adapter, &joinChanMsg{})
-	adapter.On("Gossip", mock.AnythingOfType("*proto.GossipMessage"))
+	adapter.On("Gossip", mock.AnythingOfType("*gossip.GossipMessage"))
 	adapter.On("Send", mock.Anything, mock.Anything)
 	adapter.On("DeMultiplex", mock.Anything)
 
@@ -393,7 +393,7 @@ func TestChannelIsSubscribed(t *testing.T) {
 	adapter := new(gossipAdapterMock)
 	configureAdapter(adapter)
 	gc := NewGossipChannel(cs, channelA, adapter, &joinChanMsg{})
-	adapter.On("Gossip", mock.AnythingOfType("*proto.GossipMessage"))
+	adapter.On("Gossip", mock.AnythingOfType("*gossip.GossipMessage"))
 	adapter.On("Send", mock.Anything, mock.Anything)
 	adapter.On("DeMultiplex", mock.Anything)
 	gc.HandleMessage(&receivedMsg{msg: createStateInfoMsg(10, pkiIDInOrg1, channelA), PKIID: pkiIDInOrg1})
@@ -411,7 +411,7 @@ func TestChannelAddToMessageStore(t *testing.T) {
 	gc := NewGossipChannel(cs, channelA, adapter, &joinChanMsg{})
 	adapter.On("Gossip", mock.Anything)
 	adapter.On("Send", mock.Anything, mock.Anything)
-	adapter.On("DeMultiplex", mock.AnythingOfType("*proto.GossipMessage")).Run(func(arg mock.Arguments) {
+	adapter.On("DeMultiplex", mock.AnythingOfType("*gossip.GossipMessage")).Run(func(arg mock.Arguments) {
 		demuxedMsgs <- arg.Get(0).(*proto.GossipMessage)
 	})
 
@@ -438,7 +438,7 @@ func TestChannelAddToMessageStore(t *testing.T) {
 	gc.AddToMsgStore(createStateInfoMsg(10, pkiIDInOrg1, channelA))
 	helloMsg := createHelloMsg(pkiIDInOrg1)
 	respondedChan := make(chan struct{}, 1)
-	helloMsg.On("Respond", mock.AnythingOfType("*proto.GossipMessage")).Run(func(arg mock.Arguments) {
+	helloMsg.On("Respond", mock.AnythingOfType("*gossip.GossipMessage")).Run(func(arg mock.Arguments) {
 		respondedChan <- struct{}{}
 	})
 	gc.HandleMessage(helloMsg)
@@ -588,7 +588,7 @@ func TestChannelStateInfoSnapshot(t *testing.T) {
 	adapter.On("Gossip", mock.Anything)
 	sentMessages := make(chan *proto.GossipMessage, 10)
 	adapter.On("Send", mock.Anything, mock.Anything)
-	adapter.On("ValidateStateInfoMessage", mock.AnythingOfType("*proto.GossipMessage")).Return(nil)
+	adapter.On("ValidateStateInfoMessage", mock.AnythingOfType("*gossip.GossipMessage")).Return(nil)
 
 	// Ensure we ignore stateInfo snapshots from peers not in the channel
 	gc.HandleMessage(&receivedMsg{PKIID: pkiIDInOrg1, msg: stateInfoSnapshotForChannel(common.ChainID("B"), createStateInfoMsg(4, pkiIDInOrg1, channelA))})
@@ -728,7 +728,7 @@ func TestChannelReconfigureChannel(t *testing.T) {
 	// Just call it again, to make sure stuff don't crash
 	gc.ConfigureChannel(api.JoinChannelMessage(newJoinChanMsg))
 
-	adapter.On("Gossip", mock.AnythingOfType("*proto.GossipMessage"))
+	adapter.On("Gossip", mock.AnythingOfType("*gossip.GossipMessage"))
 	adapter.On("Send", mock.Anything, mock.Anything)
 	adapter.On("DeMultiplex", mock.Anything)
 
@@ -760,7 +760,7 @@ func TestChannelReconfigureChannel(t *testing.T) {
 		msg := arg.Get(0).(*proto.GossipMessage)
 		gossipMessagesSentFromChannel <- msg
 	}
-	invalidReceivedMsg.On("Respond", mock.AnythingOfType("*proto.GossipMessage")).Run(messageRelayer)
+	invalidReceivedMsg.On("Respond", mock.AnythingOfType("*gossip.GossipMessage")).Run(messageRelayer)
 	gc.HandleMessage(invalidReceivedMsg)
 	select {
 	case <-gossipMessagesSentFromChannel:
diff --git a/gossip/gossip/chanstate.go b/gossip/gossip/chanstate.go
index 23419502119..1ff450bf827 100644
--- a/gossip/gossip/chanstate.go
+++ b/gossip/gossip/chanstate.go
@@ -28,7 +28,7 @@ import (
 	"github.com/hyperledger/fabric/gossip/gossip/channel"
 	"github.com/hyperledger/fabric/gossip/gossip/msgstore"
 	"github.com/hyperledger/fabric/gossip/gossip/pull"
-	"github.com/hyperledger/fabric/protos/gossip"
+	proto "github.com/hyperledger/fabric/protos/gossip"
 	"github.com/op/go-logging"
 )
 
diff --git a/gossip/gossip/gossip.go b/gossip/gossip/gossip.go
index 4b3ec934f60..9a863e70967 100644
--- a/gossip/gossip/gossip.go
+++ b/gossip/gossip/gossip.go
@@ -25,7 +25,7 @@ import (
 	"github.com/hyperledger/fabric/gossip/comm"
 	"github.com/hyperledger/fabric/gossip/common"
 	"github.com/hyperledger/fabric/gossip/discovery"
-	"github.com/hyperledger/fabric/protos/gossip"
+	proto "github.com/hyperledger/fabric/protos/gossip"
 )
 
 // Gossip is the interface of the gossip component
diff --git a/gossip/gossip/gossip_impl.go b/gossip/gossip/gossip_impl.go
index 6c77fa896db..5b49bd9254a 100644
--- a/gossip/gossip/gossip_impl.go
+++ b/gossip/gossip/gossip_impl.go
@@ -34,7 +34,7 @@ import (
 	"github.com/hyperledger/fabric/gossip/gossip/pull"
 	"github.com/hyperledger/fabric/gossip/identity"
 	"github.com/hyperledger/fabric/gossip/util"
-	"github.com/hyperledger/fabric/protos/gossip"
+	proto "github.com/hyperledger/fabric/protos/gossip"
 	"github.com/op/go-logging"
 	"google.golang.org/grpc"
 )
diff --git a/gossip/gossip/gossip_test.go b/gossip/gossip/gossip_test.go
index 42da334bb4a..fbbc75002cc 100644
--- a/gossip/gossip/gossip_test.go
+++ b/gossip/gossip/gossip_test.go
@@ -32,7 +32,7 @@ import (
 	"github.com/hyperledger/fabric/gossip/discovery"
 	"github.com/hyperledger/fabric/gossip/gossip/algo"
 	"github.com/hyperledger/fabric/gossip/util"
-	"github.com/hyperledger/fabric/protos/gossip"
+	proto "github.com/hyperledger/fabric/protos/gossip"
 	"github.com/stretchr/testify/assert"
 )
 
diff --git a/gossip/gossip/pull/pullstore.go b/gossip/gossip/pull/pullstore.go
index 2d4e87700a3..edb3b85281d 100644
--- a/gossip/gossip/pull/pullstore.go
+++ b/gossip/gossip/pull/pullstore.go
@@ -25,7 +25,7 @@ import (
 	"github.com/hyperledger/fabric/gossip/discovery"
 	"github.com/hyperledger/fabric/gossip/gossip/algo"
 	"github.com/hyperledger/fabric/gossip/util"
-	"github.com/hyperledger/fabric/protos/gossip"
+	proto "github.com/hyperledger/fabric/protos/gossip"
 	"github.com/op/go-logging"
 )
 
diff --git a/gossip/gossip/pull/pullstore_test.go b/gossip/gossip/pull/pullstore_test.go
index 8be4ffb21f8..375008530d4 100644
--- a/gossip/gossip/pull/pullstore_test.go
+++ b/gossip/gossip/pull/pullstore_test.go
@@ -27,7 +27,7 @@ import (
 	"github.com/hyperledger/fabric/gossip/discovery"
 	"github.com/hyperledger/fabric/gossip/gossip/algo"
 	"github.com/hyperledger/fabric/gossip/util"
-	"github.com/hyperledger/fabric/protos/gossip"
+	proto "github.com/hyperledger/fabric/protos/gossip"
 	"github.com/stretchr/testify/assert"
 )
 
diff --git a/gossip/service/gossip_service.go b/gossip/service/gossip_service.go
index 1a7f3d318c7..1ce9e72a8bc 100644
--- a/gossip/service/gossip_service.go
+++ b/gossip/service/gossip_service.go
@@ -29,7 +29,7 @@ import (
 	"github.com/hyperledger/fabric/gossip/state"
 	"github.com/hyperledger/fabric/gossip/util"
 	"github.com/hyperledger/fabric/protos/common"
-	"github.com/hyperledger/fabric/protos/gossip"
+	proto "github.com/hyperledger/fabric/protos/gossip"
 	"google.golang.org/grpc"
 )
 
diff --git a/gossip/state/payloads_buffer.go b/gossip/state/payloads_buffer.go
index 9112265596b..fd3c8ddb892 100644
--- a/gossip/state/payloads_buffer.go
+++ b/gossip/state/payloads_buffer.go
@@ -23,7 +23,7 @@ import (
 	"sync/atomic"
 
 	"github.com/hyperledger/fabric/gossip/util"
-	"github.com/hyperledger/fabric/protos/gossip"
+	proto "github.com/hyperledger/fabric/protos/gossip"
 	"github.com/op/go-logging"
 )
 
diff --git a/gossip/state/payloads_buffer_test.go b/gossip/state/payloads_buffer_test.go
index 0174c01aa44..1c21460cb2b 100644
--- a/gossip/state/payloads_buffer_test.go
+++ b/gossip/state/payloads_buffer_test.go
@@ -24,7 +24,7 @@ import (
 	"testing"
 	"time"
 
-	"github.com/hyperledger/fabric/protos/gossip"
+	proto "github.com/hyperledger/fabric/protos/gossip"
 	"github.com/stretchr/testify/assert"
 )
 
diff --git a/gossip/state/state.go b/gossip/state/state.go
index 2a37cc59d6e..7bb761baee4 100644
--- a/gossip/state/state.go
+++ b/gossip/state/state.go
@@ -30,7 +30,7 @@ import (
 	"github.com/hyperledger/fabric/gossip/gossip"
 	"github.com/hyperledger/fabric/gossip/util"
 	"github.com/hyperledger/fabric/protos/common"
-	"github.com/hyperledger/fabric/protos/gossip"
+	proto "github.com/hyperledger/fabric/protos/gossip"
 	"github.com/op/go-logging"
 )
 
diff --git a/gossip/state/state_test.go b/gossip/state/state_test.go
index 3baf68a779d..0fc601518c2 100644
--- a/gossip/state/state_test.go
+++ b/gossip/state/state_test.go
@@ -36,7 +36,7 @@ import (
 	"github.com/hyperledger/fabric/gossip/gossip"
 	gossipUtil "github.com/hyperledger/fabric/gossip/util"
 	pcomm "github.com/hyperledger/fabric/protos/common"
-	"github.com/hyperledger/fabric/protos/gossip"
+	proto "github.com/hyperledger/fabric/protos/gossip"
 	"github.com/spf13/viper"
 	"github.com/stretchr/testify/assert"
 )
diff --git a/protos/gossip/extensions.go b/protos/gossip/extensions.go
index 3fc61a3f44c..8902828f338 100644
--- a/protos/gossip/extensions.go
+++ b/protos/gossip/extensions.go
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package proto
+package gossip
 
 import (
 	"bytes"
diff --git a/protos/gossip/message.pb.go b/protos/gossip/message.pb.go
index 41fa5da9c13..33915bf7953 100644
--- a/protos/gossip/message.pb.go
+++ b/protos/gossip/message.pb.go
@@ -1,12 +1,12 @@
 // Code generated by protoc-gen-go.
-// source: message.proto
+// source: gossip/message.proto
 // DO NOT EDIT!
 
 /*
-Package proto is a generated protocol buffer package.
+Package gossip is a generated protocol buffer package.
 
 It is generated from these files:
-	message.proto
+	gossip/message.proto
 
 It has these top-level messages:
 	GossipMessage
@@ -31,9 +31,9 @@ It has these top-level messages:
 	RemoteStateRequest
 	RemoteStateResponse
 */
-package proto
+package gossip
 
-import proto1 "github.com/golang/protobuf/proto"
+import proto "github.com/golang/protobuf/proto"
 import fmt "fmt"
 import math "math"
 
@@ -43,7 +43,7 @@ import (
 )
 
 // Reference imports to suppress errors if they are not otherwise used.
-var _ = proto1.Marshal
+var _ = proto.Marshal
 var _ = fmt.Errorf
 var _ = math.Inf
 
@@ -51,7 +51,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto1.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
 
 type PullMsgType int32
 
@@ -73,7 +73,7 @@ var PullMsgType_value = map[string]int32{
 }
 
 func (x PullMsgType) String() string {
-	return proto1.EnumName(PullMsgType_name, int32(x))
+	return proto.EnumName(PullMsgType_name, int32(x))
 }
 func (PullMsgType) EnumDescriptor() ([]byte, []int) { return fileDescriptor0, []int{0} }
 
@@ -106,7 +106,7 @@ var GossipMessage_Tag_value = map[string]int32{
 }
 
 func (x GossipMessage_Tag) String() string {
-	return proto1.EnumName(GossipMessage_Tag_name, int32(x))
+	return proto.EnumName(GossipMessage_Tag_name, int32(x))
 }
 func (GossipMessage_Tag) EnumDescriptor() ([]byte, []int) { return fileDescriptor0, []int{0, 0} }
 
@@ -145,7 +145,7 @@ type GossipMessage struct {
 }
 
 func (m *GossipMessage) Reset()                    { *m = GossipMessage{} }
-func (m *GossipMessage) String() string            { return proto1.CompactTextString(m) }
+func (m *GossipMessage) String() string            { return proto.CompactTextString(m) }
 func (*GossipMessage) ProtoMessage()               {}
 func (*GossipMessage) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{0} }
 
@@ -350,7 +350,7 @@ func (m *GossipMessage) GetPeerIdentity() *PeerIdentity {
 }
 
 // XXX_OneofFuncs is for the internal use of the proto package.
-func (*GossipMessage) XXX_OneofFuncs() (func(msg proto1.Message, b *proto1.Buffer) error, func(msg proto1.Message, tag, wire int, b *proto1.Buffer) (bool, error), func(msg proto1.Message) (n int), []interface{}) {
+func (*GossipMessage) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) error, func(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error), func(msg proto.Message) (n int), []interface{}) {
 	return _GossipMessage_OneofMarshaler, _GossipMessage_OneofUnmarshaler, _GossipMessage_OneofSizer, []interface{}{
 		(*GossipMessage_AliveMsg)(nil),
 		(*GossipMessage_MemReq)(nil),
@@ -372,92 +372,92 @@ func (*GossipMessage) XXX_OneofFuncs() (func(msg proto1.Message, b *proto1.Buffe
 	}
 }
 
-func _GossipMessage_OneofMarshaler(msg proto1.Message, b *proto1.Buffer) error {
+func _GossipMessage_OneofMarshaler(msg proto.Message, b *proto.Buffer) error {
 	m := msg.(*GossipMessage)
 	// content
 	switch x := m.Content.(type) {
 	case *GossipMessage_AliveMsg:
-		b.EncodeVarint(5<<3 | proto1.WireBytes)
+		b.EncodeVarint(5<<3 | proto.WireBytes)
 		if err := b.EncodeMessage(x.AliveMsg); err != nil {
 			return err
 		}
 	case *GossipMessage_MemReq:
-		b.EncodeVarint(6<<3 | proto1.WireBytes)
+		b.EncodeVarint(6<<3 | proto.WireBytes)
 		if err := b.EncodeMessage(x.MemReq); err != nil {
 			return err
 		}
 	case *GossipMessage_MemRes:
-		b.EncodeVarint(7<<3 | proto1.WireBytes)
+		b.EncodeVarint(7<<3 | proto.WireBytes)
 		if err := b.EncodeMessage(x.MemRes); err != nil {
 			return err
 		}
 	case *GossipMessage_DataMsg:
-		b.EncodeVarint(8<<3 | proto1.WireBytes)
+		b.EncodeVarint(8<<3 | proto.WireBytes)
 		if err := b.EncodeMessage(x.DataMsg); err != nil {
 			return err
 		}
 	case *GossipMessage_Hello:
-		b.EncodeVarint(9<<3 | proto1.WireBytes)
+		b.EncodeVarint(9<<3 | proto.WireBytes)
 		if err := b.EncodeMessage(x.Hello); err != nil {
 			return err
 		}
 	case *GossipMessage_DataDig:
-		b.EncodeVarint(10<<3 | proto1.WireBytes)
+		b.EncodeVarint(10<<3 | proto.WireBytes)
 		if err := b.EncodeMessage(x.DataDig); err != nil {
 			return err
 		}
 	case *GossipMessage_DataReq:
-		b.EncodeVarint(11<<3 | proto1.WireBytes)
+		b.EncodeVarint(11<<3 | proto.WireBytes)
 		if err := b.EncodeMessage(x.DataReq); err != nil {
 			return err
 		}
 	case *GossipMessage_DataUpdate:
-		b.EncodeVarint(12<<3 | proto1.WireBytes)
+		b.EncodeVarint(12<<3 | proto.WireBytes)
 		if err := b.EncodeMessage(x.DataUpdate); err != nil {
 			return err
 		}
 	case *GossipMessage_Empty:
-		b.EncodeVarint(13<<3 | proto1.WireBytes)
+		b.EncodeVarint(13<<3 | proto.WireBytes)
 		if err := b.EncodeMessage(x.Empty); err != nil {
 			return err
 		}
 	case *GossipMessage_Conn:
-		b.EncodeVarint(14<<3 | proto1.WireBytes)
+		b.EncodeVarint(14<<3 | proto.WireBytes)
 		if err := b.EncodeMessage(x.Conn); err != nil {
 			return err
 		}
 	case *GossipMessage_StateInfo:
-		b.EncodeVarint(15<<3 | proto1.WireBytes)
+		b.EncodeVarint(15<<3 | proto.WireBytes)
 		if err := b.EncodeMessage(x.StateInfo); err != nil {
 			return err
 		}
 	case *GossipMessage_StateSnapshot:
-		b.EncodeVarint(16<<3 | proto1.WireBytes)
+		b.EncodeVarint(16<<3 | proto.WireBytes)
 		if err := b.EncodeMessage(x.StateSnapshot); err != nil {
 			return err
 		}
 	case *GossipMessage_StateInfoPullReq:
-		b.EncodeVarint(17<<3 | proto1.WireBytes)
+		b.EncodeVarint(17<<3 | proto.WireBytes)
 		if err := b.EncodeMessage(x.StateInfoPullReq); err != nil {
 			return err
 		}
 	case *GossipMessage_StateRequest:
-		b.EncodeVarint(18<<3 | proto1.WireBytes)
+		b.EncodeVarint(18<<3 | proto.WireBytes)
 		if err := b.EncodeMessage(x.StateRequest); err != nil {
 			return err
 		}
 	case *GossipMessage_StateResponse:
-		b.EncodeVarint(19<<3 | proto1.WireBytes)
+		b.EncodeVarint(19<<3 | proto.WireBytes)
 		if err := b.EncodeMessage(x.StateResponse); err != nil {
 			return err
 		}
 	case *GossipMessage_LeadershipMsg:
-		b.EncodeVarint(20<<3 | proto1.WireBytes)
+		b.EncodeVarint(20<<3 | proto.WireBytes)
 		if err := b.EncodeMessage(x.LeadershipMsg); err != nil {
 			return err
 		}
 	case *GossipMessage_PeerIdentity:
-		b.EncodeVarint(21<<3 | proto1.WireBytes)
+		b.EncodeVarint(21<<3 | proto.WireBytes)
 		if err := b.EncodeMessage(x.PeerIdentity); err != nil {
 			return err
 		}
@@ -468,140 +468,140 @@ func _GossipMessage_OneofMarshaler(msg proto1.Message, b *proto1.Buffer) error {
 	return nil
 }
 
-func _GossipMessage_OneofUnmarshaler(msg proto1.Message, tag, wire int, b *proto1.Buffer) (bool, error) {
+func _GossipMessage_OneofUnmarshaler(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error) {
 	m := msg.(*GossipMessage)
 	switch tag {
 	case 5: // content.aliveMsg
-		if wire != proto1.WireBytes {
-			return true, proto1.ErrInternalBadWireType
+		if wire != proto.WireBytes {
+			return true, proto.ErrInternalBadWireType
 		}
 		msg := new(AliveMessage)
 		err := b.DecodeMessage(msg)
 		m.Content = &GossipMessage_AliveMsg{msg}
 		return true, err
 	case 6: // content.memReq
-		if wire != proto1.WireBytes {
-			return true, proto1.ErrInternalBadWireType
+		if wire != proto.WireBytes {
+			return true, proto.ErrInternalBadWireType
 		}
 		msg := new(MembershipRequest)
 		err := b.DecodeMessage(msg)
 		m.Content = &GossipMessage_MemReq{msg}
 		return true, err
 	case 7: // content.memRes
-		if wire != proto1.WireBytes {
-			return true, proto1.ErrInternalBadWireType
+		if wire != proto.WireBytes {
+			return true, proto.ErrInternalBadWireType
 		}
 		msg := new(MembershipResponse)
 		err := b.DecodeMessage(msg)
 		m.Content = &GossipMessage_MemRes{msg}
 		return true, err
 	case 8: // content.dataMsg
-		if wire != proto1.WireBytes {
-			return true, proto1.ErrInternalBadWireType
+		if wire != proto.WireBytes {
+			return true, proto.ErrInternalBadWireType
 		}
 		msg := new(DataMessage)
 		err := b.DecodeMessage(msg)
 		m.Content = &GossipMessage_DataMsg{msg}
 		return true, err
 	case 9: // content.hello
-		if wire != proto1.WireBytes {
-			return true, proto1.ErrInternalBadWireType
+		if wire != proto.WireBytes {
+			return true, proto.ErrInternalBadWireType
 		}
 		msg := new(GossipHello)
 		err := b.DecodeMessage(msg)
 		m.Content = &GossipMessage_Hello{msg}
 		return true, err
 	case 10: // content.dataDig
-		if wire != proto1.WireBytes {
-			return true, proto1.ErrInternalBadWireType
+		if wire != proto.WireBytes {
+			return true, proto.ErrInternalBadWireType
 		}
 		msg := new(DataDigest)
 		err := b.DecodeMessage(msg)
 		m.Content = &GossipMessage_DataDig{msg}
 		return true, err
 	case 11: // content.dataReq
-		if wire != proto1.WireBytes {
-			return true, proto1.ErrInternalBadWireType
+		if wire != proto.WireBytes {
+			return true, proto.ErrInternalBadWireType
 		}
 		msg := new(DataRequest)
 		err := b.DecodeMessage(msg)
 		m.Content = &GossipMessage_DataReq{msg}
 		return true, err
 	case 12: // content.dataUpdate
-		if wire != proto1.WireBytes {
-			return true, proto1.ErrInternalBadWireType
+		if wire != proto.WireBytes {
+			return true, proto.ErrInternalBadWireType
 		}
 		msg := new(DataUpdate)
 		err := b.DecodeMessage(msg)
 		m.Content = &GossipMessage_DataUpdate{msg}
 		return true, err
 	case 13: // content.empty
-		if wire != proto1.WireBytes {
-			return true, proto1.ErrInternalBadWireType
+		if wire != proto.WireBytes {
+			return true, proto.ErrInternalBadWireType
 		}
 		msg := new(Empty)
 		err := b.DecodeMessage(msg)
 		m.Content = &GossipMessage_Empty{msg}
 		return true, err
 	case 14: // content.conn
-		if wire != proto1.WireBytes {
-			return true, proto1.ErrInternalBadWireType
+		if wire != proto.WireBytes {
+			return true, proto.ErrInternalBadWireType
 		}
 		msg := new(ConnEstablish)
 		err := b.DecodeMessage(msg)
 		m.Content = &GossipMessage_Conn{msg}
 		return true, err
 	case 15: // content.stateInfo
-		if wire != proto1.WireBytes {
-			return true, proto1.ErrInternalBadWireType
+		if wire != proto.WireBytes {
+			return true, proto.ErrInternalBadWireType
 		}
 		msg := new(StateInfo)
 		err := b.DecodeMessage(msg)
 		m.Content = &GossipMessage_StateInfo{msg}
 		return true, err
 	case 16: // content.stateSnapshot
-		if wire != proto1.WireBytes {
-			return true, proto1.ErrInternalBadWireType
+		if wire != proto.WireBytes {
+			return true, proto.ErrInternalBadWireType
 		}
 		msg := new(StateInfoSnapshot)
 		err := b.DecodeMessage(msg)
 		m.Content = &GossipMessage_StateSnapshot{msg}
 		return true, err
 	case 17: // content.stateInfoPullReq
-		if wire != proto1.WireBytes {
-			return true, proto1.ErrInternalBadWireType
+		if wire != proto.WireBytes {
+			return true, proto.ErrInternalBadWireType
 		}
 		msg := new(StateInfoPullRequest)
 		err := b.DecodeMessage(msg)
 		m.Content = &GossipMessage_StateInfoPullReq{msg}
 		return true, err
 	case 18: // content.stateRequest
-		if wire != proto1.WireBytes {
-			return true, proto1.ErrInternalBadWireType
+		if wire != proto.WireBytes {
+			return true, proto.ErrInternalBadWireType
 		}
 		msg := new(RemoteStateRequest)
 		err := b.DecodeMessage(msg)
 		m.Content = &GossipMessage_StateRequest{msg}
 		return true, err
 	case 19: // content.stateResponse
-		if wire != proto1.WireBytes {
-			return true, proto1.ErrInternalBadWireType
+		if wire != proto.WireBytes {
+			return true, proto.ErrInternalBadWireType
 		}
 		msg := new(RemoteStateResponse)
 		err := b.DecodeMessage(msg)
 		m.Content = &GossipMessage_StateResponse{msg}
 		return true, err
 	case 20: // content.leadershipMsg
-		if wire != proto1.WireBytes {
-			return true, proto1.ErrInternalBadWireType
+		if wire != proto.WireBytes {
+			return true, proto.ErrInternalBadWireType
 		}
 		msg := new(LeadershipMessage)
 		err := b.DecodeMessage(msg)
 		m.Content = &GossipMessage_LeadershipMsg{msg}
 		return true, err
 	case 21: // content.peerIdentity
-		if wire != proto1.WireBytes {
-			return true, proto1.ErrInternalBadWireType
+		if wire != proto.WireBytes {
+			return true, proto.ErrInternalBadWireType
 		}
 		msg := new(PeerIdentity)
 		err := b.DecodeMessage(msg)
@@ -612,94 +612,94 @@ func _GossipMessage_OneofUnmarshaler(msg proto1.Message, tag, wire int, b *proto
 	}
 }
 
-func _GossipMessage_OneofSizer(msg proto1.Message) (n int) {
+func _GossipMessage_OneofSizer(msg proto.Message) (n int) {
 	m := msg.(*GossipMessage)
 	// content
 	switch x := m.Content.(type) {
 	case *GossipMessage_AliveMsg:
-		s := proto1.Size(x.AliveMsg)
-		n += proto1.SizeVarint(5<<3 | proto1.WireBytes)
-		n += proto1.SizeVarint(uint64(s))
+		s := proto.Size(x.AliveMsg)
+		n += proto.SizeVarint(5<<3 | proto.WireBytes)
+		n += proto.SizeVarint(uint64(s))
 		n += s
 	case *GossipMessage_MemReq:
-		s := proto1.Size(x.MemReq)
-		n += proto1.SizeVarint(6<<3 | proto1.WireBytes)
-		n += proto1.SizeVarint(uint64(s))
+		s := proto.Size(x.MemReq)
+		n += proto.SizeVarint(6<<3 | proto.WireBytes)
+		n += proto.SizeVarint(uint64(s))
 		n += s
 	case *GossipMessage_MemRes:
-		s := proto1.Size(x.MemRes)
-		n += proto1.SizeVarint(7<<3 | proto1.WireBytes)
-		n += proto1.SizeVarint(uint64(s))
+		s := proto.Size(x.MemRes)
+		n += proto.SizeVarint(7<<3 | proto.WireBytes)
+		n += proto.SizeVarint(uint64(s))
 		n += s
 	case *GossipMessage_DataMsg:
-		s := proto1.Size(x.DataMsg)
-		n += proto1.SizeVarint(8<<3 | proto1.WireBytes)
-		n += proto1.SizeVarint(uint64(s))
+		s := proto.Size(x.DataMsg)
+		n += proto.SizeVarint(8<<3 | proto.WireBytes)
+		n += proto.SizeVarint(uint64(s))
 		n += s
 	case *GossipMessage_Hello:
-		s := proto1.Size(x.Hello)
-		n += proto1.SizeVarint(9<<3 | proto1.WireBytes)
-		n += proto1.SizeVarint(uint64(s))
+		s := proto.Size(x.Hello)
+		n += proto.SizeVarint(9<<3 | proto.WireBytes)
+		n += proto.SizeVarint(uint64(s))
 		n += s
 	case *GossipMessage_DataDig:
-		s := proto1.Size(x.DataDig)
-		n += proto1.SizeVarint(10<<3 | proto1.WireBytes)
-		n += proto1.SizeVarint(uint64(s))
+		s := proto.Size(x.DataDig)
+		n += proto.SizeVarint(10<<3 | proto.WireBytes)
+		n += proto.SizeVarint(uint64(s))
 		n += s
 	case *GossipMessage_DataReq:
-		s := proto1.Size(x.DataReq)
-		n += proto1.SizeVarint(11<<3 | proto1.WireBytes)
-		n += proto1.SizeVarint(uint64(s))
+		s := proto.Size(x.DataReq)
+		n += proto.SizeVarint(11<<3 | proto.WireBytes)
+		n += proto.SizeVarint(uint64(s))
 		n += s
 	case *GossipMessage_DataUpdate:
-		s := proto1.Size(x.DataUpdate)
-		n += proto1.SizeVarint(12<<3 | proto1.WireBytes)
-		n += proto1.SizeVarint(uint64(s))
+		s := proto.Size(x.DataUpdate)
+		n += proto.SizeVarint(12<<3 | proto.WireBytes)
+		n += proto.SizeVarint(uint64(s))
 		n += s
 	case *GossipMessage_Empty:
-		s := proto1.Size(x.Empty)
-		n += proto1.SizeVarint(13<<3 | proto1.WireBytes)
-		n += proto1.SizeVarint(uint64(s))
+		s := proto.Size(x.Empty)
+		n += proto.SizeVarint(13<<3 | proto.WireBytes)
+		n += proto.SizeVarint(uint64(s))
 		n += s
 	case *GossipMessage_Conn:
-		s := proto1.Size(x.Conn)
-		n += proto1.SizeVarint(14<<3 | proto1.WireBytes)
-		n += proto1.SizeVarint(uint64(s))
+		s := proto.Size(x.Conn)
+		n += proto.SizeVarint(14<<3 | proto.WireBytes)
+		n += proto.SizeVarint(uint64(s))
 		n += s
 	case *GossipMessage_StateInfo:
-		s := proto1.Size(x.StateInfo)
-		n += proto1.SizeVarint(15<<3 | proto1.WireBytes)
-		n += proto1.SizeVarint(uint64(s))
+		s := proto.Size(x.StateInfo)
+		n += proto.SizeVarint(15<<3 | proto.WireBytes)
+		n += proto.SizeVarint(uint64(s))
 		n += s
 	case *GossipMessage_StateSnapshot:
-		s := proto1.Size(x.StateSnapshot)
-		n += proto1.SizeVarint(16<<3 | proto1.WireBytes)
-		n += proto1.SizeVarint(uint64(s))
+		s := proto.Size(x.StateSnapshot)
+		n += proto.SizeVarint(16<<3 | proto.WireBytes)
+		n += proto.SizeVarint(uint64(s))
 		n += s
 	case *GossipMessage_StateInfoPullReq:
-		s := proto1.Size(x.StateInfoPullReq)
-		n += proto1.SizeVarint(17<<3 | proto1.WireBytes)
-		n += proto1.SizeVarint(uint64(s))
+		s := proto.Size(x.StateInfoPullReq)
+		n += proto.SizeVarint(17<<3 | proto.WireBytes)
+		n += proto.SizeVarint(uint64(s))
 		n += s
 	case *GossipMessage_StateRequest:
-		s := proto1.Size(x.StateRequest)
-		n += proto1.SizeVarint(18<<3 | proto1.WireBytes)
-		n += proto1.SizeVarint(uint64(s))
+		s := proto.Size(x.StateRequest)
+		n += proto.SizeVarint(18<<3 | proto.WireBytes)
+		n += proto.SizeVarint(uint64(s))
 		n += s
 	case *GossipMessage_StateResponse:
-		s := proto1.Size(x.StateResponse)
-		n += proto1.SizeVarint(19<<3 | proto1.WireBytes)
-		n += proto1.SizeVarint(uint64(s))
+		s := proto.Size(x.StateResponse)
+		n += proto.SizeVarint(19<<3 | proto.WireBytes)
+		n += proto.SizeVarint(uint64(s))
 		n += s
 	case *GossipMessage_LeadershipMsg:
-		s := proto1.Size(x.LeadershipMsg)
-		n += proto1.SizeVarint(20<<3 | proto1.WireBytes)
-		n += proto1.SizeVarint(uint64(s))
+		s := proto.Size(x.LeadershipMsg)
+		n += proto.SizeVarint(20<<3 | proto.WireBytes)
+		n += proto.SizeVarint(uint64(s))
 		n += s
 	case *GossipMessage_PeerIdentity:
-		s := proto1.Size(x.PeerIdentity)
-		n += proto1.SizeVarint(21<<3 | proto1.WireBytes)
-		n += proto1.SizeVarint(uint64(s))
+		s := proto.Size(x.PeerIdentity)
+		n += proto.SizeVarint(21<<3 | proto.WireBytes)
+		n += proto.SizeVarint(uint64(s))
 		n += s
 	case nil:
 	default:
@@ -717,7 +717,7 @@ type StateInfo struct {
 }
 
 func (m *StateInfo) Reset()                    { *m = StateInfo{} }
-func (m *StateInfo) String() string            { return proto1.CompactTextString(m) }
+func (m *StateInfo) String() string            { return proto.CompactTextString(m) }
 func (*StateInfo) ProtoMessage()               {}
 func (*StateInfo) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{1} }
 
@@ -734,7 +734,7 @@ type StateInfoSnapshot struct {
 }
 
 func (m *StateInfoSnapshot) Reset()                    { *m = StateInfoSnapshot{} }
-func (m *StateInfoSnapshot) String() string            { return proto1.CompactTextString(m) }
+func (m *StateInfoSnapshot) String() string            { return proto.CompactTextString(m) }
 func (*StateInfoSnapshot) ProtoMessage()               {}
 func (*StateInfoSnapshot) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{2} }
 
@@ -751,7 +751,7 @@ type StateInfoPullRequest struct {
 }
 
 func (m *StateInfoPullRequest) Reset()                    { *m = StateInfoPullRequest{} }
-func (m *StateInfoPullRequest) String() string            { return proto1.CompactTextString(m) }
+func (m *StateInfoPullRequest) String() string            { return proto.CompactTextString(m) }
 func (*StateInfoPullRequest) ProtoMessage()               {}
 func (*StateInfoPullRequest) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{3} }
 
@@ -765,7 +765,7 @@ type ConnEstablish struct {
 }
 
 func (m *ConnEstablish) Reset()                    { *m = ConnEstablish{} }
-func (m *ConnEstablish) String() string            { return proto1.CompactTextString(m) }
+func (m *ConnEstablish) String() string            { return proto.CompactTextString(m) }
 func (*ConnEstablish) ProtoMessage()               {}
 func (*ConnEstablish) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{4} }
 
@@ -779,7 +779,7 @@ type PeerIdentity struct {
 }
 
 func (m *PeerIdentity) Reset()                    { *m = PeerIdentity{} }
-func (m *PeerIdentity) String() string            { return proto1.CompactTextString(m) }
+func (m *PeerIdentity) String() string            { return proto.CompactTextString(m) }
 func (*PeerIdentity) ProtoMessage()               {}
 func (*PeerIdentity) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{5} }
 
@@ -792,7 +792,7 @@ type DataRequest struct {
 }
 
 func (m *DataRequest) Reset()                    { *m = DataRequest{} }
-func (m *DataRequest) String() string            { return proto1.CompactTextString(m) }
+func (m *DataRequest) String() string            { return proto.CompactTextString(m) }
 func (*DataRequest) ProtoMessage()               {}
 func (*DataRequest) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{6} }
 
@@ -805,7 +805,7 @@ type GossipHello struct {
 }
 
 func (m *GossipHello) Reset()                    { *m = GossipHello{} }
-func (m *GossipHello) String() string            { return proto1.CompactTextString(m) }
+func (m *GossipHello) String() string            { return proto.CompactTextString(m) }
 func (*GossipHello) ProtoMessage()               {}
 func (*GossipHello) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{7} }
 
@@ -818,7 +818,7 @@ type DataUpdate struct {
 }
 
 func (m *DataUpdate) Reset()                    { *m = DataUpdate{} }
-func (m *DataUpdate) String() string            { return proto1.CompactTextString(m) }
+func (m *DataUpdate) String() string            { return proto.CompactTextString(m) }
 func (*DataUpdate) ProtoMessage()               {}
 func (*DataUpdate) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{8} }
 
@@ -838,7 +838,7 @@ type DataDigest struct {
 }
 
 func (m *DataDigest) Reset()                    { *m = DataDigest{} }
-func (m *DataDigest) String() string            { return proto1.CompactTextString(m) }
+func (m *DataDigest) String() string            { return proto.CompactTextString(m) }
 func (*DataDigest) ProtoMessage()               {}
 func (*DataDigest) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{9} }
 
@@ -848,7 +848,7 @@ type DataMessage struct {
 }
 
 func (m *DataMessage) Reset()                    { *m = DataMessage{} }
-func (m *DataMessage) String() string            { return proto1.CompactTextString(m) }
+func (m *DataMessage) String() string            { return proto.CompactTextString(m) }
 func (*DataMessage) ProtoMessage()               {}
 func (*DataMessage) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{10} }
 
@@ -867,7 +867,7 @@ type Payload struct {
 }
 
 func (m *Payload) Reset()                    { *m = Payload{} }
-func (m *Payload) String() string            { return proto1.CompactTextString(m) }
+func (m *Payload) String() string            { return proto.CompactTextString(m) }
 func (*Payload) ProtoMessage()               {}
 func (*Payload) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{11} }
 
@@ -880,7 +880,7 @@ type AliveMessage struct {
 }
 
 func (m *AliveMessage) Reset()                    { *m = AliveMessage{} }
-func (m *AliveMessage) String() string            { return proto1.CompactTextString(m) }
+func (m *AliveMessage) String() string            { return proto.CompactTextString(m) }
 func (*AliveMessage) ProtoMessage()               {}
 func (*AliveMessage) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{12} }
 
@@ -906,7 +906,7 @@ type LeadershipMessage struct {
 }
 
 func (m *LeadershipMessage) Reset()                    { *m = LeadershipMessage{} }
-func (m *LeadershipMessage) String() string            { return proto1.CompactTextString(m) }
+func (m *LeadershipMessage) String() string            { return proto.CompactTextString(m) }
 func (*LeadershipMessage) ProtoMessage()               {}
 func (*LeadershipMessage) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{13} }
 
@@ -931,7 +931,7 @@ type PeerTime struct {
 }
 
 func (m *PeerTime) Reset()                    { *m = PeerTime{} }
-func (m *PeerTime) String() string            { return proto1.CompactTextString(m) }
+func (m *PeerTime) String() string            { return proto.CompactTextString(m) }
 func (*PeerTime) ProtoMessage()               {}
 func (*PeerTime) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{14} }
 
@@ -943,7 +943,7 @@ type MembershipRequest struct {
 }
 
 func (m *MembershipRequest) Reset()                    { *m = MembershipRequest{} }
-func (m *MembershipRequest) String() string            { return proto1.CompactTextString(m) }
+func (m *MembershipRequest) String() string            { return proto.CompactTextString(m) }
 func (*MembershipRequest) ProtoMessage()               {}
 func (*MembershipRequest) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{15} }
 
@@ -961,7 +961,7 @@ type MembershipResponse struct {
 }
 
 func (m *MembershipResponse) Reset()                    { *m = MembershipResponse{} }
-func (m *MembershipResponse) String() string            { return proto1.CompactTextString(m) }
+func (m *MembershipResponse) String() string            { return proto.CompactTextString(m) }
 func (*MembershipResponse) ProtoMessage()               {}
 func (*MembershipResponse) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{16} }
 
@@ -988,7 +988,7 @@ type Member struct {
 }
 
 func (m *Member) Reset()                    { *m = Member{} }
-func (m *Member) String() string            { return proto1.CompactTextString(m) }
+func (m *Member) String() string            { return proto.CompactTextString(m) }
 func (*Member) ProtoMessage()               {}
 func (*Member) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{17} }
 
@@ -997,7 +997,7 @@ type Empty struct {
 }
 
 func (m *Empty) Reset()                    { *m = Empty{} }
-func (m *Empty) String() string            { return proto1.CompactTextString(m) }
+func (m *Empty) String() string            { return proto.CompactTextString(m) }
 func (*Empty) ProtoMessage()               {}
 func (*Empty) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{18} }
 
@@ -1008,7 +1008,7 @@ type RemoteStateRequest struct {
 }
 
 func (m *RemoteStateRequest) Reset()                    { *m = RemoteStateRequest{} }
-func (m *RemoteStateRequest) String() string            { return proto1.CompactTextString(m) }
+func (m *RemoteStateRequest) String() string            { return proto.CompactTextString(m) }
 func (*RemoteStateRequest) ProtoMessage()               {}
 func (*RemoteStateRequest) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{19} }
 
@@ -1019,7 +1019,7 @@ type RemoteStateResponse struct {
 }
 
 func (m *RemoteStateResponse) Reset()                    { *m = RemoteStateResponse{} }
-func (m *RemoteStateResponse) String() string            { return proto1.CompactTextString(m) }
+func (m *RemoteStateResponse) String() string            { return proto.CompactTextString(m) }
 func (*RemoteStateResponse) ProtoMessage()               {}
 func (*RemoteStateResponse) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{20} }
 
@@ -1031,29 +1031,29 @@ func (m *RemoteStateResponse) GetPayloads() []*Payload {
 }
 
 func init() {
-	proto1.RegisterType((*GossipMessage)(nil), "proto.GossipMessage")
-	proto1.RegisterType((*StateInfo)(nil), "proto.StateInfo")
-	proto1.RegisterType((*StateInfoSnapshot)(nil), "proto.StateInfoSnapshot")
-	proto1.RegisterType((*StateInfoPullRequest)(nil), "proto.StateInfoPullRequest")
-	proto1.RegisterType((*ConnEstablish)(nil), "proto.ConnEstablish")
-	proto1.RegisterType((*PeerIdentity)(nil), "proto.PeerIdentity")
-	proto1.RegisterType((*DataRequest)(nil), "proto.DataRequest")
-	proto1.RegisterType((*GossipHello)(nil), "proto.GossipHello")
-	proto1.RegisterType((*DataUpdate)(nil), "proto.DataUpdate")
-	proto1.RegisterType((*DataDigest)(nil), "proto.DataDigest")
-	proto1.RegisterType((*DataMessage)(nil), "proto.DataMessage")
-	proto1.RegisterType((*Payload)(nil), "proto.Payload")
-	proto1.RegisterType((*AliveMessage)(nil), "proto.AliveMessage")
-	proto1.RegisterType((*LeadershipMessage)(nil), "proto.LeadershipMessage")
-	proto1.RegisterType((*PeerTime)(nil), "proto.PeerTime")
-	proto1.RegisterType((*MembershipRequest)(nil), "proto.MembershipRequest")
-	proto1.RegisterType((*MembershipResponse)(nil), "proto.MembershipResponse")
-	proto1.RegisterType((*Member)(nil), "proto.Member")
-	proto1.RegisterType((*Empty)(nil), "proto.Empty")
-	proto1.RegisterType((*RemoteStateRequest)(nil), "proto.RemoteStateRequest")
-	proto1.RegisterType((*RemoteStateResponse)(nil), "proto.RemoteStateResponse")
-	proto1.RegisterEnum("proto.PullMsgType", PullMsgType_name, PullMsgType_value)
-	proto1.RegisterEnum("proto.GossipMessage_Tag", GossipMessage_Tag_name, GossipMessage_Tag_value)
+	proto.RegisterType((*GossipMessage)(nil), "proto.GossipMessage")
+	proto.RegisterType((*StateInfo)(nil), "proto.StateInfo")
+	proto.RegisterType((*StateInfoSnapshot)(nil), "proto.StateInfoSnapshot")
+	proto.RegisterType((*StateInfoPullRequest)(nil), "proto.StateInfoPullRequest")
+	proto.RegisterType((*ConnEstablish)(nil), "proto.ConnEstablish")
+	proto.RegisterType((*PeerIdentity)(nil), "proto.PeerIdentity")
+	proto.RegisterType((*DataRequest)(nil), "proto.DataRequest")
+	proto.RegisterType((*GossipHello)(nil), "proto.GossipHello")
+	proto.RegisterType((*DataUpdate)(nil), "proto.DataUpdate")
+	proto.RegisterType((*DataDigest)(nil), "proto.DataDigest")
+	proto.RegisterType((*DataMessage)(nil), "proto.DataMessage")
+	proto.RegisterType((*Payload)(nil), "proto.Payload")
+	proto.RegisterType((*AliveMessage)(nil), "proto.AliveMessage")
+	proto.RegisterType((*LeadershipMessage)(nil), "proto.LeadershipMessage")
+	proto.RegisterType((*PeerTime)(nil), "proto.PeerTime")
+	proto.RegisterType((*MembershipRequest)(nil), "proto.MembershipRequest")
+	proto.RegisterType((*MembershipResponse)(nil), "proto.MembershipResponse")
+	proto.RegisterType((*Member)(nil), "proto.Member")
+	proto.RegisterType((*Empty)(nil), "proto.Empty")
+	proto.RegisterType((*RemoteStateRequest)(nil), "proto.RemoteStateRequest")
+	proto.RegisterType((*RemoteStateResponse)(nil), "proto.RemoteStateResponse")
+	proto.RegisterEnum("proto.PullMsgType", PullMsgType_name, PullMsgType_value)
+	proto.RegisterEnum("proto.GossipMessage_Tag", GossipMessage_Tag_name, GossipMessage_Tag_value)
 }
 
 // Reference imports to suppress errors if they are not otherwise used.
@@ -1198,82 +1198,82 @@ var _Gossip_serviceDesc = grpc.ServiceDesc{
 	Metadata: fileDescriptor0,
 }
 
-func init() { proto1.RegisterFile("message.proto", fileDescriptor0) }
+func init() { proto.RegisterFile("gossip/message.proto", fileDescriptor0) }
 
 var fileDescriptor0 = []byte{
-	// 1170 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0xb4, 0x56, 0x51, 0x6f, 0xdb, 0x36,
+	// 1175 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0xb4, 0x57, 0x51, 0x6f, 0xdb, 0x36,
 	0x10, 0x96, 0x62, 0x3b, 0xb6, 0xce, 0x72, 0xe3, 0xb0, 0x59, 0xa1, 0x65, 0x1b, 0x60, 0x08, 0x7d,
-	0x30, 0x8c, 0xd6, 0xe9, 0xdc, 0x87, 0x61, 0x2f, 0x6b, 0x93, 0xda, 0xab, 0x0d, 0xd4, 0x6e, 0xc0,
+	0x30, 0xb2, 0xc5, 0xe9, 0xdc, 0x87, 0x61, 0x2f, 0x6b, 0x93, 0xda, 0xab, 0x0d, 0xd4, 0x6e, 0xc0,
 	0xb8, 0x03, 0xba, 0x97, 0x80, 0xb1, 0x18, 0x59, 0x8d, 0x44, 0x29, 0x26, 0xbd, 0x21, 0xfb, 0x05,
-	0xfb, 0x01, 0xfb, 0xc1, 0x03, 0x49, 0x49, 0x96, 0x62, 0xa7, 0x43, 0x07, 0xf4, 0x49, 0xba, 0xbb,
-	0xef, 0x8e, 0xc7, 0xe3, 0xf1, 0x3b, 0x42, 0x2b, 0xa2, 0x9c, 0x13, 0x9f, 0xf6, 0x93, 0x55, 0x2c,
-	0x62, 0x54, 0x53, 0x1f, 0xf7, 0x1f, 0x0b, 0x5a, 0x6f, 0x63, 0xce, 0x83, 0x64, 0xaa, 0xcd, 0xe8,
-	0x08, 0x6a, 0x2c, 0x66, 0x0b, 0xea, 0x98, 0x1d, 0xb3, 0x5b, 0xc5, 0x5a, 0x40, 0x0e, 0xd4, 0x17,
-	0x4b, 0xc2, 0x18, 0x0d, 0x9d, 0xbd, 0x8e, 0xd9, 0xb5, 0x71, 0x26, 0xa2, 0x1e, 0x54, 0x04, 0xf1,
-	0x9d, 0x4a, 0xc7, 0xec, 0x3e, 0x1a, 0x38, 0x3a, 0x7a, 0xbf, 0x14, 0xb2, 0x3f, 0x27, 0x3e, 0x96,
-	0x20, 0xf4, 0x3d, 0x58, 0x3c, 0xf0, 0x19, 0x11, 0xeb, 0x15, 0x75, 0xaa, 0x2a, 0xce, 0x46, 0x81,
-	0x7e, 0x84, 0x06, 0x09, 0x83, 0x3f, 0xe8, 0x94, 0xfb, 0x4e, 0xad, 0x63, 0x76, 0x9b, 0x83, 0xc7,
-	0x69, 0xb8, 0x53, 0xa5, 0xd6, 0xd1, 0xc6, 0x06, 0xce, 0x61, 0x68, 0x00, 0xfb, 0x11, 0x8d, 0x30,
-	0xbd, 0x75, 0xf6, 0x95, 0x43, 0xb6, 0xfe, 0x94, 0x46, 0x57, 0x74, 0xc5, 0x97, 0x41, 0x82, 0xe9,
-	0xed, 0x9a, 0x72, 0x31, 0x36, 0x70, 0x8a, 0x44, 0x2f, 0x53, 0x1f, 0xee, 0xd4, 0x95, 0xcf, 0xb7,
-	0x3b, 0x7c, 0x78, 0x12, 0x33, 0x4e, 0x73, 0x27, 0x8e, 0xfa, 0x50, 0xf7, 0x88, 0x20, 0x32, 0xb5,
-	0x86, 0xf2, 0x42, 0xa9, 0xd7, 0x50, 0x6a, 0xf3, 0xcc, 0x32, 0x10, 0xea, 0x41, 0x6d, 0x49, 0xc3,
-	0x30, 0x76, 0xac, 0x12, 0x5a, 0xd7, 0x65, 0x2c, 0x2d, 0x63, 0x03, 0x6b, 0x08, 0x7a, 0xae, 0x63,
-	0x0f, 0x03, 0xdf, 0x01, 0x85, 0x3e, 0x2c, 0xc4, 0x1e, 0x06, 0xbe, 0x4e, 0x3f, 0xc3, 0x64, 0xa9,
-	0xc8, 0x4d, 0x37, 0xb7, 0x52, 0xd9, 0x6c, 0x37, 0x03, 0xa1, 0x97, 0x00, 0xf2, 0xf7, 0x43, 0xe2,
-	0x11, 0x41, 0x1d, 0x7b, 0x6b, 0x05, 0x6d, 0x18, 0x1b, 0xb8, 0x00, 0x43, 0x4f, 0xa1, 0x46, 0xa3,
-	0x44, 0xdc, 0x39, 0x2d, 0x85, 0xb7, 0x53, 0xfc, 0x48, 0xea, 0x64, 0xe6, 0xca, 0x88, 0x7a, 0x50,
-	0x5d, 0xc4, 0x8c, 0x39, 0x8f, 0x14, 0xe8, 0x28, 0x05, 0xbd, 0x89, 0x19, 0x1b, 0x71, 0x41, 0xae,
-	0xc2, 0x80, 0x2f, 0xc7, 0x06, 0x56, 0x18, 0xf4, 0x02, 0x2c, 0x2e, 0x88, 0xa0, 0x13, 0x76, 0x1d,
-	0x3b, 0x07, 0xca, 0xa1, 0x9d, 0x3a, 0x5c, 0x64, 0xfa, 0xb1, 0x81, 0x37, 0x20, 0xf4, 0x1a, 0x5a,
-	0x4a, 0xb8, 0x60, 0x24, 0xe1, 0xcb, 0x58, 0x38, 0xed, 0xd2, 0x19, 0xe7, 0x5e, 0x99, 0x7d, 0x6c,
-	0xe0, 0xb2, 0x03, 0x9a, 0x40, 0x3b, 0x0f, 0x77, 0xbe, 0x0e, 0x43, 0x59, 0xb3, 0x43, 0x15, 0xe4,
-	0xbb, 0xfb, 0x41, 0x52, 0x73, 0x5a, 0xbc, 0x2d, 0x37, 0xf4, 0x0a, 0x6c, 0xa5, 0x4b, 0x31, 0x0e,
-	0x2a, 0xf5, 0x0e, 0xa6, 0x51, 0x2c, 0xe8, 0x45, 0x01, 0x30, 0x36, 0x70, 0xc9, 0x01, 0x9d, 0xa5,
-	0xbb, 0xc9, 0x9a, 0xcb, 0x79, 0xac, 0x22, 0x1c, 0xef, 0x8a, 0x90, 0xb7, 0x5f, 0xd9, 0x45, 0x56,
-	0x24, 0xa4, 0xc4, 0xd3, 0x5d, 0x2a, 0x7b, 0xf1, 0xa8, 0x54, 0x91, 0x77, 0x1b, 0x5b, 0xde, 0x91,
-	0x65, 0x07, 0xf4, 0x33, 0xd8, 0x09, 0xa5, 0xab, 0x89, 0x47, 0x99, 0x08, 0xc4, 0x9d, 0xf3, 0x4d,
-	0xe9, 0x9e, 0x9d, 0x17, 0x4c, 0x72, 0x03, 0x45, 0xa8, 0x7b, 0x09, 0x95, 0x39, 0xf1, 0x51, 0x0b,
-	0xac, 0x0f, 0xb3, 0xe1, 0xe8, 0xd7, 0xc9, 0x6c, 0x34, 0x6c, 0x1b, 0xc8, 0x82, 0xda, 0x68, 0x7a,
-	0x3e, 0xff, 0xd8, 0x36, 0x91, 0x0d, 0x8d, 0xf7, 0xf8, 0xed, 0xe5, 0xfb, 0xd9, 0xbb, 0x8f, 0xed,
-	0x3d, 0x89, 0x7b, 0x33, 0x3e, 0x9d, 0x69, 0xb1, 0x82, 0xda, 0x60, 0x2b, 0xf1, 0x74, 0x36, 0xbc,
-	0x7c, 0x8f, 0xdf, 0xb6, 0xab, 0xe8, 0x00, 0x9a, 0x1a, 0x80, 0x95, 0xa2, 0x76, 0x66, 0x41, 0x7d,
-	0x11, 0x33, 0x41, 0x99, 0x70, 0x43, 0xb0, 0xf2, 0x93, 0x41, 0xc7, 0xd0, 0x88, 0xa8, 0x20, 0xb2,
-	0x3b, 0x15, 0x29, 0xd9, 0x38, 0x97, 0xd1, 0x73, 0xb0, 0x44, 0x10, 0x51, 0x2e, 0x48, 0x94, 0x28,
-	0x66, 0x6a, 0x0e, 0x0e, 0x0a, 0x9b, 0x99, 0x07, 0x11, 0xc5, 0x1b, 0x84, 0x24, 0xb7, 0xe4, 0x26,
-	0x98, 0x0c, 0x15, 0x5d, 0xd9, 0x58, 0x0b, 0xee, 0x08, 0x0e, 0xb7, 0x9a, 0x09, 0xbd, 0x80, 0x06,
-	0x0d, 0x69, 0x44, 0x99, 0xe0, 0x8e, 0xd9, 0xa9, 0x14, 0xfa, 0xbb, 0x44, 0x6e, 0x38, 0x47, 0xb9,
-	0x4f, 0xe0, 0x68, 0x57, 0x3b, 0xb9, 0x53, 0x68, 0x95, 0xae, 0xc4, 0x26, 0x0b, 0xb3, 0x90, 0x05,
-	0x42, 0x50, 0x5d, 0xd0, 0x95, 0x48, 0xf9, 0x55, 0xfd, 0x4b, 0xdd, 0x92, 0xf0, 0x65, 0x9a, 0xae,
-	0xfa, 0x77, 0xe7, 0x60, 0x17, 0xcf, 0xe9, 0x0b, 0xa2, 0x15, 0x0b, 0x59, 0x29, 0x17, 0xd2, 0xbd,
-	0x81, 0x66, 0x81, 0x3f, 0x1e, 0x9e, 0x02, 0x9e, 0xe2, 0x23, 0xee, 0xec, 0x75, 0x2a, 0x5d, 0x0b,
-	0x67, 0x22, 0x7a, 0x06, 0xf5, 0x88, 0xfb, 0xf3, 0xbb, 0x84, 0xa6, 0x93, 0x20, 0x23, 0x25, 0x59,
-	0x88, 0xa9, 0xb6, 0xe0, 0x0c, 0xe2, 0x46, 0xd0, 0x2c, 0x30, 0xe1, 0x03, 0x8b, 0x15, 0xb3, 0xdd,
-	0xbb, 0x77, 0xec, 0x5f, 0xb6, 0xdc, 0x5f, 0x00, 0x1b, 0xa2, 0x7b, 0x60, 0xb5, 0x2e, 0x54, 0xd3,
-	0x95, 0x1e, 0x3e, 0xea, 0xea, 0xff, 0x58, 0xfb, 0x93, 0x5e, 0x5b, 0xd3, 0xf8, 0x57, 0x2e, 0xeb,
-	0x4f, 0xfa, 0x0c, 0xb3, 0x49, 0xde, 0x85, 0x7a, 0x42, 0xee, 0xc2, 0x98, 0x78, 0x6a, 0xb9, 0xe6,
-	0xe0, 0x51, 0xe6, 0xac, 0xb5, 0x38, 0x33, 0xbb, 0x13, 0xa8, 0xa7, 0x3a, 0xf4, 0x04, 0xf6, 0x39,
-	0xbd, 0x9d, 0xad, 0xa3, 0x34, 0xc5, 0x54, 0xca, 0x3b, 0x51, 0x9e, 0x84, 0xa5, 0x3b, 0x51, 0xea,
-	0x0a, 0xbd, 0xa4, 0xfe, 0xdd, 0xbf, 0x4d, 0xb0, 0x8b, 0xe3, 0x1a, 0x3d, 0x07, 0x88, 0xf2, 0xc9,
-	0x9a, 0x26, 0xd2, 0x2a, 0x8d, 0x5c, 0x5c, 0x00, 0x7c, 0xe9, 0x85, 0x3e, 0x86, 0x46, 0x90, 0x71,
-	0x99, 0x7e, 0x50, 0xe4, 0xb2, 0x7b, 0x0b, 0x87, 0x5b, 0x8c, 0xf8, 0x75, 0xd3, 0x71, 0x4f, 0xa1,
-	0x91, 0xa9, 0xd1, 0x0f, 0x00, 0x01, 0x5b, 0x5c, 0xb2, 0xb5, 0x0c, 0x96, 0x56, 0xd3, 0x0a, 0xd8,
-	0x62, 0xa6, 0x14, 0x85, 0x42, 0xef, 0x15, 0x0b, 0xed, 0x06, 0x70, 0xb8, 0xf5, 0x7a, 0x41, 0xbf,
-	0xc0, 0x01, 0xa7, 0xe1, 0xb5, 0x64, 0x96, 0x55, 0x44, 0x44, 0x10, 0xb3, 0x34, 0xf5, 0xdd, 0x8d,
-	0x7a, 0x1f, 0x2c, 0xfb, 0xee, 0x86, 0xc5, 0x7f, 0x32, 0xd5, 0x5f, 0x36, 0xd6, 0x82, 0xfb, 0x09,
-	0xd0, 0xf6, 0xa3, 0x47, 0x3e, 0x5d, 0xd4, 0xfb, 0xea, 0xb3, 0xac, 0xa7, 0x21, 0xea, 0xd6, 0x50,
-	0xe2, 0xfd, 0xc7, 0xad, 0xa1, 0xc4, 0x73, 0x7f, 0x83, 0x7d, 0xbd, 0x96, 0x3c, 0x32, 0xca, 0xbc,
-	0x24, 0x0e, 0x98, 0x50, 0x9b, 0xb0, 0x70, 0x2e, 0x7f, 0xf6, 0xce, 0xef, 0xe6, 0xee, 0x3a, 0xd4,
-	0xd4, 0xa3, 0xc4, 0xed, 0x03, 0xda, 0x9e, 0xc2, 0xf2, 0x6a, 0xe9, 0xba, 0x6a, 0x12, 0xaf, 0xe2,
-	0x4c, 0x74, 0x4f, 0xe1, 0xf1, 0x8e, 0x99, 0x8b, 0x7a, 0xd0, 0x48, 0x6f, 0x45, 0x46, 0xfb, 0xf7,
-	0x6f, 0x4d, 0x6e, 0xef, 0xbd, 0x82, 0x66, 0xe1, 0x1e, 0xaa, 0xc9, 0xc8, 0x3c, 0x7a, 0x1d, 0x30,
-	0xea, 0xb5, 0x0d, 0x39, 0xf1, 0xce, 0xc2, 0x78, 0x71, 0x93, 0xd6, 0xa1, 0x6d, 0xca, 0x89, 0x97,
-	0xb1, 0xf6, 0x94, 0xfb, 0xed, 0xbd, 0x41, 0x02, 0xfb, 0xba, 0x56, 0xe8, 0x35, 0xd8, 0xfa, 0xef,
-	0x42, 0xac, 0x28, 0x89, 0xd0, 0xce, 0x52, 0x1e, 0xef, 0xd4, 0xba, 0x46, 0xd7, 0x7c, 0x61, 0xa2,
-	0xa7, 0x50, 0x3d, 0x0f, 0x98, 0x8f, 0x4a, 0x4f, 0xb5, 0xe3, 0x92, 0xe4, 0x1a, 0x67, 0xcf, 0x7e,
-	0xef, 0xf9, 0x81, 0x58, 0xae, 0xaf, 0xfa, 0x8b, 0x38, 0x3a, 0x59, 0xde, 0x25, 0x74, 0x15, 0x52,
-	0xcf, 0xa7, 0xab, 0x93, 0x6b, 0x72, 0xb5, 0x0a, 0x16, 0x27, 0xbe, 0x0a, 0x7d, 0xa2, 0xbc, 0xae,
-	0xf6, 0xd5, 0xe7, 0xe5, 0xbf, 0x01, 0x00, 0x00, 0xff, 0xff, 0x56, 0xd2, 0x95, 0x6f, 0x3c, 0x0c,
-	0x00, 0x00,
+	0xfb, 0x01, 0xfb, 0xc1, 0x03, 0x49, 0x49, 0x96, 0x62, 0xa7, 0x43, 0x06, 0xf4, 0xc9, 0xba, 0xbb,
+	0xef, 0x8e, 0xc7, 0xe3, 0xf1, 0x3b, 0x1a, 0x0e, 0xfc, 0x98, 0xf3, 0x20, 0x39, 0x89, 0x28, 0xe7,
+	0xc4, 0xa7, 0xbd, 0x64, 0x19, 0x8b, 0x18, 0xd5, 0xd4, 0x8f, 0xfb, 0x8f, 0x05, 0xad, 0xb7, 0xca,
+	0x3e, 0xd1, 0x66, 0x74, 0x00, 0x35, 0x16, 0xb3, 0x39, 0x75, 0xcc, 0x8e, 0xd9, 0xad, 0x62, 0x2d,
+	0x20, 0x07, 0xea, 0xf3, 0x05, 0x61, 0x8c, 0x86, 0xce, 0x4e, 0xc7, 0xec, 0xda, 0x38, 0x13, 0xd1,
+	0x11, 0x54, 0x04, 0xf1, 0x9d, 0x4a, 0xc7, 0xec, 0x3e, 0xe9, 0x3b, 0x3a, 0x7a, 0xaf, 0x14, 0xb2,
+	0x37, 0x23, 0x3e, 0x96, 0x20, 0xf4, 0x2d, 0x58, 0x3c, 0xf0, 0x19, 0x11, 0xab, 0x25, 0x75, 0xaa,
+	0x2a, 0xce, 0x5a, 0x81, 0x7e, 0x84, 0x06, 0x09, 0x83, 0x3f, 0xe8, 0x84, 0xfb, 0x4e, 0xad, 0x63,
+	0x76, 0x9b, 0xfd, 0xa7, 0x69, 0xb8, 0x53, 0xa5, 0xd6, 0xd1, 0x46, 0x06, 0xce, 0x61, 0xa8, 0x0f,
+	0xbb, 0x11, 0x8d, 0x30, 0xbd, 0x75, 0x76, 0x95, 0x43, 0xb6, 0xfe, 0x84, 0x46, 0x57, 0x74, 0xc9,
+	0x17, 0x41, 0x82, 0xe9, 0xed, 0x8a, 0x72, 0x31, 0x32, 0x70, 0x8a, 0x44, 0x2f, 0x53, 0x1f, 0xee,
+	0xd4, 0x95, 0xcf, 0xd7, 0x5b, 0x7c, 0x78, 0x12, 0x33, 0x4e, 0x73, 0x27, 0x8e, 0x7a, 0x50, 0xf7,
+	0x88, 0x20, 0x32, 0xb5, 0x86, 0xf2, 0x42, 0xa9, 0xd7, 0x40, 0x6a, 0xf3, 0xcc, 0x32, 0x10, 0x3a,
+	0x82, 0xda, 0x82, 0x86, 0x61, 0xec, 0x58, 0x25, 0xb4, 0xae, 0xcb, 0x48, 0x5a, 0x46, 0x06, 0xd6,
+	0x10, 0x74, 0xac, 0x63, 0x0f, 0x02, 0xdf, 0x01, 0x85, 0xde, 0x2f, 0xc4, 0x1e, 0x04, 0xbe, 0x4e,
+	0x3f, 0xc3, 0x64, 0xa9, 0xc8, 0x4d, 0x37, 0x37, 0x52, 0x59, 0x6f, 0x37, 0x03, 0xa1, 0x97, 0x00,
+	0xf2, 0xf3, 0x43, 0xe2, 0x11, 0x41, 0x1d, 0x7b, 0x63, 0x05, 0x6d, 0x18, 0x19, 0xb8, 0x00, 0x43,
+	0xcf, 0xa1, 0x46, 0xa3, 0x44, 0xdc, 0x39, 0x2d, 0x85, 0xb7, 0x53, 0xfc, 0x50, 0xea, 0x64, 0xe6,
+	0xca, 0x88, 0x8e, 0xa0, 0x3a, 0x8f, 0x19, 0x73, 0x9e, 0x28, 0xd0, 0x41, 0x0a, 0x7a, 0x13, 0x33,
+	0x36, 0xe4, 0x82, 0x5c, 0x85, 0x01, 0x5f, 0x8c, 0x0c, 0xac, 0x30, 0xe8, 0x05, 0x58, 0x5c, 0x10,
+	0x41, 0xc7, 0xec, 0x3a, 0x76, 0xf6, 0x94, 0x43, 0x3b, 0x75, 0xb8, 0xc8, 0xf4, 0x23, 0x03, 0xaf,
+	0x41, 0xe8, 0x35, 0xb4, 0x94, 0x70, 0xc1, 0x48, 0xc2, 0x17, 0xb1, 0x70, 0xda, 0xa5, 0x33, 0xce,
+	0xbd, 0x32, 0xfb, 0xc8, 0xc0, 0x65, 0x07, 0x34, 0x86, 0x76, 0x1e, 0xee, 0x7c, 0x15, 0x86, 0xb2,
+	0x66, 0xfb, 0x2a, 0xc8, 0x37, 0xf7, 0x83, 0xa4, 0xe6, 0xb4, 0x78, 0x1b, 0x6e, 0xe8, 0x15, 0xd8,
+	0x4a, 0x97, 0x62, 0x1c, 0x54, 0xea, 0x1d, 0x4c, 0xa3, 0x58, 0xd0, 0x8b, 0x02, 0x60, 0x64, 0xe0,
+	0x92, 0x03, 0x3a, 0x4b, 0x77, 0x93, 0x35, 0x97, 0xf3, 0x54, 0x45, 0x38, 0xdc, 0x16, 0x21, 0x6f,
+	0xbf, 0xb2, 0x8b, 0xac, 0x48, 0x48, 0x89, 0xa7, 0xbb, 0x54, 0xf6, 0xe2, 0x41, 0xa9, 0x22, 0xef,
+	0xd6, 0xb6, 0xbc, 0x23, 0xcb, 0x0e, 0xe8, 0x67, 0xb0, 0x13, 0x4a, 0x97, 0x63, 0x8f, 0x32, 0x11,
+	0x88, 0x3b, 0xe7, 0xab, 0xd2, 0x3d, 0x3b, 0x2f, 0x98, 0xe4, 0x06, 0x8a, 0x50, 0xf7, 0x12, 0x2a,
+	0x33, 0xe2, 0xa3, 0x16, 0x58, 0x1f, 0xa6, 0x83, 0xe1, 0xaf, 0xe3, 0xe9, 0x70, 0xd0, 0x36, 0x90,
+	0x05, 0xb5, 0xe1, 0xe4, 0x7c, 0xf6, 0xb1, 0x6d, 0x22, 0x1b, 0x1a, 0xef, 0xf1, 0xdb, 0xcb, 0xf7,
+	0xd3, 0x77, 0x1f, 0xdb, 0x3b, 0x12, 0xf7, 0x66, 0x74, 0x3a, 0xd5, 0x62, 0x05, 0xb5, 0xc1, 0x56,
+	0xe2, 0xe9, 0x74, 0x70, 0xf9, 0x1e, 0xbf, 0x6d, 0x57, 0xd1, 0x1e, 0x34, 0x35, 0x00, 0x2b, 0x45,
+	0xed, 0xcc, 0x82, 0xfa, 0x3c, 0x66, 0x82, 0x32, 0xe1, 0x86, 0x60, 0xe5, 0x27, 0x83, 0x0e, 0xa1,
+	0x11, 0x51, 0x41, 0x64, 0x77, 0x2a, 0x52, 0xb2, 0x71, 0x2e, 0xa3, 0x63, 0xb0, 0x44, 0x10, 0x51,
+	0x2e, 0x48, 0x94, 0x28, 0x66, 0x6a, 0xf6, 0xf7, 0x0a, 0x9b, 0x99, 0x05, 0x11, 0xc5, 0x6b, 0x84,
+	0x24, 0xb7, 0xe4, 0x26, 0x18, 0x0f, 0x14, 0x5d, 0xd9, 0x58, 0x0b, 0xee, 0x10, 0xf6, 0x37, 0x9a,
+	0x09, 0xbd, 0x80, 0x06, 0x0d, 0x69, 0x44, 0x99, 0xe0, 0x8e, 0xd9, 0xa9, 0x14, 0xfa, 0xbb, 0x44,
+	0x6e, 0x38, 0x47, 0xb9, 0xcf, 0xe0, 0x60, 0x5b, 0x3b, 0xb9, 0x13, 0x68, 0x95, 0xae, 0xc4, 0x3a,
+	0x0b, 0xb3, 0x90, 0x05, 0x42, 0x50, 0x9d, 0xd3, 0xa5, 0x48, 0xf9, 0x55, 0x7d, 0x4b, 0xdd, 0x82,
+	0xf0, 0x45, 0x9a, 0xae, 0xfa, 0x76, 0x67, 0x60, 0x17, 0xcf, 0xe9, 0x11, 0xd1, 0x8a, 0x85, 0xac,
+	0x94, 0x0b, 0xe9, 0xde, 0x40, 0xb3, 0xc0, 0x1f, 0x0f, 0x4f, 0x01, 0x4f, 0xf1, 0x11, 0x77, 0x76,
+	0x3a, 0x95, 0xae, 0x85, 0x33, 0x11, 0xfd, 0x00, 0xf5, 0x88, 0xfb, 0xb3, 0xbb, 0x84, 0xa6, 0x93,
+	0x20, 0x23, 0x25, 0x59, 0x88, 0x89, 0xb6, 0xe0, 0x0c, 0xe2, 0x46, 0xd0, 0x2c, 0x30, 0xe1, 0x03,
+	0x8b, 0x15, 0xb3, 0xdd, 0xb9, 0x77, 0xec, 0x8f, 0x5b, 0xee, 0x2f, 0x80, 0x35, 0xd1, 0x3d, 0xb0,
+	0x5a, 0x17, 0xaa, 0xe9, 0x4a, 0x0f, 0x1f, 0x75, 0xf5, 0x7f, 0xac, 0xfd, 0x49, 0xaf, 0xad, 0x69,
+	0xfc, 0x0b, 0x97, 0xf5, 0x27, 0x7d, 0x86, 0xd9, 0x24, 0xef, 0x42, 0x3d, 0x21, 0x77, 0x61, 0x4c,
+	0x3c, 0xb5, 0x5c, 0xb3, 0xff, 0x24, 0x73, 0xd6, 0x5a, 0x9c, 0x99, 0xdd, 0x31, 0xd4, 0x53, 0x1d,
+	0x7a, 0x06, 0xbb, 0x9c, 0xde, 0x4e, 0x57, 0x51, 0x9a, 0x62, 0x2a, 0xe5, 0x9d, 0x28, 0x4f, 0xc2,
+	0xd2, 0x9d, 0x28, 0x75, 0x85, 0x5e, 0x52, 0xdf, 0xee, 0xdf, 0x26, 0xd8, 0xc5, 0x71, 0x8d, 0x8e,
+	0x01, 0xa2, 0x7c, 0xb2, 0xa6, 0x89, 0xb4, 0x4a, 0x23, 0x17, 0x17, 0x00, 0x8f, 0xbd, 0xd0, 0x87,
+	0xd0, 0x08, 0x32, 0x2e, 0xd3, 0x0f, 0x8a, 0x5c, 0x76, 0x6f, 0x61, 0x7f, 0x83, 0x11, 0xbf, 0x6c,
+	0x3a, 0xee, 0x29, 0x34, 0x32, 0x35, 0xfa, 0x0e, 0x20, 0x60, 0xf3, 0x4b, 0xb6, 0x92, 0xc1, 0xd2,
+	0x6a, 0x5a, 0x01, 0x9b, 0x4f, 0x95, 0xa2, 0x50, 0xe8, 0x9d, 0x62, 0xa1, 0xdd, 0x00, 0xf6, 0x37,
+	0x5e, 0x2f, 0xe8, 0x17, 0xd8, 0xe3, 0x34, 0xbc, 0x96, 0xcc, 0xb2, 0x8c, 0x88, 0x08, 0x62, 0x96,
+	0xa6, 0xbe, 0xbd, 0x51, 0xef, 0x83, 0x65, 0xdf, 0xdd, 0xb0, 0xf8, 0x4f, 0xa6, 0xfa, 0xcb, 0xc6,
+	0x5a, 0x70, 0x3f, 0x01, 0xda, 0x7c, 0xf4, 0xc8, 0xa7, 0x8b, 0x7a, 0x5f, 0x7d, 0x96, 0xf5, 0x34,
+	0x44, 0xdd, 0x1a, 0x4a, 0xbc, 0xff, 0xb8, 0x35, 0x94, 0x78, 0xee, 0x6f, 0xb0, 0xab, 0xd7, 0x92,
+	0x47, 0x46, 0x99, 0x97, 0xc4, 0x01, 0x13, 0x6a, 0x13, 0x16, 0xce, 0xe5, 0xcf, 0xde, 0xf9, 0xed,
+	0xdc, 0x5d, 0x87, 0x9a, 0x7a, 0x94, 0xb8, 0x3d, 0x40, 0x9b, 0x53, 0x58, 0x5e, 0x2d, 0x5d, 0x57,
+	0x4d, 0xe2, 0x55, 0x9c, 0x89, 0xee, 0x29, 0x3c, 0xdd, 0x32, 0x73, 0xd1, 0x11, 0x34, 0xd2, 0x5b,
+	0x91, 0xd1, 0xfe, 0xfd, 0x5b, 0x93, 0xdb, 0x8f, 0x5e, 0x41, 0xb3, 0x70, 0x0f, 0xd5, 0x64, 0x64,
+	0x1e, 0xbd, 0x0e, 0x18, 0xf5, 0xda, 0x86, 0x9c, 0x78, 0x67, 0x61, 0x3c, 0xbf, 0x49, 0xeb, 0xd0,
+	0x36, 0xe5, 0xc4, 0xcb, 0x58, 0x7b, 0xc2, 0xfd, 0xf6, 0x4e, 0x3f, 0x81, 0x5d, 0x5d, 0x2b, 0xf4,
+	0x1a, 0x6c, 0xfd, 0x75, 0x21, 0x96, 0x94, 0x44, 0x68, 0x6b, 0x29, 0x0f, 0xb7, 0x6a, 0x5d, 0xa3,
+	0x6b, 0xbe, 0x30, 0xd1, 0x73, 0xa8, 0x9e, 0x07, 0xcc, 0x47, 0xa5, 0xa7, 0xda, 0x61, 0x49, 0x72,
+	0x8d, 0xb3, 0xe3, 0xdf, 0xbf, 0xf7, 0x03, 0xb1, 0x58, 0x5d, 0xf5, 0xe6, 0x71, 0x74, 0xb2, 0xb8,
+	0x4b, 0xe8, 0x32, 0xa4, 0x9e, 0x4f, 0x97, 0x27, 0xd7, 0xe4, 0x6a, 0x19, 0xcc, 0x4f, 0x14, 0x9c,
+	0x9f, 0xe8, 0xff, 0x0c, 0x57, 0xbb, 0x4a, 0x7c, 0xf9, 0x6f, 0x00, 0x00, 0x00, 0xff, 0xff, 0xa4,
+	0xf3, 0xe6, 0xff, 0x44, 0x0c, 0x00, 0x00,
 }
diff --git a/protos/gossip/message.proto b/protos/gossip/message.proto
index c9908bcae6a..4ede73fb722 100644
--- a/protos/gossip/message.proto
+++ b/protos/gossip/message.proto
@@ -1,8 +1,8 @@
 syntax = "proto3";
 
-option go_package = "github.com/hyperledger/fabric/gossip/proto" ;
+option go_package = "github.com/hyperledger/fabric/protos/gossip" ;
 
-package proto;
+package gossip;
 
 
 // Gossip