diff --git a/rpc/Cargo.toml b/rpc/Cargo.toml
index ee030f1a2379..18b531fc35df 100644
--- a/rpc/Cargo.toml
+++ b/rpc/Cargo.toml
@@ -8,10 +8,10 @@ edition = "2018"
 client = { package = "substrate-client", git = "https://github.com/paritytech/substrate", branch = "polkadot-master" }
 jsonrpc-core = "14.0.3"
 polkadot-primitives = { path = "../primitives" }
-sr-primitives = { git = "https://github.com/paritytech/substrate", branch = "polkadot-master"  }
-substrate-rpc = { git = "https://github.com/paritytech/substrate", branch = "polkadot-master" }
-transaction_pool = { package = "sc-transaction-pool", git = "https://github.com/paritytech/substrate", branch = "polkadot-master"  }
-frame-system-rpc = { package = "frame-system-rpc-runtime-api", git = "https://github.com/paritytech/substrate", branch = "polkadot-master"  }
-pallet-transaction-payment-rpc = { git = "https://github.com/paritytech/substrate", branch = "polkadot-master" }
+sr-primitives = { git = "https://github.com/paritytech/substrate", branch = "master"  }
+substrate-rpc = { git = "https://github.com/paritytech/substrate", branch = "master" }
+transaction_pool = { package = "sc-transaction-pool", git = "https://github.com/paritytech/substrate", branch = "master"  }
+substrate-frame-rpc-system = { git = "https://github.com/paritytech/substrate", branch = "master"  }
+pallet-transaction-payment-rpc = { git = "https://github.com/paritytech/substrate", branch = "master" }
 polkadot-runtime = { path = "../runtime" }
 
diff --git a/rpc/src/lib.rs b/rpc/src/lib.rs
index 5c645243a220..f2442c3b4347 100644
--- a/rpc/src/lib.rs
+++ b/rpc/src/lib.rs
@@ -33,11 +33,11 @@ pub fn create<C, P>(client: Arc<C>, pool: Arc<Pool<P>>) -> RpcExtension where
 	C: ProvideRuntimeApi,
 	C: client::blockchain::HeaderBackend<Block>,
 	C: Send + Sync + 'static,
-	C::Api: frame_system_rpc::AccountNonceApi<Block, AccountId, Nonce>,
+	C::Api: substrate_frame_rcp_system::AccountNonceApi<Block, AccountId, Nonce>,
 	C::Api: pallet_transaction_payment_rpc::TransactionPaymentRuntimeApi<Block, Balance, UncheckedExtrinsic>,
 	P: ChainApi + Sync + Send + 'static,
 {
-	use frame_system_rpc::{System, SystemApi};
+	use substrate_frame_rcp_system::{System, SystemApi};
 	use pallet_transaction_payment_rpc::{TransactionPayment, TransactionPaymentApi};
 
 	let mut io = jsonrpc_core::IoHandler::default();
diff --git a/service/Cargo.toml b/service/Cargo.toml
index c67bfd3d00cf..b1e6228a9ce9 100644
--- a/service/Cargo.toml
+++ b/service/Cargo.toml
@@ -19,26 +19,26 @@ polkadot-runtime = { path = "../runtime" }
 polkadot-executor = { path = "../executor" }
 polkadot-network = { path = "../network"  }
 polkadot-rpc = { path = "../rpc" }
-sr-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-master" }
-sr-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-master" }
-sr-primitives = { git = "https://github.com/paritytech/substrate", branch = "polkadot-master" }
-primitives = { package = "substrate-primitives", git = "https://github.com/paritytech/substrate", branch = "polkadot-master" }
-client = { package = "substrate-client", git = "https://github.com/paritytech/substrate", branch = "polkadot-master" }
-client-api = { package = "substrate-client-api", git = "https://github.com/paritytech/substrate", branch = "polkadot-master" }
-client-db = { package = "substrate-client-db", git = "https://github.com/paritytech/substrate", branch = "polkadot-master" }
-substrate-executor = { git = "https://github.com/paritytech/substrate", branch = "polkadot-master" }
-substrate-network = { git = "https://github.com/paritytech/substrate", branch = "polkadot-master" }
-consensus_common = { package = "substrate-consensus-common", git = "https://github.com/paritytech/substrate", branch = "polkadot-master" }
-grandpa = { package = "substrate-finality-grandpa", git = "https://github.com/paritytech/substrate", branch = "polkadot-master" }
-grandpa_primitives = { package = "substrate-finality-grandpa-primitives", git = "https://github.com/paritytech/substrate", branch = "polkadot-master" }
-inherents = { package = "substrate-inherents", git = "https://github.com/paritytech/substrate", branch = "polkadot-master" }
-service = { package = "substrate-service", git = "https://github.com/paritytech/substrate", branch = "polkadot-master" }
-telemetry = { package = "substrate-telemetry", git = "https://github.com/paritytech/substrate", branch = "polkadot-master" }
-transaction_pool = { package = "sc-transaction-pool", git = "https://github.com/paritytech/substrate", branch = "polkadot-master" }
-substrate-keystore = { git = "https://github.com/paritytech/substrate", branch = "polkadot-master" }
-pallet-babe = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-master" }
-pallet-staking = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-master" }
-im-online = { package = "pallet-im-online", git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-master" }
-authority-discovery = { package = "substrate-authority-discovery", git = "https://github.com/paritytech/substrate", branch = "polkadot-master" }
-babe = { package = "substrate-consensus-babe", git = "https://github.com/paritytech/substrate", branch = "polkadot-master" }
-babe-primitives = { package = "substrate-consensus-babe-primitives", git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-master" }
+sr-io = { git = "https://github.com/paritytech/substrate", branch = "master" }
+sr-api = { git = "https://github.com/paritytech/substrate", branch = "master" }
+sr-primitives = { git = "https://github.com/paritytech/substrate", branch = "master" }
+primitives = { package = "substrate-primitives", git = "https://github.com/paritytech/substrate", branch = "master" }
+client = { package = "substrate-client", git = "https://github.com/paritytech/substrate", branch = "master" }
+client-api = { package = "substrate-client-api", git = "https://github.com/paritytech/substrate", branch = "master" }
+client-db = { package = "substrate-client-db", git = "https://github.com/paritytech/substrate", branch = "master" }
+substrate-executor = { git = "https://github.com/paritytech/substrate", branch = "master" }
+substrate-network = { git = "https://github.com/paritytech/substrate", branch = "master" }
+consensus_common = { package = "substrate-consensus-common", git = "https://github.com/paritytech/substrate", branch = "master" }
+grandpa = { package = "substrate-finality-grandpa", git = "https://github.com/paritytech/substrate", branch = "master" }
+grandpa_primitives = { package = "substrate-finality-grandpa-primitives", git = "https://github.com/paritytech/substrate", branch = "master" }
+inherents = { package = "substrate-inherents", git = "https://github.com/paritytech/substrate", branch = "master" }
+service = { package = "substrate-service", git = "https://github.com/paritytech/substrate", branch = "master" }
+telemetry = { package = "substrate-telemetry", git = "https://github.com/paritytech/substrate", branch = "master" }
+transaction_pool = { package = "sc-transaction-pool", git = "https://github.com/paritytech/substrate", branch = "master" }
+substrate-keystore = { git = "https://github.com/paritytech/substrate", branch = "master" }
+pallet-babe = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "master" }
+pallet-staking = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "master" }
+im-online = { package = "pallet-im-online", git = "https://github.com/paritytech/substrate", default-features = false, branch = "master" }
+authority-discovery = { package = "substrate-authority-discovery", git = "https://github.com/paritytech/substrate", branch = "master" }
+babe = { package = "substrate-consensus-babe", git = "https://github.com/paritytech/substrate", branch = "master" }
+babe-primitives = { package = "substrate-consensus-babe-primitives", git = "https://github.com/paritytech/substrate", default-features = false, branch = "master" }
diff --git a/validation/Cargo.toml b/validation/Cargo.toml
index 043abdb2be73..956770098354 100644
--- a/validation/Cargo.toml
+++ b/validation/Cargo.toml
@@ -21,17 +21,17 @@ parachain = { package = "polkadot-parachain", path = "../parachain" }
 polkadot-primitives = { path = "../primitives" }
 polkadot-runtime = { path = "../runtime" }
 table = { package = "polkadot-statement-table", path = "../statement-table" }
-grandpa = { package = "substrate-finality-grandpa", git = "https://github.com/paritytech/substrate", branch = "polkadot-master" }
-inherents = { package = "substrate-inherents", git = "https://github.com/paritytech/substrate", branch = "polkadot-master" }
-consensus = { package = "substrate-consensus-common", git = "https://github.com/paritytech/substrate", branch = "polkadot-master" }
-primitives = { package = "substrate-primitives", git = "https://github.com/paritytech/substrate", branch = "polkadot-master" }
-transaction_pool = { package = "sc-transaction-pool", git = "https://github.com/paritytech/substrate", branch = "polkadot-master" }
-client = { package = "substrate-client", git = "https://github.com/paritytech/substrate", branch = "polkadot-master" }
-sr-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-master" }
-sp-timestamp = { git = "https://github.com/paritytech/substrate", branch = "polkadot-master" }
-block-builder = { package = "substrate-block-builder", git = "https://github.com/paritytech/substrate", branch = "polkadot-master" }
-trie = { package = "substrate-trie", git = "https://github.com/paritytech/substrate", branch = "polkadot-master" }
-runtime_primitives = { package = "sr-primitives", git = "https://github.com/paritytech/substrate", branch = "polkadot-master" }
+grandpa = { package = "substrate-finality-grandpa", git = "https://github.com/paritytech/substrate", branch = "master" }
+inherents = { package = "substrate-inherents", git = "https://github.com/paritytech/substrate", branch = "master" }
+consensus = { package = "substrate-consensus-common", git = "https://github.com/paritytech/substrate", branch = "master" }
+primitives = { package = "substrate-primitives", git = "https://github.com/paritytech/substrate", branch = "master" }
+transaction_pool = { package = "sc-transaction-pool", git = "https://github.com/paritytech/substrate", branch = "master" }
+client = { package = "substrate-client", git = "https://github.com/paritytech/substrate", branch = "master" }
+sr-api = { git = "https://github.com/paritytech/substrate", branch = "master" }
+sp-timestamp = { git = "https://github.com/paritytech/substrate", branch = "master" }
+block-builder = { package = "substrate-block-builder", git = "https://github.com/paritytech/substrate", branch = "master" }
+trie = { package = "substrate-trie", git = "https://github.com/paritytech/substrate", branch = "master" }
+runtime_primitives = { package = "sr-primitives", git = "https://github.com/paritytech/substrate", branch = "master" }
 bitvec = { version = "0.15.2", default-features = false, features = ["alloc"] }
 runtime_babe = { package = "pallet-babe", git = "https://github.com/paritytech/substrate", branch = "polkadot-master" }
 babe-primitives = { package = "substrate-consensus-babe-primitives", git = "https://github.com/paritytech/substrate", branch = "polkadot-master" }