diff --git a/cmd/stbak/cmd/archive.go b/cmd/stbak/cmd/archive.go
index e64a925..413edd5 100644
--- a/cmd/stbak/cmd/archive.go
+++ b/cmd/stbak/cmd/archive.go
@@ -25,7 +25,7 @@ const (
 
 var archiveCmd = &cobra.Command{
 	Use:     "archive",
-	Aliases: []string{"a"},
+	Aliases: []string{"arc", "a", "c"},
 	Short:   "Archive a file or directory to tape or tar file",
 	RunE: func(cmd *cobra.Command, args []string) error {
 		if err := viper.BindPFlags(cmd.PersistentFlags()); err != nil {
diff --git a/cmd/stbak/cmd/remove.go b/cmd/stbak/cmd/delete.go
similarity index 92%
rename from cmd/stbak/cmd/remove.go
rename to cmd/stbak/cmd/delete.go
index 888a0f3..d8e22a1 100644
--- a/cmd/stbak/cmd/remove.go
+++ b/cmd/stbak/cmd/delete.go
@@ -22,10 +22,10 @@ const (
 	nameFlag = "name"
 )
 
-var removeCmd = &cobra.Command{
-	Use:     "remove",
-	Aliases: []string{"r"},
-	Short:   "Remove a file or directory from tape or tar file",
+var deleteCmd = &cobra.Command{
+	Use:     "delete",
+	Aliases: []string{"del", "d", "rm"},
+	Short:   "Delete a file or directory from tape or tar file",
 	RunE: func(cmd *cobra.Command, args []string) error {
 		if err := viper.BindPFlags(cmd.PersistentFlags()); err != nil {
 			return err
@@ -167,10 +167,10 @@ func openTapeWriter(tape string) (tw *tar.Writer, isRegular bool, cleanup func(d
 }
 
 func init() {
-	removeCmd.PersistentFlags().IntP(recordSizeFlag, "e", 20, "Amount of 512-bit blocks per record")
-	removeCmd.PersistentFlags().StringP(nameFlag, "n", "", "Name of the file to remove")
+	deleteCmd.PersistentFlags().IntP(recordSizeFlag, "e", 20, "Amount of 512-bit blocks per record")
+	deleteCmd.PersistentFlags().StringP(nameFlag, "n", "", "Name of the file to remove")
 
 	viper.AutomaticEnv()
 
-	rootCmd.AddCommand(removeCmd)
+	rootCmd.AddCommand(deleteCmd)
 }
diff --git a/cmd/stbak/cmd/drive_eject.go b/cmd/stbak/cmd/drive_eject.go
index e6d077e..584feeb 100644
--- a/cmd/stbak/cmd/drive_eject.go
+++ b/cmd/stbak/cmd/drive_eject.go
@@ -10,9 +10,8 @@ import (
 )
 
 var driveEjectCmd = &cobra.Command{
-	Use:     "eject",
-	Aliases: []string{"e"},
-	Short:   "Eject tape from drive",
+	Use:   "eject",
+	Short: "Eject tape from drive",
 	RunE: func(cmd *cobra.Command, args []string) error {
 		if err := viper.BindPFlags(cmd.PersistentFlags()); err != nil {
 			return err
diff --git a/cmd/stbak/cmd/drive_tell.go b/cmd/stbak/cmd/drive_tell.go
index 67d0e96..2af96fa 100644
--- a/cmd/stbak/cmd/drive_tell.go
+++ b/cmd/stbak/cmd/drive_tell.go
@@ -11,9 +11,8 @@ import (
 )
 
 var driveTellCmd = &cobra.Command{
-	Use:     "tell",
-	Aliases: []string{"t"},
-	Short:   "Get the current record on the tape",
+	Use:   "tell",
+	Short: "Get the current record on the tape",
 	RunE: func(cmd *cobra.Command, args []string) error {
 		if err := viper.BindPFlags(cmd.PersistentFlags()); err != nil {
 			return err
diff --git a/cmd/stbak/cmd/find.go b/cmd/stbak/cmd/find.go
index cbea2dc..e889a1b 100644
--- a/cmd/stbak/cmd/find.go
+++ b/cmd/stbak/cmd/find.go
@@ -18,7 +18,7 @@ const (
 
 var findCmd = &cobra.Command{
 	Use:     "find",
-	Aliases: []string{"f"},
+	Aliases: []string{"fin", "f"},
 	Short:   "Find a file or directory on tape or tar file by matching against a regex",
 	RunE: func(cmd *cobra.Command, args []string) error {
 		if err := viper.BindPFlags(cmd.PersistentFlags()); err != nil {
diff --git a/cmd/stbak/cmd/list.go b/cmd/stbak/cmd/list.go
index 8e02b27..f73abd4 100644
--- a/cmd/stbak/cmd/list.go
+++ b/cmd/stbak/cmd/list.go
@@ -13,7 +13,7 @@ import (
 
 var listCmd = &cobra.Command{
 	Use:     "list",
-	Aliases: []string{"l"},
+	Aliases: []string{"lis", "l", "t", "ls"},
 	Short:   "List the contents of a directory on tape or tar file ",
 	RunE: func(cmd *cobra.Command, args []string) error {
 		if err := viper.BindPFlags(cmd.PersistentFlags()); err != nil {
diff --git a/cmd/stbak/cmd/move.go b/cmd/stbak/cmd/move.go
index b9899d2..4468dbf 100644
--- a/cmd/stbak/cmd/move.go
+++ b/cmd/stbak/cmd/move.go
@@ -17,7 +17,7 @@ import (
 
 var moveCmd = &cobra.Command{
 	Use:     "move",
-	Aliases: []string{"m"},
+	Aliases: []string{"mov", "m", "mv"},
 	Short:   "Move a file or directory on tape or tar file",
 	RunE: func(cmd *cobra.Command, args []string) error {
 		if err := viper.BindPFlags(cmd.PersistentFlags()); err != nil {
diff --git a/cmd/stbak/cmd/recovery_restore.go b/cmd/stbak/cmd/recovery_fetch.go
similarity index 77%
rename from cmd/stbak/cmd/recovery_restore.go
rename to cmd/stbak/cmd/recovery_fetch.go
index 439afcd..806af6d 100644
--- a/cmd/stbak/cmd/recovery_restore.go
+++ b/cmd/stbak/cmd/recovery_fetch.go
@@ -21,10 +21,9 @@ const (
 	previewFlag = "preview"
 )
 
-var recoveryRestoreCmd = &cobra.Command{
-	Use:     "restore",
-	Aliases: []string{"r"},
-	Short:   "Restore a file or directory from tape or tar file by record and block",
+var recoveryFetchCmd = &cobra.Command{
+	Use:   "fetch",
+	Short: "Fetch a file or directory from tape or tar file by record and block",
 	RunE: func(cmd *cobra.Command, args []string) error {
 		if err := viper.BindPFlags(cmd.PersistentFlags()); err != nil {
 			return err
@@ -126,13 +125,13 @@ func restoreFromRecordAndBlock(
 }
 
 func init() {
-	recoveryRestoreCmd.PersistentFlags().IntP(recordSizeFlag, "e", 20, "Amount of 512-bit blocks per record")
-	recoveryRestoreCmd.PersistentFlags().IntP(recordFlag, "r", 0, "Record to seek too")
-	recoveryRestoreCmd.PersistentFlags().IntP(blockFlag, "b", 0, "Block in record to seek too")
-	recoveryRestoreCmd.PersistentFlags().StringP(dstFlag, "d", "", "File to restore to (archived name by default)")
-	recoveryRestoreCmd.PersistentFlags().BoolP(previewFlag, "p", false, "Only read the header")
+	recoveryFetchCmd.PersistentFlags().IntP(recordSizeFlag, "e", 20, "Amount of 512-bit blocks per record")
+	recoveryFetchCmd.PersistentFlags().IntP(recordFlag, "r", 0, "Record to seek too")
+	recoveryFetchCmd.PersistentFlags().IntP(blockFlag, "b", 0, "Block in record to seek too")
+	recoveryFetchCmd.PersistentFlags().StringP(dstFlag, "d", "", "File to restore to (archived name by default)")
+	recoveryFetchCmd.PersistentFlags().BoolP(previewFlag, "p", false, "Only read the header")
 
 	viper.AutomaticEnv()
 
-	recoveryCmd.AddCommand(recoveryRestoreCmd)
+	recoveryCmd.AddCommand(recoveryFetchCmd)
 }
diff --git a/cmd/stbak/cmd/recovery_index.go b/cmd/stbak/cmd/recovery_index.go
index 4d1bdef..6b08c0b 100644
--- a/cmd/stbak/cmd/recovery_index.go
+++ b/cmd/stbak/cmd/recovery_index.go
@@ -21,9 +21,8 @@ import (
 )
 
 var recoveryIndexCmd = &cobra.Command{
-	Use:     "index",
-	Aliases: []string{"i"},
-	Short:   "Index contents of tape or tar file",
+	Use:   "index",
+	Short: "Index contents of tape or tar file",
 	RunE: func(cmd *cobra.Command, args []string) error {
 		if err := viper.BindPFlags(cmd.PersistentFlags()); err != nil {
 			return err
diff --git a/cmd/stbak/cmd/recovery_list.go b/cmd/stbak/cmd/recovery_query.go
similarity index 90%
rename from cmd/stbak/cmd/recovery_list.go
rename to cmd/stbak/cmd/recovery_query.go
index 0667880..62a9f3a 100644
--- a/cmd/stbak/cmd/recovery_list.go
+++ b/cmd/stbak/cmd/recovery_query.go
@@ -14,10 +14,9 @@ import (
 	"github.com/volatiletech/sqlboiler/v4/boil"
 )
 
-var recoveryListCmd = &cobra.Command{
-	Use:     "list",
-	Aliases: []string{"l"},
-	Short:   "List contents of tape or tar file without the index",
+var recoveryQueryCmd = &cobra.Command{
+	Use:   "query",
+	Short: "Query contents of tape or tar file without the index",
 	RunE: func(cmd *cobra.Command, args []string) error {
 		if err := viper.BindPFlags(cmd.PersistentFlags()); err != nil {
 			return err
@@ -184,11 +183,11 @@ var recoveryListCmd = &cobra.Command{
 }
 
 func init() {
-	recoveryListCmd.PersistentFlags().IntP(recordSizeFlag, "e", 20, "Amount of 512-bit blocks per record")
-	recoveryListCmd.PersistentFlags().IntP(recordFlag, "r", 0, "Record to seek too before counting")
-	recoveryListCmd.PersistentFlags().IntP(blockFlag, "b", 0, "Block in record to seek too before counting")
+	recoveryQueryCmd.PersistentFlags().IntP(recordSizeFlag, "e", 20, "Amount of 512-bit blocks per record")
+	recoveryQueryCmd.PersistentFlags().IntP(recordFlag, "r", 0, "Record to seek too before counting")
+	recoveryQueryCmd.PersistentFlags().IntP(blockFlag, "b", 0, "Block in record to seek too before counting")
 
 	viper.AutomaticEnv()
 
-	recoveryCmd.AddCommand(recoveryListCmd)
+	recoveryCmd.AddCommand(recoveryQueryCmd)
 }
diff --git a/cmd/stbak/cmd/restore.go b/cmd/stbak/cmd/restore.go
index 94823ce..5a30638 100644
--- a/cmd/stbak/cmd/restore.go
+++ b/cmd/stbak/cmd/restore.go
@@ -23,7 +23,7 @@ const (
 
 var restoreCmd = &cobra.Command{
 	Use:     "restore",
-	Aliases: []string{"r"},
+	Aliases: []string{"res", "r", "x"},
 	Short:   "Restore a file or directory from tape or tar file",
 	RunE: func(cmd *cobra.Command, args []string) error {
 		if err := viper.BindPFlags(cmd.PersistentFlags()); err != nil {
diff --git a/cmd/stbak/cmd/update.go b/cmd/stbak/cmd/update.go
index ff312c7..5164e19 100644
--- a/cmd/stbak/cmd/update.go
+++ b/cmd/stbak/cmd/update.go
@@ -24,7 +24,7 @@ const (
 
 var updateCmd = &cobra.Command{
 	Use:     "update",
-	Aliases: []string{"u"},
+	Aliases: []string{"upd", "u"},
 	Short:   "Update a file or directory's content and metadata on tape or tar file",
 	RunE: func(cmd *cobra.Command, args []string) error {
 		if err := viper.BindPFlags(cmd.PersistentFlags()); err != nil {