diff --git a/cmd/del-db.go b/cmd/del-db.go
index 1a254da..427c8b9 100644
--- a/cmd/del-db.go
+++ b/cmd/del-db.go
@@ -35,7 +35,7 @@ import (
 var delStoreCmd = &cobra.Command{
 	Use:          "remove-store STORE",
 	Short:        "Delete a store",
-	Aliases:      []string{"rm-store", "rms"},
+	Aliases:      []string{"rms"},
 	Args:         cobra.ExactArgs(1),
 	RunE:         delStore,
 	SilenceUsage: true,
diff --git a/cmd/export.go b/cmd/export.go
index b1a0898..35f0a02 100644
--- a/cmd/export.go
+++ b/cmd/export.go
@@ -29,7 +29,7 @@ import (
 var exportCmd = &cobra.Command{
 	Use:     "export [STORE]",
 	Short:   "Export store as NDJSON (alias for list --format ndjson)",
-	Aliases: []string{"dump"},
+	Aliases: []string{},
 	Args:    cobra.MaximumNArgs(1),
 	RunE: func(cmd *cobra.Command, args []string) error {
 		listFormat = "ndjson"
diff --git a/cmd/identity.go b/cmd/identity.go
index a7a4ccf..4e13fcc 100644
--- a/cmd/identity.go
+++ b/cmd/identity.go
@@ -8,6 +8,7 @@ import (
 
 var identityCmd = &cobra.Command{
 	Use:          "identity",
+	Aliases:      []string{"id"},
 	Short:        "Show or create the age encryption identity",
 	Args:         cobra.NoArgs,
 	RunE:         identityRun,
diff --git a/cmd/list-dbs.go b/cmd/list-dbs.go
index 2ff7a22..7c7ad78 100644
--- a/cmd/list-dbs.go
+++ b/cmd/list-dbs.go
@@ -31,7 +31,7 @@ import (
 var listStoresCmd = &cobra.Command{
 	Use:          "list-stores",
 	Short:        "List all stores",
-	Aliases:      []string{"ls-stores", "lss"},
+	Aliases:      []string{"lss"},
 	Args:         cobra.NoArgs,
 	RunE:         listStores,
 	SilenceUsage: true,
diff --git a/cmd/restore.go b/cmd/restore.go
index 6830ee1..bc678de 100644
--- a/cmd/restore.go
+++ b/cmd/restore.go
@@ -38,7 +38,7 @@ import (
 var restoreCmd = &cobra.Command{
 	Use:          "import [STORE]",
 	Short:        "Restore key/value pairs from an NDJSON dump",
-	Aliases:      []string{"restore"},
+	Aliases:      []string{},
 	Args:         cobra.MaximumNArgs(1),
 	RunE:         restore,
 	SilenceUsage: true,
diff --git a/testdata/dump__key__ok.ct b/testdata/dump__key__ok.ct
index 10569d2..f00cbff 100644
--- a/testdata/dump__key__ok.ct
+++ b/testdata/dump__key__ok.ct
@@ -1,8 +1,8 @@
 $ pda set a1 1
 $ pda set a2 2
 $ pda set b1 3
-$ pda dump --key "a*"
+$ pda export --key "a*"
 {"key":"a1","value":"1","encoding":"text"}
 {"key":"a2","value":"2","encoding":"text"}
-$ pda dump --key "c*" --> FAIL
+$ pda export --key "c*" --> FAIL
 FAIL  cannot ls '@default': no matches for key pattern 'c*'
diff --git a/testdata/dump__value__ok.ct b/testdata/dump__value__ok.ct
index bab0072..14bd72a 100644
--- a/testdata/dump__value__ok.ct
+++ b/testdata/dump__value__ok.ct
@@ -2,7 +2,7 @@ $ pda set url https://example.com
 $ fecho tmpval hello world
 $ pda set greeting < tmpval
 $ pda set number 42
-$ pda dump --value "**https**"
+$ pda export --value "**https**"
 {"key":"url","value":"https://example.com","encoding":"text"}
-$ pda dump --value "**world**"
+$ pda export --value "**world**"
 {"key":"greeting","value":"hello world\n","encoding":"text"}
diff --git a/testdata/help__dump__ok.ct b/testdata/help__dump__ok.ct
index 626e89d..e22b81b 100644
--- a/testdata/help__dump__ok.ct
+++ b/testdata/help__dump__ok.ct
@@ -1,13 +1,10 @@
-$ pda help dump
-$ pda dump --help
+$ pda help export
+$ pda export --help
 Export store as NDJSON (alias for list --format ndjson)
 
 Usage:
   pda export [STORE] [flags]
 
-Aliases:
-  export, dump
-
 Flags:
   -h, --help            help for export
   -k, --key strings     Filter keys with glob pattern (repeatable)
@@ -17,9 +14,6 @@ Export store as NDJSON (alias for list --format ndjson)
 Usage:
   pda export [STORE] [flags]
 
-Aliases:
-  export, dump
-
 Flags:
   -h, --help            help for export
   -k, --key strings     Filter keys with glob pattern (repeatable)
diff --git a/testdata/help__list-dbs__ok.ct b/testdata/help__list-dbs__ok.ct
index 24ba6b5..4781886 100644
--- a/testdata/help__list-dbs__ok.ct
+++ b/testdata/help__list-dbs__ok.ct
@@ -6,7 +6,7 @@ Usage:
   pda list-stores [flags]
 
 Aliases:
-  list-stores, ls-stores, lss
+  list-stores, lss
 
 Flags:
   -h, --help   help for list-stores
@@ -16,7 +16,7 @@ Usage:
   pda list-stores [flags]
 
 Aliases:
-  list-stores, ls-stores, lss
+  list-stores, lss
 
 Flags:
   -h, --help   help for list-stores
diff --git a/testdata/help__remove-store__ok.ct b/testdata/help__remove-store__ok.ct
index 0b7b0a8..6eaf204 100644
--- a/testdata/help__remove-store__ok.ct
+++ b/testdata/help__remove-store__ok.ct
@@ -6,7 +6,7 @@ Usage:
   pda remove-store STORE [flags]
 
 Aliases:
-  remove-store, rm-store, rms
+  remove-store, rms
 
 Flags:
   -h, --help          help for remove-store
@@ -17,7 +17,7 @@ Usage:
   pda remove-store STORE [flags]
 
 Aliases:
-  remove-store, rm-store, rms
+  remove-store, rms
 
 Flags:
   -h, --help          help for remove-store
diff --git a/testdata/help__restore__ok.ct b/testdata/help__restore__ok.ct
index 2bbadff..9fb102a 100644
--- a/testdata/help__restore__ok.ct
+++ b/testdata/help__restore__ok.ct
@@ -1,13 +1,10 @@
-$ pda help restore
-$ pda restore --help
+$ pda help import
+$ pda import --help
 Restore key/value pairs from an NDJSON dump
 
 Usage:
   pda import [STORE] [flags]
 
-Aliases:
-  import, restore
-
 Flags:
       --drop          Drop existing entries before restoring (full replace)
   -f, --file string   Path to an NDJSON dump (defaults to stdin)
@@ -19,9 +16,6 @@ Restore key/value pairs from an NDJSON dump
 Usage:
   pda import [STORE] [flags]
 
-Aliases:
-  import, restore
-
 Flags:
       --drop          Drop existing entries before restoring (full replace)
   -f, --file string   Path to an NDJSON dump (defaults to stdin)
diff --git a/testdata/restore__drop__ok.ct b/testdata/restore__drop__ok.ct
index 3ddadb2..5b52d5d 100644
--- a/testdata/restore__drop__ok.ct
+++ b/testdata/restore__drop__ok.ct
@@ -1,7 +1,7 @@
 $ pda set existing keep-me
 $ pda set other also-keep
 $ fecho dumpfile {"key":"new","value":"hello","encoding":"text"}
-$ pda restore --drop --file dumpfile
+$ pda import --drop --file dumpfile
   ok  restored 1 entries into @default
 $ pda get new
 hello
diff --git a/testdata/restore__key__ok.ct b/testdata/restore__key__ok.ct
index 544d033..9fc3baf 100644
--- a/testdata/restore__key__ok.ct
+++ b/testdata/restore__key__ok.ct
@@ -3,7 +3,7 @@ $ pda set a2 2
 $ pda set b1 3
 $ fecho dumpfile {"key":"a1","value":"1","encoding":"text"} {"key":"a2","value":"2","encoding":"text"} {"key":"b1","value":"3","encoding":"text"}
 $ pda rm a1 a2 b1
-$ pda restore --key "a*" --file dumpfile
+$ pda import --key "a*" --file dumpfile
   ok  restored 2 entries into @default
 $ pda get a1
 1
@@ -12,5 +12,5 @@ $ pda get a2
 $ pda get b1 --> FAIL
 FAIL  cannot get 'b1': no such key
 hint  did you mean 'a1'?
-$ pda restore --key "c*" --file dumpfile --> FAIL
+$ pda import --key "c*" --file dumpfile --> FAIL
 FAIL  cannot restore '@default': no matches for key pattern 'c*'
diff --git a/testdata/restore__merge__ok.ct b/testdata/restore__merge__ok.ct
index a8ac11a..4c81265 100644
--- a/testdata/restore__merge__ok.ct
+++ b/testdata/restore__merge__ok.ct
@@ -1,7 +1,7 @@
 # Merge import updates existing entries and adds new ones
 $ pda set existing@mrg old-value
 $ fecho dumpfile {"key":"existing","value":"updated","encoding":"text"} {"key":"new","value":"hello","encoding":"text"}
-$ pda restore mrg --file dumpfile
+$ pda import mrg --file dumpfile
   ok  restored 2 entries into @mrg
 $ pda get existing@mrg
 updated
diff --git a/testdata/restore__stdin__ok.ct b/testdata/restore__stdin__ok.ct
index ec2552a..f120052 100644
--- a/testdata/restore__stdin__ok.ct
+++ b/testdata/restore__stdin__ok.ct
@@ -1,7 +1,7 @@
 # Import from stdin preserves existing entries
 $ pda set existing@stn keep-me
 $ fecho dumpfile {"key":"new","value":"hello","encoding":"text"}
-$ pda restore stn < dumpfile
+$ pda import stn < dumpfile
   ok  restored 1 entries into @stn
 $ pda get existing@stn
 keep-me