diff --git a/internal/pkg/comm/creds.go b/internal/pkg/comm/creds.go
index 232b21e24bf..99fc9361bb2 100644
--- a/internal/pkg/comm/creds.go
+++ b/internal/pkg/comm/creds.go
@@ -93,7 +93,7 @@ func (t *TLSConfig) SetClientCAs(certPool *x509.CertPool) {
 	t.config.ClientCAs = certPool
 }
 
-// ClientHandShake is not implemented for `serverCreds`.
+// ClientHandshake is not implemented for `serverCreds`.
 func (sc *serverCreds) ClientHandshake(context.Context, string, net.Conn) (net.Conn, credentials.AuthInfo, error) {
 	return nil, nil, ErrClientHandshakeNotImplemented
 }
diff --git a/msp/mgmt/testtools/config.go b/msp/mgmt/testtools/config.go
index 96a046c7147..708acff411a 100644
--- a/msp/mgmt/testtools/config.go
+++ b/msp/mgmt/testtools/config.go
@@ -13,7 +13,7 @@ import (
 	"github.com/hyperledger/fabric/msp/mgmt"
 )
 
-// LoadTestMSPSetup sets up the local MSP
+// LoadMSPSetupForTesting sets up the local MSP
 // and a chain MSP for the default chain
 func LoadMSPSetupForTesting() error {
 	dir := configtest.GetDevMspDir()
diff --git a/orderer/mocks/common/multichannel/multichannel.go b/orderer/mocks/common/multichannel/multichannel.go
index 2a202e51736..3d9e18a165c 100644
--- a/orderer/mocks/common/multichannel/multichannel.go
+++ b/orderer/mocks/common/multichannel/multichannel.go
@@ -110,7 +110,7 @@ func (mcs *ConsenterSupport) WriteBlock(block *cb.Block, encodedMetadataValue []
 	mcs.Append(block)
 }
 
-// WriteBlock writes data to the Blocks channel
+// WriteBlockSync writes data to the Blocks channel
 func (mcs *ConsenterSupport) WriteBlockSync(block *cb.Block, encodedMetadataValue []byte) {
 	mcs.WriteBlock(block, encodedMetadataValue)
 }