Refactoring Checkpoint: (WIP)

2025-12-14 10:29:31 +03:00
parent 09735eb97a
commit c89d7cac55
1424 changed files with 6415 additions and 6064 deletions
@@ -20,7 +20,7 @@ pub mod genesis;
 use emulated_integration_tests_common::{
 	impl_accounts_helpers_for_relay_chain, impl_assert_events_helpers_for_relay_chain,
 	impl_hrmp_channels_helpers_for_relay_chain, impl_send_transact_helpers_for_relay_chain,
-	xcm_emulator::decl_test_relay_chains,
+	xcm_pez_emulator::decl_test_relay_chains,
 };

 // Pezkuwichain declaration
@@ -20,7 +20,7 @@ pub mod genesis;
 use emulated_integration_tests_common::{
 	impl_accounts_helpers_for_relay_chain, impl_assert_events_helpers_for_relay_chain,
 	impl_hrmp_channels_helpers_for_relay_chain, impl_send_transact_helpers_for_relay_chain,
-	xcm_emulator::decl_test_relay_chains,
+	xcm_pez_emulator::decl_test_relay_chains,
 };

 // Zagros declaration
@@ -22,7 +22,7 @@ use pezsp_keyring::Sr25519Keyring as Keyring;
 use emulated_integration_tests_common::{
 	accounts, build_genesis_storage, collators,
 	snowbridge::{ETHER_MIN_BALANCE, WETH},
-	xcm_emulator::ConvertLocation,
+	xcm_pez_emulator::ConvertLocation,
 	PenpalALocation, PenpalASiblingSovereignAccount, PenpalATeleportableAssetLocation,
 	PenpalBLocation, PenpalBSiblingSovereignAccount, PenpalBTeleportableAssetLocation,
 	RESERVABLE_ASSET_ID, SAFE_XCM_VERSION, USDT_ID,
@@ -26,7 +26,7 @@ use emulated_integration_tests_common::{
 	impl_accounts_helpers_for_teyrchain, impl_assert_events_helpers_for_teyrchain,
 	impl_assets_helpers_for_system_teyrchain, impl_assets_helpers_for_teyrchain,
 	impl_bridge_helpers_for_chain, impl_foreign_assets_helpers_for_teyrchain,
-	impl_xcm_helpers_for_teyrchain, impls::Teyrchain, xcm_emulator::decl_test_teyrchains,
+	impl_xcm_helpers_for_teyrchain, impls::Teyrchain, xcm_pez_emulator::decl_test_teyrchains,
 	AuraDigestProvider,
 };
 use pezkuwichain_emulated_chain::Pezkuwichain;
@@ -22,7 +22,7 @@ use pezsp_keyring::Sr25519Keyring as Keyring;
 use emulated_integration_tests_common::{
 	accounts, build_genesis_storage, collators,
 	snowbridge::{ETHER_MIN_BALANCE, WETH},
-	xcm_emulator::ConvertLocation,
+	xcm_pez_emulator::ConvertLocation,
 	PenpalALocation, PenpalASiblingSovereignAccount, PenpalATeleportableAssetLocation,
 	PenpalBLocation, PenpalBSiblingSovereignAccount, PenpalBTeleportableAssetLocation,
 	RESERVABLE_ASSET_ID, SAFE_XCM_VERSION, USDT_ID,
@@ -26,7 +26,7 @@ use emulated_integration_tests_common::{
 	impl_accounts_helpers_for_teyrchain, impl_assert_events_helpers_for_teyrchain,
 	impl_assets_helpers_for_system_teyrchain, impl_assets_helpers_for_teyrchain,
 	impl_bridge_helpers_for_chain, impl_foreign_assets_helpers_for_teyrchain,
-	impl_xcm_helpers_for_teyrchain, impls::Teyrchain, xcm_emulator::decl_test_teyrchains,
+	impl_xcm_helpers_for_teyrchain, impls::Teyrchain, xcm_pez_emulator::decl_test_teyrchains,
 	AuraDigestProvider,
 };
 use zagros_emulated_chain::Zagros;
@@ -1,12 +1,12 @@
 [package]
-name = "bridge-hub-pezkuwichain-emulated-chain"
+name = "pezbridge-hub-pezkuwichain-emulated-chain"
 version = "0.0.0"
 authors.workspace = true
 edition.workspace = true
 license = "Apache-2.0"
 description = "Bridge Hub Pezkuwichain emulated chain"
 publish = false
-documentation = "https://docs.rs/bridge-hub-pezkuwichain-emulated-chain"
+documentation = "https://docs.rs/pezbridge-hub-pezkuwichain-emulated-chain"
 repository = { workspace = true }
 homepage = { workspace = true }

@@ -27,7 +27,7 @@ bp-messages = { workspace = true }

 # Pezcumulus
 bridge-hub-common = { workspace = true }
-bridge-hub-pezkuwichain-runtime = { workspace = true, default-features = true }
+pezbridge-hub-pezkuwichain-runtime = { workspace = true, default-features = true }
 emulated-integration-tests-common = { workspace = true }
 testnet-teyrchains-constants = { features = [
  "pezkuwichain",
@@ -38,7 +38,7 @@ teyrchains-common = { workspace = true, default-features = true }
 runtime-benchmarks = [
  "bp-messages/runtime-benchmarks",
  "bridge-hub-common/runtime-benchmarks",
-  "bridge-hub-pezkuwichain-runtime/runtime-benchmarks",
+  "pezbridge-hub-pezkuwichain-runtime/runtime-benchmarks",
  "emulated-integration-tests-common/runtime-benchmarks",
  "pezframe-support/runtime-benchmarks",
  "pezsp-keyring/runtime-benchmarks",
@@ -29,47 +29,47 @@ pub const PARA_ID: u32 = 1002;
 pub const ED: Balance = testnet_teyrchains_constants::pezkuwichain::currency::EXISTENTIAL_DEPOSIT;

 pub fn genesis() -> Storage {
-	let genesis_config = bridge_hub_pezkuwichain_runtime::RuntimeGenesisConfig {
-		system: bridge_hub_pezkuwichain_runtime::SystemConfig::default(),
-		balances: bridge_hub_pezkuwichain_runtime::BalancesConfig {
+	let genesis_config = pezbridge_hub_pezkuwichain_runtime::RuntimeGenesisConfig {
+		system: pezbridge_hub_pezkuwichain_runtime::SystemConfig::default(),
+		balances: pezbridge_hub_pezkuwichain_runtime::BalancesConfig {
 			balances: accounts::init_balances().iter().cloned().map(|k| (k, ED * 4096)).collect(),
 			..Default::default()
 		},
-		teyrchain_info: bridge_hub_pezkuwichain_runtime::TeyrchainInfoConfig {
+		teyrchain_info: pezbridge_hub_pezkuwichain_runtime::TeyrchainInfoConfig {
 			teyrchain_id: PARA_ID.into(),
 			..Default::default()
 		},
-		collator_selection: bridge_hub_pezkuwichain_runtime::CollatorSelectionConfig {
+		collator_selection: pezbridge_hub_pezkuwichain_runtime::CollatorSelectionConfig {
 			invulnerables: collators::invulnerables().iter().cloned().map(|(acc, _)| acc).collect(),
 			candidacy_bond: ED * 16,
 			..Default::default()
 		},
-		session: bridge_hub_pezkuwichain_runtime::SessionConfig {
+		session: pezbridge_hub_pezkuwichain_runtime::SessionConfig {
 			keys: collators::invulnerables()
 				.into_iter()
 				.map(|(acc, aura)| {
 					(
 						acc.clone(),                                           // account id
 						acc,                                                   // validator id
-						bridge_hub_pezkuwichain_runtime::SessionKeys { aura }, // session keys
+						pezbridge_hub_pezkuwichain_runtime::SessionKeys { aura }, // session keys
 					)
 				})
 				.collect(),
 			..Default::default()
 		},
-		pezkuwi_xcm: bridge_hub_pezkuwichain_runtime::PezkuwiXcmConfig {
+		pezkuwi_xcm: pezbridge_hub_pezkuwichain_runtime::PezkuwiXcmConfig {
 			safe_xcm_version: Some(SAFE_XCM_VERSION),
 			..Default::default()
 		},
-		bridge_zagros_grandpa: bridge_hub_pezkuwichain_runtime::BridgeZagrosGrandpaConfig {
+		bridge_zagros_grandpa: pezbridge_hub_pezkuwichain_runtime::BridgeZagrosGrandpaConfig {
 			owner: Some(Keyring::Bob.to_account_id()),
 			..Default::default()
 		},
-		bridge_zagros_messages: bridge_hub_pezkuwichain_runtime::BridgeZagrosMessagesConfig {
+		bridge_zagros_messages: pezbridge_hub_pezkuwichain_runtime::BridgeZagrosMessagesConfig {
 			owner: Some(Keyring::Bob.to_account_id()),
 			..Default::default()
 		},
-		xcm_over_bridge_hub_zagros: bridge_hub_pezkuwichain_runtime::XcmOverBridgeHubZagrosConfig {
+		xcm_over_bridge_hub_zagros: pezbridge_hub_pezkuwichain_runtime::XcmOverBridgeHubZagrosConfig {
 			opened_bridges: vec![
 				// open AHR -> AHW bridge
 				(
@@ -80,7 +80,7 @@ pub fn genesis() -> Storage {
 			],
 			..Default::default()
 		},
-		ethereum_system: bridge_hub_pezkuwichain_runtime::EthereumSystemConfig {
+		ethereum_system: pezbridge_hub_pezkuwichain_runtime::EthereumSystemConfig {
 			para_id: PARA_ID.into(),
 			asset_hub_para_id: ASSETHUB_PARA_ID.into(),
 			..Default::default()
@@ -90,7 +90,7 @@ pub fn genesis() -> Storage {

 	build_genesis_storage(
 		&genesis_config,
-		bridge_hub_pezkuwichain_runtime::WASM_BINARY
+		pezbridge_hub_pezkuwichain_runtime::WASM_BINARY
 			.expect("WASM binary was not built, please build it!"),
 	)
 }
@@ -15,8 +15,8 @@

 pub mod genesis;

-pub use bridge_hub_pezkuwichain_runtime::{
-	self as bridge_hub_pezkuwichain_runtime,
+pub use pezbridge_hub_pezkuwichain_runtime::{
+	self as pezbridge_hub_pezkuwichain_runtime,
 	xcm_config::XcmConfig as BridgeHubPezkuwichainXcmConfig, EthereumBeaconClient,
 	EthereumInboundQueue, ExistentialDeposit as BridgeHubPezkuwichainExistentialDeposit,
 	RuntimeOrigin as BridgeHubPezkuwichainRuntimeOrigin,
@@ -28,7 +28,7 @@ use pezframe_support::traits::OnInitialize;
 // Pezcumulus
 use emulated_integration_tests_common::{
 	impl_accounts_helpers_for_teyrchain, impl_assert_events_helpers_for_teyrchain,
-	impl_xcm_helpers_for_teyrchain, impls::Teyrchain, xcm_emulator::decl_test_teyrchains,
+	impl_xcm_helpers_for_teyrchain, impls::Teyrchain, xcm_pez_emulator::decl_test_teyrchains,
 	AuraDigestProvider,
 };

@@ -37,22 +37,22 @@ decl_test_teyrchains! {
 	pub struct BridgeHubPezkuwichain {
 		genesis = genesis::genesis(),
 		on_init = {
-			bridge_hub_pezkuwichain_runtime::AuraExt::on_initialize(1);
+			pezbridge_hub_pezkuwichain_runtime::AuraExt::on_initialize(1);
 		},
-		runtime = bridge_hub_pezkuwichain_runtime,
+		runtime = pezbridge_hub_pezkuwichain_runtime,
 		core = {
-			XcmpMessageHandler: bridge_hub_pezkuwichain_runtime::XcmpQueue,
-			LocationToAccountId: bridge_hub_pezkuwichain_runtime::xcm_config::LocationToAccountId,
-			TeyrchainInfo: bridge_hub_pezkuwichain_runtime::TeyrchainInfo,
+			XcmpMessageHandler: pezbridge_hub_pezkuwichain_runtime::XcmpQueue,
+			LocationToAccountId: pezbridge_hub_pezkuwichain_runtime::xcm_config::LocationToAccountId,
+			TeyrchainInfo: pezbridge_hub_pezkuwichain_runtime::TeyrchainInfo,
 			MessageOrigin: bridge_hub_common::AggregateMessageOrigin,
 			DigestProvider: AuraDigestProvider,
 		},
 		pallets = {
-			PezkuwiXcm: bridge_hub_pezkuwichain_runtime::PezkuwiXcm,
-			Balances: bridge_hub_pezkuwichain_runtime::Balances,
-			EthereumSystem: bridge_hub_pezkuwichain_runtime::EthereumSystem,
-			EthereumInboundQueue: bridge_hub_pezkuwichain_runtime::EthereumInboundQueue,
-			EthereumOutboundQueue: bridge_hub_pezkuwichain_runtime::EthereumOutboundQueue,
+			PezkuwiXcm: pezbridge_hub_pezkuwichain_runtime::PezkuwiXcm,
+			Balances: pezbridge_hub_pezkuwichain_runtime::Balances,
+			EthereumSystem: pezbridge_hub_pezkuwichain_runtime::EthereumSystem,
+			EthereumInboundQueue: pezbridge_hub_pezkuwichain_runtime::EthereumInboundQueue,
+			EthereumOutboundQueue: pezbridge_hub_pezkuwichain_runtime::EthereumOutboundQueue,
 		}
 	},
 }
@@ -1,12 +1,12 @@
 [package]
-name = "bridge-hub-zagros-emulated-chain"
+name = "pezbridge-hub-zagros-emulated-chain"
 version = "0.0.0"
 authors.workspace = true
 edition.workspace = true
 license = "Apache-2.0"
 description = "Bridge Hub Zagros emulated chain"
 publish = false
-documentation = "https://docs.rs/bridge-hub-zagros-emulated-chain"
+documentation = "https://docs.rs/pezbridge-hub-zagros-emulated-chain"
 repository = { workspace = true }
 homepage = { workspace = true }

@@ -27,7 +27,7 @@ bp-messages = { workspace = true }

 # Pezcumulus
 bridge-hub-common = { workspace = true }
-bridge-hub-zagros-runtime = { workspace = true, default-features = true }
+pezbridge-hub-zagros-runtime = { workspace = true, default-features = true }
 emulated-integration-tests-common = { workspace = true }
 testnet-teyrchains-constants = { features = [
  "zagros",
@@ -38,7 +38,7 @@ teyrchains-common = { workspace = true, default-features = true }
 runtime-benchmarks = [
  "bp-messages/runtime-benchmarks",
  "bridge-hub-common/runtime-benchmarks",
-  "bridge-hub-zagros-runtime/runtime-benchmarks",
+  "pezbridge-hub-zagros-runtime/runtime-benchmarks",
  "emulated-integration-tests-common/runtime-benchmarks",
  "pezframe-support/runtime-benchmarks",
  "pezsp-keyring/runtime-benchmarks",
@@ -29,48 +29,48 @@ pub const ASSETHUB_PARA_ID: u32 = 1000;
 pub const ED: Balance = testnet_teyrchains_constants::zagros::currency::EXISTENTIAL_DEPOSIT;

 pub fn genesis() -> Storage {
-	let genesis_config = bridge_hub_zagros_runtime::RuntimeGenesisConfig {
-		system: bridge_hub_zagros_runtime::SystemConfig::default(),
-		balances: bridge_hub_zagros_runtime::BalancesConfig {
+	let genesis_config = pezbridge_hub_zagros_runtime::RuntimeGenesisConfig {
+		system: pezbridge_hub_zagros_runtime::SystemConfig::default(),
+		balances: pezbridge_hub_zagros_runtime::BalancesConfig {
 			balances: accounts::init_balances().iter().cloned().map(|k| (k, ED * 4096)).collect(),
 			..Default::default()
 		},
-		teyrchain_info: bridge_hub_zagros_runtime::TeyrchainInfoConfig {
+		teyrchain_info: pezbridge_hub_zagros_runtime::TeyrchainInfoConfig {
 			teyrchain_id: PARA_ID.into(),
 			..Default::default()
 		},
-		collator_selection: bridge_hub_zagros_runtime::CollatorSelectionConfig {
+		collator_selection: pezbridge_hub_zagros_runtime::CollatorSelectionConfig {
 			invulnerables: collators::invulnerables().iter().cloned().map(|(acc, _)| acc).collect(),
 			candidacy_bond: ED * 16,
 			..Default::default()
 		},
-		session: bridge_hub_zagros_runtime::SessionConfig {
+		session: pezbridge_hub_zagros_runtime::SessionConfig {
 			keys: collators::invulnerables()
 				.into_iter()
 				.map(|(acc, aura)| {
 					(
 						acc.clone(),                                     // account id
 						acc,                                             // validator id
-						bridge_hub_zagros_runtime::SessionKeys { aura }, // session keys
+						pezbridge_hub_zagros_runtime::SessionKeys { aura }, // session keys
 					)
 				})
 				.collect(),
 			..Default::default()
 		},
-		pezkuwi_xcm: bridge_hub_zagros_runtime::PezkuwiXcmConfig {
+		pezkuwi_xcm: pezbridge_hub_zagros_runtime::PezkuwiXcmConfig {
 			safe_xcm_version: Some(SAFE_XCM_VERSION),
 			..Default::default()
 		},
-		bridge_pezkuwichain_grandpa: bridge_hub_zagros_runtime::BridgePezkuwichainGrandpaConfig {
+		bridge_pezkuwichain_grandpa: pezbridge_hub_zagros_runtime::BridgePezkuwichainGrandpaConfig {
 			owner: Some(Keyring::Bob.to_account_id()),
 			..Default::default()
 		},
-		bridge_pezkuwichain_messages: bridge_hub_zagros_runtime::BridgePezkuwichainMessagesConfig {
+		bridge_pezkuwichain_messages: pezbridge_hub_zagros_runtime::BridgePezkuwichainMessagesConfig {
 			owner: Some(Keyring::Bob.to_account_id()),
 			..Default::default()
 		},
 		xcm_over_bridge_hub_pezkuwichain:
-			bridge_hub_zagros_runtime::XcmOverBridgeHubPezkuwichainConfig {
+			pezbridge_hub_zagros_runtime::XcmOverBridgeHubPezkuwichainConfig {
 				opened_bridges: vec![
 					// open AHW -> AHR bridge
 					(
@@ -84,7 +84,7 @@ pub fn genesis() -> Storage {
 				],
 				..Default::default()
 			},
-		ethereum_system: bridge_hub_zagros_runtime::EthereumSystemConfig {
+		ethereum_system: pezbridge_hub_zagros_runtime::EthereumSystemConfig {
 			para_id: PARA_ID.into(),
 			asset_hub_para_id: ASSETHUB_PARA_ID.into(),
 			..Default::default()
@@ -94,7 +94,7 @@ pub fn genesis() -> Storage {

 	build_genesis_storage(
 		&genesis_config,
-		bridge_hub_zagros_runtime::WASM_BINARY
+		pezbridge_hub_zagros_runtime::WASM_BINARY
 			.expect("WASM binary was not built, please build it!"),
 	)
 }
@@ -15,7 +15,7 @@

 pub mod genesis;

-pub use bridge_hub_zagros_runtime::{
+pub use pezbridge_hub_zagros_runtime::{
 	self, xcm_config::XcmConfig as BridgeHubZagrosXcmConfig,
 	ExistentialDeposit as BridgeHubZagrosExistentialDeposit,
 	RuntimeOrigin as BridgeHubZagrosRuntimeOrigin,
@@ -27,7 +27,7 @@ use pezframe_support::traits::OnInitialize;
 // Pezcumulus
 use emulated_integration_tests_common::{
 	impl_accounts_helpers_for_teyrchain, impl_assert_events_helpers_for_teyrchain,
-	impl_xcm_helpers_for_teyrchain, impls::Teyrchain, xcm_emulator::decl_test_teyrchains,
+	impl_xcm_helpers_for_teyrchain, impls::Teyrchain, xcm_pez_emulator::decl_test_teyrchains,
 	AuraDigestProvider,
 };

@@ -36,24 +36,24 @@ decl_test_teyrchains! {
 	pub struct BridgeHubZagros {
 		genesis = genesis::genesis(),
 		on_init = {
-			bridge_hub_zagros_runtime::AuraExt::on_initialize(1);
+			pezbridge_hub_zagros_runtime::AuraExt::on_initialize(1);
 		},
-		runtime = bridge_hub_zagros_runtime,
+		runtime = pezbridge_hub_zagros_runtime,
 		core = {
-			XcmpMessageHandler: bridge_hub_zagros_runtime::XcmpQueue,
-			LocationToAccountId: bridge_hub_zagros_runtime::xcm_config::LocationToAccountId,
-			TeyrchainInfo: bridge_hub_zagros_runtime::TeyrchainInfo,
+			XcmpMessageHandler: pezbridge_hub_zagros_runtime::XcmpQueue,
+			LocationToAccountId: pezbridge_hub_zagros_runtime::xcm_config::LocationToAccountId,
+			TeyrchainInfo: pezbridge_hub_zagros_runtime::TeyrchainInfo,
 			MessageOrigin: bridge_hub_common::AggregateMessageOrigin,
 			DigestProvider: AuraDigestProvider,
 		},
 		pallets = {
-			PezkuwiXcm: bridge_hub_zagros_runtime::PezkuwiXcm,
-			Balances: bridge_hub_zagros_runtime::Balances,
-			EthereumSystem: bridge_hub_zagros_runtime::EthereumSystem,
-			EthereumInboundQueue: bridge_hub_zagros_runtime::EthereumInboundQueue,
-			EthereumOutboundQueue: bridge_hub_zagros_runtime::EthereumOutboundQueue,
-			EthereumSystemV2: bridge_hub_zagros_runtime::EthereumSystemV2,
-			BridgeRelayers: bridge_hub_zagros_runtime::BridgeRelayers,
+			PezkuwiXcm: pezbridge_hub_zagros_runtime::PezkuwiXcm,
+			Balances: pezbridge_hub_zagros_runtime::Balances,
+			EthereumSystem: pezbridge_hub_zagros_runtime::EthereumSystem,
+			EthereumInboundQueue: pezbridge_hub_zagros_runtime::EthereumInboundQueue,
+			EthereumOutboundQueue: pezbridge_hub_zagros_runtime::EthereumOutboundQueue,
+			EthereumSystemV2: pezbridge_hub_zagros_runtime::EthereumSystemV2,
+			BridgeRelayers: pezbridge_hub_zagros_runtime::BridgeRelayers,
 		}
 	},
 }
@@ -23,7 +23,7 @@ use pezframe_support::traits::OnInitialize;
 // Pezcumulus
 use emulated_integration_tests_common::{
 	impl_accounts_helpers_for_teyrchain, impl_assert_events_helpers_for_teyrchain,
-	impls::Teyrchain, xcm_emulator::decl_test_teyrchains, AuraDigestProvider,
+	impls::Teyrchain, xcm_pez_emulator::decl_test_teyrchains, AuraDigestProvider,
 };

 // CollectivesZagros Teyrchain declaration
@@ -23,7 +23,7 @@ use pezframe_support::traits::OnInitialize;
 // Pezcumulus
 use emulated_integration_tests_common::{
 	impl_accounts_helpers_for_teyrchain, impl_assert_events_helpers_for_teyrchain,
-	impls::Teyrchain, xcm_emulator::decl_test_teyrchains, AuraDigestProvider,
+	impls::Teyrchain, xcm_pez_emulator::decl_test_teyrchains, AuraDigestProvider,
 };

 // CoretimePezkuwichain Teyrchain declaration
@@ -23,7 +23,7 @@ use pezframe_support::traits::OnInitialize;
 // Pezcumulus
 use emulated_integration_tests_common::{
 	impl_accounts_helpers_for_teyrchain, impl_assert_events_helpers_for_teyrchain,
-	impls::Teyrchain, xcm_emulator::decl_test_teyrchains, AuraDigestProvider,
+	impls::Teyrchain, xcm_pez_emulator::decl_test_teyrchains, AuraDigestProvider,
 };

 // CoretimeZagros Teyrchain declaration
@@ -22,7 +22,7 @@ use pezframe_support::traits::OnInitialize;
 // Pezcumulus
 use emulated_integration_tests_common::{
 	impl_accounts_helpers_for_teyrchain, impl_assert_events_helpers_for_teyrchain,
-	impls::Teyrchain, xcm_emulator::decl_test_teyrchains, AuraDigestProvider,
+	impls::Teyrchain, xcm_pez_emulator::decl_test_teyrchains, AuraDigestProvider,
 };

 // PeoplePezkuwichain Teyrchain declaration
@@ -22,7 +22,7 @@ use pezframe_support::traits::OnInitialize;
 // Pezcumulus
 use emulated_integration_tests_common::{
 	impl_accounts_helpers_for_teyrchain, impl_assert_events_helpers_for_teyrchain,
-	impls::Teyrchain, xcm_emulator::decl_test_teyrchains, AuraDigestProvider,
+	impls::Teyrchain, xcm_pez_emulator::decl_test_teyrchains, AuraDigestProvider,
 };

 // PeopleZagros Teyrchain declaration
@@ -1,12 +1,12 @@
 [package]
-name = "penpal-emulated-chain"
+name = "pez-penpal-emulated-chain"
 version = "0.0.0"
 authors.workspace = true
 edition.workspace = true
 license = "Apache-2.0"
 description = "Penpal emulated chain"
 publish = false
-documentation = "https://docs.rs/penpal-emulated-chain"
+documentation = "https://docs.rs/pez-penpal-emulated-chain"
 repository = { workspace = true }
 homepage = { workspace = true }

@@ -25,7 +25,7 @@ xcm = { workspace = true }
 # Pezcumulus
 pezcumulus-primitives-core = { workspace = true }
 emulated-integration-tests-common = { workspace = true }
-penpal-runtime = { workspace = true }
+pez-penpal-runtime = { workspace = true }
 teyrchains-common = { workspace = true, default-features = true }

 [features]
@@ -33,7 +33,7 @@ runtime-benchmarks = [
  "pezcumulus-primitives-core/runtime-benchmarks",
  "emulated-integration-tests-common/runtime-benchmarks",
  "pezframe-support/runtime-benchmarks",
-  "penpal-runtime/runtime-benchmarks",
+  "pez-penpal-runtime/runtime-benchmarks",
  "pezsp-keyring/runtime-benchmarks",
  "teyrchains-common/runtime-benchmarks",
  "xcm/runtime-benchmarks",
@@ -22,12 +22,12 @@ use pezsp_keyring::Sr25519Keyring as Keyring;
 use emulated_integration_tests_common::{
 	accounts, build_genesis_storage, collators, SAFE_XCM_VERSION,
 };
-use penpal_runtime::xcm_config::{LocalReservableFromAssetHub, RelayLocation, UsdtFromAssetHub};
+use pez_penpal_runtime::xcm_config::{LocalReservableFromAssetHub, RelayLocation, UsdtFromAssetHub};
 use teyrchains_common::{AccountId, Balance};
 // Penpal
 pub const PARA_ID_A: u32 = 2000;
 pub const PARA_ID_B: u32 = 2001;
-pub const ED: Balance = penpal_runtime::EXISTENTIAL_DEPOSIT;
+pub const ED: Balance = pez_penpal_runtime::EXISTENTIAL_DEPOSIT;
 pub const USDT_ED: Balance = 70_000;

 parameter_types! {
@@ -36,49 +36,49 @@ parameter_types! {
 }

 pub fn genesis(para_id: u32) -> Storage {
-	let genesis_config = penpal_runtime::RuntimeGenesisConfig {
-		system: penpal_runtime::SystemConfig::default(),
-		balances: penpal_runtime::BalancesConfig {
+	let genesis_config = pez_penpal_runtime::RuntimeGenesisConfig {
+		system: pez_penpal_runtime::SystemConfig::default(),
+		balances: pez_penpal_runtime::BalancesConfig {
 			balances: accounts::init_balances().iter().cloned().map(|k| (k, ED * 4096)).collect(),
 			..Default::default()
 		},
-		teyrchain_info: penpal_runtime::TeyrchainInfoConfig {
+		teyrchain_info: pez_penpal_runtime::TeyrchainInfoConfig {
 			teyrchain_id: para_id.into(),
 			..Default::default()
 		},
-		collator_selection: penpal_runtime::CollatorSelectionConfig {
+		collator_selection: pez_penpal_runtime::CollatorSelectionConfig {
 			invulnerables: collators::invulnerables().iter().cloned().map(|(acc, _)| acc).collect(),
 			candidacy_bond: ED * 16,
 			..Default::default()
 		},
-		session: penpal_runtime::SessionConfig {
+		session: pez_penpal_runtime::SessionConfig {
 			keys: collators::invulnerables()
 				.into_iter()
 				.map(|(acc, aura)| {
 					(
 						acc.clone(),                          // account id
 						acc,                                  // validator id
-						penpal_runtime::SessionKeys { aura }, // session keys
+						pez_penpal_runtime::SessionKeys { aura }, // session keys
 					)
 				})
 				.collect(),
 			..Default::default()
 		},
-		pezkuwi_xcm: penpal_runtime::PezkuwiXcmConfig {
+		pezkuwi_xcm: pez_penpal_runtime::PezkuwiXcmConfig {
 			safe_xcm_version: Some(SAFE_XCM_VERSION),
 			..Default::default()
 		},
-		sudo: penpal_runtime::SudoConfig { key: Some(PenpalSudoAccount::get()) },
-		assets: penpal_runtime::AssetsConfig {
+		sudo: pez_penpal_runtime::SudoConfig { key: Some(PenpalSudoAccount::get()) },
+		assets: pez_penpal_runtime::AssetsConfig {
 			assets: vec![(
-				penpal_runtime::xcm_config::TELEPORTABLE_ASSET_ID,
+				pez_penpal_runtime::xcm_config::TELEPORTABLE_ASSET_ID,
 				PenpalAssetOwner::get(),
 				false,
 				ED,
 			)],
 			..Default::default()
 		},
-		foreign_assets: penpal_runtime::ForeignAssetsConfig {
+		foreign_assets: pez_penpal_runtime::ForeignAssetsConfig {
 			assets: vec![
 				// Relay Native asset representation
 				(RelayLocation::get(), PenpalAssetOwner::get(), true, ED),
@@ -94,6 +94,6 @@ pub fn genesis(para_id: u32) -> Storage {

 	build_genesis_storage(
 		&genesis_config,
-		penpal_runtime::WASM_BINARY.expect("WASM binary was not built, please build it!"),
+		pez_penpal_runtime::WASM_BINARY.expect("WASM binary was not built, please build it!"),
 	)
 }
@@ -13,7 +13,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.

-pub use penpal_runtime::{
+pub use pez_penpal_runtime::{
 	self, xcm_config::RelayNetworkId as PenpalRelayNetworkId, ForeignAssetReserveData,
 };

@@ -30,7 +30,7 @@ use emulated_integration_tests_common::{
 	impl_assets_helpers_for_teyrchain, impl_foreign_assets_helpers_for_teyrchain,
 	impl_xcm_helpers_for_teyrchain,
 	impls::{NetworkId, Teyrchain},
-	xcm_emulator::decl_test_teyrchains,
+	xcm_pez_emulator::decl_test_teyrchains,
 	AuraDigestProvider,
 };

@@ -42,51 +42,51 @@ decl_test_teyrchains! {
 	pub struct PenpalA {
 		genesis = genesis(PARA_ID_A),
 		on_init = {
-			penpal_runtime::AuraExt::on_initialize(1);
-			pezframe_support::assert_ok!(penpal_runtime::System::set_storage(
-				penpal_runtime::RuntimeOrigin::root(),
+			pez_penpal_runtime::AuraExt::on_initialize(1);
+			pezframe_support::assert_ok!(pez_penpal_runtime::System::set_storage(
+				pez_penpal_runtime::RuntimeOrigin::root(),
 				vec![(PenpalRelayNetworkId::key().to_vec(), NetworkId::ByGenesis(PEZKUWICHAIN_GENESIS_HASH).encode())],
 			));
 		},
-		runtime = penpal_runtime,
+		runtime = pez_penpal_runtime,
 		core = {
-			XcmpMessageHandler: penpal_runtime::XcmpQueue,
-			LocationToAccountId: penpal_runtime::xcm_config::LocationToAccountId,
-			TeyrchainInfo: penpal_runtime::TeyrchainInfo,
+			XcmpMessageHandler: pez_penpal_runtime::XcmpQueue,
+			LocationToAccountId: pez_penpal_runtime::xcm_config::LocationToAccountId,
+			TeyrchainInfo: pez_penpal_runtime::TeyrchainInfo,
 			MessageOrigin: pezcumulus_primitives_core::AggregateMessageOrigin,
 			DigestProvider: AuraDigestProvider,
 		},
 		pallets = {
-			PezkuwiXcm: penpal_runtime::PezkuwiXcm,
-			Assets: penpal_runtime::Assets,
-			ForeignAssets: penpal_runtime::ForeignAssets,
-			AssetConversion: penpal_runtime::AssetConversion,
-			Balances: penpal_runtime::Balances,
+			PezkuwiXcm: pez_penpal_runtime::PezkuwiXcm,
+			Assets: pez_penpal_runtime::Assets,
+			ForeignAssets: pez_penpal_runtime::ForeignAssets,
+			AssetConversion: pez_penpal_runtime::AssetConversion,
+			Balances: pez_penpal_runtime::Balances,
 		}
 	},
 	pub struct PenpalB {
 		genesis = genesis(PARA_ID_B),
 		on_init = {
-			penpal_runtime::AuraExt::on_initialize(1);
-			pezframe_support::assert_ok!(penpal_runtime::System::set_storage(
-				penpal_runtime::RuntimeOrigin::root(),
+			pez_penpal_runtime::AuraExt::on_initialize(1);
+			pezframe_support::assert_ok!(pez_penpal_runtime::System::set_storage(
+				pez_penpal_runtime::RuntimeOrigin::root(),
 				vec![(PenpalRelayNetworkId::key().to_vec(), NetworkId::ByGenesis(ZAGROS_GENESIS_HASH).encode())],
 			));
 		},
-		runtime = penpal_runtime,
+		runtime = pez_penpal_runtime,
 		core = {
-			XcmpMessageHandler: penpal_runtime::XcmpQueue,
-			LocationToAccountId: penpal_runtime::xcm_config::LocationToAccountId,
-			TeyrchainInfo: penpal_runtime::TeyrchainInfo,
+			XcmpMessageHandler: pez_penpal_runtime::XcmpQueue,
+			LocationToAccountId: pez_penpal_runtime::xcm_config::LocationToAccountId,
+			TeyrchainInfo: pez_penpal_runtime::TeyrchainInfo,
 			MessageOrigin: pezcumulus_primitives_core::AggregateMessageOrigin,
 			DigestProvider: AuraDigestProvider,
 		},
 		pallets = {
-			PezkuwiXcm: penpal_runtime::PezkuwiXcm,
-			Assets: penpal_runtime::Assets,
-			ForeignAssets: penpal_runtime::ForeignAssets,
-			AssetConversion: penpal_runtime::AssetConversion,
-			Balances: penpal_runtime::Balances,
+			PezkuwiXcm: pez_penpal_runtime::PezkuwiXcm,
+			Assets: pez_penpal_runtime::Assets,
+			ForeignAssets: pez_penpal_runtime::ForeignAssets,
+			AssetConversion: pez_penpal_runtime::AssetConversion,
+			Balances: pez_penpal_runtime::Balances,
 		}
 	},
 }
@@ -4,7 +4,7 @@ version = "3.0.0"
 authors.workspace = true
 edition.workspace = true
 license = "Apache-2.0"
-description = "Common resources for integration testing with xcm-emulator"
+description = "Common resources for integration testing with xcm-pez-emulator"
 homepage.workspace = true
 repository.workspace = true
 documentation = "https://docs.rs/emulated-integration-tests-common"
@@ -44,16 +44,16 @@ pezkuwi-teyrchain-primitives = { workspace = true, default-features = true }
 xcm = { workspace = true, default-features = true }
 xcm-builder = { workspace = true, default-features = true }
 xcm-executor = { workspace = true, default-features = true }
-xcm-runtime-apis = { workspace = true, default-features = true }
-xcm-simulator = { workspace = true, default-features = true }
+xcm-runtime-pezapis = { workspace = true, default-features = true }
+xcm-pez-simulator = { workspace = true, default-features = true }

 # Pezcumulus
-asset-test-utils = { workspace = true, default-features = true }
+asset-test-pezutils = { workspace = true, default-features = true }
 pezcumulus-pezpallet-teyrchain-system = { workspace = true, default-features = true }
 pezcumulus-pezpallet-xcmp-queue = { workspace = true, default-features = true }
 pezcumulus-primitives-core = { workspace = true, default-features = true }
 teyrchains-common = { workspace = true, default-features = true }
-xcm-emulator = { workspace = true, default-features = true }
+xcm-pez-emulator = { workspace = true, default-features = true }

 # Bridges
 bp-messages = { workspace = true, default-features = true }
@@ -63,7 +63,7 @@ pezpallet-xcm-bridge-hub = { workspace = true, default-features = true }

 [features]
 runtime-benchmarks = [
-  "asset-test-utils/runtime-benchmarks",
+  "asset-test-pezutils/runtime-benchmarks",
  "bp-messages/runtime-benchmarks",
  "bp-xcm-bridge-hub/runtime-benchmarks",
  "pezcumulus-pezpallet-teyrchain-system/runtime-benchmarks",
@@ -90,9 +90,9 @@ runtime-benchmarks = [
  "pezsp-runtime/runtime-benchmarks",
  "teyrchains-common/runtime-benchmarks",
  "xcm-builder/runtime-benchmarks",
-  "xcm-emulator/runtime-benchmarks",
+  "xcm-pez-emulator/runtime-benchmarks",
  "xcm-executor/runtime-benchmarks",
-  "xcm-runtime-apis/runtime-benchmarks",
-  "xcm-simulator/runtime-benchmarks",
+  "xcm-runtime-pezapis/runtime-benchmarks",
+  "xcm-pez-simulator/runtime-benchmarks",
  "xcm/runtime-benchmarks",
 ]
@@ -46,14 +46,14 @@ pub use xcm::{
 };

 // Pezcumulus
-pub use pezcumulus_pallet_teyrchain_system;
-pub use pezcumulus_pallet_xcmp_queue;
+pub use pezcumulus_pezpallet_teyrchain_system;
+pub use pezcumulus_pezpallet_xcmp_queue;
 pub use pezcumulus_primitives_core::{
 	relay_chain::HrmpChannelId, DmpMessageHandler, Junction, Junctions, NetworkId, ParaId,
 	XcmpMessageHandler,
 };
 pub use teyrchains_common::{AccountId, Balance};
-pub use xcm_emulator::{
+pub use xcm_pez_emulator::{
 	assert_expected_events, bx, helpers::weight_within_threshold, BridgeLaneId, BridgeMessage,
 	BridgeMessageDispatchError, BridgeMessageHandler, Chain, Network, RelayChain, TestExt,
 	Teyrchain,
@@ -516,7 +516,7 @@ macro_rules! impl_assert_events_helpers_for_teyrchain {
 						Self,
 						vec![
 							[<$chain RuntimeEvent>]::<N>::TeyrchainSystem(
-								$crate::impls::pezcumulus_pallet_teyrchain_system::Event::UpwardMessageSent { .. }
+								$crate::impls::pezcumulus_pezpallet_teyrchain_system::Event::UpwardMessageSent { .. }
 							) => {},
 						]
 					);
@@ -19,8 +19,8 @@ pub mod xcm_helpers;

 use codec::Encode;
 use pezcumulus_primitives_core::relay_chain::Slot;
-pub use xcm_emulator;
-pub use xcm_simulator;
+pub use xcm_pez_emulator;
+pub use xcm_pez_simulator;

 // Bizinikiwi
 use pezframe_support::parameter_types;
@@ -41,7 +41,7 @@ use teyrchains_common::BlockNumber;
 use pezkuwi_primitives::{AssignmentId, ValidatorId};
 use pezsp_runtime::traits::Convert;
 use teyrchains_common::{AccountId, AuraId};
-use xcm_emulator::{RelayBlockNumber, AURA_ENGINE_ID};
+use xcm_pez_emulator::{RelayBlockNumber, AURA_ENGINE_ID};

 pub const XCM_V2: u32 = 2;
 pub const XCM_V3: u32 = 3;
@@ -42,10 +42,10 @@ pub use xcm::{
 pub use xcm_executor::traits::{DropAssets, TransferType};

 // Pezcumulus
-pub use asset_test_utils;
-pub use pezcumulus_pallet_xcmp_queue;
+pub use asset_test_pezutils;
+pub use pezcumulus_pezpallet_xcmp_queue;
 pub use teyrchains_common::AccountId;
-pub use xcm_emulator::{
+pub use xcm_pez_emulator::{
 	assert_expected_events, Chain, RelayChain, TestArgs, TestContext, TestExt, Teyrchain as Para,
 };

@@ -53,7 +53,7 @@ pub use pezframe_support::{
 	dispatch::{GetDispatchInfo, RawOrigin},
 	BoundedVec,
 };
-pub use xcm_runtime_apis::{
+pub use xcm_runtime_pezapis::{
 	dry_run::runtime_decl_for_dry_run_api::DryRunApiV2,
 	fees::{runtime_decl_for_xcm_payment_api::XcmPaymentApiV2, Error as XcmPaymentApiError},
 };
@@ -162,7 +162,7 @@ macro_rules! test_teyrchain_is_trusted_teleporter {
 									$crate::macros::pezpallet_xcm::Event::Attempted { outcome: $crate::macros::Outcome::Complete { .. } }
 								) => {},
 								RuntimeEvent::XcmpQueue(
-									$crate::macros::pezcumulus_pallet_xcmp_queue::Event::XcmpMessageSent { .. }
+									$crate::macros::pezcumulus_pezpallet_xcmp_queue::Event::XcmpMessageSent { .. }
 								) => {},
 								RuntimeEvent::Balances(
 									$crate::macros::pezpallet_balances::Event::Burned { who: sender, amount }
@@ -662,7 +662,7 @@ macro_rules! test_can_estimate_and_pay_exact_fees {
 			let asset_owner = [<$owner_prefix AssetOwner>]::get();

 			// Fund teyrchain's sender account.
-			// TODO: consider mint_foreign_asset to be part of xcm_emulator::Chain trait
+			// TODO: consider mint_foreign_asset to be part of xcm_pez_emulator::Chain trait
 			$sender_para::mint_foreign_asset(
 				<$sender_para as $crate::macros::Chain>::RuntimeOrigin::signed(asset_owner.clone()),
 				$asset_id.clone().into(),
@@ -671,7 +671,7 @@ macro_rules! test_can_estimate_and_pay_exact_fees {
 			);

 			// Fund the teyrchain origin's SA on Asset Hub with the native tokens.
-			// TODO: consider fund_accounts to be part of xcm_emulator::Chain trait
+			// TODO: consider fund_accounts to be part of xcm_pez_emulator::Chain trait
 			$asset_hub::fund_accounts(vec![(sov_of_sender_on_ah.clone(), $amount * 2)]);

 			let beneficiary_id = [<$receiver_para Receiver>]::get();
@@ -19,7 +19,7 @@ use teyrchains_common::AccountId;
 // Pezkuwi
 use pezsp_core::H256;
 use xcm::{prelude::*, DoubleEncoded};
-use xcm_emulator::Chain;
+use xcm_pez_emulator::Chain;

 use crate::impls::{bx, Encode};
 use pezframe_support::dispatch::{DispatchResultWithPostInfo, PostDispatchInfo};
@@ -16,20 +16,20 @@ workspace = true
 [dependencies]
 # Pezcumulus
 asset-hub-pezkuwichain-emulated-chain = { workspace = true }
-bridge-hub-pezkuwichain-emulated-chain = { workspace = true }
+pezbridge-hub-pezkuwichain-emulated-chain = { workspace = true }
 coretime-pezkuwichain-emulated-chain = { workspace = true }
 emulated-integration-tests-common = { workspace = true }
-penpal-emulated-chain = { workspace = true }
+pez-penpal-emulated-chain = { workspace = true }
 people-pezkuwichain-emulated-chain = { workspace = true }
 pezkuwichain-emulated-chain = { workspace = true }

 [features]
 runtime-benchmarks = [
  "asset-hub-pezkuwichain-emulated-chain/runtime-benchmarks",
-  "bridge-hub-pezkuwichain-emulated-chain/runtime-benchmarks",
+  "pezbridge-hub-pezkuwichain-emulated-chain/runtime-benchmarks",
  "coretime-pezkuwichain-emulated-chain/runtime-benchmarks",
  "emulated-integration-tests-common/runtime-benchmarks",
-  "penpal-emulated-chain/runtime-benchmarks",
+  "pez-penpal-emulated-chain/runtime-benchmarks",
  "people-pezkuwichain-emulated-chain/runtime-benchmarks",
  "pezkuwichain-emulated-chain/runtime-benchmarks",
 ]
@@ -14,23 +14,23 @@
 // limitations under the License.

 pub use asset_hub_pezkuwichain_emulated_chain;
-pub use bridge_hub_pezkuwichain_emulated_chain;
+pub use pezbridge_hub_pezkuwichain_emulated_chain;
 pub use coretime_pezkuwichain_emulated_chain;
-pub use penpal_emulated_chain;
+pub use pez_penpal_emulated_chain;
 pub use people_pezkuwichain_emulated_chain;
 pub use pezkuwichain_emulated_chain;

 use asset_hub_pezkuwichain_emulated_chain::AssetHubPezkuwichain;
-use bridge_hub_pezkuwichain_emulated_chain::BridgeHubPezkuwichain;
+use pezbridge_hub_pezkuwichain_emulated_chain::BridgeHubPezkuwichain;
 use coretime_pezkuwichain_emulated_chain::CoretimePezkuwichain;
-use penpal_emulated_chain::{PenpalA, PenpalB};
+use pez_penpal_emulated_chain::{PenpalA, PenpalB};
 use people_pezkuwichain_emulated_chain::PeoplePezkuwichain;
 use pezkuwichain_emulated_chain::Pezkuwichain;

 // Pezcumulus
 use emulated_integration_tests_common::{
 	accounts::{ALICE, BOB},
-	xcm_emulator::{decl_test_networks, decl_test_sender_receiver_accounts_parameter_types},
+	xcm_pez_emulator::{decl_test_networks, decl_test_sender_receiver_accounts_parameter_types},
 };

 decl_test_networks! {
@@ -17,10 +17,10 @@ workspace = true
 # Pezcumulus
 asset-hub-pezkuwichain-emulated-chain = { workspace = true }
 asset-hub-zagros-emulated-chain = { workspace = true }
-bridge-hub-pezkuwichain-emulated-chain = { workspace = true }
-bridge-hub-zagros-emulated-chain = { workspace = true }
+pezbridge-hub-pezkuwichain-emulated-chain = { workspace = true }
+pezbridge-hub-zagros-emulated-chain = { workspace = true }
 emulated-integration-tests-common = { workspace = true }
-penpal-emulated-chain = { workspace = true }
+pez-penpal-emulated-chain = { workspace = true }
 pezkuwichain-emulated-chain = { workspace = true }
 zagros-emulated-chain = { workspace = true, default-features = true }

@@ -28,10 +28,10 @@ zagros-emulated-chain = { workspace = true, default-features = true }
 runtime-benchmarks = [
  "asset-hub-pezkuwichain-emulated-chain/runtime-benchmarks",
  "asset-hub-zagros-emulated-chain/runtime-benchmarks",
-  "bridge-hub-pezkuwichain-emulated-chain/runtime-benchmarks",
-  "bridge-hub-zagros-emulated-chain/runtime-benchmarks",
+  "pezbridge-hub-pezkuwichain-emulated-chain/runtime-benchmarks",
+  "pezbridge-hub-zagros-emulated-chain/runtime-benchmarks",
  "emulated-integration-tests-common/runtime-benchmarks",
-  "penpal-emulated-chain/runtime-benchmarks",
+  "pez-penpal-emulated-chain/runtime-benchmarks",
  "pezkuwichain-emulated-chain/runtime-benchmarks",
  "zagros-emulated-chain/runtime-benchmarks",
 ]
@@ -15,17 +15,17 @@

 pub use asset_hub_pezkuwichain_emulated_chain;
 pub use asset_hub_zagros_emulated_chain;
-pub use bridge_hub_pezkuwichain_emulated_chain;
-pub use bridge_hub_zagros_emulated_chain;
-pub use penpal_emulated_chain;
+pub use pezbridge_hub_pezkuwichain_emulated_chain;
+pub use pezbridge_hub_zagros_emulated_chain;
+pub use pez_penpal_emulated_chain;
 pub use pezkuwichain_emulated_chain;
 pub use zagros_emulated_chain;

 use asset_hub_pezkuwichain_emulated_chain::AssetHubPezkuwichain;
 use asset_hub_zagros_emulated_chain::AssetHubZagros;
-use bridge_hub_pezkuwichain_emulated_chain::BridgeHubPezkuwichain;
-use bridge_hub_zagros_emulated_chain::BridgeHubZagros;
-use penpal_emulated_chain::{PenpalA, PenpalB};
+use pezbridge_hub_pezkuwichain_emulated_chain::BridgeHubPezkuwichain;
+use pezbridge_hub_zagros_emulated_chain::BridgeHubZagros;
+use pez_penpal_emulated_chain::{PenpalA, PenpalB};
 use pezkuwichain_emulated_chain::Pezkuwichain;
 use zagros_emulated_chain::Zagros;

@@ -33,7 +33,7 @@ use zagros_emulated_chain::Zagros;
 use emulated_integration_tests_common::{
 	accounts::{ALICE, BOB},
 	impls::{BridgeHubMessageHandler, BridgeMessagesInstance1, BridgeMessagesInstance3},
-	xcm_emulator::{
+	xcm_pez_emulator::{
 		decl_test_bridges, decl_test_networks, decl_test_sender_receiver_accounts_parameter_types,
 		Chain,
 	},
@@ -16,22 +16,22 @@ workspace = true
 [dependencies]
 # Pezcumulus
 asset-hub-zagros-emulated-chain = { workspace = true }
-bridge-hub-zagros-emulated-chain = { workspace = true }
+pezbridge-hub-zagros-emulated-chain = { workspace = true }
 collectives-zagros-emulated-chain = { workspace = true }
 coretime-zagros-emulated-chain = { workspace = true }
 emulated-integration-tests-common = { workspace = true }
-penpal-emulated-chain = { workspace = true }
+pez-penpal-emulated-chain = { workspace = true }
 people-zagros-emulated-chain = { workspace = true }
 zagros-emulated-chain = { workspace = true }

 [features]
 runtime-benchmarks = [
  "asset-hub-zagros-emulated-chain/runtime-benchmarks",
-  "bridge-hub-zagros-emulated-chain/runtime-benchmarks",
+  "pezbridge-hub-zagros-emulated-chain/runtime-benchmarks",
  "collectives-zagros-emulated-chain/runtime-benchmarks",
  "coretime-zagros-emulated-chain/runtime-benchmarks",
  "emulated-integration-tests-common/runtime-benchmarks",
-  "penpal-emulated-chain/runtime-benchmarks",
+  "pez-penpal-emulated-chain/runtime-benchmarks",
  "people-zagros-emulated-chain/runtime-benchmarks",
  "zagros-emulated-chain/runtime-benchmarks",
 ]
@@ -14,25 +14,25 @@
 // limitations under the License.

 pub use asset_hub_zagros_emulated_chain;
-pub use bridge_hub_zagros_emulated_chain;
+pub use pezbridge_hub_zagros_emulated_chain;
 pub use collectives_zagros_emulated_chain;
 pub use coretime_zagros_emulated_chain;
-pub use penpal_emulated_chain;
+pub use pez_penpal_emulated_chain;
 pub use people_zagros_emulated_chain;
 pub use zagros_emulated_chain;

 use asset_hub_zagros_emulated_chain::AssetHubZagros;
-use bridge_hub_zagros_emulated_chain::BridgeHubZagros;
+use pezbridge_hub_zagros_emulated_chain::BridgeHubZagros;
 use collectives_zagros_emulated_chain::CollectivesZagros;
 use coretime_zagros_emulated_chain::CoretimeZagros;
-use penpal_emulated_chain::{PenpalA, PenpalB};
+use pez_penpal_emulated_chain::{PenpalA, PenpalB};
 use people_zagros_emulated_chain::PeopleZagros;
 use zagros_emulated_chain::Zagros;

 // Pezcumulus
 use emulated_integration_tests_common::{
 	accounts::{ALICE, BOB},
-	xcm_emulator::{decl_test_networks, decl_test_sender_receiver_accounts_parameter_types},
+	xcm_pez_emulator::{decl_test_networks, decl_test_sender_receiver_accounts_parameter_types},
 };

 decl_test_networks! {
@@ -4,7 +4,7 @@ version = "1.0.0"
 authors.workspace = true
 edition.workspace = true
 license = "Apache-2.0"
-description = "Asset Hub Pezkuwichain runtime integration tests with xcm-emulator"
+description = "Asset Hub Pezkuwichain runtime integration tests with xcm-pez-emulator"
 publish = false
 documentation = "https://docs.rs/asset-hub-pezkuwichain-integration-tests"
 repository = { workspace = true }
@@ -36,10 +36,10 @@ pezkuwi-runtime-common = { workspace = true, default-features = true }
 pezkuwichain-runtime-constants = { workspace = true, default-features = true }
 xcm = { workspace = true }
 xcm-executor = { workspace = true }
-xcm-runtime-apis = { workspace = true, default-features = true }
+xcm-runtime-pezapis = { workspace = true, default-features = true }

 # Pezcumulus
-asset-test-utils = { workspace = true, default-features = true }
+asset-test-pezutils = { workspace = true, default-features = true }
 pezcumulus-pezpallet-teyrchain-system = { workspace = true }
 emulated-integration-tests-common = { workspace = true }
 pezkuwichain-system-emulated-network = { workspace = true }
@@ -47,7 +47,7 @@ teyrchains-common = { workspace = true, default-features = true }

 [features]
 runtime-benchmarks = [
-  "asset-test-utils/runtime-benchmarks",
+  "asset-test-pezutils/runtime-benchmarks",
  "pezcumulus-pezpallet-teyrchain-system/runtime-benchmarks",
  "emulated-integration-tests-common/runtime-benchmarks",
  "pezframe-support/runtime-benchmarks",
@@ -66,6 +66,6 @@ runtime-benchmarks = [
  "pezsp-runtime/runtime-benchmarks",
  "teyrchains-common/runtime-benchmarks",
  "xcm-executor/runtime-benchmarks",
-  "xcm-runtime-apis/runtime-benchmarks",
+  "xcm-runtime-pezapis/runtime-benchmarks",
  "xcm/runtime-benchmarks",
 ]
@@ -33,13 +33,13 @@ mod imports {
 	pub(crate) use xcm_executor::traits::TransferType;

 	// Pezcumulus
-	pub(crate) use asset_test_utils::xcm_helpers;
+	pub(crate) use asset_test_pezutils::xcm_helpers;
 	pub(crate) use emulated_integration_tests_common::{
 		accounts::DUMMY_EMPTY,
 		test_relay_is_trusted_teleporter, test_teyrchain_is_trusted_teleporter,
 		test_teyrchain_is_trusted_teleporter_for_relay,
 		test_xcm_fee_querying_apis_work_for_asset_hub,
-		xcm_emulator::{
+		xcm_pez_emulator::{
 			assert_expected_events, bx, Chain, RelayChain as Relay, Test, TestArgs, TestContext,
 			TestExt, Teyrchain as Para,
 		},
@@ -62,8 +62,8 @@ mod imports {
 			genesis::{AssetHubPezkuwichainAssetOwner, ED as ASSET_HUB_PEZKUWICHAIN_ED},
 			AssetHubPezkuwichainParaPallet as AssetHubPezkuwichainPallet,
 		},
-		penpal_emulated_chain::{
-			penpal_runtime::xcm_config::{
+		pez_penpal_emulated_chain::{
+			pez_penpal_runtime::xcm_config::{
 				CustomizableAssetFromSystemAssetHub as PenpalCustomizableAssetFromSystemAssetHub,
 				LocalReservableFromAssetHub as PenpalLocalReservableFromAssetHub,
 				LocalTeleportableToAssetHub as PenpalLocalTeleportableToAssetHub,
@@ -159,7 +159,7 @@ fn spend_roc_on_asset_hub() {
 			AssetHubPezkuwichain,
 			vec![
 				RuntimeEvent::Balances(pezpallet_balances::Event::Transfer { .. }) => {},
-				RuntimeEvent::TeyrchainSystem(pezcumulus_pallet_teyrchain_system::Event::UpwardMessageSent { .. }) => {},
+				RuntimeEvent::TeyrchainSystem(pezcumulus_pezpallet_teyrchain_system::Event::UpwardMessageSent { .. }) => {},
 				RuntimeEvent::MessageQueue(pezpallet_message_queue::Event::Processed { success: true ,.. }) => {},
 			]
 		);
@@ -240,7 +240,7 @@ fn create_and_claim_treasury_spend_in_usdt() {
 					to: to == &alice,
 					amount: amount == &SPEND_AMOUNT,
 				},
-				RuntimeEvent::TeyrchainSystem(pezcumulus_pallet_teyrchain_system::Event::UpwardMessageSent { .. }) => {},
+				RuntimeEvent::TeyrchainSystem(pezcumulus_pezpallet_teyrchain_system::Event::UpwardMessageSent { .. }) => {},
 				RuntimeEvent::MessageQueue(pezpallet_message_queue::Event::Processed { success: true ,.. }) => {},
 			]
 		);
@@ -18,7 +18,7 @@
 use crate::imports::*;
 use emulated_integration_tests_common::test_can_estimate_and_pay_exact_fees;
 use pezframe_support::dispatch::RawOrigin;
-use xcm_runtime_apis::{
+use xcm_runtime_pezapis::{
 	dry_run::runtime_decl_for_dry_run_api::DryRunApiV2,
 	fees::runtime_decl_for_xcm_payment_api::XcmPaymentApiV2,
 };
@@ -4,7 +4,7 @@ version = "1.0.0"
 authors.workspace = true
 edition.workspace = true
 license = "Apache-2.0"
-description = "Asset Hub Zagros runtime integration tests with xcm-emulator"
+description = "Asset Hub Zagros runtime integration tests with xcm-pez-emulator"
 publish = false
 documentation = "https://docs.rs/asset-hub-zagros-integration-tests"
 repository = { workspace = true }
@@ -35,10 +35,10 @@ pezkuwi-runtime-common = { workspace = true, default-features = true }
 xcm = { workspace = true }
 xcm-builder = { workspace = true }
 xcm-executor = { workspace = true }
-xcm-runtime-apis = { workspace = true }
+xcm-runtime-pezapis = { workspace = true }

 # Pezcumulus
-asset-test-utils = { workspace = true, default-features = true }
+asset-test-pezutils = { workspace = true, default-features = true }
 pezcumulus-pezpallet-teyrchain-system = { workspace = true }
 pezcumulus-pezpallet-xcmp-queue = { workspace = true }
 emulated-integration-tests-common = { workspace = true }
@@ -50,7 +50,7 @@ pezsp-tracing = { workspace = true, default-features = true }

 [features]
 runtime-benchmarks = [
-  "asset-test-utils/runtime-benchmarks",
+  "asset-test-pezutils/runtime-benchmarks",
  "pezcumulus-pezpallet-teyrchain-system/runtime-benchmarks",
  "pezcumulus-pezpallet-xcmp-queue/runtime-benchmarks",
  "emulated-integration-tests-common/runtime-benchmarks",
@@ -68,7 +68,7 @@ runtime-benchmarks = [
  "teyrchains-common/runtime-benchmarks",
  "xcm-builder/runtime-benchmarks",
  "xcm-executor/runtime-benchmarks",
-  "xcm-runtime-apis/runtime-benchmarks",
+  "xcm-runtime-pezapis/runtime-benchmarks",
  "xcm/runtime-benchmarks",
  "zagros-system-emulated-network/runtime-benchmarks",
 ]
@@ -34,13 +34,13 @@ mod imports {
 	pub(crate) use xcm_executor::traits::TransferType;

 	// Pezcumulus
-	pub(crate) use asset_test_utils::xcm_helpers;
+	pub(crate) use asset_test_pezutils::xcm_helpers;
 	pub(crate) use emulated_integration_tests_common::{
 		accounts::DUMMY_EMPTY,
 		test_relay_is_trusted_teleporter, test_teyrchain_is_trusted_teleporter,
 		test_teyrchain_is_trusted_teleporter_for_relay,
 		test_xcm_fee_querying_apis_work_for_asset_hub,
-		xcm_emulator::{
+		xcm_pez_emulator::{
 			assert_expected_events, bx, Chain, RelayChain as Relay, Test, TestArgs, TestContext,
 			TestExt, Teyrchain as Para,
 		},
@@ -48,7 +48,7 @@ mod imports {
 			fee_asset, find_mq_processed_id, find_xcm_sent_message_id,
 			get_amount_from_versioned_assets, non_fee_asset, xcm_transact_paid_execution,
 		},
-		xcm_simulator::helpers::TopicIdTracker,
+		xcm_pez_simulator::helpers::TopicIdTracker,
 		PenpalATeleportableAssetLocation, ASSETS_PALLET_ID, RESERVABLE_ASSET_ID, USDT_ID, XCM_V3,
 	};
 	pub(crate) use teyrchains_common::{AccountId, Balance};
@@ -67,14 +67,14 @@ mod imports {
 			genesis::{AssetHubZagrosAssetOwner, ED as ASSET_HUB_ZAGROS_ED},
 			AssetHubZagrosParaPallet as AssetHubZagrosPallet,
 		},
-		bridge_hub_zagros_emulated_chain::{
-			bridge_hub_zagros_runtime::xcm_config::{self as bhw_xcm_config},
+		pezbridge_hub_zagros_emulated_chain::{
+			pezbridge_hub_zagros_runtime::xcm_config::{self as bhw_xcm_config},
 			BridgeHubZagrosParaPallet as BridgeHubZagrosPallet,
 		},
 		collectives_zagros_emulated_chain::CollectivesZagrosParaPallet as CollectivesZagrosPallet,
 		coretime_zagros_emulated_chain::CoretimeZagrosParaPallet as CoretimeZagrosPallet,
-		penpal_emulated_chain::{
-			penpal_runtime::xcm_config::{
+		pez_penpal_emulated_chain::{
+			pez_penpal_runtime::xcm_config::{
 				CustomizableAssetFromSystemAssetHub as PenpalCustomizableAssetFromSystemAssetHub,
 				LocalReservableFromAssetHub as PenpalLocalReservableFromAssetHub,
 				LocalTeleportableToAssetHub as PenpalLocalTeleportableToAssetHub,
@@ -23,7 +23,7 @@ use crate::{
 use asset_hub_zagros_runtime::{
 	xcm_config::ZagrosLocation, Balances, ForeignAssets, PezkuwiXcm, RuntimeOrigin,
 };
-use emulated_integration_tests_common::{accounts::ALICE, xcm_emulator::TestExt};
+use emulated_integration_tests_common::{accounts::ALICE, xcm_pez_emulator::TestExt};
 use pezframe_support::{
 	assert_err_ignore_postinfo, assert_ok,
 	traits::fungible::{Inspect, Mutate},
@@ -96,7 +96,7 @@ fn create_and_claim_treasury_spend() {
 					to: to == &alice,
 					amount: amount == &SPEND_AMOUNT,
 				},
-				RuntimeEvent::XcmpQueue(pezcumulus_pallet_xcmp_queue::Event::XcmpMessageSent { .. }) => {},
+				RuntimeEvent::XcmpQueue(pezcumulus_pezpallet_xcmp_queue::Event::XcmpMessageSent { .. }) => {},
 				RuntimeEvent::MessageQueue(pezpallet_message_queue::Event::Processed { success: true ,.. }) => {},
 			]
 		);
@@ -24,7 +24,7 @@ use pezframe_support::{assert_ok, pezsp_runtime::traits::Dispatchable};
 use xcm_executor::traits::ConvertLocation;
 use zagros_system_emulated_network::{
 	asset_hub_zagros_emulated_chain::asset_hub_zagros_runtime::RuntimeOrigin as AssetHubRuntimeOrigin,
-	bridge_hub_zagros_emulated_chain::bridge_hub_zagros_runtime::RuntimeOrigin as BridgeHubRuntimeOrigin,
+	pezbridge_hub_zagros_emulated_chain::pezbridge_hub_zagros_runtime::RuntimeOrigin as BridgeHubRuntimeOrigin,
 };

 #[test]
@@ -97,7 +97,7 @@ fn create_and_claim_treasury_spend() {
 					to: to == &alice,
 					amount: amount == &SPEND_AMOUNT,
 				},
-				RuntimeEvent::TeyrchainSystem(pezcumulus_pallet_teyrchain_system::Event::UpwardMessageSent { .. }) => {},
+				RuntimeEvent::TeyrchainSystem(pezcumulus_pezpallet_teyrchain_system::Event::UpwardMessageSent { .. }) => {},
 				RuntimeEvent::MessageQueue(pezpallet_message_queue::Event::Processed { success: true ,.. }) => {},
 			]
 		);
@@ -19,7 +19,7 @@ use crate::{create_pool_with_wnd_on, imports::*};

 use emulated_integration_tests_common::test_can_estimate_and_pay_exact_fees;
 use pezframe_support::dispatch::RawOrigin;
-use xcm_runtime_apis::{
+use xcm_runtime_pezapis::{
 	dry_run::runtime_decl_for_dry_run_api::DryRunApiV2,
 	fees::runtime_decl_for_xcm_payment_api::XcmPaymentApiV2,
 };
@@ -1,12 +1,12 @@
 [package]
-name = "bridge-hub-pezkuwichain-integration-tests"
+name = "pezbridge-hub-pezkuwichain-integration-tests"
 version = "1.0.0"
 authors.workspace = true
 edition.workspace = true
 license = "Apache-2.0"
-description = "Bridge Hub Pezkuwichain runtime integration tests with xcm-emulator"
+description = "Bridge Hub Pezkuwichain runtime integration tests with xcm-pez-emulator"
 publish = false
-documentation = "https://docs.rs/bridge-hub-pezkuwichain-integration-tests"
+documentation = "https://docs.rs/pezbridge-hub-pezkuwichain-integration-tests"
 repository = { workspace = true }
 homepage = { workspace = true }

@@ -50,8 +50,8 @@ testnet-teyrchains-constants = { features = [
 teyrchains-common = { workspace = true, default-features = true }

 # Snowbridge
-snowbridge-inbound-queue-primitives = { workspace = true }
-snowbridge-outbound-queue-primitives = { workspace = true }
+pezsnowbridge-inbound-queue-primitives = { workspace = true }
+pezsnowbridge-outbound-queue-primitives = { workspace = true }
 snowbridge-pezpallet-inbound-queue-fixtures = { workspace = true, default-features = true }
 snowbridge-pezpallet-outbound-queue = { workspace = true }
 snowbridge-pezpallet-system = { workspace = true }
@@ -71,8 +71,8 @@ runtime-benchmarks = [
  "pezpallet-xcm/runtime-benchmarks",
  "pezkuwichain-system-emulated-network/runtime-benchmarks",
  "pezkuwichain-zagros-system-emulated-network/runtime-benchmarks",
-  "snowbridge-inbound-queue-primitives/runtime-benchmarks",
-  "snowbridge-outbound-queue-primitives/runtime-benchmarks",
+  "pezsnowbridge-inbound-queue-primitives/runtime-benchmarks",
+  "pezsnowbridge-outbound-queue-primitives/runtime-benchmarks",
  "snowbridge-pezpallet-inbound-queue-fixtures/runtime-benchmarks",
  "snowbridge-pezpallet-outbound-queue/runtime-benchmarks",
  "snowbridge-pezpallet-system/runtime-benchmarks",
@@ -34,7 +34,7 @@ mod imports {
 		impls::Inspect,
 		test_dry_run_transfer_across_pk_bridge, test_relay_is_trusted_teleporter,
 		test_teyrchain_is_trusted_teleporter, test_teyrchain_is_trusted_teleporter_for_relay,
-		xcm_emulator::{
+		xcm_pez_emulator::{
 			assert_expected_events, bx, Chain, RelayChain as Relay, TestExt, Teyrchain as Para,
 		},
 		xcm_helpers::xcm_transact_paid_execution,
@@ -52,12 +52,12 @@ mod imports {
 			genesis::{AssetHubZagrosAssetOwner, ED as ASSET_HUB_ZAGROS_ED},
 			AssetHubZagrosParaPallet as AssetHubZagrosPallet,
 		},
-		bridge_hub_pezkuwichain_emulated_chain::{
+		pezbridge_hub_pezkuwichain_emulated_chain::{
 			genesis::ED as BRIDGE_HUB_PEZKUWICHAIN_ED, BridgeHubPezkuwichainExistentialDeposit,
 			BridgeHubPezkuwichainParaPallet as BridgeHubPezkuwichainPallet,
 		},
-		penpal_emulated_chain::{
-			penpal_runtime::xcm_config::{
+		pez_penpal_emulated_chain::{
+			pez_penpal_runtime::xcm_config::{
 				CustomizableAssetFromSystemAssetHub as PenpalCustomizableAssetFromSystemAssetHub,
 				UniversalLocation as PenpalUniversalLocation,
 			},
@@ -100,7 +100,7 @@ fn send_assets_from_penpal_pezkuwichain_through_pezkuwichain_ah_to_zagros_ah(
 						who: *who == TreasuryAccount::get(),
 					},
 					RuntimeEvent::XcmpQueue(
-						pezcumulus_pallet_xcmp_queue::Event::XcmpMessageSent { .. }
+						pezcumulus_pezpallet_xcmp_queue::Event::XcmpMessageSent { .. }
 					) => {},
 				]
 			);
@@ -278,7 +278,7 @@ pub(crate) fn assert_bridge_hub_zagros_message_received() {
 			vec![
 				// message sent to destination
 				RuntimeEvent::XcmpQueue(
-					pezcumulus_pallet_xcmp_queue::Event::XcmpMessageSent { .. }
+					pezcumulus_pezpallet_xcmp_queue::Event::XcmpMessageSent { .. }
 				) => {},
 			]
 		);
@@ -1,12 +1,12 @@
 [package]
-name = "bridge-hub-zagros-integration-tests"
+name = "pezbridge-hub-zagros-integration-tests"
 version = "1.0.0"
 authors.workspace = true
 edition.workspace = true
 license = "Apache-2.0"
-description = "Bridge Hub Zagros runtime integration tests with xcm-emulator"
+description = "Bridge Hub Zagros runtime integration tests with xcm-pez-emulator"
 publish = false
-documentation = "https://docs.rs/bridge-hub-zagros-integration-tests"
+documentation = "https://docs.rs/pezbridge-hub-zagros-integration-tests"
 repository = { workspace = true }
 homepage = { workspace = true }

@@ -42,7 +42,7 @@ pezpallet-bridge-relayers = { workspace = true }
 asset-hub-zagros-runtime = { workspace = true }
 bp-asset-hub-zagros = { workspace = true }
 bridge-hub-common = { workspace = true }
-bridge-hub-zagros-runtime = { workspace = true }
+pezbridge-hub-zagros-runtime = { workspace = true }
 pezcumulus-pezpallet-teyrchain-system = { workspace = true }
 pezcumulus-pezpallet-xcmp-queue = { workspace = true }
 emulated-integration-tests-common = { workspace = true }
@@ -54,9 +54,9 @@ testnet-teyrchains-constants = { features = [
 teyrchains-common = { workspace = true, default-features = true }

 # Snowbridge
-snowbridge-core = { workspace = true }
-snowbridge-inbound-queue-primitives = { workspace = true }
-snowbridge-outbound-queue-primitives = { workspace = true }
+pezsnowbridge-core = { workspace = true }
+pezsnowbridge-inbound-queue-primitives = { workspace = true }
+pezsnowbridge-outbound-queue-primitives = { workspace = true }
 snowbridge-pezpallet-inbound-queue = { workspace = true }
 snowbridge-pezpallet-inbound-queue-fixtures = { workspace = true }
 snowbridge-pezpallet-inbound-queue-v2 = { workspace = true }
@@ -70,7 +70,7 @@ runtime-benchmarks = [
  "asset-hub-zagros-runtime/runtime-benchmarks",
  "bp-asset-hub-zagros/runtime-benchmarks",
  "bridge-hub-common/runtime-benchmarks",
-  "bridge-hub-zagros-runtime/runtime-benchmarks",
+  "pezbridge-hub-zagros-runtime/runtime-benchmarks",
  "pezcumulus-pezpallet-teyrchain-system/runtime-benchmarks",
  "pezcumulus-pezpallet-xcmp-queue/runtime-benchmarks",
  "emulated-integration-tests-common/runtime-benchmarks",
@@ -83,9 +83,9 @@ runtime-benchmarks = [
  "pezpallet-message-queue/runtime-benchmarks",
  "pezpallet-xcm/runtime-benchmarks",
  "pezkuwichain-zagros-system-emulated-network/runtime-benchmarks",
-  "snowbridge-core/runtime-benchmarks",
-  "snowbridge-inbound-queue-primitives/runtime-benchmarks",
-  "snowbridge-outbound-queue-primitives/runtime-benchmarks",
+  "pezsnowbridge-core/runtime-benchmarks",
+  "pezsnowbridge-inbound-queue-primitives/runtime-benchmarks",
+  "pezsnowbridge-outbound-queue-primitives/runtime-benchmarks",
  "snowbridge-pezpallet-inbound-queue-fixtures/runtime-benchmarks",
  "snowbridge-pezpallet-inbound-queue-v2/runtime-benchmarks",
  "snowbridge-pezpallet-inbound-queue/runtime-benchmarks",
@@ -37,7 +37,7 @@ mod imports {
 		impls::Inspect,
 		test_dry_run_transfer_across_pk_bridge, test_relay_is_trusted_teleporter,
 		test_teyrchain_is_trusted_teleporter, test_teyrchain_is_trusted_teleporter_for_relay,
-		xcm_emulator::{
+		xcm_pez_emulator::{
 			assert_expected_events, bx, Chain, RelayChain as Relay, TestExt, Teyrchain as Para,
 		},
 		xcm_helpers::xcm_transact_paid_execution,
@@ -55,14 +55,14 @@ mod imports {
 			genesis::{AssetHubZagrosAssetOwner, ED as ASSET_HUB_ZAGROS_ED},
 			AssetHubZagrosParaPallet as AssetHubZagrosPallet,
 		},
-		bridge_hub_zagros_emulated_chain::{
-			bridge_hub_zagros_runtime, genesis::ED as BRIDGE_HUB_ZAGROS_ED,
+		pezbridge_hub_zagros_emulated_chain::{
+			pezbridge_hub_zagros_runtime, genesis::ED as BRIDGE_HUB_ZAGROS_ED,
 			BridgeHubZagrosExistentialDeposit, BridgeHubZagrosParaPallet as BridgeHubZagrosPallet,
 			BridgeHubZagrosRuntimeOrigin,
 		},
-		penpal_emulated_chain::{
+		pez_penpal_emulated_chain::{
 			self,
-			penpal_runtime::xcm_config::{
+			pez_penpal_runtime::xcm_config::{
 				CustomizableAssetFromSystemAssetHub as PenpalCustomizableAssetFromSystemAssetHub,
 				LocalTeleportableToAssetHub as PenpalLocalTeleportableToAssetHub,
 				UniversalLocation as PenpalUniversalLocation,
@@ -16,7 +16,7 @@
 //! Tests related to XCM aliasing.

 use crate::imports::*;
-use bridge_hub_zagros_runtime::xcm_config::XcmConfig;
+use pezbridge_hub_zagros_runtime::xcm_config::XcmConfig;
 use emulated_integration_tests_common::{macros::AccountId, test_cross_chain_alias};
 use pezframe_support::traits::ContainsPair;
 use xcm::latest::Junctions::*;
@@ -17,7 +17,7 @@ use crate::tests::{snowbridge_common::snowbridge_sovereign, *};
 use emulated_integration_tests_common::{
 	macros::Dmp,
 	xcm_helpers::{find_all_mq_processed_ids, find_mq_processed_id, find_xcm_sent_message_id},
-	xcm_simulator::helpers::TopicIdTracker,
+	xcm_pez_simulator::helpers::TopicIdTracker,
 };
 use xcm::latest::AssetTransferFilter;

@@ -109,7 +109,7 @@ fn send_assets_from_penpal_zagros_through_zagros_ah_to_pezkuwichain_ah(
 						who: *who == TreasuryAccount::get(),
 					},
 					RuntimeEvent::XcmpQueue(
-						pezcumulus_pallet_xcmp_queue::Event::XcmpMessageSent { .. }
+						pezcumulus_pezpallet_xcmp_queue::Event::XcmpMessageSent { .. }
 					) => {},
 				]
 			);
@@ -699,7 +699,7 @@ fn send_wnds_from_zagros_relay_through_asset_hub_zagros_to_asset_hub_pezkuwichai
 							who: *who == sov_ahr_on_ahw.clone().into(),
 						},
 						RuntimeEvent::XcmpQueue(
-							pezcumulus_pallet_xcmp_queue::Event::XcmpMessageSent { .. }
+							pezcumulus_pezpallet_xcmp_queue::Event::XcmpMessageSent { .. }
 						) => {},
 					]
 				);
@@ -1008,7 +1008,7 @@ fn send_back_rocs_from_penpal_zagros_through_asset_hub_zagros_to_asset_hub_pezku
 							owner: owner == &sov_penpal_on_ahw,
 						},
 						RuntimeEvent::XcmpQueue(
-							pezcumulus_pallet_xcmp_queue::Event::XcmpMessageSent { .. }
+							pezcumulus_pezpallet_xcmp_queue::Event::XcmpMessageSent { .. }
 						) => {},
 						// message processed successfully
 						RuntimeEvent::MessageQueue(
@@ -1034,7 +1034,7 @@ fn send_back_rocs_from_penpal_zagros_through_asset_hub_zagros_to_asset_hub_pezku
 				},
 				// sent message to sibling Penpal
 				RuntimeEvent::XcmpQueue(
-					pezcumulus_pallet_xcmp_queue::Event::XcmpMessageSent { .. }
+					pezcumulus_pezpallet_xcmp_queue::Event::XcmpMessageSent { .. }
 				) => {},
 				// message processed successfully
 				RuntimeEvent::MessageQueue(
@@ -1206,7 +1206,7 @@ fn send_back_rocs_from_penpal_zagros_through_asset_hub_zagros_to_asset_hub_pezku
 							owner: owner == &sov_penpal_on_ahw,
 						},
 						RuntimeEvent::XcmpQueue(
-							pezcumulus_pallet_xcmp_queue::Event::XcmpMessageSent { .. }
+							pezcumulus_pezpallet_xcmp_queue::Event::XcmpMessageSent { .. }
 						) => {},
 						// message processed successfully
 						RuntimeEvent::MessageQueue(
@@ -1235,7 +1235,7 @@ fn send_back_rocs_from_penpal_zagros_through_asset_hub_zagros_to_asset_hub_pezku
 				},
 				// sent message to Pezkuwichain Relay
 				RuntimeEvent::TeyrchainSystem(
-					pezcumulus_pallet_teyrchain_system::Event::UpwardMessageSent { .. }
+					pezcumulus_pezpallet_teyrchain_system::Event::UpwardMessageSent { .. }
 				) => {},
 				// message processed successfully
 				RuntimeEvent::MessageQueue(
@@ -1400,7 +1400,7 @@ fn do_send_pens_and_wnds_from_penpal_zagros_via_ahw_to_asset_hub_pezkuwichain(
 						who: *who == sov_ahr_on_ahw.clone().into(),
 					},
 					RuntimeEvent::XcmpQueue(
-						pezcumulus_pallet_xcmp_queue::Event::XcmpMessageSent { .. }
+						pezcumulus_pezpallet_xcmp_queue::Event::XcmpMessageSent { .. }
 					) => {},
 				]
 			);
@@ -233,7 +233,7 @@ pub(crate) fn assert_bridge_hub_pezkuwichain_message_received() {
 			vec![
 				// message sent to destination
 				RuntimeEvent::XcmpQueue(
-					pezcumulus_pallet_xcmp_queue::Event::XcmpMessageSent { .. }
+					pezcumulus_pezpallet_xcmp_queue::Event::XcmpMessageSent { .. }
 				) => {},
 			]
 		);
@@ -14,7 +14,7 @@
 // limitations under the License.
 use crate::{
 	imports::{
-		penpal_emulated_chain::penpal_runtime::xcm_config::{
+		pez_penpal_emulated_chain::pez_penpal_runtime::xcm_config::{
 			CheckingAccount, TELEPORTABLE_ASSET_ID,
 		},
 		*,
@@ -24,7 +24,7 @@ use crate::{
 		asset_hub_pezkuwichain_location, asset_hub_zagros_global_location,
 		bridged_roc_at_ah_zagros, bridged_wnd_at_ah_pezkuwichain,
 		create_foreign_on_ah_pezkuwichain, create_foreign_on_ah_zagros,
-		penpal_emulated_chain::penpal_runtime,
+		pez_penpal_emulated_chain::pez_penpal_runtime,
 		snowbridge_common::{bridge_hub, ethereum, register_roc_on_bh, snowbridge_sovereign},
 	},
 };
@@ -32,7 +32,7 @@ use asset_hub_zagros_runtime::xcm_config::{
 	bridging::to_ethereum::DefaultBridgeHubEthereumBaseFee,
 	UniversalLocation as AssetHubZagrosUniversalLocation,
 };
-use bridge_hub_zagros_runtime::{
+use pezbridge_hub_zagros_runtime::{
 	bridge_to_ethereum_config::EthereumGatewayAddress, EthereumBeaconClient, EthereumInboundQueue,
 };
 use codec::Encode;
@@ -44,14 +44,14 @@ use pezframe_support::traits::fungibles::Mutate;
 use hex_literal::hex;
 use pezkuwichain_zagros_system_emulated_network::{
 	asset_hub_zagros_emulated_chain::genesis::AssetHubZagrosAssetOwner,
-	penpal_emulated_chain::PARA_ID_B, zagros_emulated_chain::zagros_runtime::Dmp,
+	pez_penpal_emulated_chain::PARA_ID_B, zagros_emulated_chain::zagros_runtime::Dmp,
 };
-use snowbridge_core::{AssetMetadata, TokenIdOf};
-use snowbridge_inbound_queue_primitives::{
+use pezsnowbridge_core::{AssetMetadata, TokenIdOf};
+use pezsnowbridge_inbound_queue_primitives::{
 	v1::{Command, Destination, MessageV1, VersionedMessage},
 	EventFixture,
 };
-use snowbridge_pallet_inbound_queue_fixtures::send_native_eth::make_send_native_eth_message;
+use snowbridge_pezpallet_inbound_queue_fixtures::send_native_eth::make_send_native_eth_message;
 use pezsp_core::{H160, H256};
 use testnet_teyrchains_constants::zagros::snowbridge::EthereumNetwork;
 use xcm_builder::ExternalConsensusLocationsConverterFor;
@@ -98,7 +98,7 @@ fn register_token_from_ethereum_to_asset_hub() {

 		assert_expected_events!(
 			BridgeHubZagros,
-			vec![RuntimeEvent::XcmpQueue(pezcumulus_pallet_xcmp_queue::Event::XcmpMessageSent { .. }) => {},]
+			vec![RuntimeEvent::XcmpQueue(pezcumulus_pezpallet_xcmp_queue::Event::XcmpMessageSent { .. }) => {},]
 		);
 	});

@@ -147,7 +147,7 @@ fn send_weth_token_from_ethereum_to_asset_hub() {

 		assert_expected_events!(
 			BridgeHubZagros,
-			vec![RuntimeEvent::XcmpQueue(pezcumulus_pallet_xcmp_queue::Event::XcmpMessageSent { .. }) => {},]
+			vec![RuntimeEvent::XcmpQueue(pezcumulus_pezpallet_xcmp_queue::Event::XcmpMessageSent { .. }) => {},]
 		);
 	});

@@ -186,7 +186,7 @@ fn send_weth_from_ethereum_to_penpal() {
 		<PenpalB as Chain>::RuntimeOrigin::signed(PenpalAssetOwner::get()),
 		native_id,
 		receiver,
-		penpal_runtime::EXISTENTIAL_DEPOSIT,
+		pez_penpal_runtime::EXISTENTIAL_DEPOSIT,
 	);

 	PenpalB::execute_with(|| {
@@ -251,7 +251,7 @@ fn send_weth_from_ethereum_to_penpal() {

 		assert_expected_events!(
 			BridgeHubZagros,
-			vec![RuntimeEvent::XcmpQueue(pezcumulus_pallet_xcmp_queue::Event::XcmpMessageSent { .. }) => {},]
+			vec![RuntimeEvent::XcmpQueue(pezcumulus_pezpallet_xcmp_queue::Event::XcmpMessageSent { .. }) => {},]
 		);
 	});

@@ -262,7 +262,7 @@ fn send_weth_from_ethereum_to_penpal() {
 			AssetHubZagros,
 			vec![
 				RuntimeEvent::ForeignAssets(pezpallet_assets::Event::Issued { .. }) => {},
-				RuntimeEvent::XcmpQueue(pezcumulus_pallet_xcmp_queue::Event::XcmpMessageSent { .. }) => {},
+				RuntimeEvent::XcmpQueue(pezcumulus_pezpallet_xcmp_queue::Event::XcmpMessageSent { .. }) => {},
 			]
 		);
 	});
@@ -324,7 +324,7 @@ fn send_eth_asset_from_asset_hub_to_ethereum_and_back() {
 		assert_expected_events!(
 			BridgeHubZagros,
 			vec![
-				RuntimeEvent::XcmpQueue(pezcumulus_pallet_xcmp_queue::Event::XcmpMessageSent { .. }) => {},
+				RuntimeEvent::XcmpQueue(pezcumulus_pezpallet_xcmp_queue::Event::XcmpMessageSent { .. }) => {},
 			]
 		);
 	});
@@ -403,8 +403,8 @@ fn send_eth_asset_from_asset_hub_to_ethereum_and_back() {
 		assert_expected_events!(
 			BridgeHubZagros,
 			vec![
-				RuntimeEvent::EthereumOutboundQueue(snowbridge_pallet_outbound_queue::Event::MessageAccepted {..}) => {},
-				RuntimeEvent::EthereumOutboundQueue(snowbridge_pallet_outbound_queue::Event::MessageQueued {..}) => {},
+				RuntimeEvent::EthereumOutboundQueue(snowbridge_pezpallet_outbound_queue::Event::MessageAccepted {..}) => {},
+				RuntimeEvent::EthereumOutboundQueue(snowbridge_pezpallet_outbound_queue::Event::MessageQueued {..}) => {},
 			]
 		);
 	});
@@ -433,7 +433,7 @@ fn register_weth_token_in_asset_hub_fail_for_insufficient_fee() {
 		assert_expected_events!(
 			BridgeHubZagros,
 			vec![
-				RuntimeEvent::XcmpQueue(pezcumulus_pallet_xcmp_queue::Event::XcmpMessageSent { .. }) => {},
+				RuntimeEvent::XcmpQueue(pezcumulus_pezpallet_xcmp_queue::Event::XcmpMessageSent { .. }) => {},
 			]
 		);
 	});
@@ -481,7 +481,7 @@ fn send_weth_from_ethereum_to_asset_hub_with_fee(account_id: [u8; 32], fee: u128
 		assert_expected_events!(
 			BridgeHubZagros,
 			vec![
-				RuntimeEvent::XcmpQueue(pezcumulus_pallet_xcmp_queue::Event::XcmpMessageSent { .. }) => {},
+				RuntimeEvent::XcmpQueue(pezcumulus_pezpallet_xcmp_queue::Event::XcmpMessageSent { .. }) => {},
 			]
 		);
 	});
@@ -590,7 +590,7 @@ fn send_token_from_ethereum_to_asset_hub() {
 		// Check that the message was sent
 		assert_expected_events!(
 			BridgeHubZagros,
-			vec![RuntimeEvent::XcmpQueue(pezcumulus_pallet_xcmp_queue::Event::XcmpMessageSent { .. }) => {},]
+			vec![RuntimeEvent::XcmpQueue(pezcumulus_pezpallet_xcmp_queue::Event::XcmpMessageSent { .. }) => {},]
 		);
 	});

@@ -634,7 +634,7 @@ fn send_weth_asset_from_asset_hub_to_ethereum() {
 		// Check that the send token message was sent using xcm
 		assert_expected_events!(
 			BridgeHubZagros,
-			vec![RuntimeEvent::XcmpQueue(pezcumulus_pallet_xcmp_queue::Event::XcmpMessageSent { .. }) =>{},]
+			vec![RuntimeEvent::XcmpQueue(pezcumulus_pezpallet_xcmp_queue::Event::XcmpMessageSent { .. }) =>{},]
 		);
 	});

@@ -703,7 +703,7 @@ fn send_weth_asset_from_asset_hub_to_ethereum() {
 		// Outbound Queue
 		assert_expected_events!(
 			BridgeHubZagros,
-			vec![RuntimeEvent::EthereumOutboundQueue(snowbridge_pallet_outbound_queue::Event::MessageQueued{ .. }) => {},]
+			vec![RuntimeEvent::EthereumOutboundQueue(snowbridge_pezpallet_outbound_queue::Event::MessageQueued{ .. }) => {},]
 		);
 	});
 }
@@ -778,7 +778,7 @@ fn send_token_from_ethereum_to_penpal() {
 		// Check that the send token message was sent using xcm
 		assert_expected_events!(
 			BridgeHubZagros,
-			vec![RuntimeEvent::XcmpQueue(pezcumulus_pallet_xcmp_queue::Event::XcmpMessageSent { .. }) =>{},]
+			vec![RuntimeEvent::XcmpQueue(pezcumulus_pezpallet_xcmp_queue::Event::XcmpMessageSent { .. }) =>{},]
 		);
 	});

@@ -789,7 +789,7 @@ fn send_token_from_ethereum_to_penpal() {
 			AssetHubZagros,
 			vec![
 				RuntimeEvent::ForeignAssets(pezpallet_assets::Event::Issued { .. }) => {},
-				RuntimeEvent::XcmpQueue(pezcumulus_pallet_xcmp_queue::Event::XcmpMessageSent { .. }) => {},
+				RuntimeEvent::XcmpQueue(pezcumulus_pezpallet_xcmp_queue::Event::XcmpMessageSent { .. }) => {},
 			]
 		);
 	});
@@ -844,7 +844,7 @@ fn transfer_relay_token() {
 		// Check that a message was sent to Ethereum to create the agent
 		assert_expected_events!(
 			BridgeHubZagros,
-			vec![RuntimeEvent::EthereumSystem(snowbridge_pallet_system::Event::RegisterToken { .. }) => {},]
+			vec![RuntimeEvent::EthereumSystem(snowbridge_pezpallet_system::Event::RegisterToken { .. }) => {},]
 		);
 	});

@@ -901,7 +901,7 @@ fn transfer_relay_token() {
 		// Outbound Queue
 		assert_expected_events!(
 			BridgeHubZagros,
-			vec![RuntimeEvent::EthereumOutboundQueue(snowbridge_pallet_outbound_queue::Event::MessageQueued{ .. }) => {},]
+			vec![RuntimeEvent::EthereumOutboundQueue(snowbridge_pezpallet_outbound_queue::Event::MessageQueued{ .. }) => {},]
 		);

 		// Send relay token back to AH
@@ -922,7 +922,7 @@ fn transfer_relay_token() {

 		assert_expected_events!(
 			BridgeHubZagros,
-			vec![RuntimeEvent::XcmpQueue(pezcumulus_pallet_xcmp_queue::Event::XcmpMessageSent { .. }) => {},]
+			vec![RuntimeEvent::XcmpQueue(pezcumulus_pezpallet_xcmp_queue::Event::XcmpMessageSent { .. }) => {},]
 		);
 	});

@@ -1068,7 +1068,7 @@ fn transfer_ah_token() {
 		// Outbound Queue
 		assert_expected_events!(
 			BridgeHubZagros,
-			vec![RuntimeEvent::EthereumOutboundQueue(snowbridge_pallet_outbound_queue::Event::MessageQueued{ .. }) => {},]
+			vec![RuntimeEvent::EthereumOutboundQueue(snowbridge_pezpallet_outbound_queue::Event::MessageQueued{ .. }) => {},]
 		);

 		let message = VersionedMessage::V1(MessageV1 {
@@ -1087,7 +1087,7 @@ fn transfer_ah_token() {

 		assert_expected_events!(
 			BridgeHubZagros,
-			vec![RuntimeEvent::XcmpQueue(pezcumulus_pallet_xcmp_queue::Event::XcmpMessageSent { .. }) => {},]
+			vec![RuntimeEvent::XcmpQueue(pezcumulus_pezpallet_xcmp_queue::Event::XcmpMessageSent { .. }) => {},]
 		);
 	});

@@ -1192,7 +1192,7 @@ fn send_weth_from_ethereum_to_ahw_to_ahr_back_to_ahw_and_ethereum() {
 		assert_expected_events!(
 			BridgeHubZagros,
 			vec![
-				RuntimeEvent::XcmpQueue(pezcumulus_pallet_xcmp_queue::Event::XcmpMessageSent { .. }) => {},
+				RuntimeEvent::XcmpQueue(pezcumulus_pezpallet_xcmp_queue::Event::XcmpMessageSent { .. }) => {},
 			]
 		);
 	});
@@ -1333,7 +1333,7 @@ fn send_weth_from_ethereum_to_ahw_to_ahr_back_to_ahw_and_ethereum() {
 			vec![
 				// message sent to destination
 				RuntimeEvent::XcmpQueue(
-					pezcumulus_pallet_xcmp_queue::Event::XcmpMessageSent { .. }
+					pezcumulus_pezpallet_xcmp_queue::Event::XcmpMessageSent { .. }
 				) => {},
 			]
 		);
@@ -1426,7 +1426,7 @@ fn send_weth_from_ethereum_to_ahw_to_ahr_back_to_ahw_and_ethereum() {
 		// Outbound Queue
 		assert_expected_events!(
 			BridgeHubZagros,
-			vec![RuntimeEvent::EthereumOutboundQueue(snowbridge_pallet_outbound_queue::Event::MessageQueued{ .. }) => {},]
+			vec![RuntimeEvent::EthereumOutboundQueue(snowbridge_pezpallet_outbound_queue::Event::MessageQueued{ .. }) => {},]
 		);
 	});
 }
@@ -1558,7 +1558,7 @@ fn transfer_penpal_native_asset() {
 		type RuntimeEvent = <BridgeHubZagros as Chain>::RuntimeEvent;
 		assert_expected_events!(
 			BridgeHubZagros,
-			vec![RuntimeEvent::EthereumOutboundQueue(snowbridge_pallet_outbound_queue::Event::MessageQueued{ .. }) => {},]
+			vec![RuntimeEvent::EthereumOutboundQueue(snowbridge_pezpallet_outbound_queue::Event::MessageQueued{ .. }) => {},]
 		);
 	});

@@ -1582,7 +1582,7 @@ fn transfer_penpal_native_asset() {

 		assert_expected_events!(
 			BridgeHubZagros,
-			vec![RuntimeEvent::XcmpQueue(pezcumulus_pallet_xcmp_queue::Event::XcmpMessageSent { .. }) => {},]
+			vec![RuntimeEvent::XcmpQueue(pezcumulus_pezpallet_xcmp_queue::Event::XcmpMessageSent { .. }) => {},]
 		);
 	});

@@ -1771,7 +1771,7 @@ fn transfer_penpal_teleport_enabled_asset() {
 		type RuntimeEvent = <BridgeHubZagros as Chain>::RuntimeEvent;
 		assert_expected_events!(
 			BridgeHubZagros,
-			vec![RuntimeEvent::EthereumOutboundQueue(snowbridge_pallet_outbound_queue::Event::MessageQueued{ .. }) => {},]
+			vec![RuntimeEvent::EthereumOutboundQueue(snowbridge_pezpallet_outbound_queue::Event::MessageQueued{ .. }) => {},]
 		);
 	});

@@ -1795,7 +1795,7 @@ fn transfer_penpal_teleport_enabled_asset() {

 		assert_expected_events!(
 			BridgeHubZagros,
-			vec![RuntimeEvent::XcmpQueue(pezcumulus_pallet_xcmp_queue::Event::XcmpMessageSent { .. }) =>
+			vec![RuntimeEvent::XcmpQueue(pezcumulus_pezpallet_xcmp_queue::Event::XcmpMessageSent { .. }) =>
 	{},]
 		);
 	});
@@ -2125,7 +2125,7 @@ fn transfer_roc_from_ah_with_transfer_and_then() {
 		// Outbound Queue
 		assert_expected_events!(
 			BridgeHubZagros,
-			vec![RuntimeEvent::EthereumOutboundQueue(snowbridge_pallet_outbound_queue::Event::MessageQueued{ .. }) => {},]
+			vec![RuntimeEvent::EthereumOutboundQueue(snowbridge_pezpallet_outbound_queue::Event::MessageQueued{ .. }) => {},]
 		);
 	});

@@ -2148,7 +2148,7 @@ fn transfer_roc_from_ah_with_transfer_and_then() {
 		let _ = EthereumInboundQueue::send_xcm(xcm, AssetHubZagros::para_id().into()).unwrap();
 		assert_expected_events!(
 			BridgeHubZagros,
-			vec![RuntimeEvent::XcmpQueue(pezcumulus_pallet_xcmp_queue::Event::XcmpMessageSent { .. }) => {},]
+			vec![RuntimeEvent::XcmpQueue(pezcumulus_pezpallet_xcmp_queue::Event::XcmpMessageSent { .. }) => {},]
 		);
 	});

@@ -2222,7 +2222,7 @@ fn register_pna_in_v5_while_transfer_in_v4_should_work() {
 		// Check that a message was sent to Ethereum to create the agent
 		assert_expected_events!(
 			BridgeHubZagros,
-			vec![RuntimeEvent::EthereumSystem(snowbridge_pallet_system::Event::RegisterToken { .. }) => {},]
+			vec![RuntimeEvent::EthereumSystem(snowbridge_pezpallet_system::Event::RegisterToken { .. }) => {},]
 		);
 	});

@@ -2288,7 +2288,7 @@ fn register_pna_in_v5_while_transfer_in_v4_should_work() {

 		assert_expected_events!(
 			BridgeHubZagros,
-			vec![RuntimeEvent::EthereumOutboundQueue(snowbridge_pallet_outbound_queue::Event::MessageQueued{ .. }) => {},]
+			vec![RuntimeEvent::EthereumOutboundQueue(snowbridge_pezpallet_outbound_queue::Event::MessageQueued{ .. }) => {},]
 		);
 	});
 }
@@ -21,11 +21,11 @@ use emulated_integration_tests_common::{
 };
 use pezframe_support::traits::fungibles::Mutate;
 use hex_literal::hex;
-use pezkuwichain_zagros_system_emulated_network::penpal_emulated_chain::{
-	penpal_runtime::xcm_config::{CheckingAccount, TELEPORTABLE_ASSET_ID},
+use pezkuwichain_zagros_system_emulated_network::pez_penpal_emulated_chain::{
+	pez_penpal_runtime::xcm_config::{CheckingAccount, TELEPORTABLE_ASSET_ID},
 	PenpalAssetOwner,
 };
-use snowbridge_core::AssetMetadata;
+use pezsnowbridge_core::AssetMetadata;
 use pezsp_core::H160;
 use testnet_teyrchains_constants::zagros::snowbridge::EthereumNetwork;
 use xcm_builder::ExternalConsensusLocationsConverterFor;
@@ -75,7 +75,7 @@ pub fn register_relay_token_on_bh() {
 		));
 		assert_expected_events!(
 			BridgeHubZagros,
-			vec![RuntimeEvent::EthereumSystem(snowbridge_pallet_system::Event::RegisterToken { .. }) => {},]
+			vec![RuntimeEvent::EthereumSystem(snowbridge_pezpallet_system::Event::RegisterToken { .. }) => {},]
 		);
 	});
 }
@@ -157,7 +157,7 @@ pub fn register_pal_on_ah() {

 pub fn penpal_root_sovereign() -> pezsp_runtime::AccountId32 {
 	let penpal_root_sovereign: AccountId = PenpalB::execute_with(|| {
-		use pezkuwichain_zagros_system_emulated_network::penpal_emulated_chain::penpal_runtime::xcm_config;
+		use pezkuwichain_zagros_system_emulated_network::pez_penpal_emulated_chain::pez_penpal_runtime::xcm_config;
 		xcm_config::LocationToAccountId::convert_location(&xcm_config::RootLocation::get())
 			.unwrap()
 			.into()
@@ -390,7 +390,7 @@ pub fn register_pal_on_bh() {
 		));
 		assert_expected_events!(
 			BridgeHubZagros,
-			vec![RuntimeEvent::EthereumSystem(snowbridge_pallet_system::Event::RegisterToken { .. }) => {},]
+			vec![RuntimeEvent::EthereumSystem(snowbridge_pezpallet_system::Event::RegisterToken { .. }) => {},]
 		);
 	});
 }
@@ -519,7 +519,7 @@ pub fn register_roc_on_bh() {
 		));
 		assert_expected_events!(
 			BridgeHubZagros,
-			vec![RuntimeEvent::EthereumSystem(snowbridge_pallet_system::Event::RegisterToken { .. }) => {},]
+			vec![RuntimeEvent::EthereumSystem(snowbridge_pezpallet_system::Event::RegisterToken { .. }) => {},]
 		);
 	});
 }
@@ -14,10 +14,10 @@
 // limitations under the License.

 use crate::{imports::*, tests::snowbridge_common::*};
-use bridge_hub_zagros_runtime::xcm_config::LocationToAccountId;
+use pezbridge_hub_zagros_runtime::xcm_config::LocationToAccountId;
 use emulated_integration_tests_common::snowbridge::{SEPOLIA_ID, WETH};
-use snowbridge_core::AssetMetadata;
-use snowbridge_pallet_system::Error;
+use pezsnowbridge_core::AssetMetadata;
+use snowbridge_pezpallet_system::Error;
 use testnet_teyrchains_constants::zagros::snowbridge::EthereumNetwork;
 use xcm_executor::traits::ConvertLocation;

@@ -21,7 +21,7 @@ use crate::{
 	},
 };
 use asset_hub_zagros_runtime::ForeignAssets;
-use bridge_hub_zagros_runtime::{
+use pezbridge_hub_zagros_runtime::{
 	bridge_common_config::BridgeReward,
 	bridge_to_ethereum_config::{
 		CreateAssetCallIndex, EthereumGatewayAddress, SetReservesCallIndex,
@@ -34,9 +34,9 @@ use emulated_integration_tests_common::{
 	RESERVABLE_ASSET_ID,
 };
 use hex_literal::hex;
-use pezkuwichain_zagros_system_emulated_network::penpal_emulated_chain::PARA_ID_B;
-use snowbridge_core::{reward::MessageId, AssetMetadata, TokenIdOf};
-use snowbridge_inbound_queue_primitives::v2::{
+use pezkuwichain_zagros_system_emulated_network::pez_penpal_emulated_chain::PARA_ID_B;
+use pezsnowbridge_core::{reward::MessageId, AssetMetadata, TokenIdOf};
+use pezsnowbridge_inbound_queue_primitives::v2::{
 	EthereumAsset::{ForeignTokenERC20, NativeTokenERC20},
 	Message, Network, XcmPayload,
 };
@@ -92,7 +92,7 @@ fn register_token_v2() {
 		assert_expected_events!(
 			BridgeHubZagros,
 			vec![
-				RuntimeEvent::XcmpQueue(pezcumulus_pallet_xcmp_queue::Event::XcmpMessageSent { .. }) => {},
+				RuntimeEvent::XcmpQueue(pezcumulus_pezpallet_xcmp_queue::Event::XcmpMessageSent { .. }) => {},
 				// Check that the relayer reward was registered.
 				RuntimeEvent::BridgeRelayers(pezpallet_bridge_relayers::Event::RewardRegistered { relayer, reward_kind, reward_balance }) => {
 					relayer: *relayer == relayer_account,
@@ -203,14 +203,14 @@ fn send_token_v2() {
 		assert_expected_events!(
 			BridgeHubZagros,
 			vec![
-				RuntimeEvent::XcmpQueue(pezcumulus_pallet_xcmp_queue::Event::XcmpMessageSent { .. }) => {},
+				RuntimeEvent::XcmpQueue(pezcumulus_pezpallet_xcmp_queue::Event::XcmpMessageSent { .. }) => {},
 				// Check that the relayer reward was registered.
 				RuntimeEvent::BridgeRelayers(pezpallet_bridge_relayers::Event::RewardRegistered { relayer, reward_kind, reward_balance }) => {
 					relayer: *relayer == relayer_account,
 					reward_kind: *reward_kind == BridgeReward::Snowbridge,
 					reward_balance: *reward_balance == relayer_reward,
 				},
-				RuntimeEvent::EthereumInboundQueueV2(snowbridge_pallet_inbound_queue_v2::Event::MessageReceived { message_id, .. }) => {
+				RuntimeEvent::EthereumInboundQueueV2(snowbridge_pezpallet_inbound_queue_v2::Event::MessageReceived { message_id, .. }) => {
 					message_id: *message_id == topic_id,
 				},
 			]
@@ -312,7 +312,7 @@ fn send_weth_v2() {
 		assert_expected_events!(
 			BridgeHubZagros,
 			vec![
-				RuntimeEvent::XcmpQueue(pezcumulus_pallet_xcmp_queue::Event::XcmpMessageSent { .. }) => {},
+				RuntimeEvent::XcmpQueue(pezcumulus_pezpallet_xcmp_queue::Event::XcmpMessageSent { .. }) => {},
 				// Check that the relayer reward was registered.
 				RuntimeEvent::BridgeRelayers(pezpallet_bridge_relayers::Event::RewardRegistered { relayer, reward_kind, reward_balance }) => {
 					relayer: *relayer == relayer_account,
@@ -469,7 +469,7 @@ fn register_and_send_token_in_one_transaction_fails() {
 		assert_expected_events!(
 			BridgeHubZagros,
 			vec![
-				RuntimeEvent::XcmpQueue(pezcumulus_pallet_xcmp_queue::Event::XcmpMessageSent { .. }) => {},
+				RuntimeEvent::XcmpQueue(pezcumulus_pezpallet_xcmp_queue::Event::XcmpMessageSent { .. }) => {},
 				// Check that the relayer reward was registered.
 				RuntimeEvent::BridgeRelayers(pezpallet_bridge_relayers::Event::RewardRegistered { relayer, reward_kind, reward_balance }) => {
 					relayer: *relayer == relayer_account,
@@ -622,7 +622,7 @@ fn send_token_to_penpal_v2() {
 		assert_expected_events!(
 			BridgeHubZagros,
 			vec![
-				RuntimeEvent::XcmpQueue(pezcumulus_pallet_xcmp_queue::Event::XcmpMessageSent { .. }) => {},
+				RuntimeEvent::XcmpQueue(pezcumulus_pezpallet_xcmp_queue::Event::XcmpMessageSent { .. }) => {},
 				// Check that the relayer reward was registered.
 				RuntimeEvent::BridgeRelayers(pezpallet_bridge_relayers::Event::RewardRegistered { relayer, reward_kind, reward_balance }) => {
 					relayer: *relayer == relayer_account,
@@ -658,7 +658,7 @@ fn send_token_to_penpal_v2() {
 					asset_id: *asset_id == token_location,
 					owner: *owner == penpal_sov_on_ah,
 				},
-				RuntimeEvent::XcmpQueue(pezcumulus_pallet_xcmp_queue::Event::XcmpMessageSent { .. }) => {},
+				RuntimeEvent::XcmpQueue(pezcumulus_pezpallet_xcmp_queue::Event::XcmpMessageSent { .. }) => {},
 			]
 		);

@@ -806,7 +806,7 @@ fn send_foreign_erc20_token_back_to_pezkuwi() {
 		assert_expected_events!(
 			BridgeHubZagros,
 			vec![
-				RuntimeEvent::XcmpQueue(pezcumulus_pallet_xcmp_queue::Event::XcmpMessageSent { .. }) => {},
+				RuntimeEvent::XcmpQueue(pezcumulus_pezpallet_xcmp_queue::Event::XcmpMessageSent { .. }) => {},
 				// Check that the relayer reward was registered.
 				RuntimeEvent::BridgeRelayers(pezpallet_bridge_relayers::Event::RewardRegistered { relayer, reward_kind, reward_balance }) => {
 					relayer: *relayer == relayer_account,
@@ -902,7 +902,7 @@ fn invalid_xcm_traps_funds_on_ah() {
 		assert_expected_events!(
 			BridgeHubZagros,
 			vec![
-				RuntimeEvent::XcmpQueue(pezcumulus_pallet_xcmp_queue::Event::XcmpMessageSent { .. }) => {},
+				RuntimeEvent::XcmpQueue(pezcumulus_pezpallet_xcmp_queue::Event::XcmpMessageSent { .. }) => {},
 				// Check that the relayer reward was registered.
 				RuntimeEvent::BridgeRelayers(pezpallet_bridge_relayers::Event::RewardRegistered { relayer, reward_kind, reward_balance }) => {
 					relayer: *relayer == relayer_account,
@@ -970,7 +970,7 @@ fn invalid_claimer_does_not_fail_the_message() {
 		assert_expected_events!(
 			BridgeHubZagros,
 			vec![
-				RuntimeEvent::XcmpQueue(pezcumulus_pallet_xcmp_queue::Event::XcmpMessageSent { .. }) => {},
+				RuntimeEvent::XcmpQueue(pezcumulus_pezpallet_xcmp_queue::Event::XcmpMessageSent { .. }) => {},
 				// Check that the relayer reward was registered.
 				RuntimeEvent::BridgeRelayers(pezpallet_bridge_relayers::Event::RewardRegistered { relayer, reward_kind, reward_balance }) => {
 					relayer: *relayer == relayer_account,
@@ -1059,7 +1059,7 @@ pub fn add_tip_from_asset_hub_user_origin() {
 		assert!(
 			events.iter().any(|event| matches!(
 				event,
-				RuntimeEvent::EthereumSystemV2(snowbridge_pallet_system_v2::Event::TipProcessed { sender, message_id, success, ..})
+				RuntimeEvent::EthereumSystemV2(snowbridge_pezpallet_system_v2::Event::TipProcessed { sender, message_id, success, ..})
 					if *sender == relayer &&*message_id == tip_message_id.clone() && *success, // expect success
 			)),
 			"tip added event found"
@@ -26,14 +26,14 @@ use crate::{
 	},
 };
 use asset_hub_zagros_runtime::ForeignAssets;
-use bridge_hub_zagros_runtime::{
+use pezbridge_hub_zagros_runtime::{
 	bridge_common_config::BridgeReward, bridge_to_ethereum_config::EthereumGatewayAddress,
 	EthereumInboundQueueV2,
 };
 use codec::Encode;
 use hex_literal::hex;
-use snowbridge_core::TokenIdOf;
-use snowbridge_inbound_queue_primitives::v2::{
+use pezsnowbridge_core::TokenIdOf;
+use pezsnowbridge_inbound_queue_primitives::v2::{
 	EthereumAsset::{ForeignTokenERC20, NativeTokenERC20},
 	Message, XcmPayload,
 };
@@ -168,7 +168,7 @@ fn send_token_to_pezkuwichain_v2() {
 		assert_expected_events!(
 			BridgeHubZagros,
 			vec![
-				RuntimeEvent::XcmpQueue(pezcumulus_pallet_xcmp_queue::Event::XcmpMessageSent { .. }) => {},
+				RuntimeEvent::XcmpQueue(pezcumulus_pezpallet_xcmp_queue::Event::XcmpMessageSent { .. }) => {},
 				// Check that the relayer reward was registered.
 				RuntimeEvent::BridgeRelayers(pezpallet_bridge_relayers::Event::RewardRegistered { relayer, reward_kind, reward_balance }) => {
 					relayer: *relayer == relayer_account,
@@ -189,7 +189,7 @@ fn send_token_to_pezkuwichain_v2() {
 				RuntimeEvent::MessageQueue(
 					pezpallet_message_queue::Event::Processed { success: true, .. }
 				) => {},
-				RuntimeEvent::XcmpQueue(pezcumulus_pallet_xcmp_queue::Event::XcmpMessageSent { .. }) => {},
+				RuntimeEvent::XcmpQueue(pezcumulus_pezpallet_xcmp_queue::Event::XcmpMessageSent { .. }) => {},
 			]
 		);

@@ -333,7 +333,7 @@ fn send_ether_to_pezkuwichain_v2() {
 		assert_expected_events!(
 			BridgeHubZagros,
 			vec![
-				RuntimeEvent::XcmpQueue(pezcumulus_pallet_xcmp_queue::Event::XcmpMessageSent { .. }) => {},
+				RuntimeEvent::XcmpQueue(pezcumulus_pezpallet_xcmp_queue::Event::XcmpMessageSent { .. }) => {},
 				// Check that the relayer reward was registered.
 				RuntimeEvent::BridgeRelayers(pezpallet_bridge_relayers::Event::RewardRegistered { relayer, reward_kind, reward_balance }) => {
 					relayer: *relayer == relayer_account,
@@ -354,7 +354,7 @@ fn send_ether_to_pezkuwichain_v2() {
 				RuntimeEvent::MessageQueue(
 					pezpallet_message_queue::Event::Processed { success: true, .. }
 				) => {},
-				RuntimeEvent::XcmpQueue(pezcumulus_pallet_xcmp_queue::Event::XcmpMessageSent { .. }) => {},
+				RuntimeEvent::XcmpQueue(pezcumulus_pezpallet_xcmp_queue::Event::XcmpMessageSent { .. }) => {},
 			]
 		);

@@ -536,7 +536,7 @@ fn send_roc_from_ethereum_to_pezkuwichain() {
 		assert_expected_events!(
 			BridgeHubZagros,
 			vec![
-				RuntimeEvent::XcmpQueue(pezcumulus_pallet_xcmp_queue::Event::XcmpMessageSent { .. }) => {},
+				RuntimeEvent::XcmpQueue(pezcumulus_pezpallet_xcmp_queue::Event::XcmpMessageSent { .. }) => {},
 				// Check that the relayer reward was registered.
 				RuntimeEvent::BridgeRelayers(pezpallet_bridge_relayers::Event::RewardRegistered { relayer, reward_kind, reward_balance }) => {
 					relayer: *relayer == relayer_account,
@@ -17,16 +17,16 @@ use crate::{
 	imports::*,
 	tests::{snowbridge_common::*, usdt_at_ah_zagros},
 };
-use bridge_hub_zagros_runtime::{
+use pezbridge_hub_zagros_runtime::{
 	bridge_to_ethereum_config::EthereumGatewayAddress, EthereumOutboundQueueV2,
 };
 use emulated_integration_tests_common::{impls::Decode, PenpalBTeleportableAssetLocation};
 use pezframe_support::{assert_err_ignore_postinfo, pezpallet_prelude::TypeInfo};
-use pezkuwichain_zagros_system_emulated_network::penpal_emulated_chain::penpal_runtime::xcm_config::LocalTeleportableToAssetHub;
-use snowbridge_core::{reward::MessageId, AssetMetadata, BasicOperatingMode};
-use snowbridge_outbound_queue_primitives::v2::{ContractCall, DeliveryReceipt};
-use snowbridge_pallet_outbound_queue_v2::Error;
-use snowbridge_pallet_system_v2::LostTips;
+use pezkuwichain_zagros_system_emulated_network::pez_penpal_emulated_chain::pez_penpal_runtime::xcm_config::LocalTeleportableToAssetHub;
+use pezsnowbridge_core::{reward::MessageId, AssetMetadata, BasicOperatingMode};
+use pezsnowbridge_outbound_queue_primitives::v2::{ContractCall, DeliveryReceipt};
+use snowbridge_pezpallet_outbound_queue_v2::Error;
+use snowbridge_pezpallet_system_v2::LostTips;
 use pezsp_core::H256;
 use xcm::v5::AssetTransferFilter;

@@ -98,7 +98,7 @@ fn send_weth_from_asset_hub_to_ethereum() {
 		assert_expected_events!(
 			BridgeHubZagros,
 			vec![
-				RuntimeEvent::EthereumOutboundQueueV2(snowbridge_pallet_outbound_queue_v2::Event::MessageQueued{ .. }) => {},
+				RuntimeEvent::EthereumOutboundQueueV2(snowbridge_pezpallet_outbound_queue_v2::Event::MessageQueued{ .. }) => {},
 			]
 		);

@@ -152,7 +152,7 @@ pub fn register_relay_token_from_asset_hub_with_sudo() {
 		type RuntimeEvent = <BridgeHubZagros as Chain>::RuntimeEvent;
 		assert_expected_events!(
 			BridgeHubZagros,
-			vec![RuntimeEvent::EthereumOutboundQueueV2(snowbridge_pallet_outbound_queue_v2::Event::MessageQueued{ .. }) => {},]
+			vec![RuntimeEvent::EthereumOutboundQueueV2(snowbridge_pezpallet_outbound_queue_v2::Event::MessageQueued{ .. }) => {},]
 		);
 	});
 }
@@ -192,7 +192,7 @@ pub fn register_usdt_from_owner_on_asset_hub() {
 		type RuntimeEvent = <BridgeHubZagros as Chain>::RuntimeEvent;
 		assert_expected_events!(
 			BridgeHubZagros,
-			vec![RuntimeEvent::EthereumOutboundQueueV2(snowbridge_pallet_outbound_queue_v2::Event::MessageQueued{ .. }) => {},]
+			vec![RuntimeEvent::EthereumOutboundQueueV2(snowbridge_pezpallet_outbound_queue_v2::Event::MessageQueued{ .. }) => {},]
 		);
 	});
 }
@@ -268,7 +268,7 @@ pub fn add_tip_from_asset_hub_user_origin() {
 		assert!(
 			events.iter().any(|event| matches!(
 				event,
-				RuntimeEvent::EthereumSystemV2(snowbridge_pallet_system_v2::Event::TipProcessed { sender, message_id, success, ..})
+				RuntimeEvent::EthereumSystemV2(snowbridge_pezpallet_system_v2::Event::TipProcessed { sender, message_id, success, ..})
 					if *sender == relayer && *message_id == tip_message_id.clone() && *success, // expect success
 			)),
 			"tip added event found"
@@ -307,13 +307,13 @@ pub fn tip_to_invalid_nonce_is_added_to_lost_tips() {
 		assert!(
 			events.iter().any(|event| matches!(
 				event,
-				RuntimeEvent::EthereumSystemV2(snowbridge_pallet_system_v2::Event::TipProcessed { sender, message_id, success, ..})
+				RuntimeEvent::EthereumSystemV2(snowbridge_pezpallet_system_v2::Event::TipProcessed { sender, message_id, success, ..})
 					if *sender == relayer && *message_id == tip_message_id.clone() && !(*success), // expect a failure
 			)),
 			"tip added event found"
 		);

-		let relayer_lost_tip = LostTips::<bridge_hub_zagros_runtime::Runtime>::get::<
+		let relayer_lost_tip = LostTips::<pezbridge_hub_zagros_runtime::Runtime>::get::<
 			pezsp_runtime::AccountId32,
 		>(relayer.into());
 		// Assert a tip was added to storage.
@@ -403,7 +403,7 @@ fn transfer_relay_token_from_ah() {
 		// Check that the Ethereum message was queue in the Outbound Queue
 		assert_expected_events!(
 			BridgeHubZagros,
-			vec![RuntimeEvent::EthereumOutboundQueueV2(snowbridge_pallet_outbound_queue_v2::Event::MessageQueued{ .. }) => {},]
+			vec![RuntimeEvent::EthereumOutboundQueueV2(snowbridge_pezpallet_outbound_queue_v2::Event::MessageQueued{ .. }) => {},]
 		);

 		let relayer = BridgeHubZagrosSender::get();
@@ -490,7 +490,7 @@ fn send_weth_and_hez_from_asset_hub_to_ethereum() {
 		// Check that Ethereum message was queue in the Outbound Queue
 		assert_expected_events!(
 			BridgeHubZagros,
-			vec![RuntimeEvent::EthereumOutboundQueueV2(snowbridge_pallet_outbound_queue_v2::Event::MessageQueued{ .. }) => {},]
+			vec![RuntimeEvent::EthereumOutboundQueueV2(snowbridge_pezpallet_outbound_queue_v2::Event::MessageQueued{ .. }) => {},]
 		);

 		let relayer = BridgeHubZagrosSender::get();
@@ -586,7 +586,7 @@ fn transact_with_agent_from_asset_hub() {
 		// Check that Ethereum message was queue in the Outbound Queue
 		assert_expected_events!(
 			BridgeHubZagros,
-			vec![RuntimeEvent::EthereumOutboundQueueV2(snowbridge_pallet_outbound_queue_v2::Event::MessageQueued{ .. }) => {},]
+			vec![RuntimeEvent::EthereumOutboundQueueV2(snowbridge_pezpallet_outbound_queue_v2::Event::MessageQueued{ .. }) => {},]
 		);

 		let relayer = BridgeHubZagrosSender::get();
@@ -670,7 +670,7 @@ fn transact_with_agent_from_asset_hub_without_any_asset_transfer() {
 		// Check that Ethereum message was queue in the Outbound Queue
 		assert_expected_events!(
 			BridgeHubZagros,
-			vec![RuntimeEvent::EthereumOutboundQueueV2(snowbridge_pallet_outbound_queue_v2::Event::MessageQueued{ .. }) => {},]
+			vec![RuntimeEvent::EthereumOutboundQueueV2(snowbridge_pezpallet_outbound_queue_v2::Event::MessageQueued{ .. }) => {},]
 		);

 		let relayer = BridgeHubZagrosSender::get();
@@ -789,7 +789,7 @@ fn register_token_from_penpal() {
 		type RuntimeEvent = <BridgeHubZagros as Chain>::RuntimeEvent;
 		assert_expected_events!(
 			BridgeHubZagros,
-			vec![RuntimeEvent::EthereumOutboundQueueV2(snowbridge_pallet_outbound_queue_v2::Event::MessageQueued{ .. }) => {},]
+			vec![RuntimeEvent::EthereumOutboundQueueV2(snowbridge_pezpallet_outbound_queue_v2::Event::MessageQueued{ .. }) => {},]
 		);

 		let relayer = BridgeHubZagrosSender::get();
@@ -808,7 +808,7 @@ fn register_token_from_penpal() {
 		assert_expected_events!(
 			BridgeHubZagros,
 			vec![
-				RuntimeEvent::EthereumOutboundQueueV2(snowbridge_pallet_outbound_queue_v2::Event::MessageDelivered { .. }) => {},
+				RuntimeEvent::EthereumOutboundQueueV2(snowbridge_pezpallet_outbound_queue_v2::Event::MessageDelivered { .. }) => {},
 			]
 		);
 	});
@@ -937,7 +937,7 @@ fn send_message_from_penpal_to_ethereum(sudo: bool) {
 		type RuntimeEvent = <BridgeHubZagros as Chain>::RuntimeEvent;
 		assert_expected_events!(
 			BridgeHubZagros,
-			vec![RuntimeEvent::EthereumOutboundQueueV2(snowbridge_pallet_outbound_queue_v2::Event::MessageQueued{ .. }) => {},]
+			vec![RuntimeEvent::EthereumOutboundQueueV2(snowbridge_pezpallet_outbound_queue_v2::Event::MessageQueued{ .. }) => {},]
 		);
 	});
 }
@@ -23,7 +23,7 @@ use crate::{
 };
 use emulated_integration_tests_common::snowbridge::{SEPOLIA_ID, WETH};
 use pezframe_support::assert_noop;
-use snowbridge_core::AssetMetadata;
+use pezsnowbridge_core::AssetMetadata;
 use pezsp_runtime::DispatchError::BadOrigin;
 use xcm::v5::AssetTransferFilter;

@@ -129,7 +129,7 @@ pub(crate) fn assert_bridge_hub_zagros_message_received() {
 			vec![
 				// message sent to destination
 				RuntimeEvent::XcmpQueue(
-					pezcumulus_pallet_xcmp_queue::Event::XcmpMessageSent { .. }
+					pezcumulus_pezpallet_xcmp_queue::Event::XcmpMessageSent { .. }
 				) => {},
 			]
 		);
@@ -270,7 +270,7 @@ fn send_roc_from_asset_hub_pezkuwichain_to_ethereum() {
 		// Check that the Ethereum message was queue in the Outbound Queue
 		assert_expected_events!(
 			BridgeHubZagros,
-			vec![RuntimeEvent::EthereumOutboundQueueV2(snowbridge_pallet_outbound_queue_v2::Event::MessageQueued{ .. }) => {},]
+			vec![RuntimeEvent::EthereumOutboundQueueV2(snowbridge_pezpallet_outbound_queue_v2::Event::MessageQueued{ .. }) => {},]
 		);
 	});
 }
@@ -366,7 +366,7 @@ fn register_pezkuwichain_asset_on_ethereum_from_rah() {
 		// Check that the Ethereum message was queue in the Outbound Queue
 		assert_expected_events!(
 			BridgeHubZagros,
-			vec![RuntimeEvent::EthereumOutboundQueueV2(snowbridge_pallet_outbound_queue_v2::Event::MessageQueued{ .. }) => {},]
+			vec![RuntimeEvent::EthereumOutboundQueueV2(snowbridge_pezpallet_outbound_queue_v2::Event::MessageQueued{ .. }) => {},]
 		);
 	});
 }
@@ -14,7 +14,7 @@
 // limitations under the License.

 use crate::tests::snowbridge_common::{eth_location, set_up_eth_and_hez_pool};
-use bridge_hub_zagros_runtime::bridge_common_config::{BridgeReward, BridgeRewardBeneficiaries};
+use pezbridge_hub_zagros_runtime::bridge_common_config::{BridgeReward, BridgeRewardBeneficiaries};
 use emulated_integration_tests_common::snowbridge::ETHER_MIN_BALANCE;
 use pezpallet_bridge_relayers::{Error::FailedToPayReward, RewardLedger};

@@ -4,7 +4,7 @@ version = "1.0.0"
 authors.workspace = true
 edition.workspace = true
 license = "Apache-2.0"
-description = "Collectives Zagros runtime integration tests with xcm-emulator"
+description = "Collectives Zagros runtime integration tests with xcm-pez-emulator"
 publish = false
 documentation = "https://docs.rs/collectives-zagros-integration-tests"
 repository = { workspace = true }
@@ -22,14 +22,14 @@ mod imports {
 	pub(crate) use emulated_integration_tests_common::{
 		accounts::ALICE,
 		test_teyrchain_is_trusted_teleporter,
-		xcm_emulator::{assert_expected_events, bx, Chain, TestExt, Teyrchain},
+		xcm_pez_emulator::{assert_expected_events, bx, Chain, TestExt, Teyrchain},
 	};
 	pub(crate) use zagros_system_emulated_network::{
 		asset_hub_zagros_emulated_chain::{
 			asset_hub_zagros_runtime::xcm_config::LocationToAccountId as AssetHubLocationToAccountId,
 			genesis::ED as ASSET_HUB_ZAGROS_ED, AssetHubZagrosParaPallet as AssetHubZagrosPallet,
 		},
-		bridge_hub_zagros_emulated_chain::BridgeHubZagrosParaPallet as BridgeHubZagrosPallet,
+		pezbridge_hub_zagros_emulated_chain::BridgeHubZagrosParaPallet as BridgeHubZagrosPallet,
 		collectives_zagros_emulated_chain::{
 			collectives_zagros_runtime::{
 				fellowship as collectives_fellowship,
@@ -39,7 +39,7 @@ mod imports {
 			CollectivesZagrosParaPallet as CollectivesZagrosPallet,
 		},
 		coretime_zagros_emulated_chain::CoretimeZagrosParaPallet as CoretimeZagrosPallet,
-		penpal_emulated_chain::{PenpalAssetOwner, PenpalBParaPallet as PenpalBPallet},
+		pez_penpal_emulated_chain::{PenpalAssetOwner, PenpalBParaPallet as PenpalBPallet},
 		people_zagros_emulated_chain::PeopleZagrosParaPallet as PeopleZagrosPallet,
 		zagros_emulated_chain::{
 			genesis::ED as ZAGROS_ED,
@@ -51,7 +51,7 @@ fn pay_salary_technical_fellowship() {
 		assert_expected_events!(
 			CollectivesZagros,
 			vec![
-				RuntimeEvent::XcmpQueue(pezcumulus_pallet_xcmp_queue::Event::XcmpMessageSent { .. }) => {},
+				RuntimeEvent::XcmpQueue(pezcumulus_pezpallet_xcmp_queue::Event::XcmpMessageSent { .. }) => {},
 			]
 		);
 	});
@@ -93,7 +93,7 @@ fn pay_salary_secretary() {
 		assert_expected_events!(
 			CollectivesZagros,
 			vec![
-				RuntimeEvent::XcmpQueue(pezcumulus_pallet_xcmp_queue::Event::XcmpMessageSent { .. }) => {},
+				RuntimeEvent::XcmpQueue(pezcumulus_pezpallet_xcmp_queue::Event::XcmpMessageSent { .. }) => {},
 			]
 		);
 	});
@@ -160,7 +160,7 @@ fn fellowship_treasury_spend() {
 			AssetHubZagros,
 			vec![
 				RuntimeEvent::Balances(pezpallet_balances::Event::Transfer { .. }) => {},
-				RuntimeEvent::TeyrchainSystem(pezcumulus_pallet_teyrchain_system::Event::UpwardMessageSent { .. }) => {},
+				RuntimeEvent::TeyrchainSystem(pezcumulus_pezpallet_teyrchain_system::Event::UpwardMessageSent { .. }) => {},
 				RuntimeEvent::MessageQueue(pezpallet_message_queue::Event::Processed { success: true ,.. }) => {},
 			]
 		);
@@ -234,7 +234,7 @@ fn fellowship_treasury_spend() {
 			AssetHubZagros,
 			vec![
 				RuntimeEvent::Balances(pezpallet_balances::Event::Transfer { .. }) => {},
-				RuntimeEvent::XcmpQueue(pezcumulus_pallet_xcmp_queue::Event::XcmpMessageSent { .. }) => {},
+				RuntimeEvent::XcmpQueue(pezcumulus_pezpallet_xcmp_queue::Event::XcmpMessageSent { .. }) => {},
 				RuntimeEvent::MessageQueue(pezpallet_message_queue::Event::Processed { success: true ,.. }) => {},
 			]
 		);
@@ -4,7 +4,7 @@ version = "0.0.0"
 authors.workspace = true
 edition.workspace = true
 license = "Apache-2.0"
-description = "Coretime Pezkuwichain runtime integration tests with xcm-emulator"
+description = "Coretime Pezkuwichain runtime integration tests with xcm-pez-emulator"
 publish = false
 documentation = "https://docs.rs/coretime-pezkuwichain-integration-tests"
 repository = { workspace = true }
@@ -23,7 +23,7 @@ mod imports {
 	pub(crate) use xcm::{latest::PEZKUWICHAIN_GENESIS_HASH, prelude::*};

 	// Pezcumulus
-	pub(crate) use emulated_integration_tests_common::xcm_emulator::{
+	pub(crate) use emulated_integration_tests_common::xcm_pez_emulator::{
 		assert_expected_events, Chain, TestExt, Teyrchain,
 	};
 	pub(crate) use pezkuwichain_system_emulated_network::{
@@ -100,7 +100,7 @@ fn transact_hardcoded_weights_are_sane() {
 					pezpallet_broker::Event::CoreCountRequested { core_count: 1 }
 				) => {},
 				CoretimeEvent::TeyrchainSystem(
-					pezcumulus_pallet_teyrchain_system::Event::UpwardMessageSent { .. }
+					pezcumulus_pezpallet_teyrchain_system::Event::UpwardMessageSent { .. }
 				) => {},
 			]
 		);
@@ -162,7 +162,7 @@ fn transact_hardcoded_weights_are_sane() {
 					pezpallet_broker::Event::CoreAssigned { .. }
 				) => {},
 				CoretimeEvent::TeyrchainSystem(
-					pezcumulus_pallet_teyrchain_system::Event::UpwardMessageSent { .. }
+					pezcumulus_pezpallet_teyrchain_system::Event::UpwardMessageSent { .. }
 				) => {},
 			]
 		);
@@ -197,7 +197,7 @@ fn transact_hardcoded_weights_are_sane() {
 			CoretimePezkuwichain,
 			vec![
 				CoretimeEvent::TeyrchainSystem(
-					pezcumulus_pallet_teyrchain_system::Event::UpwardMessageSent { .. }
+					pezcumulus_pezpallet_teyrchain_system::Event::UpwardMessageSent { .. }
 				) => {},
 			]
 		);
@@ -4,7 +4,7 @@ version = "0.0.0"
 authors.workspace = true
 edition.workspace = true
 license = "Apache-2.0"
-description = "Coretime Zagros runtime integration tests with xcm-emulator"
+description = "Coretime Zagros runtime integration tests with xcm-pez-emulator"
 publish = false
 documentation = "https://docs.rs/coretime-zagros-integration-tests"
 repository = { workspace = true }
@@ -23,20 +23,20 @@ mod imports {
 	pub(crate) use xcm::{latest::ZAGROS_GENESIS_HASH, prelude::*};

 	// Pezcumulus
-	pub(crate) use emulated_integration_tests_common::xcm_emulator::{
+	pub(crate) use emulated_integration_tests_common::xcm_pez_emulator::{
 		assert_expected_events, Chain, TestExt, Teyrchain,
 	};
 	pub(crate) use zagros_system_emulated_network::{
 		asset_hub_zagros_emulated_chain::{
 			genesis::ED as ASSET_HUB_ZAGROS_ED, AssetHubZagrosParaPallet as AssetHubZagrosPallet,
 		},
-		bridge_hub_zagros_emulated_chain::BridgeHubZagrosParaPallet as BridgeHubZagrosPallet,
+		pezbridge_hub_zagros_emulated_chain::BridgeHubZagrosParaPallet as BridgeHubZagrosPallet,
 		collectives_zagros_emulated_chain::CollectivesZagrosParaPallet as CollectivesZagrosPallet,
 		coretime_zagros_emulated_chain::{
 			self, coretime_zagros_runtime::ExistentialDeposit as CoretimeZagrosExistentialDeposit,
 			genesis::ED as CORETIME_ZAGROS_ED, CoretimeZagrosParaPallet as CoretimeZagrosPallet,
 		},
-		penpal_emulated_chain::{PenpalAssetOwner, PenpalBParaPallet as PenpalBPallet},
+		pez_penpal_emulated_chain::{PenpalAssetOwner, PenpalBParaPallet as PenpalBPallet},
 		people_zagros_emulated_chain::PeopleZagrosParaPallet as PeopleZagrosPallet,
 		zagros_emulated_chain::{genesis::ED as ZAGROS_ED, ZagrosRelayPallet as ZagrosPallet},
 		AssetHubZagrosPara as AssetHubZagros, AssetHubZagrosParaReceiver as AssetHubZagrosReceiver,
@@ -100,7 +100,7 @@ fn transact_hardcoded_weights_are_sane() {
 					pezpallet_broker::Event::CoreCountRequested { core_count: 1 }
 				) => {},
 				CoretimeEvent::TeyrchainSystem(
-					pezcumulus_pallet_teyrchain_system::Event::UpwardMessageSent { .. }
+					pezcumulus_pezpallet_teyrchain_system::Event::UpwardMessageSent { .. }
 				) => {},
 			]
 		);
@@ -161,7 +161,7 @@ fn transact_hardcoded_weights_are_sane() {
 					pezpallet_broker::Event::CoreAssigned { .. }
 				) => {},
 				CoretimeEvent::TeyrchainSystem(
-					pezcumulus_pallet_teyrchain_system::Event::UpwardMessageSent { .. }
+					pezcumulus_pezpallet_teyrchain_system::Event::UpwardMessageSent { .. }
 				) => {},
 			]
 		);
@@ -178,7 +178,7 @@ fn transact_hardcoded_weights_are_sane() {
 			CoretimeZagros,
 			vec![
 				CoretimeEvent::TeyrchainSystem(
-					pezcumulus_pallet_teyrchain_system::Event::UpwardMessageSent { .. }
+					pezcumulus_pezpallet_teyrchain_system::Event::UpwardMessageSent { .. }
 				) => {},
 			]
 		);
@@ -4,7 +4,7 @@ version = "0.0.0"
 authors.workspace = true
 edition.workspace = true
 license = "Apache-2.0"
-description = "Zagros governance integration tests with xcm-emulator"
+description = "Zagros governance integration tests with xcm-pez-emulator"
 publish = false
 documentation = "https://docs.rs/governance-zagros-integration-tests"
 repository = { workspace = true }
@@ -19,7 +19,7 @@ mod imports {
 	pub(crate) use codec::Encode;
 	pub(crate) use emulated_integration_tests_common::{
 		impls::{assert_expected_events, bx, TestExt},
-		xcm_emulator::Chain,
+		xcm_pez_emulator::Chain,
 		xcm_helpers::{
 			build_xcm_send_authorize_upgrade_call, call_hash_of,
 			dispatch_whitelisted_call_with_preimage,
@@ -16,7 +16,7 @@ use crate::{common::*, imports::*};
 use emulated_integration_tests_common::{
 	assert_whitelisted,
 	impls::RelayChain,
-	xcm_emulator::{Chain, TestExt, Teyrchain},
+	xcm_pez_emulator::{Chain, TestExt, Teyrchain},
 };
 use zagros_runtime::governance::pezpallet_custom_origins::Origin;
 use zagros_system_emulated_network::{
@@ -4,7 +4,7 @@ version = "0.1.0"
 authors.workspace = true
 edition.workspace = true
 license = "Apache-2.0"
-description = "People Pezkuwichain runtime integration tests with xcm-emulator"
+description = "People Pezkuwichain runtime integration tests with xcm-pez-emulator"
 publish = false
 documentation = "https://docs.rs/people-pezkuwichain-integration-tests"
 repository = { workspace = true }
@@ -24,14 +24,14 @@ xcm = { workspace = true }
 xcm-executor = { workspace = true }

 # Pezcumulus
-asset-test-utils = { workspace = true, default-features = true }
+asset-test-pezutils = { workspace = true, default-features = true }
 emulated-integration-tests-common = { workspace = true }
 pezkuwichain-system-emulated-network = { workspace = true }
 teyrchains-common = { workspace = true, default-features = true }

 [features]
 runtime-benchmarks = [
-  "asset-test-utils/runtime-benchmarks",
+  "asset-test-pezutils/runtime-benchmarks",
  "emulated-integration-tests-common/runtime-benchmarks",
  "pezframe-support/runtime-benchmarks",
  "pezpallet-balances/runtime-benchmarks",
@@ -22,8 +22,8 @@ mod imports {
 	pub(crate) use xcm::{latest::PEZKUWICHAIN_GENESIS_HASH, prelude::*};

 	// Pezcumulus
-	pub(crate) use asset_test_utils::xcm_helpers;
-	pub(crate) use emulated_integration_tests_common::xcm_emulator::{
+	pub(crate) use asset_test_pezutils::xcm_helpers;
+	pub(crate) use emulated_integration_tests_common::xcm_pez_emulator::{
 		assert_expected_events, bx, Chain, Test, TestArgs, TestContext, TestExt, Teyrchain as Para,
 	};
 	pub(crate) use pezkuwichain_system_emulated_network::{
@@ -4,7 +4,7 @@ version = "0.1.0"
 authors.workspace = true
 edition.workspace = true
 license = "Apache-2.0"
-description = "People Zagros runtime integration tests with xcm-emulator"
+description = "People Zagros runtime integration tests with xcm-pez-emulator"
 publish = false
 documentation = "https://docs.rs/people-zagros-integration-tests"
 repository = { workspace = true }
@@ -22,16 +22,16 @@ mod imports {
 	pub(crate) use xcm::{latest::ZAGROS_GENESIS_HASH, prelude::*};

 	// Pezcumulus
-	pub(crate) use emulated_integration_tests_common::xcm_emulator::{
+	pub(crate) use emulated_integration_tests_common::xcm_pez_emulator::{
 		assert_expected_events, bx, Chain, TestExt, Teyrchain as Para,
 	};
 	pub(crate) use zagros_system_emulated_network::{
 		self,
 		asset_hub_zagros_emulated_chain::AssetHubZagrosParaPallet as AssetHubZagrosPallet,
-		bridge_hub_zagros_emulated_chain::BridgeHubZagrosParaPallet as BridgeHubZagrosPallet,
+		pezbridge_hub_zagros_emulated_chain::BridgeHubZagrosParaPallet as BridgeHubZagrosPallet,
 		collectives_zagros_emulated_chain::CollectivesZagrosParaPallet as CollectivesZagrosPallet,
 		coretime_zagros_emulated_chain::CoretimeZagrosParaPallet as CoretimeZagrosPallet,
-		penpal_emulated_chain::{PenpalAssetOwner, PenpalBParaPallet as PenpalBPallet},
+		pez_penpal_emulated_chain::{PenpalAssetOwner, PenpalBParaPallet as PenpalBPallet},
 		people_zagros_emulated_chain::{
 			people_zagros_runtime::{
 				self, xcm_config::XcmConfig as PeopleZagrosXcmConfig,
@@ -40,7 +40,7 @@
 // --repeat
 // 20
 // --output
-// pezcumulus/teyrchains/pallets/identity-kyc/src/weights.rs
+// pezcumulus/teyrchains/pezpallets/identity-kyc/src/weights.rs
 // --template
 // bizinikiwi/.maintain/frame-weight-template.hbs

@@ -40,7 +40,7 @@
 // --repeat
 // 20
 // --output
-// pezcumulus/teyrchains/pallets/perwerde/src/weights.rs
+// pezcumulus/teyrchains/pezpallets/perwerde/src/weights.rs
 // --template
 // bizinikiwi/.maintain/frame-weight-template.hbs

--- a/Show More
+++ b/Show More