diff --git a/core/chaincode/shim/chaincode.pb.go b/core/chaincode/shim/chaincode.pb.go
index ad544a3951a..49597a7f865 100644
--- a/core/chaincode/shim/chaincode.pb.go
+++ b/core/chaincode/shim/chaincode.pb.go
@@ -1,12 +1,12 @@
 // Code generated by protoc-gen-go.
-// source: chaincode/shim/chaincode.proto
+// source: chaincode.proto
 // DO NOT EDIT!
 
 /*
 Package shim is a generated protocol buffer package.
 
 It is generated from these files:
-	chaincode/shim/chaincode.proto
+	chaincode.proto
 
 It has these top-level messages:
 	ColumnDefinition
diff --git a/core/crypto/attributes/proto/attributes.pb.go b/core/crypto/attributes/proto/attributes.pb.go
index 57d3ac39c91..12388129f69 100644
--- a/core/crypto/attributes/proto/attributes.pb.go
+++ b/core/crypto/attributes/proto/attributes.pb.go
@@ -1,12 +1,12 @@
 // Code generated by protoc-gen-go.
-// source: crypto/attributes/proto/attributes.proto
+// source: attributes.proto
 // DO NOT EDIT!
 
 /*
 Package protos is a generated protocol buffer package.
 
 It is generated from these files:
-	crypto/attributes/proto/attributes.proto
+	attributes.proto
 
 It has these top-level messages:
 	AttributesMetadataEntry
diff --git a/examples/chaincode/go/utxo/util/dah.pb.go b/examples/chaincode/go/utxo/util/dah.pb.go
index 40016f7e30b..0d694eec855 100644
--- a/examples/chaincode/go/utxo/util/dah.pb.go
+++ b/examples/chaincode/go/utxo/util/dah.pb.go
@@ -3,7 +3,7 @@
 // DO NOT EDIT!
 
 /*
-Package utxo is a generated protocol buffer package.
+Package util is a generated protocol buffer package.
 
 It is generated from these files:
 	dah.proto
diff --git a/examples/chaincode/go/utxo/util/dah.proto b/examples/chaincode/go/utxo/util/dah.proto
index 414e3a7f705..62245fb7625 100644
--- a/examples/chaincode/go/utxo/util/dah.proto
+++ b/examples/chaincode/go/utxo/util/dah.proto
@@ -16,7 +16,7 @@ limitations under the License.
 
 syntax = "proto3";
 
-package utxo;
+package util;
 
 message TX {
 	uint32 version = 1;
diff --git a/protos/api.pb.go b/protos/api.pb.go
index 5f846cd400c..5e361fa5864 100644
--- a/protos/api.pb.go
+++ b/protos/api.pb.go
@@ -52,6 +52,7 @@ It has these top-level messages:
 	PeerID
 	PeerEndpoint
 	PeersMessage
+	PeersAddresses
 	HelloMessage
 	Message
 	Response
diff --git a/protos/chaincodeevent.pb.go b/protos/chaincodeevent.pb.go
index d5f28606d5c..f555bbf5af3 100644
--- a/protos/chaincodeevent.pb.go
+++ b/protos/chaincodeevent.pb.go
@@ -13,7 +13,7 @@ var _ = proto.Marshal
 var _ = fmt.Errorf
 var _ = math.Inf
 
-// Chaincode is used for events and registrations that are specific to chaincode
+// ChaincodeEvent is used for events and registrations that are specific to chaincode
 // string type - "chaincode"
 type ChaincodeEvent struct {
 	ChaincodeID string `protobuf:"bytes,1,opt,name=chaincodeID" json:"chaincodeID,omitempty"`
diff --git a/protos/devops.pb.go b/protos/devops.pb.go
index 22e41a096d8..6fae2a7e37d 100644
--- a/protos/devops.pb.go
+++ b/protos/devops.pb.go
@@ -140,7 +140,7 @@ type DevopsClient interface {
 	Deploy(ctx context.Context, in *ChaincodeSpec, opts ...grpc.CallOption) (*ChaincodeDeploymentSpec, error)
 	// Invoke chaincode.
 	Invoke(ctx context.Context, in *ChaincodeInvocationSpec, opts ...grpc.CallOption) (*Response, error)
-	// Invoke chaincode.
+	// Query chaincode.
 	Query(ctx context.Context, in *ChaincodeInvocationSpec, opts ...grpc.CallOption) (*Response, error)
 	// Retrieve a TCert.
 	EXP_GetApplicationTCert(ctx context.Context, in *Secret, opts ...grpc.CallOption) (*Response, error)
@@ -253,7 +253,7 @@ type DevopsServer interface {
 	Deploy(context.Context, *ChaincodeSpec) (*ChaincodeDeploymentSpec, error)
 	// Invoke chaincode.
 	Invoke(context.Context, *ChaincodeInvocationSpec) (*Response, error)
-	// Invoke chaincode.
+	// Query chaincode.
 	Query(context.Context, *ChaincodeInvocationSpec) (*Response, error)
 	// Retrieve a TCert.
 	EXP_GetApplicationTCert(context.Context, *Secret) (*Response, error)
diff --git a/protos/events.pb.go b/protos/events.pb.go
index fda2b7dcb97..59d58c0667d 100644
--- a/protos/events.pb.go
+++ b/protos/events.pb.go
@@ -156,7 +156,7 @@ func (m *Register) GetEvents() []*Interest {
 // string type - "rejection"
 type Rejection struct {
 	Tx       *Transaction `protobuf:"bytes,1,opt,name=tx" json:"tx,omitempty"`
-	ErrorMsg string       `protobuf:"bytes,2,opt,name=ErrorMsg" json:"ErrorMsg,omitempty"`
+	ErrorMsg string       `protobuf:"bytes,2,opt,name=errorMsg" json:"errorMsg,omitempty"`
 }
 
 func (m *Rejection) Reset()         { *m = Rejection{} }
diff --git a/protos/fabric.pb.go b/protos/fabric.pb.go
index 1da32098bf3..8dd6b69558f 100644
--- a/protos/fabric.pb.go
+++ b/protos/fabric.pb.go
@@ -490,7 +490,7 @@ func (m *SyncStateSnapshotRequest) Reset()         { *m = SyncStateSnapshotReque
 func (m *SyncStateSnapshotRequest) String() string { return proto.CompactTextString(m) }
 func (*SyncStateSnapshotRequest) ProtoMessage()    {}
 
-// SyncState is the payload of Message.SYNC_SNAPSHOT, which is a response
+// SyncStateSnapshot is the payload of Message.SYNC_SNAPSHOT, which is a response
 // to penchainMessage.SYNC_GET_SNAPSHOT. It contains the snapshot or a chunk of the
 // snapshot on stream, and in which case, the sequence indicate the order
 // starting at 0.  The terminating message will have len(delta) == 0.
@@ -512,7 +512,7 @@ func (m *SyncStateSnapshot) GetRequest() *SyncStateSnapshotRequest {
 	return nil
 }
 
-// SyncStateRequest is the payload of Message.SYNC_GET_STATE.
+// SyncStateDeltasRequest is the payload of Message.SYNC_GET_STATE.
 // blockNumber indicates the block number for the delta which is being
 // requested. If no payload is included with SYNC_GET_STATE, it represents
 // a request for a snapshot of the current state.