diff --git a/internal/config/config.go b/internal/config/config.go
index 4b3ee57db2..6e5d82bd6f 100644
--- a/internal/config/config.go
+++ b/internal/config/config.go
@@ -86,7 +86,7 @@ func NewInMemory() *Config {
 	return newWithOptions(true)
 }
 
-// NewContextReadOnly returns a context with a read-only config.
+// NewContextInMemory returns a context with a read-only config.
 func NewContextInMemory() context.Context {
 	return NewInMemory().WithConfig(context.Background())
 }
diff --git a/internal/create/wizard.go b/internal/create/wizard.go
index f41f2352a7..c1b766af1b 100644
--- a/internal/create/wizard.go
+++ b/internal/create/wizard.go
@@ -361,7 +361,7 @@ func renderTemplate(ctx context.Context, name string, s *root.Store) ([]byte, er
 	return nc, nil
 }
 
-// generatePasssword will walk through the password generation steps.
+// generatePassword will walk through the password generation steps.
 func generatePassword(ctx context.Context, hostname, charset string) (string, error) {
 	defaultLength, _ := config.DefaultPasswordLengthFromEnv(ctx)
 
diff --git a/pkg/gopass/secrets/akv.go b/pkg/gopass/secrets/akv.go
index c43e3009fb..eec35879cc 100644
--- a/pkg/gopass/secrets/akv.go
+++ b/pkg/gopass/secrets/akv.go
@@ -34,7 +34,7 @@ func NewAKV() *AKV {
 	return a
 }
 
-// NewKVWithData returns a new KV secret populated with data.
+// NewAKVWithData returns a new KV secret populated with data.
 func NewAKVWithData(pw string, kvps map[string][]string, body string, converted bool) *AKV {
 	kv := NewAKV()
 	kv.SetPassword(pw)