diff --git a/FAQ.md b/FAQ.md
index 6ec6f61f15d0f955c45be861a7c03c08ccda2684..3b6bcfa7339e6903958ce30c62e14a78040840dd 100644
--- a/FAQ.md
+++ b/FAQ.md
@@ -113,7 +113,7 @@ 3. Happy templating! `tmpl download user/repo repo`
 
 ## Backup and Restore
 
-1. The simplest solution is to make a copy of your `registry.toml` (default: `~/.tmpl/registry.toml`).
+1. The simplest solution is to make a copy of your `registry.yaml` (default: `~/.tmpl/registry.yaml`).
    * Once in the new location, you will need to use `tmpl restore`.
    
 2. Alternatively, you can copy/paste the entire registry (default: `~/.tmpl`) and skip the restore step.

diff --git a/cmd/download.go b/cmd/download.go
index f5ce256caeb12f83e53c629657d0e801ea1c5d9d..93387334ed50ba403b0ba3ca134f9268476323f8 100644
--- a/cmd/download.go
+++ b/cmd/download.go
@@ -2,6 +2,8 @@ package cmd
 
 import (
 	"fmt"
+	"os"
+	"path"
 	"strings"
 
 	"go.jolheiser.com/tmpl/env"
@@ -15,7 +17,7 @@ var Download = &cli.Command{
 	Name:        "download",
 	Usage:       "Download a template",
 	Description: "Download a template and save it to the local registry",
-	ArgsUsage:   "[repository URL] [name]",
+	ArgsUsage:   "[repository URL] <name>",
 	Flags: []cli.Flag{
 		&cli.StringFlag{
 			Name:    "branch",
@@ -29,7 +31,7 @@ 	Action: runDownload,
 }
 
 func runDownload(ctx *cli.Context) error {
-	if ctx.NArg() < 2 {
+	if ctx.NArg() < 1 {
 		return cli.ShowCommandHelp(ctx, ctx.Command.Name)
 	}
 
@@ -67,7 +69,7 @@ 	if !strings.HasSuffix(cloneURL, ".git") {
 		cloneURL += ".git"
 	}
 
-	t, err := reg.DownloadTemplate(ctx.Args().Get(1), cloneURL, ctx.String("branch"))
+	t, err := reg.DownloadTemplate(deriveName(ctx), cloneURL, ctx.String("branch"))
 	if err != nil {
 		return err
 	}
@@ -75,3 +77,19 @@
 	log.Info().Msgf("Added new template %q", t.Name)
 	return nil
 }
+
+func deriveName(ctx *cli.Context) string {
+	if ctx.NArg() > 1 {
+		return ctx.Args().Get(1)
+	}
+
+	envBranch, envSet := os.LookupEnv("TMPL_BRANCH")
+	flagBranch, flagSet := ctx.String("branch"), ctx.IsSet("branch")
+	if flagSet {
+		if !envSet || envBranch != flagBranch {
+			return flagBranch
+		}
+	}
+
+	return path.Base(ctx.Args().First())
+}