diff --git a/gossip/gossip/pull/pullstore_test.go b/gossip/gossip/pull/pullstore_test.go
index 6f9f880fb41..2623cd5fd97 100644
--- a/gossip/gossip/pull/pullstore_test.go
+++ b/gossip/gossip/pull/pullstore_test.go
@@ -39,7 +39,7 @@ type pullMsg struct {
 	msg         *protoext.SignedGossipMessage
 }
 
-// GetSourceMessage Returns the SignedGossipMessage the ReceivedMessage was
+// GetSourceEnvelope Returns the SignedGossipMessage the ReceivedMessage was
 // constructed with
 func (pm *pullMsg) GetSourceEnvelope() *gossip.Envelope {
 	return pm.msg.Envelope
diff --git a/gossip/protoext/receivedmessage.go b/gossip/protoext/receivedmessage.go
index de6f49faa1f..1377a33589d 100644
--- a/gossip/protoext/receivedmessage.go
+++ b/gossip/protoext/receivedmessage.go
@@ -27,7 +27,7 @@ type ReceivedMessage interface {
 	// GetGossipMessage returns the underlying GossipMessage
 	GetGossipMessage() *SignedGossipMessage
 
-	// GetSourceMessage Returns the Envelope the ReceivedMessage was
+	// GetSourceEnvelope Returns the Envelope the ReceivedMessage was
 	// constructed with
 	GetSourceEnvelope() *gossip.Envelope
 
diff --git a/integration/lifecycle/lifecycle_suite_test.go b/integration/lifecycle/lifecycle_suite_test.go
index 08cebecf4d7..47d3641a186 100644
--- a/integration/lifecycle/lifecycle_suite_test.go
+++ b/integration/lifecycle/lifecycle_suite_test.go
@@ -198,7 +198,7 @@ func CommitTx(nw *nwo.Network, tx *pcommon.Envelope, peer *nwo.Peer, dc pb.Deliv
 	}
 }
 
-// GenerateOrgUpdateMeterials generates the necessary configtx and
+// GenerateOrgUpdateMaterials generates the necessary configtx and
 // crypto materials for a new org's peers to join a network
 func GenerateOrgUpdateMaterials(n *nwo.Network, peers ...*nwo.Peer) {
 	orgUpdateNetwork := *n