diff --git a/gnovm/cmd/gno/doc.go b/gnovm/cmd/gno/doc.go
index 1661abd9b84..794dd1ba7bb 100644
--- a/gnovm/cmd/gno/doc.go
+++ b/gnovm/cmd/gno/doc.go
@@ -71,7 +71,7 @@ func (c *docCfg) RegisterFlags(fs *flag.FlagSet) {
 		&c.rootDir,
 		"root-dir",
 		"",
-		"clone location of github.com/gnolang/gno (gnodev tries to guess it)",
+		"clone location of github.com/gnolang/gno (gno binary tries to guess it)",
 	)
 }
 
diff --git a/gnovm/cmd/gno/main.go b/gnovm/cmd/gno/main.go
index cbe204f9700..a2f80a9d7a4 100644
--- a/gnovm/cmd/gno/main.go
+++ b/gnovm/cmd/gno/main.go
@@ -47,7 +47,7 @@ func newGnocliCmd(io commands.IO) *commands.Command {
 		// generate
 		// "vm" -- starts an in-memory chain that can be interacted with?
 		// bug -- start a bug report
-		// version -- show gnodev, golang versions
+		// version -- show gno, golang versions
 	)
 
 	return cmd
diff --git a/gnovm/cmd/gno/main_test.go b/gnovm/cmd/gno/main_test.go
index 371cdf913e8..1395d120012 100644
--- a/gnovm/cmd/gno/main_test.go
+++ b/gnovm/cmd/gno/main_test.go
@@ -14,7 +14,7 @@ import (
 	"github.com/gnolang/gno/tm2/pkg/commands"
 )
 
-func TestMain_Gnodev(t *testing.T) {
+func TestMain_Gno(t *testing.T) {
 	tc := []testMainCase{
 		{args: []string{""}, errShouldBe: "flag: help requested"},
 	}
diff --git a/gnovm/cmd/gno/run.go b/gnovm/cmd/gno/run.go
index 4291d5fe411..b6cde09215e 100644
--- a/gnovm/cmd/gno/run.go
+++ b/gnovm/cmd/gno/run.go
@@ -49,7 +49,7 @@ func (c *runCfg) RegisterFlags(fs *flag.FlagSet) {
 		&c.rootDir,
 		"root-dir",
 		"",
-		"clone location of github.com/gnolang/gno (gnodev tries to guess it)",
+		"clone location of github.com/gnolang/gno (gno binary tries to guess it)",
 	)
 
 	fs.StringVar(
diff --git a/gnovm/pkg/doc/doc.go b/gnovm/pkg/doc/doc.go
index 3e5ce48985a..989188a946a 100644
--- a/gnovm/pkg/doc/doc.go
+++ b/gnovm/pkg/doc/doc.go
@@ -155,7 +155,7 @@ func (d *documentable) output(pp *pkgPrinter) (err error) {
 var fpAbs = filepath.Abs
 
 // ResolveDocumentable returns a Documentable from the given arguments.
-// Refer to the documentation of gnodev doc for the formats accepted (in general
+// Refer to the documentation of gno doc for the formats accepted (in general
 // the same as the go doc command).
 // An error may be returned even if documentation was resolved in case some
 // packages in dirs could not be parsed correctly.
diff --git a/gnovm/pkg/doc/print.go b/gnovm/pkg/doc/print.go
index 7ac1742c62f..644eba9ad13 100644
--- a/gnovm/pkg/doc/print.go
+++ b/gnovm/pkg/doc/print.go
@@ -430,7 +430,7 @@ func (pkg *pkgPrinter) packageClause() {
 	// If we did a file system scan, we knew the import path when we found the directory.
 	// But if we started with a directory name, we never knew the import path.
 	// Either way, we don't know it now, and it's cheap to (re)compute it.
-	/* TODO: add when supporting gnodev doc on local directories
+	/* TODO: add when supporting gno doc on local directories
 	if usingModules {
 		for _, root := range codeRoots() {
 			if pkg.build.Dir == root.dir {