diff --git a/cmd/item.go b/cmd/item.go
deleted file mode 100644
index a498759..0000000
--- a/cmd/item.go
+++ /dev/null
@@ -1,16 +0,0 @@
-package cmd
-
-import (
-	"github.com/spf13/cobra"
-)
-
-var itemCmd = &cobra.Command{
-	Use:   "item",
-	Short: "Manage items",
-	Long: `Add, edit, or deactivate items.
-`,
-}
-
-func init() {
-	rootCmd.AddCommand(itemCmd)
-}
diff --git a/cmd/itemAdd.go b/cmd/itemAdd.go
index d8fbddc..c298c80 100644
--- a/cmd/itemAdd.go
+++ b/cmd/itemAdd.go
@@ -9,8 +9,8 @@ import (
 	"github.com/spf13/cobra"
 )
 
-var itemAddCmd = &cobra.Command{
-	Use:   "add",
+var itemCmd = &cobra.Command{
+	Use:   "item",
 	Short: "Add an item",
 	Long: `Create an ad-hoc item in a source.
 
@@ -34,19 +34,19 @@ if it doesn't exist, with a random id.`,
 }
 
 func init() {
-	itemCmd.AddCommand(itemAddCmd)
+	rootCmd.AddCommand(itemCmd)
 
-	itemAddCmd.Flags().StringP("source", "s", "", "Source in which to create the item (default: default)")
-	itemAddCmd.Flags().StringP("id", "i", "", "Item id (default: random hex)")
-	itemAddCmd.Flags().StringP("title", "t", "", "Item title")
-	itemAddCmd.Flags().StringP("author", "a", "", "Item author")
-	itemAddCmd.Flags().StringP("body", "b", "", "Item body")
-	itemAddCmd.Flags().StringP("link", "l", "", "Item link")
-	itemAddCmd.Flags().IntP("time", "m", 0, "Item time as a Unix timestamp")
-	itemAddCmd.Flags().Int("ttl", 0, "Item time-to-live in seconds, relative to item creation date")
-	itemAddCmd.Flags().Int("ttd", 0, "Item time-to-die in seconds, relative to item creation date")
-	itemAddCmd.Flags().Int("tts", 0, "Item time-to-show in seconds, relative to item creation date")
-	itemAddCmd.Flags().StringP("action", "x", "", "Item action data as JSON")
+	itemCmd.Flags().StringP("source", "s", "", "Source in which to create the item (default: default)")
+	itemCmd.Flags().StringP("id", "i", "", "Item id (default: random hex)")
+	itemCmd.Flags().StringP("title", "t", "", "Item title")
+	itemCmd.Flags().StringP("author", "a", "", "Item author")
+	itemCmd.Flags().StringP("body", "b", "", "Item body")
+	itemCmd.Flags().StringP("link", "l", "", "Item link")
+	itemCmd.Flags().IntP("time", "m", 0, "Item time as a Unix timestamp")
+	itemCmd.Flags().Int("ttl", 0, "Item time-to-live in seconds, relative to item creation date")
+	itemCmd.Flags().Int("ttd", 0, "Item time-to-die in seconds, relative to item creation date")
+	itemCmd.Flags().Int("tts", 0, "Item time-to-show in seconds, relative to item creation date")
+	itemCmd.Flags().StringP("action", "x", "", "Item action data as JSON")
 }
 
 func itemAdd(
diff --git a/cmd/itemEdit.go b/cmd/itemEdit.go
index 66ae034..cb63bd7 100644
--- a/cmd/itemEdit.go
+++ b/cmd/itemEdit.go
@@ -6,7 +6,7 @@ import (
 	"github.com/spf13/cobra"
 )
 
-var itemEditCmd = &cobra.Command{
+var editCmd = &cobra.Command{
 	Use:   "edit",
 	Short: "Edit an item",
 	Long: `
@@ -17,5 +17,5 @@ var itemEditCmd = &cobra.Command{
 }
 
 func init() {
-	itemCmd.AddCommand(itemEditCmd)
+	rootCmd.AddCommand(editCmd)
 }