diff --git a/common/channelconfig/util_test.go b/common/channelconfig/util_test.go
index 0f392fbf580..e6c221e4188 100644
--- a/common/channelconfig/util_test.go
+++ b/common/channelconfig/util_test.go
@@ -167,7 +167,7 @@ func createCfgBlockWithSupportedCapabilities(t *testing.T) *cb.Block {
 	return configBlock
 }
 
-// createCfgBlockWithUnSupportedCapabilities will create a config block that contains mismatched capabilities and should be rejected by the peer
+// createCfgBlockWithUnsupportedCapabilities will create a config block that contains mismatched capabilities and should be rejected by the peer
 func createCfgBlockWithUnsupportedCapabilities(t *testing.T) *cb.Block {
 	// Create a config
 	config := &cb.Config{
diff --git a/common/crypto/tlsgen/ca.go b/common/crypto/tlsgen/ca.go
index 7ee89d34dc6..c79a4d5be1e 100644
--- a/common/crypto/tlsgen/ca.go
+++ b/common/crypto/tlsgen/ca.go
@@ -75,14 +75,14 @@ func (c *ca) CertBytes() []byte {
 	return c.caCert.Cert
 }
 
-// newClientCertKeyPair returns a certificate and private key pair and nil,
+// NewClientCertKeyPair returns a certificate and private key pair and nil,
 // or nil, error in case of failure
 // The certificate is signed by the CA and is used as a client TLS certificate
 func (c *ca) NewClientCertKeyPair() (*CertKeyPair, error) {
 	return newCertKeyPair(false, false, c.caCert.Signer, c.caCert.TLSCert)
 }
 
-// newServerCertKeyPair returns a certificate and private key pair and nil,
+// NewServerCertKeyPair returns a certificate and private key pair and nil,
 // or nil, error in case of failure
 // The certificate is signed by the CA and is used as a server TLS certificate
 func (c *ca) NewServerCertKeyPair(hosts ...string) (*CertKeyPair, error) {
diff --git a/common/policies/implicitmeta_util.go b/common/policies/implicitmeta_util.go
index ed8972939c4..d7b8c67b7fc 100644
--- a/common/policies/implicitmeta_util.go
+++ b/common/policies/implicitmeta_util.go
@@ -24,7 +24,7 @@ func ImplicitMetaPolicyWithSubPolicy(subPolicyName string, rule cb.ImplicitMetaP
 	}
 }
 
-// TemplateImplicitMetaPolicy creates a policy at the specified path with the given policyName and subPolicyName
+// TemplateImplicitMetaPolicyWithSubPolicy creates a policy at the specified path with the given policyName and subPolicyName
 func TemplateImplicitMetaPolicyWithSubPolicy(path []string, policyName string, subPolicyName string, rule cb.ImplicitMetaPolicy_Rule) *cb.ConfigGroup {
 	root := protoutil.NewConfigGroup()
 	group := root