diff --git a/crates/apps/src/lib/node/ledger/shell/finalize_block.rs b/crates/apps/src/lib/node/ledger/shell/finalize_block.rs
index 4c6b6c419a..e67febd4bd 100644
--- a/crates/apps/src/lib/node/ledger/shell/finalize_block.rs
+++ b/crates/apps/src/lib/node/ledger/shell/finalize_block.rs
@@ -764,12 +764,12 @@ mod test_finalize_block {
         BondId, SlashType, ValidatorState, WeightedValidator,
     };
     use namada::proof_of_stake::{unjail_validator, ADDRESS as pos_address};
-    use namada::replay_protection;
     use namada::tendermint::abci::types::{Misbehavior, MisbehaviorKind};
     use namada::token::{Amount, DenominatedAmount, NATIVE_MAX_DECIMAL_PLACES};
     use namada::tx::data::Fee;
     use namada::tx::{Authorization, Code, Data};
     use namada::vote_ext::ethereum_events;
+    use namada::{address, replay_protection};
     use namada_sdk::eth_bridge::storage::vote_tallies::BridgePoolRoot;
     use namada_sdk::eth_bridge::MinimumConfirmations;
     use namada_sdk::governance::ProposalVote;
diff --git a/crates/apps/src/lib/node/ledger/shell/mod.rs b/crates/apps/src/lib/node/ledger/shell/mod.rs
index a225598b5b..2d77952dc9 100644
--- a/crates/apps/src/lib/node/ledger/shell/mod.rs
+++ b/crates/apps/src/lib/node/ledger/shell/mod.rs
@@ -35,10 +35,10 @@ use masp_primitives::transaction::Transaction;
 use namada::core::address::Address;
 use namada::core::chain::ChainId;
 use namada::core::ethereum_events::EthereumEvent;
+use namada::core::hints;
 use namada::core::key::*;
 use namada::core::storage::{BlockHeight, Key, TxIndex};
 use namada::core::time::DateTimeUtc;
-use namada::core::{address, hints};
 use namada::ethereum_bridge::protocol::validation::bridge_pool_roots::validate_bp_roots_vext;
 use namada::ethereum_bridge::protocol::validation::ethereum_events::validate_eth_events_vext;
 use namada::ethereum_bridge::protocol::validation::validator_set_update::validate_valset_upd_vext;
@@ -417,7 +417,7 @@ where
             any(test, feature = "testing", feature = "benches"),
             not(feature = "integration"),
         ))]
-        let native_token = address::testing::nam();
+        let native_token = namada::address::testing::nam();
         // ... Otherwise, look it up from the genesis file
         #[cfg(not(all(
             any(test, feature = "testing", feature = "benches"),
@@ -1958,7 +1958,6 @@ mod test_utils {
 mod shell_tests {
     use namada::core::storage::Epoch;
     use namada::eth_bridge::storage::eth_bridge_queries::is_bridge_comptime_enabled;
-    use namada::replay_protection;
     use namada::token::read_denom;
     use namada::tx::data::protocol::{ProtocolTx, ProtocolTxType};
     use namada::tx::data::Fee;
@@ -1966,6 +1965,7 @@ mod shell_tests {
     use namada::vote_ext::{
         bridge_pool_roots, ethereum_events, ethereum_tx_data_variants,
     };
+    use namada::{address, replay_protection};
 
     use super::*;
     use crate::node::ledger::shell::token::DenominatedAmount;
diff --git a/crates/apps/src/lib/node/ledger/shell/process_proposal.rs b/crates/apps/src/lib/node/ledger/shell/process_proposal.rs
index 4d3ed0b063..3cff201bea 100644
--- a/crates/apps/src/lib/node/ledger/shell/process_proposal.rs
+++ b/crates/apps/src/lib/node/ledger/shell/process_proposal.rs
@@ -537,7 +537,6 @@ mod test_process_proposal {
     use namada::eth_bridge::storage::eth_bridge_queries::{
         is_bridge_comptime_enabled, EthBridgeQueries,
     };
-    use namada::replay_protection;
     use namada::state::StorageWrite;
     use namada::token::{read_denom, Amount, DenominatedAmount};
     use namada::tx::data::Fee;
@@ -545,6 +544,7 @@ mod test_process_proposal {
     use namada::vote_ext::{
         bridge_pool_roots, ethereum_events, validator_set_update,
     };
+    use namada::{address, replay_protection};
 
     use super::*;
     use crate::node::ledger::shell::test_utils::{