From c27909e37d53b1ba65c96c40c6c8f9923a2518db Mon Sep 17 00:00:00 2001
From: Nando Vieira <me@fnando.com>
Date: Thu, 17 Sep 2026 10:41:50 -0700
Subject: [PATCH 1/2] Rename contract alias remove to rm.

---
 FULL_HELP_DOCS.md                             |  8 +++--
 cmd/crates/soroban-test/tests/it/config.rs    | 31 +++++++++++++++++++
 .../src/commands/contract/alias.rs            |  9 +++---
 .../contract/alias/{remove.rs => rm.rs}       |  0
 4 files changed, 41 insertions(+), 7 deletions(-)
 rename cmd/soroban-cli/src/commands/contract/alias/{remove.rs => rm.rs} (100%)

diff --git a/FULL_HELP_DOCS.md b/FULL_HELP_DOCS.md
index 6a15af08c8..cf373d2a04 100644
--- a/FULL_HELP_DOCS.md
+++ b/FULL_HELP_DOCS.md
@@ -180,16 +180,18 @@ Utilities to manage contract aliases
 
 ###### **Subcommands:**
 
-- `remove` — Remove contract alias
+- `rm` — Remove contract alias
 - `add` — Add contract alias
 - `show` — Show the contract id associated with a given alias
 - `ls` — List all aliases
 
-## `stellar contract alias remove`
+## `stellar contract alias rm`
 
 Remove contract alias
 
-**Usage:** `stellar contract alias remove [OPTIONS] <ALIAS>`
+**Usage:** `stellar contract alias rm [OPTIONS] <ALIAS>`
+
+**Command Alias:** `remove`
 
 ###### **Arguments:**
 
diff --git a/cmd/crates/soroban-test/tests/it/config.rs b/cmd/crates/soroban-test/tests/it/config.rs
index 9fb79f4550..2459a8863b 100644
--- a/cmd/crates/soroban-test/tests/it/config.rs
+++ b/cmd/crates/soroban-test/tests/it/config.rs
@@ -1063,6 +1063,37 @@ fn can_remove_shadowed_native_alias() {
     });
 }
 
+#[test]
+fn alias_rm_is_an_alias_for_remove() {
+    TestEnv::with_default(|sandbox| {
+        sandbox
+            .new_assert_cmd("contract")
+            .args([
+                "alias",
+                "add",
+                "my-token",
+                "--id=CA3D5KRYM6CB7OWQ6TWYRR3Z4T7GNZLKERYNZGGA5SOAOPIFY6YQGAXE",
+            ])
+            .assert()
+            .success();
+
+        // `rm` is the canonical subcommand name.
+        sandbox
+            .new_assert_cmd("contract")
+            .args(["alias", "rm", "my-token"])
+            .assert()
+            .success();
+
+        // `remove` still works as an alias.
+        sandbox
+            .new_assert_cmd("contract")
+            .args(["alias", "remove", "my-token"])
+            .assert()
+            .failure()
+            .stderr(predicate::str::contains("no contract found"));
+    });
+}
+
 #[test]
 fn alias_ls_always_shows_builtin_native() {
     TestEnv::with_default(|sandbox| {
diff --git a/cmd/soroban-cli/src/commands/contract/alias.rs b/cmd/soroban-cli/src/commands/contract/alias.rs
index 7d9213097d..e7969a0810 100644
--- a/cmd/soroban-cli/src/commands/contract/alias.rs
+++ b/cmd/soroban-cli/src/commands/contract/alias.rs
@@ -2,13 +2,14 @@ use crate::commands::global;
 
 pub mod add;
 pub mod ls;
-pub mod remove;
+pub mod rm;
 pub mod show;
 
 #[derive(Debug, clap::Subcommand)]
 pub enum Cmd {
     /// Remove contract alias
-    Remove(remove::Cmd),
+    #[command(visible_alias = "remove")]
+    Rm(rm::Cmd),
 
     /// Add contract alias
     Add(add::Cmd),
@@ -23,7 +24,7 @@ pub enum Cmd {
 #[derive(thiserror::Error, Debug)]
 pub enum Error {
     #[error(transparent)]
-    Remove(#[from] remove::Error),
+    Rm(#[from] rm::Error),
 
     #[error(transparent)]
     Add(#[from] add::Error),
@@ -38,7 +39,7 @@ pub enum Error {
 impl Cmd {
     pub fn run(&self, global_args: &global::Args) -> Result<(), Error> {
         match &self {
-            Cmd::Remove(remove) => remove.run(global_args)?,
+            Cmd::Rm(rm) => rm.run(global_args)?,
             Cmd::Add(add) => add.run(global_args)?,
             Cmd::Show(show) => show.run(global_args)?,
             Cmd::Ls(ls) => ls.run()?,
diff --git a/cmd/soroban-cli/src/commands/contract/alias/remove.rs b/cmd/soroban-cli/src/commands/contract/alias/rm.rs
similarity index 100%
rename from cmd/soroban-cli/src/commands/contract/alias/remove.rs
rename to cmd/soroban-cli/src/commands/contract/alias/rm.rs

From 28ef5980fe480120cd471a664effcd0e63ed6b53 Mon Sep 17 00:00:00 2001
From: Nando Vieira <me@fnando.com>
Date: Thu, 17 Sep 2026 11:19:15 -0700
Subject: [PATCH 2/2] Rename alias rm test to describe canonical command.

---
 cmd/crates/soroban-test/tests/it/config.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/cmd/crates/soroban-test/tests/it/config.rs b/cmd/crates/soroban-test/tests/it/config.rs
index 2459a8863b..2fe2312c7d 100644
--- a/cmd/crates/soroban-test/tests/it/config.rs
+++ b/cmd/crates/soroban-test/tests/it/config.rs
@@ -1064,7 +1064,7 @@ fn can_remove_shadowed_native_alias() {
 }
 
 #[test]
-fn alias_rm_is_an_alias_for_remove() {
+fn alias_rm_is_canonical_with_remove_alias() {
     TestEnv::with_default(|sandbox| {
         sandbox
             .new_assert_cmd("contract")