diff --git a/cmd/soroban-cli/src/commands/contract/arg_parsing.rs b/cmd/soroban-cli/src/commands/contract/arg_parsing.rs
index ae068a25b..a223851ca 100644
--- a/cmd/soroban-cli/src/commands/contract/arg_parsing.rs
+++ b/cmd/soroban-cli/src/commands/contract/arg_parsing.rs
@@ -15,7 +15,7 @@ use crate::xdr::{
 use crate::commands::txn_result::TxnResult;
 use crate::config::{
     self,
-    sc_address::{self, ScAddress},
+    sc_address::{self, UnresolvedScAddress},
 };
 use soroban_spec_tools::Spec;
 
@@ -254,10 +254,10 @@ pub fn output_to_string(
 }
 
 fn resolve_address(addr_or_alias: &str, config: &config::Args) -> Result<String, Error> {
-    let sc_address: ScAddress = addr_or_alias.parse().unwrap();
+    let sc_address: UnresolvedScAddress = addr_or_alias.parse().unwrap();
     let account = match sc_address {
-        ScAddress::Address(addr) => addr.to_string(),
-        addr @ ScAddress::Alias(_) => {
+        UnresolvedScAddress::Resolved(addr) => addr.to_string(),
+        addr @ UnresolvedScAddress::Alias(_) => {
             let addr = addr.resolve(&config.locator, &config.get_network()?.network_passphrase)?;
             match addr {
                 xdr::ScAddress::Account(account) => account.to_string(),
diff --git a/cmd/soroban-cli/src/commands/contract/fetch.rs b/cmd/soroban-cli/src/commands/contract/fetch.rs
index 31ed191ff..d73aac3b7 100644
--- a/cmd/soroban-cli/src/commands/contract/fetch.rs
+++ b/cmd/soroban-cli/src/commands/contract/fetch.rs
@@ -22,7 +22,7 @@ use crate::{
 pub struct Cmd {
     /// Contract ID to fetch
     #[arg(long = "id", env = "STELLAR_CONTRACT_ID")]
-    pub contract_id: config::ContractAddress,
+    pub contract_id: config::UnresolvedContract,
     /// Where to write output otherwise stdout is used
     #[arg(long, short = 'o')]
     pub out_file: Option<std::path::PathBuf>,
diff --git a/cmd/soroban-cli/src/commands/contract/info/shared.rs b/cmd/soroban-cli/src/commands/contract/info/shared.rs
index 33a95b607..33d29c384 100644
--- a/cmd/soroban-cli/src/commands/contract/info/shared.rs
+++ b/cmd/soroban-cli/src/commands/contract/info/shared.rs
@@ -26,7 +26,7 @@ pub struct Args {
     pub wasm_hash: Option<String>,
     /// Contract id or contract alias to get the data for
     #[arg(long = "id", env = "STELLAR_CONTRACT_ID", group = "Source")]
-    pub contract_id: Option<config::ContractAddress>,
+    pub contract_id: Option<config::UnresolvedContract>,
     #[command(flatten)]
     pub network: network::Args,
     #[command(flatten)]
diff --git a/cmd/soroban-cli/src/commands/contract/invoke.rs b/cmd/soroban-cli/src/commands/contract/invoke.rs
index c7b631343..bd069698d 100644
--- a/cmd/soroban-cli/src/commands/contract/invoke.rs
+++ b/cmd/soroban-cli/src/commands/contract/invoke.rs
@@ -40,7 +40,7 @@ use soroban_spec_tools::contract;
 pub struct Cmd {
     /// Contract ID to invoke
     #[arg(long = "id", env = "STELLAR_CONTRACT_ID")]
-    pub contract_id: config::ContractAddress,
+    pub contract_id: config::UnresolvedContract,
     // For testing only
     #[arg(skip)]
     pub wasm: Option<std::path::PathBuf>,
diff --git a/cmd/soroban-cli/src/commands/events.rs b/cmd/soroban-cli/src/commands/events.rs
index 48d79c1b7..16ef410bd 100644
--- a/cmd/soroban-cli/src/commands/events.rs
+++ b/cmd/soroban-cli/src/commands/events.rs
@@ -42,7 +42,7 @@ pub struct Cmd {
         num_args = 1..=6,
         help_heading = "FILTERS"
     )]
-    contract_ids: Vec<config::ContractAddress>,
+    contract_ids: Vec<config::UnresolvedContract>,
     /// A set of (up to 4) topic filters to filter event topics on. A single
     /// topic filter can contain 1-4 different segment filters, separated by
     /// commas, with an asterisk (`*` character) indicating a wildcard segment.
diff --git a/cmd/soroban-cli/src/commands/snapshot/create.rs b/cmd/soroban-cli/src/commands/snapshot/create.rs
index 6ce48d3f2..d294a27af 100644
--- a/cmd/soroban-cli/src/commands/snapshot/create.rs
+++ b/cmd/soroban-cli/src/commands/snapshot/create.rs
@@ -34,7 +34,7 @@ use crate::{
     tx::builder,
     utils::get_name_from_stellar_asset_contract_storage,
 };
-use crate::{config::address::Address, utils::http};
+use crate::{config::address::UnresolvedMuxedAccount, utils::http};
 
 #[derive(Clone, Copy, Debug, Eq, Hash, PartialEq, ValueEnum)]
 pub enum Output {
@@ -407,7 +407,7 @@ impl Cmd {
     // Resolve an account address to an account id. The address can be a
     // G-address or a key name (as in `stellar keys address NAME`).
     fn resolve_account(&self, address: &str) -> Option<AccountId> {
-        let address: Address = address.parse().ok()?;
+        let address: UnresolvedMuxedAccount = address.parse().ok()?;
 
         Some(AccountId(xdr::PublicKey::PublicKeyTypeEd25519(
             match address.resolve_muxed_account(&self.locator, None).ok()? {
diff --git a/cmd/soroban-cli/src/config/address.rs b/cmd/soroban-cli/src/config/address.rs
index aa3116a13..6ce94eb93 100644
--- a/cmd/soroban-cli/src/config/address.rs
+++ b/cmd/soroban-cli/src/config/address.rs
@@ -6,14 +6,14 @@ use super::{locator, secret};
 
 /// Address can be either a public key or eventually an alias of a address.
 #[derive(Clone, Debug)]
-pub enum Address {
-    MuxedAccount(xdr::MuxedAccount),
+pub enum UnresolvedMuxedAccount {
+    Resolved(xdr::MuxedAccount),
     AliasOrSecret(String),
 }
 
-impl Default for Address {
+impl Default for UnresolvedMuxedAccount {
     fn default() -> Self {
-        Address::AliasOrSecret(String::default())
+        UnresolvedMuxedAccount::AliasOrSecret(String::default())
     }
 }
 
@@ -27,26 +27,26 @@ pub enum Error {
     CannotSign(xdr::MuxedAccount),
 }
 
-impl FromStr for Address {
+impl FromStr for UnresolvedMuxedAccount {
     type Err = Error;
 
     fn from_str(value: &str) -> Result<Self, Self::Err> {
         Ok(xdr::MuxedAccount::from_str(value).map_or_else(
-            |_| Address::AliasOrSecret(value.to_string()),
-            Address::MuxedAccount,
+            |_| UnresolvedMuxedAccount::AliasOrSecret(value.to_string()),
+            UnresolvedMuxedAccount::Resolved,
         ))
     }
 }
 
-impl Address {
+impl UnresolvedMuxedAccount {
     pub fn resolve_muxed_account(
         &self,
         locator: &locator::Args,
         hd_path: Option<usize>,
     ) -> Result<xdr::MuxedAccount, Error> {
         match self {
-            Address::MuxedAccount(muxed_account) => Ok(muxed_account.clone()),
-            Address::AliasOrSecret(alias) => {
+            UnresolvedMuxedAccount::Resolved(muxed_account) => Ok(muxed_account.clone()),
+            UnresolvedMuxedAccount::AliasOrSecret(alias) => {
                 Self::resolve_muxed_account_with_alias(alias, locator, hd_path)
             }
         }
@@ -66,8 +66,8 @@ impl Address {
 
     pub fn resolve_secret(&self, locator: &locator::Args) -> Result<secret::Secret, Error> {
         match &self {
-            Address::MuxedAccount(muxed_account) => Err(Error::CannotSign(muxed_account.clone())),
-            Address::AliasOrSecret(alias) => Ok(locator.read_identity(alias)?),
+            UnresolvedMuxedAccount::Resolved(muxed_account) => Err(Error::CannotSign(muxed_account.clone())),
+            UnresolvedMuxedAccount::AliasOrSecret(alias) => Ok(locator.read_identity(alias)?),
         }
     }
 }
diff --git a/cmd/soroban-cli/src/config/alias.rs b/cmd/soroban-cli/src/config/alias.rs
index 6d49dd798..734925c4e 100644
--- a/cmd/soroban-cli/src/config/alias.rs
+++ b/cmd/soroban-cli/src/config/alias.rs
@@ -11,37 +11,37 @@ pub struct Data {
 
 /// Address can be either a contract address, C.. or eventually an alias of a contract address.
 #[derive(Clone, Debug)]
-pub enum ContractAddress {
-    ContractId(stellar_strkey::Contract),
+pub enum UnresolvedContract {
+    Resolved(stellar_strkey::Contract),
     Alias(String),
 }
 
-impl Default for ContractAddress {
+impl Default for UnresolvedContract {
     fn default() -> Self {
-        ContractAddress::Alias(String::default())
+        UnresolvedContract::Alias(String::default())
     }
 }
 
-impl FromStr for ContractAddress {
+impl FromStr for UnresolvedContract {
     type Err = Infallible;
 
     fn from_str(value: &str) -> Result<Self, Self::Err> {
         Ok(stellar_strkey::Contract::from_str(value).map_or_else(
-            |_| ContractAddress::Alias(value.to_string()),
-            ContractAddress::ContractId,
+            |_| UnresolvedContract::Alias(value.to_string()),
+            UnresolvedContract::Resolved,
         ))
     }
 }
 
-impl ContractAddress {
+impl UnresolvedContract {
     pub fn resolve_contract_id(
         &self,
         locator: &locator::Args,
         network_passphrase: &str,
     ) -> Result<stellar_strkey::Contract, locator::Error> {
         match self {
-            ContractAddress::ContractId(contract) => Ok(*contract),
-            ContractAddress::Alias(alias) => {
+            UnresolvedContract::Resolved(contract) => Ok(*contract),
+            UnresolvedContract::Alias(alias) => {
                 Self::resolve_alias(alias, locator, network_passphrase)
             }
         }
diff --git a/cmd/soroban-cli/src/config/mod.rs b/cmd/soroban-cli/src/config/mod.rs
index e4a34ce22..0ff28817f 100644
--- a/cmd/soroban-cli/src/config/mod.rs
+++ b/cmd/soroban-cli/src/config/mod.rs
@@ -1,4 +1,3 @@
-use address::Address;
 use clap::{arg, command};
 use serde::{Deserialize, Serialize};
 use std::{
@@ -24,7 +23,9 @@ pub mod secret;
 pub mod sign_with;
 pub mod upgrade_check;
 
-pub use alias::ContractAddress;
+pub use alias::UnresolvedContract;
+pub use address::UnresolvedMuxedAccount;
+pub use sc_address::UnresolvedScAddress;
 
 #[derive(thiserror::Error, Debug)]
 pub enum Error {
@@ -57,7 +58,7 @@ pub struct Args {
     /// or a seed phrase (--source "kite urban…").
     /// If `--build-only` or `--sim-only` flags were NOT provided, this key will also be used to
     /// sign the final transaction. In that case, trying to sign with public key will fail.
-    pub source_account: Address,
+    pub source_account: UnresolvedMuxedAccount,
 
     #[arg(long)]
     /// If using a seed phrase, which hierarchical deterministic path to use, e.g. `m/44'/148'/{hd_path}`. Example: `--hd-path 1`. Default: `0`
diff --git a/cmd/soroban-cli/src/config/sc_address.rs b/cmd/soroban-cli/src/config/sc_address.rs
index 26eaf9641..ef12dc16b 100644
--- a/cmd/soroban-cli/src/config/sc_address.rs
+++ b/cmd/soroban-cli/src/config/sc_address.rs
@@ -2,18 +2,19 @@ use std::str::FromStr;
 
 use crate::xdr;
 
-use super::{address, locator, ContractAddress};
+use super::{address, locator, UnresolvedContract};
 
 /// `ScAddress` can be either a resolved `xdr::ScAddress` or an alias of a `Contract` or `MuxedAccount`.
+#[allow(clippy::module_name_repetitions)]
 #[derive(Clone, Debug)]
-pub enum ScAddress {
-    Address(xdr::ScAddress),
+pub enum UnresolvedScAddress {
+    Resolved(xdr::ScAddress),
     Alias(String),
 }
 
-impl Default for ScAddress {
+impl Default for UnresolvedScAddress {
     fn default() -> Self {
-        ScAddress::Alias(String::default())
+        UnresolvedScAddress::Alias(String::default())
     }
 }
 
@@ -27,27 +28,27 @@ pub enum Error {
     AccountAliasNotFound(String),
 }
 
-impl FromStr for ScAddress {
+impl FromStr for UnresolvedScAddress {
     type Err = Error;
 
     fn from_str(value: &str) -> Result<Self, Self::Err> {
         Ok(xdr::ScAddress::from_str(value)
-            .map_or_else(|_| ScAddress::Alias(value.to_string()), ScAddress::Address))
+            .map_or_else(|_| UnresolvedScAddress::Alias(value.to_string()), UnresolvedScAddress::Resolved))
     }
 }
 
-impl ScAddress {
+impl UnresolvedScAddress {
     pub fn resolve(
         self,
         locator: &locator::Args,
         network_passphrase: &str,
     ) -> Result<xdr::ScAddress, Error> {
         let alias = match self {
-            ScAddress::Address(addr) => return Ok(addr),
-            ScAddress::Alias(alias) => alias,
+            UnresolvedScAddress::Resolved(addr) => return Ok(addr),
+            UnresolvedScAddress::Alias(alias) => alias,
         };
-        let contract = ContractAddress::resolve_alias(&alias, locator, network_passphrase);
-        let muxed_account = super::Address::resolve_muxed_account_with_alias(&alias, locator, None);
+        let contract = UnresolvedContract::resolve_alias(&alias, locator, network_passphrase);
+        let muxed_account = super::UnresolvedMuxedAccount::resolve_muxed_account_with_alias(&alias, locator, None);
         match (contract, muxed_account) {
             (Ok(contract), _) => Ok(xdr::ScAddress::Contract(xdr::Hash(contract.0))),
             (_, Ok(muxed_account)) => Ok(xdr::ScAddress::Account(muxed_account.account_id())),
diff --git a/cmd/soroban-cli/src/key.rs b/cmd/soroban-cli/src/key.rs
index b704541c4..c3fd7ed89 100644
--- a/cmd/soroban-cli/src/key.rs
+++ b/cmd/soroban-cli/src/key.rs
@@ -34,7 +34,7 @@ pub struct Args {
         required_unless_present = "wasm",
         required_unless_present = "wasm_hash"
     )]
-    pub contract_id: Option<alias::ContractAddress>,
+    pub contract_id: Option<alias::UnresolvedContract>,
     /// Storage key (symbols only)
     #[arg(long = "key", conflicts_with = "key_xdr")]
     pub key: Option<Vec<String>>,