diff --git a/indexer/postgres/select.go b/indexer/postgres/select.go
index 242891c1cc75..8efef56c25c5 100644
--- a/indexer/postgres/select.go
+++ b/indexer/postgres/select.go
@@ -14,7 +14,7 @@ import (
 	"cosmossdk.io/schema"
 )
 
-// Count returns the number of rows in the table.
+// count returns the number of rows in the table.
 func (tm *objectIndexer) count(ctx context.Context, conn dbConn) (int, error) {
 	sqlStr := fmt.Sprintf("SELECT COUNT(*) FROM %q;", tm.tableName())
 	if tm.options.logger != nil {
diff --git a/schema/type.go b/schema/type.go
index f441829bb132..dfbc839ae0d4 100644
--- a/schema/type.go
+++ b/schema/type.go
@@ -18,7 +18,7 @@ type Type interface {
 type ReferenceType interface {
 	Type
 
-	// IsReferenceType is implemented if this is a reference type.
+	// isReferenceType is implemented if this is a reference type.
 	isReferenceType()
 }
 
diff --git a/x/evidence/keeper/infraction.go b/x/evidence/keeper/infraction.go
index bfb5e95ed1a8..6e2c40289495 100644
--- a/x/evidence/keeper/infraction.go
+++ b/x/evidence/keeper/infraction.go
@@ -10,7 +10,7 @@ import (
 	sdk "github.com/cosmos/cosmos-sdk/types"
 )
 
-// HandleEquivocationEvidence implements an equivocation evidence handler. Assuming the
+// handleEquivocationEvidence implements an equivocation evidence handler. Assuming the
 // evidence is valid, the validator committing the misbehavior will be slashed,
 // jailed and tombstoned. Once tombstoned, the validator will not be able to
 // recover. Note, the evidence contains the block time and height at the time of
diff --git a/x/upgrade/plan/downloader_test.go b/x/upgrade/plan/downloader_test.go
index 60706b4ac6d1..863c231eea85 100644
--- a/x/upgrade/plan/downloader_test.go
+++ b/x/upgrade/plan/downloader_test.go
@@ -96,7 +96,7 @@ func (z TestZip) SaveAs(path string) error {
 	return zipper.Close()
 }
 
-// saveTestZip saves a TestZip in this test's Home/src directory with the given name.
+// saveSrcTestZip saves a TestZip in this test's Home/src directory with the given name.
 // The full path to the saved archive is returned.
 func (s *DownloaderTestSuite) saveSrcTestZip(name string, z TestZip) string {
 	fullName := filepath.Join(s.Home, "src", name)
diff --git a/x/upgrade/plan/info_test.go b/x/upgrade/plan/info_test.go
index 047cd49defa6..62c56c8f0cac 100644
--- a/x/upgrade/plan/info_test.go
+++ b/x/upgrade/plan/info_test.go
@@ -24,7 +24,7 @@ func TestInfoTestSuite(t *testing.T) {
 	suite.Run(t, new(InfoTestSuite))
 }
 
-// saveSrcTestFile saves a TestFile in this test's Home/src directory.
+// saveTestFile saves a TestFile in this test's Home/src directory.
 // The full path to the saved file is returned.
 func (s *InfoTestSuite) saveTestFile(f *TestFile) string {
 	fullName, err := f.SaveIn(s.Home)