diff --git a/pkg/proc/fncall.go b/pkg/proc/fncall.go
index dfe260c2..8f00ab6b 100644
--- a/pkg/proc/fncall.go
+++ b/pkg/proc/fncall.go
@@ -1045,7 +1045,7 @@ func readStackVariable(t *Target, thread Thread, regs Registers, off uint64, typ
 	return v, nil
 }
 
-// fakeEntryScope alters scope to pretend that we are at the entry point of
+// fakeFunctionEntryScope alters scope to pretend that we are at the entry point of
 // fn and CFA and SP are the ones passed as argument.
 // This function is used to create a scope for a call frame that doesn't
 // exist anymore, to read the return variables of an injected function call,
diff --git a/pkg/proc/gdbserial/gdbserver_conn.go b/pkg/proc/gdbserial/gdbserver_conn.go
index 66489857..da89664e 100644
--- a/pkg/proc/gdbserial/gdbserver_conn.go
+++ b/pkg/proc/gdbserial/gdbserver_conn.go
@@ -1510,7 +1510,7 @@ func binarywiredecode(in, buf []byte) (newbuf, msg []byte) {
 	return buf, buf[start:]
 }
 
-// Checksumok checks that checksum is a valid checksum for packet.
+// checksumok checks that checksum is a valid checksum for packet.
 func checksumok(packet, checksumBuf []byte) bool {
 	if packet[0] != '$' {
 		return false
diff --git a/pkg/proc/target_exec.go b/pkg/proc/target_exec.go
index 9a1a3185..1c894e8c 100644
--- a/pkg/proc/target_exec.go
+++ b/pkg/proc/target_exec.go
@@ -806,7 +806,7 @@ func isAutogeneratedOrDeferReturn(loc Location) bool {
 	return isAutogenerated(loc) || (loc.Fn != nil && loc.Fn.Name == "runtime.deferreturn")
 }
 
-// skipAutogeneratedWrappers skips autogenerated wrappers when setting a
+// skipAutogeneratedWrappersIn skips autogenerated wrappers when setting a
 // step-into breakpoint.
 // See genwrapper in: $GOROOT/src/cmd/compile/internal/gc/subr.go
 func skipAutogeneratedWrappersIn(p Process, startfn *Function, startpc uint64) (*Function, uint64) {
diff --git a/pkg/terminal/starbind/repl.go b/pkg/terminal/starbind/repl.go
index 9e779ba3..e77919b0 100644
--- a/pkg/terminal/starbind/repl.go
+++ b/pkg/terminal/starbind/repl.go
@@ -160,7 +160,7 @@ func soleExpr(f *syntax.File) syntax.Expr {
 	return nil
 }
 
-// PrintError prints the error to stderr,
+// printError prints the error to stderr,
 // or its backtrace if it is a Starlark evaluation error.
 func printError(err error) {
 	if evalErr, ok := err.(*starlark.EvalError); ok {