diff --git a/Cargo.lock b/Cargo.lock
index e2a99a77..8b23c9d5 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1144,8 +1144,8 @@ name = "asset-hub-pezkuwichain-emulated-chain"
 version = "0.0.0"
 dependencies = [
  "asset-hub-pezkuwichain-runtime",
- "bp-bridge-hub-pezkuwichain",
  "emulated-integration-tests-common",
+ "pezbp-bridge-hub-pezkuwichain",
  "pezcumulus-primitives-core",
  "pezframe-support",
  "pezkuwichain-emulated-chain",
@@ -1192,15 +1192,15 @@ name = "asset-hub-pezkuwichain-runtime"
 version = "0.11.0"
 dependencies = [
  "asset-test-pezutils",
- "assets-common",
  "bizinikiwi-wasm-builder",
- "bp-asset-hub-pezkuwichain",
- "bp-asset-hub-zagros",
- "bp-bridge-hub-pezkuwichain",
- "bp-bridge-hub-zagros",
  "hex-literal",
  "log",
  "parity-scale-codec",
+ "pez-assets-common",
+ "pezbp-asset-hub-pezkuwichain",
+ "pezbp-asset-hub-zagros",
+ "pezbp-bridge-hub-pezkuwichain",
+ "pezbp-bridge-hub-zagros",
  "pezcumulus-pezpallet-aura-ext",
  "pezcumulus-pezpallet-session-benchmarking",
  "pezcumulus-pezpallet-teyrchain-system",
@@ -1298,8 +1298,8 @@ name = "asset-hub-zagros-emulated-chain"
 version = "0.0.0"
 dependencies = [
  "asset-hub-zagros-runtime",
- "bp-bridge-hub-zagros",
  "emulated-integration-tests-common",
+ "pezbp-bridge-hub-zagros",
  "pezcumulus-primitives-core",
  "pezframe-support",
  "pezsp-core",
@@ -1348,15 +1348,15 @@ version = "0.15.0"
 dependencies = [
  "alloy-core",
  "asset-test-pezutils",
- "assets-common",
  "bizinikiwi-wasm-builder",
- "bp-asset-hub-pezkuwichain",
- "bp-asset-hub-zagros",
- "bp-bridge-hub-pezkuwichain",
- "bp-bridge-hub-zagros",
  "hex-literal",
  "log",
  "parity-scale-codec",
+ "pez-assets-common",
+ "pezbp-asset-hub-pezkuwichain",
+ "pezbp-asset-hub-zagros",
+ "pezbp-bridge-hub-pezkuwichain",
+ "pezbp-bridge-hub-zagros",
  "pezcumulus-pezpallet-aura-ext",
  "pezcumulus-pezpallet-session-benchmarking",
  "pezcumulus-pezpallet-teyrchain-system",
@@ -1470,8 +1470,8 @@ dependencies = [
 name = "asset-test-pezutils"
 version = "7.0.0"
 dependencies = [
- "assets-common",
  "parity-scale-codec",
+ "pez-assets-common",
  "pezcumulus-pezpallet-teyrchain-system",
  "pezcumulus-pezpallet-xcmp-queue",
  "pezcumulus-primitives-core",
@@ -1496,33 +1496,6 @@ dependencies = [
  "xcm-runtime-pezapis",
 ]
 
-[[package]]
-name = "assets-common"
-version = "0.7.0"
-dependencies = [
- "impl-trait-for-tuples",
- "parity-scale-codec",
- "pez-ethereum-standards",
- "pezcumulus-primitives-core",
- "pezframe-support",
- "pezframe-system",
- "pezpallet-asset-conversion",
- "pezpallet-assets",
- "pezpallet-revive",
- "pezpallet-revive-uapi",
- "pezpallet-xcm",
- "pezsp-api",
- "pezsp-core",
- "pezsp-runtime",
- "pezstaging-xcm",
- "pezstaging-xcm-builder",
- "pezstaging-xcm-executor",
- "scale-info",
- "serde",
- "teyrchains-common",
- "tracing",
-]
-
 [[package]]
 name = "async-attributes"
 version = "1.1.2"
@@ -2044,9 +2017,9 @@ dependencies = [
 
 [[package]]
 name = "bizinikiwi-bn"
-version = "0.6.0"
+version = "0.7.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8cefde413ae13ad3feac77cedffecb4ea0d957d1b519706f801e672bc1e24554"
+checksum = "e2db2e548eb69564b147e3e42301cf63d2375eb9b05f50cc99db14fc2dde6cdf"
 dependencies = [
  "byteorder",
  "crunchy",
@@ -2098,7 +2071,6 @@ name = "bizinikiwi-frame-rpc-system"
 version = "28.0.0"
 dependencies = [
  "assert_matches",
- "bizinikiwi-test-runtime-client",
  "docify",
  "futures",
  "jsonrpsee",
@@ -2137,11 +2109,6 @@ dependencies = [
  "anyhow",
  "async-std",
  "async-trait",
- "bp-header-pez-chain",
- "bp-messages",
- "bp-pezkuwi-core",
- "bp-relayers",
- "bp-teyrchains",
  "clap",
  "futures",
  "hex",
@@ -2150,7 +2117,12 @@ dependencies = [
  "pez-equivocation-detector",
  "pez-finality-relay",
  "pez-messages-relay",
+ "pezbp-header-pez-chain",
+ "pezbp-messages",
+ "pezbp-pezkuwi-core",
+ "pezbp-relayers",
  "pezbp-runtime",
+ "pezbp-teyrchains",
  "pezframe-support",
  "pezframe-system",
  "pezpallet-balances",
@@ -2557,294 +2529,6 @@ dependencies = [
  "thiserror 1.0.69",
 ]
 
-[[package]]
-name = "bp-asset-hub-pezkuwichain"
-version = "0.4.0"
-dependencies = [
- "bp-bridge-hub-pezcumulus",
- "bp-messages",
- "bp-xcm-bridge-hub-router",
- "parity-scale-codec",
- "pezbp-runtime",
- "pezframe-support",
- "pezsp-api",
- "pezsp-core",
- "pezstaging-xcm",
- "scale-info",
- "testnet-teyrchains-constants",
-]
-
-[[package]]
-name = "bp-asset-hub-zagros"
-version = "0.3.0"
-dependencies = [
- "bp-bridge-hub-pezcumulus",
- "bp-messages",
- "bp-xcm-bridge-hub-router",
- "parity-scale-codec",
- "pezbp-runtime",
- "pezframe-support",
- "pezsp-api",
- "pezsp-core",
- "pezstaging-xcm",
- "scale-info",
- "testnet-teyrchains-constants",
-]
-
-[[package]]
-name = "bp-beefy"
-version = "0.1.0"
-dependencies = [
- "parity-scale-codec",
- "pez-binary-merkle-tree",
- "pezbp-runtime",
- "pezframe-support",
- "pezpallet-beefy-mmr",
- "pezpallet-mmr",
- "pezsp-consensus-beefy",
- "pezsp-runtime",
- "pezsp-std",
- "scale-info",
- "serde",
-]
-
-[[package]]
-name = "bp-bridge-hub-pezcumulus"
-version = "0.7.0"
-dependencies = [
- "bp-messages",
- "bp-pezkuwi-core",
- "pezbp-runtime",
- "pezframe-support",
- "pezframe-system",
- "pezkuwi-primitives",
- "pezsp-api",
- "pezsp-std",
- "teyrchains-common",
-]
-
-[[package]]
-name = "bp-bridge-hub-pezkuwichain"
-version = "0.7.0"
-dependencies = [
- "bp-bridge-hub-pezcumulus",
- "bp-messages",
- "bp-xcm-bridge-hub",
- "parity-scale-codec",
- "pezbp-runtime",
- "pezframe-support",
- "pezsp-api",
- "pezsp-runtime",
- "pezsp-std",
-]
-
-[[package]]
-name = "bp-bridge-hub-zagros"
-version = "0.3.0"
-dependencies = [
- "bp-bridge-hub-pezcumulus",
- "bp-messages",
- "bp-xcm-bridge-hub",
- "parity-scale-codec",
- "pezbp-runtime",
- "pezframe-support",
- "pezsp-api",
- "pezsp-runtime",
- "pezsp-std",
-]
-
-[[package]]
-name = "bp-header-pez-chain"
-version = "0.7.0"
-dependencies = [
- "bp-test-utils",
- "finality-grandpa",
- "hex",
- "hex-literal",
- "parity-scale-codec",
- "pezbp-runtime",
- "pezframe-support",
- "pezsp-consensus-grandpa",
- "pezsp-core",
- "pezsp-runtime",
- "pezsp-std",
- "scale-info",
- "serde",
-]
-
-[[package]]
-name = "bp-messages"
-version = "0.7.0"
-dependencies = [
- "bp-header-pez-chain",
- "hex",
- "hex-literal",
- "parity-scale-codec",
- "pezbp-runtime",
- "pezframe-support",
- "pezsp-core",
- "pezsp-io",
- "pezsp-std",
- "scale-info",
- "serde",
-]
-
-[[package]]
-name = "bp-pezkuwi-bulletin"
-version = "0.4.0"
-dependencies = [
- "bp-header-pez-chain",
- "bp-messages",
- "bp-pezkuwi-core",
- "parity-scale-codec",
- "pezbp-runtime",
- "pezframe-support",
- "pezframe-system",
- "pezsp-api",
- "pezsp-runtime",
- "pezsp-std",
- "scale-info",
-]
-
-[[package]]
-name = "bp-pezkuwi-core"
-version = "0.7.0"
-dependencies = [
- "bp-messages",
- "hex",
- "parity-scale-codec",
- "pezbp-runtime",
- "pezframe-support",
- "pezframe-system",
- "pezsp-core",
- "pezsp-runtime",
- "pezsp-std",
- "scale-info",
- "serde",
-]
-
-[[package]]
-name = "bp-pezkuwichain"
-version = "0.6.0"
-dependencies = [
- "bp-header-pez-chain",
- "bp-pezkuwi-core",
- "pezbp-runtime",
- "pezframe-support",
- "pezsp-api",
- "pezsp-std",
-]
-
-[[package]]
-name = "bp-relayers"
-version = "0.7.0"
-dependencies = [
- "bp-header-pez-chain",
- "bp-messages",
- "bp-teyrchains",
- "hex-literal",
- "parity-scale-codec",
- "pezbp-runtime",
- "pezframe-support",
- "pezframe-system",
- "pezpallet-utility",
- "pezsp-runtime",
- "pezsp-std",
- "scale-info",
-]
-
-[[package]]
-name = "bp-test-utils"
-version = "0.7.0"
-dependencies = [
- "bp-header-pez-chain",
- "bp-pezkuwi-core",
- "bp-teyrchains",
- "ed25519-dalek",
- "finality-grandpa",
- "parity-scale-codec",
- "pezbp-runtime",
- "pezsp-application-crypto",
- "pezsp-consensus-grandpa",
- "pezsp-core",
- "pezsp-runtime",
- "pezsp-std",
- "pezsp-trie",
-]
-
-[[package]]
-name = "bp-teyrchains"
-version = "0.7.0"
-dependencies = [
- "bp-header-pez-chain",
- "bp-pezkuwi-core",
- "impl-trait-for-tuples",
- "parity-scale-codec",
- "pezbp-runtime",
- "pezframe-support",
- "pezsp-core",
- "pezsp-runtime",
- "pezsp-std",
- "scale-info",
-]
-
-[[package]]
-name = "bp-xcm-bridge-hub"
-version = "0.2.0"
-dependencies = [
- "bp-messages",
- "parity-scale-codec",
- "pezbp-runtime",
- "pezframe-support",
- "pezsp-core",
- "pezsp-io",
- "pezsp-std",
- "pezstaging-xcm",
- "scale-info",
- "serde",
-]
-
-[[package]]
-name = "bp-xcm-bridge-hub-router"
-version = "0.6.0"
-dependencies = [
- "parity-scale-codec",
- "pezsp-core",
- "pezsp-runtime",
- "pezstaging-xcm",
- "scale-info",
-]
-
-[[package]]
-name = "bp-zagros"
-version = "0.3.0"
-dependencies = [
- "bp-header-pez-chain",
- "bp-pezkuwi-core",
- "pezbp-runtime",
- "pezframe-support",
- "pezsp-api",
- "pezsp-std",
-]
-
-[[package]]
-name = "bridge-hub-common"
-version = "0.1.0"
-dependencies = [
- "parity-scale-codec",
- "pezcumulus-primitives-core",
- "pezframe-support",
- "pezpallet-message-queue",
- "pezsnowbridge-core",
- "pezsp-core",
- "pezsp-runtime",
- "pezsp-std",
- "pezstaging-xcm",
- "pezstaging-xcm-builder",
- "pezstaging-xcm-executor",
- "scale-info",
-]
-
 [[package]]
 name = "bs58"
 version = "0.5.1"
@@ -4945,11 +4629,11 @@ name = "emulated-integration-tests-common"
 version = "3.0.0"
 dependencies = [
  "asset-test-pezutils",
- "bp-messages",
- "bp-xcm-bridge-hub",
  "hex-literal",
  "parity-scale-codec",
  "paste",
+ "pezbp-messages",
+ "pezbp-xcm-bridge-hub",
  "pezcumulus-pezpallet-teyrchain-system",
  "pezcumulus-pezpallet-xcmp-queue",
  "pezcumulus-primitives-core",
@@ -5632,28 +5316,6 @@ dependencies = [
  "serde",
 ]
 
-[[package]]
-name = "frame-remote-externalities"
-version = "0.35.0"
-dependencies = [
- "bizinikiwi-rpc-client",
- "futures",
- "indicatif",
- "jsonrpsee",
- "log",
- "parity-scale-codec",
- "pezsp-core",
- "pezsp-crypto-hashing",
- "pezsp-io",
- "pezsp-runtime",
- "pezsp-state-machine",
- "pezsp-tracing",
- "serde",
- "spinners",
- "tokio",
- "tokio-retry",
-]
-
 [[package]]
 name = "frame-storage-access-test-runtime"
 version = "0.1.0"
@@ -9955,6 +9617,33 @@ dependencies = [
  "indexmap 2.12.1",
 ]
 
+[[package]]
+name = "pez-assets-common"
+version = "0.7.1"
+dependencies = [
+ "impl-trait-for-tuples",
+ "parity-scale-codec",
+ "pez-ethereum-standards",
+ "pezcumulus-primitives-core",
+ "pezframe-support",
+ "pezframe-system",
+ "pezpallet-asset-conversion",
+ "pezpallet-assets",
+ "pezpallet-revive",
+ "pezpallet-revive-uapi",
+ "pezpallet-xcm",
+ "pezsp-api",
+ "pezsp-core",
+ "pezsp-runtime",
+ "pezstaging-xcm",
+ "pezstaging-xcm-builder",
+ "pezstaging-xcm-executor",
+ "scale-info",
+ "serde",
+ "teyrchains-common",
+ "tracing",
+]
+
 [[package]]
 name = "pez-binary-merkle-tree"
 version = "14.0.1"
@@ -9974,9 +9663,11 @@ dependencies = [
  "cmd_lib",
  "docify",
  "parity-scale-codec",
+ "pezframe",
  "pezframe-support",
- "pezkuwi-sdk-frame",
+ "pezframe-system",
  "pezsc-chain-spec",
+ "pezsp-api",
  "pezsp-application-crypto",
  "pezsp-core",
  "pezsp-genesis-builder",
@@ -9993,10 +9684,10 @@ version = "0.1.0"
 dependencies = [
  "async-std",
  "async-trait",
- "bp-header-pez-chain",
  "futures",
  "num-traits",
  "pez-finality-relay",
+ "pezbp-header-pez-chain",
  "relay-utils",
  "tracing",
 ]
@@ -10013,7 +9704,7 @@ dependencies = [
 
 [[package]]
 name = "pez-ethereum-standards"
-version = "0.1.0"
+version = "0.1.1"
 dependencies = [
  "alloy-core",
 ]
@@ -10025,10 +9716,10 @@ dependencies = [
  "async-std",
  "async-trait",
  "backoff",
- "bp-header-pez-chain",
  "futures",
  "num-traits",
  "parking_lot 0.12.5",
+ "pezbp-header-pez-chain",
  "relay-utils",
  "tracing",
 ]
@@ -10082,12 +9773,12 @@ version = "0.1.0"
 dependencies = [
  "async-std",
  "async-trait",
- "bp-messages",
  "futures",
  "hex",
  "num-traits",
  "parking_lot 0.12.5",
  "pez-finality-relay",
+ "pezbp-messages",
  "pezsp-arithmetic",
  "pezsp-core",
  "relay-utils",
@@ -10266,10 +9957,10 @@ dependencies = [
 name = "pez-penpal-runtime"
 version = "0.14.0"
 dependencies = [
- "assets-common",
  "bizinikiwi-wasm-builder",
  "hex-literal",
  "parity-scale-codec",
+ "pez-assets-common",
  "pezcumulus-pezpallet-aura-ext",
  "pezcumulus-pezpallet-session-benchmarking",
  "pezcumulus-pezpallet-teyrchain-system",
@@ -10479,8 +10170,8 @@ version = "0.0.0"
 dependencies = [
  "anyhow",
  "env_logger 0.11.8",
+ "pezkuwi-zombienet-sdk",
  "tokio",
- "zombienet-sdk",
 ]
 
 [[package]]
@@ -10505,6 +10196,201 @@ dependencies = [
  "syn 2.0.111",
 ]
 
+[[package]]
+name = "pezbp-asset-hub-pezkuwichain"
+version = "0.4.0"
+dependencies = [
+ "parity-scale-codec",
+ "pezbp-bridge-hub-pezcumulus",
+ "pezbp-messages",
+ "pezbp-runtime",
+ "pezbp-xcm-bridge-hub-router",
+ "pezframe-support",
+ "pezsp-api",
+ "pezsp-core",
+ "pezstaging-xcm",
+ "scale-info",
+ "testnet-teyrchains-constants",
+]
+
+[[package]]
+name = "pezbp-asset-hub-zagros"
+version = "0.3.0"
+dependencies = [
+ "parity-scale-codec",
+ "pezbp-bridge-hub-pezcumulus",
+ "pezbp-messages",
+ "pezbp-runtime",
+ "pezbp-xcm-bridge-hub-router",
+ "pezframe-support",
+ "pezsp-api",
+ "pezsp-core",
+ "pezstaging-xcm",
+ "scale-info",
+ "testnet-teyrchains-constants",
+]
+
+[[package]]
+name = "pezbp-beefy"
+version = "0.1.0"
+dependencies = [
+ "parity-scale-codec",
+ "pez-binary-merkle-tree",
+ "pezbp-runtime",
+ "pezframe-support",
+ "pezpallet-beefy-mmr",
+ "pezpallet-mmr",
+ "pezsp-consensus-beefy",
+ "pezsp-runtime",
+ "pezsp-std",
+ "scale-info",
+ "serde",
+]
+
+[[package]]
+name = "pezbp-bridge-hub-pezcumulus"
+version = "0.7.0"
+dependencies = [
+ "pezbp-messages",
+ "pezbp-pezkuwi-core",
+ "pezbp-runtime",
+ "pezframe-support",
+ "pezframe-system",
+ "pezkuwi-primitives",
+ "pezsp-api",
+ "pezsp-std",
+ "teyrchains-common",
+]
+
+[[package]]
+name = "pezbp-bridge-hub-pezkuwichain"
+version = "0.7.0"
+dependencies = [
+ "parity-scale-codec",
+ "pezbp-bridge-hub-pezcumulus",
+ "pezbp-messages",
+ "pezbp-runtime",
+ "pezbp-xcm-bridge-hub",
+ "pezframe-support",
+ "pezsp-api",
+ "pezsp-runtime",
+ "pezsp-std",
+]
+
+[[package]]
+name = "pezbp-bridge-hub-zagros"
+version = "0.3.0"
+dependencies = [
+ "parity-scale-codec",
+ "pezbp-bridge-hub-pezcumulus",
+ "pezbp-messages",
+ "pezbp-runtime",
+ "pezbp-xcm-bridge-hub",
+ "pezframe-support",
+ "pezsp-api",
+ "pezsp-runtime",
+ "pezsp-std",
+]
+
+[[package]]
+name = "pezbp-header-pez-chain"
+version = "0.7.0"
+dependencies = [
+ "finality-grandpa",
+ "hex",
+ "hex-literal",
+ "parity-scale-codec",
+ "pezbp-runtime",
+ "pezframe-support",
+ "pezsp-consensus-grandpa",
+ "pezsp-core",
+ "pezsp-runtime",
+ "pezsp-std",
+ "scale-info",
+ "serde",
+]
+
+[[package]]
+name = "pezbp-messages"
+version = "0.7.0"
+dependencies = [
+ "hex",
+ "hex-literal",
+ "parity-scale-codec",
+ "pezbp-header-pez-chain",
+ "pezbp-runtime",
+ "pezframe-support",
+ "pezsp-core",
+ "pezsp-io",
+ "pezsp-std",
+ "scale-info",
+ "serde",
+]
+
+[[package]]
+name = "pezbp-pezkuwi-bulletin"
+version = "0.4.0"
+dependencies = [
+ "parity-scale-codec",
+ "pezbp-header-pez-chain",
+ "pezbp-messages",
+ "pezbp-pezkuwi-core",
+ "pezbp-runtime",
+ "pezframe-support",
+ "pezframe-system",
+ "pezsp-api",
+ "pezsp-runtime",
+ "pezsp-std",
+ "scale-info",
+]
+
+[[package]]
+name = "pezbp-pezkuwi-core"
+version = "0.7.0"
+dependencies = [
+ "hex",
+ "parity-scale-codec",
+ "pezbp-messages",
+ "pezbp-runtime",
+ "pezframe-support",
+ "pezframe-system",
+ "pezsp-core",
+ "pezsp-runtime",
+ "pezsp-std",
+ "scale-info",
+ "serde",
+]
+
+[[package]]
+name = "pezbp-pezkuwichain"
+version = "0.6.0"
+dependencies = [
+ "pezbp-header-pez-chain",
+ "pezbp-pezkuwi-core",
+ "pezbp-runtime",
+ "pezframe-support",
+ "pezsp-api",
+ "pezsp-std",
+]
+
+[[package]]
+name = "pezbp-relayers"
+version = "0.7.0"
+dependencies = [
+ "hex-literal",
+ "parity-scale-codec",
+ "pezbp-header-pez-chain",
+ "pezbp-messages",
+ "pezbp-runtime",
+ "pezbp-teyrchains",
+ "pezframe-support",
+ "pezframe-system",
+ "pezpallet-utility",
+ "pezsp-runtime",
+ "pezsp-std",
+ "scale-info",
+]
+
 [[package]]
 name = "pezbp-runtime"
 version = "0.7.0"
@@ -10528,13 +10414,105 @@ dependencies = [
  "trie-db",
 ]
 
+[[package]]
+name = "pezbp-test-utils"
+version = "0.7.0"
+dependencies = [
+ "ed25519-dalek",
+ "finality-grandpa",
+ "parity-scale-codec",
+ "pezbp-header-pez-chain",
+ "pezbp-pezkuwi-core",
+ "pezbp-runtime",
+ "pezbp-teyrchains",
+ "pezsp-application-crypto",
+ "pezsp-consensus-grandpa",
+ "pezsp-core",
+ "pezsp-runtime",
+ "pezsp-std",
+ "pezsp-trie",
+]
+
+[[package]]
+name = "pezbp-teyrchains"
+version = "0.7.0"
+dependencies = [
+ "impl-trait-for-tuples",
+ "parity-scale-codec",
+ "pezbp-header-pez-chain",
+ "pezbp-pezkuwi-core",
+ "pezbp-runtime",
+ "pezframe-support",
+ "pezsp-core",
+ "pezsp-runtime",
+ "pezsp-std",
+ "scale-info",
+]
+
+[[package]]
+name = "pezbp-xcm-bridge-hub"
+version = "0.2.0"
+dependencies = [
+ "parity-scale-codec",
+ "pezbp-messages",
+ "pezbp-runtime",
+ "pezframe-support",
+ "pezsp-core",
+ "pezsp-io",
+ "pezsp-std",
+ "pezstaging-xcm",
+ "scale-info",
+ "serde",
+]
+
+[[package]]
+name = "pezbp-xcm-bridge-hub-router"
+version = "0.7.0"
+dependencies = [
+ "parity-scale-codec",
+ "pezsp-core",
+ "pezsp-runtime",
+ "pezstaging-xcm",
+ "scale-info",
+]
+
+[[package]]
+name = "pezbp-zagros"
+version = "0.3.0"
+dependencies = [
+ "pezbp-header-pez-chain",
+ "pezbp-pezkuwi-core",
+ "pezbp-runtime",
+ "pezframe-support",
+ "pezsp-api",
+ "pezsp-std",
+]
+
+[[package]]
+name = "pezbridge-hub-common"
+version = "0.1.1"
+dependencies = [
+ "parity-scale-codec",
+ "pezcumulus-primitives-core",
+ "pezframe-support",
+ "pezpallet-message-queue",
+ "pezsnowbridge-core",
+ "pezsp-core",
+ "pezsp-runtime",
+ "pezsp-std",
+ "pezstaging-xcm",
+ "pezstaging-xcm-builder",
+ "pezstaging-xcm-executor",
+ "scale-info",
+]
+
 [[package]]
 name = "pezbridge-hub-pezkuwichain-emulated-chain"
 version = "0.0.0"
 dependencies = [
- "bp-messages",
- "bridge-hub-common",
  "emulated-integration-tests-common",
+ "pezbp-messages",
+ "pezbridge-hub-common",
  "pezbridge-hub-pezkuwichain-runtime",
  "pezframe-support",
  "pezsp-core",
@@ -10549,10 +10527,10 @@ name = "pezbridge-hub-pezkuwichain-integration-tests"
 version = "1.0.0"
 dependencies = [
  "asset-hub-pezkuwichain-runtime",
- "bp-asset-hub-pezkuwichain",
  "emulated-integration-tests-common",
  "hex-literal",
  "parity-scale-codec",
+ "pezbp-asset-hub-pezkuwichain",
  "pezcumulus-pezpallet-xcmp-queue",
  "pezframe-support",
  "pezkuwichain-system-emulated-network",
@@ -10583,22 +10561,22 @@ name = "pezbridge-hub-pezkuwichain-runtime"
 version = "0.5.0"
 dependencies = [
  "bizinikiwi-wasm-builder",
- "bp-asset-hub-pezkuwichain",
- "bp-asset-hub-zagros",
- "bp-bridge-hub-pezkuwichain",
- "bp-bridge-hub-zagros",
- "bp-header-pez-chain",
- "bp-messages",
- "bp-pezkuwi-bulletin",
- "bp-pezkuwi-core",
- "bp-relayers",
- "bp-teyrchains",
- "bp-xcm-bridge-hub-router",
- "bp-zagros",
- "bridge-hub-common",
  "hex-literal",
  "parity-scale-codec",
+ "pezbp-asset-hub-pezkuwichain",
+ "pezbp-asset-hub-zagros",
+ "pezbp-bridge-hub-pezkuwichain",
+ "pezbp-bridge-hub-zagros",
+ "pezbp-header-pez-chain",
+ "pezbp-messages",
+ "pezbp-pezkuwi-bulletin",
+ "pezbp-pezkuwi-core",
+ "pezbp-relayers",
  "pezbp-runtime",
+ "pezbp-teyrchains",
+ "pezbp-xcm-bridge-hub-router",
+ "pezbp-zagros",
+ "pezbridge-hub-common",
  "pezbridge-hub-test-utils",
  "pezbridge-runtime-common",
  "pezcumulus-pezpallet-aura-ext",
@@ -10686,15 +10664,15 @@ name = "pezbridge-hub-test-utils"
 version = "0.7.0"
 dependencies = [
  "asset-test-pezutils",
- "bp-header-pez-chain",
- "bp-messages",
- "bp-pezkuwi-core",
- "bp-relayers",
- "bp-test-utils",
- "bp-teyrchains",
  "impl-trait-for-tuples",
  "parity-scale-codec",
+ "pezbp-header-pez-chain",
+ "pezbp-messages",
+ "pezbp-pezkuwi-core",
+ "pezbp-relayers",
  "pezbp-runtime",
+ "pezbp-test-utils",
+ "pezbp-teyrchains",
  "pezcumulus-pezpallet-teyrchain-system",
  "pezcumulus-pezpallet-xcmp-queue",
  "pezframe-support",
@@ -10726,9 +10704,9 @@ dependencies = [
 name = "pezbridge-hub-zagros-emulated-chain"
 version = "0.0.0"
 dependencies = [
- "bp-messages",
- "bridge-hub-common",
  "emulated-integration-tests-common",
+ "pezbp-messages",
+ "pezbridge-hub-common",
  "pezbridge-hub-zagros-runtime",
  "pezframe-support",
  "pezsp-core",
@@ -10743,11 +10721,11 @@ name = "pezbridge-hub-zagros-integration-tests"
 version = "1.0.0"
 dependencies = [
  "asset-hub-zagros-runtime",
- "bp-asset-hub-zagros",
- "bridge-hub-common",
  "emulated-integration-tests-common",
  "hex-literal",
  "parity-scale-codec",
+ "pezbp-asset-hub-zagros",
+ "pezbridge-hub-common",
  "pezbridge-hub-zagros-runtime",
  "pezcumulus-pezpallet-teyrchain-system",
  "pezcumulus-pezpallet-xcmp-queue",
@@ -10786,21 +10764,21 @@ name = "pezbridge-hub-zagros-runtime"
 version = "0.3.0"
 dependencies = [
  "bizinikiwi-wasm-builder",
- "bp-asset-hub-pezkuwichain",
- "bp-asset-hub-zagros",
- "bp-bridge-hub-pezkuwichain",
- "bp-bridge-hub-zagros",
- "bp-header-pez-chain",
- "bp-messages",
- "bp-pezkuwi-core",
- "bp-pezkuwichain",
- "bp-relayers",
- "bp-teyrchains",
- "bp-xcm-bridge-hub-router",
- "bridge-hub-common",
  "hex-literal",
  "parity-scale-codec",
+ "pezbp-asset-hub-pezkuwichain",
+ "pezbp-asset-hub-zagros",
+ "pezbp-bridge-hub-pezkuwichain",
+ "pezbp-bridge-hub-zagros",
+ "pezbp-header-pez-chain",
+ "pezbp-messages",
+ "pezbp-pezkuwi-core",
+ "pezbp-pezkuwichain",
+ "pezbp-relayers",
  "pezbp-runtime",
+ "pezbp-teyrchains",
+ "pezbp-xcm-bridge-hub-router",
+ "pezbridge-hub-common",
  "pezbridge-hub-test-utils",
  "pezbridge-runtime-common",
  "pezcumulus-pezpallet-aura-ext",
@@ -10893,14 +10871,14 @@ dependencies = [
 name = "pezbridge-runtime-common"
 version = "0.7.0"
 dependencies = [
- "bp-header-pez-chain",
- "bp-messages",
- "bp-pezkuwi-core",
- "bp-relayers",
- "bp-test-utils",
- "bp-teyrchains",
  "parity-scale-codec",
+ "pezbp-header-pez-chain",
+ "pezbp-messages",
+ "pezbp-pezkuwi-core",
+ "pezbp-relayers",
  "pezbp-runtime",
+ "pezbp-test-utils",
+ "pezbp-teyrchains",
  "pezframe-support",
  "pezframe-system",
  "pezpallet-balances",
@@ -10973,11 +10951,7 @@ dependencies = [
  "pezcumulus-client-consensus-common",
  "pezcumulus-client-network",
  "pezcumulus-primitives-core",
- "pezcumulus-test-client",
- "pezcumulus-test-relay-sproof-builder",
- "pezcumulus-test-runtime",
  "pezkuwi-node-subsystem",
- "pezkuwi-node-subsystem-test-helpers",
  "pezkuwi-overseer",
  "pezkuwi-pez-node-primitives",
  "pezkuwi-primitives",
@@ -11008,8 +10982,6 @@ dependencies = [
  "pezcumulus-primitives-aura",
  "pezcumulus-primitives-core",
  "pezcumulus-relay-chain-interface",
- "pezcumulus-test-client",
- "pezcumulus-test-relay-sproof-builder",
  "pezkuwi-node-subsystem",
  "pezkuwi-node-subsystem-util",
  "pezkuwi-overseer",
@@ -11132,14 +11104,10 @@ dependencies = [
  "parity-scale-codec",
  "parking_lot 0.12.5",
  "pezcumulus-primitives-core",
- "pezcumulus-relay-chain-inprocess-interface",
  "pezcumulus-relay-chain-interface",
- "pezcumulus-test-service",
  "pezkuwi-node-subsystem",
  "pezkuwi-pez-node-primitives",
  "pezkuwi-primitives",
- "pezkuwi-primitives-test-helpers",
- "pezkuwi-test-client",
  "pezkuwi-teyrchain-primitives",
  "pezsc-client-api",
  "pezsc-network",
@@ -11235,7 +11203,7 @@ dependencies = [
 
 [[package]]
 name = "pezcumulus-client-teyrchain-inherent"
-version = "0.1.0"
+version = "0.1.1"
 dependencies = [
  "async-trait",
  "parity-scale-codec",
@@ -11424,8 +11392,8 @@ version = "0.7.1"
 dependencies = [
  "approx",
  "bounded-collections 0.3.2",
- "bp-xcm-bridge-hub-router",
  "parity-scale-codec",
+ "pezbp-xcm-bridge-hub-router",
  "pezcumulus-pezpallet-teyrchain-system",
  "pezcumulus-primitives-core",
  "pezframe-benchmarking",
@@ -11584,7 +11552,6 @@ dependencies = [
  "pezkuwi-cli",
  "pezkuwi-primitives",
  "pezkuwi-service",
- "pezkuwi-test-client",
  "pezsc-cli",
  "pezsc-client-api",
  "pezsc-network",
@@ -11877,9 +11844,9 @@ dependencies = [
  "parity-scale-codec",
  "pezcumulus-primitives-core",
  "pezkuwi-primitives",
+ "pezkuwi-zombienet-configuration",
+ "pezkuwi-zombienet-sdk",
  "tokio",
- "zombienet-configuration",
- "zombienet-sdk",
 ]
 
 [[package]]
@@ -11893,6 +11860,9 @@ dependencies = [
  "parity-scale-codec",
  "pezcumulus-zombienet-sdk-helpers",
  "pezkuwi-primitives",
+ "pezkuwi-zombienet-configuration",
+ "pezkuwi-zombienet-orchestrator",
+ "pezkuwi-zombienet-sdk",
  "pezsc-statement-store",
  "pezsp-core",
  "pezsp-keyring",
@@ -11901,9 +11871,40 @@ dependencies = [
  "serde",
  "serde_json",
  "tokio",
- "zombienet-configuration",
- "zombienet-orchestrator",
- "zombienet-sdk",
+]
+
+[[package]]
+name = "pezframe"
+version = "0.1.0"
+dependencies = [
+ "docify",
+ "log",
+ "parity-scale-codec",
+ "pezframe-benchmarking",
+ "pezframe-executive",
+ "pezframe-support",
+ "pezframe-system",
+ "pezframe-system-benchmarking",
+ "pezframe-system-rpc-runtime-api",
+ "pezframe-try-runtime",
+ "pezsp-api",
+ "pezsp-arithmetic",
+ "pezsp-block-builder",
+ "pezsp-consensus-aura",
+ "pezsp-consensus-grandpa",
+ "pezsp-core",
+ "pezsp-genesis-builder",
+ "pezsp-inherents",
+ "pezsp-io",
+ "pezsp-keyring",
+ "pezsp-offchain",
+ "pezsp-runtime",
+ "pezsp-session",
+ "pezsp-storage",
+ "pezsp-transaction-pool",
+ "pezsp-version",
+ "scale-info",
+ "serde",
 ]
 
 [[package]]
@@ -11941,7 +11942,6 @@ version = "32.0.0"
 dependencies = [
  "Inflector",
  "array-bytes 6.2.3",
- "bizinikiwi-test-runtime",
  "chrono",
  "clap",
  "comfy-table",
@@ -11955,7 +11955,6 @@ dependencies = [
  "parity-scale-codec",
  "pezcumulus-client-teyrchain-inherent",
  "pezcumulus-primitives-proof-size-hostfunction",
- "pezcumulus-test-runtime",
  "pezframe-benchmarking",
  "pezframe-support",
  "pezframe-system",
@@ -11999,7 +11998,6 @@ dependencies = [
  "serde_json",
  "thiserror 1.0.69",
  "thousands",
- "zagros-runtime",
 ]
 
 [[package]]
@@ -12122,6 +12120,28 @@ dependencies = [
  "tracing-subscriber 0.3.22",
 ]
 
+[[package]]
+name = "pezframe-remote-externalities"
+version = "0.35.0"
+dependencies = [
+ "bizinikiwi-rpc-client",
+ "futures",
+ "indicatif",
+ "jsonrpsee",
+ "log",
+ "parity-scale-codec",
+ "pezsp-core",
+ "pezsp-crypto-hashing",
+ "pezsp-io",
+ "pezsp-runtime",
+ "pezsp-state-machine",
+ "pezsp-tracing",
+ "serde",
+ "spinners",
+ "tokio",
+ "tokio-retry",
+]
+
 [[package]]
 name = "pezframe-support"
 version = "28.0.0"
@@ -12273,7 +12293,9 @@ name = "pezframe-support-test-stg-pezframe-crate"
 version = "0.1.0"
 dependencies = [
  "parity-scale-codec",
- "pezkuwi-sdk-frame",
+ "pezframe",
+ "pezframe-support",
+ "pezframe-system",
  "scale-info",
 ]
 
@@ -12367,11 +12389,9 @@ dependencies = [
  "pezkuwi-node-metrics",
  "pezkuwi-node-network-protocol",
  "pezkuwi-node-subsystem",
- "pezkuwi-node-subsystem-test-helpers",
  "pezkuwi-node-subsystem-util",
  "pezkuwi-pez-node-primitives",
  "pezkuwi-primitives",
- "pezkuwi-primitives-test-helpers",
  "pezsc-keystore",
  "pezsp-application-crypto",
  "pezsp-authority-discovery",
@@ -12395,7 +12415,6 @@ dependencies = [
  "pez-tracing-gum",
  "pezkuwi-node-network-protocol",
  "pezkuwi-node-subsystem",
- "pezkuwi-node-subsystem-test-helpers",
  "pezkuwi-node-subsystem-util",
  "pezkuwi-primitives",
  "pezsp-application-crypto",
@@ -12421,12 +12440,9 @@ dependencies = [
  "pezkuwi-erasure-coding",
  "pezkuwi-node-network-protocol",
  "pezkuwi-node-subsystem",
- "pezkuwi-node-subsystem-test-helpers",
  "pezkuwi-node-subsystem-util",
  "pezkuwi-pez-node-primitives",
  "pezkuwi-primitives",
- "pezkuwi-primitives-test-helpers",
- "pezkuwi-subsystem-bench",
  "pezsc-network",
  "pezsp-core",
  "pezsp-keyring",
@@ -12452,12 +12468,9 @@ dependencies = [
  "pezkuwi-erasure-coding",
  "pezkuwi-node-network-protocol",
  "pezkuwi-node-subsystem",
- "pezkuwi-node-subsystem-test-helpers",
  "pezkuwi-node-subsystem-util",
  "pezkuwi-pez-node-primitives",
  "pezkuwi-primitives",
- "pezkuwi-primitives-test-helpers",
- "pezkuwi-subsystem-bench",
  "pezsc-network",
  "pezsp-core",
  "pezsp-keyring",
@@ -12520,11 +12533,9 @@ dependencies = [
  "pez-tracing-gum",
  "pezkuwi-node-network-protocol",
  "pezkuwi-node-subsystem",
- "pezkuwi-node-subsystem-test-helpers",
  "pezkuwi-node-subsystem-util",
  "pezkuwi-pez-node-primitives",
  "pezkuwi-primitives",
- "pezkuwi-primitives-test-helpers",
  "pezsc-keystore",
  "pezsc-network",
  "pezsp-core",
@@ -12564,11 +12575,9 @@ dependencies = [
  "pez-tracing-gum",
  "pezkuwi-node-network-protocol",
  "pezkuwi-node-subsystem",
- "pezkuwi-node-subsystem-test-helpers",
  "pezkuwi-node-subsystem-util",
  "pezkuwi-pez-node-primitives",
  "pezkuwi-primitives",
- "pezkuwi-primitives-test-helpers",
  "pezsc-keystore",
  "pezsc-network",
  "pezsp-application-crypto",
@@ -12605,7 +12614,6 @@ dependencies = [
  "pez-tracing-gum",
  "pezkuwi-node-network-protocol",
  "pezkuwi-node-subsystem",
- "pezkuwi-node-subsystem-test-helpers",
  "pezkuwi-node-subsystem-util",
  "pezkuwi-primitives",
  "pezsc-network",
@@ -12639,11 +12647,9 @@ dependencies = [
  "pezkuwi-node-metrics",
  "pezkuwi-node-network-protocol",
  "pezkuwi-node-subsystem",
- "pezkuwi-node-subsystem-test-helpers",
  "pezkuwi-node-subsystem-util",
  "pezkuwi-overseer",
  "pezkuwi-primitives",
- "pezkuwi-primitives-test-helpers",
  "pezsc-network",
  "pezsp-consensus",
  "pezsp-core",
@@ -12661,11 +12667,9 @@ dependencies = [
  "pez-tracing-gum",
  "pezkuwi-erasure-coding",
  "pezkuwi-node-subsystem",
- "pezkuwi-node-subsystem-test-helpers",
  "pezkuwi-node-subsystem-util",
  "pezkuwi-pez-node-primitives",
  "pezkuwi-primitives",
- "pezkuwi-primitives-test-helpers",
  "pezsp-core",
  "pezsp-keyring",
  "rstest",
@@ -12690,13 +12694,10 @@ dependencies = [
  "parking_lot 0.12.5",
  "pez-tracing-gum",
  "pezkuwi-node-subsystem",
- "pezkuwi-node-subsystem-test-helpers",
  "pezkuwi-node-subsystem-util",
  "pezkuwi-overseer",
  "pezkuwi-pez-node-primitives",
  "pezkuwi-primitives",
- "pezkuwi-primitives-test-helpers",
- "pezkuwi-subsystem-bench",
  "pezsc-keystore",
  "pezsp-application-crypto",
  "pezsp-consensus",
@@ -12730,7 +12731,6 @@ dependencies = [
  "pezkuwi-node-metrics",
  "pezkuwi-node-network-protocol",
  "pezkuwi-node-subsystem",
- "pezkuwi-node-subsystem-test-helpers",
  "pezkuwi-node-subsystem-util",
  "pezkuwi-overseer",
  "pezkuwi-pez-node-primitives",
@@ -12760,11 +12760,9 @@ dependencies = [
  "pez-tracing-gum",
  "pezkuwi-erasure-coding",
  "pezkuwi-node-subsystem",
- "pezkuwi-node-subsystem-test-helpers",
  "pezkuwi-node-subsystem-util",
  "pezkuwi-pez-node-primitives",
  "pezkuwi-primitives",
- "pezkuwi-primitives-test-helpers",
  "pezsp-consensus",
  "pezsp-core",
  "pezsp-keyring",
@@ -12783,11 +12781,9 @@ dependencies = [
  "pez-tracing-gum",
  "pezkuwi-erasure-coding",
  "pezkuwi-node-subsystem",
- "pezkuwi-node-subsystem-test-helpers",
  "pezkuwi-node-subsystem-util",
  "pezkuwi-pez-node-primitives",
  "pezkuwi-primitives",
- "pezkuwi-primitives-test-helpers",
  "pezkuwi-statement-table",
  "pezkuwi-teyrchain-primitives",
  "pezsc-keystore",
@@ -12807,10 +12803,8 @@ dependencies = [
  "futures",
  "pez-tracing-gum",
  "pezkuwi-node-subsystem",
- "pezkuwi-node-subsystem-test-helpers",
  "pezkuwi-node-subsystem-util",
  "pezkuwi-primitives",
- "pezkuwi-primitives-test-helpers",
  "pezsp-keystore",
  "thiserror 1.0.69",
  "wasm-timer",
@@ -12829,12 +12823,10 @@ dependencies = [
  "pezkuwi-node-core-pvf",
  "pezkuwi-node-metrics",
  "pezkuwi-node-subsystem",
- "pezkuwi-node-subsystem-test-helpers",
  "pezkuwi-node-subsystem-util",
  "pezkuwi-overseer",
  "pezkuwi-pez-node-primitives",
  "pezkuwi-primitives",
- "pezkuwi-primitives-test-helpers",
  "pezkuwi-teyrchain-primitives",
  "pezsp-application-crypto",
  "pezsp-core",
@@ -12854,7 +12846,6 @@ dependencies = [
  "pez-tracing-gum",
  "pezkuwi-node-metrics",
  "pezkuwi-node-subsystem",
- "pezkuwi-node-subsystem-test-helpers",
  "pezkuwi-node-subsystem-types",
  "pezkuwi-pez-node-primitives",
  "pezkuwi-primitives",
@@ -12876,7 +12867,6 @@ dependencies = [
  "parking_lot 0.12.5",
  "pez-tracing-gum",
  "pezkuwi-node-subsystem",
- "pezkuwi-node-subsystem-test-helpers",
  "pezkuwi-node-subsystem-util",
  "pezkuwi-pez-node-primitives",
  "pezkuwi-primitives",
@@ -12896,12 +12886,9 @@ dependencies = [
  "parity-scale-codec",
  "pez-tracing-gum",
  "pezkuwi-node-subsystem",
- "pezkuwi-node-subsystem-test-helpers",
  "pezkuwi-node-subsystem-util",
  "pezkuwi-pez-node-primitives",
  "pezkuwi-primitives",
- "pezkuwi-primitives-test-helpers",
- "pezkuwi-subsystem-bench",
  "pezsc-keystore",
  "pezsp-application-crypto",
  "pezsp-core",
@@ -12921,10 +12908,8 @@ dependencies = [
  "futures",
  "pez-tracing-gum",
  "pezkuwi-node-subsystem",
- "pezkuwi-node-subsystem-test-helpers",
  "pezkuwi-node-subsystem-util",
  "pezkuwi-primitives",
- "pezkuwi-primitives-test-helpers",
  "pezsp-core",
  "pezsp-tracing",
  "rand 0.8.5",
@@ -12942,11 +12927,9 @@ dependencies = [
  "futures-timer",
  "pez-tracing-gum",
  "pezkuwi-node-subsystem",
- "pezkuwi-node-subsystem-test-helpers",
  "pezkuwi-node-subsystem-util",
  "pezkuwi-pez-node-primitives",
  "pezkuwi-primitives",
- "pezkuwi-primitives-test-helpers",
  "pezsc-consensus-slots",
  "pezsp-application-crypto",
  "pezsp-keystore",
@@ -12968,17 +12951,14 @@ dependencies = [
  "libc",
  "parity-scale-codec",
  "pez-tracing-gum",
- "pezkuwi-node-core-pvf",
  "pezkuwi-node-core-pvf-common",
  "pezkuwi-node-core-pvf-execute-worker",
  "pezkuwi-node-core-pvf-prepare-worker",
  "pezkuwi-node-metrics",
  "pezkuwi-node-subsystem",
- "pezkuwi-node-subsystem-test-helpers",
  "pezkuwi-pez-node-primitives",
  "pezkuwi-primitives",
  "pezkuwi-teyrchain-primitives",
- "pezkuwichain-runtime",
  "pezsc-sysinfo",
  "pezsc-tracing",
  "pezsp-core",
@@ -12990,8 +12970,6 @@ dependencies = [
  "slotmap",
  "strum 0.26.3",
  "tempfile",
- "test-teyrchain-adder",
- "test-teyrchain-halt",
  "thiserror 1.0.69",
  "tokio",
 ]
@@ -13004,10 +12982,8 @@ dependencies = [
  "futures-timer",
  "pez-tracing-gum",
  "pezkuwi-node-subsystem",
- "pezkuwi-node-subsystem-test-helpers",
  "pezkuwi-node-subsystem-util",
  "pezkuwi-primitives",
- "pezkuwi-primitives-test-helpers",
  "pezsc-keystore",
  "pezsp-application-crypto",
  "pezsp-core",
@@ -13074,7 +13050,6 @@ dependencies = [
  "pez-tracing-gum",
  "pezkuwi-node-core-pvf-common",
  "pezkuwi-primitives",
- "pezkuwichain-runtime",
  "pezsp-maybe-compressed-blob",
  "pezstaging-tracking-allocator",
  "tikv-jemalloc-ctl",
@@ -13090,11 +13065,9 @@ dependencies = [
  "pez-tracing-gum",
  "pezkuwi-node-metrics",
  "pezkuwi-node-subsystem",
- "pezkuwi-node-subsystem-test-helpers",
  "pezkuwi-node-subsystem-types",
  "pezkuwi-pez-node-primitives",
  "pezkuwi-primitives",
- "pezkuwi-primitives-test-helpers",
  "pezsp-api",
  "pezsp-consensus-babe",
  "pezsp-core",
@@ -13240,12 +13213,10 @@ dependencies = [
  "pezkuwi-node-metrics",
  "pezkuwi-node-network-protocol",
  "pezkuwi-node-subsystem",
- "pezkuwi-node-subsystem-test-helpers",
  "pezkuwi-node-subsystem-types",
  "pezkuwi-overseer",
  "pezkuwi-pez-node-primitives",
  "pezkuwi-primitives",
- "pezkuwi-primitives-test-helpers",
  "pezsp-application-crypto",
  "pezsp-core",
  "pezsp-keystore",
@@ -13606,10 +13577,9 @@ dependencies = [
 
 [[package]]
 name = "pezkuwi-sdk"
-version = "0.1.0"
+version = "0.1.1"
 dependencies = [
  "asset-test-pezutils",
- "assets-common",
  "bizinikiwi-bip39",
  "bizinikiwi-build-script-utils",
  "bizinikiwi-frame-rpc-support",
@@ -13619,16 +13589,7 @@ dependencies = [
  "bizinikiwi-state-trie-migration-rpc",
  "bizinikiwi-txtesttool",
  "bizinikiwi-wasm-builder",
- "bp-header-pez-chain",
- "bp-messages",
- "bp-pezkuwi-core",
- "bp-relayers",
- "bp-test-utils",
- "bp-teyrchains",
- "bp-xcm-bridge-hub",
- "bp-xcm-bridge-hub-router",
- "bridge-hub-common",
- "frame-remote-externalities",
+ "pez-assets-common",
  "pez-binary-merkle-tree",
  "pez-ethereum-standards",
  "pez-fork-tree",
@@ -13637,7 +13598,16 @@ dependencies = [
  "pez-subkey",
  "pez-tracing-gum",
  "pez-tracing-gum-proc-macro",
+ "pezbp-header-pez-chain",
+ "pezbp-messages",
+ "pezbp-pezkuwi-core",
+ "pezbp-relayers",
  "pezbp-runtime",
+ "pezbp-test-utils",
+ "pezbp-teyrchains",
+ "pezbp-xcm-bridge-hub",
+ "pezbp-xcm-bridge-hub-router",
+ "pezbridge-hub-common",
  "pezbridge-hub-test-utils",
  "pezbridge-runtime-common",
  "pezcumulus-client-bootnodes",
@@ -13673,6 +13643,7 @@ dependencies = [
  "pezcumulus-relay-chain-minimal-node",
  "pezcumulus-relay-chain-rpc-interface",
  "pezcumulus-relay-chain-streams",
+ "pezframe",
  "pezframe-benchmarking",
  "pezframe-benchmarking-cli",
  "pezframe-benchmarking-pezpallet-pov",
@@ -13681,6 +13652,7 @@ dependencies = [
  "pezframe-executive",
  "pezframe-metadata",
  "pezframe-metadata-hash-extension",
+ "pezframe-remote-externalities",
  "pezframe-support",
  "pezframe-support-procedural",
  "pezframe-support-procedural-tools",
@@ -13732,7 +13704,6 @@ dependencies = [
  "pezkuwi-runtime-common",
  "pezkuwi-runtime-metrics",
  "pezkuwi-runtime-teyrchains",
- "pezkuwi-sdk-frame",
  "pezkuwi-service",
  "pezkuwi-statement-distribution",
  "pezkuwi-statement-table",
@@ -13747,6 +13718,12 @@ dependencies = [
  "pezkuwi-subxt-utils-fetchmetadata",
  "pezkuwi-subxt-utils-stripmetadata",
  "pezkuwi-teyrchain-primitives",
+ "pezkuwi-zombienet-configuration",
+ "pezkuwi-zombienet-orchestrator",
+ "pezkuwi-zombienet-prom-metrics-parser",
+ "pezkuwi-zombienet-provider",
+ "pezkuwi-zombienet-sdk",
+ "pezkuwi-zombienet-support",
  "pezmmr-gadget",
  "pezmmr-rpc",
  "pezpallet-alliance",
@@ -13780,7 +13757,6 @@ dependencies = [
  "pezpallet-collective",
  "pezpallet-collective-content",
  "pezpallet-contracts",
- "pezpallet-contracts-mock-network",
  "pezpallet-contracts-proc-macro",
  "pezpallet-contracts-uapi",
  "pezpallet-conviction-voting",
@@ -13968,7 +13944,7 @@ dependencies = [
  "pezsp-runtime-interface",
  "pezsp-runtime-interface-proc-macro",
  "pezsp-session",
- "pezsp-ss58-registry 1.52.0",
+ "pezsp-ss58-registry 1.52.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "pezsp-staking",
  "pezsp-state-machine",
  "pezsp-statement-store",
@@ -13997,12 +13973,6 @@ dependencies = [
  "xcm-pez-procedural",
  "xcm-pez-simulator",
  "xcm-runtime-pezapis",
- "zombienet-configuration",
- "zombienet-orchestrator",
- "zombienet-prom-metrics-parser",
- "zombienet-provider",
- "zombienet-sdk",
- "zombienet-support",
 ]
 
 [[package]]
@@ -14025,6 +13995,7 @@ dependencies = [
  "pezcumulus-pezpallet-teyrchain-system",
  "pezcumulus-pezpallet-weight-reclaim",
  "pezcumulus-primitives-proof-size-hostfunction",
+ "pezframe",
  "pezframe-benchmarking",
  "pezframe-executive",
  "pezframe-metadata-hash-extension",
@@ -14033,7 +14004,6 @@ dependencies = [
  "pezkuwi-omni-node-lib",
  "pezkuwi-sdk",
  "pezkuwi-sdk-docs-first-runtime",
- "pezkuwi-sdk-frame",
  "pezpallet-asset-conversion-tx-payment",
  "pezpallet-asset-tx-payment",
  "pezpallet-assets",
@@ -14106,7 +14076,9 @@ version = "0.0.0"
 dependencies = [
  "docify",
  "parity-scale-codec",
- "pezkuwi-sdk-frame",
+ "pezframe",
+ "pezframe-support",
+ "pezframe-system",
  "scale-info",
 ]
 
@@ -14117,50 +14089,27 @@ dependencies = [
  "bizinikiwi-wasm-builder",
  "docify",
  "parity-scale-codec",
+ "pezframe",
+ "pezframe-support",
+ "pezframe-system",
+ "pezframe-system-rpc-runtime-api",
  "pezkuwi-sdk-docs-first-pezpallet",
- "pezkuwi-sdk-frame",
  "pezpallet-balances",
  "pezpallet-sudo",
  "pezpallet-timestamp",
  "pezpallet-transaction-payment",
  "pezpallet-transaction-payment-rpc-runtime-api",
- "pezsp-keyring",
- "scale-info",
- "serde_json",
-]
-
-[[package]]
-name = "pezkuwi-sdk-frame"
-version = "0.1.0"
-dependencies = [
- "docify",
- "log",
- "parity-scale-codec",
- "pezframe-benchmarking",
- "pezframe-executive",
- "pezframe-support",
- "pezframe-system",
- "pezframe-system-benchmarking",
- "pezframe-system-rpc-runtime-api",
- "pezframe-try-runtime",
  "pezsp-api",
- "pezsp-arithmetic",
  "pezsp-block-builder",
- "pezsp-consensus-aura",
- "pezsp-consensus-grandpa",
  "pezsp-core",
  "pezsp-genesis-builder",
- "pezsp-inherents",
- "pezsp-io",
  "pezsp-keyring",
  "pezsp-offchain",
  "pezsp-runtime",
  "pezsp-session",
- "pezsp-storage",
  "pezsp-transaction-pool",
- "pezsp-version",
  "scale-info",
- "serde",
+ "serde_json",
 ]
 
 [[package]]
@@ -14211,17 +14160,14 @@ dependencies = [
  "pezkuwi-node-core-teyrchains-inherent",
  "pezkuwi-node-network-protocol",
  "pezkuwi-node-subsystem",
- "pezkuwi-node-subsystem-test-helpers",
  "pezkuwi-node-subsystem-types",
  "pezkuwi-node-subsystem-util",
  "pezkuwi-overseer",
  "pezkuwi-pez-node-primitives",
  "pezkuwi-primitives",
- "pezkuwi-primitives-test-helpers",
  "pezkuwi-rpc",
  "pezkuwi-runtime-teyrchains",
  "pezkuwi-statement-distribution",
- "pezkuwi-test-client",
  "pezkuwichain-runtime",
  "pezkuwichain-runtime-constants",
  "pezmmr-gadget",
@@ -14293,12 +14239,9 @@ dependencies = [
  "pez-tracing-gum",
  "pezkuwi-node-network-protocol",
  "pezkuwi-node-subsystem",
- "pezkuwi-node-subsystem-test-helpers",
  "pezkuwi-node-subsystem-util",
  "pezkuwi-pez-node-primitives",
  "pezkuwi-primitives",
- "pezkuwi-primitives-test-helpers",
- "pezkuwi-subsystem-bench",
  "pezsc-keystore",
  "pezsc-network",
  "pezsp-application-crypto",
@@ -14845,6 +14788,120 @@ dependencies = [
  "zagros-runtime",
 ]
 
+[[package]]
+name = "pezkuwi-zombienet-configuration"
+version = "0.44.0"
+dependencies = [
+ "anyhow",
+ "lazy_static",
+ "multiaddr 0.18.2",
+ "pezkuwi-zombienet-support",
+ "regex",
+ "reqwest",
+ "serde",
+ "serde_json",
+ "thiserror 1.0.69",
+ "tokio",
+ "toml 0.8.23",
+ "tracing",
+ "url",
+]
+
+[[package]]
+name = "pezkuwi-zombienet-orchestrator"
+version = "0.44.0"
+dependencies = [
+ "anyhow",
+ "async-trait",
+ "erased-serde",
+ "fancy-regex",
+ "futures",
+ "glob-match",
+ "hex",
+ "lazy_static",
+ "libp2p",
+ "libsecp256k1",
+ "multiaddr 0.18.2",
+ "pezkuwi-subxt",
+ "pezkuwi-subxt-signer",
+ "pezkuwi-zombienet-configuration",
+ "pezkuwi-zombienet-prom-metrics-parser",
+ "pezkuwi-zombienet-provider",
+ "pezkuwi-zombienet-support",
+ "pezsc-chain-spec",
+ "pezsp-core",
+ "rand 0.8.5",
+ "regex",
+ "reqwest",
+ "serde",
+ "serde_json",
+ "sha2 0.10.9",
+ "thiserror 1.0.69",
+ "tokio",
+ "toml 0.8.23",
+ "tracing",
+ "uuid",
+]
+
+[[package]]
+name = "pezkuwi-zombienet-prom-metrics-parser"
+version = "0.44.0"
+dependencies = [
+ "pest",
+ "pest_derive",
+ "thiserror 1.0.69",
+]
+
+[[package]]
+name = "pezkuwi-zombienet-provider"
+version = "0.44.0"
+dependencies = [
+ "anyhow",
+ "async-trait",
+ "erased-serde",
+ "flate2",
+ "futures",
+ "hex",
+ "k8s-openapi",
+ "kube",
+ "nix 0.29.0",
+ "pezkuwi-zombienet-configuration",
+ "pezkuwi-zombienet-support",
+ "regex",
+ "reqwest",
+ "serde",
+ "serde_json",
+ "serde_yaml",
+ "sha2 0.10.9",
+ "tar",
+ "thiserror 1.0.69",
+ "tokio",
+ "tokio-util",
+ "tracing",
+ "url",
+ "uuid",
+]
+
+[[package]]
+name = "pezkuwi-zombienet-sdk"
+version = "0.44.0"
+dependencies = [
+ "async-trait",
+ "futures",
+ "k8s-openapi",
+ "kube",
+ "lazy_static",
+ "pezkuwi-subxt",
+ "pezkuwi-subxt-signer",
+ "pezkuwi-zombienet-configuration",
+ "pezkuwi-zombienet-orchestrator",
+ "pezkuwi-zombienet-provider",
+ "pezkuwi-zombienet-support",
+ "serde_json",
+ "tokio",
+ "tracing-subscriber 0.3.22",
+]
+
 [[package]]
 name = "pezkuwi-zombienet-sdk-tests"
 version = "0.1.0"
@@ -14860,6 +14917,8 @@ dependencies = [
  "pezcumulus-zombienet-sdk-helpers",
  "pezkuwi-primitives",
  "pezkuwi-subxt",
+ "pezkuwi-zombienet-orchestrator",
+ "pezkuwi-zombienet-sdk",
  "pezpallet-revive",
  "pezsc-executor",
  "pezsc-runtime-utilities",
@@ -14871,8 +14930,25 @@ dependencies = [
  "serde_json",
  "tokio",
  "tokio-util",
- "zombienet-orchestrator",
- "zombienet-sdk",
+]
+
+[[package]]
+name = "pezkuwi-zombienet-support"
+version = "0.44.0"
+dependencies = [
+ "anyhow",
+ "async-trait",
+ "futures",
+ "lazy_static",
+ "nix 0.29.0",
+ "rand 0.8.5",
+ "regex",
+ "reqwest",
+ "serde_json",
+ "thiserror 1.0.69",
+ "tokio",
+ "tracing",
+ "uuid",
 ]
 
 [[package]]
@@ -14898,7 +14974,6 @@ version = "7.0.0"
 dependencies = [
  "bitvec",
  "bizinikiwi-wasm-builder",
- "frame-remote-externalities",
  "hex-literal",
  "log",
  "parity-scale-codec",
@@ -14907,6 +14982,7 @@ dependencies = [
  "pezframe-election-provider-support",
  "pezframe-executive",
  "pezframe-metadata-hash-extension",
+ "pezframe-remote-externalities",
  "pezframe-support",
  "pezframe-system",
  "pezframe-system-benchmarking",
@@ -15092,7 +15168,6 @@ dependencies = [
 name = "pezmmr-gadget"
 version = "29.0.0"
 dependencies = [
- "bizinikiwi-test-runtime-client",
  "futures",
  "log",
  "parity-scale-codec",
@@ -15152,9 +15227,10 @@ version = "1.0.0"
 dependencies = [
  "log",
  "parity-scale-codec",
+ "pezframe",
  "pezframe-election-provider-support",
  "pezframe-support",
- "pezkuwi-sdk-frame",
+ "pezframe-system",
  "pezpallet-authorship",
  "pezpallet-balances",
  "pezpallet-election-provider-multi-block",
@@ -15323,11 +15399,13 @@ dependencies = [
 
 [[package]]
 name = "pezpallet-assets-freezer"
-version = "0.1.0"
+version = "0.44.0"
 dependencies = [
  "log",
  "parity-scale-codec",
- "pezkuwi-sdk-frame",
+ "pezframe",
+ "pezframe-support",
+ "pezframe-system",
  "pezpallet-assets",
  "pezpallet-balances",
  "scale-info",
@@ -15372,7 +15450,9 @@ name = "pezpallet-atomic-swap"
 version = "28.0.0"
 dependencies = [
  "parity-scale-codec",
- "pezkuwi-sdk-frame",
+ "pezframe",
+ "pezframe-support",
+ "pezframe-system",
  "pezpallet-balances",
  "scale-info",
 ]
@@ -15487,9 +15567,9 @@ dependencies = [
 name = "pezpallet-bags-list-remote-tests"
 version = "4.0.0-dev"
 dependencies = [
- "frame-remote-externalities",
  "log",
  "pezframe-election-provider-support",
+ "pezframe-remote-externalities",
  "pezframe-support",
  "pezframe-system",
  "pezpallet-bags-list",
@@ -15591,10 +15671,10 @@ dependencies = [
 name = "pezpallet-bridge-beefy"
 version = "0.1.0"
 dependencies = [
- "bp-beefy",
- "bp-test-utils",
  "parity-scale-codec",
+ "pezbp-beefy",
  "pezbp-runtime",
+ "pezbp-test-utils",
  "pezframe-support",
  "pezframe-system",
  "pezkuwi-ckb-merkle-mountain-range",
@@ -15615,10 +15695,10 @@ dependencies = [
 name = "pezpallet-bridge-grandpa"
 version = "0.7.0"
 dependencies = [
- "bp-header-pez-chain",
- "bp-test-utils",
  "parity-scale-codec",
+ "pezbp-header-pez-chain",
  "pezbp-runtime",
+ "pezbp-test-utils",
  "pezframe-benchmarking",
  "pezframe-support",
  "pezframe-system",
@@ -15635,11 +15715,11 @@ dependencies = [
 name = "pezpallet-bridge-messages"
 version = "0.7.0"
 dependencies = [
- "bp-header-pez-chain",
- "bp-messages",
- "bp-test-utils",
  "parity-scale-codec",
+ "pezbp-header-pez-chain",
+ "pezbp-messages",
  "pezbp-runtime",
+ "pezbp-test-utils",
  "pezframe-benchmarking",
  "pezframe-support",
  "pezframe-system",
@@ -15658,14 +15738,14 @@ dependencies = [
 name = "pezpallet-bridge-relayers"
 version = "0.7.0"
 dependencies = [
- "bp-header-pez-chain",
- "bp-messages",
- "bp-pezkuwi-core",
- "bp-relayers",
- "bp-test-utils",
- "bp-teyrchains",
  "parity-scale-codec",
+ "pezbp-header-pez-chain",
+ "pezbp-messages",
+ "pezbp-pezkuwi-core",
+ "pezbp-relayers",
  "pezbp-runtime",
+ "pezbp-test-utils",
+ "pezbp-teyrchains",
  "pezframe-benchmarking",
  "pezframe-support",
  "pezframe-system",
@@ -15687,12 +15767,12 @@ dependencies = [
 name = "pezpallet-bridge-teyrchains"
 version = "0.7.0"
 dependencies = [
- "bp-header-pez-chain",
- "bp-pezkuwi-core",
- "bp-test-utils",
- "bp-teyrchains",
  "parity-scale-codec",
+ "pezbp-header-pez-chain",
+ "pezbp-pezkuwi-core",
  "pezbp-runtime",
+ "pezbp-test-utils",
+ "pezbp-teyrchains",
  "pezframe-benchmarking",
  "pezframe-support",
  "pezframe-system",
@@ -15812,7 +15892,6 @@ dependencies = [
  "pezframe-support",
  "pezframe-system",
  "pezpallet-balances",
- "pezpallet-contracts-fixtures",
  "pezpallet-contracts-proc-macro",
  "pezpallet-contracts-uapi",
  "pezpallet-insecure-randomness-collective-flip",
@@ -16097,13 +16176,13 @@ dependencies = [
 name = "pezpallet-election-provider-multi-phase"
 version = "27.0.0"
 dependencies = [
- "frame-remote-externalities",
  "hex",
  "log",
  "parity-scale-codec",
  "parking_lot 0.12.5",
  "pezframe-benchmarking",
  "pezframe-election-provider-support",
+ "pezframe-remote-externalities",
  "pezframe-support",
  "pezframe-system",
  "pezpallet-balances",
@@ -16236,7 +16315,9 @@ name = "pezpallet-example-pezframe-crate"
 version = "0.0.1"
 dependencies = [
  "parity-scale-codec",
- "pezkuwi-sdk-frame",
+ "pezframe",
+ "pezframe-support",
+ "pezframe-system",
  "scale-info",
 ]
 
@@ -16466,7 +16547,9 @@ name = "pezpallet-insecure-randomness-collective-flip"
 version = "16.0.0"
 dependencies = [
  "parity-scale-codec",
- "pezkuwi-sdk-frame",
+ "pezframe",
+ "pezframe-support",
+ "pezframe-system",
  "safe-mix",
  "scale-info",
 ]
@@ -16478,7 +16561,6 @@ dependencies = [
  "parity-scale-codec",
  "pezframe-benchmarking",
  "pezframe-support",
- "pezframe-support-test",
  "pezframe-system",
  "pezpallet-balances",
  "pezsp-core",
@@ -16527,7 +16609,7 @@ dependencies = [
 
 [[package]]
 name = "pezpallet-meta-tx"
-version = "0.1.0"
+version = "0.44.0"
 dependencies = [
  "docify",
  "parity-scale-codec",
@@ -16555,11 +16637,11 @@ dependencies = [
  "impl-trait-for-tuples",
  "log",
  "parity-scale-codec",
+ "pezframe",
  "pezframe-benchmarking",
  "pezframe-executive",
  "pezframe-support",
  "pezframe-system",
- "pezkuwi-sdk-frame",
  "pezsp-core",
  "pezsp-io",
  "pezsp-runtime",
@@ -16573,7 +16655,9 @@ name = "pezpallet-minimal-template"
 version = "0.0.0"
 dependencies = [
  "parity-scale-codec",
- "pezkuwi-sdk",
+ "pezframe-benchmarking",
+ "pezframe-support",
+ "pezframe-system",
  "scale-info",
 ]
 
@@ -16583,7 +16667,9 @@ version = "0.4.0"
 dependencies = [
  "log",
  "parity-scale-codec",
- "pezkuwi-sdk-frame",
+ "pezframe",
+ "pezframe-support",
+ "pezframe-system",
  "pezsp-application-crypto",
  "pezsp-mixnet",
  "scale-info",
@@ -16597,7 +16683,9 @@ dependencies = [
  "itertools 0.11.0",
  "log",
  "parity-scale-codec",
- "pezkuwi-sdk-frame",
+ "pezframe",
+ "pezframe-support",
+ "pezframe-system",
  "pezsp-mmr-primitives",
  "pezsp-tracing",
  "scale-info",
@@ -16628,7 +16716,9 @@ version = "28.0.0"
 dependencies = [
  "log",
  "parity-scale-codec",
- "pezkuwi-sdk-frame",
+ "pezframe",
+ "pezframe-support",
+ "pezframe-system",
  "pezpallet-balances",
  "scale-info",
 ]
@@ -16639,7 +16729,9 @@ version = "10.0.0"
 dependencies = [
  "log",
  "parity-scale-codec",
- "pezkuwi-sdk-frame",
+ "pezframe",
+ "pezframe-support",
+ "pezframe-system",
  "pezpallet-assets",
  "pezpallet-balances",
  "pezpallet-nfts",
@@ -16677,7 +16769,9 @@ name = "pezpallet-nis"
 version = "28.0.0"
 dependencies = [
  "parity-scale-codec",
- "pezkuwi-sdk-frame",
+ "pezframe",
+ "pezframe-support",
+ "pezframe-system",
  "pezpallet-balances",
  "pezsp-io",
  "scale-info",
@@ -16689,7 +16783,9 @@ version = "28.0.0"
 dependencies = [
  "log",
  "parity-scale-codec",
- "pezkuwi-sdk-frame",
+ "pezframe",
+ "pezframe-support",
+ "pezframe-system",
  "scale-info",
 ]
 
@@ -16875,7 +16971,9 @@ version = "0.6.0"
 dependencies = [
  "docify",
  "parity-scale-codec",
- "pezkuwi-sdk-frame",
+ "pezframe",
+ "pezframe-support",
+ "pezframe-system",
  "pezsp-metadata-ir",
  "scale-info",
 ]
@@ -16886,13 +16984,15 @@ version = "0.1.0"
 dependencies = [
  "arbitrary",
  "honggfuzz",
- "pezkuwi-sdk-frame",
+ "pezframe",
+ "pezframe-support",
+ "pezframe-system",
  "pezpallet-paged-list",
 ]
 
 [[package]]
 name = "pezpallet-parameters"
-version = "0.1.0"
+version = "0.44.0"
 dependencies = [
  "docify",
  "parity-scale-codec",
@@ -16901,7 +17001,6 @@ dependencies = [
  "pezframe-support",
  "pezframe-system",
  "pezpallet-balances",
- "pezpallet-example-basic",
  "pezsp-core",
  "pezsp-io",
  "pezsp-runtime",
@@ -17032,7 +17131,9 @@ name = "pezpallet-proxy"
 version = "28.0.0"
 dependencies = [
  "parity-scale-codec",
- "pezkuwi-sdk-frame",
+ "pezframe",
+ "pezframe-support",
+ "pezframe-system",
  "pezpallet-balances",
  "pezpallet-utility",
  "scale-info",
@@ -17060,7 +17161,9 @@ name = "pezpallet-recovery"
 version = "28.0.0"
 dependencies = [
  "parity-scale-codec",
- "pezkuwi-sdk-frame",
+ "pezframe",
+ "pezframe-support",
+ "pezframe-system",
  "pezpallet-balances",
  "scale-info",
 ]
@@ -17244,7 +17347,7 @@ dependencies = [
 
 [[package]]
 name = "pezpallet-revive-proc-macro"
-version = "0.1.0"
+version = "0.44.0"
 dependencies = [
  "proc-macro2 1.0.103",
  "quote 1.0.42",
@@ -17253,7 +17356,7 @@ dependencies = [
 
 [[package]]
 name = "pezpallet-revive-uapi"
-version = "0.1.0"
+version = "0.44.0"
 dependencies = [
  "alloy-core",
  "bitflags 1.3.2",
@@ -17303,7 +17406,9 @@ version = "9.0.0"
 dependencies = [
  "docify",
  "parity-scale-codec",
- "pezkuwi-sdk-frame",
+ "pezframe",
+ "pezframe-support",
+ "pezframe-system",
  "pezpallet-balances",
  "pezpallet-proxy",
  "pezpallet-utility",
@@ -17316,7 +17421,9 @@ version = "13.0.0"
 dependencies = [
  "log",
  "parity-scale-codec",
- "pezkuwi-sdk-frame",
+ "pezframe",
+ "pezframe-support",
+ "pezframe-system",
  "pezpallet-ranked-collective",
  "scale-info",
 ]
@@ -17433,7 +17540,6 @@ dependencies = [
  "parity-scale-codec",
  "pezframe-benchmarking",
  "pezframe-support",
- "pezframe-support-test",
  "pezframe-system",
  "pezpallet-balances",
  "pezsp-arithmetic",
@@ -17527,7 +17633,9 @@ name = "pezpallet-staking-async-preset-store"
 version = "0.1.0"
 dependencies = [
  "parity-scale-codec",
- "pezkuwi-sdk-frame",
+ "pezframe",
+ "pezframe-support",
+ "pezframe-system",
  "pezpallet-staking-async-ah-client",
  "scale-info",
 ]
@@ -17555,7 +17663,6 @@ dependencies = [
  "approx",
  "bitvec",
  "bizinikiwi-wasm-builder",
- "frame-remote-externalities",
  "hex-literal",
  "log",
  "parity-scale-codec",
@@ -17564,6 +17671,7 @@ dependencies = [
  "pezframe-election-provider-support",
  "pezframe-executive",
  "pezframe-metadata-hash-extension",
+ "pezframe-remote-externalities",
  "pezframe-support",
  "pezframe-system",
  "pezframe-system-benchmarking",
@@ -17692,15 +17800,14 @@ name = "pezpallet-staking-async-teyrchain-runtime"
 version = "0.15.0"
 dependencies = [
  "asset-test-pezutils",
- "assets-common",
  "bizinikiwi-wasm-builder",
- "bp-asset-hub-pezkuwichain",
- "bp-bridge-hub-pezkuwichain",
- "bp-bridge-hub-zagros",
- "frame-remote-externalities",
  "hex-literal",
  "log",
  "parity-scale-codec",
+ "pez-assets-common",
+ "pezbp-asset-hub-pezkuwichain",
+ "pezbp-bridge-hub-pezkuwichain",
+ "pezbp-bridge-hub-zagros",
  "pezcumulus-pezpallet-aura-ext",
  "pezcumulus-pezpallet-session-benchmarking",
  "pezcumulus-pezpallet-teyrchain-system",
@@ -17714,6 +17821,7 @@ dependencies = [
  "pezframe-election-provider-support",
  "pezframe-executive",
  "pezframe-metadata-hash-extension",
+ "pezframe-remote-externalities",
  "pezframe-support",
  "pezframe-system",
  "pezframe-system-benchmarking",
@@ -17860,10 +17968,10 @@ name = "pezpallet-state-trie-migration"
 version = "29.0.0"
 dependencies = [
  "bizinikiwi-state-trie-migration-rpc",
- "frame-remote-externalities",
  "log",
  "parity-scale-codec",
  "pezframe-benchmarking",
+ "pezframe-remote-externalities",
  "pezframe-support",
  "pezframe-system",
  "pezpallet-balances",
@@ -17928,7 +18036,9 @@ name = "pezpallet-teyrchain-template"
 version = "0.0.0"
 dependencies = [
  "parity-scale-codec",
- "pezkuwi-sdk-frame",
+ "pezframe",
+ "pezframe-support",
+ "pezframe-system",
  "scale-info",
 ]
 
@@ -18120,7 +18230,9 @@ version = "9.0.0"
 dependencies = [
  "docify",
  "parity-scale-codec",
- "pezkuwi-sdk-frame",
+ "pezframe",
+ "pezframe-support",
+ "pezframe-system",
  "pezpallet-balances",
  "pezpallet-proxy",
  "pezpallet-utility",
@@ -18245,7 +18357,9 @@ name = "pezpallet-whitelist"
 version = "27.0.0"
 dependencies = [
  "parity-scale-codec",
- "pezkuwi-sdk-frame",
+ "pezframe",
+ "pezframe-support",
+ "pezframe-system",
  "pezpallet-balances",
  "pezpallet-preimage",
  "scale-info",
@@ -18275,7 +18389,6 @@ dependencies = [
  "scale-info",
  "serde",
  "tracing",
- "xcm-pez-simulator",
  "xcm-runtime-pezapis",
 ]
 
@@ -18301,12 +18414,12 @@ dependencies = [
 name = "pezpallet-xcm-bridge-hub"
 version = "0.2.0"
 dependencies = [
- "bp-header-pez-chain",
- "bp-messages",
- "bp-xcm-bridge-hub",
- "bp-xcm-bridge-hub-router",
  "parity-scale-codec",
+ "pezbp-header-pez-chain",
+ "pezbp-messages",
  "pezbp-runtime",
+ "pezbp-xcm-bridge-hub",
+ "pezbp-xcm-bridge-hub-router",
  "pezframe-support",
  "pezframe-system",
  "pezkuwi-teyrchain-primitives",
@@ -18328,8 +18441,8 @@ dependencies = [
 name = "pezpallet-xcm-bridge-hub-router"
 version = "0.5.0"
 dependencies = [
- "bp-xcm-bridge-hub-router",
  "parity-scale-codec",
+ "pezbp-xcm-bridge-hub-router",
  "pezframe-benchmarking",
  "pezframe-support",
  "pezframe-system",
@@ -19808,6 +19921,8 @@ dependencies = [
  "parity-scale-codec",
  "parking_lot 0.12.5",
  "pezcumulus-zombienet-sdk-helpers",
+ "pezkuwi-zombienet-configuration",
+ "pezkuwi-zombienet-sdk",
  "pezsc-block-builder",
  "pezsc-client-api",
  "pezsc-transaction-pool-api",
@@ -19828,8 +19943,6 @@ dependencies = [
  "tokio-stream",
  "tracing",
  "tracing-subscriber 0.3.22",
- "zombienet-configuration",
- "zombienet-sdk",
 ]
 
 [[package]]
@@ -19889,9 +20002,9 @@ dependencies = [
 name = "pezsnowbridge-core"
 version = "0.2.0"
 dependencies = [
- "bp-relayers",
  "hex-literal",
  "parity-scale-codec",
+ "pezbp-relayers",
  "pezframe-support",
  "pezframe-system",
  "pezkuwi-teyrchain-primitives",
@@ -19936,9 +20049,9 @@ name = "pezsnowbridge-inbound-queue-primitives"
 version = "0.9.0"
 dependencies = [
  "alloy-core",
- "assets-common",
  "hex-literal",
  "parity-scale-codec",
+ "pez-assets-common",
  "pezframe-support",
  "pezframe-system",
  "pezsnowbridge-beacon-primitives",
@@ -20103,9 +20216,9 @@ name = "pezsnowbridge-pezpallet-inbound-queue-v2"
 version = "0.2.0"
 dependencies = [
  "alloy-core",
- "bp-relayers",
  "hex-literal",
  "parity-scale-codec",
+ "pezbp-relayers",
  "pezframe-benchmarking",
  "pezframe-support",
  "pezframe-system",
@@ -20144,9 +20257,9 @@ dependencies = [
 name = "pezsnowbridge-pezpallet-outbound-queue"
 version = "0.2.0"
 dependencies = [
- "bridge-hub-common",
  "ethabi-decode",
  "parity-scale-codec",
+ "pezbridge-hub-common",
  "pezframe-benchmarking",
  "pezframe-support",
  "pezframe-system",
@@ -20168,10 +20281,10 @@ name = "pezsnowbridge-pezpallet-outbound-queue-v2"
 version = "0.2.0"
 dependencies = [
  "alloy-core",
- "bp-relayers",
  "ethabi-decode",
  "hex-literal",
  "parity-scale-codec",
+ "pezbp-relayers",
  "pezframe-benchmarking",
  "pezframe-support",
  "pezframe-system",
@@ -20340,8 +20453,8 @@ dependencies = [
 name = "pezsnowbridge-test-utils"
 version = "0.1.0"
 dependencies = [
- "bp-relayers",
  "parity-scale-codec",
+ "pezbp-relayers",
  "pezframe-benchmarking",
  "pezframe-support",
  "pezframe-system",
@@ -21287,7 +21400,6 @@ dependencies = [
 name = "pezstaging-chain-spec-builder"
 version = "1.6.1"
 dependencies = [
- "bizinikiwi-test-runtime",
  "clap",
  "cmd_lib",
  "docify",
@@ -21317,6 +21429,7 @@ dependencies = [
  "pez-node-primitives",
  "pez-node-rpc",
  "pez-node-testing",
+ "pezframe-benchmarking-cli",
  "pezkuwi-sdk",
  "pezkuwi-subxt-signer",
  "pezsc-service-test",
@@ -22856,14 +22969,14 @@ version = "0.1.0"
 dependencies = [
  "async-std",
  "async-trait",
- "bp-header-pez-chain",
- "bp-messages",
- "bp-pezkuwi-core",
  "futures",
  "jsonrpsee",
  "num-traits",
  "parity-scale-codec",
  "pez-finality-relay",
+ "pezbp-header-pez-chain",
+ "pezbp-messages",
+ "pezbp-pezkuwi-core",
  "pezbp-runtime",
  "pezframe-support",
  "pezpallet-transaction-payment",
@@ -25557,6 +25670,7 @@ dependencies = [
  "jsonrpsee",
  "log",
  "parity-scale-codec",
+ "pezframe-benchmarking-cli",
  "pezkuwi-sdk",
  "pezsp-runtime",
  "serde",
@@ -25618,8 +25732,8 @@ version = "0.1.0"
 dependencies = [
  "async-std",
  "async-trait",
- "bp-pezkuwi-core",
  "futures",
+ "pezbp-pezkuwi-core",
  "pezsp-core",
  "relay-bizinikiwi-client",
  "relay-utils",
@@ -28005,8 +28119,10 @@ version = "0.1.0"
 dependencies = [
  "docify",
  "parity-scale-codec",
+ "pezframe",
+ "pezframe-support",
+ "pezframe-system",
  "pezkuwi-runtime-teyrchains",
- "pezkuwi-sdk-frame",
  "pezpallet-balances",
  "pezpallet-message-queue",
  "pezpallet-xcm",
@@ -28175,7 +28291,6 @@ dependencies = [
  "pezframe-system",
  "pezpallet-assets",
  "pezpallet-balances",
- "pezpallet-xcm",
  "pezsp-api",
  "pezsp-io",
  "pezsp-tracing",
@@ -28185,7 +28300,6 @@ dependencies = [
  "pezstaging-xcm-executor",
  "scale-info",
  "tracing",
- "xcm-pez-simulator",
 ]
 
 [[package]]
@@ -28316,7 +28430,6 @@ dependencies = [
  "approx",
  "bitvec",
  "bizinikiwi-wasm-builder",
- "frame-remote-externalities",
  "hex-literal",
  "log",
  "parity-scale-codec",
@@ -28325,6 +28438,7 @@ dependencies = [
  "pezframe-election-provider-support",
  "pezframe-executive",
  "pezframe-metadata-hash-extension",
+ "pezframe-remote-externalities",
  "pezframe-support",
  "pezframe-system",
  "pezframe-system-benchmarking",
@@ -28563,139 +28677,6 @@ dependencies = [
  "tokio-tungstenite 0.26.2",
 ]
 
-[[package]]
-name = "zombienet-configuration"
-version = "0.44.0"
-dependencies = [
- "anyhow",
- "lazy_static",
- "multiaddr 0.18.2",
- "regex",
- "reqwest",
- "serde",
- "serde_json",
- "thiserror 1.0.69",
- "tokio",
- "toml 0.8.23",
- "tracing",
- "url",
- "zombienet-support",
-]
-
-[[package]]
-name = "zombienet-orchestrator"
-version = "0.44.0"
-dependencies = [
- "anyhow",
- "async-trait",
- "erased-serde",
- "fancy-regex",
- "futures",
- "glob-match",
- "hex",
- "lazy_static",
- "libp2p",
- "libsecp256k1",
- "multiaddr 0.18.2",
- "pezkuwi-subxt",
- "pezkuwi-subxt-signer",
- "pezsc-chain-spec",
- "pezsp-core",
- "rand 0.8.5",
- "regex",
- "reqwest",
- "serde",
- "serde_json",
- "sha2 0.10.9",
- "thiserror 1.0.69",
- "tokio",
- "toml 0.8.23",
- "tracing",
- "uuid",
- "zombienet-configuration",
- "zombienet-prom-metrics-parser",
- "zombienet-provider",
- "zombienet-support",
-]
-
-[[package]]
-name = "zombienet-prom-metrics-parser"
-version = "0.44.0"
-dependencies = [
- "pest",
- "pest_derive",
- "thiserror 1.0.69",
-]
-
-[[package]]
-name = "zombienet-provider"
-version = "0.44.0"
-dependencies = [
- "anyhow",
- "async-trait",
- "erased-serde",
- "flate2",
- "futures",
- "hex",
- "k8s-openapi",
- "kube",
- "nix 0.29.0",
- "regex",
- "reqwest",
- "serde",
- "serde_json",
- "serde_yaml",
- "sha2 0.10.9",
- "tar",
- "thiserror 1.0.69",
- "tokio",
- "tokio-util",
- "tracing",
- "url",
- "uuid",
- "zombienet-configuration",
- "zombienet-support",
-]
-
-[[package]]
-name = "zombienet-sdk"
-version = "0.44.0"
-dependencies = [
- "async-trait",
- "futures",
- "k8s-openapi",
- "kube",
- "lazy_static",
- "pezkuwi-subxt",
- "pezkuwi-subxt-signer",
- "serde_json",
- "tokio",
- "tracing-subscriber 0.3.22",
- "zombienet-configuration",
- "zombienet-orchestrator",
- "zombienet-provider",
- "zombienet-support",
-]
-
-[[package]]
-name = "zombienet-support"
-version = "0.44.0"
-dependencies = [
- "anyhow",
- "async-trait",
- "futures",
- "lazy_static",
- "nix 0.29.0",
- "rand 0.8.5",
- "regex",
- "reqwest",
- "serde_json",
- "thiserror 1.0.69",
- "tokio",
- "tracing",
- "uuid",
-]
-
 [[package]]
 name = "zstd"
 version = "0.12.4"
diff --git a/Cargo.toml b/Cargo.toml
index b35a7e1f..1849c488 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -704,12 +704,12 @@ array-bytes = { version = "6.2.2", default-features = false }
 arrayvec = { version = "0.7.4" }
 assert_cmd = { version = "2.1" }
 assert_matches = { version = "1.5.0" }
-asset-hub-pezkuwichain-emulated-chain = { path = "pezcumulus/teyrchains/integration-tests/emulated/chains/teyrchains/assets/asset-hub-pezkuwichain" }
-asset-hub-pezkuwichain-runtime = { path = "pezcumulus/teyrchains/runtimes/assets/asset-hub-pezkuwichain", default-features = false }
-asset-hub-zagros-emulated-chain = { path = "pezcumulus/teyrchains/integration-tests/emulated/chains/teyrchains/assets/asset-hub-zagros" }
-asset-hub-zagros-runtime = { path = "pezcumulus/teyrchains/runtimes/assets/asset-hub-zagros" }
-asset-test-pezutils = { path = "pezcumulus/teyrchains/runtimes/assets/test-utils", default-features = false }
-assets-common = { path = "pezcumulus/teyrchains/runtimes/assets/common", version = "0.7.0", default-features = false }
+asset-hub-pezkuwichain-emulated-chain = { version = "0.0.0", path = "pezcumulus/teyrchains/integration-tests/emulated/chains/teyrchains/assets/asset-hub-pezkuwichain" }
+asset-hub-pezkuwichain-runtime = { version = "0.11.0", path = "pezcumulus/teyrchains/runtimes/assets/asset-hub-pezkuwichain", default-features = false }
+asset-hub-zagros-emulated-chain = { version = "0.0.0", path = "pezcumulus/teyrchains/integration-tests/emulated/chains/teyrchains/assets/asset-hub-zagros" }
+asset-hub-zagros-runtime = { version = "0.15.0", path = "pezcumulus/teyrchains/runtimes/assets/asset-hub-zagros" }
+asset-test-pezutils = { path = "pezcumulus/teyrchains/runtimes/assets/test-utils", version = "7.0.0", default-features = false }
+pez-assets-common = { path = "pezcumulus/teyrchains/runtimes/assets/common", version = "0.7.1", default-features = false }
 async-channel = { version = "1.8.0" }
 async-std = { version = "1.9.0" }
 async-trait = { version = "0.1.88" }
@@ -727,27 +727,27 @@ bitvec = { version = "1.0.1", default-features = false }
 blake2 = { version = "0.10.4", default-features = false }
 blake2b_simd = { version = "1.0.2", default-features = false }
 blake3 = { version = "1.5" }
-bn = { package = "bizinikiwi-bn", version = "0.6", default-features = false }
+bn = { package = "bizinikiwi-bn", version = "0.7", default-features = false }
 bounded-collections = { version = "0.3.2", default-features = false }
 bounded-vec = { version = "0.7" }
-bp-asset-hub-pezkuwichain = { path = "pezcumulus/teyrchains/runtimes/assets/asset-hub-pezkuwichain/bridge-primitives", version = "0.4.0", default-features = false }
-bp-asset-hub-zagros = { path = "pezcumulus/teyrchains/runtimes/assets/asset-hub-zagros/bridge-primitives", version = "0.3.0", default-features = false }
-bp-beefy = { path = "pezbridges/primitives/beefy", version = "0.1.0", default-features = false }
-bp-bridge-hub-pezcumulus = { path = "pezbridges/chains/chain-pezcumulus", version = "0.7.0", default-features = false }
-bp-bridge-hub-pezkuwichain = { path = "pezcumulus/teyrchains/runtimes/bridge-hubs/bridge-hub-pezkuwichain/bridge-primitives", version = "0.7.0", default-features = false }
-bp-bridge-hub-zagros = { path = "pezcumulus/teyrchains/runtimes/bridge-hubs/bridge-hub-zagros/bridge-primitives", version = "0.3.0", default-features = false, package = "bp-bridge-hub-zagros" }
-bp-header-pez-chain = { path = "pezbridges/primitives/header-chain", version = "0.7.0", default-features = false, package = "bp-header-pez-chain" }
-bp-messages = { path = "pezbridges/primitives/messages", version = "0.7.0", default-features = false, package = "bp-messages" }
-bp-pezkuwi-bulletin = { path = "pezbridges/chains/chain-pezkuwi-bulletin", version = "0.4.0", default-features = false, package = "bp-pezkuwi-bulletin" }
-bp-pezkuwi-core = { path = "pezbridges/primitives/pezkuwi-core", version = "0.7.0", default-features = false, package = "bp-pezkuwi-core" }
-bp-pezkuwichain = { path = "pezkuwi/runtime/pezkuwichain/bridge-primitives", version = "0.6.0", default-features = false, package = "bp-pezkuwichain" }
-bp-relayers = { path = "pezbridges/primitives/relayers", version = "0.7.0", default-features = false, package = "bp-relayers" }
-bp-test-utils = { path = "pezbridges/primitives/test-utils", version = "0.7.0", default-features = false }
-bp-teyrchains = { path = "pezbridges/primitives/teyrchains", version = "0.7.0", default-features = false }
-bp-xcm-bridge-hub = { path = "pezbridges/primitives/xcm-bridge-hub", version = "0.2.0", default-features = false }
-bp-xcm-bridge-hub-router = { path = "pezbridges/primitives/xcm-bridge-hub-router", version = "0.6.0", default-features = false }
-bp-zagros = { path = "pezkuwi/runtime/zagros/bridge-primitives", version = "0.3.0", default-features = false }
-bridge-hub-common = { path = "pezcumulus/teyrchains/runtimes/bridge-hubs/common", version = "0.1.0", default-features = false }
+pezbp-asset-hub-pezkuwichain = { path = "pezcumulus/teyrchains/runtimes/assets/asset-hub-pezkuwichain/bridge-primitives", version = "0.4.0", default-features = false }
+pezbp-asset-hub-zagros = { path = "pezcumulus/teyrchains/runtimes/assets/asset-hub-zagros/bridge-primitives", version = "0.3.0", default-features = false }
+pezbp-beefy = { path = "pezbridges/primitives/beefy", version = "0.1.0", default-features = false }
+pezbp-bridge-hub-pezcumulus = { path = "pezbridges/chains/chain-pezcumulus", version = "0.7.0", default-features = false }
+pezbp-bridge-hub-pezkuwichain = { path = "pezcumulus/teyrchains/runtimes/bridge-hubs/bridge-hub-pezkuwichain/bridge-primitives", version = "0.7.0", default-features = false }
+pezbp-bridge-hub-zagros = { path = "pezcumulus/teyrchains/runtimes/bridge-hubs/bridge-hub-zagros/bridge-primitives", version = "0.3.0", default-features = false, package = "pezbp-bridge-hub-zagros" }
+pezbp-header-pez-chain = { path = "pezbridges/primitives/header-chain", version = "0.7.0", default-features = false, package = "pezbp-header-pez-chain" }
+pezbp-messages = { path = "pezbridges/primitives/messages", version = "0.7.0", default-features = false, package = "pezbp-messages" }
+pezbp-pezkuwi-bulletin = { path = "pezbridges/chains/chain-pezkuwi-bulletin", version = "0.4.0", default-features = false, package = "pezbp-pezkuwi-bulletin" }
+pezbp-pezkuwi-core = { path = "pezbridges/primitives/pezkuwi-core", version = "0.7.0", default-features = false, package = "pezbp-pezkuwi-core" }
+pezbp-pezkuwichain = { path = "pezkuwi/runtime/pezkuwichain/bridge-primitives", version = "0.6.0", default-features = false, package = "pezbp-pezkuwichain" }
+pezbp-relayers = { path = "pezbridges/primitives/relayers", version = "0.7.0", default-features = false, package = "pezbp-relayers" }
+pezbp-test-utils = { path = "pezbridges/primitives/test-utils", version = "0.7.0", default-features = false }
+pezbp-teyrchains = { path = "pezbridges/primitives/teyrchains", version = "0.7.0", default-features = false }
+pezbp-xcm-bridge-hub = { path = "pezbridges/primitives/xcm-bridge-hub", version = "0.2.0", default-features = false }
+pezbp-xcm-bridge-hub-router = { path = "pezbridges/primitives/xcm-bridge-hub-router", version = "0.7.0", default-features = false, package = "pezbp-xcm-bridge-hub-router" }
+pezbp-zagros = { path = "pezkuwi/runtime/zagros/bridge-primitives", version = "0.3.0", default-features = false }
+pezbridge-hub-common = { path = "pezcumulus/teyrchains/runtimes/bridge-hubs/common", version = "0.1.1", default-features = false }
 bs58 = { version = "0.5.1", default-features = false }
 build-helper = { version = "0.1.1" }
 byte-slice-cast = { version = "1.2.1", default-features = false }
@@ -756,7 +756,7 @@ bytes = { version = "1.4.0", default-features = false }
 cargo_metadata = { version = "0.15.4" }
 cfg-expr = { version = "0.15.5" }
 cfg-if = { version = "1.0" }
-chain-spec-builder = { path = "bizinikiwi/bin/utils/chain-spec-builder", default-features = false, package = "pezstaging-chain-spec-builder" }
+chain-spec-builder = { path = "bizinikiwi/bin/utils/chain-spec-builder", version = "1.6.1", default-features = false, package = "pezstaging-chain-spec-builder" }
 chrono = { version = "0.4.31" }
 cid = { version = "0.9.0" }
 clap = { version = "4.5.13" }
@@ -764,19 +764,19 @@ clap_complete = { version = "4.5.13" }
 cmd_lib = { version = "1.9.5" }
 coarsetime = { version = "0.1.22" }
 codec = { version = "3.7.5", default-features = false, package = "parity-scale-codec" }
-collectives-zagros-emulated-chain = { path = "pezcumulus/teyrchains/integration-tests/emulated/chains/teyrchains/collectives/collectives-zagros" }
-collectives-zagros-runtime = { path = "pezcumulus/teyrchains/runtimes/collectives/collectives-zagros" }
+collectives-zagros-emulated-chain = { version = "0.0.0", path = "pezcumulus/teyrchains/integration-tests/emulated/chains/teyrchains/collectives/collectives-zagros" }
+collectives-zagros-runtime = { version = "3.0.0", path = "pezcumulus/teyrchains/runtimes/collectives/collectives-zagros" }
 color-eyre = { version = "0.6.3", default-features = false }
 color-print = { version = "0.3.4" }
 colored = { version = "2.0.4" }
 comfy-table = { version = "7.1.4", default-features = false }
-configuration = { package = "zombienet-configuration", path = "vendor/pezkuwi-zombienet-sdk/crates/configuration" }
+configuration = { package = "pezkuwi-zombienet-configuration", path = "vendor/pezkuwi-zombienet-sdk/crates/configuration", version = "0.44.0" }
 console = { version = "0.15.8" }
 const-hex = { version = "1.10.0", default-features = false }
-coretime-pezkuwichain-emulated-chain = { path = "pezcumulus/teyrchains/integration-tests/emulated/chains/teyrchains/coretime/coretime-pezkuwichain" }
-coretime-pezkuwichain-runtime = { path = "pezcumulus/teyrchains/runtimes/coretime/coretime-pezkuwichain" }
-coretime-zagros-emulated-chain = { path = "pezcumulus/teyrchains/integration-tests/emulated/chains/teyrchains/coretime/coretime-zagros" }
-coretime-zagros-runtime = { path = "pezcumulus/teyrchains/runtimes/coretime/coretime-zagros" }
+coretime-pezkuwichain-emulated-chain = { version = "0.1.0", path = "pezcumulus/teyrchains/integration-tests/emulated/chains/teyrchains/coretime/coretime-pezkuwichain" }
+coretime-pezkuwichain-runtime = { version = "0.1.0", path = "pezcumulus/teyrchains/runtimes/coretime/coretime-pezkuwichain" }
+coretime-zagros-emulated-chain = { version = "0.1.0", path = "pezcumulus/teyrchains/integration-tests/emulated/chains/teyrchains/coretime/coretime-zagros" }
+coretime-zagros-runtime = { version = "0.1.0", path = "pezcumulus/teyrchains/runtimes/coretime/coretime-zagros" }
 cpu-time = { version = "1.0.0" }
 criterion = { version = "0.5.1", default-features = false }
 crypto_secretbox = { version = "0.1.1", default-features = false }
@@ -794,7 +794,7 @@ dyn-clone = { version = "1.0.16" }
 ed25519-dalek = { version = "2.1", default-features = false }
 ed25519-zebra = { version = "4.0.3", default-features = false }
 either = { version = "1.8.1", default-features = false }
-emulated-integration-tests-common = { path = "pezcumulus/teyrchains/integration-tests/emulated/common", default-features = false }
+emulated-integration-tests-common = { version = "3.0.0", path = "pezcumulus/teyrchains/integration-tests/emulated/common", default-features = false }
 enumflags2 = { version = "0.7.11" }
 enumn = { version = "0.1.13" }
 env_filter = { version = "0.1.3" }
@@ -820,7 +820,7 @@ fnv = { version = "1.0.6" }
 foldhash = { version = "0.1.5", default-features = false }
 forwarded-header-value = { version = "0.1.1" }
 fraction = { version = "0.13.1" }
-frame = { path = "bizinikiwi/pezframe", default-features = false, package = "pezkuwi-sdk-frame" }
+pezframe = { version = "0.1.0", path = "bizinikiwi/pezframe", default-features = false }
 frame-decode = { version = "0.15.0", default-features = false }
 frame-metadata = { version = "23.0.0", default-features = false }
 frame-storage-access-test-runtime = { path = "bizinikiwi/utils/pezframe/storage-access-test-runtime", version = "0.1.0", default-features = false }
@@ -834,10 +834,10 @@ getrandom = { version = "0.2", default-features = false }
 git2 = { version = "0.20.0", default-features = false }
 glob = { version = "0.3" }
 glob-match = { version = "0.2.1" }
-glutton-zagros-runtime = { path = "pezcumulus/teyrchains/runtimes/glutton/glutton-zagros" }
+glutton-zagros-runtime = { version = "3.0.0", path = "pezcumulus/teyrchains/runtimes/glutton/glutton-zagros" }
 governor = { version = "0.6.0" }
-gum = { path = "pezkuwi/node/gum", default-features = false, package = "pez-tracing-gum" }
-gum-proc-macro = { path = "pezkuwi/node/gum/proc-macro", default-features = false, package = "pez-tracing-gum-proc-macro" }
+gum = { path = "pezkuwi/node/gum", version = "7.0.0", default-features = false, package = "pez-tracing-gum" }
+gum-proc-macro = { path = "pezkuwi/node/gum/proc-macro", version = "5.0.0", default-features = false, package = "pez-tracing-gum-proc-macro" }
 handlebars = { version = "5.1.0" }
 hash-db = { version = "0.16.0", default-features = false }
 hash256-std-hasher = { version = "0.15.2", default-features = false }
@@ -915,8 +915,8 @@ multihash = { version = "0.19.1", default-features = false }
 multistream-select = { version = "0.13.0" }
 names = { version = "0.14.0", default-features = false }
 nix = { version = "0.29.0" }
-node-cli = { path = "bizinikiwi/bin/node/cli", package = "pezstaging-node-cli" }
-node-inspect = { path = "bizinikiwi/bin/node/inspect", default-features = false, package = "pezstaging-node-inspect" }
+node-cli = { version = "3.0.0-dev", path = "bizinikiwi/bin/node/cli", package = "pezstaging-node-cli" }
+node-inspect = { path = "bizinikiwi/bin/node/inspect", version = "0.12.0", default-features = false, package = "pezstaging-node-inspect" }
 nohash-hasher = { version = "0.2.0" }
 novelpoly = { version = "2.0.0", package = "reed-solomon-novelpoly" }
 num-bigint = { version = "0.4.6", default-features = false }
@@ -927,10 +927,10 @@ num-traits = { version = "0.2.17", default-features = false }
 num_cpus = { version = "1.13.1" }
 once_cell = { version = "1.21.3" }
 orchestra = { version = "0.4.0", default-features = false }
-orchestrator = { package = "zombienet-orchestrator", path = "vendor/pezkuwi-zombienet-sdk/crates/orchestrator" }
+orchestrator = { package = "pezkuwi-zombienet-orchestrator", path = "vendor/pezkuwi-zombienet-sdk/crates/orchestrator", version = "0.44.0" }
 pez-chain-spec-guide-runtime = { path = "docs/sdk/src/reference_docs/chain_spec_runtime", version = "0.0.0" }
 pez-equivocation-detector = { path = "pezbridges/relays/equivocation", version = "0.1.0" }
-pez-ethereum-standards = { path = "bizinikiwi/primitives/pez-ethereum-standards", version = "0.1.0" }
+pez-ethereum-standards = { path = "bizinikiwi/primitives/pez-ethereum-standards", version = "0.1.1" }
 pez-finality-relay = { path = "pezbridges/relays/finality", version = "0.1.0" }
 pez-fork-tree = { path = "bizinikiwi/utils/pez-fork-tree", version = "12.0.0", default-features = false }
 pez-generate-bags = { path = "bizinikiwi/utils/pezframe/pez-generate-bags", version = "28.0.0", default-features = false }
@@ -958,9 +958,9 @@ pezcumulus-client-consensus-relay-chain = { path = "pezcumulus/client/consensus/
 pezcumulus-client-network = { path = "pezcumulus/client/network", version = "0.7.0", default-features = false }
 pezcumulus-client-pov-recovery = { path = "pezcumulus/client/pov-recovery", version = "0.7.0", default-features = false }
 pezcumulus-client-service = { path = "pezcumulus/client/service", version = "0.7.0", default-features = false }
-pezcumulus-client-teyrchain-inherent = { path = "pezcumulus/client/teyrchain-inherent", version = "0.1.0", default-features = false }
+pezcumulus-client-teyrchain-inherent = { path = "pezcumulus/client/teyrchain-inherent", version = "0.1.1", default-features = false }
 pezcumulus-pezpallet-aura-ext = { path = "pezcumulus/pezpallets/aura-ext", version = "0.7.0", default-features = false }
-pezcumulus-pezpallet-dmp-queue = { default-features = false, path = "pezcumulus/pezpallets/dmp-queue" }
+pezcumulus-pezpallet-dmp-queue = { default-features = false, path = "pezcumulus/pezpallets/dmp-queue", version = "0.7.0" }
 pezcumulus-pezpallet-session-benchmarking = { path = "pezcumulus/pezpallets/session-benchmarking", version = "9.0.0", default-features = false }
 pezcumulus-pezpallet-solo-to-para = { path = "pezcumulus/pezpallets/solo-to-para", version = "0.7.0", default-features = false }
 pezcumulus-pezpallet-teyrchain-system = { path = "pezcumulus/pezpallets/teyrchain-system", version = "0.7.0", default-features = false }
@@ -988,10 +988,11 @@ pezcumulus-test-service = { path = "pezcumulus/test/service", version = "0.1.0"
 pezcumulus-zombienet-sdk-helpers = { path = "pezcumulus/zombienet/zombienet-sdk-helpers", version = "0.1.0", default-features = false }
 pezframe-benchmarking = { path = "bizinikiwi/pezframe/benchmarking", version = "28.0.0", default-features = false }
 pezframe-benchmarking-cli = { path = "bizinikiwi/utils/pezframe/benchmarking-cli", version = "32.0.0", default-features = false }
-pezframe-benchmarking-pezpallet-pov = { default-features = false, path = "bizinikiwi/pezframe/benchmarking/pov" }
+pezframe-benchmarking-pezpallet-pov = { default-features = false, version = "18.0.0", path = "bizinikiwi/pezframe/benchmarking/pov" }
 pezframe-election-provider-solution-type = { path = "bizinikiwi/pezframe/election-provider-support/solution-type", version = "13.0.0", default-features = false }
 pezframe-election-provider-support = { path = "bizinikiwi/pezframe/election-provider-support", version = "28.0.0", default-features = false }
 pezframe-executive = { path = "bizinikiwi/pezframe/executive", version = "28.0.0", default-features = false }
+pezframe-metadata = { path = "bizinikiwi/pezframe/pezframe-metadata", version = "23.0.1", default-features = false }
 pezframe-metadata-hash-extension = { path = "bizinikiwi/pezframe/metadata-hash-extension", version = "0.1.0", default-features = false }
 pezframe-support = { path = "bizinikiwi/pezframe/support", version = "28.0.0", default-features = false }
 pezframe-support-procedural = { path = "bizinikiwi/pezframe/support/procedural", version = "23.0.0", default-features = false }
@@ -1006,17 +1007,17 @@ pezmmr-gadget = { path = "bizinikiwi/client/merkle-mountain-range", version = "2
 pezmmr-rpc = { path = "bizinikiwi/client/merkle-mountain-range/rpc", version = "28.0.0", default-features = false }
 pezpallet-ah-ops = { path = "pezcumulus/pezpallets/ah-ops", version = "0.1.0", default-features = false }
 pezpallet-alliance = { path = "bizinikiwi/pezframe/alliance", version = "27.0.0", default-features = false }
-pezpallet-asset-conversion = { path = "bizinikiwi/pezframe/asset-conversion", default-features = false }
-pezpallet-asset-conversion-ops = { path = "bizinikiwi/pezframe/asset-conversion/ops", default-features = false }
-pezpallet-asset-conversion-tx-payment = { path = "bizinikiwi/pezframe/transaction-payment/asset-conversion-tx-payment", default-features = false }
+pezpallet-asset-conversion = { path = "bizinikiwi/pezframe/asset-conversion", version = "10.0.0", default-features = false }
+pezpallet-asset-conversion-ops = { path = "bizinikiwi/pezframe/asset-conversion/ops", version = "0.1.0", default-features = false }
+pezpallet-asset-conversion-tx-payment = { path = "bizinikiwi/pezframe/transaction-payment/asset-conversion-tx-payment", version = "10.0.0", default-features = false }
 pezpallet-asset-rate = { path = "bizinikiwi/pezframe/asset-rate", version = "7.0.0", default-features = false }
 pezpallet-asset-rewards = { path = "bizinikiwi/pezframe/asset-rewards", version = "0.1.0", default-features = false }
 pezpallet-asset-tx-payment = { path = "bizinikiwi/pezframe/transaction-payment/asset-tx-payment", version = "28.0.0", default-features = false }
 pezpallet-assets = { path = "bizinikiwi/pezframe/assets", version = "29.1.0", default-features = false }
-pezpallet-assets-freezer = { path = "bizinikiwi/pezframe/assets-freezer", version = "0.1.0", default-features = false }
+pezpallet-assets-freezer = { path = "bizinikiwi/pezframe/assets-freezer", version = "0.44.0", default-features = false }
 pezpallet-assets-holder = { path = "bizinikiwi/pezframe/assets-holder", version = "0.1.0", default-features = false }
 pezpallet-assets-precompiles = { path = "bizinikiwi/pezframe/assets/precompiles", version = "0.1.0", default-features = false }
-pezpallet-atomic-swap = { default-features = false, path = "bizinikiwi/pezframe/atomic-swap" }
+pezpallet-atomic-swap = { default-features = false, version = "28.0.0", path = "bizinikiwi/pezframe/atomic-swap" }
 pezpallet-aura = { path = "bizinikiwi/pezframe/aura", version = "27.0.0", default-features = false }
 pezpallet-authority-discovery = { path = "bizinikiwi/pezframe/authority-discovery", version = "28.0.0", default-features = false }
 pezpallet-authorship = { path = "bizinikiwi/pezframe/authorship", version = "28.0.0", default-features = false }
@@ -1038,7 +1039,7 @@ pezpallet-collective = { path = "bizinikiwi/pezframe/collective", version = "28.
 pezpallet-collective-content = { path = "pezcumulus/teyrchains/pezpallets/collective-content", version = "0.6.0", default-features = false }
 pezpallet-contracts = { path = "bizinikiwi/pezframe/contracts", version = "27.0.0", default-features = false }
 pezpallet-contracts-fixtures = { path = "bizinikiwi/pezframe/contracts/fixtures", version = "1.0.0", default-features = false }
-pezpallet-contracts-mock-network = { default-features = false, path = "bizinikiwi/pezframe/contracts/mock-network" }
+pezpallet-contracts-mock-network = { default-features = false, version = "3.0.0", path = "bizinikiwi/pezframe/contracts/mock-network" }
 pezpallet-contracts-proc-macro = { path = "bizinikiwi/pezframe/contracts/proc-macro", version = "18.0.0", default-features = false }
 pezpallet-contracts-uapi = { path = "bizinikiwi/pezframe/contracts/uapi", version = "5.0.0", default-features = false }
 pezpallet-conviction-voting = { path = "bizinikiwi/pezframe/conviction-voting", version = "28.0.0", default-features = false }
@@ -1046,6 +1047,7 @@ pezpallet-core-fellowship = { path = "bizinikiwi/pezframe/core-fellowship", vers
 pezpallet-default-config-example = { path = "bizinikiwi/pezframe/examples/default-config", version = "10.0.0", default-features = false }
 pezpallet-delegated-staking = { path = "bizinikiwi/pezframe/delegated-staking", version = "1.0.0", default-features = false }
 pezpallet-democracy = { path = "bizinikiwi/pezframe/democracy", version = "28.0.0", default-features = false }
+pezpallet-derivatives = { path = "bizinikiwi/pezframe/derivatives", version = "1.0.0", default-features = false }
 pezpallet-dev-mode = { path = "bizinikiwi/pezframe/examples/dev-mode", version = "10.0.0", default-features = false }
 pezpallet-dummy-dim = { path = "bizinikiwi/pezframe/dummy-dim", version = "1.0.0", default-features = false }
 pezpallet-election-provider-multi-block = { path = "bizinikiwi/pezframe/election-provider-multi-block", version = "0.9.0", default-features = false }
@@ -1070,13 +1072,13 @@ pezpallet-identity = { path = "bizinikiwi/pezframe/identity", version = "29.0.0"
 pezpallet-im-online = { path = "bizinikiwi/pezframe/im-online", version = "27.0.0", default-features = false }
 pezpallet-indices = { path = "bizinikiwi/pezframe/indices", version = "28.0.0", default-features = false }
 pezpallet-insecure-randomness-collective-flip = { path = "bizinikiwi/pezframe/insecure-randomness-collective-flip", version = "16.0.0", default-features = false }
-pezpallet-lottery = { default-features = false, path = "bizinikiwi/pezframe/lottery" }
+pezpallet-lottery = { default-features = false, version = "28.0.0", path = "bizinikiwi/pezframe/lottery" }
 pezpallet-membership = { path = "bizinikiwi/pezframe/membership", version = "28.0.0", default-features = false }
 pezpallet-message-queue = { path = "bizinikiwi/pezframe/message-queue", version = "31.0.0", default-features = false }
-pezpallet-meta-tx = { path = "bizinikiwi/pezframe/meta-tx", version = "0.1.0", default-features = false }
+pezpallet-meta-tx = { path = "bizinikiwi/pezframe/meta-tx", version = "0.44.0", default-features = false }
 pezpallet-migrations = { path = "bizinikiwi/pezframe/migrations", version = "1.0.0", default-features = false }
 pezpallet-minimal-template = { path = "templates/minimal/pezpallets/template", version = "0.0.0", default-features = false }
-pezpallet-mixnet = { default-features = false, path = "bizinikiwi/pezframe/mixnet" }
+pezpallet-mixnet = { default-features = false, version = "0.4.0", path = "bizinikiwi/pezframe/mixnet" }
 pezpallet-mmr = { path = "bizinikiwi/pezframe/merkle-mountain-range", version = "27.0.0", default-features = false }
 pezpallet-multi-asset-bounties = { path = "bizinikiwi/pezframe/multi-asset-bounties", version = "1.0.0", default-features = false }
 pezpallet-multisig = { path = "bizinikiwi/pezframe/multisig", version = "28.0.0", default-features = false }
@@ -1084,7 +1086,7 @@ pezpallet-nft-fractionalization = { path = "bizinikiwi/pezframe/nft-fractionaliz
 pezpallet-nfts = { path = "bizinikiwi/pezframe/nfts", version = "22.0.0", default-features = false }
 pezpallet-nfts-runtime-api = { path = "bizinikiwi/pezframe/nfts/runtime-api", version = "14.0.0", default-features = false }
 pezpallet-nis = { path = "bizinikiwi/pezframe/nis", version = "28.0.0", default-features = false }
-pezpallet-node-authorization = { default-features = false, path = "bizinikiwi/pezframe/node-authorization" }
+pezpallet-node-authorization = { default-features = false, version = "28.0.0", path = "bizinikiwi/pezframe/node-authorization" }
 pezpallet-nomination-pools = { path = "bizinikiwi/pezframe/nomination-pools", version = "25.0.0", default-features = false }
 pezpallet-nomination-pools-benchmarking = { path = "bizinikiwi/pezframe/nomination-pools/benchmarking", version = "26.0.0", default-features = false }
 pezpallet-nomination-pools-runtime-api = { path = "bizinikiwi/pezframe/nomination-pools/runtime-api", version = "23.0.0", default-features = false }
@@ -1092,25 +1094,25 @@ pezpallet-offences = { path = "bizinikiwi/pezframe/offences", version = "27.0.0"
 pezpallet-offences-benchmarking = { path = "bizinikiwi/pezframe/offences/benchmarking", version = "28.0.0", default-features = false }
 pezpallet-origin-restriction = { path = "bizinikiwi/pezframe/origin-restriction", version = "1.0.0", default-features = false }
 pezpallet-paged-list = { path = "bizinikiwi/pezframe/paged-list", version = "0.6.0", default-features = false }
-pezpallet-parameters = { path = "bizinikiwi/pezframe/parameters", version = "0.1.0", default-features = false }
+pezpallet-parameters = { path = "bizinikiwi/pezframe/parameters", version = "0.44.0", default-features = false }
 pezpallet-people = { path = "bizinikiwi/pezframe/people", version = "1.0.0", default-features = false }
 pezpallet-preimage = { path = "bizinikiwi/pezframe/preimage", version = "28.0.0", default-features = false }
 pezpallet-proxy = { path = "bizinikiwi/pezframe/proxy", version = "28.0.0", default-features = false }
 pezpallet-ranked-collective = { path = "bizinikiwi/pezframe/ranked-collective", version = "28.0.0", default-features = false }
 pezpallet-recovery = { path = "bizinikiwi/pezframe/recovery", version = "28.0.0", default-features = false }
 pezpallet-referenda = { path = "bizinikiwi/pezframe/referenda", version = "28.0.0", default-features = false }
-pezpallet-remark = { default-features = false, path = "bizinikiwi/pezframe/remark" }
+pezpallet-remark = { default-features = false, version = "28.0.0", path = "bizinikiwi/pezframe/remark" }
 pezpallet-revive = { path = "bizinikiwi/pezframe/revive", version = "0.1.0", default-features = false }
 pezpallet-revive-eth-rpc = { path = "bizinikiwi/pezframe/revive/rpc", version = "0.1.0", default-features = false }
 pezpallet-revive-fixtures = { path = "bizinikiwi/pezframe/revive/fixtures", version = "0.1.0", default-features = false }
-pezpallet-revive-proc-macro = { path = "bizinikiwi/pezframe/revive/proc-macro", version = "0.1.0", default-features = false }
-pezpallet-revive-uapi = { path = "bizinikiwi/pezframe/revive/uapi", version = "0.1.0", default-features = false }
-pezpallet-root-offences = { default-features = false, path = "bizinikiwi/pezframe/root-offences" }
+pezpallet-revive-proc-macro = { path = "bizinikiwi/pezframe/revive/proc-macro", version = "0.44.0", default-features = false }
+pezpallet-revive-uapi = { path = "bizinikiwi/pezframe/revive/uapi", version = "0.44.0", default-features = false }
+pezpallet-root-offences = { default-features = false, version = "25.0.0", path = "bizinikiwi/pezframe/root-offences" }
 pezpallet-root-testing = { path = "bizinikiwi/pezframe/root-testing", version = "4.0.0", default-features = false }
-pezpallet-safe-mode = { default-features = false, path = "bizinikiwi/pezframe/safe-mode" }
+pezpallet-safe-mode = { default-features = false, version = "9.0.0", path = "bizinikiwi/pezframe/safe-mode" }
 pezpallet-salary = { path = "bizinikiwi/pezframe/salary", version = "13.0.0", default-features = false }
 pezpallet-scheduler = { path = "bizinikiwi/pezframe/scheduler", version = "29.0.0", default-features = false }
-pezpallet-scored-pool = { default-features = false, path = "bizinikiwi/pezframe/scored-pool" }
+pezpallet-scored-pool = { default-features = false, version = "28.0.0", path = "bizinikiwi/pezframe/scored-pool" }
 pezpallet-session = { path = "bizinikiwi/pezframe/session", version = "28.0.0", default-features = false }
 pezpallet-session-benchmarking = { path = "bizinikiwi/pezframe/session/benchmarking", version = "28.0.0", default-features = false }
 pezpallet-skip-feeless-payment = { path = "bizinikiwi/pezframe/transaction-payment/skip-feeless-payment", version = "3.0.0", default-features = false }
@@ -1141,7 +1143,7 @@ pezpallet-token-wrapper = { path = "pezcumulus/teyrchains/pezpallets/token-wrapp
 bizinikiwi-bip39 = { path = "bizinikiwi/utils/bizinikiwi-bip39", version = "0.4.7", default-features = false }
 bizinikiwi-build-script-utils = { path = "bizinikiwi/utils/build-script-utils", version = "11.0.0", default-features = false }
 bizinikiwi-cli-test-utils = { path = "bizinikiwi/test-utils/cli", version = "0.1.0" }
-bizinikiwi-frame-rpc-support = { default-features = false, path = "bizinikiwi/utils/pezframe/rpc/support" }
+bizinikiwi-frame-rpc-support = { default-features = false, path = "bizinikiwi/utils/pezframe/rpc/support", version = "29.0.0" }
 bizinikiwi-frame-rpc-system = { path = "bizinikiwi/utils/pezframe/rpc/system", version = "28.0.0", default-features = false }
 bizinikiwi-rpc-client = { path = "bizinikiwi/utils/pezframe/rpc/client", version = "0.33.0", default-features = false }
 bizinikiwi-state-trie-migration-rpc = { path = "bizinikiwi/utils/pezframe/rpc/state-trie-migration-rpc", version = "27.0.0", default-features = false }
@@ -1158,10 +1160,10 @@ parking_lot = { version = "0.12.1", default-features = false }
 partial_sort = { version = "0.2.0" }
 paste = { version = "1.0.15", default-features = false }
 pbkdf2 = { version = "0.12.2", default-features = false }
-people-pezkuwichain-emulated-chain = { path = "pezcumulus/teyrchains/integration-tests/emulated/chains/teyrchains/people/people-pezkuwichain" }
-people-pezkuwichain-runtime = { path = "pezcumulus/teyrchains/runtimes/people/people-pezkuwichain" }
-people-zagros-emulated-chain = { path = "pezcumulus/teyrchains/integration-tests/emulated/chains/teyrchains/people/people-zagros" }
-people-zagros-runtime = { path = "pezcumulus/teyrchains/runtimes/people/people-zagros" }
+people-pezkuwichain-emulated-chain = { version = "0.1.0", path = "pezcumulus/teyrchains/integration-tests/emulated/chains/teyrchains/people/people-pezkuwichain" }
+people-pezkuwichain-runtime = { version = "0.1.0", path = "pezcumulus/teyrchains/runtimes/people/people-pezkuwichain" }
+people-zagros-emulated-chain = { version = "0.1.0", path = "pezcumulus/teyrchains/integration-tests/emulated/chains/teyrchains/people/people-zagros" }
+people-zagros-runtime = { version = "0.1.0", path = "pezcumulus/teyrchains/runtimes/people/people-zagros" }
 pest = { version = "2.7" }
 pest_derive = { version = "2.7" }
 pez-penpal-emulated-chain = { path = "pezcumulus/teyrchains/integration-tests/emulated/chains/teyrchains/testing/penpal", version = "0.0.0" }
@@ -1244,7 +1246,7 @@ pezpallet-staking-async-runtime-api = { path = "bizinikiwi/pezframe/staking-asyn
 pezpallet-staking-async-teyrchain-runtime = { path = "bizinikiwi/pezframe/staking-async/runtimes/teyrchain", version = "0.15.0" }
 pezpallet-staking-runtime-api = { path = "bizinikiwi/pezframe/staking/runtime-api", version = "14.0.0", default-features = false }
 pezpallet-state-trie-migration = { path = "bizinikiwi/pezframe/state-trie-migration", version = "29.0.0", default-features = false }
-pezpallet-statement = { default-features = false, path = "bizinikiwi/pezframe/statement" }
+pezpallet-statement = { default-features = false, version = "10.0.0", path = "bizinikiwi/pezframe/statement" }
 pezpallet-sudo = { path = "bizinikiwi/pezframe/sudo", version = "28.0.0", default-features = false }
 pezpallet-template = { path = "templates/solochain/pezpallets/template", version = "0.0.0", default-features = false }
 pezpallet-timestamp = { path = "bizinikiwi/pezframe/timestamp", version = "27.0.0", default-features = false }
@@ -1252,9 +1254,9 @@ pezpallet-tips = { path = "bizinikiwi/pezframe/tips", version = "27.0.0", defaul
 pezpallet-transaction-payment = { path = "bizinikiwi/pezframe/transaction-payment", version = "28.0.0", default-features = false }
 pezpallet-transaction-payment-rpc = { path = "bizinikiwi/pezframe/transaction-payment/rpc", version = "30.0.0", default-features = false }
 pezpallet-transaction-payment-rpc-runtime-api = { path = "bizinikiwi/pezframe/transaction-payment/rpc/runtime-api", version = "28.0.0", default-features = false }
-pezpallet-transaction-storage = { default-features = false, path = "bizinikiwi/pezframe/transaction-storage" }
+pezpallet-transaction-storage = { default-features = false, version = "27.0.0", path = "bizinikiwi/pezframe/transaction-storage" }
 pezpallet-treasury = { path = "bizinikiwi/pezframe/treasury", version = "27.0.0", default-features = false }
-pezpallet-tx-pause = { default-features = false, path = "bizinikiwi/pezframe/tx-pause" }
+pezpallet-tx-pause = { default-features = false, version = "9.0.0", path = "bizinikiwi/pezframe/tx-pause" }
 pezpallet-uniques = { path = "bizinikiwi/pezframe/uniques", version = "28.0.0", default-features = false }
 pezpallet-utility = { path = "bizinikiwi/pezframe/utility", version = "28.0.0", default-features = false }
 pezpallet-verify-signature = { path = "bizinikiwi/pezframe/verify-signature", version = "1.0.0", default-features = false }
@@ -1297,7 +1299,7 @@ pezsc-network = { path = "bizinikiwi/client/network", version = "0.34.0", defaul
 pezsc-network-common = { path = "bizinikiwi/client/network/common", version = "0.33.0", default-features = false }
 pezsc-network-gossip = { path = "bizinikiwi/client/network-gossip", version = "0.34.0", default-features = false }
 pezsc-network-light = { path = "bizinikiwi/client/network/light", version = "0.33.0", default-features = false }
-pezsc-network-statement = { default-features = false, path = "bizinikiwi/client/network/statement" }
+pezsc-network-statement = { default-features = false, path = "bizinikiwi/client/network/statement", version = "0.16.0" }
 pezsc-network-sync = { path = "bizinikiwi/client/network/sync", version = "0.33.0", default-features = false }
 pezsc-network-test = { path = "bizinikiwi/client/network/test", version = "0.8.0" }
 pezsc-network-transactions = { path = "bizinikiwi/client/network/transactions", version = "0.33.0", default-features = false }
@@ -1313,7 +1315,7 @@ pezsc-runtime-utilities = { path = "bizinikiwi/client/runtime-utilities", versio
 pezsc-service = { path = "bizinikiwi/client/service", version = "0.35.0", default-features = false }
 pezsc-service-test = { path = "bizinikiwi/client/service/test", version = "2.0.0" }
 pezsc-state-db = { path = "bizinikiwi/client/state-db", version = "0.30.0", default-features = false }
-pezsc-statement-store = { default-features = false, path = "bizinikiwi/client/statement-store" }
+pezsc-statement-store = { default-features = false, version = "10.0.0", path = "bizinikiwi/client/statement-store" }
 pezsc-storage-monitor = { path = "bizinikiwi/client/storage-monitor", version = "0.16.0", default-features = false }
 pezsc-sync-state-rpc = { path = "bizinikiwi/client/sync-state-rpc", version = "0.34.0", default-features = false }
 pezsc-sysinfo = { path = "bizinikiwi/client/sysinfo", version = "27.0.0", default-features = false }
@@ -1364,9 +1366,9 @@ pezsp-consensus-pow = { path = "bizinikiwi/primitives/consensus/pow", version =
 pezsp-consensus-sassafras = { path = "bizinikiwi/primitives/consensus/sassafras", version = "0.3.4-dev", default-features = false }
 pezsp-consensus-slots = { path = "bizinikiwi/primitives/consensus/slots", version = "0.32.0", default-features = false }
 pezsp-core = { path = "bizinikiwi/primitives/core", version = "28.0.0", default-features = false }
-pezsp-core-hashing = { default-features = false, path = "bizinikiwi/deprecated/hashing" }
-pezsp-core-hashing-proc-macro = { default-features = false, path = "bizinikiwi/deprecated/hashing/proc-macro" }
-pezsp-crypto-ec-utils = { default-features = false, path = "bizinikiwi/primitives/crypto/ec-utils" }
+pezsp-core-hashing = { default-features = false, version = "15.0.0", path = "bizinikiwi/deprecated/hashing" }
+pezsp-core-hashing-proc-macro = { default-features = false, version = "15.0.0", path = "bizinikiwi/deprecated/hashing/proc-macro" }
+pezsp-crypto-ec-utils = { default-features = false, version = "0.10.0", path = "bizinikiwi/primitives/crypto/ec-utils" }
 pezsp-crypto-hashing = { path = "bizinikiwi/primitives/crypto/hashing", version = "0.1.0", default-features = false }
 pezsp-crypto-hashing-proc-macro = { path = "bizinikiwi/primitives/crypto/hashing/proc-macro", version = "0.1.0", default-features = false }
 pezsp-database = { path = "bizinikiwi/primitives/database", version = "10.0.0", default-features = false }
@@ -1420,14 +1422,14 @@ proc-macro-error2 = { version = "2.0.0" }
 proc-macro-warning = { version = "1.0.0", default-features = false }
 proc-macro2 = { version = "1.0.86" }
 procfs = { version = "0.16.0" }
-prom-metrics-parser = { package = "zombienet-prom-metrics-parser", path = "vendor/pezkuwi-zombienet-sdk/crates/prom-metrics-parser" }
+prom-metrics-parser = { package = "pezkuwi-zombienet-prom-metrics-parser", path = "vendor/pezkuwi-zombienet-sdk/crates/prom-metrics-parser", version = "0.44.0" }
 prometheus = { version = "0.13.0", default-features = false }
 prometheus-endpoint = { path = "bizinikiwi/utils/prometheus", default-features = false, package = "bizinikiwi-prometheus-endpoint", version = "0.17.0" }
 prometheus-parse = { version = "0.2.2" }
 proptest = { version = "1" }
 prost = { version = "0.12.4" }
 prost-build = { version = "0.13.2" }
-provider = { package = "zombienet-provider", path = "vendor/pezkuwi-zombienet-sdk/crates/provider" }
+provider = { package = "pezkuwi-zombienet-provider", path = "vendor/pezkuwi-zombienet-sdk/crates/provider", version = "0.44.0" }
 pyroscope = { version = "0.5.8" }
 pyroscope_pprofrs = { version = "0.2.8" }
 quick_cache = { version = "0.3" }
@@ -1441,9 +1443,9 @@ rand_pcg = { version = "0.3.1" }
 rbtag = { version = "0.3" }
 ref-cast = { version = "1.0.23" }
 regex = { version = "1.10.2" }
-relay-bizinikiwi-client = { path = "pezbridges/relays/client-bizinikiwi" }
-relay-utils = { path = "pezbridges/relays/utils" }
-remote-externalities = { path = "bizinikiwi/utils/pezframe/remote-externalities", default-features = false, package = "frame-remote-externalities" }
+relay-bizinikiwi-client = { version = "0.1.0", path = "pezbridges/relays/client-bizinikiwi" }
+relay-utils = { version = "0.1.0", path = "pezbridges/relays/utils" }
+remote-externalities = { path = "bizinikiwi/utils/pezframe/remote-externalities", version = "0.35.0", default-features = false, package = "pezframe-remote-externalities" }
 reqwest = { version = "0.12.9" }
 revm = { version = "27.0.2", default-features = false }
 ripemd = { version = "0.1.3", default-features = false }
@@ -1518,24 +1520,24 @@ pezkuwi-subxt-rpcs = { path = "vendor/pezkuwi-subxt/rpcs", version = "0.44.0" }
 pezkuwi-subxt-signer = { path = "vendor/pezkuwi-subxt/signer", version = "0.44.0" }
 pezkuwi-subxt-utils-fetchmetadata = { path = "vendor/pezkuwi-subxt/utils/fetch-metadata", version = "0.44.0" }
 pezkuwi-subxt-utils-stripmetadata = { path = "vendor/pezkuwi-subxt/utils/strip-metadata", version = "0.44.0" }
-support = { package = "zombienet-support", path = "vendor/pezkuwi-zombienet-sdk/crates/support" }
+support = { package = "pezkuwi-zombienet-support", path = "vendor/pezkuwi-zombienet-sdk/crates/support", version = "0.44.0" }
 syn = { version = "2.0.87" }
 sysinfo = { version = "0.30" }
 tar = { version = "0.4" }
 tempfile = { version = "3.8.1" }
-teyrchain-info = { path = "pezcumulus/teyrchains/pezpallets/teyrchain-info", default-features = false, package = "pezstaging-teyrchain-info" }
-teyrchain-template-runtime = { path = "templates/teyrchain/runtime" }
+teyrchain-info = { path = "pezcumulus/teyrchains/pezpallets/teyrchain-info", version = "0.7.0", default-features = false, package = "pezstaging-teyrchain-info" }
+teyrchain-template-runtime = { version = "0.0.0", path = "templates/teyrchain/runtime" }
 teyrchains-common = { path = "pezcumulus/teyrchains/common", version = "7.0.0", default-features = false }
-teyrchains-relay = { path = "pezbridges/relays/teyrchains" }
-teyrchains-runtimes-test-utils = { path = "pezcumulus/teyrchains/runtimes/test-utils", default-features = false }
+teyrchains-relay = { version = "0.1.0", path = "pezbridges/relays/teyrchains" }
+teyrchains-runtimes-test-utils = { path = "pezcumulus/teyrchains/runtimes/test-utils", version = "7.0.0", default-features = false }
 # pinned test-case to 3.3.1 because they support only the latest stable version of rust
 peztest-runtime-constants = { path = "pezkuwi/runtime/test-runtime/constants", version = "1.0.0", default-features = false }
 test-case = { version = "=3.3.1" }
 test-log = { version = "0.2.14" }
 test-pezpallet = { path = "bizinikiwi/pezframe/support/test/pezpallet", default-features = false, package = "pezframe-support-test-pezpallet" }
-test-teyrchain-adder = { path = "pezkuwi/teyrchain/test-teyrchains/adder" }
-test-teyrchain-halt = { path = "pezkuwi/teyrchain/test-teyrchains/halt" }
-test-teyrchain-undying = { path = "pezkuwi/teyrchain/test-teyrchains/undying" }
+test-teyrchain-adder = { version = "1.0.0", path = "pezkuwi/teyrchain/test-teyrchains/adder" }
+test-teyrchain-halt = { version = "1.0.0", path = "pezkuwi/teyrchain/test-teyrchains/halt" }
+test-teyrchain-undying = { version = "1.0.0", path = "pezkuwi/teyrchain/test-teyrchains/undying" }
 testnet-teyrchains-constants = { path = "pezcumulus/teyrchains/runtimes/constants", version = "1.0.0", default-features = false }
 thiserror = { version = "1.0.69" }
 thousands = { version = "0.2.0" }
@@ -1559,7 +1561,7 @@ tracing-core = { version = "0.1.32", default-features = false }
 tracing-futures = { version = "0.2.4" }
 tracing-log = { version = "0.2.0" }
 tracing-subscriber = { version = "0.3.20" }
-tracking-allocator = { path = "pezkuwi/node/tracking-allocator", default-features = false, package = "pezstaging-tracking-allocator" }
+tracking-allocator = { version = "2.0.0", path = "pezkuwi/node/tracking-allocator", default-features = false, package = "pezstaging-tracking-allocator" }
 trie-bench = { version = "=0.42.0" }
 trie-db = { version = "0.30.0", default-features = false }
 trie-root = { version = "0.18.0", default-features = false }
@@ -1568,7 +1570,7 @@ trybuild = { version = "1.0.103" }
 tt-call = { version = "1.0.8" }
 tuplex = { version = "0.1", default-features = false }
 twox-hash = { version = "1.6.3", default-features = false }
-txtesttool = { path = "bizinikiwi/utils/txtesttool", default-features = false, package = "bizinikiwi-txtesttool" }
+txtesttool = { path = "bizinikiwi/utils/txtesttool", version = "0.7.0", default-features = false, package = "bizinikiwi-txtesttool" }
 unsigned-varint = { version = "0.7.2" }
 url = { version = "2.5.4" }
 uuid = { version = "1.4" }
@@ -1589,24 +1591,27 @@ wat = { version = "1.0.0" }
 web-sys = { version = "0.3.70" }
 web-time = { version = "1.1", default-features = false }
 x25519-dalek = { version = "2.0" }
-xcm = { path = "pezkuwi/xcm", default-features = false, package = "pezstaging-xcm" }
-xcm-builder = { path = "pezkuwi/xcm/xcm-builder", default-features = false, package = "pezstaging-xcm-builder" }
-xcm-executor = { path = "pezkuwi/xcm/xcm-executor", default-features = false, package = "pezstaging-xcm-executor" }
+xcm = { path = "pezkuwi/xcm", version = "7.0.1", default-features = false, package = "pezstaging-xcm" }
+xcm-builder = { path = "pezkuwi/xcm/xcm-builder", version = "7.0.0", default-features = false, package = "pezstaging-xcm-builder" }
+xcm-executor = { path = "pezkuwi/xcm/xcm-executor", version = "7.0.0", default-features = false, package = "pezstaging-xcm-executor" }
 xcm-pez-docs = { path = "pezkuwi/xcm/docs", version = "0.1.0" }
 xcm-pez-emulator = { path = "pezcumulus/xcm/xcm-pez-emulator", version = "0.5.0", default-features = false }
 xcm-pez-procedural = { path = "pezkuwi/xcm/procedural", version = "7.0.0", default-features = false }
 xcm-pez-simulator = { path = "pezkuwi/xcm/xcm-pez-simulator", version = "7.0.0", default-features = false }
 xcm-runtime-pezapis = { path = "pezkuwi/xcm/xcm-runtime-pezapis", version = "0.1.1", default-features = false }
-yet-another-teyrchain-runtime = { path = "pezcumulus/teyrchains/runtimes/testing/yet-another-teyrchain" }
-zagros-emulated-chain = { path = "pezcumulus/teyrchains/integration-tests/emulated/chains/relays/zagros", default-features = false }
-zagros-runtime = { path = "pezkuwi/runtime/zagros", default-features = false }
-zagros-runtime-constants = { path = "pezkuwi/runtime/zagros/constants", default-features = false }
-zagros-system-emulated-network = { path = "pezcumulus/teyrchains/integration-tests/emulated/networks/zagros-system" }
+yet-another-teyrchain-runtime = { version = "0.6.0", path = "pezcumulus/teyrchains/runtimes/testing/yet-another-teyrchain" }
+zagros-emulated-chain = { version = "0.0.0", path = "pezcumulus/teyrchains/integration-tests/emulated/chains/relays/zagros", default-features = false }
+zagros-runtime = { path = "pezkuwi/runtime/zagros", default-features = false, version = "7.0.0" }
+zagros-runtime-constants = { path = "pezkuwi/runtime/zagros/constants", default-features = false, version = "7.0.0" }
+zagros-system-emulated-network = { version = "0.0.0", path = "pezcumulus/teyrchains/integration-tests/emulated/networks/zagros-system" }
 zeroize = { version = "1.7.0", default-features = false }
 # Pezkuwi-zombienet-sdk (vendored)
-zombienet-configuration = { path = "vendor/pezkuwi-zombienet-sdk/crates/configuration", version = "0.44.0" }
-zombienet-orchestrator = { path = "vendor/pezkuwi-zombienet-sdk/crates/orchestrator", version = "0.44.0" }
-zombienet-sdk = { path = "vendor/pezkuwi-zombienet-sdk/crates/sdk", version = "0.44.0" }
+pezkuwi-zombienet-configuration = { path = "vendor/pezkuwi-zombienet-sdk/crates/configuration", version = "0.44.0" }
+pezkuwi-zombienet-orchestrator = { path = "vendor/pezkuwi-zombienet-sdk/crates/orchestrator", version = "0.44.0" }
+pezkuwi-zombienet-prom-metrics-parser = { path = "vendor/pezkuwi-zombienet-sdk/crates/prom-metrics-parser", version = "0.44.0" }
+pezkuwi-zombienet-provider = { path = "vendor/pezkuwi-zombienet-sdk/crates/provider", version = "0.44.0" }
+pezkuwi-zombienet-sdk = { path = "vendor/pezkuwi-zombienet-sdk/crates/sdk", version = "0.44.0" }
+pezkuwi-zombienet-support = { path = "vendor/pezkuwi-zombienet-sdk/crates/support", version = "0.44.0" }
 zstd = { version = "0.12.4", default-features = false }
 
 [profile.release]
diff --git a/bizinikiwi/bin/node/cli/Cargo.toml b/bizinikiwi/bin/node/cli/Cargo.toml
index 46849a18..63066807 100644
--- a/bizinikiwi/bin/node/cli/Cargo.toml
+++ b/bizinikiwi/bin/node/cli/Cargo.toml
@@ -61,20 +61,23 @@ rand = { workspace = true, default-features = true }
 serde = { features = ["derive"], workspace = true, default-features = true }
 serde_json = { workspace = true, default-features = true }
 
+# For storage benchmarks
+pezframe-benchmarking-cli = { workspace = true, optional = true }
+
 # The Pezkuwi-SDK:
 pezkuwi-sdk = { features = [
 	"bizinikiwi-build-script-utils",
 	"bizinikiwi-frame-rpc-support",
 	"bizinikiwi-frame-rpc-system",
-	"bizinikiwi-prometheus-endpoint",
+	"prometheus-endpoint",
 	"bizinikiwi-rpc-client",
 	"bizinikiwi-state-trie-migration-rpc",
 	"bizinikiwi-wasm-builder",
-	"frame-remote-externalities",
+	"remote-externalities",
 	"pez-fork-tree",
 	"pez-generate-bags",
 	"pez-subkey",
-	"pez-tracing-gum",
+	"gum",
 	"pezframe-benchmarking-cli",
 	"pezframe-support-procedural-tools",
 	"pezmmr-gadget",
@@ -150,9 +153,9 @@ pezkuwi-sdk = { features = [
 	"pezsp-timestamp",
 	"pezsp-tracing",
 	"pezsp-transaction-storage-proof",
-	"pezstaging-chain-spec-builder",
-	"pezstaging-node-inspect",
-	"pezstaging-tracking-allocator",
+	"chain-spec-builder",
+	"node-inspect",
+	"tracking-allocator",
 	"std",
 ], workspace = true, default-features = true }
 
@@ -221,6 +224,7 @@ runtime-benchmarks = [
 	"pezsp-keyring/runtime-benchmarks",
 	"pezsp-runtime/runtime-benchmarks",
 ]
+storage-benchmark = ["pezframe-benchmarking-cli/storage-benchmark"]
 try-runtime = [
 	"bizinikiwi-cli-test-utils/try-runtime",
 	"pez-kitchensink-runtime/try-runtime",
diff --git a/bizinikiwi/bin/node/cli/src/command.rs b/bizinikiwi/bin/node/cli/src/command.rs
index 1dbacbc8..4ebd2d20 100644
--- a/bizinikiwi/bin/node/cli/src/command.rs
+++ b/bizinikiwi/bin/node/cli/src/command.rs
@@ -125,12 +125,7 @@ pub fn run() -> Result<()> {
 						let partial = new_partial(&config, None)?;
 						cmd.run(partial.client)
 					},
-					#[cfg(not(feature = "runtime-benchmarks"))]
-					BenchmarkCmd::Storage(_) => Err(
-						"Storage benchmarking can be enabled with `--features runtime-benchmarks`."
-							.into(),
-					),
-					#[cfg(feature = "runtime-benchmarks")]
+					#[cfg(feature = "storage-benchmark")]
 					BenchmarkCmd::Storage(cmd) => {
 						// ensure that we keep the task manager alive
 						let partial = new_partial(&config, None)?;
diff --git a/bizinikiwi/bin/utils/chain-spec-builder/Cargo.toml b/bizinikiwi/bin/utils/chain-spec-builder/Cargo.toml
index 9ae0cdb5..e334e7f6 100644
--- a/bizinikiwi/bin/utils/chain-spec-builder/Cargo.toml
+++ b/bizinikiwi/bin/utils/chain-spec-builder/Cargo.toml
@@ -19,7 +19,7 @@ targets = ["x86_64-unknown-linux-gnu"]
 
 [[bin]]
 path = "bin/main.rs"
-name = "chain-spec-builder"
+name = "pezstaging-chain-spec-builder"
 
 [lib]
 # Docs tests are not needed since the code samples that would be executed
@@ -39,7 +39,7 @@ serde = { workspace = true, default-features = true }
 serde_json = { workspace = true, default-features = true }
 
 [dev-dependencies]
-bizinikiwi-test-runtime = { workspace = true }
+# bizinikiwi-test-runtime = { workspace = true }  # publish=false
 cmd_lib = { workspace = true }
 pretty_assertions = { workspace = true }
 
@@ -47,6 +47,6 @@ pretty_assertions = { workspace = true }
 # `cargo build --feature=generate-readme` updates the `README.md` file.
 generate-readme = []
 runtime-benchmarks = [
-	"bizinikiwi-test-runtime/runtime-benchmarks",
+	# "bizinikiwi-test-runtime/runtime-benchmarks",
 	"pezsc-chain-spec/runtime-benchmarks",
 ]
diff --git a/bizinikiwi/client/chain-spec/src/lib.rs b/bizinikiwi/client/chain-spec/src/lib.rs
index 0dd0b793..4d78c90e 100644
--- a/bizinikiwi/client/chain-spec/src/lib.rs
+++ b/bizinikiwi/client/chain-spec/src/lib.rs
@@ -143,7 +143,7 @@
 //!       <td>A JSON object that provides an explicit and comprehensive representation of the
 //! <code>RuntimeGenesisConfig</code> struct, which is generated by <a
 //! href="../pezframe_support_procedural/macro.construct_runtime.html"
-//! ><code>pezkuwi_sdk_frame::runtime::prelude::construct_runtime</code></a> macro (<a
+//! ><code>pezframe::runtime::prelude::construct_runtime</code></a> macro (<a
 //! href="../bizinikiwi_test_runtime/struct.RuntimeGenesisConfig.html#"
 //! >example of generated struct</a>). Must contain *all* the keys of
 //! the genesis config, no defaults will be used.
diff --git a/bizinikiwi/client/db/src/lib.rs b/bizinikiwi/client/db/src/lib.rs
index 919183e6..4340af60 100644
--- a/bizinikiwi/client/db/src/lib.rs
+++ b/bizinikiwi/client/db/src/lib.rs
@@ -1263,7 +1263,7 @@ impl<Block: BlockT> Backend<Block> {
 				);
 			}
 
-			SharedTrieCache::new(pezsp_trie::cache::CacheSize::new(maximum_size), config.metrics_registry.as_ref())
+			SharedTrieCache::new(pezsp_trie::cache::CacheSize::new(maximum_size), None)
 		});
 
 		let backend = Backend {
diff --git a/bizinikiwi/client/merkle-mountain-range/Cargo.toml b/bizinikiwi/client/merkle-mountain-range/Cargo.toml
index b5a81738..bbd5bfa7 100644
--- a/bizinikiwi/client/merkle-mountain-range/Cargo.toml
+++ b/bizinikiwi/client/merkle-mountain-range/Cargo.toml
@@ -29,7 +29,7 @@ pezsp-mmr-primitives = { workspace = true, default-features = true }
 pezsp-runtime = { workspace = true, default-features = true }
 
 [dev-dependencies]
-bizinikiwi-test-runtime-client = { workspace = true }
+# bizinikiwi-test-runtime-client = { workspace = true }
 parking_lot = { workspace = true, default-features = true }
 pezsc-block-builder = { workspace = true, default-features = true }
 pezsp-tracing = { workspace = true, default-features = true }
@@ -37,7 +37,7 @@ tokio = { workspace = true, default-features = true }
 
 [features]
 runtime-benchmarks = [
-	"bizinikiwi-test-runtime-client/runtime-benchmarks",
+	# "bizinikiwi-test-runtime-client/runtime-benchmarks",
 	"pezsc-block-builder/runtime-benchmarks",
 	"pezsc-client-api/runtime-benchmarks",
 	"pezsc-offchain/runtime-benchmarks",
diff --git a/bizinikiwi/client/transaction-pool/Cargo.toml b/bizinikiwi/client/transaction-pool/Cargo.toml
index 55aa728f..e22ecc92 100644
--- a/bizinikiwi/client/transaction-pool/Cargo.toml
+++ b/bizinikiwi/client/transaction-pool/Cargo.toml
@@ -67,8 +67,8 @@ serde_json = { workspace = true }
 tokio = { workspace = true, features = ["rt-multi-thread"] }
 tracing-subscriber = { workspace = true }
 txtesttool = { workspace = true }
-zombienet-configuration = { workspace = true }
-zombienet-sdk = { workspace = true }
+pezkuwi-zombienet-configuration = { workspace = true }
+pezkuwi-zombienet-sdk = { workspace = true }
 
 [features]
 runtime-benchmarks = [
diff --git a/bizinikiwi/client/transaction-pool/tests/zombienet/mod.rs b/bizinikiwi/client/transaction-pool/tests/zombienet/mod.rs
index c03682ad..29d629c4 100644
--- a/bizinikiwi/client/transaction-pool/tests/zombienet/mod.rs
+++ b/bizinikiwi/client/transaction-pool/tests/zombienet/mod.rs
@@ -23,7 +23,7 @@ use anyhow::anyhow;
 use std::time::SystemTime;
 use tracing_subscriber::EnvFilter;
 use txtesttool::scenario::{ChainType, ScenarioBuilder};
-use zombienet_sdk::{
+use pezkuwi_zombienet_sdk::{
 	pezkuwi_subxt::BizinikiwConfig, GlobalSettingsBuilder, LocalFileSystem, Network, NetworkConfig,
 	NetworkConfigBuilder, NetworkConfigExt, WithRelaychain,
 };
diff --git a/bizinikiwi/client/transaction-pool/tests/zombienet/yap_test.rs b/bizinikiwi/client/transaction-pool/tests/zombienet/yap_test.rs
index 9a03b96c..5510f655 100644
--- a/bizinikiwi/client/transaction-pool/tests/zombienet/yap_test.rs
+++ b/bizinikiwi/client/transaction-pool/tests/zombienet/yap_test.rs
@@ -25,7 +25,7 @@ use crate::zombienet::{BlockSubscriptionType, NetworkSpawner, ScenarioBuilderSha
 use pezcumulus_zombienet_sdk_helpers::create_assign_core_call;
 use serde_json::json;
 use txtesttool::{execution_log::ExecutionLog, scenario::ScenarioBuilder};
-use zombienet_sdk::{
+use pezkuwi_zombienet_sdk::{
 	pezkuwi_subxt::{OnlineClient, PezkuwiConfig},
 	pezkuwi_subxt_signer::sr25519::dev,
 	NetworkConfigBuilder,
@@ -35,7 +35,7 @@ use zombienet_sdk::{
 #[ignore]
 async fn slot_based_3cores_test() -> Result<(), anyhow::Error> {
 	let spawner = NetworkSpawner::with_closure(|| {
-		let images = zombienet_sdk::environment::get_images_from_env();
+		let images = pezkuwi_zombienet_sdk::environment::get_images_from_env();
 		let names = ["alice", "bob", "charlie"];
 		NetworkConfigBuilder::new()
 			.with_relaychain(|r| {
diff --git a/bizinikiwi/pezframe/Cargo.toml b/bizinikiwi/pezframe/Cargo.toml
index d2ea38cd..d29031ed 100644
--- a/bizinikiwi/pezframe/Cargo.toml
+++ b/bizinikiwi/pezframe/Cargo.toml
@@ -1,5 +1,5 @@
 [package]
-name = "pezkuwi-sdk-frame"
+name = "pezframe"
 version = "0.1.0"
 authors = [
 	"Kurdistan Tech Institute <info@pezkuwichain.io>",
diff --git a/bizinikiwi/pezframe/assets-freezer/Cargo.toml b/bizinikiwi/pezframe/assets-freezer/Cargo.toml
index 976150a0..025f9023 100644
--- a/bizinikiwi/pezframe/assets-freezer/Cargo.toml
+++ b/bizinikiwi/pezframe/assets-freezer/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "pezpallet-assets-freezer"
-version = "0.1.0"
+version = "0.44.0"
 authors.workspace = true
 edition.workspace = true
 license = "MIT-0"
@@ -17,7 +17,9 @@ targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
 codec = { workspace = true }
-frame = { workspace = true, features = ["runtime"] }
+pezframe = { workspace = true, features = ["runtime"] }
+pezframe-system = { workspace = true }
+pezframe-support = { workspace = true }
 log = { workspace = true }
 pezpallet-assets = { workspace = true }
 scale-info = { features = ["derive"], workspace = true }
@@ -29,19 +31,21 @@ pezpallet-balances = { workspace = true }
 default = ["std"]
 std = [
 	"codec/std",
-	"frame/std",
+	"pezframe/std",
+	"pezframe-system/std",
+	"pezframe-support/std",
 	"log/std",
 	"pezpallet-assets/std",
 	"pezpallet-balances/std",
 	"scale-info/std",
 ]
 runtime-benchmarks = [
-	"frame/runtime-benchmarks",
+	"pezframe/runtime-benchmarks",
 	"pezpallet-assets/runtime-benchmarks",
 	"pezpallet-balances/runtime-benchmarks",
 ]
 try-runtime = [
-	"frame/try-runtime",
+	"pezframe/try-runtime",
 	"pezpallet-assets/try-runtime",
 	"pezpallet-balances/try-runtime",
 ]
diff --git a/bizinikiwi/pezframe/assets-freezer/src/impls.rs b/bizinikiwi/pezframe/assets-freezer/src/impls.rs
index 7ec353b1..d305a22b 100644
--- a/bizinikiwi/pezframe/assets-freezer/src/impls.rs
+++ b/bizinikiwi/pezframe/assets-freezer/src/impls.rs
@@ -22,7 +22,7 @@
 // SOFTWARE.
 
 use super::*;
-use frame::prelude::storage::StorageDoubleMap;
+use pezframe::prelude::storage::StorageDoubleMap;
 use pezpallet_assets::FrozenBalance;
 
 // Implements [`FrozenBalance`] from [`pezpallet-assets`], so it can understand how much of an
diff --git a/bizinikiwi/pezframe/assets-freezer/src/lib.rs b/bizinikiwi/pezframe/assets-freezer/src/lib.rs
index 6d7f7fdf..46e38216 100644
--- a/bizinikiwi/pezframe/assets-freezer/src/lib.rs
+++ b/bizinikiwi/pezframe/assets-freezer/src/lib.rs
@@ -47,7 +47,7 @@
 
 #![cfg_attr(not(feature = "std"), no_std)]
 
-use frame::{
+use pezframe::{
 	prelude::*,
 	traits::{
 		fungibles::{Inspect, InspectFreeze, MutateFreeze},
@@ -60,7 +60,7 @@ use frame::{
 pub use pezpallet::*;
 
 #[cfg(feature = "try-runtime")]
-use frame::try_runtime::TryRuntimeError;
+use pezframe::try_runtime::TryRuntimeError;
 
 #[cfg(test)]
 mod mock;
@@ -69,7 +69,7 @@ mod tests;
 
 mod impls;
 
-#[frame::pezpallet]
+#[pezframe::pezpallet]
 pub mod pezpallet {
 	use super::*;
 
diff --git a/bizinikiwi/pezframe/assets-freezer/src/mock.rs b/bizinikiwi/pezframe/assets-freezer/src/mock.rs
index 9f53260d..bc76e784 100644
--- a/bizinikiwi/pezframe/assets-freezer/src/mock.rs
+++ b/bizinikiwi/pezframe/assets-freezer/src/mock.rs
@@ -26,7 +26,7 @@
 use crate as pezpallet_assets_freezer;
 pub use crate::*;
 use codec::{Compact, Decode, Encode, MaxEncodedLen};
-use frame::testing_prelude::*;
+use pezframe::testing_prelude::*;
 use scale_info::TypeInfo;
 
 pub type AccountId = u64;
diff --git a/bizinikiwi/pezframe/assets-freezer/src/tests.rs b/bizinikiwi/pezframe/assets-freezer/src/tests.rs
index b1709c5c..84caf2a1 100644
--- a/bizinikiwi/pezframe/assets-freezer/src/tests.rs
+++ b/bizinikiwi/pezframe/assets-freezer/src/tests.rs
@@ -26,7 +26,7 @@
 use crate::mock::{self, *};
 
 use codec::Compact;
-use frame::testing_prelude::*;
+use pezframe::testing_prelude::*;
 use pezpallet_assets::FrozenBalance;
 
 const WHO: AccountId = 1;
diff --git a/bizinikiwi/pezframe/atomic-swap/Cargo.toml b/bizinikiwi/pezframe/atomic-swap/Cargo.toml
index de2824ae..8240f2cc 100644
--- a/bizinikiwi/pezframe/atomic-swap/Cargo.toml
+++ b/bizinikiwi/pezframe/atomic-swap/Cargo.toml
@@ -18,7 +18,9 @@ targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
 codec = { workspace = true }
-frame = { workspace = true, features = ["runtime"] }
+pezframe = { workspace = true, features = ["runtime"] }
+pezframe-system = { workspace = true }
+pezframe-support = { workspace = true }
 scale-info = { features = ["derive"], workspace = true }
 
 [dev-dependencies]
@@ -26,9 +28,9 @@ pezpallet-balances = { workspace = true, default-features = true }
 
 [features]
 default = ["std"]
-std = ["codec/std", "frame/std", "pezpallet-balances/std", "scale-info/std"]
-try-runtime = ["frame/try-runtime", "pezpallet-balances/try-runtime"]
+std = ["codec/std", "pezframe/std", "pezpallet-balances/std", "scale-info/std"]
+try-runtime = ["pezframe/try-runtime", "pezpallet-balances/try-runtime"]
 runtime-benchmarks = [
-	"frame/runtime-benchmarks",
+	"pezframe/runtime-benchmarks",
 	"pezpallet-balances/runtime-benchmarks",
 ]
diff --git a/bizinikiwi/pezframe/atomic-swap/src/lib.rs b/bizinikiwi/pezframe/atomic-swap/src/lib.rs
index f213f602..1995e806 100644
--- a/bizinikiwi/pezframe/atomic-swap/src/lib.rs
+++ b/bizinikiwi/pezframe/atomic-swap/src/lib.rs
@@ -50,7 +50,7 @@ use core::{
 	marker::PhantomData,
 	ops::{Deref, DerefMut},
 };
-use frame::{
+use pezframe::{
 	prelude::*,
 	traits::{BalanceStatus, Currency, ReservableCurrency},
 };
@@ -173,7 +173,7 @@ where
 
 pub use pezpallet::*;
 
-#[frame::pezpallet]
+#[pezframe::pezpallet]
 pub mod pezpallet {
 	use super::*;
 
diff --git a/bizinikiwi/pezframe/atomic-swap/src/tests.rs b/bizinikiwi/pezframe/atomic-swap/src/tests.rs
index 1ffa0619..a94c4724 100644
--- a/bizinikiwi/pezframe/atomic-swap/src/tests.rs
+++ b/bizinikiwi/pezframe/atomic-swap/src/tests.rs
@@ -19,7 +19,7 @@
 
 use super::*;
 use crate as pezpallet_atomic_swap;
-use frame::testing_prelude::*;
+use pezframe::testing_prelude::*;
 
 type Block = pezframe_system::mocking::MockBlock<Test>;
 
diff --git a/bizinikiwi/pezframe/benchmarking/src/lib.rs b/bizinikiwi/pezframe/benchmarking/src/lib.rs
index 0da2e019..33331b7d 100644
--- a/bizinikiwi/pezframe/benchmarking/src/lib.rs
+++ b/bizinikiwi/pezframe/benchmarking/src/lib.rs
@@ -317,7 +317,7 @@ pub use v1::*;
 /// To migrate your code from benchmarking v1 to benchmarking v2, you may follow these
 /// steps:
 /// 1. Change the import from `pezframe_benchmarking::v1::` to `pezframe_benchmarking::v2::*`, or
-///    `frame::benchmarking::prelude::*` under the umbrella crate;
+///    `pezframe::benchmarking::prelude::*` under the umbrella crate;
 /// 2. Move the code inside the v1 `benchmarks! { ... }` block to the v2 benchmarks module `mod
 ///    benchmarks { ... }` under the benchmarks macro (`#[benchmarks]` for a regular module, or
 ///    `#[instance_benchmarks]` to set up the module in instance benchmarking mode);
diff --git a/bizinikiwi/pezframe/contracts/Cargo.toml b/bizinikiwi/pezframe/contracts/Cargo.toml
index 65cf5b07..b9d211c9 100644
--- a/bizinikiwi/pezframe/contracts/Cargo.toml
+++ b/bizinikiwi/pezframe/contracts/Cargo.toml
@@ -54,7 +54,7 @@ xcm-builder = { workspace = true }
 [dev-dependencies]
 array-bytes = { workspace = true, default-features = true }
 assert_matches = { workspace = true }
-pezpallet-contracts-fixtures = { workspace = true }
+# pezpallet-contracts-fixtures = { workspace = true }  # Commented for crates.io publish (test-only crate)
 pretty_assertions = { workspace = true }
 wat = { workspace = true }
 
@@ -102,7 +102,7 @@ runtime-benchmarks = [
 	"pezframe-support/runtime-benchmarks",
 	"pezframe-system/runtime-benchmarks",
 	"pezpallet-balances/runtime-benchmarks",
-	"pezpallet-contracts-fixtures/runtime-benchmarks",
+	# "pezpallet-contracts-fixtures/runtime-benchmarks",  # Commented for crates.io publish
 	"pezpallet-insecure-randomness-collective-flip/runtime-benchmarks",
 	"pezpallet-proxy/runtime-benchmarks",
 	"pezpallet-timestamp/runtime-benchmarks",
diff --git a/bizinikiwi/pezframe/contracts/fixtures/Cargo.toml b/bizinikiwi/pezframe/contracts/fixtures/Cargo.toml
index 8b5dba33..47bd6032 100644
--- a/bizinikiwi/pezframe/contracts/fixtures/Cargo.toml
+++ b/bizinikiwi/pezframe/contracts/fixtures/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "pezpallet-contracts-fixtures"
-publish = false
+publish = true
 version = "1.0.0"
 authors.workspace = true
 edition.workspace = true
@@ -9,6 +9,7 @@ description = "Fixtures for testing contracts pezpallet."
 documentation.workspace = true
 repository = { workspace = true }
 homepage = { workspace = true }
+include = ["build.rs", "contracts/**", "src/**", "Cargo.toml"]
 
 [lints]
 workspace = true
diff --git a/bizinikiwi/pezframe/contracts/fixtures/build.rs b/bizinikiwi/pezframe/contracts/fixtures/build.rs
index 65c91516..2abc63d5 100644
--- a/bizinikiwi/pezframe/contracts/fixtures/build.rs
+++ b/bizinikiwi/pezframe/contracts/fixtures/build.rs
@@ -120,7 +120,29 @@ fn create_cargo_toml<'a>(
 	output_dir: &Path,
 ) -> Result<()> {
 	let root_toml: toml::Value = toml::from_str(&fs::read_to_string(root_cargo_toml)?)?;
-	let mut cargo_toml: toml::Value = toml::from_str(include_str!("./build/Cargo.toml"))?;
+	// Template embedded to avoid include_str! path issues during crates.io publish
+	const CARGO_TOML_TEMPLATE: &str = r#"[package]
+name = "contracts"
+version = "0.6.3"
+edition = "2021"
+description = "Pezkuwi SDK component: contracts"
+repository = "https://github.com/pezkuwichain/pezkuwi-sdk"
+homepage = "https://pezkuwi.io"
+authors = ["Pezkuwi Chain <admin@pezkuwi.io>"]
+license = "Apache-2.0"
+[[bin]]
+
+[dependencies]
+common = { package = 'pezpallet-contracts-fixtures-common', path = "" }
+polkavm-derive = { version = "" }
+uapi = { package = 'pezpallet-contracts-uapi', path = "", default-features = false }
+
+[profile.release]
+opt-level = 3
+lto = true
+codegen-units = 1
+"#;
+	let mut cargo_toml: toml::Value = toml::from_str(CARGO_TOML_TEMPLATE)?;
 	let mut set_dep = |name, path| -> Result<()> {
 		cargo_toml["dependencies"][name]["path"] = toml::Value::String(
 			fixtures_dir.join(path).canonicalize()?.to_str().unwrap().to_string(),
@@ -270,7 +292,13 @@ fn main() -> Result<()> {
 	let fixtures_dir: PathBuf = env::var("CARGO_MANIFEST_DIR")?.into();
 	let contracts_dir = fixtures_dir.join("contracts");
 	let out_dir: PathBuf = env::var("OUT_DIR")?.into();
-	let workspace_root = find_workspace_root(&fixtures_dir).expect("workspace root exists; qed");
+
+	// During crates.io package verification, workspace root may not exist.
+	// In that case, skip contract compilation (contracts are pre-compiled in src/).
+	let Some(workspace_root) = find_workspace_root(&fixtures_dir) else {
+		eprintln!("Note: Workspace root not found, skipping contract compilation (expected during crates.io verification)");
+		return Ok(());
+	};
 	let root_cargo_toml = workspace_root.join("Cargo.toml");
 
 	let entries = collect_entries(&contracts_dir, &out_dir);
diff --git a/bizinikiwi/pezframe/examples/pezframe-crate/Cargo.toml b/bizinikiwi/pezframe/examples/pezframe-crate/Cargo.toml
index 20e3b2c2..a66e8ace 100644
--- a/bizinikiwi/pezframe/examples/pezframe-crate/Cargo.toml
+++ b/bizinikiwi/pezframe/examples/pezframe-crate/Cargo.toml
@@ -23,9 +23,11 @@ targets = ["x86_64-unknown-linux-gnu"]
 codec = { workspace = true }
 scale-info = { features = ["derive"], workspace = true }
 
-frame = { features = ["runtime"], workspace = true }
+pezframe = { features = ["runtime"], workspace = true }
+pezframe-system = { workspace = true }
+pezframe-support = { workspace = true }
 
 [features]
 default = ["std"]
-std = ["codec/std", "frame/std", "scale-info/std"]
-runtime-benchmarks = ["frame/runtime-benchmarks"]
+std = ["codec/std", "pezframe/std", "pezframe-system/std", "pezframe-support/std", "scale-info/std"]
+runtime-benchmarks = ["pezframe/runtime-benchmarks"]
diff --git a/bizinikiwi/pezframe/examples/pezframe-crate/src/lib.rs b/bizinikiwi/pezframe/examples/pezframe-crate/src/lib.rs
index f6f09e62..1c5988b4 100644
--- a/bizinikiwi/pezframe/examples/pezframe-crate/src/lib.rs
+++ b/bizinikiwi/pezframe/examples/pezframe-crate/src/lib.rs
@@ -21,9 +21,9 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 // SOFTWARE.
 
-use frame::prelude::*;
+use pezframe::prelude::*;
 
-#[frame::pezpallet(dev_mode)]
+#[pezframe::pezpallet(dev_mode)]
 pub mod pezpallet {
 	use super::*;
 
@@ -50,7 +50,7 @@ pub mod pezpallet {
 #[cfg(test)]
 mod tests {
 	use crate::pezpallet as my_pallet;
-	use frame::testing_prelude::*;
+	use pezframe::testing_prelude::*;
 
 	construct_runtime!(
 		pub enum Runtime {
diff --git a/bizinikiwi/pezframe/insecure-randomness-collective-flip/Cargo.toml b/bizinikiwi/pezframe/insecure-randomness-collective-flip/Cargo.toml
index a69038ba..73d855fd 100644
--- a/bizinikiwi/pezframe/insecure-randomness-collective-flip/Cargo.toml
+++ b/bizinikiwi/pezframe/insecure-randomness-collective-flip/Cargo.toml
@@ -18,12 +18,14 @@ targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
 codec = { features = ["derive"], workspace = true }
-frame = { workspace = true, features = ["runtime"] }
+pezframe = { workspace = true, features = ["runtime"] }
+pezframe-system = { workspace = true }
+pezframe-support = { workspace = true }
 safe-mix = { workspace = true }
 scale-info = { features = ["derive"], workspace = true }
 
 [features]
 default = ["std"]
-std = ["codec/std", "frame/std", "safe-mix/std", "scale-info/std"]
-try-runtime = ["frame/try-runtime"]
-runtime-benchmarks = ["frame/runtime-benchmarks"]
+std = ["codec/std", "pezframe/std", "safe-mix/std", "scale-info/std"]
+try-runtime = ["pezframe/try-runtime"]
+runtime-benchmarks = ["pezframe/runtime-benchmarks"]
diff --git a/bizinikiwi/pezframe/insecure-randomness-collective-flip/src/lib.rs b/bizinikiwi/pezframe/insecure-randomness-collective-flip/src/lib.rs
index 446446a9..6a5cc9c8 100644
--- a/bizinikiwi/pezframe/insecure-randomness-collective-flip/src/lib.rs
+++ b/bizinikiwi/pezframe/insecure-randomness-collective-flip/src/lib.rs
@@ -42,9 +42,9 @@
 //! ### Example - Get random seed for the current block
 //!
 //! ```
-//! use frame::{prelude::*, traits::Randomness};
+//! use pezframe::{prelude::*, traits::Randomness};
 //!
-//! #[frame::pezpallet]
+//! #[pezframe::pezpallet]
 //! pub mod pezpallet {
 //!     use super::*;
 //!
@@ -71,7 +71,7 @@
 use safe_mix::TripletMix;
 
 use codec::Encode;
-use frame::{prelude::*, traits::Randomness};
+use pezframe::{prelude::*, traits::Randomness};
 
 const RANDOM_MATERIAL_LEN: u32 = 81;
 
@@ -83,7 +83,7 @@ fn block_number_to_index<T: Config>(block_number: BlockNumberFor<T>) -> usize {
 
 pub use pezpallet::*;
 
-#[frame::pezpallet]
+#[pezframe::pezpallet]
 pub mod pezpallet {
 	use super::*;
 
@@ -162,7 +162,7 @@ impl<T: Config> Randomness<T::Hash, BlockNumberFor<T>> for Pezpallet<T> {
 mod tests {
 	use super::*;
 	use crate as pezpallet_insecure_randomness_collective_flip;
-	use frame::{
+	use pezframe::{
 		testing_prelude::{pezframe_system::limits, *},
 		traits::Header as _,
 	};
diff --git a/bizinikiwi/pezframe/lottery/Cargo.toml b/bizinikiwi/pezframe/lottery/Cargo.toml
index 06ec1422..dd8724ff 100644
--- a/bizinikiwi/pezframe/lottery/Cargo.toml
+++ b/bizinikiwi/pezframe/lottery/Cargo.toml
@@ -23,8 +23,8 @@ pezframe-system = { workspace = true }
 pezsp-runtime = { workspace = true }
 scale-info = { features = ["derive"], workspace = true }
 
+# pezframe-support-test moved to integration tests to break circular dependency
 [dev-dependencies]
-pezframe-support-test = { workspace = true }
 pezpallet-balances = { workspace = true, default-features = true }
 pezsp-core = { workspace = true, default-features = true }
 pezsp-io = { workspace = true, default-features = true }
@@ -34,7 +34,6 @@ default = ["std"]
 std = [
 	"codec/std",
 	"pezframe-benchmarking?/std",
-	"pezframe-support-test/std",
 	"pezframe-support/std",
 	"pezframe-system/std",
 	"pezpallet-balances/std",
@@ -45,7 +44,6 @@ std = [
 ]
 runtime-benchmarks = [
 	"pezframe-benchmarking/runtime-benchmarks",
-	"pezframe-support-test/runtime-benchmarks",
 	"pezframe-support/runtime-benchmarks",
 	"pezframe-system/runtime-benchmarks",
 	"pezpallet-balances/runtime-benchmarks",
@@ -53,7 +51,6 @@ runtime-benchmarks = [
 	"pezsp-runtime/runtime-benchmarks",
 ]
 try-runtime = [
-	"pezframe-support-test/try-runtime",
 	"pezframe-support/try-runtime",
 	"pezframe-system/try-runtime",
 	"pezpallet-balances/try-runtime",
diff --git a/bizinikiwi/pezframe/merkle-mountain-range/Cargo.toml b/bizinikiwi/pezframe/merkle-mountain-range/Cargo.toml
index cc7c8404..0f42939e 100644
--- a/bizinikiwi/pezframe/merkle-mountain-range/Cargo.toml
+++ b/bizinikiwi/pezframe/merkle-mountain-range/Cargo.toml
@@ -17,7 +17,9 @@ targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
 codec = { workspace = true }
-frame = { workspace = true, features = ["runtime"] }
+pezframe = { workspace = true, features = ["runtime"] }
+pezframe-system = { workspace = true }
+pezframe-support = { workspace = true }
 log = { workspace = true }
 pezsp-mmr-primitives = { workspace = true }
 scale-info = { features = ["derive"], workspace = true }
@@ -30,13 +32,15 @@ pezsp-tracing = { workspace = true, default-features = true }
 default = ["std"]
 std = [
 	"codec/std",
-	"frame/std",
+	"pezframe/std",
+	"pezframe-system/std",
+	"pezframe-support/std",
 	"log/std",
 	"pezsp-mmr-primitives/std",
 	"scale-info/std",
 ]
 runtime-benchmarks = [
-	"frame/runtime-benchmarks",
+	"pezframe/runtime-benchmarks",
 	"pezsp-mmr-primitives/runtime-benchmarks",
 ]
-try-runtime = ["frame/try-runtime"]
+try-runtime = ["pezframe/try-runtime"]
diff --git a/bizinikiwi/pezframe/merkle-mountain-range/src/benchmarking.rs b/bizinikiwi/pezframe/merkle-mountain-range/src/benchmarking.rs
index 6f283bab..c6eb556d 100644
--- a/bizinikiwi/pezframe/merkle-mountain-range/src/benchmarking.rs
+++ b/bizinikiwi/pezframe/merkle-mountain-range/src/benchmarking.rs
@@ -20,7 +20,7 @@
 #![cfg(feature = "runtime-benchmarks")]
 
 use crate::*;
-use frame::{
+use pezframe::{
 	benchmarking::prelude::v1::benchmarks_instance_pallet,
 	deps::pezframe_support::traits::OnInitialize,
 };
diff --git a/bizinikiwi/pezframe/merkle-mountain-range/src/default_weights.rs b/bizinikiwi/pezframe/merkle-mountain-range/src/default_weights.rs
index d3ffca89..566dee86 100644
--- a/bizinikiwi/pezframe/merkle-mountain-range/src/default_weights.rs
+++ b/bizinikiwi/pezframe/merkle-mountain-range/src/default_weights.rs
@@ -18,7 +18,7 @@
 //! Default weights for the MMR Pezpallet
 //! This file was not auto-generated.
 
-use frame::{deps::pezframe_support::weights::constants::*, weights_prelude::*};
+use pezframe::{deps::pezframe_support::weights::constants::*, weights_prelude::*};
 
 impl crate::WeightInfo for () {
 	fn on_initialize(peaks: u32) -> Weight {
diff --git a/bizinikiwi/pezframe/merkle-mountain-range/src/lib.rs b/bizinikiwi/pezframe/merkle-mountain-range/src/lib.rs
index f44ba837..4749830b 100644
--- a/bizinikiwi/pezframe/merkle-mountain-range/src/lib.rs
+++ b/bizinikiwi/pezframe/merkle-mountain-range/src/lib.rs
@@ -61,7 +61,7 @@ extern crate alloc;
 use alloc::vec::Vec;
 use log;
 
-use frame::prelude::*;
+use pezframe::prelude::*;
 
 pub use pezsp_mmr_primitives::{
 	self as primitives, utils, utils::NodesUtils, AncestryProof, Error, FullLeaf, LeafDataProvider,
@@ -144,7 +144,7 @@ pub(crate) type HashingOf<T, I> = <T as Config<I>>::Hashing;
 /// Hash type used for the pezpallet.
 pub(crate) type HashOf<T, I> = <<T as Config<I>>::Hashing as Hash>::Output;
 
-#[frame::pezpallet]
+#[pezframe::pezpallet]
 pub mod pezpallet {
 	use super::*;
 
diff --git a/bizinikiwi/pezframe/merkle-mountain-range/src/mmr/mmr.rs b/bizinikiwi/pezframe/merkle-mountain-range/src/mmr/mmr.rs
index cb308bd8..bb4e6815 100644
--- a/bizinikiwi/pezframe/merkle-mountain-range/src/mmr/mmr.rs
+++ b/bizinikiwi/pezframe/merkle-mountain-range/src/mmr/mmr.rs
@@ -27,7 +27,7 @@ use crate::{
 	Config, HashOf, HashingOf,
 };
 use alloc::vec::Vec;
-use frame::prelude::*;
+use pezframe::prelude::*;
 
 /// Stateless verification of the proof for a batch of leaves.
 /// Note, the leaves should be sorted such that corresponding leaves and leaf indices have the
@@ -65,7 +65,7 @@ where
 
 pub fn is_ancestry_proof_optimal<H>(ancestry_proof: &AncestryProof<H::Output>) -> bool
 where
-	H: frame::traits::Hash,
+	H: pezframe::traits::Hash,
 {
 	let prev_mmr_size = NodesUtils::new(ancestry_proof.prev_leaf_count).size();
 	let mmr_size = NodesUtils::new(ancestry_proof.leaf_count).size();
diff --git a/bizinikiwi/pezframe/merkle-mountain-range/src/mmr/mod.rs b/bizinikiwi/pezframe/merkle-mountain-range/src/mmr/mod.rs
index d7ed9f21..a413f1f6 100644
--- a/bizinikiwi/pezframe/merkle-mountain-range/src/mmr/mod.rs
+++ b/bizinikiwi/pezframe/merkle-mountain-range/src/mmr/mod.rs
@@ -20,7 +20,7 @@ pub mod storage;
 
 pub use self::mmr::{is_ancestry_proof_optimal, verify_ancestry_proof, verify_leaves_proof, Mmr};
 use crate::primitives::{mmr_lib, DataOrHash, FullLeaf};
-use frame::traits;
+use pezframe::traits;
 
 /// Node type for runtime `T`.
 pub type NodeOf<T, I, L> = Node<<T as crate::Config<I>>::Hashing, L>;
diff --git a/bizinikiwi/pezframe/merkle-mountain-range/src/mmr/storage.rs b/bizinikiwi/pezframe/merkle-mountain-range/src/mmr/storage.rs
index 4a9611e1..929a722c 100644
--- a/bizinikiwi/pezframe/merkle-mountain-range/src/mmr/storage.rs
+++ b/bizinikiwi/pezframe/merkle-mountain-range/src/mmr/storage.rs
@@ -25,7 +25,7 @@ use crate::{
 use alloc::{vec, vec::Vec};
 use codec::Encode;
 use core::iter::Peekable;
-use frame::{
+use pezframe::{
 	deps::{
 		pezsp_core::offchain::StorageKind,
 		pezsp_io::{offchain, offchain_index},
diff --git a/bizinikiwi/pezframe/merkle-mountain-range/src/mock.rs b/bizinikiwi/pezframe/merkle-mountain-range/src/mock.rs
index c8159607..7bfcb367 100644
--- a/bizinikiwi/pezframe/merkle-mountain-range/src/mock.rs
+++ b/bizinikiwi/pezframe/merkle-mountain-range/src/mock.rs
@@ -23,7 +23,7 @@ use crate::{
 	primitives::{Compact, LeafDataProvider},
 };
 use codec::{Decode, Encode};
-use frame::{
+use pezframe::{
 	deps::pezframe_support::derive_impl,
 	prelude::{pezframe_system, pezframe_system::config_preludes::TestDefaultConfig},
 	testing_prelude::*,
diff --git a/bizinikiwi/pezframe/merkle-mountain-range/src/tests.rs b/bizinikiwi/pezframe/merkle-mountain-range/src/tests.rs
index 827f3e82..bbbc12f9 100644
--- a/bizinikiwi/pezframe/merkle-mountain-range/src/tests.rs
+++ b/bizinikiwi/pezframe/merkle-mountain-range/src/tests.rs
@@ -19,7 +19,7 @@ use crate::{mock::*, *};
 
 use crate::primitives::{mmr_lib::helper, utils, Compact, LeafProof};
 
-use frame::{
+use pezframe::{
 	deps::pezsp_core::{
 		offchain::{testing::TestOffchainExt, OffchainDbExt, OffchainWorkerExt},
 		H256,
diff --git a/bizinikiwi/pezframe/merkle-mountain-range/src/weights.rs b/bizinikiwi/pezframe/merkle-mountain-range/src/weights.rs
index e773b299..ba021078 100644
--- a/bizinikiwi/pezframe/merkle-mountain-range/src/weights.rs
+++ b/bizinikiwi/pezframe/merkle-mountain-range/src/weights.rs
@@ -67,7 +67,7 @@
 #![allow(missing_docs)]
 #![allow(dead_code)]
 
-use frame::weights_prelude::*;
+use pezframe::weights_prelude::*;
 
 /// Weight functions needed for `pezpallet_mmr`.
 pub trait WeightInfo {
diff --git a/bizinikiwi/pezframe/meta-tx/Cargo.toml b/bizinikiwi/pezframe/meta-tx/Cargo.toml
index 10d5bbe6..acb2905f 100644
--- a/bizinikiwi/pezframe/meta-tx/Cargo.toml
+++ b/bizinikiwi/pezframe/meta-tx/Cargo.toml
@@ -2,7 +2,7 @@
 name = "pezpallet-meta-tx"
 description = "FRAME pezpallet enabling meta transactions."
 license = "Apache-2.0"
-version = "0.1.0"
+version = "0.44.0"
 edition.workspace = true
 authors.workspace = true
 homepage.workspace = true
diff --git a/bizinikiwi/pezframe/migrations/Cargo.toml b/bizinikiwi/pezframe/migrations/Cargo.toml
index ba5c3f06..a4dc20a8 100644
--- a/bizinikiwi/pezframe/migrations/Cargo.toml
+++ b/bizinikiwi/pezframe/migrations/Cargo.toml
@@ -19,7 +19,7 @@ impl-trait-for-tuples = { workspace = true }
 log = { workspace = true, default-features = true }
 scale-info = { features = ["derive"], workspace = true }
 
-frame = { workspace = true, features = ["runtime"] }
+pezframe = { workspace = true, features = ["runtime"] }
 pezframe-benchmarking = { optional = true, workspace = true }
 pezframe-support = { workspace = true }
 pezframe-system = { workspace = true }
@@ -39,7 +39,7 @@ pretty_assertions = { workspace = true }
 default = ["std"]
 std = [
 	"codec/std",
-	"frame/std",
+	"pezframe/std",
 	"log/std",
 	"pezframe-benchmarking?/std",
 	"pezframe-support/std",
@@ -51,7 +51,7 @@ std = [
 ]
 
 runtime-benchmarks = [
-	"frame/runtime-benchmarks",
+	"pezframe/runtime-benchmarks",
 	"pezframe-benchmarking/runtime-benchmarks",
 	"pezframe-executive/runtime-benchmarks",
 	"pezframe-support/runtime-benchmarks",
@@ -61,7 +61,7 @@ runtime-benchmarks = [
 ]
 
 try-runtime = [
-	"frame/try-runtime",
+	"pezframe/try-runtime",
 	"pezframe-executive/try-runtime",
 	"pezframe-support/try-runtime",
 	"pezframe-system/try-runtime",
diff --git a/bizinikiwi/pezframe/migrations/src/weights.rs b/bizinikiwi/pezframe/migrations/src/weights.rs
index 46cd957f..ceb9f61f 100644
--- a/bizinikiwi/pezframe/migrations/src/weights.rs
+++ b/bizinikiwi/pezframe/migrations/src/weights.rs
@@ -67,7 +67,7 @@
 #![allow(missing_docs)]
 #![allow(dead_code)]
 
-use frame::weights_prelude::*;
+use pezframe::weights_prelude::*;
 
 /// Weight functions needed for `pezpallet_migrations`.
 pub trait WeightInfo {
diff --git a/bizinikiwi/pezframe/mixnet/Cargo.toml b/bizinikiwi/pezframe/mixnet/Cargo.toml
index 77e2ae55..5cbcc500 100644
--- a/bizinikiwi/pezframe/mixnet/Cargo.toml
+++ b/bizinikiwi/pezframe/mixnet/Cargo.toml
@@ -21,7 +21,9 @@ targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
 codec = { features = ["derive", "max-encoded-len"], workspace = true }
-frame = { workspace = true, features = ["runtime"] }
+pezframe = { workspace = true, features = ["runtime"] }
+pezframe-system = { workspace = true }
+pezframe-support = { workspace = true }
 log = { workspace = true }
 pezsp-application-crypto = { workspace = true }
 pezsp-mixnet = { workspace = true }
@@ -32,15 +34,17 @@ serde = { features = ["derive"], workspace = true }
 default = ["std"]
 std = [
 	"codec/std",
-	"frame/std",
+	"pezframe/std",
+	"pezframe-system/std",
+	"pezframe-support/std",
 	"log/std",
 	"pezsp-application-crypto/std",
 	"pezsp-mixnet/std",
 	"scale-info/std",
 	"serde/std",
 ]
-try-runtime = ["frame/try-runtime"]
+try-runtime = ["pezframe/try-runtime"]
 runtime-benchmarks = [
-	"frame/runtime-benchmarks",
+	"pezframe/runtime-benchmarks",
 	"pezsp-mixnet/runtime-benchmarks",
 ]
diff --git a/bizinikiwi/pezframe/mixnet/src/lib.rs b/bizinikiwi/pezframe/mixnet/src/lib.rs
index 38309e42..f8369916 100644
--- a/bizinikiwi/pezframe/mixnet/src/lib.rs
+++ b/bizinikiwi/pezframe/mixnet/src/lib.rs
@@ -27,7 +27,7 @@ pub use pezpallet::*;
 
 use alloc::vec::Vec;
 use core::cmp::Ordering;
-use frame::{
+use pezframe::{
 	deps::{
 		pezsp_io::{self, MultiRemovalResults},
 		pezsp_runtime,
@@ -172,7 +172,7 @@ fn twox<BlockNumber: UniqueSaturatedInto<u64>>(
 // The pezpallet
 ////////////////////////////////////////////////////////////////////////////////
 
-#[frame::pezpallet(dev_mode)]
+#[pezframe::pezpallet(dev_mode)]
 pub mod pezpallet {
 	use super::*;
 	#[pezpallet::pezpallet]
diff --git a/bizinikiwi/pezframe/multisig/Cargo.toml b/bizinikiwi/pezframe/multisig/Cargo.toml
index aa2c985f..df7c9f55 100644
--- a/bizinikiwi/pezframe/multisig/Cargo.toml
+++ b/bizinikiwi/pezframe/multisig/Cargo.toml
@@ -18,7 +18,9 @@ targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
 codec = { workspace = true }
-frame = { workspace = true, features = ["runtime"] }
+pezframe = { workspace = true, features = ["runtime"] }
+pezframe-system = { workspace = true }
+pezframe-support = { workspace = true }
 scale-info = { features = ["derive"], workspace = true }
 
 # third party
@@ -29,9 +31,9 @@ pezpallet-balances = { workspace = true, default-features = true }
 
 [features]
 default = ["std"]
-std = ["codec/std", "frame/std", "log/std", "scale-info/std"]
+std = ["codec/std", "pezframe/std", "log/std", "scale-info/std"]
 runtime-benchmarks = [
-	"frame/runtime-benchmarks",
+	"pezframe/runtime-benchmarks",
 	"pezpallet-balances/runtime-benchmarks",
 ]
-try-runtime = ["frame/try-runtime", "pezpallet-balances/try-runtime"]
+try-runtime = ["pezframe/try-runtime", "pezpallet-balances/try-runtime"]
diff --git a/bizinikiwi/pezframe/multisig/src/benchmarking.rs b/bizinikiwi/pezframe/multisig/src/benchmarking.rs
index a9db1e50..57adaaca 100644
--- a/bizinikiwi/pezframe/multisig/src/benchmarking.rs
+++ b/bizinikiwi/pezframe/multisig/src/benchmarking.rs
@@ -20,7 +20,7 @@
 #![cfg(feature = "runtime-benchmarks")]
 
 use super::*;
-use frame::benchmarking::prelude::*;
+use pezframe::benchmarking::prelude::*;
 
 use crate::Pezpallet as Multisig;
 
diff --git a/bizinikiwi/pezframe/multisig/src/lib.rs b/bizinikiwi/pezframe/multisig/src/lib.rs
index aca75a3c..38dc0b13 100644
--- a/bizinikiwi/pezframe/multisig/src/lib.rs
+++ b/bizinikiwi/pezframe/multisig/src/lib.rs
@@ -50,7 +50,7 @@ pub mod weights;
 
 extern crate alloc;
 use alloc::{boxed::Box, vec, vec::Vec};
-use frame::{
+use pezframe::{
 	prelude::*,
 	traits::{Currency, ReservableCurrency},
 };
@@ -138,7 +138,7 @@ enum CallOrHash<T: Config> {
 	Hash([u8; 32]),
 }
 
-#[frame::pezpallet]
+#[pezframe::pezpallet]
 pub mod pezpallet {
 	use super::*;
 
diff --git a/bizinikiwi/pezframe/multisig/src/migrations.rs b/bizinikiwi/pezframe/multisig/src/migrations.rs
index ea5c0e6a..5fac6b89 100644
--- a/bizinikiwi/pezframe/multisig/src/migrations.rs
+++ b/bizinikiwi/pezframe/multisig/src/migrations.rs
@@ -18,14 +18,14 @@
 // Migrations for Multisig Pezpallet
 
 use crate::*;
-use frame::prelude::*;
+use pezframe::prelude::*;
 
 pub mod v1 {
 	use super::*;
 
-	type OpaqueCall<T> = frame::traits::WrapperKeepOpaque<<T as Config>::RuntimeCall>;
+	type OpaqueCall<T> = pezframe::traits::WrapperKeepOpaque<<T as Config>::RuntimeCall>;
 
-	#[frame::storage_alias]
+	#[pezframe::storage_alias]
 	type Calls<T: Config> = StorageMap<
 		Pezpallet<T>,
 		Identity,
@@ -36,14 +36,14 @@ pub mod v1 {
 	pub struct MigrateToV1<T>(core::marker::PhantomData<T>);
 	impl<T: Config> OnRuntimeUpgrade for MigrateToV1<T> {
 		#[cfg(feature = "try-runtime")]
-		fn pre_upgrade() -> Result<Vec<u8>, frame::try_runtime::TryRuntimeError> {
+		fn pre_upgrade() -> Result<Vec<u8>, pezframe::try_runtime::TryRuntimeError> {
 			log!(info, "Number of calls to refund and delete: {}", Calls::<T>::iter().count());
 
 			Ok(Vec::new())
 		}
 
 		fn on_runtime_upgrade() -> Weight {
-			use frame::traits::ReservableCurrency as _;
+			use pezframe::traits::ReservableCurrency as _;
 			let current = Pezpallet::<T>::in_code_storage_version();
 			let onchain = Pezpallet::<T>::on_chain_storage_version();
 
@@ -69,7 +69,7 @@ pub mod v1 {
 		}
 
 		#[cfg(feature = "try-runtime")]
-		fn post_upgrade(_state: Vec<u8>) -> Result<(), frame::try_runtime::TryRuntimeError> {
+		fn post_upgrade(_state: Vec<u8>) -> Result<(), pezframe::try_runtime::TryRuntimeError> {
 			ensure!(
 				Calls::<T>::iter().count() == 0,
 				"there are some dangling calls that need to be destroyed and refunded"
diff --git a/bizinikiwi/pezframe/multisig/src/tests.rs b/bizinikiwi/pezframe/multisig/src/tests.rs
index e5f906bf..a7948d9e 100644
--- a/bizinikiwi/pezframe/multisig/src/tests.rs
+++ b/bizinikiwi/pezframe/multisig/src/tests.rs
@@ -21,7 +21,7 @@
 
 use super::*;
 use crate as pezpallet_multisig;
-use frame::{prelude::*, runtime::prelude::*, testing_prelude::*};
+use pezframe::{prelude::*, runtime::prelude::*, testing_prelude::*};
 
 type Block = pezframe_system::mocking::MockBlockU32<Test>;
 
diff --git a/bizinikiwi/pezframe/multisig/src/weights.rs b/bizinikiwi/pezframe/multisig/src/weights.rs
index 3ca57f63..547c3b8f 100644
--- a/bizinikiwi/pezframe/multisig/src/weights.rs
+++ b/bizinikiwi/pezframe/multisig/src/weights.rs
@@ -67,7 +67,7 @@
 #![allow(missing_docs)]
 #![allow(dead_code)]
 
-use frame::weights_prelude::*;
+use pezframe::weights_prelude::*;
 
 /// Weight functions needed for `pezpallet_multisig`.
 pub trait WeightInfo {
diff --git a/bizinikiwi/pezframe/nft-fractionalization/Cargo.toml b/bizinikiwi/pezframe/nft-fractionalization/Cargo.toml
index 4ce0a46e..2636e217 100644
--- a/bizinikiwi/pezframe/nft-fractionalization/Cargo.toml
+++ b/bizinikiwi/pezframe/nft-fractionalization/Cargo.toml
@@ -18,7 +18,9 @@ targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
 codec = { workspace = true }
-frame = { workspace = true, features = ["runtime"] }
+pezframe = { workspace = true, features = ["runtime"] }
+pezframe-system = { workspace = true }
+pezframe-support = { workspace = true }
 log = { workspace = true }
 pezpallet-assets = { workspace = true }
 pezpallet-nfts = { workspace = true }
@@ -31,7 +33,9 @@ pezpallet-balances = { workspace = true, default-features = true }
 default = ["std"]
 std = [
 	"codec/std",
-	"frame/std",
+	"pezframe/std",
+	"pezframe-system/std",
+	"pezframe-support/std",
 	"log/std",
 	"pezpallet-assets/std",
 	"pezpallet-balances/std",
@@ -39,13 +43,13 @@ std = [
 	"scale-info/std",
 ]
 runtime-benchmarks = [
-	"frame/runtime-benchmarks",
+	"pezframe/runtime-benchmarks",
 	"pezpallet-assets/runtime-benchmarks",
 	"pezpallet-balances/runtime-benchmarks",
 	"pezpallet-nfts/runtime-benchmarks",
 ]
 try-runtime = [
-	"frame/try-runtime",
+	"pezframe/try-runtime",
 	"pezpallet-assets/try-runtime",
 	"pezpallet-balances/try-runtime",
 	"pezpallet-nfts/try-runtime",
diff --git a/bizinikiwi/pezframe/nft-fractionalization/src/benchmarking.rs b/bizinikiwi/pezframe/nft-fractionalization/src/benchmarking.rs
index 3ab3fc65..81c71d88 100644
--- a/bizinikiwi/pezframe/nft-fractionalization/src/benchmarking.rs
+++ b/bizinikiwi/pezframe/nft-fractionalization/src/benchmarking.rs
@@ -20,9 +20,9 @@
 #![cfg(feature = "runtime-benchmarks")]
 
 use super::*;
-use frame::benchmarking::prelude::*;
+use pezframe::benchmarking::prelude::*;
 
-use frame::deps::pezframe_support::assert_ok;
+use pezframe::deps::pezframe_support::assert_ok;
 use fungible::{Inspect as InspectFungible, Mutate as MutateFungible};
 use nonfungibles_v2::{Create, Mutate};
 
diff --git a/bizinikiwi/pezframe/nft-fractionalization/src/lib.rs b/bizinikiwi/pezframe/nft-fractionalization/src/lib.rs
index 5e38243f..d60b2810 100644
--- a/bizinikiwi/pezframe/nft-fractionalization/src/lib.rs
+++ b/bizinikiwi/pezframe/nft-fractionalization/src/lib.rs
@@ -47,13 +47,13 @@ mod tests;
 
 pub mod weights;
 
-use frame::prelude::*;
+use pezframe::prelude::*;
 use pezframe_system::Config as SystemConfig;
 pub use pezpallet::*;
 pub use types::*;
 pub use weights::WeightInfo;
 
-#[frame::pezpallet]
+#[pezframe::pezpallet]
 pub mod pezpallet {
 	use super::*;
 	use core::fmt::Display;
diff --git a/bizinikiwi/pezframe/nft-fractionalization/src/mock.rs b/bizinikiwi/pezframe/nft-fractionalization/src/mock.rs
index 0fcfc1b8..8c94885a 100644
--- a/bizinikiwi/pezframe/nft-fractionalization/src/mock.rs
+++ b/bizinikiwi/pezframe/nft-fractionalization/src/mock.rs
@@ -20,7 +20,7 @@
 use super::*;
 use crate as pezpallet_nft_fractionalization;
 
-use frame::{deps::pezsp_runtime::MultiSignature, testing_prelude::*, traits::Verify};
+use pezframe::{deps::pezsp_runtime::MultiSignature, testing_prelude::*, traits::Verify};
 use pezpallet_nfts::PalletFeatures;
 
 type Block = MockBlock<Test>;
diff --git a/bizinikiwi/pezframe/nft-fractionalization/src/tests.rs b/bizinikiwi/pezframe/nft-fractionalization/src/tests.rs
index c38b7e52..301cf4ec 100644
--- a/bizinikiwi/pezframe/nft-fractionalization/src/tests.rs
+++ b/bizinikiwi/pezframe/nft-fractionalization/src/tests.rs
@@ -19,7 +19,7 @@
 
 use crate::{mock::*, *};
 
-use frame::{deps::pezsp_runtime::ModuleError, testing_prelude::*};
+use pezframe::{deps::pezsp_runtime::ModuleError, testing_prelude::*};
 use fungible::{hold::Inspect as InspectHold, Mutate as MutateFungible};
 use fungibles::{metadata::Inspect, InspectEnumerable};
 use TokenError::FundsUnavailable;
diff --git a/bizinikiwi/pezframe/nft-fractionalization/src/weights.rs b/bizinikiwi/pezframe/nft-fractionalization/src/weights.rs
index f49b5ce1..75904cb5 100644
--- a/bizinikiwi/pezframe/nft-fractionalization/src/weights.rs
+++ b/bizinikiwi/pezframe/nft-fractionalization/src/weights.rs
@@ -67,7 +67,7 @@
 #![allow(missing_docs)]
 #![allow(dead_code)]
 
-use frame::weights_prelude::*;
+use pezframe::weights_prelude::*;
 use core::marker::PhantomData;
 
 /// Weight functions needed for `pezpallet_nft_fractionalization`.
diff --git a/bizinikiwi/pezframe/nis/Cargo.toml b/bizinikiwi/pezframe/nis/Cargo.toml
index f5cf2198..708d66e6 100644
--- a/bizinikiwi/pezframe/nis/Cargo.toml
+++ b/bizinikiwi/pezframe/nis/Cargo.toml
@@ -18,7 +18,9 @@ targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
 codec = { features = ["derive"], workspace = true }
-frame = { workspace = true, features = ["runtime"] }
+pezframe = { workspace = true, features = ["runtime"] }
+pezframe-system = { workspace = true }
+pezframe-support = { workspace = true }
 scale-info = { features = ["derive"], workspace = true }
 
 [dev-dependencies]
@@ -27,10 +29,10 @@ pezsp-io = { workspace = true, default-features = true }
 
 [features]
 default = ["std"]
-std = ["codec/std", "frame/std", "scale-info/std"]
+std = ["codec/std", "pezframe/std", "scale-info/std"]
 runtime-benchmarks = [
-	"frame/runtime-benchmarks",
+	"pezframe/runtime-benchmarks",
 	"pezpallet-balances/runtime-benchmarks",
 	"pezsp-io/runtime-benchmarks",
 ]
-try-runtime = ["frame/try-runtime", "pezpallet-balances/try-runtime"]
+try-runtime = ["pezframe/try-runtime", "pezpallet-balances/try-runtime"]
diff --git a/bizinikiwi/pezframe/nis/src/benchmarking.rs b/bizinikiwi/pezframe/nis/src/benchmarking.rs
index f242e613..dcd26018 100644
--- a/bizinikiwi/pezframe/nis/src/benchmarking.rs
+++ b/bizinikiwi/pezframe/nis/src/benchmarking.rs
@@ -19,7 +19,7 @@
 
 #![cfg(feature = "runtime-benchmarks")]
 
-use frame::benchmarking::prelude::*;
+use pezframe::benchmarking::prelude::*;
 
 use crate::*;
 
diff --git a/bizinikiwi/pezframe/nis/src/lib.rs b/bizinikiwi/pezframe/nis/src/lib.rs
index 3cef15e7..2c22fa99 100644
--- a/bizinikiwi/pezframe/nis/src/lib.rs
+++ b/bizinikiwi/pezframe/nis/src/lib.rs
@@ -90,7 +90,7 @@ pub use pezpallet::*;
 pub use weights::WeightInfo;
 
 use alloc::{vec, vec::Vec};
-use frame::prelude::*;
+use pezframe::prelude::*;
 use fungible::{
 	Balanced as FunBalanced, Inspect as FunInspect, Mutate as FunMutate,
 	MutateHold as FunMutateHold,
@@ -173,7 +173,7 @@ impl BenchmarkSetup for () {
 	fn create_counterpart_asset() {}
 }
 
-#[frame::pezpallet]
+#[pezframe::pezpallet]
 pub mod pezpallet {
 	use super::*;
 
diff --git a/bizinikiwi/pezframe/nis/src/mock.rs b/bizinikiwi/pezframe/nis/src/mock.rs
index 4ac36451..dde02f8b 100644
--- a/bizinikiwi/pezframe/nis/src/mock.rs
+++ b/bizinikiwi/pezframe/nis/src/mock.rs
@@ -17,7 +17,7 @@
 
 //! Test environment for NIS pezpallet.
 
-use frame::{runtime::prelude::*, testing_prelude::*, traits::StorageMapShim};
+use pezframe::{runtime::prelude::*, testing_prelude::*, traits::StorageMapShim};
 
 use crate::{self as pezpallet_nis, *};
 
diff --git a/bizinikiwi/pezframe/nis/src/tests.rs b/bizinikiwi/pezframe/nis/src/tests.rs
index 2291bf54..a283d7de 100644
--- a/bizinikiwi/pezframe/nis/src/tests.rs
+++ b/bizinikiwi/pezframe/nis/src/tests.rs
@@ -17,7 +17,7 @@
 
 //! Tests for NIS pezpallet.
 
-use frame::testing_prelude::*;
+use pezframe::testing_prelude::*;
 
 use crate::{
 	mock::{Balance, *},
diff --git a/bizinikiwi/pezframe/nis/src/weights.rs b/bizinikiwi/pezframe/nis/src/weights.rs
index cf493bd6..4ce6a465 100644
--- a/bizinikiwi/pezframe/nis/src/weights.rs
+++ b/bizinikiwi/pezframe/nis/src/weights.rs
@@ -67,7 +67,7 @@
 #![allow(missing_docs)]
 #![allow(dead_code)]
 
-use frame::weights_prelude::*;
+use pezframe::weights_prelude::*;
 
 /// Weight functions needed for `pezpallet_nis`.
 pub trait WeightInfo {
diff --git a/bizinikiwi/pezframe/node-authorization/Cargo.toml b/bizinikiwi/pezframe/node-authorization/Cargo.toml
index eed3f6db..663fd5b4 100644
--- a/bizinikiwi/pezframe/node-authorization/Cargo.toml
+++ b/bizinikiwi/pezframe/node-authorization/Cargo.toml
@@ -17,12 +17,14 @@ targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
 codec = { features = ["derive"], workspace = true }
-frame = { workspace = true, features = ["runtime"] }
+pezframe = { workspace = true, features = ["runtime"] }
+pezframe-system = { workspace = true }
+pezframe-support = { workspace = true }
 log = { workspace = true }
 scale-info = { features = ["derive"], workspace = true }
 
 [features]
 default = ["std"]
-std = ["codec/std", "frame/std", "log/std", "scale-info/std"]
-try-runtime = ["frame/try-runtime"]
-runtime-benchmarks = ["frame/runtime-benchmarks"]
+std = ["codec/std", "pezframe/std", "log/std", "scale-info/std"]
+try-runtime = ["pezframe/try-runtime"]
+runtime-benchmarks = ["pezframe/runtime-benchmarks"]
diff --git a/bizinikiwi/pezframe/node-authorization/src/lib.rs b/bizinikiwi/pezframe/node-authorization/src/lib.rs
index 9d416644..692d8bfc 100644
--- a/bizinikiwi/pezframe/node-authorization/src/lib.rs
+++ b/bizinikiwi/pezframe/node-authorization/src/lib.rs
@@ -49,7 +49,7 @@ pub mod weights;
 extern crate alloc;
 
 use alloc::{collections::btree_set::BTreeSet, vec::Vec};
-use frame::{
+use pezframe::{
 	deps::{pezsp_core::OpaquePeerId as PeerId, pezsp_io},
 	prelude::*,
 };
@@ -58,7 +58,7 @@ pub use weights::WeightInfo;
 
 type AccountIdLookupOf<T> = <<T as pezframe_system::Config>::Lookup as StaticLookup>::Source;
 
-#[frame::pezpallet]
+#[pezframe::pezpallet]
 pub mod pezpallet {
 	use super::*;
 
diff --git a/bizinikiwi/pezframe/node-authorization/src/mock.rs b/bizinikiwi/pezframe/node-authorization/src/mock.rs
index 249acba7..fe9bf98a 100644
--- a/bizinikiwi/pezframe/node-authorization/src/mock.rs
+++ b/bizinikiwi/pezframe/node-authorization/src/mock.rs
@@ -20,7 +20,7 @@
 use super::*;
 use crate as pezpallet_node_authorization;
 
-use frame::testing_prelude::*;
+use pezframe::testing_prelude::*;
 
 type Block = pezframe_system::mocking::MockBlock<Test>;
 
diff --git a/bizinikiwi/pezframe/node-authorization/src/tests.rs b/bizinikiwi/pezframe/node-authorization/src/tests.rs
index a0ce7bdd..63bbe681 100644
--- a/bizinikiwi/pezframe/node-authorization/src/tests.rs
+++ b/bizinikiwi/pezframe/node-authorization/src/tests.rs
@@ -19,7 +19,7 @@
 
 use super::*;
 use crate::mock::*;
-use frame::testing_prelude::*;
+use pezframe::testing_prelude::*;
 
 #[test]
 fn add_well_known_node_works() {
diff --git a/bizinikiwi/pezframe/node-authorization/src/weights.rs b/bizinikiwi/pezframe/node-authorization/src/weights.rs
index eee77b13..81f0dac9 100644
--- a/bizinikiwi/pezframe/node-authorization/src/weights.rs
+++ b/bizinikiwi/pezframe/node-authorization/src/weights.rs
@@ -21,7 +21,7 @@
 #![allow(unused_parens)]
 #![allow(unused_imports)]
 
-use frame::weights_prelude::*;
+use pezframe::weights_prelude::*;
 
 pub trait WeightInfo {
 	fn add_well_known_node() -> Weight;
diff --git a/bizinikiwi/pezframe/paged-list/Cargo.toml b/bizinikiwi/pezframe/paged-list/Cargo.toml
index a0c93c87..2e338809 100644
--- a/bizinikiwi/pezframe/paged-list/Cargo.toml
+++ b/bizinikiwi/pezframe/paged-list/Cargo.toml
@@ -18,17 +18,19 @@ targets = ["x86_64-unknown-linux-gnu"]
 [dependencies]
 codec = { features = ["derive"], workspace = true }
 docify = { workspace = true }
-frame = { workspace = true, features = ["runtime"] }
+pezframe = { workspace = true, features = ["runtime"] }
+pezframe-system = { workspace = true }
+pezframe-support = { workspace = true }
 pezsp-metadata-ir = { optional = true, workspace = true }
 scale-info = { features = ["derive"], workspace = true }
 
 [features]
 default = ["std"]
 
-std = ["codec/std", "frame/std", "pezsp-metadata-ir/std", "scale-info/std"]
+std = ["codec/std", "pezframe/std", "pezsp-metadata-ir/std", "scale-info/std"]
 
-runtime-benchmarks = ["frame/runtime-benchmarks"]
+runtime-benchmarks = ["pezframe/runtime-benchmarks"]
 
-try-runtime = ["frame/try-runtime"]
+try-runtime = ["pezframe/try-runtime"]
 
 frame-metadata = ["pezsp-metadata-ir"]
diff --git a/bizinikiwi/pezframe/paged-list/fuzzer/Cargo.toml b/bizinikiwi/pezframe/paged-list/fuzzer/Cargo.toml
index 0f0ad039..657b61b5 100644
--- a/bizinikiwi/pezframe/paged-list/fuzzer/Cargo.toml
+++ b/bizinikiwi/pezframe/paged-list/fuzzer/Cargo.toml
@@ -19,14 +19,16 @@ path = "src/paged_list.rs"
 
 [dependencies]
 arbitrary = { workspace = true }
-frame = { workspace = true, features = ["runtime"] }
+pezframe = { workspace = true, features = ["runtime"] }
+pezframe-system = { workspace = true }
+pezframe-support = { workspace = true }
 honggfuzz = { workspace = true }
 pezpallet-paged-list = { features = ["std"], workspace = true }
 
 [features]
 default = ["std"]
-std = ["frame/std", "pezpallet-paged-list/std"]
+std = ["pezframe/std", "pezpallet-paged-list/std"]
 runtime-benchmarks = [
-	"frame/runtime-benchmarks",
+	"pezframe/runtime-benchmarks",
 	"pezpallet-paged-list/runtime-benchmarks",
 ]
diff --git a/bizinikiwi/pezframe/paged-list/fuzzer/src/paged_list.rs b/bizinikiwi/pezframe/paged-list/fuzzer/src/paged_list.rs
index 0d21477a..40a8a436 100644
--- a/bizinikiwi/pezframe/paged-list/fuzzer/src/paged_list.rs
+++ b/bizinikiwi/pezframe/paged-list/fuzzer/src/paged_list.rs
@@ -30,7 +30,7 @@
 use arbitrary::Arbitrary;
 use honggfuzz::fuzz;
 
-use frame::{
+use pezframe::{
 	prelude::*, runtime::prelude::storage::storage_noop_guard::StorageNoopGuard,
 	testing_prelude::TestExternalities,
 };
diff --git a/bizinikiwi/pezframe/paged-list/src/lib.rs b/bizinikiwi/pezframe/paged-list/src/lib.rs
index 53724f8c..799abf8c 100644
--- a/bizinikiwi/pezframe/paged-list/src/lib.rs
+++ b/bizinikiwi/pezframe/paged-list/src/lib.rs
@@ -32,7 +32,7 @@
 //!
 //! The pezpallet is quite unique since it does not expose any `Call`s, `Error`s or `Event`s. All
 //! interaction goes through the implemented
-//! [`StorageList`][frame::deps::pezframe_support::storage::StorageList] trait.
+//! [`StorageList`][pezframe::deps::pezframe_support::storage::StorageList] trait.
 //!
 //! A fuzzer for testing is provided in crate `pezpallet-paged-list-fuzzer`.
 //!
@@ -72,10 +72,10 @@ mod tests;
 extern crate alloc;
 
 use codec::FullCodec;
-use frame::{prelude::*, traits::StorageInstance};
+use pezframe::{prelude::*, traits::StorageInstance};
 pub use paged_list::StoragePagedList;
 
-#[frame::pezpallet]
+#[pezframe::pezpallet]
 pub mod pezpallet {
 	use super::*;
 
diff --git a/bizinikiwi/pezframe/paged-list/src/mock.rs b/bizinikiwi/pezframe/paged-list/src/mock.rs
index 2f9b4de0..12041be5 100644
--- a/bizinikiwi/pezframe/paged-list/src/mock.rs
+++ b/bizinikiwi/pezframe/paged-list/src/mock.rs
@@ -20,7 +20,7 @@
 #![cfg(feature = "std")]
 
 use crate::{paged_list::StoragePagedListMeta, Config, ListPrefix};
-use frame::testing_prelude::*;
+use pezframe::testing_prelude::*;
 
 type Block = pezframe_system::mocking::MockBlock<Test>;
 
diff --git a/bizinikiwi/pezframe/paged-list/src/paged_list.rs b/bizinikiwi/pezframe/paged-list/src/paged_list.rs
index f5d319da..c201752c 100644
--- a/bizinikiwi/pezframe/paged-list/src/paged_list.rs
+++ b/bizinikiwi/pezframe/paged-list/src/paged_list.rs
@@ -26,7 +26,7 @@
 use alloc::vec::Vec;
 use codec::{Decode, Encode, EncodeLike, FullCodec};
 use core::marker::PhantomData;
-use frame::{
+use pezframe::{
 	deps::pezsp_io,
 	prelude::*,
 	runtime::prelude::storage::{StorageAppender, StorageList, StoragePrefixedContainer},
@@ -60,10 +60,10 @@ pub type ValueIndex = u32;
 /// are loaded once a page is read from storage. Iteration then happens on the cached elements. This
 /// reduces the number of storage `read` calls on the overlay. **Appending** to the list happens by
 /// appending to the last page by utilizing
-/// [`storage::append`](frame::deps::pezsp_io::storage::append). It allows to directly extend
+/// [`storage::append`](pezframe::deps::pezsp_io::storage::append). It allows to directly extend
 /// the elements of `values` vector of the page without loading the whole vector from storage. A new
 /// page is instantiated once [`Page::next`] overflows `ValuesPerNewPage`. Its vector will also be
-/// created through [`storage::append`](frame::deps::pezsp_io::storage::append). **Draining**
+/// created through [`storage::append`](pezframe::deps::pezsp_io::storage::append). **Draining**
 /// advances the internal indices identical to Iteration. It additionally persists the increments to
 /// storage and thereby 'drains' elements. Completely drained pages are deleted from storage.
 ///
@@ -83,7 +83,7 @@ pub struct StoragePagedList<Prefix, Value, ValuesPerNewPage> {
 
 /// The state of a [`StoragePagedList`].
 ///
-/// This struct doubles as [`frame::deps::pezframe_support::storage::StorageList::Appender`].
+/// This struct doubles as [`pezframe::deps::pezframe_support::storage::StorageList::Appender`].
 #[derive(
 	Encode, Decode, CloneNoBound, PartialEqNoBound, EqNoBound, DebugNoBound, DefaultNoBound,
 )]
@@ -407,7 +407,7 @@ where
 #[allow(dead_code)]
 pub(crate) mod mock {
 	pub use super::*;
-	use frame::testing_prelude::*;
+	use pezframe::testing_prelude::*;
 
 	parameter_types! {
 		pub const ValuesPerNewPage: u32 = 5;
@@ -428,7 +428,7 @@ pub(crate) mod mock {
 #[cfg(test)]
 mod tests {
 	use super::mock::*;
-	use frame::testing_prelude::*;
+	use pezframe::testing_prelude::*;
 
 	#[test]
 	fn append_works() {
diff --git a/bizinikiwi/pezframe/paged-list/src/tests.rs b/bizinikiwi/pezframe/paged-list/src/tests.rs
index cbec716f..f1ee6033 100644
--- a/bizinikiwi/pezframe/paged-list/src/tests.rs
+++ b/bizinikiwi/pezframe/paged-list/src/tests.rs
@@ -21,7 +21,7 @@
 #![cfg(test)]
 
 use crate::{mock::*, *};
-use frame::{
+use pezframe::{
 	prelude::storage::{StorageAppender, StoragePrefixedContainer},
 	testing_prelude::*,
 };
diff --git a/bizinikiwi/pezframe/parameters/Cargo.toml b/bizinikiwi/pezframe/parameters/Cargo.toml
index cb186d63..cdfafc87 100644
--- a/bizinikiwi/pezframe/parameters/Cargo.toml
+++ b/bizinikiwi/pezframe/parameters/Cargo.toml
@@ -3,7 +3,7 @@ name = "pezpallet-parameters"
 description = "Pallet to store and configure parameters."
 repository.workspace = true
 license = "Apache-2.0"
-version = "0.1.0"
+version = "0.44.0"
 authors = [
 	"Acala Developers",
 	"Kurdistan Tech Institute <info@pezkuwichain.io>",
@@ -28,9 +28,9 @@ pezframe-system = { workspace = true }
 pezsp-core = { workspace = true }
 pezsp-runtime = { workspace = true }
 
+# pezpallet-example-basic moved to integration tests to break circular dependency
 [dev-dependencies]
 pezpallet-balances = { workspace = true, default-features = true }
-pezpallet-example-basic = { workspace = true, default-features = true }
 pezsp-io = { workspace = true, default-features = true }
 
 [features]
@@ -50,7 +50,6 @@ runtime-benchmarks = [
 	"pezframe-support/runtime-benchmarks",
 	"pezframe-system/runtime-benchmarks",
 	"pezpallet-balances/runtime-benchmarks",
-	"pezpallet-example-basic/runtime-benchmarks",
 	"pezsp-io/runtime-benchmarks",
 	"pezsp-runtime/runtime-benchmarks",
 ]
@@ -58,6 +57,5 @@ try-runtime = [
 	"pezframe-support/try-runtime",
 	"pezframe-system/try-runtime",
 	"pezpallet-balances/try-runtime",
-	"pezpallet-example-basic/try-runtime",
 	"pezsp-runtime/try-runtime",
 ]
diff --git a/bizinikiwi/pezframe/proxy/Cargo.toml b/bizinikiwi/pezframe/proxy/Cargo.toml
index 34cf35f0..62d4741c 100644
--- a/bizinikiwi/pezframe/proxy/Cargo.toml
+++ b/bizinikiwi/pezframe/proxy/Cargo.toml
@@ -18,7 +18,9 @@ targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
 codec = { features = ["max-encoded-len"], workspace = true }
-frame = { workspace = true, features = ["runtime"] }
+pezframe = { workspace = true, features = ["runtime"] }
+pezframe-system = { workspace = true }
+pezframe-support = { workspace = true }
 scale-info = { features = ["derive"], workspace = true }
 
 [dev-dependencies]
@@ -27,14 +29,14 @@ pezpallet-utility = { workspace = true, default-features = true }
 
 [features]
 default = ["std"]
-std = ["codec/std", "frame/std", "scale-info/std"]
+std = ["codec/std", "pezframe/std", "scale-info/std"]
 runtime-benchmarks = [
-	"frame/runtime-benchmarks",
+	"pezframe/runtime-benchmarks",
 	"pezpallet-balances/runtime-benchmarks",
 	"pezpallet-utility/runtime-benchmarks",
 ]
 try-runtime = [
-	"frame/try-runtime",
+	"pezframe/try-runtime",
 	"pezpallet-balances/try-runtime",
 	"pezpallet-utility/try-runtime",
 ]
diff --git a/bizinikiwi/pezframe/proxy/src/benchmarking.rs b/bizinikiwi/pezframe/proxy/src/benchmarking.rs
index c9ad2e27..9c602a5f 100644
--- a/bizinikiwi/pezframe/proxy/src/benchmarking.rs
+++ b/bizinikiwi/pezframe/proxy/src/benchmarking.rs
@@ -22,7 +22,7 @@
 use super::*;
 use crate::Pezpallet as Proxy;
 use alloc::{boxed::Box, vec};
-use frame::benchmarking::prelude::{
+use pezframe::benchmarking::prelude::{
 	account, benchmarks, impl_test_function, whitelisted_caller, BenchmarkError, RawOrigin,
 };
 
diff --git a/bizinikiwi/pezframe/proxy/src/lib.rs b/bizinikiwi/pezframe/proxy/src/lib.rs
index c754d41e..eef2e08b 100644
--- a/bizinikiwi/pezframe/proxy/src/lib.rs
+++ b/bizinikiwi/pezframe/proxy/src/lib.rs
@@ -35,7 +35,7 @@ pub mod weights;
 
 extern crate alloc;
 use alloc::{boxed::Box, vec};
-use frame::{
+use pezframe::{
 	prelude::*,
 	traits::{Currency, InstanceFilter, ReservableCurrency},
 };
@@ -120,7 +120,7 @@ pub enum DepositKind {
 	Announcements,
 }
 
-#[frame::pezpallet]
+#[pezframe::pezpallet]
 pub mod pezpallet {
 	use super::*;
 
@@ -154,7 +154,7 @@ pub mod pezpallet {
 			+ Member
 			+ Ord
 			+ PartialOrd
-			+ frame::traits::InstanceFilter<<Self as Config>::RuntimeCall>
+			+ pezframe::traits::InstanceFilter<<Self as Config>::RuntimeCall>
 			+ Default
 			+ MaxEncodedLen;
 
@@ -998,7 +998,7 @@ impl<T: Config> Pezpallet<T> {
 		real: T::AccountId,
 		call: <T as Config>::RuntimeCall,
 	) {
-		use frame::traits::{InstanceFilter as _, OriginTrait as _};
+		use pezframe::traits::{InstanceFilter as _, OriginTrait as _};
 		// This is a freshly authenticated new account, the origin restrictions doesn't apply.
 		let mut origin: T::RuntimeOrigin = pezframe_system::RawOrigin::Signed(real).into();
 		origin.add_filter(move |c: &<T as pezframe_system::Config>::RuntimeCall| {
diff --git a/bizinikiwi/pezframe/proxy/src/tests.rs b/bizinikiwi/pezframe/proxy/src/tests.rs
index ecafb8bb..ebfbd7e3 100644
--- a/bizinikiwi/pezframe/proxy/src/tests.rs
+++ b/bizinikiwi/pezframe/proxy/src/tests.rs
@@ -22,7 +22,7 @@
 use super::*;
 use crate as proxy;
 use alloc::{vec, vec::Vec};
-use frame::testing_prelude::*;
+use pezframe::testing_prelude::*;
 
 type Block = pezframe_system::mocking::MockBlock<Test>;
 
@@ -79,7 +79,7 @@ impl Default for ProxyType {
 		Self::Any
 	}
 }
-impl frame::traits::InstanceFilter<RuntimeCall> for ProxyType {
+impl pezframe::traits::InstanceFilter<RuntimeCall> for ProxyType {
 	fn filter(&self, c: &RuntimeCall) -> bool {
 		match self {
 			ProxyType::Any => true,
diff --git a/bizinikiwi/pezframe/proxy/src/weights.rs b/bizinikiwi/pezframe/proxy/src/weights.rs
index f8464110..815f78ac 100644
--- a/bizinikiwi/pezframe/proxy/src/weights.rs
+++ b/bizinikiwi/pezframe/proxy/src/weights.rs
@@ -66,7 +66,7 @@
 #![allow(missing_docs)]
 #![allow(dead_code)]
 
-use frame::weights_prelude::*;
+use pezframe::weights_prelude::*;
 
 /// Weight functions needed for `pezpallet_proxy`.
 pub trait WeightInfo {
diff --git a/bizinikiwi/pezframe/recovery/Cargo.toml b/bizinikiwi/pezframe/recovery/Cargo.toml
index f4a8ab47..cbbef2e4 100644
--- a/bizinikiwi/pezframe/recovery/Cargo.toml
+++ b/bizinikiwi/pezframe/recovery/Cargo.toml
@@ -18,7 +18,9 @@ targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
 codec = { features = ["derive"], workspace = true }
-frame = { workspace = true, features = ["runtime"] }
+pezframe = { workspace = true, features = ["runtime"] }
+pezframe-system = { workspace = true }
+pezframe-support = { workspace = true }
 scale-info = { features = ["derive"], workspace = true }
 
 [dev-dependencies]
@@ -27,8 +29,8 @@ pezpallet-balances = { workspace = true, default-features = true }
 [features]
 default = ["std"]
 runtime-benchmarks = [
-	"frame/runtime-benchmarks",
+	"pezframe/runtime-benchmarks",
 	"pezpallet-balances/runtime-benchmarks",
 ]
-std = ["codec/std", "frame/std", "pezpallet-balances/std", "scale-info/std"]
-try-runtime = ["frame/try-runtime", "pezpallet-balances/try-runtime"]
+std = ["codec/std", "pezframe/std", "pezpallet-balances/std", "scale-info/std"]
+try-runtime = ["pezframe/try-runtime", "pezpallet-balances/try-runtime"]
diff --git a/bizinikiwi/pezframe/recovery/src/benchmarking.rs b/bizinikiwi/pezframe/recovery/src/benchmarking.rs
index cfc31eca..73908b87 100644
--- a/bizinikiwi/pezframe/recovery/src/benchmarking.rs
+++ b/bizinikiwi/pezframe/recovery/src/benchmarking.rs
@@ -21,7 +21,7 @@ use super::*;
 
 use crate::Pezpallet;
 use alloc::{boxed::Box, vec, vec::Vec};
-use frame::benchmarking::prelude::*;
+use pezframe::benchmarking::prelude::*;
 
 const SEED: u32 = 0;
 const DEFAULT_DELAY: u32 = 0;
diff --git a/bizinikiwi/pezframe/recovery/src/lib.rs b/bizinikiwi/pezframe/recovery/src/lib.rs
index d9615b4d..4f2826bf 100644
--- a/bizinikiwi/pezframe/recovery/src/lib.rs
+++ b/bizinikiwi/pezframe/recovery/src/lib.rs
@@ -154,7 +154,7 @@ extern crate alloc;
 
 use alloc::{boxed::Box, vec::Vec};
 
-use frame::{
+use pezframe::{
 	prelude::*,
 	traits::{Currency, ReservableCurrency},
 };
@@ -225,7 +225,7 @@ pub enum DepositKind<T: Config> {
 	ActiveRecoveryFor(<T as pezframe_system::Config>::AccountId),
 }
 
-#[frame::pezpallet]
+#[pezframe::pezpallet]
 pub mod pezpallet {
 	use super::*;
 
diff --git a/bizinikiwi/pezframe/recovery/src/mock.rs b/bizinikiwi/pezframe/recovery/src/mock.rs
index 7ea643a4..23e2b79b 100644
--- a/bizinikiwi/pezframe/recovery/src/mock.rs
+++ b/bizinikiwi/pezframe/recovery/src/mock.rs
@@ -20,7 +20,7 @@
 use super::*;
 
 use crate as recovery;
-use frame::{deps::pezsp_io, testing_prelude::*};
+use pezframe::{deps::pezsp_io, testing_prelude::*};
 
 type Block = pezframe_system::mocking::MockBlock<Test>;
 
diff --git a/bizinikiwi/pezframe/recovery/src/tests.rs b/bizinikiwi/pezframe/recovery/src/tests.rs
index 4abf71a6..d2879857 100644
--- a/bizinikiwi/pezframe/recovery/src/tests.rs
+++ b/bizinikiwi/pezframe/recovery/src/tests.rs
@@ -18,7 +18,7 @@
 //! Tests for the module.
 
 use crate::{mock::*, *};
-use frame::{deps::pezsp_runtime::bounded_vec, testing_prelude::*};
+use pezframe::{deps::pezsp_runtime::bounded_vec, testing_prelude::*};
 
 #[test]
 fn basic_setup_works() {
diff --git a/bizinikiwi/pezframe/recovery/src/weights.rs b/bizinikiwi/pezframe/recovery/src/weights.rs
index 221ba692..69df7dcb 100644
--- a/bizinikiwi/pezframe/recovery/src/weights.rs
+++ b/bizinikiwi/pezframe/recovery/src/weights.rs
@@ -66,7 +66,7 @@
 #![allow(missing_docs)]
 #![allow(dead_code)]
 
-use frame::weights_prelude::*;
+use pezframe::weights_prelude::*;
 
 /// Weight functions needed for `pezpallet_recovery`.
 pub trait WeightInfo {
diff --git a/bizinikiwi/pezframe/revive/dev-node/runtime/src/lib.rs b/bizinikiwi/pezframe/revive/dev-node/runtime/src/lib.rs
index b8418fac..a7399fdc 100644
--- a/bizinikiwi/pezframe/revive/dev-node/runtime/src/lib.rs
+++ b/bizinikiwi/pezframe/revive/dev-node/runtime/src/lib.rs
@@ -31,7 +31,7 @@ use pezframe_support::weights::{
 };
 use pezframe_system::limits::BlockWeights;
 use pezkuwi_sdk::{
-	pezkuwi_sdk_frame::{
+	pezframe::{
 		deps::pezsp_genesis_builder,
 		runtime::{apis, prelude::*},
 		traits::Block as BlockT,
@@ -51,7 +51,7 @@ use pezpallet_transaction_payment::{
 use pezsp_weights::ConstantMultiplier;
 
 pub use pezkuwi_sdk::{
-	pezkuwi_sdk_frame::runtime::types_common::OpaqueBlock,
+	pezframe::runtime::types_common::OpaqueBlock,
 	teyrchains_common::{AccountId, Balance, BlockNumber, Hash, Header, Nonce, Signature},
 };
 
diff --git a/bizinikiwi/pezframe/revive/fixtures/Cargo.toml b/bizinikiwi/pezframe/revive/fixtures/Cargo.toml
index 54669f86..ce5109e5 100644
--- a/bizinikiwi/pezframe/revive/fixtures/Cargo.toml
+++ b/bizinikiwi/pezframe/revive/fixtures/Cargo.toml
@@ -9,7 +9,7 @@ homepage.workspace = true
 repository.workspace = true
 rust-version = "1.84"
 documentation.workspace = true
-publish = false
+publish = true
 
 [package.metadata.pezkuwi-sdk]
 exclude-from-umbrella = true
diff --git a/bizinikiwi/pezframe/revive/proc-macro/Cargo.toml b/bizinikiwi/pezframe/revive/proc-macro/Cargo.toml
index 2a1fbeb8..65cd2c76 100644
--- a/bizinikiwi/pezframe/revive/proc-macro/Cargo.toml
+++ b/bizinikiwi/pezframe/revive/proc-macro/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "pezpallet-revive-proc-macro"
-version = "0.1.0"
+version = "0.44.0"
 authors.workspace = true
 edition.workspace = true
 license = "Apache-2.0"
diff --git a/bizinikiwi/pezframe/revive/uapi/Cargo.toml b/bizinikiwi/pezframe/revive/uapi/Cargo.toml
index c5b3ab44..e0241263 100644
--- a/bizinikiwi/pezframe/revive/uapi/Cargo.toml
+++ b/bizinikiwi/pezframe/revive/uapi/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "pezpallet-revive-uapi"
-version = "0.1.0"
+version = "0.44.0"
 authors.workspace = true
 edition.workspace = true
 license = "Apache-2.0"
diff --git a/bizinikiwi/pezframe/safe-mode/Cargo.toml b/bizinikiwi/pezframe/safe-mode/Cargo.toml
index fee4b047..31d58e70 100644
--- a/bizinikiwi/pezframe/safe-mode/Cargo.toml
+++ b/bizinikiwi/pezframe/safe-mode/Cargo.toml
@@ -18,7 +18,9 @@ targets = ["x86_64-unknown-linux-gnu"]
 [dependencies]
 codec = { features = ["derive"], workspace = true }
 docify = { workspace = true }
-frame = { workspace = true, features = ["runtime"] }
+pezframe = { workspace = true, features = ["runtime"] }
+pezframe-system = { workspace = true }
+pezframe-support = { workspace = true }
 pezpallet-balances = { optional = true, workspace = true }
 pezpallet-proxy = { optional = true, workspace = true }
 pezpallet-utility = { optional = true, workspace = true }
@@ -33,20 +35,22 @@ pezpallet-utility = { workspace = true, default-features = true }
 default = ["std"]
 std = [
 	"codec/std",
-	"frame/std",
+	"pezframe/std",
+	"pezframe-system/std",
+	"pezframe-support/std",
 	"pezpallet-balances?/std",
 	"pezpallet-proxy?/std",
 	"pezpallet-utility?/std",
 	"scale-info/std",
 ]
 runtime-benchmarks = [
-	"frame/runtime-benchmarks",
+	"pezframe/runtime-benchmarks",
 	"pezpallet-balances/runtime-benchmarks",
 	"pezpallet-proxy/runtime-benchmarks",
 	"pezpallet-utility/runtime-benchmarks",
 ]
 try-runtime = [
-	"frame/try-runtime",
+	"pezframe/try-runtime",
 	"pezpallet-balances?/try-runtime",
 	"pezpallet-proxy?/try-runtime",
 	"pezpallet-utility?/try-runtime",
diff --git a/bizinikiwi/pezframe/safe-mode/src/benchmarking.rs b/bizinikiwi/pezframe/safe-mode/src/benchmarking.rs
index 61cfd40e..5fba5f10 100644
--- a/bizinikiwi/pezframe/safe-mode/src/benchmarking.rs
+++ b/bizinikiwi/pezframe/safe-mode/src/benchmarking.rs
@@ -18,7 +18,7 @@
 #![cfg(feature = "runtime-benchmarks")]
 
 use super::{Pezpallet as SafeMode, *};
-use frame::benchmarking::prelude::*;
+use pezframe::benchmarking::prelude::*;
 
 #[benchmarks(where T::Currency: fungible::Mutate<T::AccountId>)]
 mod benchmarks {
diff --git a/bizinikiwi/pezframe/safe-mode/src/lib.rs b/bizinikiwi/pezframe/safe-mode/src/lib.rs
index 585d55b0..1ac93545 100644
--- a/bizinikiwi/pezframe/safe-mode/src/lib.rs
+++ b/bizinikiwi/pezframe/safe-mode/src/lib.rs
@@ -75,7 +75,7 @@ pub mod mock;
 mod tests;
 pub mod weights;
 
-use frame::{
+use pezframe::{
 	prelude::{
 		fungible::hold::{Inspect, Mutate},
 		*,
@@ -90,7 +90,7 @@ type BalanceOf<T> = <<T as Config>::Currency as fungible::Inspect<
 	<T as pezframe_system::Config>::AccountId,
 >>::Balance;
 
-#[frame::pezpallet]
+#[pezframe::pezpallet]
 pub mod pezpallet {
 	use super::*;
 
@@ -613,7 +613,7 @@ where
 	}
 }
 
-impl<T: Config> frame::traits::SafeMode for Pezpallet<T> {
+impl<T: Config> pezframe::traits::SafeMode for Pezpallet<T> {
 	type BlockNumber = BlockNumberFor<T>;
 
 	fn is_entered() -> bool {
@@ -627,20 +627,20 @@ impl<T: Config> frame::traits::SafeMode for Pezpallet<T> {
 		})
 	}
 
-	fn enter(duration: BlockNumberFor<T>) -> Result<(), frame::traits::SafeModeError> {
+	fn enter(duration: BlockNumberFor<T>) -> Result<(), pezframe::traits::SafeModeError> {
 		Self::do_enter(None, duration).map_err(Into::into)
 	}
 
-	fn extend(duration: BlockNumberFor<T>) -> Result<(), frame::traits::SafeModeError> {
+	fn extend(duration: BlockNumberFor<T>) -> Result<(), pezframe::traits::SafeModeError> {
 		Self::do_extend(None, duration).map_err(Into::into)
 	}
 
-	fn exit() -> Result<(), frame::traits::SafeModeError> {
+	fn exit() -> Result<(), pezframe::traits::SafeModeError> {
 		Self::do_exit(ExitReason::Force).map_err(Into::into)
 	}
 }
 
-impl<T: Config> From<Error<T>> for frame::traits::SafeModeError {
+impl<T: Config> From<Error<T>> for pezframe::traits::SafeModeError {
 	fn from(err: Error<T>) -> Self {
 		match err {
 			Error::<T>::Entered => Self::AlreadyEntered,
diff --git a/bizinikiwi/pezframe/safe-mode/src/mock.rs b/bizinikiwi/pezframe/safe-mode/src/mock.rs
index d76a51c5..dc84557a 100644
--- a/bizinikiwi/pezframe/safe-mode/src/mock.rs
+++ b/bizinikiwi/pezframe/safe-mode/src/mock.rs
@@ -22,7 +22,7 @@
 use super::*;
 use crate as pezpallet_safe_mode;
 
-use frame::{
+use pezframe::{
 	testing_prelude::*,
 	traits::{InsideBoth, InstanceFilter, IsInVec},
 };
diff --git a/bizinikiwi/pezframe/safe-mode/src/tests.rs b/bizinikiwi/pezframe/safe-mode/src/tests.rs
index a546dc7b..ef4ba0e1 100644
--- a/bizinikiwi/pezframe/safe-mode/src/tests.rs
+++ b/bizinikiwi/pezframe/safe-mode/src/tests.rs
@@ -22,7 +22,7 @@
 use super::*;
 use crate::mock::{RuntimeCall, *};
 
-use frame::{testing_prelude::*, traits::Currency};
+use pezframe::{testing_prelude::*, traits::Currency};
 
 #[test]
 fn fails_to_filter_calls_to_safe_mode_pallet() {
diff --git a/bizinikiwi/pezframe/safe-mode/src/weights.rs b/bizinikiwi/pezframe/safe-mode/src/weights.rs
index 125fb97d..e0ce92fe 100644
--- a/bizinikiwi/pezframe/safe-mode/src/weights.rs
+++ b/bizinikiwi/pezframe/safe-mode/src/weights.rs
@@ -67,7 +67,7 @@
 #![allow(missing_docs)]
 #![allow(dead_code)]
 
-use frame::weights_prelude::*;
+use pezframe::weights_prelude::*;
 use core::marker::PhantomData;
 
 /// Weight functions needed for `pezpallet_safe_mode`.
diff --git a/bizinikiwi/pezframe/salary/Cargo.toml b/bizinikiwi/pezframe/salary/Cargo.toml
index 47baad71..0b62b76f 100644
--- a/bizinikiwi/pezframe/salary/Cargo.toml
+++ b/bizinikiwi/pezframe/salary/Cargo.toml
@@ -18,7 +18,9 @@ targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
 codec = { features = ["derive"], workspace = true }
-frame = { workspace = true, features = ["runtime"] }
+pezframe = { workspace = true, features = ["runtime"] }
+pezframe-system = { workspace = true }
+pezframe-support = { workspace = true }
 log = { workspace = true }
 pezpallet-ranked-collective = { optional = true, workspace = true }
 scale-info = { features = ["derive"], workspace = true }
@@ -27,13 +29,15 @@ scale-info = { features = ["derive"], workspace = true }
 default = ["std"]
 std = [
 	"codec/std",
-	"frame/std",
+	"pezframe/std",
+	"pezframe-system/std",
+	"pezframe-support/std",
 	"log/std",
 	"pezpallet-ranked-collective/std",
 	"scale-info/std",
 ]
 runtime-benchmarks = [
-	"frame/runtime-benchmarks",
+	"pezframe/runtime-benchmarks",
 	"pezpallet-ranked-collective/runtime-benchmarks",
 ]
-try-runtime = ["frame/try-runtime", "pezpallet-ranked-collective?/try-runtime"]
+try-runtime = ["pezframe/try-runtime", "pezpallet-ranked-collective?/try-runtime"]
diff --git a/bizinikiwi/pezframe/salary/src/benchmarking.rs b/bizinikiwi/pezframe/salary/src/benchmarking.rs
index 1637328f..a5773643 100644
--- a/bizinikiwi/pezframe/salary/src/benchmarking.rs
+++ b/bizinikiwi/pezframe/salary/src/benchmarking.rs
@@ -22,7 +22,7 @@
 use super::*;
 use crate::Pezpallet as Salary;
 
-use frame::benchmarking::prelude::*;
+use pezframe::benchmarking::prelude::*;
 const SEED: u32 = 0;
 
 fn ensure_member_with_salary<T: Config<I>, I: 'static>(who: &T::AccountId) {
diff --git a/bizinikiwi/pezframe/salary/src/lib.rs b/bizinikiwi/pezframe/salary/src/lib.rs
index 42387935..ceeb9f18 100644
--- a/bizinikiwi/pezframe/salary/src/lib.rs
+++ b/bizinikiwi/pezframe/salary/src/lib.rs
@@ -20,7 +20,7 @@
 #![cfg_attr(not(feature = "std"), no_std)]
 
 use core::marker::PhantomData;
-use frame::{
+use pezframe::{
 	prelude::*,
 	traits::tokens::{GetSalary, Pay, PaymentStatus},
 };
@@ -75,7 +75,7 @@ pub struct ClaimantStatus<CycleIndex, Balance, Id> {
 	status: ClaimState<Balance, Id>,
 }
 
-#[frame::pezpallet]
+#[pezframe::pezpallet]
 pub mod pezpallet {
 	use super::*;
 	#[pezpallet::pezpallet]
diff --git a/bizinikiwi/pezframe/salary/src/tests/integration.rs b/bizinikiwi/pezframe/salary/src/tests/integration.rs
index 6705aff2..ffa7a8ec 100644
--- a/bizinikiwi/pezframe/salary/src/tests/integration.rs
+++ b/bizinikiwi/pezframe/salary/src/tests/integration.rs
@@ -19,7 +19,7 @@
 
 use crate as pezpallet_salary;
 use crate::*;
-use frame::{deps::pezsp_io, testing_prelude::*};
+use pezframe::{deps::pezsp_io, testing_prelude::*};
 use pezpallet_ranked_collective::{EnsureRanked, Geometric};
 
 type Rank = u16;
diff --git a/bizinikiwi/pezframe/salary/src/tests/unit.rs b/bizinikiwi/pezframe/salary/src/tests/unit.rs
index a03320fc..143cf208 100644
--- a/bizinikiwi/pezframe/salary/src/tests/unit.rs
+++ b/bizinikiwi/pezframe/salary/src/tests/unit.rs
@@ -20,7 +20,7 @@
 use crate as pezpallet_salary;
 use crate::*;
 use core::cell::RefCell;
-use frame::{
+use pezframe::{
 	deps::pezsp_runtime::traits::Identity, testing_prelude::*, traits::tokens::ConvertRank,
 };
 use std::collections::BTreeMap;
diff --git a/bizinikiwi/pezframe/salary/src/weights.rs b/bizinikiwi/pezframe/salary/src/weights.rs
index 3da44e3b..7e7d837a 100644
--- a/bizinikiwi/pezframe/salary/src/weights.rs
+++ b/bizinikiwi/pezframe/salary/src/weights.rs
@@ -67,7 +67,7 @@
 #![allow(missing_docs)]
 #![allow(dead_code)]
 
-use frame::weights_prelude::*;
+use pezframe::weights_prelude::*;
 
 /// Weight functions needed for `pezpallet_salary`.
 pub trait WeightInfo {
diff --git a/bizinikiwi/pezframe/society/Cargo.toml b/bizinikiwi/pezframe/society/Cargo.toml
index 7b578fd5..1347b606 100644
--- a/bizinikiwi/pezframe/society/Cargo.toml
+++ b/bizinikiwi/pezframe/society/Cargo.toml
@@ -29,8 +29,8 @@ pezsp-arithmetic = { workspace = true }
 pezsp-io = { workspace = true }
 pezsp-runtime = { workspace = true }
 
+# pezframe-support-test moved to integration tests to break circular dependency
 [dev-dependencies]
-pezframe-support-test = { workspace = true }
 pezpallet-balances = { workspace = true, default-features = true }
 pezsp-crypto-hashing = { workspace = true, default-features = true }
 
@@ -40,7 +40,6 @@ std = [
 	"codec/std",
 	"log/std",
 	"pezframe-benchmarking?/std",
-	"pezframe-support-test/std",
 	"pezframe-support/std",
 	"pezframe-system/std",
 	"pezpallet-balances/std",
@@ -53,7 +52,6 @@ std = [
 runtime-benchmarks = [
 	"pezframe-benchmarking",
 	"pezframe-benchmarking/runtime-benchmarks",
-	"pezframe-support-test/runtime-benchmarks",
 	"pezframe-support/runtime-benchmarks",
 	"pezframe-system/runtime-benchmarks",
 	"pezpallet-balances/runtime-benchmarks",
@@ -61,7 +59,6 @@ runtime-benchmarks = [
 	"pezsp-runtime/runtime-benchmarks",
 ]
 try-runtime = [
-	"pezframe-support-test/try-runtime",
 	"pezframe-support/try-runtime",
 	"pezframe-system/try-runtime",
 	"pezpallet-balances/try-runtime",
diff --git a/bizinikiwi/pezframe/src/lib.rs b/bizinikiwi/pezframe/src/lib.rs
index f9f7c07d..d7dae84f 100644
--- a/bizinikiwi/pezframe/src/lib.rs
+++ b/bizinikiwi/pezframe/src/lib.rs
@@ -49,10 +49,10 @@
 //! ```
 //! use pezkuwi_sdk_frame as frame;
 //!
-//! #[frame::pezpallet]
+//! #[pezframe::pezpallet]
 //! pub mod pezpallet {
 //! 	# use pezkuwi_sdk_frame as frame;
-//! 	use frame::prelude::*;
+//! 	use pezframe::prelude::*;
 //! 	// ^^ using the prelude!
 //!
 //! 	#[pezpallet::config]
@@ -65,18 +65,18 @@
 //! #[cfg(test)]
 //! pub mod tests {
 //! 	# use pezkuwi_sdk_frame as frame;
-//! 	use frame::testing_prelude::*;
+//! 	use pezframe::testing_prelude::*;
 //! }
 //!
 //! #[cfg(feature = "runtime-benchmarks")]
 //! pub mod benchmarking {
 //! 	# use pezkuwi_sdk_frame as frame;
-//! 	use frame::benchmarking::prelude::*;
+//! 	use pezframe::benchmarking::prelude::*;
 //! }
 //!
 //! pub mod runtime {
 //! 	# use pezkuwi_sdk_frame as frame;
-//! 	use frame::runtime::prelude::*;
+//! 	use pezframe::runtime::prelude::*;
 //! }
 //! ```
 //!
@@ -165,7 +165,7 @@ pub mod pezpallet_macros {
 /// This prelude should almost always be the first line of code in any pezpallet or runtime.
 ///
 /// ```
-/// use pezkuwi_sdk_frame::prelude::*;
+/// use pezframe::prelude::*;
 ///
 /// // rest of your pezpallet..
 /// mod pezpallet {}
@@ -175,7 +175,7 @@ pub mod prelude {
 	/// crate.
 	///
 	/// Conveniently, the keyword `pezframe_system` is in scope as one uses `use
-	/// pezkuwi_sdk_frame::prelude::*`.
+	/// pezframe::prelude::*`.
 	#[doc(inline)]
 	pub use pezframe_system;
 
@@ -254,11 +254,11 @@ pub mod try_runtime {
 /// It supports both the `benchmarking::v1::benchmarks` and `benchmarking::v2::benchmark` syntax.
 ///
 /// ```
-/// use pezkuwi_sdk_frame::benchmarking::prelude::*;
+/// use pezframe::benchmarking::prelude::*;
 /// // rest of your code.
 /// ```
 ///
-/// It already includes `pezkuwi_sdk_frame::prelude::*` and `pezkuwi_sdk_frame::testing_prelude`.
+/// It already includes `pezframe::prelude::*` and `pezframe::testing_prelude`.
 #[cfg(feature = "runtime-benchmarks")]
 pub mod benchmarking {
 	mod shared {
@@ -294,7 +294,7 @@ pub mod benchmarking {
 /// Prelude to be included in the `weight.rs` of each pezpallet.
 ///
 /// ```
-/// pub use pezkuwi_sdk_frame::weights_prelude::*;
+/// pub use pezframe::weights_prelude::*;
 /// ```
 pub mod weights_prelude {
 	pub use core::marker::PhantomData;
@@ -313,12 +313,12 @@ pub mod weights_prelude {
 /// A test setup typically starts with:
 ///
 /// ```
-/// use pezkuwi_sdk_frame::testing_prelude::*;
+/// use pezframe::testing_prelude::*;
 /// // rest of your test setup.
 /// ```
 ///
-/// This automatically brings in `pezkuwi_sdk_frame::prelude::*` and
-/// `pezkuwi_sdk_frame::runtime::prelude::*`.
+/// This automatically brings in `pezframe::prelude::*` and
+/// `pezframe::runtime::prelude::*`.
 #[cfg(feature = "std")]
 pub mod testing_prelude {
 	pub use crate::{prelude::*, runtime::prelude::*};
@@ -337,7 +337,7 @@ pub mod testing_prelude {
 	pub use pezframe_support::traits::Everything;
 	pub use pezframe_system::{self, mocking::*, RunToBlockHooks};
 
-	#[deprecated(note = "Use `frame::testing_prelude::TestState` instead.")]
+	#[deprecated(note = "Use `pezframe::testing_prelude::TestState` instead.")]
 	pub use pezsp_io::TestExternalities;
 
 	pub use pezsp_io::TestExternalities as TestState;
@@ -354,10 +354,10 @@ pub mod runtime {
 	/// A runtime typically starts with:
 	///
 	/// ```
-	/// use pezkuwi_sdk_frame::runtime::prelude::*;
+	/// use pezframe::runtime::prelude::*;
 	/// ```
 	///
-	/// This automatically brings in `pezkuwi_sdk_frame::prelude::*`.
+	/// This automatically brings in `pezframe::prelude::*`.
 	pub mod prelude {
 		pub use crate::prelude::*;
 
@@ -429,7 +429,7 @@ pub mod runtime {
 	/// A non-testing runtime should have this enabled, as such:
 	///
 	/// ```
-	/// use pezkuwi_sdk_frame::runtime::{prelude::*, apis::{*,}};
+	/// use pezframe::runtime::{prelude::*, apis::{*,}};
 	/// ```
 	// TODO: This is because of wildcard imports, and it should be not needed once we can avoid
 	// that. Imports like that are needed because we seem to need some unknown types in the macro
diff --git a/bizinikiwi/pezframe/staking-async/ahm-test/Cargo.toml b/bizinikiwi/pezframe/staking-async/ahm-test/Cargo.toml
index 87f72f6d..2b11fb88 100644
--- a/bizinikiwi/pezframe/staking-async/ahm-test/Cargo.toml
+++ b/bizinikiwi/pezframe/staking-async/ahm-test/Cargo.toml
@@ -18,7 +18,8 @@ targets = ["x86_64-unknown-linux-gnu"]
 
 [dev-dependencies]
 codec = { features = ["derive"], workspace = true, default-features = true }
-frame = { workspace = true, default-features = true }
+pezframe = { workspace = true, default-features = true }
+pezframe-system = { workspace = true }
 log = { workspace = true }
 pezframe-support = { workspace = true, default-features = true }
 pezsp-core = { workspace = true, default-features = true }
@@ -58,7 +59,7 @@ try-runtime = [
 	"pezpallet-staking-async-rc-client/try-runtime",
 	"pezpallet-staking-async/try-runtime",
 
-	"frame/try-runtime",
+	"pezframe/try-runtime",
 	"pezframe-election-provider-support/try-runtime",
 	"pezframe-support/try-runtime",
 	"pezpallet-authorship/try-runtime",
@@ -70,7 +71,7 @@ try-runtime = [
 	"pezpallet-timestamp/try-runtime",
 ]
 runtime-benchmarks = [
-	"frame/runtime-benchmarks",
+	"pezframe/runtime-benchmarks",
 	"pezframe-election-provider-support/runtime-benchmarks",
 	"pezframe-support/runtime-benchmarks",
 	"pezpallet-authorship/runtime-benchmarks",
diff --git a/bizinikiwi/pezframe/staking-async/ahm-test/src/ah/mock.rs b/bizinikiwi/pezframe/staking-async/ahm-test/src/ah/mock.rs
index 3a9ff680..7a2e1f20 100644
--- a/bizinikiwi/pezframe/staking-async/ahm-test/src/ah/mock.rs
+++ b/bizinikiwi/pezframe/staking-async/ahm-test/src/ah/mock.rs
@@ -16,7 +16,7 @@
 // limitations under the License.
 
 use crate::shared;
-use frame::testing_prelude::*;
+use pezframe::testing_prelude::*;
 use pezframe_election_provider_support::{
 	bounds::{ElectionBounds, ElectionBoundsBuilder},
 	SequentialPhragmen,
diff --git a/bizinikiwi/pezframe/staking-async/ahm-test/src/ah/test.rs b/bizinikiwi/pezframe/staking-async/ahm-test/src/ah/test.rs
index cfee79cf..9b9e786f 100644
--- a/bizinikiwi/pezframe/staking-async/ahm-test/src/ah/test.rs
+++ b/bizinikiwi/pezframe/staking-async/ahm-test/src/ah/test.rs
@@ -16,7 +16,7 @@
 // limitations under the License.
 
 use crate::ah::mock::*;
-use frame::prelude::Perbill;
+use pezframe::prelude::Perbill;
 use pezframe_support::assert_ok;
 use pezpallet_election_provider_multi_block::{Event as ElectionEvent, Phase};
 use pezpallet_staking_async::{
diff --git a/bizinikiwi/pezframe/staking-async/ahm-test/src/lib.rs b/bizinikiwi/pezframe/staking-async/ahm-test/src/lib.rs
index c7afca57..a4dde4cc 100644
--- a/bizinikiwi/pezframe/staking-async/ahm-test/src/lib.rs
+++ b/bizinikiwi/pezframe/staking-async/ahm-test/src/lib.rs
@@ -32,7 +32,7 @@ mod tests {
 		rc::RootOffences,
 	};
 	use ah_client::OperatingMode;
-	use frame::testing_prelude::*;
+	use pezframe::testing_prelude::*;
 	use pezframe_support::traits::Get;
 	use pezpallet_election_provider_multi_block as multi_block;
 	use pezpallet_staking as staking_classic;
diff --git a/bizinikiwi/pezframe/staking-async/ahm-test/src/rc/mock.rs b/bizinikiwi/pezframe/staking-async/ahm-test/src/rc/mock.rs
index c09aa87b..4412a8e2 100644
--- a/bizinikiwi/pezframe/staking-async/ahm-test/src/rc/mock.rs
+++ b/bizinikiwi/pezframe/staking-async/ahm-test/src/rc/mock.rs
@@ -17,7 +17,7 @@
 
 use crate::shared;
 use ah_client::OperatingMode;
-use frame::{
+use pezframe::{
 	deps::pezsp_runtime::testing::UintAuthorityId, testing_prelude::*, traits::fungible::Mutate,
 };
 use pezframe_election_provider_support::{
@@ -157,7 +157,7 @@ impl BoundToRuntimeAppPublic for OtherSessionHandler {
 	type Public = UintAuthorityId;
 }
 
-frame::deps::pezsp_runtime::impl_opaque_keys! {
+pezframe::deps::pezsp_runtime::impl_opaque_keys! {
 	pub struct SessionKeys {
 		pub other: OtherSessionHandler,
 	}
@@ -183,7 +183,7 @@ impl pezpallet_session::Config for Runtime {
 	type DisablingStrategy = pezpallet_session::disabling::UpToLimitDisablingStrategy<1>;
 
 	type Keys = SessionKeys;
-	type SessionHandler = <SessionKeys as frame::traits::OpaqueKeys>::KeyTypeIdProviders;
+	type SessionHandler = <SessionKeys as pezframe::traits::OpaqueKeys>::KeyTypeIdProviders;
 
 	type NextSessionRotation = Self::ShouldEndSession;
 	type ShouldEndSession = pezpallet_session::PeriodicSessions<Period, Offset>;
diff --git a/bizinikiwi/pezframe/staking-async/ahm-test/src/rc/test.rs b/bizinikiwi/pezframe/staking-async/ahm-test/src/rc/test.rs
index 4b51d28e..ab854d97 100644
--- a/bizinikiwi/pezframe/staking-async/ahm-test/src/rc/test.rs
+++ b/bizinikiwi/pezframe/staking-async/ahm-test/src/rc/test.rs
@@ -16,7 +16,7 @@
 // limitations under the License.
 
 use crate::rc::mock::*;
-use frame::testing_prelude::*;
+use pezframe::testing_prelude::*;
 use pezpallet_staking_async_ah_client::{
 	self as ah_client, Mode, OffenceSendQueue, OperatingMode, OutgoingSessionReport, UnexpectedKind,
 };
@@ -1402,7 +1402,7 @@ mod splitting {
 
 #[cfg(test)]
 mod key_proofs {
-	use frame::traits::KeyOwnerProofSystem;
+	use pezframe::traits::KeyOwnerProofSystem;
 	use pezframe_support::pezsp_runtime;
 
 	use super::*;
diff --git a/bizinikiwi/pezframe/staking-async/ahm-test/src/shared.rs b/bizinikiwi/pezframe/staking-async/ahm-test/src/shared.rs
index 8c7c4510..61ddaa76 100644
--- a/bizinikiwi/pezframe/staking-async/ahm-test/src/shared.rs
+++ b/bizinikiwi/pezframe/staking-async/ahm-test/src/shared.rs
@@ -16,7 +16,7 @@
 // limitations under the License.
 
 use crate::*;
-use frame::testing_prelude::*;
+use pezframe::testing_prelude::*;
 use std::cell::UnsafeCell;
 
 thread_local! {
diff --git a/bizinikiwi/pezframe/staking-async/runtimes/preset-store/Cargo.toml b/bizinikiwi/pezframe/staking-async/runtimes/preset-store/Cargo.toml
index e60eb395..a638e1fa 100644
--- a/bizinikiwi/pezframe/staking-async/runtimes/preset-store/Cargo.toml
+++ b/bizinikiwi/pezframe/staking-async/runtimes/preset-store/Cargo.toml
@@ -13,7 +13,9 @@ documentation.workspace = true
 
 [dependencies]
 codec = { workspace = true }
-frame = { workspace = true, features = ["runtime"] }
+pezframe = { workspace = true, features = ["runtime"] }
+pezframe-system = { workspace = true }
+pezframe-support = { workspace = true }
 pezpallet-staking-async-ah-client = { workspace = true }
 scale-info = { workspace = true }
 
@@ -21,11 +23,13 @@ scale-info = { workspace = true }
 default = ["std"]
 std = [
 	"codec/std",
-	"frame/std",
+	"pezframe/std",
+	"pezframe-system/std",
+	"pezframe-support/std",
 	"pezpallet-staking-async-ah-client/std",
 	"scale-info/std",
 ]
 runtime-benchmarks = [
-	"frame/runtime-benchmarks",
+	"pezframe/runtime-benchmarks",
 	"pezpallet-staking-async-ah-client/runtime-benchmarks",
 ]
diff --git a/bizinikiwi/pezframe/staking-async/runtimes/preset-store/src/lib.rs b/bizinikiwi/pezframe/staking-async/runtimes/preset-store/src/lib.rs
index 5b8af6d3..775a886a 100644
--- a/bizinikiwi/pezframe/staking-async/runtimes/preset-store/src/lib.rs
+++ b/bizinikiwi/pezframe/staking-async/runtimes/preset-store/src/lib.rs
@@ -22,10 +22,10 @@
 
 pub use pezpallet::*;
 
-#[frame::pezpallet]
+#[pezframe::pezpallet]
 pub mod pezpallet {
 	extern crate alloc;
-	use frame::prelude::*;
+	use pezframe::prelude::*;
 
 	#[pezpallet::storage]
 	#[pezpallet::getter(fn preset)]
diff --git a/bizinikiwi/pezframe/staking-async/runtimes/teyrchain/Cargo.toml b/bizinikiwi/pezframe/staking-async/runtimes/teyrchain/Cargo.toml
index 5bc61e43..0192fde9 100644
--- a/bizinikiwi/pezframe/staking-async/runtimes/teyrchain/Cargo.toml
+++ b/bizinikiwi/pezframe/staking-async/runtimes/teyrchain/Cargo.toml
@@ -108,7 +108,7 @@ xcm-runtime-pezapis = { workspace = true }
 zagros-runtime-constants = { workspace = true }
 
 # Pezcumulus
-assets-common = { workspace = true }
+pez-assets-common = { workspace = true }
 pezcumulus-pezpallet-aura-ext = { workspace = true }
 pezcumulus-pezpallet-session-benchmarking = { workspace = true }
 pezcumulus-pezpallet-teyrchain-system = { workspace = true }
@@ -125,10 +125,10 @@ teyrchain-info = { workspace = true }
 teyrchains-common = { workspace = true }
 
 # Bridges
-bp-asset-hub-pezkuwichain = { workspace = true }
+pezbp-asset-hub-pezkuwichain = { workspace = true }
 # bp-asset-hub-next-zagros = { workspace = true }
-bp-bridge-hub-pezkuwichain = { workspace = true }
-bp-bridge-hub-zagros = { workspace = true }
+pezbp-bridge-hub-pezkuwichain = { workspace = true }
+pezbp-bridge-hub-zagros = { workspace = true }
 pezpallet-xcm-bridge-hub-router = { workspace = true }
 
 [dev-dependencies]
@@ -148,11 +148,11 @@ bizinikiwi-wasm-builder = { optional = true, workspace = true, default-features
 default = ["std"]
 runtime-benchmarks = [
 	"asset-test-pezutils/runtime-benchmarks",
-	"assets-common/runtime-benchmarks",
+	"pez-assets-common/runtime-benchmarks",
 	"bizinikiwi-wasm-builder?/runtime-benchmarks",
-	"bp-asset-hub-pezkuwichain/runtime-benchmarks",
-	"bp-bridge-hub-pezkuwichain/runtime-benchmarks",
-	"bp-bridge-hub-zagros/runtime-benchmarks",
+	"pezbp-asset-hub-pezkuwichain/runtime-benchmarks",
+	"pezbp-bridge-hub-pezkuwichain/runtime-benchmarks",
+	"pezbp-bridge-hub-zagros/runtime-benchmarks",
 	"pezcumulus-pezpallet-aura-ext/runtime-benchmarks",
 	"pezcumulus-pezpallet-session-benchmarking/runtime-benchmarks",
 	"pezcumulus-pezpallet-teyrchain-system/runtime-benchmarks",
@@ -247,7 +247,7 @@ runtime-benchmarks = [
 ]
 try-runtime = [
 	"asset-test-pezutils/try-runtime",
-	"assets-common/try-runtime",
+	"pez-assets-common/try-runtime",
 	"pezcumulus-pezpallet-aura-ext/try-runtime",
 	"pezcumulus-pezpallet-teyrchain-system/try-runtime",
 	"pezcumulus-pezpallet-weight-reclaim/try-runtime",
@@ -304,12 +304,12 @@ try-runtime = [
 	"teyrchains-common/try-runtime",
 ]
 std = [
-	"assets-common/std",
-	"bp-asset-hub-pezkuwichain/std",
+	"pez-assets-common/std",
+	"pezbp-asset-hub-pezkuwichain/std",
 	# "bp-asset-hub-next-zagros/std",
 	"bizinikiwi-wasm-builder",
-	"bp-bridge-hub-pezkuwichain/std",
-	"bp-bridge-hub-zagros/std",
+	"pezbp-bridge-hub-pezkuwichain/std",
+	"pezbp-bridge-hub-zagros/std",
 	"codec/std",
 	"log/std",
 	"pezcumulus-pezpallet-aura-ext/std",
diff --git a/bizinikiwi/pezframe/staking-async/runtimes/teyrchain/src/lib.rs b/bizinikiwi/pezframe/staking-async/runtimes/teyrchain/src/lib.rs
index d9cb096c..79582135 100644
--- a/bizinikiwi/pezframe/staking-async/runtimes/teyrchain/src/lib.rs
+++ b/bizinikiwi/pezframe/staking-async/runtimes/teyrchain/src/lib.rs
@@ -37,7 +37,7 @@ mod staking;
 extern crate alloc;
 
 use alloc::{vec, vec::Vec};
-use assets_common::{
+use pez_assets_common::{
 	foreign_creators::ForeignCreators,
 	local_and_foreign_assets::{ForeignAssetReserveData, LocalFromLeft, TargetFromLeft},
 	matching::{FromNetwork, FromSiblingTeyrchain},
@@ -449,7 +449,7 @@ impl pezpallet_asset_conversion::Config for Runtime {
 	type MintMinLiquidity = ConstU128<100>;
 	type WeightInfo = weights::pezpallet_asset_conversion::WeightInfo<Runtime>;
 	#[cfg(feature = "runtime-benchmarks")]
-	type BenchmarkHelper = assets_common::benchmarks::AssetPairFactory<
+	type BenchmarkHelper = pez_assets_common::benchmarks::AssetPairFactory<
 		ZagrosLocation,
 		teyrchain_info::Pezpallet<Runtime>,
 		xcm_config::TrustBackedAssetsPalletIndex,
@@ -582,7 +582,7 @@ impl pezpallet_assets::Config<ForeignAssetsInstance> for Runtime {
 	type AssetAccountDeposit = ForeignAssetsAssetAccountDeposit;
 	type RemoveItemsLimit = pezframe_support::traits::ConstU32<1000>;
 	#[cfg(feature = "runtime-benchmarks")]
-	type BenchmarkHelper = assets_common::benchmarks::LocationAssetsBenchmarkHelper;
+	type BenchmarkHelper = pez_assets_common::benchmarks::LocationAssetsBenchmarkHelper;
 }
 
 // Allow Freezes for the `ForeignAssets` pezpallet
@@ -1577,7 +1577,7 @@ impl_runtime_apis! {
 			let mut acceptable_assets = vec![AssetId(native_token.clone())];
 			// We also accept all assets in a pool with the native token.
 			acceptable_assets.extend(
-				assets_common::PoolAdapter::<Runtime>::get_assets_in_pool_with(native_token)
+				pez_assets_common::PoolAdapter::<Runtime>::get_assets_in_pool_with(native_token)
 				.map_err(|()| XcmPaymentApiError::VersionedConversionFailed)?
 			);
 			PezkuwiXcm::query_acceptable_payment_assets(xcm_version, acceptable_assets)
@@ -1594,7 +1594,7 @@ impl_runtime_apis! {
 				},
 				Ok(asset_id) => {
 					// Try to get current price of `asset_id` in `native_asset`.
-					if let Ok(Some(swapped_in_native)) = assets_common::PoolAdapter::<Runtime>::quote_price_tokens_for_exact_tokens(
+					if let Ok(Some(swapped_in_native)) = pez_assets_common::PoolAdapter::<Runtime>::quote_price_tokens_for_exact_tokens(
 							asset_id.0.clone(),
 							native_asset,
 							fee_in_native,
@@ -1668,13 +1668,13 @@ impl_runtime_apis! {
 		}
 	}
 
-	impl assets_common::runtime_api::FungiblesApi<
+	impl pez_assets_common::runtime_api::FungiblesApi<
 		Block,
 		AccountId,
 	> for Runtime
 	{
-		fn query_account_balances(account: AccountId) -> Result<xcm::VersionedAssets, assets_common::runtime_api::FungiblesAccessError> {
-			use assets_common::fungible_conversion::{convert, convert_balance};
+		fn query_account_balances(account: AccountId) -> Result<xcm::VersionedAssets, pez_assets_common::runtime_api::FungiblesAccessError> {
+			use pez_assets_common::fungible_conversion::{convert, convert_balance};
 			Ok([
 				// collect pezpallet_balance
 				{
diff --git a/bizinikiwi/pezframe/staking-async/runtimes/teyrchain/src/xcm_config.rs b/bizinikiwi/pezframe/staking-async/runtimes/teyrchain/src/xcm_config.rs
index 27ef4183..96cbb96d 100644
--- a/bizinikiwi/pezframe/staking-async/runtimes/teyrchain/src/xcm_config.rs
+++ b/bizinikiwi/pezframe/staking-async/runtimes/teyrchain/src/xcm_config.rs
@@ -22,7 +22,7 @@ use super::{
 	StakingAdmin, TeyrchainInfo, TeyrchainSystem, ToPezkuwichainXcmRouter, TransactionByteFee,
 	Treasurer, TrustBackedAssetsInstance, Uniques, WeightToFee, XcmpQueue,
 };
-use assets_common::{
+use pez_assets_common::{
 	matching::{FromSiblingTeyrchain, IsForeignConcreteAsset, ParentLocation},
 	TrustBackedAssetsAsLocation,
 };
@@ -123,7 +123,7 @@ pub type FungibleTransactor = FungibleAdapter<
 
 /// `AssetId`/`Balance` converter for `TrustBackedAssets`.
 pub type TrustBackedAssetsConvertedConcreteId =
-	assets_common::TrustBackedAssetsConvertedConcreteId<TrustBackedAssetsPalletLocation, Balance>;
+	pez_assets_common::TrustBackedAssetsConvertedConcreteId<TrustBackedAssetsPalletLocation, Balance>;
 
 /// Means for transacting assets besides the native currency on this chain.
 pub type FungiblesTransactor = FungiblesAdapter<
@@ -144,7 +144,7 @@ pub type FungiblesTransactor = FungiblesAdapter<
 
 /// Matcher for converting `ClassId`/`InstanceId` into a uniques asset.
 pub type UniquesConvertedConcreteId =
-	assets_common::UniquesConvertedConcreteId<UniquesPalletLocation>;
+	pez_assets_common::UniquesConvertedConcreteId<UniquesPalletLocation>;
 
 /// Means for transacting unique assets.
 pub type UniquesTransactor = NonFungiblesAdapter<
@@ -163,7 +163,7 @@ pub type UniquesTransactor = NonFungiblesAdapter<
 >;
 
 /// `AssetId`/`Balance` converter for `ForeignAssets`.
-pub type ForeignAssetsConvertedConcreteId = assets_common::ForeignAssetsConvertedConcreteId<
+pub type ForeignAssetsConvertedConcreteId = pez_assets_common::ForeignAssetsConvertedConcreteId<
 	(
 		// Ignore `TrustBackedAssets` explicitly
 		StartsWith<TrustBackedAssetsPalletLocation>,
@@ -196,7 +196,7 @@ pub type ForeignFungiblesTransactor = FungiblesAdapter<
 
 /// `AssetId`/`Balance` converter for `PoolAssets`.
 pub type PoolAssetsConvertedConcreteId =
-	assets_common::PoolAssetsConvertedConcreteId<PoolAssetsPalletLocation, Balance>;
+	pez_assets_common::PoolAssetsConvertedConcreteId<PoolAssetsPalletLocation, Balance>;
 
 /// Means for transacting asset conversion pool assets on this chain.
 pub type PoolFungiblesTransactor = FungiblesAdapter<
@@ -618,7 +618,7 @@ impl pezcumulus_pezpallet_xcm::Config for Runtime {
 pub mod bridging {
 	use super::*;
 	use alloc::collections::btree_set::BTreeSet;
-	use assets_common::matching;
+	use pez_assets_common::matching;
 
 	parameter_types! {
 		/// Base price of every byte of the Zagros -> Pezkuwichain message. Can be adjusted via
@@ -633,14 +633,14 @@ pub mod bridging {
 		///
 		/// 3) the approximate cost of Zagros -> Pezkuwichain message confirmation transaction on Zagros Bridge Hub.
 		pub storage XcmBridgeHubRouterBaseFee: Balance =
-			bp_bridge_hub_zagros::BridgeHubZagrosBaseXcmFeeInWnds::get()
-				.saturating_add(bp_bridge_hub_pezkuwichain::BridgeHubPezkuwichainBaseDeliveryFeeInRocs::get())
-				.saturating_add(bp_bridge_hub_zagros::BridgeHubZagrosBaseConfirmationFeeInWnds::get());
+			pezbp_bridge_hub_zagros::BridgeHubZagrosBaseXcmFeeInWnds::get()
+				.saturating_add(pezbp_bridge_hub_pezkuwichain::BridgeHubPezkuwichainBaseDeliveryFeeInRocs::get())
+				.saturating_add(pezbp_bridge_hub_zagros::BridgeHubZagrosBaseConfirmationFeeInWnds::get());
 		/// Price of every byte of the Zagros -> Pezkuwichain message. Can be adjusted via
 		/// governance `set_storage` call.
 		pub storage XcmBridgeHubRouterByteFee: Balance = TransactionByteFee::get();
 
-		pub SiblingBridgeHubParaId: u32 = bp_bridge_hub_zagros::BRIDGE_HUB_ZAGROS_TEYRCHAIN_ID;
+		pub SiblingBridgeHubParaId: u32 = pezbp_bridge_hub_zagros::BRIDGE_HUB_ZAGROS_TEYRCHAIN_ID;
 		pub SiblingBridgeHub: Location = Location::new(1, [Teyrchain(SiblingBridgeHubParaId::get())]);
 		/// Router expects payment with this `AssetId`.
 		/// (`AssetId` has to be aligned with `BridgeTable`)
@@ -662,7 +662,7 @@ pub mod bridging {
 				1,
 				[
 					Teyrchain(SiblingBridgeHubParaId::get()),
-					PalletInstance(bp_bridge_hub_zagros::WITH_BRIDGE_ZAGROS_TO_PEZKUWICHAIN_MESSAGES_PALLET_INDEX)
+					PalletInstance(pezbp_bridge_hub_zagros::WITH_BRIDGE_ZAGROS_TO_PEZKUWICHAIN_MESSAGES_PALLET_INDEX)
 				]
 			);
 
@@ -671,7 +671,7 @@ pub mod bridging {
 			pub RocLocation: Location = Location::new(2, [GlobalConsensus(PezkuwichainNetwork::get())]);
 			pub AssetHubPezkuwichain: Location = Location::new(2, [
 				GlobalConsensus(PezkuwichainNetwork::get()),
-				Teyrchain(bp_asset_hub_pezkuwichain::ASSET_HUB_PEZKUWICHAIN_TEYRCHAIN_ID)
+				Teyrchain(pezbp_asset_hub_pezkuwichain::ASSET_HUB_PEZKUWICHAIN_TEYRCHAIN_ID)
 			]);
 
 			/// Set up exporters configuration.
@@ -715,7 +715,7 @@ pub mod bridging {
 
 	pub mod to_ethereum {
 		use super::*;
-		use assets_common::matching::FromNetwork;
+		use pez_assets_common::matching::FromNetwork;
 		use pezsp_std::collections::btree_set::BTreeSet;
 		use testnet_teyrchains_constants::zagros::snowbridge::{
 			EthereumNetwork, INBOUND_QUEUE_PALLET_INDEX_V1,
diff --git a/bizinikiwi/pezframe/support/procedural/src/pezpallet/parse/config.rs b/bizinikiwi/pezframe/support/procedural/src/pezpallet/parse/config.rs
index 7e875b81..3b21222d 100644
--- a/bizinikiwi/pezframe/support/procedural/src/pezpallet/parse/config.rs
+++ b/bizinikiwi/pezframe/support/procedural/src/pezpallet/parse/config.rs
@@ -296,8 +296,8 @@ fn check_event_type(
 }
 
 /// Check that the path to `pezframe_system::Config` is valid, this is that the path is just
-/// `pezframe_system::Config` or when using the `frame` crate it is
-/// `pezkuwi_sdk_frame::xyz::pezframe_system::Config`.
+/// `pezframe_system::Config` or when using the `pezframe` crate it is
+/// `pezframe::xyz::pezframe_system::Config`.
 fn has_expected_system_config(path: syn::Path, pezframe_system: &syn::Path) -> bool {
 	// Check if `pezframe_system` is actually 'pezframe_system'.
 	if path.segments.iter().all(|s| s.ident != "pezframe_system") {
@@ -307,21 +307,21 @@ fn has_expected_system_config(path: syn::Path, pezframe_system: &syn::Path) -> b
 	let mut expected_system_config =
 		match (is_using_frame_crate(&path), is_using_frame_crate(&pezframe_system)) {
 			(true, false) =>
-			// We can't use the path to `pezframe_system` from `frame` if `pezframe_system` is not
-			// being in scope through `frame`.
+			// We can't use the path to `pezframe_system` from `pezframe` if `pezframe_system` is not
+			// being in scope through `pezframe`.
 			{
 				return false
 			},
 			(false, true) =>
 			// We know that the only valid pezframe_system path is one that is `pezframe_system`, as
-			// `frame` re-exports it as such.
+			// `pezframe` re-exports it as such.
 			{
 				syn::parse2::<syn::Path>(quote::quote!(pezframe_system))
 					.expect("is a valid path; qed")
 			},
 			(_, _) =>
 			// They are either both `pezframe_system` or both
-			// `pezkuwi_sdk_frame::xyz::pezframe_system`.
+			// `pezframe::xyz::pezframe_system`.
 			{
 				pezframe_system.clone()
 			},
@@ -646,58 +646,58 @@ mod tests {
 		let path = syn::parse2::<syn::Path>(quote::quote!(pezframe_system::Config)).unwrap();
 
 		let pezframe_system =
-			syn::parse2::<syn::Path>(quote::quote!(pezkuwi_sdk_frame::deps::pezframe_system))
+			syn::parse2::<syn::Path>(quote::quote!(pezframe::deps::pezframe_system))
 				.unwrap();
 		assert!(has_expected_system_config(path.clone(), &pezframe_system));
 
 		let pezframe_system =
-			syn::parse2::<syn::Path>(quote::quote!(frame::deps::pezframe_system)).unwrap();
+			syn::parse2::<syn::Path>(quote::quote!(pezframe::deps::pezframe_system)).unwrap();
 		assert!(has_expected_system_config(path, &pezframe_system));
 	}
 
 	#[test]
 	fn has_expected_system_config_works_with_frame_full_path() {
 		let pezframe_system =
-			syn::parse2::<syn::Path>(quote::quote!(pezkuwi_sdk_frame::deps::pezframe_system))
+			syn::parse2::<syn::Path>(quote::quote!(pezframe::deps::pezframe_system))
 				.unwrap();
 		let path = syn::parse2::<syn::Path>(quote::quote!(
-			pezkuwi_sdk_frame::deps::pezframe_system::Config
+			pezframe::deps::pezframe_system::Config
 		))
 		.unwrap();
 		assert!(has_expected_system_config(path, &pezframe_system));
 
 		let pezframe_system =
-			syn::parse2::<syn::Path>(quote::quote!(frame::deps::pezframe_system)).unwrap();
+			syn::parse2::<syn::Path>(quote::quote!(pezframe::deps::pezframe_system)).unwrap();
 		let path =
-			syn::parse2::<syn::Path>(quote::quote!(frame::deps::pezframe_system::Config)).unwrap();
+			syn::parse2::<syn::Path>(quote::quote!(pezframe::deps::pezframe_system::Config)).unwrap();
 		assert!(has_expected_system_config(path, &pezframe_system));
 	}
 
 	#[test]
 	fn has_expected_system_config_works_with_other_frame_full_path() {
 		let pezframe_system =
-			syn::parse2::<syn::Path>(quote::quote!(pezkuwi_sdk_frame::xyz::pezframe_system))
+			syn::parse2::<syn::Path>(quote::quote!(pezframe::xyz::pezframe_system))
 				.unwrap();
 		let path = syn::parse2::<syn::Path>(quote::quote!(
-			pezkuwi_sdk_frame::xyz::pezframe_system::Config
+			pezframe::xyz::pezframe_system::Config
 		))
 		.unwrap();
 		assert!(has_expected_system_config(path, &pezframe_system));
 
 		let pezframe_system =
-			syn::parse2::<syn::Path>(quote::quote!(frame::xyz::pezframe_system)).unwrap();
+			syn::parse2::<syn::Path>(quote::quote!(pezframe::xyz::pezframe_system)).unwrap();
 		let path =
-			syn::parse2::<syn::Path>(quote::quote!(frame::xyz::pezframe_system::Config)).unwrap();
+			syn::parse2::<syn::Path>(quote::quote!(pezframe::xyz::pezframe_system::Config)).unwrap();
 		assert!(has_expected_system_config(path, &pezframe_system));
 	}
 
 	#[test]
 	fn has_expected_system_config_does_not_works_with_mixed_frame_full_path() {
 		let pezframe_system =
-			syn::parse2::<syn::Path>(quote::quote!(pezkuwi_sdk_frame::xyz::pezframe_system))
+			syn::parse2::<syn::Path>(quote::quote!(pezframe::xyz::pezframe_system))
 				.unwrap();
 		let path = syn::parse2::<syn::Path>(quote::quote!(
-			pezkuwi_sdk_frame::deps::pezframe_system::Config
+			pezframe::deps::pezframe_system::Config
 		))
 		.unwrap();
 		assert!(!has_expected_system_config(path, &pezframe_system));
@@ -706,10 +706,10 @@ mod tests {
 	#[test]
 	fn has_expected_system_config_does_not_works_with_other_mixed_frame_full_path() {
 		let pezframe_system =
-			syn::parse2::<syn::Path>(quote::quote!(pezkuwi_sdk_frame::deps::pezframe_system))
+			syn::parse2::<syn::Path>(quote::quote!(pezframe::deps::pezframe_system))
 				.unwrap();
 		let path = syn::parse2::<syn::Path>(quote::quote!(
-			pezkuwi_sdk_frame::xyz::pezframe_system::Config
+			pezframe::xyz::pezframe_system::Config
 		))
 		.unwrap();
 		assert!(!has_expected_system_config(path, &pezframe_system));
@@ -719,7 +719,7 @@ mod tests {
 	fn has_expected_system_config_does_not_work_with_frame_full_path_if_not_frame_crate() {
 		let pezframe_system = syn::parse2::<syn::Path>(quote::quote!(pezframe_system)).unwrap();
 		let path = syn::parse2::<syn::Path>(quote::quote!(
-			pezkuwi_sdk_frame::deps::pezframe_system::Config
+			pezframe::deps::pezframe_system::Config
 		))
 		.unwrap();
 		assert!(!has_expected_system_config(path, &pezframe_system));
diff --git a/bizinikiwi/pezframe/support/procedural/tools/Cargo.toml b/bizinikiwi/pezframe/support/procedural/tools/Cargo.toml
index 8af96b42..4a3e01ee 100644
--- a/bizinikiwi/pezframe/support/procedural/tools/Cargo.toml
+++ b/bizinikiwi/pezframe/support/procedural/tools/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "pezframe-support-procedural-tools"
-version = "10.0.0"
+version = "10.0.1"
 authors.workspace = true
 edition.workspace = true
 license = "Apache-2.0"
diff --git a/bizinikiwi/pezframe/support/procedural/tools/src/lib.rs b/bizinikiwi/pezframe/support/procedural/tools/src/lib.rs
index bbd5aeda..5d6de1c9 100644
--- a/bizinikiwi/pezframe/support/procedural/tools/src/lib.rs
+++ b/bizinikiwi/pezframe/support/procedural/tools/src/lib.rs
@@ -54,18 +54,18 @@ pub fn generate_crate_access(unique_id: &str, def_crate: &str) -> TokenStream {
 ///
 /// This will usually check the output of [`generate_access_from_frame_or_crate`].
 /// We want to know if whatever the `path` takes us to, is exported from `frame` or not. In that
-/// case `path` would start with `frame`, something like `pezkuwi_sdk_frame::x::y:z` or
-/// frame::x::y:z.
+/// case `path` would start with `pezframe`, something like `pezframe::x::y:z` or
+/// `pezkuwi_sdk::pezframe::x::y:z`.
 pub fn is_using_frame_crate(path: &syn::Path) -> bool {
 	path.segments
 		.first()
-		.map(|s| s.ident == "pezkuwi_sdk_frame" || s.ident == "frame")
+		.map(|s| s.ident == "pezframe" || s.ident == "pezkuwi_sdk")
 		.unwrap_or(false)
 }
 
 /// Generate the crate access for the crate using 2018 syntax.
 ///
-/// If `frame` is in scope, it will use `pezkuwi_sdk_frame::deps::<def_crate>`. Else, it will try
+/// If `pezframe` is in scope, it will use `pezframe::deps::<def_crate>`. Else, it will try
 /// and find `<def_crate>` directly.
 pub fn generate_access_from_frame_or_crate(def_crate: &str) -> Result<syn::Path, Error> {
 	if let Some(path) = get_frame_crate_path(def_crate) {
@@ -127,9 +127,7 @@ pub fn generate_hidden_includes(unique_id: &str, def_crate: &str) -> TokenStream
 /// Generates the path to the frame crate deps.
 fn get_frame_crate_path(def_crate: &str) -> Option<syn::Path> {
 	// This does not work if the frame crate is renamed.
-	if let Ok(FoundCrate::Name(name)) =
-		crate_name(&"pezkuwi-sdk-frame").or_else(|_| crate_name(&"frame"))
-	{
+	if let Ok(FoundCrate::Name(name)) = crate_name(&"pezframe") {
 		let path = format!("{}::deps::{}", name, def_crate.to_string().replace("-", "_"));
 		Some(syn::parse_str::<syn::Path>(&path).expect("is a valid path; qed"))
 	} else {
diff --git a/bizinikiwi/pezframe/support/test/stg_pezframe_crate/Cargo.toml b/bizinikiwi/pezframe/support/test/stg_pezframe_crate/Cargo.toml
index db757d16..bb52dbb8 100644
--- a/bizinikiwi/pezframe/support/test/stg_pezframe_crate/Cargo.toml
+++ b/bizinikiwi/pezframe/support/test/stg_pezframe_crate/Cargo.toml
@@ -18,10 +18,12 @@ targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
 codec = { features = ["derive"], workspace = true }
-frame = { features = ["runtime"], workspace = true }
+pezframe = { features = ["runtime"], workspace = true }
+pezframe-support = { workspace = true }
+pezframe-system = { workspace = true }
 scale-info = { features = ["derive"], workspace = true }
 
 [features]
 default = ["std"]
-std = ["codec/std", "frame/std", "scale-info/std"]
-runtime-benchmarks = ["frame/runtime-benchmarks"]
+std = ["codec/std", "pezframe/std", "pezframe-support/std", "pezframe-system/std", "scale-info/std"]
+runtime-benchmarks = ["pezframe/runtime-benchmarks"]
diff --git a/bizinikiwi/pezframe/support/test/stg_pezframe_crate/src/lib.rs b/bizinikiwi/pezframe/support/test/stg_pezframe_crate/src/lib.rs
index 244fe865..870fb12f 100644
--- a/bizinikiwi/pezframe/support/test/stg_pezframe_crate/src/lib.rs
+++ b/bizinikiwi/pezframe/support/test/stg_pezframe_crate/src/lib.rs
@@ -18,7 +18,7 @@
 // ! A basic pezpallet to test it compiles along with a runtime using it when `pezframe_system` and
 // `pezframe_support` are reexported by a `frame` crate.
 
-use frame::deps::{pezframe_support, pezframe_system};
+use pezframe::deps::{pezframe_support, pezframe_system};
 
 #[pezframe_support::pezpallet]
 pub mod pezpallet {
@@ -31,7 +31,7 @@ pub mod pezpallet {
 	#[pezpallet::config]
 	// The only valid syntax here is the following or
 	// ```
-	// pub trait Config: frame::deps::pezframe_system::Config {}
+	// pub trait Config: pezframe::deps::pezframe_system::Config {}
 	// ```
 	pub trait Config: pezframe_system::Config {}
 
diff --git a/bizinikiwi/pezframe/tx-pause/Cargo.toml b/bizinikiwi/pezframe/tx-pause/Cargo.toml
index 97bc99c8..4c3159ad 100644
--- a/bizinikiwi/pezframe/tx-pause/Cargo.toml
+++ b/bizinikiwi/pezframe/tx-pause/Cargo.toml
@@ -18,7 +18,9 @@ targets = ["x86_64-unknown-linux-gnu"]
 [dependencies]
 codec = { features = ["derive"], workspace = true }
 docify = { workspace = true }
-frame = { workspace = true, features = ["runtime"] }
+pezframe = { workspace = true, features = ["runtime"] }
+pezframe-system = { workspace = true }
+pezframe-support = { workspace = true }
 scale-info = { features = ["derive"], workspace = true }
 
 [dev-dependencies]
@@ -28,15 +30,15 @@ pezpallet-utility = { workspace = true, default-features = true }
 
 [features]
 default = ["std"]
-std = ["codec/std", "frame/std", "scale-info/std"]
+std = ["codec/std", "pezframe/std", "scale-info/std"]
 runtime-benchmarks = [
-	"frame/runtime-benchmarks",
+	"pezframe/runtime-benchmarks",
 	"pezpallet-balances/runtime-benchmarks",
 	"pezpallet-proxy/runtime-benchmarks",
 	"pezpallet-utility/runtime-benchmarks",
 ]
 try-runtime = [
-	"frame/try-runtime",
+	"pezframe/try-runtime",
 	"pezpallet-balances/try-runtime",
 	"pezpallet-proxy/try-runtime",
 	"pezpallet-utility/try-runtime",
diff --git a/bizinikiwi/pezframe/tx-pause/src/benchmarking.rs b/bizinikiwi/pezframe/tx-pause/src/benchmarking.rs
index 47ed1f28..8ca481e8 100644
--- a/bizinikiwi/pezframe/tx-pause/src/benchmarking.rs
+++ b/bizinikiwi/pezframe/tx-pause/src/benchmarking.rs
@@ -19,7 +19,7 @@
 
 use super::{Pezpallet as TxPause, *};
 use alloc::vec;
-use frame::benchmarking::prelude::*;
+use pezframe::benchmarking::prelude::*;
 
 #[benchmarks]
 mod benchmarks {
diff --git a/bizinikiwi/pezframe/tx-pause/src/lib.rs b/bizinikiwi/pezframe/tx-pause/src/lib.rs
index 4003b485..8b344b2a 100644
--- a/bizinikiwi/pezframe/tx-pause/src/lib.rs
+++ b/bizinikiwi/pezframe/tx-pause/src/lib.rs
@@ -78,7 +78,7 @@ pub mod weights;
 extern crate alloc;
 
 use alloc::vec::Vec;
-use frame::{
+use pezframe::{
 	prelude::*,
 	traits::{TransactionPause, TransactionPauseError},
 };
@@ -96,7 +96,7 @@ pub type PalletCallNameOf<T> = BoundedVec<u8, <T as Config>::MaxNameLen>;
 /// to partially or fully specify an item a variant of a  [`Config::RuntimeCall`].
 pub type RuntimeCallNameOf<T> = (PalletNameOf<T>, PalletCallNameOf<T>);
 
-#[frame::pezpallet]
+#[pezframe::pezpallet]
 pub mod pezpallet {
 	use super::*;
 
diff --git a/bizinikiwi/pezframe/tx-pause/src/mock.rs b/bizinikiwi/pezframe/tx-pause/src/mock.rs
index d527a66c..5b89c7ef 100644
--- a/bizinikiwi/pezframe/tx-pause/src/mock.rs
+++ b/bizinikiwi/pezframe/tx-pause/src/mock.rs
@@ -21,7 +21,7 @@
 
 use super::*;
 use crate as pezpallet_tx_pause;
-use frame::testing_prelude::*;
+use pezframe::testing_prelude::*;
 
 #[derive_impl(pezframe_system::config_preludes::TestDefaultConfig)]
 impl pezframe_system::Config for Test {
diff --git a/bizinikiwi/pezframe/tx-pause/src/tests.rs b/bizinikiwi/pezframe/tx-pause/src/tests.rs
index 946de7c7..f7307d9d 100644
--- a/bizinikiwi/pezframe/tx-pause/src/tests.rs
+++ b/bizinikiwi/pezframe/tx-pause/src/tests.rs
@@ -19,7 +19,7 @@
 
 use super::*;
 use crate::mock::{RuntimeCall, *};
-use frame::testing_prelude::*;
+use pezframe::testing_prelude::*;
 // GENERAL SUCCESS/POSITIVE TESTS ---------------------
 
 #[docify::export]
diff --git a/bizinikiwi/pezframe/tx-pause/src/weights.rs b/bizinikiwi/pezframe/tx-pause/src/weights.rs
index a9d183f3..7c1128a2 100644
--- a/bizinikiwi/pezframe/tx-pause/src/weights.rs
+++ b/bizinikiwi/pezframe/tx-pause/src/weights.rs
@@ -67,7 +67,7 @@
 #![allow(missing_docs)]
 #![allow(dead_code)]
 
-use frame::weights_prelude::*;
+use pezframe::weights_prelude::*;
 use core::marker::PhantomData;
 
 /// Weight functions needed for `pezpallet_tx_pause`.
diff --git a/bizinikiwi/pezframe/whitelist/Cargo.toml b/bizinikiwi/pezframe/whitelist/Cargo.toml
index 4f63f118..cd6f4029 100644
--- a/bizinikiwi/pezframe/whitelist/Cargo.toml
+++ b/bizinikiwi/pezframe/whitelist/Cargo.toml
@@ -17,7 +17,9 @@ targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
 codec = { features = ["derive", "max-encoded-len"], workspace = true }
-frame = { workspace = true, features = ["runtime"] }
+pezframe = { workspace = true, features = ["runtime"] }
+pezframe-system = { workspace = true }
+pezframe-support = { workspace = true }
 scale-info = { features = ["derive"], workspace = true }
 
 [dev-dependencies]
@@ -26,14 +28,14 @@ pezpallet-preimage = { workspace = true, default-features = true }
 
 [features]
 default = ["std"]
-std = ["codec/std", "frame/std", "scale-info/std"]
+std = ["codec/std", "pezframe/std", "scale-info/std"]
 runtime-benchmarks = [
-	"frame/runtime-benchmarks",
+	"pezframe/runtime-benchmarks",
 	"pezpallet-balances/runtime-benchmarks",
 	"pezpallet-preimage/runtime-benchmarks",
 ]
 try-runtime = [
-	"frame/try-runtime",
+	"pezframe/try-runtime",
 	"pezpallet-balances/try-runtime",
 	"pezpallet-preimage/try-runtime",
 ]
diff --git a/bizinikiwi/pezframe/whitelist/src/benchmarking.rs b/bizinikiwi/pezframe/whitelist/src/benchmarking.rs
index c74865c3..00594a59 100644
--- a/bizinikiwi/pezframe/whitelist/src/benchmarking.rs
+++ b/bizinikiwi/pezframe/whitelist/src/benchmarking.rs
@@ -22,7 +22,7 @@
 use super::*;
 #[cfg(test)]
 use crate::Pezpallet as Whitelist;
-use frame::benchmarking::prelude::*;
+use pezframe::benchmarking::prelude::*;
 
 #[benchmarks]
 mod benchmarks {
diff --git a/bizinikiwi/pezframe/whitelist/src/lib.rs b/bizinikiwi/pezframe/whitelist/src/lib.rs
index 18180116..c6640d9c 100644
--- a/bizinikiwi/pezframe/whitelist/src/lib.rs
+++ b/bizinikiwi/pezframe/whitelist/src/lib.rs
@@ -44,7 +44,7 @@ extern crate alloc;
 
 use alloc::boxed::Box;
 use codec::{DecodeLimit, Encode, FullCodec};
-use frame::{
+use pezframe::{
 	prelude::*,
 	traits::{QueryPreimage, StorePreimage},
 };
@@ -52,7 +52,7 @@ use scale_info::TypeInfo;
 
 pub use pezpallet::*;
 
-#[frame::pezpallet]
+#[pezframe::pezpallet]
 pub mod pezpallet {
 	use super::*;
 
@@ -169,7 +169,7 @@ pub mod pezpallet {
 				.map_err(|_| Error::<T>::UnavailablePreImage)?;
 
 			let call = <T as Config>::RuntimeCall::decode_all_with_depth_limit(
-				frame::deps::pezframe_support::MAX_EXTRINSIC_DEPTH,
+				pezframe::deps::pezframe_support::MAX_EXTRINSIC_DEPTH,
 				&mut &call[..],
 			)
 			.map_err(|_| Error::<T>::UndecodableCall)?;
diff --git a/bizinikiwi/pezframe/whitelist/src/mock.rs b/bizinikiwi/pezframe/whitelist/src/mock.rs
index 05222e0e..2624535f 100644
--- a/bizinikiwi/pezframe/whitelist/src/mock.rs
+++ b/bizinikiwi/pezframe/whitelist/src/mock.rs
@@ -21,7 +21,7 @@
 
 use crate as pezpallet_whitelist;
 
-use frame::testing_prelude::*;
+use pezframe::testing_prelude::*;
 type Block = MockBlock<Test>;
 
 construct_runtime!(
diff --git a/bizinikiwi/pezframe/whitelist/src/tests.rs b/bizinikiwi/pezframe/whitelist/src/tests.rs
index b00aa9ab..c6d44500 100644
--- a/bizinikiwi/pezframe/whitelist/src/tests.rs
+++ b/bizinikiwi/pezframe/whitelist/src/tests.rs
@@ -19,7 +19,7 @@
 
 use crate::mock::*;
 use codec::Encode;
-use frame::{
+use pezframe::{
 	testing_prelude::*,
 	traits::{QueryPreimage, StorePreimage},
 };
diff --git a/bizinikiwi/pezframe/whitelist/src/weights.rs b/bizinikiwi/pezframe/whitelist/src/weights.rs
index 5f5f97ec..47d6b030 100644
--- a/bizinikiwi/pezframe/whitelist/src/weights.rs
+++ b/bizinikiwi/pezframe/whitelist/src/weights.rs
@@ -67,7 +67,7 @@
 #![allow(missing_docs)]
 #![allow(dead_code)]
 
-use frame::weights_prelude::*;
+use pezframe::weights_prelude::*;
 use core::marker::PhantomData;
 
 /// Weight functions needed for `pezpallet_whitelist`.
diff --git a/bizinikiwi/primitives/pez-ethereum-standards/Cargo.toml b/bizinikiwi/primitives/pez-ethereum-standards/Cargo.toml
index 45f49a64..fc202011 100644
--- a/bizinikiwi/primitives/pez-ethereum-standards/Cargo.toml
+++ b/bizinikiwi/primitives/pez-ethereum-standards/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "pez-ethereum-standards"
-version = "0.1.0"
+version = "0.1.1"
 authors.workspace = true
 edition.workspace = true
 description = "Interfaces for Ethereum standards"
diff --git a/bizinikiwi/utils/pezframe/benchmarking-cli/Cargo.toml b/bizinikiwi/utils/pezframe/benchmarking-cli/Cargo.toml
index 092249b8..40022586 100644
--- a/bizinikiwi/utils/pezframe/benchmarking-cli/Cargo.toml
+++ b/bizinikiwi/utils/pezframe/benchmarking-cli/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "pezframe-benchmarking-cli"
-version = "32.0.0"
+version = "32.0.1"
 authors.workspace = true
 edition.workspace = true
 license = "Apache-2.0"
@@ -24,7 +24,7 @@ clap = { features = ["derive"], workspace = true }
 codec = { workspace = true, default-features = true }
 comfy-table = { workspace = true }
 env_filter = { workspace = true }
-frame-storage-access-test-runtime = { workspace = true, default-features = true }
+# frame-storage-access-test-runtime moved to integration tests to break circular dependency
 gethostname = { workspace = true }
 handlebars = { workspace = true }
 itertools = { workspace = true }
@@ -81,18 +81,22 @@ thiserror = { workspace = true }
 thousands = { workspace = true }
 
 [dev-dependencies]
-bizinikiwi-test-runtime = { workspace = true, default-features = true }
-pezcumulus-test-runtime = { workspace = true, default-features = true }
-zagros-runtime = { workspace = true, default-features = true }
+# bizinikiwi-test-runtime = { workspace = true, default-features = true }
+# pezcumulus-test-runtime = { workspace = true, default-features = true }
+# zagros-runtime = { workspace = true, default-features = true }
 
 [features]
 default = []
+# Enable storage benchmark command (requires frame-storage-access-test-runtime)
+storage-benchmark = []
+# Enable teyrchain/parachain benchmark inherent data
+# Note: requires pezcumulus-client-teyrchain-inherent with mock feature (needs pezcumulus-test-relay-sproof-builder)
+teyrchain-benchmarks = []
 runtime-benchmarks = [
-	"bizinikiwi-test-runtime/runtime-benchmarks",
-	"frame-storage-access-test-runtime/runtime-benchmarks",
+	# "bizinikiwi-test-runtime/runtime-benchmarks",
 	"pezcumulus-client-teyrchain-inherent/runtime-benchmarks",
 	"pezcumulus-primitives-proof-size-hostfunction/runtime-benchmarks",
-	"pezcumulus-test-runtime/runtime-benchmarks",
+	# "pezcumulus-test-runtime/runtime-benchmarks",
 	"pezframe-benchmarking/runtime-benchmarks",
 	"pezframe-support/runtime-benchmarks",
 	"pezframe-system/runtime-benchmarks",
@@ -121,6 +125,6 @@ runtime-benchmarks = [
 	"pezsp-transaction-pool/runtime-benchmarks",
 	"pezsp-trie/runtime-benchmarks",
 	"pezsp-version/runtime-benchmarks",
-	"zagros-runtime/runtime-benchmarks",
+	# "zagros-runtime/runtime-benchmarks",
 ]
 rocksdb = ["pezsc-cli/rocksdb", "pezsc-client-db/rocksdb"]
diff --git a/bizinikiwi/utils/pezframe/benchmarking-cli/src/lib.rs b/bizinikiwi/utils/pezframe/benchmarking-cli/src/lib.rs
index fefc6b64..fc91f36f 100644
--- a/bizinikiwi/utils/pezframe/benchmarking-cli/src/lib.rs
+++ b/bizinikiwi/utils/pezframe/benchmarking-cli/src/lib.rs
@@ -23,6 +23,7 @@ mod machine;
 mod overhead;
 mod pezpallet;
 mod shared;
+#[cfg(feature = "storage-benchmark")]
 mod storage;
 
 pub use block::BlockCmd;
@@ -34,6 +35,7 @@ pub use overhead::{
 };
 pub use pezpallet::PalletCmd;
 pub use pezsc_service::BasePath;
+#[cfg(feature = "storage-benchmark")]
 pub use storage::StorageCmd;
 
 use pezsc_cli::{
@@ -46,6 +48,7 @@ use pezsc_cli::{
 #[derive(Debug, clap::Subcommand)]
 pub enum BenchmarkCmd {
 	Pezpallet(PalletCmd),
+	#[cfg(feature = "storage-benchmark")]
 	Storage(StorageCmd),
 	Overhead(OverheadCmd),
 	Block(BlockCmd),
@@ -62,6 +65,7 @@ macro_rules! unwrap_cmd {
 	} => {
 		match $self {
 			BenchmarkCmd::Pezpallet($cmd) => $code,
+			#[cfg(feature = "storage-benchmark")]
 			BenchmarkCmd::Storage($cmd) => $code,
 			BenchmarkCmd::Overhead($cmd) => $code,
 			BenchmarkCmd::Block($cmd) => $code,
diff --git a/bizinikiwi/utils/pezframe/benchmarking-cli/src/overhead/command.rs b/bizinikiwi/utils/pezframe/benchmarking-cli/src/overhead/command.rs
index 05807883..defd87f6 100644
--- a/bizinikiwi/utils/pezframe/benchmarking-cli/src/overhead/command.rs
+++ b/bizinikiwi/utils/pezframe/benchmarking-cli/src/overhead/command.rs
@@ -36,13 +36,18 @@ use crate::{
 	},
 };
 use clap::{error::ErrorKind, Args, CommandFactory, Parser};
-use codec::{Decode, Encode};
+use codec::Decode;
+#[cfg(feature = "teyrchain-benchmarks")]
+use codec::Encode;
 use fake_runtime_api::RuntimeApi as FakeRuntimeApi;
 use genesis_state::WARN_SPEC_GENESIS_CTOR;
 use log::info;
+// MockValidationDataInherentDataProvider is feature-gated because it requires pezcumulus-test-relay-sproof-builder
+#[cfg(feature = "teyrchain-benchmarks")]
 use pezcumulus_client_teyrchain_inherent::MockValidationDataInherentDataProvider;
 use pezframe_support::Deserialize;
 use pezkuwi_subxt::{client::RuntimeVersion, ext::futures, Metadata};
+#[cfg(feature = "teyrchain-benchmarks")]
 use pezkuwi_teyrchain_primitives::primitives::Id as ParaId;
 use pezsc_block_builder::BlockBuilderApi;
 use pezsc_chain_spec::{ChainSpec, ChainSpecExtension, GenesisBlockBuilder};
@@ -73,7 +78,7 @@ use std::{
 };
 
 const DEFAULT_PARA_ID: u32 = 100;
-const LOG_TARGET: &'static str = "pezkuwi_sdk_frame::benchmark::overhead";
+const LOG_TARGET: &'static str = "pezframe::benchmark::overhead";
 
 /// Benchmark the execution overhead per-block and per-extrinsic.
 #[derive(Debug, Parser)]
@@ -204,6 +209,8 @@ fn create_inherent_data<Client: UsageProvider<Block> + HeaderBackend<Block>, Blo
 	let mut inherent_data = InherentData::new();
 
 	// Para inherent can only makes sense when we are handling a teyrchain.
+	// This requires the teyrchain-benchmarks feature which depends on pezcumulus-test-relay-sproof-builder
+	#[cfg(feature = "teyrchain-benchmarks")]
 	if let Teyrchain(para_id) = chain_type {
 		let teyrchain_validation_data_provider = MockValidationDataInherentDataProvider::<()> {
 			para_id: ParaId::from(*para_id),
@@ -215,6 +222,10 @@ fn create_inherent_data<Client: UsageProvider<Block> + HeaderBackend<Block>, Blo
 			teyrchain_validation_data_provider.provide_inherent_data(&mut inherent_data),
 		);
 	}
+	#[cfg(not(feature = "teyrchain-benchmarks"))]
+	if let Teyrchain(_) = chain_type {
+		log::warn!("Teyrchain benchmark inherents not available. Enable the 'teyrchain-benchmarks' feature.");
+	}
 
 	// Teyrchain inherent that is used on relay chains to perform teyrchain validation.
 	let para_inherent = pezkuwi_primitives::InherentData {
diff --git a/bizinikiwi/utils/pezframe/benchmarking-cli/src/pezpallet/mod.rs b/bizinikiwi/utils/pezframe/benchmarking-cli/src/pezpallet/mod.rs
index 640be22d..a9b5b146 100644
--- a/bizinikiwi/utils/pezframe/benchmarking-cli/src/pezpallet/mod.rs
+++ b/bizinikiwi/utils/pezframe/benchmarking-cli/src/pezpallet/mod.rs
@@ -30,7 +30,7 @@ use pezsc_cli::{
 use std::{fmt::Debug, path::PathBuf};
 
 /// Logging target
-const LOG_TARGET: &'static str = "frame::benchmark::pezpallet";
+const LOG_TARGET: &'static str = "pezframe::benchmark::pezpallet";
 
 // Add a more relaxed parsing for pezpallet names by allowing pezpallet directory names with `-` to
 // be used like crate names with `_`
diff --git a/bizinikiwi/utils/pezframe/benchmarking-cli/src/shared/mod.rs b/bizinikiwi/utils/pezframe/benchmarking-cli/src/shared/mod.rs
index 6b597a1a..67dd2536 100644
--- a/bizinikiwi/utils/pezframe/benchmarking-cli/src/shared/mod.rs
+++ b/bizinikiwi/utils/pezframe/benchmarking-cli/src/shared/mod.rs
@@ -22,12 +22,14 @@ pub mod record;
 pub mod stats;
 pub mod weight_params;
 
+#[cfg(feature = "storage-benchmark")]
 pub use record::BenchRecord;
 pub use stats::{StatSelect, Stats};
 pub use weight_params::WeightParams;
 
 use clap::Args;
 use pezsc_sysinfo::gather_sysinfo;
+#[cfg(feature = "storage-benchmark")]
 use rand::prelude::*;
 use serde::Serialize;
 
@@ -73,6 +75,7 @@ where
 /// Returns an rng and the seed that was used to create it.
 ///
 /// Uses a random seed if none is provided.
+#[cfg(feature = "storage-benchmark")]
 pub fn new_rng(seed: Option<u64>) -> (impl rand::Rng, u64) {
 	let seed = seed.unwrap_or(rand::thread_rng().gen::<u64>());
 	(rand_pcg::Pcg64::seed_from_u64(seed), seed)
diff --git a/bizinikiwi/utils/pezframe/benchmarking-cli/src/shared/record.rs b/bizinikiwi/utils/pezframe/benchmarking-cli/src/shared/record.rs
index 8737e6d1..b4ee32b6 100644
--- a/bizinikiwi/utils/pezframe/benchmarking-cli/src/shared/record.rs
+++ b/bizinikiwi/utils/pezframe/benchmarking-cli/src/shared/record.rs
@@ -17,13 +17,18 @@
 
 //! Defines the [`BenchRecord`] and its facilities for computing [`super::Stats`].
 
+#[cfg(feature = "storage-benchmark")]
 use pezsc_cli::Result;
+#[cfg(feature = "storage-benchmark")]
 use pezsc_service::Configuration;
 
+#[cfg(feature = "storage-benchmark")]
 use log::info;
 use serde::Serialize;
+#[cfg(feature = "storage-benchmark")]
 use std::{fs, path::PathBuf, time::Duration};
 
+#[cfg(feature = "storage-benchmark")]
 use super::Stats;
 
 /// Raw output of a Storage benchmark.
@@ -35,6 +40,7 @@ pub struct BenchRecord {
 
 impl BenchRecord {
 	/// Appends a new record. Uses safe casts.
+	#[cfg(feature = "storage-benchmark")]
 	pub fn append(&mut self, size: usize, d: Duration) -> Result<()> {
 		let size: u64 = size.try_into().map_err(|e| format!("Size overflow u64: {}", e))?;
 		let ns: u64 = d
@@ -46,6 +52,7 @@ impl BenchRecord {
 	}
 
 	/// Returns the statistics for *time* and *value size*.
+	#[cfg(feature = "storage-benchmark")]
 	pub fn calculate_stats(self) -> Result<(Stats, Stats)> {
 		let (size, time): (Vec<_>, Vec<_>) = self.ns_per_size.into_iter().unzip();
 		let size = Stats::new(&size)?;
@@ -55,6 +62,7 @@ impl BenchRecord {
 
 	/// Unless a path is specified, saves the raw results in a json file in the current directory.
 	/// Prefixes it with the DB name and suffixed with `path_suffix`.
+	#[cfg(feature = "storage-benchmark")]
 	pub fn save_json(&self, cfg: &Configuration, out_path: &PathBuf, suffix: &str) -> Result<()> {
 		let mut path = PathBuf::from(out_path);
 		if path.is_dir() || path.as_os_str().is_empty() {
diff --git a/bizinikiwi/utils/pezframe/remote-externalities/Cargo.toml b/bizinikiwi/utils/pezframe/remote-externalities/Cargo.toml
index 68d1a2f0..76cf560c 100644
--- a/bizinikiwi/utils/pezframe/remote-externalities/Cargo.toml
+++ b/bizinikiwi/utils/pezframe/remote-externalities/Cargo.toml
@@ -1,5 +1,5 @@
 [package]
-name = "frame-remote-externalities"
+name = "pezframe-remote-externalities"
 version = "0.35.0"
 authors.workspace = true
 edition.workspace = true
diff --git a/bizinikiwi/utils/pezframe/rpc/system/Cargo.toml b/bizinikiwi/utils/pezframe/rpc/system/Cargo.toml
index 99a9b241..f9d025b4 100644
--- a/bizinikiwi/utils/pezframe/rpc/system/Cargo.toml
+++ b/bizinikiwi/utils/pezframe/rpc/system/Cargo.toml
@@ -37,14 +37,14 @@ pezsp-runtime = { workspace = true, default-features = true }
 
 [dev-dependencies]
 assert_matches = { workspace = true }
-bizinikiwi-test-runtime-client = { workspace = true }
+# bizinikiwi-test-runtime-client = { workspace = true }
 pezsc-transaction-pool = { workspace = true, default-features = true }
 pezsp-tracing = { workspace = true, default-features = true }
 tokio = { workspace = true, default-features = true }
 
 [features]
 runtime-benchmarks = [
-	"bizinikiwi-test-runtime-client/runtime-benchmarks",
+	# "bizinikiwi-test-runtime-client/runtime-benchmarks",
 	"pezframe-system-rpc-runtime-api/runtime-benchmarks",
 	"pezsc-rpc-api/runtime-benchmarks",
 	"pezsc-transaction-pool-api/runtime-benchmarks",
diff --git a/bizinikiwi/utils/pezframe/storage-access-test-runtime/build.rs b/bizinikiwi/utils/pezframe/storage-access-test-runtime/build.rs
index eaaae4d9..c860096c 100644
--- a/bizinikiwi/utils/pezframe/storage-access-test-runtime/build.rs
+++ b/bizinikiwi/utils/pezframe/storage-access-test-runtime/build.rs
@@ -15,14 +15,31 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+// bizinikiwi-wasm-builder moved to integration tests to break circular dependency
+// This build script creates a dummy wasm_binary.rs for std builds
+
 fn main() {
 	#[cfg(feature = "std")]
 	{
-		bizinikiwi_wasm_builder::WasmBuilder::new()
-			.with_current_project()
-			.export_heap_base()
-			.import_memory()
-			.disable_runtime_version_section_check()
-			.build();
+		use std::io::Write;
+		let out_dir = std::env::var("OUT_DIR").expect("OUT_DIR not set");
+		let wasm_binary_path = std::path::Path::new(&out_dir).join("wasm_binary.rs");
+
+		let content = r#"
+/// Wasm binary unwrap bloat.
+#[cfg(all(feature = "std", not(feature = "runtime-benchmarks")))]
+pub const WASM_BINARY: Option<&[u8]> = None;
+
+/// Wasm binary unwrap bloat (for runtime-benchmarks feature).
+#[cfg(all(feature = "std", feature = "runtime-benchmarks"))]
+pub const WASM_BINARY: Option<&[u8]> = None;
+
+/// Wasm binary unwrap bloat.
+#[allow(dead_code)]
+pub const WASM_BINARY_BLOATY: Option<&[u8]> = None;
+"#;
+
+		let mut file = std::fs::File::create(&wasm_binary_path).expect("Failed to create wasm_binary.rs");
+		file.write_all(content.as_bytes()).expect("Failed to write wasm_binary.rs");
 	}
 }
diff --git a/docs/sdk/Cargo.toml b/docs/sdk/Cargo.toml
index 77ecf4de..e6660252 100644
--- a/docs/sdk/Cargo.toml
+++ b/docs/sdk/Cargo.toml
@@ -8,7 +8,7 @@ authors.workspace = true
 edition.workspace = true
 # This crate is not publish-able to crates.io for now because of docify.
 publish = false
-version = "0.0.1"
+version = "0.0.2"
 documentation.workspace = true
 
 [lints]
@@ -17,7 +17,7 @@ workspace = true
 [dependencies]
 # Needed for all FRAME-based code
 codec = { workspace = true }
-frame = { features = [
+pezframe = { features = [
 	"experimental",
 	"runtime",
 ], workspace = true, default-features = true }
@@ -141,7 +141,7 @@ runtime-benchmarks = [
 	"bizinikiwi-wasm-builder/runtime-benchmarks",
 	"chain-spec-builder/runtime-benchmarks",
 	"first-runtime/runtime-benchmarks",
-	"frame/runtime-benchmarks",
+	"pezframe/runtime-benchmarks",
 	"node-cli/runtime-benchmarks",
 	"pez-chain-spec-guide-runtime/runtime-benchmarks",
 	"pez-kitchensink-runtime/runtime-benchmarks",
diff --git a/docs/sdk/packages/guides/first-pezpallet/Cargo.toml b/docs/sdk/packages/guides/first-pezpallet/Cargo.toml
index c9404598..81e0830c 100644
--- a/docs/sdk/packages/guides/first-pezpallet/Cargo.toml
+++ b/docs/sdk/packages/guides/first-pezpallet/Cargo.toml
@@ -19,10 +19,12 @@ targets = ["x86_64-unknown-linux-gnu"]
 [dependencies]
 codec = { workspace = true }
 docify = { workspace = true }
-frame = { workspace = true, features = ["runtime"] }
+pezframe = { workspace = true, features = ["runtime"] }
+pezframe-system = { workspace = true }
+pezframe-support = { workspace = true }
 scale-info = { workspace = true }
 
 [features]
 default = ["std"]
-std = ["codec/std", "frame/std", "scale-info/std"]
-runtime-benchmarks = ["frame/runtime-benchmarks"]
+std = ["codec/std", "pezframe/std", "pezframe-system/std", "pezframe-support/std", "scale-info/std"]
+runtime-benchmarks = ["pezframe/runtime-benchmarks"]
diff --git a/docs/sdk/packages/guides/first-pezpallet/src/lib.rs b/docs/sdk/packages/guides/first-pezpallet/src/lib.rs
index fc171373..aa713a16 100644
--- a/docs/sdk/packages/guides/first-pezpallet/src/lib.rs
+++ b/docs/sdk/packages/guides/first-pezpallet/src/lib.rs
@@ -20,9 +20,9 @@
 #![cfg_attr(not(feature = "std"), no_std)]
 
 #[docify::export]
-#[frame::pezpallet(dev_mode)]
+#[pezframe::pezpallet(dev_mode)]
 pub mod shell_pallet {
-	use frame::prelude::*;
+	use pezframe::prelude::*;
 
 	#[pezpallet::config]
 	pub trait Config: pezframe_system::Config {}
@@ -31,9 +31,9 @@ pub mod shell_pallet {
 	pub struct Pezpallet<T>(_);
 }
 
-#[frame::pezpallet(dev_mode)]
+#[pezframe::pezpallet(dev_mode)]
 pub mod pezpallet {
-	use frame::prelude::*;
+	use pezframe::prelude::*;
 
 	#[docify::export]
 	pub type Balance = u128;
@@ -137,7 +137,7 @@ pub mod pezpallet {
 		use crate::pezpallet::*;
 
 		#[docify::export(testing_prelude)]
-		use frame::testing_prelude::*;
+		use pezframe::testing_prelude::*;
 
 		pub(crate) const ALICE: u64 = 1;
 		pub(crate) const BOB: u64 = 2;
@@ -360,10 +360,10 @@ pub mod pezpallet {
 	}
 }
 
-#[frame::pezpallet(dev_mode)]
+#[pezframe::pezpallet(dev_mode)]
 pub mod pezpallet_v2 {
 	use super::pezpallet::Balance;
-	use frame::prelude::*;
+	use pezframe::prelude::*;
 
 	#[docify::export(config_v2)]
 	#[pezpallet::config]
@@ -429,7 +429,7 @@ pub mod pezpallet_v2 {
 	#[cfg(any(test, doc))]
 	pub mod tests {
 		use super::{super::pezpallet::tests::StateBuilder, *};
-		use frame::testing_prelude::*;
+		use pezframe::testing_prelude::*;
 		const ALICE: u64 = 1;
 		const BOB: u64 = 2;
 
diff --git a/docs/sdk/packages/guides/first-runtime/Cargo.toml b/docs/sdk/packages/guides/first-runtime/Cargo.toml
index aefbad9c..172439c8 100644
--- a/docs/sdk/packages/guides/first-runtime/Cargo.toml
+++ b/docs/sdk/packages/guides/first-runtime/Cargo.toml
@@ -19,7 +19,9 @@ scale-info = { workspace = true }
 serde_json = { workspace = true }
 
 # this is a frame-based runtime, thus importing `frame` with runtime feature enabled.
-frame = { workspace = true, features = ["runtime"] }
+pezframe = { workspace = true, features = ["runtime"] }
+pezframe-system = { workspace = true }
+pezframe-support = { workspace = true }
 
 # pallets that we want to use
 pezpallet-balances = { workspace = true }
@@ -29,7 +31,16 @@ pezpallet-transaction-payment = { workspace = true }
 pezpallet-transaction-payment-rpc-runtime-api = { workspace = true }
 
 # other pezkuwi-sdk-deps
+pezsp-api = { workspace = true }
+pezsp-block-builder = { workspace = true }
+pezsp-core = { workspace = true }
+pezsp-genesis-builder = { workspace = true }
 pezsp-keyring = { workspace = true }
+pezsp-offchain = { workspace = true }
+pezsp-runtime = { workspace = true }
+pezsp-session = { workspace = true }
+pezsp-transaction-pool = { workspace = true }
+pezframe-system-rpc-runtime-api = { workspace = true }
 
 # local pezpallet templates
 first-pezpallet = { workspace = true }
@@ -46,7 +57,9 @@ std = [
 	"scale-info/std",
 	"serde_json/std",
 
-	"frame/std",
+	"pezframe/std",
+	"pezframe-system/std",
+	"pezframe-support/std",
 
 	"pezpallet-balances/std",
 	"pezpallet-sudo/std",
@@ -55,14 +68,23 @@ std = [
 	"pezpallet-transaction-payment/std",
 
 	"first-pezpallet/std",
+	"pezsp-api/std",
+	"pezsp-block-builder/std",
+	"pezsp-core/std",
+	"pezsp-genesis-builder/std",
 	"pezsp-keyring/std",
+	"pezsp-offchain/std",
+	"pezsp-runtime/std",
+	"pezsp-session/std",
+	"pezsp-transaction-pool/std",
+	"pezframe-system-rpc-runtime-api/std",
 
 	"bizinikiwi-wasm-builder",
 ]
 runtime-benchmarks = [
 	"bizinikiwi-wasm-builder?/runtime-benchmarks",
 	"first-pezpallet/runtime-benchmarks",
-	"frame/runtime-benchmarks",
+	"pezframe/runtime-benchmarks",
 	"pezpallet-balances/runtime-benchmarks",
 	"pezpallet-sudo/runtime-benchmarks",
 	"pezpallet-timestamp/runtime-benchmarks",
diff --git a/docs/sdk/packages/guides/first-runtime/src/lib.rs b/docs/sdk/packages/guides/first-runtime/src/lib.rs
index 270e6698..cf65133d 100644
--- a/docs/sdk/packages/guides/first-runtime/src/lib.rs
+++ b/docs/sdk/packages/guides/first-runtime/src/lib.rs
@@ -22,13 +22,18 @@
 extern crate alloc;
 use alloc::{vec, vec::Vec};
 use first_pezpallet::pezpallet_v2 as our_first_pallet;
-use frame::{
+use pezframe::{
 	deps::pezsp_genesis_builder::DEV_RUNTIME_PRESET,
 	prelude::*,
-	runtime::{apis, prelude::*},
+	runtime::prelude::*,
 };
 use pezpallet_transaction_payment_rpc_runtime_api::{FeeDetails, RuntimeDispatchInfo};
 use pezsp_keyring::Sr25519Keyring;
+use pezsp_runtime::{
+	traits::Block as BlockT,
+	transaction_validity::{TransactionSource, TransactionValidity},
+	ApplyExtrinsicResult,
+};
 
 #[docify::export]
 #[runtime_version]
@@ -66,12 +71,12 @@ mod runtime_types {
 	pub(super) type SignedExtra = (
 		// `frame` already provides all the signed extensions from `pezframe-system`. We just add
 		// the one related to tx-payment here.
-		frame::runtime::types_common::SystemTransactionExtensionsOf<Runtime>,
+		pezframe::runtime::types_common::SystemTransactionExtensionsOf<Runtime>,
 		pezpallet_transaction_payment::ChargeTransactionPayment<Runtime>,
 	);
 
-	pub(super) type Block = frame::runtime::types_common::BlockOf<Runtime, SignedExtra>;
-	pub(super) type Header = HeaderFor<Runtime>;
+	pub(super) type Block = pezframe::runtime::types_common::BlockOf<Runtime, SignedExtra>;
+	pub(super) type _Header = HeaderFor<Runtime>;
 
 	pub(super) type RuntimeExecutive = Executive<
 		Runtime,
@@ -132,7 +137,7 @@ pub mod genesis_config_presets {
 		interface::{Balance, MinimumBalance},
 		BalancesConfig, RuntimeGenesisConfig, SudoConfig,
 	};
-	use frame::deps::pezframe_support::build_struct_json_patch;
+	use pezframe::deps::pezframe_support::build_struct_json_patch;
 	use serde_json::Value;
 
 	/// Returns a development genesis config preset.
@@ -171,21 +176,21 @@ pub mod genesis_config_presets {
 }
 
 impl_runtime_apis! {
-	impl apis::Core<Block> for Runtime {
+	impl pezsp_api::Core<Block> for Runtime {
 		fn version() -> RuntimeVersion {
 			VERSION
 		}
 
-		fn execute_block(block: <Block as frame::traits::Block>::LazyBlock) {
+		fn execute_block(block: <Block as BlockT>::LazyBlock) {
 			RuntimeExecutive::execute_block(block)
 		}
 
-		fn initialize_block(header: &Header) -> ExtrinsicInclusionMode {
+		fn initialize_block(header: &<Block as BlockT>::Header) -> ExtrinsicInclusionMode {
 			RuntimeExecutive::initialize_block(header)
 		}
 	}
 
-	impl apis::Metadata<Block> for Runtime {
+	impl pezsp_api::Metadata<Block> for Runtime {
 		fn metadata() -> OpaqueMetadata {
 			OpaqueMetadata::new(Runtime::metadata().into())
 		}
@@ -199,62 +204,62 @@ impl_runtime_apis! {
 		}
 	}
 
-	impl apis::BlockBuilder<Block> for Runtime {
-		fn apply_extrinsic(extrinsic: ExtrinsicFor<Runtime>) -> ApplyExtrinsicResult {
+	impl pezsp_block_builder::BlockBuilder<Block> for Runtime {
+		fn apply_extrinsic(extrinsic: <Block as BlockT>::Extrinsic) -> ApplyExtrinsicResult {
 			RuntimeExecutive::apply_extrinsic(extrinsic)
 		}
 
-		fn finalize_block() -> HeaderFor<Runtime> {
+		fn finalize_block() -> <Block as BlockT>::Header {
 			RuntimeExecutive::finalize_block()
 		}
 
-		fn inherent_extrinsics(data: InherentData) -> Vec<ExtrinsicFor<Runtime>> {
+		fn inherent_extrinsics(data: InherentData) -> Vec<<Block as BlockT>::Extrinsic> {
 			data.create_extrinsics()
 		}
 
 		fn check_inherents(
-			block: <Block as frame::traits::Block>::LazyBlock,
+			block: <Block as BlockT>::LazyBlock,
 			data: InherentData,
 		) -> CheckInherentsResult {
 			data.check_extrinsics(&block)
 		}
 	}
 
-	impl apis::TaggedTransactionQueue<Block> for Runtime {
+	impl pezsp_transaction_pool::runtime_api::TaggedTransactionQueue<Block> for Runtime {
 		fn validate_transaction(
 			source: TransactionSource,
-			tx: ExtrinsicFor<Runtime>,
-			block_hash: <Runtime as pezframe_system::Config>::Hash,
+			tx: <Block as BlockT>::Extrinsic,
+			block_hash: <Block as BlockT>::Hash,
 		) -> TransactionValidity {
 			RuntimeExecutive::validate_transaction(source, tx, block_hash)
 		}
 	}
 
-	impl apis::OffchainWorkerApi<Block> for Runtime {
-		fn offchain_worker(header: &HeaderFor<Runtime>) {
+	impl pezsp_offchain::OffchainWorkerApi<Block> for Runtime {
+		fn offchain_worker(header: &<Block as BlockT>::Header) {
 			RuntimeExecutive::offchain_worker(header)
 		}
 	}
 
-	impl apis::SessionKeys<Block> for Runtime {
+	impl pezsp_session::SessionKeys<Block> for Runtime {
 		fn generate_session_keys(_seed: Option<Vec<u8>>) -> Vec<u8> {
 			Default::default()
 		}
 
 		fn decode_session_keys(
 			_encoded: Vec<u8>,
-		) -> Option<Vec<(Vec<u8>, apis::KeyTypeId)>> {
+		) -> Option<Vec<(Vec<u8>, pezsp_core::crypto::KeyTypeId)>> {
 			Default::default()
 		}
 	}
 
-	impl apis::AccountNonceApi<Block, interface::AccountId, interface::Nonce> for Runtime {
+	impl pezframe_system_rpc_runtime_api::AccountNonceApi<Block, interface::AccountId, interface::Nonce> for Runtime {
 		fn account_nonce(account: interface::AccountId) -> interface::Nonce {
 			System::account_nonce(account)
 		}
 	}
 
-	impl apis::GenesisBuilder<Block> for Runtime {
+	impl pezsp_genesis_builder::GenesisBuilder<Block> for Runtime {
 		fn build_state(config: Vec<u8>) -> GenesisBuilderResult {
 			build_state::<RuntimeGenesisConfig>(config)
 		}
@@ -272,10 +277,10 @@ impl_runtime_apis! {
 		Block,
 		interface::Balance,
 	> for Runtime {
-		fn query_info(uxt: ExtrinsicFor<Runtime>, len: u32) -> RuntimeDispatchInfo<interface::Balance> {
+		fn query_info(uxt: <Block as BlockT>::Extrinsic, len: u32) -> RuntimeDispatchInfo<interface::Balance> {
 			TransactionPayment::query_info(uxt, len)
 		}
-		fn query_fee_details(uxt: ExtrinsicFor<Runtime>, len: u32) -> FeeDetails<interface::Balance> {
+		fn query_fee_details(uxt: <Block as BlockT>::Extrinsic, len: u32) -> FeeDetails<interface::Balance> {
 			TransactionPayment::query_fee_details(uxt, len)
 		}
 		fn query_weight_to_fee(weight: Weight) -> interface::Balance {
@@ -291,7 +296,7 @@ impl_runtime_apis! {
 /// configs.
 pub mod interface {
 	use super::Runtime;
-	use frame::prelude::pezframe_system;
+	use pezframe::prelude::pezframe_system;
 
 	pub type AccountId = <Runtime as pezframe_system::Config>::AccountId;
 	pub type Nonce = <Runtime as pezframe_system::Config>::Nonce;
diff --git a/docs/sdk/src/guides/your_first_pallet/mod.rs b/docs/sdk/src/guides/your_first_pallet/mod.rs
index 869c3cb9..e853cf13 100644
--- a/docs/sdk/src/guides/your_first_pallet/mod.rs
+++ b/docs/sdk/src/guides/your_first_pallet/mod.rs
@@ -38,7 +38,7 @@
 //! - [`pezpallet::event`]
 //! - [`pezpallet::error`]
 //! - Basics of testing a pezpallet
-//! - [Constructing a runtime](frame::runtime::prelude::construct_runtime)
+//! - [Constructing a runtime](pezframe::runtime::prelude::construct_runtime)
 //!
 //! ### Shell Pezpallet
 //!
@@ -79,7 +79,7 @@
 //! details:
 //!
 //! - Where do `T::AccountId` and `T::RuntimeOrigin` come from? These are both defined in
-//!  [`frame::prelude::pezframe_system::Config`], therefore we can access them in `T`.
+//!  [`pezframe::prelude::pezframe_system::Config`], therefore we can access them in `T`.
 //! - What is `ensure_signed`, and what does it do with the aforementioned `T::RuntimeOrigin`? This
 //!   is outside the scope of this guide, and you can learn more about it in the origin reference
 //!   document ([`crate::reference_docs::frame_origin`]). For now, you should only know the
@@ -90,31 +90,31 @@
 //!
 //! - Where does `mutate`, `get` and `insert` and other storage APIs come from? All of them are
 //! explained in the corresponding `type`, for example, for `Balances::<T>::insert`, you can look
-//! into [`frame::prelude::StorageMap::insert`].
+//! into [`pezframe::prelude::StorageMap::insert`].
 //!
-//! - The return type of all dispatchable functions is [`frame::prelude::DispatchResult`]:
+//! - The return type of all dispatchable functions is [`pezframe::prelude::DispatchResult`]:
 #![doc = docify::embed!("../../bizinikiwi/pezframe/support/src/dispatch.rs", DispatchResult)]
 //!
-//! Which is more or less a normal Rust `Result`, with a custom [`frame::prelude::DispatchError`] as
+//! Which is more or less a normal Rust `Result`, with a custom [`pezframe::prelude::DispatchError`] as
 //! the `Err` variant. We won't cover this error in detail here, but importantly you should know
 //! that there is an `impl From<&'static string> for DispatchError` provided (see
-//! [here](`frame::prelude::DispatchError#impl-From<%26str>-for-DispatchError`)). Therefore,
+//! [here](`pezframe::prelude::DispatchError#impl-From<%26str>-for-DispatchError`)). Therefore,
 //! we can use basic string literals as our error type and `.into()` them into `DispatchError`.
 //!
 //! - Why are all `get` and `mutate` functions returning an `Option`? This is the default behavior
 //!   of FRAME storage APIs. You can learn more about how to override this by looking into
-//!   [`pezpallet::storage`], and [`frame::prelude::ValueQuery`]/[`frame::prelude::OptionQuery`]
+//!   [`pezpallet::storage`], and [`pezframe::prelude::ValueQuery`]/[`pezframe::prelude::OptionQuery`]
 //!
 //! ### Improving Errors
 //!
 //! How we handle error in the above snippets is fairly rudimentary. Let's look at how this can be
-//! improved. First, we can use [`frame::prelude::ensure`] to express the error slightly better.
+//! improved. First, we can use [`pezframe::prelude::ensure`] to express the error slightly better.
 //! This macro will call `.into()` under the hood.
 #![doc = docify::embed!("./packages/guides/first-pezpallet/src/lib.rs", transfer_better)]
 //!
 //! Moreover, you will learn in the [Defensive Programming
 //! section](crate::reference_docs::defensive_programming) that it is always recommended to use
-//! safe arithmetic operations in your runtime. By using [`frame::traits::CheckedSub`], we can not
+//! safe arithmetic operations in your runtime. By using [`pezframe::traits::CheckedSub`], we can not
 //! only take a step in that direction, but also improve the error handing and make it slightly more
 //! ergonomic.
 #![doc = docify::embed!("./packages/guides/first-pezpallet/src/lib.rs", transfer_better_checked)]
@@ -134,7 +134,7 @@
 //! #[cfg(test)]
 //! mod tests {
 //! 	// bring in the testing prelude of frame
-//! 	use frame::testing_prelude::*;
+//! 	use pezframe::testing_prelude::*;
 //! 	// bring in all pezpallet items
 //! 	use super::pezpallet::*;
 //!
@@ -144,12 +144,12 @@
 //!
 //! Next, we create a "test runtime" in order to test our pezpallet. Recall from
 //! [`crate::pezkuwi_sdk::frame_runtime`] that a runtime is a collection of pallets, expressed
-//! through [`frame::runtime::prelude::construct_runtime`]. All runtimes also have to include
-//! [`frame::prelude::pezframe_system`]. So we expect to see a runtime with two pezpallet,
+//! through [`pezframe::runtime::prelude::construct_runtime`]. All runtimes also have to include
+//! [`pezframe::prelude::pezframe_system`]. So we expect to see a runtime with two pezpallet,
 //! `pezframe_system` and the one we just wrote.
 #![doc = docify::embed!("./packages/guides/first-pezpallet/src/lib.rs", runtime)]
 //!
-//! > [`frame::pezpallet_macros::derive_impl`] is a FRAME feature that enables developers to have
+//! > [`pezframe::pezpallet_macros::derive_impl`] is a FRAME feature that enables developers to have
 //! > defaults for associated types.
 //!
 //! Recall that within our pezpallet, (almost) all blocks of code are generic over `<T: Config>`.
@@ -183,7 +183,7 @@
 //!
 //! The above is all you need to execute the dispatchables of your pezpallet. The last thing you
 //! need to learn is that all of your pezpallet testing code should be wrapped in
-//! [`frame::testing_prelude::TestState`]. This is a type that provides access to an in-memory state
+//! [`pezframe::testing_prelude::TestState`]. This is a type that provides access to an in-memory state
 //! to be used in our tests.
 #![doc = docify::embed!("./packages/guides/first-pezpallet/src/lib.rs", first_test)]
 //!
@@ -305,7 +305,7 @@
 //!
 //! In this snippet, the actual `RuntimeEvent` type (right hand side of `type RuntimeEvent =
 //! RuntimeEvent`) is generated by
-//! [`construct_runtime`](frame::runtime::prelude::construct_runtime). An interesting way to inspect
+//! [`construct_runtime`](pezframe::runtime::prelude::construct_runtime). An interesting way to inspect
 //! this type is to see its definition in rust-docs:
 //! [`crate::guides::your_first_pallet::pezpallet_v2::tests::runtime_v2::RuntimeEvent`].
 //!
@@ -321,7 +321,7 @@
 //! - The pezpallet we wrote in this guide was using `dev_mode`, learn more in
 //!   [`pezpallet::config`].
 //! - Learn more about the individual pezpallet items/macros, such as event and errors and call, in
-//!   [`frame::pezpallet_macros`].
+//!   [`pezframe::pezpallet_macros`].
 //!
 //! [`pezpallet::storage`]: pezframe_support::pezpallet_macros::storage
 //! [`pezpallet::call`]: pezframe_support::pezpallet_macros::call
@@ -332,9 +332,9 @@
 //! [`pezpallet::generate_deposit`]: pezframe_support::pezpallet_macros::generate_deposit
 
 #[docify::export]
-#[frame::pezpallet(dev_mode)]
+#[pezframe::pezpallet(dev_mode)]
 pub mod shell_pallet {
-	use frame::prelude::*;
+	use pezframe::prelude::*;
 
 	#[pezpallet::config]
 	pub trait Config: pezframe_system::Config {}
@@ -343,9 +343,9 @@ pub mod shell_pallet {
 	pub struct Pezpallet<T>(_);
 }
 
-#[frame::pezpallet(dev_mode)]
+#[pezframe::pezpallet(dev_mode)]
 pub mod pezpallet {
-	use frame::prelude::*;
+	use pezframe::prelude::*;
 
 	#[docify::export]
 	pub type Balance = u128;
@@ -449,7 +449,7 @@ pub mod pezpallet {
 		use crate::guides::your_first_pallet::pezpallet::*;
 
 		#[docify::export(testing_prelude)]
-		use frame::testing_prelude::*;
+		use pezframe::testing_prelude::*;
 
 		pub(crate) const ALICE: u64 = 1;
 		pub(crate) const BOB: u64 = 2;
@@ -672,10 +672,10 @@ pub mod pezpallet {
 	}
 }
 
-#[frame::pezpallet(dev_mode)]
+#[pezframe::pezpallet(dev_mode)]
 pub mod pezpallet_v2 {
 	use super::pezpallet::Balance;
-	use frame::prelude::*;
+	use pezframe::prelude::*;
 
 	#[docify::export(config_v2)]
 	#[pezpallet::config]
@@ -741,7 +741,7 @@ pub mod pezpallet_v2 {
 	#[cfg(any(test, doc))]
 	pub mod tests {
 		use super::{super::pezpallet::tests::StateBuilder, *};
-		use frame::testing_prelude::*;
+		use pezframe::testing_prelude::*;
 		const ALICE: u64 = 1;
 		const BOB: u64 = 2;
 
diff --git a/docs/sdk/src/guides/your_first_runtime.rs b/docs/sdk/src/guides/your_first_runtime.rs
index 8b7a13e7..51bf7751 100644
--- a/docs/sdk/src/guides/your_first_runtime.rs
+++ b/docs/sdk/src/guides/your_first_runtime.rs
@@ -30,7 +30,7 @@
 //! ## Your First Runtime
 //!
 //! The first new property of a real runtime that it must define its
-//! [`frame::runtime::prelude::RuntimeVersion`]:
+//! [`pezframe::runtime::prelude::RuntimeVersion`]:
 #![doc = docify::embed!("./packages/guides/first-runtime/src/lib.rs", VERSION)]
 //!
 //! The version contains a number of very important fields, such as `spec_version` and `spec_name`
@@ -39,7 +39,7 @@
 //! [`crate::reference_docs::frame_runtime_upgrades_and_migrations`].
 //!
 //! Then, a real runtime also contains the `impl` of all individual pallets' `trait Config` for
-//! `struct Runtime`, and a [`frame::runtime::prelude::construct_runtime`] macro that amalgamates
+//! `struct Runtime`, and a [`pezframe::runtime::prelude::construct_runtime`] macro that amalgamates
 //! them all.
 //!
 //! In the case of our example:
@@ -49,9 +49,9 @@
 //! their `Config` need to be implemented for `struct Runtime`:
 #![doc = docify::embed!("./packages/guides/first-runtime/src/lib.rs", config_impls)]
 //!
-//! Notice how we use [`frame::pezpallet_macros::derive_impl`] to provide "default" configuration
+//! Notice how we use [`pezframe::pezpallet_macros::derive_impl`] to provide "default" configuration
 //! items for each pezpallet. Feel free to dive into the definition of each default prelude (eg.
-//! [`frame::prelude::pezframe_system::pezpallet::config_preludes`]) to learn more which types are
+//! [`pezframe::prelude::pezframe_system::pezpallet::config_preludes`]) to learn more which types are
 //! exactly used.
 //!
 //! Recall that in test runtime in [`crate::guides::your_first_pallet`], we provided `type AccountId
@@ -66,12 +66,12 @@
 //! steps of crafting a runtime are related to achieving exactly this.
 //!
 //! First, we define a number of types that eventually lead to the creation of an instance of
-//! [`frame::runtime::prelude::Executive`]. The executive is a handy FRAME utility that, through
+//! [`pezframe::runtime::prelude::Executive`]. The executive is a handy FRAME utility that, through
 //! amalgamating all pallets and further types, implements some of the very very core pieces of the
 //! runtime logic, such as how blocks are executed and other runtime-api implementations.
 #![doc = docify::embed!("./packages/guides/first-runtime/src/lib.rs", runtime_types)]
 //!
-//! Finally, we use [`frame::runtime::prelude::impl_runtime_apis`] to implement all of the runtime
+//! Finally, we use [`pezframe::runtime::prelude::impl_runtime_apis`] to implement all of the runtime
 //! APIs that the runtime wishes to expose. As you will see in the code, most of these runtime API
 //! implementations are merely forwarding calls to `RuntimeExecutive` which handles the actual
 //! logic. Given that the implementation block is somewhat large, we won't repeat it here. You can
@@ -111,7 +111,7 @@
 //! primary way to run a new chain.
 //!
 //! These APIs are defined in [`pezsp_genesis_builder`], and are re-exposed as a part of
-//! [`frame::runtime::apis`]. Therefore, the implementation blocks can be found inside of
+//! [`pezframe::runtime::apis`]. Therefore, the implementation blocks can be found inside of
 //! `impl_runtime_apis!` similar to:
 //!
 //! ```ignore
@@ -143,7 +143,7 @@
 //!
 //! For `build_state` and `get_preset`, we use the helper functions provide by frame:
 //!
-//! * [`frame::runtime::prelude::build_state`] and [`frame::runtime::prelude::get_preset`].
+//! * [`pezframe::runtime::prelude::build_state`] and [`pezframe::runtime::prelude::get_preset`].
 //!
 //! Indeed, our runtime needs to specify what its `DEV_RUNTIME_PRESET` genesis state should be like:
 #![doc = docify::embed!("./packages/guides/first-runtime/src/lib.rs", development_config_genesis)]
diff --git a/docs/sdk/src/meta_contributing.rs b/docs/sdk/src/meta_contributing.rs
index 8fe7dded..203e224c 100644
--- a/docs/sdk/src/meta_contributing.rs
+++ b/docs/sdk/src/meta_contributing.rs
@@ -82,9 +82,9 @@
 //!
 //!
 //! ```
-//! #[frame::pezpallet(dev_mode)]
+//! #[pezframe::pezpallet(dev_mode)]
 //! pub mod pezpallet {
-//! #   use frame::prelude::*;
+//! #   use pezframe::prelude::*;
 //! #   #[pezpallet::config]
 //! #   pub trait Config: pezframe_system::Config {}
 //! #   #[pezpallet::pezpallet]
@@ -105,9 +105,9 @@
 //! explained in [`crate::reference_docs::frame_runtime_types`]. Build on top of this!
 //! * Then, what is `origin`? Just an account id? [`crate::reference_docs::frame_origin`].
 //! * Then, what is `DispatchResult`? Why is this called *dispatch*? Probably something that can be
-//! explained in the documentation of [`frame::prelude::DispatchResult`].
+//! explained in the documentation of [`pezframe::prelude::DispatchResult`].
 //! * Why is `"SomeStaticString"` a valid error? Because there is implementation for it that you can
-//!   see [here](frame::prelude::DispatchError#impl-From<%26'static+str>-for-DispatchError).
+//!   see [here](pezframe::prelude::DispatchError#impl-From<%26'static+str>-for-DispatchError).
 //!
 //!
 //! All of these are examples of underlying information that a contributor should:
diff --git a/docs/sdk/src/pezkuwi_sdk/bizinikiwi.rs b/docs/sdk/src/pezkuwi_sdk/bizinikiwi.rs
index d18d0561..77eee9cf 100644
--- a/docs/sdk/src/pezkuwi_sdk/bizinikiwi.rs
+++ b/docs/sdk/src/pezkuwi_sdk/bizinikiwi.rs
@@ -98,8 +98,8 @@
 //! Bizinikiwi-based project typically contains the following:
 //!
 //! * Under `./runtime`, a `./runtime/src/lib.rs` which is the top level runtime amalgamator file.
-//!   This file typically contains the [`frame::runtime::prelude::construct_runtime`] and
-//!   [`frame::runtime::prelude::impl_runtime_apis`] macro calls, which is the final definition of a
+//!   This file typically contains the [`pezframe::runtime::prelude::construct_runtime`] and
+//!   [`pezframe::runtime::prelude::impl_runtime_apis`] macro calls, which is the final definition of a
 //!   runtime.
 //!
 //! * Under `./node`, a `main.rs`, which is the starting point, and a `./service.rs`, which contains
diff --git a/docs/sdk/src/pezkuwi_sdk/frame_runtime.rs b/docs/sdk/src/pezkuwi_sdk/frame_runtime.rs
index fb192116..a63b2a7e 100644
--- a/docs/sdk/src/pezkuwi_sdk/frame_runtime.rs
+++ b/docs/sdk/src/pezkuwi_sdk/frame_runtime.rs
@@ -34,23 +34,23 @@
 //! about its own responsibilities and make as few assumptions about the general runtime as
 //! possible. A pezpallet is analogous to a _module_ in the runtime.
 //!
-//! A pezpallet is defined as a `mod pezpallet` wrapped by the [`frame::pezpallet`] macro. Within
+//! A pezpallet is defined as a `mod pezpallet` wrapped by the [`pezframe::pezpallet`] macro. Within
 //! this macro, pezpallet components/parts can be defined. Most notable of these parts are:
 //!
-//! - [Config](frame::pezpallet_macros::config), allowing a pezpallet to make itself configurable
+//! - [Config](pezframe::pezpallet_macros::config), allowing a pezpallet to make itself configurable
 //!   and generic over types, values and such.
-//! - [Storage](frame::pezpallet_macros::storage), allowing a pezpallet to define onchain storage.
-//! - [Dispatchable function](frame::pezpallet_macros::call), allowing a pezpallet to define
+//! - [Storage](pezframe::pezpallet_macros::storage), allowing a pezpallet to define onchain storage.
+//! - [Dispatchable function](pezframe::pezpallet_macros::call), allowing a pezpallet to define
 //!   extrinsics that are callable by end users, from the outer world.
-//! - [Events](frame::pezpallet_macros::event), allowing a pezpallet to emit events.
-//! - [Errors](frame::pezpallet_macros::error), allowing a pezpallet to emit well-formed errors.
+//! - [Events](pezframe::pezpallet_macros::event), allowing a pezpallet to emit events.
+//! - [Errors](pezframe::pezpallet_macros::error), allowing a pezpallet to emit well-formed errors.
 //!
 //! Some of these pezpallet components resemble the building blocks of a smart contract. While both
 //! models are programming state transition functions of blockchains, there are crucial differences
 //! between the two. See [`crate::reference_docs::runtime_vs_smart_contract`] for more.
 //!
 //! Most of these components are defined using macros, the full list of which can be found in
-//! [`frame::pezpallet_macros`].
+//! [`pezframe::pezpallet_macros`].
 //!
 //! ### Example
 //!
@@ -61,16 +61,16 @@
 //!
 //! A runtime is a collection of pallets that are amalgamated together. Each pezpallet typically has
 //! some configurations (exposed as a `trait Config`) that needs to be *specified* in the runtime.
-//! This is done with [`frame::runtime::prelude::construct_runtime`].
+//! This is done with [`pezframe::runtime::prelude::construct_runtime`].
 //!
 //! A (real) runtime that actually wishes to compile to WASM needs to also implement a set of
 //! runtime-apis. These implementation can be specified using the
-//! [`frame::runtime::prelude::impl_runtime_apis`] macro.
+//! [`pezframe::runtime::prelude::impl_runtime_apis`] macro.
 //!
 //! ### Example
 //!
 //! The following example shows a (test) runtime that is composing the pezpallet demonstrated above,
-//! next to the [`frame::prelude::pezframe_system`] pezpallet, into a runtime.
+//! next to the [`pezframe::prelude::pezframe_system`] pezpallet, into a runtime.
 #![doc = docify::embed!("src/pezkuwi_sdk/frame_runtime.rs", runtime)]
 //!
 //! ## More Examples
@@ -94,9 +94,9 @@
 /// experimental feature to break these parts into different `mod`s. See [`pezpallet_examples`] for
 /// more.
 #[docify::export]
-#[frame::pezpallet(dev_mode)]
+#[pezframe::pezpallet(dev_mode)]
 pub mod pezpallet {
-	use frame::prelude::*;
+	use pezframe::prelude::*;
 
 	/// The configuration trait of a pezpallet. Mandatory. Allows a pezpallet to receive types at a
 	/// later point from the runtime that wishes to contain it. It allows the pezpallet to be
@@ -118,7 +118,7 @@ pub mod pezpallet {
 	}
 
 	/// A mandatory struct in each pezpallet. All functions callable by external users (aka.
-	/// transactions) must be attached to this type (see [`frame::pezpallet_macros::call`]). For
+	/// transactions) must be attached to this type (see [`pezframe::pezpallet_macros::call`]). For
 	/// convenience, internal (private) functions can also be attached to this type.
 	#[pezpallet::pezpallet]
 	pub struct Pezpallet<T>(PhantomData<T>);
@@ -153,7 +153,7 @@ pub mod pezpallet {
 #[docify::export]
 pub mod runtime {
 	use super::pezpallet as pezpallet_example;
-	use frame::{prelude::*, testing_prelude::*};
+	use pezframe::{prelude::*, testing_prelude::*};
 
 	// The major macro that amalgamates pallets into `enum Runtime`
 	construct_runtime!(
diff --git a/docs/sdk/src/pezkuwi_sdk/pezcumulus.rs b/docs/sdk/src/pezkuwi_sdk/pezcumulus.rs
index ab993acf..87f290c9 100644
--- a/docs/sdk/src/pezkuwi_sdk/pezcumulus.rs
+++ b/docs/sdk/src/pezkuwi_sdk/pezcumulus.rs
@@ -17,7 +17,7 @@
 //! A teyrchain runtime should use a number of pallets that are provided by Pezcumulus and
 //! Bizinikiwi. Notably:
 //!
-//! - [`pezframe-system`](frame::prelude::pezframe_system), like all FRAME-based runtimes.
+//! - [`pezframe-system`](pezframe::prelude::pezframe_system), like all FRAME-based runtimes.
 //! - [`pezcumulus_pezpallet_teyrchain_system`]
 //! - [`teyrchain_info`]
 #![doc = docify::embed!("./src/pezkuwi_sdk/pezcumulus.rs", system_pallets)]
@@ -32,7 +32,7 @@
 //!
 //!
 //! Finally, a separate macro, similar to
-//! [`impl_runtime_api`](frame::runtime::prelude::impl_runtime_apis), which creates the default set
+//! [`impl_runtime_api`](pezframe::runtime::prelude::impl_runtime_apis), which creates the default set
 //! of runtime APIs, will generate the teyrchain runtime's validation runtime API, also known as
 //! teyrchain validation function (PVF). Without this API, the relay chain is unable to validate
 //! blocks produced by our teyrchain.
@@ -48,7 +48,7 @@
 #[cfg(test)]
 mod tests {
 	mod runtime {
-		pub use frame::{
+		pub use pezframe::{
 			deps::pezsp_consensus_aura::sr25519::AuthorityId as AuraId, prelude::*,
 			runtime::prelude::*, testing_prelude::*,
 		};
@@ -95,7 +95,7 @@ mod tests {
 					1,
 				>;
 				type WeightInfo = ();
-				type DmpQueue = frame::traits::EnqueueWithOrigin<(), pezsp_core::ConstU8<0>>;
+				type DmpQueue = pezframe::traits::EnqueueWithOrigin<(), pezsp_core::ConstU8<0>>;
 				type RelayParentOffset = ConstU32<0>;
 			}
 
diff --git a/docs/sdk/src/reference_docs/chain_spec_genesis.rs b/docs/sdk/src/reference_docs/chain_spec_genesis.rs
index 7099c817..eda84ad9 100644
--- a/docs/sdk/src/reference_docs/chain_spec_genesis.rs
+++ b/docs/sdk/src/reference_docs/chain_spec_genesis.rs
@@ -188,7 +188,7 @@
 //!     pez_chain_spec_guide_runtime::runtime::RuntimeGenesisConfig
 //! [`FooStruct`]:
 //!     pez_chain_spec_guide_runtime::pallets::FooStruct
-//! [`impl_runtime_apis`]: frame::runtime::prelude::impl_runtime_apis
+//! [`impl_runtime_apis`]: pezframe::runtime::prelude::impl_runtime_apis
 //! [`build_state`]: pezframe_support::genesis_builder_helper::build_state
 //! [`get_preset`]: pezframe_support::genesis_builder_helper::get_preset
 //! [`pezpallet::genesis_build`]: pezframe_support::pezpallet_macros::genesis_build
diff --git a/docs/sdk/src/reference_docs/chain_spec_runtime/Cargo.toml b/docs/sdk/src/reference_docs/chain_spec_runtime/Cargo.toml
index f933a695..012cf9ba 100644
--- a/docs/sdk/src/reference_docs/chain_spec_runtime/Cargo.toml
+++ b/docs/sdk/src/reference_docs/chain_spec_runtime/Cargo.toml
@@ -14,14 +14,16 @@ documentation.workspace = true
 codec = { workspace = true }
 docify = { workspace = true }
 pezframe-support = { workspace = true }
+pezframe-system = { workspace = true }
 scale-info = { workspace = true }
 serde = { workspace = true }
 serde_json = { workspace = true }
 
 # this is a frame-based runtime, thus importing `frame` with runtime feature enabled.
-frame = { features = ["experimental", "runtime"], workspace = true }
+pezframe = { features = ["experimental", "runtime"], workspace = true }
 
 # genesis builder that allows us to interact with runtime genesis config
+pezsp-api = { workspace = true }
 pezsp-application-crypto = { features = ["serde"], workspace = true }
 pezsp-core = { workspace = true }
 pezsp-genesis-builder = { workspace = true }
@@ -41,9 +43,11 @@ std = [
 	"codec/std",
 	"scale-info/std",
 
-	"frame/std",
+	"pezframe/std",
 	"pezframe-support/std",
+	"pezframe-system/std",
 
+	"pezsp-api/std",
 	"pezsp-application-crypto/std",
 	"pezsp-core/std",
 	"pezsp-genesis-builder/std",
@@ -56,7 +60,7 @@ std = [
 ]
 runtime-benchmarks = [
 	"bizinikiwi-wasm-builder?/runtime-benchmarks",
-	"frame/runtime-benchmarks",
+	"pezframe/runtime-benchmarks",
 	"pezframe-support/runtime-benchmarks",
 	"pezsc-chain-spec/runtime-benchmarks",
 	"pezsp-genesis-builder/runtime-benchmarks",
diff --git a/docs/sdk/src/reference_docs/chain_spec_runtime/src/pallets.rs b/docs/sdk/src/reference_docs/chain_spec_runtime/src/pallets.rs
index e79fcd9e..ce15d557 100644
--- a/docs/sdk/src/reference_docs/chain_spec_runtime/src/pallets.rs
+++ b/docs/sdk/src/reference_docs/chain_spec_runtime/src/pallets.rs
@@ -18,10 +18,10 @@
 //! Pallets for the chain-spec demo runtime.
 
 use alloc::vec::Vec;
-use frame::prelude::*;
+use pezframe::prelude::*;
 
 #[docify::export]
-#[frame::pezpallet(dev_mode)]
+#[pezframe::pezpallet(dev_mode)]
 pub mod pezpallet_bar {
 	use super::*;
 
@@ -94,7 +94,7 @@ pub enum FooEnum {
 }
 
 #[docify::export]
-#[frame::pezpallet(dev_mode)]
+#[pezframe::pezpallet(dev_mode)]
 pub mod pezpallet_foo {
 	use super::*;
 
diff --git a/docs/sdk/src/reference_docs/chain_spec_runtime/src/runtime.rs b/docs/sdk/src/reference_docs/chain_spec_runtime/src/runtime.rs
index 3de1dc41..49bb1168 100644
--- a/docs/sdk/src/reference_docs/chain_spec_runtime/src/runtime.rs
+++ b/docs/sdk/src/reference_docs/chain_spec_runtime/src/runtime.rs
@@ -26,15 +26,14 @@ use crate::{
 	presets::*,
 };
 use alloc::{vec, vec::Vec};
-use frame::{
-	deps::pezframe_support::{
-		genesis_builder_helper::{build_state, get_preset},
-		runtime,
-	},
+use pezframe::{
+	deps::pezframe_support::genesis_builder_helper::{build_state, get_preset},
 	prelude::*,
-	runtime::{apis, prelude::*},
+	runtime::prelude::*,
 };
+use pezsp_api::impl_runtime_apis;
 use pezsp_genesis_builder::PresetId;
+use pezsp_runtime::traits::Block as BlockT;
 
 /// The runtime version.
 #[runtime_version]
@@ -53,7 +52,7 @@ pub const VERSION: RuntimeVersion = RuntimeVersion {
 type SignedExtra = ();
 
 // Composes the runtime by adding all the used pallets and deriving necessary types.
-#[runtime]
+#[frame_construct_runtime]
 mod runtime {
 	/// The main runtime type.
 	#[runtime::runtime]
@@ -69,15 +68,15 @@ mod runtime {
 
 	/// Mandatory system pezpallet that should always be included in a FRAME runtime.
 	#[runtime::pezpallet_index(0)]
-	pub type System = pezframe_system;
+	pub type System = pezframe_system::Pezpallet<Runtime>;
 
 	/// Sample pezpallet 1
 	#[runtime::pezpallet_index(1)]
-	pub type Bar = pezpallet_bar;
+	pub type Bar = pezpallet_bar::Pezpallet<Runtime>;
 
 	/// Sample pezpallet 2
 	#[runtime::pezpallet_index(2)]
-	pub type Foo = pezpallet_foo;
+	pub type Foo = pezpallet_foo::Pezpallet<Runtime>;
 }
 
 parameter_types! {
@@ -94,8 +93,8 @@ impl pezframe_system::Config for Runtime {
 impl pezpallet_bar::Config for Runtime {}
 impl pezpallet_foo::Config for Runtime {}
 
-type Block = frame::runtime::types_common::BlockOf<Runtime, SignedExtra>;
-type Header = HeaderFor<Runtime>;
+type Block = pezframe::runtime::types_common::BlockOf<Runtime, SignedExtra>;
+type _Header = HeaderFor<Runtime>;
 
 #[docify::export(runtime_impl)]
 impl_runtime_apis! {
@@ -119,9 +118,9 @@ impl_runtime_apis! {
 		}
 	}
 
-	impl apis::Core<Block> for Runtime {
+	impl pezsp_api::Core<Block> for Runtime {
 		fn version() -> RuntimeVersion { VERSION }
-		fn execute_block(_: <Block as frame::traits::Block>::LazyBlock) { }
-		fn initialize_block(_: &Header) -> ExtrinsicInclusionMode { ExtrinsicInclusionMode::default() }
+		fn execute_block(_: <Block as BlockT>::LazyBlock) { }
+		fn initialize_block(_: &<Block as BlockT>::Header) -> ExtrinsicInclusionMode { ExtrinsicInclusionMode::default() }
 	}
 }
diff --git a/docs/sdk/src/reference_docs/defensive_programming.rs b/docs/sdk/src/reference_docs/defensive_programming.rs
index 734611ab..ea9b05ec 100644
--- a/docs/sdk/src/reference_docs/defensive_programming.rs
+++ b/docs/sdk/src/reference_docs/defensive_programming.rs
@@ -70,18 +70,18 @@
 //!
 //! ### Defensive Traits
 //!
-//! The [`Defensive`](frame::traits::Defensive) trait provides a number of functions, all of which
+//! The [`Defensive`](pezframe::traits::Defensive) trait provides a number of functions, all of which
 //! provide an alternative to 'vanilla' Rust functions, e.g.:
 //!
-//! - [`defensive_unwrap_or()`](frame::traits::Defensive::defensive_unwrap_or) instead of
+//! - [`defensive_unwrap_or()`](pezframe::traits::Defensive::defensive_unwrap_or) instead of
 //!   `unwrap_or()`
-//! - [`defensive_ok_or()`](frame::traits::DefensiveOption::defensive_ok_or) instead of `ok_or()`
+//! - [`defensive_ok_or()`](pezframe::traits::DefensiveOption::defensive_ok_or) instead of `ok_or()`
 //!
 //! Defensive methods use [`debug_assertions`](https://doc.rust-lang.org/reference/conditional-compilation.html#debug_assertions), which panic in development, but in
 //! production/release, they will merely log an error (i.e., `log::error`).
 //!
-//! The [`Defensive`](frame::traits::Defensive) trait and its various implementations can be found
-//! [here](frame::traits::Defensive).
+//! The [`Defensive`](pezframe::traits::Defensive) trait and its various implementations can be found
+//! [here](pezframe::traits::Defensive).
 //!
 //! ## Integer Overflow
 //!
@@ -188,8 +188,8 @@
 //! to avoid introducing the notion of any potential-panic or wrapping behavior.
 //!
 //! There is also a series of defensive alternatives via
-//! [`DefensiveSaturating`](frame::traits::DefensiveSaturating), which introduces the same behavior
-//! of the [`Defensive`](frame::traits::Defensive) trait, only with saturating, mathematical
+//! [`DefensiveSaturating`](pezframe::traits::DefensiveSaturating), which introduces the same behavior
+//! of the [`Defensive`](pezframe::traits::Defensive) trait, only with saturating, mathematical
 //! operations:
 #![doc = docify::embed!(
     "./src/reference_docs/defensive_programming.rs",
@@ -278,7 +278,7 @@
 //! actually cause harm to the network, and thus stalling would be the better option.
 //!
 //! Take the example of the BABE pezpallet ([`pezpallet_babe`]), which doesn't allow for a validator
-//! to participate if it is disabled (see: [`frame::traits::DisabledValidators`]):
+//! to participate if it is disabled (see: [`pezframe::traits::DisabledValidators`]):
 //!
 //! ```ignore
 //! if T::DisabledValidators::is_disabled(authority_index) {
@@ -359,7 +359,7 @@ mod fake_runtime_types {
 
 #[cfg(test)]
 mod tests {
-	use frame::traits::DefensiveSaturating;
+	use pezframe::traits::DefensiveSaturating;
 	#[docify::export]
 	#[test]
 	fn checked_add_example() {
diff --git a/docs/sdk/src/reference_docs/extrinsic_encoding.rs b/docs/sdk/src/reference_docs/extrinsic_encoding.rs
index 000ad4ea..b48fb3fd 100644
--- a/docs/sdk/src/reference_docs/extrinsic_encoding.rs
+++ b/docs/sdk/src/reference_docs/extrinsic_encoding.rs
@@ -37,7 +37,7 @@
 //!
 //! ## compact_encoded_length
 //!
-//! This is a [SCALE compact encoded][frame::deps::codec::Compact] integer which is equal to the
+//! This is a [SCALE compact encoded][pezframe::deps::codec::Compact] integer which is equal to the
 //! length, in bytes, of the rest of the extrinsic details.
 //!
 //! To obtain this value, we must encode and concatenate together the rest of the extrinsic details
@@ -90,7 +90,7 @@
 //!
 //! #### from_address
 //!
-//! This is the [SCALE encoded][frame::deps::codec] address of the sender of the extrinsic. The
+//! This is the [SCALE encoded][pezframe::deps::codec] address of the sender of the extrinsic. The
 //! address is the first generic parameter of [`pezsp_runtime::generic::UncheckedExtrinsic`], and so
 //! can vary from chain to chain.
 //!
@@ -102,7 +102,7 @@
 //!
 //! #### signature
 //!
-//! This is the [SCALE encoded][frame::deps::codec] signature. The signature type is configured via
+//! This is the [SCALE encoded][pezframe::deps::codec] signature. The signature type is configured via
 //! the third generic parameter of [`pezsp_runtime::generic::UncheckedExtrinsic`], which determines
 //! the shape of the signature and signing algorithm that should be used.
 //!
@@ -121,7 +121,7 @@
 //!
 //! ### transaction_extensions_extra
 //!
-//! This is the concatenation of the [SCALE encoded][frame::deps::codec] bytes representing first a
+//! This is the concatenation of the [SCALE encoded][pezframe::deps::codec] bytes representing first a
 //! single byte describing the extension version (this is bumped whenever a change occurs in the
 //! transaction extension pipeline) followed by the bytes of each of the [_transaction
 //! extensions_][pezsp_runtime::traits::TransactionExtension], and are configured by the fourth
@@ -142,11 +142,11 @@
 //! configuration. At the time of writing, Pezkuwi configures them
 //! [here](https://github.com/polkadot-fellows/runtimes/blob/1dc04eb954eadf8aadb5d83990b89662dbb5a074/relay/polkadot/src/lib.rs#L1432C25-L1432C25).
 //! Some of the common transaction extensions are defined
-//! [here][frame::deps::pezframe_system#transaction-extensions].
+//! [here][pezframe::deps::pezframe_system#transaction-extensions].
 //!
 //! Information about exactly which transaction extensions are present on a chain and in what order
 //! is also a part of the metadata for the chain. For V15 metadata, it can be [found
-//! here][frame::deps::pezframe_support::__private::metadata::v15::ExtrinsicMetadata].
+//! here][pezframe::deps::pezframe_support::__private::metadata::v15::ExtrinsicMetadata].
 //!
 //! ## call_data
 //!
@@ -154,7 +154,7 @@
 //! altered. This is defined by the second generic parameter of
 //! [`pezsp_runtime::generic::UncheckedExtrinsic`].
 //!
-//! A call can be anything that implements [`Encode`][frame::deps::codec::Encode]. In FRAME-based
+//! A call can be anything that implements [`Encode`][pezframe::deps::codec::Encode]. In FRAME-based
 //! runtimes, a call is represented as an enum of enums, where the outer enum represents the FRAME
 //! pezpallet being called, and the inner enum represents the call being made within that pezpallet,
 //! and any arguments to it. Read more about the call enum
@@ -183,7 +183,7 @@
 //! Information about the pallets that exist for a chain (including their indexes), the calls
 //! available in each pezpallet (including their indexes), and the arguments required for each call
 //! can be found in the metadata for the chain. For V15 metadata, this information [is
-//! here][frame::deps::pezframe_support::__private::metadata::v15::PalletMetadata].
+//! here][pezframe::deps::pezframe_support::__private::metadata::v15::PalletMetadata].
 //!
 //! # The Signed Payload Format
 //!
diff --git a/docs/sdk/src/reference_docs/frame_logging.rs b/docs/sdk/src/reference_docs/frame_logging.rs
index c89dfaf3..482fc1dc 100644
--- a/docs/sdk/src/reference_docs/frame_logging.rs
+++ b/docs/sdk/src/reference_docs/frame_logging.rs
@@ -57,7 +57,7 @@
 //! ]
 //! ```
 //!
-//! More conveniently, the `frame` umbrella crate re-exports the log crate as [`frame::log`].
+//! More conveniently, the `frame` umbrella crate re-exports the log crate as [`pezframe::log`].
 //!
 //! Then, the pezpallet can use this crate to emit log statements. In this statement, we use the
 //! info level, and the target is `pezpallet-example`.
@@ -68,7 +68,7 @@
 //!
 //! 	impl Pezpallet {
 //! 		fn logs() {
-//! 			frame::log::info!(target: "pezpallet-example", "Hello, world!");
+//! 			pezframe::log::info!(target: "pezpallet-example", "Hello, world!");
 //! 		}
 //! 	}
 //! }
diff --git a/docs/sdk/src/reference_docs/frame_offchain_workers.rs b/docs/sdk/src/reference_docs/frame_offchain_workers.rs
index e4fe9f60..46a908a5 100644
--- a/docs/sdk/src/reference_docs/frame_offchain_workers.rs
+++ b/docs/sdk/src/reference_docs/frame_offchain_workers.rs
@@ -54,13 +54,13 @@
 //! ## FRAME's API
 //!
 //! [`frame`] provides a simple API through which pallets can define offchain worker functions. This
-//! is part of [`frame::traits::Hooks`], which is implemented as a part of
-//! [`frame::pezpallet_macros::hooks`].
+//! is part of [`pezframe::traits::Hooks`], which is implemented as a part of
+//! [`pezframe::pezpallet_macros::hooks`].
 //!
 //! ```
-//! #[frame::pezpallet]
+//! #[pezframe::pezpallet]
 //! pub mod pezpallet {
-//! 	use frame::prelude::*;
+//! 	use pezframe::prelude::*;
 //!
 //! 	#[pezpallet::config]
 //! 	pub trait Config: pezframe_system::Config {}
@@ -95,7 +95,7 @@
 //! API into the WASM blob are:
 //!
 //! * Accessing the state is easier within the `offchain_worker` function, as it is already a part
-//!   of the runtime, and [`frame::pezpallet_macros::storage`] provides all the tools needed to read
+//!   of the runtime, and [`pezframe::pezpallet_macros::storage`] provides all the tools needed to read
 //!   the state. Other client libraries might provide varying degrees of capability here.
 //! * It will be updated in synchrony with the runtime. A Bizinikiwi's offchain application is part
 //!   of the same WASM blob, and is therefore guaranteed to be up to date.
diff --git a/docs/sdk/src/reference_docs/frame_origin.rs b/docs/sdk/src/reference_docs/frame_origin.rs
index 72f20684..7cb91189 100644
--- a/docs/sdk/src/reference_docs/frame_origin.rs
+++ b/docs/sdk/src/reference_docs/frame_origin.rs
@@ -93,13 +93,13 @@
 //! Then, within the pezpallet, we can simply use this "unknown" origin check type:
 #![doc = docify::embed!("./src/reference_docs/frame_origin.rs", external_origin_usage)]
 //!
-//! Finally, at the runtime, any implementation of [`frame::traits::EnsureOrigin`] can be passed.
+//! Finally, at the runtime, any implementation of [`pezframe::traits::EnsureOrigin`] can be passed.
 #![doc = docify::embed!("./src/reference_docs/frame_origin.rs", external_origin_provide)]
 //!
-//! Indeed, some of these implementations of [`frame::traits::EnsureOrigin`] are similar to the ones
-//! that we know about: [`frame::runtime::prelude::EnsureSigned`],
-//! [`frame::runtime::prelude::EnsureSignedBy`], [`frame::runtime::prelude::EnsureRoot`],
-//! [`frame::runtime::prelude::EnsureNone`], etc. But, there are also many more that are not known
+//! Indeed, some of these implementations of [`pezframe::traits::EnsureOrigin`] are similar to the ones
+//! that we know about: [`pezframe::runtime::prelude::EnsureSigned`],
+//! [`pezframe::runtime::prelude::EnsureSignedBy`], [`pezframe::runtime::prelude::EnsureRoot`],
+//! [`pezframe::runtime::prelude::EnsureNone`], etc. But, there are also many more that are not known
 //! to us, and are defined in other pallets.
 //!
 //! For example, [`pezpallet_collective`] defines [`pezpallet_collective::EnsureMember`] and
@@ -107,7 +107,7 @@
 //! alluded to earlier in this document.
 //!
 //! Make sure to check the full list of [implementors of
-//! `EnsureOrigin`](frame::traits::EnsureOrigin#implementors) for more inspiration.
+//! `EnsureOrigin`](pezframe::traits::EnsureOrigin#implementors) for more inspiration.
 //!
 //! ## Obtaining Abstract Origins
 //!
@@ -129,9 +129,9 @@
 //! [^1]: Inherents are essentially unsigned extrinsics that need an [`pezframe_system::ensure_none`]
 //! origin check, and through the virtue of being an inherent, are agreed upon by all validators.
 
-use frame::prelude::*;
+use pezframe::prelude::*;
 
-#[frame::pezpallet(dev_mode)]
+#[pezframe::pezpallet(dev_mode)]
 pub mod pezpallet_for_origin {
 	use super::*;
 
@@ -151,7 +151,7 @@ pub mod pezpallet_for_origin {
 	}
 }
 
-#[frame::pezpallet(dev_mode)]
+#[pezframe::pezpallet(dev_mode)]
 pub mod pezpallet_with_custom_origin {
 	use super::*;
 
@@ -206,7 +206,7 @@ pub mod pezpallet_with_custom_origin {
 
 pub mod runtime_for_origin {
 	use super::pezpallet_with_custom_origin;
-	use frame::{runtime::prelude::*, testing_prelude::*};
+	use pezframe::{runtime::prelude::*, testing_prelude::*};
 
 	#[docify::export(runtime_exp)]
 	construct_runtime!(
@@ -226,7 +226,7 @@ pub mod runtime_for_origin {
 	}
 }
 
-#[frame::pezpallet(dev_mode)]
+#[pezframe::pezpallet(dev_mode)]
 pub mod pezpallet_with_external_origin {
 	use super::*;
 	#[docify::export(external_origin_def)]
@@ -250,7 +250,7 @@ pub mod pezpallet_with_external_origin {
 
 pub mod runtime_for_external_origin {
 	use super::*;
-	use frame::{runtime::prelude::*, testing_prelude::*};
+	use pezframe::{runtime::prelude::*, testing_prelude::*};
 
 	construct_runtime!(
 		pub struct Runtime {
diff --git a/docs/sdk/src/reference_docs/frame_pallet_coupling.rs b/docs/sdk/src/reference_docs/frame_pallet_coupling.rs
index ea3d1eb9..87cc9974 100644
--- a/docs/sdk/src/reference_docs/frame_pallet_coupling.rs
+++ b/docs/sdk/src/reference_docs/frame_pallet_coupling.rs
@@ -3,7 +3,7 @@
 //! This reference document explains how FRAME pallets can be combined to interact together.
 //!
 //! It is suggested to re-read [`crate::pezkuwi_sdk::frame_runtime`], notably the information
-//! around [`frame::pezpallet_macros::config`]. Recall that:
+//! around [`pezframe::pezpallet_macros::config`]. Recall that:
 //!
 //! > Configuration trait of a pezpallet: It allows a pezpallet to receive types at a later
 //! > point from the runtime that wishes to contain it. It allows the pezpallet to be parameterized
@@ -124,8 +124,8 @@
 //! With the above information in context, we can conclude that **`pezframe_system` is a special
 //! pezpallet that is tightly coupled with every other pezpallet**. This is because it provides the
 //! fundamental system functionality that every pezpallet needs, such as some types like
-//! [`frame::prelude::pezframe_system::Config::AccountId`],
-//! [`frame::prelude::pezframe_system::Config::Hash`], and some functionality such as block number,
+//! [`pezframe::prelude::pezframe_system::Config::AccountId`],
+//! [`pezframe::prelude::pezframe_system::Config::Hash`], and some functionality such as block number,
 //! etc.
 //!
 //! ## Recap
@@ -157,10 +157,10 @@
 
 #![allow(unused)]
 
-use frame::prelude::*;
+use pezframe::prelude::*;
 
 #[docify::export]
-#[frame::pezpallet]
+#[pezframe::pezpallet]
 pub mod pezpallet_foo {
 	use super::*;
 
@@ -178,7 +178,7 @@ pub mod pezpallet_foo {
 }
 
 #[docify::export]
-#[frame::pezpallet]
+#[pezframe::pezpallet]
 pub mod pezpallet_author {
 	use super::*;
 
@@ -195,7 +195,7 @@ pub mod pezpallet_author {
 	}
 }
 
-#[frame::pezpallet]
+#[pezframe::pezpallet]
 pub mod pezpallet_foo_tight {
 	use super::*;
 
@@ -224,7 +224,7 @@ pub trait AuthorProvider<AccountId> {
 	fn author() -> AccountId;
 }
 
-#[frame::pezpallet]
+#[pezframe::pezpallet]
 pub mod pezpallet_foo_loose {
 	use super::*;
 
@@ -272,7 +272,7 @@ impl<AccountId> AuthorProvider<AccountId> for () {
 
 pub mod runtime {
 	use super::*;
-	use frame::{runtime::prelude::*, testing_prelude::*};
+	use pezframe::{runtime::prelude::*, testing_prelude::*};
 	use pezcumulus_pezpallet_aura_ext::pezpallet;
 
 	construct_runtime!(
diff --git a/docs/sdk/src/reference_docs/frame_pezpallet_coupling.rs b/docs/sdk/src/reference_docs/frame_pezpallet_coupling.rs
index 274eadf1..4276aa9a 100644
--- a/docs/sdk/src/reference_docs/frame_pezpallet_coupling.rs
+++ b/docs/sdk/src/reference_docs/frame_pezpallet_coupling.rs
@@ -3,7 +3,7 @@
 //! This reference document explains how FRAME pezpallets can be combined to interact together.
 //!
 //! It is suggested to re-read [`crate::pezkuwi_sdk::frame_runtime`], notably the information
-//! around [`frame::pezpallet_macros::config`]. Recall that:
+//! around [`pezframe::pezpallet_macros::config`]. Recall that:
 //!
 //! > Configuration trait of a pezpallet: It allows a pezpallet to receive types at a later
 //! > point from the runtime that wishes to contain it. It allows the pezpallet to be parameterized
@@ -123,8 +123,8 @@
 //! With the above information in context, we can conclude that **`pezframe_system` is a special pezpallet
 //! that is tightly coupled with every other pezpallet**. This is because it provides the fundamental
 //! system functionality that every pezpallet needs, such as some types like
-//! [`frame::prelude::pezframe_system::Config::AccountId`],
-//! [`frame::prelude::pezframe_system::Config::Hash`], and some functionality such as block number,
+//! [`pezframe::prelude::pezframe_system::Config::AccountId`],
+//! [`pezframe::prelude::pezframe_system::Config::Hash`], and some functionality such as block number,
 //! etc.
 //!
 //! ## Recap
@@ -155,10 +155,10 @@
 
 #![allow(unused)]
 
-use frame::prelude::*;
+use pezframe::prelude::*;
 
 #[docify::export]
-#[frame::pezpallet]
+#[pezframe::pezpallet]
 pub mod pezpallet_foo {
 	use super::*;
 
@@ -176,7 +176,7 @@ pub mod pezpallet_foo {
 }
 
 #[docify::export]
-#[frame::pezpallet]
+#[pezframe::pezpallet]
 pub mod pezpallet_author {
 	use super::*;
 
@@ -193,7 +193,7 @@ pub mod pezpallet_author {
 	}
 }
 
-#[frame::pezpallet]
+#[pezframe::pezpallet]
 pub mod pezpallet_foo_tight {
 	use super::*;
 
@@ -221,7 +221,7 @@ pub trait AuthorProvider<AccountId> {
 	fn author() -> AccountId;
 }
 
-#[frame::pezpallet]
+#[pezframe::pezpallet]
 pub mod pezpallet_foo_loose {
 	use super::*;
 
@@ -270,7 +270,7 @@ impl<AccountId> AuthorProvider<AccountId> for () {
 pub mod runtime {
 	use super::*;
 	use pezcumulus_pezpallet_aura_ext::pezpallet;
-	use frame::{runtime::prelude::*, testing_prelude::*};
+	use pezframe::{runtime::prelude::*, testing_prelude::*};
 
 	construct_runtime!(
 		pub struct Runtime {
diff --git a/docs/sdk/src/reference_docs/frame_runtime_types.rs b/docs/sdk/src/reference_docs/frame_runtime_types.rs
index f9af37bc..aadd0c90 100644
--- a/docs/sdk/src/reference_docs/frame_runtime_types.rs
+++ b/docs/sdk/src/reference_docs/frame_runtime_types.rs
@@ -43,7 +43,7 @@
 //! pointer to the `Call` type in each pezpallet, for example [`pezpallet_foo::Call`].
 //!
 //! [`RuntimeOrigin`]'s [`OriginCaller`] has two variants, one for system, and one for
-//! `pezpallet_foo` which utilized [`frame::pezpallet_macros::origin`].
+//! `pezpallet_foo` which utilized [`pezframe::pezpallet_macros::origin`].
 //!
 //! Finally, [`RuntimeGenesisConfig`] is composed of `pezframe_system` and a variant for
 //! `pezpallet_bar`'s [`pezpallet_bar::GenesisConfig`].
@@ -80,7 +80,7 @@
 //! The only way to express this using Rust's associated types is for the pezpallet to **define its
 //! own associated type `RuntimeCall`, and further specify what it thinks `RuntimeCall` should be**.
 //!
-//! In this case, we will want to assert the existence of [`frame::traits::IsSubType`], which is
+//! In this case, we will want to assert the existence of [`pezframe::traits::IsSubType`], which is
 //! very similar to [`TryFrom`].
 #![doc = docify::embed!("./src/reference_docs/frame_runtime_types.rs", custom_runtime_call)]
 //!
@@ -100,7 +100,7 @@
 //! type that is only known when the runtime is being constructed.
 //!
 //! Now, within this pezpallet, this new `RuntimeCall` can be used, and it can use its new trait
-//! bounds, such as being [`frame::traits::IsSubType`]:
+//! bounds, such as being [`pezframe::traits::IsSubType`]:
 #![doc = docify::embed!("./src/reference_docs/frame_runtime_types.rs", custom_runtime_call_usages)]
 //!
 //! > Once Rust's "_Associated Type Bounds RFC_" is usable, this syntax can be used to
@@ -116,9 +116,9 @@
 //! the runtime is constructed? The following snippet exactly does that:
 #![doc = docify::embed!("./src/reference_docs/frame_runtime_types.rs", assert_equality)]
 //!
-//! We leave it to the reader to further explore what [`frame::traits::Hooks::integrity_test`] is,
+//! We leave it to the reader to further explore what [`pezframe::traits::Hooks::integrity_test`] is,
 //! and what [`core::any::TypeId`] is. Another way to assert this is using
-//! [`frame::traits::IsType`].
+//! [`pezframe::traits::IsType`].
 //!
 //! ## Type Aliases
 //!
@@ -128,7 +128,7 @@
 //!   `System`
 //! * [`runtime::AllPalletsWithSystem`] is an alias for a tuple of all of the above. This type is
 //!   important to FRAME internals such as `executive`, as it implements traits such as
-//!   [`frame::traits::Hooks`].
+//!   [`pezframe::traits::Hooks`].
 //!
 //! ## Further Details
 //!
@@ -140,7 +140,7 @@
 //! * See the corresponding lecture in the [PBA Lectures](https://www.youtube.com/watch?v=OCBC1pMYPoc&list=PL-w_i5kwVqbni1Ch2j_RwTIXiB-bwnYqq&index=11).
 //!
 //!
-//! [`construct_runtime`]: frame::runtime::prelude::construct_runtime
+//! [`construct_runtime`]: pezframe::runtime::prelude::construct_runtime
 //! [`runtime::PalletFoo`]: crate::reference_docs::frame_runtime_types::runtime::PalletFoo
 //! [`runtime::AllPalletsWithSystem`]: crate::reference_docs::frame_runtime_types::runtime::AllPalletsWithSystem
 //! [`runtime`]: crate::reference_docs::frame_runtime_types::runtime
@@ -158,10 +158,10 @@
 //! [`RuntimeCall`]: crate::reference_docs::frame_runtime_types::runtime::RuntimeCall
 //! [`RuntimeHoldReason`]: crate::reference_docs::frame_runtime_types::runtime::RuntimeHoldReason
 
-use frame::prelude::*;
+use pezframe::prelude::*;
 
 #[docify::export]
-#[frame::pezpallet(dev_mode)]
+#[pezframe::pezpallet(dev_mode)]
 pub mod pezpallet_foo {
 	use super::*;
 
@@ -201,7 +201,7 @@ pub mod pezpallet_foo {
 }
 
 #[docify::export]
-#[frame::pezpallet(dev_mode)]
+#[pezframe::pezpallet(dev_mode)]
 pub mod pezpallet_bar {
 	use super::*;
 
@@ -232,7 +232,7 @@ pub mod pezpallet_bar {
 
 pub mod runtime {
 	use super::{pezpallet_bar, pezpallet_foo};
-	use frame::{runtime::prelude::*, testing_prelude::*};
+	use pezframe::{runtime::prelude::*, testing_prelude::*};
 
 	#[docify::export(runtime_exp)]
 	construct_runtime!(
@@ -252,10 +252,10 @@ pub mod runtime {
 	impl pezpallet_bar::Config for Runtime {}
 }
 
-#[frame::pezpallet(dev_mode)]
+#[pezframe::pezpallet(dev_mode)]
 pub mod pezpallet_with_specific_runtime_call {
 	use super::*;
-	use frame::traits::IsSubType;
+	use pezframe::traits::IsSubType;
 
 	#[docify::export(custom_runtime_call)]
 	/// A pezpallet that wants to further narrow down what `RuntimeCall` is.
@@ -299,7 +299,7 @@ pub mod pezpallet_with_specific_runtime_call {
 
 pub mod runtime_with_specific_runtime_call {
 	use super::pezpallet_with_specific_runtime_call;
-	use frame::{runtime::prelude::*, testing_prelude::*};
+	use pezframe::{runtime::prelude::*, testing_prelude::*};
 
 	construct_runtime!(
 		pub struct Runtime {
diff --git a/docs/sdk/src/reference_docs/frame_runtime_upgrades_and_migrations.rs b/docs/sdk/src/reference_docs/frame_runtime_upgrades_and_migrations.rs
index 8fef97dd..b8e98e49 100644
--- a/docs/sdk/src/reference_docs/frame_runtime_upgrades_and_migrations.rs
+++ b/docs/sdk/src/reference_docs/frame_runtime_upgrades_and_migrations.rs
@@ -35,7 +35,7 @@
 //! # Migrations
 //!
 //! It is often desirable to define logic to execute immediately after runtime upgrades (see
-//! [this diagram](frame::traits::Hooks)).
+//! [this diagram](pezframe::traits::Hooks)).
 //!
 //! Self-contained pieces of logic that execute after a runtime upgrade are called "Migrations".
 //!
diff --git a/docs/sdk/src/reference_docs/frame_storage_derives.rs b/docs/sdk/src/reference_docs/frame_storage_derives.rs
index f26cf20c..ecf5e0b4 100644
--- a/docs/sdk/src/reference_docs/frame_storage_derives.rs
+++ b/docs/sdk/src/reference_docs/frame_storage_derives.rs
@@ -8,9 +8,9 @@
 //! Let's begin by starting to store a `NewType` in a storage item:
 //!
 //! ```compile_fail
-//! #[frame::pezpallet]
+//! #[pezframe::pezpallet]
 //! pub mod pezpallet {
-//! 	# use frame::prelude::*;
+//! 	# use pezframe::prelude::*;
 //! 	# #[pezpallet::config]
 //! 	# pub trait Config: pezframe_system::Config {}
 //! 	# #[pezpallet::pezpallet]
@@ -25,16 +25,16 @@
 //! This raises a number of compiler errors, like:
 //! ```text
 //! the trait `MaxEncodedLen` is not implemented for `NewType`, which is required by
-//! `frame::prelude::StorageValue<_GeneratedPrefixForStorageSomething<T>, NewType>:
+//! `pezframe::prelude::StorageValue<_GeneratedPrefixForStorageSomething<T>, NewType>:
 //! StorageInfoTrait`
 //! ```
 //!
 //! This implies the following set of traits that need to be derived for a type to be stored in
 //! `frame` storage:
 //! ```rust
-//! #[frame::pezpallet]
+//! #[pezframe::pezpallet]
 //! pub mod pezpallet {
-//! 	# use frame::prelude::*;
+//! 	# use pezframe::prelude::*;
 //! 	# #[pezpallet::config]
 //! 	# pub trait Config: pezframe_system::Config {}
 //! 	# #[pezpallet::pezpallet]
@@ -48,11 +48,11 @@
 //! ```
 //!
 //! Next, let's look at how this will differ if we are to store a type that is derived from `T` in
-//! storage, such as [`frame::prelude::BlockNumberFor`]:
+//! storage, such as [`pezframe::prelude::BlockNumberFor`]:
 //! ```compile_fail
-//! #[frame::pezpallet]
+//! #[pezframe::pezpallet]
 //! pub mod pezpallet {
-//! 	# use frame::prelude::*;
+//! 	# use pezframe::prelude::*;
 //! 	# #[pezpallet::config]
 //! 	# pub trait Config: pezframe_system::Config {}
 //! 	# #[pezpallet::pezpallet]
@@ -84,9 +84,9 @@
 //! attribute to `NewType`. This additional macro will instruct the `derive` to skip the bound on
 //! `T`.
 //! ```rust
-//! #[frame::pezpallet]
+//! #[pezframe::pezpallet]
 //! pub mod pezpallet {
-//! 	# use frame::prelude::*;
+//! 	# use pezframe::prelude::*;
 //! 	# #[pezpallet::config]
 //! 	# pub trait Config: pezframe_system::Config {}
 //! 	# #[pezpallet::pezpallet]
@@ -100,13 +100,13 @@
 //! }
 //! ```
 //!
-//! Next, let's say we wish to store `NewType` as [`frame::prelude::ValueQuery`], which means it
+//! Next, let's say we wish to store `NewType` as [`pezframe::prelude::ValueQuery`], which means it
 //! must also implement `Default`. This should be as simple as adding `derive(Default)` to it,
 //! right?
 //! ```compile_fail
-//! #[frame::pezpallet]
+//! #[pezframe::pezpallet]
 //! pub mod pezpallet {
-//! 	# use frame::prelude::*;
+//! 	# use pezframe::prelude::*;
 //! 	# #[pezpallet::config]
 //! 	# pub trait Config: pezframe_system::Config {}
 //! 	# #[pezpallet::pezpallet]
@@ -129,22 +129,22 @@
 //! To fix this, frame provides a set of macros that are analogous to normal rust derive macros, but
 //! work nicely on top of structs that are generic over `T: Config`. These macros are:
 //!
-//! - [`frame::prelude::DefaultNoBound`]
-//! - [`frame::prelude::DebugNoBound`]
-//! - [`frame::prelude::PartialEqNoBound`]
-//! - [`frame::prelude::EqNoBound`]
-//! - [`frame::prelude::CloneNoBound`]
-//! - [`frame::prelude::PartialOrdNoBound`]
-//! - [`frame::prelude::OrdNoBound`]
+//! - [`pezframe::prelude::DefaultNoBound`]
+//! - [`pezframe::prelude::DebugNoBound`]
+//! - [`pezframe::prelude::PartialEqNoBound`]
+//! - [`pezframe::prelude::EqNoBound`]
+//! - [`pezframe::prelude::CloneNoBound`]
+//! - [`pezframe::prelude::PartialOrdNoBound`]
+//! - [`pezframe::prelude::OrdNoBound`]
 //!
 //! The above traits are almost certainly needed for your tests - to print your type, assert equality
 //! or clone it.
 //!
-//! We can fix the following example by using [`frame::prelude::DefaultNoBound`].
+//! We can fix the following example by using [`pezframe::prelude::DefaultNoBound`].
 //! ```rust
-//! #[frame::pezpallet]
+//! #[pezframe::pezpallet]
 //! pub mod pezpallet {
-//! 	# use frame::prelude::*;
+//! 	# use pezframe::prelude::*;
 //! 	# #[pezpallet::config]
 //! 	# pub trait Config: pezframe_system::Config {}
 //! 	# #[pezpallet::pezpallet]
@@ -167,9 +167,9 @@
 //! Finally, if a custom type that is provided through `Config` is to be stored in the storage, it
 //! is subject to the same trait requirements. The following does not work:
 //! ```compile_fail
-//! #[frame::pezpallet]
+//! #[pezframe::pezpallet]
 //! pub mod pezpallet {
-//! 	use frame::prelude::*;
+//! 	use pezframe::prelude::*;
 //! 	#[pezpallet::config]
 //! 	pub trait Config: pezframe_system::Config {
 //! 		type CustomType;
@@ -183,9 +183,9 @@
 //!
 //! But adding the right trait bounds will fix it.
 //! ```rust
-//! #[frame::pezpallet]
+//! #[pezframe::pezpallet]
 //! pub mod pezpallet {
-//! 	use frame::prelude::*;
+//! 	use pezframe::prelude::*;
 //! 	#[pezpallet::config]
 //! 	pub trait Config: pezframe_system::Config {
 //! 		type CustomType: codec::FullCodec
diff --git a/docs/sdk/src/reference_docs/pezframe_benchmarking_weight.rs b/docs/sdk/src/reference_docs/pezframe_benchmarking_weight.rs
index 8a71aeed..22a0fbc4 100644
--- a/docs/sdk/src/reference_docs/pezframe_benchmarking_weight.rs
+++ b/docs/sdk/src/reference_docs/pezframe_benchmarking_weight.rs
@@ -81,7 +81,7 @@
 #![doc = docify::embed!("src/reference_docs/pezframe_benchmarking_weight.rs", WeightInfo)]
 //!
 //! Then, individual functions of this trait are the final values that we assigned to the
-//! [`frame::pezpallet_macros::weight`] attribute:
+//! [`pezframe::pezpallet_macros::weight`] attribute:
 #![doc = docify::embed!("./src/reference_docs/pezframe_benchmarking_weight.rs", simple_transfer_2)]
 //!
 //! ## Manual Refund
@@ -130,10 +130,10 @@
 //! [PolkaVM]: https://github.com/koute/polkavm
 //! [JAM]: https://graypaper.com
 
-#[frame::pezpallet(dev_mode)]
+#[pezframe::pezpallet(dev_mode)]
 #[allow(unused_variables, unreachable_code, unused, clippy::diverging_sub_expression)]
 pub mod pezpallet {
-	use frame::prelude::*;
+	use pezframe::prelude::*;
 
 	#[docify::export]
 	pub trait WeightInfo {
@@ -202,7 +202,7 @@ pub mod pezpallet {
 				let actual_weight =
 					todo!("this can likely come from another benchmark that is NOT the worst case");
 				let pays_fee = todo!("You can set this to `Pays::Yes` or `Pays::No` to change if this transaction should pay fees");
-				Ok(frame::deps::pezframe_support::dispatch::PostDispatchInfo {
+				Ok(pezframe::deps::pezframe_support::dispatch::PostDispatchInfo {
 					actual_weight: Some(actual_weight),
 					pays_fee,
 				})
diff --git a/docs/sdk/src/reference_docs/trait_based_programming.rs b/docs/sdk/src/reference_docs/trait_based_programming.rs
index 25231583..66f38199 100644
--- a/docs/sdk/src/reference_docs/trait_based_programming.rs
+++ b/docs/sdk/src/reference_docs/trait_based_programming.rs
@@ -7,12 +7,12 @@
 //! The rest of this document assumes familiarity with the
 //! [Rust book's Advanced Traits](https://doc.rust-lang.org/book/ch19-03-advanced-traits.html)
 //! section.
-//! Moreover, we use the [`frame::traits::Get`].
+//! Moreover, we use the [`pezframe::traits::Get`].
 //!
 //! First, imagine we are writing a FRAME pezpallet. We represent this pezpallet with a `struct
 //! Pezpallet`, and this pezpallet wants to implement the functionalities of that pezpallet, for
 //! example a simple `transfer` function. For the sake of education, we are interested in having a
-//! `MinTransfer` amount, expressed as a [`frame::traits::Get`], which will dictate what is the
+//! `MinTransfer` amount, expressed as a [`pezframe::traits::Get`], which will dictate what is the
 //! minimum amount that can be transferred.
 //!
 //! We can foremost write this as simple as the following snippet:
@@ -84,7 +84,7 @@
 //! having individual `trait Configs` declare a shared `trait SystemConfig` as their
 //! [supertrait](https://doc.rust-lang.org/rust-by-example/trait/supertraits.html).
 #![doc = docify::embed!("./src/reference_docs/trait_based_programming.rs", with_system)]
-//! In FRAME, this shared supertrait is [`frame::prelude::pezframe_system`].
+//! In FRAME, this shared supertrait is [`pezframe::prelude::pezframe_system`].
 //!
 //! Notice how this made no difference in the syntax of the rest of the code. `T::AccountId` is
 //! still a valid type, since `T` implements `Config` and `Config` implies `SystemConfig`, which
@@ -103,7 +103,7 @@
 //! length of fully qualified syntax is a common pattern in FRAME.
 //!
 //! The above example is almost identical to the well-known (and somewhat notorious) `type
-//! BalanceOf` that is often used in the context of [`frame::traits::fungible`].
+//! BalanceOf` that is often used in the context of [`pezframe::traits::fungible`].
 #![doc = docify::embed!("../../bizinikiwi/pezframe/fast-unstake/src/types.rs", BalanceOf)]
 //!
 //! ## Additional Resources
@@ -113,15 +113,15 @@
 //! - <https://exchange.pezkuwichain.app/questions/2228/type-casting-to-trait-t-as-config>
 #![allow(unused)]
 
-use frame::traits::Get;
+use pezframe::traits::Get;
 
 #[docify::export]
 mod basic {
 	struct Pezpallet;
 
-	type AccountId = frame::deps::pezsp_runtime::AccountId32;
+	type AccountId = pezframe::deps::pezsp_runtime::AccountId32;
 	type Balance = u128;
-	type MinTransfer = frame::traits::ConstU128<10>;
+	type MinTransfer = pezframe::traits::ConstU128<10>;
 
 	impl Pezpallet {
 		fn transfer(_from: AccountId, _to: AccountId, _amount: Balance) {
@@ -140,8 +140,8 @@ mod generic {
 
 	impl<AccountId, Balance, MinTransfer> Pezpallet<AccountId, Balance, MinTransfer>
 	where
-		Balance: frame::traits::AtLeast32BitUnsigned,
-		MinTransfer: frame::traits::Get<Balance>,
+		Balance: pezframe::traits::AtLeast32BitUnsigned,
+		MinTransfer: pezframe::traits::Get<Balance>,
 		AccountId: From<[u8; 32]>,
 	{
 		fn transfer(_from: AccountId, _to: AccountId, amount: Balance) {
@@ -157,8 +157,8 @@ mod trait_based {
 
 	trait Config {
 		type AccountId: From<[u8; 32]>;
-		type Balance: frame::traits::AtLeast32BitUnsigned;
-		type MinTransfer: frame::traits::Get<Self::Balance>;
+		type Balance: pezframe::traits::AtLeast32BitUnsigned;
+		type MinTransfer: pezframe::traits::Get<Self::Balance>;
 	}
 
 	struct Pezpallet<T: Config>(std::marker::PhantomData<T>);
@@ -179,8 +179,8 @@ mod with_system {
 	}
 
 	pub trait Config: SystemConfig {
-		type Balance: frame::traits::AtLeast32BitUnsigned;
-		type MinTransfer: frame::traits::Get<Self::Balance>;
+		type Balance: pezframe::traits::AtLeast32BitUnsigned;
+		type MinTransfer: pezframe::traits::Get<Self::Balance>;
 	}
 
 	pub struct Pezpallet<T: Config>(std::marker::PhantomData<T>);
@@ -205,7 +205,7 @@ mod fully_qualified_complicated {
 	use super::with_system::*;
 
 	trait CurrencyTrait {
-		type Balance: frame::traits::AtLeast32BitUnsigned;
+		type Balance: pezframe::traits::AtLeast32BitUnsigned;
 		fn more_stuff() {}
 	}
 
diff --git a/pezbridges/bin/runtime-common/Cargo.toml b/pezbridges/bin/runtime-common/Cargo.toml
index c6425b38..97c1dbee 100644
--- a/pezbridges/bin/runtime-common/Cargo.toml
+++ b/pezbridges/bin/runtime-common/Cargo.toml
@@ -20,11 +20,11 @@ tracing = { workspace = true }
 tuplex = { workspace = true }
 
 # Bridge dependencies
-bp-header-pez-chain = { workspace = true }
-bp-messages = { workspace = true }
-bp-pezkuwi-core = { workspace = true }
-bp-relayers = { workspace = true }
-bp-teyrchains = { workspace = true }
+pezbp-header-pez-chain = { workspace = true }
+pezbp-messages = { workspace = true }
+pezbp-pezkuwi-core = { workspace = true }
+pezbp-relayers = { workspace = true }
+pezbp-teyrchains = { workspace = true }
 pezbp-runtime = { workspace = true }
 pezpallet-bridge-grandpa = { workspace = true }
 pezpallet-bridge-messages = { workspace = true }
@@ -46,7 +46,7 @@ pezsp-weights = { workspace = true }
 xcm = { workspace = true }
 
 [dev-dependencies]
-bp-test-utils = { workspace = true }
+pezbp-test-utils = { workspace = true }
 pezpallet-balances = { workspace = true, default-features = true }
 pezpallet-bridge-messages = { features = [
 	"std",
@@ -57,12 +57,12 @@ pezsp-core = { workspace = true, default-features = true }
 [features]
 default = ["std"]
 std = [
-	"bp-header-pez-chain/std",
-	"bp-messages/std",
-	"bp-pezkuwi-core/std",
-	"bp-relayers/std",
-	"bp-test-utils/std",
-	"bp-teyrchains/std",
+	"pezbp-header-pez-chain/std",
+	"pezbp-messages/std",
+	"pezbp-pezkuwi-core/std",
+	"pezbp-relayers/std",
+	"pezbp-test-utils/std",
+	"pezbp-teyrchains/std",
 	"codec/std",
 	"pezbp-runtime/std",
 	"pezframe-support/std",
@@ -84,12 +84,12 @@ std = [
 	"xcm/std",
 ]
 runtime-benchmarks = [
-	"bp-header-pez-chain/runtime-benchmarks",
-	"bp-messages/runtime-benchmarks",
-	"bp-pezkuwi-core/runtime-benchmarks",
-	"bp-relayers/runtime-benchmarks",
-	"bp-test-utils/runtime-benchmarks",
-	"bp-teyrchains/runtime-benchmarks",
+	"pezbp-header-pez-chain/runtime-benchmarks",
+	"pezbp-messages/runtime-benchmarks",
+	"pezbp-pezkuwi-core/runtime-benchmarks",
+	"pezbp-relayers/runtime-benchmarks",
+	"pezbp-test-utils/runtime-benchmarks",
+	"pezbp-teyrchains/runtime-benchmarks",
 	"pezbp-runtime/runtime-benchmarks",
 	"pezbp-runtime/test-helpers",
 	"pezframe-support/runtime-benchmarks",
diff --git a/pezbridges/bin/runtime-common/src/extensions.rs b/pezbridges/bin/runtime-common/src/extensions.rs
index 4cb67884..0706aa7c 100644
--- a/pezbridges/bin/runtime-common/src/extensions.rs
+++ b/pezbridges/bin/runtime-common/src/extensions.rs
@@ -18,8 +18,8 @@
 //! obsolete (duplicated) data or do not pass some additional pezpallet-specific
 //! checks.
 
-use bp_relayers::ExplicitOrAccountParams;
-use bp_teyrchains::SubmitTeyrchainHeadsInfo;
+use pezbp_relayers::ExplicitOrAccountParams;
+use pezbp_teyrchains::SubmitTeyrchainHeadsInfo;
 use pezbp_runtime::Teyrchain;
 use pezpallet_bridge_grandpa::{
 	BridgedBlockNumber, CallSubType as GrandpaCallSubType, SubmitFinalityProofHelper,
@@ -377,12 +377,12 @@ macro_rules! generate_bridge_reject_obsolete_headers_and_messages {
 mod tests {
 	use super::*;
 	use crate::mock::*;
-	use bp_header_pez_chain::StoredHeaderDataBuilder;
-	use bp_messages::{InboundLaneData, MessageNonce, OutboundLaneData};
-	use bp_pezkuwi_core::teyrchains::{ParaHeadsProof, ParaId};
-	use bp_relayers::{RewardsAccountOwner, RewardsAccountParams};
-	use bp_test_utils::{make_default_justification, test_keyring, TEST_GRANDPA_SET_ID};
-	use bp_teyrchains::{BestParaHeadHash, ParaInfo};
+	use pezbp_header_pez_chain::StoredHeaderDataBuilder;
+	use pezbp_messages::{InboundLaneData, MessageNonce, OutboundLaneData};
+	use pezbp_pezkuwi_core::teyrchains::{ParaHeadsProof, ParaId};
+	use pezbp_relayers::{RewardsAccountOwner, RewardsAccountParams};
+	use pezbp_test_utils::{make_default_justification, test_keyring, TEST_GRANDPA_SET_ID};
+	use pezbp_teyrchains::{BestParaHeadHash, ParaInfo};
 	use codec::{Decode, Encode, MaxEncodedLen};
 	use pezbp_runtime::HeaderId;
 	use pezframe_support::{assert_err, assert_ok, traits::fungible::Mutate};
@@ -541,7 +541,7 @@ mod tests {
 		pezpallet_bridge_grandpa::BestFinalized::<TestRuntime>::put(best_relay_header);
 		pezpallet_bridge_grandpa::ImportedHeaders::<TestRuntime>::insert(
 			best_relay_header.hash(),
-			bp_test_utils::test_header::<BridgedChainHeader>(0).build(),
+			pezbp_test_utils::test_header::<BridgedChainHeader>(0).build(),
 		);
 
 		let para_id = ParaId(BridgedUnderlyingTeyrchain::TEYRCHAIN_ID);
diff --git a/pezbridges/bin/runtime-common/src/integrity.rs b/pezbridges/bin/runtime-common/src/integrity.rs
index a5ac872d..bf8634d7 100644
--- a/pezbridges/bin/runtime-common/src/integrity.rs
+++ b/pezbridges/bin/runtime-common/src/integrity.rs
@@ -19,8 +19,8 @@
 //! Most of the tests in this module assume that the bridge is using standard (see `crate::messages`
 //! module for details) configuration.
 
-use bp_header_pez_chain::ChainWithGrandpa;
-use bp_messages::{ChainWithMessages, InboundLaneData, MessageNonce};
+use pezbp_header_pez_chain::ChainWithGrandpa;
+use pezbp_messages::{ChainWithMessages, InboundLaneData, MessageNonce};
 use codec::Encode;
 use pezbp_runtime::{AccountIdOf, Chain};
 use pezframe_support::{storage::generator::StorageValue, traits::Get, weights::Weight};
@@ -69,7 +69,7 @@ macro_rules! assert_bridge_messages_pallet_types(
 	) => {
 		{
 			use $crate::integrity::__private::static_assertions::assert_type_eq_all;
-			use bp_messages::ChainWithMessages;
+			use pezbp_messages::ChainWithMessages;
 			use pezbp_runtime::Chain;
 			use pezpallet_bridge_messages::Config as BridgeMessagesConfig;
 
diff --git a/pezbridges/bin/runtime-common/src/messages_api.rs b/pezbridges/bin/runtime-common/src/messages_api.rs
index 17930805..5d8d2bea 100644
--- a/pezbridges/bin/runtime-common/src/messages_api.rs
+++ b/pezbridges/bin/runtime-common/src/messages_api.rs
@@ -16,7 +16,7 @@
 
 //! Helpers for implementing various message-related runtime API methods.
 
-use bp_messages::{InboundMessageDetails, MessageNonce, MessagePayload, OutboundMessageDetails};
+use pezbp_messages::{InboundMessageDetails, MessageNonce, MessagePayload, OutboundMessageDetails};
 use pezsp_std::vec::Vec;
 
 /// Implementation of the `To*OutboundLaneApi::message_details`.
diff --git a/pezbridges/bin/runtime-common/src/messages_benchmarking.rs b/pezbridges/bin/runtime-common/src/messages_benchmarking.rs
index eb6fe4fc..d894fe65 100644
--- a/pezbridges/bin/runtime-common/src/messages_benchmarking.rs
+++ b/pezbridges/bin/runtime-common/src/messages_benchmarking.rs
@@ -19,11 +19,11 @@
 
 #![cfg(feature = "runtime-benchmarks")]
 
-use bp_messages::{
+use pezbp_messages::{
 	source_chain::FromBridgedChainMessagesDeliveryProof,
 	target_chain::FromBridgedChainMessagesProof, MessagePayload,
 };
-use bp_pezkuwi_core::teyrchains::ParaHash;
+use pezbp_pezkuwi_core::teyrchains::ParaHash;
 use codec::Encode;
 use pezbp_runtime::{AccountIdOf, Chain, HashOf, Teyrchain};
 use pezframe_support::weights::Weight;
diff --git a/pezbridges/bin/runtime-common/src/mock.rs b/pezbridges/bin/runtime-common/src/mock.rs
index 39a82385..4519abf8 100644
--- a/pezbridges/bin/runtime-common/src/mock.rs
+++ b/pezbridges/bin/runtime-common/src/mock.rs
@@ -20,13 +20,13 @@
 #![cfg(test)]
 #![allow(dead_code)]
 
-use bp_header_pez_chain::ChainWithGrandpa;
-use bp_messages::{
+use pezbp_header_pez_chain::ChainWithGrandpa;
+use pezbp_messages::{
 	target_chain::{DispatchMessage, MessageDispatch},
 	ChainWithMessages, HashedLaneId, LaneIdType, MessageNonce,
 };
-use bp_relayers::{PayRewardFromAccount, RewardsAccountParams};
-use bp_teyrchains::SingleParaStoredHeaderDataBuilder;
+use pezbp_relayers::{PayRewardFromAccount, RewardsAccountParams};
+use pezbp_teyrchains::SingleParaStoredHeaderDataBuilder;
 use codec::Encode;
 use pezbp_runtime::{messages::MessageDispatchResult, Chain, ChainId, Teyrchain};
 use pezframe_support::{
diff --git a/pezbridges/bin/runtime-common/src/teyrchains_benchmarking.rs b/pezbridges/bin/runtime-common/src/teyrchains_benchmarking.rs
index 1ca6c9df..056820b6 100644
--- a/pezbridges/bin/runtime-common/src/teyrchains_benchmarking.rs
+++ b/pezbridges/bin/runtime-common/src/teyrchains_benchmarking.rs
@@ -20,8 +20,8 @@
 
 use crate::messages_benchmarking::insert_header_to_grandpa_pallet;
 
-use bp_pezkuwi_core::teyrchains::{ParaHash, ParaHead, ParaHeadsProof, ParaId};
-use bp_teyrchains::{
+use pezbp_pezkuwi_core::teyrchains::{ParaHash, ParaHead, ParaHeadsProof, ParaId};
+use pezbp_teyrchains::{
 	teyrchain_head_storage_key_at_source, RelayBlockHash, RelayBlockHasher, RelayBlockNumber,
 };
 use codec::Encode;
diff --git a/pezbridges/chains/chain-pezcumulus/Cargo.toml b/pezbridges/chains/chain-pezcumulus/Cargo.toml
index 5ed7ec1d..c72e89ac 100644
--- a/pezbridges/chains/chain-pezcumulus/Cargo.toml
+++ b/pezbridges/chains/chain-pezcumulus/Cargo.toml
@@ -1,5 +1,5 @@
 [package]
-name = "bp-bridge-hub-pezcumulus"
+name = "pezbp-bridge-hub-pezcumulus"
 description = "Primitives for BridgeHub teyrchain runtimes."
 version = "0.7.0"
 authors.workspace = true
@@ -17,8 +17,8 @@ workspace = true
 
 [dependencies]
 # Bridge Dependencies
-bp-messages = { workspace = true }
-bp-pezkuwi-core = { workspace = true }
+pezbp-messages = { workspace = true }
+pezbp-pezkuwi-core = { workspace = true }
 pezbp-runtime = { workspace = true }
 
 # Bizinikiwi Based Dependencies
@@ -34,8 +34,8 @@ pezkuwi-primitives = { workspace = true }
 [features]
 default = ["std"]
 std = [
-	"bp-messages/std",
-	"bp-pezkuwi-core/std",
+	"pezbp-messages/std",
+	"pezbp-pezkuwi-core/std",
 	"pezbp-runtime/std",
 	"pezframe-support/std",
 	"pezframe-system/std",
@@ -45,8 +45,8 @@ std = [
 	"teyrchains-common/std",
 ]
 runtime-benchmarks = [
-	"bp-messages/runtime-benchmarks",
-	"bp-pezkuwi-core/runtime-benchmarks",
+	"pezbp-messages/runtime-benchmarks",
+	"pezbp-pezkuwi-core/runtime-benchmarks",
 	"pezbp-runtime/runtime-benchmarks",
 	"pezframe-support/runtime-benchmarks",
 	"pezframe-system/runtime-benchmarks",
diff --git a/pezbridges/chains/chain-pezcumulus/src/lib.rs b/pezbridges/chains/chain-pezcumulus/src/lib.rs
index 6e6d2218..98f6f580 100644
--- a/pezbridges/chains/chain-pezcumulus/src/lib.rs
+++ b/pezbridges/chains/chain-pezcumulus/src/lib.rs
@@ -19,7 +19,7 @@
 #![warn(missing_docs)]
 #![cfg_attr(not(feature = "std"), no_std)]
 
-pub use bp_pezkuwi_core::{
+pub use pezbp_pezkuwi_core::{
 	AccountId, AccountInfoStorageMapKeyProvider, AccountPublic, Balance, BlockNumber, Hash, Hasher,
 	Hashing, Header, Nonce, Perbill, Signature, SignedBlock, UncheckedExtrinsic,
 	EXTRA_STORAGE_PROOF_SIZE, TX_EXTRA_BYTES,
@@ -30,8 +30,8 @@ pub use teyrchains_common::{
 	NORMAL_DISPATCH_RATIO, SLOT_DURATION,
 };
 
-use bp_messages::*;
-use bp_pezkuwi_core::SuffixedCommonTransactionExtension;
+use pezbp_messages::*;
+use pezbp_pezkuwi_core::SuffixedCommonTransactionExtension;
 use pezbp_runtime::extensions::{
 	BridgeRejectObsoleteHeadersAndMessages, RefundBridgedTeyrchainMessagesSchema,
 };
diff --git a/pezbridges/chains/chain-pezkuwi-bulletin/Cargo.toml b/pezbridges/chains/chain-pezkuwi-bulletin/Cargo.toml
index 5709de9d..e29ee37d 100644
--- a/pezbridges/chains/chain-pezkuwi-bulletin/Cargo.toml
+++ b/pezbridges/chains/chain-pezkuwi-bulletin/Cargo.toml
@@ -1,5 +1,5 @@
 [package]
-name = "bp-pezkuwi-bulletin"
+name = "pezbp-pezkuwi-bulletin"
 description = "Primitives of Pezkuwi Bulletin chain runtime."
 version = "0.4.0"
 authors.workspace = true
@@ -20,9 +20,9 @@ codec = { features = ["derive"], workspace = true }
 scale-info = { features = ["derive"], workspace = true }
 
 # Bridge Dependencies
-bp-header-pez-chain = { workspace = true }
-bp-messages = { workspace = true }
-bp-pezkuwi-core = { workspace = true }
+pezbp-header-pez-chain = { workspace = true }
+pezbp-messages = { workspace = true }
+pezbp-pezkuwi-core = { workspace = true }
 pezbp-runtime = { workspace = true }
 
 # Bizinikiwi Based Dependencies
@@ -35,9 +35,9 @@ pezsp-std = { workspace = true }
 [features]
 default = ["std"]
 std = [
-	"bp-header-pez-chain/std",
-	"bp-messages/std",
-	"bp-pezkuwi-core/std",
+	"pezbp-header-pez-chain/std",
+	"pezbp-messages/std",
+	"pezbp-pezkuwi-core/std",
 	"codec/std",
 	"pezbp-runtime/std",
 	"pezframe-support/std",
@@ -48,9 +48,9 @@ std = [
 	"scale-info/std",
 ]
 runtime-benchmarks = [
-	"bp-header-pez-chain/runtime-benchmarks",
-	"bp-messages/runtime-benchmarks",
-	"bp-pezkuwi-core/runtime-benchmarks",
+	"pezbp-header-pez-chain/runtime-benchmarks",
+	"pezbp-messages/runtime-benchmarks",
+	"pezbp-pezkuwi-core/runtime-benchmarks",
 	"pezbp-runtime/runtime-benchmarks",
 	"pezframe-support/runtime-benchmarks",
 	"pezframe-system/runtime-benchmarks",
diff --git a/pezbridges/chains/chain-pezkuwi-bulletin/src/lib.rs b/pezbridges/chains/chain-pezkuwi-bulletin/src/lib.rs
index 2f544059..b0bd2f6b 100644
--- a/pezbridges/chains/chain-pezkuwi-bulletin/src/lib.rs
+++ b/pezbridges/chains/chain-pezkuwi-bulletin/src/lib.rs
@@ -19,8 +19,8 @@
 #![warn(missing_docs)]
 #![cfg_attr(not(feature = "std"), no_std)]
 
-use bp_header_pez_chain::ChainWithGrandpa;
-use bp_messages::{ChainWithMessages, MessageNonce};
+use pezbp_header_pez_chain::ChainWithGrandpa;
+use pezbp_messages::{ChainWithMessages, MessageNonce};
 use codec::{Decode, DecodeWithMemTracking, Encode};
 use pezbp_runtime::{
 	decl_bridge_finality_runtime_apis, decl_bridge_messages_runtime_apis,
@@ -43,7 +43,7 @@ use pezsp_runtime::{
 use scale_info::TypeInfo;
 
 // This chain reuses most of Pezkuwi primitives.
-pub use bp_pezkuwi_core::{
+pub use pezbp_pezkuwi_core::{
 	AccountAddress, AccountId, Balance, Block, BlockNumber, Hash, Hasher, Header, Nonce, Signature,
 	SignedBlock, UncheckedExtrinsic, AVERAGE_HEADER_SIZE, EXTRA_STORAGE_PROOF_SIZE,
 	MAX_MANDATORY_HEADER_SIZE, REASONABLE_HEADERS_IN_JUSTIFICATION_ANCESTRY,
@@ -225,4 +225,4 @@ impl ChainWithMessages for PezkuwiBulletin {
 }
 
 decl_bridge_finality_runtime_apis!(pezkuwi_bulletin, grandpa);
-decl_bridge_messages_runtime_apis!(pezkuwi_bulletin, bp_messages::LegacyLaneId);
+decl_bridge_messages_runtime_apis!(pezkuwi_bulletin, pezbp_messages::LegacyLaneId);
diff --git a/pezbridges/modules/beefy/Cargo.toml b/pezbridges/modules/beefy/Cargo.toml
index 33a45ecc..a5c3b177 100644
--- a/pezbridges/modules/beefy/Cargo.toml
+++ b/pezbridges/modules/beefy/Cargo.toml
@@ -20,7 +20,7 @@ serde = { optional = true, workspace = true }
 tracing = { workspace = true }
 
 # Bridge Dependencies
-bp-beefy = { workspace = true }
+pezbp-beefy = { workspace = true }
 pezbp-runtime = { workspace = true }
 
 # Bizinikiwi Dependencies
@@ -31,7 +31,7 @@ pezsp-runtime = { workspace = true }
 pezsp-std = { workspace = true }
 
 [dev-dependencies]
-bp-test-utils = { workspace = true, default-features = true }
+pezbp-test-utils = { workspace = true, default-features = true }
 mmr-lib = { workspace = true, default-features = true }
 pezpallet-beefy-mmr = { workspace = true, default-features = true }
 pezpallet-mmr = { workspace = true, default-features = true }
@@ -42,7 +42,7 @@ rand = { workspace = true, default-features = true }
 [features]
 default = ["std"]
 std = [
-	"bp-beefy/std",
+	"pezbp-beefy/std",
 	"codec/std",
 	"pezbp-runtime/std",
 	"pezframe-support/std",
@@ -62,8 +62,8 @@ try-runtime = [
 	"pezsp-runtime/try-runtime",
 ]
 runtime-benchmarks = [
-	"bp-beefy/runtime-benchmarks",
-	"bp-test-utils/runtime-benchmarks",
+	"pezbp-beefy/runtime-benchmarks",
+	"pezbp-test-utils/runtime-benchmarks",
 	"pezbp-runtime/runtime-benchmarks",
 	"pezframe-support/runtime-benchmarks",
 	"pezframe-system/runtime-benchmarks",
diff --git a/pezbridges/modules/beefy/src/lib.rs b/pezbridges/modules/beefy/src/lib.rs
index 37d980d4..d6d65f92 100644
--- a/pezbridges/modules/beefy/src/lib.rs
+++ b/pezbridges/modules/beefy/src/lib.rs
@@ -32,7 +32,7 @@
 #![warn(missing_docs)]
 #![cfg_attr(not(feature = "std"), no_std)]
 
-use bp_beefy::{ChainWithBeefy, InitializationData};
+use pezbp_beefy::{ChainWithBeefy, InitializationData};
 use pezsp_std::{boxed::Box, prelude::*};
 
 // Re-export in crate namespace for `construct_runtime!`
@@ -57,29 +57,29 @@ pub type BridgedBlockHash<T, I> = pezbp_runtime::HashOf<BridgedChain<T, I>>;
 
 /// Pezpallet initialization data.
 pub type InitializationDataOf<T, I> =
-	InitializationData<BridgedBlockNumber<T, I>, bp_beefy::MmrHashOf<BridgedChain<T, I>>>;
+	InitializationData<BridgedBlockNumber<T, I>, pezbp_beefy::MmrHashOf<BridgedChain<T, I>>>;
 /// BEEFY commitment hasher, used by configured bridged chain.
-pub type BridgedBeefyCommitmentHasher<T, I> = bp_beefy::BeefyCommitmentHasher<BridgedChain<T, I>>;
+pub type BridgedBeefyCommitmentHasher<T, I> = pezbp_beefy::BeefyCommitmentHasher<BridgedChain<T, I>>;
 /// BEEFY validator id, used by configured bridged chain.
-pub type BridgedBeefyAuthorityId<T, I> = bp_beefy::BeefyAuthorityIdOf<BridgedChain<T, I>>;
+pub type BridgedBeefyAuthorityId<T, I> = pezbp_beefy::BeefyAuthorityIdOf<BridgedChain<T, I>>;
 /// BEEFY validator set, used by configured bridged chain.
-pub type BridgedBeefyAuthoritySet<T, I> = bp_beefy::BeefyAuthoritySetOf<BridgedChain<T, I>>;
+pub type BridgedBeefyAuthoritySet<T, I> = pezbp_beefy::BeefyAuthoritySetOf<BridgedChain<T, I>>;
 /// BEEFY authority set, used by configured bridged chain.
-pub type BridgedBeefyAuthoritySetInfo<T, I> = bp_beefy::BeefyAuthoritySetInfoOf<BridgedChain<T, I>>;
+pub type BridgedBeefyAuthoritySetInfo<T, I> = pezbp_beefy::BeefyAuthoritySetInfoOf<BridgedChain<T, I>>;
 /// BEEFY signed commitment, used by configured bridged chain.
-pub type BridgedBeefySignedCommitment<T, I> = bp_beefy::BeefySignedCommitmentOf<BridgedChain<T, I>>;
+pub type BridgedBeefySignedCommitment<T, I> = pezbp_beefy::BeefySignedCommitmentOf<BridgedChain<T, I>>;
 /// MMR hashing algorithm, used by configured bridged chain.
-pub type BridgedMmrHashing<T, I> = bp_beefy::MmrHashingOf<BridgedChain<T, I>>;
+pub type BridgedMmrHashing<T, I> = pezbp_beefy::MmrHashingOf<BridgedChain<T, I>>;
 /// MMR hashing output type of `BridgedMmrHashing<T, I>`.
-pub type BridgedMmrHash<T, I> = bp_beefy::MmrHashOf<BridgedChain<T, I>>;
+pub type BridgedMmrHash<T, I> = pezbp_beefy::MmrHashOf<BridgedChain<T, I>>;
 /// The type of the MMR leaf extra data used by the configured bridged chain.
-pub type BridgedBeefyMmrLeafExtra<T, I> = bp_beefy::BeefyMmrLeafExtraOf<BridgedChain<T, I>>;
+pub type BridgedBeefyMmrLeafExtra<T, I> = pezbp_beefy::BeefyMmrLeafExtraOf<BridgedChain<T, I>>;
 /// BEEFY MMR proof type used by the pezpallet
-pub type BridgedMmrProof<T, I> = bp_beefy::MmrProofOf<BridgedChain<T, I>>;
+pub type BridgedMmrProof<T, I> = pezbp_beefy::MmrProofOf<BridgedChain<T, I>>;
 /// MMR leaf type, used by configured bridged chain.
-pub type BridgedBeefyMmrLeaf<T, I> = bp_beefy::BeefyMmrLeafOf<BridgedChain<T, I>>;
+pub type BridgedBeefyMmrLeaf<T, I> = pezbp_beefy::BeefyMmrLeafOf<BridgedChain<T, I>>;
 /// Imported commitment data, stored by the pezpallet.
-pub type ImportedCommitment<T, I> = bp_beefy::ImportedCommitment<
+pub type ImportedCommitment<T, I> = pezbp_beefy::ImportedCommitment<
 	BridgedBlockNumber<T, I>,
 	BridgedBlockHash<T, I>,
 	BridgedMmrHash<T, I>,
@@ -415,7 +415,7 @@ pub mod pezpallet {
 #[cfg(test)]
 mod tests {
 	use super::*;
-	use bp_test_utils::generate_owned_bridge_module_tests;
+	use pezbp_test_utils::generate_owned_bridge_module_tests;
 	use mock::*;
 	use mock_chain::*;
 	use pezbp_runtime::{BasicOperatingMode, OwnedBridgeModuleError};
@@ -565,7 +565,7 @@ mod tests {
 			let imported_commitment = ImportedCommitments::<TestRuntime>::get(58).unwrap();
 			assert_eq!(
 				imported_commitment,
-				bp_beefy::ImportedCommitment {
+				pezbp_beefy::ImportedCommitment {
 					parent_number_and_hash: (57, chain.header(57).header.hash()),
 					mmr_root: chain.header(58).mmr_root,
 				},
diff --git a/pezbridges/modules/beefy/src/mock.rs b/pezbridges/modules/beefy/src/mock.rs
index e88a012d..0307a852 100644
--- a/pezbridges/modules/beefy/src/mock.rs
+++ b/pezbridges/modules/beefy/src/mock.rs
@@ -21,7 +21,7 @@ use crate::{
 	BridgedMmrHash, BridgedMmrHashing, BridgedMmrProof,
 };
 
-use bp_beefy::{BeefyValidatorSignatureOf, ChainWithBeefy, Commitment, MmrDataOrHash};
+use pezbp_beefy::{BeefyValidatorSignatureOf, ChainWithBeefy, Commitment, MmrDataOrHash};
 use codec::Encode;
 use pezbp_runtime::{BasicOperatingMode, Chain, ChainId};
 use pezframe_support::{construct_runtime, derive_impl, weights::Weight};
@@ -126,7 +126,7 @@ pub fn run_test_with_initialize<T>(initial_validators_count: u32, test: impl FnO
 
 		crate::Pezpallet::<TestRuntime>::initialize(
 			RuntimeOrigin::root(),
-			bp_beefy::InitializationData {
+			pezbp_beefy::InitializationData {
 				operating_mode: BasicOperatingMode::Normal,
 				best_block_number: 0,
 				authority_set,
diff --git a/pezbridges/modules/beefy/src/mock_chain.rs b/pezbridges/modules/beefy/src/mock_chain.rs
index c06c0361..f7fe6758 100644
--- a/pezbridges/modules/beefy/src/mock_chain.rs
+++ b/pezbridges/modules/beefy/src/mock_chain.rs
@@ -26,7 +26,7 @@ use crate::{
 	utils::get_authorities_mmr_root,
 };
 
-use bp_beefy::{BeefyPayload, Commitment, ValidatorSetId, MMR_ROOT_PAYLOAD_ID};
+use pezbp_beefy::{BeefyPayload, Commitment, ValidatorSetId, MMR_ROOT_PAYLOAD_ID};
 use codec::Encode;
 use pezpallet_mmr::NodeIndex;
 use pezsp_consensus_beefy::mmr::{BeefyNextAuthoritySet, MmrLeafVersion};
diff --git a/pezbridges/modules/beefy/src/utils.rs b/pezbridges/modules/beefy/src/utils.rs
index ea51a81c..a50633d3 100644
--- a/pezbridges/modules/beefy/src/utils.rs
+++ b/pezbridges/modules/beefy/src/utils.rs
@@ -3,7 +3,7 @@ use crate::{
 	BridgedBeefyMmrLeaf, BridgedBeefySignedCommitment, BridgedChain, BridgedMmrHash,
 	BridgedMmrHashing, BridgedMmrProof, Config, Error, LOG_TARGET,
 };
-use bp_beefy::{merkle_root, verify_mmr_leaves_proof, BeefyAuthorityId, MmrDataOrHash};
+use pezbp_beefy::{merkle_root, verify_mmr_leaves_proof, BeefyAuthorityId, MmrDataOrHash};
 use codec::Encode;
 use pezframe_support::ensure;
 use pezsp_runtime::traits::{Convert, Hash};
@@ -12,7 +12,7 @@ use pezsp_std::{vec, vec::Vec};
 type BridgedMmrDataOrHash<T, I> = MmrDataOrHash<BridgedMmrHashing<T, I>, BridgedBeefyMmrLeaf<T, I>>;
 /// A way to encode validator id to the BEEFY merkle tree leaf.
 type BridgedBeefyAuthorityIdToMerkleLeaf<T, I> =
-	bp_beefy::BeefyAuthorityIdToMerkleLeafOf<BridgedChain<T, I>>;
+	pezbp_beefy::BeefyAuthorityIdToMerkleLeafOf<BridgedChain<T, I>>;
 
 /// Get the MMR root for a collection of validators.
 pub(crate) fn get_authorities_mmr_root<
@@ -100,7 +100,7 @@ fn extract_mmr_root<T: Config<I>, I: 'static>(
 	commitment
 		.commitment
 		.payload
-		.get_decoded(&bp_beefy::MMR_ROOT_PAYLOAD_ID)
+		.get_decoded(&pezbp_beefy::MMR_ROOT_PAYLOAD_ID)
 		.ok_or(Error::MmrRootMissingFromCommitment)
 }
 
@@ -160,7 +160,7 @@ pub(crate) fn verify_beefy_mmr_leaf<T: Config<I>, I: 'static>(
 mod tests {
 	use super::*;
 	use crate::{mock::*, mock_chain::*, *};
-	use bp_beefy::{BeefyPayload, MMR_ROOT_PAYLOAD_ID};
+	use pezbp_beefy::{BeefyPayload, MMR_ROOT_PAYLOAD_ID};
 	use pezframe_support::{assert_noop, assert_ok};
 	use pezsp_consensus_beefy::ValidatorSet;
 
@@ -350,7 +350,7 @@ mod tests {
 			assert_eq!(CurrentAuthoritySetInfo::<TestRuntime>::get().len, 30);
 			assert_eq!(
 				ImportedCommitments::<TestRuntime>::get(1).unwrap(),
-				bp_beefy::ImportedCommitment {
+				pezbp_beefy::ImportedCommitment {
 					parent_number_and_hash: (0, [0; 32].into()),
 					mmr_root: header.mmr_root,
 				},
diff --git a/pezbridges/modules/grandpa/Cargo.toml b/pezbridges/modules/grandpa/Cargo.toml
index f781ec91..0dda1353 100644
--- a/pezbridges/modules/grandpa/Cargo.toml
+++ b/pezbridges/modules/grandpa/Cargo.toml
@@ -20,7 +20,7 @@ scale-info = { features = ["derive"], workspace = true }
 tracing = { workspace = true }
 
 # Bridge Dependencies
-bp-header-pez-chain = { workspace = true }
+pezbp-header-pez-chain = { workspace = true }
 pezbp-runtime = { workspace = true }
 
 # Bizinikiwi Dependencies
@@ -31,7 +31,7 @@ pezsp-runtime = { features = ["serde"], workspace = true }
 pezsp-std = { workspace = true }
 
 # Optional Benchmarking Dependencies
-bp-test-utils = { optional = true, workspace = true }
+pezbp-test-utils = { optional = true, workspace = true }
 pezframe-benchmarking = { optional = true, workspace = true }
 
 [dev-dependencies]
@@ -42,8 +42,8 @@ pezsp-io = { workspace = true, default-features = true }
 [features]
 default = ["std"]
 std = [
-	"bp-header-pez-chain/std",
-	"bp-test-utils/std",
+	"pezbp-header-pez-chain/std",
+	"pezbp-test-utils/std",
 	"codec/std",
 	"pezbp-runtime/std",
 	"pezframe-benchmarking/std",
@@ -56,9 +56,9 @@ std = [
 	"tracing/std",
 ]
 runtime-benchmarks = [
-	"bp-header-pez-chain/runtime-benchmarks",
-	"bp-test-utils",
-	"bp-test-utils?/runtime-benchmarks",
+	"pezbp-header-pez-chain/runtime-benchmarks",
+	"pezbp-test-utils",
+	"pezbp-test-utils?/runtime-benchmarks",
 	"pezbp-runtime/runtime-benchmarks",
 	"pezframe-benchmarking/runtime-benchmarks",
 	"pezframe-support/runtime-benchmarks",
diff --git a/pezbridges/modules/grandpa/src/benchmarking.rs b/pezbridges/modules/grandpa/src/benchmarking.rs
index 585030ef..67d5560d 100644
--- a/pezbridges/modules/grandpa/src/benchmarking.rs
+++ b/pezbridges/modules/grandpa/src/benchmarking.rs
@@ -42,8 +42,8 @@
 
 use crate::*;
 
-use bp_header_pez_chain::justification::required_justification_precommits;
-use bp_test_utils::{
+use pezbp_header_pez_chain::justification::required_justification_precommits;
+use pezbp_test_utils::{
 	accounts, make_justification_for_header, JustificationGeneratorParams, TEST_GRANDPA_ROUND,
 	TEST_GRANDPA_SET_ID,
 };
@@ -92,7 +92,7 @@ fn prepare_benchmark_data<T: Config<I>, I: 'static>(
 		.map(|id| (AuthorityId::from(*id), 1))
 		.collect::<Vec<_>>();
 
-	let genesis_header: BridgedHeader<T, I> = bp_test_utils::test_header(Zero::zero());
+	let genesis_header: BridgedHeader<T, I> = pezbp_test_utils::test_header(Zero::zero());
 	let genesis_hash = genesis_header.hash();
 	let init_data = InitializationData {
 		header: Box::new(genesis_header),
@@ -104,7 +104,7 @@ fn prepare_benchmark_data<T: Config<I>, I: 'static>(
 	bootstrap_bridge::<T, I>(init_data);
 	assert!(<ImportedHeaders<T, I>>::contains_key(genesis_hash));
 
-	let header: BridgedHeader<T, I> = bp_test_utils::test_header(One::one());
+	let header: BridgedHeader<T, I> = pezbp_test_utils::test_header(One::one());
 	let params = JustificationGeneratorParams {
 		header: header.clone(),
 		round: TEST_GRANDPA_ROUND,
@@ -127,8 +127,8 @@ benchmarks_instance_pallet! {
 		let (header, justification) = prepare_benchmark_data::<T, I>(p, v);
 	}: submit_finality_proof(RawOrigin::Signed(caller), Box::new(header), justification)
 	verify {
-		let genesis_header: BridgedHeader<T, I> = bp_test_utils::test_header(Zero::zero());
-		let header: BridgedHeader<T, I> = bp_test_utils::test_header(One::one());
+		let genesis_header: BridgedHeader<T, I> = pezbp_test_utils::test_header(Zero::zero());
+		let header: BridgedHeader<T, I> = pezbp_test_utils::test_header(One::one());
 		let expected_hash = header.hash();
 
 		// check that the header#1 has been inserted
diff --git a/pezbridges/modules/grandpa/src/call_ext.rs b/pezbridges/modules/grandpa/src/call_ext.rs
index e1b5d86c..4d5c3f6a 100644
--- a/pezbridges/modules/grandpa/src/call_ext.rs
+++ b/pezbridges/modules/grandpa/src/call_ext.rs
@@ -18,7 +18,7 @@ use crate::{
 	weights::WeightInfo, BestFinalized, BridgedBlockNumber, BridgedHeader, Config,
 	CurrentAuthoritySet, Error, FreeHeadersRemaining, Pezpallet,
 };
-use bp_header_pez_chain::{
+use pezbp_header_pez_chain::{
 	justification::GrandpaJustification, submit_finality_proof_limits_extras,
 	SubmitFinalityProofInfo,
 };
@@ -308,8 +308,8 @@ mod tests {
 		BestFinalized, Config, CurrentAuthoritySet, FreeHeadersRemaining, PalletOperatingMode,
 		StoredAuthoritySet, WeightInfo,
 	};
-	use bp_header_pez_chain::{ChainWithGrandpa, SubmitFinalityProofInfo};
-	use bp_test_utils::{
+	use pezbp_header_pez_chain::{ChainWithGrandpa, SubmitFinalityProofInfo};
+	use pezbp_test_utils::{
 		make_default_justification, make_justification_for_header, JustificationGeneratorParams,
 		TEST_GRANDPA_SET_ID,
 	};
@@ -522,7 +522,7 @@ mod tests {
 			let consensus_log =
 				pezsp_consensus_grandpa::ConsensusLog::<TestNumber>::ScheduledChange(
 					pezsp_consensus_grandpa::ScheduledChange {
-						next_authorities: bp_test_utils::authority_list(),
+						next_authorities: pezbp_test_utils::authority_list(),
 						delay: 0,
 					},
 				);
diff --git a/pezbridges/modules/grandpa/src/lib.rs b/pezbridges/modules/grandpa/src/lib.rs
index ad3425da..9990631c 100644
--- a/pezbridges/modules/grandpa/src/lib.rs
+++ b/pezbridges/modules/grandpa/src/lib.rs
@@ -38,7 +38,7 @@
 
 pub use storage_types::StoredAuthoritySet;
 
-use bp_header_pez_chain::{
+use pezbp_header_pez_chain::{
 	justification::GrandpaJustification, AuthoritySet, ChainWithGrandpa, GrandpaConsensusLogReader,
 	HeaderChain, InitializationData, StoredHeaderData, StoredHeaderDataBuilder,
 	StoredHeaderGrandpaInfo,
@@ -680,9 +680,9 @@ pub mod pezpallet {
 		justification: &GrandpaJustification<BridgedHeader<T, I>>,
 		hash: BridgedBlockHash<T, I>,
 		number: BridgedBlockNumber<T, I>,
-		authority_set: bp_header_pez_chain::AuthoritySet,
+		authority_set: pezbp_header_pez_chain::AuthoritySet,
 	) -> Result<(), pezsp_runtime::DispatchError> {
-		use bp_header_pez_chain::justification::verify_justification;
+		use pezbp_header_pez_chain::justification::verify_justification;
 
 		Ok(verify_justification::<BridgedHeader<T, I>>(
 			(hash, number),
@@ -838,8 +838,8 @@ mod tests {
 		run_test, test_header, FreeHeadersInterval, RuntimeEvent as TestEvent, RuntimeOrigin,
 		System, TestBridgedChain, TestHeader, TestNumber, TestRuntime, MAX_BRIDGED_AUTHORITIES,
 	};
-	use bp_header_pez_chain::BridgeGrandpaCall;
-	use bp_test_utils::{
+	use pezbp_header_pez_chain::BridgeGrandpaCall;
+	use pezbp_test_utils::{
 		authority_list, generate_owned_bridge_module_tests, make_default_justification,
 		make_justification_for_header, JustificationGeneratorParams, ALICE, BOB,
 		TEST_GRANDPA_SET_ID,
@@ -1456,7 +1456,7 @@ mod tests {
 					Default::default(),
 				)
 				.map(|_| ()),
-				bp_header_pez_chain::HeaderChainError::UnknownHeader,
+				pezbp_header_pez_chain::HeaderChainError::UnknownHeader,
 			);
 		});
 	}
@@ -1671,17 +1671,17 @@ mod tests {
 	fn storage_keys_computed_properly() {
 		assert_eq!(
 			PalletOperatingMode::<TestRuntime>::storage_value_final_key().to_vec(),
-			bp_header_pez_chain::storage_keys::pezpallet_operating_mode_key("Grandpa").0,
+			pezbp_header_pez_chain::storage_keys::pezpallet_operating_mode_key("Grandpa").0,
 		);
 
 		assert_eq!(
 			CurrentAuthoritySet::<TestRuntime>::storage_value_final_key().to_vec(),
-			bp_header_pez_chain::storage_keys::current_authority_set_key("Grandpa").0,
+			pezbp_header_pez_chain::storage_keys::current_authority_set_key("Grandpa").0,
 		);
 
 		assert_eq!(
 			BestFinalized::<TestRuntime>::storage_value_final_key().to_vec(),
-			bp_header_pez_chain::storage_keys::best_finalized_key("Grandpa").0,
+			pezbp_header_pez_chain::storage_keys::best_finalized_key("Grandpa").0,
 		);
 	}
 
diff --git a/pezbridges/modules/grandpa/src/mock.rs b/pezbridges/modules/grandpa/src/mock.rs
index b11c12b0..abaac480 100644
--- a/pezbridges/modules/grandpa/src/mock.rs
+++ b/pezbridges/modules/grandpa/src/mock.rs
@@ -17,7 +17,7 @@
 // From construct_runtime macro
 #![allow(clippy::from_over_into)]
 
-use bp_header_pez_chain::ChainWithGrandpa;
+use pezbp_header_pez_chain::ChainWithGrandpa;
 use pezbp_runtime::{Chain, ChainId};
 use pezframe_support::{
 	construct_runtime, derive_impl, parameter_types, pezsp_runtime::StateVersion, traits::Hooks,
@@ -113,5 +113,5 @@ pub fn run_test<T>(test: impl FnOnce() -> T) -> T {
 /// Return test header with given number.
 pub fn test_header(num: TestNumber) -> TestHeader {
 	// We wrap the call to avoid explicit type annotations in our tests
-	bp_test_utils::test_header(num)
+	pezbp_test_utils::test_header(num)
 }
diff --git a/pezbridges/modules/grandpa/src/storage_types.rs b/pezbridges/modules/grandpa/src/storage_types.rs
index 041d3844..d81d8d96 100644
--- a/pezbridges/modules/grandpa/src/storage_types.rs
+++ b/pezbridges/modules/grandpa/src/storage_types.rs
@@ -18,7 +18,7 @@
 
 use crate::{Config, Error};
 
-use bp_header_pez_chain::{AuthoritySet, ChainWithGrandpa};
+use pezbp_header_pez_chain::{AuthoritySet, ChainWithGrandpa};
 use codec::{Decode, Encode, MaxEncodedLen};
 use pezframe_support::{traits::Get, BoundedVec, CloneNoBound, RuntimeDebugNoBound};
 use pezsp_consensus_grandpa::{AuthorityId, AuthorityList, AuthorityWeight, SetId};
@@ -100,7 +100,7 @@ impl<T: Config<I>, I: 'static> From<StoredAuthoritySet<T, I>> for AuthoritySet {
 #[cfg(test)]
 mod tests {
 	use crate::mock::{TestRuntime, MAX_BRIDGED_AUTHORITIES};
-	use bp_test_utils::authority_list;
+	use pezbp_test_utils::authority_list;
 
 	type StoredAuthoritySet = super::StoredAuthoritySet<TestRuntime, ()>;
 
diff --git a/pezbridges/modules/messages/Cargo.toml b/pezbridges/modules/messages/Cargo.toml
index b6c4ce9e..fd23f8a0 100644
--- a/pezbridges/modules/messages/Cargo.toml
+++ b/pezbridges/modules/messages/Cargo.toml
@@ -18,8 +18,8 @@ scale-info = { features = ["derive"], workspace = true }
 tracing = { workspace = true }
 
 # Bridge dependencies
-bp-header-pez-chain = { workspace = true }
-bp-messages = { workspace = true }
+pezbp-header-pez-chain = { workspace = true }
+pezbp-messages = { workspace = true }
 pezbp-runtime = { workspace = true }
 
 # Bizinikiwi Dependencies
@@ -31,7 +31,7 @@ pezsp-std = { workspace = true }
 pezsp-trie = { optional = true, workspace = true }
 
 [dev-dependencies]
-bp-test-utils = { workspace = true }
+pezbp-test-utils = { workspace = true }
 pezbp-runtime = { features = ["test-helpers"], workspace = true }
 pezpallet-balances = { workspace = true }
 pezpallet-bridge-grandpa = { workspace = true }
@@ -41,9 +41,9 @@ pezsp-io = { workspace = true }
 [features]
 default = ["std"]
 std = [
-	"bp-header-pez-chain/std",
-	"bp-messages/std",
-	"bp-test-utils/std",
+	"pezbp-header-pez-chain/std",
+	"pezbp-messages/std",
+	"pezbp-test-utils/std",
 	"codec/std",
 	"pezbp-runtime/std",
 	"pezframe-benchmarking/std",
@@ -60,9 +60,9 @@ std = [
 	"tracing/std",
 ]
 runtime-benchmarks = [
-	"bp-header-pez-chain/runtime-benchmarks",
-	"bp-messages/runtime-benchmarks",
-	"bp-test-utils/runtime-benchmarks",
+	"pezbp-header-pez-chain/runtime-benchmarks",
+	"pezbp-messages/runtime-benchmarks",
+	"pezbp-test-utils/runtime-benchmarks",
 	"pezbp-runtime/runtime-benchmarks",
 	"pezbp-runtime/test-helpers",
 	"pezframe-benchmarking/runtime-benchmarks",
diff --git a/pezbridges/modules/messages/src/benchmarking.rs b/pezbridges/modules/messages/src/benchmarking.rs
index e512f920..6c4d81bc 100644
--- a/pezbridges/modules/messages/src/benchmarking.rs
+++ b/pezbridges/modules/messages/src/benchmarking.rs
@@ -23,7 +23,7 @@ use crate::{
 	InboundLanes, OutboundLanes,
 };
 
-use bp_messages::{
+use pezbp_messages::{
 	source_chain::FromBridgedChainMessagesDeliveryProof,
 	target_chain::FromBridgedChainMessagesProof, ChainWithMessages, DeliveredMessages,
 	InboundLaneData, LaneState, MessageNonce, OutboundLaneData, UnrewardedRelayer,
diff --git a/pezbridges/modules/messages/src/call_ext.rs b/pezbridges/modules/messages/src/call_ext.rs
index cbfe42d1..048e692e 100644
--- a/pezbridges/modules/messages/src/call_ext.rs
+++ b/pezbridges/modules/messages/src/call_ext.rs
@@ -18,7 +18,7 @@
 
 use crate::{BridgedChainOf, Config, InboundLanes, OutboundLanes, Pezpallet, LOG_TARGET};
 
-use bp_messages::{
+use pezbp_messages::{
 	target_chain::MessageDispatch, BaseMessagesProofInfo, ChainWithMessages, InboundLaneData,
 	MessageNonce, MessagesCallInfo, ReceiveMessagesDeliveryProofInfo, ReceiveMessagesProofInfo,
 	UnrewardedRelayerOccupation,
@@ -248,7 +248,7 @@ fn unrewarded_relayers_occupation<T: Config<I>, I: 'static>(
 mod tests {
 	use super::*;
 	use crate::tests::mock::*;
-	use bp_messages::{
+	use pezbp_messages::{
 		source_chain::FromBridgedChainMessagesDeliveryProof,
 		target_chain::FromBridgedChainMessagesProof, DeliveredMessages, InboundLaneData, LaneState,
 		OutboundLaneData, UnrewardedRelayer, UnrewardedRelayersState,
@@ -281,7 +281,7 @@ mod tests {
 	fn deliver_message_10() {
 		InboundLanes::<TestRuntime>::insert(
 			test_lane_id(),
-			bp_messages::InboundLaneData {
+			pezbp_messages::InboundLaneData {
 				state: LaneState::Opened,
 				relayers: Default::default(),
 				last_confirmed_nonce: 10,
@@ -290,8 +290,8 @@ mod tests {
 	}
 
 	fn validate_message_delivery(
-		nonces_start: bp_messages::MessageNonce,
-		nonces_end: bp_messages::MessageNonce,
+		nonces_start: pezbp_messages::MessageNonce,
+		nonces_end: pezbp_messages::MessageNonce,
 	) -> bool {
 		RuntimeCall::Messages(crate::Call::<TestRuntime, ()>::receive_messages_proof {
 			relayer_id_at_bridged_chain: 42,
@@ -413,7 +413,7 @@ mod tests {
 	fn confirm_message_10() {
 		OutboundLanes::<TestRuntime>::insert(
 			test_lane_id(),
-			bp_messages::OutboundLaneData {
+			pezbp_messages::OutboundLaneData {
 				state: LaneState::Opened,
 				oldest_unpruned_nonce: 0,
 				latest_received_nonce: 10,
@@ -422,7 +422,7 @@ mod tests {
 		);
 	}
 
-	fn validate_message_confirmation(last_delivered_nonce: bp_messages::MessageNonce) -> bool {
+	fn validate_message_confirmation(last_delivered_nonce: pezbp_messages::MessageNonce) -> bool {
 		RuntimeCall::Messages(crate::Call::<TestRuntime>::receive_messages_delivery_proof {
 			proof: FromBridgedChainMessagesDeliveryProof {
 				bridged_header_hash: Default::default(),
diff --git a/pezbridges/modules/messages/src/inbound_lane.rs b/pezbridges/modules/messages/src/inbound_lane.rs
index 9d50caa9..53f7f949 100644
--- a/pezbridges/modules/messages/src/inbound_lane.rs
+++ b/pezbridges/modules/messages/src/inbound_lane.rs
@@ -18,7 +18,7 @@
 
 use crate::{BridgedChainOf, Config};
 
-use bp_messages::{
+use pezbp_messages::{
 	target_chain::{DispatchMessage, DispatchMessageData, MessageDispatch},
 	ChainWithMessages, DeliveredMessages, InboundLaneData, LaneState, MessageKey, MessageNonce,
 	OutboundLaneData, ReceptionResult, UnrewardedRelayer,
@@ -238,7 +238,7 @@ impl<S: InboundLaneStorage> InboundLane<S> {
 mod tests {
 	use super::*;
 	use crate::{active_inbound_lane, lanes_manager::RuntimeInboundLaneStorage, tests::mock::*};
-	use bp_messages::UnrewardedRelayersState;
+	use pezbp_messages::UnrewardedRelayersState;
 
 	fn receive_regular_message(
 		lane: &mut InboundLane<RuntimeInboundLaneStorage<TestRuntime, ()>>,
diff --git a/pezbridges/modules/messages/src/lanes_manager.rs b/pezbridges/modules/messages/src/lanes_manager.rs
index e7e477d4..968e6b3a 100644
--- a/pezbridges/modules/messages/src/lanes_manager.rs
+++ b/pezbridges/modules/messages/src/lanes_manager.rs
@@ -20,7 +20,7 @@ use crate::{
 	StoredMessagePayload,
 };
 
-use bp_messages::{
+use pezbp_messages::{
 	target_chain::MessageDispatch, ChainWithMessages, InboundLaneData, LaneState, MessageKey,
 	MessageNonce, OutboundLaneData,
 };
diff --git a/pezbridges/modules/messages/src/lib.rs b/pezbridges/modules/messages/src/lib.rs
index b7f78295..2004ea03 100644
--- a/pezbridges/modules/messages/src/lib.rs
+++ b/pezbridges/modules/messages/src/lib.rs
@@ -50,8 +50,8 @@ pub use weights_ext::{
 	EXPECTED_DEFAULT_MESSAGE_LENGTH, EXTRA_STORAGE_PROOF_SIZE,
 };
 
-use bp_header_pez_chain::HeaderChain;
-use bp_messages::{
+use pezbp_header_pez_chain::HeaderChain;
+use pezbp_messages::{
 	source_chain::{
 		DeliveryConfirmationPayments, FromBridgedChainMessagesDeliveryProof, OnMessagesDelivered,
 		SendMessageArtifacts,
@@ -97,7 +97,7 @@ pub const LOG_TARGET: &str = "runtime::bridge-messages";
 #[pezframe_support::pezpallet]
 pub mod pezpallet {
 	use super::*;
-	use bp_messages::{LaneIdType, ReceivedMessages, ReceptionResult};
+	use pezbp_messages::{LaneIdType, ReceivedMessages, ReceptionResult};
 	use pezbp_runtime::RangeInclusiveExt;
 	use pezframe_support::pezpallet_prelude::*;
 	use pezframe_system::pezpallet_prelude::*;
@@ -677,7 +677,7 @@ pub struct SendMessageArgs<T: Config<I>, I: 'static> {
 	payload: StoredMessagePayload<T, I>,
 }
 
-impl<T, I> bp_messages::source_chain::MessagesBridge<T::OutboundPayload, T::LaneId>
+impl<T, I> pezbp_messages::source_chain::MessagesBridge<T::OutboundPayload, T::LaneId>
 	for Pezpallet<T, I>
 where
 	T: Config<I>,
diff --git a/pezbridges/modules/messages/src/migration.rs b/pezbridges/modules/messages/src/migration.rs
index a5806dd5..5899c20b 100644
--- a/pezbridges/modules/messages/src/migration.rs
+++ b/pezbridges/modules/messages/src/migration.rs
@@ -30,7 +30,7 @@ pub const STORAGE_VERSION: StorageVersion = StorageVersion::new(1);
 pub mod v0 {
 	use super::Config;
 	use crate::BridgedChainOf;
-	use bp_messages::{MessageNonce, UnrewardedRelayer};
+	use pezbp_messages::{MessageNonce, UnrewardedRelayer};
 	use codec::{Decode, Encode};
 	use pezbp_runtime::AccountIdOf;
 	use pezsp_std::collections::vec_deque::VecDeque;
@@ -59,7 +59,7 @@ pub mod v1 {
 	use crate::{
 		InboundLaneData, InboundLanes, OutboundLaneData, OutboundLanes, StoredInboundLaneData,
 	};
-	use bp_messages::LaneState;
+	use pezbp_messages::LaneState;
 	use pezframe_support::traits::UncheckedOnRuntimeUpgrade;
 	use pezsp_std::marker::PhantomData;
 
diff --git a/pezbridges/modules/messages/src/outbound_lane.rs b/pezbridges/modules/messages/src/outbound_lane.rs
index 652dc7f8..22b6ab53 100644
--- a/pezbridges/modules/messages/src/outbound_lane.rs
+++ b/pezbridges/modules/messages/src/outbound_lane.rs
@@ -18,7 +18,7 @@
 
 use crate::{Config, LOG_TARGET};
 
-use bp_messages::{
+use pezbp_messages::{
 	ChainWithMessages, DeliveredMessages, LaneState, MessageNonce, OutboundLaneData,
 	UnrewardedRelayer,
 };
diff --git a/pezbridges/modules/messages/src/proofs.rs b/pezbridges/modules/messages/src/proofs.rs
index 82b6e5a7..4c2fe66c 100644
--- a/pezbridges/modules/messages/src/proofs.rs
+++ b/pezbridges/modules/messages/src/proofs.rs
@@ -18,8 +18,8 @@
 
 use crate::{BridgedChainOf, BridgedHeaderChainOf, Config};
 
-use bp_header_pez_chain::{HeaderChain, HeaderChainError};
-use bp_messages::{
+use pezbp_header_pez_chain::{HeaderChain, HeaderChainError};
+use pezbp_messages::{
 	source_chain::FromBridgedChainMessagesDeliveryProof,
 	target_chain::{FromBridgedChainMessagesProof, ProvedLaneMessages, ProvedMessages},
 	ChainWithMessages, InboundLaneData, Message, MessageKey, MessageNonce, MessagePayload,
@@ -114,7 +114,7 @@ pub fn verify_messages_delivery_proof<T: Config<I>, I: 'static>(
 		.map_err(VerificationError::HeaderChain)?;
 	// Messages delivery proof is just proof of single storage key read => any error
 	// is fatal.
-	let storage_inbound_lane_data_key = bp_messages::storage_keys::inbound_lane_data_key(
+	let storage_inbound_lane_data_key = pezbp_messages::storage_keys::inbound_lane_data_key(
 		T::ThisChain::WITH_CHAIN_MESSAGES_PALLET_NAME,
 		&lane,
 	);
@@ -145,7 +145,7 @@ trait StorageProofAdapter<T: Config<I>, I: 'static> {
 		&mut self,
 		lane_id: &T::LaneId,
 	) -> Result<Option<OutboundLaneData>, StorageProofError> {
-		let storage_outbound_lane_data_key = bp_messages::storage_keys::outbound_lane_data_key(
+		let storage_outbound_lane_data_key = pezbp_messages::storage_keys::outbound_lane_data_key(
 			T::ThisChain::WITH_CHAIN_MESSAGES_PALLET_NAME,
 			lane_id,
 		);
@@ -156,7 +156,7 @@ trait StorageProofAdapter<T: Config<I>, I: 'static> {
 		&mut self,
 		message_key: &MessageKey<T::LaneId>,
 	) -> Result<MessagePayload, StorageProofError> {
-		let storage_message_key = bp_messages::storage_keys::message_key(
+		let storage_message_key = pezbp_messages::storage_keys::message_key(
 			T::ThisChain::WITH_CHAIN_MESSAGES_PALLET_NAME,
 			&message_key.lane_id,
 			message_key.nonce,
@@ -216,8 +216,8 @@ mod tests {
 		mock::*,
 	};
 
-	use bp_header_pez_chain::{HeaderChainError, StoredHeaderDataBuilder};
-	use bp_messages::LaneState;
+	use pezbp_header_pez_chain::{HeaderChainError, StoredHeaderDataBuilder};
+	use pezbp_messages::LaneState;
 	use codec::Encode;
 	use pezbp_runtime::{HeaderId, StorageProofError};
 	use pezsp_runtime::traits::Header;
diff --git a/pezbridges/modules/messages/src/tests/messages_generation.rs b/pezbridges/modules/messages/src/tests/messages_generation.rs
index 4527a8c6..6f35f743 100644
--- a/pezbridges/modules/messages/src/tests/messages_generation.rs
+++ b/pezbridges/modules/messages/src/tests/messages_generation.rs
@@ -16,7 +16,7 @@
 
 //! Helpers for generating message storage proofs, that are used by tests and by benchmarks.
 
-use bp_messages::{
+use pezbp_messages::{
 	storage_keys, ChainWithMessages, InboundLaneData, MessageKey, MessageNonce, MessagePayload,
 	OutboundLaneData,
 };
diff --git a/pezbridges/modules/messages/src/tests/mock.rs b/pezbridges/modules/messages/src/tests/mock.rs
index cdb16fc3..3e197ec9 100644
--- a/pezbridges/modules/messages/src/tests/mock.rs
+++ b/pezbridges/modules/messages/src/tests/mock.rs
@@ -25,8 +25,8 @@ use crate::{
 	Config, StoredMessagePayload,
 };
 
-use bp_header_pez_chain::{ChainWithGrandpa, StoredHeaderData};
-use bp_messages::{
+use pezbp_header_pez_chain::{ChainWithGrandpa, StoredHeaderData};
+use pezbp_messages::{
 	calc_relayers_rewards,
 	source_chain::{
 		DeliveryConfirmationPayments, FromBridgedChainMessagesDeliveryProof, OnMessagesDelivered,
diff --git a/pezbridges/modules/messages/src/tests/pezpallet_tests.rs b/pezbridges/modules/messages/src/tests/pezpallet_tests.rs
index b3cf34fa..141438e4 100644
--- a/pezbridges/modules/messages/src/tests/pezpallet_tests.rs
+++ b/pezbridges/modules/messages/src/tests/pezpallet_tests.rs
@@ -26,7 +26,7 @@ use crate::{
 	PalletOperatingMode, PalletOwner, Pezpallet, StoredInboundLaneData,
 };
 
-use bp_messages::{
+use pezbp_messages::{
 	source_chain::{FromBridgedChainMessagesDeliveryProof, MessagesBridge},
 	target_chain::{FromBridgedChainMessagesProof, MessageDispatch},
 	BridgeMessagesCall, ChainWithMessages, DeliveredMessages, InboundLaneData,
@@ -34,7 +34,7 @@ use bp_messages::{
 	OutboundLaneData, OutboundMessageDetails, UnrewardedRelayer, UnrewardedRelayersState,
 	VerificationError,
 };
-use bp_test_utils::generate_owned_bridge_module_tests;
+use pezbp_test_utils::generate_owned_bridge_module_tests;
 use codec::Encode;
 use pezbp_runtime::{BasicOperatingMode, PreComputedSize, RangeInclusiveExt, Size};
 use pezframe_support::{
@@ -976,7 +976,7 @@ fn receive_messages_delivery_proof_rejects_proof_if_trying_to_confirm_more_messa
 fn storage_keys_computed_properly() {
 	assert_eq!(
 		PalletOperatingMode::<TestRuntime>::storage_value_final_key().to_vec(),
-		bp_messages::storage_keys::operating_mode_key("Messages").0,
+		pezbp_messages::storage_keys::operating_mode_key("Messages").0,
 	);
 
 	assert_eq!(
@@ -984,17 +984,17 @@ fn storage_keys_computed_properly() {
 			lane_id: test_lane_id(),
 			nonce: 42
 		}),
-		bp_messages::storage_keys::message_key("Messages", &test_lane_id(), 42).0,
+		pezbp_messages::storage_keys::message_key("Messages", &test_lane_id(), 42).0,
 	);
 
 	assert_eq!(
 		OutboundLanes::<TestRuntime>::storage_map_final_key(test_lane_id()),
-		bp_messages::storage_keys::outbound_lane_data_key("Messages", &test_lane_id()).0,
+		pezbp_messages::storage_keys::outbound_lane_data_key("Messages", &test_lane_id()).0,
 	);
 
 	assert_eq!(
 		InboundLanes::<TestRuntime>::storage_map_final_key(test_lane_id()),
-		bp_messages::storage_keys::inbound_lane_data_key("Messages", &test_lane_id()).0,
+		pezbp_messages::storage_keys::inbound_lane_data_key("Messages", &test_lane_id()).0,
 	);
 }
 
diff --git a/pezbridges/modules/messages/src/weights_ext.rs b/pezbridges/modules/messages/src/weights_ext.rs
index ee881f7a..101c0339 100644
--- a/pezbridges/modules/messages/src/weights_ext.rs
+++ b/pezbridges/modules/messages/src/weights_ext.rs
@@ -18,7 +18,7 @@
 
 use crate::weights::WeightInfo;
 
-use bp_messages::{MessageNonce, UnrewardedRelayersState};
+use pezbp_messages::{MessageNonce, UnrewardedRelayersState};
 use pezbp_runtime::{PreComputedSize, Size};
 use pezframe_support::weights::Weight;
 
diff --git a/pezbridges/modules/relayers/Cargo.toml b/pezbridges/modules/relayers/Cargo.toml
index 5d46c063..9793aed7 100644
--- a/pezbridges/modules/relayers/Cargo.toml
+++ b/pezbridges/modules/relayers/Cargo.toml
@@ -18,9 +18,9 @@ scale-info = { features = ["derive"], workspace = true }
 tracing = { workspace = true }
 
 # Bridge dependencies
-bp-header-pez-chain = { workspace = true }
-bp-messages = { workspace = true }
-bp-relayers = { workspace = true }
+pezbp-header-pez-chain = { workspace = true }
+pezbp-messages = { workspace = true }
+pezbp-relayers = { workspace = true }
 pezbp-runtime = { workspace = true }
 pezpallet-bridge-grandpa = { workspace = true }
 pezpallet-bridge-messages = { workspace = true }
@@ -35,9 +35,9 @@ pezsp-arithmetic = { workspace = true }
 pezsp-runtime = { workspace = true }
 
 [dev-dependencies]
-bp-pezkuwi-core = { workspace = true }
-bp-test-utils = { workspace = true }
-bp-teyrchains = { workspace = true }
+pezbp-pezkuwi-core = { workspace = true }
+pezbp-test-utils = { workspace = true }
+pezbp-teyrchains = { workspace = true }
 pezpallet-balances = { workspace = true, default-features = true }
 pezpallet-utility = { workspace = true }
 pezsp-core = { workspace = true }
@@ -46,12 +46,12 @@ pezsp-io = { workspace = true }
 [features]
 default = ["std"]
 std = [
-	"bp-header-pez-chain/std",
-	"bp-messages/std",
-	"bp-pezkuwi-core/std",
-	"bp-relayers/std",
-	"bp-test-utils/std",
-	"bp-teyrchains/std",
+	"pezbp-header-pez-chain/std",
+	"pezbp-messages/std",
+	"pezbp-pezkuwi-core/std",
+	"pezbp-relayers/std",
+	"pezbp-test-utils/std",
+	"pezbp-teyrchains/std",
 	"codec/std",
 	"pezbp-runtime/std",
 	"pezframe-benchmarking/std",
@@ -70,12 +70,12 @@ std = [
 	"tracing/std",
 ]
 runtime-benchmarks = [
-	"bp-header-pez-chain/runtime-benchmarks",
-	"bp-messages/runtime-benchmarks",
-	"bp-pezkuwi-core/runtime-benchmarks",
-	"bp-relayers/runtime-benchmarks",
-	"bp-test-utils/runtime-benchmarks",
-	"bp-teyrchains/runtime-benchmarks",
+	"pezbp-header-pez-chain/runtime-benchmarks",
+	"pezbp-messages/runtime-benchmarks",
+	"pezbp-pezkuwi-core/runtime-benchmarks",
+	"pezbp-relayers/runtime-benchmarks",
+	"pezbp-test-utils/runtime-benchmarks",
+	"pezbp-teyrchains/runtime-benchmarks",
 	"pezbp-runtime/runtime-benchmarks",
 	"pezframe-benchmarking/runtime-benchmarks",
 	"pezframe-support/runtime-benchmarks",
diff --git a/pezbridges/modules/relayers/src/benchmarking.rs b/pezbridges/modules/relayers/src/benchmarking.rs
index c3a43a9d..10e81582 100644
--- a/pezbridges/modules/relayers/src/benchmarking.rs
+++ b/pezbridges/modules/relayers/src/benchmarking.rs
@@ -171,7 +171,7 @@ mod benchmarks {
 		{
 			crate::Pezpallet::<T, I>::slash_and_deregister(
 				&relayer,
-				bp_relayers::ExplicitOrAccountParams::Explicit::<_, ()>(slash_destination),
+				pezbp_relayers::ExplicitOrAccountParams::Explicit::<_, ()>(slash_destination),
 			);
 		}
 
diff --git a/pezbridges/modules/relayers/src/extension/grandpa_adapter.rs b/pezbridges/modules/relayers/src/extension/grandpa_adapter.rs
index 5b482d82..0bfbc5e2 100644
--- a/pezbridges/modules/relayers/src/extension/grandpa_adapter.rs
+++ b/pezbridges/modules/relayers/src/extension/grandpa_adapter.rs
@@ -21,7 +21,7 @@ use crate::{
 	extension::verify_messages_call_succeeded, Config as BridgeRelayersConfig, LOG_TARGET,
 };
 
-use bp_relayers::{BatchCallUnpacker, ExtensionCallData, ExtensionCallInfo, ExtensionConfig};
+use pezbp_relayers::{BatchCallUnpacker, ExtensionCallData, ExtensionCallInfo, ExtensionConfig};
 use core::marker::PhantomData;
 use pezbp_runtime::{Chain, StaticStrProvider};
 use pezframe_support::dispatch::{DispatchInfo, PostDispatchInfo};
diff --git a/pezbridges/modules/relayers/src/extension/messages_adapter.rs b/pezbridges/modules/relayers/src/extension/messages_adapter.rs
index 9994b426..8d0efc44 100644
--- a/pezbridges/modules/relayers/src/extension/messages_adapter.rs
+++ b/pezbridges/modules/relayers/src/extension/messages_adapter.rs
@@ -19,7 +19,7 @@
 
 use crate::{extension::verify_messages_call_succeeded, Config as BridgeRelayersConfig};
 
-use bp_relayers::{ExtensionCallData, ExtensionCallInfo, ExtensionConfig};
+use pezbp_relayers::{ExtensionCallData, ExtensionCallInfo, ExtensionConfig};
 use core::marker::PhantomData;
 use pezbp_runtime::StaticStrProvider;
 use pezframe_support::dispatch::{DispatchInfo, PostDispatchInfo};
diff --git a/pezbridges/modules/relayers/src/extension/mod.rs b/pezbridges/modules/relayers/src/extension/mod.rs
index 8f810b6d..51549380 100644
--- a/pezbridges/modules/relayers/src/extension/mod.rs
+++ b/pezbridges/modules/relayers/src/extension/mod.rs
@@ -24,8 +24,8 @@
 
 use crate::{Config as RelayersConfig, Pezpallet as RelayersPallet, WeightInfoExt, LOG_TARGET};
 
-use bp_messages::{ChainWithMessages, MessageNonce};
-use bp_relayers::{
+use pezbp_messages::{ChainWithMessages, MessageNonce};
+use pezbp_relayers::{
 	ExplicitOrAccountParams, ExtensionCallData, ExtensionCallInfo, ExtensionConfig,
 	RewardsAccountOwner, RewardsAccountParams,
 };
@@ -86,7 +86,7 @@ impl<AccountId, RemoteGrandpaChainBlockNumber: Debug, LaneId: Clone + Copy + Deb
 	#[cfg(test)]
 	pub fn submit_finality_proof_info_mut(
 		&mut self,
-	) -> Option<&mut bp_header_pez_chain::SubmitFinalityProofInfo<RemoteGrandpaChainBlockNumber>> {
+	) -> Option<&mut pezbp_header_pez_chain::SubmitFinalityProofInfo<RemoteGrandpaChainBlockNumber>> {
 		match self.call_info {
 			ExtensionCallInfo::AllFinalityAndMsgs(ref mut info, _, _) => Some(info),
 			ExtensionCallInfo::RelayFinalityAndMsgs(ref mut info, _) => Some(info),
@@ -455,18 +455,18 @@ mod tests {
 	use super::*;
 	use crate::mock::*;
 
-	use bp_header_pez_chain::{StoredHeaderDataBuilder, SubmitFinalityProofInfo};
-	use bp_messages::{
+	use pezbp_header_pez_chain::{StoredHeaderDataBuilder, SubmitFinalityProofInfo};
+	use pezbp_messages::{
 		source_chain::FromBridgedChainMessagesDeliveryProof,
 		target_chain::FromBridgedChainMessagesProof, BaseMessagesProofInfo, DeliveredMessages,
 		InboundLaneData, MessageNonce, MessagesCallInfo, MessagesOperatingMode, OutboundLaneData,
 		ReceiveMessagesDeliveryProofInfo, ReceiveMessagesProofInfo, UnrewardedRelayer,
 		UnrewardedRelayerOccupation, UnrewardedRelayersState,
 	};
-	use bp_pezkuwi_core::teyrchains::{ParaHeadsProof, ParaId};
-	use bp_relayers::RuntimeWithUtilityPallet;
-	use bp_test_utils::{make_default_justification, test_keyring, TEST_GRANDPA_SET_ID};
-	use bp_teyrchains::{BestParaHeadHash, ParaInfo, SubmitTeyrchainHeadsInfo};
+	use pezbp_pezkuwi_core::teyrchains::{ParaHeadsProof, ParaId};
+	use pezbp_relayers::RuntimeWithUtilityPallet;
+	use pezbp_test_utils::{make_default_justification, test_keyring, TEST_GRANDPA_SET_ID};
+	use pezbp_teyrchains::{BestParaHeadHash, ParaInfo, SubmitTeyrchainHeadsInfo};
 	use pezbp_runtime::{BasicOperatingMode, HeaderId, Teyrchain};
 	use pezframe_support::{
 		__private::pezsp_tracing,
@@ -574,7 +574,7 @@ mod tests {
 		pezpallet_bridge_grandpa::BestFinalized::<TestRuntime>::put(best_relay_header);
 		pezpallet_bridge_grandpa::ImportedHeaders::<TestRuntime>::insert(
 			best_relay_header.hash(),
-			bp_test_utils::test_header::<BridgedChainHeader>(0).build(),
+			pezbp_test_utils::test_header::<BridgedChainHeader>(0).build(),
 		);
 
 		let para_id = ParaId(TestTeyrchain::get());
diff --git a/pezbridges/modules/relayers/src/extension/priority.rs b/pezbridges/modules/relayers/src/extension/priority.rs
index 0d878377..264aee23 100644
--- a/pezbridges/modules/relayers/src/extension/priority.rs
+++ b/pezbridges/modules/relayers/src/extension/priority.rs
@@ -51,7 +51,7 @@ mod integrity_tests {}
 mod integrity_tests {
 	use super::{compute_priority_boost, ItemCount};
 
-	use bp_messages::MessageNonce;
+	use pezbp_messages::MessageNonce;
 	use pezbp_runtime::PreComputedSize;
 	use pezframe_support::{
 		dispatch::{DispatchClass, DispatchInfo, Pays, PostDispatchInfo},
@@ -142,7 +142,7 @@ mod integrity_tests {
 	pub mod per_relay_header {
 		use super::*;
 
-		use bp_header_pez_chain::{
+		use pezbp_header_pez_chain::{
 			max_expected_submit_finality_proof_arguments_size, ChainWithGrandpa,
 		};
 		use pezpallet_bridge_grandpa::WeightInfoExt;
@@ -334,7 +334,7 @@ mod integrity_tests {
 	pub mod per_message {
 		use super::*;
 
-		use bp_messages::ChainWithMessages;
+		use pezbp_messages::ChainWithMessages;
 		use pezpallet_bridge_messages::WeightInfoExt;
 
 		/// Ensures that the value of `PriorityBoostPerMessage` matches the value of
diff --git a/pezbridges/modules/relayers/src/extension/teyrchain_adapter.rs b/pezbridges/modules/relayers/src/extension/teyrchain_adapter.rs
index c914fdcb..3b7ff4fb 100644
--- a/pezbridges/modules/relayers/src/extension/teyrchain_adapter.rs
+++ b/pezbridges/modules/relayers/src/extension/teyrchain_adapter.rs
@@ -24,7 +24,7 @@ use crate::{
 	Config as BridgeRelayersConfig, LOG_TARGET,
 };
 
-use bp_relayers::{BatchCallUnpacker, ExtensionCallData, ExtensionCallInfo, ExtensionConfig};
+use pezbp_relayers::{BatchCallUnpacker, ExtensionCallData, ExtensionCallInfo, ExtensionConfig};
 use core::marker::PhantomData;
 use pezbp_runtime::{StaticStrProvider, Teyrchain};
 use pezframe_support::dispatch::{DispatchInfo, PostDispatchInfo};
diff --git a/pezbridges/modules/relayers/src/lib.rs b/pezbridges/modules/relayers/src/lib.rs
index 30daad2c..d712fc6a 100644
--- a/pezbridges/modules/relayers/src/lib.rs
+++ b/pezbridges/modules/relayers/src/lib.rs
@@ -21,8 +21,8 @@
 
 extern crate alloc;
 
-pub use bp_relayers::RewardLedger;
-use bp_relayers::{PaymentProcedure, Registration, RelayerRewardsKeyProvider, StakeAndSlash};
+pub use pezbp_relayers::RewardLedger;
+use pezbp_relayers::{PaymentProcedure, Registration, RelayerRewardsKeyProvider, StakeAndSlash};
 use core::marker::PhantomData;
 use pezbp_runtime::StorageDoubleMapKeyProvider;
 use pezframe_support::{fail, traits::tokens::Balance};
@@ -578,8 +578,8 @@ mod tests {
 	use super::*;
 	use mock::{RuntimeEvent as TestEvent, *};
 
-	use bp_messages::{HashedLaneId, LaneIdType};
-	use bp_relayers::{RewardsAccountOwner, RewardsAccountParams};
+	use pezbp_messages::{HashedLaneId, LaneIdType};
+	use pezbp_relayers::{RewardsAccountOwner, RewardsAccountParams};
 	use pezframe_support::{assert_noop, assert_ok, traits::fungible::Mutate};
 	use pezframe_system::{EventRecord, Pezpallet as System, Phase};
 	use pezsp_runtime::DispatchError;
@@ -637,7 +637,7 @@ mod tests {
 				*b"test",
 				RewardsAccountOwner::ThisChain,
 			);
-			let slash_destination = bp_relayers::ExplicitOrAccountParams::Params(slash_destination);
+			let slash_destination = pezbp_relayers::ExplicitOrAccountParams::Params(slash_destination);
 			Pezpallet::<TestRuntime>::slash_and_deregister(&REGISTER_RELAYER, slash_destination);
 			// check if event emitted
 			assert_eq!(
diff --git a/pezbridges/modules/relayers/src/migration.rs b/pezbridges/modules/relayers/src/migration.rs
index 1b2f0d5f..715776b7 100644
--- a/pezbridges/modules/relayers/src/migration.rs
+++ b/pezbridges/modules/relayers/src/migration.rs
@@ -29,7 +29,7 @@ pub const STORAGE_VERSION: StorageVersion = StorageVersion::new(2);
 /// (used with v1 migration).
 pub mod v0 {
 	use crate::{Config, Pezpallet};
-	use bp_relayers::RewardsAccountOwner;
+	use pezbp_relayers::RewardsAccountOwner;
 	use codec::{Codec, Decode, Encode, EncodeLike, MaxEncodedLen};
 	use core::marker::PhantomData;
 	use pezbp_runtime::{ChainId, StorageDoubleMapKeyProvider};
@@ -120,8 +120,8 @@ pub mod v0 {
 pub mod v1 {
 	use super::*;
 	use crate::{Config, Pezpallet};
-	use bp_messages::LaneIdType;
-	use bp_relayers::RewardsAccountParams;
+	use pezbp_messages::LaneIdType;
+	use pezbp_relayers::RewardsAccountParams;
 	use codec::{Codec, EncodeLike};
 	use core::marker::PhantomData;
 	use pezbp_runtime::StorageDoubleMapKeyProvider;
@@ -329,8 +329,8 @@ pub mod v2 {
 	#[cfg(feature = "try-runtime")]
 	use crate::RelayerRewards;
 	use crate::{Config, Pezpallet};
-	use bp_messages::LaneIdType;
-	use bp_relayers::RewardsAccountParams;
+	use pezbp_messages::LaneIdType;
+	use pezbp_relayers::RewardsAccountParams;
 	use core::marker::PhantomData;
 	use pezframe_support::traits::UncheckedOnRuntimeUpgrade;
 
diff --git a/pezbridges/modules/relayers/src/mock.rs b/pezbridges/modules/relayers/src/mock.rs
index 36867248..74df7ffb 100644
--- a/pezbridges/modules/relayers/src/mock.rs
+++ b/pezbridges/modules/relayers/src/mock.rs
@@ -18,15 +18,15 @@
 
 use crate as pezpallet_bridge_relayers;
 
-use bp_header_pez_chain::ChainWithGrandpa;
-use bp_messages::{
+use pezbp_header_pez_chain::ChainWithGrandpa;
+use pezbp_messages::{
 	target_chain::{DispatchMessage, MessageDispatch},
 	ChainWithMessages, HashedLaneId, LaneIdType, MessageNonce,
 };
-use bp_relayers::{
+use pezbp_relayers::{
 	PayRewardFromAccount, PaymentProcedure, RewardsAccountOwner, RewardsAccountParams,
 };
-use bp_teyrchains::SingleParaStoredHeaderDataBuilder;
+use pezbp_teyrchains::SingleParaStoredHeaderDataBuilder;
 use codec::Encode;
 use pezbp_runtime::{messages::MessageDispatchResult, Chain, ChainId, Teyrchain};
 use pezframe_support::{
diff --git a/pezbridges/modules/relayers/src/payment_adapter.rs b/pezbridges/modules/relayers/src/payment_adapter.rs
index 8e77ef13..c6150ef3 100644
--- a/pezbridges/modules/relayers/src/payment_adapter.rs
+++ b/pezbridges/modules/relayers/src/payment_adapter.rs
@@ -20,12 +20,12 @@
 use crate::{Config, Pezpallet};
 
 use alloc::collections::vec_deque::VecDeque;
-use bp_messages::{
+use pezbp_messages::{
 	source_chain::{DeliveryConfirmationPayments, RelayersRewards},
 	MessageNonce,
 };
-pub use bp_relayers::PayRewardFromAccount;
-use bp_relayers::{RewardsAccountOwner, RewardsAccountParams};
+pub use pezbp_relayers::PayRewardFromAccount;
+use pezbp_relayers::{RewardsAccountOwner, RewardsAccountParams};
 use core::{marker::PhantomData, ops::RangeInclusive};
 use pezbp_runtime::Chain;
 use pezframe_support::{pezsp_runtime::SaturatedConversion, traits::Get};
@@ -51,11 +51,11 @@ where
 
 	fn pay_reward(
 		lane_id: LaneIdOf<T, MI>,
-		pez_messages_relayers: VecDeque<bp_messages::UnrewardedRelayer<T::AccountId>>,
+		pez_messages_relayers: VecDeque<pezbp_messages::UnrewardedRelayer<T::AccountId>>,
 		confirmation_relayer: &T::AccountId,
-		received_range: &RangeInclusive<bp_messages::MessageNonce>,
+		received_range: &RangeInclusive<pezbp_messages::MessageNonce>,
 	) -> MessageNonce {
-		let relayers_rewards = bp_messages::calc_relayers_rewards::<T::AccountId>(
+		let relayers_rewards = pezbp_messages::calc_relayers_rewards::<T::AccountId>(
 			pez_messages_relayers,
 			received_range,
 		);
@@ -117,8 +117,8 @@ fn register_relayers_rewards<
 mod tests {
 	use super::*;
 	use crate::{mock::*, RelayerRewards};
-	use bp_messages::LaneIdType;
-	use bp_relayers::PaymentProcedure;
+	use pezbp_messages::LaneIdType;
+	use pezbp_relayers::PaymentProcedure;
 	use pezframe_support::{
 		assert_ok,
 		traits::fungible::{Inspect, Mutate},
diff --git a/pezbridges/modules/relayers/src/stake_adapter.rs b/pezbridges/modules/relayers/src/stake_adapter.rs
index e93bdc24..84a01921 100644
--- a/pezbridges/modules/relayers/src/stake_adapter.rs
+++ b/pezbridges/modules/relayers/src/stake_adapter.rs
@@ -17,7 +17,7 @@
 //! Code that allows `NamedReservableCurrency` to be used as a `StakeAndSlash`
 //! mechanism of the relayers pezpallet.
 
-use bp_relayers::StakeAndSlash;
+use pezbp_relayers::StakeAndSlash;
 use codec::Codec;
 use core::{fmt::Debug, marker::PhantomData};
 use pezframe_support::traits::{tokens::BalanceStatus, NamedReservableCurrency};
@@ -27,7 +27,7 @@ use pezsp_runtime::{traits::Get, DispatchError, DispatchResult};
 /// reservations.
 ///
 /// **WARNING**: this implementation assumes that the relayers pezpallet is configured to
-/// use the [`bp_relayers::PayRewardFromAccount`] as its relayers payment scheme.
+/// use the [`pezbp_relayers::PayRewardFromAccount`] as its relayers payment scheme.
 pub struct StakeAndSlashNamed<AccountId, BlockNumber, Currency, ReserveId, Stake, Lease>(
 	PhantomData<(AccountId, BlockNumber, Currency, ReserveId, Stake, Lease)>,
 );
@@ -72,7 +72,7 @@ where
 mod tests {
 	use super::*;
 	use crate::mock::*;
-	use bp_relayers::ExplicitOrAccountParams;
+	use pezbp_relayers::ExplicitOrAccountParams;
 
 	use pezframe_support::traits::fungible::Mutate;
 	use pezsp_runtime::traits::IdentifyAccount;
diff --git a/pezbridges/modules/teyrchains/Cargo.toml b/pezbridges/modules/teyrchains/Cargo.toml
index 692ea4c3..59b7bd82 100644
--- a/pezbridges/modules/teyrchains/Cargo.toml
+++ b/pezbridges/modules/teyrchains/Cargo.toml
@@ -18,9 +18,9 @@ scale-info = { features = ["derive"], workspace = true }
 tracing = { workspace = true }
 
 # Bridge Dependencies
-bp-header-pez-chain = { workspace = true }
-bp-pezkuwi-core = { workspace = true }
-bp-teyrchains = { workspace = true }
+pezbp-header-pez-chain = { workspace = true }
+pezbp-pezkuwi-core = { workspace = true }
+pezbp-teyrchains = { workspace = true }
 pezbp-runtime = { workspace = true }
 pezpallet-bridge-grandpa = { workspace = true }
 
@@ -32,17 +32,17 @@ pezsp-runtime = { workspace = true }
 pezsp-std = { workspace = true }
 
 [dev-dependencies]
-bp-header-pez-chain = { workspace = true, default-features = true }
-bp-test-utils = { workspace = true, default-features = true }
+pezbp-header-pez-chain = { workspace = true, default-features = true }
+pezbp-test-utils = { workspace = true, default-features = true }
 pezsp-core = { workspace = true, default-features = true }
 pezsp-io = { workspace = true, default-features = true }
 
 [features]
 default = ["std"]
 std = [
-	"bp-header-pez-chain/std",
-	"bp-pezkuwi-core/std",
-	"bp-teyrchains/std",
+	"pezbp-header-pez-chain/std",
+	"pezbp-pezkuwi-core/std",
+	"pezbp-teyrchains/std",
 	"codec/std",
 	"pezbp-runtime/std",
 	"pezframe-benchmarking/std",
@@ -55,10 +55,10 @@ std = [
 	"tracing/std",
 ]
 runtime-benchmarks = [
-	"bp-header-pez-chain/runtime-benchmarks",
-	"bp-pezkuwi-core/runtime-benchmarks",
-	"bp-test-utils/runtime-benchmarks",
-	"bp-teyrchains/runtime-benchmarks",
+	"pezbp-header-pez-chain/runtime-benchmarks",
+	"pezbp-pezkuwi-core/runtime-benchmarks",
+	"pezbp-test-utils/runtime-benchmarks",
+	"pezbp-teyrchains/runtime-benchmarks",
 	"pezbp-runtime/runtime-benchmarks",
 	"pezframe-benchmarking/runtime-benchmarks",
 	"pezframe-support/runtime-benchmarks",
diff --git a/pezbridges/modules/teyrchains/src/benchmarking.rs b/pezbridges/modules/teyrchains/src/benchmarking.rs
index 261ea0cb..d79de299 100644
--- a/pezbridges/modules/teyrchains/src/benchmarking.rs
+++ b/pezbridges/modules/teyrchains/src/benchmarking.rs
@@ -21,7 +21,7 @@ use crate::{
 	RelayBlockNumber,
 };
 
-use bp_pezkuwi_core::teyrchains::{ParaHash, ParaHeadsProof, ParaId};
+use pezbp_pezkuwi_core::teyrchains::{ParaHash, ParaHeadsProof, ParaId};
 use pezbp_runtime::UnverifiedStorageProofParams;
 use pezframe_benchmarking::{account, benchmarks_instance_pallet};
 use pezframe_system::RawOrigin;
diff --git a/pezbridges/modules/teyrchains/src/call_ext.rs b/pezbridges/modules/teyrchains/src/call_ext.rs
index def09131..77d4de68 100644
--- a/pezbridges/modules/teyrchains/src/call_ext.rs
+++ b/pezbridges/modules/teyrchains/src/call_ext.rs
@@ -15,8 +15,8 @@
 // along with Parity Bridges Common.  If not, see <http://www.gnu.org/licenses/>.
 
 use crate::{Config, GrandpaPalletOf, Pezpallet, RelayBlockNumber};
-use bp_header_pez_chain::HeaderChain;
-use bp_teyrchains::{BestParaHeadHash, SubmitTeyrchainHeadsInfo};
+use pezbp_header_pez_chain::HeaderChain;
+use pezbp_teyrchains::{BestParaHeadHash, SubmitTeyrchainHeadsInfo};
 use pezbp_runtime::{HeaderId, OwnedBridgeModule};
 use pezframe_support::{
 	dispatch::CallableCallFor,
@@ -259,9 +259,9 @@ mod tests {
 		mock::{run_test, FreeHeadersInterval, RuntimeCall, TestRuntime},
 		CallSubType, PalletOperatingMode, ParaInfo, ParasInfo, RelayBlockHash, RelayBlockNumber,
 	};
-	use bp_header_pez_chain::StoredHeaderData;
-	use bp_pezkuwi_core::teyrchains::{ParaHash, ParaHeadsProof, ParaId};
-	use bp_teyrchains::BestParaHeadHash;
+	use pezbp_header_pez_chain::StoredHeaderData;
+	use pezbp_pezkuwi_core::teyrchains::{ParaHash, ParaHeadsProof, ParaId};
+	use pezbp_teyrchains::BestParaHeadHash;
 	use pezbp_runtime::BasicOperatingMode;
 
 	fn validate_submit_teyrchain_heads(
diff --git a/pezbridges/modules/teyrchains/src/lib.rs b/pezbridges/modules/teyrchains/src/lib.rs
index c7fadc7c..279c3318 100644
--- a/pezbridges/modules/teyrchains/src/lib.rs
+++ b/pezbridges/modules/teyrchains/src/lib.rs
@@ -27,9 +27,9 @@
 pub use weights::WeightInfo;
 pub use weights_ext::WeightInfoExt;
 
-use bp_header_pez_chain::{HeaderChain, HeaderChainError};
-use bp_pezkuwi_core::teyrchains::{ParaHash, ParaHead, ParaHeadsProof, ParaId};
-use bp_teyrchains::{
+use pezbp_header_pez_chain::{HeaderChain, HeaderChainError};
+use pezbp_pezkuwi_core::teyrchains::{ParaHash, ParaHead, ParaHeadsProof, ParaId};
+use pezbp_teyrchains::{
 	ParaInfo, ParaStoredHeaderData, RelayBlockHash, RelayBlockHasher, RelayBlockNumber,
 	SubmitTeyrchainHeadsInfo,
 };
@@ -40,7 +40,7 @@ use pezsp_std::{marker::PhantomData, vec::Vec};
 use proofs::{StorageProofAdapter, TeyrchainsStorageProofAdapter};
 
 #[cfg(feature = "runtime-benchmarks")]
-use bp_teyrchains::ParaStoredHeaderDataBuilder;
+use pezbp_teyrchains::ParaStoredHeaderDataBuilder;
 #[cfg(feature = "runtime-benchmarks")]
 use codec::Encode;
 #[cfg(feature = "runtime-benchmarks")]
@@ -75,7 +75,7 @@ struct UpdateTeyrchainHeadArtifacts {
 #[pezframe_support::pezpallet]
 pub mod pezpallet {
 	use super::*;
-	use bp_teyrchains::{
+	use pezbp_teyrchains::{
 		BestParaHeadHash, ImportedParaHeadsKeyProvider, OnNewHead, ParaStoredHeaderDataBuilder,
 		ParasInfoKeyProvider,
 	};
@@ -225,13 +225,13 @@ pub mod pezpallet {
 		///
 		/// We never store teyrchain heads here, since they may be too big (e.g. because of large
 		/// digest items). Instead we're using the same approach as `pezpallet-bridge-grandpa`
-		/// pezpallet - we are only storing `bp_messages::StoredHeaderData` (number and state root),
+		/// pezpallet - we are only storing `pezbp_messages::StoredHeaderData` (number and state root),
 		/// which is enough for our applications. However, we work with different teyrchains here
 		/// and they can use different primitives (for block numbers and hash). So we can't store
-		/// it directly. Instead, we're storing `bp_messages::StoredHeaderData` in SCALE-encoded
-		/// form, wrapping it into `bp_teyrchains::ParaStoredHeaderData`.
+		/// it directly. Instead, we're storing `pezbp_messages::StoredHeaderData` in SCALE-encoded
+		/// form, wrapping it into `pezbp_teyrchains::ParaStoredHeaderData`.
 		///
-		/// This builder helps to convert from `HeadData` to `bp_teyrchains::ParaStoredHeaderData`.
+		/// This builder helps to convert from `HeadData` to `pezbp_teyrchains::ParaStoredHeaderData`.
 		type ParaStoredHeaderDataBuilder: ParaStoredHeaderDataBuilder;
 
 		/// Maximal number of single teyrchain heads to keep in the storage.
@@ -245,7 +245,7 @@ pub mod pezpallet {
 		type HeadsToKeep: Get<u32>;
 
 		/// Maximal size (in bytes) of the SCALE-encoded teyrchain head data
-		/// (`bp_teyrchains::ParaStoredHeaderData`).
+		/// (`pezbp_teyrchains::ParaStoredHeaderData`).
 		///
 		/// Keep in mind that the size of any tracked teyrchain header data must not exceed this
 		/// value. So if you're going to track multiple teyrchains, one of which is using large
@@ -804,7 +804,7 @@ impl<T: Config<I>, I: 'static, C: Teyrchain<Hash = ParaHash>> HeaderChain<C>
 pub fn initialize_for_benchmarks<T: Config<I>, I: 'static, PC: Teyrchain<Hash = ParaHash>>(
 	header: HeaderOf<PC>,
 ) {
-	use bp_pezkuwi_core::teyrchains::ParaHead;
+	use pezbp_pezkuwi_core::teyrchains::ParaHead;
 	use pezbp_runtime::HeaderIdProvider;
 	use pezsp_runtime::traits::Header;
 
@@ -842,16 +842,16 @@ pub(crate) mod tests {
 		RegularTeyrchainHasher, RegularTeyrchainHeader, RelayBlockHeader,
 		RuntimeEvent as TestEvent, RuntimeOrigin, TestRuntime, UNTRACKED_TEYRCHAIN_ID,
 	};
-	use bp_test_utils::prepare_teyrchain_heads_proof;
+	use pezbp_test_utils::prepare_teyrchain_heads_proof;
 	use codec::Encode;
 
-	use bp_header_pez_chain::{justification::GrandpaJustification, StoredHeaderGrandpaInfo};
-	use bp_pezkuwi_core::teyrchains::ParaHead;
-	use bp_test_utils::{
+	use pezbp_header_pez_chain::{justification::GrandpaJustification, StoredHeaderGrandpaInfo};
+	use pezbp_pezkuwi_core::teyrchains::ParaHead;
+	use pezbp_test_utils::{
 		authority_list, generate_owned_bridge_module_tests, make_default_justification,
 		TEST_GRANDPA_SET_ID,
 	};
-	use bp_teyrchains::{
+	use pezbp_teyrchains::{
 		BestParaHeadHash, BridgeTeyrchainCall, ImportedParaHeadsKeyProvider, ParasInfoKeyProvider,
 	};
 	use pezbp_runtime::{
@@ -878,7 +878,7 @@ pub(crate) mod tests {
 		pezpallet_bridge_grandpa::FreeHeadersRemaining::<TestRuntime, BridgesGrandpaPalletInstance>::set(Some(100));
 		pezpallet_bridge_grandpa::Pezpallet::<TestRuntime, BridgesGrandpaPalletInstance>::initialize(
 			RuntimeOrigin::root(),
-			bp_header_pez_chain::InitializationData {
+			pezbp_header_pez_chain::InitializationData {
 				header: Box::new(test_relay_header(0, state_root)),
 				authority_list: authority_list(),
 				set_id: 1,
diff --git a/pezbridges/modules/teyrchains/src/mock.rs b/pezbridges/modules/teyrchains/src/mock.rs
index 29bf628b..46558bcf 100644
--- a/pezbridges/modules/teyrchains/src/mock.rs
+++ b/pezbridges/modules/teyrchains/src/mock.rs
@@ -14,8 +14,8 @@
 // You should have received a copy of the GNU General Public License
 // along with Parity Bridges Common.  If not, see <http://www.gnu.org/licenses/>.
 
-use bp_header_pez_chain::ChainWithGrandpa;
-use bp_pezkuwi_core::teyrchains::ParaId;
+use pezbp_header_pez_chain::ChainWithGrandpa;
+use pezbp_pezkuwi_core::teyrchains::ParaId;
 use pezbp_runtime::{Chain, ChainId, Teyrchain};
 use pezframe_support::{
 	construct_runtime, derive_impl, parameter_types, traits::ConstU32, weights::Weight,
@@ -235,13 +235,13 @@ impl pezpallet_bridge_teyrchains::benchmarking::Config<()> for TestRuntime {
 	) -> (
 		crate::RelayBlockNumber,
 		crate::RelayBlockHash,
-		bp_pezkuwi_core::teyrchains::ParaHeadsProof,
-		Vec<(ParaId, bp_pezkuwi_core::teyrchains::ParaHash)>,
+		pezbp_pezkuwi_core::teyrchains::ParaHeadsProof,
+		Vec<(ParaId, pezbp_pezkuwi_core::teyrchains::ParaHash)>,
 	) {
 		// in mock run we only care about benchmarks correctness, not the benchmark results
 		// => ignore size related arguments
 		let (state_root, proof, teyrchains) =
-			bp_test_utils::prepare_teyrchain_heads_proof::<RegularTeyrchainHeader>(
+			pezbp_test_utils::prepare_teyrchain_heads_proof::<RegularTeyrchainHeader>(
 				teyrchains.iter().map(|p| (p.0, crate::tests::head_data(p.0, 1))).collect(),
 			);
 		let relay_genesis_hash = crate::tests::initialize(state_root);
diff --git a/pezbridges/modules/teyrchains/src/proofs.rs b/pezbridges/modules/teyrchains/src/proofs.rs
index f41e083a..933edbf6 100644
--- a/pezbridges/modules/teyrchains/src/proofs.rs
+++ b/pezbridges/modules/teyrchains/src/proofs.rs
@@ -17,9 +17,9 @@
 //! Tools for teyrchain head proof verification.
 
 use crate::{Config, GrandpaPalletOf, RelayBlockHash, RelayBlockHasher};
-use bp_header_pez_chain::{HeaderChain, HeaderChainError};
-use bp_pezkuwi_core::teyrchains::{ParaHead, ParaId};
-use bp_teyrchains::teyrchain_head_storage_key_at_source;
+use pezbp_header_pez_chain::{HeaderChain, HeaderChainError};
+use pezbp_pezkuwi_core::teyrchains::{ParaHead, ParaId};
+use pezbp_teyrchains::teyrchain_head_storage_key_at_source;
 use codec::Decode;
 use pezbp_runtime::{RawStorageProof, StorageProofChecker, StorageProofError};
 use pezframe_support::traits::Get;
diff --git a/pezbridges/modules/xcm-bridge-hub-router/Cargo.toml b/pezbridges/modules/xcm-bridge-hub-router/Cargo.toml
index 8782bd8c..436d3c51 100644
--- a/pezbridges/modules/xcm-bridge-hub-router/Cargo.toml
+++ b/pezbridges/modules/xcm-bridge-hub-router/Cargo.toml
@@ -18,7 +18,7 @@ scale-info = { features = ["bit-vec", "derive", "serde"], workspace = true }
 tracing = { workspace = true }
 
 # Bridge dependencies
-bp-xcm-bridge-hub-router = { workspace = true }
+pezbp-xcm-bridge-hub-router = { workspace = true }
 
 # Bizinikiwi Dependencies
 pezframe-benchmarking = { optional = true, workspace = true }
@@ -39,7 +39,7 @@ pezsp-io = { workspace = true, default-features = true }
 [features]
 default = ["std"]
 std = [
-	"bp-xcm-bridge-hub-router/std",
+	"pezbp-xcm-bridge-hub-router/std",
 	"codec/std",
 	"pezframe-benchmarking/std",
 	"pezframe-support/std",
@@ -54,7 +54,7 @@ std = [
 	"xcm/std",
 ]
 runtime-benchmarks = [
-	"bp-xcm-bridge-hub-router/runtime-benchmarks",
+	"pezbp-xcm-bridge-hub-router/runtime-benchmarks",
 	"pezframe-benchmarking/runtime-benchmarks",
 	"pezframe-support/runtime-benchmarks",
 	"pezframe-system/runtime-benchmarks",
diff --git a/pezbridges/modules/xcm-bridge-hub-router/src/lib.rs b/pezbridges/modules/xcm-bridge-hub-router/src/lib.rs
index 18ad822c..aee6f5b0 100644
--- a/pezbridges/modules/xcm-bridge-hub-router/src/lib.rs
+++ b/pezbridges/modules/xcm-bridge-hub-router/src/lib.rs
@@ -30,8 +30,8 @@
 
 #![cfg_attr(not(feature = "std"), no_std)]
 
-use bp_xcm_bridge_hub_router::MINIMAL_DELIVERY_FEE_FACTOR;
-pub use bp_xcm_bridge_hub_router::{BridgeState, XcmChannelStatusProvider};
+use pezbp_xcm_bridge_hub_router::MINIMAL_DELIVERY_FEE_FACTOR;
+pub use pezbp_xcm_bridge_hub_router::{BridgeState, XcmChannelStatusProvider};
 use codec::Encode;
 use pezframe_support::traits::Get;
 use pezkuwi_runtime_teyrchains::FeeTracker;
diff --git a/pezbridges/modules/xcm-bridge-hub-router/src/mock.rs b/pezbridges/modules/xcm-bridge-hub-router/src/mock.rs
index 0bd1e824..5913996a 100644
--- a/pezbridges/modules/xcm-bridge-hub-router/src/mock.rs
+++ b/pezbridges/modules/xcm-bridge-hub-router/src/mock.rs
@@ -18,7 +18,7 @@
 
 use crate as pezpallet_xcm_bridge_hub_router;
 
-use bp_xcm_bridge_hub_router::XcmChannelStatusProvider;
+use pezbp_xcm_bridge_hub_router::XcmChannelStatusProvider;
 use codec::Encode;
 use pezframe_support::{
 	construct_runtime, derive_impl, parameter_types,
diff --git a/pezbridges/modules/xcm-bridge-hub/Cargo.toml b/pezbridges/modules/xcm-bridge-hub/Cargo.toml
index 4d86217e..36898b55 100644
--- a/pezbridges/modules/xcm-bridge-hub/Cargo.toml
+++ b/pezbridges/modules/xcm-bridge-hub/Cargo.toml
@@ -18,8 +18,8 @@ scale-info = { features = ["derive"], workspace = true }
 tracing = { workspace = true }
 
 # Bridge Dependencies
-bp-messages = { workspace = true }
-bp-xcm-bridge-hub = { workspace = true }
+pezbp-messages = { workspace = true }
+pezbp-xcm-bridge-hub = { workspace = true }
 pezbp-runtime = { workspace = true }
 pezpallet-bridge-messages = { workspace = true }
 
@@ -36,8 +36,8 @@ xcm-builder = { workspace = true }
 xcm-executor = { workspace = true }
 
 [dev-dependencies]
-bp-header-pez-chain = { workspace = true }
-bp-xcm-bridge-hub-router = { workspace = true }
+pezbp-header-pez-chain = { workspace = true }
+pezbp-xcm-bridge-hub-router = { workspace = true }
 pezkuwi-teyrchain-primitives = { workspace = true }
 pezpallet-balances = { workspace = true }
 pezpallet-xcm-bridge-hub-router = { workspace = true }
@@ -46,10 +46,10 @@ pezsp-io = { workspace = true }
 [features]
 default = ["std"]
 std = [
-	"bp-header-pez-chain/std",
-	"bp-messages/std",
-	"bp-xcm-bridge-hub-router/std",
-	"bp-xcm-bridge-hub/std",
+	"pezbp-header-pez-chain/std",
+	"pezbp-messages/std",
+	"pezbp-xcm-bridge-hub-router/std",
+	"pezbp-xcm-bridge-hub/std",
 	"codec/std",
 	"pezbp-runtime/std",
 	"pezframe-support/std",
@@ -69,10 +69,10 @@ std = [
 	"xcm/std",
 ]
 runtime-benchmarks = [
-	"bp-header-pez-chain/runtime-benchmarks",
-	"bp-messages/runtime-benchmarks",
-	"bp-xcm-bridge-hub-router/runtime-benchmarks",
-	"bp-xcm-bridge-hub/runtime-benchmarks",
+	"pezbp-header-pez-chain/runtime-benchmarks",
+	"pezbp-messages/runtime-benchmarks",
+	"pezbp-xcm-bridge-hub-router/runtime-benchmarks",
+	"pezbp-xcm-bridge-hub/runtime-benchmarks",
 	"pezbp-runtime/runtime-benchmarks",
 	"pezframe-support/runtime-benchmarks",
 	"pezframe-system/runtime-benchmarks",
diff --git a/pezbridges/modules/xcm-bridge-hub/src/dispatcher.rs b/pezbridges/modules/xcm-bridge-hub/src/dispatcher.rs
index 8f21fc84..9fba821b 100644
--- a/pezbridges/modules/xcm-bridge-hub/src/dispatcher.rs
+++ b/pezbridges/modules/xcm-bridge-hub/src/dispatcher.rs
@@ -23,8 +23,8 @@
 
 use crate::{Config, Pezpallet, LOG_TARGET};
 
-use bp_messages::target_chain::{DispatchMessage, MessageDispatch};
-use bp_xcm_bridge_hub::{LocalXcmChannelManager, XcmAsPlainPayload};
+use pezbp_messages::target_chain::{DispatchMessage, MessageDispatch};
+use pezbp_xcm_bridge_hub::{LocalXcmChannelManager, XcmAsPlainPayload};
 use codec::{Decode, DecodeWithMemTracking, Encode};
 use pezbp_runtime::messages::MessageDispatchResult;
 use pezframe_support::{weights::Weight, CloneNoBound, EqNoBound, PartialEqNoBound};
@@ -134,8 +134,8 @@ mod tests {
 	use super::*;
 	use crate::{mock::*, Bridges, LaneToBridge, LanesManagerOf};
 
-	use bp_messages::{target_chain::DispatchMessageData, LaneIdType, MessageKey};
-	use bp_xcm_bridge_hub::{Bridge, BridgeLocations, BridgeState};
+	use pezbp_messages::{target_chain::DispatchMessageData, LaneIdType, MessageKey};
+	use pezbp_xcm_bridge_hub::{Bridge, BridgeLocations, BridgeState};
 	use pezframe_support::assert_ok;
 	use pezpallet_bridge_messages::InboundLaneStorage;
 	use xcm_executor::traits::ConvertLocation;
diff --git a/pezbridges/modules/xcm-bridge-hub/src/exporter.rs b/pezbridges/modules/xcm-bridge-hub/src/exporter.rs
index 2854bf81..0212df01 100644
--- a/pezbridges/modules/xcm-bridge-hub/src/exporter.rs
+++ b/pezbridges/modules/xcm-bridge-hub/src/exporter.rs
@@ -24,11 +24,11 @@ use crate::{Config, Pezpallet, LOG_TARGET};
 
 use crate::{BridgeOf, Bridges};
 
-use bp_messages::{
+use pezbp_messages::{
 	source_chain::{MessagesBridge, OnMessagesDelivered},
 	MessageNonce,
 };
-use bp_xcm_bridge_hub::{BridgeId, BridgeState, LocalXcmChannelManager, XcmAsPlainPayload};
+use pezbp_xcm_bridge_hub::{BridgeId, BridgeState, LocalXcmChannelManager, XcmAsPlainPayload};
 use pezframe_support::{ensure, traits::Get};
 use pezpallet_bridge_messages::{
 	Config as BridgeMessagesConfig, Error, Pezpallet as BridgeMessagesPallet,
@@ -371,7 +371,7 @@ mod tests {
 	use super::*;
 	use crate::{mock::*, Bridges, LaneToBridge, LanesManagerOf};
 
-	use bp_xcm_bridge_hub::{Bridge, BridgeLocations, BridgeState};
+	use pezbp_xcm_bridge_hub::{Bridge, BridgeLocations, BridgeState};
 	use pezbp_runtime::RangeInclusiveExt;
 	use pezframe_support::{assert_ok, traits::EnsureOrigin};
 	use pezpallet_bridge_messages::InboundLaneStorage;
diff --git a/pezbridges/modules/xcm-bridge-hub/src/lib.rs b/pezbridges/modules/xcm-bridge-hub/src/lib.rs
index 02447a0c..09bb5e52 100644
--- a/pezbridges/modules/xcm-bridge-hub/src/lib.rs
+++ b/pezbridges/modules/xcm-bridge-hub/src/lib.rs
@@ -143,9 +143,9 @@
 #![warn(missing_docs)]
 #![cfg_attr(not(feature = "std"), no_std)]
 
-use bp_messages::{LaneState, MessageNonce};
-use bp_xcm_bridge_hub::BridgeLocationsError;
-pub use bp_xcm_bridge_hub::{
+use pezbp_messages::{LaneState, MessageNonce};
+use pezbp_xcm_bridge_hub::BridgeLocationsError;
+pub use pezbp_xcm_bridge_hub::{
 	Bridge, BridgeId, BridgeLocations, BridgeState, LocalXcmChannelManager,
 };
 use pezbp_runtime::{AccountIdOf, BalanceOf, RangeInclusiveExt};
@@ -158,7 +158,7 @@ use xcm::prelude::*;
 use xcm_builder::DispatchBlob;
 use xcm_executor::traits::ConvertLocation;
 
-pub use bp_xcm_bridge_hub::XcmAsPlainPayload;
+pub use pezbp_xcm_bridge_hub::XcmAsPlainPayload;
 pub use dispatcher::XcmBlobMessageDispatchResult;
 pub use exporter::PalletAsHaulBlobExporter;
 pub use pezpallet::*;
@@ -846,7 +846,7 @@ pub mod pezpallet {
 #[cfg(test)]
 mod tests {
 	use super::*;
-	use bp_messages::LaneIdType;
+	use pezbp_messages::LaneIdType;
 	use mock::*;
 
 	use pezframe_support::{
@@ -1715,7 +1715,7 @@ mod tests {
 		let may_prune_messages = 13;
 
 		assert_eq!(
-			bp_xcm_bridge_hub::XcmBridgeHubCall::open_bridge {
+			pezbp_xcm_bridge_hub::XcmBridgeHubCall::open_bridge {
 				bridge_destination_universal_location: Box::new(
 					bridge_destination_universal_location.clone().into()
 				)
@@ -1729,7 +1729,7 @@ mod tests {
 			.encode()
 		);
 		assert_eq!(
-			bp_xcm_bridge_hub::XcmBridgeHubCall::close_bridge {
+			pezbp_xcm_bridge_hub::XcmBridgeHubCall::close_bridge {
 				bridge_destination_universal_location: Box::new(
 					bridge_destination_universal_location.clone().into()
 				),
diff --git a/pezbridges/modules/xcm-bridge-hub/src/mock.rs b/pezbridges/modules/xcm-bridge-hub/src/mock.rs
index 9ff60978..2995a79e 100644
--- a/pezbridges/modules/xcm-bridge-hub/src/mock.rs
+++ b/pezbridges/modules/xcm-bridge-hub/src/mock.rs
@@ -18,11 +18,11 @@
 
 use crate as pezpallet_xcm_bridge_hub;
 
-use bp_messages::{
+use pezbp_messages::{
 	target_chain::{DispatchMessage, MessageDispatch},
 	ChainWithMessages, HashedLaneId, MessageNonce,
 };
-use bp_xcm_bridge_hub::{BridgeId, LocalXcmChannelManager};
+use pezbp_xcm_bridge_hub::{BridgeId, LocalXcmChannelManager};
 use codec::{Decode, Encode};
 use pezbp_runtime::{messages::MessageDispatchResult, Chain, ChainId, HashOf};
 use pezframe_support::{
@@ -472,7 +472,7 @@ impl TestLocalXcmChannelManager {
 	}
 
 	fn build_congestion_message(bridge: &BridgeId, is_congested: bool) -> Vec<Instruction<()>> {
-		use bp_xcm_bridge_hub_router::XcmBridgeHubRouterCall;
+		use pezbp_xcm_bridge_hub_router::XcmBridgeHubRouterCall;
 		#[allow(clippy::large_enum_variant)]
 		#[derive(Encode, Decode, Debug, PartialEq, Eq, Clone, scale_info::TypeInfo)]
 		enum Call {
@@ -620,7 +620,7 @@ impl ChainWithMessages for BridgedUnderlyingChain {
 }
 
 pub struct BridgedHeaderChain;
-impl bp_header_pez_chain::HeaderChain<BridgedUnderlyingChain> for BridgedHeaderChain {
+impl pezbp_header_pez_chain::HeaderChain<BridgedUnderlyingChain> for BridgedHeaderChain {
 	fn finalized_header_state_root(
 		_hash: HashOf<BridgedUnderlyingChain>,
 	) -> Option<HashOf<BridgedUnderlyingChain>> {
diff --git a/pezbridges/pezsnowbridge/pezpallets/ethereum-client/fixtures/Cargo.toml b/pezbridges/pezsnowbridge/pezpallets/ethereum-client/fixtures/Cargo.toml
index d25195d1..c99d05c7 100644
--- a/pezbridges/pezsnowbridge/pezpallets/ethereum-client/fixtures/Cargo.toml
+++ b/pezbridges/pezsnowbridge/pezpallets/ethereum-client/fixtures/Cargo.toml
@@ -9,7 +9,7 @@ license = "Apache-2.0"
 categories = ["cryptography::cryptocurrencies"]
 documentation.workspace = true
 homepage = { workspace = true }
-publish = false
+publish = true
 
 [lints]
 workspace = true
diff --git a/pezbridges/pezsnowbridge/pezpallets/inbound-queue-v2/Cargo.toml b/pezbridges/pezsnowbridge/pezpallets/inbound-queue-v2/Cargo.toml
index bc6a2c3e..dceddd09 100644
--- a/pezbridges/pezsnowbridge/pezpallets/inbound-queue-v2/Cargo.toml
+++ b/pezbridges/pezsnowbridge/pezpallets/inbound-queue-v2/Cargo.toml
@@ -44,7 +44,7 @@ pezsnowbridge-core = { workspace = true }
 pezsnowbridge-inbound-queue-primitives = { workspace = true }
 pezsnowbridge-pezpallet-inbound-queue-v2-fixtures = { optional = true, workspace = true }
 
-bp-relayers = { workspace = true }
+pezbp-relayers = { workspace = true }
 
 [dev-dependencies]
 hex-literal = { workspace = true, default-features = true }
@@ -56,7 +56,7 @@ pezsp-keyring = { workspace = true, default-features = true }
 default = ["std"]
 std = [
 	"alloy-core/std",
-	"bp-relayers/std",
+	"pezbp-relayers/std",
 	"codec/std",
 	"pezframe-benchmarking/std",
 	"pezframe-support/std",
@@ -78,7 +78,7 @@ std = [
 	"xcm/std",
 ]
 runtime-benchmarks = [
-	"bp-relayers/runtime-benchmarks",
+	"pezbp-relayers/runtime-benchmarks",
 	"pezframe-benchmarking",
 	"pezframe-benchmarking/runtime-benchmarks",
 	"pezframe-support/runtime-benchmarks",
diff --git a/pezbridges/pezsnowbridge/pezpallets/inbound-queue-v2/fixtures/Cargo.toml b/pezbridges/pezsnowbridge/pezpallets/inbound-queue-v2/fixtures/Cargo.toml
index a8909939..4f18627a 100644
--- a/pezbridges/pezsnowbridge/pezpallets/inbound-queue-v2/fixtures/Cargo.toml
+++ b/pezbridges/pezsnowbridge/pezpallets/inbound-queue-v2/fixtures/Cargo.toml
@@ -9,7 +9,7 @@ license = "Apache-2.0"
 categories = ["cryptography::cryptocurrencies"]
 documentation.workspace = true
 homepage = { workspace = true }
-publish = false
+publish = true
 
 [lints]
 workspace = true
diff --git a/pezbridges/pezsnowbridge/pezpallets/inbound-queue-v2/src/lib.rs b/pezbridges/pezsnowbridge/pezpallets/inbound-queue-v2/src/lib.rs
index f415a6ed..4e2125ce 100644
--- a/pezbridges/pezsnowbridge/pezpallets/inbound-queue-v2/src/lib.rs
+++ b/pezbridges/pezsnowbridge/pezpallets/inbound-queue-v2/src/lib.rs
@@ -36,7 +36,7 @@ mod mock;
 mod test;
 
 pub use crate::weights::WeightInfo;
-use bp_relayers::RewardLedger;
+use pezbp_relayers::RewardLedger;
 use pezframe_system::ensure_signed;
 use pezsnowbridge_core::{
 	reward::{AddTip, AddTipError},
diff --git a/pezbridges/pezsnowbridge/pezpallets/inbound-queue/fixtures/Cargo.toml b/pezbridges/pezsnowbridge/pezpallets/inbound-queue/fixtures/Cargo.toml
index 0f409b5f..18f7deeb 100644
--- a/pezbridges/pezsnowbridge/pezpallets/inbound-queue/fixtures/Cargo.toml
+++ b/pezbridges/pezsnowbridge/pezpallets/inbound-queue/fixtures/Cargo.toml
@@ -9,7 +9,7 @@ license = "Apache-2.0"
 categories = ["cryptography::cryptocurrencies"]
 documentation.workspace = true
 homepage = { workspace = true }
-publish = false
+publish = true
 
 [lints]
 workspace = true
diff --git a/pezbridges/pezsnowbridge/pezpallets/outbound-queue-v2/Cargo.toml b/pezbridges/pezsnowbridge/pezpallets/outbound-queue-v2/Cargo.toml
index bcaf540b..1d444981 100644
--- a/pezbridges/pezsnowbridge/pezpallets/outbound-queue-v2/Cargo.toml
+++ b/pezbridges/pezsnowbridge/pezpallets/outbound-queue-v2/Cargo.toml
@@ -36,7 +36,7 @@ pezsp-io = { workspace = true }
 pezsp-runtime = { workspace = true }
 pezsp-std = { workspace = true }
 
-bp-relayers = { workspace = true }
+pezbp-relayers = { workspace = true }
 
 pezsnowbridge-beacon-primitives = { workspace = true }
 pezsnowbridge-core = { workspace = true }
@@ -56,7 +56,7 @@ pezsnowbridge-test-utils = { workspace = true }
 default = ["std"]
 std = [
 	"alloy-core/std",
-	"bp-relayers/std",
+	"pezbp-relayers/std",
 	"codec/std",
 	"ethabi/std",
 	"pezframe-benchmarking/std",
@@ -80,7 +80,7 @@ std = [
 	"xcm/std",
 ]
 runtime-benchmarks = [
-	"bp-relayers/runtime-benchmarks",
+	"pezbp-relayers/runtime-benchmarks",
 	"pezframe-benchmarking",
 	"pezframe-benchmarking/runtime-benchmarks",
 	"pezframe-support/runtime-benchmarks",
diff --git a/pezbridges/pezsnowbridge/pezpallets/outbound-queue-v2/src/lib.rs b/pezbridges/pezsnowbridge/pezpallets/outbound-queue-v2/src/lib.rs
index 7fe7fc4d..064a8c14 100644
--- a/pezbridges/pezsnowbridge/pezpallets/outbound-queue-v2/src/lib.rs
+++ b/pezbridges/pezsnowbridge/pezpallets/outbound-queue-v2/src/lib.rs
@@ -71,7 +71,7 @@ use alloy_core::{
 	primitives::{Bytes, FixedBytes},
 	sol_types::SolValue,
 };
-use bp_relayers::RewardLedger;
+use pezbp_relayers::RewardLedger;
 use codec::{Decode, FullCodec};
 use pezframe_support::{
 	storage::StorageStreamIter,
diff --git a/pezbridges/pezsnowbridge/pezpallets/outbound-queue/Cargo.toml b/pezbridges/pezsnowbridge/pezpallets/outbound-queue/Cargo.toml
index ade1d97b..2359e5c0 100644
--- a/pezbridges/pezsnowbridge/pezpallets/outbound-queue/Cargo.toml
+++ b/pezbridges/pezsnowbridge/pezpallets/outbound-queue/Cargo.toml
@@ -33,7 +33,7 @@ pezsp-io = { workspace = true }
 pezsp-runtime = { workspace = true }
 pezsp-std = { workspace = true }
 
-bridge-hub-common = { workspace = true }
+pezbridge-hub-common = { workspace = true }
 
 ethabi = { workspace = true }
 pezsnowbridge-core = { workspace = true }
@@ -46,7 +46,7 @@ pezpallet-message-queue = { workspace = true }
 [features]
 default = ["std"]
 std = [
-	"bridge-hub-common/std",
+	"pezbridge-hub-common/std",
 	"codec/std",
 	"ethabi/std",
 	"pezframe-benchmarking/std",
@@ -65,7 +65,7 @@ std = [
 	"serde/std",
 ]
 runtime-benchmarks = [
-	"bridge-hub-common/runtime-benchmarks",
+	"pezbridge-hub-common/runtime-benchmarks",
 	"pezframe-benchmarking",
 	"pezframe-benchmarking/runtime-benchmarks",
 	"pezframe-support/runtime-benchmarks",
diff --git a/pezbridges/pezsnowbridge/pezpallets/outbound-queue/src/benchmarking.rs b/pezbridges/pezsnowbridge/pezpallets/outbound-queue/src/benchmarking.rs
index 552aec73..a150b4e5 100644
--- a/pezbridges/pezsnowbridge/pezpallets/outbound-queue/src/benchmarking.rs
+++ b/pezbridges/pezsnowbridge/pezpallets/outbound-queue/src/benchmarking.rs
@@ -2,7 +2,7 @@
 // SPDX-FileCopyrightText: 2023 Snowfork <hello@snowfork.com>
 use super::*;
 
-use bridge_hub_common::AggregateMessageOrigin;
+use pezbridge_hub_common::AggregateMessageOrigin;
 use codec::Encode;
 use pezframe_benchmarking::v2::*;
 use pezsnowbridge_core::ChannelId;
diff --git a/pezbridges/pezsnowbridge/pezpallets/outbound-queue/src/lib.rs b/pezbridges/pezsnowbridge/pezpallets/outbound-queue/src/lib.rs
index 2b15db55..3c05a27b 100644
--- a/pezbridges/pezsnowbridge/pezpallets/outbound-queue/src/lib.rs
+++ b/pezbridges/pezsnowbridge/pezpallets/outbound-queue/src/lib.rs
@@ -103,7 +103,7 @@ mod mock;
 #[cfg(test)]
 mod test;
 
-use bridge_hub_common::AggregateMessageOrigin;
+use pezbridge_hub_common::AggregateMessageOrigin;
 use codec::Decode;
 use pezframe_support::{
 	storage::StorageStreamIter,
diff --git a/pezbridges/pezsnowbridge/pezpallets/outbound-queue/src/send_message_impl.rs b/pezbridges/pezsnowbridge/pezpallets/outbound-queue/src/send_message_impl.rs
index e83427fe..92adfe3e 100644
--- a/pezbridges/pezsnowbridge/pezpallets/outbound-queue/src/send_message_impl.rs
+++ b/pezbridges/pezsnowbridge/pezpallets/outbound-queue/src/send_message_impl.rs
@@ -2,7 +2,7 @@
 // SPDX-FileCopyrightText: 2023 Snowfork <hello@snowfork.com>
 //! Implementation for [`pezsnowbridge_outbound_queue_primitives::v1::SendMessage`]
 use super::*;
-use bridge_hub_common::AggregateMessageOrigin;
+use pezbridge_hub_common::AggregateMessageOrigin;
 use codec::Encode;
 use pezframe_support::{
 	ensure,
diff --git a/pezbridges/pezsnowbridge/primitives/core/Cargo.toml b/pezbridges/pezsnowbridge/primitives/core/Cargo.toml
index 9e227512..fe6ac042 100644
--- a/pezbridges/pezsnowbridge/primitives/core/Cargo.toml
+++ b/pezbridges/pezsnowbridge/primitives/core/Cargo.toml
@@ -36,12 +36,12 @@ pezsp-runtime = { workspace = true }
 pezsp-std = { workspace = true }
 xcm-executor = { workspace = true }
 
-bp-relayers = { workspace = true }
+pezbp-relayers = { workspace = true }
 
 [features]
 default = ["std"]
 std = [
-	"bp-relayers/std",
+	"pezbp-relayers/std",
 	"codec/std",
 	"pezframe-support/std",
 	"pezframe-system/std",
@@ -60,7 +60,7 @@ std = [
 ]
 serde = ["dep:serde", "scale-info/serde"]
 runtime-benchmarks = [
-	"bp-relayers/runtime-benchmarks",
+	"pezbp-relayers/runtime-benchmarks",
 	"pezframe-support/runtime-benchmarks",
 	"pezframe-system/runtime-benchmarks",
 	"pezkuwi-teyrchain-primitives/runtime-benchmarks",
diff --git a/pezbridges/pezsnowbridge/primitives/core/src/reward.rs b/pezbridges/pezsnowbridge/primitives/core/src/reward.rs
index be0418fd..5456e043 100644
--- a/pezbridges/pezsnowbridge/primitives/core/src/reward.rs
+++ b/pezbridges/pezsnowbridge/primitives/core/src/reward.rs
@@ -4,7 +4,7 @@
 extern crate alloc;
 
 use crate::reward::RewardPaymentError::{ChargeFeesFailure, XcmSendFailure};
-use bp_relayers::PaymentProcedure;
+use pezbp_relayers::PaymentProcedure;
 use codec::DecodeWithMemTracking;
 use pezframe_support::{dispatch::GetDispatchInfo, PalletError};
 use pezsp_runtime::{
diff --git a/pezbridges/pezsnowbridge/primitives/inbound-queue/Cargo.toml b/pezbridges/pezsnowbridge/primitives/inbound-queue/Cargo.toml
index 298e6228..773615a5 100644
--- a/pezbridges/pezsnowbridge/primitives/inbound-queue/Cargo.toml
+++ b/pezbridges/pezsnowbridge/primitives/inbound-queue/Cargo.toml
@@ -37,7 +37,7 @@ pezsnowbridge-beacon-primitives = { workspace = true }
 pezsnowbridge-core = { workspace = true }
 pezsnowbridge-verification-primitives = { workspace = true }
 
-assets-common = { workspace = true }
+pez-assets-common = { workspace = true }
 
 hex-literal = { workspace = true, default-features = true }
 
@@ -48,7 +48,7 @@ pezsnowbridge-test-utils = { workspace = true }
 default = ["std"]
 std = [
 	"alloy-core/std",
-	"assets-common/std",
+	"pez-assets-common/std",
 	"codec/std",
 	"pezframe-support/std",
 	"pezframe-system/std",
@@ -66,7 +66,7 @@ std = [
 	"xcm/std",
 ]
 runtime-benchmarks = [
-	"assets-common/runtime-benchmarks",
+	"pez-assets-common/runtime-benchmarks",
 	"pezframe-support/runtime-benchmarks",
 	"pezframe-system/runtime-benchmarks",
 	"pezsnowbridge-beacon-primitives/runtime-benchmarks",
@@ -80,7 +80,6 @@ runtime-benchmarks = [
 	"xcm/runtime-benchmarks",
 ]
 try-runtime = [
-	"assets-common/try-runtime",
 	"pezframe-support/try-runtime",
 	"pezframe-system/try-runtime",
 	"pezsp-runtime/try-runtime",
diff --git a/pezbridges/pezsnowbridge/primitives/inbound-queue/src/v2/converter.rs b/pezbridges/pezsnowbridge/primitives/inbound-queue/src/v2/converter.rs
index dcdeb854..1bb3354c 100644
--- a/pezbridges/pezsnowbridge/primitives/inbound-queue/src/v2/converter.rs
+++ b/pezbridges/pezsnowbridge/primitives/inbound-queue/src/v2/converter.rs
@@ -275,7 +275,7 @@ where
 		claimer: Location,
 	) -> Xcm<()> {
 		let bridge_owner_bytes: [u8; 32] = bridge_owner.into();
-		let reserve_data = assets_common::local_and_foreign_assets::ForeignAssetReserveData {
+		let reserve_data = pez_assets_common::local_and_foreign_assets::ForeignAssetReserveData {
 			reserve: Location::new(2, [GlobalConsensus(EthereumNetwork::get())]),
 			teleportable: false,
 		};
diff --git a/pezbridges/pezsnowbridge/test-utils/Cargo.toml b/pezbridges/pezsnowbridge/test-utils/Cargo.toml
index 5fa8d45f..8cc97b6f 100644
--- a/pezbridges/pezsnowbridge/test-utils/Cargo.toml
+++ b/pezbridges/pezsnowbridge/test-utils/Cargo.toml
@@ -17,7 +17,7 @@ workspace = true
 exclude-from-umbrella = true
 
 [dependencies]
-bp-relayers = { workspace = true, default-features = true }
+pezbp-relayers = { workspace = true, default-features = true }
 codec = { workspace = true, default-features = true }
 pezframe-benchmarking = { optional = true, workspace = true, default-features = true }
 pezframe-support = { workspace = true, default-features = true }
@@ -35,7 +35,7 @@ xcm-executor = { workspace = true, default-features = true }
 
 [features]
 runtime-benchmarks = [
-	"bp-relayers/runtime-benchmarks",
+	"pezbp-relayers/runtime-benchmarks",
 	"pezframe-benchmarking/runtime-benchmarks",
 	"pezframe-support/runtime-benchmarks",
 	"pezframe-system/runtime-benchmarks",
diff --git a/pezbridges/pezsnowbridge/test-utils/src/mock_rewards.rs b/pezbridges/pezsnowbridge/test-utils/src/mock_rewards.rs
index dbd9fc8b..81950669 100644
--- a/pezbridges/pezsnowbridge/test-utils/src/mock_rewards.rs
+++ b/pezbridges/pezsnowbridge/test-utils/src/mock_rewards.rs
@@ -1,6 +1,6 @@
 // SPDX-License-Identifier: Apache-2.0
 // SPDX-FileCopyrightText: 2023 Snowfork <hello@snowfork.com>
-use bp_relayers::{PaymentProcedure, RewardLedger, RewardsAccountOwner, RewardsAccountParams};
+use pezbp_relayers::{PaymentProcedure, RewardLedger, RewardsAccountOwner, RewardsAccountParams};
 use codec::{Decode, DecodeWithMemTracking, Encode, MaxEncodedLen};
 use pezframe_support::{parameter_types, pezpallet_prelude::DispatchResult, pezsp_runtime};
 use scale_info::TypeInfo;
@@ -34,7 +34,7 @@ impl PaymentProcedure<pezsp_runtime::AccountId32, RewardsAccountParams<u64>, u12
 	type Beneficiary = Location;
 	fn pay_reward(
 		_who: &pezsp_runtime::AccountId32,
-		_reward_params: bp_relayers::RewardsAccountParams<u64>,
+		_reward_params: pezbp_relayers::RewardsAccountParams<u64>,
 		_reward_balance: u128,
 		_beneficiary: Self::Beneficiary,
 	) -> Result<(), Self::Error> {
diff --git a/pezbridges/primitives/beefy/Cargo.toml b/pezbridges/primitives/beefy/Cargo.toml
index 0813b012..d59a140e 100644
--- a/pezbridges/primitives/beefy/Cargo.toml
+++ b/pezbridges/primitives/beefy/Cargo.toml
@@ -1,5 +1,5 @@
 [package]
-name = "bp-beefy"
+name = "pezbp-beefy"
 description = "Primitives of pezpallet-bridge-beefy module."
 version = "0.1.0"
 authors.workspace = true
diff --git a/pezbridges/primitives/header-chain/Cargo.toml b/pezbridges/primitives/header-chain/Cargo.toml
index 8d02139e..4df39572 100644
--- a/pezbridges/primitives/header-chain/Cargo.toml
+++ b/pezbridges/primitives/header-chain/Cargo.toml
@@ -1,5 +1,5 @@
 [package]
-name = "bp-header-pez-chain"
+name = "pezbp-header-pez-chain"
 description = "A common interface for describing what a bridge pezpallet should be able to do."
 version = "0.7.0"
 authors.workspace = true
@@ -29,7 +29,7 @@ pezsp-runtime = { features = ["serde"], workspace = true }
 pezsp-std = { workspace = true }
 
 [dev-dependencies]
-bp-test-utils = { workspace = true, default-features = true }
+# bp-test-utils = { workspace = true, default-features = true }
 hex = { workspace = true, default-features = true }
 hex-literal = { workspace = true, default-features = true }
 
@@ -48,7 +48,7 @@ std = [
 	"serde/std",
 ]
 runtime-benchmarks = [
-	"bp-test-utils/runtime-benchmarks",
+	# "pezbp-test-utils/runtime-benchmarks",
 	"pezbp-runtime/runtime-benchmarks",
 	"pezframe-support/runtime-benchmarks",
 	"pezsp-consensus-grandpa/runtime-benchmarks",
diff --git a/pezbridges/primitives/header-chain/tests/implementation_match.rs b/pezbridges/primitives/header-chain/tests/implementation_match.rs
index c6f07d80..e512e5e0 100644
--- a/pezbridges/primitives/header-chain/tests/implementation_match.rs
+++ b/pezbridges/primitives/header-chain/tests/implementation_match.rs
@@ -21,11 +21,11 @@
 //! Some of tests in this module may partially duplicate tests from `justification.rs`,
 //! but their purpose is different.
 
-use bp_header_pez_chain::justification::{
+use pezbp_header_pez_chain::justification::{
 	verify_justification, GrandpaJustification, JustificationVerificationContext,
 	JustificationVerificationError, PrecommitError,
 };
-use bp_test_utils::{
+use pezbp_test_utils::{
 	header_id, make_justification_for_header, signed_precommit, test_header, Account,
 	JustificationGeneratorParams, ALICE, BOB, CHARLIE, DAVE, EVE, FERDIE, TEST_GRANDPA_SET_ID,
 };
@@ -38,11 +38,11 @@ type TestHash = <TestHeader as HeaderT>::Hash;
 type TestNumber = <TestHeader as HeaderT>::Number;
 
 /// Implementation of `finality_grandpa::Chain` that is used in tests.
-struct AncestryChain(bp_header_pez_chain::justification::AncestryChain<TestHeader>);
+struct AncestryChain(pezbp_header_pez_chain::justification::AncestryChain<TestHeader>);
 
 impl AncestryChain {
 	fn new(justification: &GrandpaJustification<TestHeader>) -> Self {
-		Self(bp_header_pez_chain::justification::AncestryChain::new(justification).0)
+		Self(pezbp_header_pez_chain::justification::AncestryChain::new(justification).0)
 	}
 }
 
diff --git a/pezbridges/primitives/header-chain/tests/justification/equivocation.rs b/pezbridges/primitives/header-chain/tests/justification/equivocation.rs
index 97209bde..2154d7ab 100644
--- a/pezbridges/primitives/header-chain/tests/justification/equivocation.rs
+++ b/pezbridges/primitives/header-chain/tests/justification/equivocation.rs
@@ -16,8 +16,8 @@
 
 //! Tests for Grandpa equivocations collector code.
 
-use bp_header_pez_chain::justification::EquivocationsCollector;
-use bp_test_utils::*;
+use pezbp_header_pez_chain::justification::EquivocationsCollector;
+use pezbp_test_utils::*;
 use finality_grandpa::Precommit;
 use pezsp_consensus_grandpa::EquivocationProof;
 
diff --git a/pezbridges/primitives/header-chain/tests/justification/optimizer.rs b/pezbridges/primitives/header-chain/tests/justification/optimizer.rs
index d7a1c7ec..201d3c91 100644
--- a/pezbridges/primitives/header-chain/tests/justification/optimizer.rs
+++ b/pezbridges/primitives/header-chain/tests/justification/optimizer.rs
@@ -16,8 +16,8 @@
 
 //! Tests for Grandpa Justification optimizer code.
 
-use bp_header_pez_chain::justification::verify_and_optimize_justification;
-use bp_test_utils::*;
+use pezbp_header_pez_chain::justification::verify_and_optimize_justification;
+use pezbp_test_utils::*;
 use finality_grandpa::SignedPrecommit;
 use pezsp_consensus_grandpa::AuthoritySignature;
 
@@ -43,7 +43,7 @@ fn optimizer_does_noting_with_minimal_justification() {
 fn unknown_authority_votes_are_removed_by_optimizer() {
 	let mut justification = make_default_justification::<TestHeader>(&test_header(1));
 	justification.commit.precommits.push(signed_precommit::<TestHeader>(
-		&bp_test_utils::Account(42),
+		&pezbp_test_utils::Account(42),
 		header_id::<TestHeader>(1),
 		justification.round,
 		TEST_GRANDPA_SET_ID,
diff --git a/pezbridges/primitives/header-chain/tests/justification/strict.rs b/pezbridges/primitives/header-chain/tests/justification/strict.rs
index b4748bbc..32774f76 100644
--- a/pezbridges/primitives/header-chain/tests/justification/strict.rs
+++ b/pezbridges/primitives/header-chain/tests/justification/strict.rs
@@ -16,11 +16,11 @@
 
 //! Tests for Grandpa strict justification verifier code.
 
-use bp_header_pez_chain::justification::{
+use pezbp_header_pez_chain::justification::{
 	required_justification_precommits, verify_justification, JustificationVerificationContext,
 	JustificationVerificationError, PrecommitError,
 };
-use bp_test_utils::*;
+use pezbp_test_utils::*;
 
 type TestHeader = pezsp_runtime::testing::Header;
 
diff --git a/pezbridges/primitives/messages/Cargo.toml b/pezbridges/primitives/messages/Cargo.toml
index 02b10a95..9ea91ca7 100644
--- a/pezbridges/primitives/messages/Cargo.toml
+++ b/pezbridges/primitives/messages/Cargo.toml
@@ -1,5 +1,5 @@
 [package]
-name = "bp-messages"
+name = "pezbp-messages"
 description = "Primitives of messages module."
 version = "0.7.0"
 authors.workspace = true
@@ -18,7 +18,7 @@ scale-info = { features = ["bit-vec", "derive"], workspace = true }
 serde = { features = ["alloc", "derive"], workspace = true }
 
 # Bridge dependencies
-bp-header-pez-chain = { workspace = true }
+pezbp-header-pez-chain = { workspace = true }
 pezbp-runtime = { workspace = true }
 
 # Bizinikiwi Dependencies
@@ -34,7 +34,7 @@ hex-literal = { workspace = true, default-features = true }
 [features]
 default = ["std"]
 std = [
-	"bp-header-pez-chain/std",
+	"pezbp-header-pez-chain/std",
 	"codec/std",
 	"pezbp-runtime/std",
 	"pezframe-support/std",
@@ -45,7 +45,7 @@ std = [
 	"serde/std",
 ]
 runtime-benchmarks = [
-	"bp-header-pez-chain/runtime-benchmarks",
+	"pezbp-header-pez-chain/runtime-benchmarks",
 	"pezbp-runtime/runtime-benchmarks",
 	"pezframe-support/runtime-benchmarks",
 	"pezsp-io/runtime-benchmarks",
diff --git a/pezbridges/primitives/messages/src/lib.rs b/pezbridges/primitives/messages/src/lib.rs
index 13b4fde1..66bf6a44 100644
--- a/pezbridges/primitives/messages/src/lib.rs
+++ b/pezbridges/primitives/messages/src/lib.rs
@@ -19,7 +19,7 @@
 #![warn(missing_docs)]
 #![cfg_attr(not(feature = "std"), no_std)]
 
-use bp_header_pez_chain::HeaderChainError;
+use pezbp_header_pez_chain::HeaderChainError;
 use codec::{Decode, DecodeWithMemTracking, Encode, MaxEncodedLen};
 use pezbp_runtime::{
 	messages::MessageDispatchResult, BasicOperatingMode, Chain, OperatingMode, RangeInclusiveExt,
diff --git a/pezbridges/primitives/pezkuwi-core/Cargo.toml b/pezbridges/primitives/pezkuwi-core/Cargo.toml
index 790a538e..a0fe175b 100644
--- a/pezbridges/primitives/pezkuwi-core/Cargo.toml
+++ b/pezbridges/primitives/pezkuwi-core/Cargo.toml
@@ -1,5 +1,5 @@
 [package]
-name = "bp-pezkuwi-core"
+name = "pezbp-pezkuwi-core"
 description = "Primitives of Pezkuwi-like runtime."
 version = "0.7.0"
 authors.workspace = true
@@ -20,7 +20,7 @@ serde = { optional = true, features = [
 ], workspace = true, default-features = true }
 
 # Bridge Dependencies
-bp-messages = { workspace = true }
+pezbp-messages = { workspace = true }
 pezbp-runtime = { workspace = true }
 
 # Bizinikiwi Based Dependencies
@@ -36,7 +36,7 @@ hex = { workspace = true, default-features = true }
 [features]
 default = ["std"]
 std = [
-	"bp-messages/std",
+	"pezbp-messages/std",
 	"codec/std",
 	"pezbp-runtime/std",
 	"pezframe-support/std",
@@ -48,7 +48,7 @@ std = [
 	"serde",
 ]
 runtime-benchmarks = [
-	"bp-messages/runtime-benchmarks",
+	"pezbp-messages/runtime-benchmarks",
 	"pezbp-runtime/runtime-benchmarks",
 	"pezframe-support/runtime-benchmarks",
 	"pezframe-system/runtime-benchmarks",
diff --git a/pezbridges/primitives/pezkuwi-core/src/lib.rs b/pezbridges/primitives/pezkuwi-core/src/lib.rs
index 9adad31c..0a2363a3 100644
--- a/pezbridges/primitives/pezkuwi-core/src/lib.rs
+++ b/pezbridges/primitives/pezkuwi-core/src/lib.rs
@@ -19,7 +19,7 @@
 #![warn(missing_docs)]
 #![cfg_attr(not(feature = "std"), no_std)]
 
-use bp_messages::MessageNonce;
+use pezbp_messages::MessageNonce;
 use pezbp_runtime::{
 	self,
 	extensions::{
diff --git a/pezbridges/primitives/relayers/Cargo.toml b/pezbridges/primitives/relayers/Cargo.toml
index 8b02acc6..fc7256a9 100644
--- a/pezbridges/primitives/relayers/Cargo.toml
+++ b/pezbridges/primitives/relayers/Cargo.toml
@@ -1,5 +1,5 @@
 [package]
-name = "bp-relayers"
+name = "pezbp-relayers"
 description = "Primitives of relayers module."
 version = "0.7.0"
 authors.workspace = true
@@ -17,9 +17,9 @@ codec = { features = ["bit-vec", "derive"], workspace = true }
 scale-info = { features = ["bit-vec", "derive"], workspace = true }
 
 # Bridge Dependencies
-bp-header-pez-chain = { workspace = true }
-bp-messages = { workspace = true }
-bp-teyrchains = { workspace = true }
+pezbp-header-pez-chain = { workspace = true }
+pezbp-messages = { workspace = true }
+pezbp-teyrchains = { workspace = true }
 pezbp-runtime = { workspace = true }
 
 # Bizinikiwi Dependencies
@@ -35,9 +35,9 @@ hex-literal = { workspace = true, default-features = true }
 [features]
 default = ["std"]
 std = [
-	"bp-header-pez-chain/std",
-	"bp-messages/std",
-	"bp-teyrchains/std",
+	"pezbp-header-pez-chain/std",
+	"pezbp-messages/std",
+	"pezbp-teyrchains/std",
 	"codec/std",
 	"pezbp-runtime/std",
 	"pezframe-support/std",
@@ -48,9 +48,9 @@ std = [
 	"scale-info/std",
 ]
 runtime-benchmarks = [
-	"bp-header-pez-chain/runtime-benchmarks",
-	"bp-messages/runtime-benchmarks",
-	"bp-teyrchains/runtime-benchmarks",
+	"pezbp-header-pez-chain/runtime-benchmarks",
+	"pezbp-messages/runtime-benchmarks",
+	"pezbp-teyrchains/runtime-benchmarks",
 	"pezbp-runtime/runtime-benchmarks",
 	"pezframe-support/runtime-benchmarks",
 	"pezframe-system/runtime-benchmarks",
diff --git a/pezbridges/primitives/relayers/src/extension.rs b/pezbridges/primitives/relayers/src/extension.rs
index 1661544d..49bdea9e 100644
--- a/pezbridges/primitives/relayers/src/extension.rs
+++ b/pezbridges/primitives/relayers/src/extension.rs
@@ -17,9 +17,9 @@
 //! All runtime calls, supported by `pezpallet-bridge-relayers` when it acts as a signed
 //! extension.
 
-use bp_header_pez_chain::SubmitFinalityProofInfo;
-use bp_messages::MessagesCallInfo;
-use bp_teyrchains::SubmitTeyrchainHeadsInfo;
+use pezbp_header_pez_chain::SubmitFinalityProofInfo;
+use pezbp_messages::MessagesCallInfo;
+use pezbp_teyrchains::SubmitTeyrchainHeadsInfo;
 use codec::{Decode, Encode};
 use pezbp_runtime::StaticStrProvider;
 use pezframe_support::{
diff --git a/pezbridges/primitives/relayers/src/lib.rs b/pezbridges/primitives/relayers/src/lib.rs
index e08b47e7..e2a740f4 100644
--- a/pezbridges/primitives/relayers/src/lib.rs
+++ b/pezbridges/primitives/relayers/src/lib.rs
@@ -222,7 +222,7 @@ pub trait RewardLedger<Relayer, Reward, RewardBalance> {
 #[cfg(test)]
 mod tests {
 	use super::*;
-	use bp_messages::{HashedLaneId, LaneIdType, LegacyLaneId};
+	use pezbp_messages::{HashedLaneId, LaneIdType, LegacyLaneId};
 	use pezsp_runtime::{app_crypto::Ss58Codec, testing::H256};
 
 	#[test]
diff --git a/pezbridges/primitives/runtime/src/chain.rs b/pezbridges/primitives/runtime/src/chain.rs
index 8426a18a..e356e93e 100644
--- a/pezbridges/primitives/runtime/src/chain.rs
+++ b/pezbridges/primitives/runtime/src/chain.rs
@@ -363,7 +363,7 @@ macro_rules! decl_bridge_finality_runtime_apis {
 		}
 	};
 	($chain: ident, grandpa) => {
-		decl_bridge_finality_runtime_apis!($chain, grandpa => bp_header_pez_chain::StoredHeaderGrandpaInfo<Header>);
+		decl_bridge_finality_runtime_apis!($chain, grandpa => pezbp_header_pez_chain::StoredHeaderGrandpaInfo<Header>);
 	};
 }
 
@@ -409,9 +409,9 @@ macro_rules! decl_bridge_messages_runtime_apis {
 						/// be missing from the resulting vector. The vector is ordered by the nonce.
 						fn message_details(
 							lane: $lane_id_type,
-							begin: bp_messages::MessageNonce,
-							end: bp_messages::MessageNonce,
-						) -> $crate::private::Vec<bp_messages::OutboundMessageDetails>;
+							begin: pezbp_messages::MessageNonce,
+							end: pezbp_messages::MessageNonce,
+						) -> $crate::private::Vec<pezbp_messages::OutboundMessageDetails>;
 					}
 
 					/// Inbound message lane API for messages sent by this chain.
@@ -425,8 +425,8 @@ macro_rules! decl_bridge_messages_runtime_apis {
 						/// Return details of given inbound messages.
 						fn message_details(
 							lane: $lane_id_type,
-							messages: $crate::private::Vec<(bp_messages::MessagePayload, bp_messages::OutboundMessageDetails)>,
-						) -> $crate::private::Vec<bp_messages::InboundMessageDetails>;
+							messages: $crate::private::Vec<(pezbp_messages::MessagePayload, pezbp_messages::OutboundMessageDetails)>,
+						) -> $crate::private::Vec<pezbp_messages::InboundMessageDetails>;
 					}
 				}
 			}
diff --git a/pezbridges/primitives/test-utils/Cargo.toml b/pezbridges/primitives/test-utils/Cargo.toml
index b390e0ea..083439fd 100644
--- a/pezbridges/primitives/test-utils/Cargo.toml
+++ b/pezbridges/primitives/test-utils/Cargo.toml
@@ -1,5 +1,5 @@
 [package]
-name = "bp-test-utils"
+name = "pezbp-test-utils"
 version = "0.7.0"
 description = "Utilities for testing bizinikiwi-based runtime bridge code"
 authors.workspace = true
@@ -13,9 +13,9 @@ homepage = { workspace = true }
 workspace = true
 
 [dependencies]
-bp-header-pez-chain = { workspace = true }
-bp-pezkuwi-core = { workspace = true }
-bp-teyrchains = { workspace = true }
+pezbp-header-pez-chain = { workspace = true }
+pezbp-pezkuwi-core = { workspace = true }
+pezbp-teyrchains = { workspace = true }
 codec = { workspace = true }
 ed25519-dalek = { workspace = true }
 finality-grandpa = { workspace = true }
@@ -30,9 +30,9 @@ pezsp-trie = { workspace = true }
 [features]
 default = ["std"]
 std = [
-	"bp-header-pez-chain/std",
-	"bp-pezkuwi-core/std",
-	"bp-teyrchains/std",
+	"pezbp-header-pez-chain/std",
+	"pezbp-pezkuwi-core/std",
+	"pezbp-teyrchains/std",
 	"codec/std",
 	"ed25519-dalek/std",
 	"finality-grandpa/std",
@@ -45,9 +45,9 @@ std = [
 	"pezsp-trie/std",
 ]
 runtime-benchmarks = [
-	"bp-header-pez-chain/runtime-benchmarks",
-	"bp-pezkuwi-core/runtime-benchmarks",
-	"bp-teyrchains/runtime-benchmarks",
+	"pezbp-header-pez-chain/runtime-benchmarks",
+	"pezbp-pezkuwi-core/runtime-benchmarks",
+	"pezbp-teyrchains/runtime-benchmarks",
 	"pezbp-runtime/runtime-benchmarks",
 	"pezsp-consensus-grandpa/runtime-benchmarks",
 	"pezsp-runtime/runtime-benchmarks",
diff --git a/pezbridges/primitives/test-utils/src/keyring.rs b/pezbridges/primitives/test-utils/src/keyring.rs
index 8bcff851..cf44d0ec 100644
--- a/pezbridges/primitives/test-utils/src/keyring.rs
+++ b/pezbridges/primitives/test-utils/src/keyring.rs
@@ -16,7 +16,7 @@
 
 //! Utilities for working with test accounts.
 
-use bp_header_pez_chain::{justification::JustificationVerificationContext, AuthoritySet};
+use pezbp_header_pez_chain::{justification::JustificationVerificationContext, AuthoritySet};
 use codec::Encode;
 use ed25519_dalek::{Signature, SigningKey, VerifyingKey};
 use finality_grandpa::voter_set::VoterSet;
diff --git a/pezbridges/primitives/test-utils/src/lib.rs b/pezbridges/primitives/test-utils/src/lib.rs
index b2acae05..9cadadbc 100644
--- a/pezbridges/primitives/test-utils/src/lib.rs
+++ b/pezbridges/primitives/test-utils/src/lib.rs
@@ -19,9 +19,9 @@
 #![warn(missing_docs)]
 #![cfg_attr(not(feature = "std"), no_std)]
 
-use bp_header_pez_chain::justification::{required_justification_precommits, GrandpaJustification};
-use bp_pezkuwi_core::teyrchains::{ParaHash, ParaHead, ParaHeadsProof, ParaId};
-use bp_teyrchains::teyrchain_head_storage_key_at_source;
+use pezbp_header_pez_chain::justification::{required_justification_precommits, GrandpaJustification};
+use pezbp_pezkuwi_core::teyrchains::{ParaHash, ParaHead, ParaHeadsProof, ParaId};
+use pezbp_teyrchains::teyrchain_head_storage_key_at_source;
 use codec::Encode;
 use pezbp_runtime::record_all_trie_keys;
 use pezsp_consensus_grandpa::{AuthorityId, AuthoritySignature, AuthorityWeight, SetId};
diff --git a/pezbridges/primitives/teyrchains/Cargo.toml b/pezbridges/primitives/teyrchains/Cargo.toml
index c4f31dad..30105dff 100644
--- a/pezbridges/primitives/teyrchains/Cargo.toml
+++ b/pezbridges/primitives/teyrchains/Cargo.toml
@@ -1,5 +1,5 @@
 [package]
-name = "bp-teyrchains"
+name = "pezbp-teyrchains"
 description = "Primitives of teyrchains module."
 version = "0.7.0"
 authors.workspace = true
@@ -18,8 +18,8 @@ impl-trait-for-tuples = { workspace = true }
 scale-info = { features = ["derive"], workspace = true }
 
 # Bridge dependencies
-bp-header-pez-chain = { workspace = true }
-bp-pezkuwi-core = { workspace = true }
+pezbp-header-pez-chain = { workspace = true }
+pezbp-pezkuwi-core = { workspace = true }
 pezbp-runtime = { workspace = true }
 
 # Bizinikiwi dependencies
@@ -31,8 +31,8 @@ pezsp-std = { workspace = true }
 [features]
 default = ["std"]
 std = [
-	"bp-header-pez-chain/std",
-	"bp-pezkuwi-core/std",
+	"pezbp-header-pez-chain/std",
+	"pezbp-pezkuwi-core/std",
 	"codec/std",
 	"pezbp-runtime/std",
 	"pezframe-support/std",
@@ -42,8 +42,8 @@ std = [
 	"scale-info/std",
 ]
 runtime-benchmarks = [
-	"bp-header-pez-chain/runtime-benchmarks",
-	"bp-pezkuwi-core/runtime-benchmarks",
+	"pezbp-header-pez-chain/runtime-benchmarks",
+	"pezbp-pezkuwi-core/runtime-benchmarks",
 	"pezbp-runtime/runtime-benchmarks",
 	"pezframe-support/runtime-benchmarks",
 	"pezsp-runtime/runtime-benchmarks",
diff --git a/pezbridges/primitives/teyrchains/src/call_info.rs b/pezbridges/primitives/teyrchains/src/call_info.rs
index 85887001..4589b74f 100644
--- a/pezbridges/primitives/teyrchains/src/call_info.rs
+++ b/pezbridges/primitives/teyrchains/src/call_info.rs
@@ -18,7 +18,7 @@
 
 use crate::{ParaHash, ParaId, RelayBlockHash, RelayBlockNumber};
 
-use bp_pezkuwi_core::teyrchains::ParaHeadsProof;
+use pezbp_pezkuwi_core::teyrchains::ParaHeadsProof;
 use codec::{Decode, Encode};
 use pezbp_runtime::HeaderId;
 use pezsp_runtime::RuntimeDebug;
diff --git a/pezbridges/primitives/teyrchains/src/lib.rs b/pezbridges/primitives/teyrchains/src/lib.rs
index e75843ff..5e5258f4 100644
--- a/pezbridges/primitives/teyrchains/src/lib.rs
+++ b/pezbridges/primitives/teyrchains/src/lib.rs
@@ -19,10 +19,10 @@
 #![warn(missing_docs)]
 #![cfg_attr(not(feature = "std"), no_std)]
 
-pub use bp_header_pez_chain::StoredHeaderData;
+pub use pezbp_header_pez_chain::StoredHeaderData;
 pub use call_info::{BridgeTeyrchainCall, SubmitTeyrchainHeadsInfo};
 
-use bp_pezkuwi_core::teyrchains::{ParaHash, ParaHead, ParaId};
+use pezbp_pezkuwi_core::teyrchains::{ParaHash, ParaHead, ParaId};
 use codec::{Decode, Encode, MaxEncodedLen};
 use pezbp_runtime::{
 	BlockNumberOf, Chain, HashOf, HeaderOf, StorageDoubleMapKeyProvider, StorageMapKeyProvider,
@@ -35,11 +35,11 @@ use pezsp_std::{marker::PhantomData, prelude::*};
 use scale_info::TypeInfo;
 
 /// Block hash of the bridged relay chain.
-pub type RelayBlockHash = bp_pezkuwi_core::Hash;
+pub type RelayBlockHash = pezbp_pezkuwi_core::Hash;
 /// Block number of the bridged relay chain.
-pub type RelayBlockNumber = bp_pezkuwi_core::BlockNumber;
+pub type RelayBlockNumber = pezbp_pezkuwi_core::BlockNumber;
 /// Hasher of the bridged relay chain.
-pub type RelayBlockHasher = bp_pezkuwi_core::Hasher;
+pub type RelayBlockHasher = pezbp_pezkuwi_core::Hasher;
 
 mod call_info;
 
diff --git a/pezbridges/primitives/xcm-bridge-hub-router/Cargo.toml b/pezbridges/primitives/xcm-bridge-hub-router/Cargo.toml
index 9ff07f5c..0e7a072a 100644
--- a/pezbridges/primitives/xcm-bridge-hub-router/Cargo.toml
+++ b/pezbridges/primitives/xcm-bridge-hub-router/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
-name = "bp-xcm-bridge-hub-router"
+name = "pezbp-xcm-bridge-hub-router"
 description = "Primitives of the xcm-bridge-hub fee pezpallet."
-version = "0.6.0"
+version = "0.7.0"
 authors.workspace = true
 edition.workspace = true
 license = "GPL-3.0-or-later WITH Classpath-exception-2.0"
diff --git a/pezbridges/primitives/xcm-bridge-hub/Cargo.toml b/pezbridges/primitives/xcm-bridge-hub/Cargo.toml
index ca932beb..f7f657c4 100644
--- a/pezbridges/primitives/xcm-bridge-hub/Cargo.toml
+++ b/pezbridges/primitives/xcm-bridge-hub/Cargo.toml
@@ -1,5 +1,5 @@
 [package]
-name = "bp-xcm-bridge-hub"
+name = "pezbp-xcm-bridge-hub"
 description = "Primitives of the xcm-bridge-hub pezpallet."
 version = "0.2.0"
 authors.workspace = true
@@ -18,7 +18,7 @@ scale-info = { features = ["derive"], workspace = true }
 serde = { features = ["alloc", "derive"], workspace = true }
 
 # Bridge Dependencies
-bp-messages = { workspace = true }
+pezbp-messages = { workspace = true }
 pezbp-runtime = { workspace = true }
 
 # Bizinikiwi Dependencies
@@ -33,7 +33,7 @@ xcm = { workspace = true }
 [features]
 default = ["std"]
 std = [
-	"bp-messages/std",
+	"pezbp-messages/std",
 	"codec/std",
 	"pezbp-runtime/std",
 	"pezframe-support/std",
@@ -45,7 +45,7 @@ std = [
 	"xcm/std",
 ]
 runtime-benchmarks = [
-	"bp-messages/runtime-benchmarks",
+	"pezbp-messages/runtime-benchmarks",
 	"pezbp-runtime/runtime-benchmarks",
 	"pezframe-support/runtime-benchmarks",
 	"pezsp-io/runtime-benchmarks",
diff --git a/pezbridges/primitives/xcm-bridge-hub/src/call_info.rs b/pezbridges/primitives/xcm-bridge-hub/src/call_info.rs
index 057d5cb2..99bd98db 100644
--- a/pezbridges/primitives/xcm-bridge-hub/src/call_info.rs
+++ b/pezbridges/primitives/xcm-bridge-hub/src/call_info.rs
@@ -16,7 +16,7 @@
 
 //! Defines structures related to calls of the `pezpallet-xcm-bridge-hub` pezpallet.
 
-use bp_messages::MessageNonce;
+use pezbp_messages::MessageNonce;
 use codec::{Decode, Encode};
 use pezsp_std::boxed::Box;
 use scale_info::TypeInfo;
diff --git a/pezbridges/primitives/xcm-bridge-hub/src/lib.rs b/pezbridges/primitives/xcm-bridge-hub/src/lib.rs
index 44093dd4..6dd21776 100644
--- a/pezbridges/primitives/xcm-bridge-hub/src/lib.rs
+++ b/pezbridges/primitives/xcm-bridge-hub/src/lib.rs
@@ -19,7 +19,7 @@
 #![warn(missing_docs)]
 #![cfg_attr(not(feature = "std"), no_std)]
 
-use bp_messages::LaneIdType;
+use pezbp_messages::LaneIdType;
 pub use call_info::XcmBridgeHubCall;
 use codec::{Decode, DecodeWithMemTracking, Encode, MaxEncodedLen};
 use pezbp_runtime::{AccountIdOf, BalanceOf, Chain};
@@ -607,7 +607,7 @@ mod tests {
 
 	#[test]
 	fn calculate_lane_id_works() {
-		type TestLaneId = bp_messages::HashedLaneId;
+		type TestLaneId = pezbp_messages::HashedLaneId;
 
 		let from_local_to_remote = run_successful_test(SuccessfulTest {
 			here_universal_location: [GlobalConsensus(LOCAL_NETWORK), Teyrchain(LOCAL_BRIDGE_HUB)]
diff --git a/pezbridges/relays/client-bizinikiwi/Cargo.toml b/pezbridges/relays/client-bizinikiwi/Cargo.toml
index 54f34a23..8d73b795 100644
--- a/pezbridges/relays/client-bizinikiwi/Cargo.toml
+++ b/pezbridges/relays/client-bizinikiwi/Cargo.toml
@@ -33,9 +33,9 @@ tokio = { features = [
 tracing = { workspace = true }
 
 # Bridge dependencies
-bp-header-pez-chain = { workspace = true, default-features = true }
-bp-messages = { workspace = true, default-features = true }
-bp-pezkuwi-core = { workspace = true, default-features = true }
+pezbp-header-pez-chain = { workspace = true, default-features = true }
+pezbp-messages = { workspace = true, default-features = true }
+pezbp-pezkuwi-core = { workspace = true, default-features = true }
 pez-finality-relay = { workspace = true }
 pezbp-runtime = { workspace = true, default-features = true }
 relay-utils = { workspace = true }
@@ -63,9 +63,9 @@ xcm = { workspace = true, default-features = true }
 default = []
 test-helpers = []
 runtime-benchmarks = [
-	"bp-header-pez-chain/runtime-benchmarks",
-	"bp-messages/runtime-benchmarks",
-	"bp-pezkuwi-core/runtime-benchmarks",
+	"pezbp-header-pez-chain/runtime-benchmarks",
+	"pezbp-messages/runtime-benchmarks",
+	"pezbp-pezkuwi-core/runtime-benchmarks",
 	"pez-finality-relay/runtime-benchmarks",
 	"pezbp-runtime/runtime-benchmarks",
 	"pezframe-support/runtime-benchmarks",
diff --git a/pezbridges/relays/client-bizinikiwi/src/chain.rs b/pezbridges/relays/client-bizinikiwi/src/chain.rs
index f5261b29..9cde6e7a 100644
--- a/pezbridges/relays/client-bizinikiwi/src/chain.rs
+++ b/pezbridges/relays/client-bizinikiwi/src/chain.rs
@@ -17,8 +17,8 @@
 use crate::calls::UtilityCall;
 
 use crate::SimpleRuntimeVersion;
-use bp_header_pez_chain::ChainWithGrandpa as ChainWithGrandpaBase;
-use bp_messages::ChainWithMessages as ChainWithMessagesBase;
+use pezbp_header_pez_chain::ChainWithGrandpa as ChainWithGrandpaBase;
+use pezbp_messages::ChainWithMessages as ChainWithMessagesBase;
 use codec::{Codec, Decode, Encode, MaxEncodedLen};
 use jsonrpsee::core::{DeserializeOwned, Serialize};
 use num_traits::Zero;
diff --git a/pezbridges/relays/client-bizinikiwi/src/error.rs b/pezbridges/relays/client-bizinikiwi/src/error.rs
index 096cfbb4..82ce823f 100644
--- a/pezbridges/relays/client-bizinikiwi/src/error.rs
+++ b/pezbridges/relays/client-bizinikiwi/src/error.rs
@@ -17,8 +17,8 @@
 //! Bizinikiwi node RPC errors.
 
 use crate::{BlockNumberOf, Chain, HashOf, SimpleRuntimeVersion};
-use bp_header_pez_chain::SubmitFinalityProofCallExtras;
-use bp_pezkuwi_core::teyrchains::ParaId;
+use pezbp_header_pez_chain::SubmitFinalityProofCallExtras;
+use pezbp_pezkuwi_core::teyrchains::ParaId;
 use jsonrpsee::core::ClientError as RpcError;
 use pezsc_rpc_api::system::Health;
 use pezsp_core::{storage::StorageKey, Bytes};
diff --git a/pezbridges/relays/client-bizinikiwi/src/sync_header.rs b/pezbridges/relays/client-bizinikiwi/src/sync_header.rs
index 5eda9466..eeb1d840 100644
--- a/pezbridges/relays/client-bizinikiwi/src/sync_header.rs
+++ b/pezbridges/relays/client-bizinikiwi/src/sync_header.rs
@@ -14,7 +14,7 @@
 // You should have received a copy of the GNU General Public License
 // along with Parity Bridges Common.  If not, see <http://www.gnu.org/licenses/>.
 
-use bp_header_pez_chain::ConsensusLogReader;
+use pezbp_header_pez_chain::ConsensusLogReader;
 use pez_finality_relay::SourceHeader as FinalitySourceHeader;
 use pezsp_runtime::traits::Header as HeaderT;
 
diff --git a/pezbridges/relays/client-bizinikiwi/src/test_chain.rs b/pezbridges/relays/client-bizinikiwi/src/test_chain.rs
index d2a8276d..180038cb 100644
--- a/pezbridges/relays/client-bizinikiwi/src/test_chain.rs
+++ b/pezbridges/relays/client-bizinikiwi/src/test_chain.rs
@@ -25,7 +25,7 @@ use crate::{
 	Chain, ChainWithBalances, ChainWithMessages, ChainWithRewards, ChainWithTransactions,
 	Error as BizinikiwiError, SignParam, UnsignedTransaction,
 };
-use bp_messages::{ChainWithMessages as ChainWithMessagesBase, MessageNonce};
+use pezbp_messages::{ChainWithMessages as ChainWithMessagesBase, MessageNonce};
 use codec::{Decode, DecodeWithMemTracking, Encode, MaxEncodedLen};
 use pezbp_runtime::ChainId;
 use pezframe_support::{pezsp_runtime::StateVersion, weights::Weight};
@@ -122,9 +122,9 @@ impl ChainWithMessages for TestChain {
 
 impl ChainWithTransactions for TestChain {
 	type AccountKeyPair = pezsp_core::sr25519::Pair;
-	type SignedTransaction = bp_pezkuwi_core::UncheckedExtrinsic<
+	type SignedTransaction = pezbp_pezkuwi_core::UncheckedExtrinsic<
 		TestRuntimeCall,
-		bp_pezkuwi_core::SuffixedCommonTransactionExtension<(
+		pezbp_pezkuwi_core::SuffixedCommonTransactionExtension<(
 			pezbp_runtime::extensions::BridgeRejectObsoleteHeadersAndMessages,
 			pezbp_runtime::extensions::RefundBridgedTeyrchainMessagesSchema,
 		)>,
diff --git a/pezbridges/relays/equivocation/Cargo.toml b/pezbridges/relays/equivocation/Cargo.toml
index 60178c2a..339198e6 100644
--- a/pezbridges/relays/equivocation/Cargo.toml
+++ b/pezbridges/relays/equivocation/Cargo.toml
@@ -16,7 +16,7 @@ workspace = true
 [dependencies]
 async-std = { features = ["attributes"], workspace = true }
 async-trait = { workspace = true }
-bp-header-pez-chain = { workspace = true, default-features = true }
+pezbp-header-pez-chain = { workspace = true, default-features = true }
 futures = { workspace = true }
 num-traits = { workspace = true, default-features = true }
 pez-finality-relay = { workspace = true }
@@ -25,7 +25,7 @@ tracing = { workspace = true }
 
 [features]
 runtime-benchmarks = [
-	"bp-header-pez-chain/runtime-benchmarks",
+	"pezbp-header-pez-chain/runtime-benchmarks",
 	"pez-finality-relay/runtime-benchmarks",
 	"relay-utils/runtime-benchmarks",
 ]
diff --git a/pezbridges/relays/equivocation/src/block_checker.rs b/pezbridges/relays/equivocation/src/block_checker.rs
index a46cd349..d0dba13f 100644
--- a/pezbridges/relays/equivocation/src/block_checker.rs
+++ b/pezbridges/relays/equivocation/src/block_checker.rs
@@ -19,7 +19,7 @@ use crate::{
 	EquivocationReportingContext, HeaderFinalityInfo, SourceClient, TargetClient,
 };
 
-use bp_header_pez_chain::{FinalityProof, FindEquivocations as FindEquivocationsT};
+use pezbp_header_pez_chain::{FinalityProof, FindEquivocations as FindEquivocationsT};
 use futures::future::{BoxFuture, FutureExt};
 use num_traits::Saturating;
 use pez_finality_relay::FinalityProofsBuf;
diff --git a/pezbridges/relays/equivocation/src/lib.rs b/pezbridges/relays/equivocation/src/lib.rs
index 13b66801..2476b77a 100644
--- a/pezbridges/relays/equivocation/src/lib.rs
+++ b/pezbridges/relays/equivocation/src/lib.rs
@@ -20,7 +20,7 @@ mod mock;
 mod reporter;
 
 use async_trait::async_trait;
-use bp_header_pez_chain::{FinalityProof, FindEquivocations};
+use pezbp_header_pez_chain::{FinalityProof, FindEquivocations};
 use pez_finality_relay::{FinalityPipeline, SourceClientBase};
 use relay_utils::{relay_loop::Client as RelayClient, MaybeConnectionError, TransactionTracker};
 use std::{fmt::Debug, time::Duration};
@@ -47,7 +47,7 @@ pub trait EquivocationDetectionPipeline: FinalityPipeline {
 	>;
 }
 
-type HeaderFinalityInfo<P> = bp_header_pez_chain::HeaderFinalityInfo<
+type HeaderFinalityInfo<P> = pezbp_header_pez_chain::HeaderFinalityInfo<
 	<P as FinalityPipeline>::FinalityProof,
 	<P as EquivocationDetectionPipeline>::FinalityVerificationContext,
 >;
diff --git a/pezbridges/relays/equivocation/src/mock.rs b/pezbridges/relays/equivocation/src/mock.rs
index 56e6e5e5..629903d9 100644
--- a/pezbridges/relays/equivocation/src/mock.rs
+++ b/pezbridges/relays/equivocation/src/mock.rs
@@ -18,7 +18,7 @@
 
 use crate::{EquivocationDetectionPipeline, HeaderFinalityInfo, SourceClient, TargetClient};
 use async_trait::async_trait;
-use bp_header_pez_chain::{FinalityProof, FindEquivocations};
+use pezbp_header_pez_chain::{FinalityProof, FindEquivocations};
 use futures::{Stream, StreamExt};
 use pez_finality_relay::{FinalityPipeline, SourceClientBase};
 use relay_utils::{
diff --git a/pezbridges/relays/finality/Cargo.toml b/pezbridges/relays/finality/Cargo.toml
index cecd9e2c..4f915b58 100644
--- a/pezbridges/relays/finality/Cargo.toml
+++ b/pezbridges/relays/finality/Cargo.toml
@@ -17,7 +17,7 @@ workspace = true
 async-std = { workspace = true }
 async-trait = { workspace = true }
 backoff = { workspace = true }
-bp-header-pez-chain = { workspace = true, default-features = true }
+pezbp-header-pez-chain = { workspace = true, default-features = true }
 futures = { workspace = true }
 num-traits = { workspace = true, default-features = true }
 relay-utils = { workspace = true }
@@ -28,6 +28,6 @@ parking_lot = { workspace = true, default-features = true }
 
 [features]
 runtime-benchmarks = [
-	"bp-header-pez-chain/runtime-benchmarks",
+	"pezbp-header-pez-chain/runtime-benchmarks",
 	"relay-utils/runtime-benchmarks",
 ]
diff --git a/pezbridges/relays/finality/src/base.rs b/pezbridges/relays/finality/src/base.rs
index ecb57bc1..9946326d 100644
--- a/pezbridges/relays/finality/src/base.rs
+++ b/pezbridges/relays/finality/src/base.rs
@@ -15,7 +15,7 @@
 // along with Parity Bridges Common.  If not, see <http://www.gnu.org/licenses/>.
 
 use async_trait::async_trait;
-use bp_header_pez_chain::FinalityProof;
+use pezbp_header_pez_chain::FinalityProof;
 use futures::Stream;
 use relay_utils::relay_loop::Client as RelayClient;
 use std::fmt::Debug;
diff --git a/pezbridges/relays/finality/src/finality_proofs.rs b/pezbridges/relays/finality/src/finality_proofs.rs
index e5a025b5..59a80786 100644
--- a/pezbridges/relays/finality/src/finality_proofs.rs
+++ b/pezbridges/relays/finality/src/finality_proofs.rs
@@ -16,7 +16,7 @@
 
 use crate::{base::SourceClientBase, FinalityPipeline};
 
-use bp_header_pez_chain::FinalityProof;
+use pezbp_header_pez_chain::FinalityProof;
 use futures::{FutureExt, Stream, StreamExt};
 use std::pin::Pin;
 
diff --git a/pezbridges/relays/finality/src/headers.rs b/pezbridges/relays/finality/src/headers.rs
index 8f9a9b7f..6a3e239e 100644
--- a/pezbridges/relays/finality/src/headers.rs
+++ b/pezbridges/relays/finality/src/headers.rs
@@ -19,7 +19,7 @@ use crate::{
 	HeadersToRelay, SourceClient, SourceHeader, TargetClient,
 };
 
-use bp_header_pez_chain::FinalityProof;
+use pezbp_header_pez_chain::FinalityProof;
 use num_traits::Saturating;
 use std::cmp::Ordering;
 
diff --git a/pezbridges/relays/finality/src/lib.rs b/pezbridges/relays/finality/src/lib.rs
index 7a2b0aff..05c8af4e 100644
--- a/pezbridges/relays/finality/src/lib.rs
+++ b/pezbridges/relays/finality/src/lib.rs
@@ -28,7 +28,7 @@ pub use crate::{
 	sync_loop_metrics::SyncLoopMetrics,
 };
 
-use bp_header_pez_chain::ConsensusLogReader;
+use pezbp_header_pez_chain::ConsensusLogReader;
 use relay_utils::{FailedClient, MaybeConnectionError};
 use std::fmt::Debug;
 
diff --git a/pezbridges/relays/finality/src/mock.rs b/pezbridges/relays/finality/src/mock.rs
index b3b6c65c..59a46e60 100644
--- a/pezbridges/relays/finality/src/mock.rs
+++ b/pezbridges/relays/finality/src/mock.rs
@@ -25,7 +25,7 @@ use crate::{
 };
 
 use async_trait::async_trait;
-use bp_header_pez_chain::{FinalityProof, GrandpaConsensusLogReader};
+use pezbp_header_pez_chain::{FinalityProof, GrandpaConsensusLogReader};
 use futures::{Stream, StreamExt};
 use parking_lot::Mutex;
 use relay_utils::{
diff --git a/pezbridges/relays/lib-bizinikiwi-relay/Cargo.toml b/pezbridges/relays/lib-bizinikiwi-relay/Cargo.toml
index 7a1b5bf2..ce13f23b 100644
--- a/pezbridges/relays/lib-bizinikiwi-relay/Cargo.toml
+++ b/pezbridges/relays/lib-bizinikiwi-relay/Cargo.toml
@@ -28,10 +28,10 @@ thiserror = { workspace = true }
 tracing = { workspace = true }
 
 # Bridge dependencies
-bp-header-pez-chain = { workspace = true, default-features = true }
-bp-pezkuwi-core = { workspace = true, default-features = true }
-bp-relayers = { workspace = true, default-features = true }
-bp-teyrchains = { workspace = true, default-features = true }
+pezbp-header-pez-chain = { workspace = true, default-features = true }
+pezbp-pezkuwi-core = { workspace = true, default-features = true }
+pezbp-relayers = { workspace = true, default-features = true }
+pezbp-teyrchains = { workspace = true, default-features = true }
 
 pez-equivocation-detector = { workspace = true }
 pez-finality-relay = { workspace = true }
@@ -44,7 +44,7 @@ pezpallet-bridge-grandpa = { workspace = true, default-features = true }
 pezpallet-bridge-messages = { workspace = true, default-features = true }
 pezpallet-bridge-teyrchains = { workspace = true, default-features = true }
 
-bp-messages = { workspace = true, default-features = true }
+pezbp-messages = { workspace = true, default-features = true }
 pezbp-runtime = { workspace = true, default-features = true }
 
 # Bizinikiwi Dependencies
@@ -63,11 +63,11 @@ scale-info = { features = ["derive"], workspace = true }
 
 [features]
 runtime-benchmarks = [
-	"bp-header-pez-chain/runtime-benchmarks",
-	"bp-messages/runtime-benchmarks",
-	"bp-pezkuwi-core/runtime-benchmarks",
-	"bp-relayers/runtime-benchmarks",
-	"bp-teyrchains/runtime-benchmarks",
+	"pezbp-header-pez-chain/runtime-benchmarks",
+	"pezbp-messages/runtime-benchmarks",
+	"pezbp-pezkuwi-core/runtime-benchmarks",
+	"pezbp-relayers/runtime-benchmarks",
+	"pezbp-teyrchains/runtime-benchmarks",
 	"pez-equivocation-detector/runtime-benchmarks",
 	"pez-finality-relay/runtime-benchmarks",
 	"pez-messages-relay/runtime-benchmarks",
diff --git a/pezbridges/relays/lib-bizinikiwi-relay/src/cli/bridge.rs b/pezbridges/relays/lib-bizinikiwi-relay/src/cli/bridge.rs
index 66d74b46..1737692a 100644
--- a/pezbridges/relays/lib-bizinikiwi-relay/src/cli/bridge.rs
+++ b/pezbridges/relays/lib-bizinikiwi-relay/src/cli/bridge.rs
@@ -22,7 +22,7 @@ use crate::{
 	messages::{BizinikiwiMessageLane, MessagesRelayLimits},
 	teyrchains::BizinikiwiTeyrchainsPipeline,
 };
-use bp_teyrchains::{RelayBlockHash, RelayBlockHasher, RelayBlockNumber};
+use pezbp_teyrchains::{RelayBlockHash, RelayBlockHasher, RelayBlockNumber};
 use relay_bizinikiwi_client::{
 	Chain, ChainWithRuntimeVersion, ChainWithTransactions, RelayChain, Teyrchain,
 };
diff --git a/pezbridges/relays/lib-bizinikiwi-relay/src/cli/mod.rs b/pezbridges/relays/lib-bizinikiwi-relay/src/cli/mod.rs
index 5621ddce..e8f5adf2 100644
--- a/pezbridges/relays/lib-bizinikiwi-relay/src/cli/mod.rs
+++ b/pezbridges/relays/lib-bizinikiwi-relay/src/cli/mod.rs
@@ -141,7 +141,7 @@ where
 #[cfg(test)]
 mod tests {
 	use super::*;
-	use bp_messages::{HashedLaneId, LegacyLaneId};
+	use pezbp_messages::{HashedLaneId, LegacyLaneId};
 	use pezsp_core::H256;
 
 	#[test]
diff --git a/pezbridges/relays/lib-bizinikiwi-relay/src/cli/relay_headers_and_messages/relay_to_teyrchain.rs b/pezbridges/relays/lib-bizinikiwi-relay/src/cli/relay_headers_and_messages/relay_to_teyrchain.rs
index 8e6f58b5..06b4f38f 100644
--- a/pezbridges/relays/lib-bizinikiwi-relay/src/cli/relay_headers_and_messages/relay_to_teyrchain.rs
+++ b/pezbridges/relays/lib-bizinikiwi-relay/src/cli/relay_headers_and_messages/relay_to_teyrchain.rs
@@ -33,8 +33,8 @@ use crate::{
 		headers::OnDemandHeadersRelay, teyrchains::OnDemandTeyrchainsRelay, OnDemandRelay,
 	},
 };
-use bp_pezkuwi_core::teyrchains::ParaHash;
-use bp_teyrchains::{RelayBlockHash, RelayBlockHasher, RelayBlockNumber};
+use pezbp_pezkuwi_core::teyrchains::ParaHash;
+use pezbp_teyrchains::{RelayBlockHash, RelayBlockHasher, RelayBlockNumber};
 use pezsp_core::Pair;
 use relay_bizinikiwi_client::{
 	AccountIdOf, AccountKeyPairOf, Chain, ChainWithRuntimeVersion, ChainWithTransactions, Client,
diff --git a/pezbridges/relays/lib-bizinikiwi-relay/src/cli/relay_headers_and_messages/teyrchain_to_teyrchain.rs b/pezbridges/relays/lib-bizinikiwi-relay/src/cli/relay_headers_and_messages/teyrchain_to_teyrchain.rs
index 16c8719a..d9ffc2f2 100644
--- a/pezbridges/relays/lib-bizinikiwi-relay/src/cli/relay_headers_and_messages/teyrchain_to_teyrchain.rs
+++ b/pezbridges/relays/lib-bizinikiwi-relay/src/cli/relay_headers_and_messages/teyrchain_to_teyrchain.rs
@@ -30,8 +30,8 @@ use crate::{
 		headers::OnDemandHeadersRelay, teyrchains::OnDemandTeyrchainsRelay, OnDemandRelay,
 	},
 };
-use bp_pezkuwi_core::teyrchains::ParaHash;
-use bp_teyrchains::{RelayBlockHash, RelayBlockHasher, RelayBlockNumber};
+use pezbp_pezkuwi_core::teyrchains::ParaHash;
+use pezbp_teyrchains::{RelayBlockHash, RelayBlockHasher, RelayBlockNumber};
 use pezsp_core::Pair;
 use relay_bizinikiwi_client::{
 	AccountIdOf, AccountKeyPairOf, Chain, ChainWithRuntimeVersion, ChainWithTransactions, Client,
diff --git a/pezbridges/relays/lib-bizinikiwi-relay/src/cli/relay_messages.rs b/pezbridges/relays/lib-bizinikiwi-relay/src/cli/relay_messages.rs
index c630659b..ae20ac87 100644
--- a/pezbridges/relays/lib-bizinikiwi-relay/src/cli/relay_messages.rs
+++ b/pezbridges/relays/lib-bizinikiwi-relay/src/cli/relay_messages.rs
@@ -26,7 +26,7 @@ use async_trait::async_trait;
 use clap::Parser;
 use pezsp_core::Pair;
 
-use bp_messages::MessageNonce;
+use pezbp_messages::MessageNonce;
 use pezbp_runtime::HeaderIdProvider;
 use pezsp_runtime::traits::TryConvert;
 use relay_bizinikiwi_client::{
diff --git a/pezbridges/relays/lib-bizinikiwi-relay/src/cli/relay_teyrchains.rs b/pezbridges/relays/lib-bizinikiwi-relay/src/cli/relay_teyrchains.rs
index ee9789e7..64ecd9f4 100644
--- a/pezbridges/relays/lib-bizinikiwi-relay/src/cli/relay_teyrchains.rs
+++ b/pezbridges/relays/lib-bizinikiwi-relay/src/cli/relay_teyrchains.rs
@@ -18,7 +18,7 @@
 
 use async_std::sync::Mutex;
 use async_trait::async_trait;
-use bp_pezkuwi_core::BlockNumber as RelayBlockNumber;
+use pezbp_pezkuwi_core::BlockNumber as RelayBlockNumber;
 use clap::Parser;
 use pezbp_runtime::HeaderIdProvider;
 use relay_bizinikiwi_client::{Client, Teyrchain};
diff --git a/pezbridges/relays/lib-bizinikiwi-relay/src/equivocation/target.rs b/pezbridges/relays/lib-bizinikiwi-relay/src/equivocation/target.rs
index 4e094694..f36aca62 100644
--- a/pezbridges/relays/lib-bizinikiwi-relay/src/equivocation/target.rs
+++ b/pezbridges/relays/lib-bizinikiwi-relay/src/equivocation/target.rs
@@ -25,7 +25,7 @@ use crate::{
 };
 
 use async_trait::async_trait;
-use bp_header_pez_chain::HeaderFinalityInfo;
+use pezbp_header_pez_chain::HeaderFinalityInfo;
 use pez_equivocation_detector::TargetClient;
 use pezbp_runtime::{BlockNumberOf, HashOf};
 use pezsp_runtime::traits::Header;
diff --git a/pezbridges/relays/lib-bizinikiwi-relay/src/finality/mod.rs b/pezbridges/relays/lib-bizinikiwi-relay/src/finality/mod.rs
index 7c2df4cd..e881e3f8 100644
--- a/pezbridges/relays/lib-bizinikiwi-relay/src/finality/mod.rs
+++ b/pezbridges/relays/lib-bizinikiwi-relay/src/finality/mod.rs
@@ -24,7 +24,7 @@ use crate::{
 };
 
 use async_trait::async_trait;
-use bp_header_pez_chain::justification::{GrandpaJustification, JustificationVerificationContext};
+use pezbp_header_pez_chain::justification::{GrandpaJustification, JustificationVerificationContext};
 use pez_finality_relay::{
 	FinalityPipeline, FinalitySyncPipeline, HeadersToRelay, SourceClient, TargetClient,
 };
@@ -175,13 +175,13 @@ macro_rules! generate_submit_finality_proof_call_builder {
 						<$pipeline as $crate::finality_base::BizinikiwiFinalityPipeline>::SourceChain
 					>
 				>,
-				proof: bp_header_pez_chain::justification::GrandpaJustification<
+				proof: pezbp_header_pez_chain::justification::GrandpaJustification<
 					relay_bizinikiwi_client::HeaderOf<
 						<$pipeline as $crate::finality_base::BizinikiwiFinalityPipeline>::SourceChain
 					>
 				>,
 				_is_free_execution_expected: bool,
-				_context: bp_header_pez_chain::justification::JustificationVerificationContext,
+				_context: pezbp_header_pez_chain::justification::JustificationVerificationContext,
 			) -> relay_bizinikiwi_client::CallOf<
 				<$pipeline as $crate::finality_base::BizinikiwiFinalityPipeline>::TargetChain
 			> {
@@ -215,13 +215,13 @@ macro_rules! generate_submit_finality_proof_ex_call_builder {
 						<$pipeline as $crate::finality_base::BizinikiwiFinalityPipeline>::SourceChain
 					>
 				>,
-				proof: bp_header_pez_chain::justification::GrandpaJustification<
+				proof: pezbp_header_pez_chain::justification::GrandpaJustification<
 					relay_bizinikiwi_client::HeaderOf<
 						<$pipeline as $crate::finality_base::BizinikiwiFinalityPipeline>::SourceChain
 					>
 				>,
 				is_free_execution_expected: bool,
-				context: bp_header_pez_chain::justification::JustificationVerificationContext,
+				context: pezbp_header_pez_chain::justification::JustificationVerificationContext,
 			) -> relay_bizinikiwi_client::CallOf<
 				<$pipeline as $crate::finality_base::BizinikiwiFinalityPipeline>::TargetChain
 			> {
diff --git a/pezbridges/relays/lib-bizinikiwi-relay/src/finality/source.rs b/pezbridges/relays/lib-bizinikiwi-relay/src/finality/source.rs
index f6bb51df..b5a31722 100644
--- a/pezbridges/relays/lib-bizinikiwi-relay/src/finality/source.rs
+++ b/pezbridges/relays/lib-bizinikiwi-relay/src/finality/source.rs
@@ -25,7 +25,7 @@ use crate::{
 
 use async_std::sync::{Arc, Mutex};
 use async_trait::async_trait;
-use bp_header_pez_chain::FinalityProof;
+use pezbp_header_pez_chain::FinalityProof;
 use codec::Decode;
 use futures::{
 	select,
diff --git a/pezbridges/relays/lib-bizinikiwi-relay/src/finality_base/engine.rs b/pezbridges/relays/lib-bizinikiwi-relay/src/finality_base/engine.rs
index e2defb22..a4fdd204 100644
--- a/pezbridges/relays/lib-bizinikiwi-relay/src/finality_base/engine.rs
+++ b/pezbridges/relays/lib-bizinikiwi-relay/src/finality_base/engine.rs
@@ -18,7 +18,7 @@
 
 use crate::error::Error;
 use async_trait::async_trait;
-use bp_header_pez_chain::{
+use pezbp_header_pez_chain::{
 	justification::{
 		verify_and_optimize_justification, GrandpaEquivocationsFinder, GrandpaJustification,
 		JustificationVerificationContext,
@@ -189,15 +189,15 @@ impl<C: ChainWithGrandpa> Engine<C> for Grandpa<C> {
 		pezsp_consensus_grandpa::EquivocationProof<HashOf<C>, BlockNumberOf<C>>;
 	type EquivocationsFinder = GrandpaEquivocationsFinder<C>;
 	type KeyOwnerProof = C::KeyOwnerProof;
-	type InitializationData = bp_header_pez_chain::InitializationData<C::Header>;
+	type InitializationData = pezbp_header_pez_chain::InitializationData<C::Header>;
 	type OperatingMode = BasicOperatingMode;
 
 	fn is_initialized_key() -> StorageKey {
-		bp_header_pez_chain::storage_keys::best_finalized_key(C::WITH_CHAIN_GRANDPA_PALLET_NAME)
+		pezbp_header_pez_chain::storage_keys::best_finalized_key(C::WITH_CHAIN_GRANDPA_PALLET_NAME)
 	}
 
 	fn pezpallet_operating_mode_key() -> StorageKey {
-		bp_header_pez_chain::storage_keys::pezpallet_operating_mode_key(
+		pezbp_header_pez_chain::storage_keys::pezpallet_operating_mode_key(
 			C::WITH_CHAIN_GRANDPA_PALLET_NAME,
 		)
 	}
@@ -242,7 +242,7 @@ impl<C: ChainWithGrandpa> Engine<C> for Grandpa<C> {
 		header: &C::Header,
 		proof: &Self::FinalityProof,
 	) -> SubmitFinalityProofCallExtras {
-		bp_header_pez_chain::submit_finality_proof_limits_extras::<C>(header, proof)
+		pezbp_header_pez_chain::submit_finality_proof_limits_extras::<C>(header, proof)
 	}
 
 	/// Prepare initialization data for the GRANDPA verifier pezpallet.
@@ -356,7 +356,7 @@ impl<C: ChainWithGrandpa> Engine<C> for Grandpa<C> {
 			}
 		}
 
-		Ok(bp_header_pez_chain::InitializationData {
+		Ok(pezbp_header_pez_chain::InitializationData {
 			header: Box::new(initial_header),
 			authority_list: initial_authorities_set,
 			set_id: if schedules_change {
@@ -373,7 +373,7 @@ impl<C: ChainWithGrandpa> Engine<C> for Grandpa<C> {
 		at: HashOf<TargetChain>,
 	) -> Result<Self::FinalityVerificationContext, BizinikiwiError> {
 		let current_authority_set_key =
-			bp_header_pez_chain::storage_keys::current_authority_set_key(
+			pezbp_header_pez_chain::storage_keys::current_authority_set_key(
 				C::WITH_CHAIN_GRANDPA_PALLET_NAME,
 			);
 		let authority_set: AuthoritySet = target_client
diff --git a/pezbridges/relays/lib-bizinikiwi-relay/src/messages/metrics.rs b/pezbridges/relays/lib-bizinikiwi-relay/src/messages/metrics.rs
index 7ff9e937..644f5338 100644
--- a/pezbridges/relays/lib-bizinikiwi-relay/src/messages/metrics.rs
+++ b/pezbridges/relays/lib-bizinikiwi-relay/src/messages/metrics.rs
@@ -18,7 +18,7 @@
 
 use crate::TaggedAccount;
 
-use bp_relayers::{RewardsAccountOwner, RewardsAccountParams};
+use pezbp_relayers::{RewardsAccountOwner, RewardsAccountParams};
 use codec::{Decode, EncodeLike};
 use pez_messages_relay::Labeled;
 use pezframe_system::AccountInfo;
diff --git a/pezbridges/relays/lib-bizinikiwi-relay/src/messages/mod.rs b/pezbridges/relays/lib-bizinikiwi-relay/src/messages/mod.rs
index 33a9cbdf..055962a5 100644
--- a/pezbridges/relays/lib-bizinikiwi-relay/src/messages/mod.rs
+++ b/pezbridges/relays/lib-bizinikiwi-relay/src/messages/mod.rs
@@ -26,7 +26,7 @@ use crate::{
 };
 
 use async_std::sync::Arc;
-use bp_messages::{
+use pezbp_messages::{
 	target_chain::FromBridgedChainMessagesProof, ChainWithMessages as _, MessageNonce,
 };
 use codec::{Codec, Encode, EncodeLike};
@@ -459,7 +459,7 @@ macro_rules! generate_receive_message_proof_call_builder {
 					<$pipeline as $crate::messages::BizinikiwiMessageLane>::LaneId
 				>,
 				messages_count: u32,
-				dispatch_weight: bp_messages::Weight,
+				dispatch_weight: pezbp_messages::Weight,
 				_trace_call: bool,
 			) -> relay_bizinikiwi_client::CallOf<
 				<$pipeline as $crate::messages::BizinikiwiMessageLane>::TargetChain
@@ -686,7 +686,7 @@ where
 #[cfg(test)]
 mod tests {
 	use super::*;
-	use bp_messages::{
+	use pezbp_messages::{
 		source_chain::FromBridgedChainMessagesDeliveryProof, LaneIdType, UnrewardedRelayersState,
 	};
 	use relay_bizinikiwi_client::calls::{UtilityCall as MockUtilityCall, UtilityCall};
@@ -698,7 +698,7 @@ mod tests {
 		#[codec(index = 123)]
 		Utility(UtilityCall<RuntimeCall>),
 	}
-	pub type CodegenBridgeMessagesCall = bp_messages::BridgeMessagesCall<
+	pub type CodegenBridgeMessagesCall = pezbp_messages::BridgeMessagesCall<
 		u64,
 		Box<FromBridgedChainMessagesProof<mock::BridgedHeaderHash, mock::TestLaneIdType>>,
 		FromBridgedChainMessagesDeliveryProof<mock::BridgedHeaderHash, mock::TestLaneIdType>,
@@ -825,7 +825,7 @@ mod tests {
 	#[allow(unexpected_cfgs)]
 	mod mock {
 		use super::super::*;
-		use bp_messages::{target_chain::ForbidInboundMessages, HashedLaneId};
+		use pezbp_messages::{target_chain::ForbidInboundMessages, HashedLaneId};
 		use pezbp_runtime::ChainId;
 		use pezframe_support::derive_impl;
 		use pezsp_core::H256;
@@ -888,7 +888,7 @@ mod tests {
 			}
 		}
 
-		impl bp_messages::ChainWithMessages for ThisUnderlyingChain {
+		impl pezbp_messages::ChainWithMessages for ThisUnderlyingChain {
 			const WITH_CHAIN_MESSAGES_PALLET_NAME: &'static str = "";
 			const MAX_UNREWARDED_RELAYERS_IN_CONFIRMATION_TX: MessageNonce = 16;
 			const MAX_UNCONFIRMED_MESSAGES_IN_CONFIRMATION_TX: MessageNonce = 1000;
@@ -918,7 +918,7 @@ mod tests {
 			}
 		}
 
-		impl bp_messages::ChainWithMessages for BridgedUnderlyingChain {
+		impl pezbp_messages::ChainWithMessages for BridgedUnderlyingChain {
 			const WITH_CHAIN_MESSAGES_PALLET_NAME: &'static str = "";
 			const MAX_UNREWARDED_RELAYERS_IN_CONFIRMATION_TX: MessageNonce = 16;
 			const MAX_UNCONFIRMED_MESSAGES_IN_CONFIRMATION_TX: MessageNonce = 1000;
@@ -926,7 +926,7 @@ mod tests {
 
 		pub struct BridgedHeaderChain;
 
-		impl bp_header_pez_chain::HeaderChain<BridgedUnderlyingChain> for BridgedHeaderChain {
+		impl pezbp_header_pez_chain::HeaderChain<BridgedUnderlyingChain> for BridgedHeaderChain {
 			fn finalized_header_state_root(
 				_hash: HashOf<BridgedUnderlyingChain>,
 			) -> Option<HashOf<BridgedUnderlyingChain>> {
diff --git a/pezbridges/relays/lib-bizinikiwi-relay/src/messages/source.rs b/pezbridges/relays/lib-bizinikiwi-relay/src/messages/source.rs
index 90fdc493..1b2f432b 100644
--- a/pezbridges/relays/lib-bizinikiwi-relay/src/messages/source.rs
+++ b/pezbridges/relays/lib-bizinikiwi-relay/src/messages/source.rs
@@ -31,7 +31,7 @@ use crate::{
 
 use async_std::sync::Arc;
 use async_trait::async_trait;
-use bp_messages::{
+use pezbp_messages::{
 	storage_keys::{operating_mode_key, outbound_lane_data_key},
 	target_chain::FromBridgedChainMessagesProof,
 	ChainWithMessages as _, InboundMessageDetails, MessageNonce, MessagePayload,
@@ -63,7 +63,7 @@ use std::ops::RangeInclusive;
 pub type BizinikiwiMessagesProof<C, L> = (Weight, FromBridgedChainMessagesProof<HashOf<C>, L>);
 type MessagesToRefine<'a> = Vec<(MessagePayload, &'a mut OutboundMessageDetails)>;
 
-/// Outbound lane data - for backwards compatibility with `bp_messages::OutboundLaneData` which has
+/// Outbound lane data - for backwards compatibility with `pezbp_messages::OutboundLaneData` which has
 /// additional `lane_state` attribute.
 ///
 /// TODO: remove - https://github.com/pezkuwichain/pezkuwi-sdk/issues/22
@@ -247,7 +247,7 @@ where
 
 			// for pay-at-target messages we may want to ask target chain for
 			// refined dispatch weight
-			let msg_key = bp_messages::storage_keys::message_key(
+			let msg_key = pezbp_messages::storage_keys::message_key(
 				P::TargetChain::WITH_CHAIN_MESSAGES_PALLET_NAME,
 				&self.lane_id,
 				out_msg_details.nonce,
@@ -338,7 +338,7 @@ where
 	> {
 		let mut storage_keys = Vec::with_capacity(nonces.saturating_len() as usize);
 		for message_nonce in nonces.clone() {
-			let message_key = bp_messages::storage_keys::message_key(
+			let message_key = pezbp_messages::storage_keys::message_key(
 				P::TargetChain::WITH_CHAIN_MESSAGES_PALLET_NAME,
 				&self.lane_id,
 				message_nonce,
@@ -593,7 +593,7 @@ fn split_msgs_to_refine<Source: Chain + ChainWithMessages, Target: Chain, LaneId
 #[cfg(test)]
 mod tests {
 	use super::*;
-	use bp_messages::{HashedLaneId, LaneIdType};
+	use pezbp_messages::{HashedLaneId, LaneIdType};
 	use relay_bizinikiwi_client::test_chain::TestChain;
 
 	/// Lane identifier type used for tests.
@@ -604,7 +604,7 @@ mod tests {
 	) -> Vec<OutboundMessageDetails> {
 		nonces
 			.into_iter()
-			.map(|nonce| bp_messages::OutboundMessageDetails {
+			.map(|nonce| pezbp_messages::OutboundMessageDetails {
 				nonce,
 				dispatch_weight: Weight::zero(),
 				size: 0,
@@ -761,17 +761,17 @@ mod tests {
 		let bytes_without_state =
 			vec![1, 0, 0, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 3, 0, 0, 0, 0, 0, 0, 0];
 		let bytes_with_state = {
-			// add state byte `bp_messages::LaneState::Opened`
+			// add state byte `pezbp_messages::LaneState::Opened`
 			let mut b = bytes_without_state.clone();
 			b.push(0);
 			b
 		};
 
-		let full = bp_messages::OutboundLaneData {
+		let full = pezbp_messages::OutboundLaneData {
 			oldest_unpruned_nonce: 1,
 			latest_received_nonce: 2,
 			latest_generated_nonce: 3,
-			state: bp_messages::LaneState::Opened,
+			state: pezbp_messages::LaneState::Opened,
 		};
 		assert_eq!(full.encode(), bytes_with_state);
 		assert_ne!(full.encode(), bytes_without_state);
diff --git a/pezbridges/relays/lib-bizinikiwi-relay/src/messages/target.rs b/pezbridges/relays/lib-bizinikiwi-relay/src/messages/target.rs
index 8a12ba04..bd986162 100644
--- a/pezbridges/relays/lib-bizinikiwi-relay/src/messages/target.rs
+++ b/pezbridges/relays/lib-bizinikiwi-relay/src/messages/target.rs
@@ -34,7 +34,7 @@ use crate::{
 
 use async_std::sync::Arc;
 use async_trait::async_trait;
-use bp_messages::{
+use pezbp_messages::{
 	source_chain::FromBridgedChainMessagesDeliveryProof, storage_keys::inbound_lane_data_key,
 	ChainWithMessages as _, LaneState, MessageNonce, UnrewardedRelayer, UnrewardedRelayersState,
 };
@@ -55,7 +55,7 @@ use std::{collections::VecDeque, convert::TryFrom, ops::RangeInclusive};
 pub type BizinikiwiMessagesDeliveryProof<C, L> =
 	(UnrewardedRelayersState, FromBridgedChainMessagesDeliveryProof<HashOf<C>, L>);
 
-/// Inbound lane data - for backwards compatibility with `bp_messages::InboundLaneData` which has
+/// Inbound lane data - for backwards compatibility with `pezbp_messages::InboundLaneData` which has
 /// additional `lane_state` attribute.
 ///
 /// TODO: remove - https://github.com/pezkuwichain/pezkuwi-sdk/issues/22
@@ -66,14 +66,14 @@ struct LegacyInboundLaneData<RelayerId> {
 }
 impl<RelayerId> Default for LegacyInboundLaneData<RelayerId> {
 	fn default() -> Self {
-		let full = bp_messages::InboundLaneData::default();
+		let full = pezbp_messages::InboundLaneData::default();
 		Self { relayers: full.relayers, last_confirmed_nonce: full.last_confirmed_nonce }
 	}
 }
 
 impl<RelayerId> LegacyInboundLaneData<RelayerId> {
 	pub fn last_delivered_nonce(self) -> MessageNonce {
-		bp_messages::InboundLaneData {
+		pezbp_messages::InboundLaneData {
 			relayers: self.relayers,
 			last_confirmed_nonce: self.last_confirmed_nonce,
 			// we don't care about the state here
@@ -85,7 +85,7 @@ impl<RelayerId> LegacyInboundLaneData<RelayerId> {
 
 impl<RelayerId> From<LegacyInboundLaneData<RelayerId>> for UnrewardedRelayersState {
 	fn from(value: LegacyInboundLaneData<RelayerId>) -> Self {
-		(&bp_messages::InboundLaneData {
+		(&pezbp_messages::InboundLaneData {
 			relayers: value.relayers,
 			last_confirmed_nonce: value.last_confirmed_nonce,
 			// we don't care about the state here
@@ -366,7 +366,7 @@ fn make_messages_delivery_call<P: BizinikiwiMessageLane>(
 #[cfg(test)]
 mod tests {
 	use super::*;
-	use bp_messages::{DeliveredMessages, UnrewardedRelayer};
+	use pezbp_messages::{DeliveredMessages, UnrewardedRelayer};
 	use codec::Encode;
 
 	#[test]
@@ -374,13 +374,13 @@ mod tests {
 		let bytes_without_state =
 			vec![4, 0, 2, 0, 0, 0, 0, 0, 0, 0, 5, 0, 0, 0, 0, 0, 0, 0, 6, 0, 0, 0, 0, 0, 0, 0];
 		let bytes_with_state = {
-			// add state byte `bp_messages::LaneState::Opened`
+			// add state byte `pezbp_messages::LaneState::Opened`
 			let mut b = bytes_without_state.clone();
 			b.push(0);
 			b
 		};
 
-		let full = bp_messages::InboundLaneData::<u8> {
+		let full = pezbp_messages::InboundLaneData::<u8> {
 			relayers: vec![UnrewardedRelayer {
 				relayer: Default::default(),
 				messages: DeliveredMessages { begin: 2, end: 5 },
@@ -388,7 +388,7 @@ mod tests {
 			.into_iter()
 			.collect(),
 			last_confirmed_nonce: 6,
-			state: bp_messages::LaneState::Opened,
+			state: pezbp_messages::LaneState::Opened,
 		};
 		assert_eq!(full.encode(), bytes_with_state);
 		assert_ne!(full.encode(), bytes_without_state);
diff --git a/pezbridges/relays/lib-bizinikiwi-relay/src/on_demand/headers.rs b/pezbridges/relays/lib-bizinikiwi-relay/src/on_demand/headers.rs
index d9958d22..d55f396a 100644
--- a/pezbridges/relays/lib-bizinikiwi-relay/src/on_demand/headers.rs
+++ b/pezbridges/relays/lib-bizinikiwi-relay/src/on_demand/headers.rs
@@ -20,7 +20,7 @@ use crate::finality::SubmitFinalityProofCallBuilder;
 
 use async_std::sync::{Arc, Mutex};
 use async_trait::async_trait;
-use bp_header_pez_chain::ConsensusLogReader;
+use pezbp_header_pez_chain::ConsensusLogReader;
 use futures::{select, FutureExt};
 use num_traits::{One, Saturating, Zero};
 use pezbp_runtime::HeaderIdProvider;
diff --git a/pezbridges/relays/lib-bizinikiwi-relay/src/on_demand/teyrchains.rs b/pezbridges/relays/lib-bizinikiwi-relay/src/on_demand/teyrchains.rs
index c2155e89..1288279f 100644
--- a/pezbridges/relays/lib-bizinikiwi-relay/src/on_demand/teyrchains.rs
+++ b/pezbridges/relays/lib-bizinikiwi-relay/src/on_demand/teyrchains.rs
@@ -31,8 +31,8 @@ use async_std::{
 	sync::{Arc, Mutex},
 };
 use async_trait::async_trait;
-use bp_pezkuwi_core::teyrchains::{ParaHash, ParaId};
-use bp_teyrchains::{RelayBlockHash, RelayBlockHasher, RelayBlockNumber};
+use pezbp_pezkuwi_core::teyrchains::{ParaHash, ParaId};
+use pezbp_teyrchains::{RelayBlockHash, RelayBlockHasher, RelayBlockNumber};
 use futures::{select, FutureExt};
 use num_traits::Zero;
 use pezbp_runtime::HeaderIdProvider;
diff --git a/pezbridges/relays/lib-bizinikiwi-relay/src/teyrchains/mod.rs b/pezbridges/relays/lib-bizinikiwi-relay/src/teyrchains/mod.rs
index 044d0dae..db94dfa7 100644
--- a/pezbridges/relays/lib-bizinikiwi-relay/src/teyrchains/mod.rs
+++ b/pezbridges/relays/lib-bizinikiwi-relay/src/teyrchains/mod.rs
@@ -18,8 +18,8 @@
 //! teyrchain finality proofs synchronization pipelines.
 
 use async_trait::async_trait;
-use bp_pezkuwi_core::teyrchains::{ParaHash, ParaHeadsProof, ParaId};
-use bp_teyrchains::{RelayBlockHash, RelayBlockHasher, RelayBlockNumber};
+use pezbp_pezkuwi_core::teyrchains::{ParaHash, ParaHeadsProof, ParaId};
+use pezbp_teyrchains::{RelayBlockHash, RelayBlockHasher, RelayBlockNumber};
 use pezpallet_bridge_teyrchains::{Call as BridgeTeyrchainsCall, Config as BridgeTeyrchainsConfig};
 use relay_bizinikiwi_client::{
 	CallOf, Chain, ChainWithTransactions, HeaderIdOf, RelayChain, Teyrchain,
diff --git a/pezbridges/relays/lib-bizinikiwi-relay/src/teyrchains/source.rs b/pezbridges/relays/lib-bizinikiwi-relay/src/teyrchains/source.rs
index 2a22a14f..1bcbb85f 100644
--- a/pezbridges/relays/lib-bizinikiwi-relay/src/teyrchains/source.rs
+++ b/pezbridges/relays/lib-bizinikiwi-relay/src/teyrchains/source.rs
@@ -22,8 +22,8 @@ use crate::{
 };
 use async_std::sync::{Arc, Mutex};
 use async_trait::async_trait;
-use bp_pezkuwi_core::teyrchains::{ParaHash, ParaHead, ParaHeadsProof, ParaId};
-use bp_teyrchains::teyrchain_head_storage_key_at_source;
+use pezbp_pezkuwi_core::teyrchains::{ParaHash, ParaHead, ParaHeadsProof, ParaId};
+use pezbp_teyrchains::teyrchain_head_storage_key_at_source;
 use codec::Decode;
 use pezbp_runtime::HeaderIdProvider;
 use relay_bizinikiwi_client::{
diff --git a/pezbridges/relays/lib-bizinikiwi-relay/src/teyrchains/target.rs b/pezbridges/relays/lib-bizinikiwi-relay/src/teyrchains/target.rs
index e9e3835a..e66a9026 100644
--- a/pezbridges/relays/lib-bizinikiwi-relay/src/teyrchains/target.rs
+++ b/pezbridges/relays/lib-bizinikiwi-relay/src/teyrchains/target.rs
@@ -24,11 +24,11 @@ use crate::{
 };
 
 use async_trait::async_trait;
-use bp_pezkuwi_core::{
+use pezbp_pezkuwi_core::{
 	teyrchains::{ParaHash, ParaHeadsProof, ParaId},
 	BlockNumber as RelayBlockNumber,
 };
-use bp_teyrchains::{
+use pezbp_teyrchains::{
 	ImportedParaHeadsKeyProvider, ParaInfo, ParaStoredHeaderData, ParasInfoKeyProvider,
 };
 use pezbp_runtime::{
diff --git a/pezbridges/relays/messages/Cargo.toml b/pezbridges/relays/messages/Cargo.toml
index 3c9e3b58..c4774d42 100644
--- a/pezbridges/relays/messages/Cargo.toml
+++ b/pezbridges/relays/messages/Cargo.toml
@@ -23,7 +23,7 @@ parking_lot = { workspace = true, default-features = true }
 tracing = { workspace = true }
 
 # Bridge Dependencies
-bp-messages = { workspace = true, default-features = true }
+pezbp-messages = { workspace = true, default-features = true }
 pez-finality-relay = { workspace = true }
 relay-utils = { workspace = true }
 
@@ -34,7 +34,7 @@ pezsp-core = { workspace = true }
 
 [features]
 runtime-benchmarks = [
-	"bp-messages/runtime-benchmarks",
+	"pezbp-messages/runtime-benchmarks",
 	"pez-finality-relay/runtime-benchmarks",
 	"relay-utils/runtime-benchmarks",
 ]
diff --git a/pezbridges/relays/messages/src/message_lane_loop.rs b/pezbridges/relays/messages/src/message_lane_loop.rs
index d2e8a7e6..fe4f0025 100644
--- a/pezbridges/relays/messages/src/message_lane_loop.rs
+++ b/pezbridges/relays/messages/src/message_lane_loop.rs
@@ -29,7 +29,7 @@ use std::{collections::BTreeMap, fmt::Debug, future::Future, ops::RangeInclusive
 use async_trait::async_trait;
 use futures::{channel::mpsc::unbounded, future::FutureExt, stream::StreamExt};
 
-use bp_messages::{MessageNonce, UnrewardedRelayersState, Weight};
+use pezbp_messages::{MessageNonce, UnrewardedRelayersState, Weight};
 use relay_utils::{
 	interval, metrics::MetricsParams, process_future_result, relay_loop::Client as RelayClient,
 	retry_backoff, FailedClient, TransactionTracker,
@@ -471,7 +471,7 @@ async fn run_until_connection_lost<P: MessageLane, SC: SourceClient<P>, TC: Targ
 pub(crate) mod tests {
 	use std::sync::Arc;
 
-	use bp_messages::{HashedLaneId, LaneIdType, LegacyLaneId};
+	use pezbp_messages::{HashedLaneId, LaneIdType, LegacyLaneId};
 	use futures::stream::StreamExt;
 	use parking_lot::Mutex;
 	use relay_utils::{HeaderId, MaybeConnectionError, TrackedTransactionStatus};
diff --git a/pezbridges/relays/messages/src/message_race_delivery.rs b/pezbridges/relays/messages/src/message_race_delivery.rs
index 6aa34b15..0e9de299 100644
--- a/pezbridges/relays/messages/src/message_race_delivery.rs
+++ b/pezbridges/relays/messages/src/message_race_delivery.rs
@@ -18,7 +18,7 @@ use std::{collections::VecDeque, marker::PhantomData, ops::RangeInclusive};
 use async_trait::async_trait;
 use futures::stream::FusedStream;
 
-use bp_messages::{MessageNonce, UnrewardedRelayersState, Weight};
+use pezbp_messages::{MessageNonce, UnrewardedRelayersState, Weight};
 use relay_utils::{FailedClient, TrackedTransactionStatus, TransactionTracker};
 
 use crate::{
diff --git a/pezbridges/relays/messages/src/message_race_limits.rs b/pezbridges/relays/messages/src/message_race_limits.rs
index 50bd94f1..2a27b8ac 100644
--- a/pezbridges/relays/messages/src/message_race_limits.rs
+++ b/pezbridges/relays/messages/src/message_race_limits.rs
@@ -19,7 +19,7 @@
 use num_traits::Zero;
 use std::ops::RangeInclusive;
 
-use bp_messages::{MessageNonce, Weight};
+use pezbp_messages::{MessageNonce, Weight};
 
 use crate::{
 	message_lane::MessageLane,
diff --git a/pezbridges/relays/messages/src/message_race_loop.rs b/pezbridges/relays/messages/src/message_race_loop.rs
index 54d6a507..6b3d7f53 100644
--- a/pezbridges/relays/messages/src/message_race_loop.rs
+++ b/pezbridges/relays/messages/src/message_race_loop.rs
@@ -23,7 +23,7 @@
 use crate::message_lane_loop::{BatchTransaction, ClientState, NoncesSubmitArtifacts};
 
 use async_trait::async_trait;
-use bp_messages::MessageNonce;
+use pezbp_messages::MessageNonce;
 use futures::{
 	future::{FutureExt, TryFutureExt},
 	stream::{FusedStream, StreamExt},
diff --git a/pezbridges/relays/messages/src/message_race_receiving.rs b/pezbridges/relays/messages/src/message_race_receiving.rs
index 8e53a656..ed98afcc 100644
--- a/pezbridges/relays/messages/src/message_race_receiving.rs
+++ b/pezbridges/relays/messages/src/message_race_receiving.rs
@@ -28,7 +28,7 @@ use crate::{
 };
 
 use async_trait::async_trait;
-use bp_messages::MessageNonce;
+use pezbp_messages::MessageNonce;
 use futures::stream::FusedStream;
 use relay_utils::{FailedClient, TrackedTransactionStatus, TransactionTracker};
 use std::{marker::PhantomData, ops::RangeInclusive};
diff --git a/pezbridges/relays/messages/src/message_race_strategy.rs b/pezbridges/relays/messages/src/message_race_strategy.rs
index 471dc0f8..38301078 100644
--- a/pezbridges/relays/messages/src/message_race_strategy.rs
+++ b/pezbridges/relays/messages/src/message_race_strategy.rs
@@ -22,7 +22,7 @@ use crate::message_race_loop::{
 };
 
 use async_trait::async_trait;
-use bp_messages::MessageNonce;
+use pezbp_messages::MessageNonce;
 use relay_utils::HeaderId;
 use std::{collections::VecDeque, fmt::Debug, marker::PhantomData, ops::RangeInclusive};
 
diff --git a/pezbridges/relays/messages/src/metrics.rs b/pezbridges/relays/messages/src/metrics.rs
index 276bbeb0..61fde051 100644
--- a/pezbridges/relays/messages/src/metrics.rs
+++ b/pezbridges/relays/messages/src/metrics.rs
@@ -21,7 +21,7 @@ use crate::{
 	message_lane_loop::{SourceClientState, TargetClientState},
 };
 
-use bp_messages::{HashedLaneId, LegacyLaneId, MessageNonce};
+use pezbp_messages::{HashedLaneId, LegacyLaneId, MessageNonce};
 use pez_finality_relay::SyncLoopMetrics;
 use relay_utils::metrics::{
 	metric_name, register, GaugeVec, Metric, Opts, PrometheusError, Registry, U64,
diff --git a/pezbridges/relays/teyrchains/Cargo.toml b/pezbridges/relays/teyrchains/Cargo.toml
index 630df96f..97113da8 100644
--- a/pezbridges/relays/teyrchains/Cargo.toml
+++ b/pezbridges/relays/teyrchains/Cargo.toml
@@ -21,7 +21,7 @@ relay-utils = { workspace = true }
 tracing = { workspace = true }
 
 # Bridge dependencies
-bp-pezkuwi-core = { workspace = true, default-features = true }
+pezbp-pezkuwi-core = { workspace = true, default-features = true }
 relay-bizinikiwi-client = { workspace = true }
 
 [dev-dependencies]
@@ -30,7 +30,7 @@ relay-bizinikiwi-client = { features = ["test-helpers"], workspace = true }
 
 [features]
 runtime-benchmarks = [
-	"bp-pezkuwi-core/runtime-benchmarks",
+	"pezbp-pezkuwi-core/runtime-benchmarks",
 	"relay-bizinikiwi-client/runtime-benchmarks",
 	"relay-utils/runtime-benchmarks",
 ]
diff --git a/pezbridges/relays/teyrchains/src/teyrchains_loop.rs b/pezbridges/relays/teyrchains/src/teyrchains_loop.rs
index b426802f..31d28a45 100644
--- a/pezbridges/relays/teyrchains/src/teyrchains_loop.rs
+++ b/pezbridges/relays/teyrchains/src/teyrchains_loop.rs
@@ -17,7 +17,7 @@
 use crate::{teyrchains_loop_metrics::TeyrchainsLoopMetrics, TeyrchainsPipeline};
 
 use async_trait::async_trait;
-use bp_pezkuwi_core::{
+use pezbp_pezkuwi_core::{
 	teyrchains::{ParaHash, ParaHeadsProof, ParaId},
 	BlockNumber as RelayBlockNumber,
 };
diff --git a/pezbridges/relays/teyrchains/src/teyrchains_loop_metrics.rs b/pezbridges/relays/teyrchains/src/teyrchains_loop_metrics.rs
index 5adb0774..5c554c38 100644
--- a/pezbridges/relays/teyrchains/src/teyrchains_loop_metrics.rs
+++ b/pezbridges/relays/teyrchains/src/teyrchains_loop_metrics.rs
@@ -14,7 +14,7 @@
 // You should have received a copy of the GNU General Public License
 // along with Parity Bridges Common.  If not, see <http://www.gnu.org/licenses/>.
 
-use bp_pezkuwi_core::teyrchains::ParaId;
+use pezbp_pezkuwi_core::teyrchains::ParaId;
 use relay_utils::{
 	metrics::{metric_name, register, Gauge, Metric, PrometheusError, Registry, U64},
 	UniqueSaturatedInto,
diff --git a/pezcumulus/client/collator/Cargo.toml b/pezcumulus/client/collator/Cargo.toml
index 5324bb34..7f3dca1c 100644
--- a/pezcumulus/client/collator/Cargo.toml
+++ b/pezcumulus/client/collator/Cargo.toml
@@ -45,22 +45,22 @@ pezsp-state-machine = { workspace = true, default-features = true }
 pezsp-tracing = { workspace = true, default-features = true }
 
 # Pezkuwi
-pezkuwi-node-subsystem-test-helpers = { workspace = true }
+# pezkuwi-node-subsystem-test-helpers = { workspace = true }
 
 # Pezcumulus
-pezcumulus-test-client = { workspace = true }
-pezcumulus-test-relay-sproof-builder = { workspace = true, default-features = true }
-pezcumulus-test-runtime = { workspace = true }
+# pezcumulus-test-client = { workspace = true }
+# pezcumulus-test-relay-sproof-builder = { workspace = true, default-features = true }
+# pezcumulus-test-runtime = { workspace = true }
 
 [features]
 runtime-benchmarks = [
 	"pezcumulus-client-consensus-common/runtime-benchmarks",
 	"pezcumulus-client-network/runtime-benchmarks",
 	"pezcumulus-primitives-core/runtime-benchmarks",
-	"pezcumulus-test-client/runtime-benchmarks",
-	"pezcumulus-test-relay-sproof-builder/runtime-benchmarks",
-	"pezcumulus-test-runtime/runtime-benchmarks",
-	"pezkuwi-node-subsystem-test-helpers/runtime-benchmarks",
+	# "pezcumulus-test-client/runtime-benchmarks",
+	# "pezcumulus-test-relay-sproof-builder/runtime-benchmarks",
+	# "pezcumulus-test-runtime/runtime-benchmarks",
+	# "pezkuwi-node-subsystem-test-helpers/runtime-benchmarks",
 	"pezkuwi-node-subsystem/runtime-benchmarks",
 	"pezkuwi-overseer/runtime-benchmarks",
 	"pezkuwi-pez-node-primitives/runtime-benchmarks",
diff --git a/pezcumulus/client/consensus/aura/Cargo.toml b/pezcumulus/client/consensus/aura/Cargo.toml
index e2c678a4..4b8da9d9 100644
--- a/pezcumulus/client/consensus/aura/Cargo.toml
+++ b/pezcumulus/client/consensus/aura/Cargo.toml
@@ -62,8 +62,8 @@ pezkuwi-pez-node-primitives = { workspace = true, default-features = true }
 pezkuwi-primitives = { workspace = true, default-features = true }
 
 [dev-dependencies]
-pezcumulus-test-client = { workspace = true }
-pezcumulus-test-relay-sproof-builder = { workspace = true }
+# pezcumulus-test-client = { workspace = true }
+# pezcumulus-test-relay-sproof-builder = { workspace = true }
 pezsp-keyring = { workspace = true }
 pezsp-tracing = { workspace = true }
 pezsp-version = { workspace = true }
@@ -78,8 +78,8 @@ runtime-benchmarks = [
 	"pezcumulus-primitives-aura/runtime-benchmarks",
 	"pezcumulus-primitives-core/runtime-benchmarks",
 	"pezcumulus-relay-chain-interface/runtime-benchmarks",
-	"pezcumulus-test-client/runtime-benchmarks",
-	"pezcumulus-test-relay-sproof-builder/runtime-benchmarks",
+	# "pezcumulus-test-client/runtime-benchmarks",
+	# "pezcumulus-test-relay-sproof-builder/runtime-benchmarks",
 	"pezkuwi-node-subsystem-util/runtime-benchmarks",
 	"pezkuwi-node-subsystem/runtime-benchmarks",
 	"pezkuwi-overseer/runtime-benchmarks",
diff --git a/pezcumulus/client/network/Cargo.toml b/pezcumulus/client/network/Cargo.toml
index 1ab61b01..152e0bca 100644
--- a/pezcumulus/client/network/Cargo.toml
+++ b/pezcumulus/client/network/Cargo.toml
@@ -35,7 +35,7 @@ pezsp-version = { workspace = true, default-features = true }
 pezkuwi-node-subsystem = { workspace = true, default-features = true }
 pezkuwi-pez-node-primitives = { workspace = true, default-features = true }
 pezkuwi-primitives = { workspace = true, default-features = true }
-pezkuwi-primitives-test-helpers = { workspace = true, default-features = true }
+# pezkuwi-primitives-test-helpers = { workspace = true, default-features = true }
 pezkuwi-teyrchain-primitives = { workspace = true, default-features = true }
 
 # Pezcumulus
@@ -50,24 +50,24 @@ pezsp-keyring = { workspace = true, default-features = true }
 pezsp-keystore = { workspace = true, default-features = true }
 
 # Pezkuwi
-pezkuwi-test-client = { workspace = true }
+# pezkuwi-test-client = { workspace = true }
 
 # Pezcumulus
 pezcumulus-primitives-core = { workspace = true, default-features = true }
-pezcumulus-relay-chain-inprocess-interface = { workspace = true, default-features = true }
-pezcumulus-test-service = { workspace = true }
+# pezcumulus-relay-chain-inprocess-interface = { workspace = true, default-features = true }
+# pezcumulus-test-service = { workspace = true }
 
 [features]
 runtime-benchmarks = [
 	"pezcumulus-primitives-core/runtime-benchmarks",
-	"pezcumulus-relay-chain-inprocess-interface/runtime-benchmarks",
+	# "pezcumulus-relay-chain-inprocess-interface/runtime-benchmarks",
 	"pezcumulus-relay-chain-interface/runtime-benchmarks",
-	"pezcumulus-test-service/runtime-benchmarks",
+	# "pezcumulus-test-service/runtime-benchmarks",
 	"pezkuwi-node-subsystem/runtime-benchmarks",
 	"pezkuwi-pez-node-primitives/runtime-benchmarks",
-	"pezkuwi-primitives-test-helpers/runtime-benchmarks",
+	# "pezkuwi-primitives-test-helpers/runtime-benchmarks",
 	"pezkuwi-primitives/runtime-benchmarks",
-	"pezkuwi-test-client/runtime-benchmarks",
+	# "pezkuwi-test-client/runtime-benchmarks",
 	"pezkuwi-teyrchain-primitives/runtime-benchmarks",
 	"pezsc-client-api/runtime-benchmarks",
 	"pezsc-network/runtime-benchmarks",
diff --git a/pezcumulus/client/relay-chain-inprocess-interface/Cargo.toml b/pezcumulus/client/relay-chain-inprocess-interface/Cargo.toml
index 777d5a1d..ce0c5b44 100644
--- a/pezcumulus/client/relay-chain-inprocess-interface/Cargo.toml
+++ b/pezcumulus/client/relay-chain-inprocess-interface/Cargo.toml
@@ -47,7 +47,7 @@ pezsp-keyring = { workspace = true, default-features = true }
 
 # Pezkuwi
 metered = { features = ["futures_channel"], workspace = true }
-pezkuwi-test-client = { workspace = true }
+# pezkuwi-test-client = { workspace = true }
 
 [features]
 runtime-benchmarks = [
@@ -57,7 +57,7 @@ runtime-benchmarks = [
 	"pezkuwi-cli/runtime-benchmarks",
 	"pezkuwi-primitives/runtime-benchmarks",
 	"pezkuwi-service/runtime-benchmarks",
-	"pezkuwi-test-client/runtime-benchmarks",
+	# "pezkuwi-test-client/runtime-benchmarks",
 	"pezsc-cli/runtime-benchmarks",
 	"pezsc-client-api/runtime-benchmarks",
 	"pezsc-network/runtime-benchmarks",
diff --git a/pezcumulus/client/teyrchain-inherent/Cargo.toml b/pezcumulus/client/teyrchain-inherent/Cargo.toml
index b289fb50..68e50d10 100644
--- a/pezcumulus/client/teyrchain-inherent/Cargo.toml
+++ b/pezcumulus/client/teyrchain-inherent/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "pezcumulus-client-teyrchain-inherent"
-version = "0.1.0"
+version = "0.1.1"
 authors.workspace = true
 edition.workspace = true
 description = "Inherent that needs to be present in every teyrchain block. Contains messages and a relay chain storage-proof."
@@ -28,14 +28,16 @@ pezsp-storage = { workspace = true, default-features = true }
 pezcumulus-primitives-core = { workspace = true, default-features = true }
 pezcumulus-primitives-teyrchain-inherent = { workspace = true, default-features = true }
 pezcumulus-relay-chain-interface = { workspace = true, default-features = true }
-pezcumulus-test-relay-sproof-builder = { workspace = true, default-features = true }
+pezcumulus-test-relay-sproof-builder = { optional = true, workspace = true, default-features = true }
 
 [features]
+default = []
+mock = ["pezcumulus-test-relay-sproof-builder"]
 runtime-benchmarks = [
 	"pezcumulus-primitives-core/runtime-benchmarks",
 	"pezcumulus-primitives-teyrchain-inherent/runtime-benchmarks",
 	"pezcumulus-relay-chain-interface/runtime-benchmarks",
-	"pezcumulus-test-relay-sproof-builder/runtime-benchmarks",
+	"pezcumulus-test-relay-sproof-builder?/runtime-benchmarks",
 	"pezsc-client-api/runtime-benchmarks",
 	"pezsc-consensus-babe/runtime-benchmarks",
 	"pezsp-inherents/runtime-benchmarks",
diff --git a/pezcumulus/client/teyrchain-inherent/src/lib.rs b/pezcumulus/client/teyrchain-inherent/src/lib.rs
index b8141dae..338b3823 100644
--- a/pezcumulus/client/teyrchain-inherent/src/lib.rs
+++ b/pezcumulus/client/teyrchain-inherent/src/lib.rs
@@ -16,9 +16,11 @@
 
 //! Client side code for generating the teyrchain inherent.
 
+#[cfg(feature = "mock")]
 mod mock;
 
 use codec::Decode;
+#[cfg(feature = "mock")]
 pub use mock::{MockValidationDataInherentDataProvider, MockXcmConfig};
 use pezcumulus_primitives_core::{
 	relay_chain::{
diff --git a/pezcumulus/pezkuwi-omni-node/lib/Cargo.toml b/pezcumulus/pezkuwi-omni-node/lib/Cargo.toml
index 79168bda..86db8465 100644
--- a/pezcumulus/pezkuwi-omni-node/lib/Cargo.toml
+++ b/pezcumulus/pezkuwi-omni-node/lib/Cargo.toml
@@ -102,7 +102,7 @@ pezcumulus-client-consensus-common = { workspace = true, default-features = true
 pezcumulus-client-consensus-proposer = { workspace = true, default-features = true }
 pezcumulus-client-consensus-relay-chain = { workspace = true, default-features = true }
 pezcumulus-client-service = { workspace = true, default-features = true }
-pezcumulus-client-teyrchain-inherent = { workspace = true, default-features = true }
+pezcumulus-client-teyrchain-inherent = { workspace = true, default-features = true, features = ["mock"] }
 pezcumulus-primitives-aura = { workspace = true, default-features = true }
 pezcumulus-primitives-core = { workspace = true, default-features = true }
 pezcumulus-relay-chain-interface = { workspace = true, default-features = true }
diff --git a/pezcumulus/pezpallets/xcmp-queue/Cargo.toml b/pezcumulus/pezpallets/xcmp-queue/Cargo.toml
index 0833ec90..60825c4f 100644
--- a/pezcumulus/pezpallets/xcmp-queue/Cargo.toml
+++ b/pezcumulus/pezpallets/xcmp-queue/Cargo.toml
@@ -42,7 +42,7 @@ bounded-collections = { workspace = true }
 pezframe-benchmarking = { optional = true, workspace = true }
 
 # Bridges
-bp-xcm-bridge-hub-router = { optional = true, workspace = true }
+pezbp-xcm-bridge-hub-router = { optional = true, workspace = true }
 
 [dev-dependencies]
 # Bizinikiwi
@@ -60,7 +60,7 @@ default = ["std"]
 std = [
 	"approx/std",
 	"bounded-collections/std",
-	"bp-xcm-bridge-hub-router?/std",
+	"pezbp-xcm-bridge-hub-router?/std",
 	"codec/std",
 	"pezcumulus-primitives-core/std",
 	"pezframe-benchmarking?/std",
@@ -79,7 +79,7 @@ std = [
 	"xcm/std",
 ]
 runtime-benchmarks = [
-	"bp-xcm-bridge-hub-router?/runtime-benchmarks",
+	"pezbp-xcm-bridge-hub-router?/runtime-benchmarks",
 	"pezcumulus-pezpallet-teyrchain-system/runtime-benchmarks",
 	"pezcumulus-primitives-core/runtime-benchmarks",
 	"pezframe-benchmarking/runtime-benchmarks",
@@ -105,4 +105,4 @@ try-runtime = [
 	"pezpallet-message-queue/try-runtime",
 	"pezsp-runtime/try-runtime",
 ]
-bridging = ["bp-xcm-bridge-hub-router"]
+bridging = ["pezbp-xcm-bridge-hub-router"]
diff --git a/pezcumulus/pezpallets/xcmp-queue/src/bridging.rs b/pezcumulus/pezpallets/xcmp-queue/src/bridging.rs
index 97f8004f..c543bace 100644
--- a/pezcumulus/pezpallets/xcmp-queue/src/bridging.rs
+++ b/pezcumulus/pezpallets/xcmp-queue/src/bridging.rs
@@ -17,11 +17,11 @@ use crate::{pezpallet, OutboundState};
 use pezcumulus_primitives_core::ParaId;
 use xcm::latest::prelude::*;
 
-/// Adapter implementation for `bp_xcm_bridge_hub_router::XcmChannelStatusProvider` which checks
+/// Adapter implementation for `pezbp_xcm_bridge_hub_router::XcmChannelStatusProvider` which checks
 /// both `OutboundXcmpStatus` and `InboundXcmpStatus` for defined `Location` if any of those is
 /// suspended.
 pub struct InAndOutXcmpChannelStatusProvider<Runtime>(core::marker::PhantomData<Runtime>);
-impl<Runtime: crate::Config> bp_xcm_bridge_hub_router::XcmChannelStatusProvider
+impl<Runtime: crate::Config> pezbp_xcm_bridge_hub_router::XcmChannelStatusProvider
 	for InAndOutXcmpChannelStatusProvider<Runtime>
 {
 	fn is_congested(with: &Location) -> bool {
@@ -46,7 +46,7 @@ impl<Runtime: crate::Config> bp_xcm_bridge_hub_router::XcmChannelStatusProvider
 }
 
 /// Adapter implementation for `bp_xcm_bridge::ChannelStatusProvider` and/or
-/// `bp_xcm_bridge_hub_router::XcmChannelStatusProvider` which checks only `OutboundXcmpStatus`
+/// `pezbp_xcm_bridge_hub_router::XcmChannelStatusProvider` which checks only `OutboundXcmpStatus`
 /// for defined `Location` if is suspended.
 pub struct OutXcmpChannelStatusProvider<Runtime>(core::marker::PhantomData<Runtime>);
 impl<Runtime: crate::Config> OutXcmpChannelStatusProvider<Runtime> {
@@ -87,7 +87,7 @@ impl<Runtime: crate::Config> OutXcmpChannelStatusProvider<Runtime> {
 	}
 }
 
-impl<Runtime: crate::Config> bp_xcm_bridge_hub_router::XcmChannelStatusProvider
+impl<Runtime: crate::Config> pezbp_xcm_bridge_hub_router::XcmChannelStatusProvider
 	for OutXcmpChannelStatusProvider<Runtime>
 {
 	fn is_congested(with: &Location) -> bool {
diff --git a/pezcumulus/test/relay-sproof-builder/Cargo.toml b/pezcumulus/test/relay-sproof-builder/Cargo.toml
index c7b3e605..9ee6add9 100644
--- a/pezcumulus/test/relay-sproof-builder/Cargo.toml
+++ b/pezcumulus/test/relay-sproof-builder/Cargo.toml
@@ -8,7 +8,7 @@ description = "Mocked relay state proof builder for testing Pezcumulus."
 homepage.workspace = true
 repository.workspace = true
 documentation.workspace = true
-publish = false
+publish = true
 
 [lints]
 workspace = true
diff --git a/pezcumulus/test/runtime/Cargo.toml b/pezcumulus/test/runtime/Cargo.toml
index 0ae2869b..e4163054 100644
--- a/pezcumulus/test/runtime/Cargo.toml
+++ b/pezcumulus/test/runtime/Cargo.toml
@@ -3,7 +3,7 @@ name = "pezcumulus-test-runtime"
 version = "0.1.0"
 authors.workspace = true
 edition.workspace = true
-publish = false
+publish = true
 description = "Pezkuwi SDK cumulus/teyrchain component: test runtime"
 documentation.workspace = true
 repository = { workspace = true }
diff --git a/pezcumulus/teyrchains/integration-tests/emulated/chains/teyrchains/assets/asset-hub-pezkuwichain/Cargo.toml b/pezcumulus/teyrchains/integration-tests/emulated/chains/teyrchains/assets/asset-hub-pezkuwichain/Cargo.toml
index 3dcf610b..5b5cf705 100644
--- a/pezcumulus/teyrchains/integration-tests/emulated/chains/teyrchains/assets/asset-hub-pezkuwichain/Cargo.toml
+++ b/pezcumulus/teyrchains/integration-tests/emulated/chains/teyrchains/assets/asset-hub-pezkuwichain/Cargo.toml
@@ -34,12 +34,12 @@ xcm = { workspace = true }
 xcm-builder = { workspace = true, default-features = true }
 
 # Bridges
-bp-bridge-hub-pezkuwichain = { workspace = true }
+pezbp-bridge-hub-pezkuwichain = { workspace = true }
 
 [features]
 runtime-benchmarks = [
 	"asset-hub-pezkuwichain-runtime/runtime-benchmarks",
-	"bp-bridge-hub-pezkuwichain/runtime-benchmarks",
+	"pezbp-bridge-hub-pezkuwichain/runtime-benchmarks",
 	"emulated-integration-tests-common/runtime-benchmarks",
 	"pezcumulus-primitives-core/runtime-benchmarks",
 	"pezframe-support/runtime-benchmarks",
diff --git a/pezcumulus/teyrchains/integration-tests/emulated/chains/teyrchains/assets/asset-hub-pezkuwichain/src/lib.rs b/pezcumulus/teyrchains/integration-tests/emulated/chains/teyrchains/assets/asset-hub-pezkuwichain/src/lib.rs
index 98e178fa..9d618809 100644
--- a/pezcumulus/teyrchains/integration-tests/emulated/chains/teyrchains/assets/asset-hub-pezkuwichain/src/lib.rs
+++ b/pezcumulus/teyrchains/integration-tests/emulated/chains/teyrchains/assets/asset-hub-pezkuwichain/src/lib.rs
@@ -73,5 +73,5 @@ impl_bridge_helpers_for_chain!(
 	AssetHubPezkuwichain,
 	ParaPezpallet,
 	PezkuwiXcm,
-	bp_bridge_hub_pezkuwichain::RuntimeCall::XcmOverBridgeHubZagros
+	pezbp_bridge_hub_pezkuwichain::RuntimeCall::XcmOverBridgeHubZagros
 );
diff --git a/pezcumulus/teyrchains/integration-tests/emulated/chains/teyrchains/assets/asset-hub-zagros/Cargo.toml b/pezcumulus/teyrchains/integration-tests/emulated/chains/teyrchains/assets/asset-hub-zagros/Cargo.toml
index 1bf2d715..34aabf8b 100644
--- a/pezcumulus/teyrchains/integration-tests/emulated/chains/teyrchains/assets/asset-hub-zagros/Cargo.toml
+++ b/pezcumulus/teyrchains/integration-tests/emulated/chains/teyrchains/assets/asset-hub-zagros/Cargo.toml
@@ -34,12 +34,12 @@ xcm = { workspace = true }
 xcm-builder = { workspace = true, default-features = true }
 
 # Bridges
-bp-bridge-hub-zagros = { workspace = true }
+pezbp-bridge-hub-zagros = { workspace = true }
 
 [features]
 runtime-benchmarks = [
 	"asset-hub-zagros-runtime/runtime-benchmarks",
-	"bp-bridge-hub-zagros/runtime-benchmarks",
+	"pezbp-bridge-hub-zagros/runtime-benchmarks",
 	"emulated-integration-tests-common/runtime-benchmarks",
 	"pezcumulus-primitives-core/runtime-benchmarks",
 	"pezframe-support/runtime-benchmarks",
diff --git a/pezcumulus/teyrchains/integration-tests/emulated/chains/teyrchains/assets/asset-hub-zagros/src/lib.rs b/pezcumulus/teyrchains/integration-tests/emulated/chains/teyrchains/assets/asset-hub-zagros/src/lib.rs
index f7680e56..6817f6a1 100644
--- a/pezcumulus/teyrchains/integration-tests/emulated/chains/teyrchains/assets/asset-hub-zagros/src/lib.rs
+++ b/pezcumulus/teyrchains/integration-tests/emulated/chains/teyrchains/assets/asset-hub-zagros/src/lib.rs
@@ -75,5 +75,5 @@ impl_bridge_helpers_for_chain!(
 	AssetHubZagros,
 	ParaPezpallet,
 	PezkuwiXcm,
-	bp_bridge_hub_zagros::RuntimeCall::XcmOverBridgeHubPezkuwichain
+	pezbp_bridge_hub_zagros::RuntimeCall::XcmOverBridgeHubPezkuwichain
 );
diff --git a/pezcumulus/teyrchains/integration-tests/emulated/chains/teyrchains/pezbridges/bridge-hub-pezkuwichain/Cargo.toml b/pezcumulus/teyrchains/integration-tests/emulated/chains/teyrchains/pezbridges/bridge-hub-pezkuwichain/Cargo.toml
index d75dd0a1..2cefc2bb 100644
--- a/pezcumulus/teyrchains/integration-tests/emulated/chains/teyrchains/pezbridges/bridge-hub-pezkuwichain/Cargo.toml
+++ b/pezcumulus/teyrchains/integration-tests/emulated/chains/teyrchains/pezbridges/bridge-hub-pezkuwichain/Cargo.toml
@@ -23,10 +23,10 @@ pezsp-keyring = { workspace = true }
 xcm = { workspace = true }
 
 # Bridge dependencies
-bp-messages = { workspace = true }
+pezbp-messages = { workspace = true }
 
 # Pezcumulus
-bridge-hub-common = { workspace = true }
+pezbridge-hub-common = { workspace = true }
 emulated-integration-tests-common = { workspace = true }
 pezbridge-hub-pezkuwichain-runtime = { workspace = true, default-features = true }
 testnet-teyrchains-constants = { features = [
@@ -36,8 +36,8 @@ teyrchains-common = { workspace = true, default-features = true }
 
 [features]
 runtime-benchmarks = [
-	"bp-messages/runtime-benchmarks",
-	"bridge-hub-common/runtime-benchmarks",
+	"pezbp-messages/runtime-benchmarks",
+	"pezbridge-hub-common/runtime-benchmarks",
 	"emulated-integration-tests-common/runtime-benchmarks",
 	"pezbridge-hub-pezkuwichain-runtime/runtime-benchmarks",
 	"pezframe-support/runtime-benchmarks",
diff --git a/pezcumulus/teyrchains/integration-tests/emulated/chains/teyrchains/pezbridges/bridge-hub-pezkuwichain/src/genesis.rs b/pezcumulus/teyrchains/integration-tests/emulated/chains/teyrchains/pezbridges/bridge-hub-pezkuwichain/src/genesis.rs
index e52ee49f..e5cc6db7 100644
--- a/pezcumulus/teyrchains/integration-tests/emulated/chains/teyrchains/pezbridges/bridge-hub-pezkuwichain/src/genesis.rs
+++ b/pezcumulus/teyrchains/integration-tests/emulated/chains/teyrchains/pezbridges/bridge-hub-pezkuwichain/src/genesis.rs
@@ -76,7 +76,7 @@ pub fn genesis() -> Storage {
 					(
 						Location::new(1, [Teyrchain(1000)]),
 						Junctions::from([ByGenesis(ZAGROS_GENESIS_HASH).into(), Teyrchain(1000)]),
-						Some(bp_messages::LegacyLaneId([0, 0, 0, 2])),
+						Some(pezbp_messages::LegacyLaneId([0, 0, 0, 2])),
 					),
 				],
 				..Default::default()
diff --git a/pezcumulus/teyrchains/integration-tests/emulated/chains/teyrchains/pezbridges/bridge-hub-pezkuwichain/src/lib.rs b/pezcumulus/teyrchains/integration-tests/emulated/chains/teyrchains/pezbridges/bridge-hub-pezkuwichain/src/lib.rs
index ec18b6ba..f0078b76 100644
--- a/pezcumulus/teyrchains/integration-tests/emulated/chains/teyrchains/pezbridges/bridge-hub-pezkuwichain/src/lib.rs
+++ b/pezcumulus/teyrchains/integration-tests/emulated/chains/teyrchains/pezbridges/bridge-hub-pezkuwichain/src/lib.rs
@@ -44,7 +44,7 @@ decl_test_teyrchains! {
 			XcmpMessageHandler: pezbridge_hub_pezkuwichain_runtime::XcmpQueue,
 			LocationToAccountId: pezbridge_hub_pezkuwichain_runtime::xcm_config::LocationToAccountId,
 			TeyrchainInfo: pezbridge_hub_pezkuwichain_runtime::TeyrchainInfo,
-			MessageOrigin: bridge_hub_common::AggregateMessageOrigin,
+			MessageOrigin: pezbridge_hub_common::AggregateMessageOrigin,
 			DigestProvider: AuraDigestProvider,
 		},
 		pallets = {
diff --git a/pezcumulus/teyrchains/integration-tests/emulated/chains/teyrchains/pezbridges/bridge-hub-zagros/Cargo.toml b/pezcumulus/teyrchains/integration-tests/emulated/chains/teyrchains/pezbridges/bridge-hub-zagros/Cargo.toml
index 91c8fbcb..168aa8b6 100644
--- a/pezcumulus/teyrchains/integration-tests/emulated/chains/teyrchains/pezbridges/bridge-hub-zagros/Cargo.toml
+++ b/pezcumulus/teyrchains/integration-tests/emulated/chains/teyrchains/pezbridges/bridge-hub-zagros/Cargo.toml
@@ -23,10 +23,10 @@ pezsp-keyring = { workspace = true }
 xcm = { workspace = true }
 
 # Bridge dependencies
-bp-messages = { workspace = true }
+pezbp-messages = { workspace = true }
 
 # Pezcumulus
-bridge-hub-common = { workspace = true }
+pezbridge-hub-common = { workspace = true }
 emulated-integration-tests-common = { workspace = true }
 pezbridge-hub-zagros-runtime = { workspace = true, default-features = true }
 testnet-teyrchains-constants = { features = [
@@ -36,8 +36,8 @@ teyrchains-common = { workspace = true, default-features = true }
 
 [features]
 runtime-benchmarks = [
-	"bp-messages/runtime-benchmarks",
-	"bridge-hub-common/runtime-benchmarks",
+	"pezbp-messages/runtime-benchmarks",
+	"pezbridge-hub-common/runtime-benchmarks",
 	"emulated-integration-tests-common/runtime-benchmarks",
 	"pezbridge-hub-zagros-runtime/runtime-benchmarks",
 	"pezframe-support/runtime-benchmarks",
diff --git a/pezcumulus/teyrchains/integration-tests/emulated/chains/teyrchains/pezbridges/bridge-hub-zagros/src/genesis.rs b/pezcumulus/teyrchains/integration-tests/emulated/chains/teyrchains/pezbridges/bridge-hub-zagros/src/genesis.rs
index 4c30ff99..bcb16916 100644
--- a/pezcumulus/teyrchains/integration-tests/emulated/chains/teyrchains/pezbridges/bridge-hub-zagros/src/genesis.rs
+++ b/pezcumulus/teyrchains/integration-tests/emulated/chains/teyrchains/pezbridges/bridge-hub-zagros/src/genesis.rs
@@ -81,7 +81,7 @@ pub fn genesis() -> Storage {
 							NetworkId::ByGenesis(PEZKUWICHAIN_GENESIS_HASH).into(),
 							Teyrchain(1000),
 						]),
-						Some(bp_messages::LegacyLaneId([0, 0, 0, 2])),
+						Some(pezbp_messages::LegacyLaneId([0, 0, 0, 2])),
 					),
 				],
 				..Default::default()
diff --git a/pezcumulus/teyrchains/integration-tests/emulated/chains/teyrchains/pezbridges/bridge-hub-zagros/src/lib.rs b/pezcumulus/teyrchains/integration-tests/emulated/chains/teyrchains/pezbridges/bridge-hub-zagros/src/lib.rs
index 6101a905..46bfc3d6 100644
--- a/pezcumulus/teyrchains/integration-tests/emulated/chains/teyrchains/pezbridges/bridge-hub-zagros/src/lib.rs
+++ b/pezcumulus/teyrchains/integration-tests/emulated/chains/teyrchains/pezbridges/bridge-hub-zagros/src/lib.rs
@@ -43,7 +43,7 @@ decl_test_teyrchains! {
 			XcmpMessageHandler: pezbridge_hub_zagros_runtime::XcmpQueue,
 			LocationToAccountId: pezbridge_hub_zagros_runtime::xcm_config::LocationToAccountId,
 			TeyrchainInfo: pezbridge_hub_zagros_runtime::TeyrchainInfo,
-			MessageOrigin: bridge_hub_common::AggregateMessageOrigin,
+			MessageOrigin: pezbridge_hub_common::AggregateMessageOrigin,
 			DigestProvider: AuraDigestProvider,
 		},
 		pallets = {
diff --git a/pezcumulus/teyrchains/integration-tests/emulated/common/Cargo.toml b/pezcumulus/teyrchains/integration-tests/emulated/common/Cargo.toml
index ab4d06f7..26e8f7a1 100644
--- a/pezcumulus/teyrchains/integration-tests/emulated/common/Cargo.toml
+++ b/pezcumulus/teyrchains/integration-tests/emulated/common/Cargo.toml
@@ -56,16 +56,16 @@ teyrchains-common = { workspace = true, default-features = true }
 xcm-pez-emulator = { workspace = true, default-features = true }
 
 # Bridges
-bp-messages = { workspace = true, default-features = true }
-bp-xcm-bridge-hub = { workspace = true, default-features = true }
+pezbp-messages = { workspace = true, default-features = true }
+pezbp-xcm-bridge-hub = { workspace = true, default-features = true }
 pezpallet-bridge-messages = { workspace = true, default-features = true }
 pezpallet-xcm-bridge-hub = { workspace = true, default-features = true }
 
 [features]
 runtime-benchmarks = [
 	"asset-test-pezutils/runtime-benchmarks",
-	"bp-messages/runtime-benchmarks",
-	"bp-xcm-bridge-hub/runtime-benchmarks",
+	"pezbp-messages/runtime-benchmarks",
+	"pezbp-xcm-bridge-hub/runtime-benchmarks",
 	"pezcumulus-pezpallet-teyrchain-system/runtime-benchmarks",
 	"pezcumulus-pezpallet-xcmp-queue/runtime-benchmarks",
 	"pezcumulus-primitives-core/runtime-benchmarks",
diff --git a/pezcumulus/teyrchains/integration-tests/emulated/common/src/impls.rs b/pezcumulus/teyrchains/integration-tests/emulated/common/src/impls.rs
index 9c47307c..f765a049 100644
--- a/pezcumulus/teyrchains/integration-tests/emulated/common/src/impls.rs
+++ b/pezcumulus/teyrchains/integration-tests/emulated/common/src/impls.rs
@@ -60,11 +60,11 @@ pub use xcm_pez_emulator::{
 };
 
 // Bridges
-use bp_messages::{
+use pezbp_messages::{
 	target_chain::{DispatchMessage, DispatchMessageData, MessageDispatch},
 	MessageKey, OutboundLaneData,
 };
-pub use bp_xcm_bridge_hub::XcmBridgeHubCall;
+pub use pezbp_xcm_bridge_hub::XcmBridgeHubCall;
 use pezpallet_bridge_messages::{
 	Config as BridgeMessagesConfig, LaneIdOf, OutboundLanes, Pezpallet,
 };
diff --git a/pezcumulus/teyrchains/integration-tests/emulated/tests/pezbridges/bridge-hub-pezkuwichain/Cargo.toml b/pezcumulus/teyrchains/integration-tests/emulated/tests/pezbridges/bridge-hub-pezkuwichain/Cargo.toml
index 5028c596..10922422 100644
--- a/pezcumulus/teyrchains/integration-tests/emulated/tests/pezbridges/bridge-hub-pezkuwichain/Cargo.toml
+++ b/pezcumulus/teyrchains/integration-tests/emulated/tests/pezbridges/bridge-hub-pezkuwichain/Cargo.toml
@@ -34,7 +34,7 @@ xcm-builder = { workspace = true }
 xcm-executor = { workspace = true }
 
 # Bridges
-bp-asset-hub-pezkuwichain = { workspace = true }
+pezbp-asset-hub-pezkuwichain = { workspace = true }
 pezpallet-bridge-messages = { workspace = true }
 
 # Pezcumulus
@@ -59,7 +59,7 @@ pezsnowbridge-pezpallet-system = { workspace = true }
 [features]
 runtime-benchmarks = [
 	"asset-hub-pezkuwichain-runtime/runtime-benchmarks",
-	"bp-asset-hub-pezkuwichain/runtime-benchmarks",
+	"pezbp-asset-hub-pezkuwichain/runtime-benchmarks",
 	"emulated-integration-tests-common/runtime-benchmarks",
 	"pezcumulus-pezpallet-xcmp-queue/runtime-benchmarks",
 	"pezframe-support/runtime-benchmarks",
diff --git a/pezcumulus/teyrchains/integration-tests/emulated/tests/pezbridges/bridge-hub-zagros/Cargo.toml b/pezcumulus/teyrchains/integration-tests/emulated/tests/pezbridges/bridge-hub-zagros/Cargo.toml
index 8302f4a2..9d4fed5d 100644
--- a/pezcumulus/teyrchains/integration-tests/emulated/tests/pezbridges/bridge-hub-zagros/Cargo.toml
+++ b/pezcumulus/teyrchains/integration-tests/emulated/tests/pezbridges/bridge-hub-zagros/Cargo.toml
@@ -40,8 +40,8 @@ pezpallet-bridge-relayers = { workspace = true }
 
 # Pezcumulus
 asset-hub-zagros-runtime = { workspace = true }
-bp-asset-hub-zagros = { workspace = true }
-bridge-hub-common = { workspace = true }
+pezbp-asset-hub-zagros = { workspace = true }
+pezbridge-hub-common = { workspace = true }
 emulated-integration-tests-common = { workspace = true }
 pezbridge-hub-zagros-runtime = { workspace = true }
 pezcumulus-pezpallet-teyrchain-system = { workspace = true }
@@ -68,8 +68,8 @@ pezsnowbridge-pezpallet-system-v2 = { workspace = true }
 [features]
 runtime-benchmarks = [
 	"asset-hub-zagros-runtime/runtime-benchmarks",
-	"bp-asset-hub-zagros/runtime-benchmarks",
-	"bridge-hub-common/runtime-benchmarks",
+	"pezbp-asset-hub-zagros/runtime-benchmarks",
+	"pezbridge-hub-common/runtime-benchmarks",
 	"emulated-integration-tests-common/runtime-benchmarks",
 	"pezbridge-hub-zagros-runtime/runtime-benchmarks",
 	"pezcumulus-pezpallet-teyrchain-system/runtime-benchmarks",
diff --git a/pezcumulus/teyrchains/integration-tests/emulated/tests/pezbridges/bridge-hub-zagros/src/tests/snowbridge_edge_case.rs b/pezcumulus/teyrchains/integration-tests/emulated/tests/pezbridges/bridge-hub-zagros/src/tests/snowbridge_edge_case.rs
index 44220139..de057ce4 100644
--- a/pezcumulus/teyrchains/integration-tests/emulated/tests/pezbridges/bridge-hub-zagros/src/tests/snowbridge_edge_case.rs
+++ b/pezcumulus/teyrchains/integration-tests/emulated/tests/pezbridges/bridge-hub-zagros/src/tests/snowbridge_edge_case.rs
@@ -289,7 +289,7 @@ fn export_from_non_system_teyrchain_will_fail() {
 		assert_expected_events!(
 			BridgeHubZagros,
 			vec![RuntimeEvent::MessageQueue(pezpallet_message_queue::Event::Processed{ success:false, origin, .. }) => {
-				origin: *origin == bridge_hub_common::AggregateMessageOrigin::Sibling(PenpalB::para_id()),
+				origin: *origin == pezbridge_hub_common::AggregateMessageOrigin::Sibling(PenpalB::para_id()),
 			},]
 		);
 	});
diff --git a/pezcumulus/teyrchains/integration-tests/emulated/tests/pezbridges/bridge-hub-zagros/src/tests/snowbridge_v2_inbound.rs b/pezcumulus/teyrchains/integration-tests/emulated/tests/pezbridges/bridge-hub-zagros/src/tests/snowbridge_v2_inbound.rs
index 01a0792a..1245cc69 100644
--- a/pezcumulus/teyrchains/integration-tests/emulated/tests/pezbridges/bridge-hub-zagros/src/tests/snowbridge_v2_inbound.rs
+++ b/pezcumulus/teyrchains/integration-tests/emulated/tests/pezbridges/bridge-hub-zagros/src/tests/snowbridge_v2_inbound.rs
@@ -398,7 +398,7 @@ fn register_and_send_token_in_one_transaction_fails() {
 
 	let dot_asset = Location::new(1, Here);
 	let dot_fee: xcm::prelude::Asset =
-		(dot_asset, bp_asset_hub_zagros::CreateForeignAssetDeposit::get()).into();
+		(dot_asset, pezbp_asset_hub_zagros::CreateForeignAssetDeposit::get()).into();
 
 	// Used to pay the asset creation deposit.
 	let eth_asset_value = 9_000_000_000_000u128;
@@ -1022,7 +1022,7 @@ fn invalid_claimer_does_not_fail_the_message() {
 #[test]
 fn create_foreign_asset_deposit_is_equal_to_asset_hub_foreign_asset_pallet_deposit() {
 	let asset_hub_deposit = asset_hub_zagros_runtime::ForeignAssetsAssetDeposit::get();
-	let bridge_hub_deposit = bp_asset_hub_zagros::CreateForeignAssetDeposit::get();
+	let bridge_hub_deposit = pezbp_asset_hub_zagros::CreateForeignAssetDeposit::get();
 	assert!(
 		bridge_hub_deposit >=
 		asset_hub_deposit,
diff --git a/pezcumulus/teyrchains/runtimes/assets/asset-hub-pezkuwichain/Cargo.toml b/pezcumulus/teyrchains/runtimes/assets/asset-hub-pezkuwichain/Cargo.toml
index 1303888a..7c9b400e 100644
--- a/pezcumulus/teyrchains/runtimes/assets/asset-hub-pezkuwichain/Cargo.toml
+++ b/pezcumulus/teyrchains/runtimes/assets/asset-hub-pezkuwichain/Cargo.toml
@@ -104,7 +104,7 @@ xcm-executor = { workspace = true }
 xcm-runtime-pezapis = { workspace = true }
 
 # Pezcumulus
-assets-common = { workspace = true }
+pez-assets-common = { workspace = true }
 pezcumulus-pezpallet-aura-ext = { workspace = true }
 pezcumulus-pezpallet-session-benchmarking = { workspace = true }
 pezcumulus-pezpallet-teyrchain-system = { workspace = true }
@@ -120,10 +120,10 @@ teyrchain-info = { workspace = true }
 teyrchains-common = { workspace = true }
 
 # Bridges
-bp-asset-hub-pezkuwichain = { workspace = true }
-bp-asset-hub-zagros = { workspace = true }
-bp-bridge-hub-pezkuwichain = { workspace = true }
-bp-bridge-hub-zagros = { workspace = true }
+pezbp-asset-hub-pezkuwichain = { workspace = true }
+pezbp-asset-hub-zagros = { workspace = true }
+pezbp-bridge-hub-pezkuwichain = { workspace = true }
+pezbp-bridge-hub-zagros = { workspace = true }
 pezpallet-xcm-bridge-hub-router = { workspace = true }
 
 [dev-dependencies]
@@ -138,12 +138,12 @@ default = ["std"]
 fast-runtime = []
 runtime-benchmarks = [
 	"asset-test-pezutils/runtime-benchmarks",
-	"assets-common/runtime-benchmarks",
+	"pez-assets-common/runtime-benchmarks",
 	"bizinikiwi-wasm-builder?/runtime-benchmarks",
-	"bp-asset-hub-pezkuwichain/runtime-benchmarks",
-	"bp-asset-hub-zagros/runtime-benchmarks",
-	"bp-bridge-hub-pezkuwichain/runtime-benchmarks",
-	"bp-bridge-hub-zagros/runtime-benchmarks",
+	"pezbp-asset-hub-pezkuwichain/runtime-benchmarks",
+	"pezbp-asset-hub-zagros/runtime-benchmarks",
+	"pezbp-bridge-hub-pezkuwichain/runtime-benchmarks",
+	"pezbp-bridge-hub-zagros/runtime-benchmarks",
 	"pezcumulus-pezpallet-aura-ext/runtime-benchmarks",
 	"pezcumulus-pezpallet-session-benchmarking/runtime-benchmarks",
 	"pezcumulus-pezpallet-teyrchain-system/runtime-benchmarks",
@@ -230,7 +230,7 @@ runtime-benchmarks = [
 ]
 try-runtime = [
 	"asset-test-pezutils/try-runtime",
-	"assets-common/try-runtime",
+	"pez-assets-common/try-runtime",
 	"pezcumulus-pezpallet-aura-ext/try-runtime",
 	"pezcumulus-pezpallet-teyrchain-system/try-runtime",
 	"pezcumulus-pezpallet-weight-reclaim/try-runtime",
@@ -284,12 +284,12 @@ try-runtime = [
 	"teyrchains-common/try-runtime",
 ]
 std = [
-	"assets-common/std",
+	"pez-assets-common/std",
 	"bizinikiwi-wasm-builder",
-	"bp-asset-hub-pezkuwichain/std",
-	"bp-asset-hub-zagros/std",
-	"bp-bridge-hub-pezkuwichain/std",
-	"bp-bridge-hub-zagros/std",
+	"pezbp-asset-hub-pezkuwichain/std",
+	"pezbp-asset-hub-zagros/std",
+	"pezbp-bridge-hub-pezkuwichain/std",
+	"pezbp-bridge-hub-zagros/std",
 	"codec/std",
 	"log/std",
 	"pezcumulus-pezpallet-aura-ext/std",
diff --git a/pezcumulus/teyrchains/runtimes/assets/asset-hub-pezkuwichain/bridge-primitives/Cargo.toml b/pezcumulus/teyrchains/runtimes/assets/asset-hub-pezkuwichain/bridge-primitives/Cargo.toml
index 0a1c6861..2542f1b8 100644
--- a/pezcumulus/teyrchains/runtimes/assets/asset-hub-pezkuwichain/bridge-primitives/Cargo.toml
+++ b/pezcumulus/teyrchains/runtimes/assets/asset-hub-pezkuwichain/bridge-primitives/Cargo.toml
@@ -1,5 +1,5 @@
 [package]
-name = "bp-asset-hub-pezkuwichain"
+name = "pezbp-asset-hub-pezkuwichain"
 description = "Primitives of AssetHubPezkuwichain teyrchain runtime."
 version = "0.4.0"
 authors.workspace = true
@@ -25,9 +25,9 @@ pezsp-api = { workspace = true }
 pezsp-core = { workspace = true }
 
 # Bridge Dependencies
-bp-bridge-hub-pezcumulus = { workspace = true }
-bp-messages = { workspace = true }
-bp-xcm-bridge-hub-router = { workspace = true }
+pezbp-bridge-hub-pezcumulus = { workspace = true }
+pezbp-messages = { workspace = true }
+pezbp-xcm-bridge-hub-router = { workspace = true }
 pezbp-runtime = { workspace = true }
 testnet-teyrchains-constants = { features = ["pezkuwichain"], workspace = true }
 
@@ -37,9 +37,9 @@ xcm = { workspace = true }
 [features]
 default = ["std"]
 std = [
-	"bp-bridge-hub-pezcumulus/std",
-	"bp-messages/std",
-	"bp-xcm-bridge-hub-router/std",
+	"pezbp-bridge-hub-pezcumulus/std",
+	"pezbp-messages/std",
+	"pezbp-xcm-bridge-hub-router/std",
 	"codec/std",
 	"pezbp-runtime/std",
 	"pezframe-support/std",
@@ -50,9 +50,9 @@ std = [
 	"xcm/std",
 ]
 runtime-benchmarks = [
-	"bp-bridge-hub-pezcumulus/runtime-benchmarks",
-	"bp-messages/runtime-benchmarks",
-	"bp-xcm-bridge-hub-router/runtime-benchmarks",
+	"pezbp-bridge-hub-pezcumulus/runtime-benchmarks",
+	"pezbp-messages/runtime-benchmarks",
+	"pezbp-xcm-bridge-hub-router/runtime-benchmarks",
 	"pezbp-runtime/runtime-benchmarks",
 	"pezframe-support/runtime-benchmarks",
 	"pezsp-api/runtime-benchmarks",
diff --git a/pezcumulus/teyrchains/runtimes/assets/asset-hub-pezkuwichain/bridge-primitives/src/lib.rs b/pezcumulus/teyrchains/runtimes/assets/asset-hub-pezkuwichain/bridge-primitives/src/lib.rs
index ff8106b6..c9d69ff4 100644
--- a/pezcumulus/teyrchains/runtimes/assets/asset-hub-pezkuwichain/bridge-primitives/src/lib.rs
+++ b/pezcumulus/teyrchains/runtimes/assets/asset-hub-pezkuwichain/bridge-primitives/src/lib.rs
@@ -22,9 +22,9 @@ extern crate alloc;
 use codec::{Decode, Encode};
 use scale_info::TypeInfo;
 
-pub use bp_bridge_hub_pezcumulus::*;
-use bp_messages::*;
-pub use bp_xcm_bridge_hub_router::XcmBridgeHubRouterCall;
+pub use pezbp_bridge_hub_pezcumulus::*;
+use pezbp_messages::*;
+pub use pezbp_xcm_bridge_hub_router::XcmBridgeHubRouterCall;
 use pezbp_runtime::{
 	decl_bridge_finality_runtime_apis, decl_bridge_messages_runtime_apis, Chain, ChainId, Teyrchain,
 };
diff --git a/pezcumulus/teyrchains/runtimes/assets/asset-hub-pezkuwichain/src/lib.rs b/pezcumulus/teyrchains/runtimes/assets/asset-hub-pezkuwichain/src/lib.rs
index 6024bee0..4e2289f2 100644
--- a/pezcumulus/teyrchains/runtimes/assets/asset-hub-pezkuwichain/src/lib.rs
+++ b/pezcumulus/teyrchains/runtimes/assets/asset-hub-pezkuwichain/src/lib.rs
@@ -36,13 +36,13 @@ pub use staking::*;
 extern crate alloc;
 
 use alloc::{vec, vec::Vec};
-use assets_common::{
+use pez_assets_common::{
 	foreign_creators::ForeignCreators,
 	local_and_foreign_assets::{LocalFromLeft, TargetFromLeft},
 	matching::{FromNetwork, FromSiblingTeyrchain},
 	AssetIdForPoolAssets, AssetIdForPoolAssetsConvert, AssetIdForTrustBackedAssetsConvert,
 };
-use bp_asset_hub_pezkuwichain::CreateForeignAssetDeposit;
+use pezbp_asset_hub_pezkuwichain::CreateForeignAssetDeposit;
 use pezcumulus_pezpallet_teyrchain_system::{
 	RelayNumberMonotonicallyIncreases, RelaychainDataProvider,
 };
@@ -61,7 +61,7 @@ use testnet_teyrchains_constants::pezkuwichain::snowbridge::EthereumNetwork;
 use pezsp_version::NativeVersion;
 use pezsp_version::RuntimeVersion;
 
-pub use assets_common::local_and_foreign_assets::ForeignAssetReserveData;
+pub use pez_assets_common::local_and_foreign_assets::ForeignAssetReserveData;
 use codec::{Decode, DecodeWithMemTracking, Encode, MaxEncodedLen};
 use pezcumulus_primitives_core::ParaId;
 use pezframe_support::{
@@ -453,7 +453,7 @@ impl pezpallet_asset_conversion::Config for Runtime {
 	type MintMinLiquidity = ConstU128<100>;
 	type WeightInfo = weights::pezpallet_asset_conversion::WeightInfo<Runtime>;
 	#[cfg(feature = "runtime-benchmarks")]
-	type BenchmarkHelper = assets_common::benchmarks::AssetPairFactory<
+	type BenchmarkHelper = pez_assets_common::benchmarks::AssetPairFactory<
 		TokenLocation,
 		teyrchain_info::Pezpallet<Runtime>,
 		xcm_config::TrustBackedAssetsPalletIndex,
@@ -518,7 +518,7 @@ impl pezpallet_assets::Config<ForeignAssetsInstance> for Runtime {
 	type AssetAccountDeposit = ForeignAssetsAssetAccountDeposit;
 	type RemoveItemsLimit = pezframe_support::traits::ConstU32<1000>;
 	#[cfg(feature = "runtime-benchmarks")]
-	type BenchmarkHelper = assets_common::benchmarks::LocationAssetsBenchmarkHelper;
+	type BenchmarkHelper = pez_assets_common::benchmarks::LocationAssetsBenchmarkHelper;
 }
 
 // Allow Freezes for the `ForeignAssets` pezpallet
@@ -1771,13 +1771,13 @@ impl_runtime_apis! {
 		}
 	}
 
-	impl assets_common::runtime_api::FungiblesApi<
+	impl pez_assets_common::runtime_api::FungiblesApi<
 		Block,
 		AccountId,
 	> for Runtime
 	{
-		fn query_account_balances(account: AccountId) -> Result<xcm::VersionedAssets, assets_common::runtime_api::FungiblesAccessError> {
-			use assets_common::fungible_conversion::{convert, convert_balance};
+		fn query_account_balances(account: AccountId) -> Result<xcm::VersionedAssets, pez_assets_common::runtime_api::FungiblesAccessError> {
+			use pez_assets_common::fungible_conversion::{convert, convert_balance};
 			Ok([
 				// collect pezpallet_balance
 				{
@@ -1818,7 +1818,7 @@ impl_runtime_apis! {
 			let mut acceptable_assets = vec![AssetId(native_token.clone())];
 			// We also accept all assets in a pool with the native token.
 			acceptable_assets.extend(
-				assets_common::PoolAdapter::<Runtime>::get_assets_in_pool_with(native_token)
+				pez_assets_common::PoolAdapter::<Runtime>::get_assets_in_pool_with(native_token)
 				.map_err(|()| XcmPaymentApiError::VersionedConversionFailed)?
 			);
 			PezkuwiXcm::query_acceptable_payment_assets(xcm_version, acceptable_assets)
diff --git a/pezcumulus/teyrchains/runtimes/assets/asset-hub-pezkuwichain/src/xcm_config.rs b/pezcumulus/teyrchains/runtimes/assets/asset-hub-pezkuwichain/src/xcm_config.rs
index e0688cf9..116cde83 100644
--- a/pezcumulus/teyrchains/runtimes/assets/asset-hub-pezkuwichain/src/xcm_config.rs
+++ b/pezcumulus/teyrchains/runtimes/assets/asset-hub-pezkuwichain/src/xcm_config.rs
@@ -19,7 +19,7 @@ use super::{
 	RuntimeHoldReason, RuntimeOrigin, TeyrchainInfo, TeyrchainSystem, ToZagrosXcmRouter,
 	TransactionByteFee, Uniques, WeightToFee, XcmpQueue,
 };
-use assets_common::{
+use pez_assets_common::{
 	matching::{
 		FromNetwork, IsForeignConcreteAsset, NonTeleportableAssetFromTrustedReserve,
 		ParentLocation, TeleportableAssetWithTrustedReserve,
@@ -129,7 +129,7 @@ pub type FungibleTransactor = FungibleAdapter<
 
 /// `AssetId`/`Balance` converter for `TrustBackedAssets`.
 pub type TrustBackedAssetsConvertedConcreteId =
-	assets_common::TrustBackedAssetsConvertedConcreteId<TrustBackedAssetsPalletLocation, Balance>;
+	pez_assets_common::TrustBackedAssetsConvertedConcreteId<TrustBackedAssetsPalletLocation, Balance>;
 
 /// Means for transacting assets besides the native currency on this chain.
 pub type FungiblesTransactor = FungiblesAdapter<
@@ -150,7 +150,7 @@ pub type FungiblesTransactor = FungiblesAdapter<
 
 /// Matcher for converting `ClassId`/`InstanceId` into a uniques asset.
 pub type UniquesConvertedConcreteId =
-	assets_common::UniquesConvertedConcreteId<UniquesPalletLocation>;
+	pez_assets_common::UniquesConvertedConcreteId<UniquesPalletLocation>;
 
 /// Means for transacting unique assets.
 pub type UniquesTransactor = UniqueInstancesAdapter<
@@ -161,7 +161,7 @@ pub type UniquesTransactor = UniqueInstancesAdapter<
 >;
 
 /// `AssetId`/`Balance` converter for `ForeignAssets`.
-pub type ForeignAssetsConvertedConcreteId = assets_common::ForeignAssetsConvertedConcreteId<
+pub type ForeignAssetsConvertedConcreteId = pez_assets_common::ForeignAssetsConvertedConcreteId<
 	(
 		// Ignore `TrustBackedAssets` explicitly
 		StartsWith<TrustBackedAssetsPalletLocation>,
@@ -194,7 +194,7 @@ pub type ForeignFungiblesTransactor = FungiblesAdapter<
 
 /// `AssetId`/`Balance` converter for `PoolAssets`.
 pub type PoolAssetsConvertedConcreteId =
-	assets_common::PoolAssetsConvertedConcreteId<PoolAssetsPalletLocation, Balance>;
+	pez_assets_common::PoolAssetsConvertedConcreteId<PoolAssetsPalletLocation, Balance>;
 
 /// Means for transacting asset conversion pool assets on this chain.
 pub type PoolFungiblesTransactor = FungiblesAdapter<
@@ -499,7 +499,7 @@ impl pezcumulus_pezpallet_xcm::Config for Runtime {
 pub mod bridging {
 	use super::*;
 	use alloc::collections::btree_set::BTreeSet;
-	use assets_common::matching;
+	use pez_assets_common::matching;
 
 	// common/shared parameters
 	parameter_types! {
@@ -515,14 +515,14 @@ pub mod bridging {
 		///
 		/// 3) the approximate cost of Pezkuwichain -> Zagros message confirmation transaction on Pezkuwichain Bridge Hub.
 		pub storage XcmBridgeHubRouterBaseFee: Balance =
-			bp_bridge_hub_pezkuwichain::BridgeHubPezkuwichainBaseXcmFeeInRocs::get()
-				.saturating_add(bp_bridge_hub_zagros::BridgeHubZagrosBaseDeliveryFeeInWnds::get())
-				.saturating_add(bp_bridge_hub_pezkuwichain::BridgeHubPezkuwichainBaseConfirmationFeeInRocs::get());
+			pezbp_bridge_hub_pezkuwichain::BridgeHubPezkuwichainBaseXcmFeeInRocs::get()
+				.saturating_add(pezbp_bridge_hub_zagros::BridgeHubZagrosBaseDeliveryFeeInWnds::get())
+				.saturating_add(pezbp_bridge_hub_pezkuwichain::BridgeHubPezkuwichainBaseConfirmationFeeInRocs::get());
 		/// Price of every byte of the Pezkuwichain -> Zagros message. Can be adjusted via
 		/// governance `set_storage` call.
 		pub storage XcmBridgeHubRouterByteFee: Balance = TransactionByteFee::get();
 
-		pub SiblingBridgeHubParaId: u32 = bp_bridge_hub_pezkuwichain::BRIDGE_HUB_PEZKUWICHAIN_TEYRCHAIN_ID;
+		pub SiblingBridgeHubParaId: u32 = pezbp_bridge_hub_pezkuwichain::BRIDGE_HUB_PEZKUWICHAIN_TEYRCHAIN_ID;
 		pub SiblingBridgeHub: Location = Location::new(1, [Teyrchain(SiblingBridgeHubParaId::get())]);
 		/// Router expects payment with this `AssetId`.
 		/// (`AssetId` has to be aligned with `BridgeTable`)
@@ -551,7 +551,7 @@ pub mod bridging {
 				1,
 				[
 					Teyrchain(SiblingBridgeHubParaId::get()),
-					PalletInstance(bp_bridge_hub_pezkuwichain::WITH_BRIDGE_PEZKUWICHAIN_TO_ZAGROS_MESSAGES_PALLET_INDEX)
+					PalletInstance(pezbp_bridge_hub_pezkuwichain::WITH_BRIDGE_PEZKUWICHAIN_TO_ZAGROS_MESSAGES_PALLET_INDEX)
 				]
 			);
 
@@ -562,7 +562,7 @@ pub mod bridging {
 			pub WndLocation: Location = Location::new(2, [GlobalConsensus(ZagrosNetwork::get())]);
 			pub AssetHubZagros: Location = Location::new(2, [
 				GlobalConsensus(ZagrosNetwork::get()),
-				Teyrchain(bp_asset_hub_zagros::ASSET_HUB_ZAGROS_TEYRCHAIN_ID)
+				Teyrchain(pezbp_asset_hub_zagros::ASSET_HUB_ZAGROS_TEYRCHAIN_ID)
 			]);
 
 			/// Set up exporters configuration.
diff --git a/pezcumulus/teyrchains/runtimes/assets/asset-hub-pezkuwichain/tests/tests.rs b/pezcumulus/teyrchains/runtimes/assets/asset-hub-pezkuwichain/tests/tests.rs
index 0db374d0..1ad5a99d 100644
--- a/pezcumulus/teyrchains/runtimes/assets/asset-hub-pezkuwichain/tests/tests.rs
+++ b/pezcumulus/teyrchains/runtimes/assets/asset-hub-pezkuwichain/tests/tests.rs
@@ -66,7 +66,7 @@ parameter_types! {
 }
 
 type AssetIdForTrustBackedAssetsConvert =
-	assets_common::AssetIdForTrustBackedAssetsConvert<TrustBackedAssetsPalletLocation>;
+	pez_assets_common::AssetIdForTrustBackedAssetsConvert<TrustBackedAssetsPalletLocation>;
 
 type RuntimeHelper = asset_test_pezutils::RuntimeHelper<Runtime, AllPalletsWithoutSystem>;
 
@@ -465,7 +465,7 @@ fn test_asset_xcm_trader_not_possible_for_non_sufficient_assets() {
 
 #[test]
 fn test_assets_balances_api_works() {
-	use assets_common::runtime_api::runtime_decl_for_fungibles_api::FungiblesApi;
+	use pez_assets_common::runtime_api::runtime_decl_for_fungibles_api::FungiblesApi;
 
 	ExtBuilder::<Runtime>::default()
 		.with_collators(vec![AccountId::from(ALICE)])
@@ -553,7 +553,7 @@ fn test_assets_balances_api_works() {
 
 			// check currency
 			assert!(result.inner().iter().any(|asset| asset.eq(
-				&assets_common::fungible_conversion::convert_balance::<TokenLocation, Balance>(
+				&pez_assets_common::fungible_conversion::convert_balance::<TokenLocation, Balance>(
 					some_currency
 				)
 				.unwrap()
@@ -812,7 +812,7 @@ mod asset_hub_pezkuwichain_tests {
 				bridging_to_asset_hub_zagros()
 			},
 			(
-				[PalletInstance(bp_bridge_hub_pezkuwichain::WITH_BRIDGE_PEZKUWICHAIN_TO_ZAGROS_MESSAGES_PALLET_INDEX)].into(),
+				[PalletInstance(pezbp_bridge_hub_pezkuwichain::WITH_BRIDGE_PEZKUWICHAIN_TO_ZAGROS_MESSAGES_PALLET_INDEX)].into(),
 				GlobalConsensus(ByGenesis(ZAGROS_GENESIS_HASH)),
 				[Teyrchain(1000)].into()
 			),
@@ -892,7 +892,7 @@ mod asset_hub_pezkuwichain_tests {
 				bridging_to_asset_hub_zagros()
 			},
 			(
-				[PalletInstance(bp_bridge_hub_pezkuwichain::WITH_BRIDGE_PEZKUWICHAIN_TO_ZAGROS_MESSAGES_PALLET_INDEX)].into(),
+				[PalletInstance(pezbp_bridge_hub_pezkuwichain::WITH_BRIDGE_PEZKUWICHAIN_TO_ZAGROS_MESSAGES_PALLET_INDEX)].into(),
 				GlobalConsensus(ByGenesis(ZAGROS_GENESIS_HASH)),
 				[Teyrchain(1000)].into()
 			),
@@ -932,9 +932,9 @@ mod asset_hub_pezkuwichain_tests {
 		>(
 			collator_session_keys(),
 			bridging_to_asset_hub_zagros,
-			|| bp_asset_hub_pezkuwichain::build_congestion_message(Default::default(), true).into(),
+			|| pezbp_asset_hub_pezkuwichain::build_congestion_message(Default::default(), true).into(),
 			|| {
-				bp_asset_hub_pezkuwichain::build_congestion_message(Default::default(), false)
+				pezbp_asset_hub_pezkuwichain::build_congestion_message(Default::default(), false)
 					.into()
 			},
 		)
@@ -942,7 +942,7 @@ mod asset_hub_pezkuwichain_tests {
 
 	#[test]
 	fn test_report_bridge_status_call_compatibility() {
-		// if this test fails, make sure `bp_asset_hub_pezkuwichain` has valid encoding
+		// if this test fails, make sure `pezbp_asset_hub_pezkuwichain` has valid encoding
 		assert_eq!(
 			RuntimeCall::ToZagrosXcmRouter(
 				pezpallet_xcm_bridge_hub_router::Call::report_bridge_status {
@@ -951,8 +951,8 @@ mod asset_hub_pezkuwichain_tests {
 				}
 			)
 			.encode(),
-			bp_asset_hub_pezkuwichain::Call::ToZagrosXcmRouter(
-				bp_asset_hub_pezkuwichain::XcmBridgeHubRouterCall::report_bridge_status {
+			pezbp_asset_hub_pezkuwichain::Call::ToZagrosXcmRouter(
+				pezbp_asset_hub_pezkuwichain::XcmBridgeHubRouterCall::report_bridge_status {
 					bridge_id: Default::default(),
 					is_congested: true,
 				}
@@ -967,7 +967,7 @@ mod asset_hub_pezkuwichain_tests {
 		let actual = <Runtime as pezpallet_xcm_bridge_hub_router::Config<
 			ToZagrosXcmRouterInstance,
 		>>::WeightInfo::report_bridge_status();
-		let max_weight = bp_asset_hub_pezkuwichain::XcmBridgeHubRouterTransactCallMaxWeight::get();
+		let max_weight = pezbp_asset_hub_pezkuwichain::XcmBridgeHubRouterTransactCallMaxWeight::get();
 		assert!(
 			actual.all_lte(max_weight),
 			"max_weight: {:?} should be adjusted to actual {:?}",
diff --git a/pezcumulus/teyrchains/runtimes/assets/asset-hub-zagros/Cargo.toml b/pezcumulus/teyrchains/runtimes/assets/asset-hub-zagros/Cargo.toml
index 97213013..596dde78 100644
--- a/pezcumulus/teyrchains/runtimes/assets/asset-hub-zagros/Cargo.toml
+++ b/pezcumulus/teyrchains/runtimes/assets/asset-hub-zagros/Cargo.toml
@@ -114,7 +114,7 @@ xcm-runtime-pezapis = { workspace = true }
 zagros-runtime-constants = { workspace = true }
 
 # Pezcumulus
-assets-common = { workspace = true }
+pez-assets-common = { workspace = true }
 pezcumulus-pezpallet-aura-ext = { workspace = true }
 pezcumulus-pezpallet-session-benchmarking = { workspace = true }
 pezcumulus-pezpallet-teyrchain-system = { workspace = true }
@@ -131,10 +131,10 @@ teyrchain-info = { workspace = true }
 teyrchains-common = { workspace = true }
 
 # Bridges
-bp-asset-hub-pezkuwichain = { workspace = true }
-bp-asset-hub-zagros = { workspace = true }
-bp-bridge-hub-pezkuwichain = { workspace = true }
-bp-bridge-hub-zagros = { workspace = true }
+pezbp-asset-hub-pezkuwichain = { workspace = true }
+pezbp-asset-hub-zagros = { workspace = true }
+pezbp-bridge-hub-pezkuwichain = { workspace = true }
+pezbp-bridge-hub-zagros = { workspace = true }
 pezpallet-xcm-bridge-hub-router = { workspace = true }
 pezsnowbridge-outbound-queue-primitives = { workspace = true }
 pezsnowbridge-pezpallet-system-frontend = { workspace = true }
@@ -154,12 +154,12 @@ bizinikiwi-wasm-builder = { optional = true, workspace = true, default-features
 default = ["std"]
 runtime-benchmarks = [
 	"asset-test-pezutils/runtime-benchmarks",
-	"assets-common/runtime-benchmarks",
+	"pez-assets-common/runtime-benchmarks",
 	"bizinikiwi-wasm-builder?/runtime-benchmarks",
-	"bp-asset-hub-pezkuwichain/runtime-benchmarks",
-	"bp-asset-hub-zagros/runtime-benchmarks",
-	"bp-bridge-hub-pezkuwichain/runtime-benchmarks",
-	"bp-bridge-hub-zagros/runtime-benchmarks",
+	"pezbp-asset-hub-pezkuwichain/runtime-benchmarks",
+	"pezbp-asset-hub-zagros/runtime-benchmarks",
+	"pezbp-bridge-hub-pezkuwichain/runtime-benchmarks",
+	"pezbp-bridge-hub-zagros/runtime-benchmarks",
 	"pezcumulus-pezpallet-aura-ext/runtime-benchmarks",
 	"pezcumulus-pezpallet-session-benchmarking/runtime-benchmarks",
 	"pezcumulus-pezpallet-teyrchain-system/runtime-benchmarks",
@@ -260,7 +260,7 @@ runtime-benchmarks = [
 ]
 try-runtime = [
 	"asset-test-pezutils/try-runtime",
-	"assets-common/try-runtime",
+	"pez-assets-common/try-runtime",
 	"pezcumulus-pezpallet-aura-ext/try-runtime",
 	"pezcumulus-pezpallet-teyrchain-system/try-runtime",
 	"pezcumulus-pezpallet-weight-reclaim/try-runtime",
@@ -326,12 +326,12 @@ try-runtime = [
 ]
 std = [
 	"alloy-core/std",
-	"assets-common/std",
+	"pez-assets-common/std",
 	"bizinikiwi-wasm-builder",
-	"bp-asset-hub-pezkuwichain/std",
-	"bp-asset-hub-zagros/std",
-	"bp-bridge-hub-pezkuwichain/std",
-	"bp-bridge-hub-zagros/std",
+	"pezbp-asset-hub-pezkuwichain/std",
+	"pezbp-asset-hub-zagros/std",
+	"pezbp-bridge-hub-pezkuwichain/std",
+	"pezbp-bridge-hub-zagros/std",
 	"codec/std",
 	"log/std",
 	"pezcumulus-pezpallet-aura-ext/std",
diff --git a/pezcumulus/teyrchains/runtimes/assets/asset-hub-zagros/bridge-primitives/Cargo.toml b/pezcumulus/teyrchains/runtimes/assets/asset-hub-zagros/bridge-primitives/Cargo.toml
index f984ba11..fdd0a0db 100644
--- a/pezcumulus/teyrchains/runtimes/assets/asset-hub-zagros/bridge-primitives/Cargo.toml
+++ b/pezcumulus/teyrchains/runtimes/assets/asset-hub-zagros/bridge-primitives/Cargo.toml
@@ -1,5 +1,5 @@
 [package]
-name = "bp-asset-hub-zagros"
+name = "pezbp-asset-hub-zagros"
 description = "Primitives of AssetHubZagros teyrchain runtime."
 version = "0.3.0"
 authors.workspace = true
@@ -25,9 +25,9 @@ pezsp-api = { workspace = true }
 pezsp-core = { workspace = true }
 
 # Bridge Dependencies
-bp-bridge-hub-pezcumulus = { workspace = true }
-bp-messages = { workspace = true }
-bp-xcm-bridge-hub-router = { workspace = true }
+pezbp-bridge-hub-pezcumulus = { workspace = true }
+pezbp-messages = { workspace = true }
+pezbp-xcm-bridge-hub-router = { workspace = true }
 pezbp-runtime = { workspace = true }
 testnet-teyrchains-constants = { features = ["zagros"], workspace = true }
 
@@ -37,9 +37,9 @@ xcm = { workspace = true }
 [features]
 default = ["std"]
 std = [
-	"bp-bridge-hub-pezcumulus/std",
-	"bp-messages/std",
-	"bp-xcm-bridge-hub-router/std",
+	"pezbp-bridge-hub-pezcumulus/std",
+	"pezbp-messages/std",
+	"pezbp-xcm-bridge-hub-router/std",
 	"codec/std",
 	"pezbp-runtime/std",
 	"pezframe-support/std",
@@ -50,9 +50,9 @@ std = [
 	"xcm/std",
 ]
 runtime-benchmarks = [
-	"bp-bridge-hub-pezcumulus/runtime-benchmarks",
-	"bp-messages/runtime-benchmarks",
-	"bp-xcm-bridge-hub-router/runtime-benchmarks",
+	"pezbp-bridge-hub-pezcumulus/runtime-benchmarks",
+	"pezbp-messages/runtime-benchmarks",
+	"pezbp-xcm-bridge-hub-router/runtime-benchmarks",
 	"pezbp-runtime/runtime-benchmarks",
 	"pezframe-support/runtime-benchmarks",
 	"pezsp-api/runtime-benchmarks",
diff --git a/pezcumulus/teyrchains/runtimes/assets/asset-hub-zagros/bridge-primitives/src/lib.rs b/pezcumulus/teyrchains/runtimes/assets/asset-hub-zagros/bridge-primitives/src/lib.rs
index ca2e04db..538faf6b 100644
--- a/pezcumulus/teyrchains/runtimes/assets/asset-hub-zagros/bridge-primitives/src/lib.rs
+++ b/pezcumulus/teyrchains/runtimes/assets/asset-hub-zagros/bridge-primitives/src/lib.rs
@@ -19,9 +19,9 @@
 
 extern crate alloc;
 
-pub use bp_bridge_hub_pezcumulus::*;
-use bp_messages::*;
-pub use bp_xcm_bridge_hub_router::XcmBridgeHubRouterCall;
+pub use pezbp_bridge_hub_pezcumulus::*;
+use pezbp_messages::*;
+pub use pezbp_xcm_bridge_hub_router::XcmBridgeHubRouterCall;
 use codec::{Decode, Encode};
 use pezbp_runtime::{
 	decl_bridge_finality_runtime_apis, decl_bridge_messages_runtime_apis, Chain, ChainId, Teyrchain,
diff --git a/pezcumulus/teyrchains/runtimes/assets/asset-hub-zagros/src/bridge_to_ethereum_config.rs b/pezcumulus/teyrchains/runtimes/assets/asset-hub-zagros/src/bridge_to_ethereum_config.rs
index 1a45409c..ad3d279f 100644
--- a/pezcumulus/teyrchains/runtimes/assets/asset-hub-zagros/src/bridge_to_ethereum_config.rs
+++ b/pezcumulus/teyrchains/runtimes/assets/asset-hub-zagros/src/bridge_to_ethereum_config.rs
@@ -23,7 +23,7 @@ use crate::{
 	},
 	AccountId, AssetConversion, Assets, ForeignAssets, Runtime, RuntimeEvent,
 };
-use assets_common::{matching::FromSiblingTeyrchain, AssetIdForTrustBackedAssetsConvert};
+use pez_assets_common::{matching::FromSiblingTeyrchain, AssetIdForTrustBackedAssetsConvert};
 use pezframe_support::{parameter_types, traits::EitherOf};
 use pezframe_system::EnsureRootWithSuccess;
 use pezsnowbridge_runtime_common::{ForeignAssetOwner, LocalAssetOwner};
diff --git a/pezcumulus/teyrchains/runtimes/assets/asset-hub-zagros/src/lib.rs b/pezcumulus/teyrchains/runtimes/assets/asset-hub-zagros/src/lib.rs
index 5beac44c..a61a5ec8 100644
--- a/pezcumulus/teyrchains/runtimes/assets/asset-hub-zagros/src/lib.rs
+++ b/pezcumulus/teyrchains/runtimes/assets/asset-hub-zagros/src/lib.rs
@@ -43,12 +43,12 @@ use governance::{
 extern crate alloc;
 
 use alloc::{vec, vec::Vec};
-pub use assets_common::local_and_foreign_assets::ForeignAssetReserveData;
-use assets_common::{
+pub use pez_assets_common::local_and_foreign_assets::ForeignAssetReserveData;
+use pez_assets_common::{
 	local_and_foreign_assets::{LocalFromLeft, TargetFromLeft},
 	AssetIdForPoolAssets, AssetIdForPoolAssetsConvert, AssetIdForTrustBackedAssetsConvert,
 };
-use bp_asset_hub_zagros::CreateForeignAssetDeposit;
+use pezbp_asset_hub_zagros::CreateForeignAssetDeposit;
 use codec::{Decode, DecodeWithMemTracking, Encode, MaxEncodedLen};
 use pezcumulus_pezpallet_teyrchain_system::{
 	RelayNumberMonotonicallyIncreases, RelaychainDataProvider,
@@ -110,7 +110,7 @@ use zagros_runtime_constants::time::DAYS as RC_DAYS;
 #[cfg(any(feature = "std", test))]
 pub use pezsp_runtime::BuildStorage;
 
-use assets_common::{
+use pez_assets_common::{
 	foreign_creators::ForeignCreators,
 	matching::{FromNetwork, FromSiblingTeyrchain},
 };
@@ -477,7 +477,7 @@ impl pezpallet_asset_conversion::Config for Runtime {
 	type MintMinLiquidity = ConstU128<100>;
 	type WeightInfo = weights::pezpallet_asset_conversion::WeightInfo<Runtime>;
 	#[cfg(feature = "runtime-benchmarks")]
-	type BenchmarkHelper = assets_common::benchmarks::AssetPairFactory<
+	type BenchmarkHelper = pez_assets_common::benchmarks::AssetPairFactory<
 		ZagrosLocation,
 		teyrchain_info::Pezpallet<Runtime>,
 		xcm_config::TrustBackedAssetsPalletIndex,
@@ -609,7 +609,7 @@ impl pezpallet_assets::Config<ForeignAssetsInstance> for Runtime {
 	type AssetAccountDeposit = ForeignAssetsAssetAccountDeposit;
 	type RemoveItemsLimit = pezframe_support::traits::ConstU32<1000>;
 	#[cfg(feature = "runtime-benchmarks")]
-	type BenchmarkHelper = assets_common::benchmarks::LocationAssetsBenchmarkHelper;
+	type BenchmarkHelper = pez_assets_common::benchmarks::LocationAssetsBenchmarkHelper;
 }
 
 // Allow Freezes for the `ForeignAssets` pezpallet
@@ -1231,7 +1231,7 @@ parameter_types! {
 type MultiBlockMigrationsType = pezpallet_migrations::mock_helpers::MockedMigrations;
 #[cfg(not(feature = "runtime-benchmarks"))]
 type MultiBlockMigrationsType = (
-	assets_common::migrations::foreign_assets_reserves::ForeignAssetsReservesMigration<
+	pez_assets_common::migrations::foreign_assets_reserves::ForeignAssetsReservesMigration<
 		Runtime,
 		ForeignAssetsInstance,
 		migrations::AssetHubZagrosForeignAssetsReservesProvider,
@@ -1954,7 +1954,7 @@ pezpallet_revive::impl_runtime_apis_plus_revive_traits!(
 			let mut acceptable_assets = vec![AssetId(native_token.clone())];
 			// We also accept all assets in a pool with the native token.
 			acceptable_assets.extend(
-				assets_common::PoolAdapter::<Runtime>::get_assets_in_pool_with(native_token)
+				pez_assets_common::PoolAdapter::<Runtime>::get_assets_in_pool_with(native_token)
 				.map_err(|()| XcmPaymentApiError::VersionedConversionFailed)?
 			);
 			PezkuwiXcm::query_acceptable_payment_assets(xcm_version, acceptable_assets)
@@ -2044,13 +2044,13 @@ pezpallet_revive::impl_runtime_apis_plus_revive_traits!(
 		}
 	}
 
-	impl assets_common::runtime_api::FungiblesApi<
+	impl pez_assets_common::runtime_api::FungiblesApi<
 		Block,
 		AccountId,
 	> for Runtime
 	{
-		fn query_account_balances(account: AccountId) -> Result<xcm::VersionedAssets, assets_common::runtime_api::FungiblesAccessError> {
-			use assets_common::fungible_conversion::{convert, convert_balance};
+		fn query_account_balances(account: AccountId) -> Result<xcm::VersionedAssets, pez_assets_common::runtime_api::FungiblesAccessError> {
+			use pez_assets_common::fungible_conversion::{convert, convert_balance};
 			Ok([
 				// collect pezpallet_balance
 				{
diff --git a/pezcumulus/teyrchains/runtimes/assets/asset-hub-zagros/src/migrations.rs b/pezcumulus/teyrchains/runtimes/assets/asset-hub-zagros/src/migrations.rs
index c88707cc..3b4017dc 100644
--- a/pezcumulus/teyrchains/runtimes/assets/asset-hub-zagros/src/migrations.rs
+++ b/pezcumulus/teyrchains/runtimes/assets/asset-hub-zagros/src/migrations.rs
@@ -15,7 +15,7 @@
 
 use crate::xcm_config::bridging::to_pezkuwichain::{AssetHubPezkuwichain, PezkuwichainEcosystem};
 use alloc::{vec, vec::Vec};
-use assets_common::{
+use pez_assets_common::{
 	local_and_foreign_assets::ForeignAssetReserveData,
 	migrations::foreign_assets_reserves::ForeignAssetsReservesProvider,
 };
diff --git a/pezcumulus/teyrchains/runtimes/assets/asset-hub-zagros/src/weights/xcm/mod.rs b/pezcumulus/teyrchains/runtimes/assets/asset-hub-zagros/src/weights/xcm/mod.rs
index 6d34c98f..576680c2 100644
--- a/pezcumulus/teyrchains/runtimes/assets/asset-hub-zagros/src/weights/xcm/mod.rs
+++ b/pezcumulus/teyrchains/runtimes/assets/asset-hub-zagros/src/weights/xcm/mod.rs
@@ -21,7 +21,7 @@ use crate::{
 	Runtime,
 };
 use alloc::vec::Vec;
-use assets_common::IsLocalAccountKey20;
+use pez_assets_common::IsLocalAccountKey20;
 use pezframe_support::{traits::Contains, weights::Weight};
 use pezpallet_xcm_benchmarks_fungible::WeightInfo as XcmFungibleWeight;
 use pezpallet_xcm_benchmarks_generic::WeightInfo as XcmGeneric;
diff --git a/pezcumulus/teyrchains/runtimes/assets/asset-hub-zagros/src/xcm_config.rs b/pezcumulus/teyrchains/runtimes/assets/asset-hub-zagros/src/xcm_config.rs
index 3d460fac..aaac242f 100644
--- a/pezcumulus/teyrchains/runtimes/assets/asset-hub-zagros/src/xcm_config.rs
+++ b/pezcumulus/teyrchains/runtimes/assets/asset-hub-zagros/src/xcm_config.rs
@@ -21,7 +21,7 @@ use super::{
 	ToPezkuwichainXcmRouter, TransactionByteFee, Treasurer, Uniques, WeightToFee, XcmpQueue,
 };
 use alloc::{collections::BTreeSet, vec, vec::Vec};
-use assets_common::{
+use pez_assets_common::{
 	matching::{
 		IsForeignConcreteAsset, NonTeleportableAssetFromTrustedReserve, ParentLocation,
 		TeleportableAssetWithTrustedReserve,
@@ -124,7 +124,7 @@ pub type FungibleTransactor = FungibleAdapter<
 
 /// `AssetId`/`Balance` converter for `TrustBackedAssets`.
 pub type TrustBackedAssetsConvertedConcreteId =
-	assets_common::TrustBackedAssetsConvertedConcreteId<TrustBackedAssetsPalletLocation, Balance>;
+	pez_assets_common::TrustBackedAssetsConvertedConcreteId<TrustBackedAssetsPalletLocation, Balance>;
 
 /// Means for transacting assets besides the native currency on this chain.
 pub type FungiblesTransactor = FungiblesAdapter<
@@ -145,7 +145,7 @@ pub type FungiblesTransactor = FungiblesAdapter<
 
 /// Matcher for converting `ClassId`/`InstanceId` into a uniques asset.
 pub type UniquesConvertedConcreteId =
-	assets_common::UniquesConvertedConcreteId<UniquesPalletLocation>;
+	pez_assets_common::UniquesConvertedConcreteId<UniquesPalletLocation>;
 
 /// Means for transacting unique assets.
 pub type UniquesTransactor = UniqueInstancesAdapter<
@@ -156,7 +156,7 @@ pub type UniquesTransactor = UniqueInstancesAdapter<
 >;
 
 /// `AssetId`/`Balance` converter for `ForeignAssets`.
-pub type ForeignAssetsConvertedConcreteId = assets_common::ForeignAssetsConvertedConcreteId<
+pub type ForeignAssetsConvertedConcreteId = pez_assets_common::ForeignAssetsConvertedConcreteId<
 	(
 		// Ignore `TrustBackedAssets` explicitly
 		StartsWith<TrustBackedAssetsPalletLocation>,
@@ -189,7 +189,7 @@ pub type ForeignFungiblesTransactor = FungiblesAdapter<
 
 /// `AssetId`/`Balance` converter for `PoolAssets`.
 pub type PoolAssetsConvertedConcreteId =
-	assets_common::PoolAssetsConvertedConcreteId<PoolAssetsPalletLocation, Balance>;
+	pez_assets_common::PoolAssetsConvertedConcreteId<PoolAssetsPalletLocation, Balance>;
 
 /// Means for transacting asset conversion pool assets on this chain.
 pub type PoolFungiblesTransactor = FungiblesAdapter<
@@ -216,11 +216,11 @@ parameter_types! {
 }
 
 /// Transactor for ERC20 tokens.
-pub type ERC20Transactor = assets_common::ERC20Transactor<
+pub type ERC20Transactor = pez_assets_common::ERC20Transactor<
 	// We need this for accessing pezpallet-revive.
 	Runtime,
 	// The matcher for smart contracts.
-	assets_common::ERC20Matcher,
+	pez_assets_common::ERC20Matcher,
 	// How to convert from a location to an account id.
 	LocationToAccountId,
 	// The maximum gas that can be used by a standard ERC20 transfer.
@@ -602,7 +602,7 @@ impl pezcumulus_pezpallet_xcm::Config for Runtime {
 /// All configuration related to bridging
 pub mod bridging {
 	use super::*;
-	use assets_common::matching;
+	use pez_assets_common::matching;
 
 	parameter_types! {
 		/// Base price of every byte of the Zagros -> Pezkuwichain message. Can be adjusted via
@@ -617,14 +617,14 @@ pub mod bridging {
 		///
 		/// 3) the approximate cost of Zagros -> Pezkuwichain message confirmation transaction on Zagros Bridge Hub.
 		pub storage XcmBridgeHubRouterBaseFee: Balance =
-			bp_bridge_hub_zagros::BridgeHubZagrosBaseXcmFeeInWnds::get()
-				.saturating_add(bp_bridge_hub_pezkuwichain::BridgeHubPezkuwichainBaseDeliveryFeeInRocs::get())
-				.saturating_add(bp_bridge_hub_zagros::BridgeHubZagrosBaseConfirmationFeeInWnds::get());
+			pezbp_bridge_hub_zagros::BridgeHubZagrosBaseXcmFeeInWnds::get()
+				.saturating_add(pezbp_bridge_hub_pezkuwichain::BridgeHubPezkuwichainBaseDeliveryFeeInRocs::get())
+				.saturating_add(pezbp_bridge_hub_zagros::BridgeHubZagrosBaseConfirmationFeeInWnds::get());
 		/// Price of every byte of the Zagros -> Pezkuwichain message. Can be adjusted via
 		/// governance `set_storage` call.
 		pub storage XcmBridgeHubRouterByteFee: Balance = TransactionByteFee::get();
 
-		pub SiblingBridgeHubParaId: u32 = bp_bridge_hub_zagros::BRIDGE_HUB_ZAGROS_TEYRCHAIN_ID;
+		pub SiblingBridgeHubParaId: u32 = pezbp_bridge_hub_zagros::BRIDGE_HUB_ZAGROS_TEYRCHAIN_ID;
 		pub SiblingBridgeHub: Location = Location::new(1, [Teyrchain(SiblingBridgeHubParaId::get())]);
 		/// Router expects payment with this `AssetId`.
 		/// (`AssetId` has to be aligned with `BridgeTable`)
@@ -646,7 +646,7 @@ pub mod bridging {
 				1,
 				[
 					Teyrchain(SiblingBridgeHubParaId::get()),
-					PalletInstance(bp_bridge_hub_zagros::WITH_BRIDGE_ZAGROS_TO_PEZKUWICHAIN_MESSAGES_PALLET_INDEX)
+					PalletInstance(pezbp_bridge_hub_zagros::WITH_BRIDGE_ZAGROS_TO_PEZKUWICHAIN_MESSAGES_PALLET_INDEX)
 				]
 			);
 
@@ -655,7 +655,7 @@ pub mod bridging {
 			pub RocLocation: Location = Location::new(2, [GlobalConsensus(PezkuwichainNetwork::get())]);
 			pub AssetHubPezkuwichain: Location = Location::new(2, [
 				GlobalConsensus(PezkuwichainNetwork::get()),
-				Teyrchain(bp_asset_hub_pezkuwichain::ASSET_HUB_PEZKUWICHAIN_TEYRCHAIN_ID)
+				Teyrchain(pezbp_asset_hub_pezkuwichain::ASSET_HUB_PEZKUWICHAIN_TEYRCHAIN_ID)
 			]);
 
 			/// Set up exporters configuration.
@@ -699,7 +699,7 @@ pub mod bridging {
 
 	pub mod to_ethereum {
 		use super::*;
-		use assets_common::matching::FromNetwork;
+		use pez_assets_common::matching::FromNetwork;
 		use testnet_teyrchains_constants::zagros::snowbridge::{
 			EthereumNetwork, INBOUND_QUEUE_PALLET_INDEX_V1, INBOUND_QUEUE_PALLET_INDEX_V2,
 		};
diff --git a/pezcumulus/teyrchains/runtimes/assets/asset-hub-zagros/tests/tests.rs b/pezcumulus/teyrchains/runtimes/assets/asset-hub-zagros/tests/tests.rs
index f939de63..4bd9bdb7 100644
--- a/pezcumulus/teyrchains/runtimes/assets/asset-hub-zagros/tests/tests.rs
+++ b/pezcumulus/teyrchains/runtimes/assets/asset-hub-zagros/tests/tests.rs
@@ -38,7 +38,7 @@ use asset_test_pezutils::{
 	test_cases_over_bridge::TestBridgingConfig, CollatorSessionKey, CollatorSessionKeys,
 	ExtBuilder, GovernanceOrigin, SlotDurations,
 };
-use assets_common::local_and_foreign_assets::ForeignAssetReserveData;
+use pez_assets_common::local_and_foreign_assets::ForeignAssetReserveData;
 use codec::{Decode, Encode};
 use hex_literal::hex;
 use pezframe_support::{
@@ -102,7 +102,7 @@ parameter_types! {
 }
 
 type AssetIdForTrustBackedAssetsConvert =
-	assets_common::AssetIdForTrustBackedAssetsConvert<TrustBackedAssetsPalletLocation>;
+	pez_assets_common::AssetIdForTrustBackedAssetsConvert<TrustBackedAssetsPalletLocation>;
 
 type RuntimeHelper = asset_test_pezutils::RuntimeHelper<Runtime, AllPalletsWithoutSystem>;
 
@@ -686,7 +686,7 @@ fn test_new_nft_config_works_as_the_old_one() {
 
 #[test]
 fn test_assets_balances_api_works() {
-	use assets_common::runtime_api::runtime_decl_for_fungibles_api::FungiblesApi;
+	use pez_assets_common::runtime_api::runtime_decl_for_fungibles_api::FungiblesApi;
 
 	ExtBuilder::<Runtime>::default()
 		.with_tracing()
@@ -781,7 +781,7 @@ fn test_assets_balances_api_works() {
 
 			// check currency
 			assert!(result.inner().iter().any(|asset| asset.eq(
-				&assets_common::fungible_conversion::convert_balance::<ZagrosLocation, Balance>(
+				&pez_assets_common::fungible_conversion::convert_balance::<ZagrosLocation, Balance>(
 					some_currency
 				)
 				.unwrap()
@@ -1113,7 +1113,7 @@ fn receive_reserve_asset_deposited_roc_from_asset_hub_pezkuwichain_fees_paid_by_
 				bridging_to_asset_hub_pezkuwichain()
 			},
 			(
-				[PalletInstance(bp_bridge_hub_zagros::WITH_BRIDGE_ZAGROS_TO_PEZKUWICHAIN_MESSAGES_PALLET_INDEX)].into(),
+				[PalletInstance(pezbp_bridge_hub_zagros::WITH_BRIDGE_ZAGROS_TO_PEZKUWICHAIN_MESSAGES_PALLET_INDEX)].into(),
 				GlobalConsensus(ByGenesis(PEZKUWICHAIN_GENESIS_HASH)),
 				[Teyrchain(1000)].into()
 			),
@@ -1189,7 +1189,7 @@ fn receive_reserve_asset_deposited_roc_from_asset_hub_pezkuwichain_fees_paid_by_
 			bridging_to_asset_hub_pezkuwichain()
 		},
 		(
-			[PalletInstance(bp_bridge_hub_zagros::WITH_BRIDGE_ZAGROS_TO_PEZKUWICHAIN_MESSAGES_PALLET_INDEX)].into(),
+			[PalletInstance(pezbp_bridge_hub_zagros::WITH_BRIDGE_ZAGROS_TO_PEZKUWICHAIN_MESSAGES_PALLET_INDEX)].into(),
 			GlobalConsensus(ByGenesis(PEZKUWICHAIN_GENESIS_HASH)),
 			[Teyrchain(1000)].into()
 		),
@@ -1229,14 +1229,14 @@ fn report_bridge_status_from_xcm_bridge_router_for_pezkuwichain_works() {
 	>(
 		collator_session_keys(),
 		bridging_to_asset_hub_pezkuwichain,
-		|| bp_asset_hub_zagros::build_congestion_message(Default::default(), true).into(),
-		|| bp_asset_hub_zagros::build_congestion_message(Default::default(), false).into(),
+		|| pezbp_asset_hub_zagros::build_congestion_message(Default::default(), true).into(),
+		|| pezbp_asset_hub_zagros::build_congestion_message(Default::default(), false).into(),
 	)
 }
 
 #[test]
 fn test_report_bridge_status_call_compatibility() {
-	// if this test fails, make sure `bp_asset_hub_pezkuwichain` has valid encoding
+	// if this test fails, make sure `pezbp_asset_hub_pezkuwichain` has valid encoding
 	assert_eq!(
 		RuntimeCall::ToPezkuwichainXcmRouter(
 			pezpallet_xcm_bridge_hub_router::Call::report_bridge_status {
@@ -1245,8 +1245,8 @@ fn test_report_bridge_status_call_compatibility() {
 			}
 		)
 		.encode(),
-		bp_asset_hub_zagros::Call::ToPezkuwichainXcmRouter(
-			bp_asset_hub_zagros::XcmBridgeHubRouterCall::report_bridge_status {
+		pezbp_asset_hub_zagros::Call::ToPezkuwichainXcmRouter(
+			pezbp_asset_hub_zagros::XcmBridgeHubRouterCall::report_bridge_status {
 				bridge_id: Default::default(),
 				is_congested: true,
 			}
@@ -1261,7 +1261,7 @@ fn check_sane_weight_report_bridge_status() {
 	let actual = <Runtime as pezpallet_xcm_bridge_hub_router::Config<
 		ToPezkuwichainXcmRouterInstance,
 	>>::WeightInfo::report_bridge_status();
-	let max_weight = bp_asset_hub_zagros::XcmBridgeHubRouterTransactCallMaxWeight::get();
+	let max_weight = pezbp_asset_hub_zagros::XcmBridgeHubRouterTransactCallMaxWeight::get();
 	assert!(
 		actual.all_lte(max_weight),
 		"max_weight: {:?} should be adjusted to actual {:?}",
diff --git a/pezcumulus/teyrchains/runtimes/assets/common/Cargo.toml b/pezcumulus/teyrchains/runtimes/assets/common/Cargo.toml
index 87de13a6..44bf4881 100644
--- a/pezcumulus/teyrchains/runtimes/assets/common/Cargo.toml
+++ b/pezcumulus/teyrchains/runtimes/assets/common/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
-name = "assets-common"
-version = "0.7.0"
+name = "pez-assets-common"
+version = "0.7.1"
 authors.workspace = true
 edition.workspace = true
 description = "Assets common utilities"
diff --git a/pezcumulus/teyrchains/runtimes/assets/test-utils/Cargo.toml b/pezcumulus/teyrchains/runtimes/assets/test-utils/Cargo.toml
index 163f3434..6aa70387 100644
--- a/pezcumulus/teyrchains/runtimes/assets/test-utils/Cargo.toml
+++ b/pezcumulus/teyrchains/runtimes/assets/test-utils/Cargo.toml
@@ -27,7 +27,7 @@ pezsp-io = { workspace = true }
 pezsp-runtime = { workspace = true }
 
 # Pezcumulus
-assets-common = { workspace = true }
+pez-assets-common = { workspace = true }
 pezcumulus-pezpallet-teyrchain-system = { workspace = true }
 pezcumulus-pezpallet-xcmp-queue = { workspace = true }
 pezcumulus-primitives-core = { workspace = true }
@@ -49,7 +49,7 @@ pezpallet-xcm-bridge-hub-router = { workspace = true }
 [features]
 default = ["std"]
 std = [
-	"assets-common/std",
+	"pez-assets-common/std",
 	"codec/std",
 	"pezcumulus-pezpallet-teyrchain-system/std",
 	"pezcumulus-pezpallet-xcmp-queue/std",
@@ -75,7 +75,7 @@ std = [
 	"xcm/std",
 ]
 try-runtime = [
-	"assets-common/try-runtime",
+	"pez-assets-common/try-runtime",
 	"pezcumulus-pezpallet-teyrchain-system/try-runtime",
 	"pezcumulus-pezpallet-xcmp-queue/try-runtime",
 	"pezframe-support/try-runtime",
@@ -93,7 +93,7 @@ try-runtime = [
 	"teyrchains-common/try-runtime",
 ]
 runtime-benchmarks = [
-	"assets-common/runtime-benchmarks",
+	"pez-assets-common/runtime-benchmarks",
 	"pezcumulus-pezpallet-teyrchain-system/runtime-benchmarks",
 	"pezcumulus-pezpallet-xcmp-queue/runtime-benchmarks",
 	"pezcumulus-primitives-core/runtime-benchmarks",
diff --git a/pezcumulus/teyrchains/runtimes/assets/test-utils/src/test_cases.rs b/pezcumulus/teyrchains/runtimes/assets/test-utils/src/test_cases.rs
index 84aba64c..956c6f1c 100644
--- a/pezcumulus/teyrchains/runtimes/assets/test-utils/src/test_cases.rs
+++ b/pezcumulus/teyrchains/runtimes/assets/test-utils/src/test_cases.rs
@@ -17,7 +17,7 @@
 
 use super::xcm_helpers;
 use crate::{assert_matches_reserve_asset_deposited_instructions, get_fungible_delivery_fees};
-use assets_common::local_and_foreign_assets::ForeignAssetReserveData;
+use pez_assets_common::local_and_foreign_assets::ForeignAssetReserveData;
 use codec::Encode;
 use core::ops::Mul;
 use pezcumulus_primitives_core::{UpwardMessageSender, XcmpMessageSource};
diff --git a/pezcumulus/teyrchains/runtimes/assets/test-utils/src/test_cases_over_bridge.rs b/pezcumulus/teyrchains/runtimes/assets/test-utils/src/test_cases_over_bridge.rs
index 7b1b9a6e..e1a70e5c 100644
--- a/pezcumulus/teyrchains/runtimes/assets/test-utils/src/test_cases_over_bridge.rs
+++ b/pezcumulus/teyrchains/runtimes/assets/test-utils/src/test_cases_over_bridge.rs
@@ -17,7 +17,7 @@
 //! over a bridge.
 
 use crate::{assert_matches_reserve_asset_deposited_instructions, get_fungible_delivery_fees};
-use assets_common::local_and_foreign_assets::ForeignAssetReserveData;
+use pez_assets_common::local_and_foreign_assets::ForeignAssetReserveData;
 use codec::Encode;
 use pezcumulus_primitives_core::XcmpMessageSource;
 use pezframe_support::{
diff --git a/pezcumulus/teyrchains/runtimes/bridge-hubs/bridge-hub-pezkuwichain/Cargo.toml b/pezcumulus/teyrchains/runtimes/bridge-hubs/bridge-hub-pezkuwichain/Cargo.toml
index 234464c9..af7bc3de 100644
--- a/pezcumulus/teyrchains/runtimes/bridge-hubs/bridge-hub-pezkuwichain/Cargo.toml
+++ b/pezcumulus/teyrchains/runtimes/bridge-hubs/bridge-hub-pezkuwichain/Cargo.toml
@@ -87,18 +87,18 @@ teyrchain-info = { workspace = true }
 teyrchains-common = { workspace = true }
 
 # Bridges
-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-pez-chain = { workspace = true }
-bp-messages = { workspace = true }
-bp-pezkuwi-bulletin = { workspace = true }
-bp-pezkuwi-core = { workspace = true }
-bp-relayers = { workspace = true }
-bp-teyrchains = { workspace = true }
-bp-xcm-bridge-hub-router = { workspace = true }
-bp-zagros = { workspace = true }
+pezbp-asset-hub-pezkuwichain = { workspace = true }
+pezbp-asset-hub-zagros = { workspace = true }
+pezbp-bridge-hub-pezkuwichain = { workspace = true }
+pezbp-bridge-hub-zagros = { workspace = true }
+pezbp-header-pez-chain = { workspace = true }
+pezbp-messages = { workspace = true }
+pezbp-pezkuwi-bulletin = { workspace = true }
+pezbp-pezkuwi-core = { workspace = true }
+pezbp-relayers = { workspace = true }
+pezbp-teyrchains = { workspace = true }
+pezbp-xcm-bridge-hub-router = { workspace = true }
+pezbp-zagros = { workspace = true }
 pezbp-runtime = { workspace = true }
 pezbridge-runtime-common = { workspace = true }
 pezpallet-bridge-grandpa = { workspace = true }
@@ -121,7 +121,7 @@ pezsnowbridge-pezpallet-outbound-queue = { workspace = true }
 pezsnowbridge-pezpallet-system = { workspace = true }
 pezsnowbridge-system-runtime-api = { workspace = true }
 
-bridge-hub-common = { workspace = true }
+pezbridge-hub-common = { workspace = true }
 
 [dev-dependencies]
 pezbridge-hub-test-utils = { workspace = true, default-features = true }
@@ -136,19 +136,19 @@ teyrchains-runtimes-test-utils = { workspace = true, default-features = true }
 default = ["std"]
 std = [
 	"bizinikiwi-wasm-builder",
-	"bp-asset-hub-pezkuwichain/std",
-	"bp-asset-hub-zagros/std",
-	"bp-bridge-hub-pezkuwichain/std",
-	"bp-bridge-hub-zagros/std",
-	"bp-header-pez-chain/std",
-	"bp-messages/std",
-	"bp-pezkuwi-bulletin/std",
-	"bp-pezkuwi-core/std",
-	"bp-relayers/std",
-	"bp-teyrchains/std",
-	"bp-xcm-bridge-hub-router/std",
-	"bp-zagros/std",
-	"bridge-hub-common/std",
+	"pezbp-asset-hub-pezkuwichain/std",
+	"pezbp-asset-hub-zagros/std",
+	"pezbp-bridge-hub-pezkuwichain/std",
+	"pezbp-bridge-hub-zagros/std",
+	"pezbp-header-pez-chain/std",
+	"pezbp-messages/std",
+	"pezbp-pezkuwi-bulletin/std",
+	"pezbp-pezkuwi-core/std",
+	"pezbp-relayers/std",
+	"pezbp-teyrchains/std",
+	"pezbp-xcm-bridge-hub-router/std",
+	"pezbp-zagros/std",
+	"pezbridge-hub-common/std",
 	"codec/std",
 	"pezbp-runtime/std",
 	"pezbridge-runtime-common/std",
@@ -231,19 +231,19 @@ std = [
 ]
 runtime-benchmarks = [
 	"bizinikiwi-wasm-builder?/runtime-benchmarks",
-	"bp-asset-hub-pezkuwichain/runtime-benchmarks",
-	"bp-asset-hub-zagros/runtime-benchmarks",
-	"bp-bridge-hub-pezkuwichain/runtime-benchmarks",
-	"bp-bridge-hub-zagros/runtime-benchmarks",
-	"bp-header-pez-chain/runtime-benchmarks",
-	"bp-messages/runtime-benchmarks",
-	"bp-pezkuwi-bulletin/runtime-benchmarks",
-	"bp-pezkuwi-core/runtime-benchmarks",
-	"bp-relayers/runtime-benchmarks",
-	"bp-teyrchains/runtime-benchmarks",
-	"bp-xcm-bridge-hub-router/runtime-benchmarks",
-	"bp-zagros/runtime-benchmarks",
-	"bridge-hub-common/runtime-benchmarks",
+	"pezbp-asset-hub-pezkuwichain/runtime-benchmarks",
+	"pezbp-asset-hub-zagros/runtime-benchmarks",
+	"pezbp-bridge-hub-pezkuwichain/runtime-benchmarks",
+	"pezbp-bridge-hub-zagros/runtime-benchmarks",
+	"pezbp-header-pez-chain/runtime-benchmarks",
+	"pezbp-messages/runtime-benchmarks",
+	"pezbp-pezkuwi-bulletin/runtime-benchmarks",
+	"pezbp-pezkuwi-core/runtime-benchmarks",
+	"pezbp-relayers/runtime-benchmarks",
+	"pezbp-teyrchains/runtime-benchmarks",
+	"pezbp-xcm-bridge-hub-router/runtime-benchmarks",
+	"pezbp-zagros/runtime-benchmarks",
+	"pezbridge-hub-common/runtime-benchmarks",
 	"pezbp-runtime/runtime-benchmarks",
 	"pezbridge-hub-test-utils/runtime-benchmarks",
 	"pezbridge-runtime-common/runtime-benchmarks",
diff --git a/pezcumulus/teyrchains/runtimes/bridge-hubs/bridge-hub-pezkuwichain/bridge-primitives/Cargo.toml b/pezcumulus/teyrchains/runtimes/bridge-hubs/bridge-hub-pezkuwichain/bridge-primitives/Cargo.toml
index ba55b612..7af4e59e 100644
--- a/pezcumulus/teyrchains/runtimes/bridge-hubs/bridge-hub-pezkuwichain/bridge-primitives/Cargo.toml
+++ b/pezcumulus/teyrchains/runtimes/bridge-hubs/bridge-hub-pezkuwichain/bridge-primitives/Cargo.toml
@@ -1,5 +1,5 @@
 [package]
-name = "bp-bridge-hub-pezkuwichain"
+name = "pezbp-bridge-hub-pezkuwichain"
 description = "Primitives of BridgeHubPezkuwichain teyrchain runtime."
 version = "0.7.0"
 authors.workspace = true
@@ -19,9 +19,9 @@ workspace = true
 codec = { features = ["derive"], workspace = true }
 
 # Bridge Dependencies
-bp-bridge-hub-pezcumulus = { workspace = true }
-bp-messages = { workspace = true }
-bp-xcm-bridge-hub = { workspace = true }
+pezbp-bridge-hub-pezcumulus = { workspace = true }
+pezbp-messages = { workspace = true }
+pezbp-xcm-bridge-hub = { workspace = true }
 pezbp-runtime = { workspace = true }
 
 # Bizinikiwi Based Dependencies
@@ -33,9 +33,9 @@ pezsp-std = { workspace = true }
 [features]
 default = ["std"]
 std = [
-	"bp-bridge-hub-pezcumulus/std",
-	"bp-messages/std",
-	"bp-xcm-bridge-hub/std",
+	"pezbp-bridge-hub-pezcumulus/std",
+	"pezbp-messages/std",
+	"pezbp-xcm-bridge-hub/std",
 	"codec/std",
 	"pezbp-runtime/std",
 	"pezframe-support/std",
@@ -44,9 +44,9 @@ std = [
 	"pezsp-std/std",
 ]
 runtime-benchmarks = [
-	"bp-bridge-hub-pezcumulus/runtime-benchmarks",
-	"bp-messages/runtime-benchmarks",
-	"bp-xcm-bridge-hub/runtime-benchmarks",
+	"pezbp-bridge-hub-pezcumulus/runtime-benchmarks",
+	"pezbp-messages/runtime-benchmarks",
+	"pezbp-xcm-bridge-hub/runtime-benchmarks",
 	"pezbp-runtime/runtime-benchmarks",
 	"pezframe-support/runtime-benchmarks",
 	"pezsp-api/runtime-benchmarks",
diff --git a/pezcumulus/teyrchains/runtimes/bridge-hubs/bridge-hub-pezkuwichain/bridge-primitives/src/lib.rs b/pezcumulus/teyrchains/runtimes/bridge-hubs/bridge-hub-pezkuwichain/bridge-primitives/src/lib.rs
index ab0af22b..fdc29efb 100644
--- a/pezcumulus/teyrchains/runtimes/bridge-hubs/bridge-hub-pezkuwichain/bridge-primitives/src/lib.rs
+++ b/pezcumulus/teyrchains/runtimes/bridge-hubs/bridge-hub-pezkuwichain/bridge-primitives/src/lib.rs
@@ -19,8 +19,8 @@
 #![warn(missing_docs)]
 #![cfg_attr(not(feature = "std"), no_std)]
 
-pub use bp_bridge_hub_pezcumulus::*;
-use bp_messages::*;
+pub use pezbp_bridge_hub_pezcumulus::*;
+use pezbp_messages::*;
 use codec::{Decode, Encode};
 use pezbp_runtime::{
 	decl_bridge_finality_runtime_apis, decl_bridge_messages_runtime_apis, Chain, ChainId, Teyrchain,
@@ -121,5 +121,5 @@ pezframe_support::parameter_types! {
 pub enum RuntimeCall {
 	/// Points to the `pezpallet_xcm_bridge_hub` pezpallet instance for `BridgeHubZagros`.
 	#[codec(index = 52)]
-	XcmOverBridgeHubZagros(bp_xcm_bridge_hub::XcmBridgeHubCall),
+	XcmOverBridgeHubZagros(pezbp_xcm_bridge_hub::XcmBridgeHubCall),
 }
diff --git a/pezcumulus/teyrchains/runtimes/bridge-hubs/bridge-hub-pezkuwichain/src/bridge_common_config.rs b/pezcumulus/teyrchains/runtimes/bridge-hubs/bridge-hub-pezkuwichain/src/bridge_common_config.rs
index dcb9a271..6685f62e 100644
--- a/pezcumulus/teyrchains/runtimes/bridge-hubs/bridge-hub-pezkuwichain/src/bridge_common_config.rs
+++ b/pezcumulus/teyrchains/runtimes/bridge-hubs/bridge-hub-pezkuwichain/src/bridge_common_config.rs
@@ -22,16 +22,16 @@
 //! GRANDPA tracking pezpallet only needs to be aware of one chain.
 
 use super::{weights, AccountId, Balance, Balances, BlockNumber, Runtime, RuntimeEvent};
-use bp_relayers::RewardsAccountParams;
-use bp_teyrchains::SingleParaStoredHeaderDataBuilder;
+use pezbp_relayers::RewardsAccountParams;
+use pezbp_teyrchains::SingleParaStoredHeaderDataBuilder;
 use pezframe_support::{parameter_types, traits::ConstU32};
 
 parameter_types! {
 	pub const RelayChainHeadersToKeep: u32 = 1024;
 	pub const TeyrchainHeadsToKeep: u32 = 64;
 
-	pub const ZagrosBridgeTeyrchainPalletName: &'static str = bp_zagros::PARAS_PALLET_NAME;
-	pub const MaxZagrosParaHeadDataSize: u32 = bp_zagros::MAX_NESTED_TEYRCHAIN_HEAD_DATA_SIZE;
+	pub const ZagrosBridgeTeyrchainPalletName: &'static str = pezbp_zagros::PARAS_PALLET_NAME;
+	pub const MaxZagrosParaHeadDataSize: u32 = pezbp_zagros::MAX_NESTED_TEYRCHAIN_HEAD_DATA_SIZE;
 
 	pub storage RequiredStakeForStakeAndSlash: Balance = 1_000_000;
 	pub const RelayerStakeLease: u32 = 8;
@@ -44,7 +44,7 @@ parameter_types! {
 pub type BridgeGrandpaZagrosInstance = pezpallet_bridge_grandpa::Instance3;
 impl pezpallet_bridge_grandpa::Config<BridgeGrandpaZagrosInstance> for Runtime {
 	type RuntimeEvent = RuntimeEvent;
-	type BridgedChain = bp_zagros::Zagros;
+	type BridgedChain = pezbp_zagros::Zagros;
 	type MaxFreeHeadersPerBlock = ConstU32<4>;
 	type FreeHeadersInterval = ConstU32<5>;
 	type HeadersToKeep = RelayChainHeadersToKeep;
@@ -59,7 +59,7 @@ impl pezpallet_bridge_teyrchains::Config<BridgeTeyrchainZagrosInstance> for Runt
 	type BridgesGrandpaPalletInstance = BridgeGrandpaZagrosInstance;
 	type ParasPalletName = ZagrosBridgeTeyrchainPalletName;
 	type ParaStoredHeaderDataBuilder =
-		SingleParaStoredHeaderDataBuilder<bp_bridge_hub_zagros::BridgeHubZagros>;
+		SingleParaStoredHeaderDataBuilder<pezbp_bridge_hub_zagros::BridgeHubZagros>;
 	type HeadsToKeep = TeyrchainHeadsToKeep;
 	type MaxParaHeadDataSize = MaxZagrosParaHeadDataSize;
 	type OnNewHead = ();
@@ -70,11 +70,11 @@ pub type RelayersForLegacyLaneIdsMessagesInstance = ();
 impl pezpallet_bridge_relayers::Config<RelayersForLegacyLaneIdsMessagesInstance> for Runtime {
 	type RuntimeEvent = RuntimeEvent;
 	type RewardBalance = Balance;
-	type Reward = RewardsAccountParams<bp_messages::LegacyLaneId>;
-	type PaymentProcedure = bp_relayers::PayRewardFromAccount<
+	type Reward = RewardsAccountParams<pezbp_messages::LegacyLaneId>;
+	type PaymentProcedure = pezbp_relayers::PayRewardFromAccount<
 		pezpallet_balances::Pezpallet<Runtime>,
 		AccountId,
-		bp_messages::LegacyLaneId,
+		pezbp_messages::LegacyLaneId,
 		Self::RewardBalance,
 	>;
 	type StakeAndSlash = pezpallet_bridge_relayers::StakeAndSlashNamed<
@@ -94,11 +94,11 @@ pub type RelayersForPermissionlessLanesInstance = pezpallet_bridge_relayers::Ins
 impl pezpallet_bridge_relayers::Config<RelayersForPermissionlessLanesInstance> for Runtime {
 	type RuntimeEvent = RuntimeEvent;
 	type RewardBalance = Balance;
-	type Reward = RewardsAccountParams<bp_messages::HashedLaneId>;
-	type PaymentProcedure = bp_relayers::PayRewardFromAccount<
+	type Reward = RewardsAccountParams<pezbp_messages::HashedLaneId>;
+	type PaymentProcedure = pezbp_relayers::PayRewardFromAccount<
 		pezpallet_balances::Pezpallet<Runtime>,
 		AccountId,
-		bp_messages::HashedLaneId,
+		pezbp_messages::HashedLaneId,
 		Self::RewardBalance,
 	>;
 	type StakeAndSlash = pezpallet_bridge_relayers::StakeAndSlashNamed<
@@ -117,7 +117,7 @@ impl pezpallet_bridge_relayers::Config<RelayersForPermissionlessLanesInstance> f
 pub type BridgeGrandpaPezkuwichainBulletinInstance = pezpallet_bridge_grandpa::Instance4;
 impl pezpallet_bridge_grandpa::Config<BridgeGrandpaPezkuwichainBulletinInstance> for Runtime {
 	type RuntimeEvent = RuntimeEvent;
-	type BridgedChain = bp_pezkuwi_bulletin::PezkuwiBulletin;
+	type BridgedChain = pezbp_pezkuwi_bulletin::PezkuwiBulletin;
 	type MaxFreeHeadersPerBlock = ConstU32<4>;
 	type FreeHeadersInterval = ConstU32<5>;
 	type HeadersToKeep = RelayChainHeadersToKeep;
diff --git a/pezcumulus/teyrchains/runtimes/bridge-hubs/bridge-hub-pezkuwichain/src/bridge_to_bulletin_config.rs b/pezcumulus/teyrchains/runtimes/bridge-hubs/bridge-hub-pezkuwichain/src/bridge_to_bulletin_config.rs
index c1912acd..62d795e5 100644
--- a/pezcumulus/teyrchains/runtimes/bridge-hubs/bridge-hub-pezkuwichain/src/bridge_to_bulletin_config.rs
+++ b/pezcumulus/teyrchains/runtimes/bridge-hubs/bridge-hub-pezkuwichain/src/bridge_to_bulletin_config.rs
@@ -25,7 +25,7 @@ use crate::{
 	BridgePezkuwichainBulletinMessages, Runtime, RuntimeEvent, RuntimeHoldReason,
 	XcmOverPezkuwichainBulletin, XcmRouter,
 };
-use bp_messages::{
+use pezbp_messages::{
 	source_chain::FromBridgedChainMessagesDeliveryProof,
 	target_chain::FromBridgedChainMessagesProof, LegacyLaneId,
 };
@@ -80,10 +80,10 @@ parameter_types! {
 
 /// Proof of messages, coming from Pezkuwichain Bulletin chain.
 pub type FromPezkuwichainBulletinMessagesProof<MI> =
-	FromBridgedChainMessagesProof<bp_pezkuwi_bulletin::Hash, LaneIdOf<Runtime, MI>>;
+	FromBridgedChainMessagesProof<pezbp_pezkuwi_bulletin::Hash, LaneIdOf<Runtime, MI>>;
 /// Messages delivery proof for Pezkuwichain Bridge Hub -> Pezkuwichain Bulletin messages.
 pub type ToPezkuwichainBulletinMessagesDeliveryProof<MI> =
-	FromBridgedChainMessagesDeliveryProof<bp_pezkuwi_bulletin::Hash, LaneIdOf<Runtime, MI>>;
+	FromBridgedChainMessagesDeliveryProof<pezbp_pezkuwi_bulletin::Hash, LaneIdOf<Runtime, MI>>;
 
 /// Dispatches received XCM messages from other bridge.
 type FromPezkuwichainBulletinMessageBlobDispatcher = BridgeBlobDispatcher<
@@ -119,8 +119,8 @@ impl pezpallet_bridge_messages::Config<WithPezkuwichainBulletinMessagesInstance>
 			Runtime,
 		>;
 
-	type ThisChain = bp_bridge_hub_pezkuwichain::BridgeHubPezkuwichain;
-	type BridgedChain = bp_pezkuwi_bulletin::PezkuwiBulletin;
+	type ThisChain = pezbp_bridge_hub_pezkuwichain::BridgeHubPezkuwichain;
+	type BridgedChain = pezbp_pezkuwi_bulletin::PezkuwiBulletin;
 	type BridgedHeaderChain = BridgePezkuwichainBulletinGrandpa;
 
 	type OutboundPayload = XcmAsPlainPayload;
@@ -190,13 +190,13 @@ mod tests {
 	#[test]
 	fn ensure_bridge_hub_pezkuwichain_message_lane_weights_are_correct() {
 		check_message_lane_weights::<
-			bp_bridge_hub_pezkuwichain::BridgeHubPezkuwichain,
+			pezbp_bridge_hub_pezkuwichain::BridgeHubPezkuwichain,
 			Runtime,
 			WithPezkuwichainBulletinMessagesInstance,
 		>(
-			bp_pezkuwi_bulletin::EXTRA_STORAGE_PROOF_SIZE,
-			bp_bridge_hub_pezkuwichain::MAX_UNREWARDED_RELAYERS_IN_CONFIRMATION_TX,
-			bp_bridge_hub_pezkuwichain::MAX_UNCONFIRMED_MESSAGES_IN_CONFIRMATION_TX,
+			pezbp_pezkuwi_bulletin::EXTRA_STORAGE_PROOF_SIZE,
+			pezbp_bridge_hub_pezkuwichain::MAX_UNREWARDED_RELAYERS_IN_CONFIRMATION_TX,
+			pezbp_bridge_hub_pezkuwichain::MAX_UNCONFIRMED_MESSAGES_IN_CONFIRMATION_TX,
 			true,
 		);
 	}
@@ -206,8 +206,8 @@ mod tests {
 		assert_complete_bridge_types!(
 			runtime: Runtime,
 			with_bridged_chain_messages_instance: WithPezkuwichainBulletinMessagesInstance,
-			this_chain: bp_bridge_hub_pezkuwichain::BridgeHubPezkuwichain,
-			bridged_chain: bp_pezkuwi_bulletin::PezkuwiBulletin,
+			this_chain: pezbp_bridge_hub_pezkuwichain::BridgeHubPezkuwichain,
+			bridged_chain: pezbp_pezkuwi_bulletin::PezkuwiBulletin,
 			expected_payload_type: XcmAsPlainPayload,
 		);
 
@@ -228,7 +228,7 @@ mod tests {
 		>(FEE_BOOST_PER_MESSAGE);
 
 		let expected: InteriorLocation = PalletInstance(
-			bp_bridge_hub_pezkuwichain::WITH_BRIDGE_PEZKUWICHAIN_TO_BULLETIN_MESSAGES_PALLET_INDEX,
+			pezbp_bridge_hub_pezkuwichain::WITH_BRIDGE_PEZKUWICHAIN_TO_BULLETIN_MESSAGES_PALLET_INDEX,
 		)
 		.into();
 
diff --git a/pezcumulus/teyrchains/runtimes/bridge-hubs/bridge-hub-pezkuwichain/src/bridge_to_ethereum_config.rs b/pezcumulus/teyrchains/runtimes/bridge-hubs/bridge-hub-pezkuwichain/src/bridge_to_ethereum_config.rs
index 3718b7cd..2c9d9500 100644
--- a/pezcumulus/teyrchains/runtimes/bridge-hubs/bridge-hub-pezkuwichain/src/bridge_to_ethereum_config.rs
+++ b/pezcumulus/teyrchains/runtimes/bridge-hubs/bridge-hub-pezkuwichain/src/bridge_to_ethereum_config.rs
@@ -37,7 +37,7 @@ use testnet_teyrchains_constants::pezkuwichain::{
 use crate::xcm_config::RelayNetwork;
 #[cfg(feature = "runtime-benchmarks")]
 use benchmark_helpers::DoNothingRouter;
-use bp_asset_hub_pezkuwichain::CreateForeignAssetDeposit;
+use pezbp_asset_hub_pezkuwichain::CreateForeignAssetDeposit;
 use hex_literal::hex;
 use pezframe_support::{parameter_types, weights::ConstantMultiplier};
 use pezpallet_xcm::EnsureXcm;
diff --git a/pezcumulus/teyrchains/runtimes/bridge-hubs/bridge-hub-pezkuwichain/src/bridge_to_zagros_config.rs b/pezcumulus/teyrchains/runtimes/bridge-hubs/bridge-hub-pezkuwichain/src/bridge_to_zagros_config.rs
index 0418d4f9..1cd2faea 100644
--- a/pezcumulus/teyrchains/runtimes/bridge-hubs/bridge-hub-pezkuwichain/src/bridge_to_zagros_config.rs
+++ b/pezcumulus/teyrchains/runtimes/bridge-hubs/bridge-hub-pezkuwichain/src/bridge_to_zagros_config.rs
@@ -26,11 +26,11 @@ use crate::{
 	AccountId, Balance, Balances, BridgeZagrosMessages, PezkuwiXcm, Runtime, RuntimeEvent,
 	RuntimeHoldReason, XcmOverBridgeHubZagros, XcmRouter, XcmpQueue,
 };
-use bp_messages::{
+use pezbp_messages::{
 	source_chain::FromBridgedChainMessagesDeliveryProof,
 	target_chain::FromBridgedChainMessagesProof, LegacyLaneId,
 };
-use bridge_hub_common::xcm_version::XcmVersionOfDestAndRemoteBridge;
+use pezbridge_hub_common::xcm_version::XcmVersionOfDestAndRemoteBridge;
 use pezpallet_xcm_bridge_hub::{BridgeId, XcmAsPlainPayload};
 
 use pezframe_support::{parameter_types, traits::PalletInfoAccess};
@@ -66,7 +66,7 @@ parameter_types! {
 		2,
 		[
 			GlobalConsensus(ZagrosGlobalConsensusNetwork::get()),
-			Teyrchain(<bp_bridge_hub_zagros::BridgeHubZagros as pezbp_runtime::Teyrchain>::TEYRCHAIN_ID)
+			Teyrchain(<pezbp_bridge_hub_zagros::BridgeHubZagros as pezbp_runtime::Teyrchain>::TEYRCHAIN_ID)
 		]
 	);
 
@@ -75,10 +75,10 @@ parameter_types! {
 
 /// Proof of messages, coming from Zagros.
 pub type FromZagrosBridgeHubMessagesProof<MI> =
-	FromBridgedChainMessagesProof<bp_bridge_hub_zagros::Hash, LaneIdOf<Runtime, MI>>;
+	FromBridgedChainMessagesProof<pezbp_bridge_hub_zagros::Hash, LaneIdOf<Runtime, MI>>;
 /// Messages delivery proof for Pezkuwichain Bridge Hub -> Zagros Bridge Hub messages.
 pub type ToZagrosBridgeHubMessagesDeliveryProof<MI> =
-	FromBridgedChainMessagesDeliveryProof<bp_bridge_hub_zagros::Hash, LaneIdOf<Runtime, MI>>;
+	FromBridgedChainMessagesDeliveryProof<pezbp_bridge_hub_zagros::Hash, LaneIdOf<Runtime, MI>>;
 
 /// Dispatches received XCM messages from other bridge
 type FromZagrosMessageBlobDispatcher = BridgeBlobDispatcher<
@@ -108,12 +108,12 @@ impl pezpallet_bridge_messages::Config<WithBridgeHubZagrosMessagesInstance> for
 	type WeightInfo =
 		weights::pezpallet_bridge_messages_pezkuwichain_to_zagros::WeightInfo<Runtime>;
 
-	type ThisChain = bp_bridge_hub_pezkuwichain::BridgeHubPezkuwichain;
-	type BridgedChain = bp_bridge_hub_zagros::BridgeHubZagros;
+	type ThisChain = pezbp_bridge_hub_pezkuwichain::BridgeHubPezkuwichain;
+	type BridgedChain = pezbp_bridge_hub_zagros::BridgeHubZagros;
 	type BridgedHeaderChain = pezpallet_bridge_teyrchains::TeyrchainHeaders<
 		Runtime,
 		BridgeTeyrchainZagrosInstance,
-		bp_bridge_hub_zagros::BridgeHubZagros,
+		pezbp_bridge_hub_zagros::BridgeHubZagros,
 	>;
 
 	type OutboundPayload = XcmAsPlainPayload;
@@ -164,7 +164,7 @@ impl pezpallet_xcm_bridge_hub::Config<XcmOverBridgeHubZagrosInstance> for Runtim
 	type BlobDispatcher = FromZagrosMessageBlobDispatcher;
 }
 
-/// Implementation of `bp_xcm_bridge_hub::LocalXcmChannelManager` for congestion management.
+/// Implementation of `pezbp_xcm_bridge_hub::LocalXcmChannelManager` for congestion management.
 pub struct CongestionManager;
 impl pezpallet_xcm_bridge_hub::LocalXcmChannelManager for CongestionManager {
 	type Error = SendError;
@@ -173,7 +173,7 @@ impl pezpallet_xcm_bridge_hub::LocalXcmChannelManager for CongestionManager {
 		// This is used to check the inbound bridge queue/messages to determine if they can be
 		// dispatched and sent to the sibling teyrchain. Therefore, checking outbound `XcmpQueue`
 		// is sufficient here.
-		use bp_xcm_bridge_hub_router::XcmChannelStatusProvider;
+		use pezbp_xcm_bridge_hub_router::XcmChannelStatusProvider;
 		pezcumulus_pezpallet_xcmp_queue::bridging::OutXcmpChannelStatusProvider::<Runtime>::is_congested(
 			with,
 		)
@@ -184,7 +184,7 @@ impl pezpallet_xcm_bridge_hub::LocalXcmChannelManager for CongestionManager {
 		// so `local_origin` is expected to represent only the local AH.
 		send_xcm::<XcmpQueue>(
 			local_origin.clone(),
-			bp_asset_hub_pezkuwichain::build_congestion_message(bridge.inner(), true).into(),
+			pezbp_asset_hub_pezkuwichain::build_congestion_message(bridge.inner(), true).into(),
 		)
 		.map(|_| ())
 	}
@@ -194,7 +194,7 @@ impl pezpallet_xcm_bridge_hub::LocalXcmChannelManager for CongestionManager {
 		// so `local_origin` is expected to represent only the local AH.
 		send_xcm::<XcmpQueue>(
 			local_origin.clone(),
-			bp_asset_hub_pezkuwichain::build_congestion_message(bridge.inner(), false).into(),
+			pezbp_asset_hub_pezkuwichain::build_congestion_message(bridge.inner(), false).into(),
 		)
 		.map(|_| ())
 	}
@@ -280,13 +280,13 @@ mod tests {
 	#[test]
 	fn ensure_bridge_hub_pezkuwichain_message_lane_weights_are_correct() {
 		check_message_lane_weights::<
-			bp_bridge_hub_pezkuwichain::BridgeHubPezkuwichain,
+			pezbp_bridge_hub_pezkuwichain::BridgeHubPezkuwichain,
 			Runtime,
 			WithBridgeHubZagrosMessagesInstance,
 		>(
-			bp_bridge_hub_zagros::EXTRA_STORAGE_PROOF_SIZE,
-			bp_bridge_hub_pezkuwichain::MAX_UNREWARDED_RELAYERS_IN_CONFIRMATION_TX,
-			bp_bridge_hub_pezkuwichain::MAX_UNCONFIRMED_MESSAGES_IN_CONFIRMATION_TX,
+			pezbp_bridge_hub_zagros::EXTRA_STORAGE_PROOF_SIZE,
+			pezbp_bridge_hub_pezkuwichain::MAX_UNREWARDED_RELAYERS_IN_CONFIRMATION_TX,
+			pezbp_bridge_hub_pezkuwichain::MAX_UNCONFIRMED_MESSAGES_IN_CONFIRMATION_TX,
 			true,
 		);
 	}
@@ -296,8 +296,8 @@ mod tests {
 		assert_complete_bridge_types!(
 			runtime: Runtime,
 			with_bridged_chain_messages_instance: WithBridgeHubZagrosMessagesInstance,
-			this_chain: bp_bridge_hub_pezkuwichain::BridgeHubPezkuwichain,
-			bridged_chain: bp_bridge_hub_zagros::BridgeHubZagros,
+			this_chain: pezbp_bridge_hub_pezkuwichain::BridgeHubPezkuwichain,
+			bridged_chain: pezbp_bridge_hub_zagros::BridgeHubZagros,
 			expected_payload_type: XcmAsPlainPayload,
 		);
 
@@ -307,8 +307,8 @@ mod tests {
 			WithBridgeHubZagrosMessagesInstance,
 		>(AssertCompleteBridgeConstants {
 			this_chain_constants: AssertChainConstants {
-				block_length: bp_bridge_hub_pezkuwichain::BlockLength::get(),
-				block_weights: bp_bridge_hub_pezkuwichain::BlockWeightsForAsyncBacking::get(),
+				block_length: pezbp_bridge_hub_pezkuwichain::BlockLength::get(),
+				block_weights: pezbp_bridge_hub_pezkuwichain::BlockWeightsForAsyncBacking::get(),
 			},
 		});
 
@@ -321,7 +321,7 @@ mod tests {
 		pezpallet_bridge_relayers::extension::per_teyrchain_header::ensure_priority_boost_is_sane::<
 			Runtime,
 			WithBridgeHubZagrosMessagesInstance,
-			bp_bridge_hub_zagros::BridgeHubZagros,
+			pezbp_bridge_hub_zagros::BridgeHubZagros,
 			PriorityBoostPerTeyrchainHeader,
 		>(FEE_BOOST_PER_TEYRCHAIN_HEADER);
 
@@ -332,7 +332,7 @@ mod tests {
 		>(FEE_BOOST_PER_MESSAGE);
 
 		let expected: InteriorLocation = [PalletInstance(
-			bp_bridge_hub_pezkuwichain::WITH_BRIDGE_PEZKUWICHAIN_TO_ZAGROS_MESSAGES_PALLET_INDEX,
+			pezbp_bridge_hub_pezkuwichain::WITH_BRIDGE_PEZKUWICHAIN_TO_ZAGROS_MESSAGES_PALLET_INDEX,
 		)]
 		.into();
 
@@ -347,8 +347,8 @@ pub mod migration {
 
 	parameter_types! {
 		pub AssetHubPezkuwichainToAssetHubZagrosMessagesLane: LegacyLaneId = LegacyLaneId([0, 0, 0, 2]);
-		pub AssetHubPezkuwichainLocation: Location = Location::new(1, [Teyrchain(bp_asset_hub_pezkuwichain::ASSET_HUB_PEZKUWICHAIN_TEYRCHAIN_ID)]);
-		pub AssetHubZagrosUniversalLocation: InteriorLocation = [GlobalConsensus(ZagrosGlobalConsensusNetwork::get()), Teyrchain(bp_asset_hub_zagros::ASSET_HUB_ZAGROS_TEYRCHAIN_ID)].into();
+		pub AssetHubPezkuwichainLocation: Location = Location::new(1, [Teyrchain(pezbp_asset_hub_pezkuwichain::ASSET_HUB_PEZKUWICHAIN_TEYRCHAIN_ID)]);
+		pub AssetHubZagrosUniversalLocation: InteriorLocation = [GlobalConsensus(ZagrosGlobalConsensusNetwork::get()), Teyrchain(pezbp_asset_hub_zagros::ASSET_HUB_ZAGROS_TEYRCHAIN_ID)].into();
 	}
 
 	/// Ensure that the existing lanes for the AHR<>AHW bridge are correctly configured.
@@ -364,7 +364,7 @@ pub mod migration {
 	>;
 
 	mod v1_wrong {
-		use bp_messages::{LaneState, MessageNonce, UnrewardedRelayer};
+		use pezbp_messages::{LaneState, MessageNonce, UnrewardedRelayer};
 		use codec::{Decode, Encode};
 		use pezbp_runtime::AccountIdOf;
 		use pezpallet_bridge_messages::BridgedChainOf;
@@ -390,7 +390,7 @@ pub mod migration {
 	}
 
 	mod v1 {
-		pub use bp_messages::{InboundLaneData, LaneState, OutboundLaneData};
+		pub use pezbp_messages::{InboundLaneData, LaneState, OutboundLaneData};
 		pub use pezpallet_bridge_messages::{InboundLanes, OutboundLanes, StoredInboundLaneData};
 	}
 
diff --git a/pezcumulus/teyrchains/runtimes/bridge-hubs/bridge-hub-pezkuwichain/src/genesis_config_presets.rs b/pezcumulus/teyrchains/runtimes/bridge-hubs/bridge-hub-pezkuwichain/src/genesis_config_presets.rs
index f036245e..e75d5740 100644
--- a/pezcumulus/teyrchains/runtimes/bridge-hubs/bridge-hub-pezkuwichain/src/genesis_config_presets.rs
+++ b/pezcumulus/teyrchains/runtimes/bridge-hubs/bridge-hub-pezkuwichain/src/genesis_config_presets.rs
@@ -33,7 +33,7 @@ fn bridge_hub_pezkuwichain_genesis(
 	id: ParaId,
 	bridges_pallet_owner: Option<AccountId>,
 	asset_hub_para_id: ParaId,
-	opened_bridges: Vec<(Location, InteriorLocation, Option<bp_messages::LegacyLaneId>)>,
+	opened_bridges: Vec<(Location, InteriorLocation, Option<pezbp_messages::LegacyLaneId>)>,
 ) -> serde_json::Value {
 	build_struct_json_patch!(RuntimeGenesisConfig {
 		balances: BalancesConfig {
@@ -70,7 +70,7 @@ fn bridge_hub_pezkuwichain_genesis(
 			opened_bridges: vec![(
 				Location::new(1, [Teyrchain(1004)]),
 				Junctions::from([GlobalConsensus(NetworkId::PezkuwiBulletin).into()]),
-				Some(bp_messages::LegacyLaneId([0, 0, 0, 0])),
+				Some(pezbp_messages::LegacyLaneId([0, 0, 0, 0])),
 			)],
 		},
 		xcm_over_bridge_hub_zagros: XcmOverBridgeHubZagrosConfig { opened_bridges },
@@ -94,7 +94,7 @@ pub fn get_preset(id: &pezsp_genesis_builder::PresetId) -> Option<pezsp_std::vec
 			vec![(
 				Location::new(1, [Teyrchain(1000)]),
 				Junctions::from([ByGenesis(ZAGROS_GENESIS_HASH).into(), Teyrchain(1000)]),
-				Some(bp_messages::LegacyLaneId([0, 0, 0, 2])),
+				Some(pezbp_messages::LegacyLaneId([0, 0, 0, 2])),
 			)],
 		),
 		pezsp_genesis_builder::DEV_RUNTIME_PRESET => bridge_hub_pezkuwichain_genesis(
diff --git a/pezcumulus/teyrchains/runtimes/bridge-hubs/bridge-hub-pezkuwichain/src/lib.rs b/pezcumulus/teyrchains/runtimes/bridge-hubs/bridge-hub-pezkuwichain/src/lib.rs
index a21e4fb3..d6b2dcc5 100644
--- a/pezcumulus/teyrchains/runtimes/bridge-hubs/bridge-hub-pezkuwichain/src/lib.rs
+++ b/pezcumulus/teyrchains/runtimes/bridge-hubs/bridge-hub-pezkuwichain/src/lib.rs
@@ -75,7 +75,7 @@ use testnet_teyrchains_constants::pezkuwichain::{
 	consensus::*, currency::*, fee::WeightToFee, time::*,
 };
 
-use bridge_hub_common::{
+use pezbridge_hub_common::{
 	message_queue::{NarrowOriginToSibling, ParaIdToSibling},
 	AggregateMessageOrigin,
 };
@@ -188,7 +188,7 @@ pub type Migrations = (
 	pezpallet_bridge_relayers::migration::v1::MigrationToV1<
 		Runtime,
 		bridge_common_config::RelayersForLegacyLaneIdsMessagesInstance,
-		bp_messages::LegacyLaneId,
+		pezbp_messages::LegacyLaneId,
 	>,
 	pezpallet_session::migrations::v1::MigrateV0ToV1<
 		Runtime,
@@ -432,7 +432,7 @@ impl pezpallet_message_queue::Config for Runtime {
 	type MessageProcessor =
 		pezpallet_message_queue::mock_helpers::NoopMessageProcessor<AggregateMessageOrigin>;
 	#[cfg(not(all(not(feature = "std"), feature = "runtime-benchmarks")))]
-	type MessageProcessor = bridge_hub_common::BridgeHubMessageRouter<
+	type MessageProcessor = pezbridge_hub_common::BridgeHubMessageRouter<
 		xcm_builder::ProcessXcmMessage<
 			AggregateMessageOrigin,
 			xcm_executor::XcmExecutor<xcm_config::XcmConfig>,
@@ -667,7 +667,7 @@ pezbridge_runtime_common::generate_bridge_reject_obsolete_headers_and_messages!
 	CheckAndBoostBridgeTeyrchainsTransactions<
 		Runtime,
 		bridge_common_config::BridgeTeyrchainZagrosInstance,
-		bp_bridge_hub_zagros::BridgeHubZagros,
+		pezbp_bridge_hub_zagros::BridgeHubZagros,
 		bridge_to_zagros_config::PriorityBoostPerTeyrchainHeader,
 		xcm_config::TreasuryAccount,
 	>,
@@ -919,39 +919,39 @@ impl_runtime_apis! {
 		}
 	}
 
-	impl bp_zagros::ZagrosFinalityApi<Block> for Runtime {
-		fn best_finalized() -> Option<HeaderId<bp_zagros::Hash, bp_zagros::BlockNumber>> {
+	impl pezbp_zagros::ZagrosFinalityApi<Block> for Runtime {
+		fn best_finalized() -> Option<HeaderId<pezbp_zagros::Hash, pezbp_zagros::BlockNumber>> {
 			BridgeZagrosGrandpa::best_finalized()
 		}
-		fn free_headers_interval() -> Option<bp_zagros::BlockNumber> {
+		fn free_headers_interval() -> Option<pezbp_zagros::BlockNumber> {
 			<Runtime as pezpallet_bridge_grandpa::Config<
 				bridge_common_config::BridgeGrandpaZagrosInstance
 			>>::FreeHeadersInterval::get()
 		}
 		fn synced_headers_grandpa_info(
-		) -> Vec<bp_header_pez_chain::StoredHeaderGrandpaInfo<bp_zagros::Header>> {
+		) -> Vec<pezbp_header_pez_chain::StoredHeaderGrandpaInfo<pezbp_zagros::Header>> {
 			BridgeZagrosGrandpa::synced_headers_grandpa_info()
 		}
 	}
 
-	impl bp_bridge_hub_zagros::BridgeHubZagrosFinalityApi<Block> for Runtime {
+	impl pezbp_bridge_hub_zagros::BridgeHubZagrosFinalityApi<Block> for Runtime {
 		fn best_finalized() -> Option<HeaderId<Hash, BlockNumber>> {
 			BridgeZagrosTeyrchains::best_teyrchain_head_id::<
-				bp_bridge_hub_zagros::BridgeHubZagros
+				pezbp_bridge_hub_zagros::BridgeHubZagros
 			>().unwrap_or(None)
 		}
-		fn free_headers_interval() -> Option<bp_bridge_hub_zagros::BlockNumber> {
+		fn free_headers_interval() -> Option<pezbp_bridge_hub_zagros::BlockNumber> {
 			// "free interval" is not currently used for teyrchains
 			None
 		}
 	}
 
 	// This is exposed by BridgeHubPezkuwichain
-	impl bp_bridge_hub_zagros::FromBridgeHubZagrosInboundLaneApi<Block> for Runtime {
+	impl pezbp_bridge_hub_zagros::FromBridgeHubZagrosInboundLaneApi<Block> for Runtime {
 		fn message_details(
 			lane: LaneIdOf<Runtime, bridge_to_zagros_config::WithBridgeHubZagrosMessagesInstance>,
-			messages: Vec<(bp_messages::MessagePayload, bp_messages::OutboundMessageDetails)>,
-		) -> Vec<bp_messages::InboundMessageDetails> {
+			messages: Vec<(pezbp_messages::MessagePayload, pezbp_messages::OutboundMessageDetails)>,
+		) -> Vec<pezbp_messages::InboundMessageDetails> {
 			pezbridge_runtime_common::messages_api::inbound_message_details::<
 				Runtime,
 				bridge_to_zagros_config::WithBridgeHubZagrosMessagesInstance,
@@ -960,12 +960,12 @@ impl_runtime_apis! {
 	}
 
 	// This is exposed by BridgeHubPezkuwichain
-	impl bp_bridge_hub_zagros::ToBridgeHubZagrosOutboundLaneApi<Block> for Runtime {
+	impl pezbp_bridge_hub_zagros::ToBridgeHubZagrosOutboundLaneApi<Block> for Runtime {
 		fn message_details(
 			lane: LaneIdOf<Runtime, bridge_to_zagros_config::WithBridgeHubZagrosMessagesInstance>,
-			begin: bp_messages::MessageNonce,
-			end: bp_messages::MessageNonce,
-		) -> Vec<bp_messages::OutboundMessageDetails> {
+			begin: pezbp_messages::MessageNonce,
+			end: pezbp_messages::MessageNonce,
+		) -> Vec<pezbp_messages::OutboundMessageDetails> {
 			pezbridge_runtime_common::messages_api::outbound_message_details::<
 				Runtime,
 				bridge_to_zagros_config::WithBridgeHubZagrosMessagesInstance,
@@ -973,28 +973,28 @@ impl_runtime_apis! {
 		}
 	}
 
-	impl bp_pezkuwi_bulletin::PezkuwiBulletinFinalityApi<Block> for Runtime {
-		fn best_finalized() -> Option<pezbp_runtime::HeaderId<bp_pezkuwi_bulletin::Hash, bp_pezkuwi_bulletin::BlockNumber>> {
+	impl pezbp_pezkuwi_bulletin::PezkuwiBulletinFinalityApi<Block> for Runtime {
+		fn best_finalized() -> Option<pezbp_runtime::HeaderId<pezbp_pezkuwi_bulletin::Hash, pezbp_pezkuwi_bulletin::BlockNumber>> {
 			BridgePezkuwiBulletinGrandpa::best_finalized()
 		}
 
-		fn free_headers_interval() -> Option<bp_pezkuwi_bulletin::BlockNumber> {
+		fn free_headers_interval() -> Option<pezbp_pezkuwi_bulletin::BlockNumber> {
 			<Runtime as pezpallet_bridge_grandpa::Config<
 				bridge_common_config::BridgeGrandpaPezkuwichainBulletinInstance
 			>>::FreeHeadersInterval::get()
 		}
 
 		fn synced_headers_grandpa_info(
-		) -> Vec<bp_header_pez_chain::StoredHeaderGrandpaInfo<bp_pezkuwi_bulletin::Header>> {
+		) -> Vec<pezbp_header_pez_chain::StoredHeaderGrandpaInfo<pezbp_pezkuwi_bulletin::Header>> {
 			BridgePezkuwiBulletinGrandpa::synced_headers_grandpa_info()
 		}
 	}
 
-	impl bp_pezkuwi_bulletin::FromPezkuwiBulletinInboundLaneApi<Block> for Runtime {
+	impl pezbp_pezkuwi_bulletin::FromPezkuwiBulletinInboundLaneApi<Block> for Runtime {
 		fn message_details(
 			lane: LaneIdOf<Runtime, bridge_to_bulletin_config::WithPezkuwichainBulletinMessagesInstance>,
-			messages: Vec<(bp_messages::MessagePayload, bp_messages::OutboundMessageDetails)>,
-		) -> Vec<bp_messages::InboundMessageDetails> {
+			messages: Vec<(pezbp_messages::MessagePayload, pezbp_messages::OutboundMessageDetails)>,
+		) -> Vec<pezbp_messages::InboundMessageDetails> {
 			pezbridge_runtime_common::messages_api::inbound_message_details::<
 				Runtime,
 				bridge_to_bulletin_config::WithPezkuwichainBulletinMessagesInstance,
@@ -1002,12 +1002,12 @@ impl_runtime_apis! {
 		}
 	}
 
-	impl bp_pezkuwi_bulletin::ToPezkuwiBulletinOutboundLaneApi<Block> for Runtime {
+	impl pezbp_pezkuwi_bulletin::ToPezkuwiBulletinOutboundLaneApi<Block> for Runtime {
 		fn message_details(
 			lane: LaneIdOf<Runtime, bridge_to_bulletin_config::WithPezkuwichainBulletinMessagesInstance>,
-			begin: bp_messages::MessageNonce,
-			end: bp_messages::MessageNonce,
-		) -> Vec<bp_messages::OutboundMessageDetails> {
+			begin: pezbp_messages::MessageNonce,
+			end: pezbp_messages::MessageNonce,
+		) -> Vec<pezbp_messages::OutboundMessageDetails> {
 			pezbridge_runtime_common::messages_api::outbound_message_details::<
 				Runtime,
 				bridge_to_bulletin_config::WithPezkuwichainBulletinMessagesInstance,
@@ -1300,7 +1300,7 @@ impl_runtime_apis! {
 					)?;
 					XcmOverBridgeHubZagros::do_open_bridge(
 						locations,
-						bp_messages::LegacyLaneId([1, 2, 3, 4]),
+						pezbp_messages::LegacyLaneId([1, 2, 3, 4]),
 						true,
 					).map_err(|e| {
 						tracing::error!(
@@ -1357,10 +1357,10 @@ impl_runtime_apis! {
 					let bridged_chain_id =<Self as pezpallet_bridge_messages::Config<bridge_to_zagros_config::WithBridgeHubZagrosMessagesInstance>>::BridgedChain::ID;
 					pezpallet_bridge_relayers::Pezpallet::<Runtime, bridge_common_config::RelayersForLegacyLaneIdsMessagesInstance>::relayer_reward(
 						relayer,
-						bp_relayers::RewardsAccountParams::new(
+						pezbp_relayers::RewardsAccountParams::new(
 							bench_lane_id,
 							bridged_chain_id,
-							bp_relayers::RewardsAccountOwner::BridgedChain
+							pezbp_relayers::RewardsAccountOwner::BridgedChain
 						)
 					).is_some()
 				}
@@ -1398,7 +1398,7 @@ impl_runtime_apis! {
 					>(params)
 				}
 
-				fn is_message_successfully_dispatched(_nonce: bp_messages::MessageNonce) -> bool {
+				fn is_message_successfully_dispatched(_nonce: pezbp_messages::MessageNonce) -> bool {
 					use pezcumulus_primitives_core::XcmpMessageSource;
 					!XcmpQueue::take_outbound_messages(usize::MAX).is_empty()
 				}
@@ -1443,7 +1443,7 @@ impl_runtime_apis! {
 					>(params)
 				}
 
-				fn is_message_successfully_dispatched(_nonce: bp_messages::MessageNonce) -> bool {
+				fn is_message_successfully_dispatched(_nonce: pezbp_messages::MessageNonce) -> bool {
 					use pezcumulus_primitives_core::XcmpMessageSource;
 					!XcmpQueue::take_outbound_messages(usize::MAX).is_empty()
 				}
@@ -1457,20 +1457,20 @@ impl_runtime_apis! {
 			};
 
 			impl BridgeTeyrchainsConfig<bridge_common_config::BridgeTeyrchainZagrosInstance> for Runtime {
-				fn teyrchains() -> Vec<bp_pezkuwi_core::teyrchains::ParaId> {
+				fn teyrchains() -> Vec<pezbp_pezkuwi_core::teyrchains::ParaId> {
 					use pezbp_runtime::Teyrchain;
-					vec![bp_pezkuwi_core::teyrchains::ParaId(bp_bridge_hub_zagros::BridgeHubZagros::TEYRCHAIN_ID)]
+					vec![pezbp_pezkuwi_core::teyrchains::ParaId(pezbp_bridge_hub_zagros::BridgeHubZagros::TEYRCHAIN_ID)]
 				}
 
 				fn prepare_teyrchain_heads_proof(
-					teyrchains: &[bp_pezkuwi_core::teyrchains::ParaId],
+					teyrchains: &[pezbp_pezkuwi_core::teyrchains::ParaId],
 					teyrchain_head_size: u32,
 					proof_params: pezbp_runtime::UnverifiedStorageProofParams,
 				) -> (
-					bp_teyrchains::RelayBlockNumber,
-					bp_teyrchains::RelayBlockHash,
-					bp_pezkuwi_core::teyrchains::ParaHeadsProof,
-					Vec<(bp_pezkuwi_core::teyrchains::ParaId, bp_pezkuwi_core::teyrchains::ParaHash)>,
+					pezbp_teyrchains::RelayBlockNumber,
+					pezbp_teyrchains::RelayBlockHash,
+					pezbp_pezkuwi_core::teyrchains::ParaHeadsProof,
+					Vec<(pezbp_pezkuwi_core::teyrchains::ParaId, pezbp_pezkuwi_core::teyrchains::ParaHash)>,
 				) {
 					prepare_teyrchain_heads_proof::<Runtime, bridge_common_config::BridgeTeyrchainZagrosInstance>(
 						teyrchains,
@@ -1482,10 +1482,10 @@ impl_runtime_apis! {
 
 			impl BridgeRelayersConfig<bridge_common_config::RelayersForLegacyLaneIdsMessagesInstance> for Runtime {
 				fn bench_reward() -> Self::Reward {
-					bp_relayers::RewardsAccountParams::new(
-						bp_messages::LegacyLaneId::default(),
+					pezbp_relayers::RewardsAccountParams::new(
+						pezbp_messages::LegacyLaneId::default(),
 						*b"test",
-						bp_relayers::RewardsAccountOwner::ThisChain
+						pezbp_relayers::RewardsAccountOwner::ThisChain
 					)
 				}
 
@@ -1493,10 +1493,10 @@ impl_runtime_apis! {
 					reward_kind: Self::Reward,
 					reward: Balance,
 				) -> Option<AccountId> {
-					let rewards_account = bp_relayers::PayRewardFromAccount::<
+					let rewards_account = pezbp_relayers::PayRewardFromAccount::<
 						Balances,
 						AccountId,
-						bp_messages::LegacyLaneId,
+						pezbp_messages::LegacyLaneId,
 						Balance,
 					>::rewards_account(reward_kind);
 					<Runtime as BridgeRelayersConfig<bridge_common_config::RelayersForLegacyLaneIdsMessagesInstance>>::deposit_account(rewards_account, reward);
@@ -1512,10 +1512,10 @@ impl_runtime_apis! {
 
 			impl BridgeRelayersConfig<bridge_common_config::RelayersForPermissionlessLanesInstance> for Runtime {
 				fn bench_reward() -> Self::Reward {
-					bp_relayers::RewardsAccountParams::new(
-						bp_messages::HashedLaneId::default(),
+					pezbp_relayers::RewardsAccountParams::new(
+						pezbp_messages::HashedLaneId::default(),
 						*b"test",
-						bp_relayers::RewardsAccountOwner::ThisChain
+						pezbp_relayers::RewardsAccountOwner::ThisChain
 					)
 				}
 
@@ -1523,10 +1523,10 @@ impl_runtime_apis! {
 					reward_kind: Self::Reward,
 					reward: Balance,
 				) -> Option<AccountId> {
-					let rewards_account = bp_relayers::PayRewardFromAccount::<
+					let rewards_account = pezbp_relayers::PayRewardFromAccount::<
 						Balances,
 						AccountId,
-						bp_messages::HashedLaneId,
+						pezbp_messages::HashedLaneId,
 						Balance,
 					>::rewards_account(reward_kind);
 					<Runtime as BridgeRelayersConfig<bridge_common_config::RelayersForPermissionlessLanesInstance>>::deposit_account(rewards_account, reward);
@@ -1598,7 +1598,7 @@ mod tests {
 
 	#[test]
 	fn ensure_transaction_extension_definition_is_compatible_with_relay() {
-		use bp_pezkuwi_core::SuffixedCommonTransactionExtensionExt;
+		use pezbp_pezkuwi_core::SuffixedCommonTransactionExtensionExt;
 
 		pezsp_io::TestExternalities::default().execute_with(|| {
 			pezframe_system::BlockHash::<Runtime>::insert(BlockNumber::zero(), Hash::default());
@@ -1624,7 +1624,7 @@ mod tests {
 			// for BridgeHubPezkuwichain
 			{
 				let bhr_indirect_payload =
-					bp_bridge_hub_pezkuwichain::TransactionExtension::from_params(
+					pezbp_bridge_hub_pezkuwichain::TransactionExtension::from_params(
 						VERSION.spec_version,
 						VERSION.transaction_version,
 						pezbp_runtime::TransactionEra::Immortal,
diff --git a/pezcumulus/teyrchains/runtimes/bridge-hubs/bridge-hub-pezkuwichain/src/weights/mod.rs b/pezcumulus/teyrchains/runtimes/bridge-hubs/bridge-hub-pezkuwichain/src/weights/mod.rs
index 9d488fa8..5994efa5 100644
--- a/pezcumulus/teyrchains/runtimes/bridge-hubs/bridge-hub-pezkuwichain/src/weights/mod.rs
+++ b/pezcumulus/teyrchains/runtimes/bridge-hubs/bridge-hub-pezkuwichain/src/weights/mod.rs
@@ -76,7 +76,7 @@ impl MessagesWeightInfoExt
 	for pezpallet_bridge_messages_pezkuwichain_to_pezkuwichain_bulletin::WeightInfo<crate::Runtime>
 {
 	fn expected_extra_storage_proof_size() -> u32 {
-		bp_pezkuwi_bulletin::EXTRA_STORAGE_PROOF_SIZE
+		pezbp_pezkuwi_bulletin::EXTRA_STORAGE_PROOF_SIZE
 	}
 
 	fn receive_messages_proof_overhead_from_runtime() -> Weight {
@@ -93,7 +93,7 @@ impl MessagesWeightInfoExt
 	for pezpallet_bridge_messages_pezkuwichain_to_zagros::WeightInfo<crate::Runtime>
 {
 	fn expected_extra_storage_proof_size() -> u32 {
-		bp_bridge_hub_zagros::EXTRA_STORAGE_PROOF_SIZE
+		pezbp_bridge_hub_zagros::EXTRA_STORAGE_PROOF_SIZE
 	}
 
 	fn receive_messages_proof_overhead_from_runtime() -> Weight {
@@ -108,7 +108,7 @@ impl MessagesWeightInfoExt
 
 impl TeyrchainsWeightInfoExt for pezpallet_bridge_teyrchains::WeightInfo<crate::Runtime> {
 	fn expected_extra_storage_proof_size() -> u32 {
-		bp_bridge_hub_zagros::EXTRA_STORAGE_PROOF_SIZE
+		pezbp_bridge_hub_zagros::EXTRA_STORAGE_PROOF_SIZE
 	}
 
 	fn submit_teyrchain_heads_overhead_from_runtime() -> Weight {
diff --git a/pezcumulus/teyrchains/runtimes/bridge-hubs/bridge-hub-pezkuwichain/src/xcm_config.rs b/pezcumulus/teyrchains/runtimes/bridge-hubs/bridge-hub-pezkuwichain/src/xcm_config.rs
index db5d4558..0f5ac966 100644
--- a/pezcumulus/teyrchains/runtimes/bridge-hubs/bridge-hub-pezkuwichain/src/xcm_config.rs
+++ b/pezcumulus/teyrchains/runtimes/bridge-hubs/bridge-hub-pezkuwichain/src/xcm_config.rs
@@ -73,7 +73,7 @@ parameter_types! {
 	pub TreasuryAccount: AccountId = TREASURY_PALLET_ID.into_account_truncating();
 	pub RelayTreasuryLocation: Location = (Parent, PalletInstance(pezkuwichain_runtime_constants::TREASURY_PALLET_ID)).into();
 	pub SiblingPeople: Location = (Parent, Teyrchain(pezkuwichain_runtime_constants::system_teyrchain::PEOPLE_ID)).into();
-	pub AssetHubPezkuwichainLocation: Location = Location::new(1, [Teyrchain(bp_asset_hub_pezkuwichain::ASSET_HUB_PEZKUWICHAIN_TEYRCHAIN_ID)]);
+	pub AssetHubPezkuwichainLocation: Location = Location::new(1, [Teyrchain(pezbp_asset_hub_pezkuwichain::ASSET_HUB_PEZKUWICHAIN_TEYRCHAIN_ID)]);
 }
 
 /// Type for specifying how a `Location` can be converted into an `AccountId`. This is used
diff --git a/pezcumulus/teyrchains/runtimes/bridge-hubs/bridge-hub-pezkuwichain/tests/snowbridge.rs b/pezcumulus/teyrchains/runtimes/bridge-hubs/bridge-hub-pezkuwichain/tests/snowbridge.rs
index 1a9575e3..db6572e8 100644
--- a/pezcumulus/teyrchains/runtimes/bridge-hubs/bridge-hub-pezkuwichain/tests/snowbridge.rs
+++ b/pezcumulus/teyrchains/runtimes/bridge-hubs/bridge-hub-pezkuwichain/tests/snowbridge.rs
@@ -16,7 +16,7 @@
 
 #![cfg(test)]
 
-use bp_pezkuwi_core::Signature;
+use pezbp_pezkuwi_core::Signature;
 use codec::{Decode, Encode};
 use pezbridge_hub_pezkuwichain_runtime::{
 	bridge_to_zagros_config::OnBridgeHubPezkuwichainRefundBridgeHubZagrosMessages,
diff --git a/pezcumulus/teyrchains/runtimes/bridge-hubs/bridge-hub-pezkuwichain/tests/tests.rs b/pezcumulus/teyrchains/runtimes/bridge-hubs/bridge-hub-pezkuwichain/tests/tests.rs
index a889bcd2..106d2a4f 100644
--- a/pezcumulus/teyrchains/runtimes/bridge-hubs/bridge-hub-pezkuwichain/tests/tests.rs
+++ b/pezcumulus/teyrchains/runtimes/bridge-hubs/bridge-hub-pezkuwichain/tests/tests.rs
@@ -16,7 +16,7 @@
 
 #![cfg(test)]
 
-use bp_pezkuwi_core::Signature;
+use pezbp_pezkuwi_core::Signature;
 use codec::{Decode, Encode};
 use hex_literal::hex;
 use pezbridge_hub_pezkuwichain_runtime::{
@@ -121,12 +121,12 @@ pezbridge_hub_test_utils::test_cases::include_teleports_for_native_asset_works!(
 			_ => None,
 		}
 	}),
-	bp_bridge_hub_pezkuwichain::BRIDGE_HUB_PEZKUWICHAIN_TEYRCHAIN_ID
+	pezbp_bridge_hub_pezkuwichain::BRIDGE_HUB_PEZKUWICHAIN_TEYRCHAIN_ID
 );
 
 mod bridge_hub_zagros_tests {
 	use super::*;
-	use bp_messages::LegacyLaneId;
+	use pezbp_messages::LegacyLaneId;
 	use bridge_common_config::{
 		BridgeGrandpaZagrosInstance, BridgeTeyrchainZagrosInstance, DeliveryRewardInBalance,
 		RelayersForLegacyLaneIdsMessagesInstance,
@@ -169,7 +169,7 @@ mod bridge_hub_zagros_tests {
 			BridgeGrandpaZagrosInstance,
 		>(
 			collator_session_keys(),
-			bp_bridge_hub_pezkuwichain::BRIDGE_HUB_PEZKUWICHAIN_TEYRCHAIN_ID,
+			pezbp_bridge_hub_pezkuwichain::BRIDGE_HUB_PEZKUWICHAIN_TEYRCHAIN_ID,
 			Governance::get(),
 		)
 	}
@@ -182,7 +182,7 @@ mod bridge_hub_zagros_tests {
 			BridgeGrandpaZagrosInstance,
 		>(
 			collator_session_keys(),
-			bp_bridge_hub_pezkuwichain::BRIDGE_HUB_PEZKUWICHAIN_TEYRCHAIN_ID,
+			pezbp_bridge_hub_pezkuwichain::BRIDGE_HUB_PEZKUWICHAIN_TEYRCHAIN_ID,
 			Governance::get(),
 		)
 	}
@@ -195,7 +195,7 @@ mod bridge_hub_zagros_tests {
 			BridgeTeyrchainZagrosInstance,
 		>(
 			collator_session_keys(),
-			bp_bridge_hub_pezkuwichain::BRIDGE_HUB_PEZKUWICHAIN_TEYRCHAIN_ID,
+			pezbp_bridge_hub_pezkuwichain::BRIDGE_HUB_PEZKUWICHAIN_TEYRCHAIN_ID,
 			Governance::get(),
 		)
 	}
@@ -208,7 +208,7 @@ mod bridge_hub_zagros_tests {
 			WithBridgeHubZagrosMessagesInstance,
 		>(
 			collator_session_keys(),
-			bp_bridge_hub_pezkuwichain::BRIDGE_HUB_PEZKUWICHAIN_TEYRCHAIN_ID,
+			pezbp_bridge_hub_pezkuwichain::BRIDGE_HUB_PEZKUWICHAIN_TEYRCHAIN_ID,
 			Governance::get(),
 		)
 	}
@@ -221,7 +221,7 @@ mod bridge_hub_zagros_tests {
 			H160,
 		>(
 			collator_session_keys(),
-			bp_bridge_hub_pezkuwichain::BRIDGE_HUB_PEZKUWICHAIN_TEYRCHAIN_ID,
+			pezbp_bridge_hub_pezkuwichain::BRIDGE_HUB_PEZKUWICHAIN_TEYRCHAIN_ID,
 			Governance::get(),
 			|| (EthereumGatewayAddress::key().to_vec(), EthereumGatewayAddress::get()),
 			|_| [1; 20].into(),
@@ -237,7 +237,7 @@ mod bridge_hub_zagros_tests {
 		// Reset a single inbound channel
 		pezbridge_hub_test_utils::test_cases::set_storage_keys_by_governance_works::<Runtime>(
 			collator_session_keys(),
-			bp_bridge_hub_pezkuwichain::BRIDGE_HUB_PEZKUWICHAIN_TEYRCHAIN_ID,
+			pezbp_bridge_hub_pezkuwichain::BRIDGE_HUB_PEZKUWICHAIN_TEYRCHAIN_ID,
 			Governance::get(),
 			vec![
 				(
@@ -308,7 +308,7 @@ mod bridge_hub_zagros_tests {
 			u64,
 		>(
 			collator_session_keys(),
-			bp_bridge_hub_pezkuwichain::BRIDGE_HUB_PEZKUWICHAIN_TEYRCHAIN_ID,
+			pezbp_bridge_hub_pezkuwichain::BRIDGE_HUB_PEZKUWICHAIN_TEYRCHAIN_ID,
 			Governance::get(),
 			|| (DeliveryRewardInBalance::key().to_vec(), DeliveryRewardInBalance::get()),
 			|old_value| old_value.checked_mul(2).unwrap(),
@@ -324,7 +324,7 @@ mod bridge_hub_zagros_tests {
 			WithBridgeHubZagrosMessagesInstance,
 		>(
 			collator_session_keys(),
-			bp_bridge_hub_pezkuwichain::BRIDGE_HUB_PEZKUWICHAIN_TEYRCHAIN_ID,
+			pezbp_bridge_hub_pezkuwichain::BRIDGE_HUB_PEZKUWICHAIN_TEYRCHAIN_ID,
 			SIBLING_TEYRCHAIN_ID,
 			Box::new(|runtime_event_encoded: Vec<u8>| {
 				match RuntimeEvent::decode(&mut &runtime_event_encoded[..]) {
@@ -335,7 +335,7 @@ mod bridge_hub_zagros_tests {
 			|| ExportMessage { network: ZagrosGlobalConsensusNetwork::get(), destination: [Teyrchain(BRIDGED_LOCATION_TEYRCHAIN_ID)].into(), xcm: Xcm(vec![]) },
 			Some((TokenLocation::get(), ExistentialDeposit::get()).into()),
 			// value should be >= than value generated by `can_calculate_weight_for_paid_export_message_with_reserve_transfer`
-			Some((TokenLocation::get(), bp_bridge_hub_pezkuwichain::BridgeHubPezkuwichainBaseXcmFeeInRocs::get()).into()),
+			Some((TokenLocation::get(), pezbp_bridge_hub_pezkuwichain::BridgeHubPezkuwichainBaseXcmFeeInRocs::get()).into()),
 			|| {
 				PezkuwiXcm::force_xcm_version(RuntimeOrigin::root(), Box::new(BridgeHubZagrosLocation::get()), XCM_VERSION).expect("version saved!");
 
@@ -375,7 +375,7 @@ mod bridge_hub_zagros_tests {
 		>(
 			collator_session_keys(),
 			slot_durations(),
-			bp_bridge_hub_pezkuwichain::BRIDGE_HUB_PEZKUWICHAIN_TEYRCHAIN_ID,
+			pezbp_bridge_hub_pezkuwichain::BRIDGE_HUB_PEZKUWICHAIN_TEYRCHAIN_ID,
 			SIBLING_TEYRCHAIN_ID,
 			Box::new(|runtime_event_encoded: Vec<u8>| {
 				match RuntimeEvent::decode(&mut &runtime_event_encoded[..]) {
@@ -399,8 +399,8 @@ mod bridge_hub_zagros_tests {
 		from_teyrchain::relayed_incoming_message_works::<RuntimeTestsAdapter>(
 			collator_session_keys(),
 			slot_durations(),
-			bp_bridge_hub_pezkuwichain::BRIDGE_HUB_PEZKUWICHAIN_TEYRCHAIN_ID,
-			bp_bridge_hub_zagros::BRIDGE_HUB_ZAGROS_TEYRCHAIN_ID,
+			pezbp_bridge_hub_pezkuwichain::BRIDGE_HUB_PEZKUWICHAIN_TEYRCHAIN_ID,
+			pezbp_bridge_hub_zagros::BRIDGE_HUB_ZAGROS_TEYRCHAIN_ID,
 			SIBLING_TEYRCHAIN_ID,
 			ByGenesis(PEZKUWICHAIN_GENESIS_HASH),
 			|| {
@@ -434,8 +434,8 @@ mod bridge_hub_zagros_tests {
 		from_teyrchain::free_relay_extrinsic_works::<RuntimeTestsAdapter>(
 			collator_session_keys(),
 			slot_durations(),
-			bp_bridge_hub_pezkuwichain::BRIDGE_HUB_PEZKUWICHAIN_TEYRCHAIN_ID,
-			bp_bridge_hub_zagros::BRIDGE_HUB_ZAGROS_TEYRCHAIN_ID,
+			pezbp_bridge_hub_pezkuwichain::BRIDGE_HUB_PEZKUWICHAIN_TEYRCHAIN_ID,
+			pezbp_bridge_hub_zagros::BRIDGE_HUB_ZAGROS_TEYRCHAIN_ID,
 			SIBLING_TEYRCHAIN_ID,
 			ByGenesis(PEZKUWICHAIN_GENESIS_HASH),
 			|| {
@@ -466,8 +466,8 @@ mod bridge_hub_zagros_tests {
 	#[test]
 	pub fn can_calculate_weight_for_paid_export_message_with_reserve_transfer() {
 		pezbridge_hub_test_utils::check_sane_fees_values(
-			"bp_bridge_hub_pezkuwichain::BridgeHubPezkuwichainBaseXcmFeeInRocs",
-			bp_bridge_hub_pezkuwichain::BridgeHubPezkuwichainBaseXcmFeeInRocs::get(),
+			"pezbp_bridge_hub_pezkuwichain::BridgeHubPezkuwichainBaseXcmFeeInRocs",
+			pezbp_bridge_hub_pezkuwichain::BridgeHubPezkuwichainBaseXcmFeeInRocs::get(),
 			|| {
 				pezbridge_hub_test_utils::test_cases::can_calculate_weight_for_paid_export_message_with_reserve_transfer::<
 					Runtime,
@@ -487,8 +487,8 @@ mod bridge_hub_zagros_tests {
 	#[test]
 	fn can_calculate_fee_for_standalone_message_delivery_transaction() {
 		pezbridge_hub_test_utils::check_sane_fees_values(
-			"bp_bridge_hub_pezkuwichain::BridgeHubPezkuwichainBaseDeliveryFeeInRocs",
-			bp_bridge_hub_pezkuwichain::BridgeHubPezkuwichainBaseDeliveryFeeInRocs::get(),
+			"pezbp_bridge_hub_pezkuwichain::BridgeHubPezkuwichainBaseDeliveryFeeInRocs",
+			pezbp_bridge_hub_pezkuwichain::BridgeHubPezkuwichainBaseDeliveryFeeInRocs::get(),
 			|| {
 				from_teyrchain::can_calculate_fee_for_standalone_message_delivery_transaction::<
 					RuntimeTestsAdapter,
@@ -506,8 +506,8 @@ mod bridge_hub_zagros_tests {
 	#[test]
 	fn can_calculate_fee_for_standalone_message_confirmation_transaction() {
 		pezbridge_hub_test_utils::check_sane_fees_values(
-			"bp_bridge_hub_pezkuwichain::BridgeHubPezkuwichainBaseConfirmationFeeInRocs",
-			bp_bridge_hub_pezkuwichain::BridgeHubPezkuwichainBaseConfirmationFeeInRocs::get(),
+			"pezbp_bridge_hub_pezkuwichain::BridgeHubPezkuwichainBaseConfirmationFeeInRocs",
+			pezbp_bridge_hub_pezkuwichain::BridgeHubPezkuwichainBaseConfirmationFeeInRocs::get(),
 			|| {
 				from_teyrchain::can_calculate_fee_for_standalone_message_confirmation_transaction::<
 					RuntimeTestsAdapter,
@@ -525,7 +525,7 @@ mod bridge_hub_zagros_tests {
 
 mod bridge_hub_bulletin_tests {
 	use super::*;
-	use bp_messages::LegacyLaneId;
+	use pezbp_messages::LegacyLaneId;
 	use bridge_common_config::BridgeGrandpaPezkuwichainBulletinInstance;
 	use bridge_to_bulletin_config::{
 		PezkuwichainBulletinGlobalConsensusNetwork,
@@ -565,7 +565,7 @@ mod bridge_hub_bulletin_tests {
 			BridgeGrandpaPezkuwichainBulletinInstance,
 		>(
 			collator_session_keys(),
-			bp_bridge_hub_pezkuwichain::BRIDGE_HUB_PEZKUWICHAIN_TEYRCHAIN_ID,
+			pezbp_bridge_hub_pezkuwichain::BRIDGE_HUB_PEZKUWICHAIN_TEYRCHAIN_ID,
 			Governance::get(),
 		)
 	}
@@ -578,7 +578,7 @@ mod bridge_hub_bulletin_tests {
 			BridgeGrandpaPezkuwichainBulletinInstance,
 		>(
 			collator_session_keys(),
-			bp_bridge_hub_pezkuwichain::BRIDGE_HUB_PEZKUWICHAIN_TEYRCHAIN_ID,
+			pezbp_bridge_hub_pezkuwichain::BRIDGE_HUB_PEZKUWICHAIN_TEYRCHAIN_ID,
 			Governance::get(),
 		)
 	}
@@ -591,7 +591,7 @@ mod bridge_hub_bulletin_tests {
 			WithPezkuwichainBulletinMessagesInstance,
 		>(
 			collator_session_keys(),
-			bp_bridge_hub_pezkuwichain::BRIDGE_HUB_PEZKUWICHAIN_TEYRCHAIN_ID,
+			pezbp_bridge_hub_pezkuwichain::BRIDGE_HUB_PEZKUWICHAIN_TEYRCHAIN_ID,
 			Governance::get(),
 		)
 	}
@@ -605,7 +605,7 @@ mod bridge_hub_bulletin_tests {
 			WithPezkuwichainBulletinMessagesInstance,
 		>(
 			collator_session_keys(),
-			bp_bridge_hub_pezkuwichain::BRIDGE_HUB_PEZKUWICHAIN_TEYRCHAIN_ID,
+			pezbp_bridge_hub_pezkuwichain::BRIDGE_HUB_PEZKUWICHAIN_TEYRCHAIN_ID,
 			SIBLING_PEOPLE_TEYRCHAIN_ID,
 			Box::new(|runtime_event_encoded: Vec<u8>| {
 				match RuntimeEvent::decode(&mut &runtime_event_encoded[..]) {
@@ -659,7 +659,7 @@ mod bridge_hub_bulletin_tests {
 		>(
 			collator_session_keys(),
 			slot_durations(),
-			bp_bridge_hub_pezkuwichain::BRIDGE_HUB_PEZKUWICHAIN_TEYRCHAIN_ID,
+			pezbp_bridge_hub_pezkuwichain::BRIDGE_HUB_PEZKUWICHAIN_TEYRCHAIN_ID,
 			SIBLING_PEOPLE_TEYRCHAIN_ID,
 			Box::new(|runtime_event_encoded: Vec<u8>| {
 				match RuntimeEvent::decode(&mut &runtime_event_encoded[..]) {
@@ -683,7 +683,7 @@ mod bridge_hub_bulletin_tests {
 		from_grandpa_chain::relayed_incoming_message_works::<RuntimeTestsAdapter>(
 			collator_session_keys(),
 			slot_durations(),
-			bp_bridge_hub_pezkuwichain::BRIDGE_HUB_PEZKUWICHAIN_TEYRCHAIN_ID,
+			pezbp_bridge_hub_pezkuwichain::BRIDGE_HUB_PEZKUWICHAIN_TEYRCHAIN_ID,
 			SIBLING_PEOPLE_TEYRCHAIN_ID,
 			ByGenesis(PEZKUWICHAIN_GENESIS_HASH),
 			|| {
@@ -717,7 +717,7 @@ mod bridge_hub_bulletin_tests {
 		from_grandpa_chain::free_relay_extrinsic_works::<RuntimeTestsAdapter>(
 			collator_session_keys(),
 			slot_durations(),
-			bp_bridge_hub_pezkuwichain::BRIDGE_HUB_PEZKUWICHAIN_TEYRCHAIN_ID,
+			pezbp_bridge_hub_pezkuwichain::BRIDGE_HUB_PEZKUWICHAIN_TEYRCHAIN_ID,
 			SIBLING_PEOPLE_TEYRCHAIN_ID,
 			ByGenesis(PEZKUWICHAIN_GENESIS_HASH),
 			|| {
@@ -754,7 +754,7 @@ fn change_required_stake_by_governance_works() {
 		Balance,
 	>(
 		collator_session_keys(),
-		bp_bridge_hub_pezkuwichain::BRIDGE_HUB_PEZKUWICHAIN_TEYRCHAIN_ID,
+		pezbp_bridge_hub_pezkuwichain::BRIDGE_HUB_PEZKUWICHAIN_TEYRCHAIN_ID,
 		Governance::get(),
 		|| {
 			(
diff --git a/pezcumulus/teyrchains/runtimes/bridge-hubs/bridge-hub-zagros/Cargo.toml b/pezcumulus/teyrchains/runtimes/bridge-hubs/bridge-hub-zagros/Cargo.toml
index 3c64b7f8..9bc38be5 100644
--- a/pezcumulus/teyrchains/runtimes/bridge-hubs/bridge-hub-zagros/Cargo.toml
+++ b/pezcumulus/teyrchains/runtimes/bridge-hubs/bridge-hub-zagros/Cargo.toml
@@ -85,18 +85,18 @@ teyrchain-info = { workspace = true }
 teyrchains-common = { workspace = true }
 
 # Bridges
-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-pez-chain = { workspace = true }
-bp-messages = { workspace = true }
-bp-pezkuwi-core = { workspace = true }
-bp-pezkuwichain = { workspace = true }
-bp-relayers = { workspace = true }
-bp-teyrchains = { workspace = true }
-bp-xcm-bridge-hub-router = { workspace = true }
-bridge-hub-common = { workspace = true }
+pezbp-asset-hub-pezkuwichain = { workspace = true }
+pezbp-asset-hub-zagros = { workspace = true }
+pezbp-bridge-hub-pezkuwichain = { workspace = true }
+pezbp-bridge-hub-zagros = { workspace = true }
+pezbp-header-pez-chain = { workspace = true }
+pezbp-messages = { workspace = true }
+pezbp-pezkuwi-core = { workspace = true }
+pezbp-pezkuwichain = { workspace = true }
+pezbp-relayers = { workspace = true }
+pezbp-teyrchains = { workspace = true }
+pezbp-xcm-bridge-hub-router = { workspace = true }
+pezbridge-hub-common = { workspace = true }
 pezbp-runtime = { workspace = true }
 pezbridge-runtime-common = { workspace = true }
 pezpallet-bridge-grandpa = { workspace = true }
@@ -140,18 +140,18 @@ bizinikiwi-wasm-builder = { optional = true, workspace = true, default-features
 [features]
 std = [
 	"bizinikiwi-wasm-builder",
-	"bp-asset-hub-pezkuwichain/std",
-	"bp-asset-hub-zagros/std",
-	"bp-bridge-hub-pezkuwichain/std",
-	"bp-bridge-hub-zagros/std",
-	"bp-header-pez-chain/std",
-	"bp-messages/std",
-	"bp-pezkuwi-core/std",
-	"bp-pezkuwichain/std",
-	"bp-relayers/std",
-	"bp-teyrchains/std",
-	"bp-xcm-bridge-hub-router/std",
-	"bridge-hub-common/std",
+	"pezbp-asset-hub-pezkuwichain/std",
+	"pezbp-asset-hub-zagros/std",
+	"pezbp-bridge-hub-pezkuwichain/std",
+	"pezbp-bridge-hub-zagros/std",
+	"pezbp-header-pez-chain/std",
+	"pezbp-messages/std",
+	"pezbp-pezkuwi-core/std",
+	"pezbp-pezkuwichain/std",
+	"pezbp-relayers/std",
+	"pezbp-teyrchains/std",
+	"pezbp-xcm-bridge-hub-router/std",
+	"pezbridge-hub-common/std",
 	"codec/std",
 	"pezbp-runtime/std",
 	"pezbridge-runtime-common/std",
@@ -242,18 +242,18 @@ default = ["std"]
 
 runtime-benchmarks = [
 	"bizinikiwi-wasm-builder?/runtime-benchmarks",
-	"bp-asset-hub-pezkuwichain/runtime-benchmarks",
-	"bp-asset-hub-zagros/runtime-benchmarks",
-	"bp-bridge-hub-pezkuwichain/runtime-benchmarks",
-	"bp-bridge-hub-zagros/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-teyrchains/runtime-benchmarks",
-	"bp-xcm-bridge-hub-router/runtime-benchmarks",
-	"bridge-hub-common/runtime-benchmarks",
+	"pezbp-asset-hub-pezkuwichain/runtime-benchmarks",
+	"pezbp-asset-hub-zagros/runtime-benchmarks",
+	"pezbp-bridge-hub-pezkuwichain/runtime-benchmarks",
+	"pezbp-bridge-hub-zagros/runtime-benchmarks",
+	"pezbp-header-pez-chain/runtime-benchmarks",
+	"pezbp-messages/runtime-benchmarks",
+	"pezbp-pezkuwi-core/runtime-benchmarks",
+	"pezbp-pezkuwichain/runtime-benchmarks",
+	"pezbp-relayers/runtime-benchmarks",
+	"pezbp-teyrchains/runtime-benchmarks",
+	"pezbp-xcm-bridge-hub-router/runtime-benchmarks",
+	"pezbridge-hub-common/runtime-benchmarks",
 	"pezbp-runtime/runtime-benchmarks",
 	"pezbridge-hub-test-utils/runtime-benchmarks",
 	"pezbridge-runtime-common/runtime-benchmarks",
diff --git a/pezcumulus/teyrchains/runtimes/bridge-hubs/bridge-hub-zagros/bridge-primitives/Cargo.toml b/pezcumulus/teyrchains/runtimes/bridge-hubs/bridge-hub-zagros/bridge-primitives/Cargo.toml
index ab7961fb..0a633d2b 100644
--- a/pezcumulus/teyrchains/runtimes/bridge-hubs/bridge-hub-zagros/bridge-primitives/Cargo.toml
+++ b/pezcumulus/teyrchains/runtimes/bridge-hubs/bridge-hub-zagros/bridge-primitives/Cargo.toml
@@ -1,5 +1,5 @@
 [package]
-name = "bp-bridge-hub-zagros"
+name = "pezbp-bridge-hub-zagros"
 description = "Primitives of BridgeHubZagros teyrchain runtime."
 version = "0.3.0"
 authors.workspace = true
@@ -19,9 +19,9 @@ workspace = true
 codec = { features = ["derive"], workspace = true }
 
 # Bridge Dependencies
-bp-bridge-hub-pezcumulus = { workspace = true }
-bp-messages = { workspace = true }
-bp-xcm-bridge-hub = { workspace = true }
+pezbp-bridge-hub-pezcumulus = { workspace = true }
+pezbp-messages = { workspace = true }
+pezbp-xcm-bridge-hub = { workspace = true }
 pezbp-runtime = { workspace = true }
 
 # Bizinikiwi Based Dependencies
@@ -33,9 +33,9 @@ pezsp-std = { workspace = true }
 [features]
 default = ["std"]
 std = [
-	"bp-bridge-hub-pezcumulus/std",
-	"bp-messages/std",
-	"bp-xcm-bridge-hub/std",
+	"pezbp-bridge-hub-pezcumulus/std",
+	"pezbp-messages/std",
+	"pezbp-xcm-bridge-hub/std",
 	"codec/std",
 	"pezbp-runtime/std",
 	"pezframe-support/std",
@@ -44,9 +44,9 @@ std = [
 	"pezsp-std/std",
 ]
 runtime-benchmarks = [
-	"bp-bridge-hub-pezcumulus/runtime-benchmarks",
-	"bp-messages/runtime-benchmarks",
-	"bp-xcm-bridge-hub/runtime-benchmarks",
+	"pezbp-bridge-hub-pezcumulus/runtime-benchmarks",
+	"pezbp-messages/runtime-benchmarks",
+	"pezbp-xcm-bridge-hub/runtime-benchmarks",
 	"pezbp-runtime/runtime-benchmarks",
 	"pezframe-support/runtime-benchmarks",
 	"pezsp-api/runtime-benchmarks",
diff --git a/pezcumulus/teyrchains/runtimes/bridge-hubs/bridge-hub-zagros/bridge-primitives/src/lib.rs b/pezcumulus/teyrchains/runtimes/bridge-hubs/bridge-hub-zagros/bridge-primitives/src/lib.rs
index 198086e0..8ac2a6fa 100644
--- a/pezcumulus/teyrchains/runtimes/bridge-hubs/bridge-hub-zagros/bridge-primitives/src/lib.rs
+++ b/pezcumulus/teyrchains/runtimes/bridge-hubs/bridge-hub-zagros/bridge-primitives/src/lib.rs
@@ -18,8 +18,8 @@
 
 #![cfg_attr(not(feature = "std"), no_std)]
 
-pub use bp_bridge_hub_pezcumulus::*;
-use bp_messages::*;
+pub use pezbp_bridge_hub_pezcumulus::*;
+use pezbp_messages::*;
 use codec::{Decode, Encode};
 use pezbp_runtime::{
 	decl_bridge_finality_runtime_apis, decl_bridge_messages_runtime_apis, Chain, ChainId, Teyrchain,
@@ -109,5 +109,5 @@ pezframe_support::parameter_types! {
 pub enum RuntimeCall {
 	/// Points to the `pezpallet_xcm_bridge_hub` pezpallet instance for `BridgeHubPezkuwichain`.
 	#[codec(index = 45)]
-	XcmOverBridgeHubPezkuwichain(bp_xcm_bridge_hub::XcmBridgeHubCall),
+	XcmOverBridgeHubPezkuwichain(pezbp_xcm_bridge_hub::XcmBridgeHubCall),
 }
diff --git a/pezcumulus/teyrchains/runtimes/bridge-hubs/bridge-hub-zagros/src/bridge_common_config.rs b/pezcumulus/teyrchains/runtimes/bridge-hubs/bridge-hub-zagros/src/bridge_common_config.rs
index aea689d2..dfa26a9a 100644
--- a/pezcumulus/teyrchains/runtimes/bridge-hubs/bridge-hub-zagros/src/bridge_common_config.rs
+++ b/pezcumulus/teyrchains/runtimes/bridge-hubs/bridge-hub-zagros/src/bridge_common_config.rs
@@ -26,8 +26,8 @@ use crate::{
 	bridge_to_ethereum_config::InboundQueueV2Location, xcm_config::XcmConfig, RuntimeCall,
 	XcmRouter,
 };
-use bp_messages::LegacyLaneId;
-use bp_relayers::RewardsAccountParams;
+use pezbp_messages::LegacyLaneId;
+use pezbp_relayers::RewardsAccountParams;
 use codec::{Decode, DecodeWithMemTracking, Encode, MaxEncodedLen};
 use pezframe_support::parameter_types;
 use scale_info::TypeInfo;
@@ -86,9 +86,9 @@ impl From<pezsp_runtime::AccountId32> for BridgeRewardBeneficiaries {
 	}
 }
 
-/// Implementation of `bp_relayers::PaymentProcedure` as a pay/claim rewards scheme.
+/// Implementation of `pezbp_relayers::PaymentProcedure` as a pay/claim rewards scheme.
 pub struct BridgeRewardPayer;
-impl bp_relayers::PaymentProcedure<AccountId, BridgeReward, u128> for BridgeRewardPayer {
+impl pezbp_relayers::PaymentProcedure<AccountId, BridgeReward, u128> for BridgeRewardPayer {
 	type Error = pezsp_runtime::DispatchError;
 	type Beneficiary = BridgeRewardBeneficiaries;
 
@@ -102,7 +102,7 @@ impl bp_relayers::PaymentProcedure<AccountId, BridgeReward, u128> for BridgeRewa
 			BridgeReward::PezkuwichainZagros(lane_params) => {
 				match beneficiary {
 					BridgeRewardBeneficiaries::LocalAccount(account) => {
-						bp_relayers::PayRewardFromAccount::<
+						pezbp_relayers::PayRewardFromAccount::<
 							Balances,
 							AccountId,
 							LegacyLaneId,
diff --git a/pezcumulus/teyrchains/runtimes/bridge-hubs/bridge-hub-zagros/src/bridge_to_ethereum_config.rs b/pezcumulus/teyrchains/runtimes/bridge-hubs/bridge-hub-zagros/src/bridge_to_ethereum_config.rs
index d2cb88b1..13065e95 100644
--- a/pezcumulus/teyrchains/runtimes/bridge-hubs/bridge-hub-zagros/src/bridge_to_ethereum_config.rs
+++ b/pezcumulus/teyrchains/runtimes/bridge-hubs/bridge-hub-zagros/src/bridge_to_ethereum_config.rs
@@ -22,8 +22,8 @@ use crate::{
 	EthereumOutboundQueue, EthereumOutboundQueueV2, EthereumSystem, EthereumSystemV2, MessageQueue,
 	Runtime, RuntimeEvent, TransactionByteFee,
 };
-use bp_asset_hub_zagros::CreateForeignAssetDeposit;
-use bridge_hub_common::AggregateMessageOrigin;
+use pezbp_asset_hub_zagros::CreateForeignAssetDeposit;
+use pezbridge_hub_common::AggregateMessageOrigin;
 use hex_literal::hex;
 use pezframe_support::{parameter_types, traits::Contains, weights::ConstantMultiplier};
 use pezframe_system::EnsureRootWithSuccess;
diff --git a/pezcumulus/teyrchains/runtimes/bridge-hubs/bridge-hub-zagros/src/bridge_to_pezkuwichain_config.rs b/pezcumulus/teyrchains/runtimes/bridge-hubs/bridge-hub-zagros/src/bridge_to_pezkuwichain_config.rs
index 16fbb0b0..e29b0880 100644
--- a/pezcumulus/teyrchains/runtimes/bridge-hubs/bridge-hub-zagros/src/bridge_to_pezkuwichain_config.rs
+++ b/pezcumulus/teyrchains/runtimes/bridge-hubs/bridge-hub-zagros/src/bridge_to_pezkuwichain_config.rs
@@ -21,12 +21,12 @@ use crate::{
 	AccountId, Balance, Balances, BridgePezkuwichainMessages, PezkuwiXcm, Runtime, RuntimeEvent,
 	RuntimeHoldReason, XcmOverBridgeHubPezkuwichain, XcmRouter, XcmpQueue,
 };
-use bp_messages::{
+use pezbp_messages::{
 	source_chain::FromBridgedChainMessagesDeliveryProof,
 	target_chain::FromBridgedChainMessagesProof, LegacyLaneId,
 };
-use bp_teyrchains::SingleParaStoredHeaderDataBuilder;
-use bridge_hub_common::xcm_version::XcmVersionOfDestAndRemoteBridge;
+use pezbp_teyrchains::SingleParaStoredHeaderDataBuilder;
+use pezbridge_hub_common::xcm_version::XcmVersionOfDestAndRemoteBridge;
 use pezpallet_xcm_bridge_hub::{BridgeId, XcmAsPlainPayload};
 
 use pezframe_support::{
@@ -52,7 +52,7 @@ parameter_types! {
 	pub const TeyrchainHeadsToKeep: u32 = 64;
 
 	pub const PezkuwichainBridgeTeyrchainPalletName: &'static str = "Paras";
-	pub const MaxPezkuwichainParaHeadDataSize: u32 = bp_pezkuwichain::MAX_NESTED_TEYRCHAIN_HEAD_DATA_SIZE;
+	pub const MaxPezkuwichainParaHeadDataSize: u32 = pezbp_pezkuwichain::MAX_NESTED_TEYRCHAIN_HEAD_DATA_SIZE;
 
 	pub BridgeZagrosToPezkuwichainMessagesPalletInstance: InteriorLocation = [PalletInstance(<BridgePezkuwichainMessages as PalletInfoAccess>::index() as u8)].into();
 	pub PezkuwichainGlobalConsensusNetwork: NetworkId = NetworkId::ByGenesis(PEZKUWICHAIN_GENESIS_HASH);
@@ -71,7 +71,7 @@ parameter_types! {
 		2,
 		[
 			GlobalConsensus(PezkuwichainGlobalConsensusNetwork::get()),
-			Teyrchain(<bp_bridge_hub_pezkuwichain::BridgeHubPezkuwichain as pezbp_runtime::Teyrchain>::TEYRCHAIN_ID)
+			Teyrchain(<pezbp_bridge_hub_pezkuwichain::BridgeHubPezkuwichain as pezbp_runtime::Teyrchain>::TEYRCHAIN_ID)
 		]
 	);
 
@@ -81,10 +81,10 @@ parameter_types! {
 
 /// Proof of messages, coming from Pezkuwichain.
 pub type FromPezkuwichainBridgeHubMessagesProof<MI> =
-	FromBridgedChainMessagesProof<bp_bridge_hub_pezkuwichain::Hash, LaneIdOf<Runtime, MI>>;
+	FromBridgedChainMessagesProof<pezbp_bridge_hub_pezkuwichain::Hash, LaneIdOf<Runtime, MI>>;
 /// Messages delivery proof for Pezkuwichain Bridge Hub -> Zagros Bridge Hub messages.
 pub type ToPezkuwichainBridgeHubMessagesDeliveryProof<MI> =
-	FromBridgedChainMessagesDeliveryProof<bp_bridge_hub_pezkuwichain::Hash, LaneIdOf<Runtime, MI>>;
+	FromBridgedChainMessagesDeliveryProof<pezbp_bridge_hub_pezkuwichain::Hash, LaneIdOf<Runtime, MI>>;
 
 /// Dispatches received XCM messages from other bridge
 type FromPezkuwichainMessageBlobDispatcher = BridgeBlobDispatcher<
@@ -111,7 +111,7 @@ pezbp_runtime::generate_static_str_provider!(OnBridgeHubZagrosRefundBridgeHubPez
 pub type BridgeGrandpaPezkuwichainInstance = pezpallet_bridge_grandpa::Instance1;
 impl pezpallet_bridge_grandpa::Config<BridgeGrandpaPezkuwichainInstance> for Runtime {
 	type RuntimeEvent = RuntimeEvent;
-	type BridgedChain = bp_pezkuwichain::Pezkuwichain;
+	type BridgedChain = pezbp_pezkuwichain::Pezkuwichain;
 	type MaxFreeHeadersPerBlock = ConstU32<4>;
 	type FreeHeadersInterval = ConstU32<5>;
 	type HeadersToKeep = RelayChainHeadersToKeep;
@@ -126,7 +126,7 @@ impl pezpallet_bridge_teyrchains::Config<BridgeTeyrchainPezkuwichainInstance> fo
 	type BridgesGrandpaPalletInstance = BridgeGrandpaPezkuwichainInstance;
 	type ParasPalletName = PezkuwichainBridgeTeyrchainPalletName;
 	type ParaStoredHeaderDataBuilder =
-		SingleParaStoredHeaderDataBuilder<bp_bridge_hub_pezkuwichain::BridgeHubPezkuwichain>;
+		SingleParaStoredHeaderDataBuilder<pezbp_bridge_hub_pezkuwichain::BridgeHubPezkuwichain>;
 	type HeadsToKeep = TeyrchainHeadsToKeep;
 	type MaxParaHeadDataSize = MaxPezkuwichainParaHeadDataSize;
 	type OnNewHead = ();
@@ -138,12 +138,12 @@ impl pezpallet_bridge_messages::Config<WithBridgeHubPezkuwichainMessagesInstance
 	type RuntimeEvent = RuntimeEvent;
 	type WeightInfo = weights::pezpallet_bridge_messages::WeightInfo<Runtime>;
 
-	type ThisChain = bp_bridge_hub_zagros::BridgeHubZagros;
-	type BridgedChain = bp_bridge_hub_pezkuwichain::BridgeHubPezkuwichain;
+	type ThisChain = pezbp_bridge_hub_zagros::BridgeHubZagros;
+	type BridgedChain = pezbp_bridge_hub_pezkuwichain::BridgeHubPezkuwichain;
 	type BridgedHeaderChain = pezpallet_bridge_teyrchains::TeyrchainHeaders<
 		Runtime,
 		BridgeTeyrchainPezkuwichainInstance,
-		bp_bridge_hub_pezkuwichain::BridgeHubPezkuwichain,
+		pezbp_bridge_hub_pezkuwichain::BridgeHubPezkuwichain,
 	>;
 
 	type OutboundPayload = XcmAsPlainPayload;
@@ -194,7 +194,7 @@ impl pezpallet_xcm_bridge_hub::Config<XcmOverBridgeHubPezkuwichainInstance> for
 	type BlobDispatcher = FromPezkuwichainMessageBlobDispatcher;
 }
 
-/// Implementation of `bp_xcm_bridge_hub::LocalXcmChannelManager` for congestion management.
+/// Implementation of `pezbp_xcm_bridge_hub::LocalXcmChannelManager` for congestion management.
 pub struct CongestionManager;
 impl pezpallet_xcm_bridge_hub::LocalXcmChannelManager for CongestionManager {
 	type Error = SendError;
@@ -203,7 +203,7 @@ impl pezpallet_xcm_bridge_hub::LocalXcmChannelManager for CongestionManager {
 		// This is used to check the inbound bridge queue/messages to determine if they can be
 		// dispatched and sent to the sibling teyrchain. Therefore, checking outbound `XcmpQueue`
 		// is sufficient here.
-		use bp_xcm_bridge_hub_router::XcmChannelStatusProvider;
+		use pezbp_xcm_bridge_hub_router::XcmChannelStatusProvider;
 		pezcumulus_pezpallet_xcmp_queue::bridging::OutXcmpChannelStatusProvider::<Runtime>::is_congested(
 			with,
 		)
@@ -214,7 +214,7 @@ impl pezpallet_xcm_bridge_hub::LocalXcmChannelManager for CongestionManager {
 		// so `local_origin` is expected to represent only the local AH.
 		send_xcm::<XcmpQueue>(
 			local_origin.clone(),
-			bp_asset_hub_zagros::build_congestion_message(bridge.inner(), true).into(),
+			pezbp_asset_hub_zagros::build_congestion_message(bridge.inner(), true).into(),
 		)
 		.map(|_| ())
 	}
@@ -224,7 +224,7 @@ impl pezpallet_xcm_bridge_hub::LocalXcmChannelManager for CongestionManager {
 		// so `local_origin` is expected to represent only the local AH.
 		send_xcm::<XcmpQueue>(
 			local_origin.clone(),
-			bp_asset_hub_zagros::build_congestion_message(bridge.inner(), false).into(),
+			pezbp_asset_hub_zagros::build_congestion_message(bridge.inner(), false).into(),
 		)
 		.map(|_| ())
 	}
@@ -309,13 +309,13 @@ mod tests {
 	#[test]
 	fn ensure_bridge_hub_zagros_message_lane_weights_are_correct() {
 		check_message_lane_weights::<
-			bp_bridge_hub_zagros::BridgeHubZagros,
+			pezbp_bridge_hub_zagros::BridgeHubZagros,
 			Runtime,
 			WithBridgeHubPezkuwichainMessagesInstance,
 		>(
-			bp_bridge_hub_pezkuwichain::EXTRA_STORAGE_PROOF_SIZE,
-			bp_bridge_hub_zagros::MAX_UNREWARDED_RELAYERS_IN_CONFIRMATION_TX,
-			bp_bridge_hub_zagros::MAX_UNCONFIRMED_MESSAGES_IN_CONFIRMATION_TX,
+			pezbp_bridge_hub_pezkuwichain::EXTRA_STORAGE_PROOF_SIZE,
+			pezbp_bridge_hub_zagros::MAX_UNREWARDED_RELAYERS_IN_CONFIRMATION_TX,
+			pezbp_bridge_hub_zagros::MAX_UNCONFIRMED_MESSAGES_IN_CONFIRMATION_TX,
 			true,
 		);
 	}
@@ -325,8 +325,8 @@ mod tests {
 		assert_complete_bridge_types!(
 			runtime: Runtime,
 			with_bridged_chain_messages_instance: WithBridgeHubPezkuwichainMessagesInstance,
-			this_chain: bp_bridge_hub_zagros::BridgeHubZagros,
-			bridged_chain: bp_bridge_hub_pezkuwichain::BridgeHubPezkuwichain,
+			this_chain: pezbp_bridge_hub_zagros::BridgeHubZagros,
+			bridged_chain: pezbp_bridge_hub_pezkuwichain::BridgeHubPezkuwichain,
 			expected_payload_type: XcmAsPlainPayload,
 		);
 
@@ -336,8 +336,8 @@ mod tests {
 			WithBridgeHubPezkuwichainMessagesInstance,
 		>(AssertCompleteBridgeConstants {
 			this_chain_constants: AssertChainConstants {
-				block_length: bp_bridge_hub_zagros::BlockLength::get(),
-				block_weights: bp_bridge_hub_zagros::BlockWeightsForAsyncBacking::get(),
+				block_length: pezbp_bridge_hub_zagros::BlockLength::get(),
+				block_weights: pezbp_bridge_hub_zagros::BlockWeightsForAsyncBacking::get(),
 			},
 		});
 
@@ -350,7 +350,7 @@ mod tests {
 		pezpallet_bridge_relayers::extension::per_teyrchain_header::ensure_priority_boost_is_sane::<
 			Runtime,
 			WithBridgeHubPezkuwichainMessagesInstance,
-			bp_bridge_hub_pezkuwichain::BridgeHubPezkuwichain,
+			pezbp_bridge_hub_pezkuwichain::BridgeHubPezkuwichain,
 			PriorityBoostPerTeyrchainHeader,
 		>(FEE_BOOST_PER_TEYRCHAIN_HEADER);
 
@@ -363,7 +363,7 @@ mod tests {
 		assert_eq!(
 			BridgeZagrosToPezkuwichainMessagesPalletInstance::get(),
 			[PalletInstance(
-				bp_bridge_hub_zagros::WITH_BRIDGE_ZAGROS_TO_PEZKUWICHAIN_MESSAGES_PALLET_INDEX
+				pezbp_bridge_hub_zagros::WITH_BRIDGE_ZAGROS_TO_PEZKUWICHAIN_MESSAGES_PALLET_INDEX
 			)]
 		);
 	}
@@ -372,16 +372,16 @@ mod tests {
 /// Contains the migration for the AssetHubZagros<>AssetHubPezkuwichain bridge.
 pub mod migration {
 	use super::*;
-	use bp_messages::LegacyLaneId;
+	use pezbp_messages::LegacyLaneId;
 
 	parameter_types! {
 		pub AssetHubZagrosToAssetHubPezkuwichainMessagesLane: LegacyLaneId = LegacyLaneId([0, 0, 0, 2]);
-		pub AssetHubZagrosLocation: Location = Location::new(1, [Teyrchain(bp_asset_hub_zagros::ASSET_HUB_ZAGROS_TEYRCHAIN_ID)]);
-		pub AssetHubPezkuwichainUniversalLocation: InteriorLocation = [GlobalConsensus(PezkuwichainGlobalConsensusNetwork::get()), Teyrchain(bp_asset_hub_pezkuwichain::ASSET_HUB_PEZKUWICHAIN_TEYRCHAIN_ID)].into();
+		pub AssetHubZagrosLocation: Location = Location::new(1, [Teyrchain(pezbp_asset_hub_zagros::ASSET_HUB_ZAGROS_TEYRCHAIN_ID)]);
+		pub AssetHubPezkuwichainUniversalLocation: InteriorLocation = [GlobalConsensus(PezkuwichainGlobalConsensusNetwork::get()), Teyrchain(pezbp_asset_hub_pezkuwichain::ASSET_HUB_PEZKUWICHAIN_TEYRCHAIN_ID)].into();
 	}
 
 	mod v1_wrong {
-		use bp_messages::{LaneState, MessageNonce, UnrewardedRelayer};
+		use pezbp_messages::{LaneState, MessageNonce, UnrewardedRelayer};
 		use codec::{Decode, Encode};
 		use pezbp_runtime::AccountIdOf;
 		use pezpallet_bridge_messages::BridgedChainOf;
@@ -407,7 +407,7 @@ pub mod migration {
 	}
 
 	mod v1 {
-		pub use bp_messages::{InboundLaneData, LaneState, OutboundLaneData};
+		pub use pezbp_messages::{InboundLaneData, LaneState, OutboundLaneData};
 		pub use pezpallet_bridge_messages::{InboundLanes, OutboundLanes, StoredInboundLaneData};
 	}
 
diff --git a/pezcumulus/teyrchains/runtimes/bridge-hubs/bridge-hub-zagros/src/genesis_config_presets.rs b/pezcumulus/teyrchains/runtimes/bridge-hubs/bridge-hub-zagros/src/genesis_config_presets.rs
index ca83b21d..a444f332 100644
--- a/pezcumulus/teyrchains/runtimes/bridge-hubs/bridge-hub-zagros/src/genesis_config_presets.rs
+++ b/pezcumulus/teyrchains/runtimes/bridge-hubs/bridge-hub-zagros/src/genesis_config_presets.rs
@@ -33,7 +33,7 @@ fn bridge_hub_zagros_genesis(
 	id: ParaId,
 	bridges_pallet_owner: Option<AccountId>,
 	asset_hub_para_id: ParaId,
-	opened_bridges: Vec<(Location, InteriorLocation, Option<bp_messages::LegacyLaneId>)>,
+	opened_bridges: Vec<(Location, InteriorLocation, Option<pezbp_messages::LegacyLaneId>)>,
 ) -> serde_json::Value {
 	build_struct_json_patch!(RuntimeGenesisConfig {
 		balances: BalancesConfig {
@@ -91,7 +91,7 @@ pub fn get_preset(id: &pezsp_genesis_builder::PresetId) -> Option<pezsp_std::vec
 					NetworkId::ByGenesis(PEZKUWICHAIN_GENESIS_HASH).into(),
 					Teyrchain(1000),
 				]),
-				Some(bp_messages::LegacyLaneId([0, 0, 0, 2])),
+				Some(pezbp_messages::LegacyLaneId([0, 0, 0, 2])),
 			)],
 		),
 		pezsp_genesis_builder::DEV_RUNTIME_PRESET => bridge_hub_zagros_genesis(
diff --git a/pezcumulus/teyrchains/runtimes/bridge-hubs/bridge-hub-zagros/src/lib.rs b/pezcumulus/teyrchains/runtimes/bridge-hubs/bridge-hub-zagros/src/lib.rs
index 6a9e9f6a..198614b5 100644
--- a/pezcumulus/teyrchains/runtimes/bridge-hubs/bridge-hub-zagros/src/lib.rs
+++ b/pezcumulus/teyrchains/runtimes/bridge-hubs/bridge-hub-zagros/src/lib.rs
@@ -54,7 +54,7 @@ use pezsp_runtime::{
 use pezsp_version::NativeVersion;
 use pezsp_version::RuntimeVersion;
 
-use bridge_hub_common::{
+use pezbridge_hub_common::{
 	message_queue::{NarrowOriginToSibling, ParaIdToSibling},
 	AggregateMessageOrigin,
 };
@@ -165,12 +165,12 @@ pub type Migrations = (
 	pezpallet_bridge_relayers::migration::v1::MigrationToV1<
 		Runtime,
 		bridge_common_config::BridgeRelayersInstance,
-		bp_messages::LegacyLaneId,
+		pezbp_messages::LegacyLaneId,
 	>,
 	pezpallet_bridge_relayers::migration::v2::MigrationToV2<
 		Runtime,
 		bridge_common_config::BridgeRelayersInstance,
-		bp_messages::LegacyLaneId,
+		pezbp_messages::LegacyLaneId,
 	>,
 	pezsnowbridge_pezpallet_system::migration::v0::InitializeOnUpgrade<
 		Runtime,
@@ -416,7 +416,7 @@ impl pezpallet_message_queue::Config for Runtime {
 	type MessageProcessor =
 		pezpallet_message_queue::mock_helpers::NoopMessageProcessor<AggregateMessageOrigin>;
 	#[cfg(any(feature = "std", not(feature = "runtime-benchmarks")))]
-	type MessageProcessor = bridge_hub_common::BridgeHubDualMessageRouter<
+	type MessageProcessor = pezbridge_hub_common::BridgeHubDualMessageRouter<
 		xcm_builder::ProcessXcmMessage<
 			AggregateMessageOrigin,
 			xcm_executor::XcmExecutor<xcm_config::XcmConfig>,
@@ -619,7 +619,7 @@ pezbridge_runtime_common::generate_bridge_reject_obsolete_headers_and_messages!
 	CheckAndBoostBridgeTeyrchainsTransactions<
 		Runtime,
 		bridge_to_pezkuwichain_config::BridgeTeyrchainPezkuwichainInstance,
-		bp_bridge_hub_pezkuwichain::BridgeHubPezkuwichain,
+		pezbp_bridge_hub_pezkuwichain::BridgeHubPezkuwichain,
 		bridge_to_pezkuwichain_config::PriorityBoostPerTeyrchainHeader,
 		xcm_config::TreasuryAccount,
 	>,
@@ -892,38 +892,38 @@ impl_runtime_apis! {
 		}
 	}
 
-	impl bp_pezkuwichain::PezkuwichainFinalityApi<Block> for Runtime {
-		fn best_finalized() -> Option<HeaderId<bp_pezkuwichain::Hash, bp_pezkuwichain::BlockNumber>> {
+	impl pezbp_pezkuwichain::PezkuwichainFinalityApi<Block> for Runtime {
+		fn best_finalized() -> Option<HeaderId<pezbp_pezkuwichain::Hash, pezbp_pezkuwichain::BlockNumber>> {
 			BridgePezkuwichainGrandpa::best_finalized()
 		}
-		fn free_headers_interval() -> Option<bp_pezkuwichain::BlockNumber> {
+		fn free_headers_interval() -> Option<pezbp_pezkuwichain::BlockNumber> {
 			<Runtime as pezpallet_bridge_grandpa::Config<
 				bridge_to_pezkuwichain_config::BridgeGrandpaPezkuwichainInstance
 			>>::FreeHeadersInterval::get()
 		}
 		fn synced_headers_grandpa_info(
-		) -> Vec<bp_header_pez_chain::StoredHeaderGrandpaInfo<bp_pezkuwichain::Header>> {
+		) -> Vec<pezbp_header_pez_chain::StoredHeaderGrandpaInfo<pezbp_pezkuwichain::Header>> {
 			BridgePezkuwichainGrandpa::synced_headers_grandpa_info()
 		}
 	}
 
-	impl bp_bridge_hub_pezkuwichain::BridgeHubPezkuwichainFinalityApi<Block> for Runtime {
+	impl pezbp_bridge_hub_pezkuwichain::BridgeHubPezkuwichainFinalityApi<Block> for Runtime {
 		fn best_finalized() -> Option<HeaderId<Hash, BlockNumber>> {
 			BridgePezkuwichainTeyrchains::best_teyrchain_head_id::<
-				bp_bridge_hub_pezkuwichain::BridgeHubPezkuwichain
+				pezbp_bridge_hub_pezkuwichain::BridgeHubPezkuwichain
 			>().unwrap_or(None)
 		}
-		fn free_headers_interval() -> Option<bp_bridge_hub_pezkuwichain::BlockNumber> {
+		fn free_headers_interval() -> Option<pezbp_bridge_hub_pezkuwichain::BlockNumber> {
 			// "free interval" is not currently used for teyrchains
 			None
 		}
 	}
 
-	impl bp_bridge_hub_pezkuwichain::FromBridgeHubPezkuwichainInboundLaneApi<Block> for Runtime {
+	impl pezbp_bridge_hub_pezkuwichain::FromBridgeHubPezkuwichainInboundLaneApi<Block> for Runtime {
 		fn message_details(
 			lane: LaneIdOf<Runtime, bridge_to_pezkuwichain_config::WithBridgeHubPezkuwichainMessagesInstance>,
-			messages: Vec<(bp_messages::MessagePayload, bp_messages::OutboundMessageDetails)>,
-		) -> Vec<bp_messages::InboundMessageDetails> {
+			messages: Vec<(pezbp_messages::MessagePayload, pezbp_messages::OutboundMessageDetails)>,
+		) -> Vec<pezbp_messages::InboundMessageDetails> {
 			pezbridge_runtime_common::messages_api::inbound_message_details::<
 				Runtime,
 				bridge_to_pezkuwichain_config::WithBridgeHubPezkuwichainMessagesInstance,
@@ -931,12 +931,12 @@ impl_runtime_apis! {
 		}
 	}
 
-	impl bp_bridge_hub_pezkuwichain::ToBridgeHubPezkuwichainOutboundLaneApi<Block> for Runtime {
+	impl pezbp_bridge_hub_pezkuwichain::ToBridgeHubPezkuwichainOutboundLaneApi<Block> for Runtime {
 		fn message_details(
 			lane: LaneIdOf<Runtime, bridge_to_pezkuwichain_config::WithBridgeHubPezkuwichainMessagesInstance>,
-			begin: bp_messages::MessageNonce,
-			end: bp_messages::MessageNonce,
-		) -> Vec<bp_messages::OutboundMessageDetails> {
+			begin: pezbp_messages::MessageNonce,
+			end: pezbp_messages::MessageNonce,
+		) -> Vec<pezbp_messages::OutboundMessageDetails> {
 			pezbridge_runtime_common::messages_api::outbound_message_details::<
 				Runtime,
 				bridge_to_pezkuwichain_config::WithBridgeHubPezkuwichainMessagesInstance,
@@ -1240,7 +1240,7 @@ impl_runtime_apis! {
 					)?;
 					XcmOverBridgeHubPezkuwichain::do_open_bridge(
 						locations,
-						bp_messages::LegacyLaneId([1, 2, 3, 4]),
+						pezbp_messages::LegacyLaneId([1, 2, 3, 4]),
 						true,
 					).map_err(|e| {
 						tracing::error!(
@@ -1297,10 +1297,10 @@ impl_runtime_apis! {
 					pezpallet_bridge_relayers::Pezpallet::<Runtime, bridge_common_config::BridgeRelayersInstance>::relayer_reward(
 						relayer,
 						bridge_common_config::BridgeReward::PezkuwichainZagros(
-							bp_relayers::RewardsAccountParams::new(
+							pezbp_relayers::RewardsAccountParams::new(
 								bench_lane_id,
 								bridged_chain_id,
-								bp_relayers::RewardsAccountOwner::BridgedChain
+								pezbp_relayers::RewardsAccountOwner::BridgedChain
 							)
 						)
 					).is_some()
@@ -1339,7 +1339,7 @@ impl_runtime_apis! {
 					>(params)
 				}
 
-				fn is_message_successfully_dispatched(_nonce: bp_messages::MessageNonce) -> bool {
+				fn is_message_successfully_dispatched(_nonce: pezbp_messages::MessageNonce) -> bool {
 					use pezcumulus_primitives_core::XcmpMessageSource;
 					!XcmpQueue::take_outbound_messages(usize::MAX).is_empty()
 				}
@@ -1353,20 +1353,20 @@ impl_runtime_apis! {
 			};
 
 			impl BridgeTeyrchainsConfig<bridge_to_pezkuwichain_config::BridgeTeyrchainPezkuwichainInstance> for Runtime {
-				fn teyrchains() -> Vec<bp_pezkuwi_core::teyrchains::ParaId> {
+				fn teyrchains() -> Vec<pezbp_pezkuwi_core::teyrchains::ParaId> {
 					use pezbp_runtime::Teyrchain;
-					vec![bp_pezkuwi_core::teyrchains::ParaId(bp_bridge_hub_pezkuwichain::BridgeHubPezkuwichain::TEYRCHAIN_ID)]
+					vec![pezbp_pezkuwi_core::teyrchains::ParaId(pezbp_bridge_hub_pezkuwichain::BridgeHubPezkuwichain::TEYRCHAIN_ID)]
 				}
 
 				fn prepare_teyrchain_heads_proof(
-					teyrchains: &[bp_pezkuwi_core::teyrchains::ParaId],
+					teyrchains: &[pezbp_pezkuwi_core::teyrchains::ParaId],
 					teyrchain_head_size: u32,
 					proof_params: pezbp_runtime::UnverifiedStorageProofParams,
 				) -> (
-					bp_teyrchains::RelayBlockNumber,
-					bp_teyrchains::RelayBlockHash,
-					bp_pezkuwi_core::teyrchains::ParaHeadsProof,
-					Vec<(bp_pezkuwi_core::teyrchains::ParaId, bp_pezkuwi_core::teyrchains::ParaHash)>,
+					pezbp_teyrchains::RelayBlockNumber,
+					pezbp_teyrchains::RelayBlockHash,
+					pezbp_pezkuwi_core::teyrchains::ParaHeadsProof,
+					Vec<(pezbp_pezkuwi_core::teyrchains::ParaId, pezbp_pezkuwi_core::teyrchains::ParaHash)>,
 				) {
 					prepare_teyrchain_heads_proof::<Runtime, bridge_to_pezkuwichain_config::BridgeTeyrchainPezkuwichainInstance>(
 						teyrchains,
@@ -1378,10 +1378,10 @@ impl_runtime_apis! {
 
 			impl BridgeRelayersConfig<bridge_common_config::BridgeRelayersInstance> for Runtime {
 				fn bench_reward() -> Self::Reward {
-					bp_relayers::RewardsAccountParams::new(
-						bp_messages::LegacyLaneId::default(),
+					pezbp_relayers::RewardsAccountParams::new(
+						pezbp_messages::LegacyLaneId::default(),
 						*b"test",
-						bp_relayers::RewardsAccountOwner::ThisChain
+						pezbp_relayers::RewardsAccountOwner::ThisChain
 					).into()
 				}
 
@@ -1392,10 +1392,10 @@ impl_runtime_apis! {
 					let bridge_common_config::BridgeReward::PezkuwichainZagros(reward_kind) = reward_kind else {
 						panic!("Unexpected reward_kind: {:?} - not compatible with `bench_reward`!", reward_kind);
 					};
-					let rewards_account = bp_relayers::PayRewardFromAccount::<
+					let rewards_account = pezbp_relayers::PayRewardFromAccount::<
 						Balances,
 						AccountId,
-						bp_messages::LegacyLaneId,
+						pezbp_messages::LegacyLaneId,
 						u128,
 					>::rewards_account(reward_kind);
 					Self::deposit_account(rewards_account, reward);
@@ -1463,7 +1463,7 @@ mod tests {
 
 	#[test]
 	fn ensure_transaction_extension_definition_is_compatible_with_relay() {
-		use bp_pezkuwi_core::SuffixedCommonTransactionExtensionExt;
+		use pezbp_pezkuwi_core::SuffixedCommonTransactionExtensionExt;
 
 		pezsp_io::TestExternalities::default().execute_with(|| {
 			pezframe_system::BlockHash::<Runtime>::insert(BlockNumber::zero(), Hash::default());
@@ -1487,7 +1487,7 @@ mod tests {
 			).into();
 
 			{
-				let bh_indirect_payload = bp_bridge_hub_zagros::TransactionExtension::from_params(
+				let bh_indirect_payload = pezbp_bridge_hub_zagros::TransactionExtension::from_params(
 					VERSION.spec_version,
 					VERSION.transaction_version,
 					pezbp_runtime::TransactionEra::Immortal,
diff --git a/pezcumulus/teyrchains/runtimes/bridge-hubs/bridge-hub-zagros/src/weights/mod.rs b/pezcumulus/teyrchains/runtimes/bridge-hubs/bridge-hub-zagros/src/weights/mod.rs
index dd3722e4..3613cbc4 100644
--- a/pezcumulus/teyrchains/runtimes/bridge-hubs/bridge-hub-zagros/src/weights/mod.rs
+++ b/pezcumulus/teyrchains/runtimes/bridge-hubs/bridge-hub-zagros/src/weights/mod.rs
@@ -76,7 +76,7 @@ impl GrandpaWeightInfoExt for pezpallet_bridge_grandpa::WeightInfo<crate::Runtim
 
 impl MessagesWeightInfoExt for pezpallet_bridge_messages::WeightInfo<crate::Runtime> {
 	fn expected_extra_storage_proof_size() -> u32 {
-		bp_bridge_hub_pezkuwichain::EXTRA_STORAGE_PROOF_SIZE
+		pezbp_bridge_hub_pezkuwichain::EXTRA_STORAGE_PROOF_SIZE
 	}
 
 	fn receive_messages_proof_overhead_from_runtime() -> Weight {
@@ -91,7 +91,7 @@ impl MessagesWeightInfoExt for pezpallet_bridge_messages::WeightInfo<crate::Runt
 
 impl TeyrchainsWeightInfoExt for pezpallet_bridge_teyrchains::WeightInfo<crate::Runtime> {
 	fn expected_extra_storage_proof_size() -> u32 {
-		bp_bridge_hub_pezkuwichain::EXTRA_STORAGE_PROOF_SIZE
+		pezbp_bridge_hub_pezkuwichain::EXTRA_STORAGE_PROOF_SIZE
 	}
 
 	fn submit_teyrchain_heads_overhead_from_runtime() -> Weight {
diff --git a/pezcumulus/teyrchains/runtimes/bridge-hubs/bridge-hub-zagros/src/xcm_config.rs b/pezcumulus/teyrchains/runtimes/bridge-hubs/bridge-hub-zagros/src/xcm_config.rs
index b5058acd..3dacad9c 100644
--- a/pezcumulus/teyrchains/runtimes/bridge-hubs/bridge-hub-zagros/src/xcm_config.rs
+++ b/pezcumulus/teyrchains/runtimes/bridge-hubs/bridge-hub-zagros/src/xcm_config.rs
@@ -20,7 +20,7 @@ use super::{
 	TeyrchainSystem, TransactionByteFee, WeightToFee, XcmOverBridgeHubPezkuwichain, XcmpQueue,
 };
 use crate::bridge_to_ethereum_config::SnowbridgeFrontendLocation;
-use bridge_hub_common::DenyExportMessageFrom;
+use pezbridge_hub_common::DenyExportMessageFrom;
 use pezframe_support::{
 	parameter_types,
 	traits::{
diff --git a/pezcumulus/teyrchains/runtimes/bridge-hubs/bridge-hub-zagros/tests/snowbridge.rs b/pezcumulus/teyrchains/runtimes/bridge-hubs/bridge-hub-zagros/tests/snowbridge.rs
index 7f767226..f33d932f 100644
--- a/pezcumulus/teyrchains/runtimes/bridge-hubs/bridge-hub-zagros/tests/snowbridge.rs
+++ b/pezcumulus/teyrchains/runtimes/bridge-hubs/bridge-hub-zagros/tests/snowbridge.rs
@@ -16,9 +16,9 @@
 
 #![cfg(test)]
 
-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 pezbp_asset_hub_zagros::ASSET_HUB_ZAGROS_TEYRCHAIN_ID;
+use pezbp_bridge_hub_zagros::BRIDGE_HUB_ZAGROS_TEYRCHAIN_ID;
+use pezbp_pezkuwi_core::Signature;
 use codec::{Decode, Encode};
 use pezbridge_hub_zagros_runtime::{
 	bridge_to_pezkuwichain_config, xcm_config::XcmConfig, AllPalletsWithoutSystem,
diff --git a/pezcumulus/teyrchains/runtimes/bridge-hubs/bridge-hub-zagros/tests/tests.rs b/pezcumulus/teyrchains/runtimes/bridge-hubs/bridge-hub-zagros/tests/tests.rs
index 6f135a5f..553f58bf 100644
--- a/pezcumulus/teyrchains/runtimes/bridge-hubs/bridge-hub-zagros/tests/tests.rs
+++ b/pezcumulus/teyrchains/runtimes/bridge-hubs/bridge-hub-zagros/tests/tests.rs
@@ -17,9 +17,9 @@
 #![cfg(test)]
 
 use crate::bridge_common_config::BridgeRewardBeneficiaries;
-use bp_messages::LegacyLaneId;
-use bp_pezkuwi_core::Signature;
-use bp_relayers::{PayRewardFromAccount, RewardsAccountOwner, RewardsAccountParams};
+use pezbp_messages::LegacyLaneId;
+use pezbp_pezkuwi_core::Signature;
+use pezbp_relayers::{PayRewardFromAccount, RewardsAccountOwner, RewardsAccountParams};
 use bridge_common_config::{BridgeRelayersInstance, BridgeReward, RequiredStakeForStakeAndSlash};
 use bridge_to_pezkuwichain_config::{
 	BridgeGrandpaPezkuwichainInstance, BridgeHubPezkuwichainLocation,
@@ -168,7 +168,7 @@ pezbridge_hub_test_utils::test_cases::include_teleports_for_native_asset_works!(
 			_ => None,
 		}
 	}),
-	bp_bridge_hub_zagros::BRIDGE_HUB_ZAGROS_TEYRCHAIN_ID
+	pezbp_bridge_hub_zagros::BRIDGE_HUB_ZAGROS_TEYRCHAIN_ID
 );
 
 #[test]
@@ -178,7 +178,7 @@ fn initialize_bridge_by_governance_works() {
 		BridgeGrandpaPezkuwichainInstance,
 	>(
 		collator_session_keys(),
-		bp_bridge_hub_zagros::BRIDGE_HUB_ZAGROS_TEYRCHAIN_ID,
+		pezbp_bridge_hub_zagros::BRIDGE_HUB_ZAGROS_TEYRCHAIN_ID,
 		Governance::get(),
 	)
 }
@@ -190,7 +190,7 @@ fn change_bridge_grandpa_pallet_mode_by_governance_works() {
 		BridgeGrandpaPezkuwichainInstance,
 	>(
 		collator_session_keys(),
-		bp_bridge_hub_zagros::BRIDGE_HUB_ZAGROS_TEYRCHAIN_ID,
+		pezbp_bridge_hub_zagros::BRIDGE_HUB_ZAGROS_TEYRCHAIN_ID,
 		Governance::get(),
 	)
 }
@@ -202,7 +202,7 @@ fn change_bridge_teyrchains_pallet_mode_by_governance_works() {
 		BridgeTeyrchainPezkuwichainInstance,
 	>(
 		collator_session_keys(),
-		bp_bridge_hub_zagros::BRIDGE_HUB_ZAGROS_TEYRCHAIN_ID,
+		pezbp_bridge_hub_zagros::BRIDGE_HUB_ZAGROS_TEYRCHAIN_ID,
 		Governance::get(),
 	)
 }
@@ -214,7 +214,7 @@ fn change_bridge_messages_pallet_mode_by_governance_works() {
 		WithBridgeHubPezkuwichainMessagesInstance,
 	>(
 		collator_session_keys(),
-		bp_bridge_hub_zagros::BRIDGE_HUB_ZAGROS_TEYRCHAIN_ID,
+		pezbp_bridge_hub_zagros::BRIDGE_HUB_ZAGROS_TEYRCHAIN_ID,
 		Governance::get(),
 	)
 }
@@ -227,7 +227,7 @@ fn change_delivery_reward_by_governance_works() {
 		u64,
 	>(
 		collator_session_keys(),
-		bp_bridge_hub_zagros::BRIDGE_HUB_ZAGROS_TEYRCHAIN_ID,
+		pezbp_bridge_hub_zagros::BRIDGE_HUB_ZAGROS_TEYRCHAIN_ID,
 		Governance::get(),
 		|| (DeliveryRewardInBalance::key().to_vec(), DeliveryRewardInBalance::get()),
 		|old_value| old_value.checked_mul(2).unwrap(),
@@ -242,7 +242,7 @@ fn change_required_stake_by_governance_works() {
 		Balance,
 	>(
 		collator_session_keys(),
-		bp_bridge_hub_zagros::BRIDGE_HUB_ZAGROS_TEYRCHAIN_ID,
+		pezbp_bridge_hub_zagros::BRIDGE_HUB_ZAGROS_TEYRCHAIN_ID,
 		Governance::get(),
 		|| (RequiredStakeForStakeAndSlash::key().to_vec(), RequiredStakeForStakeAndSlash::get()),
 		|old_value| old_value.checked_mul(2).unwrap(),
@@ -257,7 +257,7 @@ fn handle_export_message_from_system_teyrchain_add_to_outbound_queue_works() {
 			WithBridgeHubPezkuwichainMessagesInstance,
 		>(
 			collator_session_keys(),
-			bp_bridge_hub_zagros::BRIDGE_HUB_ZAGROS_TEYRCHAIN_ID,
+			pezbp_bridge_hub_zagros::BRIDGE_HUB_ZAGROS_TEYRCHAIN_ID,
 			SIBLING_TEYRCHAIN_ID,
 			Box::new(|runtime_event_encoded: Vec<u8>| {
 				match RuntimeEvent::decode(&mut &runtime_event_encoded[..]) {
@@ -268,7 +268,7 @@ fn handle_export_message_from_system_teyrchain_add_to_outbound_queue_works() {
 			|| ExportMessage { network: PezkuwichainGlobalConsensusNetwork::get(), destination: [Teyrchain(BRIDGED_LOCATION_TEYRCHAIN_ID)].into(), xcm: Xcm(vec![]) },
 			Some((ZagrosLocation::get(), ExistentialDeposit::get()).into()),
 			// value should be >= than value generated by `can_calculate_weight_for_paid_export_message_with_reserve_transfer`
-			Some((ZagrosLocation::get(), bp_bridge_hub_zagros::BridgeHubZagrosBaseXcmFeeInWnds::get()).into()),
+			Some((ZagrosLocation::get(), pezbp_bridge_hub_zagros::BridgeHubZagrosBaseXcmFeeInWnds::get()).into()),
 			|| {
 				PezkuwiXcm::force_xcm_version(RuntimeOrigin::root(), Box::new(BridgeHubPezkuwichainLocation::get()), XCM_VERSION).expect("version saved!");
 
@@ -306,7 +306,7 @@ fn message_dispatch_routing_works() {
 	>(
 		collator_session_keys(),
 		slot_durations(),
-		bp_bridge_hub_zagros::BRIDGE_HUB_ZAGROS_TEYRCHAIN_ID,
+		pezbp_bridge_hub_zagros::BRIDGE_HUB_ZAGROS_TEYRCHAIN_ID,
 		SIBLING_TEYRCHAIN_ID,
 		Box::new(|runtime_event_encoded: Vec<u8>| {
 			match RuntimeEvent::decode(&mut &runtime_event_encoded[..]) {
@@ -329,8 +329,8 @@ fn relayed_incoming_message_works() {
 	from_teyrchain::relayed_incoming_message_works::<RuntimeTestsAdapter>(
 		collator_session_keys(),
 		slot_durations(),
-		bp_bridge_hub_zagros::BRIDGE_HUB_ZAGROS_TEYRCHAIN_ID,
-		bp_bridge_hub_pezkuwichain::BRIDGE_HUB_PEZKUWICHAIN_TEYRCHAIN_ID,
+		pezbp_bridge_hub_zagros::BRIDGE_HUB_ZAGROS_TEYRCHAIN_ID,
+		pezbp_bridge_hub_pezkuwichain::BRIDGE_HUB_PEZKUWICHAIN_TEYRCHAIN_ID,
 		SIBLING_TEYRCHAIN_ID,
 		ByGenesis(ZAGROS_GENESIS_HASH),
 		|| {
@@ -364,8 +364,8 @@ fn free_relay_extrinsic_works() {
 	from_teyrchain::free_relay_extrinsic_works::<RuntimeTestsAdapter>(
 		collator_session_keys(),
 		slot_durations(),
-		bp_bridge_hub_zagros::BRIDGE_HUB_ZAGROS_TEYRCHAIN_ID,
-		bp_bridge_hub_pezkuwichain::BRIDGE_HUB_PEZKUWICHAIN_TEYRCHAIN_ID,
+		pezbp_bridge_hub_zagros::BRIDGE_HUB_ZAGROS_TEYRCHAIN_ID,
+		pezbp_bridge_hub_pezkuwichain::BRIDGE_HUB_PEZKUWICHAIN_TEYRCHAIN_ID,
 		SIBLING_TEYRCHAIN_ID,
 		ByGenesis(ZAGROS_GENESIS_HASH),
 		|| {
@@ -396,8 +396,8 @@ fn free_relay_extrinsic_works() {
 #[test]
 pub fn can_calculate_weight_for_paid_export_message_with_reserve_transfer() {
 	pezbridge_hub_test_utils::check_sane_fees_values(
-		"bp_bridge_hub_zagros::BridgeHubZagrosBaseXcmFeeInWnds",
-		bp_bridge_hub_zagros::BridgeHubZagrosBaseXcmFeeInWnds::get(),
+		"pezbp_bridge_hub_zagros::BridgeHubZagrosBaseXcmFeeInWnds",
+		pezbp_bridge_hub_zagros::BridgeHubZagrosBaseXcmFeeInWnds::get(),
 		|| {
 			pezbridge_hub_test_utils::test_cases::can_calculate_weight_for_paid_export_message_with_reserve_transfer::<
 			Runtime,
@@ -417,8 +417,8 @@ pub fn can_calculate_weight_for_paid_export_message_with_reserve_transfer() {
 #[test]
 pub fn can_calculate_fee_for_standalone_message_delivery_transaction() {
 	pezbridge_hub_test_utils::check_sane_fees_values(
-		"bp_bridge_hub_zagros::BridgeHubZagrosBaseDeliveryFeeInWnds",
-		bp_bridge_hub_zagros::BridgeHubZagrosBaseDeliveryFeeInWnds::get(),
+		"pezbp_bridge_hub_zagros::BridgeHubZagrosBaseDeliveryFeeInWnds",
+		pezbp_bridge_hub_zagros::BridgeHubZagrosBaseDeliveryFeeInWnds::get(),
 		|| {
 			from_teyrchain::can_calculate_fee_for_standalone_message_delivery_transaction::<
 				RuntimeTestsAdapter,
@@ -436,8 +436,8 @@ pub fn can_calculate_fee_for_standalone_message_delivery_transaction() {
 #[test]
 pub fn can_calculate_fee_for_standalone_message_confirmation_transaction() {
 	pezbridge_hub_test_utils::check_sane_fees_values(
-		"bp_bridge_hub_zagros::BridgeHubZagrosBaseConfirmationFeeInWnds",
-		bp_bridge_hub_zagros::BridgeHubZagrosBaseConfirmationFeeInWnds::get(),
+		"pezbp_bridge_hub_zagros::BridgeHubZagrosBaseConfirmationFeeInWnds",
+		pezbp_bridge_hub_zagros::BridgeHubZagrosBaseConfirmationFeeInWnds::get(),
 		|| {
 			from_teyrchain::can_calculate_fee_for_standalone_message_confirmation_transaction::<
 				RuntimeTestsAdapter,
@@ -699,7 +699,7 @@ fn xcm_payment_api_works() {
 pub fn bridge_rewards_works() {
 	run_test::<Runtime, _>(
 		collator_session_keys(),
-		bp_bridge_hub_zagros::BRIDGE_HUB_ZAGROS_TEYRCHAIN_ID,
+		pezbp_bridge_hub_zagros::BRIDGE_HUB_ZAGROS_TEYRCHAIN_ID,
 		vec![],
 		|| {
 			// reward in WNDs
@@ -726,7 +726,7 @@ pub fn bridge_rewards_works() {
 			assert_ok!(Balances::mint_into(&account2, ExistentialDeposit::get() * 10000));
 
 			// register rewards
-			use bp_relayers::RewardLedger;
+			use pezbp_relayers::RewardLedger;
 			BridgeRelayers::register_reward(&account1, BridgeReward::from(reward1_for), reward1);
 			BridgeRelayers::register_reward(&account2, BridgeReward::Snowbridge, reward2);
 
diff --git a/pezcumulus/teyrchains/runtimes/bridge-hubs/common/Cargo.toml b/pezcumulus/teyrchains/runtimes/bridge-hubs/common/Cargo.toml
index 5faf0bf1..11bc86ed 100644
--- a/pezcumulus/teyrchains/runtimes/bridge-hubs/common/Cargo.toml
+++ b/pezcumulus/teyrchains/runtimes/bridge-hubs/common/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
-name = "bridge-hub-common"
-version = "0.1.0"
+name = "pezbridge-hub-common"
+version = "0.1.1"
 authors.workspace = true
 edition.workspace = true
 description = "Bridge hub common utilities"
diff --git a/pezcumulus/teyrchains/runtimes/bridge-hubs/common/tests/tests.rs b/pezcumulus/teyrchains/runtimes/bridge-hubs/common/tests/tests.rs
index faa4166c..67772e10 100644
--- a/pezcumulus/teyrchains/runtimes/bridge-hubs/common/tests/tests.rs
+++ b/pezcumulus/teyrchains/runtimes/bridge-hubs/common/tests/tests.rs
@@ -15,7 +15,7 @@
 // limitations under the License.
 
 #![cfg(test)]
-use bridge_hub_common::DenyExportMessageFrom;
+use pezbridge_hub_common::DenyExportMessageFrom;
 use pezframe_support::{
 	parameter_types,
 	traits::{Equals, EverythingBut, ProcessMessageError::Unsupported},
diff --git a/pezcumulus/teyrchains/runtimes/bridge-hubs/test-utils/Cargo.toml b/pezcumulus/teyrchains/runtimes/bridge-hubs/test-utils/Cargo.toml
index 894c41fe..42b514b6 100644
--- a/pezcumulus/teyrchains/runtimes/bridge-hubs/test-utils/Cargo.toml
+++ b/pezcumulus/teyrchains/runtimes/bridge-hubs/test-utils/Cargo.toml
@@ -44,12 +44,12 @@ xcm-builder = { workspace = true }
 xcm-executor = { workspace = true }
 
 # Bridges
-bp-header-pez-chain = { workspace = true }
-bp-messages = { workspace = true }
-bp-pezkuwi-core = { workspace = true }
-bp-relayers = { workspace = true }
-bp-test-utils = { workspace = true }
-bp-teyrchains = { workspace = true }
+pezbp-header-pez-chain = { workspace = true }
+pezbp-messages = { workspace = true }
+pezbp-pezkuwi-core = { workspace = true }
+pezbp-relayers = { workspace = true }
+pezbp-test-utils = { workspace = true }
+pezbp-teyrchains = { workspace = true }
 pezbp-runtime = { workspace = true }
 pezpallet-bridge-grandpa = { workspace = true }
 pezpallet-bridge-messages = { features = ["test-helpers"], workspace = true }
@@ -61,12 +61,12 @@ pezpallet-xcm-bridge-hub = { workspace = true }
 default = ["std"]
 std = [
 	"asset-test-pezutils/std",
-	"bp-header-pez-chain/std",
-	"bp-messages/std",
-	"bp-pezkuwi-core/std",
-	"bp-relayers/std",
-	"bp-test-utils/std",
-	"bp-teyrchains/std",
+	"pezbp-header-pez-chain/std",
+	"pezbp-messages/std",
+	"pezbp-pezkuwi-core/std",
+	"pezbp-relayers/std",
+	"pezbp-test-utils/std",
+	"pezbp-teyrchains/std",
 	"codec/std",
 	"pezbp-runtime/std",
 	"pezcumulus-pezpallet-teyrchain-system/std",
@@ -95,12 +95,12 @@ std = [
 ]
 runtime-benchmarks = [
 	"asset-test-pezutils/runtime-benchmarks",
-	"bp-header-pez-chain/runtime-benchmarks",
-	"bp-messages/runtime-benchmarks",
-	"bp-pezkuwi-core/runtime-benchmarks",
-	"bp-relayers/runtime-benchmarks",
-	"bp-test-utils/runtime-benchmarks",
-	"bp-teyrchains/runtime-benchmarks",
+	"pezbp-header-pez-chain/runtime-benchmarks",
+	"pezbp-messages/runtime-benchmarks",
+	"pezbp-pezkuwi-core/runtime-benchmarks",
+	"pezbp-relayers/runtime-benchmarks",
+	"pezbp-test-utils/runtime-benchmarks",
+	"pezbp-teyrchains/runtime-benchmarks",
 	"pezbp-runtime/runtime-benchmarks",
 	"pezcumulus-pezpallet-teyrchain-system/runtime-benchmarks",
 	"pezcumulus-pezpallet-xcmp-queue/runtime-benchmarks",
diff --git a/pezcumulus/teyrchains/runtimes/bridge-hubs/test-utils/src/lib.rs b/pezcumulus/teyrchains/runtimes/bridge-hubs/test-utils/src/lib.rs
index a6cfffdd..3b8f5ec1 100644
--- a/pezcumulus/teyrchains/runtimes/bridge-hubs/test-utils/src/lib.rs
+++ b/pezcumulus/teyrchains/runtimes/bridge-hubs/test-utils/src/lib.rs
@@ -21,7 +21,7 @@ pub mod test_data;
 
 extern crate alloc;
 
-pub use bp_test_utils::test_header;
+pub use pezbp_test_utils::test_header;
 use pezsp_runtime::Perbill;
 pub use test_cases::helpers::for_pallet_xcm_bridge_hub::{
 	ensure_opened_bridge, open_bridge_with_extrinsic, open_bridge_with_storage,
diff --git a/pezcumulus/teyrchains/runtimes/bridge-hubs/test-utils/src/test_cases/from_grandpa_chain.rs b/pezcumulus/teyrchains/runtimes/bridge-hubs/test-utils/src/test_cases/from_grandpa_chain.rs
index 70742228..cd9ee2ad 100644
--- a/pezcumulus/teyrchains/runtimes/bridge-hubs/test-utils/src/test_cases/from_grandpa_chain.rs
+++ b/pezcumulus/teyrchains/runtimes/bridge-hubs/test-utils/src/test_cases/from_grandpa_chain.rs
@@ -24,9 +24,9 @@ use crate::{
 };
 
 use alloc::{boxed::Box, vec};
-use bp_header_pez_chain::ChainWithGrandpa;
-use bp_messages::UnrewardedRelayersState;
-use bp_relayers::{RewardsAccountOwner, RewardsAccountParams};
+use pezbp_header_pez_chain::ChainWithGrandpa;
+use pezbp_messages::UnrewardedRelayersState;
+use pezbp_relayers::{RewardsAccountOwner, RewardsAccountParams};
 use pezframe_support::traits::{OnFinalize, OnInitialize};
 use pezframe_system::pezpallet_prelude::BlockNumberFor;
 use pezpallet_bridge_messages::{BridgedChainOf, LaneIdOf, ThisChainOf};
diff --git a/pezcumulus/teyrchains/runtimes/bridge-hubs/test-utils/src/test_cases/from_teyrchain.rs b/pezcumulus/teyrchains/runtimes/bridge-hubs/test-utils/src/test_cases/from_teyrchain.rs
index ecceb1c9..bb20af06 100644
--- a/pezcumulus/teyrchains/runtimes/bridge-hubs/test-utils/src/test_cases/from_teyrchain.rs
+++ b/pezcumulus/teyrchains/runtimes/bridge-hubs/test-utils/src/test_cases/from_teyrchain.rs
@@ -24,10 +24,10 @@ use crate::{
 };
 
 use alloc::{boxed::Box, vec};
-use bp_header_pez_chain::ChainWithGrandpa;
-use bp_messages::UnrewardedRelayersState;
-use bp_pezkuwi_core::teyrchains::ParaHash;
-use bp_relayers::{RewardsAccountOwner, RewardsAccountParams};
+use pezbp_header_pez_chain::ChainWithGrandpa;
+use pezbp_messages::UnrewardedRelayersState;
+use pezbp_pezkuwi_core::teyrchains::ParaHash;
+use pezbp_relayers::{RewardsAccountOwner, RewardsAccountParams};
 use pezbp_runtime::{Chain, Teyrchain};
 use pezframe_support::traits::{OnFinalize, OnInitialize};
 use pezframe_system::pezpallet_prelude::BlockNumberFor;
diff --git a/pezcumulus/teyrchains/runtimes/bridge-hubs/test-utils/src/test_cases/helpers.rs b/pezcumulus/teyrchains/runtimes/bridge-hubs/test-utils/src/test_cases/helpers.rs
index e897ad9a..bdb7b00c 100644
--- a/pezcumulus/teyrchains/runtimes/bridge-hubs/test-utils/src/test_cases/helpers.rs
+++ b/pezcumulus/teyrchains/runtimes/bridge-hubs/test-utils/src/test_cases/helpers.rs
@@ -19,8 +19,8 @@
 use crate::test_cases::{bridges_prelude::*, run_test, RuntimeHelper};
 
 use asset_test_pezutils::BasicTeyrchainRuntime;
-use bp_messages::MessageNonce;
-use bp_pezkuwi_core::teyrchains::{ParaHash, ParaId};
+use pezbp_messages::MessageNonce;
+use pezbp_pezkuwi_core::teyrchains::{ParaHash, ParaId};
 use codec::Decode;
 use core::marker::PhantomData;
 use pezbp_runtime::Chain;
@@ -234,7 +234,7 @@ where
 
 /// Initialize bridge GRANDPA pezpallet.
 pub(crate) fn initialize_bridge_grandpa_pallet<Runtime, GPI>(
-	init_data: bp_header_pez_chain::InitializationData<BridgedHeader<Runtime, GPI>>,
+	init_data: pezbp_header_pez_chain::InitializationData<BridgedHeader<Runtime, GPI>>,
 ) where
 	Runtime: BridgeGrandpaConfig<GPI>
 		+ pezcumulus_pezpallet_teyrchain_system::Config
diff --git a/pezcumulus/teyrchains/runtimes/bridge-hubs/test-utils/src/test_cases/mod.rs b/pezcumulus/teyrchains/runtimes/bridge-hubs/test-utils/src/test_cases/mod.rs
index ed973e70..8a91b124 100644
--- a/pezcumulus/teyrchains/runtimes/bridge-hubs/test-utils/src/test_cases/mod.rs
+++ b/pezcumulus/teyrchains/runtimes/bridge-hubs/test-utils/src/test_cases/mod.rs
@@ -27,7 +27,7 @@ pub(crate) mod helpers;
 use crate::{test_cases::bridges_prelude::*, test_data};
 
 use asset_test_pezutils::BasicTeyrchainRuntime;
-use bp_messages::{
+use pezbp_messages::{
 	target_chain::{DispatchMessage, DispatchMessageData, MessageDispatch},
 	LaneState, MessageKey, MessagesOperatingMode, OutboundLaneData,
 };
@@ -54,7 +54,7 @@ use xcm_executor::{
 
 /// Common bridges exports.
 pub(crate) mod bridges_prelude {
-	pub use bp_teyrchains::{RelayBlockHash, RelayBlockNumber};
+	pub use pezbp_teyrchains::{RelayBlockHash, RelayBlockNumber};
 	pub use pezpallet_bridge_grandpa::{Call as BridgeGrandpaCall, Config as BridgeGrandpaConfig};
 	pub use pezpallet_bridge_messages::{
 		Call as BridgeMessagesCall, Config as BridgeMessagesConfig, LanesManagerError,
diff --git a/pezcumulus/teyrchains/runtimes/bridge-hubs/test-utils/src/test_data/from_grandpa_chain.rs b/pezcumulus/teyrchains/runtimes/bridge-hubs/test-utils/src/test_data/from_grandpa_chain.rs
index 1e1f99b4..7e2572bc 100644
--- a/pezcumulus/teyrchains/runtimes/bridge-hubs/test-utils/src/test_data/from_grandpa_chain.rs
+++ b/pezcumulus/teyrchains/runtimes/bridge-hubs/test-utils/src/test_data/from_grandpa_chain.rs
@@ -18,12 +18,12 @@
 
 use crate::test_data::{prepare_inbound_xcm, XcmAsPlainPayload};
 
-use bp_messages::{
+use pezbp_messages::{
 	source_chain::FromBridgedChainMessagesDeliveryProof,
 	target_chain::FromBridgedChainMessagesProof, ChainWithMessages, LaneState, MessageNonce,
 	UnrewardedRelayersState,
 };
-use bp_test_utils::make_default_justification;
+use pezbp_test_utils::make_default_justification;
 use codec::Encode;
 use pezbp_runtime::{AccountIdOf, BlockNumberOf, Chain, HeaderOf, UnverifiedStorageProofParams};
 use pezpallet_bridge_grandpa::{BridgedChain, BridgedHeader};
@@ -31,8 +31,8 @@ use pezsp_runtime::traits::Header as HeaderT;
 use xcm::latest::prelude::*;
 
 use crate::test_cases::helpers::InboundRelayerId;
-use bp_header_pez_chain::{justification::GrandpaJustification, ChainWithGrandpa};
-use bp_messages::{DeliveredMessages, InboundLaneData, UnrewardedRelayer};
+use pezbp_header_pez_chain::{justification::GrandpaJustification, ChainWithGrandpa};
+use pezbp_messages::{DeliveredMessages, InboundLaneData, UnrewardedRelayer};
 use pezbp_runtime::HashOf;
 use pezpallet_bridge_messages::{
 	messages_generation::{
@@ -270,7 +270,7 @@ pub fn make_complex_bridged_grandpa_header_proof<BridgedChain>(
 where
 	BridgedChain: ChainWithGrandpa,
 {
-	let mut header = bp_test_utils::test_header_with_root::<HeaderOf<BridgedChain>>(
+	let mut header = pezbp_test_utils::test_header_with_root::<HeaderOf<BridgedChain>>(
 		header_number.into(),
 		state_root.into(),
 	);
@@ -289,7 +289,7 @@ where
 
 /// Maximal expected `submit_finality_proof` call size.
 pub fn maximal_expected_submit_finality_proof_call_size<BridgedChain: ChainWithGrandpa>() -> usize {
-	bp_header_pez_chain::max_expected_submit_finality_proof_arguments_size::<BridgedChain>(
+	pezbp_header_pez_chain::max_expected_submit_finality_proof_arguments_size::<BridgedChain>(
 		false,
 		BridgedChain::MAX_AUTHORITIES_COUNT * 2 / 3 + 1,
 	) as usize
diff --git a/pezcumulus/teyrchains/runtimes/bridge-hubs/test-utils/src/test_data/from_teyrchain.rs b/pezcumulus/teyrchains/runtimes/bridge-hubs/test-utils/src/test_data/from_teyrchain.rs
index 18513a03..14e0ba6b 100644
--- a/pezcumulus/teyrchains/runtimes/bridge-hubs/test-utils/src/test_data/from_teyrchain.rs
+++ b/pezcumulus/teyrchains/runtimes/bridge-hubs/test-utils/src/test_data/from_teyrchain.rs
@@ -21,13 +21,13 @@ use super::{
 	XcmAsPlainPayload,
 };
 
-use bp_messages::{
+use pezbp_messages::{
 	source_chain::FromBridgedChainMessagesDeliveryProof,
 	target_chain::FromBridgedChainMessagesProof, ChainWithMessages, LaneState,
 	UnrewardedRelayersState, Weight,
 };
-use bp_test_utils::prepare_teyrchain_heads_proof;
-use bp_teyrchains::{RelayBlockHash, RelayBlockNumber};
+use pezbp_test_utils::prepare_teyrchain_heads_proof;
+use pezbp_teyrchains::{RelayBlockHash, RelayBlockNumber};
 use codec::Encode;
 use pezbp_runtime::{
 	AccountIdOf, BlockNumberOf, Chain, HeaderOf, Teyrchain, UnverifiedStorageProofParams,
@@ -37,9 +37,9 @@ use pezsp_runtime::traits::Header as HeaderT;
 use xcm::latest::prelude::*;
 
 use crate::test_cases::helpers::InboundRelayerId;
-use bp_header_pez_chain::{justification::GrandpaJustification, ChainWithGrandpa};
-use bp_messages::{DeliveredMessages, InboundLaneData, MessageNonce, UnrewardedRelayer};
-use bp_pezkuwi_core::teyrchains::{ParaHash, ParaHead, ParaHeadsProof, ParaId};
+use pezbp_header_pez_chain::{justification::GrandpaJustification, ChainWithGrandpa};
+use pezbp_messages::{DeliveredMessages, InboundLaneData, MessageNonce, UnrewardedRelayer};
+use pezbp_pezkuwi_core::teyrchains::{ParaHash, ParaHead, ParaHeadsProof, ParaId};
 use pezpallet_bridge_messages::{
 	messages_generation::{
 		encode_all_messages, encode_lane_data, prepare_message_delivery_storage_proof,
@@ -359,7 +359,7 @@ where
 	BridgedTeyrchain: pezbp_runtime::Chain<Hash = ParaHash> + Teyrchain,
 {
 	let bridged_para_head = ParaHead(
-		bp_test_utils::test_header_with_root::<HeaderOf<BridgedTeyrchain>>(
+		pezbp_test_utils::test_header_with_root::<HeaderOf<BridgedTeyrchain>>(
 			para_header_number.into(),
 			para_state_root,
 		)
diff --git a/pezcumulus/teyrchains/runtimes/bridge-hubs/test-utils/src/test_data/mod.rs b/pezcumulus/teyrchains/runtimes/bridge-hubs/test-utils/src/test_data/mod.rs
index 9e67edf1..06f33e8a 100644
--- a/pezcumulus/teyrchains/runtimes/bridge-hubs/test-utils/src/test_data/mod.rs
+++ b/pezcumulus/teyrchains/runtimes/bridge-hubs/test-utils/src/test_data/mod.rs
@@ -19,7 +19,7 @@
 pub mod from_grandpa_chain;
 pub mod from_teyrchain;
 
-use bp_messages::{
+use pezbp_messages::{
 	target_chain::{DispatchMessage, DispatchMessageData},
 	MessageKey,
 };
@@ -28,8 +28,8 @@ use pezframe_support::traits::Get;
 use pezpallet_bridge_grandpa::BridgedHeader;
 use xcm::latest::prelude::*;
 
-use bp_messages::MessageNonce;
-use bp_test_utils::authority_list;
+use pezbp_messages::MessageNonce;
+use pezbp_test_utils::authority_list;
 use pezbp_runtime::BasicOperatingMode;
 use xcm::GetVersion;
 use xcm_builder::{BridgeMessage, HaulBlob, HaulBlobError, HaulBlobExporter};
@@ -53,9 +53,9 @@ pub fn initialization_data<
 	GrandpaPalletInstance: 'static,
 >(
 	block_number: u32,
-) -> bp_header_pez_chain::InitializationData<BridgedHeader<Runtime, GrandpaPalletInstance>> {
-	bp_header_pez_chain::InitializationData {
-		header: Box::new(bp_test_utils::test_header(block_number.into())),
+) -> pezbp_header_pez_chain::InitializationData<BridgedHeader<Runtime, GrandpaPalletInstance>> {
+	pezbp_header_pez_chain::InitializationData {
+		header: Box::new(pezbp_test_utils::test_header(block_number.into())),
 		authority_list: authority_list(),
 		set_id: 1,
 		operating_mode: BasicOperatingMode::Normal,
diff --git a/pezcumulus/teyrchains/runtimes/testing/penpal/Cargo.toml b/pezcumulus/teyrchains/runtimes/testing/penpal/Cargo.toml
index 25ad88d1..602e88ca 100644
--- a/pezcumulus/teyrchains/runtimes/testing/penpal/Cargo.toml
+++ b/pezcumulus/teyrchains/runtimes/testing/penpal/Cargo.toml
@@ -71,7 +71,7 @@ xcm-executor = { workspace = true }
 xcm-runtime-pezapis = { workspace = true }
 
 # Pezcumulus
-assets-common = { workspace = true }
+pez-assets-common = { workspace = true }
 pezcumulus-pezpallet-aura-ext = { workspace = true }
 pezcumulus-pezpallet-session-benchmarking = { workspace = true }
 pezcumulus-pezpallet-teyrchain-system = { workspace = true }
@@ -98,7 +98,7 @@ bizinikiwi-wasm-builder = { optional = true, workspace = true, default-features
 [features]
 default = ["std"]
 std = [
-	"assets-common/std",
+	"pez-assets-common/std",
 	"bizinikiwi-wasm-builder",
 	"codec/std",
 	"pezcumulus-pezpallet-aura-ext/std",
@@ -163,7 +163,7 @@ std = [
 ]
 
 runtime-benchmarks = [
-	"assets-common/runtime-benchmarks",
+	"pez-assets-common/runtime-benchmarks",
 	"bizinikiwi-wasm-builder?/runtime-benchmarks",
 	"hex-literal",
 	"pezcumulus-pezpallet-aura-ext/runtime-benchmarks",
@@ -222,7 +222,7 @@ runtime-benchmarks = [
 ]
 
 try-runtime = [
-	"assets-common/try-runtime",
+	"pez-assets-common/try-runtime",
 	"pezcumulus-pezpallet-aura-ext/try-runtime",
 	"pezcumulus-pezpallet-teyrchain-system/try-runtime",
 	"pezcumulus-pezpallet-xcm/try-runtime",
diff --git a/pezcumulus/teyrchains/runtimes/testing/penpal/src/lib.rs b/pezcumulus/teyrchains/runtimes/testing/penpal/src/lib.rs
index 9c4d2f70..b5126a81 100644
--- a/pezcumulus/teyrchains/runtimes/testing/penpal/src/lib.rs
+++ b/pezcumulus/teyrchains/runtimes/testing/penpal/src/lib.rs
@@ -48,8 +48,8 @@ pub mod xcm_config;
 extern crate alloc;
 
 use alloc::{vec, vec::Vec};
-pub use assets_common::local_and_foreign_assets::ForeignAssetReserveData;
-use assets_common::{
+pub use pez_assets_common::local_and_foreign_assets::ForeignAssetReserveData;
+use pez_assets_common::{
 	foreign_creators::ForeignCreators,
 	local_and_foreign_assets::{LocalFromLeft, TargetFromLeft},
 	AssetIdForTrustBackedAssetsConvert,
@@ -526,7 +526,7 @@ impl pezpallet_assets::Config<ForeignAssetsInstance> for Runtime {
 	type AssetAccountDeposit = ForeignAssetsAssetAccountDeposit;
 	type RemoveItemsLimit = pezframe_support::traits::ConstU32<1000>;
 	#[cfg(feature = "runtime-benchmarks")]
-	type BenchmarkHelper = assets_common::benchmarks::LocationAssetsBenchmarkHelper;
+	type BenchmarkHelper = pez_assets_common::benchmarks::LocationAssetsBenchmarkHelper;
 }
 
 parameter_types! {
@@ -623,7 +623,7 @@ impl pezpallet_asset_conversion::Config for Runtime {
 	type MintMinLiquidity = ConstU128<100>;
 	type WeightInfo = ();
 	#[cfg(feature = "runtime-benchmarks")]
-	type BenchmarkHelper = assets_common::benchmarks::AssetPairFactory<
+	type BenchmarkHelper = pez_assets_common::benchmarks::AssetPairFactory<
 		xcm_config::RelayLocation,
 		teyrchain_info::Pezpallet<Runtime>,
 		xcm_config::TrustBackedAssetsPalletIndex,
diff --git a/pezcumulus/teyrchains/runtimes/testing/penpal/src/xcm_config.rs b/pezcumulus/teyrchains/runtimes/testing/penpal/src/xcm_config.rs
index bb759f66..7df1c238 100644
--- a/pezcumulus/teyrchains/runtimes/testing/penpal/src/xcm_config.rs
+++ b/pezcumulus/teyrchains/runtimes/testing/penpal/src/xcm_config.rs
@@ -41,7 +41,7 @@ use super::{
 	TeyrchainSystem, WeightToFee, XcmpQueue,
 };
 use crate::{BaseDeliveryFee, FeeAssetId, TransactionByteFee};
-use assets_common::TrustBackedAssetsAsLocation;
+use pez_assets_common::TrustBackedAssetsAsLocation;
 use core::marker::PhantomData;
 use pezframe_support::{
 	parameter_types,
@@ -173,7 +173,7 @@ pub type ForeignAssetsConvertedConcreteId = xcm_builder::MatchedConvertedConcret
 		// assert!(Location::new(1,
 		// [Teyrchain(100)]).starts_with(&Location::parent()));
 		// assert!([Teyrchain(100)].into().starts_with(&Here));
-		StartsWith<assets_common::matching::LocalLocationPattern>,
+		StartsWith<pez_assets_common::matching::LocalLocationPattern>,
 	)>,
 	Identity,
 	TryConvertInto,
@@ -364,7 +364,7 @@ pub type TrustedAliasers = (
 pub type WaivedLocations = Equals<RootLocation>;
 /// `AssetId`/`Balance` converter for `TrustBackedAssets`.
 pub type TrustBackedAssetsConvertedConcreteId =
-	assets_common::TrustBackedAssetsConvertedConcreteId<AssetsPalletLocation, Balance>;
+	pez_assets_common::TrustBackedAssetsConvertedConcreteId<AssetsPalletLocation, Balance>;
 
 /// Asset converter for pool assets.
 /// Used to convert assets in pools to the asset required for fee payment.
diff --git a/pezcumulus/teyrchains/runtimes/testing/yet-another-teyrchain/Cargo.toml b/pezcumulus/teyrchains/runtimes/testing/yet-another-teyrchain/Cargo.toml
index 8d28b094..e7e0d904 100644
--- a/pezcumulus/teyrchains/runtimes/testing/yet-another-teyrchain/Cargo.toml
+++ b/pezcumulus/teyrchains/runtimes/testing/yet-another-teyrchain/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "yet-another-teyrchain-runtime"
-version = "0.6.0"
+version = "0.6.1"
 authors.workspace = true
 edition.workspace = true
 description = "Simple runtime used by the testing teyrchain(s)"
@@ -54,9 +54,9 @@ pezkuwi-sdk = { workspace = true, default-features = false, features = [
 	"pezkuwi-runtime-common",
 	"pezkuwi-teyrchain-primitives",
 	"pezpallet-xcm",
-	"pezstaging-xcm",
-	"pezstaging-xcm-builder",
-	"pezstaging-xcm-executor",
+	"xcm",
+	"xcm-builder",
+	"xcm-executor",
 
 	"pezcumulus-pezpallet-aura-ext",
 	"pezcumulus-pezpallet-weight-reclaim",
@@ -66,7 +66,7 @@ pezkuwi-sdk = { workspace = true, default-features = false, features = [
 	"pezcumulus-primitives-core",
 	"pezcumulus-primitives-utility",
 	"pezpallet-collator-selection",
-	"pezstaging-teyrchain-info",
+	"teyrchain-info",
 	"teyrchains-common",
 
 	"runtime",
diff --git a/pezcumulus/teyrchains/runtimes/testing/yet-another-teyrchain/src/genesis_config_presets.rs b/pezcumulus/teyrchains/runtimes/testing/yet-another-teyrchain/src/genesis_config_presets.rs
index 1967f2b2..916732f2 100644
--- a/pezcumulus/teyrchains/runtimes/testing/yet-another-teyrchain/src/genesis_config_presets.rs
+++ b/pezcumulus/teyrchains/runtimes/testing/yet-another-teyrchain/src/genesis_config_presets.rs
@@ -23,7 +23,7 @@ use pezsp_genesis_builder::PresetId;
 use pezsp_keyring::Sr25519Keyring;
 use teyrchains_common::{AccountId, AuraId};
 
-const SAFE_XCM_VERSION: u32 = pezstaging_xcm::prelude::XCM_VERSION;
+const SAFE_XCM_VERSION: u32 = xcm::prelude::XCM_VERSION;
 
 const DEFAULT_PARA_ID: ParaId = ParaId::new(1000);
 const ENDOWMENT: u128 = 1 << 60;
diff --git a/pezcumulus/teyrchains/runtimes/testing/yet-another-teyrchain/src/lib.rs b/pezcumulus/teyrchains/runtimes/testing/yet-another-teyrchain/src/lib.rs
index 65d1f0a7..ae87db12 100644
--- a/pezcumulus/teyrchains/runtimes/testing/yet-another-teyrchain/src/lib.rs
+++ b/pezcumulus/teyrchains/runtimes/testing/yet-another-teyrchain/src/lib.rs
@@ -28,10 +28,8 @@ mod xcm_config;
 
 use crate::xcm_config::{RelayLocation, XcmOriginToTransactDispatchOrigin};
 
-pub use pezkuwi_sdk::{pezstaging_teyrchain_info as teyrchain_info, *};
+pub use pezkuwi_sdk::{teyrchain_info, *};
 use pezpallet_xcm::{EnsureXcm, IsVoiceOfBody};
-use pezstaging_xcm_builder as xcm_builder;
-use pezstaging_xcm_executor as xcm_executor;
 
 use pezcumulus_primitives_core::ParaId;
 use pezkuwi_runtime_common::{prod_or_fast, xcm_sender::NoPriceForMessageDelivery};
@@ -81,7 +79,7 @@ pub use pezsp_runtime::BuildStorage;
 pub use pezsp_runtime::{Perbill, Permill};
 
 use pezcumulus_primitives_core::AggregateMessageOrigin; //, ClaimQueueOffset, CoreSelector};
-use pezstaging_xcm::latest::prelude::BodyId;
+use xcm::latest::prelude::BodyId;
 use teyrchains_common::{AccountId, Signature};
 
 pub type SessionHandlers = ();
diff --git a/pezcumulus/teyrchains/runtimes/testing/yet-another-teyrchain/src/xcm_config.rs b/pezcumulus/teyrchains/runtimes/testing/yet-another-teyrchain/src/xcm_config.rs
index adc7e11d..e8dea720 100644
--- a/pezcumulus/teyrchains/runtimes/testing/yet-another-teyrchain/src/xcm_config.rs
+++ b/pezcumulus/teyrchains/runtimes/testing/yet-another-teyrchain/src/xcm_config.rs
@@ -19,10 +19,7 @@ use super::{
 	RuntimeOrigin, TeyrchainInfo, TeyrchainSystem, WeightToFee, XcmpQueue,
 };
 
-use pezkuwi_sdk::{
-	pezstaging_xcm as xcm, pezstaging_xcm_builder as xcm_builder,
-	pezstaging_xcm_executor as xcm_executor, *,
-};
+use pezkuwi_sdk::{xcm, xcm_builder, xcm_executor, *};
 
 use pezframe_support::{
 	parameter_types,
diff --git a/pezcumulus/zombienet/zombienet-sdk-helpers/Cargo.toml b/pezcumulus/zombienet/zombienet-sdk-helpers/Cargo.toml
index 3bd943ae..7d798674 100644
--- a/pezcumulus/zombienet/zombienet-sdk-helpers/Cargo.toml
+++ b/pezcumulus/zombienet/zombienet-sdk-helpers/Cargo.toml
@@ -17,9 +17,9 @@ log = { workspace = true }
 pezkuwi-primitives = { workspace = true, default-features = true }
 pezcumulus-primitives-core = { workspace = true, default-features = true }
 tokio = { workspace = true, features = ["rt-multi-thread", "macros", "time"] }
-zombienet-sdk = { workspace = true }
+pezkuwi-zombienet-sdk = { workspace = true }
 futures = { workspace = true }
-zombienet-configuration = { workspace = true }
+pezkuwi-zombienet-configuration = { workspace = true }
 
 [features]
 runtime-benchmarks = [
diff --git a/pezcumulus/zombienet/zombienet-sdk-helpers/src/lib.rs b/pezcumulus/zombienet/zombienet-sdk-helpers/src/lib.rs
index db1ef68d..c55d0bc2 100644
--- a/pezcumulus/zombienet/zombienet-sdk-helpers/src/lib.rs
+++ b/pezcumulus/zombienet/zombienet-sdk-helpers/src/lib.rs
@@ -16,7 +16,7 @@ use tokio::{
 	join,
 	time::{sleep, Duration},
 };
-use zombienet_sdk::subxt::{
+use pezkuwi_zombienet_sdk::subxt::{
 	self,
 	blocks::Block,
 	config::{bizinikiwi::DigestItem, pezkuwi::PezkuwiExtrinsicParamsBuilder},
@@ -27,12 +27,12 @@ use zombienet_sdk::subxt::{
 	OnlineClient, PezkuwiConfig,
 };
 
-use zombienet_sdk::{
+use pezkuwi_zombienet_sdk::{
 	tx_helper::{ChainUpgrade, RuntimeUpgradeOptions},
 	LocalFileSystem, Network, NetworkNode,
 };
 
-use zombienet_configuration::types::AssetLocation;
+use pezkuwi_zombienet_configuration::types::AssetLocation;
 
 // Maximum number of blocks to wait for a session change.
 // If it does not arrive for whatever reason, we should not wait forever.
@@ -47,7 +47,7 @@ pub fn create_assign_core_call(core_and_para: &[(u32, u32)]) -> DynamicPayload {
 		});
 	}
 
-	zombienet_sdk::subxt::tx::dynamic(
+	pezkuwi_zombienet_sdk::subxt::tx::dynamic(
 		"Sudo",
 		"sudo",
 		vec![value! {
@@ -158,7 +158,7 @@ pub async fn assert_para_throughput(
 ///
 /// The session change is detected by inspecting the events in the block.
 pub async fn wait_for_first_session_change(
-	blocks_sub: &mut zombienet_sdk::subxt::backend::StreamOfResults<
+	blocks_sub: &mut pezkuwi_zombienet_sdk::subxt::backend::StreamOfResults<
 		Block<PezkuwiConfig, OnlineClient<PezkuwiConfig>>,
 	>,
 ) -> Result<(), anyhow::Error> {
@@ -169,7 +169,7 @@ pub async fn wait_for_first_session_change(
 ///
 /// The session change is detected by inspecting the events in the block.
 pub async fn wait_for_nth_session_change(
-	blocks_sub: &mut zombienet_sdk::subxt::backend::StreamOfResults<
+	blocks_sub: &mut pezkuwi_zombienet_sdk::subxt::backend::StreamOfResults<
 		Block<PezkuwiConfig, OnlineClient<PezkuwiConfig>>,
 	>,
 	mut sessions_to_wait: u32,
@@ -476,7 +476,7 @@ pub async fn assign_cores(
 	let res = submit_extrinsic_and_wait_for_finalization_success_with_timeout(
 		&client,
 		&assign_cores_call,
-		&zombienet_sdk::subxt_signer::sr25519::dev::alice(),
+		&pezkuwi_zombienet_sdk::subxt_signer::sr25519::dev::alice(),
 		60u64,
 	)
 	.await;
diff --git a/pezcumulus/zombienet/zombienet-sdk/Cargo.toml b/pezcumulus/zombienet/zombienet-sdk/Cargo.toml
index 57916eb6..c4388d1a 100644
--- a/pezcumulus/zombienet/zombienet-sdk/Cargo.toml
+++ b/pezcumulus/zombienet/zombienet-sdk/Cargo.toml
@@ -19,9 +19,9 @@ serde = { workspace = true }
 serde_json = { workspace = true }
 tokio = { workspace = true, features = ["rt-multi-thread"] }
 futures = { workspace = true }
-zombienet-sdk = { workspace = true }
-zombienet-orchestrator = { workspace = true }
-zombienet-configuration = { workspace = true }
+pezkuwi-zombienet-sdk = { workspace = true }
+pezkuwi-zombienet-orchestrator = { workspace = true }
+pezkuwi-zombienet-configuration = { workspace = true }
 pezcumulus-zombienet-sdk-helpers = { workspace = true }
 pezsp-statement-store = { workspace = true, default-features = true }
 pezsc-statement-store = { workspace = true, default-features = true }
diff --git a/pezcumulus/zombienet/zombienet-sdk/tests/utils.rs b/pezcumulus/zombienet/zombienet-sdk/tests/utils.rs
index 4053cc01..139bc8e9 100644
--- a/pezcumulus/zombienet/zombienet-sdk/tests/utils.rs
+++ b/pezcumulus/zombienet/zombienet-sdk/tests/utils.rs
@@ -1,7 +1,7 @@
 // Copyright (C) Parity Technologies (UK) Ltd. and Dijital Kurdistan Tech Institute
 // SPDX-License-Identifier: Apache-2.0
 
-use zombienet_sdk::{LocalFileSystem, Network, NetworkConfig};
+use pezkuwi_zombienet_sdk::{LocalFileSystem, Network, NetworkConfig};
 
 pub const BEST_BLOCK_METRIC: &str = "block_height{status=\"best\"}";
 
@@ -9,7 +9,7 @@ pub async fn initialize_network(
 	config: NetworkConfig,
 ) -> Result<Network<LocalFileSystem>, anyhow::Error> {
 	// Spawn network
-	let spawn_fn = zombienet_sdk::environment::get_spawn_fn();
+	let spawn_fn = pezkuwi_zombienet_sdk::environment::get_spawn_fn();
 	let network = spawn_fn(config).await?;
 
 	// Do not terminate network after the test is finished.
diff --git a/pezcumulus/zombienet/zombienet-sdk/tests/zombie_ci/bootnodes.rs b/pezcumulus/zombienet/zombienet-sdk/tests/zombie_ci/bootnodes.rs
index e3d0ed62..41918bb1 100644
--- a/pezcumulus/zombienet/zombienet-sdk/tests/zombie_ci/bootnodes.rs
+++ b/pezcumulus/zombienet/zombienet-sdk/tests/zombie_ci/bootnodes.rs
@@ -7,15 +7,15 @@ use tokio::time::Duration;
 use crate::utils::initialize_network;
 
 use pezcumulus_zombienet_sdk_helpers::wait_for_nth_session_change;
-use zombienet_orchestrator::network::node::LogLineCountOptions;
-use zombienet_sdk::{
+use pezkuwi_zombienet_orchestrator::network::node::LogLineCountOptions;
+use pezkuwi_zombienet_sdk::{
 	subxt::{OnlineClient, PezkuwiConfig},
 	NetworkConfig, NetworkConfigBuilder,
 };
 
 async fn build_network_config() -> Result<NetworkConfig, anyhow::Error> {
 	// images are not relevant for `native`, but we leave it here in case we use `k8s` some day
-	let images = zombienet_sdk::environment::get_images_from_env();
+	let images = pezkuwi_zombienet_sdk::environment::get_images_from_env();
 	log::info!("Using images: {images:?}");
 
 	NetworkConfigBuilder::new()
diff --git a/pezcumulus/zombienet/zombienet-sdk/tests/zombie_ci/elastic_scaling/multiple_blocks_per_slot.rs b/pezcumulus/zombienet/zombienet-sdk/tests/zombie_ci/elastic_scaling/multiple_blocks_per_slot.rs
index edb5a492..30383960 100644
--- a/pezcumulus/zombienet/zombienet-sdk/tests/zombie_ci/elastic_scaling/multiple_blocks_per_slot.rs
+++ b/pezcumulus/zombienet/zombienet-sdk/tests/zombie_ci/elastic_scaling/multiple_blocks_per_slot.rs
@@ -8,7 +8,7 @@ use crate::utils::initialize_network;
 use pezcumulus_zombienet_sdk_helpers::{assert_finality_lag, assert_para_throughput, assign_cores};
 use pezkuwi_primitives::Id as ParaId;
 use serde_json::json;
-use zombienet_sdk::{
+use pezkuwi_zombienet_sdk::{
 	subxt::{OnlineClient, PezkuwiConfig},
 	NetworkConfig, NetworkConfigBuilder,
 };
@@ -67,7 +67,7 @@ async fn elastic_scaling_multiple_blocks_per_slot() -> Result<(), anyhow::Error>
 
 async fn build_network_config() -> Result<NetworkConfig, anyhow::Error> {
 	// images are not relevant for `native`, but we leave it here in case we use `k8s` some day
-	let images = zombienet_sdk::environment::get_images_from_env();
+	let images = pezkuwi_zombienet_sdk::environment::get_images_from_env();
 	log::info!("Using images: {images:?}");
 
 	NetworkConfigBuilder::new()
diff --git a/pezcumulus/zombienet/zombienet-sdk/tests/zombie_ci/elastic_scaling/pov_recovery.rs b/pezcumulus/zombienet/zombienet-sdk/tests/zombie_ci/elastic_scaling/pov_recovery.rs
index 589b95fa..b6cd7a6c 100644
--- a/pezcumulus/zombienet/zombienet-sdk/tests/zombie_ci/elastic_scaling/pov_recovery.rs
+++ b/pezcumulus/zombienet/zombienet-sdk/tests/zombie_ci/elastic_scaling/pov_recovery.rs
@@ -11,8 +11,8 @@ use pezcumulus_zombienet_sdk_helpers::{
 };
 use pezkuwi_primitives::Id as ParaId;
 use serde_json::json;
-use zombienet_orchestrator::network::node::LogLineCountOptions;
-use zombienet_sdk::{
+use pezkuwi_zombienet_orchestrator::network::node::LogLineCountOptions;
+use pezkuwi_zombienet_sdk::{
 	subxt::{OnlineClient, PezkuwiConfig},
 	NetworkConfig, NetworkConfigBuilder, RegistrationStrategy,
 };
@@ -113,7 +113,7 @@ async fn elastic_scaling_pov_recovery() -> Result<(), anyhow::Error> {
 
 async fn build_network_config() -> Result<NetworkConfig, anyhow::Error> {
 	// images are not relevant for `native`, but we leave it here in case we use `k8s` some day
-	let images = zombienet_sdk::environment::get_images_from_env();
+	let images = pezkuwi_zombienet_sdk::environment::get_images_from_env();
 	log::info!("Using images: {images:?}");
 
 	// Network setup:
diff --git a/pezcumulus/zombienet/zombienet-sdk/tests/zombie_ci/elastic_scaling/slot_based_authoring.rs b/pezcumulus/zombienet/zombienet-sdk/tests/zombie_ci/elastic_scaling/slot_based_authoring.rs
index c07e1a8f..e73bcebd 100644
--- a/pezcumulus/zombienet/zombienet-sdk/tests/zombie_ci/elastic_scaling/slot_based_authoring.rs
+++ b/pezcumulus/zombienet/zombienet-sdk/tests/zombie_ci/elastic_scaling/slot_based_authoring.rs
@@ -8,8 +8,8 @@ use crate::utils::{initialize_network, BEST_BLOCK_METRIC};
 
 use pezcumulus_zombienet_sdk_helpers::assign_cores;
 use serde_json::json;
-use zombienet_orchestrator::network::node::LogLineCountOptions;
-use zombienet_sdk::{NetworkConfig, NetworkConfigBuilder};
+use pezkuwi_zombienet_orchestrator::network::node::LogLineCountOptions;
+use pezkuwi_zombienet_sdk::{NetworkConfig, NetworkConfigBuilder};
 
 const PARA_ID_1: u32 = 2100;
 const PARA_ID_2: u32 = 2000;
@@ -68,7 +68,7 @@ async fn elastic_scaling_slot_based_authoring() -> Result<(), anyhow::Error> {
 
 async fn build_network_config() -> Result<NetworkConfig, anyhow::Error> {
 	// images are not relevant for `native`, but we leave it here in case we use `k8s` some day
-	let images = zombienet_sdk::environment::get_images_from_env();
+	let images = pezkuwi_zombienet_sdk::environment::get_images_from_env();
 	log::info!("Using images: {images:?}");
 
 	// Network setup:
diff --git a/pezcumulus/zombienet/zombienet-sdk/tests/zombie_ci/elastic_scaling/slot_based_rp_offset.rs b/pezcumulus/zombienet/zombienet-sdk/tests/zombie_ci/elastic_scaling/slot_based_rp_offset.rs
index a8d69a15..357dd471 100644
--- a/pezcumulus/zombienet/zombienet-sdk/tests/zombie_ci/elastic_scaling/slot_based_rp_offset.rs
+++ b/pezcumulus/zombienet/zombienet-sdk/tests/zombie_ci/elastic_scaling/slot_based_rp_offset.rs
@@ -7,7 +7,7 @@
 use anyhow::anyhow;
 use pezcumulus_zombienet_sdk_helpers::{assert_relay_parent_offset, assign_cores};
 use serde_json::json;
-use zombienet_sdk::{
+use pezkuwi_zombienet_sdk::{
 	subxt::{OnlineClient, PezkuwiConfig},
 	NetworkConfigBuilder,
 };
@@ -19,7 +19,7 @@ async fn elastic_scaling_slot_based_relay_parent_offset_test() -> Result<(), any
 	);
 
 	// images are not relevant for `native`, but we leave it here in case we use `k8s` some day
-	let images = zombienet_sdk::environment::get_images_from_env();
+	let images = pezkuwi_zombienet_sdk::environment::get_images_from_env();
 
 	let config = NetworkConfigBuilder::new()
 		.with_relaychain(|r| {
@@ -69,7 +69,7 @@ async fn elastic_scaling_slot_based_relay_parent_offset_test() -> Result<(), any
 			anyhow!("config errs: {errs}")
 		})?;
 
-	let spawn_fn = zombienet_sdk::environment::get_spawn_fn();
+	let spawn_fn = pezkuwi_zombienet_sdk::environment::get_spawn_fn();
 	let network = spawn_fn(config).await?;
 
 	let relay_node = network.get_node("validator-0")?;
diff --git a/pezcumulus/zombienet/zombienet-sdk/tests/zombie_ci/elastic_scaling/upgrade_to_3_cores.rs b/pezcumulus/zombienet/zombienet-sdk/tests/zombie_ci/elastic_scaling/upgrade_to_3_cores.rs
index 9084b8bb..78ba13ad 100644
--- a/pezcumulus/zombienet/zombienet-sdk/tests/zombie_ci/elastic_scaling/upgrade_to_3_cores.rs
+++ b/pezcumulus/zombienet/zombienet-sdk/tests/zombie_ci/elastic_scaling/upgrade_to_3_cores.rs
@@ -12,7 +12,7 @@ use pezcumulus_zombienet_sdk_helpers::{
 };
 use pezkuwi_primitives::Id as ParaId;
 use rstest::rstest;
-use zombienet_sdk::{
+use pezkuwi_zombienet_sdk::{
 	subxt::{OnlineClient, PezkuwiConfig},
 	NetworkConfig, NetworkConfigBuilder,
 };
@@ -112,7 +112,7 @@ async fn elastic_scaling_upgrade_to_3_cores(
 
 async fn build_network_config(async_backing: bool) -> Result<NetworkConfig, anyhow::Error> {
 	// images are not relevant for `native`, but we leave it here in case we use `k8s` some day
-	let images = zombienet_sdk::environment::get_images_from_env();
+	let images = pezkuwi_zombienet_sdk::environment::get_images_from_env();
 	log::info!("Using images: {images:?}");
 
 	let chain = if async_backing { "async-backing" } else { "sync-backing" };
diff --git a/pezcumulus/zombienet/zombienet-sdk/tests/zombie_ci/full_node_catching_up.rs b/pezcumulus/zombienet/zombienet-sdk/tests/zombie_ci/full_node_catching_up.rs
index cfa2fc48..6606cdbc 100644
--- a/pezcumulus/zombienet/zombienet-sdk/tests/zombie_ci/full_node_catching_up.rs
+++ b/pezcumulus/zombienet/zombienet-sdk/tests/zombie_ci/full_node_catching_up.rs
@@ -8,8 +8,8 @@ use crate::utils::{initialize_network, BEST_BLOCK_METRIC};
 
 use pezcumulus_zombienet_sdk_helpers::assert_para_throughput;
 use pezkuwi_primitives::Id as ParaId;
-use zombienet_orchestrator::network::node::LogLineCountOptions;
-use zombienet_sdk::{
+use pezkuwi_zombienet_orchestrator::network::node::LogLineCountOptions;
+use pezkuwi_zombienet_sdk::{
 	subxt::{OnlineClient, PezkuwiConfig},
 	NetworkConfig, NetworkConfigBuilder,
 };
@@ -67,7 +67,7 @@ async fn full_node_catching_up() -> Result<(), anyhow::Error> {
 
 async fn build_network_config() -> Result<NetworkConfig, anyhow::Error> {
 	// images are not relevant for `native`, but we leave it here in case we use `k8s` some day
-	let images = zombienet_sdk::environment::get_images_from_env();
+	let images = pezkuwi_zombienet_sdk::environment::get_images_from_env();
 	log::info!("Using images: {images:?}");
 
 	// Network setup:
diff --git a/pezcumulus/zombienet/zombienet-sdk/tests/zombie_ci/full_node_warp_sync.rs b/pezcumulus/zombienet/zombienet-sdk/tests/zombie_ci/full_node_warp_sync.rs
index af55830e..b9dcdb7c 100644
--- a/pezcumulus/zombienet/zombienet-sdk/tests/zombie_ci/full_node_warp_sync.rs
+++ b/pezcumulus/zombienet/zombienet-sdk/tests/zombie_ci/full_node_warp_sync.rs
@@ -117,7 +117,7 @@ use pezkuwi_primitives::Id as ParaId;
 
 use crate::utils::{initialize_network, BEST_BLOCK_METRIC};
 use pezcumulus_zombienet_sdk_helpers::assert_para_is_registered;
-use zombienet_sdk::{
+use pezkuwi_zombienet_sdk::{
 	subxt::{OnlineClient, PezkuwiConfig},
 	NetworkConfig, NetworkConfigBuilder,
 };
@@ -157,7 +157,7 @@ async fn full_node_warp_sync() -> Result<(), anyhow::Error> {
 
 async fn build_network_config() -> Result<NetworkConfig, anyhow::Error> {
 	// images are not relevant for `native`, but we leave it here in case we use `k8s` some day
-	let images = zombienet_sdk::environment::get_images_from_env();
+	let images = pezkuwi_zombienet_sdk::environment::get_images_from_env();
 	log::info!("Using images: {images:?}");
 
 	// Network setup:
diff --git a/pezcumulus/zombienet/zombienet-sdk/tests/zombie_ci/migrate_solo.rs b/pezcumulus/zombienet/zombienet-sdk/tests/zombie_ci/migrate_solo.rs
index ae584adf..3a42204a 100644
--- a/pezcumulus/zombienet/zombienet-sdk/tests/zombie_ci/migrate_solo.rs
+++ b/pezcumulus/zombienet/zombienet-sdk/tests/zombie_ci/migrate_solo.rs
@@ -10,7 +10,7 @@ use crate::utils::{initialize_network, BEST_BLOCK_METRIC};
 use pezcumulus_zombienet_sdk_helpers::assert_para_throughput;
 use pezkuwi_primitives::Id as ParaId;
 use pezsp_core::{hexdisplay::AsBytesRef, Bytes};
-use zombienet_sdk::{
+use pezkuwi_zombienet_sdk::{
 	subxt::{self, dynamic::Value, tx::DynamicPayload, OnlineClient, PezkuwiConfig},
 	subxt_signer::sr25519::dev,
 	NetworkConfig, NetworkConfigBuilder, RegistrationStrategy,
@@ -104,7 +104,7 @@ async fn migrate_solo_to_para() -> Result<(), anyhow::Error> {
 
 async fn build_network_config() -> Result<NetworkConfig, anyhow::Error> {
 	// images are not relevant for `native`, but we leave it here in case we use `k8s` some day
-	let images = zombienet_sdk::environment::get_images_from_env();
+	let images = pezkuwi_zombienet_sdk::environment::get_images_from_env();
 	log::info!("Using images: {images:?}");
 
 	// Network setup:
diff --git a/pezcumulus/zombienet/zombienet-sdk/tests/zombie_ci/pov_recovery.rs b/pezcumulus/zombienet/zombienet-sdk/tests/zombie_ci/pov_recovery.rs
index 57aa304a..d320293a 100644
--- a/pezcumulus/zombienet/zombienet-sdk/tests/zombie_ci/pov_recovery.rs
+++ b/pezcumulus/zombienet/zombienet-sdk/tests/zombie_ci/pov_recovery.rs
@@ -9,9 +9,9 @@ use pezcumulus_zombienet_sdk_helpers::{assert_para_is_registered, assert_para_th
 use pezkuwi_primitives::Id as ParaId;
 use serde_json::json;
 use std::{sync::Arc, time::Duration};
-use zombienet_configuration::types::Arg;
-use zombienet_orchestrator::network::node::LogLineCountOptions;
-use zombienet_sdk::{
+use pezkuwi_zombienet_configuration::types::Arg;
+use pezkuwi_zombienet_orchestrator::network::node::LogLineCountOptions;
+use pezkuwi_zombienet_sdk::{
 	environment::Provider,
 	subxt::{OnlineClient, PezkuwiConfig},
 	NetworkConfig, NetworkConfigBuilder, RegistrationStrategy,
@@ -101,13 +101,13 @@ async fn pov_recovery() -> Result<(), anyhow::Error> {
 
 async fn build_network_config() -> Result<NetworkConfig, anyhow::Error> {
 	// images are not relevant for `native`, but we leave it here in case we use `k8s` some day
-	let images = zombienet_sdk::environment::get_images_from_env();
+	let images = pezkuwi_zombienet_sdk::environment::get_images_from_env();
 	log::info!("Using images: {images:?}");
 
 	// If all nodes running on one machine and there are too much of them,
 	// then they don't get enough CPU time and others might fail trying to connect to them.
 	// eg. 'one' and 'two' trying to connect to validators rpc but it is still initializing.
-	let validator_cnt = match zombienet_sdk::environment::get_provider_from_env() {
+	let validator_cnt = match pezkuwi_zombienet_sdk::environment::get_provider_from_env() {
 		Provider::K8s => 13,
 		_ => 5,
 	};
diff --git a/pezcumulus/zombienet/zombienet-sdk/tests/zombie_ci/rpc_collator_build_blocks.rs b/pezcumulus/zombienet/zombienet-sdk/tests/zombie_ci/rpc_collator_build_blocks.rs
index 21fac16e..e75569f2 100644
--- a/pezcumulus/zombienet/zombienet-sdk/tests/zombie_ci/rpc_collator_build_blocks.rs
+++ b/pezcumulus/zombienet/zombienet-sdk/tests/zombie_ci/rpc_collator_build_blocks.rs
@@ -8,8 +8,8 @@ use crate::utils::{initialize_network, BEST_BLOCK_METRIC};
 
 use pezcumulus_zombienet_sdk_helpers::assert_para_throughput;
 use pezkuwi_primitives::Id as ParaId;
-use zombienet_orchestrator::network::node::LogLineCountOptions;
-use zombienet_sdk::{
+use pezkuwi_zombienet_orchestrator::network::node::LogLineCountOptions;
+use pezkuwi_zombienet_sdk::{
 	subxt::{OnlineClient, PezkuwiConfig},
 	NetworkConfig, NetworkConfigBuilder,
 };
@@ -93,7 +93,7 @@ async fn rpc_collator_builds_blocks() -> Result<(), anyhow::Error> {
 
 async fn build_network_config() -> Result<NetworkConfig, anyhow::Error> {
 	// images are not relevant for `native`, but we leave it here in case we use `k8s` some day
-	let images = zombienet_sdk::environment::get_images_from_env();
+	let images = pezkuwi_zombienet_sdk::environment::get_images_from_env();
 	log::info!("Using images: {images:?}");
 
 	// Network setup:
diff --git a/pezcumulus/zombienet/zombienet-sdk/tests/zombie_ci/runtime_upgrade.rs b/pezcumulus/zombienet/zombienet-sdk/tests/zombie_ci/runtime_upgrade.rs
index fb08cc38..78c09102 100644
--- a/pezcumulus/zombienet/zombienet-sdk/tests/zombie_ci/runtime_upgrade.rs
+++ b/pezcumulus/zombienet/zombienet-sdk/tests/zombie_ci/runtime_upgrade.rs
@@ -8,8 +8,8 @@ use crate::utils::initialize_network;
 
 use pezcumulus_zombienet_sdk_helpers::{assert_para_throughput, wait_for_upgrade};
 use pezkuwi_primitives::Id as ParaId;
-use zombienet_configuration::types::AssetLocation;
-use zombienet_sdk::{
+use pezkuwi_zombienet_configuration::types::AssetLocation;
+use pezkuwi_zombienet_sdk::{
 	subxt::{OnlineClient, PezkuwiConfig},
 	tx_helper::{ChainUpgrade, RuntimeUpgradeOptions},
 	NetworkConfig, NetworkConfigBuilder,
@@ -81,7 +81,7 @@ async fn runtime_upgrade() -> Result<(), anyhow::Error> {
 
 async fn build_network_config() -> Result<NetworkConfig, anyhow::Error> {
 	// images are not relevant for `native`, but we leave it here in case we use `k8s` some day
-	let images = zombienet_sdk::environment::get_images_from_env();
+	let images = pezkuwi_zombienet_sdk::environment::get_images_from_env();
 	log::info!("Using images: {images:?}");
 
 	// Network setup:
diff --git a/pezcumulus/zombienet/zombienet-sdk/tests/zombie_ci/statement_store.rs b/pezcumulus/zombienet/zombienet-sdk/tests/zombie_ci/statement_store.rs
index af295db0..491b4b9a 100644
--- a/pezcumulus/zombienet/zombienet-sdk/tests/zombie_ci/statement_store.rs
+++ b/pezcumulus/zombienet/zombienet-sdk/tests/zombie_ci/statement_store.rs
@@ -6,7 +6,7 @@
 
 use anyhow::anyhow;
 use pezsp_core::{Bytes, Encode};
-use zombienet_sdk::{subxt::ext::pezkuwi_subxt_rpcs::rpc_params, NetworkConfigBuilder};
+use pezkuwi_zombienet_sdk::{subxt::ext::pezkuwi_subxt_rpcs::rpc_params, NetworkConfigBuilder};
 
 #[tokio::test(flavor = "multi_thread")]
 async fn statement_store() -> Result<(), anyhow::Error> {
@@ -14,7 +14,7 @@ async fn statement_store() -> Result<(), anyhow::Error> {
 		env_logger::Env::default().filter_or(env_logger::DEFAULT_FILTER_ENV, "info"),
 	);
 	// images are not relevant for `native`, but we leave it here in case we use `k8s` some day
-	let images = zombienet_sdk::environment::get_images_from_env();
+	let images = pezkuwi_zombienet_sdk::environment::get_images_from_env();
 
 	let config = NetworkConfigBuilder::new()
 		.with_relaychain(|r| {
@@ -54,7 +54,7 @@ async fn statement_store() -> Result<(), anyhow::Error> {
 			anyhow!("config errs: {errs}")
 		})?;
 
-	let spawn_fn = zombienet_sdk::environment::get_spawn_fn();
+	let spawn_fn = pezkuwi_zombienet_sdk::environment::get_spawn_fn();
 	let network = spawn_fn(config).await?;
 	assert!(network.wait_until_is_up(60).await.is_ok());
 
diff --git a/pezcumulus/zombienet/zombienet-sdk/tests/zombie_ci/statement_store_bench.rs b/pezcumulus/zombienet/zombienet-sdk/tests/zombie_ci/statement_store_bench.rs
index d1858a05..efee303f 100644
--- a/pezcumulus/zombienet/zombienet-sdk/tests/zombie_ci/statement_store_bench.rs
+++ b/pezcumulus/zombienet/zombienet-sdk/tests/zombie_ci/statement_store_bench.rs
@@ -11,7 +11,7 @@ use pezsp_core::{blake2_256, sr25519, Bytes, Pair};
 use pezsp_statement_store::{Channel, Statement, Topic};
 use std::{cell::Cell, collections::HashMap, time::Duration};
 use tokio::time::timeout;
-use zombienet_sdk::{
+use pezkuwi_zombienet_sdk::{
 	subxt::{backend::rpc::RpcClient, ext::pezkuwi_subxt_rpcs::rpc_params},
 	LocalFileSystem, Network, NetworkConfigBuilder,
 };
@@ -299,7 +299,7 @@ async fn statement_store_memory_stress_bench() -> Result<(), anyhow::Error> {
 /// signed statement in the statement-store without additional verification.
 async fn spawn_network(collators: &[&str]) -> Result<Network<LocalFileSystem>, anyhow::Error> {
 	assert!(collators.len() >= 2);
-	let images = zombienet_sdk::environment::get_images_from_env();
+	let images = pezkuwi_zombienet_sdk::environment::get_images_from_env();
 	let config = NetworkConfigBuilder::new()
 		.with_relaychain(|r| {
 			r.with_chain("pezkuwichain-local")
@@ -338,7 +338,7 @@ async fn spawn_network(collators: &[&str]) -> Result<Network<LocalFileSystem>, a
 			anyhow!("config errs: {errs}")
 		})?;
 
-	let spawn_fn = zombienet_sdk::environment::get_spawn_fn();
+	let spawn_fn = pezkuwi_zombienet_sdk::environment::get_spawn_fn();
 	let network = spawn_fn(config).await?;
 	assert!(network.wait_until_is_up(60).await.is_ok());
 
diff --git a/pezcumulus/zombienet/zombienet-sdk/tests/zombie_ci/sync_blocks.rs b/pezcumulus/zombienet/zombienet-sdk/tests/zombie_ci/sync_blocks.rs
index fd32d61c..eb55469b 100644
--- a/pezcumulus/zombienet/zombienet-sdk/tests/zombie_ci/sync_blocks.rs
+++ b/pezcumulus/zombienet/zombienet-sdk/tests/zombie_ci/sync_blocks.rs
@@ -7,7 +7,7 @@ use crate::utils::{initialize_network, BEST_BLOCK_METRIC};
 
 use pezcumulus_zombienet_sdk_helpers::assert_para_throughput;
 use pezkuwi_primitives::Id as ParaId;
-use zombienet_sdk::{
+use pezkuwi_zombienet_sdk::{
 	subxt::{OnlineClient, PezkuwiConfig},
 	NetworkConfig, NetworkConfigBuilder,
 };
@@ -60,7 +60,7 @@ async fn sync_blocks_from_tip_without_connected_collator() -> Result<(), anyhow:
 
 async fn build_network_config() -> Result<NetworkConfig, anyhow::Error> {
 	// images are not relevant for `native`, but we leave it here in case we use `k8s` some day
-	let images = zombienet_sdk::environment::get_images_from_env();
+	let images = pezkuwi_zombienet_sdk::environment::get_images_from_env();
 	log::info!("Using images: {images:?}");
 
 	// Network setup:
diff --git a/pezcumulus/zombienet/zombienet-sdk/tests/zombie_ci/teyrchain_extrinsic_get_finalized.rs b/pezcumulus/zombienet/zombienet-sdk/tests/zombie_ci/teyrchain_extrinsic_get_finalized.rs
index e729e2bc..496b2f4b 100644
--- a/pezcumulus/zombienet/zombienet-sdk/tests/zombie_ci/teyrchain_extrinsic_get_finalized.rs
+++ b/pezcumulus/zombienet/zombienet-sdk/tests/zombie_ci/teyrchain_extrinsic_get_finalized.rs
@@ -6,8 +6,8 @@ use tokio::time::Duration;
 
 use crate::utils::{initialize_network, BEST_BLOCK_METRIC};
 use pezcumulus_zombienet_sdk_helpers::submit_extrinsic_and_wait_for_finalization_success_with_timeout;
-use zombienet_orchestrator::network::node::{LogLineCount, LogLineCountOptions};
-use zombienet_sdk::{
+use pezkuwi_zombienet_orchestrator::network::node::{LogLineCount, LogLineCountOptions};
+use pezkuwi_zombienet_sdk::{
 	subxt::{self, dynamic::Value, OnlineClient, PezkuwiConfig},
 	subxt_signer::sr25519::dev,
 	NetworkConfig, NetworkConfigBuilder,
@@ -126,7 +126,7 @@ async fn build_network_config() -> Result<NetworkConfig, anyhow::Error> {
 	log::info!("Spawning network");
 
 	// images are not relevant for `native`, but we leave it here in case we use `k8s` some day
-	let images = zombienet_sdk::environment::get_images_from_env();
+	let images = pezkuwi_zombienet_sdk::environment::get_images_from_env();
 	log::info!("Using images: {images:?}");
 
 	// Network setup:
diff --git a/pezkuwi/cli/src/command.rs b/pezkuwi/cli/src/command.rs
index c9342287..ed21c6ac 100644
--- a/pezkuwi/cli/src/command.rs
+++ b/pezkuwi/cli/src/command.rs
@@ -439,23 +439,25 @@ pub fn run() -> Result<()> {
 			let chain_spec = &runner.config().chain_spec;
 
 			match cmd {
-				#[cfg(not(feature = "runtime-benchmarks"))]
-				BenchmarkCmd::Storage(_) =>
-					return Err(pezsc_cli::Error::Input(
-						"Compile with --features=runtime-benchmarks \
-						to enable storage benchmarks."
-							.into(),
-					)
-					.into()),
-				#[cfg(feature = "runtime-benchmarks")]
-				BenchmarkCmd::Storage(cmd) => runner.sync_run(|mut config| {
-					let (client, backend, _, _) = pezkuwi_service::new_chain_ops(&mut config)?;
-					let db = backend.expose_db();
-					let storage = backend.expose_storage();
-					let shared_trie_cache = backend.expose_shared_trie_cache();
-
-					cmd.run(config, client.clone(), db, storage, shared_trie_cache).map_err(Error::BizinikiwiCli)
-				}),
+				// Storage benchmarks are only available with pezframe-benchmarking-cli's
+				// `storage-benchmark` feature enabled, which requires test runtime crate.
+				// #[cfg(not(feature = "runtime-benchmarks"))]
+				// BenchmarkCmd::Storage(_) =>
+				// 	return Err(pezsc_cli::Error::Input(
+				// 		"Compile with --features=runtime-benchmarks \
+				// 		to enable storage benchmarks."
+				// 			.into(),
+				// 	)
+				// 	.into()),
+				// #[cfg(feature = "runtime-benchmarks")]
+				// BenchmarkCmd::Storage(cmd) => runner.sync_run(|mut config| {
+				// 	let (client, backend, _, _) = pezkuwi_service::new_chain_ops(&mut config)?;
+				// 	let db = backend.expose_db();
+				// 	let storage = backend.expose_storage();
+				// 	let shared_trie_cache = backend.expose_shared_trie_cache();
+				//
+				// 	cmd.run(config, client.clone(), db, storage, shared_trie_cache).map_err(Error::BizinikiwiCli)
+				// }),
 				BenchmarkCmd::Block(cmd) => runner.sync_run(|mut config| {
 					let (client, _, _, _) = pezkuwi_service::new_chain_ops(&mut config)?;
 
diff --git a/pezkuwi/node/collation-generation/Cargo.toml b/pezkuwi/node/collation-generation/Cargo.toml
index da499aa1..354cd1e6 100644
--- a/pezkuwi/node/collation-generation/Cargo.toml
+++ b/pezkuwi/node/collation-generation/Cargo.toml
@@ -27,9 +27,9 @@ thiserror = { workspace = true }
 
 [dev-dependencies]
 assert_matches = { workspace = true }
-pezkuwi-node-subsystem-test-helpers = { workspace = true }
+# pezkuwi-node-subsystem-test-helpers = { workspace = true }
 pezkuwi-primitives = { workspace = true, features = ["test"] }
-pezkuwi-primitives-test-helpers = { workspace = true }
+# pezkuwi-primitives-test-helpers = { workspace = true }
 pezsp-keyring = { workspace = true, default-features = true }
 rstest = { workspace = true }
 
@@ -37,11 +37,11 @@ rstest = { workspace = true }
 runtime-benchmarks = [
 	"gum/runtime-benchmarks",
 	"pezkuwi-erasure-coding/runtime-benchmarks",
-	"pezkuwi-node-subsystem-test-helpers/runtime-benchmarks",
+	# "pezkuwi-node-subsystem-test-helpers/runtime-benchmarks",
 	"pezkuwi-node-subsystem-util/runtime-benchmarks",
 	"pezkuwi-node-subsystem/runtime-benchmarks",
 	"pezkuwi-pez-node-primitives/runtime-benchmarks",
-	"pezkuwi-primitives-test-helpers/runtime-benchmarks",
+	# "pezkuwi-primitives-test-helpers/runtime-benchmarks",
 	"pezkuwi-primitives/runtime-benchmarks",
 	"pezsp-keyring/runtime-benchmarks",
 ]
diff --git a/pezkuwi/node/core/approval-voting-parallel/Cargo.toml b/pezkuwi/node/core/approval-voting-parallel/Cargo.toml
index 9c806e09..8a047bcf 100644
--- a/pezkuwi/node/core/approval-voting-parallel/Cargo.toml
+++ b/pezkuwi/node/core/approval-voting-parallel/Cargo.toml
@@ -37,7 +37,7 @@ rand_core = { workspace = true }
 [dev-dependencies]
 assert_matches = { workspace = true }
 kvdb-memorydb = { workspace = true }
-pezkuwi-node-subsystem-test-helpers = { workspace = true, default-features = true }
+# pezkuwi-node-subsystem-test-helpers = { workspace = true, default-features = true }
 pezsp-consensus-babe = { workspace = true, default-features = true }
 pezsp-core = { workspace = true, default-features = true }
 pezsp-keyring = { workspace = true, default-features = true }
@@ -51,7 +51,7 @@ runtime-benchmarks = [
 	"pezkuwi-node-core-approval-voting/runtime-benchmarks",
 	"pezkuwi-node-metrics/runtime-benchmarks",
 	"pezkuwi-node-network-protocol/runtime-benchmarks",
-	"pezkuwi-node-subsystem-test-helpers/runtime-benchmarks",
+	# "pezkuwi-node-subsystem-test-helpers/runtime-benchmarks",
 	"pezkuwi-node-subsystem-util/runtime-benchmarks",
 	"pezkuwi-node-subsystem/runtime-benchmarks",
 	"pezkuwi-overseer/runtime-benchmarks",
diff --git a/pezkuwi/node/core/approval-voting/Cargo.toml b/pezkuwi/node/core/approval-voting/Cargo.toml
index b8401b6e..88d9497e 100644
--- a/pezkuwi/node/core/approval-voting/Cargo.toml
+++ b/pezkuwi/node/core/approval-voting/Cargo.toml
@@ -52,29 +52,29 @@ rand_core = { workspace = true }
 assert_matches = { workspace = true }
 kvdb-memorydb = { workspace = true }
 parking_lot = { workspace = true, default-features = true }
-pezkuwi-node-subsystem-test-helpers = { workspace = true }
+# pezkuwi-node-subsystem-test-helpers = { workspace = true }
 pezkuwi-primitives = { workspace = true, features = ["test"] }
-pezkuwi-primitives-test-helpers = { workspace = true }
+# pezkuwi-primitives-test-helpers = { workspace = true }
 pezsp-consensus-babe = { workspace = true, default-features = true }
 pezsp-core = { workspace = true, default-features = true }
 pezsp-keyring = { workspace = true, default-features = true }
 pezsp-keystore = { workspace = true, default-features = true }
 pezsp-tracing = { workspace = true }
 
-pezkuwi-subsystem-bench = { workspace = true }
+# pezkuwi-subsystem-bench = { workspace = true }
 
 [features]
 subsystem-benchmarks = []
 runtime-benchmarks = [
 	"gum/runtime-benchmarks",
-	"pezkuwi-node-subsystem-test-helpers/runtime-benchmarks",
+	# "pezkuwi-node-subsystem-test-helpers/runtime-benchmarks",
 	"pezkuwi-node-subsystem-util/runtime-benchmarks",
 	"pezkuwi-node-subsystem/runtime-benchmarks",
 	"pezkuwi-overseer/runtime-benchmarks",
 	"pezkuwi-pez-node-primitives/runtime-benchmarks",
-	"pezkuwi-primitives-test-helpers/runtime-benchmarks",
+	# "pezkuwi-primitives-test-helpers/runtime-benchmarks",
 	"pezkuwi-primitives/runtime-benchmarks",
-	"pezkuwi-subsystem-bench/runtime-benchmarks",
+	# "pezkuwi-subsystem-bench/runtime-benchmarks",
 	"pezsp-consensus-babe/runtime-benchmarks",
 	"pezsp-consensus-slots/runtime-benchmarks",
 	"pezsp-consensus/runtime-benchmarks",
diff --git a/pezkuwi/node/core/av-store/Cargo.toml b/pezkuwi/node/core/av-store/Cargo.toml
index b1390ffa..1f3b25aa 100644
--- a/pezkuwi/node/core/av-store/Cargo.toml
+++ b/pezkuwi/node/core/av-store/Cargo.toml
@@ -33,8 +33,8 @@ kvdb-memorydb = { workspace = true }
 pezsp-tracing = { workspace = true }
 
 parking_lot = { workspace = true, default-features = true }
-pezkuwi-node-subsystem-test-helpers = { workspace = true }
-pezkuwi-primitives-test-helpers = { workspace = true }
+# pezkuwi-node-subsystem-test-helpers = { workspace = true }
+# pezkuwi-primitives-test-helpers = { workspace = true }
 pezsp-core = { workspace = true, default-features = true }
 pezsp-keyring = { workspace = true, default-features = true }
 
@@ -42,11 +42,11 @@ pezsp-keyring = { workspace = true, default-features = true }
 runtime-benchmarks = [
 	"gum/runtime-benchmarks",
 	"pezkuwi-erasure-coding/runtime-benchmarks",
-	"pezkuwi-node-subsystem-test-helpers/runtime-benchmarks",
+	# "pezkuwi-node-subsystem-test-helpers/runtime-benchmarks",
 	"pezkuwi-node-subsystem-util/runtime-benchmarks",
 	"pezkuwi-node-subsystem/runtime-benchmarks",
 	"pezkuwi-pez-node-primitives/runtime-benchmarks",
-	"pezkuwi-primitives-test-helpers/runtime-benchmarks",
+	# "pezkuwi-primitives-test-helpers/runtime-benchmarks",
 	"pezkuwi-primitives/runtime-benchmarks",
 	"pezsp-consensus/runtime-benchmarks",
 	"pezsp-keyring/runtime-benchmarks",
diff --git a/pezkuwi/node/core/backing/Cargo.toml b/pezkuwi/node/core/backing/Cargo.toml
index f9b27dc1..0e191f61 100644
--- a/pezkuwi/node/core/backing/Cargo.toml
+++ b/pezkuwi/node/core/backing/Cargo.toml
@@ -31,9 +31,9 @@ thiserror = { workspace = true }
 [dev-dependencies]
 assert_matches = { workspace = true }
 futures = { features = ["thread-pool"], workspace = true }
-pezkuwi-node-subsystem-test-helpers = { workspace = true }
+# pezkuwi-node-subsystem-test-helpers = { workspace = true }
 pezkuwi-primitives = { workspace = true, features = ["test"] }
-pezkuwi-primitives-test-helpers = { workspace = true }
+# pezkuwi-primitives-test-helpers = { workspace = true }
 pezsc-keystore = { workspace = true, default-features = true }
 pezsp-application-crypto = { workspace = true, default-features = true }
 pezsp-core = { workspace = true, default-features = true }
@@ -44,11 +44,11 @@ pezsp-tracing = { workspace = true, default-features = true }
 runtime-benchmarks = [
 	"gum/runtime-benchmarks",
 	"pezkuwi-erasure-coding/runtime-benchmarks",
-	"pezkuwi-node-subsystem-test-helpers/runtime-benchmarks",
+	# "pezkuwi-node-subsystem-test-helpers/runtime-benchmarks",
 	"pezkuwi-node-subsystem-util/runtime-benchmarks",
 	"pezkuwi-node-subsystem/runtime-benchmarks",
 	"pezkuwi-pez-node-primitives/runtime-benchmarks",
-	"pezkuwi-primitives-test-helpers/runtime-benchmarks",
+	# "pezkuwi-primitives-test-helpers/runtime-benchmarks",
 	"pezkuwi-primitives/runtime-benchmarks",
 	"pezkuwi-statement-table/runtime-benchmarks",
 	"pezkuwi-teyrchain-primitives/runtime-benchmarks",
diff --git a/pezkuwi/node/core/bitfield-signing/Cargo.toml b/pezkuwi/node/core/bitfield-signing/Cargo.toml
index 871b7f5c..63dfb192 100644
--- a/pezkuwi/node/core/bitfield-signing/Cargo.toml
+++ b/pezkuwi/node/core/bitfield-signing/Cargo.toml
@@ -23,15 +23,15 @@ thiserror = { workspace = true }
 wasm-timer = { workspace = true }
 
 [dev-dependencies]
-pezkuwi-node-subsystem-test-helpers = { workspace = true }
-pezkuwi-primitives-test-helpers = { workspace = true }
+# pezkuwi-node-subsystem-test-helpers = { workspace = true }
+# pezkuwi-primitives-test-helpers = { workspace = true }
 
 [features]
 runtime-benchmarks = [
 	"gum/runtime-benchmarks",
-	"pezkuwi-node-subsystem-test-helpers/runtime-benchmarks",
+	# "pezkuwi-node-subsystem-test-helpers/runtime-benchmarks",
 	"pezkuwi-node-subsystem-util/runtime-benchmarks",
 	"pezkuwi-node-subsystem/runtime-benchmarks",
-	"pezkuwi-primitives-test-helpers/runtime-benchmarks",
+	# "pezkuwi-primitives-test-helpers/runtime-benchmarks",
 	"pezkuwi-primitives/runtime-benchmarks",
 ]
diff --git a/pezkuwi/node/core/candidate-validation/Cargo.toml b/pezkuwi/node/core/candidate-validation/Cargo.toml
index b175e847..597af4bf 100644
--- a/pezkuwi/node/core/candidate-validation/Cargo.toml
+++ b/pezkuwi/node/core/candidate-validation/Cargo.toml
@@ -36,9 +36,9 @@ pezkuwi-node-core-pvf = { workspace = true, default-features = true }
 [dev-dependencies]
 assert_matches = { workspace = true }
 futures = { features = ["thread-pool"], workspace = true }
-pezkuwi-node-subsystem-test-helpers = { workspace = true }
+# pezkuwi-node-subsystem-test-helpers = { workspace = true }
 pezkuwi-primitives = { workspace = true, features = ["test"] }
-pezkuwi-primitives-test-helpers = { workspace = true }
+# pezkuwi-primitives-test-helpers = { workspace = true }
 pezsp-core = { workspace = true, default-features = true }
 pezsp-keyring = { workspace = true, default-features = true }
 pezsp-maybe-compressed-blob = { workspace = true, default-features = true }
@@ -49,12 +49,12 @@ runtime-benchmarks = [
 	"gum/runtime-benchmarks",
 	"pezkuwi-node-core-pvf/runtime-benchmarks",
 	"pezkuwi-node-metrics/runtime-benchmarks",
-	"pezkuwi-node-subsystem-test-helpers/runtime-benchmarks",
+	# "pezkuwi-node-subsystem-test-helpers/runtime-benchmarks",
 	"pezkuwi-node-subsystem-util/runtime-benchmarks",
 	"pezkuwi-node-subsystem/runtime-benchmarks",
 	"pezkuwi-overseer/runtime-benchmarks",
 	"pezkuwi-pez-node-primitives/runtime-benchmarks",
-	"pezkuwi-primitives-test-helpers/runtime-benchmarks",
+	# "pezkuwi-primitives-test-helpers/runtime-benchmarks",
 	"pezkuwi-primitives/runtime-benchmarks",
 	"pezkuwi-teyrchain-primitives/runtime-benchmarks",
 	"pezsp-keyring/runtime-benchmarks",
diff --git a/pezkuwi/node/core/chain-api/Cargo.toml b/pezkuwi/node/core/chain-api/Cargo.toml
index d3fedec7..5571592b 100644
--- a/pezkuwi/node/core/chain-api/Cargo.toml
+++ b/pezkuwi/node/core/chain-api/Cargo.toml
@@ -25,7 +25,7 @@ pezsc-consensus-babe = { workspace = true, default-features = true }
 codec = { workspace = true, default-features = true }
 futures = { features = ["thread-pool"], workspace = true }
 maplit = { workspace = true }
-pezkuwi-node-subsystem-test-helpers = { workspace = true }
+# pezkuwi-node-subsystem-test-helpers = { workspace = true }
 pezkuwi-pez-node-primitives = { workspace = true, default-features = true }
 pezkuwi-primitives = { workspace = true, default-features = true }
 pezsp-blockchain = { workspace = true, default-features = true }
@@ -35,7 +35,7 @@ pezsp-core = { workspace = true, default-features = true }
 runtime-benchmarks = [
 	"gum/runtime-benchmarks",
 	"pezkuwi-node-metrics/runtime-benchmarks",
-	"pezkuwi-node-subsystem-test-helpers/runtime-benchmarks",
+	# "pezkuwi-node-subsystem-test-helpers/runtime-benchmarks",
 	"pezkuwi-node-subsystem-types/runtime-benchmarks",
 	"pezkuwi-node-subsystem/runtime-benchmarks",
 	"pezkuwi-pez-node-primitives/runtime-benchmarks",
diff --git a/pezkuwi/node/core/chain-selection/Cargo.toml b/pezkuwi/node/core/chain-selection/Cargo.toml
index b9d5d610..0825fcb9 100644
--- a/pezkuwi/node/core/chain-selection/Cargo.toml
+++ b/pezkuwi/node/core/chain-selection/Cargo.toml
@@ -27,13 +27,13 @@ thiserror = { workspace = true }
 assert_matches = { workspace = true }
 kvdb-memorydb = { workspace = true }
 parking_lot = { workspace = true, default-features = true }
-pezkuwi-node-subsystem-test-helpers = { workspace = true }
+# pezkuwi-node-subsystem-test-helpers = { workspace = true }
 pezsp-core = { workspace = true, default-features = true }
 
 [features]
 runtime-benchmarks = [
 	"gum/runtime-benchmarks",
-	"pezkuwi-node-subsystem-test-helpers/runtime-benchmarks",
+	# "pezkuwi-node-subsystem-test-helpers/runtime-benchmarks",
 	"pezkuwi-node-subsystem-util/runtime-benchmarks",
 	"pezkuwi-node-subsystem/runtime-benchmarks",
 	"pezkuwi-pez-node-primitives/runtime-benchmarks",
diff --git a/pezkuwi/node/core/dispute-coordinator/Cargo.toml b/pezkuwi/node/core/dispute-coordinator/Cargo.toml
index fc7df159..7e48e044 100644
--- a/pezkuwi/node/core/dispute-coordinator/Cargo.toml
+++ b/pezkuwi/node/core/dispute-coordinator/Cargo.toml
@@ -37,16 +37,16 @@ pezsc-keystore = { workspace = true, default-features = true }
 assert_matches = { workspace = true }
 futures-timer = { workspace = true }
 kvdb-memorydb = { workspace = true }
-pezkuwi-node-subsystem-test-helpers = { workspace = true }
+# pezkuwi-node-subsystem-test-helpers = { workspace = true }
 pezkuwi-primitives = { workspace = true, features = ["test"] }
-pezkuwi-primitives-test-helpers = { workspace = true }
+# pezkuwi-primitives-test-helpers = { workspace = true }
 pezsp-application-crypto = { workspace = true, default-features = true }
 pezsp-core = { workspace = true, default-features = true }
 pezsp-keyring = { workspace = true, default-features = true }
 pezsp-keystore = { workspace = true, default-features = true }
 pezsp-tracing = { workspace = true, default-features = true }
 
-pezkuwi-subsystem-bench = { workspace = true }
+# pezkuwi-subsystem-bench = { workspace = true }
 
 [features]
 # If not enabled, the dispute coordinator will do nothing.
@@ -54,12 +54,12 @@ disputes = []
 subsystem-benchmarks = []
 runtime-benchmarks = [
 	"gum/runtime-benchmarks",
-	"pezkuwi-node-subsystem-test-helpers/runtime-benchmarks",
+	# "pezkuwi-node-subsystem-test-helpers/runtime-benchmarks",
 	"pezkuwi-node-subsystem-util/runtime-benchmarks",
 	"pezkuwi-node-subsystem/runtime-benchmarks",
 	"pezkuwi-pez-node-primitives/runtime-benchmarks",
-	"pezkuwi-primitives-test-helpers/runtime-benchmarks",
+	# "pezkuwi-primitives-test-helpers/runtime-benchmarks",
 	"pezkuwi-primitives/runtime-benchmarks",
-	"pezkuwi-subsystem-bench/runtime-benchmarks",
+	# "pezkuwi-subsystem-bench/runtime-benchmarks",
 	"pezsp-keyring/runtime-benchmarks",
 ]
diff --git a/pezkuwi/node/core/prospective-teyrchains/Cargo.toml b/pezkuwi/node/core/prospective-teyrchains/Cargo.toml
index 22b211bb..d309dd3c 100644
--- a/pezkuwi/node/core/prospective-teyrchains/Cargo.toml
+++ b/pezkuwi/node/core/prospective-teyrchains/Cargo.toml
@@ -24,9 +24,9 @@ pezkuwi-primitives = { workspace = true, default-features = true }
 
 [dev-dependencies]
 assert_matches = { workspace = true }
-pezkuwi-node-subsystem-test-helpers = { workspace = true }
+# pezkuwi-node-subsystem-test-helpers = { workspace = true }
 pezkuwi-primitives = { workspace = true, features = ["test"] }
-pezkuwi-primitives-test-helpers = { workspace = true }
+# pezkuwi-primitives-test-helpers = { workspace = true }
 pezsp-core = { workspace = true, default-features = true }
 pezsp-tracing = { workspace = true }
 rand = { workspace = true }
@@ -35,9 +35,9 @@ rstest = { workspace = true }
 [features]
 runtime-benchmarks = [
 	"gum/runtime-benchmarks",
-	"pezkuwi-node-subsystem-test-helpers/runtime-benchmarks",
+	# "pezkuwi-node-subsystem-test-helpers/runtime-benchmarks",
 	"pezkuwi-node-subsystem-util/runtime-benchmarks",
 	"pezkuwi-node-subsystem/runtime-benchmarks",
-	"pezkuwi-primitives-test-helpers/runtime-benchmarks",
+	# "pezkuwi-primitives-test-helpers/runtime-benchmarks",
 	"pezkuwi-primitives/runtime-benchmarks",
 ]
diff --git a/pezkuwi/node/core/provisioner/Cargo.toml b/pezkuwi/node/core/provisioner/Cargo.toml
index c50096dd..e92ab9cd 100644
--- a/pezkuwi/node/core/provisioner/Cargo.toml
+++ b/pezkuwi/node/core/provisioner/Cargo.toml
@@ -27,20 +27,20 @@ schnellru = { workspace = true }
 thiserror = { workspace = true }
 
 [dev-dependencies]
-pezkuwi-node-subsystem-test-helpers = { workspace = true }
+# pezkuwi-node-subsystem-test-helpers = { workspace = true }
 pezkuwi-primitives = { workspace = true, features = ["test"] }
-pezkuwi-primitives-test-helpers = { workspace = true }
+# pezkuwi-primitives-test-helpers = { workspace = true }
 pezsp-application-crypto = { workspace = true, default-features = true }
 pezsp-keystore = { workspace = true, default-features = true }
 
 [features]
 runtime-benchmarks = [
 	"gum/runtime-benchmarks",
-	"pezkuwi-node-subsystem-test-helpers/runtime-benchmarks",
+	# "pezkuwi-node-subsystem-test-helpers/runtime-benchmarks",
 	"pezkuwi-node-subsystem-util/runtime-benchmarks",
 	"pezkuwi-node-subsystem/runtime-benchmarks",
 	"pezkuwi-pez-node-primitives/runtime-benchmarks",
-	"pezkuwi-primitives-test-helpers/runtime-benchmarks",
+	# "pezkuwi-primitives-test-helpers/runtime-benchmarks",
 	"pezkuwi-primitives/runtime-benchmarks",
 	"pezsc-consensus-slots/runtime-benchmarks",
 ]
diff --git a/pezkuwi/node/core/pvf-checker/Cargo.toml b/pezkuwi/node/core/pvf-checker/Cargo.toml
index 7c5cf827..2c9d5117 100644
--- a/pezkuwi/node/core/pvf-checker/Cargo.toml
+++ b/pezkuwi/node/core/pvf-checker/Cargo.toml
@@ -24,8 +24,8 @@ pezsp-keystore = { workspace = true, default-features = true }
 
 [dev-dependencies]
 futures-timer = { workspace = true }
-pezkuwi-node-subsystem-test-helpers = { workspace = true }
-pezkuwi-primitives-test-helpers = { workspace = true }
+# pezkuwi-node-subsystem-test-helpers = { workspace = true }
+# pezkuwi-primitives-test-helpers = { workspace = true }
 pezsc-keystore = { workspace = true, default-features = true }
 pezsp-application-crypto = { workspace = true, default-features = true }
 pezsp-core = { workspace = true, default-features = true }
@@ -35,10 +35,10 @@ pezsp-runtime = { workspace = true, default-features = true }
 [features]
 runtime-benchmarks = [
 	"gum/runtime-benchmarks",
-	"pezkuwi-node-subsystem-test-helpers/runtime-benchmarks",
+	# "pezkuwi-node-subsystem-test-helpers/runtime-benchmarks",
 	"pezkuwi-node-subsystem-util/runtime-benchmarks",
 	"pezkuwi-node-subsystem/runtime-benchmarks",
-	"pezkuwi-primitives-test-helpers/runtime-benchmarks",
+	# "pezkuwi-primitives-test-helpers/runtime-benchmarks",
 	"pezkuwi-primitives/runtime-benchmarks",
 	"pezsp-keyring/runtime-benchmarks",
 	"pezsp-runtime/runtime-benchmarks",
diff --git a/pezkuwi/node/core/pvf/Cargo.toml b/pezkuwi/node/core/pvf/Cargo.toml
index 67e458e3..1d24acbc 100644
--- a/pezkuwi/node/core/pvf/Cargo.toml
+++ b/pezkuwi/node/core/pvf/Cargo.toml
@@ -59,15 +59,15 @@ criterion = { features = [
 pezkuwi-node-core-pvf-common = { features = [
 	"test-utils",
 ], workspace = true, default-features = true }
-pezkuwi-node-subsystem-test-helpers = { workspace = true }
+# pezkuwi-node-subsystem-test-helpers = { workspace = true }
 # For benches and integration tests, depend on ourselves with the test-utils feature.
-pezkuwi-node-core-pvf = { features = [
-	"test-utils",
-], workspace = true, default-features = true }
-pezkuwichain-runtime = { workspace = true }
+# pezkuwi-node-core-pvf = { features = [
+# 	"test-utils",
+# ], workspace = true, default-features = true }
+# pezkuwichain-runtime = { workspace = true }
 
-test-teyrchain-adder = { workspace = true }
-test-teyrchain-halt = { workspace = true }
+# test-teyrchain-adder = { workspace = true }
+# test-teyrchain-halt = { workspace = true }
 
 [target.'cfg(target_os = "linux")'.dev-dependencies]
 libc = { workspace = true }
@@ -90,15 +90,15 @@ runtime-benchmarks = [
 	"pezkuwi-node-core-pvf-common/runtime-benchmarks",
 	"pezkuwi-node-core-pvf-execute-worker?/runtime-benchmarks",
 	"pezkuwi-node-core-pvf-prepare-worker?/runtime-benchmarks",
-	"pezkuwi-node-core-pvf/runtime-benchmarks",
+	# "pezkuwi-node-core-pvf/runtime-benchmarks",
 	"pezkuwi-node-metrics/runtime-benchmarks",
-	"pezkuwi-node-subsystem-test-helpers/runtime-benchmarks",
+	# "pezkuwi-node-subsystem-test-helpers/runtime-benchmarks",
 	"pezkuwi-node-subsystem/runtime-benchmarks",
 	"pezkuwi-pez-node-primitives/runtime-benchmarks",
 	"pezkuwi-primitives/runtime-benchmarks",
 	"pezkuwi-teyrchain-primitives/runtime-benchmarks",
-	"pezkuwichain-runtime/runtime-benchmarks",
+	# "pezkuwichain-runtime/runtime-benchmarks",
 	"pezsc-sysinfo/runtime-benchmarks",
 	"pezsc-tracing/runtime-benchmarks",
-	"test-teyrchain-adder/runtime-benchmarks",
+	# "test-teyrchain-adder/runtime-benchmarks",
 ]
diff --git a/pezkuwi/node/core/pvf/prepare-worker/Cargo.toml b/pezkuwi/node/core/pvf/prepare-worker/Cargo.toml
index 212f3b77..79f06664 100644
--- a/pezkuwi/node/core/pvf/prepare-worker/Cargo.toml
+++ b/pezkuwi/node/core/pvf/prepare-worker/Cargo.toml
@@ -38,7 +38,7 @@ tikv-jemalloc-ctl = { workspace = true }
 
 [dev-dependencies]
 criterion = { features = ["cargo_bench_support"], workspace = true }
-pezkuwichain-runtime = { workspace = true }
+# pezkuwichain-runtime = { workspace = true }
 
 [features]
 builder = []
@@ -51,5 +51,5 @@ runtime-benchmarks = [
 	"gum/runtime-benchmarks",
 	"pezkuwi-node-core-pvf-common/runtime-benchmarks",
 	"pezkuwi-primitives/runtime-benchmarks",
-	"pezkuwichain-runtime/runtime-benchmarks",
+	# "pezkuwichain-runtime/runtime-benchmarks",
 ]
diff --git a/pezkuwi/node/core/runtime-api/Cargo.toml b/pezkuwi/node/core/runtime-api/Cargo.toml
index b1e33e05..c0f893ed 100644
--- a/pezkuwi/node/core/runtime-api/Cargo.toml
+++ b/pezkuwi/node/core/runtime-api/Cargo.toml
@@ -27,9 +27,9 @@ pezkuwi-primitives = { workspace = true, default-features = true }
 [dev-dependencies]
 async-trait = { workspace = true }
 futures = { features = ["thread-pool"], workspace = true }
-pezkuwi-node-subsystem-test-helpers = { workspace = true }
+# pezkuwi-node-subsystem-test-helpers = { workspace = true }
 pezkuwi-pez-node-primitives = { workspace = true, default-features = true }
-pezkuwi-primitives-test-helpers = { workspace = true }
+# pezkuwi-primitives-test-helpers = { workspace = true }
 pezsp-api = { workspace = true, default-features = true }
 pezsp-core = { workspace = true, default-features = true }
 pezsp-keyring = { workspace = true, default-features = true }
@@ -38,11 +38,11 @@ pezsp-keyring = { workspace = true, default-features = true }
 runtime-benchmarks = [
 	"gum/runtime-benchmarks",
 	"pezkuwi-node-metrics/runtime-benchmarks",
-	"pezkuwi-node-subsystem-test-helpers/runtime-benchmarks",
+	# "pezkuwi-node-subsystem-test-helpers/runtime-benchmarks",
 	"pezkuwi-node-subsystem-types/runtime-benchmarks",
 	"pezkuwi-node-subsystem/runtime-benchmarks",
 	"pezkuwi-pez-node-primitives/runtime-benchmarks",
-	"pezkuwi-primitives-test-helpers/runtime-benchmarks",
+	# "pezkuwi-primitives-test-helpers/runtime-benchmarks",
 	"pezkuwi-primitives/runtime-benchmarks",
 	"pezsp-api/runtime-benchmarks",
 	"pezsp-consensus-babe/runtime-benchmarks",
diff --git a/pezkuwi/node/network/approval-distribution/Cargo.toml b/pezkuwi/node/network/approval-distribution/Cargo.toml
index c5a9ebae..9b20255d 100644
--- a/pezkuwi/node/network/approval-distribution/Cargo.toml
+++ b/pezkuwi/node/network/approval-distribution/Cargo.toml
@@ -32,8 +32,8 @@ pezsp-application-crypto = { workspace = true, default-features = true }
 pezsp-authority-discovery = { workspace = true, default-features = true }
 pezsp-core = { features = ["std"], workspace = true, default-features = true }
 
-pezkuwi-node-subsystem-test-helpers = { workspace = true }
-pezkuwi-primitives-test-helpers = { workspace = true }
+# pezkuwi-node-subsystem-test-helpers = { workspace = true }
+# pezkuwi-primitives-test-helpers = { workspace = true }
 
 assert_matches = { workspace = true }
 rand_chacha = { workspace = true, default-features = true }
@@ -47,11 +47,11 @@ runtime-benchmarks = [
 	"gum/runtime-benchmarks",
 	"pezkuwi-node-metrics/runtime-benchmarks",
 	"pezkuwi-node-network-protocol/runtime-benchmarks",
-	"pezkuwi-node-subsystem-test-helpers/runtime-benchmarks",
+	# "pezkuwi-node-subsystem-test-helpers/runtime-benchmarks",
 	"pezkuwi-node-subsystem-util/runtime-benchmarks",
 	"pezkuwi-node-subsystem/runtime-benchmarks",
 	"pezkuwi-pez-node-primitives/runtime-benchmarks",
-	"pezkuwi-primitives-test-helpers/runtime-benchmarks",
+	# "pezkuwi-primitives-test-helpers/runtime-benchmarks",
 	"pezkuwi-primitives/runtime-benchmarks",
 	"pezsp-authority-discovery/runtime-benchmarks",
 ]
diff --git a/pezkuwi/node/network/availability-distribution/Cargo.toml b/pezkuwi/node/network/availability-distribution/Cargo.toml
index d3e3c934..d8213630 100644
--- a/pezkuwi/node/network/availability-distribution/Cargo.toml
+++ b/pezkuwi/node/network/availability-distribution/Cargo.toml
@@ -39,9 +39,9 @@ thiserror = { workspace = true }
 [dev-dependencies]
 assert_matches = { workspace = true }
 futures-timer = { workspace = true }
-pezkuwi-node-subsystem-test-helpers = { workspace = true }
-pezkuwi-primitives-test-helpers = { workspace = true }
-pezkuwi-subsystem-bench = { workspace = true }
+# pezkuwi-node-subsystem-test-helpers = { workspace = true }
+# pezkuwi-primitives-test-helpers = { workspace = true }
+# pezkuwi-subsystem-bench = { workspace = true }
 pezsp-keyring = { workspace = true, default-features = true }
 pezsp-tracing = { workspace = true, default-features = true }
 rstest = { workspace = true }
@@ -52,13 +52,13 @@ runtime-benchmarks = [
 	"gum/runtime-benchmarks",
 	"pezkuwi-erasure-coding/runtime-benchmarks",
 	"pezkuwi-node-network-protocol/runtime-benchmarks",
-	"pezkuwi-node-subsystem-test-helpers/runtime-benchmarks",
+	# "pezkuwi-node-subsystem-test-helpers/runtime-benchmarks",
 	"pezkuwi-node-subsystem-util/runtime-benchmarks",
 	"pezkuwi-node-subsystem/runtime-benchmarks",
 	"pezkuwi-pez-node-primitives/runtime-benchmarks",
-	"pezkuwi-primitives-test-helpers/runtime-benchmarks",
+	# "pezkuwi-primitives-test-helpers/runtime-benchmarks",
 	"pezkuwi-primitives/runtime-benchmarks",
-	"pezkuwi-subsystem-bench/runtime-benchmarks",
+	# "pezkuwi-subsystem-bench/runtime-benchmarks",
 	"pezsc-network/runtime-benchmarks",
 	"pezsp-keyring/runtime-benchmarks",
 ]
diff --git a/pezkuwi/node/network/availability-recovery/Cargo.toml b/pezkuwi/node/network/availability-recovery/Cargo.toml
index 7b1ef9cf..48eb58b7 100644
--- a/pezkuwi/node/network/availability-recovery/Cargo.toml
+++ b/pezkuwi/node/network/availability-recovery/Cargo.toml
@@ -46,9 +46,9 @@ pezsp-core = { workspace = true, default-features = true }
 pezsp-keyring = { workspace = true, default-features = true }
 pezsp-tracing = { workspace = true, default-features = true }
 
-pezkuwi-node-subsystem-test-helpers = { workspace = true }
-pezkuwi-primitives-test-helpers = { workspace = true }
-pezkuwi-subsystem-bench = { workspace = true }
+# pezkuwi-node-subsystem-test-helpers = { workspace = true }
+# pezkuwi-primitives-test-helpers = { workspace = true }
+# pezkuwi-subsystem-bench = { workspace = true }
 
 [features]
 subsystem-benchmarks = []
@@ -56,13 +56,13 @@ runtime-benchmarks = [
 	"gum/runtime-benchmarks",
 	"pezkuwi-erasure-coding/runtime-benchmarks",
 	"pezkuwi-node-network-protocol/runtime-benchmarks",
-	"pezkuwi-node-subsystem-test-helpers/runtime-benchmarks",
+	# "pezkuwi-node-subsystem-test-helpers/runtime-benchmarks",
 	"pezkuwi-node-subsystem-util/runtime-benchmarks",
 	"pezkuwi-node-subsystem/runtime-benchmarks",
 	"pezkuwi-pez-node-primitives/runtime-benchmarks",
-	"pezkuwi-primitives-test-helpers/runtime-benchmarks",
+	# "pezkuwi-primitives-test-helpers/runtime-benchmarks",
 	"pezkuwi-primitives/runtime-benchmarks",
-	"pezkuwi-subsystem-bench/runtime-benchmarks",
+	# "pezkuwi-subsystem-bench/runtime-benchmarks",
 	"pezsc-network/runtime-benchmarks",
 	"pezsp-keyring/runtime-benchmarks",
 ]
diff --git a/pezkuwi/node/network/bitfield-distribution/Cargo.toml b/pezkuwi/node/network/bitfield-distribution/Cargo.toml
index 0cddb7f7..3b7f4a03 100644
--- a/pezkuwi/node/network/bitfield-distribution/Cargo.toml
+++ b/pezkuwi/node/network/bitfield-distribution/Cargo.toml
@@ -26,7 +26,7 @@ rand = { workspace = true, default-features = true }
 assert_matches = { workspace = true }
 bitvec = { features = ["alloc"], workspace = true }
 maplit = { workspace = true }
-pezkuwi-node-subsystem-test-helpers = { workspace = true }
+# pezkuwi-node-subsystem-test-helpers = { workspace = true }
 pezsp-application-crypto = { workspace = true, default-features = true }
 pezsp-authority-discovery = { workspace = true, default-features = true }
 pezsp-core = { workspace = true, default-features = true }
@@ -39,7 +39,7 @@ rand_chacha = { workspace = true, default-features = true }
 runtime-benchmarks = [
 	"gum/runtime-benchmarks",
 	"pezkuwi-node-network-protocol/runtime-benchmarks",
-	"pezkuwi-node-subsystem-test-helpers/runtime-benchmarks",
+	# "pezkuwi-node-subsystem-test-helpers/runtime-benchmarks",
 	"pezkuwi-node-subsystem-util/runtime-benchmarks",
 	"pezkuwi-node-subsystem/runtime-benchmarks",
 	"pezkuwi-primitives/runtime-benchmarks",
diff --git a/pezkuwi/node/network/bridge/Cargo.toml b/pezkuwi/node/network/bridge/Cargo.toml
index 0f4e27c3..86179f35 100644
--- a/pezkuwi/node/network/bridge/Cargo.toml
+++ b/pezkuwi/node/network/bridge/Cargo.toml
@@ -33,9 +33,9 @@ thiserror = { workspace = true }
 [dev-dependencies]
 assert_matches = { workspace = true }
 futures-timer = { workspace = true }
-pezkuwi-node-subsystem-test-helpers = { workspace = true }
+# pezkuwi-node-subsystem-test-helpers = { workspace = true }
 pezkuwi-node-subsystem-util = { workspace = true, default-features = true }
-pezkuwi-primitives-test-helpers = { workspace = true }
+# pezkuwi-primitives-test-helpers = { workspace = true }
 pezsp-core = { workspace = true, default-features = true }
 pezsp-keyring = { workspace = true, default-features = true }
 
@@ -44,11 +44,11 @@ runtime-benchmarks = [
 	"gum/runtime-benchmarks",
 	"pezkuwi-node-metrics/runtime-benchmarks",
 	"pezkuwi-node-network-protocol/runtime-benchmarks",
-	"pezkuwi-node-subsystem-test-helpers/runtime-benchmarks",
+	# "pezkuwi-node-subsystem-test-helpers/runtime-benchmarks",
 	"pezkuwi-node-subsystem-util/runtime-benchmarks",
 	"pezkuwi-node-subsystem/runtime-benchmarks",
 	"pezkuwi-overseer/runtime-benchmarks",
-	"pezkuwi-primitives-test-helpers/runtime-benchmarks",
+	# "pezkuwi-primitives-test-helpers/runtime-benchmarks",
 	"pezkuwi-primitives/runtime-benchmarks",
 	"pezsc-network/runtime-benchmarks",
 	"pezsp-consensus/runtime-benchmarks",
diff --git a/pezkuwi/node/network/collator-protocol/Cargo.toml b/pezkuwi/node/network/collator-protocol/Cargo.toml
index 925a29f2..5e71bb86 100644
--- a/pezkuwi/node/network/collator-protocol/Cargo.toml
+++ b/pezkuwi/node/network/collator-protocol/Cargo.toml
@@ -51,8 +51,8 @@ pezsp-core = { features = ["std"], workspace = true, default-features = true }
 pezsp-keyring = { workspace = true, default-features = true }
 
 itertools = { workspace = true }
-pezkuwi-node-subsystem-test-helpers = { workspace = true }
-pezkuwi-primitives-test-helpers = { workspace = true }
+# pezkuwi-node-subsystem-test-helpers = { workspace = true }
+# pezkuwi-primitives-test-helpers = { workspace = true }
 
 [features]
 default = []
@@ -60,11 +60,11 @@ experimental-collator-protocol = ["async-trait", "tokio"]
 runtime-benchmarks = [
 	"gum/runtime-benchmarks",
 	"pezkuwi-node-network-protocol/runtime-benchmarks",
-	"pezkuwi-node-subsystem-test-helpers/runtime-benchmarks",
+	# "pezkuwi-node-subsystem-test-helpers/runtime-benchmarks",
 	"pezkuwi-node-subsystem-util/runtime-benchmarks",
 	"pezkuwi-node-subsystem/runtime-benchmarks",
 	"pezkuwi-pez-node-primitives/runtime-benchmarks",
-	"pezkuwi-primitives-test-helpers/runtime-benchmarks",
+	# "pezkuwi-primitives-test-helpers/runtime-benchmarks",
 	"pezkuwi-primitives/runtime-benchmarks",
 	"pezsc-network/runtime-benchmarks",
 	"pezsp-keyring/runtime-benchmarks",
diff --git a/pezkuwi/node/network/dispute-distribution/Cargo.toml b/pezkuwi/node/network/dispute-distribution/Cargo.toml
index d722b029..18090d27 100644
--- a/pezkuwi/node/network/dispute-distribution/Cargo.toml
+++ b/pezkuwi/node/network/dispute-distribution/Cargo.toml
@@ -33,8 +33,8 @@ thiserror = { workspace = true }
 assert_matches = { workspace = true }
 async-channel = { workspace = true }
 async-trait = { workspace = true }
-pezkuwi-node-subsystem-test-helpers = { workspace = true }
-pezkuwi-primitives-test-helpers = { workspace = true }
+# pezkuwi-node-subsystem-test-helpers = { workspace = true }
+# pezkuwi-primitives-test-helpers = { workspace = true }
 pezsc-keystore = { workspace = true, default-features = true }
 pezsp-keyring = { workspace = true, default-features = true }
 pezsp-tracing = { workspace = true, default-features = true }
@@ -43,11 +43,11 @@ pezsp-tracing = { workspace = true, default-features = true }
 runtime-benchmarks = [
 	"gum/runtime-benchmarks",
 	"pezkuwi-node-network-protocol/runtime-benchmarks",
-	"pezkuwi-node-subsystem-test-helpers/runtime-benchmarks",
+	# "pezkuwi-node-subsystem-test-helpers/runtime-benchmarks",
 	"pezkuwi-node-subsystem-util/runtime-benchmarks",
 	"pezkuwi-node-subsystem/runtime-benchmarks",
 	"pezkuwi-pez-node-primitives/runtime-benchmarks",
-	"pezkuwi-primitives-test-helpers/runtime-benchmarks",
+	# "pezkuwi-primitives-test-helpers/runtime-benchmarks",
 	"pezkuwi-primitives/runtime-benchmarks",
 	"pezsc-network/runtime-benchmarks",
 	"pezsp-keyring/runtime-benchmarks",
diff --git a/pezkuwi/node/network/gossip-support/Cargo.toml b/pezkuwi/node/network/gossip-support/Cargo.toml
index da8bdc77..eb064b3a 100644
--- a/pezkuwi/node/network/gossip-support/Cargo.toml
+++ b/pezkuwi/node/network/gossip-support/Cargo.toml
@@ -36,7 +36,7 @@ pezsp-consensus-babe = { workspace = true, default-features = true }
 pezsp-keyring = { workspace = true, default-features = true }
 pezsp-tracing = { workspace = true, default-features = true }
 
-pezkuwi-node-subsystem-test-helpers = { workspace = true }
+# pezkuwi-node-subsystem-test-helpers = { workspace = true }
 
 assert_matches = { workspace = true }
 async-trait = { workspace = true }
@@ -47,7 +47,7 @@ quickcheck = { workspace = true, default-features = true }
 runtime-benchmarks = [
 	"gum/runtime-benchmarks",
 	"pezkuwi-node-network-protocol/runtime-benchmarks",
-	"pezkuwi-node-subsystem-test-helpers/runtime-benchmarks",
+	# "pezkuwi-node-subsystem-test-helpers/runtime-benchmarks",
 	"pezkuwi-node-subsystem-util/runtime-benchmarks",
 	"pezkuwi-node-subsystem/runtime-benchmarks",
 	"pezkuwi-primitives/runtime-benchmarks",
diff --git a/pezkuwi/node/network/statement-distribution/Cargo.toml b/pezkuwi/node/network/statement-distribution/Cargo.toml
index 8a374efe..13e87fc9 100644
--- a/pezkuwi/node/network/statement-distribution/Cargo.toml
+++ b/pezkuwi/node/network/statement-distribution/Cargo.toml
@@ -36,10 +36,10 @@ thiserror = { workspace = true }
 [dev-dependencies]
 assert_matches = { workspace = true }
 async-channel = { workspace = true }
-pezkuwi-node-subsystem-test-helpers = { workspace = true }
+# pezkuwi-node-subsystem-test-helpers = { workspace = true }
 pezkuwi-primitives = { workspace = true, features = ["test"] }
-pezkuwi-primitives-test-helpers = { workspace = true }
-pezkuwi-subsystem-bench = { workspace = true }
+# pezkuwi-primitives-test-helpers = { workspace = true }
+# pezkuwi-subsystem-bench = { workspace = true }
 pezsc-keystore = { workspace = true, default-features = true }
 pezsc-network = { workspace = true, default-features = true }
 pezsp-application-crypto = { workspace = true, default-features = true }
@@ -55,13 +55,13 @@ subsystem-benchmarks = []
 runtime-benchmarks = [
 	"gum/runtime-benchmarks",
 	"pezkuwi-node-network-protocol/runtime-benchmarks",
-	"pezkuwi-node-subsystem-test-helpers/runtime-benchmarks",
+	# "pezkuwi-node-subsystem-test-helpers/runtime-benchmarks",
 	"pezkuwi-node-subsystem-util/runtime-benchmarks",
 	"pezkuwi-node-subsystem/runtime-benchmarks",
 	"pezkuwi-pez-node-primitives/runtime-benchmarks",
-	"pezkuwi-primitives-test-helpers/runtime-benchmarks",
+	# "pezkuwi-primitives-test-helpers/runtime-benchmarks",
 	"pezkuwi-primitives/runtime-benchmarks",
-	"pezkuwi-subsystem-bench/runtime-benchmarks",
+	# "pezkuwi-subsystem-bench/runtime-benchmarks",
 	"pezsc-network/runtime-benchmarks",
 	"pezsp-authority-discovery/runtime-benchmarks",
 	"pezsp-keyring/runtime-benchmarks",
diff --git a/pezkuwi/node/service/Cargo.toml b/pezkuwi/node/service/Cargo.toml
index 8640051a..5aab656c 100644
--- a/pezkuwi/node/service/Cargo.toml
+++ b/pezkuwi/node/service/Cargo.toml
@@ -139,9 +139,9 @@ xcm-runtime-pezapis = { workspace = true, default-features = true }
 
 [dev-dependencies]
 assert_matches = { workspace = true }
-pezkuwi-node-subsystem-test-helpers = { workspace = true }
-pezkuwi-primitives-test-helpers = { workspace = true }
-pezkuwi-test-client = { workspace = true }
+# pezkuwi-node-subsystem-test-helpers = { workspace = true }
+# pezkuwi-primitives-test-helpers = { workspace = true }
+# pezkuwi-test-client = { workspace = true }
 pezsp-tracing = { workspace = true }
 tempfile = { workspace = true }
 
@@ -229,18 +229,18 @@ runtime-benchmarks = [
 	"pezkuwi-node-core-runtime-api?/runtime-benchmarks",
 	"pezkuwi-node-core-teyrchains-inherent/runtime-benchmarks",
 	"pezkuwi-node-network-protocol/runtime-benchmarks",
-	"pezkuwi-node-subsystem-test-helpers/runtime-benchmarks",
+	# "pezkuwi-node-subsystem-test-helpers/runtime-benchmarks",
 	"pezkuwi-node-subsystem-types/runtime-benchmarks",
 	"pezkuwi-node-subsystem-util/runtime-benchmarks",
 	"pezkuwi-node-subsystem/runtime-benchmarks",
 	"pezkuwi-overseer/runtime-benchmarks",
 	"pezkuwi-pez-node-primitives/runtime-benchmarks",
-	"pezkuwi-primitives-test-helpers/runtime-benchmarks",
+	# "pezkuwi-primitives-test-helpers/runtime-benchmarks",
 	"pezkuwi-primitives/runtime-benchmarks",
 	"pezkuwi-rpc/runtime-benchmarks",
 	"pezkuwi-runtime-teyrchains/runtime-benchmarks",
 	"pezkuwi-statement-distribution?/runtime-benchmarks",
-	"pezkuwi-test-client/runtime-benchmarks",
+	# "pezkuwi-test-client/runtime-benchmarks",
 	"pezkuwichain-runtime-constants?/runtime-benchmarks",
 	"pezkuwichain-runtime?/runtime-benchmarks",
 	"pezmmr-gadget/runtime-benchmarks",
diff --git a/pezkuwi/node/subsystem-util/Cargo.toml b/pezkuwi/node/subsystem-util/Cargo.toml
index dc1b8839..676e113b 100644
--- a/pezkuwi/node/subsystem-util/Cargo.toml
+++ b/pezkuwi/node/subsystem-util/Cargo.toml
@@ -44,8 +44,8 @@ parity-db = { workspace = true }
 assert_matches = { workspace = true }
 futures = { features = ["thread-pool"], workspace = true }
 kvdb-shared-tests = { workspace = true }
-pezkuwi-node-subsystem-test-helpers = { workspace = true }
-pezkuwi-primitives-test-helpers = { workspace = true }
+# pezkuwi-node-subsystem-test-helpers = { workspace = true }
+# pezkuwi-primitives-test-helpers = { workspace = true }
 tempfile = { workspace = true }
 
 [features]
@@ -54,11 +54,11 @@ runtime-benchmarks = [
 	"pezkuwi-erasure-coding/runtime-benchmarks",
 	"pezkuwi-node-metrics/runtime-benchmarks",
 	"pezkuwi-node-network-protocol/runtime-benchmarks",
-	"pezkuwi-node-subsystem-test-helpers/runtime-benchmarks",
+	# "pezkuwi-node-subsystem-test-helpers/runtime-benchmarks",
 	"pezkuwi-node-subsystem-types/runtime-benchmarks",
 	"pezkuwi-node-subsystem/runtime-benchmarks",
 	"pezkuwi-overseer/runtime-benchmarks",
 	"pezkuwi-pez-node-primitives/runtime-benchmarks",
-	"pezkuwi-primitives-test-helpers/runtime-benchmarks",
+	# "pezkuwi-primitives-test-helpers/runtime-benchmarks",
 	"pezkuwi-primitives/runtime-benchmarks",
 ]
diff --git a/pezkuwi/runtime/pezkuwichain/bridge-primitives/Cargo.toml b/pezkuwi/runtime/pezkuwichain/bridge-primitives/Cargo.toml
index e908ba24..c9329a35 100644
--- a/pezkuwi/runtime/pezkuwichain/bridge-primitives/Cargo.toml
+++ b/pezkuwi/runtime/pezkuwichain/bridge-primitives/Cargo.toml
@@ -1,5 +1,5 @@
 [package]
-name = "bp-pezkuwichain"
+name = "pezbp-pezkuwichain"
 description = "Primitives of Pezkuwichain runtime."
 version = "0.6.0"
 authors.workspace = true
@@ -17,8 +17,8 @@ workspace = true
 
 [dependencies]
 # Bridge Dependencies
-bp-header-pez-chain = { workspace = true }
-bp-pezkuwi-core = { workspace = true }
+pezbp-header-pez-chain = { workspace = true }
+pezbp-pezkuwi-core = { workspace = true }
 pezbp-runtime = { workspace = true }
 
 # Bizinikiwi Based Dependencies
@@ -29,16 +29,16 @@ pezsp-std = { workspace = true }
 [features]
 default = ["std"]
 std = [
-	"bp-header-pez-chain/std",
-	"bp-pezkuwi-core/std",
+	"pezbp-header-pez-chain/std",
+	"pezbp-pezkuwi-core/std",
 	"pezbp-runtime/std",
 	"pezframe-support/std",
 	"pezsp-api/std",
 	"pezsp-std/std",
 ]
 runtime-benchmarks = [
-	"bp-header-pez-chain/runtime-benchmarks",
-	"bp-pezkuwi-core/runtime-benchmarks",
+	"pezbp-header-pez-chain/runtime-benchmarks",
+	"pezbp-pezkuwi-core/runtime-benchmarks",
 	"pezbp-runtime/runtime-benchmarks",
 	"pezframe-support/runtime-benchmarks",
 	"pezsp-api/runtime-benchmarks",
diff --git a/pezkuwi/runtime/pezkuwichain/bridge-primitives/src/lib.rs b/pezkuwi/runtime/pezkuwichain/bridge-primitives/src/lib.rs
index 0a344a3e..d9ca6be8 100644
--- a/pezkuwi/runtime/pezkuwichain/bridge-primitives/src/lib.rs
+++ b/pezkuwi/runtime/pezkuwichain/bridge-primitives/src/lib.rs
@@ -18,9 +18,9 @@
 #![warn(missing_docs)]
 #![cfg_attr(not(feature = "std"), no_std)]
 
-pub use bp_pezkuwi_core::*;
+pub use pezbp_pezkuwi_core::*;
 
-use bp_header_pez_chain::ChainWithGrandpa;
+use pezbp_header_pez_chain::ChainWithGrandpa;
 use pezbp_runtime::{decl_bridge_finality_runtime_apis, Chain, ChainId};
 use pezframe_support::{pezsp_runtime::StateVersion, weights::Weight};
 
@@ -61,7 +61,7 @@ impl ChainWithGrandpa for Pezkuwichain {
 }
 
 // The TransactionExtension used by Pezkuwichain.
-pub use bp_pezkuwi_core::CommonTransactionExtension as TransactionExtension;
+pub use pezbp_pezkuwi_core::CommonTransactionExtension as TransactionExtension;
 
 /// Name of the teyrchains pezpallet in the Pezkuwichain runtime.
 pub const PARAS_PALLET_NAME: &str = "Paras";
@@ -71,7 +71,7 @@ pub const WITH_PEZKUWICHAIN_GRANDPA_PALLET_NAME: &str = "BridgePezkuwichainGrand
 /// Name of the With-Pezkuwichain teyrchains pezpallet instance that is deployed at bridged chains.
 pub const WITH_PEZKUWICHAIN_BRIDGE_TEYRCHAINS_PALLET_NAME: &str = "BridgePezkuwichainTeyrchains";
 
-/// Maximal size of encoded `bp_teyrchains::ParaStoredHeaderData` structure among all Pezkuwichain
+/// Maximal size of encoded `pezbp_teyrchains::ParaStoredHeaderData` structure among all Pezkuwichain
 /// teyrchains.
 ///
 /// It includes the block number and state root, so it shall be near 40 bytes, but let's have some
diff --git a/pezkuwi/runtime/zagros/bridge-primitives/Cargo.toml b/pezkuwi/runtime/zagros/bridge-primitives/Cargo.toml
index 27751a3d..808cc044 100644
--- a/pezkuwi/runtime/zagros/bridge-primitives/Cargo.toml
+++ b/pezkuwi/runtime/zagros/bridge-primitives/Cargo.toml
@@ -1,5 +1,5 @@
 [package]
-name = "bp-zagros"
+name = "pezbp-zagros"
 description = "Primitives of Zagros runtime."
 version = "0.3.0"
 authors.workspace = true
@@ -17,8 +17,8 @@ workspace = true
 
 [dependencies]
 # Bridge Dependencies
-bp-header-pez-chain = { workspace = true }
-bp-pezkuwi-core = { workspace = true }
+pezbp-header-pez-chain = { workspace = true }
+pezbp-pezkuwi-core = { workspace = true }
 pezbp-runtime = { workspace = true }
 
 # Bizinikiwi Based Dependencies
@@ -29,16 +29,16 @@ pezsp-std = { workspace = true }
 [features]
 default = ["std"]
 std = [
-	"bp-header-pez-chain/std",
-	"bp-pezkuwi-core/std",
+	"pezbp-header-pez-chain/std",
+	"pezbp-pezkuwi-core/std",
 	"pezbp-runtime/std",
 	"pezframe-support/std",
 	"pezsp-api/std",
 	"pezsp-std/std",
 ]
 runtime-benchmarks = [
-	"bp-header-pez-chain/runtime-benchmarks",
-	"bp-pezkuwi-core/runtime-benchmarks",
+	"pezbp-header-pez-chain/runtime-benchmarks",
+	"pezbp-pezkuwi-core/runtime-benchmarks",
 	"pezbp-runtime/runtime-benchmarks",
 	"pezframe-support/runtime-benchmarks",
 	"pezsp-api/runtime-benchmarks",
diff --git a/pezkuwi/runtime/zagros/bridge-primitives/src/lib.rs b/pezkuwi/runtime/zagros/bridge-primitives/src/lib.rs
index 93ff687b..fd1886fa 100644
--- a/pezkuwi/runtime/zagros/bridge-primitives/src/lib.rs
+++ b/pezkuwi/runtime/zagros/bridge-primitives/src/lib.rs
@@ -18,9 +18,9 @@
 #![warn(missing_docs)]
 #![cfg_attr(not(feature = "std"), no_std)]
 
-pub use bp_pezkuwi_core::*;
+pub use pezbp_pezkuwi_core::*;
 
-use bp_header_pez_chain::ChainWithGrandpa;
+use pezbp_header_pez_chain::ChainWithGrandpa;
 use pezbp_runtime::{decl_bridge_finality_runtime_apis, Chain, ChainId};
 use pezframe_support::{pezsp_runtime::StateVersion, weights::Weight};
 
@@ -61,7 +61,7 @@ impl ChainWithGrandpa for Zagros {
 }
 
 // The TransactionExtension used by Zagros.
-pub use bp_pezkuwi_core::CommonTransactionExtension as TransactionExtension;
+pub use pezbp_pezkuwi_core::CommonTransactionExtension as TransactionExtension;
 
 /// Name of the teyrchains pezpallet in the Pezkuwichain runtime.
 pub const PARAS_PALLET_NAME: &str = "Paras";
@@ -71,7 +71,7 @@ pub const WITH_ZAGROS_GRANDPA_PALLET_NAME: &str = "BridgeZagrosGrandpa";
 /// Name of the With-Zagros teyrchains pezpallet instance that is deployed at bridged chains.
 pub const WITH_ZAGROS_BRIDGE_TEYRCHAINS_PALLET_NAME: &str = "BridgeZagrosTeyrchains";
 
-/// Maximal size of encoded `bp_teyrchains::ParaStoredHeaderData` structure among all Zagros
+/// Maximal size of encoded `pezbp_teyrchains::ParaStoredHeaderData` structure among all Zagros
 /// teyrchains.
 ///
 /// It includes the block number and state root, so it shall be near 40 bytes, but let's have some
diff --git a/pezkuwi/xcm/docs/Cargo.toml b/pezkuwi/xcm/docs/Cargo.toml
index 81dcd49d..2c1ffaca 100644
--- a/pezkuwi/xcm/docs/Cargo.toml
+++ b/pezkuwi/xcm/docs/Cargo.toml
@@ -20,7 +20,9 @@ xcm-pez-simulator = { workspace = true, default-features = true }
 
 # For building FRAME runtimes
 codec = { workspace = true, default-features = true }
-frame = { features = ["runtime"], workspace = true, default-features = true }
+pezframe = { features = ["runtime"], workspace = true, default-features = true }
+pezframe-support = { workspace = true, default-features = true }
+pezframe-system = { workspace = true, default-features = true }
 pezkuwi-runtime-teyrchains = { workspace = true, default-features = true }
 pezsp-io = { workspace = true, default-features = true }
 pezsp-runtime = { workspace = true, default-features = true }
@@ -39,7 +41,9 @@ test-log = { workspace = true }
 
 [features]
 runtime-benchmarks = [
-	"frame/runtime-benchmarks",
+	"pezframe/runtime-benchmarks",
+	"pezframe-support/runtime-benchmarks",
+	"pezframe-system/runtime-benchmarks",
 	"pezkuwi-runtime-teyrchains/runtime-benchmarks",
 	"pezpallet-balances/runtime-benchmarks",
 	"pezpallet-message-queue/runtime-benchmarks",
diff --git a/pezkuwi/xcm/docs/src/cookbook/relay_token_transactor/network.rs b/pezkuwi/xcm/docs/src/cookbook/relay_token_transactor/network.rs
index cd1734b0..44e3b077 100644
--- a/pezkuwi/xcm/docs/src/cookbook/relay_token_transactor/network.rs
+++ b/pezkuwi/xcm/docs/src/cookbook/relay_token_transactor/network.rs
@@ -17,7 +17,7 @@
 
 //! Mock network
 
-use frame::deps::{
+use pezframe::deps::{
 	pezframe_system,
 	pezsp_io::TestExternalities,
 	pezsp_runtime::{AccountId32, BuildStorage},
@@ -66,7 +66,7 @@ pub fn para_ext() -> TestExternalities {
 	use teyrchain::{MessageQueue, Runtime, System};
 
 	let t = pezframe_system::GenesisConfig::<Runtime>::default().build_storage().unwrap();
-	let mut ext = frame::deps::pezsp_io::TestExternalities::new(t);
+	let mut ext = pezframe::deps::pezsp_io::TestExternalities::new(t);
 	ext.execute_with(|| {
 		System::set_block_number(1);
 		MessageQueue::set_para_id(2222.into());
diff --git a/pezkuwi/xcm/docs/src/cookbook/relay_token_transactor/relay_chain/mod.rs b/pezkuwi/xcm/docs/src/cookbook/relay_token_transactor/relay_chain/mod.rs
index c1f8c713..cfa61cfa 100644
--- a/pezkuwi/xcm/docs/src/cookbook/relay_token_transactor/relay_chain/mod.rs
+++ b/pezkuwi/xcm/docs/src/cookbook/relay_token_transactor/relay_chain/mod.rs
@@ -17,7 +17,7 @@
 
 //! Relay chain runtime mock.
 
-use frame::{
+use pezframe::{
 	deps::{pezframe_support::weights::WeightMeter, pezsp_runtime::AccountId32},
 	prelude::*,
 	runtime::prelude::*,
diff --git a/pezkuwi/xcm/docs/src/cookbook/relay_token_transactor/relay_chain/xcm_config.rs b/pezkuwi/xcm/docs/src/cookbook/relay_token_transactor/relay_chain/xcm_config.rs
index a3c475cc..a1ba970e 100644
--- a/pezkuwi/xcm/docs/src/cookbook/relay_token_transactor/relay_chain/xcm_config.rs
+++ b/pezkuwi/xcm/docs/src/cookbook/relay_token_transactor/relay_chain/xcm_config.rs
@@ -17,7 +17,7 @@
 
 //! Relay chain XCM configuration
 
-use frame::{
+use pezframe::{
 	deps::pezframe_system,
 	runtime::prelude::*,
 	traits::{Disabled, Everything, Nothing},
@@ -108,7 +108,7 @@ impl xcm_executor::Config for XcmConfig {
 	type SubscriptionService = ();
 	type PalletInstancesInfo = ();
 	type FeeManager = ();
-	type MaxAssetsIntoHolding = frame::traits::ConstU32<1>;
+	type MaxAssetsIntoHolding = pezframe::traits::ConstU32<1>;
 	type MessageExporter = ();
 	type UniversalAliases = Nothing;
 	type CallDispatcher = RuntimeCall;
@@ -150,8 +150,8 @@ impl pezpallet_xcm::Config for Runtime {
 	type AdminOrigin = pezframe_system::EnsureRoot<AccountId>;
 	// No locking
 	type TrustedLockers = ();
-	type MaxLockers = frame::traits::ConstU32<0>;
-	type MaxRemoteLockConsumers = frame::traits::ConstU32<0>;
+	type MaxLockers = pezframe::traits::ConstU32<0>;
+	type MaxRemoteLockConsumers = pezframe::traits::ConstU32<0>;
 	type RemoteLockConsumerIdentifier = ();
 	// How to turn locations into accounts
 	type SovereignAccountOf = LocationToAccountId;
diff --git a/pezkuwi/xcm/docs/src/cookbook/relay_token_transactor/tests.rs b/pezkuwi/xcm/docs/src/cookbook/relay_token_transactor/tests.rs
index 758eb3e6..e22b189d 100644
--- a/pezkuwi/xcm/docs/src/cookbook/relay_token_transactor/tests.rs
+++ b/pezkuwi/xcm/docs/src/cookbook/relay_token_transactor/tests.rs
@@ -15,7 +15,7 @@
 // You should have received a copy of the GNU General Public License
 // along with Pezkuwi.  If not, see <http://www.gnu.org/licenses/>.
 
-use frame::testing_prelude::*;
+use pezframe::testing_prelude::*;
 use test_log::test;
 use xcm::prelude::*;
 use xcm_executor::traits::{ConvertLocation, TransferType};
diff --git a/pezkuwi/xcm/docs/src/cookbook/relay_token_transactor/teyrchain/mod.rs b/pezkuwi/xcm/docs/src/cookbook/relay_token_transactor/teyrchain/mod.rs
index 2b874e23..15bf3c7d 100644
--- a/pezkuwi/xcm/docs/src/cookbook/relay_token_transactor/teyrchain/mod.rs
+++ b/pezkuwi/xcm/docs/src/cookbook/relay_token_transactor/teyrchain/mod.rs
@@ -17,7 +17,7 @@
 
 //! # Runtime
 
-use frame::{deps::pezframe_system, runtime::prelude::*, traits::IdentityLookup};
+use pezframe::{deps::pezframe_system, runtime::prelude::*, traits::IdentityLookup};
 use xcm_executor::XcmExecutor;
 use xcm_pez_simulator::mock_message_queue;
 
@@ -25,7 +25,7 @@ mod xcm_config;
 use xcm_config::XcmConfig;
 
 pub type Block = pezframe_system::mocking::MockBlock<Runtime>;
-pub type AccountId = frame::deps::pezsp_runtime::AccountId32;
+pub type AccountId = pezframe::deps::pezsp_runtime::AccountId32;
 pub type Balance = u64;
 
 construct_runtime! {
diff --git a/pezkuwi/xcm/docs/src/cookbook/relay_token_transactor/teyrchain/xcm_config.rs b/pezkuwi/xcm/docs/src/cookbook/relay_token_transactor/teyrchain/xcm_config.rs
index c3411ca5..5c218ba5 100644
--- a/pezkuwi/xcm/docs/src/cookbook/relay_token_transactor/teyrchain/xcm_config.rs
+++ b/pezkuwi/xcm/docs/src/cookbook/relay_token_transactor/teyrchain/xcm_config.rs
@@ -17,7 +17,7 @@
 
 //! # XCM Configuration
 
-use frame::{
+use pezframe::{
 	deps::pezframe_system,
 	runtime::prelude::*,
 	traits::{Disabled, Everything, Nothing},
@@ -135,7 +135,7 @@ impl xcm_executor::Config for XcmConfig {
 	type SubscriptionService = ();
 	type PalletInstancesInfo = ();
 	type FeeManager = ();
-	type MaxAssetsIntoHolding = frame::traits::ConstU32<1>;
+	type MaxAssetsIntoHolding = pezframe::traits::ConstU32<1>;
 	type MessageExporter = ();
 	type UniversalAliases = Nothing;
 	type CallDispatcher = RuntimeCall;
@@ -176,8 +176,8 @@ impl pezpallet_xcm::Config for Runtime {
 	type AdminOrigin = pezframe_system::EnsureRoot<AccountId>;
 	// No locking
 	type TrustedLockers = ();
-	type MaxLockers = frame::traits::ConstU32<0>;
-	type MaxRemoteLockConsumers = frame::traits::ConstU32<0>;
+	type MaxLockers = pezframe::traits::ConstU32<0>;
+	type MaxRemoteLockConsumers = pezframe::traits::ConstU32<0>;
 	type RemoteLockConsumerIdentifier = ();
 	// How to turn locations into accounts
 	type SovereignAccountOf = LocationToAccountId;
diff --git a/pezkuwi/xcm/pezpallet-xcm/Cargo.toml b/pezkuwi/xcm/pezpallet-xcm/Cargo.toml
index 7a387697..199cb76f 100644
--- a/pezkuwi/xcm/pezpallet-xcm/Cargo.toml
+++ b/pezkuwi/xcm/pezpallet-xcm/Cargo.toml
@@ -42,7 +42,7 @@ pezkuwi-runtime-teyrchains = { workspace = true, default-features = true }
 pezkuwi-teyrchain-primitives = { workspace = true, default-features = true }
 pezpallet-assets = { workspace = true, default-features = true }
 pezsp-tracing = { workspace = true, default-features = true }
-xcm-pez-simulator = { workspace = true, default-features = true }
+# xcm-pez-simulator = { workspace = true, default-features = true }
 
 [features]
 default = ["std"]
@@ -76,7 +76,7 @@ runtime-benchmarks = [
 	"pezsp-runtime/runtime-benchmarks",
 	"xcm-builder/runtime-benchmarks",
 	"xcm-executor/runtime-benchmarks",
-	"xcm-pez-simulator/runtime-benchmarks",
+	# "xcm-pez-simulator/runtime-benchmarks",
 	"xcm-runtime-pezapis/runtime-benchmarks",
 	"xcm/runtime-benchmarks",
 ]
diff --git a/pezkuwi/xcm/xcm-runtime-pezapis/Cargo.toml b/pezkuwi/xcm/xcm-runtime-pezapis/Cargo.toml
index d20c7149..34570a08 100644
--- a/pezkuwi/xcm/xcm-runtime-pezapis/Cargo.toml
+++ b/pezkuwi/xcm/xcm-runtime-pezapis/Cargo.toml
@@ -27,12 +27,12 @@ hex-literal = { workspace = true }
 pezframe-system = { workspace = true }
 pezpallet-assets = { workspace = true }
 pezpallet-balances = { workspace = true }
-pezpallet-xcm = { workspace = true }
+# pezpallet-xcm = { workspace = true }
 pezsp-io = { workspace = true }
 pezsp-tracing = { workspace = true, default-features = true }
 tracing = { workspace = true }
 xcm-builder = { workspace = true }
-xcm-pez-simulator = { workspace = true, default-features = true }
+# xcm-pez-simulator = { workspace = true, default-features = true }
 
 [features]
 default = ["std"]
@@ -42,7 +42,7 @@ std = [
 	"pezframe-system/std",
 	"pezpallet-assets/std",
 	"pezpallet-balances/std",
-	"pezpallet-xcm/std",
+	# "pezpallet-xcm/std",
 	"pezsp-api/std",
 	"pezsp-io/std",
 	"pezsp-weights/std",
@@ -57,11 +57,11 @@ runtime-benchmarks = [
 	"pezframe-system/runtime-benchmarks",
 	"pezpallet-assets/runtime-benchmarks",
 	"pezpallet-balances/runtime-benchmarks",
-	"pezpallet-xcm/runtime-benchmarks",
+	# "pezpallet-xcm/runtime-benchmarks",
 	"pezsp-api/runtime-benchmarks",
 	"pezsp-io/runtime-benchmarks",
 	"xcm-builder/runtime-benchmarks",
 	"xcm-executor/runtime-benchmarks",
-	"xcm-pez-simulator/runtime-benchmarks",
+	# "xcm-pez-simulator/runtime-benchmarks",
 	"xcm/runtime-benchmarks",
 ]
diff --git a/pezkuwi/zombienet-sdk-tests/Cargo.toml b/pezkuwi/zombienet-sdk-tests/Cargo.toml
index 8540c436..41086dde 100644
--- a/pezkuwi/zombienet-sdk-tests/Cargo.toml
+++ b/pezkuwi/zombienet-sdk-tests/Cargo.toml
@@ -31,8 +31,8 @@ serde = { workspace = true }
 serde_json = { workspace = true }
 tokio = { workspace = true, features = ["rt-multi-thread"] }
 tokio-util = { workspace = true, features = ["time"] }
-zombienet-orchestrator = { workspace = true }
-zombienet-sdk = { workspace = true }
+pezkuwi-zombienet-orchestrator = { workspace = true }
+pezkuwi-zombienet-sdk = { workspace = true }
 
 [features]
 zombie-metadata = []
diff --git a/pezkuwi/zombienet-sdk-tests/tests/disabling/slashing.rs b/pezkuwi/zombienet-sdk-tests/tests/disabling/slashing.rs
index 189150cb..6c0a1154 100644
--- a/pezkuwi/zombienet-sdk-tests/tests/disabling/slashing.rs
+++ b/pezkuwi/zombienet-sdk-tests/tests/disabling/slashing.rs
@@ -14,8 +14,8 @@ use pezkuwi_primitives::{BlockNumber, CandidateHash, DisputeState, Id as ParaId,
 use serde_json::json;
 use tokio::time::Duration;
 use tokio_util::time::FutureExt;
-use zombienet_orchestrator::network::node::LogLineCountOptions;
-use zombienet_sdk::{
+use pezkuwi_zombienet_orchestrator::network::node::LogLineCountOptions;
+use pezkuwi_zombienet_sdk::{
 	subxt::{OnlineClient, PezkuwiConfig},
 	NetworkConfigBuilder,
 };
@@ -26,7 +26,7 @@ async fn dispute_past_session_slashing() -> Result<(), anyhow::Error> {
 		env_logger::Env::default().filter_or(env_logger::DEFAULT_FILTER_ENV, "info"),
 	);
 
-	let images = zombienet_sdk::environment::get_images_from_env();
+	let images = pezkuwi_zombienet_sdk::environment::get_images_from_env();
 
 	let config = NetworkConfigBuilder::new()
 		.with_relaychain(|r| {
@@ -82,7 +82,7 @@ async fn dispute_past_session_slashing() -> Result<(), anyhow::Error> {
 			anyhow!("config errs: {errs}")
 		})?;
 
-	let spawn_fn = zombienet_sdk::environment::get_spawn_fn();
+	let spawn_fn = pezkuwi_zombienet_sdk::environment::get_spawn_fn();
 	let network = spawn_fn(config).await?;
 
 	let malus = network.get_node("malicious-backer")?;
diff --git a/pezkuwi/zombienet-sdk-tests/tests/elastic_scaling/basic_3cores.rs b/pezkuwi/zombienet-sdk-tests/tests/elastic_scaling/basic_3cores.rs
index 6b39514c..9bd16827 100644
--- a/pezkuwi/zombienet-sdk-tests/tests/elastic_scaling/basic_3cores.rs
+++ b/pezkuwi/zombienet-sdk-tests/tests/elastic_scaling/basic_3cores.rs
@@ -8,7 +8,7 @@ use anyhow::anyhow;
 use pezcumulus_zombienet_sdk_helpers::{assert_para_throughput, create_assign_core_call};
 use pezkuwi_primitives::Id as ParaId;
 use serde_json::json;
-use zombienet_sdk::{
+use pezkuwi_zombienet_sdk::{
 	subxt::{OnlineClient, PezkuwiConfig},
 	subxt_signer::sr25519::dev,
 	NetworkConfigBuilder,
@@ -20,7 +20,7 @@ async fn basic_3cores_test() -> Result<(), anyhow::Error> {
 		env_logger::Env::default().filter_or(env_logger::DEFAULT_FILTER_ENV, "info"),
 	);
 
-	let images = zombienet_sdk::environment::get_images_from_env();
+	let images = pezkuwi_zombienet_sdk::environment::get_images_from_env();
 
 	let config = NetworkConfigBuilder::new()
 		.with_relaychain(|r| {
@@ -69,7 +69,7 @@ async fn basic_3cores_test() -> Result<(), anyhow::Error> {
 			anyhow!("config errs: {errs}")
 		})?;
 
-	let spawn_fn = zombienet_sdk::environment::get_spawn_fn();
+	let spawn_fn = pezkuwi_zombienet_sdk::environment::get_spawn_fn();
 	let network = spawn_fn(config).await?;
 
 	let relay_node = network.get_node("validator-0")?;
diff --git a/pezkuwi/zombienet-sdk-tests/tests/elastic_scaling/doesnt_break_teyrchains.rs b/pezkuwi/zombienet-sdk-tests/tests/elastic_scaling/doesnt_break_teyrchains.rs
index e6eb24ea..4b84830a 100644
--- a/pezkuwi/zombienet-sdk-tests/tests/elastic_scaling/doesnt_break_teyrchains.rs
+++ b/pezkuwi/zombienet-sdk-tests/tests/elastic_scaling/doesnt_break_teyrchains.rs
@@ -12,7 +12,7 @@ use pezcumulus_zombienet_sdk_helpers::{
 use pezkuwi_primitives::{CoreIndex, Id as ParaId};
 use serde_json::json;
 use std::collections::{BTreeMap, VecDeque};
-use zombienet_sdk::{
+use pezkuwi_zombienet_sdk::{
 	subxt::{OnlineClient, PezkuwiConfig},
 	subxt_signer::sr25519::dev,
 	NetworkConfigBuilder,
@@ -24,7 +24,7 @@ async fn doesnt_break_teyrchains_test() -> Result<(), anyhow::Error> {
 		env_logger::Env::default().filter_or(env_logger::DEFAULT_FILTER_ENV, "info"),
 	);
 
-	let images = zombienet_sdk::environment::get_images_from_env();
+	let images = pezkuwi_zombienet_sdk::environment::get_images_from_env();
 
 	let config = NetworkConfigBuilder::new()
 		.with_relaychain(|r| {
@@ -66,7 +66,7 @@ async fn doesnt_break_teyrchains_test() -> Result<(), anyhow::Error> {
 			anyhow!("config errs: {errs}")
 		})?;
 
-	let spawn_fn = zombienet_sdk::environment::get_spawn_fn();
+	let spawn_fn = pezkuwi_zombienet_sdk::environment::get_spawn_fn();
 	let network = spawn_fn(config).await?;
 
 	let relay_node = network.get_node("validator-0")?;
diff --git a/pezkuwi/zombienet-sdk-tests/tests/elastic_scaling/slot_based_12cores.rs b/pezkuwi/zombienet-sdk-tests/tests/elastic_scaling/slot_based_12cores.rs
index 2b7bec1c..eb67a7c2 100644
--- a/pezkuwi/zombienet-sdk-tests/tests/elastic_scaling/slot_based_12cores.rs
+++ b/pezkuwi/zombienet-sdk-tests/tests/elastic_scaling/slot_based_12cores.rs
@@ -13,8 +13,8 @@ use pezcumulus_zombienet_sdk_helpers::{
 };
 use pezkuwi_primitives::Id as ParaId;
 use serde_json::json;
-use zombienet_orchestrator::network::node::LogLineCountOptions;
-use zombienet_sdk::{
+use pezkuwi_zombienet_orchestrator::network::node::LogLineCountOptions;
+use pezkuwi_zombienet_sdk::{
 	subxt::{OnlineClient, PezkuwiConfig},
 	subxt_signer::sr25519::dev,
 	NetworkConfigBuilder,
@@ -26,7 +26,7 @@ async fn slot_based_12cores_test() -> Result<(), anyhow::Error> {
 		env_logger::Env::default().filter_or(env_logger::DEFAULT_FILTER_ENV, "info"),
 	);
 
-	let images = zombienet_sdk::environment::get_images_from_env();
+	let images = pezkuwi_zombienet_sdk::environment::get_images_from_env();
 
 	let config = NetworkConfigBuilder::new()
 		.with_relaychain(|r| {
@@ -79,7 +79,7 @@ async fn slot_based_12cores_test() -> Result<(), anyhow::Error> {
 			anyhow!("config errs: {errs}")
 		})?;
 
-	let spawn_fn = zombienet_sdk::environment::get_spawn_fn();
+	let spawn_fn = pezkuwi_zombienet_sdk::environment::get_spawn_fn();
 	let network = spawn_fn(config).await?;
 
 	let relay_node = network.get_node("validator-0")?;
diff --git a/pezkuwi/zombienet-sdk-tests/tests/elastic_scaling/slot_based_3cores.rs b/pezkuwi/zombienet-sdk-tests/tests/elastic_scaling/slot_based_3cores.rs
index 98320326..3f717f91 100644
--- a/pezkuwi/zombienet-sdk-tests/tests/elastic_scaling/slot_based_3cores.rs
+++ b/pezkuwi/zombienet-sdk-tests/tests/elastic_scaling/slot_based_3cores.rs
@@ -11,7 +11,7 @@ use pezcumulus_zombienet_sdk_helpers::{
 };
 use pezkuwi_primitives::Id as ParaId;
 use serde_json::json;
-use zombienet_sdk::{
+use pezkuwi_zombienet_sdk::{
 	subxt::{OnlineClient, PezkuwiConfig},
 	subxt_signer::sr25519::dev,
 	NetworkConfigBuilder,
@@ -23,7 +23,7 @@ async fn slot_based_3cores_test() -> Result<(), anyhow::Error> {
 		env_logger::Env::default().filter_or(env_logger::DEFAULT_FILTER_ENV, "info"),
 	);
 
-	let images = zombienet_sdk::environment::get_images_from_env();
+	let images = pezkuwi_zombienet_sdk::environment::get_images_from_env();
 
 	let config = NetworkConfigBuilder::new()
 		.with_relaychain(|r| {
@@ -86,7 +86,7 @@ async fn slot_based_3cores_test() -> Result<(), anyhow::Error> {
 			anyhow!("config errs: {errs}")
 		})?;
 
-	let spawn_fn = zombienet_sdk::environment::get_spawn_fn();
+	let spawn_fn = pezkuwi_zombienet_sdk::environment::get_spawn_fn();
 	let network = spawn_fn(config).await?;
 
 	let relay_node = network.get_node("validator-0")?;
diff --git a/pezkuwi/zombienet-sdk-tests/tests/functional/approval_voting_coalescing.rs b/pezkuwi/zombienet-sdk-tests/tests/functional/approval_voting_coalescing.rs
index d929b76d..ae294252 100644
--- a/pezkuwi/zombienet-sdk-tests/tests/functional/approval_voting_coalescing.rs
+++ b/pezkuwi/zombienet-sdk-tests/tests/functional/approval_voting_coalescing.rs
@@ -8,7 +8,7 @@ use anyhow::anyhow;
 use pezcumulus_zombienet_sdk_helpers::{assert_finality_lag, assert_para_throughput};
 use pezkuwi_primitives::Id as ParaId;
 use serde_json::json;
-use zombienet_sdk::{
+use pezkuwi_zombienet_sdk::{
 	subxt::{OnlineClient, PezkuwiConfig},
 	NetworkConfigBuilder,
 };
@@ -19,7 +19,7 @@ async fn approval_voting_coalescing_test() -> Result<(), anyhow::Error> {
 		env_logger::Env::default().filter_or(env_logger::DEFAULT_FILTER_ENV, "info"),
 	);
 
-	let images = zombienet_sdk::environment::get_images_from_env();
+	let images = pezkuwi_zombienet_sdk::environment::get_images_from_env();
 	let no_show_slots = 4;
 	let mut config_builder = NetworkConfigBuilder::new().with_relaychain(|r| {
 		let r = r
@@ -66,7 +66,7 @@ async fn approval_voting_coalescing_test() -> Result<(), anyhow::Error> {
 		anyhow!("config errs: {errs}")
 	})?;
 
-	let spawn_fn = zombienet_sdk::environment::get_spawn_fn();
+	let spawn_fn = pezkuwi_zombienet_sdk::environment::get_spawn_fn();
 
 	log::info!("Spawning network");
 	let network = spawn_fn(config).await?;
diff --git a/pezkuwi/zombienet-sdk-tests/tests/functional/approved_peer_mixed_validators.rs b/pezkuwi/zombienet-sdk-tests/tests/functional/approved_peer_mixed_validators.rs
index 52557e81..a2e72114 100644
--- a/pezkuwi/zombienet-sdk-tests/tests/functional/approved_peer_mixed_validators.rs
+++ b/pezkuwi/zombienet-sdk-tests/tests/functional/approved_peer_mixed_validators.rs
@@ -12,8 +12,8 @@ use tokio::time::Duration;
 use pezcumulus_zombienet_sdk_helpers::{assert_finality_lag, assert_para_throughput};
 use pezkuwi_primitives::Id as ParaId;
 use serde_json::json;
-use zombienet_orchestrator::network::node::LogLineCountOptions;
-use zombienet_sdk::{
+use pezkuwi_zombienet_orchestrator::network::node::LogLineCountOptions;
+use pezkuwi_zombienet_sdk::{
 	subxt::{OnlineClient, PezkuwiConfig},
 	NetworkConfigBuilder,
 };
@@ -24,7 +24,7 @@ async fn approved_peer_mixed_validators_test() -> Result<(), anyhow::Error> {
 		env_logger::Env::default().filter_or(env_logger::DEFAULT_FILTER_ENV, "info"),
 	);
 
-	let images = zombienet_sdk::environment::get_images_from_env();
+	let images = pezkuwi_zombienet_sdk::environment::get_images_from_env();
 
 	let config = NetworkConfigBuilder::new()
 		.with_relaychain(|r| {
@@ -101,7 +101,7 @@ async fn approved_peer_mixed_validators_test() -> Result<(), anyhow::Error> {
 			anyhow!("config errs: {errs}")
 		})?;
 
-	let spawn_fn = zombienet_sdk::environment::get_spawn_fn();
+	let spawn_fn = pezkuwi_zombienet_sdk::environment::get_spawn_fn();
 	let network = spawn_fn(config).await?;
 
 	let relay_node = network.get_node("validator-0")?;
diff --git a/pezkuwi/zombienet-sdk-tests/tests/functional/async_backing_6_seconds_rate.rs b/pezkuwi/zombienet-sdk-tests/tests/functional/async_backing_6_seconds_rate.rs
index f16356cb..6091c988 100644
--- a/pezkuwi/zombienet-sdk-tests/tests/functional/async_backing_6_seconds_rate.rs
+++ b/pezkuwi/zombienet-sdk-tests/tests/functional/async_backing_6_seconds_rate.rs
@@ -8,7 +8,7 @@ use anyhow::anyhow;
 use pezcumulus_zombienet_sdk_helpers::{assert_finality_lag, assert_para_throughput};
 use pezkuwi_primitives::Id as ParaId;
 use serde_json::json;
-use zombienet_sdk::{
+use pezkuwi_zombienet_sdk::{
 	subxt::{OnlineClient, PezkuwiConfig},
 	NetworkConfigBuilder,
 };
@@ -19,7 +19,7 @@ async fn async_backing_6_seconds_rate_test() -> Result<(), anyhow::Error> {
 		env_logger::Env::default().filter_or(env_logger::DEFAULT_FILTER_ENV, "info"),
 	);
 
-	let images = zombienet_sdk::environment::get_images_from_env();
+	let images = pezkuwi_zombienet_sdk::environment::get_images_from_env();
 
 	let config = NetworkConfigBuilder::new()
 		.with_relaychain(|r| {
@@ -68,7 +68,7 @@ async fn async_backing_6_seconds_rate_test() -> Result<(), anyhow::Error> {
 			anyhow!("config errs: {errs}")
 		})?;
 
-	let spawn_fn = zombienet_sdk::environment::get_spawn_fn();
+	let spawn_fn = pezkuwi_zombienet_sdk::environment::get_spawn_fn();
 	let network = spawn_fn(config).await?;
 
 	let relay_node = network.get_node("validator-0")?;
diff --git a/pezkuwi/zombienet-sdk-tests/tests/functional/dispute_old_finalized.rs b/pezkuwi/zombienet-sdk-tests/tests/functional/dispute_old_finalized.rs
index 10a8e566..7c7abe57 100644
--- a/pezkuwi/zombienet-sdk-tests/tests/functional/dispute_old_finalized.rs
+++ b/pezkuwi/zombienet-sdk-tests/tests/functional/dispute_old_finalized.rs
@@ -22,15 +22,15 @@ use anyhow::anyhow;
 use pezcumulus_zombienet_sdk_helpers::assert_para_throughput;
 use serde_json::json;
 use tokio::time::Duration;
-use zombienet_orchestrator::network::node::LogLineCountOptions;
+use pezkuwi_zombienet_orchestrator::network::node::LogLineCountOptions;
 
 #[tokio::test(flavor = "multi_thread")]
 async fn dispute_old_finalized() -> Result<(), anyhow::Error> {
 	let _ = env_logger::try_init_from_env(
 		env_logger::Env::default().filter_or(env_logger::DEFAULT_FILTER_ENV, "info"),
 	);
-	let images = zombienet_sdk::environment::get_images_from_env();
-	let config = zombienet_sdk::NetworkConfigBuilder::new()
+	let images = pezkuwi_zombienet_sdk::environment::get_images_from_env();
+	let config = pezkuwi_zombienet_sdk::NetworkConfigBuilder::new()
 		.with_relaychain(|r| {
 			let r = r
 				.with_chain("pezkuwichain-local")
@@ -100,7 +100,7 @@ async fn dispute_old_finalized() -> Result<(), anyhow::Error> {
 			anyhow!("config errors: {errors}")
 		})?;
 
-	let spawn_fn = zombienet_sdk::environment::get_spawn_fn();
+	let spawn_fn = pezkuwi_zombienet_sdk::environment::get_spawn_fn();
 	let network = spawn_fn(config).await?;
 
 	let honest = network.get_node("honest-0")?;
diff --git a/pezkuwi/zombienet-sdk-tests/tests/functional/duplicate_collations.rs b/pezkuwi/zombienet-sdk-tests/tests/functional/duplicate_collations.rs
index 99b8ffec..f5760b7f 100644
--- a/pezkuwi/zombienet-sdk-tests/tests/functional/duplicate_collations.rs
+++ b/pezkuwi/zombienet-sdk-tests/tests/functional/duplicate_collations.rs
@@ -10,8 +10,8 @@ use tokio::time::Duration;
 use pezcumulus_zombienet_sdk_helpers::{assert_para_throughput, create_assign_core_call};
 use pezkuwi_primitives::Id as ParaId;
 use serde_json::json;
-use zombienet_orchestrator::network::node::LogLineCountOptions;
-use zombienet_sdk::{
+use pezkuwi_zombienet_orchestrator::network::node::LogLineCountOptions;
+use pezkuwi_zombienet_sdk::{
 	subxt::{OnlineClient, PezkuwiConfig},
 	subxt_signer::sr25519::dev,
 	NetworkConfigBuilder,
@@ -25,7 +25,7 @@ async fn duplicate_collations_test() -> Result<(), anyhow::Error> {
 		env_logger::Env::default().filter_or(env_logger::DEFAULT_FILTER_ENV, "info"),
 	);
 
-	let images = zombienet_sdk::environment::get_images_from_env();
+	let images = pezkuwi_zombienet_sdk::environment::get_images_from_env();
 
 	let config = NetworkConfigBuilder::new()
 		.with_relaychain(|r| {
@@ -79,7 +79,7 @@ async fn duplicate_collations_test() -> Result<(), anyhow::Error> {
 			anyhow!("config errs: {errs}")
 		})?;
 
-	let spawn_fn = zombienet_sdk::environment::get_spawn_fn();
+	let spawn_fn = pezkuwi_zombienet_sdk::environment::get_spawn_fn();
 	let network = spawn_fn(config).await?;
 
 	let relay_node = network.get_node("validator-0")?;
diff --git a/pezkuwi/zombienet-sdk-tests/tests/functional/shared_core_idle_teyrchain.rs b/pezkuwi/zombienet-sdk-tests/tests/functional/shared_core_idle_teyrchain.rs
index 29dfc9b5..b0aa7631 100644
--- a/pezkuwi/zombienet-sdk-tests/tests/functional/shared_core_idle_teyrchain.rs
+++ b/pezkuwi/zombienet-sdk-tests/tests/functional/shared_core_idle_teyrchain.rs
@@ -9,7 +9,7 @@ use anyhow::anyhow;
 use pezcumulus_zombienet_sdk_helpers::{assert_finality_lag, assert_para_throughput};
 use pezkuwi_primitives::Id as ParaId;
 use serde_json::json;
-use zombienet_sdk::{
+use pezkuwi_zombienet_sdk::{
 	subxt::{self, ext::scale_value::value, OnlineClient, PezkuwiConfig},
 	subxt_signer::sr25519::dev,
 	NetworkConfigBuilder,
@@ -21,7 +21,7 @@ async fn shared_core_idle_teyrchain_test() -> Result<(), anyhow::Error> {
 		env_logger::Env::default().filter_or(env_logger::DEFAULT_FILTER_ENV, "info"),
 	);
 
-	let images = zombienet_sdk::environment::get_images_from_env();
+	let images = pezkuwi_zombienet_sdk::environment::get_images_from_env();
 
 	let config = NetworkConfigBuilder::new()
 		.with_relaychain(|r| {
@@ -65,7 +65,7 @@ async fn shared_core_idle_teyrchain_test() -> Result<(), anyhow::Error> {
 			anyhow!("config errs: {errs}")
 		})?;
 
-	let spawn_fn = zombienet_sdk::environment::get_spawn_fn();
+	let spawn_fn = pezkuwi_zombienet_sdk::environment::get_spawn_fn();
 	let network = spawn_fn(config).await?;
 
 	let relay_node = network.get_node("validator-0")?;
diff --git a/pezkuwi/zombienet-sdk-tests/tests/functional/spam_statement_distribution_requests.rs b/pezkuwi/zombienet-sdk-tests/tests/functional/spam_statement_distribution_requests.rs
index 87da39aa..99746ccd 100644
--- a/pezkuwi/zombienet-sdk-tests/tests/functional/spam_statement_distribution_requests.rs
+++ b/pezkuwi/zombienet-sdk-tests/tests/functional/spam_statement_distribution_requests.rs
@@ -9,8 +9,8 @@ use tokio::time::Duration;
 use pezcumulus_zombienet_sdk_helpers::assert_para_throughput;
 use pezkuwi_primitives::Id as ParaId;
 use serde_json::json;
-use zombienet_orchestrator::network::node::LogLineCountOptions;
-use zombienet_sdk::{
+use pezkuwi_zombienet_orchestrator::network::node::LogLineCountOptions;
+use pezkuwi_zombienet_sdk::{
 	subxt::{OnlineClient, PezkuwiConfig},
 	NetworkConfigBuilder,
 };
@@ -21,7 +21,7 @@ async fn spam_statement_distribution_requests_test() -> Result<(), anyhow::Error
 		env_logger::Env::default().filter_or(env_logger::DEFAULT_FILTER_ENV, "info"),
 	);
 
-	let images = zombienet_sdk::environment::get_images_from_env();
+	let images = pezkuwi_zombienet_sdk::environment::get_images_from_env();
 
 	let config = NetworkConfigBuilder::new()
 		.with_relaychain(|r| {
@@ -100,7 +100,7 @@ async fn spam_statement_distribution_requests_test() -> Result<(), anyhow::Error
 			anyhow!("config errs: {errs}")
 		})?;
 
-	let spawn_fn = zombienet_sdk::environment::get_spawn_fn();
+	let spawn_fn = pezkuwi_zombienet_sdk::environment::get_spawn_fn();
 	let network = spawn_fn(config).await?;
 
 	let malus = network.get_node("malus")?;
diff --git a/pezkuwi/zombienet-sdk-tests/tests/functional/sync_backing.rs b/pezkuwi/zombienet-sdk-tests/tests/functional/sync_backing.rs
index 7013b34a..7a994ced 100644
--- a/pezkuwi/zombienet-sdk-tests/tests/functional/sync_backing.rs
+++ b/pezkuwi/zombienet-sdk-tests/tests/functional/sync_backing.rs
@@ -8,7 +8,7 @@ use anyhow::anyhow;
 use pezcumulus_zombienet_sdk_helpers::{assert_finality_lag, assert_para_throughput};
 use pezkuwi_primitives::Id as ParaId;
 use serde_json::json;
-use zombienet_sdk::{
+use pezkuwi_zombienet_sdk::{
 	subxt::{OnlineClient, PezkuwiConfig},
 	NetworkConfigBuilder,
 };
@@ -19,7 +19,7 @@ async fn sync_backing_test() -> Result<(), anyhow::Error> {
 		env_logger::Env::default().filter_or(env_logger::DEFAULT_FILTER_ENV, "info"),
 	);
 
-	let images = zombienet_sdk::environment::get_images_from_env();
+	let images = pezkuwi_zombienet_sdk::environment::get_images_from_env();
 
 	let config = NetworkConfigBuilder::new()
 		.with_relaychain(|r| {
@@ -57,7 +57,7 @@ async fn sync_backing_test() -> Result<(), anyhow::Error> {
 			anyhow!("config errs: {errs}")
 		})?;
 
-	let spawn_fn = zombienet_sdk::environment::get_spawn_fn();
+	let spawn_fn = pezkuwi_zombienet_sdk::environment::get_spawn_fn();
 	let network = spawn_fn(config).await?;
 
 	let relay_node = network.get_node("validator-0")?;
diff --git a/pezkuwi/zombienet-sdk-tests/tests/functional/validator_disabling.rs b/pezkuwi/zombienet-sdk-tests/tests/functional/validator_disabling.rs
index dabf5c12..fe39f0df 100644
--- a/pezkuwi/zombienet-sdk-tests/tests/functional/validator_disabling.rs
+++ b/pezkuwi/zombienet-sdk-tests/tests/functional/validator_disabling.rs
@@ -9,7 +9,7 @@ use pezkuwi_primitives::{
 	BlockNumber, CandidateHash, DisputeState, SessionIndex, ValidatorId, ValidatorIndex,
 };
 use serde_json::json;
-use zombienet_sdk::{
+use pezkuwi_zombienet_sdk::{
 	subxt::{OnlineClient, PezkuwiConfig},
 	NetworkConfigBuilder,
 };
@@ -19,7 +19,7 @@ async fn validator_disabling_test() -> Result<(), anyhow::Error> {
 	let _ = env_logger::try_init_from_env(
 		env_logger::Env::default().filter_or(env_logger::DEFAULT_FILTER_ENV, "info"),
 	);
-	let images = zombienet_sdk::environment::get_images_from_env();
+	let images = pezkuwi_zombienet_sdk::environment::get_images_from_env();
 	let config_builder = NetworkConfigBuilder::new()
 		.with_relaychain(|r| {
 			let r = r
@@ -80,7 +80,7 @@ async fn validator_disabling_test() -> Result<(), anyhow::Error> {
 			anyhow!("config errors: {errors}")
 		})?;
 
-	let spawn_fn = zombienet_sdk::environment::get_spawn_fn();
+	let spawn_fn = pezkuwi_zombienet_sdk::environment::get_spawn_fn();
 	log::info!("Spawning network");
 	let network = spawn_fn(config_builder).await?;
 
diff --git a/pezkuwi/zombienet-sdk-tests/tests/smoke/coretime_revenue.rs b/pezkuwi/zombienet-sdk-tests/tests/smoke/coretime_revenue.rs
index 36d85434..c3f16523 100644
--- a/pezkuwi/zombienet-sdk-tests/tests/smoke/coretime_revenue.rs
+++ b/pezkuwi/zombienet-sdk-tests/tests/smoke/coretime_revenue.rs
@@ -32,7 +32,7 @@ use pezkuwi_subxt::{events::StaticEvent, utils::AccountId32, OnlineClient, Pezku
 use serde_json::json;
 use std::{fmt::Display, sync::Arc};
 use tokio::sync::RwLock;
-use zombienet_sdk::{subxt_signer::sr25519::dev, NetworkConfigBuilder};
+use pezkuwi_zombienet_sdk::{subxt_signer::sr25519::dev, NetworkConfigBuilder};
 
 use coretime_pezkuwichain::{
 	self as coretime_api,
@@ -220,7 +220,7 @@ async fn coretime_revenue_test() -> Result<(), anyhow::Error> {
 		env_logger::Env::default().filter_or(env_logger::DEFAULT_FILTER_ENV, "info"),
 	);
 
-	let images = zombienet_sdk::environment::get_images_from_env();
+	let images = pezkuwi_zombienet_sdk::environment::get_images_from_env();
 	let config = NetworkConfigBuilder::new()
 		.with_relaychain(|r| {
 			r.with_chain("pezkuwichain-local")
@@ -246,7 +246,7 @@ async fn coretime_revenue_test() -> Result<(), anyhow::Error> {
 			anyhow!("config errs: {errs}")
 		})?;
 
-	let spawn_fn = zombienet_sdk::environment::get_spawn_fn();
+	let spawn_fn = pezkuwi_zombienet_sdk::environment::get_spawn_fn();
 	let network = spawn_fn(config).await?;
 
 	let relay_node = network.get_node("alice")?;
diff --git a/pezkuwi/zombienet-sdk-tests/tests/teyrchains/weights.rs b/pezkuwi/zombienet-sdk-tests/tests/teyrchains/weights.rs
index daaeb0b3..ed3ec2fd 100644
--- a/pezkuwi/zombienet-sdk-tests/tests/teyrchains/weights.rs
+++ b/pezkuwi/zombienet-sdk-tests/tests/teyrchains/weights.rs
@@ -20,7 +20,7 @@ use pezpallet_revive::AddressMapper;
 use pezsp_core::{H160, H256};
 use rand::Rng;
 use std::str::FromStr;
-use zombienet_sdk::{
+use pezkuwi_zombienet_sdk::{
 	subxt_signer::{
 		sr25519::{dev, Keypair},
 		SecretUri,
@@ -152,7 +152,7 @@ async fn wait_warmup_finish(collator: &NetworkNode) -> Result<(), anyhow::Error>
 }
 
 async fn setup_network() -> Result<Network<LocalFileSystem>, anyhow::Error> {
-	let images = zombienet_sdk::environment::get_images_from_env();
+	let images = pezkuwi_zombienet_sdk::environment::get_images_from_env();
 	let config = NetworkConfigBuilder::new()
 		.with_relaychain(|r| {
 			r.with_chain("zagros-local")
@@ -192,7 +192,7 @@ async fn setup_network() -> Result<Network<LocalFileSystem>, anyhow::Error> {
 			let errs = e.into_iter().map(|e| e.to_string()).collect::<Vec<_>>().join(" ");
 			anyhow!("config errs: {errs}")
 		})?;
-	let spawn_fn = zombienet_sdk::environment::get_spawn_fn();
+	let spawn_fn = pezkuwi_zombienet_sdk::environment::get_spawn_fn();
 	let network = spawn_fn(config).await?;
 
 	Ok(network)
diff --git a/templates/minimal/pezpallets/template/Cargo.toml b/templates/minimal/pezpallets/template/Cargo.toml
index 2351bbb6..fbb0c8ba 100644
--- a/templates/minimal/pezpallets/template/Cargo.toml
+++ b/templates/minimal/pezpallets/template/Cargo.toml
@@ -18,13 +18,24 @@ targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
 codec = { features = ["derive"], workspace = true }
-pezkuwi-sdk = { workspace = true, default-features = false, features = [
-	"experimental",
-	"runtime",
-] }
 scale-info = { features = ["derive"], workspace = true }
 
+# frame deps
+pezframe-benchmarking = { optional = true, workspace = true }
+pezframe-support = { workspace = true }
+pezframe-system = { workspace = true }
+
 [features]
 default = ["std"]
-std = ["codec/std", "pezkuwi-sdk/std", "scale-info/std"]
-runtime-benchmarks = ["pezkuwi-sdk/runtime-benchmarks"]
+std = [
+	"codec/std",
+	"pezframe-benchmarking?/std",
+	"pezframe-support/std",
+	"pezframe-system/std",
+	"scale-info/std",
+]
+runtime-benchmarks = [
+	"pezframe-benchmarking/runtime-benchmarks",
+	"pezframe-support/runtime-benchmarks",
+	"pezframe-system/runtime-benchmarks",
+]
diff --git a/templates/minimal/pezpallets/template/src/lib.rs b/templates/minimal/pezpallets/template/src/lib.rs
index 9e1904a4..c770e558 100644
--- a/templates/minimal/pezpallets/template/src/lib.rs
+++ b/templates/minimal/pezpallets/template/src/lib.rs
@@ -1,26 +1,23 @@
-//! A shell pezpallet built with [`frame`].
+//! A shell pezpallet built with [`pezframe`].
 //!
 //! To get started with this pezpallet, try implementing the guide in
 //! <https://docs.pezkuwichain.io/sdk/master/polkadot_sdk_docs/guides/your_first_pallet/index.html>
 
 #![cfg_attr(not(feature = "std"), no_std)]
 
-use frame::prelude::*;
-use pezkuwi_sdk::pezkuwi_sdk_frame as frame;
-
 // Re-export all pezpallet parts, this is needed to properly import the pezpallet into the runtime.
 pub use pezpallet::*;
 
-#[frame::pezpallet]
+#[pezframe_support::pezpallet]
 pub mod pezpallet {
-	use super::*;
+	use pezframe_support::pezpallet_prelude::*;
 
 	#[pezpallet::config]
-	pub trait Config: pezkuwi_sdk::pezframe_system::Config {}
+	pub trait Config: pezframe_system::Config {}
 
 	#[pezpallet::pezpallet]
 	pub struct Pezpallet<T>(_);
 
 	#[pezpallet::storage]
-	pub type Value<T> = StorageValue<Value = u32>;
+	pub type Value<T> = StorageValue<_, u32>;
 }
diff --git a/templates/minimal/runtime/Cargo.toml b/templates/minimal/runtime/Cargo.toml
index c5a112e8..f5996e06 100644
--- a/templates/minimal/runtime/Cargo.toml
+++ b/templates/minimal/runtime/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 name = "pez-minimal-template-runtime"
 description = "A solochain runtime template built with Bizinikiwi, part of Pezkuwi Sdk."
-version = "0.0.0"
+version = "0.0.1"
 license = "Unlicense"
 authors.workspace = true
 homepage.workspace = true
diff --git a/templates/minimal/runtime/src/lib.rs b/templates/minimal/runtime/src/lib.rs
index 94e8664f..8f3eba3b 100644
--- a/templates/minimal/runtime/src/lib.rs
+++ b/templates/minimal/runtime/src/lib.rs
@@ -27,8 +27,7 @@ extern crate alloc;
 
 use alloc::vec::Vec;
 use pezkuwi_sdk::{
-	pezkuwi_sdk_frame::{
-		self as frame,
+	pezframe::{
 		deps::pezsp_genesis_builder,
 		runtime::{apis, prelude::*},
 	},
@@ -211,7 +210,7 @@ impl pezpallet_transaction_payment::Config for Runtime {
 // Implements the types required for the template pezpallet.
 impl pezpallet_minimal_template::Config for Runtime {}
 
-type Block = frame::runtime::types_common::BlockOf<Runtime, TxExtension>;
+type Block = pezframe::runtime::types_common::BlockOf<Runtime, TxExtension>;
 type Header = HeaderFor<Runtime>;
 
 type RuntimeExecutive = Executive<
@@ -228,7 +227,7 @@ impl_runtime_apis! {
 			VERSION
 		}
 
-		fn execute_block(block: <Block as frame::traits::Block>::LazyBlock) {
+		fn execute_block(block: <Block as pezframe::traits::Block>::LazyBlock) {
 			RuntimeExecutive::execute_block(block)
 		}
 
@@ -264,7 +263,7 @@ impl_runtime_apis! {
 		}
 
 		fn check_inherents(
-			block: <Block as frame::traits::Block>::LazyBlock,
+			block: <Block as pezframe::traits::Block>::LazyBlock,
 			data: InherentData,
 		) -> CheckInherentsResult {
 			data.check_extrinsics(&block)
@@ -345,10 +344,10 @@ impl_runtime_apis! {
 // https://github.com/pezkuwichain/pezkuwi-sdk/issues/3
 pub mod interface {
 	use super::Runtime;
-	use pezkuwi_sdk::{pezkuwi_sdk_frame as frame, *};
+	use pezkuwi_sdk::*;
 
 	pub type Block = super::Block;
-	pub use frame::runtime::types_common::OpaqueBlock;
+	pub use pezframe::runtime::types_common::OpaqueBlock;
 	pub type AccountId = <Runtime as pezframe_system::Config>::AccountId;
 	pub type Nonce = <Runtime as pezframe_system::Config>::Nonce;
 	pub type Hash = <Runtime as pezframe_system::Config>::Hash;
diff --git a/templates/solochain/node/Cargo.toml b/templates/solochain/node/Cargo.toml
index ad639bc6..fb69e9c3 100644
--- a/templates/solochain/node/Cargo.toml
+++ b/templates/solochain/node/Cargo.toml
@@ -70,6 +70,8 @@ bizinikiwi-build-script-utils = { workspace = true, default-features = true }
 [features]
 default = ["std"]
 std = ["pez-solochain-template-runtime/std"]
+# Storage benchmarking support (optional)
+storage-benchmark = ["pezframe-benchmarking-cli/storage-benchmark"]
 # Dependencies that are only required if runtime benchmarking should be build.
 runtime-benchmarks = [
 	"bizinikiwi-frame-rpc-system/runtime-benchmarks",
diff --git a/templates/solochain/node/src/command.rs b/templates/solochain/node/src/command.rs
index 72c9c910..ae4ea248 100644
--- a/templates/solochain/node/src/command.rs
+++ b/templates/solochain/node/src/command.rs
@@ -131,12 +131,12 @@ pub fn run() -> pezsc_cli::Result<()> {
 						let PartialComponents { client, .. } = service::new_partial(&config)?;
 						cmd.run(client)
 					},
-					#[cfg(not(feature = "runtime-benchmarks"))]
+					#[cfg(all(feature = "storage-benchmark", not(feature = "runtime-benchmarks")))]
 					BenchmarkCmd::Storage(_) => Err(
 						"Storage benchmarking can be enabled with `--features runtime-benchmarks`."
 							.into(),
 					),
-					#[cfg(feature = "runtime-benchmarks")]
+					#[cfg(all(feature = "storage-benchmark", feature = "runtime-benchmarks"))]
 					BenchmarkCmd::Storage(cmd) => {
 						let PartialComponents { client, backend, .. } =
 							service::new_partial(&config)?;
diff --git a/templates/teyrchain/node/Cargo.toml b/templates/teyrchain/node/Cargo.toml
index 4573a7c6..9fec53bc 100644
--- a/templates/teyrchain/node/Cargo.toml
+++ b/templates/teyrchain/node/Cargo.toml
@@ -34,6 +34,9 @@ teyrchain-template-runtime = { workspace = true }
 # Bizinikiwi
 prometheus-endpoint = { workspace = true, default-features = true }
 
+# For storage benchmarks
+pezframe-benchmarking-cli = { workspace = true, optional = true }
+
 [build-dependencies]
 pezkuwi-sdk = { workspace = true, features = ["bizinikiwi-build-script-utils"] }
 
@@ -50,6 +53,7 @@ runtime-benchmarks = [
 	"pezsp-runtime/runtime-benchmarks",
 	"teyrchain-template-runtime/runtime-benchmarks",
 ]
+storage-benchmark = ["pezframe-benchmarking-cli/storage-benchmark"]
 try-runtime = [
 	"pezkuwi-sdk/try-runtime",
 	"pezsp-runtime/try-runtime",
diff --git a/templates/teyrchain/node/src/command.rs b/templates/teyrchain/node/src/command.rs
index 877f50fe..0bf47cf1 100644
--- a/templates/teyrchain/node/src/command.rs
+++ b/templates/teyrchain/node/src/command.rs
@@ -205,13 +205,7 @@ pub fn run() -> Result<()> {
 					let partials = new_partial(&config)?;
 					cmd.run(partials.client)
 				}),
-				#[cfg(not(feature = "runtime-benchmarks"))]
-				BenchmarkCmd::Storage(_) => Err(pezsc_cli::Error::Input(
-					"Compile with --features=runtime-benchmarks \
-						to enable storage benchmarks."
-						.into(),
-				)),
-				#[cfg(feature = "runtime-benchmarks")]
+				#[cfg(feature = "storage-benchmark")]
 				BenchmarkCmd::Storage(cmd) => runner.sync_run(|config| {
 					let partials = new_partial(&config)?;
 					let db = partials.backend.expose_db();
diff --git a/templates/teyrchain/pezpallets/template/Cargo.toml b/templates/teyrchain/pezpallets/template/Cargo.toml
index 66bda35e..5eefa357 100644
--- a/templates/teyrchain/pezpallets/template/Cargo.toml
+++ b/templates/teyrchain/pezpallets/template/Cargo.toml
@@ -20,13 +20,15 @@ targets = ["x86_64-unknown-linux-gnu"]
 codec = { features = ["derive"], workspace = true }
 scale-info = { features = ["derive"], workspace = true }
 
-frame = { workspace = true, default-features = false, features = [
+pezframe = { workspace = true, default-features = false, features = [
 	"experimental",
 	"runtime",
 ] }
+pezframe-support = { workspace = true, default-features = false }
+pezframe-system = { workspace = true, default-features = false }
 
 [features]
 default = ["std"]
-runtime-benchmarks = ["frame/runtime-benchmarks"]
-std = ["codec/std", "frame/std", "scale-info/std"]
-try-runtime = ["frame/try-runtime"]
+runtime-benchmarks = ["pezframe/runtime-benchmarks"]
+std = ["codec/std", "pezframe/std", "pezframe-support/std", "pezframe-system/std", "scale-info/std"]
+try-runtime = ["pezframe/try-runtime"]
diff --git a/templates/teyrchain/pezpallets/template/src/benchmarking.rs b/templates/teyrchain/pezpallets/template/src/benchmarking.rs
index 7e54ab51..688532b0 100644
--- a/templates/teyrchain/pezpallets/template/src/benchmarking.rs
+++ b/templates/teyrchain/pezpallets/template/src/benchmarking.rs
@@ -1,7 +1,7 @@
 //! Benchmarking setup for pezpallet-template
 
 use super::*;
-use frame::{deps::pezframe_benchmarking::v2::*, prelude::*};
+use pezframe::{deps::pezframe_benchmarking::v2::*, prelude::*};
 
 #[benchmarks]
 mod benchmarks {
diff --git a/templates/teyrchain/pezpallets/template/src/lib.rs b/templates/teyrchain/pezpallets/template/src/lib.rs
index 36792871..96a5a1bc 100644
--- a/templates/teyrchain/pezpallets/template/src/lib.rs
+++ b/templates/teyrchain/pezpallets/template/src/lib.rs
@@ -67,9 +67,9 @@ mod benchmarking;
 // To see a full list of `pezpallet` macros and their use cases, see:
 // <https://docs.pezkuwichain.io/sdk/master/pezpallet_example_kitchensink/index.html>
 // <https://docs.pezkuwichain.io/sdk/master/pezframe_support/pezpallet_macros/index.html>
-#[frame::pezpallet]
+#[pezframe::pezpallet]
 pub mod pezpallet {
-	use frame::prelude::*;
+	use pezframe::prelude::*;
 
 	/// Configure the pezpallet by specifying the parameters and types on which it depends.
 	#[pezpallet::config]
diff --git a/templates/teyrchain/pezpallets/template/src/mock.rs b/templates/teyrchain/pezpallets/template/src/mock.rs
index 599ef785..5a1d06c1 100644
--- a/templates/teyrchain/pezpallets/template/src/mock.rs
+++ b/templates/teyrchain/pezpallets/template/src/mock.rs
@@ -1,4 +1,4 @@
-use frame::{
+use pezframe::{
 	deps::{pezframe_support::weights::constants::RocksDbWeight, pezframe_system::GenesisConfig},
 	prelude::*,
 	runtime::prelude::*,
diff --git a/templates/teyrchain/pezpallets/template/src/tests.rs b/templates/teyrchain/pezpallets/template/src/tests.rs
index fb48e175..3d01d2ad 100644
--- a/templates/teyrchain/pezpallets/template/src/tests.rs
+++ b/templates/teyrchain/pezpallets/template/src/tests.rs
@@ -1,5 +1,5 @@
 use crate::{mock::*, Error, Something};
-use frame::testing_prelude::*;
+use pezframe::testing_prelude::*;
 
 #[test]
 fn it_works_for_default_value() {
diff --git a/templates/teyrchain/pezpallets/template/src/weights.rs b/templates/teyrchain/pezpallets/template/src/weights.rs
index 5ebe6333..e8f19bd9 100644
--- a/templates/teyrchain/pezpallets/template/src/weights.rs
+++ b/templates/teyrchain/pezpallets/template/src/weights.rs
@@ -29,7 +29,7 @@
 #![allow(unused_parens)]
 #![allow(unused_imports)]
 
-use frame::{deps::pezframe_support::weights::constants::RocksDbWeight, prelude::*};
+use pezframe::{deps::pezframe_support::weights::constants::RocksDbWeight, prelude::*};
 use core::marker::PhantomData;
 
 /// Weight functions needed for pezpallet_template.
diff --git a/templates/teyrchain/runtime/Cargo.toml b/templates/teyrchain/runtime/Cargo.toml
index 63a5c50c..9e322fea 100644
--- a/templates/teyrchain/runtime/Cargo.toml
+++ b/templates/teyrchain/runtime/Cargo.toml
@@ -63,9 +63,9 @@ pezkuwi-sdk = { workspace = true, default-features = false, features = [
 	"pezkuwi-runtime-common",
 	"pezkuwi-teyrchain-primitives",
 	"pezpallet-xcm",
-	"pezstaging-xcm",
-	"pezstaging-xcm-builder",
-	"pezstaging-xcm-executor",
+	"xcm",
+	"xcm-builder",
+	"xcm-executor",
 
 	"pezcumulus-pezpallet-aura-ext",
 	"pezcumulus-pezpallet-session-benchmarking",
@@ -76,7 +76,7 @@ pezkuwi-sdk = { workspace = true, default-features = false, features = [
 	"pezcumulus-primitives-core",
 	"pezcumulus-primitives-utility",
 	"pezpallet-collator-selection",
-	"pezstaging-teyrchain-info",
+	"teyrchain-info",
 	"teyrchains-common",
 
 	"runtime",
diff --git a/templates/teyrchain/runtime/src/apis.rs b/templates/teyrchain/runtime/src/apis.rs
index 9d8fac84..54701e09 100644
--- a/templates/teyrchain/runtime/src/apis.rs
+++ b/templates/teyrchain/runtime/src/apis.rs
@@ -26,7 +26,7 @@
 // External crates imports
 use alloc::vec::Vec;
 
-use pezkuwi_sdk::{pezstaging_teyrchain_info as teyrchain_info, *};
+use pezkuwi_sdk::{teyrchain_info, *};
 
 use pezcumulus_primitives_core::ParaId;
 use pezframe_support::{
diff --git a/templates/teyrchain/runtime/src/configs/mod.rs b/templates/teyrchain/runtime/src/configs/mod.rs
index e1929efc..5ee8511e 100644
--- a/templates/teyrchain/runtime/src/configs/mod.rs
+++ b/templates/teyrchain/runtime/src/configs/mod.rs
@@ -25,9 +25,9 @@
 
 mod xcm_config;
 
-use pezkuwi_sdk::{pezstaging_teyrchain_info as teyrchain_info, pezstaging_xcm as xcm, *};
+use pezkuwi_sdk::{teyrchain_info, xcm, *};
 #[cfg(not(feature = "runtime-benchmarks"))]
-use pezkuwi_sdk::{pezstaging_xcm_builder as xcm_builder, pezstaging_xcm_executor as xcm_executor};
+use pezkuwi_sdk::{xcm_builder, xcm_executor};
 
 // Bizinikiwi and Pezkuwi dependencies
 use pezcumulus_pezpallet_teyrchain_system::RelayNumberMonotonicallyIncreases;
diff --git a/templates/teyrchain/runtime/src/configs/xcm_config.rs b/templates/teyrchain/runtime/src/configs/xcm_config.rs
index 333a2cce..9e9a4e47 100644
--- a/templates/teyrchain/runtime/src/configs/xcm_config.rs
+++ b/templates/teyrchain/runtime/src/configs/xcm_config.rs
@@ -4,10 +4,7 @@ use crate::{
 	RuntimeOrigin, TeyrchainInfo, TeyrchainSystem, WeightToFee, XcmpQueue,
 };
 
-use pezkuwi_sdk::{
-	pezstaging_xcm as xcm, pezstaging_xcm_builder as xcm_builder,
-	pezstaging_xcm_executor as xcm_executor, *,
-};
+use pezkuwi_sdk::{xcm, xcm_builder, xcm_executor, *};
 
 use pezframe_support::{
 	parameter_types,
@@ -16,18 +13,15 @@ use pezframe_support::{
 };
 use pezframe_system::EnsureRoot;
 use pezkuwi_runtime_common::impls::ToAuthor;
-use pezkuwi_sdk::{
-	pezkuwi_sdk_frame::traits::Disabled,
-	pezstaging_xcm_builder::{DenyRecursively, DenyThenTry},
-};
+use pezframe_support::traits::Disabled;
 use pezkuwi_teyrchain_primitives::primitives::Sibling;
 use pezpallet_xcm::XcmPassthrough;
 use xcm::latest::prelude::*;
 use xcm_builder::{
 	AccountId32Aliases, AllowExplicitUnpaidExecutionFrom, AllowTopLevelPaidExecutionFrom,
-	DenyReserveTransferToRelayChain, EnsureXcmOrigin, FixedWeightBounds,
-	FrameTransactionalProcessor, FungibleAdapter, IsConcrete, NativeAsset, ParentIsPreset,
-	RelayChainAsNative, SiblingTeyrchainAsNative, SiblingTeyrchainConvertsVia,
+	DenyRecursively, DenyReserveTransferToRelayChain, DenyThenTry, EnsureXcmOrigin,
+	FixedWeightBounds, FrameTransactionalProcessor, FungibleAdapter, IsConcrete, NativeAsset,
+	ParentIsPreset, RelayChainAsNative, SiblingTeyrchainAsNative, SiblingTeyrchainConvertsVia,
 	SignedAccountId32AsNative, SignedToAccountId32, SovereignSignedViaLocation, TakeWeightCredit,
 	TrailingSetTopicAsId, UsingComponents, WithComputedOrigin, WithUniqueTopic,
 };
diff --git a/templates/teyrchain/runtime/src/genesis_config_presets.rs b/templates/teyrchain/runtime/src/genesis_config_presets.rs
index 7ade2229..cdc6de7e 100644
--- a/templates/teyrchain/runtime/src/genesis_config_presets.rs
+++ b/templates/teyrchain/runtime/src/genesis_config_presets.rs
@@ -5,7 +5,7 @@ use crate::{
 
 use alloc::{vec, vec::Vec};
 
-use pezkuwi_sdk::{pezstaging_xcm as xcm, *};
+use pezkuwi_sdk::{xcm, *};
 
 use pezcumulus_primitives_core::ParaId;
 use pezframe_support::build_struct_json_patch;
diff --git a/templates/teyrchain/runtime/src/lib.rs b/templates/teyrchain/runtime/src/lib.rs
index 2144d63d..9d86af94 100644
--- a/templates/teyrchain/runtime/src/lib.rs
+++ b/templates/teyrchain/runtime/src/lib.rs
@@ -17,7 +17,7 @@ extern crate alloc;
 use alloc::vec::Vec;
 use smallvec::smallvec;
 
-use pezkuwi_sdk::{pezstaging_teyrchain_info as teyrchain_info, *};
+use pezkuwi_sdk::{teyrchain_info, *};
 
 use pezsp_runtime::{
 	generic, impl_opaque_keys,
diff --git a/templates/zombienet/Cargo.toml b/templates/zombienet/Cargo.toml
index 06971f42..4f10a8bc 100644
--- a/templates/zombienet/Cargo.toml
+++ b/templates/zombienet/Cargo.toml
@@ -14,7 +14,7 @@ documentation.workspace = true
 anyhow = { workspace = true }
 env_logger = { workspace = true }
 tokio = { workspace = true, features = ["rt-multi-thread"] }
-zombienet-sdk = { workspace = true }
+pezkuwi-zombienet-sdk = { workspace = true }
 
 [features]
 zombienet = []
diff --git a/templates/zombienet/tests/smoke.rs b/templates/zombienet/tests/smoke.rs
index cc3c3038..afe5a3ee 100644
--- a/templates/zombienet/tests/smoke.rs
+++ b/templates/zombienet/tests/smoke.rs
@@ -29,7 +29,7 @@ mod smoke {
 	use std::path::PathBuf;
 
 	use anyhow::anyhow;
-	use zombienet_sdk::{NetworkConfig, NetworkConfigBuilder, NetworkConfigExt};
+	use pezkuwi_zombienet_sdk::{NetworkConfig, NetworkConfigBuilder, NetworkConfigExt};
 
 	const CHAIN_SPECS_DIR_PATH: &str = "CHAIN_SPECS_DIR";
 	const TEYRCHAIN_ID: u32 = 1000;
diff --git a/umbrella/Cargo.toml b/umbrella/Cargo.toml
index 46d9ed16..f529524f 100644
--- a/umbrella/Cargo.toml
+++ b/umbrella/Cargo.toml
@@ -1,25 +1,25 @@
 [package]
 name = "pezkuwi-sdk"
-version = "0.1.0"
-description = "Pezkuwi SDK umbrella crate."
+version = "0.1.2"
+description = "Pezkuwi SDK umbrella crate - Kurdish blockchain SDK."
 license = "Apache-2.0"
 
 [features]
 default = ["std"]
 std = [
 	"asset-test-pezutils?/std",
-	"assets-common?/std",
+	"pez-assets-common?/std",
 	"pez-binary-merkle-tree?/std",
 	"bizinikiwi-bip39?/std",
-	"bp-header-pez-chain?/std",
-	"bp-messages?/std",
-	"bp-pezkuwi-core?/std",
-	"bp-relayers?/std",
-	"bp-test-utils?/std",
-	"bp-teyrchains?/std",
-	"bp-xcm-bridge-hub-router?/std",
-	"bp-xcm-bridge-hub?/std",
-	"bridge-hub-common?/std",
+	"pezbp-header-pez-chain?/std",
+	"pezbp-messages?/std",
+	"pezbp-pezkuwi-core?/std",
+	"pezbp-relayers?/std",
+	"pezbp-test-utils?/std",
+	"pezbp-teyrchains?/std",
+	"pezbp-xcm-bridge-hub-router?/std",
+	"pezbp-xcm-bridge-hub?/std",
+	"pezbridge-hub-common?/std",
 	"pez-slot-range-helper?/std",
 	"pezbp-runtime?/std",
 	"pezbridge-hub-test-utils?/std",
@@ -57,8 +57,8 @@ std = [
 	"pezkuwi-runtime-common?/std",
 	"pezkuwi-runtime-metrics?/std",
 	"pezkuwi-runtime-teyrchains?/std",
-	"pezkuwi-sdk-frame?/std",
-	"pezsp-ss58-registry?/std",
+	"pezframe?/std",
+	"ss58-registry?/std",
 	"pezkuwi-subxt-core?/std",
 	"pezkuwi-subxt-metadata?/std",
 	"pezkuwi-subxt-signer?/std",
@@ -93,7 +93,7 @@ std = [
 	"pezpallet-collator-selection?/std",
 	"pezpallet-collective-content?/std",
 	"pezpallet-collective?/std",
-	"pezpallet-contracts-mock-network?/std",
+	# "pezpallet-contracts-mock-network?/std",  # Test-only crate
 	"pezpallet-contracts?/std",
 	"pezpallet-conviction-voting?/std",
 	"pezpallet-core-fellowship?/std",
@@ -226,10 +226,10 @@ std = [
 	"pezsp-version?/std",
 	"pezsp-wasm-interface?/std",
 	"pezsp-weights?/std",
-	"pezstaging-teyrchain-info?/std",
-	"pezstaging-xcm-builder?/std",
-	"pezstaging-xcm-executor?/std",
-	"pezstaging-xcm?/std",
+	"teyrchain-info?/std",
+	"xcm-builder?/std",
+	"xcm-executor?/std",
+	"xcm?/std",
 	"testnet-teyrchains-constants?/std",
 	"teyrchains-common?/std",
 	"teyrchains-runtimes-test-utils?/std",
@@ -237,41 +237,30 @@ std = [
 ]
 runtime-benchmarks = [
 	"asset-test-pezutils?/runtime-benchmarks",
-	"assets-common?/runtime-benchmarks",
+	"pez-assets-common?/runtime-benchmarks",
 	"pez-binary-merkle-tree?/runtime-benchmarks",
 	"bizinikiwi-frame-rpc-support?/runtime-benchmarks",
 	"bizinikiwi-frame-rpc-system?/runtime-benchmarks",
 	"bizinikiwi-rpc-client?/runtime-benchmarks",
 	"bizinikiwi-state-trie-migration-rpc?/runtime-benchmarks",
 	"bizinikiwi-wasm-builder?/runtime-benchmarks",
-	"bp-header-pez-chain?/runtime-benchmarks",
-	"bp-messages?/runtime-benchmarks",
-	"bp-pezkuwi-core?/runtime-benchmarks",
-	"bp-relayers?/runtime-benchmarks",
-	"bp-test-utils?/runtime-benchmarks",
-	"bp-teyrchains?/runtime-benchmarks",
-	"bp-xcm-bridge-hub-router?/runtime-benchmarks",
-	"bp-xcm-bridge-hub?/runtime-benchmarks",
-	"bridge-hub-common?/runtime-benchmarks",
-	"frame-remote-externalities?/runtime-benchmarks",
+	"pezbp-header-pez-chain?/runtime-benchmarks",
+	"pezbp-messages?/runtime-benchmarks",
+	"pezbp-pezkuwi-core?/runtime-benchmarks",
+	"pezbp-relayers?/runtime-benchmarks",
+	"pezbp-test-utils?/runtime-benchmarks",
+	"pezbp-teyrchains?/runtime-benchmarks",
+	"pezbp-xcm-bridge-hub-router?/runtime-benchmarks",
+	"pezbp-xcm-bridge-hub?/runtime-benchmarks",
+	"pezbridge-hub-common?/runtime-benchmarks",
+	"remote-externalities?/runtime-benchmarks",
 	"pez-generate-bags?/runtime-benchmarks",
 	"pez-slot-range-helper?/runtime-benchmarks",
 	"pez-subkey?/runtime-benchmarks",
-	"pez-tracing-gum?/runtime-benchmarks",
+	"gum?/runtime-benchmarks",
 	"pezbp-runtime?/runtime-benchmarks",
 	"pezbridge-hub-test-utils?/runtime-benchmarks",
 	"pezbridge-runtime-common?/runtime-benchmarks",
-	"pezcumulus-client-bootnodes?/runtime-benchmarks",
-	"pezcumulus-client-cli?/runtime-benchmarks",
-	"pezcumulus-client-collator?/runtime-benchmarks",
-	"pezcumulus-client-consensus-aura?/runtime-benchmarks",
-	"pezcumulus-client-consensus-common?/runtime-benchmarks",
-	"pezcumulus-client-consensus-proposer?/runtime-benchmarks",
-	"pezcumulus-client-consensus-relay-chain?/runtime-benchmarks",
-	"pezcumulus-client-network?/runtime-benchmarks",
-	"pezcumulus-client-pov-recovery?/runtime-benchmarks",
-	"pezcumulus-client-service?/runtime-benchmarks",
-	"pezcumulus-client-teyrchain-inherent?/runtime-benchmarks",
 	"pezcumulus-pezpallet-aura-ext?/runtime-benchmarks",
 	"pezcumulus-pezpallet-dmp-queue?/runtime-benchmarks",
 	"pezcumulus-pezpallet-session-benchmarking?/runtime-benchmarks",
@@ -288,11 +277,6 @@ runtime-benchmarks = [
 	"pezcumulus-primitives-teyrchain-inherent?/runtime-benchmarks",
 	"pezcumulus-primitives-timestamp?/runtime-benchmarks",
 	"pezcumulus-primitives-utility?/runtime-benchmarks",
-	"pezcumulus-relay-chain-inprocess-interface?/runtime-benchmarks",
-	"pezcumulus-relay-chain-interface?/runtime-benchmarks",
-	"pezcumulus-relay-chain-minimal-node?/runtime-benchmarks",
-	"pezcumulus-relay-chain-rpc-interface?/runtime-benchmarks",
-	"pezcumulus-relay-chain-streams?/runtime-benchmarks",
 	"pezframe-benchmarking-cli?/runtime-benchmarks",
 	"pezframe-benchmarking-pezpallet-pov?/runtime-benchmarks",
 	"pezframe-benchmarking?/runtime-benchmarks",
@@ -309,48 +293,20 @@ runtime-benchmarks = [
 	"pezkuwi-availability-bitfield-distribution?/runtime-benchmarks",
 	"pezkuwi-availability-distribution?/runtime-benchmarks",
 	"pezkuwi-availability-recovery?/runtime-benchmarks",
-	"pezkuwi-cli?/runtime-benchmarks",
 	"pezkuwi-collator-protocol?/runtime-benchmarks",
 	"pezkuwi-core-primitives?/runtime-benchmarks",
 	"pezkuwi-dispute-distribution?/runtime-benchmarks",
 	"pezkuwi-erasure-coding?/runtime-benchmarks",
 	"pezkuwi-gossip-support?/runtime-benchmarks",
 	"pezkuwi-network-bridge?/runtime-benchmarks",
-	"pezkuwi-node-collation-generation?/runtime-benchmarks",
-	"pezkuwi-node-core-approval-voting-parallel?/runtime-benchmarks",
-	"pezkuwi-node-core-approval-voting?/runtime-benchmarks",
-	"pezkuwi-node-core-av-store?/runtime-benchmarks",
-	"pezkuwi-node-core-backing?/runtime-benchmarks",
-	"pezkuwi-node-core-bitfield-signing?/runtime-benchmarks",
-	"pezkuwi-node-core-candidate-validation?/runtime-benchmarks",
-	"pezkuwi-node-core-chain-api?/runtime-benchmarks",
-	"pezkuwi-node-core-chain-selection?/runtime-benchmarks",
-	"pezkuwi-node-core-dispute-coordinator?/runtime-benchmarks",
-	"pezkuwi-node-core-prospective-teyrchains?/runtime-benchmarks",
-	"pezkuwi-node-core-provisioner?/runtime-benchmarks",
-	"pezkuwi-node-core-pvf-checker?/runtime-benchmarks",
-	"pezkuwi-node-core-pvf-common?/runtime-benchmarks",
-	"pezkuwi-node-core-pvf-execute-worker?/runtime-benchmarks",
-	"pezkuwi-node-core-pvf-prepare-worker?/runtime-benchmarks",
-	"pezkuwi-node-core-pvf?/runtime-benchmarks",
-	"pezkuwi-node-core-runtime-api?/runtime-benchmarks",
-	"pezkuwi-node-core-teyrchains-inherent?/runtime-benchmarks",
-	"pezkuwi-node-metrics?/runtime-benchmarks",
-	"pezkuwi-node-network-protocol?/runtime-benchmarks",
-	"pezkuwi-node-subsystem-types?/runtime-benchmarks",
-	"pezkuwi-node-subsystem-util?/runtime-benchmarks",
-	"pezkuwi-node-subsystem?/runtime-benchmarks",
 	"pezkuwi-omni-node-lib?/runtime-benchmarks",
-	"pezkuwi-overseer?/runtime-benchmarks",
 	"pezkuwi-pez-node-primitives?/runtime-benchmarks",
 	"pezkuwi-primitives-test-helpers?/runtime-benchmarks",
 	"pezkuwi-primitives?/runtime-benchmarks",
-	"pezkuwi-rpc?/runtime-benchmarks",
 	"pezkuwi-runtime-common?/runtime-benchmarks",
 	"pezkuwi-runtime-metrics?/runtime-benchmarks",
 	"pezkuwi-runtime-teyrchains?/runtime-benchmarks",
-	"pezkuwi-sdk-frame?/runtime-benchmarks",
-	"pezkuwi-service?/runtime-benchmarks",
+	"pezframe?/runtime-benchmarks",
 	"pezkuwi-statement-distribution?/runtime-benchmarks",
 	"pezkuwi-statement-table?/runtime-benchmarks",
 	"pezkuwi-teyrchain-primitives?/runtime-benchmarks",
@@ -386,7 +342,7 @@ runtime-benchmarks = [
 	"pezpallet-collator-selection?/runtime-benchmarks",
 	"pezpallet-collective-content?/runtime-benchmarks",
 	"pezpallet-collective?/runtime-benchmarks",
-	"pezpallet-contracts-mock-network?/runtime-benchmarks",
+	# "pezpallet-contracts-mock-network?/runtime-benchmarks",  # Test-only crate
 	"pezpallet-contracts?/runtime-benchmarks",
 	"pezpallet-conviction-voting?/runtime-benchmarks",
 	"pezpallet-core-fellowship?/runtime-benchmarks",
@@ -475,49 +431,6 @@ runtime-benchmarks = [
 	"pezpallet-xcm-bridge-hub?/runtime-benchmarks",
 	"pezpallet-xcm-precompiles?/runtime-benchmarks",
 	"pezpallet-xcm?/runtime-benchmarks",
-	"pezsc-authority-discovery?/runtime-benchmarks",
-	"pezsc-basic-authorship?/runtime-benchmarks",
-	"pezsc-block-builder?/runtime-benchmarks",
-	"pezsc-chain-spec?/runtime-benchmarks",
-	"pezsc-cli?/runtime-benchmarks",
-	"pezsc-client-api?/runtime-benchmarks",
-	"pezsc-client-db?/runtime-benchmarks",
-	"pezsc-consensus-aura?/runtime-benchmarks",
-	"pezsc-consensus-babe-rpc?/runtime-benchmarks",
-	"pezsc-consensus-babe?/runtime-benchmarks",
-	"pezsc-consensus-beefy-rpc?/runtime-benchmarks",
-	"pezsc-consensus-beefy?/runtime-benchmarks",
-	"pezsc-consensus-epochs?/runtime-benchmarks",
-	"pezsc-consensus-grandpa-rpc?/runtime-benchmarks",
-	"pezsc-consensus-grandpa?/runtime-benchmarks",
-	"pezsc-consensus-manual-seal?/runtime-benchmarks",
-	"pezsc-consensus-pow?/runtime-benchmarks",
-	"pezsc-consensus-slots?/runtime-benchmarks",
-	"pezsc-consensus?/runtime-benchmarks",
-	"pezsc-executor-wasmtime?/runtime-benchmarks",
-	"pezsc-executor?/runtime-benchmarks",
-	"pezsc-informant?/runtime-benchmarks",
-	"pezsc-mixnet?/runtime-benchmarks",
-	"pezsc-network-common?/runtime-benchmarks",
-	"pezsc-network-gossip?/runtime-benchmarks",
-	"pezsc-network-light?/runtime-benchmarks",
-	"pezsc-network-statement?/runtime-benchmarks",
-	"pezsc-network-sync?/runtime-benchmarks",
-	"pezsc-network-transactions?/runtime-benchmarks",
-	"pezsc-network?/runtime-benchmarks",
-	"pezsc-offchain?/runtime-benchmarks",
-	"pezsc-rpc-api?/runtime-benchmarks",
-	"pezsc-rpc-server?/runtime-benchmarks",
-	"pezsc-rpc-spec-v2?/runtime-benchmarks",
-	"pezsc-rpc?/runtime-benchmarks",
-	"pezsc-runtime-utilities?/runtime-benchmarks",
-	"pezsc-service?/runtime-benchmarks",
-	"pezsc-statement-store?/runtime-benchmarks",
-	"pezsc-sync-state-rpc?/runtime-benchmarks",
-	"pezsc-sysinfo?/runtime-benchmarks",
-	"pezsc-tracing?/runtime-benchmarks",
-	"pezsc-transaction-pool-api?/runtime-benchmarks",
-	"pezsc-transaction-pool?/runtime-benchmarks",
 	"pezsp-api?/runtime-benchmarks",
 	"pezsp-authority-discovery?/runtime-benchmarks",
 	"pezsp-block-builder?/runtime-benchmarks",
@@ -548,12 +461,10 @@ runtime-benchmarks = [
 	"pezsp-trie?/runtime-benchmarks",
 	"pezsp-version-proc-macro?/runtime-benchmarks",
 	"pezsp-version?/runtime-benchmarks",
-	"pezstaging-chain-spec-builder?/runtime-benchmarks",
-	"pezstaging-node-inspect?/runtime-benchmarks",
-	"pezstaging-teyrchain-info?/runtime-benchmarks",
-	"pezstaging-xcm-builder?/runtime-benchmarks",
-	"pezstaging-xcm-executor?/runtime-benchmarks",
-	"pezstaging-xcm?/runtime-benchmarks",
+	"teyrchain-info?/runtime-benchmarks",
+	"xcm-builder?/runtime-benchmarks",
+	"xcm-executor?/runtime-benchmarks",
+	"xcm?/runtime-benchmarks",
 	"testnet-teyrchains-constants?/runtime-benchmarks",
 	"teyrchains-common?/runtime-benchmarks",
 	"teyrchains-runtimes-test-utils?/runtime-benchmarks",
@@ -564,7 +475,7 @@ runtime-benchmarks = [
 ]
 try-runtime = [
 	"asset-test-pezutils?/try-runtime",
-	"assets-common?/try-runtime",
+	"pez-assets-common?/try-runtime",
 	"pezcumulus-pezpallet-aura-ext?/try-runtime",
 	"pezcumulus-pezpallet-dmp-queue?/try-runtime",
 	"pezcumulus-pezpallet-solo-to-para?/try-runtime",
@@ -582,7 +493,7 @@ try-runtime = [
 	"pezkuwi-omni-node-lib?/try-runtime",
 	"pezkuwi-runtime-common?/try-runtime",
 	"pezkuwi-runtime-teyrchains?/try-runtime",
-	"pezkuwi-sdk-frame?/try-runtime",
+	"pezframe?/try-runtime",
 	"pezkuwi-service?/try-runtime",
 	"pezpallet-alliance?/try-runtime",
 	"pezpallet-asset-conversion-ops?/try-runtime",
@@ -689,11 +600,11 @@ try-runtime = [
 	"pezpallet-xcm-bridge-hub?/try-runtime",
 	"pezpallet-xcm-precompiles?/try-runtime",
 	"pezpallet-xcm?/try-runtime",
-	"pezstaging-teyrchain-info?/try-runtime",
+	"teyrchain-info?/try-runtime",
 	"teyrchains-common?/try-runtime",
 ]
 serde = [
-	"bp-pezkuwi-core?/serde",
+	"pezbp-pezkuwi-core?/serde",
 	"pezframe-benchmarking?/serde",
 	"pezframe-metadata?/serde",
 	"pezkuwi-subxt-signer?/serde",
@@ -736,7 +647,7 @@ experimental = [
 	"pezframe-support-procedural?/experimental",
 	"pezframe-support?/experimental",
 	"pezframe-system?/experimental",
-	"pezkuwi-sdk-frame?/experimental",
+	"pezframe?/experimental",
 ]
 with-tracing = [
 	"pezframe-executive?/with-tracing",
@@ -744,21 +655,21 @@ with-tracing = [
 	"pezsp-tracing?/with-tracing",
 ]
 runtime-full = [
-	"assets-common",
+	"pez-assets-common",
 	"pez-binary-merkle-tree",
 	"bizinikiwi-bip39",
-	"bp-header-pez-chain",
-	"bp-messages",
-	"bp-pezkuwi-core",
-	"bp-relayers",
-	"bp-test-utils",
-	"bp-teyrchains",
-	"bp-xcm-bridge-hub",
-	"bp-xcm-bridge-hub-router",
-	"bridge-hub-common",
+	"pezbp-header-pez-chain",
+	"pezbp-messages",
+	"pezbp-pezkuwi-core",
+	"pezbp-relayers",
+	"pezbp-test-utils",
+	"pezbp-teyrchains",
+	"pezbp-xcm-bridge-hub",
+	"pezbp-xcm-bridge-hub-router",
+	"pezbridge-hub-common",
 	"pez-ethereum-standards",
 	"pez-slot-range-helper",
-	"pez-tracing-gum-proc-macro",
+	"gum-proc-macro",
 	"pezbp-runtime",
 	"pezbridge-runtime-common",
 	"pezcumulus-pezpallet-aura-ext",
@@ -796,8 +707,8 @@ runtime-full = [
 	"pezkuwi-runtime-common",
 	"pezkuwi-runtime-metrics",
 	"pezkuwi-runtime-teyrchains",
-	"pezkuwi-sdk-frame",
-	"pezsp-ss58-registry",
+	"pezframe",
+	"ss58-registry",
 	"pezkuwi-subxt-core",
 	"pezkuwi-subxt-macro",
 	"pezkuwi-subxt-metadata",
@@ -973,10 +884,10 @@ runtime-full = [
 	"pezsp-version-proc-macro",
 	"pezsp-wasm-interface",
 	"pezsp-weights",
-	"pezstaging-teyrchain-info",
-	"pezstaging-xcm",
-	"pezstaging-xcm-builder",
-	"pezstaging-xcm-executor",
+	"teyrchain-info",
+	"xcm",
+	"xcm-builder",
+	"xcm-executor",
 	"testnet-teyrchains-constants",
 	"teyrchains-common",
 	"xcm-pez-procedural",
@@ -996,8 +907,8 @@ runtime = [
 	"pezframe-system",
 	"pezframe-system-benchmarking",
 	"pezframe-system-rpc-runtime-api",
-	"pezkuwi-sdk-frame",
-	"pezkuwi-sdk-frame?/runtime",
+	"pezframe",
+	"pezframe?/runtime",
 	"pezkuwi-subxt?/runtime",
 ]
 node = [
@@ -1005,16 +916,16 @@ node = [
 	"bizinikiwi-build-script-utils",
 	"bizinikiwi-frame-rpc-support",
 	"bizinikiwi-frame-rpc-system",
-	"bizinikiwi-prometheus-endpoint",
+	"prometheus-endpoint",
 	"bizinikiwi-rpc-client",
 	"bizinikiwi-state-trie-migration-rpc",
-	"bizinikiwi-txtesttool",
+	"txtesttool",
 	"bizinikiwi-wasm-builder",
-	"frame-remote-externalities",
+	"remote-externalities",
 	"pez-fork-tree",
 	"pez-generate-bags",
 	"pez-subkey",
-	"pez-tracing-gum",
+	"gum",
 	"pezbridge-hub-test-utils",
 	"pezcumulus-client-bootnodes",
 	"pezcumulus-client-cli",
@@ -1084,7 +995,7 @@ node = [
 	"pezkuwi-subxt-utils-stripmetadata",
 	"pezmmr-gadget",
 	"pezmmr-rpc",
-	"pezpallet-contracts-mock-network",
+	# "pezpallet-contracts-mock-network",  # Test-only crate
 	"pezpallet-transaction-payment-rpc",
 	"pezsc-allocator",
 	"pezsc-authority-discovery",
@@ -1147,19 +1058,19 @@ node = [
 	"pezsp-maybe-compressed-blob",
 	"pezsp-panic-handler",
 	"pezsp-rpc",
-	"pezstaging-chain-spec-builder",
-	"pezstaging-node-inspect",
-	"pezstaging-tracking-allocator",
+	"chain-spec-builder",
+	"node-inspect",
+	"tracking-allocator",
 	"std",
 	"teyrchains-runtimes-test-utils",
 	"xcm-pez-emulator",
 	"xcm-pez-simulator",
-	"zombienet-configuration",
-	"zombienet-orchestrator",
-	"zombienet-prom-metrics-parser",
-	"zombienet-provider",
-	"zombienet-sdk",
-	"zombienet-support",
+	"pezkuwi-zombienet-configuration",
+	"pezkuwi-zombienet-orchestrator",
+	"pezkuwi-zombienet-prom-metrics-parser",
+	"pezkuwi-zombienet-provider",
+	"pezkuwi-zombienet-sdk",
+	"pezkuwi-zombienet-support",
 ]
 tuples-96 = [
 	"pezframe-support-procedural?/tuples-96",
@@ -1178,1980 +1089,1982 @@ workspace = true
 [package.repository]
 workspace = true
 
-[dependencies.assets-common]
+[dependencies.pez-assets-common]
+workspace = true
 default-features = false
 optional = true
-path = "../pezcumulus/teyrchains/runtimes/assets/common"
 
 [dependencies.pez-binary-merkle-tree]
+workspace = true
 default-features = false
 optional = true
-path = "../bizinikiwi/utils/binary-merkle-tree"
 
 [dependencies.bizinikiwi-bip39]
+workspace = true
 default-features = false
 optional = true
-path = "../bizinikiwi/utils/bizinikiwi-bip39"
 
-[dependencies.bp-header-pez-chain]
+[dependencies.pezbp-header-pez-chain]
+workspace = true
 default-features = false
 optional = true
-path = "../pezbridges/primitives/header-chain"
 
-[dependencies.bp-messages]
+[dependencies.pezbp-messages]
+workspace = true
 default-features = false
 optional = true
-path = "../pezbridges/primitives/messages"
 
-[dependencies.bp-pezkuwi-core]
+[dependencies.pezbp-pezkuwi-core]
+workspace = true
 default-features = false
 optional = true
-path = "../pezbridges/primitives/pezkuwi-core"
 
-[dependencies.bp-relayers]
+[dependencies.pezbp-relayers]
+workspace = true
 default-features = false
 optional = true
-path = "../pezbridges/primitives/relayers"
 
-[dependencies.bp-test-utils]
+[dependencies.pezbp-test-utils]
+workspace = true
 default-features = false
 optional = true
-path = "../pezbridges/primitives/test-utils"
 
-[dependencies.bp-teyrchains]
+[dependencies.pezbp-teyrchains]
+workspace = true
 default-features = false
 optional = true
-path = "../pezbridges/primitives/teyrchains"
 
-[dependencies.bp-xcm-bridge-hub]
+[dependencies.pezbp-xcm-bridge-hub]
+workspace = true
 default-features = false
 optional = true
-path = "../pezbridges/primitives/xcm-bridge-hub"
 
-[dependencies.bp-xcm-bridge-hub-router]
+[dependencies.pezbp-xcm-bridge-hub-router]
+workspace = true
 default-features = false
 optional = true
-path = "../pezbridges/primitives/xcm-bridge-hub-router"
+package = "pezbp-xcm-bridge-hub-router"
 
-[dependencies.bridge-hub-common]
+[dependencies.pezbridge-hub-common]
+workspace = true
 default-features = false
 optional = true
-path = "../pezcumulus/teyrchains/runtimes/bridge-hubs/common"
 
 [dependencies.pez-ethereum-standards]
+workspace = true
 default-features = false
 optional = true
-path = "../bizinikiwi/primitives/pez-ethereum-standards"
 
 [dependencies.pez-slot-range-helper]
+workspace = true
 default-features = false
 optional = true
-path = "../pezkuwi/runtime/common/pez-slot-range-helper"
 
-[dependencies.pez-tracing-gum-proc-macro]
+[dependencies.gum-proc-macro]
+workspace = true
 default-features = false
 optional = true
-path = "../pezkuwi/node/gum/proc-macro"
 
 [dependencies.pezbp-runtime]
+workspace = true
 default-features = false
 optional = true
-path = "../pezbridges/primitives/runtime"
 
 [dependencies.pezbridge-runtime-common]
+workspace = true
 default-features = false
 optional = true
-path = "../pezbridges/bin/runtime-common"
 
 [dependencies.pezcumulus-pezpallet-aura-ext]
+workspace = true
 default-features = false
 optional = true
-path = "../pezcumulus/pezpallets/aura-ext"
 
 [dependencies.pezcumulus-pezpallet-dmp-queue]
+workspace = true
 default-features = false
 optional = true
-path = "../pezcumulus/pezpallets/dmp-queue"
 
 [dependencies.pezcumulus-pezpallet-session-benchmarking]
+workspace = true
 default-features = false
 optional = true
-path = "../pezcumulus/pezpallets/session-benchmarking"
 
 [dependencies.pezcumulus-pezpallet-solo-to-para]
+workspace = true
 default-features = false
 optional = true
-path = "../pezcumulus/pezpallets/solo-to-para"
 
 [dependencies.pezcumulus-pezpallet-teyrchain-system]
+workspace = true
 default-features = false
 optional = true
-path = "../pezcumulus/pezpallets/teyrchain-system"
 
 [dependencies.pezcumulus-pezpallet-teyrchain-system-proc-macro]
+workspace = true
 default-features = false
 optional = true
-path = "../pezcumulus/pezpallets/teyrchain-system/proc-macro"
 
 [dependencies.pezcumulus-pezpallet-weight-reclaim]
+workspace = true
 default-features = false
 optional = true
-path = "../pezcumulus/pezpallets/weight-reclaim"
 
 [dependencies.pezcumulus-pezpallet-xcm]
+workspace = true
 default-features = false
 optional = true
-path = "../pezcumulus/pezpallets/xcm"
 
 [dependencies.pezcumulus-pezpallet-xcmp-queue]
+workspace = true
 default-features = false
 optional = true
-path = "../pezcumulus/pezpallets/xcmp-queue"
 
 [dependencies.pezcumulus-ping]
+workspace = true
 default-features = false
 optional = true
-path = "../pezcumulus/teyrchains/pezpallets/ping"
 
 [dependencies.pezcumulus-primitives-aura]
+workspace = true
 default-features = false
 optional = true
-path = "../pezcumulus/primitives/aura"
 
 [dependencies.pezcumulus-primitives-core]
+workspace = true
 default-features = false
 optional = true
-path = "../pezcumulus/primitives/core"
 
 [dependencies.pezcumulus-primitives-proof-size-hostfunction]
+workspace = true
 default-features = false
 optional = true
-path = "../pezcumulus/primitives/proof-size-hostfunction"
 
 [dependencies.pezcumulus-primitives-storage-weight-reclaim]
+workspace = true
 default-features = false
 optional = true
-path = "../pezcumulus/primitives/storage-weight-reclaim"
 
 [dependencies.pezcumulus-primitives-teyrchain-inherent]
+workspace = true
 default-features = false
 optional = true
-path = "../pezcumulus/primitives/teyrchain-inherent"
 
 [dependencies.pezcumulus-primitives-timestamp]
+workspace = true
 default-features = false
 optional = true
-path = "../pezcumulus/primitives/timestamp"
 
 [dependencies.pezcumulus-primitives-utility]
+workspace = true
 default-features = false
 optional = true
-path = "../pezcumulus/primitives/utility"
 
 [dependencies.pezframe-benchmarking]
+workspace = true
 default-features = false
 optional = true
-path = "../bizinikiwi/pezframe/benchmarking"
 
 [dependencies.pezframe-benchmarking-pezpallet-pov]
+workspace = true
 default-features = false
 optional = true
-path = "../bizinikiwi/pezframe/benchmarking/pov"
 
 [dependencies.pezframe-election-provider-solution-type]
+workspace = true
 default-features = false
 optional = true
-path = "../bizinikiwi/pezframe/election-provider-support/solution-type"
 
 [dependencies.pezframe-election-provider-support]
+workspace = true
 default-features = false
 optional = true
-path = "../bizinikiwi/pezframe/election-provider-support"
 
 [dependencies.pezframe-executive]
+workspace = true
 default-features = false
 optional = true
-path = "../bizinikiwi/pezframe/executive"
 
 [dependencies.pezframe-metadata]
+workspace = true
 default-features = false
 optional = true
-path = "../bizinikiwi/pezframe/pezframe-metadata"
 
 [dependencies.pezframe-metadata-hash-extension]
+workspace = true
 default-features = false
 optional = true
-path = "../bizinikiwi/pezframe/metadata-hash-extension"
 
 [dependencies.pezframe-support]
+workspace = true
 default-features = false
 optional = true
-path = "../bizinikiwi/pezframe/support"
 
 [dependencies.pezframe-support-procedural]
+workspace = true
 default-features = false
 optional = true
-path = "../bizinikiwi/pezframe/support/procedural"
 
 [dependencies.pezframe-support-procedural-tools-derive]
+workspace = true
 default-features = false
 optional = true
-path = "../bizinikiwi/pezframe/support/procedural/tools/derive"
 
 [dependencies.pezframe-system]
+workspace = true
 default-features = false
 optional = true
-path = "../bizinikiwi/pezframe/system"
 
 [dependencies.pezframe-system-benchmarking]
+workspace = true
 default-features = false
 optional = true
-path = "../bizinikiwi/pezframe/system/benchmarking"
 
 [dependencies.pezframe-system-rpc-runtime-api]
+workspace = true
 default-features = false
 optional = true
-path = "../bizinikiwi/pezframe/system/rpc/runtime-api"
 
 [dependencies.pezkuwi-core-primitives]
+workspace = true
 default-features = false
 optional = true
-path = "../pezkuwi/core-primitives"
 
 [dependencies.pezkuwi-primitives]
+workspace = true
 default-features = false
 optional = true
-path = "../pezkuwi/primitives"
 
 [dependencies.pezkuwi-runtime-common]
+workspace = true
 default-features = false
 optional = true
-path = "../pezkuwi/runtime/common"
 
 [dependencies.pezkuwi-runtime-metrics]
+workspace = true
 default-features = false
 optional = true
-path = "../pezkuwi/runtime/metrics"
 
 [dependencies.pezkuwi-runtime-teyrchains]
+workspace = true
 default-features = false
 optional = true
-path = "../pezkuwi/runtime/teyrchains"
 
-[dependencies.pezkuwi-sdk-frame]
+[dependencies.pezframe]
+workspace = true
 default-features = false
 optional = true
-path = "../bizinikiwi/pezframe"
 
-[dependencies.pezsp-ss58-registry]
+[dependencies.ss58-registry]
+workspace = true
 default-features = false
 optional = true
-path = "../vendor/ss58-registry"
 
 [dependencies.pezkuwi-subxt-core]
+workspace = true
 default-features = false
 optional = true
-path = "../vendor/pezkuwi-subxt/core"
 
 [dependencies.pezkuwi-subxt-macro]
+workspace = true
 default-features = false
 optional = true
-path = "../vendor/pezkuwi-subxt/macro"
 
 [dependencies.pezkuwi-subxt-metadata]
+workspace = true
 default-features = false
 optional = true
-path = "../vendor/pezkuwi-subxt/metadata"
 
 [dependencies.pezkuwi-subxt-signer]
+workspace = true
 default-features = false
 optional = true
-path = "../vendor/pezkuwi-subxt/signer"
 
 [dependencies.pezkuwi-teyrchain-primitives]
+workspace = true
 default-features = false
 optional = true
-path = "../pezkuwi/teyrchain"
 
 [dependencies.pezpallet-alliance]
+workspace = true
 default-features = false
 optional = true
-path = "../bizinikiwi/pezframe/alliance"
 
 [dependencies.pezpallet-asset-conversion]
+workspace = true
 default-features = false
 optional = true
-path = "../bizinikiwi/pezframe/asset-conversion"
 
 [dependencies.pezpallet-asset-conversion-ops]
+workspace = true
 default-features = false
 optional = true
-path = "../bizinikiwi/pezframe/asset-conversion/ops"
 
 [dependencies.pezpallet-asset-conversion-tx-payment]
+workspace = true
 default-features = false
 optional = true
-path = "../bizinikiwi/pezframe/transaction-payment/asset-conversion-tx-payment"
 
 [dependencies.pezpallet-asset-rate]
+workspace = true
 default-features = false
 optional = true
-path = "../bizinikiwi/pezframe/asset-rate"
 
 [dependencies.pezpallet-asset-rewards]
+workspace = true
 default-features = false
 optional = true
-path = "../bizinikiwi/pezframe/asset-rewards"
 
 [dependencies.pezpallet-asset-tx-payment]
+workspace = true
 default-features = false
 optional = true
-path = "../bizinikiwi/pezframe/transaction-payment/asset-tx-payment"
 
 [dependencies.pezpallet-assets]
+workspace = true
 default-features = false
 optional = true
-path = "../bizinikiwi/pezframe/assets"
 
 [dependencies.pezpallet-assets-freezer]
+workspace = true
 default-features = false
 optional = true
-path = "../bizinikiwi/pezframe/assets-freezer"
 
 [dependencies.pezpallet-assets-holder]
+workspace = true
 default-features = false
 optional = true
-path = "../bizinikiwi/pezframe/assets-holder"
 
 [dependencies.pezpallet-assets-precompiles]
+workspace = true
 default-features = false
 optional = true
-path = "../bizinikiwi/pezframe/assets/precompiles"
 
 [dependencies.pezpallet-atomic-swap]
+workspace = true
 default-features = false
 optional = true
-path = "../bizinikiwi/pezframe/atomic-swap"
 
 [dependencies.pezpallet-aura]
+workspace = true
 default-features = false
 optional = true
-path = "../bizinikiwi/pezframe/aura"
 
 [dependencies.pezpallet-authority-discovery]
+workspace = true
 default-features = false
 optional = true
-path = "../bizinikiwi/pezframe/authority-discovery"
 
 [dependencies.pezpallet-authorship]
+workspace = true
 default-features = false
 optional = true
-path = "../bizinikiwi/pezframe/authorship"
 
 [dependencies.pezpallet-babe]
+workspace = true
 default-features = false
 optional = true
-path = "../bizinikiwi/pezframe/babe"
 
 [dependencies.pezpallet-bags-list]
+workspace = true
 default-features = false
 optional = true
-path = "../bizinikiwi/pezframe/bags-list"
 
 [dependencies.pezpallet-balances]
+workspace = true
 default-features = false
 optional = true
-path = "../bizinikiwi/pezframe/balances"
 
 [dependencies.pezpallet-beefy]
+workspace = true
 default-features = false
 optional = true
-path = "../bizinikiwi/pezframe/beefy"
 
 [dependencies.pezpallet-beefy-mmr]
+workspace = true
 default-features = false
 optional = true
-path = "../bizinikiwi/pezframe/beefy-mmr"
 
 [dependencies.pezpallet-bounties]
+workspace = true
 default-features = false
 optional = true
-path = "../bizinikiwi/pezframe/bounties"
 
 [dependencies.pezpallet-bridge-grandpa]
+workspace = true
 default-features = false
 optional = true
-path = "../pezbridges/modules/grandpa"
 
 [dependencies.pezpallet-bridge-messages]
+workspace = true
 default-features = false
 optional = true
-path = "../pezbridges/modules/messages"
 
 [dependencies.pezpallet-bridge-relayers]
+workspace = true
 default-features = false
 optional = true
-path = "../pezbridges/modules/relayers"
 
 [dependencies.pezpallet-bridge-teyrchains]
+workspace = true
 default-features = false
 optional = true
-path = "../pezbridges/modules/teyrchains"
 
 [dependencies.pezpallet-broker]
+workspace = true
 default-features = false
 optional = true
-path = "../bizinikiwi/pezframe/broker"
 
 [dependencies.pezpallet-child-bounties]
+workspace = true
 default-features = false
 optional = true
-path = "../bizinikiwi/pezframe/child-bounties"
 
 [dependencies.pezpallet-collator-selection]
+workspace = true
 default-features = false
 optional = true
-path = "../pezcumulus/pezpallets/collator-selection"
 
 [dependencies.pezpallet-collective]
+workspace = true
 default-features = false
 optional = true
-path = "../bizinikiwi/pezframe/collective"
 
 [dependencies.pezpallet-collective-content]
+workspace = true
 default-features = false
 optional = true
-path = "../pezcumulus/teyrchains/pezpallets/collective-content"
 
 [dependencies.pezpallet-contracts]
+workspace = true
 default-features = false
 optional = true
-path = "../bizinikiwi/pezframe/contracts"
 
 [dependencies.pezpallet-contracts-proc-macro]
+workspace = true
 default-features = false
 optional = true
-path = "../bizinikiwi/pezframe/contracts/proc-macro"
 
 [dependencies.pezpallet-contracts-uapi]
+workspace = true
 default-features = false
 optional = true
-path = "../bizinikiwi/pezframe/contracts/uapi"
 
 [dependencies.pezpallet-conviction-voting]
+workspace = true
 default-features = false
 optional = true
-path = "../bizinikiwi/pezframe/conviction-voting"
 
 [dependencies.pezpallet-core-fellowship]
+workspace = true
 default-features = false
 optional = true
-path = "../bizinikiwi/pezframe/core-fellowship"
 
 [dependencies.pezpallet-delegated-staking]
+workspace = true
 default-features = false
 optional = true
-path = "../bizinikiwi/pezframe/delegated-staking"
 
 [dependencies.pezpallet-democracy]
+workspace = true
 default-features = false
 optional = true
-path = "../bizinikiwi/pezframe/democracy"
 
 [dependencies.pezpallet-derivatives]
+workspace = true
 default-features = false
 optional = true
-path = "../bizinikiwi/pezframe/derivatives"
 
 [dependencies.pezpallet-dummy-dim]
+workspace = true
 default-features = false
 optional = true
-path = "../bizinikiwi/pezframe/dummy-dim"
 
 [dependencies.pezpallet-election-provider-multi-block]
+workspace = true
 default-features = false
 optional = true
-path = "../bizinikiwi/pezframe/election-provider-multi-block"
 
 [dependencies.pezpallet-election-provider-multi-phase]
+workspace = true
 default-features = false
 optional = true
-path = "../bizinikiwi/pezframe/election-provider-multi-phase"
 
 [dependencies.pezpallet-election-provider-support-benchmarking]
+workspace = true
 default-features = false
 optional = true
-path = "../bizinikiwi/pezframe/election-provider-support/benchmarking"
 
 [dependencies.pezpallet-elections-phragmen]
+workspace = true
 default-features = false
 optional = true
-path = "../bizinikiwi/pezframe/elections-phragmen"
 
 [dependencies.pezpallet-fast-unstake]
+workspace = true
 default-features = false
 optional = true
-path = "../bizinikiwi/pezframe/fast-unstake"
 
 [dependencies.pezpallet-glutton]
+workspace = true
 default-features = false
 optional = true
-path = "../bizinikiwi/pezframe/glutton"
 
 [dependencies.pezpallet-grandpa]
+workspace = true
 default-features = false
 optional = true
-path = "../bizinikiwi/pezframe/grandpa"
 
 [dependencies.pezpallet-identity]
+workspace = true
 default-features = false
 optional = true
-path = "../bizinikiwi/pezframe/identity"
 
 [dependencies.pezpallet-im-online]
+workspace = true
 default-features = false
 optional = true
-path = "../bizinikiwi/pezframe/im-online"
 
 [dependencies.pezpallet-indices]
+workspace = true
 default-features = false
 optional = true
-path = "../bizinikiwi/pezframe/indices"
 
 [dependencies.pezpallet-insecure-randomness-collective-flip]
+workspace = true
 default-features = false
 optional = true
-path = "../bizinikiwi/pezframe/insecure-randomness-collective-flip"
 
 [dependencies.pezpallet-lottery]
+workspace = true
 default-features = false
 optional = true
-path = "../bizinikiwi/pezframe/lottery"
 
 [dependencies.pezpallet-membership]
+workspace = true
 default-features = false
 optional = true
-path = "../bizinikiwi/pezframe/membership"
 
 [dependencies.pezpallet-message-queue]
+workspace = true
 default-features = false
 optional = true
-path = "../bizinikiwi/pezframe/message-queue"
 
 [dependencies.pezpallet-meta-tx]
+workspace = true
 default-features = false
 optional = true
-path = "../bizinikiwi/pezframe/meta-tx"
 
 [dependencies.pezpallet-migrations]
+workspace = true
 default-features = false
 optional = true
-path = "../bizinikiwi/pezframe/migrations"
 
 [dependencies.pezpallet-mixnet]
+workspace = true
 default-features = false
 optional = true
-path = "../bizinikiwi/pezframe/mixnet"
 
 [dependencies.pezpallet-mmr]
+workspace = true
 default-features = false
 optional = true
-path = "../bizinikiwi/pezframe/merkle-mountain-range"
 
 [dependencies.pezpallet-multi-asset-bounties]
+workspace = true
 default-features = false
 optional = true
-path = "../bizinikiwi/pezframe/multi-asset-bounties"
 
 [dependencies.pezpallet-multisig]
+workspace = true
 default-features = false
 optional = true
-path = "../bizinikiwi/pezframe/multisig"
 
 [dependencies.pezpallet-nft-fractionalization]
+workspace = true
 default-features = false
 optional = true
-path = "../bizinikiwi/pezframe/nft-fractionalization"
 
 [dependencies.pezpallet-nfts]
+workspace = true
 default-features = false
 optional = true
-path = "../bizinikiwi/pezframe/nfts"
 
 [dependencies.pezpallet-nfts-runtime-api]
+workspace = true
 default-features = false
 optional = true
-path = "../bizinikiwi/pezframe/nfts/runtime-api"
 
 [dependencies.pezpallet-nis]
+workspace = true
 default-features = false
 optional = true
-path = "../bizinikiwi/pezframe/nis"
 
 [dependencies.pezpallet-node-authorization]
+workspace = true
 default-features = false
 optional = true
-path = "../bizinikiwi/pezframe/node-authorization"
 
 [dependencies.pezpallet-nomination-pools]
+workspace = true
 default-features = false
 optional = true
-path = "../bizinikiwi/pezframe/nomination-pools"
 
 [dependencies.pezpallet-nomination-pools-benchmarking]
+workspace = true
 default-features = false
 optional = true
-path = "../bizinikiwi/pezframe/nomination-pools/benchmarking"
 
 [dependencies.pezpallet-nomination-pools-runtime-api]
+workspace = true
 default-features = false
 optional = true
-path = "../bizinikiwi/pezframe/nomination-pools/runtime-api"
 
 [dependencies.pezpallet-offences]
+workspace = true
 default-features = false
 optional = true
-path = "../bizinikiwi/pezframe/offences"
 
 [dependencies.pezpallet-offences-benchmarking]
+workspace = true
 default-features = false
 optional = true
-path = "../bizinikiwi/pezframe/offences/benchmarking"
 
 [dependencies.pezpallet-oracle]
+workspace = true
 default-features = false
 optional = true
-path = "../bizinikiwi/pezframe/honzon/oracle"
 
 [dependencies.pezpallet-oracle-runtime-api]
+workspace = true
 default-features = false
 optional = true
-path = "../bizinikiwi/pezframe/honzon/oracle/runtime-api"
 
 [dependencies.pezpallet-origin-restriction]
+workspace = true
 default-features = false
 optional = true
-path = "../bizinikiwi/pezframe/origin-restriction"
 
 [dependencies.pezpallet-paged-list]
+workspace = true
 default-features = false
 optional = true
-path = "../bizinikiwi/pezframe/paged-list"
 
 [dependencies.pezpallet-parameters]
+workspace = true
 default-features = false
 optional = true
-path = "../bizinikiwi/pezframe/parameters"
 
 [dependencies.pezpallet-people]
+workspace = true
 default-features = false
 optional = true
-path = "../bizinikiwi/pezframe/people"
 
 [dependencies.pezpallet-preimage]
+workspace = true
 default-features = false
 optional = true
-path = "../bizinikiwi/pezframe/preimage"
 
 [dependencies.pezpallet-proxy]
+workspace = true
 default-features = false
 optional = true
-path = "../bizinikiwi/pezframe/proxy"
 
 [dependencies.pezpallet-ranked-collective]
+workspace = true
 default-features = false
 optional = true
-path = "../bizinikiwi/pezframe/ranked-collective"
 
 [dependencies.pezpallet-recovery]
+workspace = true
 default-features = false
 optional = true
-path = "../bizinikiwi/pezframe/recovery"
 
 [dependencies.pezpallet-referenda]
+workspace = true
 default-features = false
 optional = true
-path = "../bizinikiwi/pezframe/referenda"
 
 [dependencies.pezpallet-remark]
+workspace = true
 default-features = false
 optional = true
-path = "../bizinikiwi/pezframe/remark"
 
 [dependencies.pezpallet-revive]
+workspace = true
 default-features = false
 optional = true
-path = "../bizinikiwi/pezframe/revive"
 
 [dependencies.pezpallet-revive-proc-macro]
+workspace = true
 default-features = false
 optional = true
-path = "../bizinikiwi/pezframe/revive/proc-macro"
 
 [dependencies.pezpallet-revive-uapi]
+workspace = true
 default-features = false
 optional = true
-path = "../bizinikiwi/pezframe/revive/uapi"
 
 [dependencies.pezpallet-root-offences]
+workspace = true
 default-features = false
 optional = true
-path = "../bizinikiwi/pezframe/root-offences"
 
 [dependencies.pezpallet-root-testing]
+workspace = true
 default-features = false
 optional = true
-path = "../bizinikiwi/pezframe/root-testing"
 
 [dependencies.pezpallet-safe-mode]
+workspace = true
 default-features = false
 optional = true
-path = "../bizinikiwi/pezframe/safe-mode"
 
 [dependencies.pezpallet-salary]
+workspace = true
 default-features = false
 optional = true
-path = "../bizinikiwi/pezframe/salary"
 
 [dependencies.pezpallet-scheduler]
+workspace = true
 default-features = false
 optional = true
-path = "../bizinikiwi/pezframe/scheduler"
 
 [dependencies.pezpallet-scored-pool]
+workspace = true
 default-features = false
 optional = true
-path = "../bizinikiwi/pezframe/scored-pool"
 
 [dependencies.pezpallet-session]
+workspace = true
 default-features = false
 optional = true
-path = "../bizinikiwi/pezframe/session"
 
 [dependencies.pezpallet-session-benchmarking]
+workspace = true
 default-features = false
 optional = true
-path = "../bizinikiwi/pezframe/session/benchmarking"
 
 [dependencies.pezpallet-skip-feeless-payment]
+workspace = true
 default-features = false
 optional = true
-path = "../bizinikiwi/pezframe/transaction-payment/skip-feeless-payment"
 
 [dependencies.pezpallet-society]
+workspace = true
 default-features = false
 optional = true
-path = "../bizinikiwi/pezframe/society"
 
 [dependencies.pezpallet-staking]
+workspace = true
 default-features = false
 optional = true
-path = "../bizinikiwi/pezframe/staking"
 
 [dependencies.pezpallet-staking-async]
+workspace = true
 default-features = false
 optional = true
-path = "../bizinikiwi/pezframe/staking-async"
 
 [dependencies.pezpallet-staking-async-ah-client]
+workspace = true
 default-features = false
 optional = true
-path = "../bizinikiwi/pezframe/staking-async/ah-client"
 
 [dependencies.pezpallet-staking-async-rc-client]
+workspace = true
 default-features = false
 optional = true
-path = "../bizinikiwi/pezframe/staking-async/rc-client"
 
 [dependencies.pezpallet-staking-async-reward-fn]
+workspace = true
 default-features = false
 optional = true
-path = "../bizinikiwi/pezframe/staking-async/reward-fn"
 
 [dependencies.pezpallet-staking-async-runtime-api]
+workspace = true
 default-features = false
 optional = true
-path = "../bizinikiwi/pezframe/staking-async/runtime-api"
 
 [dependencies.pezpallet-staking-reward-curve]
+workspace = true
 default-features = false
 optional = true
-path = "../bizinikiwi/pezframe/staking/reward-curve"
 
 [dependencies.pezpallet-staking-reward-fn]
+workspace = true
 default-features = false
 optional = true
-path = "../bizinikiwi/pezframe/staking/reward-fn"
 
 [dependencies.pezpallet-staking-runtime-api]
+workspace = true
 default-features = false
 optional = true
-path = "../bizinikiwi/pezframe/staking/runtime-api"
 
 [dependencies.pezpallet-state-trie-migration]
+workspace = true
 default-features = false
 optional = true
-path = "../bizinikiwi/pezframe/state-trie-migration"
 
 [dependencies.pezpallet-statement]
+workspace = true
 default-features = false
 optional = true
-path = "../bizinikiwi/pezframe/statement"
 
 [dependencies.pezpallet-sudo]
+workspace = true
 default-features = false
 optional = true
-path = "../bizinikiwi/pezframe/sudo"
 
 [dependencies.pezpallet-timestamp]
+workspace = true
 default-features = false
 optional = true
-path = "../bizinikiwi/pezframe/timestamp"
 
 [dependencies.pezpallet-tips]
+workspace = true
 default-features = false
 optional = true
-path = "../bizinikiwi/pezframe/tips"
 
 [dependencies.pezpallet-transaction-payment]
+workspace = true
 default-features = false
 optional = true
-path = "../bizinikiwi/pezframe/transaction-payment"
 
 [dependencies.pezpallet-transaction-payment-rpc-runtime-api]
+workspace = true
 default-features = false
 optional = true
-path = "../bizinikiwi/pezframe/transaction-payment/rpc/runtime-api"
 
 [dependencies.pezpallet-transaction-storage]
+workspace = true
 default-features = false
 optional = true
-path = "../bizinikiwi/pezframe/transaction-storage"
 
 [dependencies.pezpallet-treasury]
+workspace = true
 default-features = false
 optional = true
-path = "../bizinikiwi/pezframe/treasury"
 
 [dependencies.pezpallet-tx-pause]
+workspace = true
 default-features = false
 optional = true
-path = "../bizinikiwi/pezframe/tx-pause"
 
 [dependencies.pezpallet-uniques]
+workspace = true
 default-features = false
 optional = true
-path = "../bizinikiwi/pezframe/uniques"
 
 [dependencies.pezpallet-utility]
+workspace = true
 default-features = false
 optional = true
-path = "../bizinikiwi/pezframe/utility"
 
 [dependencies.pezpallet-verify-signature]
+workspace = true
 default-features = false
 optional = true
-path = "../bizinikiwi/pezframe/verify-signature"
 
 [dependencies.pezpallet-vesting]
+workspace = true
 default-features = false
 optional = true
-path = "../bizinikiwi/pezframe/vesting"
 
 [dependencies.pezpallet-whitelist]
+workspace = true
 default-features = false
 optional = true
-path = "../bizinikiwi/pezframe/whitelist"
 
 [dependencies.pezpallet-xcm]
+workspace = true
 default-features = false
 optional = true
-path = "../pezkuwi/xcm/pezpallet-xcm"
 
 [dependencies.pezpallet-xcm-benchmarks]
+workspace = true
 default-features = false
 optional = true
-path = "../pezkuwi/xcm/pezpallet-xcm-benchmarks"
 
 [dependencies.pezpallet-xcm-bridge-hub]
+workspace = true
 default-features = false
 optional = true
-path = "../pezbridges/modules/xcm-bridge-hub"
 
 [dependencies.pezpallet-xcm-bridge-hub-router]
+workspace = true
 default-features = false
 optional = true
-path = "../pezbridges/modules/xcm-bridge-hub-router"
 
 [dependencies.pezpallet-xcm-precompiles]
+workspace = true
 default-features = false
 optional = true
-path = "../pezkuwi/xcm/pezpallet-xcm/precompiles"
 
 [dependencies.pezsc-chain-spec-derive]
+workspace = true
 default-features = false
 optional = true
-path = "../bizinikiwi/client/chain-spec/derive"
 
 [dependencies.pezsc-tracing-proc-macro]
+workspace = true
 default-features = false
 optional = true
-path = "../bizinikiwi/client/tracing/proc-macro"
 
 [dependencies.pezsp-api]
+workspace = true
 default-features = false
 optional = true
-path = "../bizinikiwi/primitives/api"
 
 [dependencies.pezsp-api-proc-macro]
+workspace = true
 default-features = false
 optional = true
-path = "../bizinikiwi/primitives/api/proc-macro"
 
 [dependencies.pezsp-application-crypto]
+workspace = true
 default-features = false
 optional = true
-path = "../bizinikiwi/primitives/application-crypto"
 
 [dependencies.pezsp-arithmetic]
+workspace = true
 default-features = false
 optional = true
-path = "../bizinikiwi/primitives/arithmetic"
 
 [dependencies.pezsp-authority-discovery]
+workspace = true
 default-features = false
 optional = true
-path = "../bizinikiwi/primitives/authority-discovery"
 
 [dependencies.pezsp-block-builder]
+workspace = true
 default-features = false
 optional = true
-path = "../bizinikiwi/primitives/block-builder"
 
 [dependencies.pezsp-consensus-aura]
+workspace = true
 default-features = false
 optional = true
-path = "../bizinikiwi/primitives/consensus/aura"
 
 [dependencies.pezsp-consensus-babe]
+workspace = true
 default-features = false
 optional = true
-path = "../bizinikiwi/primitives/consensus/babe"
 
 [dependencies.pezsp-consensus-beefy]
+workspace = true
 default-features = false
 optional = true
-path = "../bizinikiwi/primitives/consensus/beefy"
 
 [dependencies.pezsp-consensus-grandpa]
+workspace = true
 default-features = false
 optional = true
-path = "../bizinikiwi/primitives/consensus/grandpa"
 
 [dependencies.pezsp-consensus-pow]
+workspace = true
 default-features = false
 optional = true
-path = "../bizinikiwi/primitives/consensus/pow"
 
 [dependencies.pezsp-consensus-slots]
+workspace = true
 default-features = false
 optional = true
-path = "../bizinikiwi/primitives/consensus/slots"
 
 [dependencies.pezsp-core]
+workspace = true
 default-features = false
 optional = true
-path = "../bizinikiwi/primitives/core"
 
 [dependencies.pezsp-crypto-ec-utils]
+workspace = true
 default-features = false
 optional = true
-path = "../bizinikiwi/primitives/crypto/ec-utils"
 
 [dependencies.pezsp-crypto-hashing]
+workspace = true
 default-features = false
 optional = true
-path = "../bizinikiwi/primitives/crypto/hashing"
 
 [dependencies.pezsp-crypto-hashing-proc-macro]
+workspace = true
 default-features = false
 optional = true
-path = "../bizinikiwi/primitives/crypto/hashing/proc-macro"
 
 [dependencies.pezsp-debug-derive]
+workspace = true
 default-features = false
 optional = true
-path = "../bizinikiwi/primitives/debug-derive"
 
 [dependencies.pezsp-externalities]
+workspace = true
 default-features = false
 optional = true
-path = "../bizinikiwi/primitives/externalities"
 
 [dependencies.pezsp-genesis-builder]
+workspace = true
 default-features = false
 optional = true
-path = "../bizinikiwi/primitives/genesis-builder"
 
 [dependencies.pezsp-inherents]
+workspace = true
 default-features = false
 optional = true
-path = "../bizinikiwi/primitives/inherents"
 
 [dependencies.pezsp-io]
+workspace = true
 default-features = false
 optional = true
-path = "../bizinikiwi/primitives/io"
 
 [dependencies.pezsp-keyring]
+workspace = true
 default-features = false
 optional = true
-path = "../bizinikiwi/primitives/keyring"
 
 [dependencies.pezsp-keystore]
+workspace = true
 default-features = false
 optional = true
-path = "../bizinikiwi/primitives/keystore"
 
 [dependencies.pezsp-metadata-ir]
+workspace = true
 default-features = false
 optional = true
-path = "../bizinikiwi/primitives/metadata-ir"
 
 [dependencies.pezsp-mixnet]
+workspace = true
 default-features = false
 optional = true
-path = "../bizinikiwi/primitives/mixnet"
 
 [dependencies.pezsp-mmr-primitives]
+workspace = true
 default-features = false
 optional = true
-path = "../bizinikiwi/primitives/merkle-mountain-range"
 
 [dependencies.pezsp-npos-elections]
+workspace = true
 default-features = false
 optional = true
-path = "../bizinikiwi/primitives/npos-elections"
 
 [dependencies.pezsp-offchain]
+workspace = true
 default-features = false
 optional = true
-path = "../bizinikiwi/primitives/offchain"
 
 [dependencies.pezsp-runtime-interface]
+workspace = true
 default-features = false
 optional = true
-path = "../bizinikiwi/primitives/runtime-interface"
 
 [dependencies.pezsp-runtime-interface-proc-macro]
+workspace = true
 default-features = false
 optional = true
-path = "../bizinikiwi/primitives/runtime-interface/proc-macro"
 
 [dependencies.pezsp-session]
+workspace = true
 default-features = false
 optional = true
-path = "../bizinikiwi/primitives/session"
 
 [dependencies.pezsp-staking]
+workspace = true
 default-features = false
 optional = true
-path = "../bizinikiwi/primitives/staking"
 
 [dependencies.pezsp-state-machine]
+workspace = true
 default-features = false
 optional = true
-path = "../bizinikiwi/primitives/state-machine"
 
 [dependencies.pezsp-statement-store]
+workspace = true
 default-features = false
 optional = true
-path = "../bizinikiwi/primitives/statement-store"
 
 [dependencies.pezsp-std]
+workspace = true
 default-features = false
 optional = true
-path = "../bizinikiwi/primitives/std"
 
 [dependencies.pezsp-storage]
+workspace = true
 default-features = false
 optional = true
-path = "../bizinikiwi/primitives/storage"
 
 [dependencies.pezsp-timestamp]
+workspace = true
 default-features = false
 optional = true
-path = "../bizinikiwi/primitives/timestamp"
 
 [dependencies.pezsp-tracing]
+workspace = true
 default-features = false
 optional = true
-path = "../bizinikiwi/primitives/tracing"
 
 [dependencies.pezsp-transaction-pool]
+workspace = true
 default-features = false
 optional = true
-path = "../bizinikiwi/primitives/transaction-pool"
 
 [dependencies.pezsp-transaction-storage-proof]
+workspace = true
 default-features = false
 optional = true
-path = "../bizinikiwi/primitives/transaction-storage-proof"
 
 [dependencies.pezsp-trie]
+workspace = true
 default-features = false
 optional = true
-path = "../bizinikiwi/primitives/trie"
 
 [dependencies.pezsp-version]
+workspace = true
 default-features = false
 optional = true
-path = "../bizinikiwi/primitives/version"
 
 [dependencies.pezsp-version-proc-macro]
+workspace = true
 default-features = false
 optional = true
-path = "../bizinikiwi/primitives/version/proc-macro"
 
 [dependencies.pezsp-wasm-interface]
+workspace = true
 default-features = false
 optional = true
-path = "../bizinikiwi/primitives/wasm-interface"
 
 [dependencies.pezsp-weights]
+workspace = true
 default-features = false
 optional = true
-path = "../bizinikiwi/primitives/weights"
 
-[dependencies.pezstaging-teyrchain-info]
+[dependencies.teyrchain-info]
+workspace = true
 default-features = false
 optional = true
-path = "../pezcumulus/teyrchains/pezpallets/teyrchain-info"
 
-[dependencies.pezstaging-xcm]
+[dependencies.xcm]
+workspace = true
 default-features = false
 optional = true
-path = "../pezkuwi/xcm"
 
-[dependencies.pezstaging-xcm-builder]
+[dependencies.xcm-builder]
+workspace = true
 default-features = false
 optional = true
-path = "../pezkuwi/xcm/xcm-builder"
 
-[dependencies.pezstaging-xcm-executor]
+[dependencies.xcm-executor]
+workspace = true
 default-features = false
 optional = true
-path = "../pezkuwi/xcm/xcm-executor"
 
 [dependencies.testnet-teyrchains-constants]
+workspace = true
 default-features = false
 optional = true
-path = "../pezcumulus/teyrchains/runtimes/constants"
 
 [dependencies.teyrchains-common]
+workspace = true
 default-features = false
 optional = true
-path = "../pezcumulus/teyrchains/common"
 
 [dependencies.xcm-pez-procedural]
+workspace = true
 default-features = false
 optional = true
-path = "../pezkuwi/xcm/procedural"
 
 [dependencies.xcm-runtime-pezapis]
+workspace = true
 default-features = false
 optional = true
-path = "../pezkuwi/xcm/xcm-runtime-pezapis"
 
 [dependencies.asset-test-pezutils]
+workspace = true
 default-features = false
 optional = true
-path = "../pezcumulus/teyrchains/runtimes/assets/test-utils"
 
 [dependencies.bizinikiwi-build-script-utils]
+workspace = true
 default-features = false
 optional = true
-path = "../bizinikiwi/utils/build-script-utils"
 
 [dependencies.bizinikiwi-frame-rpc-support]
+workspace = true
 default-features = false
 optional = true
-path = "../bizinikiwi/utils/pezframe/rpc/support"
 
 [dependencies.bizinikiwi-frame-rpc-system]
+workspace = true
 default-features = false
 optional = true
-path = "../bizinikiwi/utils/pezframe/rpc/system"
 
-[dependencies.bizinikiwi-prometheus-endpoint]
+[dependencies.prometheus-endpoint]
+workspace = true
 default-features = false
 optional = true
-path = "../bizinikiwi/utils/prometheus"
 
 [dependencies.bizinikiwi-rpc-client]
+workspace = true
 default-features = false
 optional = true
-path = "../bizinikiwi/utils/pezframe/rpc/client"
 
 [dependencies.bizinikiwi-state-trie-migration-rpc]
+workspace = true
 default-features = false
 optional = true
-path = "../bizinikiwi/utils/pezframe/rpc/state-trie-migration-rpc"
 
-[dependencies.bizinikiwi-txtesttool]
+[dependencies.txtesttool]
+workspace = true
 default-features = false
 optional = true
-path = "../bizinikiwi/utils/txtesttool"
 
 [dependencies.bizinikiwi-wasm-builder]
+workspace = true
 default-features = false
 optional = true
-path = "../bizinikiwi/utils/wasm-builder"
 
-[dependencies.frame-remote-externalities]
+[dependencies.remote-externalities]
+workspace = true
 default-features = false
 optional = true
-path = "../bizinikiwi/utils/pezframe/remote-externalities"
 
 [dependencies.pez-fork-tree]
+workspace = true
 default-features = false
 optional = true
-path = "../bizinikiwi/utils/pez-fork-tree"
 
 [dependencies.pez-generate-bags]
+workspace = true
 default-features = false
 optional = true
-path = "../bizinikiwi/utils/pezframe/pez-generate-bags"
 
 [dependencies.pez-subkey]
+workspace = true
 default-features = false
 optional = true
-path = "../bizinikiwi/bin/utils/pez-subkey"
 
-[dependencies.pez-tracing-gum]
+[dependencies.gum]
+workspace = true
 default-features = false
 optional = true
-path = "../pezkuwi/node/gum"
 
 [dependencies.pezbridge-hub-test-utils]
+workspace = true
 default-features = false
 optional = true
-path = "../pezcumulus/teyrchains/runtimes/bridge-hubs/test-utils"
 
 [dependencies.pezcumulus-client-bootnodes]
+workspace = true
 default-features = false
 optional = true
-path = "../pezcumulus/client/bootnodes"
 
 [dependencies.pezcumulus-client-cli]
+workspace = true
 default-features = false
 optional = true
-path = "../pezcumulus/client/cli"
 
 [dependencies.pezcumulus-client-collator]
+workspace = true
 default-features = false
 optional = true
-path = "../pezcumulus/client/collator"
 
 [dependencies.pezcumulus-client-consensus-aura]
+workspace = true
 default-features = false
 optional = true
-path = "../pezcumulus/client/consensus/aura"
 
 [dependencies.pezcumulus-client-consensus-common]
+workspace = true
 default-features = false
 optional = true
-path = "../pezcumulus/client/consensus/common"
 
 [dependencies.pezcumulus-client-consensus-proposer]
+workspace = true
 default-features = false
 optional = true
-path = "../pezcumulus/client/consensus/proposer"
 
 [dependencies.pezcumulus-client-consensus-relay-chain]
+workspace = true
 default-features = false
 optional = true
-path = "../pezcumulus/client/consensus/relay-chain"
 
 [dependencies.pezcumulus-client-network]
+workspace = true
 default-features = false
 optional = true
-path = "../pezcumulus/client/network"
 
 [dependencies.pezcumulus-client-pov-recovery]
+workspace = true
 default-features = false
 optional = true
-path = "../pezcumulus/client/pov-recovery"
 
 [dependencies.pezcumulus-client-service]
+workspace = true
 default-features = false
 optional = true
-path = "../pezcumulus/client/service"
 
 [dependencies.pezcumulus-client-teyrchain-inherent]
+workspace = true
 default-features = false
 optional = true
-path = "../pezcumulus/client/teyrchain-inherent"
 
 [dependencies.pezcumulus-relay-chain-inprocess-interface]
+workspace = true
 default-features = false
 optional = true
-path = "../pezcumulus/client/relay-chain-inprocess-interface"
 
 [dependencies.pezcumulus-relay-chain-interface]
+workspace = true
 default-features = false
 optional = true
-path = "../pezcumulus/client/relay-chain-interface"
 
 [dependencies.pezcumulus-relay-chain-minimal-node]
+workspace = true
 default-features = false
 optional = true
-path = "../pezcumulus/client/relay-chain-minimal-node"
 
 [dependencies.pezcumulus-relay-chain-rpc-interface]
+workspace = true
 default-features = false
 optional = true
-path = "../pezcumulus/client/relay-chain-rpc-interface"
 
 [dependencies.pezcumulus-relay-chain-streams]
+workspace = true
 default-features = false
 optional = true
-path = "../pezcumulus/client/relay-chain-streams"
 
 [dependencies.pezframe-benchmarking-cli]
+workspace = true
 default-features = false
 optional = true
-path = "../bizinikiwi/utils/pezframe/benchmarking-cli"
 
 [dependencies.pezframe-support-procedural-tools]
+workspace = true
 default-features = false
 optional = true
-path = "../bizinikiwi/pezframe/support/procedural/tools"
 
 [dependencies.pezkuwi-approval-distribution]
+workspace = true
 default-features = false
 optional = true
-path = "../pezkuwi/node/network/approval-distribution"
 
 [dependencies.pezkuwi-availability-bitfield-distribution]
+workspace = true
 default-features = false
 optional = true
-path = "../pezkuwi/node/network/bitfield-distribution"
 
 [dependencies.pezkuwi-availability-distribution]
+workspace = true
 default-features = false
 optional = true
-path = "../pezkuwi/node/network/availability-distribution"
 
 [dependencies.pezkuwi-availability-recovery]
+workspace = true
 default-features = false
 optional = true
-path = "../pezkuwi/node/network/availability-recovery"
 
 [dependencies.pezkuwi-cli]
+workspace = true
 default-features = false
 optional = true
-path = "../pezkuwi/cli"
 
 [dependencies.pezkuwi-collator-protocol]
+workspace = true
 default-features = false
 optional = true
-path = "../pezkuwi/node/network/collator-protocol"
 
 [dependencies.pezkuwi-dispute-distribution]
+workspace = true
 default-features = false
 optional = true
-path = "../pezkuwi/node/network/dispute-distribution"
 
 [dependencies.pezkuwi-erasure-coding]
+workspace = true
 default-features = false
 optional = true
-path = "../pezkuwi/erasure-coding"
 
 [dependencies.pezkuwi-gossip-support]
+workspace = true
 default-features = false
 optional = true
-path = "../pezkuwi/node/network/gossip-support"
 
 [dependencies.pezkuwi-network-bridge]
+workspace = true
 default-features = false
 optional = true
-path = "../pezkuwi/node/network/bridge"
 
 [dependencies.pezkuwi-node-collation-generation]
+workspace = true
 default-features = false
 optional = true
-path = "../pezkuwi/node/collation-generation"
 
 [dependencies.pezkuwi-node-core-approval-voting]
+workspace = true
 default-features = false
 optional = true
-path = "../pezkuwi/node/core/approval-voting"
 
 [dependencies.pezkuwi-node-core-approval-voting-parallel]
+workspace = true
 default-features = false
 optional = true
-path = "../pezkuwi/node/core/approval-voting-parallel"
 
 [dependencies.pezkuwi-node-core-av-store]
+workspace = true
 default-features = false
 optional = true
-path = "../pezkuwi/node/core/av-store"
 
 [dependencies.pezkuwi-node-core-backing]
+workspace = true
 default-features = false
 optional = true
-path = "../pezkuwi/node/core/backing"
 
 [dependencies.pezkuwi-node-core-bitfield-signing]
+workspace = true
 default-features = false
 optional = true
-path = "../pezkuwi/node/core/bitfield-signing"
 
 [dependencies.pezkuwi-node-core-candidate-validation]
+workspace = true
 default-features = false
 optional = true
-path = "../pezkuwi/node/core/candidate-validation"
 
 [dependencies.pezkuwi-node-core-chain-api]
+workspace = true
 default-features = false
 optional = true
-path = "../pezkuwi/node/core/chain-api"
 
 [dependencies.pezkuwi-node-core-chain-selection]
+workspace = true
 default-features = false
 optional = true
-path = "../pezkuwi/node/core/chain-selection"
 
 [dependencies.pezkuwi-node-core-dispute-coordinator]
+workspace = true
 default-features = false
 optional = true
-path = "../pezkuwi/node/core/dispute-coordinator"
 
 [dependencies.pezkuwi-node-core-prospective-teyrchains]
+workspace = true
 default-features = false
 optional = true
-path = "../pezkuwi/node/core/prospective-teyrchains"
 
 [dependencies.pezkuwi-node-core-provisioner]
+workspace = true
 default-features = false
 optional = true
-path = "../pezkuwi/node/core/provisioner"
 
 [dependencies.pezkuwi-node-core-pvf]
+workspace = true
 default-features = false
 optional = true
-path = "../pezkuwi/node/core/pvf"
 
 [dependencies.pezkuwi-node-core-pvf-checker]
+workspace = true
 default-features = false
 optional = true
-path = "../pezkuwi/node/core/pvf-checker"
 
 [dependencies.pezkuwi-node-core-pvf-common]
+workspace = true
 default-features = false
 optional = true
-path = "../pezkuwi/node/core/pvf/common"
 
 [dependencies.pezkuwi-node-core-pvf-execute-worker]
+workspace = true
 default-features = false
 optional = true
-path = "../pezkuwi/node/core/pvf/execute-worker"
 
 [dependencies.pezkuwi-node-core-pvf-prepare-worker]
+workspace = true
 default-features = false
 optional = true
-path = "../pezkuwi/node/core/pvf/prepare-worker"
 
 [dependencies.pezkuwi-node-core-runtime-api]
+workspace = true
 default-features = false
 optional = true
-path = "../pezkuwi/node/core/runtime-api"
 
 [dependencies.pezkuwi-node-core-teyrchains-inherent]
+workspace = true
 default-features = false
 optional = true
-path = "../pezkuwi/node/core/teyrchains-inherent"
 
 [dependencies.pezkuwi-node-metrics]
+workspace = true
 default-features = false
 optional = true
-path = "../pezkuwi/node/metrics"
 
 [dependencies.pezkuwi-node-network-protocol]
+workspace = true
 default-features = false
 optional = true
-path = "../pezkuwi/node/network/protocol"
 
 [dependencies.pezkuwi-node-subsystem]
+workspace = true
 default-features = false
 optional = true
-path = "../pezkuwi/node/subsystem"
 
 [dependencies.pezkuwi-node-subsystem-types]
+workspace = true
 default-features = false
 optional = true
-path = "../pezkuwi/node/subsystem-types"
 
 [dependencies.pezkuwi-node-subsystem-util]
+workspace = true
 default-features = false
 optional = true
-path = "../pezkuwi/node/subsystem-util"
 
 [dependencies.pezkuwi-omni-node-lib]
+workspace = true
 default-features = false
 optional = true
-path = "../pezcumulus/pezkuwi-omni-node/lib"
 
 [dependencies.pezkuwi-overseer]
+workspace = true
 default-features = false
 optional = true
-path = "../pezkuwi/node/overseer"
 
 [dependencies.pezkuwi-pez-node-primitives]
+workspace = true
 default-features = false
 optional = true
-path = "../pezkuwi/node/primitives"
 
 [dependencies.pezkuwi-primitives-test-helpers]
+workspace = true
 default-features = false
 optional = true
-path = "../pezkuwi/primitives/test-helpers"
 
 [dependencies.pezkuwi-rpc]
+workspace = true
 default-features = false
 optional = true
-path = "../pezkuwi/rpc"
 
 [dependencies.pezkuwi-service]
+workspace = true
 default-features = false
 optional = true
-path = "../pezkuwi/node/service"
 
 [dependencies.pezkuwi-statement-distribution]
+workspace = true
 default-features = false
 optional = true
-path = "../pezkuwi/node/network/statement-distribution"
 
 [dependencies.pezkuwi-statement-table]
+workspace = true
 default-features = false
 optional = true
-path = "../pezkuwi/statement-table"
 
 [dependencies.pezkuwi-subxt]
+workspace = true
 default-features = false
 optional = true
-path = "../vendor/pezkuwi-subxt/subxt"
 
 [dependencies.pezkuwi-subxt-codegen]
+workspace = true
 default-features = false
 optional = true
-path = "../vendor/pezkuwi-subxt/codegen"
 
 [dependencies.pezkuwi-subxt-lightclient]
+workspace = true
 default-features = false
 optional = true
-path = "../vendor/pezkuwi-subxt/lightclient"
 
 [dependencies.pezkuwi-subxt-rpcs]
+workspace = true
 default-features = false
 optional = true
-path = "../vendor/pezkuwi-subxt/rpcs"
 
 [dependencies.pezkuwi-subxt-utils-fetchmetadata]
+workspace = true
 default-features = false
 optional = true
-path = "../vendor/pezkuwi-subxt/utils/fetch-metadata"
 
 [dependencies.pezkuwi-subxt-utils-stripmetadata]
+workspace = true
 default-features = false
 optional = true
-path = "../vendor/pezkuwi-subxt/utils/strip-metadata"
 
 [dependencies.pezmmr-gadget]
+workspace = true
 default-features = false
 optional = true
-path = "../bizinikiwi/client/merkle-mountain-range"
 
 [dependencies.pezmmr-rpc]
+workspace = true
 default-features = false
 optional = true
-path = "../bizinikiwi/client/merkle-mountain-range/rpc"
 
-[dependencies.pezpallet-contracts-mock-network]
-default-features = false
-optional = true
-path = "../bizinikiwi/pezframe/contracts/mock-network"
+# [dependencies.pezpallet-contracts-mock-network]  # Test-only crate, not published
+# workspace = true
+# default-features = false
+# optional = true
 
 [dependencies.pezpallet-transaction-payment-rpc]
+workspace = true
 default-features = false
 optional = true
-path = "../bizinikiwi/pezframe/transaction-payment/rpc"
 
 [dependencies.pezsc-allocator]
+workspace = true
 default-features = false
 optional = true
-path = "../bizinikiwi/client/allocator"
 
 [dependencies.pezsc-authority-discovery]
+workspace = true
 default-features = false
 optional = true
-path = "../bizinikiwi/client/authority-discovery"
 
 [dependencies.pezsc-basic-authorship]
+workspace = true
 default-features = false
 optional = true
-path = "../bizinikiwi/client/basic-authorship"
 
 [dependencies.pezsc-block-builder]
+workspace = true
 default-features = false
 optional = true
-path = "../bizinikiwi/client/block-builder"
 
 [dependencies.pezsc-chain-spec]
+workspace = true
 default-features = false
 optional = true
-path = "../bizinikiwi/client/chain-spec"
 
 [dependencies.pezsc-cli]
+workspace = true
 default-features = false
 optional = true
-path = "../bizinikiwi/client/cli"
 
 [dependencies.pezsc-client-api]
+workspace = true
 default-features = false
 optional = true
-path = "../bizinikiwi/client/api"
 
 [dependencies.pezsc-client-db]
+workspace = true
 default-features = false
 optional = true
-path = "../bizinikiwi/client/db"
 
 [dependencies.pezsc-consensus]
+workspace = true
 default-features = false
 optional = true
-path = "../bizinikiwi/client/consensus/common"
 
 [dependencies.pezsc-consensus-aura]
+workspace = true
 default-features = false
 optional = true
-path = "../bizinikiwi/client/consensus/aura"
 
 [dependencies.pezsc-consensus-babe]
+workspace = true
 default-features = false
 optional = true
-path = "../bizinikiwi/client/consensus/babe"
 
 [dependencies.pezsc-consensus-babe-rpc]
+workspace = true
 default-features = false
 optional = true
-path = "../bizinikiwi/client/consensus/babe/rpc"
 
 [dependencies.pezsc-consensus-beefy]
+workspace = true
 default-features = false
 optional = true
-path = "../bizinikiwi/client/consensus/beefy"
 
 [dependencies.pezsc-consensus-beefy-rpc]
+workspace = true
 default-features = false
 optional = true
-path = "../bizinikiwi/client/consensus/beefy/rpc"
 
 [dependencies.pezsc-consensus-epochs]
+workspace = true
 default-features = false
 optional = true
-path = "../bizinikiwi/client/consensus/epochs"
 
 [dependencies.pezsc-consensus-grandpa]
+workspace = true
 default-features = false
 optional = true
-path = "../bizinikiwi/client/consensus/grandpa"
 
 [dependencies.pezsc-consensus-grandpa-rpc]
+workspace = true
 default-features = false
 optional = true
-path = "../bizinikiwi/client/consensus/grandpa/rpc"
 
 [dependencies.pezsc-consensus-manual-seal]
+workspace = true
 default-features = false
 optional = true
-path = "../bizinikiwi/client/consensus/manual-seal"
 
 [dependencies.pezsc-consensus-pow]
+workspace = true
 default-features = false
 optional = true
-path = "../bizinikiwi/client/consensus/pow"
 
 [dependencies.pezsc-consensus-slots]
+workspace = true
 default-features = false
 optional = true
-path = "../bizinikiwi/client/consensus/slots"
 
 [dependencies.pezsc-executor]
+workspace = true
 default-features = false
 optional = true
-path = "../bizinikiwi/client/executor"
 
 [dependencies.pezsc-executor-common]
+workspace = true
 default-features = false
 optional = true
-path = "../bizinikiwi/client/executor/common"
 
 [dependencies.pezsc-executor-polkavm]
+workspace = true
 default-features = false
 optional = true
-path = "../bizinikiwi/client/executor/polkavm"
 
 [dependencies.pezsc-executor-wasmtime]
+workspace = true
 default-features = false
 optional = true
-path = "../bizinikiwi/client/executor/wasmtime"
 
 [dependencies.pezsc-informant]
+workspace = true
 default-features = false
 optional = true
-path = "../bizinikiwi/client/informant"
 
 [dependencies.pezsc-keystore]
+workspace = true
 default-features = false
 optional = true
-path = "../bizinikiwi/client/keystore"
 
 [dependencies.pezsc-mixnet]
+workspace = true
 default-features = false
 optional = true
-path = "../bizinikiwi/client/mixnet"
 
 [dependencies.pezsc-network]
+workspace = true
 default-features = false
 optional = true
-path = "../bizinikiwi/client/network"
 
 [dependencies.pezsc-network-common]
+workspace = true
 default-features = false
 optional = true
-path = "../bizinikiwi/client/network/common"
 
 [dependencies.pezsc-network-gossip]
+workspace = true
 default-features = false
 optional = true
-path = "../bizinikiwi/client/network-gossip"
 
 [dependencies.pezsc-network-light]
+workspace = true
 default-features = false
 optional = true
-path = "../bizinikiwi/client/network/light"
 
 [dependencies.pezsc-network-statement]
+workspace = true
 default-features = false
 optional = true
-path = "../bizinikiwi/client/network/statement"
 
 [dependencies.pezsc-network-sync]
+workspace = true
 default-features = false
 optional = true
-path = "../bizinikiwi/client/network/sync"
 
 [dependencies.pezsc-network-transactions]
+workspace = true
 default-features = false
 optional = true
-path = "../bizinikiwi/client/network/transactions"
 
 [dependencies.pezsc-network-types]
+workspace = true
 default-features = false
 optional = true
-path = "../bizinikiwi/client/network/types"
 
 [dependencies.pezsc-offchain]
+workspace = true
 default-features = false
 optional = true
-path = "../bizinikiwi/client/offchain"
 
 [dependencies.pezsc-proposer-metrics]
+workspace = true
 default-features = false
 optional = true
-path = "../bizinikiwi/client/proposer-metrics"
 
 [dependencies.pezsc-rpc]
+workspace = true
 default-features = false
 optional = true
-path = "../bizinikiwi/client/rpc"
 
 [dependencies.pezsc-rpc-api]
+workspace = true
 default-features = false
 optional = true
-path = "../bizinikiwi/client/rpc-api"
 
 [dependencies.pezsc-rpc-server]
+workspace = true
 default-features = false
 optional = true
-path = "../bizinikiwi/client/rpc-servers"
 
 [dependencies.pezsc-rpc-spec-v2]
+workspace = true
 default-features = false
 optional = true
-path = "../bizinikiwi/client/rpc-spec-v2"
 
 [dependencies.pezsc-runtime-utilities]
+workspace = true
 default-features = false
 optional = true
-path = "../bizinikiwi/client/runtime-utilities"
 
 [dependencies.pezsc-service]
+workspace = true
 default-features = false
 optional = true
-path = "../bizinikiwi/client/service"
 
 [dependencies.pezsc-state-db]
+workspace = true
 default-features = false
 optional = true
-path = "../bizinikiwi/client/state-db"
 
 [dependencies.pezsc-statement-store]
+workspace = true
 default-features = false
 optional = true
-path = "../bizinikiwi/client/statement-store"
 
 [dependencies.pezsc-storage-monitor]
+workspace = true
 default-features = false
 optional = true
-path = "../bizinikiwi/client/storage-monitor"
 
 [dependencies.pezsc-sync-state-rpc]
+workspace = true
 default-features = false
 optional = true
-path = "../bizinikiwi/client/sync-state-rpc"
 
 [dependencies.pezsc-sysinfo]
+workspace = true
 default-features = false
 optional = true
-path = "../bizinikiwi/client/sysinfo"
 
 [dependencies.pezsc-telemetry]
+workspace = true
 default-features = false
 optional = true
-path = "../bizinikiwi/client/telemetry"
 
 [dependencies.pezsc-tracing]
+workspace = true
 default-features = false
 optional = true
-path = "../bizinikiwi/client/tracing"
 
 [dependencies.pezsc-transaction-pool]
+workspace = true
 default-features = false
 optional = true
-path = "../bizinikiwi/client/transaction-pool"
 
 [dependencies.pezsc-transaction-pool-api]
+workspace = true
 default-features = false
 optional = true
-path = "../bizinikiwi/client/transaction-pool/api"
 
 [dependencies.pezsc-utils]
+workspace = true
 default-features = false
 optional = true
-path = "../bizinikiwi/client/utils"
 
 [dependencies.pezsp-blockchain]
+workspace = true
 default-features = false
 optional = true
-path = "../bizinikiwi/primitives/blockchain"
 
 [dependencies.pezsp-consensus]
+workspace = true
 default-features = false
 optional = true
-path = "../bizinikiwi/primitives/consensus/common"
 
 [dependencies.pezsp-core-hashing]
+workspace = true
 default-features = false
 optional = true
-path = "../bizinikiwi/deprecated/hashing"
 
 [dependencies.pezsp-core-hashing-proc-macro]
+workspace = true
 default-features = false
 optional = true
-path = "../bizinikiwi/deprecated/hashing/proc-macro"
 
 [dependencies.pezsp-database]
+workspace = true
 default-features = false
 optional = true
-path = "../bizinikiwi/primitives/database"
 
 [dependencies.pezsp-maybe-compressed-blob]
+workspace = true
 default-features = false
 optional = true
-path = "../bizinikiwi/primitives/maybe-compressed-blob"
 
 [dependencies.pezsp-panic-handler]
+workspace = true
 default-features = false
 optional = true
-path = "../bizinikiwi/primitives/panic-handler"
 
 [dependencies.pezsp-rpc]
+workspace = true
 default-features = false
 optional = true
-path = "../bizinikiwi/primitives/rpc"
 
-[dependencies.pezstaging-chain-spec-builder]
+[dependencies.chain-spec-builder]
+workspace = true
 default-features = false
 optional = true
-path = "../bizinikiwi/bin/utils/chain-spec-builder"
 
-[dependencies.pezstaging-node-inspect]
+[dependencies.node-inspect]
+workspace = true
 default-features = false
 optional = true
-path = "../bizinikiwi/bin/node/inspect"
 
-[dependencies.pezstaging-tracking-allocator]
+[dependencies.tracking-allocator]
+workspace = true
 default-features = false
 optional = true
-path = "../pezkuwi/node/tracking-allocator"
 
 [dependencies.teyrchains-runtimes-test-utils]
+workspace = true
 default-features = false
 optional = true
-path = "../pezcumulus/teyrchains/runtimes/test-utils"
 
 [dependencies.xcm-pez-emulator]
+workspace = true
 default-features = false
 optional = true
-path = "../pezcumulus/xcm/xcm-pez-emulator"
 
 [dependencies.xcm-pez-simulator]
+workspace = true
 default-features = false
 optional = true
-path = "../pezkuwi/xcm/xcm-pez-simulator"
 
-[dependencies.zombienet-configuration]
+# Pezkuwi Zombienet SDK crates
+[dependencies.pezkuwi-zombienet-configuration]
+workspace = true
 default-features = false
 optional = true
-path = "../vendor/pezkuwi-zombienet-sdk/crates/configuration"
 
-[dependencies.zombienet-orchestrator]
+[dependencies.pezkuwi-zombienet-orchestrator]
+workspace = true
 default-features = false
 optional = true
-path = "../vendor/pezkuwi-zombienet-sdk/crates/orchestrator"
 
-[dependencies.zombienet-prom-metrics-parser]
+[dependencies.pezkuwi-zombienet-prom-metrics-parser]
+workspace = true
 default-features = false
 optional = true
-path = "../vendor/pezkuwi-zombienet-sdk/crates/prom-metrics-parser"
 
-[dependencies.zombienet-provider]
+[dependencies.pezkuwi-zombienet-provider]
+workspace = true
 default-features = false
 optional = true
-path = "../vendor/pezkuwi-zombienet-sdk/crates/provider"
 
-[dependencies.zombienet-sdk]
+[dependencies.pezkuwi-zombienet-sdk]
+workspace = true
 default-features = false
 optional = true
-path = "../vendor/pezkuwi-zombienet-sdk/crates/sdk"
 
-[dependencies.zombienet-support]
+[dependencies.pezkuwi-zombienet-support]
+workspace = true
 default-features = false
 optional = true
-path = "../vendor/pezkuwi-zombienet-sdk/crates/support"
 
 [package.metadata.docs.rs]
 features = ["node", "runtime-full"]
diff --git a/umbrella/src/lib.rs b/umbrella/src/lib.rs
index 3650e652..3b45a26f 100644
--- a/umbrella/src/lib.rs
+++ b/umbrella/src/lib.rs
@@ -16,11 +16,11 @@
 pub use asset_test_pezutils;
 
 /// Assets common utilities.
-#[cfg(feature = "assets-common")]
-pub use assets_common;
+#[cfg(feature = "pez-assets-common")]
+pub use pez_assets_common;
 
 /// A no-std/Bizinikiwi compatible library to construct binary merkle tree.
-#[cfg(feature = "binary-merkle-tree")]
+#[cfg(feature = "pez-binary-merkle-tree")]
 pub use pez_binary_merkle_tree;
 
 /// Converting BIP39 entropy to valid Bizinikiwi (sr25519) SecretKeys.
@@ -40,8 +40,8 @@ pub use bizinikiwi_frame_rpc_support;
 pub use bizinikiwi_frame_rpc_system;
 
 /// Endpoint to expose Prometheus metrics.
-#[cfg(feature = "bizinikiwi-prometheus-endpoint")]
-pub use bizinikiwi_prometheus_endpoint;
+#[cfg(feature = "prometheus-endpoint")]
+pub use prometheus_endpoint;
 
 /// Shared JSON-RPC client.
 #[cfg(feature = "bizinikiwi-rpc-client")]
@@ -52,52 +52,52 @@ pub use bizinikiwi_rpc_client;
 pub use bizinikiwi_state_trie_migration_rpc;
 
 /// Bizinikiwi utility: A library and CLI tool for sending transactions to Pezkuwi blockchain, enabling developers to test and monitor transaction scenarios.
-#[cfg(feature = "bizinikiwi-txtesttool")]
-pub use bizinikiwi_txtesttool;
+#[cfg(feature = "txtesttool")]
+pub use txtesttool;
 
 /// Utility for building WASM binaries.
 #[cfg(feature = "bizinikiwi-wasm-builder")]
 pub use bizinikiwi_wasm_builder;
 
 /// A common interface for describing what a bridge pezpallet should be able to do.
-#[cfg(feature = "bp-header-pez-chain")]
-pub use bp_header_pez_chain;
+#[cfg(feature = "pezbp-header-pez-chain")]
+pub use pezbp_header_pez_chain;
 
 /// Primitives of messages module.
-#[cfg(feature = "bp-messages")]
-pub use bp_messages;
+#[cfg(feature = "pezbp-messages")]
+pub use pezbp_messages;
 
 /// Primitives of Pezkuwi-like runtime.
-#[cfg(feature = "bp-pezkuwi-core")]
-pub use bp_pezkuwi_core;
+#[cfg(feature = "pezbp-pezkuwi-core")]
+pub use pezbp_pezkuwi_core;
 
 /// Primitives of relayers module.
-#[cfg(feature = "bp-relayers")]
-pub use bp_relayers;
+#[cfg(feature = "pezbp-relayers")]
+pub use pezbp_relayers;
 
 /// Utilities for testing bizinikiwi-based runtime bridge code.
-#[cfg(feature = "bp-test-utils")]
-pub use bp_test_utils;
+#[cfg(feature = "pezbp-test-utils")]
+pub use pezbp_test_utils;
 
 /// Primitives of teyrchains module.
-#[cfg(feature = "bp-teyrchains")]
-pub use bp_teyrchains;
+#[cfg(feature = "pezbp-teyrchains")]
+pub use pezbp_teyrchains;
 
 /// Primitives of the xcm-bridge-hub pezpallet.
-#[cfg(feature = "bp-xcm-bridge-hub")]
-pub use bp_xcm_bridge_hub;
+#[cfg(feature = "pezbp-xcm-bridge-hub")]
+pub use pezbp_xcm_bridge_hub;
 
 /// Primitives of the xcm-bridge-hub fee pezpallet.
-#[cfg(feature = "bp-xcm-bridge-hub-router")]
-pub use bp_xcm_bridge_hub_router;
+#[cfg(feature = "pezbp-xcm-bridge-hub-router")]
+pub use pezbp_xcm_bridge_hub_router;
 
 /// Bridge hub common utilities.
-#[cfg(feature = "bridge-hub-common")]
-pub use bridge_hub_common;
+#[cfg(feature = "pezbridge-hub-common")]
+pub use pezbridge_hub_common;
 
 /// An externalities provided environment that can load itself from remote nodes or cached files.
-#[cfg(feature = "frame-remote-externalities")]
-pub use frame_remote_externalities;
+#[cfg(feature = "remote-externalities")]
+pub use remote_externalities;
 
 /// Interfaces for Ethereum standards.
 #[cfg(feature = "pez-ethereum-standards")]
@@ -120,12 +120,12 @@ pub use pez_slot_range_helper;
 pub use pez_subkey;
 
 /// Stick logs together with the TraceID as provided by tempo.
-#[cfg(feature = "pez-tracing-gum")]
-pub use pez_tracing_gum;
+#[cfg(feature = "gum")]
+pub use gum;
 
 /// Generate an overseer including builder pattern and message wrapper from a single annotated struct definition.
-#[cfg(feature = "pez-tracing-gum-proc-macro")]
-pub use pez_tracing_gum_proc_macro;
+#[cfg(feature = "gum-proc-macro")]
+pub use gum_proc_macro;
 
 /// Primitives that may be used at (bridges) runtime level.
 #[cfg(feature = "pezbp-runtime")]
@@ -508,16 +508,16 @@ pub use pezkuwi_runtime_metrics;
 pub use pezkuwi_runtime_teyrchains;
 
 /// The single package to get you started with building frame pallets and runtimes.
-#[cfg(feature = "pezkuwi-sdk-frame")]
-pub use pezkuwi_sdk_frame;
+#[cfg(feature = "pezframe")]
+pub use pezframe;
 
 /// Utils to tie different Pezkuwi components together and allow instantiation of a node.
 #[cfg(feature = "pezkuwi-service")]
 pub use pezkuwi_service;
 
 /// Registry of known SS58 address types - PezkuwiChain fork.
-#[cfg(feature = "pezsp-ss58-registry")]
-pub use pezsp_ss58_registry;
+#[cfg(feature = "ss58-registry")]
+pub use ss58_registry;
 
 /// Statement Distribution Subsystem.
 #[cfg(feature = "pezkuwi-statement-distribution")]
@@ -703,9 +703,9 @@ pub use pezpallet_collective_content;
 #[cfg(feature = "pezpallet-contracts")]
 pub use pezpallet_contracts;
 
-/// A mock network for testing pezpallet-contracts.
-#[cfg(feature = "pezpallet-contracts-mock-network")]
-pub use pezpallet_contracts_mock_network;
+// A mock network for testing pezpallet-contracts.
+// #[cfg(feature = "pezpallet-contracts-mock-network")]
+// pub use pezpallet_contracts_mock_network;  // Test-only crate, not published
 
 /// Procedural macros used in pallet_contracts.
 #[cfg(feature = "pezpallet-contracts-proc-macro")]
@@ -1512,32 +1512,32 @@ pub use pezsp_wasm_interface;
 pub use pezsp_weights;
 
 /// Utility for building chain-specification files for Bizinikiwi-based runtimes based on `pezsp-genesis-builder`.
-#[cfg(feature = "pezstaging-chain-spec-builder")]
-pub use pezstaging_chain_spec_builder;
+#[cfg(feature = "chain-spec-builder")]
+pub use chain_spec_builder;
 
 /// Bizinikiwi node block inspection tool.
-#[cfg(feature = "pezstaging-node-inspect")]
-pub use pezstaging_node_inspect;
+#[cfg(feature = "node-inspect")]
+pub use node_inspect;
 
 /// Pallet to store the teyrchain ID.
-#[cfg(feature = "pezstaging-teyrchain-info")]
-pub use pezstaging_teyrchain_info;
+#[cfg(feature = "teyrchain-info")]
+pub use teyrchain_info;
 
 /// Tracking allocator to control the amount of memory consumed by the process.
-#[cfg(feature = "pezstaging-tracking-allocator")]
-pub use pezstaging_tracking_allocator;
+#[cfg(feature = "tracking-allocator")]
+pub use tracking_allocator;
 
 /// The basic XCM datastructures.
-#[cfg(feature = "pezstaging-xcm")]
-pub use pezstaging_xcm;
+#[cfg(feature = "xcm")]
+pub use xcm;
 
 /// Tools & types for building with XCM and its executor.
-#[cfg(feature = "pezstaging-xcm-builder")]
-pub use pezstaging_xcm_builder;
+#[cfg(feature = "xcm-builder")]
+pub use xcm_builder;
 
 /// An abstract and configurable XCM message executor.
-#[cfg(feature = "pezstaging-xcm-executor")]
-pub use pezstaging_xcm_executor;
+#[cfg(feature = "xcm-executor")]
+pub use xcm_executor;
 
 /// Common constants for Testnet Teyrchains runtimes.
 #[cfg(feature = "testnet-teyrchains-constants")]
@@ -1567,26 +1567,26 @@ pub use xcm_pez_simulator;
 #[cfg(feature = "xcm-runtime-pezapis")]
 pub use xcm_runtime_pezapis;
 
-/// Zombienet sdk config builder, allow to build a network configuration.
-#[cfg(feature = "zombienet-configuration")]
-pub use zombienet_configuration;
+/// Pezkuwi Zombienet configuration builder for network testing.
+#[cfg(feature = "pezkuwi-zombienet-configuration")]
+pub use pezkuwi_zombienet_configuration;
 
-/// Zombienet Orchestrator, drive network spwan through providers.
-#[cfg(feature = "zombienet-orchestrator")]
-pub use zombienet_orchestrator;
+/// Pezkuwi Zombienet orchestrator - Network spawn through providers.
+#[cfg(feature = "pezkuwi-zombienet-orchestrator")]
+pub use pezkuwi_zombienet_orchestrator;
 
-/// Prometheus metric parser, parse metrics provided by internal prometheus server.
-#[cfg(feature = "zombienet-prom-metrics-parser")]
-pub use zombienet_prom_metrics_parser;
+/// Pezkuwi Zombienet Prometheus metrics parser.
+#[cfg(feature = "pezkuwi-zombienet-prom-metrics-parser")]
+pub use pezkuwi_zombienet_prom_metrics_parser;
 
-/// Zombienet provider, implement the logic to run the nodes in the native provider.
-#[cfg(feature = "zombienet-provider")]
-pub use zombienet_provider;
+/// Pezkuwi Zombienet provider - Node execution through native provider.
+#[cfg(feature = "pezkuwi-zombienet-provider")]
+pub use pezkuwi_zombienet_provider;
 
-/// Zombienet SDK, entrypoint for using zombienet.
-#[cfg(feature = "zombienet-sdk")]
-pub use zombienet_sdk;
+/// Pezkuwi Zombienet SDK - Network orchestration for Pezkuwi blockchain testing.
+#[cfg(feature = "pezkuwi-zombienet-sdk")]
+pub use pezkuwi_zombienet_sdk;
 
-/// Support crates with common traits/structs and helpers.
-#[cfg(feature = "zombienet-support")]
-pub use zombienet_support;
+/// Pezkuwi Zombienet support - Common traits, structs and helpers.
+#[cfg(feature = "pezkuwi-zombienet-support")]
+pub use pezkuwi_zombienet_support;
diff --git a/vendor/pezkuwi-subxt/signer/Cargo.toml b/vendor/pezkuwi-subxt/signer/Cargo.toml
index 8e8e8328..922d3d9f 100644
--- a/vendor/pezkuwi-subxt/signer/Cargo.toml
+++ b/vendor/pezkuwi-subxt/signer/Cargo.toml
@@ -88,7 +88,7 @@ secp256k1 = { workspace = true, optional = true, features = [
 	"alloc",
 	"recovery",
 ] }
-secrecy = { workspace = true }
+secrecy = { workspace = true, features = ["alloc"] }
 sha2 = { workspace = true }
 thiserror = { workspace = true }
 zeroize = { workspace = true }
diff --git a/vendor/pezkuwi-zombienet-sdk/crates/configuration/Cargo.toml b/vendor/pezkuwi-zombienet-sdk/crates/configuration/Cargo.toml
index fbd8b93a..c966c17a 100644
--- a/vendor/pezkuwi-zombienet-sdk/crates/configuration/Cargo.toml
+++ b/vendor/pezkuwi-zombienet-sdk/crates/configuration/Cargo.toml
@@ -1,5 +1,5 @@
 [package]
-name = "zombienet-configuration"
+name = "pezkuwi-zombienet-configuration"
 version.workspace = true
 authors.workspace = true
 edition.workspace = true
@@ -7,8 +7,8 @@ rust-version.workspace = true
 publish = true
 license.workspace = true
 repository.workspace = true
-description = "Zombienet sdk config builder, allow to build a network configuration"
-keywords = ["configuration", "sdk", "zombienet"]
+description = "Pezkuwi Zombienet configuration builder for network testing"
+keywords = ["configuration", "sdk", "zombienet", "pezkuwi"]
 
 [dependencies]
 anyhow = { workspace = true }
@@ -17,7 +17,7 @@ multiaddr = { workspace = true }
 regex = { workspace = true }
 reqwest = { workspace = true }
 serde = { workspace = true, features = ["derive"] }
-serde_json = { workspace = true }
+serde_json = { workspace = true, default-features = true }
 thiserror = { workspace = true }
 tokio = { workspace = true, features = ["fs"] }
 toml = { workspace = true }
diff --git a/vendor/pezkuwi-zombienet-sdk/crates/orchestrator/Cargo.toml b/vendor/pezkuwi-zombienet-sdk/crates/orchestrator/Cargo.toml
index bd0c0902..fabf1ae9 100644
--- a/vendor/pezkuwi-zombienet-sdk/crates/orchestrator/Cargo.toml
+++ b/vendor/pezkuwi-zombienet-sdk/crates/orchestrator/Cargo.toml
@@ -1,5 +1,5 @@
 [package]
-name = "zombienet-orchestrator"
+name = "pezkuwi-zombienet-orchestrator"
 version.workspace = true
 authors.workspace = true
 edition.workspace = true
@@ -7,8 +7,8 @@ rust-version.workspace = true
 publish = true
 license.workspace = true
 repository.workspace = true
-description = "Zombienet Orchestrator, drive network spwan through providers"
-keywords = ["orchestrator", "sdk", "zombienet"]
+description = "Pezkuwi Zombienet orchestrator - Network spawn through providers"
+keywords = ["orchestrator", "sdk", "zombienet", "pezkuwi"]
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
@@ -31,7 +31,7 @@ rand = { workspace = true }
 regex = { workspace = true }
 reqwest = { workspace = true }
 serde = { workspace = true, features = ["derive"] }
-serde_json = { workspace = true, features = ["arbitrary_precision"] }
+serde_json = { workspace = true, default-features = true, features = ["arbitrary_precision"] }
 sha2 = { workspace = true, default-features = false }
 thiserror = { workspace = true }
 tokio = { workspace = true, features = ["time"] }
diff --git a/vendor/pezkuwi-zombienet-sdk/crates/prom-metrics-parser/Cargo.toml b/vendor/pezkuwi-zombienet-sdk/crates/prom-metrics-parser/Cargo.toml
index bd93bf87..916f647d 100644
--- a/vendor/pezkuwi-zombienet-sdk/crates/prom-metrics-parser/Cargo.toml
+++ b/vendor/pezkuwi-zombienet-sdk/crates/prom-metrics-parser/Cargo.toml
@@ -1,5 +1,5 @@
 [package]
-name = "zombienet-prom-metrics-parser"
+name = "pezkuwi-zombienet-prom-metrics-parser"
 version.workspace = true
 authors.workspace = true
 edition.workspace = true
@@ -7,8 +7,8 @@ rust-version.workspace = true
 publish = true
 license.workspace = true
 repository.workspace = true
-description = "Prometheus metric parser, parse metrics provided by internal prometheus server"
-keywords = ["prometheus", "zombienet"]
+description = "Pezkuwi Zombienet Prometheus metrics parser"
+keywords = ["prometheus", "zombienet", "pezkuwi", "metrics"]
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
diff --git a/vendor/pezkuwi-zombienet-sdk/crates/provider/Cargo.toml b/vendor/pezkuwi-zombienet-sdk/crates/provider/Cargo.toml
index 31008821..86bd5498 100644
--- a/vendor/pezkuwi-zombienet-sdk/crates/provider/Cargo.toml
+++ b/vendor/pezkuwi-zombienet-sdk/crates/provider/Cargo.toml
@@ -1,5 +1,5 @@
 [package]
-name = "zombienet-provider"
+name = "pezkuwi-zombienet-provider"
 version.workspace = true
 authors.workspace = true
 edition.workspace = true
@@ -7,8 +7,8 @@ rust-version.workspace = true
 publish = true
 license.workspace = true
 repository.workspace = true
-description = "Zombienet provider, implement the logic to run the nodes in the native provider"
-keywords = ["native", "provider", "zombienet"]
+description = "Pezkuwi Zombienet provider - Node execution through native provider"
+keywords = ["native", "provider", "zombienet", "pezkuwi"]
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
@@ -25,7 +25,7 @@ nix = { workspace = true, features = ["signal"] }
 regex = { workspace = true }
 reqwest = { workspace = true }
 serde = { workspace = true, features = ["derive", "rc"] }
-serde_json = { workspace = true }
+serde_json = { workspace = true, default-features = true }
 serde_yaml = { workspace = true }
 sha2 = { workspace = true }
 tar = { workspace = true }
diff --git a/vendor/pezkuwi-zombienet-sdk/crates/sdk/Cargo.toml b/vendor/pezkuwi-zombienet-sdk/crates/sdk/Cargo.toml
index e11ace9a..97c06de8 100644
--- a/vendor/pezkuwi-zombienet-sdk/crates/sdk/Cargo.toml
+++ b/vendor/pezkuwi-zombienet-sdk/crates/sdk/Cargo.toml
@@ -1,5 +1,5 @@
 [package]
-name = "zombienet-sdk"
+name = "pezkuwi-zombienet-sdk"
 version.workspace = true
 authors.workspace = true
 edition.workspace = true
@@ -7,8 +7,8 @@ rust-version.workspace = true
 publish = true
 license.workspace = true
 repository.workspace = true
-description = "Zombienet SDK, entrypoint for using zombienet"
-keywords = ["sdk", "zombienet"]
+description = "Pezkuwi Zombienet SDK - Network orchestration for Pezkuwi blockchain testing"
+keywords = ["sdk", "zombienet", "pezkuwi", "blockchain"]
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
@@ -29,5 +29,5 @@ support = { workspace = true }
 [dev-dependencies]
 k8s-openapi = { workspace = true, features = ["v1_28"] }
 kube = { workspace = true, features = ["runtime", "ws"] }
-serde_json = { workspace = true }
+serde_json = { workspace = true, default-features = true }
 tracing-subscriber = { workspace = true }
diff --git a/vendor/pezkuwi-zombienet-sdk/crates/support/Cargo.toml b/vendor/pezkuwi-zombienet-sdk/crates/support/Cargo.toml
index 25374d5c..bee4cc54 100644
--- a/vendor/pezkuwi-zombienet-sdk/crates/support/Cargo.toml
+++ b/vendor/pezkuwi-zombienet-sdk/crates/support/Cargo.toml
@@ -1,5 +1,5 @@
 [package]
-name = "zombienet-support"
+name = "pezkuwi-zombienet-support"
 version.workspace = true
 authors.workspace = true
 edition.workspace = true
@@ -7,8 +7,8 @@ rust-version.workspace = true
 publish = true
 license.workspace = true
 repository.workspace = true
-description = "Support crates with common traits/structs and helpers"
-keywords = ["zombienet"]
+description = "Pezkuwi Zombienet support - Common traits, structs and helpers"
+keywords = ["zombienet", "pezkuwi", "support"]
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
@@ -21,7 +21,7 @@ nix = { workspace = true, features = ["signal"] }
 rand = { workspace = true }
 regex = { workspace = true }
 reqwest = { workspace = true }
-serde_json = { workspace = true }
+serde_json = { workspace = true, default-features = true }
 thiserror = { workspace = true }
 tokio = { workspace = true, features = ["full"] }
 tracing = { workspace = true }