diff --git a/Cargo.lock b/Cargo.lock
index 2247c876..bc2e0b47 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -14553,6 +14553,7 @@ dependencies = [
  "hashbrown 0.15.5",
  "parity-scale-codec",
  "pezkuwi-subxt-codegen",
+ "pezkuwi-subxt-utils-stripmetadata",
  "pezsp-crypto-hashing",
  "scale-info",
  "scale-info-legacy",
diff --git a/umbrella/Cargo.toml b/umbrella/Cargo.toml
index a51c4467..a548e0ca 100644
--- a/umbrella/Cargo.toml
+++ b/umbrella/Cargo.toml
@@ -173,11 +173,11 @@ std = [
 	"pezpallet-verify-signature?/std",
 	"pezpallet-vesting?/std",
 	"pezpallet-whitelist?/std",
+	"pezpallet-xcm-benchmarks?/std",
 	"pezpallet-xcm-bridge-hub-router?/std",
 	"pezpallet-xcm-bridge-hub?/std",
 	"pezpallet-xcm-precompiles?/std",
 	"pezpallet-xcm?/std",
-	"pezpallet-xcm-benchmarks?/std",
 	"pezsc-executor?/std",
 	"pezsp-api-proc-macro?/std",
 	"pezsp-api?/std",
@@ -465,11 +465,11 @@ runtime-benchmarks = [
 	"pezpallet-verify-signature?/runtime-benchmarks",
 	"pezpallet-vesting?/runtime-benchmarks",
 	"pezpallet-whitelist?/runtime-benchmarks",
+	"pezpallet-xcm-benchmarks?/runtime-benchmarks",
 	"pezpallet-xcm-bridge-hub-router?/runtime-benchmarks",
 	"pezpallet-xcm-bridge-hub?/runtime-benchmarks",
 	"pezpallet-xcm-precompiles?/runtime-benchmarks",
 	"pezpallet-xcm?/runtime-benchmarks",
-	"pezpallet-xcm-benchmarks?/runtime-benchmarks",
 	"pezsc-authority-discovery?/runtime-benchmarks",
 	"pezsc-basic-authorship?/runtime-benchmarks",
 	"pezsc-block-builder?/runtime-benchmarks",
diff --git a/vendor/pezkuwi-subxt/core/src/tx/payload.rs b/vendor/pezkuwi-subxt/core/src/tx/payload.rs
index 8561392c..7533daef 100644
--- a/vendor/pezkuwi-subxt/core/src/tx/payload.rs
+++ b/vendor/pezkuwi-subxt/core/src/tx/payload.rs
@@ -222,7 +222,7 @@ mod tests {
 	use scale_value::Composite;
 
 	fn test_metadata() -> Metadata {
-		let metadata_bytes = include_bytes!("../../../artifacts/pezkuwi_metadata_small.scale");
+		let metadata_bytes = include_bytes!("../../../artifacts/polkadot_metadata_small.scale");
 		Metadata::decode(&mut &metadata_bytes[..]).expect("Valid metadata")
 	}
 
diff --git a/vendor/pezkuwi-subxt/core/src/utils/account_id.rs b/vendor/pezkuwi-subxt/core/src/utils/account_id.rs
index 91abd6aa..57c28df8 100644
--- a/vendor/pezkuwi-subxt/core/src/utils/account_id.rs
+++ b/vendor/pezkuwi-subxt/core/src/utils/account_id.rs
@@ -162,8 +162,8 @@ impl core::str::FromStr for AccountId32 {
 #[cfg(test)]
 mod test {
 	use super::*;
-	use sp_core::{self, crypto::Ss58Codec};
-	use sp_keyring::sr25519::Keyring;
+	use pezsp_core::{self, crypto::Ss58Codec};
+	use pezsp_keyring::sr25519::Keyring;
 
 	#[test]
 	fn ss58_is_compatible_with_bizinikiwi_impl() {
@@ -179,7 +179,7 @@ mod test {
 
 			// Both should decode from ss58 back to the same:
 			assert_eq!(
-				sp_core::crypto::AccountId32::from_ss58check(&bizinikiwi_ss58).unwrap(),
+				pezsp_core::crypto::AccountId32::from_ss58check(&bizinikiwi_ss58).unwrap(),
 				bizinikiwi_account
 			);
 			assert_eq!(AccountId32::from_ss58check(&bizinikiwi_ss58).unwrap(), local_account);
diff --git a/vendor/pezkuwi-subxt/metadata/Cargo.toml b/vendor/pezkuwi-subxt/metadata/Cargo.toml
index f218527b..65b7f780 100644
--- a/vendor/pezkuwi-subxt/metadata/Cargo.toml
+++ b/vendor/pezkuwi-subxt/metadata/Cargo.toml
@@ -50,6 +50,7 @@ bitvec = { workspace = true, features = ["alloc"] }
 criterion = { workspace = true }
 frame-decode = { workspace = true, features = ["legacy-types"] }
 pezkuwi-subxt-codegen = { workspace = true }
+pezkuwi-subxt-utils-stripmetadata = { workspace = true }
 scale-info = { workspace = true, features = ["bit-vec"] }
 
 [lib]
diff --git a/vendor/pezkuwi-subxt/metadata/benches/bench.rs b/vendor/pezkuwi-subxt/metadata/benches/bench.rs
index d08bf6fd..c243a69a 100644
--- a/vendor/pezkuwi-subxt/metadata/benches/bench.rs
+++ b/vendor/pezkuwi-subxt/metadata/benches/bench.rs
@@ -11,7 +11,7 @@ use pezkuwi_subxt_metadata::Metadata;
 use std::{fs, path::Path};
 
 fn load_metadata() -> Metadata {
-	let bytes = fs::read(Path::new("../artifacts/pezkuwi_metadata_full.scale"))
+	let bytes = fs::read(Path::new("../artifacts/polkadot_metadata_full.scale"))
 		.expect("Cannot read metadata blob");
 	let meta: RuntimeMetadataPrefixed =
 		Decode::decode(&mut &*bytes).expect("Cannot decode scale metadata");
diff --git a/vendor/pezkuwi-subxt/metadata/src/from/legacy/tests.rs b/vendor/pezkuwi-subxt/metadata/src/from/legacy/tests.rs
index 24b17910..36ab5c7f 100644
--- a/vendor/pezkuwi-subxt/metadata/src/from/legacy/tests.rs
+++ b/vendor/pezkuwi-subxt/metadata/src/from/legacy/tests.rs
@@ -35,7 +35,8 @@ fn legacy_kusama_metadata(version: u8) -> (u64, RuntimeMetadata) {
 /// Load our kusama types.
 /// TODO: This is WRONG at the moment; change to point to kusama types when they exist:
 fn kusama_types() -> scale_info_legacy::ChainTypeRegistry {
-	frame_decode::legacy_types::pezkuwi::relay_chain()
+	// frame-decode is an external crate (v0.15.0) that uses original naming
+	frame_decode::legacy_types::polkadot::relay_chain()
 }
 
 /// Sanitizing paths changes things between old and new, so disable this in tests by default
diff --git a/vendor/pezkuwi-subxt/signer/src/ecdsa.rs b/vendor/pezkuwi-subxt/signer/src/ecdsa.rs
index d986af3b..30badcb8 100644
--- a/vendor/pezkuwi-subxt/signer/src/ecdsa.rs
+++ b/vendor/pezkuwi-subxt/signer/src/ecdsa.rs
@@ -352,7 +352,7 @@ mod test {
 
 	use super::*;
 
-	use sp_core::{self, crypto::Pair as _, ecdsa::Pair as SpPair};
+	use pezsp_core::{self, crypto::Pair as _, ecdsa::Pair as SpPair};
 
 	#[test]
 	fn check_from_phrase_matches() {
@@ -413,7 +413,7 @@ mod test {
 
 	#[test]
 	fn check_signing_and_verifying_matches() {
-		use sp_core::ecdsa::Signature as SpSignature;
+		use pezsp_core::ecdsa::Signature as SpSignature;
 
 		for _ in 0..20 {
 			let (sp_pair, phrase, _seed) = SpPair::generate_with_phrase(Some("Testing"));
diff --git a/vendor/pezkuwi-subxt/signer/src/sr25519.rs b/vendor/pezkuwi-subxt/signer/src/sr25519.rs
index ba89dce3..414b05c5 100644
--- a/vendor/pezkuwi-subxt/signer/src/sr25519.rs
+++ b/vendor/pezkuwi-subxt/signer/src/sr25519.rs
@@ -341,7 +341,7 @@ mod test {
 
 	use super::*;
 
-	use sp_core::{self, crypto::Pair as _, sr25519::Pair as SpPair};
+	use pezsp_core::{self, crypto::Pair as _, sr25519::Pair as SpPair};
 
 	#[test]
 	fn check_from_phrase_matches() {
@@ -399,7 +399,7 @@ mod test {
 
 	#[test]
 	fn check_dev_accounts_match() {
-		use sp_keyring::sr25519::Keyring::*;
+		use pezsp_keyring::sr25519::Keyring::*;
 
 		assert_eq!(dev::alice().public_key().0, Alice.public().0);
 		assert_eq!(dev::bob().public_key().0, Bob.public().0);
@@ -413,7 +413,7 @@ mod test {
 
 	#[test]
 	fn check_signing_and_verifying_matches() {
-		use sp_core::sr25519::Signature as SpSignature;
+		use pezsp_core::sr25519::Signature as SpSignature;
 
 		for _ in 0..20 {
 			let (sp_pair, phrase, _seed) = SpPair::generate_with_phrase(Some("Testing"));
diff --git a/vendor/pezkuwi-subxt/subxt/examples/bizinikiwi_compat_signer.rs b/vendor/pezkuwi-subxt/subxt/examples/bizinikiwi_compat_signer.rs
index 8584e944..a6c2c8df 100644
--- a/vendor/pezkuwi-subxt/subxt/examples/bizinikiwi_compat_signer.rs
+++ b/vendor/pezkuwi-subxt/subxt/examples/bizinikiwi_compat_signer.rs
@@ -6,10 +6,10 @@
 
 #![allow(missing_docs, unused)]
 
-use pezkuwi_subxt::{config::bizinikiwi::MultiAddress, Config, OnlineClient, PezkuwiConfig};
-use sp_core::{sr25519, Pair as _};
+use pezkuwi_subxt::{Config, OnlineClient, PezkuwiConfig};
+use pezsp_core::{sr25519, Pair as _};
 
-#[pezkuwi_subxt::subxt(runtime_metadata_path = "../artifacts/pezkuwi_metadata_small.scale")]
+#[pezkuwi_subxt::subxt(runtime_metadata_path = "../artifacts/polkadot_metadata_small.scale")]
 pub mod pezkuwi {}
 
 /// A concrete PairSigner implementation which relies on `sr25519::Pair` for signing
@@ -20,7 +20,7 @@ mod pair_signer {
 		config::bizinikiwi::{AccountId32, MultiSignature},
 		tx::Signer,
 	};
-	use sp_runtime::{
+	use pezsp_runtime::{
 		traits::{IdentifyAccount, Verify},
 		MultiSignature as SpMultiSignature,
 	};
@@ -90,7 +90,7 @@ async fn main() -> Result<(), Box<dyn std::error::Error>> {
 
 	let dest = {
 		let acc = sr25519::Pair::from_string("//Bob", None)?;
-		MultiAddress::Address32(acc.public().0)
+		pezkuwi::runtime_types::sp_runtime::multiaddress::MultiAddress::Address32(acc.public().0)
 	};
 
 	// Build a balance transfer extrinsic.
diff --git a/vendor/pezkuwi-subxt/subxt/examples/block_decoding_static.rs b/vendor/pezkuwi-subxt/subxt/examples/block_decoding_static.rs
index 3fbaa044..93d39f06 100644
--- a/vendor/pezkuwi-subxt/subxt/examples/block_decoding_static.rs
+++ b/vendor/pezkuwi-subxt/subxt/examples/block_decoding_static.rs
@@ -1,15 +1,17 @@
 #![allow(missing_docs)]
 use pezkuwi_subxt::{
-	utils::{AccountId32, MultiAddress},
+	utils::{AccountId32 as UtilAccountId32, MultiAddress as UtilMultiAddress},
 	OnlineClient, PezkuwiConfig,
 };
 
 use codec::Decode;
 
-#[pezkuwi_subxt::subxt(runtime_metadata_path = "../artifacts/pezkuwi_metadata_small.scale")]
+#[pezkuwi_subxt::subxt(runtime_metadata_path = "../artifacts/polkadot_metadata_small.scale")]
 pub mod pezkuwi {}
 
 use pezkuwi::balances::calls::types::TransferKeepAlive;
+use pezkuwi::runtime_types::sp_runtime::multiaddress::MultiAddress;
+use pezkuwi::runtime_types::sp_core::crypto::AccountId32;
 
 #[tokio::main]
 async fn main() -> Result<(), Box<dyn std::error::Error>> {
@@ -37,9 +39,10 @@ async fn main() -> Result<(), Box<dyn std::error::Error>> {
 
 			let addr_bytes =
 				transfer.details.address_bytes().expect("TransferKeepAlive should be signed");
-			let sender = MultiAddress::<AccountId32, ()>::decode(&mut &addr_bytes[..])
+			// Use utility types for decoding as they implement the Decode trait
+			let sender = UtilMultiAddress::<UtilAccountId32, ()>::decode(&mut &addr_bytes[..])
 				.expect("Decoding should work");
-			let sender = display_address(&sender);
+			let sender = display_util_address(&sender);
 			let receiver = display_address(&transfer.value.dest);
 			let value = transfer.value.value;
 			let tip = extensions.tip().expect("Should have tip");
@@ -56,6 +59,14 @@ async fn main() -> Result<(), Box<dyn std::error::Error>> {
 
 fn display_address(addr: &MultiAddress<AccountId32, ()>) -> String {
 	if let MultiAddress::Id(id32) = addr {
+		format!("{id32:?}")
+	} else {
+		"MultiAddress::...".into()
+	}
+}
+
+fn display_util_address(addr: &UtilMultiAddress<UtilAccountId32, ()>) -> String {
+	if let UtilMultiAddress::Id(id32) = addr {
 		format!("{id32}")
 	} else {
 		"MultiAddress::...".into()
diff --git a/vendor/pezkuwi-subxt/subxt/examples/blocks_subscribing.rs b/vendor/pezkuwi-subxt/subxt/examples/blocks_subscribing.rs
index 5bca0b0d..a365bf12 100644
--- a/vendor/pezkuwi-subxt/subxt/examples/blocks_subscribing.rs
+++ b/vendor/pezkuwi-subxt/subxt/examples/blocks_subscribing.rs
@@ -1,7 +1,7 @@
 #![allow(missing_docs)]
 use pezkuwi_subxt::{OnlineClient, PezkuwiConfig};
 
-#[pezkuwi_subxt::subxt(runtime_metadata_path = "../artifacts/pezkuwi_metadata_small.scale")]
+#[pezkuwi_subxt::subxt(runtime_metadata_path = "../artifacts/polkadot_metadata_small.scale")]
 pub mod pezkuwi {}
 
 #[tokio::main]
diff --git a/vendor/pezkuwi-subxt/subxt/examples/constants_static.rs b/vendor/pezkuwi-subxt/subxt/examples/constants_static.rs
index f16017a0..f1a316ff 100644
--- a/vendor/pezkuwi-subxt/subxt/examples/constants_static.rs
+++ b/vendor/pezkuwi-subxt/subxt/examples/constants_static.rs
@@ -1,7 +1,7 @@
 #![allow(missing_docs)]
 use pezkuwi_subxt::{OnlineClient, PezkuwiConfig};
 
-#[pezkuwi_subxt::subxt(runtime_metadata_path = "../artifacts/pezkuwi_metadata_small.scale")]
+#[pezkuwi_subxt::subxt(runtime_metadata_path = "../artifacts/polkadot_metadata_small.scale")]
 pub mod pezkuwi {}
 
 #[tokio::main]
diff --git a/vendor/pezkuwi-subxt/subxt/examples/events.rs b/vendor/pezkuwi-subxt/subxt/examples/events.rs
index 297bd42e..482f53c7 100644
--- a/vendor/pezkuwi-subxt/subxt/examples/events.rs
+++ b/vendor/pezkuwi-subxt/subxt/examples/events.rs
@@ -1,7 +1,7 @@
 #![allow(missing_docs)]
 use pezkuwi_subxt::{OnlineClient, PezkuwiConfig};
 
-#[pezkuwi_subxt::subxt(runtime_metadata_path = "../artifacts/pezkuwi_metadata_small.scale")]
+#[pezkuwi_subxt::subxt(runtime_metadata_path = "../artifacts/polkadot_metadata_small.scale")]
 pub mod pezkuwi {}
 
 #[tokio::main]
diff --git a/vendor/pezkuwi-subxt/subxt/examples/light_client_basic.rs b/vendor/pezkuwi-subxt/subxt/examples/light_client_basic.rs
index 0403e15b..fb156254 100644
--- a/vendor/pezkuwi-subxt/subxt/examples/light_client_basic.rs
+++ b/vendor/pezkuwi-subxt/subxt/examples/light_client_basic.rs
@@ -3,12 +3,12 @@ use futures::StreamExt;
 use pezkuwi_subxt::{client::OnlineClient, lightclient::LightClient, PezkuwiConfig};
 
 // Generate an interface that we can use from the node's metadata.
-#[pezkuwi_subxt::subxt(runtime_metadata_path = "../artifacts/pezkuwi_metadata_small.scale")]
+#[pezkuwi_subxt::subxt(runtime_metadata_path = "../artifacts/polkadot_metadata_small.scale")]
 pub mod pezkuwi {}
 
-const POLKADOT_SPEC: &str = include_str!("../../artifacts/demo_chain_specs/pezkuwi.json");
+const POLKADOT_SPEC: &str = include_str!("../../artifacts/demo_chain_specs/polkadot.json");
 const ASSET_HUB_SPEC: &str =
-	include_str!("../../artifacts/demo_chain_specs/pezkuwi_asset_hub.json");
+	include_str!("../../artifacts/demo_chain_specs/polkadot_asset_hub.json");
 
 #[tokio::main]
 async fn main() -> Result<(), Box<dyn std::error::Error>> {
diff --git a/vendor/pezkuwi-subxt/subxt/examples/light_client_local_node.rs b/vendor/pezkuwi-subxt/subxt/examples/light_client_local_node.rs
index 3fb488b5..5e57a454 100644
--- a/vendor/pezkuwi-subxt/subxt/examples/light_client_local_node.rs
+++ b/vendor/pezkuwi-subxt/subxt/examples/light_client_local_node.rs
@@ -8,7 +8,7 @@ use pezkuwi_subxt::{
 use pezkuwi_subxt_signer::sr25519::dev;
 
 // Generate an interface that we can use from the node's metadata.
-#[pezkuwi_subxt::subxt(runtime_metadata_path = "../artifacts/pezkuwi_metadata_small.scale")]
+#[pezkuwi_subxt::subxt(runtime_metadata_path = "../artifacts/polkadot_metadata_small.scale")]
 pub mod pezkuwi {}
 
 #[tokio::main]
@@ -35,7 +35,9 @@ async fn main() -> Result<(), Box<dyn std::error::Error>> {
 	let api = OnlineClient::<PezkuwiConfig>::from_rpc_client(chain_rpc).await?;
 
 	// Build a balance transfer extrinsic.
-	let dest = dev::bob().public_key().into();
+	let dest = pezkuwi::runtime_types::sp_runtime::multiaddress::MultiAddress::Id(
+		pezkuwi::runtime_types::sp_core::crypto::AccountId32(dev::bob().public_key().0),
+	);
 	let balance_transfer_tx = pezkuwi::tx().balances().transfer_allow_death(dest, 10_000);
 
 	// Submit the balance transfer extrinsic from Alice, and wait for it to be successful
diff --git a/vendor/pezkuwi-subxt/subxt/examples/rpc_legacy.rs b/vendor/pezkuwi-subxt/subxt/examples/rpc_legacy.rs
index f6dee0a6..2d05f3f6 100644
--- a/vendor/pezkuwi-subxt/subxt/examples/rpc_legacy.rs
+++ b/vendor/pezkuwi-subxt/subxt/examples/rpc_legacy.rs
@@ -6,7 +6,7 @@ use pezkuwi_subxt::{
 };
 use pezkuwi_subxt_signer::sr25519::dev;
 
-#[pezkuwi_subxt::subxt(runtime_metadata_path = "../artifacts/pezkuwi_metadata_small.scale")]
+#[pezkuwi_subxt::subxt(runtime_metadata_path = "../artifacts/polkadot_metadata_small.scale")]
 pub mod pezkuwi {}
 
 #[tokio::main]
@@ -37,13 +37,17 @@ async fn main() -> Result<(), Box<dyn std::error::Error>> {
 	let bob = dev::bob();
 
 	loop {
-		let current_nonce = rpc.system_account_next_index(&alice.public_key().into()).await?;
+		let alice_account_id = pezkuwi_subxt::config::bizinikiwi::AccountId32(alice.public_key().0);
+		let current_nonce = rpc.system_account_next_index(&alice_account_id).await?;
 
 		let ext_params = Params::new().mortal(8).nonce(current_nonce).build();
 
+		let dest = pezkuwi::runtime_types::sp_runtime::multiaddress::MultiAddress::Id(
+			pezkuwi::runtime_types::sp_core::crypto::AccountId32(bob.public_key().0),
+		);
 		let balance_transfer = pezkuwi::tx()
 			.balances()
-			.transfer_allow_death(bob.public_key().into(), 1_000_000);
+			.transfer_allow_death(dest, 1_000_000);
 
 		let ext_hash = api
 			.tx()
diff --git a/vendor/pezkuwi-subxt/subxt/examples/runtime_apis_dynamic.rs b/vendor/pezkuwi-subxt/subxt/examples/runtime_apis_dynamic.rs
index 3b404ff0..d0074b46 100644
--- a/vendor/pezkuwi-subxt/subxt/examples/runtime_apis_dynamic.rs
+++ b/vendor/pezkuwi-subxt/subxt/examples/runtime_apis_dynamic.rs
@@ -12,7 +12,7 @@ async fn main() -> Result<(), Box<dyn std::error::Error>> {
 	// `scale_value::Value` type as output, and a vec of those as inputs,
 	// but since we know the input + return types we can pass them directly.
 	// There is one input argument, so the inputs are a tuple of one element.
-	let account: AccountId32 = dev::alice().public_key().into();
+	let account = AccountId32(dev::alice().public_key().0);
 	let runtime_api_call = pezkuwi_subxt::dynamic::runtime_api_call::<_, u64>(
 		"AccountNonceApi",
 		"account_nonce",
diff --git a/vendor/pezkuwi-subxt/subxt/examples/runtime_apis_raw.rs b/vendor/pezkuwi-subxt/subxt/examples/runtime_apis_raw.rs
index 4c30f650..9c40bc5d 100644
--- a/vendor/pezkuwi-subxt/subxt/examples/runtime_apis_raw.rs
+++ b/vendor/pezkuwi-subxt/subxt/examples/runtime_apis_raw.rs
@@ -7,7 +7,7 @@ use pezkuwi_subxt::{
 	OnlineClient, PezkuwiConfig,
 };
 
-#[pezkuwi_subxt::subxt(runtime_metadata_path = "../artifacts/pezkuwi_metadata_small.scale")]
+#[pezkuwi_subxt::subxt(runtime_metadata_path = "../artifacts/polkadot_metadata_small.scale")]
 pub mod pezkuwi {}
 
 #[tokio::main]
diff --git a/vendor/pezkuwi-subxt/subxt/examples/runtime_apis_static.rs b/vendor/pezkuwi-subxt/subxt/examples/runtime_apis_static.rs
index 6e9a4eff..370c551b 100644
--- a/vendor/pezkuwi-subxt/subxt/examples/runtime_apis_static.rs
+++ b/vendor/pezkuwi-subxt/subxt/examples/runtime_apis_static.rs
@@ -2,7 +2,7 @@
 use pezkuwi_subxt::{config::PezkuwiConfig, OnlineClient};
 use pezkuwi_subxt_signer::sr25519::dev;
 
-#[pezkuwi_subxt::subxt(runtime_metadata_path = "../artifacts/pezkuwi_metadata_small.scale")]
+#[pezkuwi_subxt::subxt(runtime_metadata_path = "../artifacts/polkadot_metadata_small.scale")]
 pub mod pezkuwi {}
 
 #[tokio::main]
@@ -12,7 +12,7 @@ async fn main() -> Result<(), Box<dyn std::error::Error>> {
 
 	// Create a runtime API payload that calls into
 	// `AccountNonceApi_account_nonce` function.
-	let account = dev::alice().public_key().into();
+	let account = pezkuwi::runtime_types::sp_core::crypto::AccountId32(dev::alice().public_key().0);
 	let runtime_api_call = pezkuwi::apis().account_nonce_api().account_nonce(account);
 
 	// Submit the call and get back a result.
diff --git a/vendor/pezkuwi-subxt/subxt/examples/setup_client_offline.rs b/vendor/pezkuwi-subxt/subxt/examples/setup_client_offline.rs
index 66736b53..d1ae279d 100644
--- a/vendor/pezkuwi-subxt/subxt/examples/setup_client_offline.rs
+++ b/vendor/pezkuwi-subxt/subxt/examples/setup_client_offline.rs
@@ -21,7 +21,7 @@ async fn main() -> Result<(), Box<dyn std::error::Error>> {
 	// 3. Metadata (I'll load it from the downloaded metadata, but you can use `subxt metadata >
 	//    file.scale` to download it):
 	let metadata = {
-		let bytes = std::fs::read("./artifacts/pezkuwi_metadata_small.scale").unwrap();
+		let bytes = std::fs::read("./artifacts/polkadot_metadata_small.scale").unwrap();
 		Metadata::decode(&mut &*bytes).unwrap()
 	};
 
diff --git a/vendor/pezkuwi-subxt/subxt/examples/setup_config_assethub.rs b/vendor/pezkuwi-subxt/subxt/examples/setup_config_assethub.rs
index 3f4b6ee3..6c552a63 100644
--- a/vendor/pezkuwi-subxt/subxt/examples/setup_config_assethub.rs
+++ b/vendor/pezkuwi-subxt/subxt/examples/setup_config_assethub.rs
@@ -5,7 +5,7 @@ use pezkuwi_subxt::config::{
 use pezkuwi_subxt_signer::sr25519::dev;
 
 #[pezkuwi_subxt::subxt(
-	runtime_metadata_path = "../artifacts/pezkuwi_metadata_full.scale",
+	runtime_metadata_path = "../artifacts/polkadot_metadata_full.scale",
 	derive_for_type(
 		path = "staging_xcm::v3::multilocation::MultiLocation",
 		derive = "Clone, codec::Encode",
diff --git a/vendor/pezkuwi-subxt/subxt/examples/setup_config_custom.rs b/vendor/pezkuwi-subxt/subxt/examples/setup_config_custom.rs
index 86c564eb..0d135cf5 100644
--- a/vendor/pezkuwi-subxt/subxt/examples/setup_config_custom.rs
+++ b/vendor/pezkuwi-subxt/subxt/examples/setup_config_custom.rs
@@ -9,7 +9,7 @@ use pezkuwi_subxt::{
 };
 use pezkuwi_subxt_signer::sr25519::dev;
 
-#[pezkuwi_subxt::subxt(runtime_metadata_path = "../artifacts/pezkuwi_metadata_full.scale")]
+#[pezkuwi_subxt::subxt(runtime_metadata_path = "../artifacts/polkadot_metadata_full.scale")]
 pub mod runtime {}
 
 // We don't need to construct this at runtime,
diff --git a/vendor/pezkuwi-subxt/subxt/examples/setup_config_transaction_extension.rs b/vendor/pezkuwi-subxt/subxt/examples/setup_config_transaction_extension.rs
index bce6fea7..bd71f0e9 100644
--- a/vendor/pezkuwi-subxt/subxt/examples/setup_config_transaction_extension.rs
+++ b/vendor/pezkuwi-subxt/subxt/examples/setup_config_transaction_extension.rs
@@ -11,7 +11,7 @@ use pezkuwi_subxt_signer::sr25519::dev;
 use scale_encode::EncodeAsType;
 use scale_info::PortableRegistry;
 
-#[pezkuwi_subxt::subxt(runtime_metadata_path = "../artifacts/pezkuwi_metadata_small.scale")]
+#[pezkuwi_subxt::subxt(runtime_metadata_path = "../artifacts/polkadot_metadata_small.scale")]
 pub mod runtime {}
 
 // We don't need to construct this at runtime,
diff --git a/vendor/pezkuwi-subxt/subxt/examples/setup_reconnecting_rpc_client.rs b/vendor/pezkuwi-subxt/subxt/examples/setup_reconnecting_rpc_client.rs
index d25bee58..0d1d41ec 100644
--- a/vendor/pezkuwi-subxt/subxt/examples/setup_reconnecting_rpc_client.rs
+++ b/vendor/pezkuwi-subxt/subxt/examples/setup_reconnecting_rpc_client.rs
@@ -15,7 +15,7 @@ use pezkuwi_subxt::{
 };
 
 // Generate an interface that we can use from the node's metadata.
-#[pezkuwi_subxt::subxt(runtime_metadata_path = "../artifacts/pezkuwi_metadata_small.scale")]
+#[pezkuwi_subxt::subxt(runtime_metadata_path = "../artifacts/polkadot_metadata_small.scale")]
 pub mod pezkuwi {}
 
 #[tokio::main]
diff --git a/vendor/pezkuwi-subxt/subxt/examples/setup_rpc_chainhead_backend.rs b/vendor/pezkuwi-subxt/subxt/examples/setup_rpc_chainhead_backend.rs
index e5aeb5f2..0fde3e73 100644
--- a/vendor/pezkuwi-subxt/subxt/examples/setup_rpc_chainhead_backend.rs
+++ b/vendor/pezkuwi-subxt/subxt/examples/setup_rpc_chainhead_backend.rs
@@ -12,7 +12,7 @@ use pezkuwi_subxt::{
 };
 
 // Generate an interface that we can use from the node's metadata.
-#[pezkuwi_subxt::subxt(runtime_metadata_path = "../artifacts/pezkuwi_metadata_small.scale")]
+#[pezkuwi_subxt::subxt(runtime_metadata_path = "../artifacts/polkadot_metadata_small.scale")]
 pub mod pezkuwi {}
 
 #[tokio::main]
diff --git a/vendor/pezkuwi-subxt/subxt/examples/storage_fetch.rs b/vendor/pezkuwi-subxt/subxt/examples/storage_fetch.rs
index 76f073ca..fe25784d 100644
--- a/vendor/pezkuwi-subxt/subxt/examples/storage_fetch.rs
+++ b/vendor/pezkuwi-subxt/subxt/examples/storage_fetch.rs
@@ -3,14 +3,14 @@ use pezkuwi_subxt::{OnlineClient, PezkuwiConfig};
 use pezkuwi_subxt_signer::sr25519::dev;
 
 // Generate an interface that we can use from the node's metadata.
-#[pezkuwi_subxt::subxt(runtime_metadata_path = "../artifacts/pezkuwi_metadata_small.scale")]
+#[pezkuwi_subxt::subxt(runtime_metadata_path = "../artifacts/polkadot_metadata_small.scale")]
 pub mod pezkuwi {}
 
 #[tokio::main]
 async fn main() -> Result<(), Box<dyn std::error::Error>> {
 	// Create a new API client, configured to talk to Pezkuwi nodes.
 	let api = OnlineClient::<PezkuwiConfig>::new().await?;
-	let account = dev::alice().public_key().into();
+	let account = pezkuwi::runtime_types::sp_core::crypto::AccountId32(dev::alice().public_key().0);
 
 	// Build a storage query to access account information.
 	let storage_query = pezkuwi::storage().system().account();
diff --git a/vendor/pezkuwi-subxt/subxt/examples/storage_fetch_dynamic.rs b/vendor/pezkuwi-subxt/subxt/examples/storage_fetch_dynamic.rs
index 5e991a2c..ce2bf5d8 100644
--- a/vendor/pezkuwi-subxt/subxt/examples/storage_fetch_dynamic.rs
+++ b/vendor/pezkuwi-subxt/subxt/examples/storage_fetch_dynamic.rs
@@ -15,7 +15,7 @@ async fn main() -> Result<(), Box<dyn std::error::Error>> {
 	// here, we assume that there is one value to provide at this entry
 	// to access a value; an AccountId32. In this example we don't know the
 	// return type and so we set it to `Value`, which anything can decode into.
-	let account: AccountId32 = dev::alice().public_key().into();
+	let account = AccountId32(dev::alice().public_key().0);
 	let storage_query =
 		pezkuwi_subxt::dynamic::storage::<(AccountId32,), Value>("System", "Account");
 
diff --git a/vendor/pezkuwi-subxt/subxt/examples/storage_iterating.rs b/vendor/pezkuwi-subxt/subxt/examples/storage_iterating.rs
index 6b312b91..84be614f 100644
--- a/vendor/pezkuwi-subxt/subxt/examples/storage_iterating.rs
+++ b/vendor/pezkuwi-subxt/subxt/examples/storage_iterating.rs
@@ -2,7 +2,7 @@
 use pezkuwi_subxt::{ext::futures::StreamExt, OnlineClient, PezkuwiConfig};
 
 // Generate an interface that we can use from the node's metadata.
-#[pezkuwi_subxt::subxt(runtime_metadata_path = "../artifacts/pezkuwi_metadata_small.scale")]
+#[pezkuwi_subxt::subxt(runtime_metadata_path = "../artifacts/polkadot_metadata_small.scale")]
 pub mod pezkuwi {}
 
 #[tokio::main]
@@ -34,7 +34,7 @@ async fn main() -> Result<(), Box<dyn std::error::Error>> {
 		let value = kv.value().decode()?;
 
 		let value_data = value.data;
-		println!("{account_id32}:\n  {value_data:?}");
+		println!("{account_id32:?}:\n  {value_data:?}");
 	}
 
 	Ok(())
diff --git a/vendor/pezkuwi-subxt/subxt/examples/tx_basic.rs b/vendor/pezkuwi-subxt/subxt/examples/tx_basic.rs
index 56993482..31248390 100644
--- a/vendor/pezkuwi-subxt/subxt/examples/tx_basic.rs
+++ b/vendor/pezkuwi-subxt/subxt/examples/tx_basic.rs
@@ -3,7 +3,7 @@ use pezkuwi_subxt::{OnlineClient, PezkuwiConfig};
 use pezkuwi_subxt_signer::sr25519::dev;
 
 // Generate an interface that we can use from the node's metadata.
-#[pezkuwi_subxt::subxt(runtime_metadata_path = "../artifacts/pezkuwi_metadata_small.scale")]
+#[pezkuwi_subxt::subxt(runtime_metadata_path = "../artifacts/polkadot_metadata_small.scale")]
 pub mod pezkuwi {}
 
 #[tokio::main]
@@ -12,7 +12,9 @@ async fn main() -> Result<(), Box<dyn std::error::Error>> {
 	let api = OnlineClient::<PezkuwiConfig>::new().await?;
 
 	// Build a balance transfer extrinsic.
-	let dest = dev::bob().public_key().into();
+	let dest = pezkuwi::runtime_types::sp_runtime::multiaddress::MultiAddress::Id(
+		pezkuwi::runtime_types::sp_core::crypto::AccountId32(dev::bob().public_key().0),
+	);
 	let balance_transfer_tx = pezkuwi::tx().balances().transfer_allow_death(dest, 10_000);
 
 	// Submit the balance transfer extrinsic from Alice, and wait for it to be successful
diff --git a/vendor/pezkuwi-subxt/subxt/examples/tx_boxed.rs b/vendor/pezkuwi-subxt/subxt/examples/tx_boxed.rs
index 941098ff..ec9386ef 100644
--- a/vendor/pezkuwi-subxt/subxt/examples/tx_boxed.rs
+++ b/vendor/pezkuwi-subxt/subxt/examples/tx_boxed.rs
@@ -2,7 +2,7 @@
 use pezkuwi_subxt::{OnlineClient, PezkuwiConfig};
 use pezkuwi_subxt_signer::sr25519::dev;
 
-#[pezkuwi_subxt::subxt(runtime_metadata_path = "../artifacts/pezkuwi_metadata_small.scale")]
+#[pezkuwi_subxt::subxt(runtime_metadata_path = "../artifacts/polkadot_metadata_small.scale")]
 pub mod pezkuwi {}
 
 #[tokio::main]
@@ -27,7 +27,9 @@ async fn main() -> Result<(), Box<dyn std::error::Error>> {
 }
 
 fn balance_transfer() -> Box<dyn pezkuwi_subxt::tx::Payload> {
-	let dest = dev::bob().public_key().into();
+	let dest = pezkuwi::runtime_types::sp_runtime::multiaddress::MultiAddress::Id(
+		pezkuwi::runtime_types::sp_core::crypto::AccountId32(dev::bob().public_key().0),
+	);
 	Box::new(pezkuwi::tx().balances().transfer_allow_death(dest, 10_000))
 }
 
diff --git a/vendor/pezkuwi-subxt/subxt/examples/tx_partial.rs b/vendor/pezkuwi-subxt/subxt/examples/tx_partial.rs
index a37fa539..08f1b148 100644
--- a/vendor/pezkuwi-subxt/subxt/examples/tx_partial.rs
+++ b/vendor/pezkuwi-subxt/subxt/examples/tx_partial.rs
@@ -4,7 +4,7 @@ use pezkuwi_subxt_signer::sr25519::dev;
 
 type BoxedError = Box<dyn std::error::Error + Send + Sync + 'static>;
 
-#[pezkuwi_subxt::subxt(runtime_metadata_path = "../artifacts/pezkuwi_metadata_small.scale")]
+#[pezkuwi_subxt::subxt(runtime_metadata_path = "../artifacts/polkadot_metadata_small.scale")]
 pub mod pezkuwi {}
 
 #[tokio::main]
@@ -19,7 +19,9 @@ async fn signing_example() -> Result<(), BoxedError> {
 	let api = OnlineClient::<PezkuwiConfig>::new().await?;
 
 	// Build a balance transfer extrinsic.
-	let dest = dev::bob().public_key().into();
+	let dest = pezkuwi::runtime_types::sp_runtime::multiaddress::MultiAddress::Id(
+		pezkuwi::runtime_types::sp_core::crypto::AccountId32(dev::bob().public_key().0),
+	);
 	let balance_transfer_tx = pezkuwi::tx().balances().transfer_allow_death(dest, 10_000);
 
 	let alice = dev::alice();
diff --git a/vendor/pezkuwi-subxt/subxt/examples/tx_status_stream.rs b/vendor/pezkuwi-subxt/subxt/examples/tx_status_stream.rs
index 88649850..fc408223 100644
--- a/vendor/pezkuwi-subxt/subxt/examples/tx_status_stream.rs
+++ b/vendor/pezkuwi-subxt/subxt/examples/tx_status_stream.rs
@@ -3,7 +3,7 @@ use pezkuwi_subxt::{tx::TxStatus, OnlineClient, PezkuwiConfig};
 use pezkuwi_subxt_signer::sr25519::dev;
 
 // Generate an interface that we can use from the node's metadata.
-#[pezkuwi_subxt::subxt(runtime_metadata_path = "../artifacts/pezkuwi_metadata_small.scale")]
+#[pezkuwi_subxt::subxt(runtime_metadata_path = "../artifacts/polkadot_metadata_small.scale")]
 pub mod pezkuwi {}
 
 #[tokio::main]
@@ -12,7 +12,9 @@ async fn main() -> Result<(), Box<dyn std::error::Error>> {
 	let api = OnlineClient::<PezkuwiConfig>::new().await?;
 
 	// Build a balance transfer extrinsic.
-	let dest = dev::bob().public_key().into();
+	let dest = pezkuwi::runtime_types::sp_runtime::multiaddress::MultiAddress::Id(
+		pezkuwi::runtime_types::sp_core::crypto::AccountId32(dev::bob().public_key().0),
+	);
 	let balance_transfer_tx = pezkuwi::tx().balances().transfer_allow_death(dest, 10_000);
 
 	// Submit the balance transfer extrinsic from Alice, and then monitor the
diff --git a/vendor/pezkuwi-subxt/subxt/examples/tx_with_params.rs b/vendor/pezkuwi-subxt/subxt/examples/tx_with_params.rs
index 45a729a8..6532a49c 100644
--- a/vendor/pezkuwi-subxt/subxt/examples/tx_with_params.rs
+++ b/vendor/pezkuwi-subxt/subxt/examples/tx_with_params.rs
@@ -4,7 +4,7 @@ use pezkuwi_subxt::{
 };
 use pezkuwi_subxt_signer::sr25519::dev;
 
-#[pezkuwi_subxt::subxt(runtime_metadata_path = "../artifacts/pezkuwi_metadata_small.scale")]
+#[pezkuwi_subxt::subxt(runtime_metadata_path = "../artifacts/polkadot_metadata_small.scale")]
 pub mod pezkuwi {}
 
 #[tokio::main]
@@ -13,7 +13,9 @@ async fn main() -> Result<(), Box<dyn std::error::Error>> {
 	let api = OnlineClient::<PezkuwiConfig>::new().await?;
 
 	// Build a balance transfer extrinsic.
-	let dest = dev::bob().public_key().into();
+	let dest = pezkuwi::runtime_types::sp_runtime::multiaddress::MultiAddress::Id(
+		pezkuwi::runtime_types::sp_core::crypto::AccountId32(dev::bob().public_key().0),
+	);
 	let tx = pezkuwi::tx().balances().transfer_allow_death(dest, 10_000);
 
 	// Configure the transaction parameters; we give a small tip and set the
diff --git a/vendor/pezkuwi-subxt/subxt/src/backend/mod.rs b/vendor/pezkuwi-subxt/subxt/src/backend/mod.rs
index 75dede66..031fa483 100644
--- a/vendor/pezkuwi-subxt/subxt/src/backend/mod.rs
+++ b/vendor/pezkuwi-subxt/subxt/src/backend/mod.rs
@@ -468,7 +468,7 @@ mod test {
 					// Decode the storage key as first item from sequence of params:
 					let params = params.map(|p| p.get().to_string());
 					let rpc_params = jsonrpsee::types::Params::new(params.as_deref());
-					let key: sp_core::Bytes = rpc_params.sequence().next().unwrap();
+					let key: pezsp_core::Bytes = rpc_params.sequence().next().unwrap();
 					let key = std::str::from_utf8(&key.0).unwrap();
 					// Fetch the response to use from our map, popping it from the front.
 					let values = values.get_mut(key).unwrap();
diff --git a/vendor/pezkuwi-subxt/subxt/src/tx/tx_client.rs b/vendor/pezkuwi-subxt/subxt/src/tx/tx_client.rs
index 400000d3..ddaec37e 100644
--- a/vendor/pezkuwi-subxt/subxt/src/tx/tx_client.rs
+++ b/vendor/pezkuwi-subxt/subxt/src/tx/tx_client.rs
@@ -864,7 +864,7 @@ mod test {
 
 	#[test]
 	fn transaction_validity_decoding_is_ok() {
-		use sp_runtime::{
+		use pezsp_runtime::{
 			transaction_validity as sp, transaction_validity::TransactionValidity as T,
 		};
 
diff --git a/vendor/pezkuwi-zombienet-sdk/crates/sdk/tests/chain_spec_runtime_omni_node.rs b/vendor/pezkuwi-zombienet-sdk/crates/sdk/tests/chain_spec_runtime_omni_node.rs
index e8629c96..79fc7998 100644
--- a/vendor/pezkuwi-zombienet-sdk/crates/sdk/tests/chain_spec_runtime_omni_node.rs
+++ b/vendor/pezkuwi-zombienet-sdk/crates/sdk/tests/chain_spec_runtime_omni_node.rs
@@ -40,7 +40,7 @@ async fn rococo_local_with_omni_node_and_wasm_runtime() {
 
 	// omni-collator-1
 	let collator = network.get_node("omni-collator-1").unwrap();
-	let client = collator.wait_client::<subxt::PolkadotConfig>().await.unwrap();
+	let client = collator.wait_client::<pezkuwi_subxt::PezkuwiConfig>().await.unwrap();
 
 	// wait 1 blocks
 	let mut blocks = client.blocks().subscribe_finalized().await.unwrap().take(1);
@@ -50,7 +50,7 @@ async fn rococo_local_with_omni_node_and_wasm_runtime() {
 
 	// omni-collator-2
 	let collator = network.get_node("omni-collator-2").unwrap();
-	let client = collator.wait_client::<subxt::PolkadotConfig>().await.unwrap();
+	let client = collator.wait_client::<pezkuwi_subxt::PezkuwiConfig>().await.unwrap();
 
 	// wait 1 blocks
 	let mut blocks = client.blocks().subscribe_finalized().await.unwrap().take(1);
diff --git a/vendor/pezkuwi-zombienet-sdk/crates/sdk/tests/chain_spec_runtime_polkadot.rs b/vendor/pezkuwi-zombienet-sdk/crates/sdk/tests/chain_spec_runtime_polkadot.rs
index ab726291..d29aef71 100644
--- a/vendor/pezkuwi-zombienet-sdk/crates/sdk/tests/chain_spec_runtime_polkadot.rs
+++ b/vendor/pezkuwi-zombienet-sdk/crates/sdk/tests/chain_spec_runtime_polkadot.rs
@@ -41,7 +41,7 @@ async fn polkadot_local_with_chain_spec_runtime() {
 
 	// asset-hub-collator-1
 	let collator = network.get_node("asset-hub-collator-1").unwrap();
-	let client = collator.wait_client::<subxt::PolkadotConfig>().await.unwrap();
+	let client = collator.wait_client::<pezkuwi_subxt::PezkuwiConfig>().await.unwrap();
 
 	// wait 1 blocks
 	let mut blocks = client.blocks().subscribe_finalized().await.unwrap().take(1);
@@ -51,7 +51,7 @@ async fn polkadot_local_with_chain_spec_runtime() {
 
 	// asset-hub-collator-2
 	let collator = network.get_node("asset-hub-collator-2").unwrap();
-	let client = collator.wait_client::<subxt::PolkadotConfig>().await.unwrap();
+	let client = collator.wait_client::<pezkuwi_subxt::PezkuwiConfig>().await.unwrap();
 
 	// wait 1 blocks
 	let mut blocks = client.blocks().subscribe_finalized().await.unwrap().take(1);
diff --git a/vendor/pezkuwi-zombienet-sdk/crates/sdk/tests/smoke.rs b/vendor/pezkuwi-zombienet-sdk/crates/sdk/tests/smoke.rs
index b4c28897..d31430c7 100644
--- a/vendor/pezkuwi-zombienet-sdk/crates/sdk/tests/smoke.rs
+++ b/vendor/pezkuwi-zombienet-sdk/crates/sdk/tests/smoke.rs
@@ -62,7 +62,7 @@ async fn ci_k8s_basic_functionalities_should_works() {
 
 	let (_best_block_pass, client) = try_join!(
 		alice.wait_metric(BEST_BLOCK_METRIC, |x| x > 5_f64),
-		alice.wait_client::<subxt::PolkadotConfig>()
+		alice.wait_client::<pezkuwi_subxt::PezkuwiConfig>()
 	)
 	.unwrap();
 
@@ -104,7 +104,7 @@ async fn ci_k8s_basic_functionalities_should_works() {
 
 	// collator
 	let collator = network.get_node("collator").unwrap();
-	let client = collator.wait_client::<subxt::PolkadotConfig>().await.unwrap();
+	let client = collator.wait_client::<pezkuwi_subxt::PezkuwiConfig>().await.unwrap();
 
 	// wait 3 blocks
 	let mut blocks = client.blocks().subscribe_finalized().await.unwrap().take(3);
@@ -143,7 +143,7 @@ async fn ci_k8s_basic_functionalities_should_works() {
 	collator.pause().await.unwrap();
 	tokio::time::sleep(tokio::time::Duration::from_millis(100)).await;
 
-	let r = collator.wait_client_with_timeout::<subxt::PolkadotConfig>(1_u32).await;
+	let r = collator.wait_client_with_timeout::<pezkuwi_subxt::PezkuwiConfig>(1_u32).await;
 	assert!(r.is_err());
 
 	// tear down (optional if you don't detach the network)