diff --git a/cmd/ctr/commands/containers/containers.go b/cmd/ctr/commands/containers/containers.go
index 5bd9fb456..d0195d4d3 100644
--- a/cmd/ctr/commands/containers/containers.go
+++ b/cmd/ctr/commands/containers/containers.go
@@ -18,7 +18,7 @@ import (
 var Command = cli.Command{
 	Name:    "containers",
 	Usage:   "manage containers",
-	Aliases: []string{"c"},
+	Aliases: []string{"c", "container"},
 	Subcommands: []cli.Command{
 		deleteCommand,
 		infoCommand,
diff --git a/cmd/ctr/commands/events/events.go b/cmd/ctr/commands/events/events.go
index 7f74710f3..c347c0f48 100644
--- a/cmd/ctr/commands/events/events.go
+++ b/cmd/ctr/commands/events/events.go
@@ -15,8 +15,9 @@ import (
 
 // Command is the cli command for displaying containerd events
 var Command = cli.Command{
-	Name:  "events",
-	Usage: "display containerd events",
+	Name:    "events",
+	Aliases: []string{"event"},
+	Usage:   "display containerd events",
 	Action: func(context *cli.Context) error {
 		client, ctx, cancel, err := commands.NewClient(context)
 		if err != nil {
diff --git a/cmd/ctr/commands/images/images.go b/cmd/ctr/commands/images/images.go
index 958c25ef5..7a8a2e99a 100644
--- a/cmd/ctr/commands/images/images.go
+++ b/cmd/ctr/commands/images/images.go
@@ -19,8 +19,9 @@ import (
 
 // Command is the cli command for managing images
 var Command = cli.Command{
-	Name:  "images",
-	Usage: "manage images",
+	Name:    "images",
+	Aliases: []string{"image"},
+	Usage:   "manage images",
 	Subcommands: cli.Commands{
 		checkCommand,
 		exportCommand,
diff --git a/cmd/ctr/commands/namespaces/namespaces.go b/cmd/ctr/commands/namespaces/namespaces.go
index bedaf8522..32407dadd 100644
--- a/cmd/ctr/commands/namespaces/namespaces.go
+++ b/cmd/ctr/commands/namespaces/namespaces.go
@@ -16,8 +16,9 @@ import (
 
 // Command is the cli command for managing namespaces
 var Command = cli.Command{
-	Name:  "namespaces",
-	Usage: "manage namespaces",
+	Name:    "namespaces",
+	Aliases: []string{"namespace"},
+	Usage:   "manage namespaces",
 	Subcommands: cli.Commands{
 		createCommand,
 		listCommand,
diff --git a/cmd/ctr/commands/plugins/plugins.go b/cmd/ctr/commands/plugins/plugins.go
index 0c8d2228d..1fbee48b7 100644
--- a/cmd/ctr/commands/plugins/plugins.go
+++ b/cmd/ctr/commands/plugins/plugins.go
@@ -18,8 +18,9 @@ import (
 
 // Command is a cli command that outputs plugin information
 var Command = cli.Command{
-	Name:  "plugins",
-	Usage: "provides information about containerd plugins",
+	Name:    "plugins",
+	Aliases: []string{"plugin"},
+	Usage:   "provides information about containerd plugins",
 	Flags: []cli.Flag{
 		cli.BoolFlag{
 			Name:  "quiet,q",
diff --git a/cmd/ctr/commands/snapshot/snapshot.go b/cmd/ctr/commands/snapshots/snapshots.go
similarity index 98%
rename from cmd/ctr/commands/snapshot/snapshot.go
rename to cmd/ctr/commands/snapshots/snapshots.go
index 1a54b86f9..491d4901f 100644
--- a/cmd/ctr/commands/snapshot/snapshot.go
+++ b/cmd/ctr/commands/snapshots/snapshots.go
@@ -1,4 +1,4 @@
-package snapshot
+package snapshots
 
 import (
 	gocontext "context"
@@ -19,9 +19,10 @@ import (
 
 // Command is the cli command for managing snapshots
 var Command = cli.Command{
-	Name:  "snapshot",
-	Usage: "manage snapshots",
-	Flags: commands.SnapshotterFlags,
+	Name:    "snapshots",
+	Aliases: []string{"snapshot"},
+	Usage:   "manage snapshots",
+	Flags:   commands.SnapshotterFlags,
 	Subcommands: cli.Commands{
 		commitCommand,
 		infoCommand,
diff --git a/cmd/ctr/commands/tasks/tasks.go b/cmd/ctr/commands/tasks/tasks.go
index 356e3e4fe..6178c8249 100644
--- a/cmd/ctr/commands/tasks/tasks.go
+++ b/cmd/ctr/commands/tasks/tasks.go
@@ -14,7 +14,7 @@ type resizer interface {
 var Command = cli.Command{
 	Name:    "tasks",
 	Usage:   "manage tasks",
-	Aliases: []string{"t"},
+	Aliases: []string{"t", "task"},
 	Subcommands: []cli.Command{
 		attachCommand,
 		checkpointCommand,
diff --git a/cmd/ctr/main.go b/cmd/ctr/main.go
index e8b2b23ba..f0e63b84c 100644
--- a/cmd/ctr/main.go
+++ b/cmd/ctr/main.go
@@ -14,7 +14,7 @@ import (
 	"github.com/containerd/containerd/cmd/ctr/commands/plugins"
 	"github.com/containerd/containerd/cmd/ctr/commands/pprof"
 	"github.com/containerd/containerd/cmd/ctr/commands/run"
-	"github.com/containerd/containerd/cmd/ctr/commands/snapshot"
+	"github.com/containerd/containerd/cmd/ctr/commands/snapshots"
 	"github.com/containerd/containerd/cmd/ctr/commands/tasks"
 	versionCmd "github.com/containerd/containerd/cmd/ctr/commands/version"
 	"github.com/containerd/containerd/defaults"
@@ -84,7 +84,7 @@ containerd CLI
 		namespacesCmd.Command,
 		pprof.Command,
 		run.Command,
-		snapshot.Command,
+		snapshots.Command,
 		tasks.Command,
 	}, extraCmds...)
 	app.Before = func(context *cli.Context) error {