Refactoring Checkpoint: (WIP)

2025-12-14 10:29:31 +03:00
parent 09735eb97a
commit c89d7cac55
1424 changed files with 6415 additions and 6064 deletions
@@ -1,5 +1,5 @@
 [package]
-name = "bridge-hub-zagros-runtime"
+name = "pezbridge-hub-zagros-runtime"
 version = "0.3.0"
 authors.workspace = true
 edition.workspace = true
@@ -7,7 +7,7 @@ description = "Zagros's BridgeHub teyrchain runtime"
 license = "Apache-2.0"
 homepage.workspace = true
 repository.workspace = true
-documentation = "https://docs.rs/bridge-hub-zagros-runtime"
+documentation = "https://docs.rs/pezbridge-hub-zagros-runtime"

 [lints]
 workspace = true
@@ -65,7 +65,7 @@ pezkuwi-teyrchain-primitives = { workspace = true }
 xcm = { workspace = true }
 xcm-builder = { workspace = true }
 xcm-executor = { workspace = true }
-xcm-runtime-apis = { workspace = true }
+xcm-runtime-pezapis = { workspace = true }
 zagros-runtime-constants = { workspace = true }

 # Pezcumulus
@@ -89,16 +89,16 @@ bp-asset-hub-pezkuwichain = { workspace = true }
 bp-asset-hub-zagros = { workspace = true }
 bp-bridge-hub-pezkuwichain = { workspace = true }
 bp-bridge-hub-zagros = { workspace = true }
-bp-header-chain = { workspace = true }
+bp-header-pez-chain = { workspace = true }
 bp-messages = { workspace = true }
 bp-pezkuwi-core = { workspace = true }
 bp-pezkuwichain = { workspace = true }
 bp-relayers = { workspace = true }
-bp-runtime = { workspace = true }
+pezbp-runtime = { workspace = true }
 bp-teyrchains = { workspace = true }
 bp-xcm-bridge-hub-router = { workspace = true }
 bridge-hub-common = { workspace = true }
-bridge-runtime-common = { workspace = true }
+pezbridge-runtime-common = { workspace = true }
 pezpallet-bridge-grandpa = { workspace = true }
 pezpallet-bridge-messages = { workspace = true }
 pezpallet-bridge-relayers = { workspace = true }
@@ -106,13 +106,13 @@ pezpallet-bridge-teyrchains = { workspace = true }
 pezpallet-xcm-bridge-hub = { workspace = true }

 # Ethereum Bridge (Snowbridge)
-snowbridge-beacon-primitives = { workspace = true }
-snowbridge-core = { workspace = true }
-snowbridge-inbound-queue-primitives = { workspace = true }
-snowbridge-merkle-tree = { workspace = true }
-snowbridge-outbound-queue-primitives = { workspace = true }
-snowbridge-outbound-queue-runtime-api = { workspace = true }
-snowbridge-outbound-queue-v2-runtime-api = { workspace = true }
+pezsnowbridge-beacon-primitives = { workspace = true }
+pezsnowbridge-core = { workspace = true }
+pezsnowbridge-inbound-queue-primitives = { workspace = true }
+pezsnowbridge-merkle-tree = { workspace = true }
+pezsnowbridge-outbound-queue-primitives = { workspace = true }
+pezsnowbridge-outbound-queue-runtime-api = { workspace = true }
+pezsnowbridge-outbound-queue-v2-runtime-api = { workspace = true }
 snowbridge-pezpallet-ethereum-client = { workspace = true }
 snowbridge-pezpallet-inbound-queue = { workspace = true }
 snowbridge-pezpallet-inbound-queue-fixtures = { workspace = true }
@@ -122,16 +122,16 @@ snowbridge-pezpallet-outbound-queue = { workspace = true }
 snowbridge-pezpallet-outbound-queue-v2 = { workspace = true }
 snowbridge-pezpallet-system = { workspace = true }
 snowbridge-pezpallet-system-v2 = { workspace = true }
-snowbridge-system-runtime-api = { workspace = true }
-snowbridge-system-v2-runtime-api = { workspace = true }
+pezsnowbridge-system-runtime-api = { workspace = true }
+pezsnowbridge-system-v2-runtime-api = { workspace = true }

 [dev-dependencies]
-bridge-hub-test-utils = { workspace = true, default-features = true }
-bridge-runtime-common = { features = [
+pezbridge-hub-test-utils = { workspace = true, default-features = true }
+pezbridge-runtime-common = { features = [
  "integrity-test",
 ], workspace = true, default-features = true }
 pezpallet-bridge-relayers = { features = ["integrity-test"], workspace = true }
-snowbridge-runtime-test-common = { workspace = true, default-features = true }
+pezsnowbridge-runtime-test-common = { workspace = true, default-features = true }
 teyrchains-runtimes-test-utils = { workspace = true, default-features = true }

 [build-dependencies]
@@ -143,16 +143,16 @@ std = [
  "bp-asset-hub-zagros/std",
  "bp-bridge-hub-pezkuwichain/std",
  "bp-bridge-hub-zagros/std",
-  "bp-header-chain/std",
+  "bp-header-pez-chain/std",
  "bp-messages/std",
  "bp-pezkuwi-core/std",
  "bp-pezkuwichain/std",
  "bp-relayers/std",
-  "bp-runtime/std",
+  "pezbp-runtime/std",
  "bp-teyrchains/std",
  "bp-xcm-bridge-hub-router/std",
  "bridge-hub-common/std",
-  "bridge-runtime-common/std",
+  "pezbridge-runtime-common/std",
  "codec/std",
  "pezcumulus-pezpallet-aura-ext/std",
  "pezcumulus-pezpallet-session-benchmarking/std",
@@ -194,13 +194,13 @@ std = [
  "scale-info/std",
  "serde",
  "serde_json/std",
-  "snowbridge-beacon-primitives/std",
-  "snowbridge-core/std",
-  "snowbridge-inbound-queue-primitives/std",
-  "snowbridge-merkle-tree/std",
-  "snowbridge-outbound-queue-primitives/std",
-  "snowbridge-outbound-queue-runtime-api/std",
-  "snowbridge-outbound-queue-v2-runtime-api/std",
+  "pezsnowbridge-beacon-primitives/std",
+  "pezsnowbridge-core/std",
+  "pezsnowbridge-inbound-queue-primitives/std",
+  "pezsnowbridge-merkle-tree/std",
+  "pezsnowbridge-outbound-queue-primitives/std",
+  "pezsnowbridge-outbound-queue-runtime-api/std",
+  "pezsnowbridge-outbound-queue-v2-runtime-api/std",
  "snowbridge-pezpallet-ethereum-client/std",
  "snowbridge-pezpallet-inbound-queue-fixtures/std",
  "snowbridge-pezpallet-inbound-queue-v2-fixtures/std",
@@ -210,8 +210,8 @@ std = [
  "snowbridge-pezpallet-outbound-queue/std",
  "snowbridge-pezpallet-system-v2/std",
  "snowbridge-pezpallet-system/std",
-  "snowbridge-system-runtime-api/std",
-  "snowbridge-system-v2-runtime-api/std",
+  "pezsnowbridge-system-runtime-api/std",
+  "pezsnowbridge-system-v2-runtime-api/std",
  "pezsp-api/std",
  "pezsp-block-builder/std",
  "pezsp-consensus-aura/std",
@@ -234,7 +234,7 @@ std = [
  "tracing/std",
  "xcm-builder/std",
  "xcm-executor/std",
-  "xcm-runtime-apis/std",
+  "xcm-runtime-pezapis/std",
  "xcm/std",
  "zagros-runtime-constants/std",
 ]
@@ -245,17 +245,17 @@ runtime-benchmarks = [
  "bp-asset-hub-zagros/runtime-benchmarks",
  "bp-bridge-hub-pezkuwichain/runtime-benchmarks",
  "bp-bridge-hub-zagros/runtime-benchmarks",
-  "bp-header-chain/runtime-benchmarks",
+  "bp-header-pez-chain/runtime-benchmarks",
  "bp-messages/runtime-benchmarks",
  "bp-pezkuwi-core/runtime-benchmarks",
  "bp-pezkuwichain/runtime-benchmarks",
  "bp-relayers/runtime-benchmarks",
-  "bp-runtime/runtime-benchmarks",
+  "pezbp-runtime/runtime-benchmarks",
  "bp-teyrchains/runtime-benchmarks",
  "bp-xcm-bridge-hub-router/runtime-benchmarks",
  "bridge-hub-common/runtime-benchmarks",
-  "bridge-hub-test-utils/runtime-benchmarks",
-  "bridge-runtime-common/runtime-benchmarks",
+  "pezbridge-hub-test-utils/runtime-benchmarks",
+  "pezbridge-runtime-common/runtime-benchmarks",
  "pezcumulus-pezpallet-aura-ext/runtime-benchmarks",
  "pezcumulus-pezpallet-session-benchmarking/runtime-benchmarks",
  "pezcumulus-pezpallet-teyrchain-system/runtime-benchmarks",
@@ -293,13 +293,13 @@ runtime-benchmarks = [
  "pezpallet-xcm/runtime-benchmarks",
  "pezkuwi-runtime-common/runtime-benchmarks",
  "pezkuwi-teyrchain-primitives/runtime-benchmarks",
-  "snowbridge-beacon-primitives/runtime-benchmarks",
-  "snowbridge-core/runtime-benchmarks",
-  "snowbridge-inbound-queue-primitives/runtime-benchmarks",
-  "snowbridge-merkle-tree/runtime-benchmarks",
-  "snowbridge-outbound-queue-primitives/runtime-benchmarks",
-  "snowbridge-outbound-queue-runtime-api/runtime-benchmarks",
-  "snowbridge-outbound-queue-v2-runtime-api/runtime-benchmarks",
+  "pezsnowbridge-beacon-primitives/runtime-benchmarks",
+  "pezsnowbridge-core/runtime-benchmarks",
+  "pezsnowbridge-inbound-queue-primitives/runtime-benchmarks",
+  "pezsnowbridge-merkle-tree/runtime-benchmarks",
+  "pezsnowbridge-outbound-queue-primitives/runtime-benchmarks",
+  "pezsnowbridge-outbound-queue-runtime-api/runtime-benchmarks",
+  "pezsnowbridge-outbound-queue-v2-runtime-api/runtime-benchmarks",
  "snowbridge-pezpallet-ethereum-client/runtime-benchmarks",
  "snowbridge-pezpallet-inbound-queue-fixtures/runtime-benchmarks",
  "snowbridge-pezpallet-inbound-queue-v2-fixtures/runtime-benchmarks",
@@ -309,9 +309,9 @@ runtime-benchmarks = [
  "snowbridge-pezpallet-outbound-queue/runtime-benchmarks",
  "snowbridge-pezpallet-system-v2/runtime-benchmarks",
  "snowbridge-pezpallet-system/runtime-benchmarks",
-  "snowbridge-runtime-test-common/runtime-benchmarks",
-  "snowbridge-system-runtime-api/runtime-benchmarks",
-  "snowbridge-system-v2-runtime-api/runtime-benchmarks",
+  "pezsnowbridge-runtime-test-common/runtime-benchmarks",
+  "pezsnowbridge-system-runtime-api/runtime-benchmarks",
+  "pezsnowbridge-system-v2-runtime-api/runtime-benchmarks",
  "pezsp-api/runtime-benchmarks",
  "pezsp-block-builder/runtime-benchmarks",
  "pezsp-consensus-aura/runtime-benchmarks",
@@ -331,7 +331,7 @@ runtime-benchmarks = [
  "teyrchains-runtimes-test-utils/runtime-benchmarks",
  "xcm-builder/runtime-benchmarks",
  "xcm-executor/runtime-benchmarks",
-  "xcm-runtime-apis/runtime-benchmarks",
+  "xcm-runtime-pezapis/runtime-benchmarks",
  "xcm/runtime-benchmarks",
  "zagros-runtime-constants/runtime-benchmarks",
 ]
@@ -363,7 +363,7 @@ try-runtime = [
  "pezpallet-xcm-bridge-hub/try-runtime",
  "pezpallet-xcm/try-runtime",
  "pezkuwi-runtime-common/try-runtime",
-  "snowbridge-inbound-queue-primitives/try-runtime",
+  "pezsnowbridge-inbound-queue-primitives/try-runtime",
  "snowbridge-pezpallet-ethereum-client/try-runtime",
  "snowbridge-pezpallet-inbound-queue-v2/try-runtime",
  "snowbridge-pezpallet-inbound-queue/try-runtime",
@@ -21,7 +21,7 @@ codec = { features = ["derive"], workspace = true }
 # Bridge Dependencies
 bp-bridge-hub-pezcumulus = { workspace = true }
 bp-messages = { workspace = true }
-bp-runtime = { workspace = true }
+pezbp-runtime = { workspace = true }
 bp-xcm-bridge-hub = { workspace = true }

 # Bizinikiwi Based Dependencies
@@ -35,7 +35,7 @@ default = ["std"]
 std = [
  "bp-bridge-hub-pezcumulus/std",
  "bp-messages/std",
-  "bp-runtime/std",
+  "pezbp-runtime/std",
  "bp-xcm-bridge-hub/std",
  "codec/std",
  "pezframe-support/std",
@@ -46,7 +46,7 @@ std = [
 runtime-benchmarks = [
  "bp-bridge-hub-pezcumulus/runtime-benchmarks",
  "bp-messages/runtime-benchmarks",
-  "bp-runtime/runtime-benchmarks",
+  "pezbp-runtime/runtime-benchmarks",
  "bp-xcm-bridge-hub/runtime-benchmarks",
  "pezframe-support/runtime-benchmarks",
  "pezsp-api/runtime-benchmarks",
@@ -18,9 +18,9 @@

 #![cfg_attr(not(feature = "std"), no_std)]

-pub use bp_bridge_hub_cumulus::*;
+pub use bp_bridge_hub_pezcumulus::*;
 use bp_messages::*;
-use bp_runtime::{
+use pezbp_runtime::{
 	decl_bridge_finality_runtime_apis, decl_bridge_messages_runtime_apis, Chain, ChainId, Teyrchain,
 };
 use codec::{Decode, Encode};
@@ -120,7 +120,7 @@ impl bp_relayers::PaymentProcedure<AccountId, BridgeReward, u128> for BridgeRewa
 					BridgeRewardBeneficiaries::AssetHubLocation(account_location) => {
 						let account_location = Location::try_from(account_location)
 							.map_err(|_| Self::Error::Other("`AssetHubLocation` beneficiary location version is not supported for `Snowbridge` rewards!"))?;
-						snowbridge_core::reward::PayAccountOnLocation::<
+						pezsnowbridge_core::reward::PayAccountOnLocation::<
 							AccountId,
 							u128,
 							EthereumNetwork,
@@ -28,10 +28,10 @@ use pezframe_support::{parameter_types, traits::Contains, weights::ConstantMulti
 use pezframe_system::EnsureRootWithSuccess;
 use hex_literal::hex;
 use pezpallet_xcm::EnsureXcm;
-use snowbridge_beacon_primitives::{Fork, ForkVersions};
-use snowbridge_core::{gwei, meth, AllowSiblingsOnly, PricingParameters, Rewards};
-use snowbridge_inbound_queue_primitives::v2::CreateAssetCallInfo;
-use snowbridge_outbound_queue_primitives::{
+use pezsnowbridge_beacon_primitives::{Fork, ForkVersions};
+use pezsnowbridge_core::{gwei, meth, AllowSiblingsOnly, PricingParameters, Rewards};
+use pezsnowbridge_inbound_queue_primitives::v2::CreateAssetCallInfo;
+use pezsnowbridge_outbound_queue_primitives::{
 	v1::{ConstantGasMeter, EthereumBlobExporter},
 	v2::{ConstantGasMeter as ConstantGasMeterV2, EthereumBlobExporter as EthereumBlobExporterV2},
 };
@@ -53,14 +53,14 @@ use xcm::prelude::{GlobalConsensus, InteriorLocation, Location, PalletInstance,
 use xcm_executor::XcmExecutor;
 use zagros_runtime_constants::system_teyrchain::ASSET_HUB_ID;

-pub const SLOTS_PER_EPOCH: u32 = snowbridge_pallet_ethereum_client::config::SLOTS_PER_EPOCH as u32;
+pub const SLOTS_PER_EPOCH: u32 = snowbridge_pezpallet_ethereum_client::config::SLOTS_PER_EPOCH as u32;

 /// Exports message to the Ethereum Gateway contract.
 pub type SnowbridgeExporter = EthereumBlobExporter<
 	UniversalLocation,
 	EthereumNetwork,
-	snowbridge_pallet_outbound_queue::Pallet<Runtime>,
-	snowbridge_core::AgentIdOf,
+	snowbridge_pezpallet_outbound_queue::Pallet<Runtime>,
+	pezsnowbridge_core::AgentIdOf,
 	EthereumSystem,
 >;

@@ -100,9 +100,9 @@ parameter_types! {
 	pub SnowbridgeFrontendLocation: Location = Location::new(1, [Teyrchain(ASSET_HUB_ID), PalletInstance(FRONTEND_PALLET_INDEX)]);
 }

-impl snowbridge_pallet_inbound_queue::Config for Runtime {
+impl snowbridge_pezpallet_inbound_queue::Config for Runtime {
 	type RuntimeEvent = RuntimeEvent;
-	type Verifier = snowbridge_pallet_ethereum_client::Pallet<Runtime>;
+	type Verifier = snowbridge_pezpallet_ethereum_client::Pallet<Runtime>;
 	type Token = Balances;
 	#[cfg(not(feature = "runtime-benchmarks"))]
 	type XcmSender = crate::XcmRouter;
@@ -112,7 +112,7 @@ impl snowbridge_pallet_inbound_queue::Config for Runtime {
 	type GatewayAddress = EthereumGatewayAddress;
 	#[cfg(feature = "runtime-benchmarks")]
 	type Helper = Runtime;
-	type MessageConverter = snowbridge_inbound_queue_primitives::v1::MessageToXcm<
+	type MessageConverter = pezsnowbridge_inbound_queue_primitives::v1::MessageToXcm<
 		CreateAssetCallIndex,
 		CreateForeignAssetDeposit,
 		ConstU8<INBOUND_QUEUE_PALLET_INDEX_V1>,
@@ -125,12 +125,12 @@ impl snowbridge_pallet_inbound_queue::Config for Runtime {
 	type WeightToFee = WeightToFee;
 	type LengthToFee = ConstantMultiplier<Balance, TransactionByteFee>;
 	type MaxMessageSize = ConstU32<2048>;
-	type WeightInfo = crate::weights::snowbridge_pallet_inbound_queue::WeightInfo<Runtime>;
+	type WeightInfo = crate::weights::snowbridge_pezpallet_inbound_queue::WeightInfo<Runtime>;
 	type PricingParameters = EthereumSystem;
 	type AssetTransactor = <xcm_config::XcmConfig as xcm_executor::Config>::AssetTransactor;
 }

-impl snowbridge_pallet_inbound_queue_v2::Config for Runtime {
+impl snowbridge_pezpallet_inbound_queue_v2::Config for Runtime {
 	type RuntimeEvent = RuntimeEvent;
 	type Verifier = EthereumBeaconClient;
 	#[cfg(not(feature = "runtime-benchmarks"))]
@@ -140,10 +140,10 @@ impl snowbridge_pallet_inbound_queue_v2::Config for Runtime {
 	type GatewayAddress = EthereumGatewayAddress;
 	#[cfg(feature = "runtime-benchmarks")]
 	type Helper = Runtime;
-	type WeightInfo = crate::weights::snowbridge_pallet_inbound_queue_v2::WeightInfo<Runtime>;
+	type WeightInfo = crate::weights::snowbridge_pezpallet_inbound_queue_v2::WeightInfo<Runtime>;
 	type AssetHubParaId = AssetHubParaId;
 	type XcmExecutor = XcmExecutor<XcmConfig>;
-	type MessageConverter = snowbridge_inbound_queue_primitives::v2::MessageToXcm<
+	type MessageConverter = pezsnowbridge_inbound_queue_primitives::v2::MessageToXcm<
 		CreateAssetCall,
 		EthereumNetwork,
 		RelayNetwork,
@@ -162,7 +162,7 @@ impl snowbridge_pallet_inbound_queue_v2::Config for Runtime {
 	type RewardPayment = BridgeRelayers;
 }

-impl snowbridge_pallet_outbound_queue::Config for Runtime {
+impl snowbridge_pezpallet_outbound_queue::Config for Runtime {
 	type RuntimeEvent = RuntimeEvent;
 	type Hashing = Keccak256;
 	type MessageQueue = MessageQueue;
@@ -172,12 +172,12 @@ impl snowbridge_pallet_outbound_queue::Config for Runtime {
 	type GasMeter = ConstantGasMeter;
 	type Balance = Balance;
 	type WeightToFee = WeightToFee;
-	type WeightInfo = crate::weights::snowbridge_pallet_outbound_queue::WeightInfo<Runtime>;
+	type WeightInfo = crate::weights::snowbridge_pezpallet_outbound_queue::WeightInfo<Runtime>;
 	type PricingParameters = EthereumSystem;
 	type Channels = EthereumSystem;
 }

-impl snowbridge_pallet_outbound_queue_v2::Config for Runtime {
+impl snowbridge_pezpallet_outbound_queue_v2::Config for Runtime {
 	type RuntimeEvent = RuntimeEvent;
 	type Hashing = Keccak256;
 	type MessageQueue = MessageQueue;
@@ -185,7 +185,7 @@ impl snowbridge_pallet_outbound_queue_v2::Config for Runtime {
 	type MaxMessagePayloadSize = ConstU32<2048>;
 	// Maximum number of outbound messages that can be committed per block.
 	// It's benchmarked, including the entire process flow(initialize,submit,commit) in the
-	// worst-case, Benchmark results in `../weights/snowbridge_pallet_outbound_queue_v2.
+	// worst-case, Benchmark results in `../weights/snowbridge_pezpallet_outbound_queue_v2.
 	// rs` show that the `process` function consumes less than 1% of the block capacity, which is
 	// safe enough.
 	type MaxMessagesPerBlock = ConstU32<32>;
@@ -194,7 +194,7 @@ impl snowbridge_pallet_outbound_queue_v2::Config for Runtime {
 	type WeightToFee = WeightToFee;
 	type Verifier = EthereumBeaconClient;
 	type GatewayAddress = EthereumGatewayAddress;
-	type WeightInfo = crate::weights::snowbridge_pallet_outbound_queue_v2::WeightInfo<Runtime>;
+	type WeightInfo = crate::weights::snowbridge_pezpallet_outbound_queue_v2::WeightInfo<Runtime>;
 	type EthereumNetwork = EthereumNetwork;
 	type RewardKind = BridgeReward;
 	type DefaultRewardKind = SnowbridgeReward;
@@ -273,21 +273,21 @@ parameter_types! {
 	};
 }

-impl snowbridge_pallet_ethereum_client::Config for Runtime {
+impl snowbridge_pezpallet_ethereum_client::Config for Runtime {
 	type RuntimeEvent = RuntimeEvent;
 	type ForkVersions = ChainForkVersions;
 	type FreeHeadersInterval = ConstU32<SLOTS_PER_EPOCH>;
-	type WeightInfo = crate::weights::snowbridge_pallet_ethereum_client::WeightInfo<Runtime>;
+	type WeightInfo = crate::weights::snowbridge_pezpallet_ethereum_client::WeightInfo<Runtime>;
 }

-impl snowbridge_pallet_system::Config for Runtime {
+impl snowbridge_pezpallet_system::Config for Runtime {
 	type RuntimeEvent = RuntimeEvent;
 	type OutboundQueue = EthereumOutboundQueue;
 	type SiblingOrigin = EnsureXcm<AllowSiblingsOnly>;
-	type AgentIdOf = snowbridge_core::AgentIdOf;
+	type AgentIdOf = pezsnowbridge_core::AgentIdOf;
 	type TreasuryAccount = TreasuryAccount;
 	type Token = Balances;
-	type WeightInfo = crate::weights::snowbridge_pallet_system::WeightInfo<Runtime>;
+	type WeightInfo = crate::weights::snowbridge_pezpallet_system::WeightInfo<Runtime>;
 	#[cfg(feature = "runtime-benchmarks")]
 	type Helper = ();
 	type DefaultPricingParameters = Parameters;
@@ -307,12 +307,12 @@ impl Contains<Location> for AllowFromEthereumFrontend {
 	}
 }

-impl snowbridge_pallet_system_v2::Config for Runtime {
+impl snowbridge_pezpallet_system_v2::Config for Runtime {
 	type RuntimeEvent = RuntimeEvent;
 	type OutboundQueue = EthereumOutboundQueueV2;
 	type InboundQueue = EthereumInboundQueueV2;
 	type FrontendOrigin = EnsureXcm<AllowFromEthereumFrontend>;
-	type WeightInfo = crate::weights::snowbridge_pallet_system_v2::WeightInfo<Runtime>;
+	type WeightInfo = crate::weights::snowbridge_pezpallet_system_v2::WeightInfo<Runtime>;
 	type GovernanceOrigin = EnsureRootWithSuccess<crate::AccountId, RootLocation>;
 	#[cfg(feature = "runtime-benchmarks")]
 	type Helper = ();
@@ -327,17 +327,17 @@ pub mod benchmark_helpers {
 	use codec::Encode;
 	use pezframe_support::assert_ok;
 	use hex_literal::hex;
-	use snowbridge_beacon_primitives::BeaconHeader;
-	use snowbridge_inbound_queue_primitives::EventFixture;
-	use snowbridge_pallet_inbound_queue::BenchmarkHelper;
-	use snowbridge_pallet_inbound_queue_fixtures::register_token::make_register_token_message;
-	use snowbridge_pallet_inbound_queue_v2::BenchmarkHelper as InboundQueueBenchmarkHelperV2;
-	use snowbridge_pallet_inbound_queue_v2_fixtures::register_token::make_register_token_message as make_register_token_message_v2;
-	use snowbridge_pallet_outbound_queue_v2::BenchmarkHelper as OutboundQueueBenchmarkHelperV2;
+	use pezsnowbridge_beacon_primitives::BeaconHeader;
+	use pezsnowbridge_inbound_queue_primitives::EventFixture;
+	use snowbridge_pezpallet_inbound_queue::BenchmarkHelper;
+	use snowbridge_pezpallet_inbound_queue_fixtures::register_token::make_register_token_message;
+	use snowbridge_pezpallet_inbound_queue_v2::BenchmarkHelper as InboundQueueBenchmarkHelperV2;
+	use snowbridge_pezpallet_inbound_queue_v2_fixtures::register_token::make_register_token_message as make_register_token_message_v2;
+	use snowbridge_pezpallet_outbound_queue_v2::BenchmarkHelper as OutboundQueueBenchmarkHelperV2;
 	use pezsp_core::H256;
 	use xcm::latest::{Assets, Location, SendError, SendResult, SendXcm, Xcm, XcmHash};

-	impl<T: snowbridge_pallet_ethereum_client::Config> BenchmarkHelper<T> for Runtime {
+	impl<T: snowbridge_pezpallet_ethereum_client::Config> BenchmarkHelper<T> for Runtime {
 		fn initialize_storage() -> EventFixture {
 			let message = make_register_token_message();
 			EthereumBeaconClient::store_finalized_header(
@@ -357,7 +357,7 @@ pub mod benchmark_helpers {
 		}
 	}

-	impl<T: snowbridge_pallet_inbound_queue_v2::Config> InboundQueueBenchmarkHelperV2<T> for Runtime {
+	impl<T: snowbridge_pezpallet_inbound_queue_v2::Config> InboundQueueBenchmarkHelperV2<T> for Runtime {
 		fn initialize_storage() -> EventFixture {
 			let message = make_register_token_message_v2();

@@ -370,7 +370,7 @@ pub mod benchmark_helpers {
 		}
 	}

-	impl<T: snowbridge_pallet_outbound_queue_v2::Config> OutboundQueueBenchmarkHelperV2<T> for Runtime {
+	impl<T: snowbridge_pezpallet_outbound_queue_v2::Config> OutboundQueueBenchmarkHelperV2<T> for Runtime {
 		fn initialize_storage(beacon_header: BeaconHeader, block_roots_root: H256) {
 			EthereumBeaconClient::store_finalized_header(beacon_header, block_roots_root).unwrap();
 		}
@@ -392,13 +392,13 @@ pub mod benchmark_helpers {
 		}
 	}

-	impl snowbridge_pallet_system::BenchmarkHelper<RuntimeOrigin> for () {
+	impl snowbridge_pezpallet_system::BenchmarkHelper<RuntimeOrigin> for () {
 		fn make_xcm_origin(location: Location) -> RuntimeOrigin {
 			RuntimeOrigin::from(pezpallet_xcm::Origin::Xcm(location))
 		}
 	}

-	impl snowbridge_pallet_system_v2::BenchmarkHelper<RuntimeOrigin> for () {
+	impl snowbridge_pezpallet_system_v2::BenchmarkHelper<RuntimeOrigin> for () {
 		fn make_xcm_origin(location: Location) -> RuntimeOrigin {
 			RuntimeOrigin::from(pezpallet_xcm::Origin::Xcm(location))
 		}
@@ -428,11 +428,11 @@ mod tests {

 pub(crate) mod migrations {
 	use pezframe_support::pezpallet_prelude::*;
-	use snowbridge_core::TokenId;
+	use pezsnowbridge_core::TokenId;

 	#[pezframe_support::storage_alias]
-	pub type OldNativeToForeignId<T: snowbridge_pallet_system::Config> = StorageMap<
-		snowbridge_pallet_system::Pallet<T>,
+	pub type OldNativeToForeignId<T: snowbridge_pezpallet_system::Config> = StorageMap<
+		snowbridge_pezpallet_system::Pallet<T>,
 		Blake2_128Concat,
 		xcm::v4::Location,
 		TokenId,
@@ -440,8 +440,8 @@ pub(crate) mod migrations {
 	>;

 	/// One shot migration for NetworkId::Zagros to NetworkId::ByGenesis(ZAGROS_GENESIS_HASH)
-	pub struct MigrationForXcmV5<T: snowbridge_pallet_system::Config>(core::marker::PhantomData<T>);
-	impl<T: snowbridge_pallet_system::Config> pezframe_support::traits::OnRuntimeUpgrade
+	pub struct MigrationForXcmV5<T: snowbridge_pezpallet_system::Config>(core::marker::PhantomData<T>);
+	impl<T: snowbridge_pezpallet_system::Config> pezframe_support::traits::OnRuntimeUpgrade
 		for MigrationForXcmV5<T>
 	{
 		fn on_runtime_upgrade() -> Weight {
@@ -451,7 +451,7 @@ pub(crate) mod migrations {
 				weight.saturating_accrue(T::DbWeight::get().reads_writes(1, 1));
 				Some(xcm::v5::Location::try_from(pre).expect("valid location"))
 			};
-			snowbridge_pallet_system::ForeignToNativeId::<T>::translate_values(translate_zagros);
+			snowbridge_pezpallet_system::ForeignToNativeId::<T>::translate_values(translate_zagros);

 			weight
 		}
@@ -71,7 +71,7 @@ parameter_types! {
 		2,
 		[
 			GlobalConsensus(PezkuwichainGlobalConsensusNetwork::get()),
-			Teyrchain(<bp_bridge_hub_pezkuwichain::BridgeHubPezkuwichain as bp_runtime::Teyrchain>::TEYRCHAIN_ID)
+			Teyrchain(<bp_bridge_hub_pezkuwichain::BridgeHubPezkuwichain as pezbp_runtime::Teyrchain>::TEYRCHAIN_ID)
 		]
 	);

@@ -105,7 +105,7 @@ pub type OnBridgeHubZagrosRefundBridgeHubPezkuwichainMessages = BridgeRelayersTr
 		PriorityBoostPerMessage,
 	>,
 >;
-bp_runtime::generate_static_str_provider!(OnBridgeHubZagrosRefundBridgeHubPezkuwichainMessages);
+pezbp_runtime::generate_static_str_provider!(OnBridgeHubZagrosRefundBridgeHubPezkuwichainMessages);

 /// Add GRANDPA bridge pallet to track Pezkuwichain relay chain.
 pub type BridgeGrandpaPezkuwichainInstance = pezpallet_bridge_grandpa::Instance1;
@@ -203,7 +203,7 @@ impl pezpallet_xcm_bridge_hub::LocalXcmChannelManager for CongestionManager {
 		// dispatched and sent to the sibling teyrchain. Therefore, checking outbound `XcmpQueue`
 		// is sufficient here.
 		use bp_xcm_bridge_hub_router::XcmChannelStatusProvider;
-		pezcumulus_pallet_xcmp_queue::bridging::OutXcmpChannelStatusProvider::<Runtime>::is_congested(
+		pezcumulus_pezpallet_xcmp_queue::bridging::OutXcmpChannelStatusProvider::<Runtime>::is_congested(
 			with,
 		)
 	}
@@ -238,7 +238,7 @@ where
 	R: pezpallet_xcm_bridge_hub::Config<XBHI>,
 	XBHI: 'static,
 	C: xcm_executor::traits::ConvertLocation<
-		bp_runtime::AccountIdOf<pezpallet_xcm_bridge_hub::ThisChainOf<R, XBHI>>,
+		pezbp_runtime::AccountIdOf<pezpallet_xcm_bridge_hub::ThisChainOf<R, XBHI>>,
 	>,
 {
 	use pezpallet_xcm_bridge_hub::{Bridge, BridgeId, BridgeState};
@@ -281,7 +281,7 @@ where
 #[cfg(test)]
 mod tests {
 	use super::*;
-	use bridge_runtime_common::{
+	use pezbridge_runtime_common::{
 		assert_complete_bridge_types,
 		integrity::{
 			assert_complete_with_teyrchain_bridge_constants, check_message_lane_weights,
@@ -381,7 +381,7 @@ pub mod migration {

 	mod v1_wrong {
 		use bp_messages::{LaneState, MessageNonce, UnrewardedRelayer};
-		use bp_runtime::AccountIdOf;
+		use pezbp_runtime::AccountIdOf;
 		use codec::{Decode, Encode};
 		use pezpallet_bridge_messages::BridgedChainOf;
 		use pezsp_std::collections::vec_deque::VecDeque;
@@ -37,10 +37,10 @@ pub mod xcm_config;
 extern crate alloc;

 use alloc::{vec, vec::Vec};
-use bridge_runtime_common::extensions::{
+use pezbridge_runtime_common::extensions::{
 	CheckAndBoostBridgeGrandpaTransactions, CheckAndBoostBridgeTeyrchainsTransactions,
 };
-use pezcumulus_pallet_teyrchain_system::RelayNumberMonotonicallyIncreases;
+use pezcumulus_pezpallet_teyrchain_system::RelayNumberMonotonicallyIncreases;
 use pezcumulus_primitives_core::ParaId;
 use pezsp_api::impl_runtime_apis;
 use pezsp_core::{crypto::KeyTypeId, OpaqueMetadata};
@@ -75,12 +75,12 @@ pub use pezsp_consensus_aura::sr25519::AuthorityId as AuraId;
 pub use pezsp_runtime::{MultiAddress, Perbill, Permill};
 use xcm_config::{XcmConfig, XcmOriginToTransactDispatchOrigin, XcmRouter};

-use xcm_runtime_apis::{
+use xcm_runtime_pezapis::{
 	dry_run::{CallDryRunEffects, Error as XcmDryRunApiError, XcmDryRunEffects},
 	fees::Error as XcmPaymentApiError,
 };

-use bp_runtime::HeaderId;
+use pezbp_runtime::HeaderId;
 use pezpallet_bridge_messages::LaneIdOf;
 #[cfg(any(feature = "std", test))]
 pub use pezsp_runtime::BuildStorage;
@@ -93,8 +93,8 @@ use xcm::prelude::*;

 use weights::{BlockExecutionWeight, ExtrinsicBaseWeight, RocksDbWeight};

-use snowbridge_core::{AgentId, PricingParameters};
-use snowbridge_outbound_queue_primitives::v1::{Command, Fee};
+use pezsnowbridge_core::{AgentId, PricingParameters};
+use pezsnowbridge_outbound_queue_primitives::v1::{Command, Fee};
 use testnet_teyrchains_constants::zagros::{consensus::*, currency::*, fee::WeightToFee, time::*};
 use teyrchains_common::{
 	impls::DealWithFees, AccountId, Balance, BlockNumber, Hash, Header, Nonce, Signature,
@@ -117,7 +117,7 @@ pub type SignedBlock = generic::SignedBlock<Block>;
 pub type BlockId = generic::BlockId<Block>;

 /// The TransactionExtension to the basic transaction logic.
-pub type TxExtension = pezcumulus_pallet_weight_reclaim::StorageWeightReclaim<
+pub type TxExtension = pezcumulus_pezpallet_weight_reclaim::StorageWeightReclaim<
 	Runtime,
 	(
 		(
@@ -147,8 +147,8 @@ pub type Migrations = (
 	pezpallet_multisig::migrations::v1::MigrateToV1<Runtime>,
 	InitStorageVersions,
 	// unreleased
-	pezcumulus_pallet_xcmp_queue::migration::v4::MigrationToV4<Runtime>,
-	pezcumulus_pallet_xcmp_queue::migration::v5::MigrateV4ToV5<Runtime>,
+	pezcumulus_pezpallet_xcmp_queue::migration::v4::MigrationToV4<Runtime>,
+	pezcumulus_pezpallet_xcmp_queue::migration::v5::MigrateV4ToV5<Runtime>,
 	pezpallet_bridge_messages::migration::v1::MigrationToV1<
 		Runtime,
 		bridge_to_pezkuwichain_config::WithBridgeHubPezkuwichainMessagesInstance,
@@ -172,12 +172,12 @@ pub type Migrations = (
 		bridge_common_config::BridgeRelayersInstance,
 		bp_messages::LegacyLaneId,
 	>,
-	snowbridge_pallet_system::migration::v0::InitializeOnUpgrade<
+	snowbridge_pezpallet_system::migration::v0::InitializeOnUpgrade<
 		Runtime,
 		ConstU32<BRIDGE_HUB_ID>,
 		ConstU32<ASSET_HUB_ID>,
 	>,
-	snowbridge_pallet_system::migration::FeePerGasMigrationV0ToV1<Runtime>,
+	snowbridge_pezpallet_system::migration::FeePerGasMigrationV0ToV1<Runtime>,
 	bridge_to_ethereum_config::migrations::MigrationForXcmV5<Runtime>,
 	pezpallet_session::migrations::v1::MigrateV0ToV1<
 		Runtime,
@@ -185,7 +185,7 @@ pub type Migrations = (
 	>,
 	// permanent
 	pezpallet_xcm::migration::MigrateToLatestXcmVersion<Runtime>,
-	pezcumulus_pallet_aura_ext::migration::MigrateV0ToV1<Runtime>,
+	pezcumulus_pezpallet_aura_ext::migration::MigrateV0ToV1<Runtime>,
 );

 parameter_types! {
@@ -311,13 +311,13 @@ impl pezframe_system::Config for Runtime {
 	/// This is used as an identifier of the chain. 42 is the generic bizinikiwi prefix.
 	type SS58Prefix = SS58Prefix;
 	/// The action to take on a Runtime Upgrade
-	type OnSetCode = pezcumulus_pallet_teyrchain_system::TeyrchainSetCode<Self>;
+	type OnSetCode = pezcumulus_pezpallet_teyrchain_system::TeyrchainSetCode<Self>;
 	type MaxConsumers = pezframe_support::traits::ConstU32<16>;
 	type SingleBlockMigrations = Migrations;
 }

-impl pezcumulus_pallet_weight_reclaim::Config for Runtime {
-	type WeightInfo = weights::pezcumulus_pallet_weight_reclaim::WeightInfo<Runtime>;
+impl pezcumulus_pezpallet_weight_reclaim::Config for Runtime {
+	type WeightInfo = weights::pezcumulus_pezpallet_weight_reclaim::WeightInfo<Runtime>;
 }

 impl pezpallet_timestamp::Config for Runtime {
@@ -377,8 +377,8 @@ parameter_types! {
 	pub const ReservedDmpWeight: Weight = MAXIMUM_BLOCK_WEIGHT.saturating_div(4);
 }

-impl pezcumulus_pallet_teyrchain_system::Config for Runtime {
-	type WeightInfo = weights::pezcumulus_pallet_teyrchain_system::WeightInfo<Runtime>;
+impl pezcumulus_pezpallet_teyrchain_system::Config for Runtime {
+	type WeightInfo = weights::pezcumulus_pezpallet_teyrchain_system::WeightInfo<Runtime>;
 	type RuntimeEvent = RuntimeEvent;
 	type OnSystemEvent = ();
 	type SelfParaId = teyrchain_info::Pallet<Runtime>;
@@ -392,7 +392,7 @@ impl pezcumulus_pallet_teyrchain_system::Config for Runtime {
 	type RelayParentOffset = ConstU32<0>;
 }

-type ConsensusHook = pezcumulus_pallet_aura_ext::FixedVelocityConsensusHook<
+type ConsensusHook = pezcumulus_pezpallet_aura_ext::FixedVelocityConsensusHook<
 	Runtime,
 	RELAY_CHAIN_SLOT_DURATION_MILLIS,
 	BLOCK_PROCESSING_VELOCITY,
@@ -435,7 +435,7 @@ impl pezpallet_message_queue::Config for Runtime {
 	type IdleMaxServiceWeight = MessageQueueServiceWeight;
 }

-impl pezcumulus_pallet_aura_ext::Config for Runtime {}
+impl pezcumulus_pezpallet_aura_ext::Config for Runtime {}

 parameter_types! {
 	/// The asset ID for the asset that we use to pay for message delivery fees.
@@ -451,7 +451,7 @@ pub type PriceForSiblingTeyrchainDelivery = pezkuwi_runtime_common::xcm_sender::
 	XcmpQueue,
 >;

-impl pezcumulus_pallet_xcmp_queue::Config for Runtime {
+impl pezcumulus_pezpallet_xcmp_queue::Config for Runtime {
 	type RuntimeEvent = RuntimeEvent;
 	type ChannelInfo = TeyrchainSystem;
 	type VersionWrapper = PezkuwiXcm;
@@ -463,11 +463,11 @@ impl pezcumulus_pallet_xcmp_queue::Config for Runtime {
 	type MaxPageSize = ConstU32<{ 103 * 1024 }>;
 	type ControllerOrigin = EnsureRoot<AccountId>;
 	type ControllerOriginConverter = XcmOriginToTransactDispatchOrigin;
-	type WeightInfo = weights::pezcumulus_pallet_xcmp_queue::WeightInfo<Runtime>;
+	type WeightInfo = weights::pezcumulus_pezpallet_xcmp_queue::WeightInfo<Runtime>;
 	type PriceForSiblingDelivery = PriceForSiblingTeyrchainDelivery;
 }

-impl pezcumulus_pallet_xcmp_queue::migration::v5::V5Config for Runtime {
+impl pezcumulus_pezpallet_xcmp_queue::migration::v5::V5Config for Runtime {
 	// This must be the same as the `ChannelInfo` from the `Config`:
 	type ChannelList = TeyrchainSystem;
 }
@@ -558,10 +558,10 @@ construct_runtime!(
 	{
 		// System support stuff.
 		System: pezframe_system = 0,
-		TeyrchainSystem: pezcumulus_pallet_teyrchain_system = 1,
+		TeyrchainSystem: pezcumulus_pezpallet_teyrchain_system = 1,
 		Timestamp: pezpallet_timestamp = 2,
 		TeyrchainInfo: teyrchain_info = 3,
-		WeightReclaim: pezcumulus_pallet_weight_reclaim = 4,
+		WeightReclaim: pezcumulus_pezpallet_weight_reclaim = 4,

 		// Monetary stuff.
 		Balances: pezpallet_balances = 10,
@@ -572,12 +572,12 @@ construct_runtime!(
 		CollatorSelection: pezpallet_collator_selection = 21,
 		Session: pezpallet_session = 22,
 		Aura: pezpallet_aura = 23,
-		AuraExt: pezcumulus_pallet_aura_ext = 24,
+		AuraExt: pezcumulus_pezpallet_aura_ext = 24,

 		// XCM helpers.
-		XcmpQueue: pezcumulus_pallet_xcmp_queue = 30,
+		XcmpQueue: pezcumulus_pezpallet_xcmp_queue = 30,
 		PezkuwiXcm: pezpallet_xcm = 31,
-		CumulusXcm: pezcumulus_pallet_xcm = 32,
+		CumulusXcm: pezcumulus_pezpallet_xcm = 32,

 		// Handy utilities.
 		Utility: pezpallet_utility = 40,
@@ -590,14 +590,14 @@ construct_runtime!(
 		BridgePezkuwichainMessages: pezpallet_bridge_messages::<Instance1> = 44,
 		XcmOverBridgeHubPezkuwichain: pezpallet_xcm_bridge_hub::<Instance1> = 45,

-		EthereumInboundQueue: snowbridge_pallet_inbound_queue = 80,
-		EthereumOutboundQueue: snowbridge_pallet_outbound_queue = 81,
-		EthereumBeaconClient: snowbridge_pallet_ethereum_client = 82,
-		EthereumSystem: snowbridge_pallet_system = 83,
+		EthereumInboundQueue: snowbridge_pezpallet_inbound_queue = 80,
+		EthereumOutboundQueue: snowbridge_pezpallet_outbound_queue = 81,
+		EthereumBeaconClient: snowbridge_pezpallet_ethereum_client = 82,
+		EthereumSystem: snowbridge_pezpallet_system = 83,

-		EthereumSystemV2: snowbridge_pallet_system_v2 = 90,
-		EthereumInboundQueueV2: snowbridge_pallet_inbound_queue_v2 = 91,
-		EthereumOutboundQueueV2: snowbridge_pallet_outbound_queue_v2 = 92,
+		EthereumSystemV2: snowbridge_pezpallet_system_v2 = 90,
+		EthereumInboundQueueV2: snowbridge_pezpallet_inbound_queue_v2 = 91,
+		EthereumOutboundQueueV2: snowbridge_pezpallet_outbound_queue_v2 = 92,

 		// Message Queue. Importantly, is registered last so that messages are processed after
 		// the `on_initialize` hooks of bridging pallets.
@@ -605,7 +605,7 @@ construct_runtime!(
 	}
 );

-bridge_runtime_common::generate_bridge_reject_obsolete_headers_and_messages! {
+pezbridge_runtime_common::generate_bridge_reject_obsolete_headers_and_messages! {
 	RuntimeCall, AccountId,
 	// Grandpa
 	CheckAndBoostBridgeGrandpaTransactions<
@@ -639,8 +639,8 @@ mod benches {
 		[pezpallet_timestamp, Timestamp]
 		[pezpallet_transaction_payment, TransactionPayment]
 		[pezpallet_collator_selection, CollatorSelection]
-		[pezcumulus_pallet_teyrchain_system, TeyrchainSystem]
-		[pezcumulus_pallet_xcmp_queue, XcmpQueue]
+		[pezcumulus_pezpallet_teyrchain_system, TeyrchainSystem]
+		[pezcumulus_pezpallet_xcmp_queue, XcmpQueue]
 		// XCM
 		[pezpallet_xcm, PalletXcmExtrinsicsBenchmark::<Runtime>]
 		// NOTE: Make sure you point to the individual modules below.
@@ -652,16 +652,16 @@ mod benches {
 		[pezpallet_bridge_teyrchains, WithinPezkuwichain]
 		[pezpallet_bridge_messages, ZagrosToPezkuwichain]
 		// Ethereum Bridge V1
-		[snowbridge_pallet_system, EthereumSystem]
-		[snowbridge_pallet_ethereum_client, EthereumBeaconClient]
-		[snowbridge_pallet_inbound_queue, EthereumInboundQueue]
-		[snowbridge_pallet_outbound_queue, EthereumOutboundQueue]
+		[snowbridge_pezpallet_system, EthereumSystem]
+		[snowbridge_pezpallet_ethereum_client, EthereumBeaconClient]
+		[snowbridge_pezpallet_inbound_queue, EthereumInboundQueue]
+		[snowbridge_pezpallet_outbound_queue, EthereumOutboundQueue]
 		// Ethereum Bridge V2
-		[snowbridge_pallet_system_v2, EthereumSystemV2]
-		[snowbridge_pallet_inbound_queue_v2, EthereumInboundQueueV2]
-		[snowbridge_pallet_outbound_queue_v2, EthereumOutboundQueueV2]
+		[snowbridge_pezpallet_system_v2, EthereumSystemV2]
+		[snowbridge_pezpallet_inbound_queue_v2, EthereumInboundQueueV2]
+		[snowbridge_pezpallet_outbound_queue_v2, EthereumOutboundQueueV2]

-		[pezcumulus_pallet_weight_reclaim, WeightReclaim]
+		[pezcumulus_pezpallet_weight_reclaim, WeightReclaim]
 	);
 }

@@ -818,7 +818,7 @@ impl_runtime_apis! {
 		}
 	}

-	impl xcm_runtime_apis::fees::XcmPaymentApi<Block> for Runtime {
+	impl xcm_runtime_pezapis::fees::XcmPaymentApi<Block> for Runtime {
 		fn query_acceptable_payment_assets(xcm_version: xcm::Version) -> Result<Vec<VersionedAssetId>, XcmPaymentApiError> {
 			let acceptable_assets = vec![AssetId(xcm_config::ZagrosLocation::get())];
 			PezkuwiXcm::query_acceptable_payment_assets(xcm_version, acceptable_assets)
@@ -839,7 +839,7 @@ impl_runtime_apis! {
 		}
 	}

-	impl xcm_runtime_apis::dry_run::DryRunApi<Block, RuntimeCall, RuntimeEvent, OriginCaller> for Runtime {
+	impl xcm_runtime_pezapis::dry_run::DryRunApi<Block, RuntimeCall, RuntimeEvent, OriginCaller> for Runtime {
 		fn dry_run_call(origin: OriginCaller, call: RuntimeCall, result_xcms_version: XcmVersion) -> Result<CallDryRunEffects<RuntimeEvent>, XcmDryRunApiError> {
 			PezkuwiXcm::dry_run_call::<Runtime, xcm_config::XcmRouter, OriginCaller, RuntimeCall>(origin, call, result_xcms_version)
 		}
@@ -849,37 +849,37 @@ impl_runtime_apis! {
 		}
 	}

-	impl xcm_runtime_apis::conversions::LocationToAccountApi<Block, AccountId> for Runtime {
+	impl xcm_runtime_pezapis::conversions::LocationToAccountApi<Block, AccountId> for Runtime {
 		fn convert_location(location: VersionedLocation) -> Result<
 			AccountId,
-			xcm_runtime_apis::conversions::Error
+			xcm_runtime_pezapis::conversions::Error
 		> {
-			xcm_runtime_apis::conversions::LocationToAccountHelper::<
+			xcm_runtime_pezapis::conversions::LocationToAccountHelper::<
 				AccountId,
 				xcm_config::LocationToAccountId,
 			>::convert_location(location)
 		}
 	}

-	impl xcm_runtime_apis::trusted_query::TrustedQueryApi<Block> for Runtime {
-		fn is_trusted_reserve(asset: VersionedAsset, location: VersionedLocation) -> xcm_runtime_apis::trusted_query::XcmTrustedQueryResult {
+	impl xcm_runtime_pezapis::trusted_query::TrustedQueryApi<Block> for Runtime {
+		fn is_trusted_reserve(asset: VersionedAsset, location: VersionedLocation) -> xcm_runtime_pezapis::trusted_query::XcmTrustedQueryResult {
 			PezkuwiXcm::is_trusted_reserve(asset, location)
 		}
-		fn is_trusted_teleporter(asset: VersionedAsset, location: VersionedLocation) -> xcm_runtime_apis::trusted_query::XcmTrustedQueryResult {
+		fn is_trusted_teleporter(asset: VersionedAsset, location: VersionedLocation) -> xcm_runtime_pezapis::trusted_query::XcmTrustedQueryResult {
 			PezkuwiXcm::is_trusted_teleporter(asset, location)
 		}
 	}

-	impl xcm_runtime_apis::authorized_aliases::AuthorizedAliasersApi<Block> for Runtime {
+	impl xcm_runtime_pezapis::authorized_aliases::AuthorizedAliasersApi<Block> for Runtime {
 		fn authorized_aliasers(target: VersionedLocation) -> Result<
-			Vec<xcm_runtime_apis::authorized_aliases::OriginAliaser>,
-			xcm_runtime_apis::authorized_aliases::Error
+			Vec<xcm_runtime_pezapis::authorized_aliases::OriginAliaser>,
+			xcm_runtime_pezapis::authorized_aliases::Error
 		> {
 			PezkuwiXcm::authorized_aliasers(target)
 		}
 		fn is_authorized_alias(origin: VersionedLocation, target: VersionedLocation) -> Result<
 			bool,
-			xcm_runtime_apis::authorized_aliases::Error
+			xcm_runtime_pezapis::authorized_aliases::Error
 		> {
 			PezkuwiXcm::is_authorized_alias(origin, target)
 		}
@@ -901,7 +901,7 @@ impl_runtime_apis! {
 			>>::FreeHeadersInterval::get()
 		}
 		fn synced_headers_grandpa_info(
-		) -> Vec<bp_header_chain::StoredHeaderGrandpaInfo<bp_pezkuwichain::Header>> {
+		) -> Vec<bp_header_pez_chain::StoredHeaderGrandpaInfo<bp_pezkuwichain::Header>> {
 			BridgePezkuwichainGrandpa::synced_headers_grandpa_info()
 		}
 	}
@@ -923,7 +923,7 @@ impl_runtime_apis! {
 			lane: LaneIdOf<Runtime, bridge_to_pezkuwichain_config::WithBridgeHubPezkuwichainMessagesInstance>,
 			messages: Vec<(bp_messages::MessagePayload, bp_messages::OutboundMessageDetails)>,
 		) -> Vec<bp_messages::InboundMessageDetails> {
-			bridge_runtime_common::messages_api::inbound_message_details::<
+			pezbridge_runtime_common::messages_api::inbound_message_details::<
 				Runtime,
 				bridge_to_pezkuwichain_config::WithBridgeHubPezkuwichainMessagesInstance,
 			>(lane, messages)
@@ -936,38 +936,38 @@ impl_runtime_apis! {
 			begin: bp_messages::MessageNonce,
 			end: bp_messages::MessageNonce,
 		) -> Vec<bp_messages::OutboundMessageDetails> {
-			bridge_runtime_common::messages_api::outbound_message_details::<
+			pezbridge_runtime_common::messages_api::outbound_message_details::<
 				Runtime,
 				bridge_to_pezkuwichain_config::WithBridgeHubPezkuwichainMessagesInstance,
 			>(lane, begin, end)
 		}
 	}

-	impl snowbridge_outbound_queue_runtime_api::OutboundQueueApi<Block, Balance> for Runtime {
-		fn prove_message(leaf_index: u64) -> Option<snowbridge_merkle_tree::MerkleProof> {
-			snowbridge_pallet_outbound_queue::api::prove_message::<Runtime>(leaf_index)
+	impl pezsnowbridge_outbound_queue_runtime_api::OutboundQueueApi<Block, Balance> for Runtime {
+		fn prove_message(leaf_index: u64) -> Option<pezsnowbridge_merkle_tree::MerkleProof> {
+			snowbridge_pezpallet_outbound_queue::api::prove_message::<Runtime>(leaf_index)
 		}

 		fn calculate_fee(command: Command, parameters: Option<PricingParameters<Balance>>) -> Fee<Balance> {
-			snowbridge_pallet_outbound_queue::api::calculate_fee::<Runtime>(command, parameters)
+			snowbridge_pezpallet_outbound_queue::api::calculate_fee::<Runtime>(command, parameters)
 		}
 	}

-	impl snowbridge_outbound_queue_v2_runtime_api::OutboundQueueV2Api<Block, Balance> for Runtime {
-		fn prove_message(leaf_index: u64) -> Option<snowbridge_merkle_tree::MerkleProof> {
-			snowbridge_pallet_outbound_queue_v2::api::prove_message::<Runtime>(leaf_index)
+	impl pezsnowbridge_outbound_queue_v2_runtime_api::OutboundQueueV2Api<Block, Balance> for Runtime {
+		fn prove_message(leaf_index: u64) -> Option<pezsnowbridge_merkle_tree::MerkleProof> {
+			snowbridge_pezpallet_outbound_queue_v2::api::prove_message::<Runtime>(leaf_index)
 		}
 	}

-	impl snowbridge_system_runtime_api::ControlApi<Block> for Runtime {
+	impl pezsnowbridge_system_runtime_api::ControlApi<Block> for Runtime {
 		fn agent_id(location: VersionedLocation) -> Option<AgentId> {
-			snowbridge_pallet_system::api::agent_id::<Runtime>(location)
+			snowbridge_pezpallet_system::api::agent_id::<Runtime>(location)
 		}
 	}

-	impl snowbridge_system_v2_runtime_api::ControlV2Api<Block> for Runtime {
+	impl pezsnowbridge_system_v2_runtime_api::ControlV2Api<Block> for Runtime {
 		fn agent_id(location: VersionedLocation) -> Option<AgentId> {
-			snowbridge_pallet_system_v2::api::agent_id::<Runtime>(location)
+			snowbridge_pezpallet_system_v2::api::agent_id::<Runtime>(location)
 		}
 	}

@@ -1000,7 +1000,7 @@ impl_runtime_apis! {
 			use pezframe_support::traits::StorageInfoTrait;
 			use pezframe_system_benchmarking::Pallet as SystemBench;
 			use pezframe_system_benchmarking::extensions::Pallet as SystemExtensionsBench;
-			use pezcumulus_pallet_session_benchmarking::Pallet as SessionBench;
+			use pezcumulus_pezpallet_session_benchmarking::Pallet as SessionBench;
 			use pezpallet_xcm::benchmarking::Pallet as PalletXcmExtrinsicsBenchmark;

 			// This is defined once again in dispatch_benchmark, because list_benchmarks!
@@ -1038,12 +1038,12 @@ impl_runtime_apis! {
 				}

 				fn verify_set_code() {
-					System::assert_last_event(pezcumulus_pallet_teyrchain_system::Event::<Runtime>::ValidationFunctionStored.into());
+					System::assert_last_event(pezcumulus_pezpallet_teyrchain_system::Event::<Runtime>::ValidationFunctionStored.into());
 				}
 			}

-			use pezcumulus_pallet_session_benchmarking::Pallet as SessionBench;
-			impl pezcumulus_pallet_session_benchmarking::Config for Runtime {}
+			use pezcumulus_pezpallet_session_benchmarking::Pallet as SessionBench;
+			impl pezcumulus_pezpallet_session_benchmarking::Config for Runtime {}

 			use xcm::latest::prelude::*;
 			use xcm_config::ZagrosLocation;
@@ -1277,7 +1277,7 @@ impl_runtime_apis! {
 			type WithinPezkuwichain = pezpallet_bridge_teyrchains::benchmarking::Pallet::<Runtime, bridge_to_pezkuwichain_config::BridgeTeyrchainPezkuwichainInstance>;
 			type ZagrosToPezkuwichain = pezpallet_bridge_messages::benchmarking::Pallet ::<Runtime, bridge_to_pezkuwichain_config::WithBridgeHubPezkuwichainMessagesInstance>;

-			use bridge_runtime_common::messages_benchmarking::{
+			use pezbridge_runtime_common::messages_benchmarking::{
 				prepare_message_delivery_proof_from_teyrchain,
 				prepare_message_proof_from_teyrchain,
 				generate_xcm_builder_bridge_message_sample,
@@ -1291,7 +1291,7 @@ impl_runtime_apis! {
 			impl BridgeMessagesConfig<bridge_to_pezkuwichain_config::WithBridgeHubPezkuwichainMessagesInstance> for Runtime {
 				fn is_relayer_rewarded(relayer: &Self::AccountId) -> bool {
 					let bench_lane_id = <Self as BridgeMessagesConfig<bridge_to_pezkuwichain_config::WithBridgeHubPezkuwichainMessagesInstance>>::bench_lane_id();
-					use bp_runtime::Chain;
+					use pezbp_runtime::Chain;
 					let bridged_chain_id =<Self as pezpallet_bridge_messages::Config<bridge_to_pezkuwichain_config::WithBridgeHubPezkuwichainMessagesInstance>>::BridgedChain::ID;
 					pezpallet_bridge_relayers::Pallet::<Runtime, bridge_common_config::BridgeRelayersInstance>::relayer_reward(
 						relayer,
@@ -1344,7 +1344,7 @@ impl_runtime_apis! {
 				}
 			}

-			use bridge_runtime_common::teyrchains_benchmarking::prepare_teyrchain_heads_proof;
+			use pezbridge_runtime_common::teyrchains_benchmarking::prepare_teyrchain_heads_proof;
 			use pezpallet_bridge_teyrchains::benchmarking::Config as BridgeTeyrchainsConfig;
 			use pezpallet_bridge_relayers::benchmarking::{
 				Pallet as BridgeRelayersBench,
@@ -1353,14 +1353,14 @@ impl_runtime_apis! {

 			impl BridgeTeyrchainsConfig<bridge_to_pezkuwichain_config::BridgeTeyrchainPezkuwichainInstance> for Runtime {
 				fn teyrchains() -> Vec<bp_pezkuwi_core::teyrchains::ParaId> {
-					use bp_runtime::Teyrchain;
+					use pezbp_runtime::Teyrchain;
 					vec![bp_pezkuwi_core::teyrchains::ParaId(bp_bridge_hub_pezkuwichain::BridgeHubPezkuwichain::TEYRCHAIN_ID)]
 				}

 				fn prepare_teyrchain_heads_proof(
 					teyrchains: &[bp_pezkuwi_core::teyrchains::ParaId],
 					teyrchain_head_size: u32,
-					proof_params: bp_runtime::UnverifiedStorageProofParams,
+					proof_params: pezbp_runtime::UnverifiedStorageProofParams,
 				) -> (
 					bp_teyrchains::RelayBlockNumber,
 					bp_teyrchains::RelayBlockHash,
@@ -1446,9 +1446,9 @@ impl_runtime_apis! {
 	}
 }

-pezcumulus_pallet_teyrchain_system::register_validate_block! {
+pezcumulus_pezpallet_teyrchain_system::register_validate_block! {
 	Runtime = Runtime,
-	BlockExecutor = pezcumulus_pallet_aura_ext::BlockExecutor::<Runtime, Executive>,
+	BlockExecutor = pezcumulus_pezpallet_aura_ext::BlockExecutor::<Runtime, Executive>,
 }

 #[cfg(test)]
@@ -1489,7 +1489,7 @@ mod tests {
 				let bh_indirect_payload = bp_bridge_hub_zagros::TransactionExtension::from_params(
 					VERSION.spec_version,
 					VERSION.transaction_version,
-					bp_runtime::TransactionEra::Immortal,
+					pezbp_runtime::TransactionEra::Immortal,
 					System::block_hash(BlockNumber::zero()),
 					10,
 					10,
@@ -23,9 +23,9 @@ use ::pezpallet_bridge_relayers::WeightInfo as _;
 use ::pezpallet_bridge_teyrchains::WeightInfoExt as TeyrchainsWeightInfoExt;

 pub mod block_weights;
-pub mod pezcumulus_pallet_teyrchain_system;
-pub mod pezcumulus_pallet_weight_reclaim;
-pub mod pezcumulus_pallet_xcmp_queue;
+pub mod pezcumulus_pezpallet_teyrchain_system;
+pub mod pezcumulus_pezpallet_weight_reclaim;
+pub mod pezcumulus_pezpallet_xcmp_queue;
 pub mod extrinsic_weights;
 pub mod pezframe_system;
 pub mod pezframe_system_extensions;
@@ -46,13 +46,13 @@ pub mod paritydb_weights;
 pub mod rocksdb_weights;
 pub mod xcm;

-pub mod snowbridge_pallet_ethereum_client;
-pub mod snowbridge_pallet_inbound_queue;
-pub mod snowbridge_pallet_inbound_queue_v2;
-pub mod snowbridge_pallet_outbound_queue;
-pub mod snowbridge_pallet_outbound_queue_v2;
-pub mod snowbridge_pallet_system;
-pub mod snowbridge_pallet_system_v2;
+pub mod snowbridge_pezpallet_ethereum_client;
+pub mod snowbridge_pezpallet_inbound_queue;
+pub mod snowbridge_pezpallet_inbound_queue_v2;
+pub mod snowbridge_pezpallet_outbound_queue;
+pub mod snowbridge_pezpallet_outbound_queue_v2;
+pub mod snowbridge_pezpallet_system;
+pub mod snowbridge_pezpallet_system_v2;

 pub use block_weights::constants::BlockExecutionWeight;
 pub use extrinsic_weights::constants::ExtrinsicBaseWeight;
@@ -13,7 +13,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.

-//! Autogenerated weights for `pezcumulus_pallet_teyrchain_system`
+//! Autogenerated weights for `pezcumulus_pezpallet_teyrchain_system`
 //!
 //! THIS FILE WAS AUTO-GENERATED USING THE BIZINIKIWI BENCHMARK CLI VERSION 32.0.0
 //! DATE: 2025-02-21, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]`
@@ -27,8 +27,8 @@
 // benchmark
 // pallet
 // --extrinsic=*
-// --runtime=target/production/wbuild/bridge-hub-zagros-runtime/bridge_hub_zagros_runtime.wasm
-// --pallet=pezcumulus_pallet_teyrchain_system
+// --runtime=target/production/wbuild/pezbridge-hub-zagros-runtime/pezbridge_hub_zagros_runtime.wasm
+// --pallet=pezcumulus_pezpallet_teyrchain_system
 // --header=/__w/pezkuwi-sdk/pezkuwi-sdk/pezcumulus/file_header.txt
 // --output=./pezcumulus/teyrchains/runtimes/bridge-hubs/bridge-hub-zagros/src/weights
 // --wasm-execution=compiled
@@ -47,9 +47,9 @@
 use pezframe_support::{traits::Get, weights::Weight};
 use core::marker::PhantomData;

-/// Weight functions for `pezcumulus_pallet_teyrchain_system`.
+/// Weight functions for `pezcumulus_pezpallet_teyrchain_system`.
 pub struct WeightInfo<T>(PhantomData<T>);
-impl<T: pezframe_system::Config> pezcumulus_pallet_teyrchain_system::WeightInfo for WeightInfo<T> {
+impl<T: pezframe_system::Config> pezcumulus_pezpallet_teyrchain_system::WeightInfo for WeightInfo<T> {
 	/// Storage: `TeyrchainSystem::LastDmqMqcHead` (r:1 w:1)
 	/// Proof: `TeyrchainSystem::LastDmqMqcHead` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
 	/// Storage: `MessageQueue::BookStateFor` (r:1 w:1)
@@ -13,7 +13,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.

-//! Autogenerated weights for `pezcumulus_pallet_weight_reclaim`
+//! Autogenerated weights for `pezcumulus_pezpallet_weight_reclaim`
 //!
 //! THIS FILE WAS AUTO-GENERATED USING THE BIZINIKIWI BENCHMARK CLI VERSION 32.0.0
 //! DATE: 2025-02-21, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]`
@@ -27,8 +27,8 @@
 // benchmark
 // pallet
 // --extrinsic=*
-// --runtime=target/production/wbuild/bridge-hub-zagros-runtime/bridge_hub_zagros_runtime.wasm
-// --pallet=pezcumulus_pallet_weight_reclaim
+// --runtime=target/production/wbuild/pezbridge-hub-zagros-runtime/pezbridge_hub_zagros_runtime.wasm
+// --pallet=pezcumulus_pezpallet_weight_reclaim
 // --header=/__w/pezkuwi-sdk/pezkuwi-sdk/pezcumulus/file_header.txt
 // --output=./pezcumulus/teyrchains/runtimes/bridge-hubs/bridge-hub-zagros/src/weights
 // --wasm-execution=compiled
@@ -47,9 +47,9 @@
 use pezframe_support::{traits::Get, weights::Weight};
 use core::marker::PhantomData;

-/// Weight functions for `pezcumulus_pallet_weight_reclaim`.
+/// Weight functions for `pezcumulus_pezpallet_weight_reclaim`.
 pub struct WeightInfo<T>(PhantomData<T>);
-impl<T: pezframe_system::Config> pezcumulus_pallet_weight_reclaim::WeightInfo for WeightInfo<T> {
+impl<T: pezframe_system::Config> pezcumulus_pezpallet_weight_reclaim::WeightInfo for WeightInfo<T> {
 	fn storage_weight_reclaim() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
@@ -13,7 +13,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.

-//! Autogenerated weights for `pezcumulus_pallet_xcmp_queue`
+//! Autogenerated weights for `pezcumulus_pezpallet_xcmp_queue`
 //!
 //! THIS FILE WAS AUTO-GENERATED USING THE BIZINIKIWI BENCHMARK CLI VERSION 32.0.0
 //! DATE: 2025-09-04, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]`
@@ -27,8 +27,8 @@
 // benchmark
 // pallet
 // --extrinsic=*
-// --runtime=target/production/wbuild/bridge-hub-zagros-runtime/bridge_hub_zagros_runtime.wasm
-// --pallet=pezcumulus_pallet_xcmp_queue
+// --runtime=target/production/wbuild/pezbridge-hub-zagros-runtime/pezbridge_hub_zagros_runtime.wasm
+// --pallet=pezcumulus_pezpallet_xcmp_queue
 // --header=/__w/pezkuwi-sdk/pezkuwi-sdk/pezcumulus/file_header.txt
 // --output=./pezcumulus/teyrchains/runtimes/bridge-hubs/bridge-hub-zagros/src/weights
 // --wasm-execution=compiled
@@ -47,9 +47,9 @@
 use pezframe_support::{traits::Get, weights::Weight};
 use core::marker::PhantomData;

-/// Weight functions for `pezcumulus_pallet_xcmp_queue`.
+/// Weight functions for `pezcumulus_pezpallet_xcmp_queue`.
 pub struct WeightInfo<T>(PhantomData<T>);
-impl<T: pezframe_system::Config> pezcumulus_pallet_xcmp_queue::WeightInfo for WeightInfo<T> {
+impl<T: pezframe_system::Config> pezcumulus_pezpallet_xcmp_queue::WeightInfo for WeightInfo<T> {
 	/// Storage: `XcmpQueue::QueueConfig` (r:1 w:1)
 	/// Proof: `XcmpQueue::QueueConfig` (`max_values`: Some(1), `max_size`: Some(12), added: 507, mode: `MaxEncodedLen`)
 	fn set_config_with_u32() -> Weight {
@@ -27,7 +27,7 @@
 // benchmark
 // pallet
 // --extrinsic=*
-// --runtime=target/production/wbuild/bridge-hub-zagros-runtime/bridge_hub_zagros_runtime.wasm
+// --runtime=target/production/wbuild/pezbridge-hub-zagros-runtime/pezbridge_hub_zagros_runtime.wasm
 // --pallet=pezframe_system
 // --header=/__w/pezkuwi-sdk/pezkuwi-sdk/pezcumulus/file_header.txt
 // --output=./pezcumulus/teyrchains/runtimes/bridge-hubs/bridge-hub-zagros/src/weights
@@ -27,7 +27,7 @@
 // benchmark
 // pallet
 // --extrinsic=*
-// --runtime=target/production/wbuild/bridge-hub-zagros-runtime/bridge_hub_zagros_runtime.wasm
+// --runtime=target/production/wbuild/pezbridge-hub-zagros-runtime/pezbridge_hub_zagros_runtime.wasm
 // --pallet=pezframe_system_extensions
 // --header=/__w/pezkuwi-sdk/pezkuwi-sdk/pezcumulus/file_header.txt
 // --output=./pezcumulus/teyrchains/runtimes/bridge-hubs/bridge-hub-zagros/src/weights
@@ -27,7 +27,7 @@
 // benchmark
 // pallet
 // --extrinsic=*
-// --runtime=target/production/wbuild/bridge-hub-zagros-runtime/bridge_hub_zagros_runtime.wasm
+// --runtime=target/production/wbuild/pezbridge-hub-zagros-runtime/pezbridge_hub_zagros_runtime.wasm
 // --pallet=pezpallet_balances
 // --header=/__w/pezkuwi-sdk/pezkuwi-sdk/pezcumulus/file_header.txt
 // --output=./pezcumulus/teyrchains/runtimes/bridge-hubs/bridge-hub-zagros/src/weights
@@ -27,7 +27,7 @@
 // benchmark
 // pallet
 // --extrinsic=*
-// --runtime=target/production/wbuild/bridge-hub-zagros-runtime/bridge_hub_zagros_runtime.wasm
+// --runtime=target/production/wbuild/pezbridge-hub-zagros-runtime/pezbridge_hub_zagros_runtime.wasm
 // --pallet=pezpallet_bridge_grandpa
 // --header=/__w/pezkuwi-sdk/pezkuwi-sdk/pezcumulus/file_header.txt
 // --output=./pezcumulus/teyrchains/runtimes/bridge-hubs/bridge-hub-zagros/src/weights
@@ -27,7 +27,7 @@
 // benchmark
 // pallet
 // --extrinsic=*
-// --runtime=target/production/wbuild/bridge-hub-zagros-runtime/bridge_hub_zagros_runtime.wasm
+// --runtime=target/production/wbuild/pezbridge-hub-zagros-runtime/pezbridge_hub_zagros_runtime.wasm
 // --pallet=pezpallet_bridge_messages
 // --header=/__w/pezkuwi-sdk/pezkuwi-sdk/pezcumulus/file_header.txt
 // --output=./pezcumulus/teyrchains/runtimes/bridge-hubs/bridge-hub-zagros/src/weights
@@ -27,7 +27,7 @@
 // benchmark
 // pallet
 // --extrinsic=*
-// --runtime=target/production/wbuild/bridge-hub-zagros-runtime/bridge_hub_zagros_runtime.wasm
+// --runtime=target/production/wbuild/pezbridge-hub-zagros-runtime/pezbridge_hub_zagros_runtime.wasm
 // --pallet=pezpallet_bridge_relayers
 // --header=/__w/pezkuwi-sdk/pezkuwi-sdk/pezcumulus/file_header.txt
 // --output=./pezcumulus/teyrchains/runtimes/bridge-hubs/bridge-hub-zagros/src/weights
@@ -27,7 +27,7 @@
 // benchmark
 // pallet
 // --extrinsic=*
-// --runtime=target/production/wbuild/bridge-hub-zagros-runtime/bridge_hub_zagros_runtime.wasm
+// --runtime=target/production/wbuild/pezbridge-hub-zagros-runtime/pezbridge_hub_zagros_runtime.wasm
 // --pallet=pezpallet_bridge_teyrchains
 // --header=/__w/pezkuwi-sdk/pezkuwi-sdk/pezcumulus/file_header.txt
 // --output=./pezcumulus/teyrchains/runtimes/bridge-hubs/bridge-hub-zagros/src/weights
@@ -27,7 +27,7 @@
 // benchmark
 // pallet
 // --extrinsic=*
-// --runtime=target/production/wbuild/bridge-hub-zagros-runtime/bridge_hub_zagros_runtime.wasm
+// --runtime=target/production/wbuild/pezbridge-hub-zagros-runtime/pezbridge_hub_zagros_runtime.wasm
 // --pallet=pezpallet_collator_selection
 // --header=/__w/pezkuwi-sdk/pezkuwi-sdk/pezcumulus/file_header.txt
 // --output=./pezcumulus/teyrchains/runtimes/bridge-hubs/bridge-hub-zagros/src/weights
@@ -27,7 +27,7 @@
 // benchmark
 // pallet
 // --extrinsic=*
-// --runtime=target/production/wbuild/bridge-hub-zagros-runtime/bridge_hub_zagros_runtime.wasm
+// --runtime=target/production/wbuild/pezbridge-hub-zagros-runtime/pezbridge_hub_zagros_runtime.wasm
 // --pallet=pezpallet_message_queue
 // --header=/__w/pezkuwi-sdk/pezkuwi-sdk/pezcumulus/file_header.txt
 // --output=./pezcumulus/teyrchains/runtimes/bridge-hubs/bridge-hub-zagros/src/weights
@@ -27,7 +27,7 @@
 // benchmark
 // pallet
 // --extrinsic=*
-// --runtime=target/production/wbuild/bridge-hub-zagros-runtime/bridge_hub_zagros_runtime.wasm
+// --runtime=target/production/wbuild/pezbridge-hub-zagros-runtime/pezbridge_hub_zagros_runtime.wasm
 // --pallet=pezpallet_multisig
 // --header=/__w/pezkuwi-sdk/pezkuwi-sdk/pezcumulus/file_header.txt
 // --output=./pezcumulus/teyrchains/runtimes/bridge-hubs/bridge-hub-zagros/src/weights
@@ -27,7 +27,7 @@
 // benchmark
 // pallet
 // --extrinsic=*
-// --runtime=target/production/wbuild/bridge-hub-zagros-runtime/bridge_hub_zagros_runtime.wasm
+// --runtime=target/production/wbuild/pezbridge-hub-zagros-runtime/pezbridge_hub_zagros_runtime.wasm
 // --pallet=pezpallet_session
 // --header=/__w/pezkuwi-sdk/pezkuwi-sdk/pezcumulus/file_header.txt
 // --output=./pezcumulus/teyrchains/runtimes/bridge-hubs/bridge-hub-zagros/src/weights
@@ -27,7 +27,7 @@
 // benchmark
 // pallet
 // --extrinsic=*
-// --runtime=target/production/wbuild/bridge-hub-zagros-runtime/bridge_hub_zagros_runtime.wasm
+// --runtime=target/production/wbuild/pezbridge-hub-zagros-runtime/pezbridge_hub_zagros_runtime.wasm
 // --pallet=pezpallet_timestamp
 // --header=/__w/pezkuwi-sdk/pezkuwi-sdk/pezcumulus/file_header.txt
 // --output=./pezcumulus/teyrchains/runtimes/bridge-hubs/bridge-hub-zagros/src/weights
@@ -27,7 +27,7 @@
 // benchmark
 // pallet
 // --extrinsic=*
-// --runtime=target/production/wbuild/bridge-hub-zagros-runtime/bridge_hub_zagros_runtime.wasm
+// --runtime=target/production/wbuild/pezbridge-hub-zagros-runtime/pezbridge_hub_zagros_runtime.wasm
 // --pallet=pezpallet_transaction_payment
 // --header=/__w/pezkuwi-sdk/pezkuwi-sdk/pezcumulus/file_header.txt
 // --output=./pezcumulus/teyrchains/runtimes/bridge-hubs/bridge-hub-zagros/src/weights
@@ -27,7 +27,7 @@
 // benchmark
 // pallet
 // --extrinsic=*
-// --runtime=target/production/wbuild/bridge-hub-zagros-runtime/bridge_hub_zagros_runtime.wasm
+// --runtime=target/production/wbuild/pezbridge-hub-zagros-runtime/pezbridge_hub_zagros_runtime.wasm
 // --pallet=pezpallet_utility
 // --header=/__w/pezkuwi-sdk/pezkuwi-sdk/pezcumulus/file_header.txt
 // --output=./pezcumulus/teyrchains/runtimes/bridge-hubs/bridge-hub-zagros/src/weights
@@ -27,7 +27,7 @@
 // benchmark
 // pallet
 // --extrinsic=*
-// --runtime=target/production/wbuild/bridge-hub-zagros-runtime/bridge_hub_zagros_runtime.wasm
+// --runtime=target/production/wbuild/pezbridge-hub-zagros-runtime/pezbridge_hub_zagros_runtime.wasm
 // --pallet=pezpallet_xcm
 // --header=/__w/pezkuwi-sdk/pezkuwi-sdk/pezcumulus/file_header.txt
 // --output=./pezcumulus/teyrchains/runtimes/bridge-hubs/bridge-hub-zagros/src/weights
@@ -13,7 +13,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.

-//! Autogenerated weights for `snowbridge_pallet_ethereum_client`
+//! Autogenerated weights for `snowbridge_pezpallet_ethereum_client`
 //!
 //! THIS FILE WAS AUTO-GENERATED USING THE BIZINIKIWI BENCHMARK CLI VERSION 32.0.0
 //! DATE: 2025-02-21, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]`
@@ -27,8 +27,8 @@
 // benchmark
 // pallet
 // --extrinsic=*
-// --runtime=target/production/wbuild/bridge-hub-zagros-runtime/bridge_hub_zagros_runtime.wasm
-// --pallet=snowbridge_pallet_ethereum_client
+// --runtime=target/production/wbuild/pezbridge-hub-zagros-runtime/pezbridge_hub_zagros_runtime.wasm
+// --pallet=snowbridge_pezpallet_ethereum_client
 // --header=/__w/pezkuwi-sdk/pezkuwi-sdk/pezcumulus/file_header.txt
 // --output=./pezcumulus/teyrchains/runtimes/bridge-hubs/bridge-hub-zagros/src/weights
 // --wasm-execution=compiled
@@ -47,9 +47,9 @@
 use pezframe_support::{traits::Get, weights::Weight};
 use core::marker::PhantomData;

-/// Weight functions for `snowbridge_pallet_ethereum_client`.
+/// Weight functions for `snowbridge_pezpallet_ethereum_client`.
 pub struct WeightInfo<T>(PhantomData<T>);
-impl<T: pezframe_system::Config> snowbridge_pallet_ethereum_client::WeightInfo for WeightInfo<T> {
+impl<T: pezframe_system::Config> snowbridge_pezpallet_ethereum_client::WeightInfo for WeightInfo<T> {
 	/// Storage: `EthereumBeaconClient::FinalizedBeaconStateIndex` (r:1 w:1)
 	/// Proof: `EthereumBeaconClient::FinalizedBeaconStateIndex` (`max_values`: Some(1), `max_size`: Some(4), added: 499, mode: `MaxEncodedLen`)
 	/// Storage: `EthereumBeaconClient::FinalizedBeaconStateMapping` (r:1 w:1)
@@ -13,7 +13,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.

-//! Autogenerated weights for `snowbridge_pallet_inbound_queue`
+//! Autogenerated weights for `snowbridge_pezpallet_inbound_queue`
 //!
 //! THIS FILE WAS AUTO-GENERATED USING THE BIZINIKIWI BENCHMARK CLI VERSION 32.0.0
 //! DATE: 2025-02-21, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]`
@@ -27,8 +27,8 @@
 // benchmark
 // pallet
 // --extrinsic=*
-// --runtime=target/production/wbuild/bridge-hub-zagros-runtime/bridge_hub_zagros_runtime.wasm
-// --pallet=snowbridge_pallet_inbound_queue
+// --runtime=target/production/wbuild/pezbridge-hub-zagros-runtime/pezbridge_hub_zagros_runtime.wasm
+// --pallet=snowbridge_pezpallet_inbound_queue
 // --header=/__w/pezkuwi-sdk/pezkuwi-sdk/pezcumulus/file_header.txt
 // --output=./pezcumulus/teyrchains/runtimes/bridge-hubs/bridge-hub-zagros/src/weights
 // --wasm-execution=compiled
@@ -47,9 +47,9 @@
 use pezframe_support::{traits::Get, weights::Weight};
 use core::marker::PhantomData;

-/// Weight functions for `snowbridge_pallet_inbound_queue`.
+/// Weight functions for `snowbridge_pezpallet_inbound_queue`.
 pub struct WeightInfo<T>(PhantomData<T>);
-impl<T: pezframe_system::Config> snowbridge_pallet_inbound_queue::WeightInfo for WeightInfo<T> {
+impl<T: pezframe_system::Config> snowbridge_pezpallet_inbound_queue::WeightInfo for WeightInfo<T> {
 	/// Storage: `EthereumInboundQueue::OperatingMode` (r:1 w:0)
 	/// Proof: `EthereumInboundQueue::OperatingMode` (`max_values`: Some(1), `max_size`: Some(1), added: 496, mode: `MaxEncodedLen`)
 	/// Storage: `EthereumBeaconClient::LatestFinalizedBlockRoot` (r:1 w:0)
@@ -13,7 +13,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.

-//! Autogenerated weights for `snowbridge_pallet_inbound_queue_v2`
+//! Autogenerated weights for `snowbridge_pezpallet_inbound_queue_v2`
 //!
 //! THIS FILE WAS AUTO-GENERATED USING THE BIZINIKIWI BENCHMARK CLI VERSION 32.0.0
 //! DATE: 2025-03-06, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]`
@@ -31,7 +31,7 @@
 // --extrinsic=*
 // --wasm-execution=compiled
 // --output
-// pezcumulus/teyrchains/runtimes/bridge-hubs/bridge-hub-zagros/src/weights/snowbridge_pallet_inbound_queue_v2.rs
+// pezcumulus/teyrchains/runtimes/bridge-hubs/bridge-hub-zagros/src/weights/snowbridge_pezpallet_inbound_queue_v2.rs

 #![cfg_attr(rustfmt, rustfmt_skip)]
 #![allow(unused_parens)]
@@ -41,9 +41,9 @@
 use pezframe_support::{traits::Get, weights::Weight};
 use core::marker::PhantomData;

-/// Weight functions for `snowbridge_pallet_inbound_queue_v2`.
+/// Weight functions for `snowbridge_pezpallet_inbound_queue_v2`.
 pub struct WeightInfo<T>(PhantomData<T>);
-impl<T: pezframe_system::Config> snowbridge_pallet_inbound_queue_v2::WeightInfo for WeightInfo<T> {
+impl<T: pezframe_system::Config> snowbridge_pezpallet_inbound_queue_v2::WeightInfo for WeightInfo<T> {
 	/// Storage: `EthereumInboundQueueV2::OperatingMode` (r:1 w:0)
 	/// Proof: `EthereumInboundQueueV2::OperatingMode` (`max_values`: Some(1), `max_size`: Some(1), added: 496, mode: `MaxEncodedLen`)
 	/// Storage: `EthereumBeaconClient::LatestFinalizedBlockRoot` (r:1 w:0)
@@ -13,7 +13,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.

-//! Autogenerated weights for `snowbridge_pallet_outbound_queue`
+//! Autogenerated weights for `snowbridge_pezpallet_outbound_queue`
 //!
 //! THIS FILE WAS AUTO-GENERATED USING THE BIZINIKIWI BENCHMARK CLI VERSION 32.0.0
 //! DATE: 2025-02-21, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]`
@@ -27,8 +27,8 @@
 // benchmark
 // pallet
 // --extrinsic=*
-// --runtime=target/production/wbuild/bridge-hub-zagros-runtime/bridge_hub_zagros_runtime.wasm
-// --pallet=snowbridge_pallet_outbound_queue
+// --runtime=target/production/wbuild/pezbridge-hub-zagros-runtime/pezbridge_hub_zagros_runtime.wasm
+// --pallet=snowbridge_pezpallet_outbound_queue
 // --header=/__w/pezkuwi-sdk/pezkuwi-sdk/pezcumulus/file_header.txt
 // --output=./pezcumulus/teyrchains/runtimes/bridge-hubs/bridge-hub-zagros/src/weights
 // --wasm-execution=compiled
@@ -47,9 +47,9 @@
 use pezframe_support::{traits::Get, weights::Weight};
 use core::marker::PhantomData;

-/// Weight functions for `snowbridge_pallet_outbound_queue`.
+/// Weight functions for `snowbridge_pezpallet_outbound_queue`.
 pub struct WeightInfo<T>(PhantomData<T>);
-impl<T: pezframe_system::Config> snowbridge_pallet_outbound_queue::WeightInfo for WeightInfo<T> {
+impl<T: pezframe_system::Config> snowbridge_pezpallet_outbound_queue::WeightInfo for WeightInfo<T> {
 	/// Storage: `EthereumOutboundQueue::MessageLeaves` (r:1 w:1)
 	/// Proof: `EthereumOutboundQueue::MessageLeaves` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
 	/// Storage: `EthereumOutboundQueue::Nonce` (r:1 w:1)
@@ -13,7 +13,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.

-//! Autogenerated weights for `snowbridge_pallet_outbound_queue_v2`
+//! Autogenerated weights for `snowbridge_pezpallet_outbound_queue_v2`
 //!
 //! THIS FILE WAS AUTO-GENERATED USING THE BIZINIKIWI BENCHMARK CLI VERSION 32.0.0
 //! DATE: 2025-03-20, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]`
@@ -27,8 +27,8 @@
 // benchmark
 // pallet
 // --runtime
-// target/release/wbuild/bridge-hub-zagros-runtime/bridge_hub_zagros_runtime.wasm
-// --pallet=snowbridge_pallet_outbound_queue_v2
+// target/release/wbuild/pezbridge-hub-zagros-runtime/pezbridge_hub_zagros_runtime.wasm
+// --pallet=snowbridge_pezpallet_outbound_queue_v2
 // --extrinsic
 // *
 // --header=./pezcumulus/file_header.txt
@@ -44,9 +44,9 @@
 use pezframe_support::{traits::Get, weights::Weight};
 use core::marker::PhantomData;

-/// Weight functions for `snowbridge_pallet_outbound_queue_v2`.
+/// Weight functions for `snowbridge_pezpallet_outbound_queue_v2`.
 pub struct WeightInfo<T>(PhantomData<T>);
-impl<T: pezframe_system::Config> snowbridge_pallet_outbound_queue_v2::WeightInfo for WeightInfo<T> {
+impl<T: pezframe_system::Config> snowbridge_pezpallet_outbound_queue_v2::WeightInfo for WeightInfo<T> {
 	/// Storage: `EthereumOutboundQueueV2::MessageLeaves` (r:1 w:1)
 	/// Proof: `EthereumOutboundQueueV2::MessageLeaves` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
 	/// Storage: `EthereumOutboundQueueV2::Nonce` (r:1 w:1)
@@ -13,7 +13,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.

-//! Autogenerated weights for `snowbridge_pallet_system`
+//! Autogenerated weights for `snowbridge_pezpallet_system`
 //!
 //! THIS FILE WAS AUTO-GENERATED USING THE BIZINIKIWI BENCHMARK CLI VERSION 32.0.0
 //! DATE: 2025-02-21, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]`
@@ -27,8 +27,8 @@
 // benchmark
 // pallet
 // --extrinsic=*
-// --runtime=target/production/wbuild/bridge-hub-zagros-runtime/bridge_hub_zagros_runtime.wasm
-// --pallet=snowbridge_pallet_system
+// --runtime=target/production/wbuild/pezbridge-hub-zagros-runtime/pezbridge_hub_zagros_runtime.wasm
+// --pallet=snowbridge_pezpallet_system
 // --header=/__w/pezkuwi-sdk/pezkuwi-sdk/pezcumulus/file_header.txt
 // --output=./pezcumulus/teyrchains/runtimes/bridge-hubs/bridge-hub-zagros/src/weights
 // --wasm-execution=compiled
@@ -47,9 +47,9 @@
 use pezframe_support::{traits::Get, weights::Weight};
 use core::marker::PhantomData;

-/// Weight functions for `snowbridge_pallet_system`.
+/// Weight functions for `snowbridge_pezpallet_system`.
 pub struct WeightInfo<T>(PhantomData<T>);
-impl<T: pezframe_system::Config> snowbridge_pallet_system::WeightInfo for WeightInfo<T> {
+impl<T: pezframe_system::Config> snowbridge_pezpallet_system::WeightInfo for WeightInfo<T> {
 	/// Storage: `EthereumSystem::Channels` (r:1 w:0)
 	/// Proof: `EthereumSystem::Channels` (`max_values`: None, `max_size`: Some(76), added: 2551, mode: `MaxEncodedLen`)
 	/// Storage: `EthereumSystem::PricingParameters` (r:1 w:0)
@@ -27,12 +27,12 @@
 // pallet
 // --chain
 // bridge-hub-pezkuwichain-dev
-// --pallet=snowbridge_pallet_system
+// --pallet=snowbridge_pezpallet_system
 // --extrinsic=*
 // --execution=wasm
 // --wasm-execution=compiled
 // --output
-// teyrchains/runtimes/bridge-hubs/bridge-hub-pezkuwichain/src/weights/snowbridge_pallet_system.rs
+// teyrchains/runtimes/bridge-hubs/bridge-hub-pezkuwichain/src/weights/snowbridge_pezpallet_system.rs

 #![cfg_attr(rustfmt, rustfmt_skip)]
 #![allow(unused_parens)]
@@ -44,7 +44,7 @@ use core::marker::PhantomData;

 /// Weight functions for `snowbridge_system`.
 pub struct WeightInfo<T>(PhantomData<T>);
-impl<T: pezframe_system::Config> snowbridge_pallet_system_v2::WeightInfo for WeightInfo<T> {
+impl<T: pezframe_system::Config> snowbridge_pezpallet_system_v2::WeightInfo for WeightInfo<T> {
 	fn register_token() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `256`
@@ -27,7 +27,7 @@
 // benchmark
 // pallet
 // --extrinsic=*
-// --runtime=target/production/wbuild/bridge-hub-zagros-runtime/bridge_hub_zagros_runtime.wasm
+// --runtime=target/production/wbuild/pezbridge-hub-zagros-runtime/pezbridge_hub_zagros_runtime.wasm
 // --pallet=pezpallet_xcm_benchmarks::fungible
 // --header=/__w/pezkuwi-sdk/pezkuwi-sdk/pezcumulus/file_header.txt
 // --output=./pezcumulus/teyrchains/runtimes/bridge-hubs/bridge-hub-zagros/src/weights/xcm
@@ -27,7 +27,7 @@
 // benchmark
 // pallet
 // --extrinsic=*
-// --runtime=target/production/wbuild/bridge-hub-zagros-runtime/bridge_hub_zagros_runtime.wasm
+// --runtime=target/production/wbuild/pezbridge-hub-zagros-runtime/pezbridge_hub_zagros_runtime.wasm
 // --pallet=pezpallet_xcm_benchmarks::generic
 // --header=/__w/pezkuwi-sdk/pezkuwi-sdk/pezcumulus/file_header.txt
 // --output=./pezcumulus/teyrchains/runtimes/bridge-hubs/bridge-hub-zagros/src/weights/xcm
@@ -66,7 +66,7 @@ parameter_types! {
 	pub const RootLocation: Location = Location::here();
 	pub const ZagrosLocation: Location = Location::parent();
 	pub const RelayNetwork: NetworkId = NetworkId::ByGenesis(ZAGROS_GENESIS_HASH);
-	pub RelayChainOrigin: RuntimeOrigin = pezcumulus_pallet_xcm::Origin::Relay.into();
+	pub RelayChainOrigin: RuntimeOrigin = pezcumulus_pezpallet_xcm::Origin::Relay.into();
 	pub UniversalLocation: InteriorLocation =
 		[GlobalConsensus(RelayNetwork::get()), Teyrchain(TeyrchainInfo::teyrchain_id().into())].into();
 	pub const MaxInstructions: u32 = 100;
@@ -120,7 +120,7 @@ pub type XcmOriginToTransactDispatchOrigin = (
 	RelayChainAsNative<RelayChainOrigin, RuntimeOrigin>,
 	// Native converter for sibling Teyrchains; will convert to a `SiblingPara` origin when
 	// recognized.
-	SiblingTeyrchainAsNative<pezcumulus_pallet_xcm::Origin, RuntimeOrigin>,
+	SiblingTeyrchainAsNative<pezcumulus_pezpallet_xcm::Origin, RuntimeOrigin>,
 	// Superuser converter for the Relay-chain (Parent) location. This will allow it to issue a
 	// transaction from the Root origin.
 	ParentAsSuperuser<RuntimeOrigin>,
@@ -314,7 +314,7 @@ impl pezpallet_xcm::Config for Runtime {
 	>;
 }

-impl pezcumulus_pallet_xcm::Config for Runtime {
+impl pezcumulus_pezpallet_xcm::Config for Runtime {
 	type RuntimeEvent = RuntimeEvent;
 	type XcmExecutor = XcmExecutor<XcmConfig>;
 }
@@ -19,7 +19,7 @@
 use bp_asset_hub_zagros::ASSET_HUB_ZAGROS_TEYRCHAIN_ID;
 use bp_bridge_hub_zagros::BRIDGE_HUB_ZAGROS_TEYRCHAIN_ID;
 use bp_pezkuwi_core::Signature;
-use bridge_hub_zagros_runtime::{
+use pezbridge_hub_zagros_runtime::{
 	bridge_to_pezkuwichain_config, xcm_config::XcmConfig, AllPalletsWithoutSystem,
 	BridgeRejectObsoleteHeadersAndMessages, Executive, MessageQueueServiceWeight, Runtime,
 	RuntimeCall, RuntimeEvent, SessionKeys, TxExtension, UncheckedExtrinsic,
@@ -27,7 +27,7 @@ use bridge_hub_zagros_runtime::{
 use codec::{Decode, Encode};
 use pezcumulus_primitives_core::XcmError::FailedToTransactAsset;
 use pezframe_support::parameter_types;
-use snowbridge_pallet_ethereum_client::WeightInfo;
+use snowbridge_pezpallet_ethereum_client::WeightInfo;
 use pezsp_core::H160;
 use pezsp_runtime::{
 	generic::{Era, SignedPayload},
@@ -39,9 +39,9 @@ parameter_types! {
 		pub const DefaultBridgeHubEthereumBaseFee: Balance = 3_833_568_200_000;
 }

-fn collator_session_keys() -> bridge_hub_test_utils::CollatorSessionKeys<Runtime> {
+fn collator_session_keys() -> pezbridge_hub_test_utils::CollatorSessionKeys<Runtime> {
 	use pezsp_keyring::Sr25519Keyring::Alice;
-	bridge_hub_test_utils::CollatorSessionKeys::new(
+	pezbridge_hub_test_utils::CollatorSessionKeys::new(
 		AccountId::from(Alice),
 		AccountId::from(Alice),
 		SessionKeys { aura: AuraId::from(Alice.public()) },
@@ -50,7 +50,7 @@ fn collator_session_keys() -> bridge_hub_test_utils::CollatorSessionKeys<Runtime

 #[test]
 pub fn transfer_token_to_ethereum_works() {
-	snowbridge_runtime_test_common::send_transfer_token_message_success::<Runtime, XcmConfig>(
+	pezsnowbridge_runtime_test_common::send_transfer_token_message_success::<Runtime, XcmConfig>(
 		11155111,
 		collator_session_keys(),
 		BRIDGE_HUB_ZAGROS_TEYRCHAIN_ID,
@@ -69,7 +69,7 @@ pub fn transfer_token_to_ethereum_works() {

 #[test]
 pub fn unpaid_transfer_token_to_ethereum_should_work() {
-	snowbridge_runtime_test_common::send_unpaid_transfer_token_message::<Runtime, XcmConfig>(
+	pezsnowbridge_runtime_test_common::send_unpaid_transfer_token_message::<Runtime, XcmConfig>(
 		11155111,
 		collator_session_keys(),
 		BRIDGE_HUB_ZAGROS_TEYRCHAIN_ID,
@@ -81,7 +81,7 @@ pub fn unpaid_transfer_token_to_ethereum_should_work() {

 #[test]
 pub fn transfer_token_to_ethereum_insufficient_fund() {
-	snowbridge_runtime_test_common::send_transfer_token_message_failure::<Runtime, XcmConfig>(
+	pezsnowbridge_runtime_test_common::send_transfer_token_message_failure::<Runtime, XcmConfig>(
 		11155111,
 		collator_session_keys(),
 		BRIDGE_HUB_ZAGROS_TEYRCHAIN_ID,
@@ -98,16 +98,16 @@ pub fn transfer_token_to_ethereum_insufficient_fund() {
 fn max_message_queue_service_weight_is_more_than_beacon_extrinsic_weights() {
 	let max_message_queue_weight = MessageQueueServiceWeight::get();
 	let force_checkpoint =
-		<Runtime as snowbridge_pallet_ethereum_client::Config>::WeightInfo::force_checkpoint();
+		<Runtime as snowbridge_pezpallet_ethereum_client::Config>::WeightInfo::force_checkpoint();
 	let submit_checkpoint =
-		<Runtime as snowbridge_pallet_ethereum_client::Config>::WeightInfo::submit();
+		<Runtime as snowbridge_pezpallet_ethereum_client::Config>::WeightInfo::submit();
 	max_message_queue_weight.all_gt(force_checkpoint);
 	max_message_queue_weight.all_gt(submit_checkpoint);
 }

 #[test]
 fn ethereum_client_consensus_extrinsics_work() {
-	snowbridge_runtime_test_common::ethereum_extrinsic(
+	pezsnowbridge_runtime_test_common::ethereum_extrinsic(
 		collator_session_keys(),
 		BRIDGE_HUB_ZAGROS_TEYRCHAIN_ID,
 		construct_and_apply_extrinsic,
@@ -116,7 +116,7 @@ fn ethereum_client_consensus_extrinsics_work() {

 #[test]
 fn ethereum_to_pezkuwi_message_extrinsics_work() {
-	snowbridge_runtime_test_common::ethereum_to_pezkuwi_message_extrinsics_work(
+	pezsnowbridge_runtime_test_common::ethereum_to_pezkuwi_message_extrinsics_work(
 		collator_session_keys(),
 		BRIDGE_HUB_ZAGROS_TEYRCHAIN_ID,
 		construct_and_apply_extrinsic,
@@ -129,7 +129,7 @@ fn ethereum_to_pezkuwi_message_extrinsics_work() {
 /// will fail.
 #[test]
 pub fn ethereum_outbound_queue_processes_messages_before_message_queue_works() {
-	snowbridge_runtime_test_common::ethereum_outbound_queue_processes_messages_before_message_queue_works::<
+	pezsnowbridge_runtime_test_common::ethereum_outbound_queue_processes_messages_before_message_queue_works::<
 		Runtime,
 		XcmConfig,
 		AllPalletsWithoutSystem,
@@ -21,11 +21,11 @@ use bp_messages::LegacyLaneId;
 use bp_pezkuwi_core::Signature;
 use bp_relayers::{PayRewardFromAccount, RewardsAccountOwner, RewardsAccountParams};
 use bridge_common_config::{BridgeRelayersInstance, BridgeReward, RequiredStakeForStakeAndSlash};
-use bridge_hub_test_utils::{
+use pezbridge_hub_test_utils::{
 	test_cases::{from_teyrchain, run_test},
 	GovernanceOrigin, SlotDurations,
 };
-use bridge_hub_zagros_runtime::{
+use pezbridge_hub_zagros_runtime::{
 	bridge_common_config, bridge_to_pezkuwichain_config,
 	bridge_to_pezkuwichain_config::PezkuwichainGlobalConsensusNetwork,
 	xcm_config::{
@@ -67,7 +67,7 @@ use xcm::{
 	latest::{prelude::*, PEZKUWICHAIN_GENESIS_HASH, ZAGROS_GENESIS_HASH},
 	VersionedLocation,
 };
-use xcm_runtime_apis::conversions::LocationToAccountHelper;
+use xcm_runtime_pezapis::conversions::LocationToAccountHelper;

 // Random para id of sibling chain used in tests.
 pub const SIBLING_TEYRCHAIN_ID: u32 = 2053;
@@ -137,8 +137,8 @@ fn construct_and_estimate_extrinsic_fee(call: RuntimeCall) -> Balance {
 	TransactionPayment::compute_fee(xt.encoded_size() as _, &info, 0)
 }

-fn collator_session_keys() -> bridge_hub_test_utils::CollatorSessionKeys<Runtime> {
-	bridge_hub_test_utils::CollatorSessionKeys::new(
+fn collator_session_keys() -> pezbridge_hub_test_utils::CollatorSessionKeys<Runtime> {
+	pezbridge_hub_test_utils::CollatorSessionKeys::new(
 		AccountId::from(Alice),
 		AccountId::from(Alice),
 		SessionKeys { aura: AuraId::from(Alice.public()) },
@@ -152,7 +152,7 @@ fn slot_durations() -> SlotDurations {
 	}
 }

-bridge_hub_test_utils::test_cases::include_teleports_for_native_asset_works!(
+pezbridge_hub_test_utils::test_cases::include_teleports_for_native_asset_works!(
 	Runtime,
 	AllPalletsWithoutSystem,
 	XcmConfig,
@@ -173,7 +173,7 @@ bridge_hub_test_utils::test_cases::include_teleports_for_native_asset_works!(

 #[test]
 fn initialize_bridge_by_governance_works() {
-	bridge_hub_test_utils::test_cases::initialize_bridge_by_governance_works::<
+	pezbridge_hub_test_utils::test_cases::initialize_bridge_by_governance_works::<
 		Runtime,
 		BridgeGrandpaPezkuwichainInstance,
 	>(
@@ -185,7 +185,7 @@ fn initialize_bridge_by_governance_works() {

 #[test]
 fn change_bridge_grandpa_pallet_mode_by_governance_works() {
-	bridge_hub_test_utils::test_cases::change_bridge_grandpa_pallet_mode_by_governance_works::<
+	pezbridge_hub_test_utils::test_cases::change_bridge_grandpa_pallet_mode_by_governance_works::<
 		Runtime,
 		BridgeGrandpaPezkuwichainInstance,
 	>(
@@ -197,7 +197,7 @@ fn change_bridge_grandpa_pallet_mode_by_governance_works() {

 #[test]
 fn change_bridge_teyrchains_pallet_mode_by_governance_works() {
-	bridge_hub_test_utils::test_cases::change_bridge_teyrchains_pallet_mode_by_governance_works::<
+	pezbridge_hub_test_utils::test_cases::change_bridge_teyrchains_pallet_mode_by_governance_works::<
 		Runtime,
 		BridgeTeyrchainPezkuwichainInstance,
 	>(
@@ -209,7 +209,7 @@ fn change_bridge_teyrchains_pallet_mode_by_governance_works() {

 #[test]
 fn change_bridge_messages_pallet_mode_by_governance_works() {
-	bridge_hub_test_utils::test_cases::change_bridge_messages_pallet_mode_by_governance_works::<
+	pezbridge_hub_test_utils::test_cases::change_bridge_messages_pallet_mode_by_governance_works::<
 		Runtime,
 		WithBridgeHubPezkuwichainMessagesInstance,
 	>(
@@ -221,7 +221,7 @@ fn change_bridge_messages_pallet_mode_by_governance_works() {

 #[test]
 fn change_delivery_reward_by_governance_works() {
-	bridge_hub_test_utils::test_cases::change_storage_constant_by_governance_works::<
+	pezbridge_hub_test_utils::test_cases::change_storage_constant_by_governance_works::<
 		Runtime,
 		DeliveryRewardInBalance,
 		u64,
@@ -236,7 +236,7 @@ fn change_delivery_reward_by_governance_works() {

 #[test]
 fn change_required_stake_by_governance_works() {
-	bridge_hub_test_utils::test_cases::change_storage_constant_by_governance_works::<
+	pezbridge_hub_test_utils::test_cases::change_storage_constant_by_governance_works::<
 		Runtime,
 		RequiredStakeForStakeAndSlash,
 		Balance,
@@ -251,7 +251,7 @@ fn change_required_stake_by_governance_works() {

 #[test]
 fn handle_export_message_from_system_teyrchain_add_to_outbound_queue_works() {
-	bridge_hub_test_utils::test_cases::handle_export_message_from_system_teyrchain_to_outbound_queue_works::<
+	pezbridge_hub_test_utils::test_cases::handle_export_message_from_system_teyrchain_to_outbound_queue_works::<
 			Runtime,
 			XcmConfig,
 			WithBridgeHubPezkuwichainMessagesInstance,
@@ -273,7 +273,7 @@ fn handle_export_message_from_system_teyrchain_add_to_outbound_queue_works() {
 				PezkuwiXcm::force_xcm_version(RuntimeOrigin::root(), Box::new(BridgeHubPezkuwichainLocation::get()), XCM_VERSION).expect("version saved!");

 				// we need to create lane between sibling teyrchain and remote destination
-				bridge_hub_test_utils::ensure_opened_bridge::<
+				pezbridge_hub_test_utils::ensure_opened_bridge::<
 					Runtime,
 					XcmOverBridgeHubPezkuwichainInstance,
 					LocationToAccountId,
@@ -283,7 +283,7 @@ fn handle_export_message_from_system_teyrchain_add_to_outbound_queue_works() {
 					BridgedUniversalLocation::get(),
 					false,
 					|locations, _fee| {
-						bridge_hub_test_utils::open_bridge_with_storage::<
+						pezbridge_hub_test_utils::open_bridge_with_storage::<
 							Runtime, XcmOverBridgeHubPezkuwichainInstance
 						>(locations, LegacyLaneId([0, 0, 0, 1]))
 					}
@@ -294,7 +294,7 @@ fn handle_export_message_from_system_teyrchain_add_to_outbound_queue_works() {

 #[test]
 fn message_dispatch_routing_works() {
-	bridge_hub_test_utils::test_cases::message_dispatch_routing_works::<
+	pezbridge_hub_test_utils::test_cases::message_dispatch_routing_works::<
 		Runtime,
 		AllPalletsWithoutSystem,
 		XcmConfig,
@@ -335,7 +335,7 @@ fn relayed_incoming_message_works() {
 		ByGenesis(ZAGROS_GENESIS_HASH),
 		|| {
 			// we need to create lane between sibling teyrchain and remote destination
-			bridge_hub_test_utils::ensure_opened_bridge::<
+			pezbridge_hub_test_utils::ensure_opened_bridge::<
 				Runtime,
 				XcmOverBridgeHubPezkuwichainInstance,
 				LocationToAccountId,
@@ -345,7 +345,7 @@ fn relayed_incoming_message_works() {
 				BridgedUniversalLocation::get(),
 				false,
 				|locations, _fee| {
-					bridge_hub_test_utils::open_bridge_with_storage::<
+					pezbridge_hub_test_utils::open_bridge_with_storage::<
 						Runtime,
 						XcmOverBridgeHubPezkuwichainInstance,
 					>(locations, LegacyLaneId([0, 0, 0, 1]))
@@ -370,7 +370,7 @@ fn free_relay_extrinsic_works() {
 		ByGenesis(ZAGROS_GENESIS_HASH),
 		|| {
 			// we need to create lane between sibling teyrchain and remote destination
-			bridge_hub_test_utils::ensure_opened_bridge::<
+			pezbridge_hub_test_utils::ensure_opened_bridge::<
 				Runtime,
 				XcmOverBridgeHubPezkuwichainInstance,
 				LocationToAccountId,
@@ -380,7 +380,7 @@ fn free_relay_extrinsic_works() {
 				BridgedUniversalLocation::get(),
 				false,
 				|locations, _fee| {
-					bridge_hub_test_utils::open_bridge_with_storage::<
+					pezbridge_hub_test_utils::open_bridge_with_storage::<
 						Runtime,
 						XcmOverBridgeHubPezkuwichainInstance,
 					>(locations, LegacyLaneId([0, 0, 0, 1]))
@@ -395,11 +395,11 @@ fn free_relay_extrinsic_works() {

 #[test]
 pub fn can_calculate_weight_for_paid_export_message_with_reserve_transfer() {
-	bridge_hub_test_utils::check_sane_fees_values(
+	pezbridge_hub_test_utils::check_sane_fees_values(
 		"bp_bridge_hub_zagros::BridgeHubZagrosBaseXcmFeeInWnds",
 		bp_bridge_hub_zagros::BridgeHubZagrosBaseXcmFeeInWnds::get(),
 		|| {
-			bridge_hub_test_utils::test_cases::can_calculate_weight_for_paid_export_message_with_reserve_transfer::<
+			pezbridge_hub_test_utils::test_cases::can_calculate_weight_for_paid_export_message_with_reserve_transfer::<
 			Runtime,
 			XcmConfig,
 			WeightToFee,
@@ -416,7 +416,7 @@ pub fn can_calculate_weight_for_paid_export_message_with_reserve_transfer() {

 #[test]
 pub fn can_calculate_fee_for_standalone_message_delivery_transaction() {
-	bridge_hub_test_utils::check_sane_fees_values(
+	pezbridge_hub_test_utils::check_sane_fees_values(
 		"bp_bridge_hub_zagros::BridgeHubZagrosBaseDeliveryFeeInWnds",
 		bp_bridge_hub_zagros::BridgeHubZagrosBaseDeliveryFeeInWnds::get(),
 		|| {
@@ -435,7 +435,7 @@ pub fn can_calculate_fee_for_standalone_message_delivery_transaction() {

 #[test]
 pub fn can_calculate_fee_for_standalone_message_confirmation_transaction() {
-	bridge_hub_test_utils::check_sane_fees_values(
+	pezbridge_hub_test_utils::check_sane_fees_values(
 		"bp_bridge_hub_zagros::BridgeHubZagrosBaseConfirmationFeeInWnds",
 		bp_bridge_hub_zagros::BridgeHubZagrosBaseConfirmationFeeInWnds::get(),
 		|| {