diff --git a/pkg/cmd/delete.go b/pkg/cmd/delete.go
index 777db923c6f196d5814b7f90074b62b78a07a1ee..a98fa5b316cd69fbb73bf1f116f1a828779f6d82 100644
--- a/pkg/cmd/delete.go
+++ b/pkg/cmd/delete.go
@@ -15,7 +15,7 @@ import (
 
 // Delete contains the cli-command for deleting templates.
 var Delete = &cli.Command{
-	Use:   "delete <template-name>",
+	Use:   "delete <template-tag>",
 	Short: "Delete a project template from the template registry",
 	Run: func(c *cli.Command, args []string) {
 		MustValidateVarArgs(args, validate.Argument{"template-path", validate.Alphanumeric})
diff --git a/pkg/cmd/download.go b/pkg/cmd/download.go
index 996015c55ff8b499591ecf9325ac9277f1454e9a..d546db71067f8ba663ad622b4fdce3faa2ec0390 100644
--- a/pkg/cmd/download.go
+++ b/pkg/cmd/download.go
@@ -94,13 +94,13 @@ func downloadZip(URL, targetDir string) error {
 
 // Download contains the cli-command for downloading templates from github.
 var Download = &cli.Command{
-	Use:   "download <template-repo> <template-name>",
+	Use:   "download <template-repo> <template-tag>",
 	Short: "Download a project template from a github repository to template registry",
 	// FIXME Half-Updates leave messy templates
 	Run: func(c *cli.Command, args []string) {
 		MustValidateArgs(args, []validate.Argument{
 			{"template-repo", validate.UnixPath},
-			{"template-name", validate.Alphanumeric},
+			{"template-tag", validate.Alphanumeric},
 		})
 
 		templateURL, templateName := args[0], args[1]
diff --git a/pkg/cmd/list.go b/pkg/cmd/list.go
index 97369d8bdf7ce8a87bd98474c19dc09762b95eaf..3ba167050c7ab307f41599162abe2e16e97761f0 100644
--- a/pkg/cmd/list.go
+++ b/pkg/cmd/list.go
@@ -37,7 +37,7 @@ func ListTemplates() (map[string]bool, error) {
 
 // List contains the cli-command for printing a list of saved templates.
 var List = &cli.Command{
-	Use:   "list <template-path> <template-name>",
+	Use:   "list <template-path> <template-tag>",
 	Short: "List project templates found in the local template registry",
 	Run: func(c *cli.Command, args []string) {
 		MustValidateArgs(args, []validate.Argument{})
diff --git a/pkg/cmd/rename.go b/pkg/cmd/rename.go
index 18feabcab8ead89135178afb663388d98441dc55..bf68889d8edf1b45265fbb57c04d10e9e8317f6d 100644
--- a/pkg/cmd/rename.go
+++ b/pkg/cmd/rename.go
@@ -22,12 +22,12 @@ func renameTemplate(oldPath, newPath string) error {
 // Rename contains the cli-command for renaming templates in the template registry.
 var Rename = &cli.Command{
 	Hidden: true,
-	Use:    "rename <old-template-name> <new-template-name>",
+	Use:    "rename <old-template-tag> <new-template-tag>",
 	Short:  "Rename a project template",
 	Run: func(c *cli.Command, args []string) {
 		MustValidateArgs(args, []validate.Argument{
-			{"old-template-name", validate.UnixPath},
-			{"new-template-name", validate.UnixPath},
+			{"old-template-tag", validate.UnixPath},
+			{"new-template-tag", validate.UnixPath},
 		})
 
 		tmplName, newTmplName := args[0], args[1]
diff --git a/pkg/cmd/report.go b/pkg/cmd/report.go
index 0a8f961a921372eb67798dcbed959162d9915591..3f551ed117a107cc61fc4f6ac1ece7569667e00a 100644
--- a/pkg/cmd/report.go
+++ b/pkg/cmd/report.go
@@ -141,7 +141,7 @@ func createIssue() (string, error) {
 // Report contains the cli-command for creating github issues.
 var Report = &cli.Command{
 	Use:   "report",
-	Short: "Creates an issue in the github repository",
+	Short: "Create an issue in the github repository",
 	Run: func(c *cli.Command, args []string) {
 		MustValidateArgs(args, []validate.Argument{})
 
diff --git a/pkg/cmd/save.go b/pkg/cmd/save.go
index 3a374092e1f73e461f3a5ce0fbc18ea4c2c044f2..4ed49920349e9d9b4dc3b6f39139b3e9c6543831 100644
--- a/pkg/cmd/save.go
+++ b/pkg/cmd/save.go
@@ -16,13 +16,13 @@ import (
 
 // Save contains the cli-command for saving templates to template registry.
 var Save = &cli.Command{
-	// TODO rename template-name to template-tag
-	Use:   "save <template-path> <template-name>",
+	// TODO rename template-tag to template-tag
+	Use:   "save <template-path> <template-tag>",
 	Short: "Save a project template to local template registry",
 	Run: func(c *cli.Command, args []string) {
 		MustValidateArgs(args, []validate.Argument{
 			{"template-path", validate.UnixPath},
-			{"template-name", validate.Alphanumeric},
+			{"template-tag", validate.Alphanumeric},
 		})
 
 		tmplDir, templateName := args[0], args[1]
diff --git a/pkg/cmd/use.go b/pkg/cmd/use.go
index c318c10a479084d53462d7621c5cf3468782f01c..51a3284eb7322e495b3a1b1be2723b8ed3375deb 100644
--- a/pkg/cmd/use.go
+++ b/pkg/cmd/use.go
@@ -26,11 +26,11 @@ func TemplateInRegistry(name string) (bool, error) {
 // TODO add --use-cache flag to execute a template from previous answers to prompts
 // Use contains the cli-command for using templates located in the local template registry.
 var Use = &cli.Command{
-	Use:   "use <template-name> <target-dir>",
+	Use:   "use <template-tag> <target-dir>",
 	Short: "Execute a project template in the given directory",
 	Run: func(c *cli.Command, args []string) {
 		MustValidateArgs(args, []validate.Argument{
-			{"template-name", validate.UnixPath},
+			{"template-tag", validate.UnixPath},
 			{"target-dir", validate.UnixPath},
 		})
 
diff --git a/pkg/cmd/validate.go b/pkg/cmd/validate.go
index 52884924927b157ba92e34ff89a713602fb2ffbe..f92ed6489f95570eda151283a615e71cf3c6fbbe 100644
--- a/pkg/cmd/validate.go
+++ b/pkg/cmd/validate.go
@@ -16,7 +16,7 @@ var (
 // Validate contains the cli-command for validating templates.
 var Validate = &cli.Command{
 	Use:   "validate",
-	Short: "Validates a template",
+	Short: "Validate a template",
 	Run: func(_ *cli.Command, args []string) {
 		MustValidateArgs(args, []validate.Argument{
 			{"template-path", validate.UnixPath},