diff --git a/README.md b/README.md
index 58ad65a4..0ff7623e 100644
--- a/README.md
+++ b/README.md
@@ -2,9 +2,9 @@
 
 [![PkgGoDev](https://pkg.go.dev/badge/github.com/carapace-sh/carapace-pflag)](https://pkg.go.dev/github.com/carapace-sh/carapace-pflag)
 [![GoReportCard](https://goreportcard.com/badge/github.com/carapace-sh/carapace-pflag)](https://goreportcard.com/report/github.com/carapace-sh/carapace-pflag)
-[![Coverage Status](https://coveralls.io/repos/github/rsteube/carapace-pflag/badge.svg?branch=master)](https://coveralls.io/github/rsteube/carapace-pflag?branch=master)
+[![Coverage Status](https://coveralls.io/repos/github/carapace-sh/carapace-pflag/badge.svg?branch=master)](https://coveralls.io/github/carapace-sh/carapace-pflag?branch=master)
 
-Fork of [spf13/pflag](https://github.com/spf13/pflag) aimed to provide support for non-posix variants in [carapace](https://github.com/rsteube/carapace) standalone mode (e.g. [carapace-bin](https://github.com/rsteube/carapace-bin)).
+Fork of [spf13/pflag](https://github.com/spf13/pflag) aimed to provide support for non-posix variants in [carapace](https://github.com/carapace-sh/carapace) standalone mode (e.g. [carapace-bin](https://github.com/carapace-sh/carapace-bin)).
 
 ## Customizations
 
diff --git a/flag.go b/flag.go
index f56c164e..74ce7367 100644
--- a/flag.go
+++ b/flag.go
@@ -1186,7 +1186,7 @@ func (f *FlagSet) parseSingleShortArg(shorthands string, args []string, fn parse
 			if f.IsPosix() {
 				err = f.failf("unknown shorthand flag: %q in -%s", name, shorthands) // standard spf13/pflag message for shorthand chain
 			} else {
-				err = f.failf("unknown shorthand flag: -%s", name) // custom rsteube/carapace-pflag message for non-posix shorthand (chain disabled)
+				err = f.failf("unknown shorthand flag: -%s", name) // custom carapace-sh/carapace-pflag message for non-posix shorthand (chain disabled)
 			}
 			return
 		}