diff --git a/command.go b/command.go
index 541081a59c..d7b05637d2 100644
--- a/command.go
+++ b/command.go
@@ -85,9 +85,9 @@ type Command struct {
 	Writer io.Writer `json:"-"`
 	// ErrWriter writes error output
 	ErrWriter io.Writer `json:"-"`
-	// ExitErrHandler processes any error encountered while running an App before
-	// it is returned to the caller. If no function is provided, HandleExitCoder
-	// is used as the default behavior.
+	// ExitErrHandler processes any error encountered while running a Command before it is
+	// returned to the caller. If no function is provided, HandleExitCoder is used as the
+	// default behavior.
 	ExitErrHandler ExitErrHandlerFunc `json:"-"`
 	// Other custom info
 	Metadata map[string]interface{} `json:"metadata"`
diff --git a/command_run.go b/command_run.go
index 44ffc22349..6b2abc1b90 100644
--- a/command_run.go
+++ b/command_run.go
@@ -175,9 +175,9 @@ func (cmd *Command) run(ctx context.Context, osArgs []string) (_ context.Context
 		}
 		if !cmd.hideHelp() {
 			if cmd.parent == nil {
-				tracef("running ShowAppHelp")
-				if err := ShowAppHelp(cmd); err != nil {
-					tracef("SILENTLY IGNORING ERROR running ShowAppHelp %[1]v (cmd=%[2]q)", err, cmd.Name)
+				tracef("running ShowRootCommandHelp")
+				if err := ShowRootCommandHelp(cmd); err != nil {
+					tracef("SILENTLY IGNORING ERROR running ShowRootCommandHelp %[1]v (cmd=%[2]q)", err, cmd.Name)
 				}
 			} else {
 				tracef("running ShowCommandHelp with %[1]q", cmd.Name)
diff --git a/docs/v3/examples/full-api-example.md b/docs/v3/examples/full-api-example.md
index fb574141ae..9857e89826 100644
--- a/docs/v3/examples/full-api-example.md
+++ b/docs/v3/examples/full-api-example.md
@@ -185,9 +185,9 @@ func main() {
 			return nil
 		},
 		Action: func(ctx context.Context, cmd *cli.Command) error {
-			cli.DefaultAppComplete(ctx, cmd)
+			cli.DefaultRootCommandComplete(ctx, cmd)
 			cli.HandleExitCoder(errors.New("not an exit coder, though"))
-			cli.ShowAppHelp(cmd)
+			cli.ShowRootCommandHelp(cmd)
 			cli.ShowCommandHelp(ctx, cmd, "also-nope")
 			cli.ShowSubcommandHelp(cmd)
 			cli.ShowVersion(cmd)
diff --git a/docs/v3/examples/help/generated-help-text.md b/docs/v3/examples/help/generated-help-text.md
index 3f11b757a4..973a85756d 100644
--- a/docs/v3/examples/help/generated-help-text.md
+++ b/docs/v3/examples/help/generated-help-text.md
@@ -11,11 +11,10 @@ or subcommand, and break execution.
 
 #### Customization
 
-All of the help text generation may be customized, and at multiple levels.  The
-templates are exposed as variables `AppHelpTemplate`, `CommandHelpTemplate`, and
-`SubcommandHelpTemplate` which may be reassigned or augmented, and full override
-is possible by assigning a compatible func to the `cli.HelpPrinter` variable,
-e.g.:
+All of the help text generation may be customized, and at multiple levels. The templates
+are exposed as variables `RootCommandHelpTemplate`, `CommandHelpTemplate`, and
+`SubcommandHelpTemplate` which may be reassigned or augmented, and full override is
+possible by assigning a compatible func to the `cli.HelpPrinter` variable, e.g.:
 
 <!-- {
   "output": "Ha HA.  I pwnd the help!!1"
diff --git a/errors.go b/errors.go
index 6b377f1097..a1188e736a 100644
--- a/errors.go
+++ b/errors.go
@@ -92,8 +92,7 @@ type ErrorFormatter interface {
 	Format(s fmt.State, verb rune)
 }
 
-// ExitCoder is the interface checked by `App` and `Command` for a custom exit
-// code
+// ExitCoder is the interface checked by `Command` for a custom exit code.
 type ExitCoder interface {
 	error
 	ExitCode() int
@@ -107,11 +106,11 @@ type exitError struct {
 // Exit wraps a message and exit code into an error, which by default is
 // handled with a call to os.Exit during default error handling.
 //
-// This is the simplest way to trigger a non-zero exit code for an App without
+// This is the simplest way to trigger a non-zero exit code for a Command without
 // having to call os.Exit manually. During testing, this behavior can be avoided
-// by overriding the ExitErrHandler function on an App or the package-global
+// by overriding the ExitErrHandler function on a Command or the package-global
 // OsExiter function.
-func Exit(message interface{}, exitCode int) ExitCoder {
+func Exit(message any, exitCode int) ExitCoder {
 	var err error
 
 	switch e := message.(type) {
@@ -144,7 +143,7 @@ func (ee *exitError) ExitCode() int {
 // for the ExitCoder interface, and OsExiter will be called with the last exit
 // code found, or exit code 1 if no ExitCoder is found.
 //
-// This function is the default error-handling behavior for an App.
+// This function is the default error-handling behavior for a Command.
 func HandleExitCoder(err error) {
 	if err == nil {
 		return
diff --git a/fish.go b/fish.go
index 320dfc6c69..1607f55b13 100644
--- a/fish.go
+++ b/fish.go
@@ -8,7 +8,7 @@ import (
 	"text/template"
 )
 
-// ToFishCompletion creates a fish completion string for the `*App`
+// ToFishCompletion creates a fish completion string for the `*Command`
 // The function errors if either parsing or writing of the string fails.
 func (cmd *Command) ToFishCompletion() (string, error) {
 	var w bytes.Buffer
diff --git a/godoc-current.txt b/godoc-current.txt
index aa3ca2d73c..bf43768cf4 100644
--- a/godoc-current.txt
+++ b/godoc-current.txt
@@ -79,6 +79,10 @@ GLOBAL OPTIONS:{{template "visiblePersistentFlagTemplate" .}}{{end}}
     uses text/template to render templates. You can render custom help text by
     setting this variable.
 
+var DefaultAppComplete = DefaultRootCommandComplete
+    DefaultAppComplete is a backward-compatible name for
+    DefaultRootCommandComplete.
+
 var DefaultInverseBoolPrefix = "no-"
 var ErrWriter io.Writer = os.Stderr
     ErrWriter is used to write errors to the user. This can be anything
@@ -131,13 +135,19 @@ COPYRIGHT:
     cli.go uses text/template to render templates. You can render custom help
     text by setting this variable.
 
-var ShowAppHelp = showAppHelp
-    ShowAppHelp is an action that displays the help
+var ShowAppHelp = ShowRootCommandHelp
+    ShowAppHelp is a backward-compatible name for ShowRootCommandHelp.
+
+var ShowAppHelpAndExit = ShowRootCommandHelpAndExit
+    ShowAppHelpAndExit is a backward-compatible name for ShowRootCommandHelp.
 
-var ShowCommandHelp = showCommandHelp
+var ShowCommandHelp = DefaultShowCommandHelp
     ShowCommandHelp prints help for the given command
 
-var ShowSubcommandHelp = showSubcommandHelp
+var ShowRootCommandHelp = DefaultShowRootCommandHelp
+    ShowRootCommandHelp is an action that displays help for the root command.
+
+var ShowSubcommandHelp = DefaultShowSubcommandHelp
     ShowSubcommandHelp prints help for the given subcommand
 
 var SubcommandHelpTemplate = `NAME:
@@ -162,37 +172,40 @@ OPTIONS:{{template "visibleFlagTemplate" .}}{{end}}
     cli.go uses text/template to render templates. You can render custom help
     text by setting this variable.
 
-var VersionPrinter = printVersion
-    VersionPrinter prints the version for the App
+var VersionPrinter = DefaultPrintVersion
+    VersionPrinter prints the version for the root Command.
 
-var HelpPrinter helpPrinter = printHelp
-    HelpPrinter is a function that writes the help output. If not set
-    explicitly, this calls HelpPrinterCustom using only the default template
-    functions.
 
-    If custom logic for printing help is required, this function can be
-    overridden. If the ExtraInfo field is defined on an App, this function
-    should not be modified, as HelpPrinterCustom will be used directly in order
-    to capture the extra information.
+FUNCTIONS
 
-var HelpPrinterCustom helpPrinterCustom = printHelpCustom
-    HelpPrinterCustom is a function that writes the help output. It is used as
-    the default implementation of HelpPrinter, and may be called directly if the
-    ExtraInfo field is set on an App.
+func DefaultCompleteWithFlags(ctx context.Context, cmd *Command)
+func DefaultPrintHelp(out io.Writer, templ string, data any)
+    DefaultPrintHelp is the default implementation of HelpPrinter.
 
-    In the default implementation, if the customFuncs argument contains a
-    "wrapAt" key, which is a function which takes no arguments and returns an
-    int, this int value will be used to produce a "wrap" function used by the
-    default template to wrap long lines.
+func DefaultPrintHelpCustom(out io.Writer, templ string, data any, customFuncs map[string]any)
+    DefaultPrintHelpCustom is the default implementation of HelpPrinterCustom.
 
+    The customFuncs map will be combined with a default template.FuncMap to
+    allow using arbitrary functions in template rendering.
 
-FUNCTIONS
+func DefaultPrintVersion(cmd *Command)
+    DefaultPrintVersion is the default implementation of VersionPrinter.
 
-func DefaultAppComplete(ctx context.Context, cmd *Command)
-    DefaultAppComplete prints the list of subcommands as the default app
-    completion method
+func DefaultRootCommandComplete(ctx context.Context, cmd *Command)
+    DefaultRootCommandComplete prints the list of subcommands as the default
+    completion method.
+
+func DefaultShowCommandHelp(ctx context.Context, cmd *Command, commandName string) error
+    DefaultShowCommandHelp is the default implementation of ShowCommandHelp.
+
+func DefaultShowRootCommandHelp(cmd *Command) error
+    DefaultShowRootCommandHelp is the default implementation of
+    ShowRootCommandHelp.
+
+func DefaultShowSubcommandHelp(cmd *Command) error
+    DefaultShowSubcommandHelp is the default implementation of
+    ShowSubcommandHelp.
 
-func DefaultCompleteWithFlags(ctx context.Context, cmd *Command)
 func FlagNames(name string, aliases []string) []string
 func HandleExitCoder(err error)
     HandleExitCoder handles errors implementing ExitCoder by printing their
@@ -202,21 +215,22 @@ func HandleExitCoder(err error)
     for the ExitCoder interface, and OsExiter will be called with the last exit
     code found, or exit code 1 if no ExitCoder is found.
 
-    This function is the default error-handling behavior for an App.
-
-func ShowAppHelpAndExit(cmd *Command, exitCode int)
-    ShowAppHelpAndExit - Prints the list of subcommands for the app and exits
-    with exit code.
+    This function is the default error-handling behavior for a Command.
 
 func ShowCommandHelpAndExit(ctx context.Context, cmd *Command, command string, code int)
-    ShowCommandHelpAndExit - exits with code after showing help
+    ShowCommandHelpAndExit exits with code after showing help via
+    ShowCommandHelp.
+
+func ShowRootCommandHelpAndExit(cmd *Command, exitCode int)
+    ShowRootCommandHelpAndExit prints the list of subcommands and exits with
+    exit code.
 
 func ShowSubcommandHelpAndExit(cmd *Command, exitCode int)
-    ShowSubcommandHelpAndExit - Prints help for the given subcommand and exits
-    with exit code.
+    ShowSubcommandHelpAndExit prints help for the given subcommand via
+    ShowSubcommandHelp and exits with exit code.
 
 func ShowVersion(cmd *Command)
-    ShowVersion prints the version number of the App
+    ShowVersion prints the version number of the root Command.
 
 
 TYPES
@@ -472,9 +486,9 @@ type Command struct {
 	Writer io.Writer `json:"-"`
 	// ErrWriter writes error output
 	ErrWriter io.Writer `json:"-"`
-	// ExitErrHandler processes any error encountered while running an App before
-	// it is returned to the caller. If no function is provided, HandleExitCoder
-	// is used as the default behavior.
+	// ExitErrHandler processes any error encountered while running a Command before it is
+	// returned to the caller. If no function is provided, HandleExitCoder is used as the
+	// default behavior.
 	ExitErrHandler ExitErrHandlerFunc `json:"-"`
 	// Other custom info
 	Metadata map[string]interface{} `json:"metadata"`
@@ -687,7 +701,7 @@ func (c *Command) TimestampArg(name string) time.Time
 func (c *Command) TimestampArgs(name string) []time.Time
 
 func (cmd *Command) ToFishCompletion() (string, error)
-    ToFishCompletion creates a fish completion string for the `*App` The
+    ToFishCompletion creates a fish completion string for the `*Command` The
     function errors if either parsing or writing of the string fails.
 
 func (cmd *Command) Uint(name string) uint
@@ -847,16 +861,15 @@ type ExitCoder interface {
 	error
 	ExitCode() int
 }
-    ExitCoder is the interface checked by `App` and `Command` for a custom exit
-    code
+    ExitCoder is the interface checked by `Command` for a custom exit code.
 
-func Exit(message interface{}, exitCode int) ExitCoder
+func Exit(message any, exitCode int) ExitCoder
     Exit wraps a message and exit code into an error, which by default is
     handled with a call to os.Exit during default error handling.
 
-    This is the simplest way to trigger a non-zero exit code for an App
-    without having to call os.Exit manually. During testing, this behavior
-    can be avoided by overriding the ExitErrHandler function on an App or the
+    This is the simplest way to trigger a non-zero exit code for a Command
+    without having to call os.Exit manually. During testing, this behavior can
+    be avoided by overriding the ExitErrHandler function on a Command or the
     package-global OsExiter function.
 
 type ExitErrHandlerFunc func(context.Context, *Command, error)
@@ -1093,6 +1106,32 @@ type FloatSliceFlag = FlagBase[[]float64, NoConfig, FloatSlice]
 
 type GenericFlag = FlagBase[Value, NoConfig, genericValue]
 
+type HelpPrinterCustomFunc func(w io.Writer, templ string, data any, customFunc map[string]any)
+    Prints help for the Command with custom template function.
+
+var HelpPrinterCustom HelpPrinterCustomFunc = DefaultPrintHelpCustom
+    HelpPrinterCustom is a function that writes the help output. It is used as
+    the default implementation of HelpPrinter, and may be called directly if the
+    ExtraInfo field is set on a Command.
+
+    In the default implementation, if the customFuncs argument contains a
+    "wrapAt" key, which is a function which takes no arguments and returns an
+    int, this int value will be used to produce a "wrap" function used by the
+    default template to wrap long lines.
+
+type HelpPrinterFunc func(w io.Writer, templ string, data any)
+    HelpPrinterFunc prints help for the Command.
+
+var HelpPrinter HelpPrinterFunc = DefaultPrintHelp
+    HelpPrinter is a function that writes the help output. If not set
+    explicitly, this calls HelpPrinterCustom using only the default template
+    functions.
+
+    If custom logic for printing help is required, this function can be
+    overridden. If the ExtraInfo field is defined on a Command, this function
+    should not be modified, as HelpPrinterCustom will be used directly in order
+    to capture the extra information.
+
 type Int16Arg = ArgumentBase[int16, IntegerConfig, intValue[int16]]
 
 type Int16Args = ArgumentsBase[int16, IntegerConfig, intValue[int16]]
diff --git a/help.go b/help.go
index 42e14a854d..028fbb5dbb 100644
--- a/help.go
+++ b/help.go
@@ -16,42 +16,45 @@ const (
 	helpAlias = "h"
 )
 
-// Prints help for the App or Command
-type helpPrinter func(w io.Writer, templ string, data interface{})
+// HelpPrinterFunc prints help for the Command.
+type HelpPrinterFunc func(w io.Writer, templ string, data any)
 
-// Prints help for the App or Command with custom template function.
-type helpPrinterCustom func(w io.Writer, templ string, data interface{}, customFunc map[string]interface{})
+// Prints help for the Command with custom template function.
+type HelpPrinterCustomFunc func(w io.Writer, templ string, data any, customFunc map[string]any)
 
 // HelpPrinter is a function that writes the help output. If not set explicitly,
 // this calls HelpPrinterCustom using only the default template functions.
 //
 // If custom logic for printing help is required, this function can be
-// overridden. If the ExtraInfo field is defined on an App, this function
+// overridden. If the ExtraInfo field is defined on a Command, this function
 // should not be modified, as HelpPrinterCustom will be used directly in order
 // to capture the extra information.
-var HelpPrinter helpPrinter = printHelp
+var HelpPrinter HelpPrinterFunc = DefaultPrintHelp
 
 // HelpPrinterCustom is a function that writes the help output. It is used as
 // the default implementation of HelpPrinter, and may be called directly if
-// the ExtraInfo field is set on an App.
+// the ExtraInfo field is set on a Command.
 //
 // In the default implementation, if the customFuncs argument contains a
 // "wrapAt" key, which is a function which takes no arguments and returns
 // an int, this int value will be used to produce a "wrap" function used
 // by the default template to wrap long lines.
-var HelpPrinterCustom helpPrinterCustom = printHelpCustom
+var HelpPrinterCustom HelpPrinterCustomFunc = DefaultPrintHelpCustom
 
-// VersionPrinter prints the version for the App
-var VersionPrinter = printVersion
+// VersionPrinter prints the version for the root Command.
+var VersionPrinter = DefaultPrintVersion
 
-// ShowAppHelp is an action that displays the help
-var ShowAppHelp = showAppHelp
+// ShowRootCommandHelp is an action that displays help for the root command.
+var ShowRootCommandHelp = DefaultShowRootCommandHelp
+
+// ShowAppHelp is a backward-compatible name for ShowRootCommandHelp.
+var ShowAppHelp = ShowRootCommandHelp
 
 // ShowCommandHelp prints help for the given command
-var ShowCommandHelp = showCommandHelp
+var ShowCommandHelp = DefaultShowCommandHelp
 
 // ShowSubcommandHelp prints help for the given subcommand
-var ShowSubcommandHelp = showSubcommandHelp
+var ShowSubcommandHelp = DefaultShowSubcommandHelp
 
 func buildHelpCommand(withAction bool) *Command {
 	cmd := &Command{
@@ -109,8 +112,8 @@ func helpCommandAction(ctx context.Context, cmd *Command) error {
 	// Special case when running help on main app itself as opposed to individual
 	// commands/subcommands
 	if cmd.parent == nil {
-		tracef("returning ShowAppHelp")
-		_ = ShowAppHelp(cmd)
+		tracef("returning ShowRootCommandHelp")
+		_ = ShowRootCommandHelp(cmd)
 		return nil
 	}
 
@@ -133,14 +136,17 @@ func helpCommandAction(ctx context.Context, cmd *Command) error {
 	return ShowSubcommandHelp(cmd)
 }
 
-// ShowAppHelpAndExit - Prints the list of subcommands for the app and exits with exit code.
-func ShowAppHelpAndExit(cmd *Command, exitCode int) {
-	_ = ShowAppHelp(cmd)
-	os.Exit(exitCode)
+// ShowRootCommandHelpAndExit prints the list of subcommands and exits with exit code.
+func ShowRootCommandHelpAndExit(cmd *Command, exitCode int) {
+	_ = ShowRootCommandHelp(cmd)
+	OsExiter(exitCode)
 }
 
-// ShowAppHelp is an action that displays the help.
-func showAppHelp(cmd *Command) error {
+// ShowAppHelpAndExit is a backward-compatible name for ShowRootCommandHelp.
+var ShowAppHelpAndExit = ShowRootCommandHelpAndExit
+
+// DefaultShowRootCommandHelp is the default implementation of ShowRootCommandHelp.
+func DefaultShowRootCommandHelp(cmd *Command) error {
 	tmpl := cmd.CustomRootCommandHelpTemplate
 	if tmpl == "" {
 		tracef("using RootCommandHelpTemplate")
@@ -163,11 +169,14 @@ func showAppHelp(cmd *Command) error {
 	return nil
 }
 
-// DefaultAppComplete prints the list of subcommands as the default app completion method
-func DefaultAppComplete(ctx context.Context, cmd *Command) {
+// DefaultRootCommandComplete prints the list of subcommands as the default completion method.
+func DefaultRootCommandComplete(ctx context.Context, cmd *Command) {
 	DefaultCompleteWithFlags(ctx, cmd)
 }
 
+// DefaultAppComplete is a backward-compatible name for DefaultRootCommandComplete.
+var DefaultAppComplete = DefaultRootCommandComplete
+
 func printCommandSuggestions(commands []*Command, writer io.Writer) {
 	for _, command := range commands {
 		if command.Hidden {
@@ -273,13 +282,14 @@ func DefaultCompleteWithFlags(ctx context.Context, cmd *Command) {
 	}
 }
 
-// ShowCommandHelpAndExit - exits with code after showing help
+// ShowCommandHelpAndExit exits with code after showing help via ShowCommandHelp.
 func ShowCommandHelpAndExit(ctx context.Context, cmd *Command, command string, code int) {
 	_ = ShowCommandHelp(ctx, cmd, command)
-	os.Exit(code)
+	OsExiter(code)
 }
 
-func showCommandHelp(ctx context.Context, cmd *Command, commandName string) error {
+// DefaultShowCommandHelp is the default implementation of ShowCommandHelp.
+func DefaultShowCommandHelp(ctx context.Context, cmd *Command, commandName string) error {
 	for _, subCmd := range cmd.Commands {
 		if !subCmd.HasName(commandName) {
 			continue
@@ -324,24 +334,26 @@ func showCommandHelp(ctx context.Context, cmd *Command, commandName string) erro
 	return nil
 }
 
-// ShowSubcommandHelpAndExit - Prints help for the given subcommand and exits with exit code.
+// ShowSubcommandHelpAndExit prints help for the given subcommand via ShowSubcommandHelp and exits with exit code.
 func ShowSubcommandHelpAndExit(cmd *Command, exitCode int) {
 	_ = ShowSubcommandHelp(cmd)
-	os.Exit(exitCode)
+	OsExiter(exitCode)
 }
 
-func showSubcommandHelp(cmd *Command) error {
+// DefaultShowSubcommandHelp is the default implementation of ShowSubcommandHelp.
+func DefaultShowSubcommandHelp(cmd *Command) error {
 	HelpPrinter(cmd.Root().Writer, SubcommandHelpTemplate, cmd)
 	return nil
 }
 
-// ShowVersion prints the version number of the App
+// ShowVersion prints the version number of the root Command.
 func ShowVersion(cmd *Command) {
 	tracef("showing version via VersionPrinter (cmd=%[1]q)", cmd.Name)
 	VersionPrinter(cmd)
 }
 
-func printVersion(cmd *Command) {
+// DefaultPrintVersion is the default implementation of VersionPrinter.
+func DefaultPrintVersion(cmd *Command) {
 	_, _ = fmt.Fprintf(cmd.Root().Writer, "%v version %v\n", cmd.Name, cmd.Version)
 }
 
@@ -357,11 +369,11 @@ func handleTemplateError(err error) {
 	}
 }
 
-// printHelpCustom is the default implementation of HelpPrinterCustom.
+// DefaultPrintHelpCustom is the default implementation of HelpPrinterCustom.
 //
 // The customFuncs map will be combined with a default template.FuncMap to
 // allow using arbitrary functions in template rendering.
-func printHelpCustom(out io.Writer, templ string, data interface{}, customFuncs map[string]interface{}) {
+func DefaultPrintHelpCustom(out io.Writer, templ string, data any, customFuncs map[string]any) {
 	const maxLineLength = 10000
 
 	tracef("building default funcMap")
@@ -450,7 +462,8 @@ func printHelpCustom(out io.Writer, templ string, data interface{}, customFuncs
 	_ = w.Flush()
 }
 
-func printHelp(out io.Writer, templ string, data interface{}) {
+// DefaultPrintHelp is the default implementation of HelpPrinter.
+func DefaultPrintHelp(out io.Writer, templ string, data any) {
 	HelpPrinterCustom(out, templ, data, nil)
 }
 
diff --git a/help_test.go b/help_test.go
index 1decf8899a..b1696aeade 100644
--- a/help_test.go
+++ b/help_test.go
@@ -15,56 +15,99 @@ import (
 	"github.com/stretchr/testify/require"
 )
 
-func Test_ShowAppHelp_NoAuthor(t *testing.T) {
+func Test_ShowRootCommandHelp_NoAuthor(t *testing.T) {
 	output := new(bytes.Buffer)
 	cmd := &Command{Writer: output}
-	_ = ShowAppHelp(cmd)
+	_ = ShowRootCommandHelp(cmd)
 
 	if bytes.Contains(output.Bytes(), []byte("AUTHOR(S):")) {
 		t.Errorf("expected\n%snot to include %s", output.String(), "AUTHOR(S):")
 	}
 }
 
-func Test_ShowAppHelp_NoVersion(t *testing.T) {
+func Test_ShowRootCommandHelp_NoVersion(t *testing.T) {
 	output := new(bytes.Buffer)
 	cmd := &Command{Writer: output}
 
 	cmd.Version = ""
 
-	_ = ShowAppHelp(cmd)
+	_ = ShowRootCommandHelp(cmd)
 
 	if bytes.Contains(output.Bytes(), []byte("VERSION:")) {
 		t.Errorf("expected\n%snot to include %s", output.String(), "VERSION:")
 	}
 }
 
-func Test_ShowAppHelp_HideVersion(t *testing.T) {
+func Test_ShowRootCommandHelp_HideVersion(t *testing.T) {
 	output := new(bytes.Buffer)
 	cmd := &Command{Writer: output}
 
 	cmd.HideVersion = true
 
-	_ = ShowAppHelp(cmd)
+	_ = ShowRootCommandHelp(cmd)
 
 	if bytes.Contains(output.Bytes(), []byte("VERSION:")) {
 		t.Errorf("expected\n%snot to include %s", output.String(), "VERSION:")
 	}
 }
 
-func Test_ShowAppHelp_MultiLineDescription(t *testing.T) {
+func Test_ShowRootCommandHelp_MultiLineDescription(t *testing.T) {
 	output := new(bytes.Buffer)
 	cmd := &Command{Writer: output}
 
 	cmd.HideVersion = true
 	cmd.Description = "multi\n  line"
 
-	_ = ShowAppHelp(cmd)
+	_ = ShowRootCommandHelp(cmd)
 
 	if !bytes.Contains(output.Bytes(), []byte("DESCRIPTION:\n   multi\n     line")) {
 		t.Errorf("expected\n%s\nto include\n%s", output.String(), "DESCRIPTION:\n   multi\n     line")
 	}
 }
 
+func TestShowCommandHelpAndExit(t *testing.T) {
+	output := new(bytes.Buffer)
+	cmd := &Command{
+		Commands: []*Command{
+			{
+				Name:   "ok",
+				Writer: output,
+			},
+		},
+		Writer: output,
+	}
+
+	ShowCommandHelpAndExit(context.Background(), cmd, "ok", 42)
+
+	require.Equal(t, 42, lastExitCode)
+}
+
+func TestShowRootCommandHelpAndExit(t *testing.T) {
+	output := new(bytes.Buffer)
+	cmd := &Command{Writer: output}
+
+	ShowRootCommandHelpAndExit(cmd, 42)
+
+	require.Equal(t, 42, lastExitCode)
+}
+
+func TestShowSubcommandHelpAndExit(t *testing.T) {
+	output := new(bytes.Buffer)
+	ok := &Command{
+		Name:   "ok",
+		Writer: output,
+	}
+	cmd := &Command{
+		Commands: []*Command{ok},
+		Writer:   output,
+	}
+	_ = cmd
+
+	ShowSubcommandHelpAndExit(ok, 42)
+
+	require.Equal(t, 42, lastExitCode)
+}
+
 func Test_Help_RequiredFlagsNoDefault(t *testing.T) {
 	output := new(bytes.Buffer)
 
@@ -302,7 +345,7 @@ func Test_helpSubcommand_Action_ErrorIfNoTopic(t *testing.T) {
 	require.Equal(t, 3, exitErr.exitCode, "unexpected exit value")
 }
 
-func TestShowAppHelp_CommandAliases(t *testing.T) {
+func TestShowRootCommandHelp_CommandAliases(t *testing.T) {
 	out := &bytes.Buffer{}
 
 	cmd := &Command{
@@ -402,7 +445,7 @@ func TestShowCommandHelp_HelpPrinter(t *testing.T) {
 	tests := []struct {
 		name         string
 		template     string
-		printer      helpPrinter
+		printer      HelpPrinterFunc
 		command      string
 		wantTemplate string
 		wantOutput   string
@@ -443,7 +486,7 @@ func TestShowCommandHelp_HelpPrinter(t *testing.T) {
 
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
-			defer func(old helpPrinter) {
+			defer func(old HelpPrinterFunc) {
 				HelpPrinter = old
 			}(HelpPrinter)
 			HelpPrinter = func(w io.Writer, templ string, data interface{}) {
@@ -480,7 +523,7 @@ func TestShowCommandHelp_HelpPrinterCustom(t *testing.T) {
 	testCases := []struct {
 		name         string
 		template     string
-		printer      helpPrinterCustom
+		printer      HelpPrinterCustomFunc
 		arguments    []string
 		wantTemplate string
 		wantOutput   string
@@ -509,7 +552,7 @@ func TestShowCommandHelp_HelpPrinterCustom(t *testing.T) {
 			printer: func(w io.Writer, templ string, data any, _ map[string]any) {
 				// Pass a custom function to ensure it gets used
 				fm := map[string]any{"doublecho": doublecho}
-				printHelpCustom(w, templ, data, fm)
+				DefaultPrintHelpCustom(w, templ, data, fm)
 			},
 			arguments:    []string{"my-app", "help", "my-command"},
 			wantTemplate: "{{doublecho .Name}}",
@@ -521,7 +564,7 @@ func TestShowCommandHelp_HelpPrinterCustom(t *testing.T) {
 		t.Run(tc.name, func(t *testing.T) {
 			r := require.New(t)
 
-			defer func(old helpPrinterCustom) {
+			defer func(old HelpPrinterCustomFunc) {
 				HelpPrinterCustom = old
 			}(HelpPrinterCustom)
 
@@ -784,7 +827,7 @@ UsageText`,
 		"expected output to include usage text")
 }
 
-func TestShowAppHelp_HiddenCommand(t *testing.T) {
+func TestShowRootCommandHelp_HiddenCommand(t *testing.T) {
 	cmd := &Command{
 		Commands: []*Command{
 			{
@@ -815,7 +858,7 @@ func TestShowAppHelp_HiddenCommand(t *testing.T) {
 		"expected output to include \"frobbly\"")
 }
 
-func TestShowAppHelp_HelpPrinter(t *testing.T) {
+func TestShowRootCommandHelp_HelpPrinter(t *testing.T) {
 	doublecho := func(text string) string {
 		return text + " " + text
 	}
@@ -823,7 +866,7 @@ func TestShowAppHelp_HelpPrinter(t *testing.T) {
 	tests := []struct {
 		name         string
 		template     string
-		printer      helpPrinter
+		printer      HelpPrinterFunc
 		wantTemplate string
 		wantOutput   string
 	}{
@@ -841,8 +884,8 @@ func TestShowAppHelp_HelpPrinter(t *testing.T) {
 			template: "{{doublecho .Name}}",
 			printer: func(w io.Writer, templ string, data interface{}) {
 				// Pass a custom function to ensure it gets used
-				fm := map[string]interface{}{"doublecho": doublecho}
-				printHelpCustom(w, templ, data, fm)
+				fm := map[string]any{"doublecho": doublecho}
+				DefaultPrintHelpCustom(w, templ, data, fm)
 			},
 			wantTemplate: "{{doublecho .Name}}",
 			wantOutput:   "my-app my-app",
@@ -851,7 +894,7 @@ func TestShowAppHelp_HelpPrinter(t *testing.T) {
 
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
-			defer func(old helpPrinter) {
+			defer func(old HelpPrinterFunc) {
 				HelpPrinter = old
 			}(HelpPrinter)
 			HelpPrinter = func(w io.Writer, templ string, data interface{}) {
@@ -874,7 +917,7 @@ func TestShowAppHelp_HelpPrinter(t *testing.T) {
 	}
 }
 
-func TestShowAppHelp_HelpPrinterCustom(t *testing.T) {
+func TestShowRootCommandHelp_HelpPrinterCustom(t *testing.T) {
 	doublecho := func(text string) string {
 		return text + " " + text
 	}
@@ -882,7 +925,7 @@ func TestShowAppHelp_HelpPrinterCustom(t *testing.T) {
 	tests := []struct {
 		name         string
 		template     string
-		printer      helpPrinterCustom
+		printer      HelpPrinterCustomFunc
 		wantTemplate string
 		wantOutput   string
 	}{
@@ -900,8 +943,8 @@ func TestShowAppHelp_HelpPrinterCustom(t *testing.T) {
 			template: "{{doublecho .Name}}",
 			printer: func(w io.Writer, templ string, data interface{}, _ map[string]interface{}) {
 				// Pass a custom function to ensure it gets used
-				fm := map[string]interface{}{"doublecho": doublecho}
-				printHelpCustom(w, templ, data, fm)
+				fm := map[string]any{"doublecho": doublecho}
+				DefaultPrintHelpCustom(w, templ, data, fm)
 			},
 			wantTemplate: "{{doublecho .Name}}",
 			wantOutput:   "my-app my-app",
@@ -910,7 +953,7 @@ func TestShowAppHelp_HelpPrinterCustom(t *testing.T) {
 
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
-			defer func(old helpPrinterCustom) {
+			defer func(old HelpPrinterCustomFunc) {
 				HelpPrinterCustom = old
 			}(HelpPrinterCustom)
 			HelpPrinterCustom = func(w io.Writer, templ string, data interface{}, fm map[string]interface{}) {
@@ -933,7 +976,7 @@ func TestShowAppHelp_HelpPrinterCustom(t *testing.T) {
 	}
 }
 
-func TestShowAppHelp_CustomAppTemplate(t *testing.T) {
+func TestShowRootCommandHelp_CustomAppTemplate(t *testing.T) {
 	cmd := &Command{
 		Commands: []*Command{
 			{
@@ -1004,7 +1047,7 @@ VERSION:
 	}
 }
 
-func TestShowAppHelp_UsageText(t *testing.T) {
+func TestShowRootCommandHelp_UsageText(t *testing.T) {
 	cmd := &Command{
 		UsageText: "This is a single line of UsageText",
 		Commands: []*Command{
@@ -1022,7 +1065,7 @@ func TestShowAppHelp_UsageText(t *testing.T) {
 	assert.Contains(t, output.String(), "This is a single line of UsageText", "expected output to include usage text")
 }
 
-func TestShowAppHelp_MultiLine_UsageText(t *testing.T) {
+func TestShowRootCommandHelp_MultiLine_UsageText(t *testing.T) {
 	cmd := &Command{
 		UsageText: `This is a
 multi
@@ -1050,7 +1093,7 @@ App UsageText`,
 	assert.Contains(t, output.String(), expected, "expected output to include usage text")
 }
 
-func TestShowAppHelp_CommandMultiLine_UsageText(t *testing.T) {
+func TestShowRootCommandHelp_CommandMultiLine_UsageText(t *testing.T) {
 	cmd := &Command{
 		UsageText: `This is a
 multi
@@ -1356,7 +1399,7 @@ func TestMutuallyExclusiveFlags(t *testing.T) {
 		},
 	}
 
-	_ = ShowAppHelp(cmd)
+	_ = ShowRootCommandHelp(cmd)
 
 	assert.Contains(t, writer.String(), "--s1", "written help does not include mutex flag")
 }
@@ -1368,7 +1411,7 @@ func TestWrap(t *testing.T) {
 
 func TestWrappedHelp(t *testing.T) {
 	// Reset HelpPrinter after this test.
-	defer func(old helpPrinter) {
+	defer func(old HelpPrinterFunc) {
 		HelpPrinter = old
 	}(HelpPrinter)
 
@@ -1407,7 +1450,7 @@ And then another long line. Blah blah blah does anybody ever read these things?`
 		HelpPrinterCustom(w, templ, data, funcMap)
 	}
 
-	_ = ShowAppHelp(cmd)
+	_ = ShowRootCommandHelp(cmd)
 
 	expected := `NAME:
     - here's a sample
@@ -1457,7 +1500,7 @@ COPYRIGHT:
 
 func TestWrappedCommandHelp(t *testing.T) {
 	// Reset HelpPrinter after this test.
-	defer func(old helpPrinter) {
+	defer func(old HelpPrinterFunc) {
 		HelpPrinter = old
 	}(HelpPrinter)
 
@@ -1517,7 +1560,7 @@ OPTIONS:
 
 func TestWrappedSubcommandHelp(t *testing.T) {
 	// Reset HelpPrinter after this test.
-	defer func(old helpPrinter) {
+	defer func(old HelpPrinterFunc) {
 		HelpPrinter = old
 	}(HelpPrinter)
 
@@ -1582,7 +1625,7 @@ OPTIONS:
 
 func TestWrappedHelpSubcommand(t *testing.T) {
 	// Reset HelpPrinter after this test.
-	defer func(old helpPrinter) {
+	defer func(old HelpPrinterFunc) {
 		HelpPrinter = old
 	}(HelpPrinter)
 
@@ -1657,7 +1700,7 @@ OPTIONS:
 
 func TestCategorizedHelp(t *testing.T) {
 	// Reset HelpPrinter after this test.
-	defer func(old helpPrinter) {
+	defer func(old HelpPrinterFunc) {
 		HelpPrinter = old
 	}(HelpPrinter)
 
@@ -1959,7 +2002,7 @@ func TestPrintHelpCustomTemplateError(t *testing.T) {
 		buf := &bytes.Buffer{}
 
 		*tmpl = "{{junk"
-		printHelpCustom(buf, "", "", nil)
+		DefaultPrintHelpCustom(buf, "", "", nil)
 
 		assert.Contains(t, errBuf.String(), "CLI TEMPLATE ERROR")
 
diff --git a/testdata/godoc-v3.x.txt b/testdata/godoc-v3.x.txt
index aa3ca2d73c..bf43768cf4 100644
--- a/testdata/godoc-v3.x.txt
+++ b/testdata/godoc-v3.x.txt
@@ -79,6 +79,10 @@ GLOBAL OPTIONS:{{template "visiblePersistentFlagTemplate" .}}{{end}}
     uses text/template to render templates. You can render custom help text by
     setting this variable.
 
+var DefaultAppComplete = DefaultRootCommandComplete
+    DefaultAppComplete is a backward-compatible name for
+    DefaultRootCommandComplete.
+
 var DefaultInverseBoolPrefix = "no-"
 var ErrWriter io.Writer = os.Stderr
     ErrWriter is used to write errors to the user. This can be anything
@@ -131,13 +135,19 @@ COPYRIGHT:
     cli.go uses text/template to render templates. You can render custom help
     text by setting this variable.
 
-var ShowAppHelp = showAppHelp
-    ShowAppHelp is an action that displays the help
+var ShowAppHelp = ShowRootCommandHelp
+    ShowAppHelp is a backward-compatible name for ShowRootCommandHelp.
+
+var ShowAppHelpAndExit = ShowRootCommandHelpAndExit
+    ShowAppHelpAndExit is a backward-compatible name for ShowRootCommandHelp.
 
-var ShowCommandHelp = showCommandHelp
+var ShowCommandHelp = DefaultShowCommandHelp
     ShowCommandHelp prints help for the given command
 
-var ShowSubcommandHelp = showSubcommandHelp
+var ShowRootCommandHelp = DefaultShowRootCommandHelp
+    ShowRootCommandHelp is an action that displays help for the root command.
+
+var ShowSubcommandHelp = DefaultShowSubcommandHelp
     ShowSubcommandHelp prints help for the given subcommand
 
 var SubcommandHelpTemplate = `NAME:
@@ -162,37 +172,40 @@ OPTIONS:{{template "visibleFlagTemplate" .}}{{end}}
     cli.go uses text/template to render templates. You can render custom help
     text by setting this variable.
 
-var VersionPrinter = printVersion
-    VersionPrinter prints the version for the App
+var VersionPrinter = DefaultPrintVersion
+    VersionPrinter prints the version for the root Command.
 
-var HelpPrinter helpPrinter = printHelp
-    HelpPrinter is a function that writes the help output. If not set
-    explicitly, this calls HelpPrinterCustom using only the default template
-    functions.
 
-    If custom logic for printing help is required, this function can be
-    overridden. If the ExtraInfo field is defined on an App, this function
-    should not be modified, as HelpPrinterCustom will be used directly in order
-    to capture the extra information.
+FUNCTIONS
 
-var HelpPrinterCustom helpPrinterCustom = printHelpCustom
-    HelpPrinterCustom is a function that writes the help output. It is used as
-    the default implementation of HelpPrinter, and may be called directly if the
-    ExtraInfo field is set on an App.
+func DefaultCompleteWithFlags(ctx context.Context, cmd *Command)
+func DefaultPrintHelp(out io.Writer, templ string, data any)
+    DefaultPrintHelp is the default implementation of HelpPrinter.
 
-    In the default implementation, if the customFuncs argument contains a
-    "wrapAt" key, which is a function which takes no arguments and returns an
-    int, this int value will be used to produce a "wrap" function used by the
-    default template to wrap long lines.
+func DefaultPrintHelpCustom(out io.Writer, templ string, data any, customFuncs map[string]any)
+    DefaultPrintHelpCustom is the default implementation of HelpPrinterCustom.
 
+    The customFuncs map will be combined with a default template.FuncMap to
+    allow using arbitrary functions in template rendering.
 
-FUNCTIONS
+func DefaultPrintVersion(cmd *Command)
+    DefaultPrintVersion is the default implementation of VersionPrinter.
 
-func DefaultAppComplete(ctx context.Context, cmd *Command)
-    DefaultAppComplete prints the list of subcommands as the default app
-    completion method
+func DefaultRootCommandComplete(ctx context.Context, cmd *Command)
+    DefaultRootCommandComplete prints the list of subcommands as the default
+    completion method.
+
+func DefaultShowCommandHelp(ctx context.Context, cmd *Command, commandName string) error
+    DefaultShowCommandHelp is the default implementation of ShowCommandHelp.
+
+func DefaultShowRootCommandHelp(cmd *Command) error
+    DefaultShowRootCommandHelp is the default implementation of
+    ShowRootCommandHelp.
+
+func DefaultShowSubcommandHelp(cmd *Command) error
+    DefaultShowSubcommandHelp is the default implementation of
+    ShowSubcommandHelp.
 
-func DefaultCompleteWithFlags(ctx context.Context, cmd *Command)
 func FlagNames(name string, aliases []string) []string
 func HandleExitCoder(err error)
     HandleExitCoder handles errors implementing ExitCoder by printing their
@@ -202,21 +215,22 @@ func HandleExitCoder(err error)
     for the ExitCoder interface, and OsExiter will be called with the last exit
     code found, or exit code 1 if no ExitCoder is found.
 
-    This function is the default error-handling behavior for an App.
-
-func ShowAppHelpAndExit(cmd *Command, exitCode int)
-    ShowAppHelpAndExit - Prints the list of subcommands for the app and exits
-    with exit code.
+    This function is the default error-handling behavior for a Command.
 
 func ShowCommandHelpAndExit(ctx context.Context, cmd *Command, command string, code int)
-    ShowCommandHelpAndExit - exits with code after showing help
+    ShowCommandHelpAndExit exits with code after showing help via
+    ShowCommandHelp.
+
+func ShowRootCommandHelpAndExit(cmd *Command, exitCode int)
+    ShowRootCommandHelpAndExit prints the list of subcommands and exits with
+    exit code.
 
 func ShowSubcommandHelpAndExit(cmd *Command, exitCode int)
-    ShowSubcommandHelpAndExit - Prints help for the given subcommand and exits
-    with exit code.
+    ShowSubcommandHelpAndExit prints help for the given subcommand via
+    ShowSubcommandHelp and exits with exit code.
 
 func ShowVersion(cmd *Command)
-    ShowVersion prints the version number of the App
+    ShowVersion prints the version number of the root Command.
 
 
 TYPES
@@ -472,9 +486,9 @@ type Command struct {
 	Writer io.Writer `json:"-"`
 	// ErrWriter writes error output
 	ErrWriter io.Writer `json:"-"`
-	// ExitErrHandler processes any error encountered while running an App before
-	// it is returned to the caller. If no function is provided, HandleExitCoder
-	// is used as the default behavior.
+	// ExitErrHandler processes any error encountered while running a Command before it is
+	// returned to the caller. If no function is provided, HandleExitCoder is used as the
+	// default behavior.
 	ExitErrHandler ExitErrHandlerFunc `json:"-"`
 	// Other custom info
 	Metadata map[string]interface{} `json:"metadata"`
@@ -687,7 +701,7 @@ func (c *Command) TimestampArg(name string) time.Time
 func (c *Command) TimestampArgs(name string) []time.Time
 
 func (cmd *Command) ToFishCompletion() (string, error)
-    ToFishCompletion creates a fish completion string for the `*App` The
+    ToFishCompletion creates a fish completion string for the `*Command` The
     function errors if either parsing or writing of the string fails.
 
 func (cmd *Command) Uint(name string) uint
@@ -847,16 +861,15 @@ type ExitCoder interface {
 	error
 	ExitCode() int
 }
-    ExitCoder is the interface checked by `App` and `Command` for a custom exit
-    code
+    ExitCoder is the interface checked by `Command` for a custom exit code.
 
-func Exit(message interface{}, exitCode int) ExitCoder
+func Exit(message any, exitCode int) ExitCoder
     Exit wraps a message and exit code into an error, which by default is
     handled with a call to os.Exit during default error handling.
 
-    This is the simplest way to trigger a non-zero exit code for an App
-    without having to call os.Exit manually. During testing, this behavior
-    can be avoided by overriding the ExitErrHandler function on an App or the
+    This is the simplest way to trigger a non-zero exit code for a Command
+    without having to call os.Exit manually. During testing, this behavior can
+    be avoided by overriding the ExitErrHandler function on a Command or the
     package-global OsExiter function.
 
 type ExitErrHandlerFunc func(context.Context, *Command, error)
@@ -1093,6 +1106,32 @@ type FloatSliceFlag = FlagBase[[]float64, NoConfig, FloatSlice]
 
 type GenericFlag = FlagBase[Value, NoConfig, genericValue]
 
+type HelpPrinterCustomFunc func(w io.Writer, templ string, data any, customFunc map[string]any)
+    Prints help for the Command with custom template function.
+
+var HelpPrinterCustom HelpPrinterCustomFunc = DefaultPrintHelpCustom
+    HelpPrinterCustom is a function that writes the help output. It is used as
+    the default implementation of HelpPrinter, and may be called directly if the
+    ExtraInfo field is set on a Command.
+
+    In the default implementation, if the customFuncs argument contains a
+    "wrapAt" key, which is a function which takes no arguments and returns an
+    int, this int value will be used to produce a "wrap" function used by the
+    default template to wrap long lines.
+
+type HelpPrinterFunc func(w io.Writer, templ string, data any)
+    HelpPrinterFunc prints help for the Command.
+
+var HelpPrinter HelpPrinterFunc = DefaultPrintHelp
+    HelpPrinter is a function that writes the help output. If not set
+    explicitly, this calls HelpPrinterCustom using only the default template
+    functions.
+
+    If custom logic for printing help is required, this function can be
+    overridden. If the ExtraInfo field is defined on a Command, this function
+    should not be modified, as HelpPrinterCustom will be used directly in order
+    to capture the extra information.
+
 type Int16Arg = ArgumentBase[int16, IntegerConfig, intValue[int16]]
 
 type Int16Args = ArgumentsBase[int16, IntegerConfig, intValue[int16]]