diff --git a/substrate/.gitlab-ci.yml b/substrate/.gitlab-ci.yml index 8561cfac8c..e4226ee8ad 100644 --- a/substrate/.gitlab-ci.yml +++ b/substrate/.gitlab-ci.yml @@ -155,7 +155,7 @@ test-dependency-rules: &test-linux script: - .maintain/ensure-deps.sh -test-palette-staking: &test-palette-staking +test-frame-staking: &test-frame-staking stage: test <<: *docker-env variables: @@ -167,7 +167,7 @@ test-palette-staking: &test-palette-staking variables: - $DEPLOY_TAG script: - - cd palette/staking/ + - cd frame/staking/ - WASM_BUILD_NO_COLOR=1 time cargo test --release --verbose --no-default-features --features std - sccache -s diff --git a/substrate/.maintain/ensure-deps.sh b/substrate/.maintain/ensure-deps.sh index 690a0ac7cc..d8383cd313 100755 --- a/substrate/.maintain/ensure-deps.sh +++ b/substrate/.maintain/ensure-deps.sh @@ -6,19 +6,19 @@ # [top-lvl-dir]<[crate-name-prefix] # For instance no crate within `./client` directory -# is allowed to import any crate with a directory path containing `palette`. -# Such rule is just: `client(client: Arc, pool: Arc>) -> jsonrpc_core::IoHa C: ProvideRuntimeApi, C: client::blockchain::HeaderBackend, C: Send + Sync + 'static, - C::Api: palette_system_rpc::AccountNonceApi, + C::Api: frame_system_rpc::AccountNonceApi, C::Api: pallet_contracts_rpc::ContractsRuntimeApi, C::Api: pallet_transaction_payment_rpc::TransactionPaymentRuntimeApi, P: ChainApi + Sync + Send + 'static, M: jsonrpc_core::Metadata + Default, { - use palette_system_rpc::{System, SystemApi}; + use frame_system_rpc::{System, SystemApi}; use pallet_contracts_rpc::{Contracts, ContractsApi}; use pallet_transaction_payment_rpc::{TransactionPayment, TransactionPaymentApi}; diff --git a/substrate/bin/node/runtime/Cargo.toml b/substrate/bin/node/runtime/Cargo.toml index fd2ef694e6..3844fa336f 100644 --- a/substrate/bin/node/runtime/Cargo.toml +++ b/substrate/bin/node/runtime/Cargo.toml @@ -30,37 +30,37 @@ substrate-session = { path = "../../../primitives/session", default-features = f tx-pool-api = { package = "substrate-transaction-pool-runtime-api", path = "../../../primitives/transaction-pool/runtime-api", default-features = false } version = { package = "sr-version", path = "../../../primitives/sr-version", default-features = false } -# palette dependencies -authority-discovery = { package = "pallet-authority-discovery", path = "../../../palette/authority-discovery", default-features = false } -authorship = { package = "pallet-authorship", path = "../../../palette/authorship", default-features = false } -babe = { package = "pallet-babe", path = "../../../palette/babe", default-features = false } -balances = { package = "pallet-balances", path = "../../../palette/balances", default-features = false } -collective = { package = "pallet-collective", path = "../../../palette/collective", default-features = false } -contracts = { package = "pallet-contracts", path = "../../../palette/contracts", default-features = false } -contracts-rpc-runtime-api = { package = "pallet-contracts-rpc-runtime-api", path = "../../../palette/contracts/rpc/runtime-api/", default-features = false } -democracy = { package = "pallet-democracy", path = "../../../palette/democracy", default-features = false } -elections-phragmen = { package = "pallet-elections-phragmen", path = "../../../palette/elections-phragmen", default-features = false } -executive = { package = "palette-executive", path = "../../../palette/executive", default-features = false } -finality-tracker = { package = "pallet-finality-tracker", path = "../../../palette/finality-tracker", default-features = false } -grandpa = { package = "pallet-grandpa", path = "../../../palette/grandpa", default-features = false } -im-online = { package = "pallet-im-online", path = "../../../palette/im-online", default-features = false } -indices = { package = "pallet-indices", path = "../../../palette/indices", default-features = false } -membership = { package = "pallet-membership", path = "../../../palette/membership", default-features = false } -nicks = { package = "pallet-nicks", path = "../../../palette/nicks", default-features = false } -offences = { package = "pallet-offences", path = "../../../palette/offences", default-features = false } -randomness-collective-flip = { package = "pallet-randomness-collective-flip", path = "../../../palette/randomness-collective-flip", default-features = false } -session = { package = "pallet-session", path = "../../../palette/session", default-features = false, features = ["historical"] } -staking = { package = "pallet-staking", path = "../../../palette/staking", default-features = false } -pallet-staking-reward-curve = { path = "../../../palette/staking/reward-curve"} -sudo = { package = "pallet-sudo", path = "../../../palette/sudo", default-features = false } -support = { package = "palette-support", path = "../../../palette/support", default-features = false } -system = { package = "palette-system", path = "../../../palette/system", default-features = false } -system-rpc-runtime-api = { package = "palette-system-rpc-runtime-api", path = "../../../palette/system/rpc/runtime-api/", default-features = false } -timestamp = { package = "pallet-timestamp", path = "../../../palette/timestamp", default-features = false } -treasury = { package = "pallet-treasury", path = "../../../palette/treasury", default-features = false } -utility = { package = "palette-utility", path = "../../../palette/utility", default-features = false } -transaction-payment = { package = "pallet-transaction-payment", path = "../../../palette/transaction-payment", default-features = false } -transaction-payment-rpc-runtime-api = { package = "pallet-transaction-payment-rpc-runtime-api", path = "../../../palette/transaction-payment/rpc/runtime-api/", default-features = false } +# frame dependencies +authority-discovery = { package = "pallet-authority-discovery", path = "../../../frame/authority-discovery", default-features = false } +authorship = { package = "pallet-authorship", path = "../../../frame/authorship", default-features = false } +babe = { package = "pallet-babe", path = "../../../frame/babe", default-features = false } +balances = { package = "pallet-balances", path = "../../../frame/balances", default-features = false } +collective = { package = "pallet-collective", path = "../../../frame/collective", default-features = false } +contracts = { package = "pallet-contracts", path = "../../../frame/contracts", default-features = false } +contracts-rpc-runtime-api = { package = "pallet-contracts-rpc-runtime-api", path = "../../../frame/contracts/rpc/runtime-api/", default-features = false } +democracy = { package = "pallet-democracy", path = "../../../frame/democracy", default-features = false } +elections-phragmen = { package = "pallet-elections-phragmen", path = "../../../frame/elections-phragmen", default-features = false } +executive = { package = "frame-executive", path = "../../../frame/executive", default-features = false } +finality-tracker = { package = "pallet-finality-tracker", path = "../../../frame/finality-tracker", default-features = false } +grandpa = { package = "pallet-grandpa", path = "../../../frame/grandpa", default-features = false } +im-online = { package = "pallet-im-online", path = "../../../frame/im-online", default-features = false } +indices = { package = "pallet-indices", path = "../../../frame/indices", default-features = false } +membership = { package = "pallet-membership", path = "../../../frame/membership", default-features = false } +nicks = { package = "pallet-nicks", path = "../../../frame/nicks", default-features = false } +offences = { package = "pallet-offences", path = "../../../frame/offences", default-features = false } +randomness-collective-flip = { package = "pallet-randomness-collective-flip", path = "../../../frame/randomness-collective-flip", default-features = false } +session = { package = "pallet-session", path = "../../../frame/session", default-features = false, features = ["historical"] } +staking = { package = "pallet-staking", path = "../../../frame/staking", default-features = false } +pallet-staking-reward-curve = { path = "../../../frame/staking/reward-curve"} +sudo = { package = "pallet-sudo", path = "../../../frame/sudo", default-features = false } +support = { package = "frame-support", path = "../../../frame/support", default-features = false } +system = { package = "frame-system", path = "../../../frame/system", default-features = false } +system-rpc-runtime-api = { package = "frame-system-rpc-runtime-api", path = "../../../frame/system/rpc/runtime-api/", default-features = false } +timestamp = { package = "pallet-timestamp", path = "../../../frame/timestamp", default-features = false } +treasury = { package = "pallet-treasury", path = "../../../frame/treasury", default-features = false } +utility = { package = "frame-utility", path = "../../../frame/utility", default-features = false } +transaction-payment = { package = "pallet-transaction-payment", path = "../../../frame/transaction-payment", default-features = false } +transaction-payment-rpc-runtime-api = { package = "pallet-transaction-payment-rpc-runtime-api", path = "../../../frame/transaction-payment/rpc/runtime-api/", default-features = false } [build-dependencies] wasm-builder-runner = { package = "substrate-wasm-builder-runner", path = "../../../client/utils/wasm-builder-runner", version = "1.0.4" } diff --git a/substrate/bin/node/testing/Cargo.toml b/substrate/bin/node/testing/Cargo.toml index 18e735d946..2bfdd58a65 100644 --- a/substrate/bin/node/testing/Cargo.toml +++ b/substrate/bin/node/testing/Cargo.toml @@ -6,26 +6,26 @@ description = "Test utilities for Substrate node." edition = "2018" [dependencies] -balances = { package = "pallet-balances", path = "../../../palette/balances" } +balances = { package = "pallet-balances", path = "../../../frame/balances" } client = { package = "substrate-client", path = "../../../client/" } codec = { package = "parity-scale-codec", version = "1.0.0" } -contracts = { package = "pallet-contracts", path = "../../../palette/contracts" } -grandpa = { package = "pallet-grandpa", path = "../../../palette/grandpa" } -indices = { package = "pallet-indices", path = "../../../palette/indices" } +contracts = { package = "pallet-contracts", path = "../../../frame/contracts" } +grandpa = { package = "pallet-grandpa", path = "../../../frame/grandpa" } +indices = { package = "pallet-indices", path = "../../../frame/indices" } keyring = { package = "substrate-keyring", path = "../../../primitives/keyring" } node-executor = { path = "../executor" } node-primitives = { path = "../primitives" } node-runtime = { path = "../runtime" } primitives = { package = "substrate-primitives", path = "../../../primitives/core" } runtime-io = { package = "sr-io", path = "../../../primitives/sr-io" } -runtime_support = { package = "palette-support", path = "../../../palette/support" } -session = { package = "pallet-session", path = "../../../palette/session" } +runtime_support = { package = "frame-support", path = "../../../frame/support" } +session = { package = "pallet-session", path = "../../../frame/session" } sr-primitives = { path = "../../../primitives/sr-primitives" } -staking = { package = "pallet-staking", path = "../../../palette/staking" } +staking = { package = "pallet-staking", path = "../../../frame/staking" } substrate-executor = { path = "../../../client/executor" } -system = { package = "palette-system", path = "../../../palette/system" } +system = { package = "frame-system", path = "../../../frame/system" } test-client = { package = "substrate-test-client", path = "../../../test/utils/client" } -timestamp = { package = "pallet-timestamp", path = "../../../palette/timestamp" } -transaction-payment = { package = "pallet-transaction-payment", path = "../../../palette/transaction-payment" } -treasury = { package = "pallet-treasury", path = "../../../palette/treasury" } +timestamp = { package = "pallet-timestamp", path = "../../../frame/timestamp" } +transaction-payment = { package = "pallet-transaction-payment", path = "../../../frame/transaction-payment" } +treasury = { package = "pallet-treasury", path = "../../../frame/treasury" } wabt = "0.9.2" diff --git a/substrate/bin/subkey/Cargo.toml b/substrate/bin/subkey/Cargo.toml index 2060e5c640..978ecc709f 100644 --- a/substrate/bin/subkey/Cargo.toml +++ b/substrate/bin/subkey/Cargo.toml @@ -17,9 +17,9 @@ substrate-bip39 = "0.3.1" hex = "0.3.2" hex-literal = "0.2.1" codec = { package = "parity-scale-codec", version = "1.0.0" } -system = { package = "palette-system", path = "../../palette/system" } -balances = { package = "pallet-balances", path = "../../palette/balances" } -transaction-payment = { package = "pallet-transaction-payment", path = "../../palette/transaction-payment" } +system = { package = "frame-system", path = "../../frame/system" } +balances = { package = "pallet-balances", path = "../../frame/balances" } +transaction-payment = { package = "pallet-transaction-payment", path = "../../frame/transaction-payment" } [features] bench = [] diff --git a/substrate/docs/CODEOWNERS b/substrate/docs/CODEOWNERS index eeda13a0f0..5ad126c3f6 100644 --- a/substrate/docs/CODEOWNERS +++ b/substrate/docs/CODEOWNERS @@ -40,22 +40,22 @@ /primitives/rpc/ @tomusdrw # GRANDPA, BABE, consensus stuff -/palette/babe/ @andresilva @DemiMarie-parity -/palette/grandpa/ @andresilva @DemiMarie-parity +/frame/babe/ @andresilva @DemiMarie-parity +/frame/grandpa/ @andresilva @DemiMarie-parity /client/finality-grandpa/ @andresilva @DemiMarie-parity /client/consensus/babe/ @andresilva @DemiMarie-parity /client/consensus/slots/ @andresilva @DemiMarie-parity # Contracts -/palette/contracts/ @pepyakin @thiolliere @jimpo -/palette/contracts/src/wasm/runtime.rs @Robbepop +/frame/contracts/ @pepyakin @thiolliere @jimpo +/frame/contracts/src/wasm/runtime.rs @Robbepop # Inflation points -/palette/staking/src/inflation.rs @thiolliere +/frame/staking/src/inflation.rs @thiolliere # NPoS and Governance -/palette/staking/ @kianenigma -/palette/election/ @kianenigma +/frame/staking/ @kianenigma +/frame/election/ @kianenigma # End to end testing of substrate node /bin/node/executor/ @kianenigma @@ -64,4 +64,4 @@ /primitives/sr-primitives/src/weights.rs @kianenigma # Support crates -/palette/support/ @thiolliere @kianenigma +/frame/support/ @thiolliere @kianenigma diff --git a/substrate/docs/README.adoc b/substrate/docs/README.adoc index 9c33d28913..76e640db9b 100644 --- a/substrate/docs/README.adoc +++ b/substrate/docs/README.adoc @@ -24,7 +24,7 @@ Substrate is designed for use in one of three ways: **1. Trivial**: By running the Substrate binary `substrate` and configuring it with a genesis block that includes the current demonstration runtime. In this case, you just build Substrate, configure a JSON file, and launch your own blockchain. This affords you the least amount of customizability, primarily allowing you to change the genesis parameters of the various included runtime modules such as balances, staking, block-period, fees, and governance. -**2. Modular**: By hacking together modules from the Substrate Runtime Module Library (SRML) into a new runtime and possibly altering or reconfiguring the Substrate client's block authoring logic. This affords you a very large amount of freedom over your blockchain's logic, letting you change datatypes, add or remove modules, and crucially, add your own modules. Much can be changed without touching the block authoring logic (since it is generic). If this is the case, then the existing Substrate binary can be used for block authoring and syncing. If the block authoring logic needs to be tweaked, then a new, altered block authoring binary must be built as a separate project and used by validators. This is how the Polkadot relay chain is built and should suffice for almost all circumstances in the near to mid-term. +**2. Modular**: By hacking together pallets built with Substrate FRAME into a new runtime and possibly altering or reconfiguring the Substrate client's block authoring logic. This affords you a very large amount of freedom over your blockchain's logic, letting you change datatypes, add or remove modules, and crucially, add your own modules. Much can be changed without touching the block authoring logic (since it is generic). If this is the case, then the existing Substrate binary can be used for block authoring and syncing. If the block authoring logic needs to be tweaked, then a new, altered block authoring binary must be built as a separate project and used by validators. This is how the Polkadot relay chain is built and should suffice for almost all circumstances in the near to mid-term. **3. Generic**: The entire SRML can be ignored and the entire runtime designed and implemented from scratch. If desired, this can be done in a language other than Rust, provided it can target WebAssembly. If the runtime can be made compatible with the existing client's block authoring logic, then you can simply construct a new genesis block from your Wasm blob and launch your chain with the existing Rust-based Substrate client. If not, then you'll need to alter the client's block authoring logic accordingly. This is probably a useless option for most projects right now, but provides complete flexibility allowing for a long-term, far-reaching upgrade path for the Substrate paradigm. @@ -43,9 +43,9 @@ Extrinsics in Substrate are pieces of information from "the outside world" that Inherents, meanwhile, are not passed on the network and are not signed. They represent data which describes the environment but which cannot call upon anything to prove it such as a signature. Rather they are assumed to be "true" simply because a sufficiently large number of validators have agreed on them being reasonable. -To give an example, there is the timestamp inherent, which sets the current timestamp of the block. This is not a fixed part of Substrate, but does come as part of the Substrate Runtime Module Library to be used as desired. No signature could fundamentally prove that a block were authored at a given time in quite the same way that a signature can "prove" the desire to spend some particular funds. Rather, it is the business of each validator to ensure that they believe the timestamp is set to something reasonable before they agree that the block candidate is valid. +To give an example, there is the timestamp inherent, which sets the current timestamp of the block. This is not a fixed part of Substrate, but does come as part of FRAME to be used as desired. No signature could fundamentally prove that a block were authored at a given time in quite the same way that a signature can "prove" the desire to spend some particular funds. Rather, it is the business of each validator to ensure that they believe the timestamp is set to something reasonable before they agree that the block candidate is valid. -Other examples include the parachain-heads extrinsic in Polkadot and the "note-missed-proposal" extrinsic used in the Substrate Runtime Module Library to determine and punish or deactivate offline validators. +Other examples include the parachain-heads extrinsic in Polkadot and the "note-missed-proposal" extrinsic used in FRAME to determine and punish or deactivate offline validators. === Runtime and API @@ -78,7 +78,7 @@ impl_runtime_apis! { === Inherent Extrinsics -The Substrate Runtime Module Library includes functionality for timestamps and slashing. If used, these rely on "trusted" external information being passed in via inherent extrinsics. The Substrate reference block authoring client software will expect to be able to call into the runtime API with collated data (in the case of the reference Substrate authoring client, this is merely the current timestamp and which nodes were offline) in order to return the appropriate extrinsics ready for inclusion. If new inherent extrinsic types and data are to be used in a modified runtime, then it is this function (and its argument type) that would change. +Substrate FRAME includes functionality for timestamps and slashing. If used, these rely on "trusted" external information being passed in via inherent extrinsics. The Substrate reference block authoring client software will expect to be able to call into the runtime API with collated data (in the case of the reference Substrate authoring client, this is merely the current timestamp and which nodes were offline) in order to return the appropriate extrinsics ready for inclusion. If new inherent extrinsic types and data are to be used in a modified runtime, then it is this function (and its argument type) that would change. === Block-authoring Logic @@ -444,11 +444,13 @@ substrate-trie * Substrate Runtime [source, shell] sr-api, sr-io, sr-primitives, sr-sandbox, sr-std, sr-version -* Substrate Runtime Module Library (SRML) +* FRAME Core [source, shell] -pallet-assets, pallet-balances, palette-consensus, pallet-contracts, palette-council, pallet-democracy, pallet-example, -palette-executive, palette-metadata, pallet-session, pallet-staking, palette-support, palette-system, pallet-timestamp, -pallet-treasury +frame-metadata, frame-support, frame-system +* FRAME Pallets +[source, shell] +pallet-assets, pallet-balances, pallet-consensus, pallet-contracts, pallet-council, pallet-democracy, pallet-example, +frame-executive, pallet-session, pallet-staking, pallet-timestamp, pallet-treasury * Node [source, shell] node-cli, node-consensus, node-executor, node-network, node-primitives, node-runtime diff --git a/substrate/docs/Structure.adoc b/substrate/docs/Structure.adoc index bcd2f32d8f..cff2b48019 100644 --- a/substrate/docs/Structure.adoc +++ b/substrate/docs/Structure.adoc @@ -11,7 +11,7 @@ Substrate is split into multiple levels with increasing opinion and decreasing f * primitives * client -* PALETTE (formerly `srml`) +* FRAME (formerly `srml`) Putting all these components together we have: @@ -35,23 +35,23 @@ In the lowest level, Substrate defines primitives, interfaces and traits to impl * _found in_: `/client` * _crates prefix_: `substrate-` * _constraints_: -** crates may not (dev-)depend on any `palette-`-crates +** crates may not (dev-)depend on any `frame-`-crates In the client you can find a set of crates to construct the outer substrate-node, implementing outer runtime interfaces, thus it depends on `runtime`. It provides the outer building blocks like transaction queue, networking layer, database backend, full* and light-client support. -=== PALETTE (formerly `srml`) +=== FRAME (formerly `srml`) -* _found in_: `/palette` -* _crates prefix_: `palette-` and `pallet-` +* _found in_: `/frame` +* _crates prefix_: `frame-` and `pallet-` * _constraints_: ** all crates that go on chain must be `[no_std]` ** must not (dev-)depend on anything in `/client` -PALETTE is a set of modules that implement specific transition functions and features one might want to have in their runtime. +FRAME is a set of modules that implement specific transition functions and features one might want to have in their runtime. -_Pallets_ are individual modules within _Palette._ These are containers that host domain-specific logic. They have the `pallet-` prefix. For example, `pallet-staking` contains logic for staking tokens. +_Pallets_ are individual modules within _FRAME._ These are containers that host domain-specific logic. They have the `pallet-` prefix. For example, `pallet-staking` contains logic for staking tokens. -There are a few crates with the `palette-` prefix. These do not contain domain-specific logic. Rather, they are the main Palette support infrastructure. These are: +There are a few crates with the `frame-` prefix. These do not contain domain-specific logic. Rather, they are the main FRAME support infrastructure. These are: - Executive - Metadata @@ -79,7 +79,7 @@ We also provide some binaries pulling from the components creating full applicat * _found in_: `/bin/node` -The default (testing) application pulling together our recommended setup of substrate-client with a wasm-contracts-supporting palette-runtime. The node pulls it all together, constructs the (upgradable) runtime, and wires up the client around it. You can find an example client, which includes a full wasm-contracts chain in `node`. This is also what is being built and run if you do `cargo run`. +The default (testing) application pulling together our recommended setup of substrate-client with a wasm-contracts-supporting frame-runtime. The node pulls it all together, constructs the (upgradable) runtime, and wires up the client around it. You can find an example client, which includes a full wasm-contracts chain in `node`. This is also what is being built and run if you do `cargo run`. ==== Node Template @@ -99,7 +99,7 @@ Subkey is a client library to generate keys and sign transactions to send to a s .... +---------------+ +----------------+ | | | | -| runtime +<------+ palette | +| runtime +<------+ frame | | | | | +------+-----+--+ +-------------+--+ ^ ^ ^ diff --git a/substrate/palette/assets/Cargo.toml b/substrate/frame/assets/Cargo.toml similarity index 83% rename from substrate/palette/assets/Cargo.toml rename to substrate/frame/assets/Cargo.toml index 9872334a63..e24a3b187a 100644 --- a/substrate/palette/assets/Cargo.toml +++ b/substrate/frame/assets/Cargo.toml @@ -10,9 +10,9 @@ codec = { package = "parity-scale-codec", version = "1.0.0", default-features = # Needed for various traits. In our case, `OnFinalize`. sr-primitives = { path = "../../primitives/sr-primitives", default-features = false } # Needed for type-safe access to storage DB. -support = { package = "palette-support", path = "../support", default-features = false } +support = { package = "frame-support", path = "../support", default-features = false } # `system` module provides us with all sorts of useful stuff and macros depend on it being around. -system = { package = "palette-system", path = "../system", default-features = false } +system = { package = "frame-system", path = "../system", default-features = false } [dev-dependencies] primitives = { package = "substrate-primitives", path = "../../primitives/core" } diff --git a/substrate/palette/assets/src/lib.rs b/substrate/frame/assets/src/lib.rs similarity index 99% rename from substrate/palette/assets/src/lib.rs rename to substrate/frame/assets/src/lib.rs index 6739c97340..6f4647ac2e 100644 --- a/substrate/palette/assets/src/lib.rs +++ b/substrate/frame/assets/src/lib.rs @@ -124,8 +124,8 @@ //! //! ## Related Modules //! -//! * [`System`](../palette_system/index.html) -//! * [`Support`](../palette_support/index.html) +//! * [`System`](../frame_system/index.html) +//! * [`Support`](../frame_support/index.html) // Ensure we're `no_std` when compiling for Wasm. #![cfg_attr(not(feature = "std"), no_std)] diff --git a/substrate/palette/aura/Cargo.toml b/substrate/frame/aura/Cargo.toml similarity index 90% rename from substrate/palette/aura/Cargo.toml rename to substrate/frame/aura/Cargo.toml index f047762153..a6700dbaf8 100644 --- a/substrate/palette/aura/Cargo.toml +++ b/substrate/frame/aura/Cargo.toml @@ -14,9 +14,9 @@ serde = { version = "1.0.101", optional = true } session = { package = "pallet-session", path = "../session", default-features = false } sr-primitives = { path = "../../primitives/sr-primitives", default-features = false } runtime-io ={ package = "sr-io", path = "../../primitives/sr-io", default-features = false } -support = { package = "palette-support", path = "../support", default-features = false } +support = { package = "frame-support", path = "../support", default-features = false } substrate-consensus-aura-primitives = { path = "../../primitives/consensus/aura", default-features = false} -system = { package = "palette-system", path = "../system", default-features = false } +system = { package = "frame-system", path = "../system", default-features = false } sp-timestamp = { package = "sp-timestamp", path = "../../primitives/timestamp", default-features = false } pallet-timestamp = { package = "pallet-timestamp", path = "../timestamp", default-features = false } diff --git a/substrate/palette/aura/src/lib.rs b/substrate/frame/aura/src/lib.rs similarity index 98% rename from substrate/palette/aura/src/lib.rs rename to substrate/frame/aura/src/lib.rs index 50ed4b0ab4..f1ae121e00 100644 --- a/substrate/palette/aura/src/lib.rs +++ b/substrate/frame/aura/src/lib.rs @@ -33,7 +33,7 @@ //! //! - [Timestamp](../pallet_timestamp/index.html): The Timestamp module is used in Aura to track //! consensus rounds (via `slots`). -//! - [Consensus](../palette_consensus/index.html): The Consensus module does not relate directly to Aura, +//! - [Consensus](../frame_consensus/index.html): The Consensus module does not relate directly to Aura, //! but serves to manage offline reporting by implementing `ProvideInherent` in a similar way. //! //! ## References diff --git a/substrate/palette/aura/src/mock.rs b/substrate/frame/aura/src/mock.rs similarity index 100% rename from substrate/palette/aura/src/mock.rs rename to substrate/frame/aura/src/mock.rs diff --git a/substrate/palette/aura/src/tests.rs b/substrate/frame/aura/src/tests.rs similarity index 100% rename from substrate/palette/aura/src/tests.rs rename to substrate/frame/aura/src/tests.rs diff --git a/substrate/palette/authority-discovery/Cargo.toml b/substrate/frame/authority-discovery/Cargo.toml similarity index 89% rename from substrate/palette/authority-discovery/Cargo.toml rename to substrate/frame/authority-discovery/Cargo.toml index 4c367a42b4..c0961671d8 100644 --- a/substrate/palette/authority-discovery/Cargo.toml +++ b/substrate/frame/authority-discovery/Cargo.toml @@ -14,8 +14,8 @@ serde = { version = "1.0.101", optional = true } runtime-io = { package = "sr-io", path = "../../primitives/sr-io", default-features = false } session = { package = "pallet-session", path = "../session", default-features = false, features = [ "historical" ] } sr-primitives = { path = "../../primitives/sr-primitives", default-features = false } -support = { package = "palette-support", path = "../support", default-features = false } -system = { package = "palette-system", path = "../system", default-features = false } +support = { package = "frame-support", path = "../support", default-features = false } +system = { package = "frame-system", path = "../system", default-features = false } [dev-dependencies] sr-staking-primitives = { path = "../../primitives/sr-staking-primitives", default-features = false } diff --git a/substrate/palette/authority-discovery/src/lib.rs b/substrate/frame/authority-discovery/src/lib.rs similarity index 100% rename from substrate/palette/authority-discovery/src/lib.rs rename to substrate/frame/authority-discovery/src/lib.rs diff --git a/substrate/palette/authorship/Cargo.toml b/substrate/frame/authorship/Cargo.toml similarity index 86% rename from substrate/palette/authorship/Cargo.toml rename to substrate/frame/authorship/Cargo.toml index 1a1731f950..508df216ae 100644 --- a/substrate/palette/authorship/Cargo.toml +++ b/substrate/frame/authorship/Cargo.toml @@ -12,8 +12,8 @@ inherents = { package = "substrate-inherents", path = "../../primitives/inherent sp-authorship = { path = "../../primitives/authorship", default-features = false } rstd = { package = "sr-std", path = "../../primitives/sr-std", default-features = false } sr-primitives = { path = "../../primitives/sr-primitives", default-features = false } -support = { package = "palette-support", path = "../support", default-features = false } -system = { package = "palette-system", path = "../system", default-features = false } +support = { package = "frame-support", path = "../support", default-features = false } +system = { package = "frame-system", path = "../system", default-features = false } runtime-io ={ package = "sr-io", path = "../../primitives/sr-io", default-features = false } impl-trait-for-tuples = "0.1.3" diff --git a/substrate/palette/authorship/src/lib.rs b/substrate/frame/authorship/src/lib.rs similarity index 100% rename from substrate/palette/authorship/src/lib.rs rename to substrate/frame/authorship/src/lib.rs diff --git a/substrate/palette/babe/Cargo.toml b/substrate/frame/babe/Cargo.toml similarity index 91% rename from substrate/palette/babe/Cargo.toml rename to substrate/frame/babe/Cargo.toml index c6f224ec47..0ca099b845 100644 --- a/substrate/palette/babe/Cargo.toml +++ b/substrate/frame/babe/Cargo.toml @@ -12,8 +12,8 @@ inherents = { package = "substrate-inherents", path = "../../primitives/inherent rstd = { package = "sr-std", path = "../../primitives/sr-std", default-features = false } sr-primitives = { path = "../../primitives/sr-primitives", default-features = false } sr-staking-primitives = { path = "../../primitives/sr-staking-primitives", default-features = false } -support = { package = "palette-support", path = "../support", default-features = false } -system = { package = "palette-system", path = "../system", default-features = false } +support = { package = "frame-support", path = "../support", default-features = false } +system = { package = "frame-system", path = "../system", default-features = false } timestamp = { package = "pallet-timestamp", path = "../timestamp", default-features = false } sp-timestamp = { path = "../../primitives/timestamp", default-features = false } session = { package = "pallet-session", path = "../session", default-features = false } diff --git a/substrate/palette/babe/src/lib.rs b/substrate/frame/babe/src/lib.rs similarity index 100% rename from substrate/palette/babe/src/lib.rs rename to substrate/frame/babe/src/lib.rs diff --git a/substrate/palette/babe/src/mock.rs b/substrate/frame/babe/src/mock.rs similarity index 100% rename from substrate/palette/babe/src/mock.rs rename to substrate/frame/babe/src/mock.rs diff --git a/substrate/palette/babe/src/tests.rs b/substrate/frame/babe/src/tests.rs similarity index 100% rename from substrate/palette/babe/src/tests.rs rename to substrate/frame/babe/src/tests.rs diff --git a/substrate/palette/balances/Cargo.toml b/substrate/frame/balances/Cargo.toml similarity index 84% rename from substrate/palette/balances/Cargo.toml rename to substrate/frame/balances/Cargo.toml index 5fcbc5e0f0..a2a69902b0 100644 --- a/substrate/palette/balances/Cargo.toml +++ b/substrate/frame/balances/Cargo.toml @@ -10,8 +10,8 @@ safe-mix = { version = "1.0.0", default-features = false } codec = { package = "parity-scale-codec", version = "1.0.0", default-features = false, features = ["derive"] } rstd = { package = "sr-std", path = "../../primitives/sr-std", default-features = false } sr-primitives = { path = "../../primitives/sr-primitives", default-features = false } -support = { package = "palette-support", path = "../support", default-features = false } -system = { package = "palette-system", path = "../system", default-features = false } +support = { package = "frame-support", path = "../support", default-features = false } +system = { package = "frame-system", path = "../system", default-features = false } [dev-dependencies] runtime-io = { package = "sr-io", path = "../../primitives/sr-io" } diff --git a/substrate/palette/balances/src/lib.rs b/substrate/frame/balances/src/lib.rs similarity index 98% rename from substrate/palette/balances/src/lib.rs rename to substrate/frame/balances/src/lib.rs index 4c5df40e08..fd6ec99c07 100644 --- a/substrate/palette/balances/src/lib.rs +++ b/substrate/frame/balances/src/lib.rs @@ -75,16 +75,16 @@ //! The Balances module provides implementations for the following traits. If these traits provide the functionality //! that you need, then you can avoid coupling with the Balances module. //! -//! - [`Currency`](../palette_support/traits/trait.Currency.html): Functions for dealing with a +//! - [`Currency`](../frame_support/traits/trait.Currency.html): Functions for dealing with a //! fungible assets system. -//! - [`ReservableCurrency`](../palette_support/traits/trait.ReservableCurrency.html): +//! - [`ReservableCurrency`](../frame_support/traits/trait.ReservableCurrency.html): //! Functions for dealing with assets that can be reserved from an account. -//! - [`LockableCurrency`](../palette_support/traits/trait.LockableCurrency.html): Functions for +//! - [`LockableCurrency`](../frame_support/traits/trait.LockableCurrency.html): Functions for //! dealing with accounts that allow liquidity restrictions. -//! - [`Imbalance`](../palette_support/traits/trait.Imbalance.html): Functions for handling +//! - [`Imbalance`](../frame_support/traits/trait.Imbalance.html): Functions for handling //! imbalances between total issuance in the system and account balances. Must be used when a function //! creates new funds (e.g. a reward) or destroys some funds (e.g. a system fee). -//! - [`IsDeadAccount`](../palette_system/trait.IsDeadAccount.html): Determiner to say whether a +//! - [`IsDeadAccount`](../frame_system/trait.IsDeadAccount.html): Determiner to say whether a //! given account is unused. //! //! ## Interface diff --git a/substrate/palette/balances/src/mock.rs b/substrate/frame/balances/src/mock.rs similarity index 100% rename from substrate/palette/balances/src/mock.rs rename to substrate/frame/balances/src/mock.rs diff --git a/substrate/palette/balances/src/tests.rs b/substrate/frame/balances/src/tests.rs similarity index 100% rename from substrate/palette/balances/src/tests.rs rename to substrate/frame/balances/src/tests.rs diff --git a/substrate/palette/collective/Cargo.toml b/substrate/frame/collective/Cargo.toml similarity index 85% rename from substrate/palette/collective/Cargo.toml rename to substrate/frame/collective/Cargo.toml index a456b37e9e..ed1244ff23 100644 --- a/substrate/palette/collective/Cargo.toml +++ b/substrate/frame/collective/Cargo.toml @@ -12,8 +12,8 @@ primitives = { package = "substrate-primitives", path = "../../primitives/core" rstd = { package = "sr-std", path = "../../primitives/sr-std", default-features = false } runtime-io = { package = "sr-io", path = "../../primitives/sr-io", default-features = false } sr-primitives = { path = "../../primitives/sr-primitives", default-features = false } -support = { package = "palette-support", path = "../support", default-features = false } -system = { package = "palette-system", path = "../system", default-features = false } +support = { package = "frame-support", path = "../support", default-features = false } +system = { package = "frame-system", path = "../system", default-features = false } [dev-dependencies] hex-literal = "0.2.1" diff --git a/substrate/palette/collective/src/lib.rs b/substrate/frame/collective/src/lib.rs similarity index 100% rename from substrate/palette/collective/src/lib.rs rename to substrate/frame/collective/src/lib.rs diff --git a/substrate/palette/contracts/COMPLEXITY.md b/substrate/frame/contracts/COMPLEXITY.md similarity index 100% rename from substrate/palette/contracts/COMPLEXITY.md rename to substrate/frame/contracts/COMPLEXITY.md diff --git a/substrate/palette/contracts/Cargo.toml b/substrate/frame/contracts/Cargo.toml similarity index 90% rename from substrate/palette/contracts/Cargo.toml rename to substrate/frame/contracts/Cargo.toml index 52f6210cda..2b4536dd8a 100644 --- a/substrate/palette/contracts/Cargo.toml +++ b/substrate/frame/contracts/Cargo.toml @@ -15,8 +15,8 @@ sr-primitives = { path = "../../primitives/sr-primitives", default-features = fa runtime-io = { package = "sr-io", path = "../../primitives/sr-io", default-features = false } rstd = { package = "sr-std", path = "../../primitives/sr-std", default-features = false } sandbox = { package = "sr-sandbox", path = "../../primitives/sr-sandbox", default-features = false } -support = { package = "palette-support", path = "../support", default-features = false } -system = { package = "palette-system", path = "../system", default-features = false } +support = { package = "frame-support", path = "../support", default-features = false } +system = { package = "frame-system", path = "../system", default-features = false } [dev-dependencies] wabt = "0.9.2" diff --git a/substrate/palette/contracts/rpc/Cargo.toml b/substrate/frame/contracts/rpc/Cargo.toml similarity index 100% rename from substrate/palette/contracts/rpc/Cargo.toml rename to substrate/frame/contracts/rpc/Cargo.toml diff --git a/substrate/palette/contracts/rpc/runtime-api/Cargo.toml b/substrate/frame/contracts/rpc/runtime-api/Cargo.toml similarity index 100% rename from substrate/palette/contracts/rpc/runtime-api/Cargo.toml rename to substrate/frame/contracts/rpc/runtime-api/Cargo.toml diff --git a/substrate/palette/contracts/rpc/runtime-api/src/lib.rs b/substrate/frame/contracts/rpc/runtime-api/src/lib.rs similarity index 100% rename from substrate/palette/contracts/rpc/runtime-api/src/lib.rs rename to substrate/frame/contracts/rpc/runtime-api/src/lib.rs diff --git a/substrate/palette/contracts/rpc/src/lib.rs b/substrate/frame/contracts/rpc/src/lib.rs similarity index 100% rename from substrate/palette/contracts/rpc/src/lib.rs rename to substrate/frame/contracts/rpc/src/lib.rs diff --git a/substrate/palette/contracts/src/account_db.rs b/substrate/frame/contracts/src/account_db.rs similarity index 100% rename from substrate/palette/contracts/src/account_db.rs rename to substrate/frame/contracts/src/account_db.rs diff --git a/substrate/palette/contracts/src/exec.rs b/substrate/frame/contracts/src/exec.rs similarity index 100% rename from substrate/palette/contracts/src/exec.rs rename to substrate/frame/contracts/src/exec.rs diff --git a/substrate/palette/contracts/src/gas.rs b/substrate/frame/contracts/src/gas.rs similarity index 100% rename from substrate/palette/contracts/src/gas.rs rename to substrate/frame/contracts/src/gas.rs diff --git a/substrate/palette/contracts/src/lib.rs b/substrate/frame/contracts/src/lib.rs similarity index 100% rename from substrate/palette/contracts/src/lib.rs rename to substrate/frame/contracts/src/lib.rs diff --git a/substrate/palette/contracts/src/rent.rs b/substrate/frame/contracts/src/rent.rs similarity index 100% rename from substrate/palette/contracts/src/rent.rs rename to substrate/frame/contracts/src/rent.rs diff --git a/substrate/palette/contracts/src/tests.rs b/substrate/frame/contracts/src/tests.rs similarity index 100% rename from substrate/palette/contracts/src/tests.rs rename to substrate/frame/contracts/src/tests.rs diff --git a/substrate/palette/contracts/src/wasm/code_cache.rs b/substrate/frame/contracts/src/wasm/code_cache.rs similarity index 100% rename from substrate/palette/contracts/src/wasm/code_cache.rs rename to substrate/frame/contracts/src/wasm/code_cache.rs diff --git a/substrate/palette/contracts/src/wasm/env_def/macros.rs b/substrate/frame/contracts/src/wasm/env_def/macros.rs similarity index 100% rename from substrate/palette/contracts/src/wasm/env_def/macros.rs rename to substrate/frame/contracts/src/wasm/env_def/macros.rs diff --git a/substrate/palette/contracts/src/wasm/env_def/mod.rs b/substrate/frame/contracts/src/wasm/env_def/mod.rs similarity index 100% rename from substrate/palette/contracts/src/wasm/env_def/mod.rs rename to substrate/frame/contracts/src/wasm/env_def/mod.rs diff --git a/substrate/palette/contracts/src/wasm/mod.rs b/substrate/frame/contracts/src/wasm/mod.rs similarity index 100% rename from substrate/palette/contracts/src/wasm/mod.rs rename to substrate/frame/contracts/src/wasm/mod.rs diff --git a/substrate/palette/contracts/src/wasm/prepare.rs b/substrate/frame/contracts/src/wasm/prepare.rs similarity index 100% rename from substrate/palette/contracts/src/wasm/prepare.rs rename to substrate/frame/contracts/src/wasm/prepare.rs diff --git a/substrate/palette/contracts/src/wasm/runtime.rs b/substrate/frame/contracts/src/wasm/runtime.rs similarity index 100% rename from substrate/palette/contracts/src/wasm/runtime.rs rename to substrate/frame/contracts/src/wasm/runtime.rs diff --git a/substrate/palette/democracy/Cargo.toml b/substrate/frame/democracy/Cargo.toml similarity index 84% rename from substrate/palette/democracy/Cargo.toml rename to substrate/frame/democracy/Cargo.toml index 98f9eed993..b607e8af73 100644 --- a/substrate/palette/democracy/Cargo.toml +++ b/substrate/frame/democracy/Cargo.toml @@ -11,8 +11,8 @@ codec = { package = "parity-scale-codec", version = "1.0.0", default-features = rstd = { package = "sr-std", path = "../../primitives/sr-std", default-features = false } runtime-io = { package = "sr-io", path = "../../primitives/sr-io", default-features = false } sr-primitives = { path = "../../primitives/sr-primitives", default-features = false } -support = { package = "palette-support", path = "../support", default-features = false } -system = { package = "palette-system", path = "../system", default-features = false } +support = { package = "frame-support", path = "../support", default-features = false } +system = { package = "frame-system", path = "../system", default-features = false } [dev-dependencies] primitives = { package = "substrate-primitives", path = "../../primitives/core" } diff --git a/substrate/palette/democracy/src/lib.rs b/substrate/frame/democracy/src/lib.rs similarity index 100% rename from substrate/palette/democracy/src/lib.rs rename to substrate/frame/democracy/src/lib.rs diff --git a/substrate/palette/democracy/src/vote_threshold.rs b/substrate/frame/democracy/src/vote_threshold.rs similarity index 100% rename from substrate/palette/democracy/src/vote_threshold.rs rename to substrate/frame/democracy/src/vote_threshold.rs diff --git a/substrate/palette/elections-phragmen/Cargo.toml b/substrate/frame/elections-phragmen/Cargo.toml similarity index 84% rename from substrate/palette/elections-phragmen/Cargo.toml rename to substrate/frame/elections-phragmen/Cargo.toml index fb13161bfc..bf17df628d 100644 --- a/substrate/palette/elections-phragmen/Cargo.toml +++ b/substrate/frame/elections-phragmen/Cargo.toml @@ -8,8 +8,8 @@ edition = "2018" codec = { package = "parity-scale-codec", version = "1.0.0", default-features = false, features = ["derive"] } sr-primitives = { path = "../../primitives/sr-primitives", default-features = false } phragmen = { package = "substrate-phragmen", path = "../../primitives/phragmen", default-features = false } -support = { package = "palette-support", path = "../support", default-features = false } -system = { package = "palette-system", path = "../system", default-features = false } +support = { package = "frame-support", path = "../support", default-features = false } +system = { package = "frame-system", path = "../system", default-features = false } rstd = { package = "sr-std", path = "../../primitives/sr-std", default-features = false } [dev-dependencies] diff --git a/substrate/palette/elections-phragmen/src/lib.rs b/substrate/frame/elections-phragmen/src/lib.rs similarity index 100% rename from substrate/palette/elections-phragmen/src/lib.rs rename to substrate/frame/elections-phragmen/src/lib.rs diff --git a/substrate/palette/elections/Cargo.toml b/substrate/frame/elections/Cargo.toml similarity index 85% rename from substrate/palette/elections/Cargo.toml rename to substrate/frame/elections/Cargo.toml index ca5ba6bc17..62986f758d 100644 --- a/substrate/palette/elections/Cargo.toml +++ b/substrate/frame/elections/Cargo.toml @@ -12,8 +12,8 @@ primitives = { package = "substrate-primitives", path = "../../primitives/core" rstd = { package = "sr-std", path = "../../primitives/sr-std", default-features = false } runtime-io = { package = "sr-io", path = "../../primitives/sr-io", default-features = false } sr-primitives = { path = "../../primitives/sr-primitives", default-features = false } -support = { package = "palette-support", path = "../support", default-features = false } -system = { package = "palette-system", path = "../system", default-features = false } +support = { package = "frame-support", path = "../support", default-features = false } +system = { package = "frame-system", path = "../system", default-features = false } [dev-dependencies] hex-literal = "0.2.1" diff --git a/substrate/palette/elections/src/lib.rs b/substrate/frame/elections/src/lib.rs similarity index 100% rename from substrate/palette/elections/src/lib.rs rename to substrate/frame/elections/src/lib.rs diff --git a/substrate/palette/elections/src/mock.rs b/substrate/frame/elections/src/mock.rs similarity index 100% rename from substrate/palette/elections/src/mock.rs rename to substrate/frame/elections/src/mock.rs diff --git a/substrate/palette/elections/src/tests.rs b/substrate/frame/elections/src/tests.rs similarity index 100% rename from substrate/palette/elections/src/tests.rs rename to substrate/frame/elections/src/tests.rs diff --git a/substrate/palette/evm/Cargo.toml b/substrate/frame/evm/Cargo.toml similarity index 88% rename from substrate/palette/evm/Cargo.toml rename to substrate/frame/evm/Cargo.toml index ca6ed080e8..2318fe59a4 100644 --- a/substrate/palette/evm/Cargo.toml +++ b/substrate/frame/evm/Cargo.toml @@ -7,8 +7,8 @@ edition = "2018" [dependencies] serde = { version = "1.0.101", optional = true, features = ["derive"] } codec = { package = "parity-scale-codec", version = "1.0.0", default-features = false } -support = { package = "palette-support", path = "../support", default-features = false } -system = { package = "palette-system", path = "../system", default-features = false } +support = { package = "frame-support", path = "../support", default-features = false } +system = { package = "frame-system", path = "../system", default-features = false } timestamp = { package = "pallet-timestamp", path = "../timestamp", default-features = false } balances = { package = "pallet-balances", path = "../balances", default-features = false } primitives = { package = "substrate-primitives", path = "../../primitives/core", default-features = false } diff --git a/substrate/palette/evm/src/backend.rs b/substrate/frame/evm/src/backend.rs similarity index 100% rename from substrate/palette/evm/src/backend.rs rename to substrate/frame/evm/src/backend.rs diff --git a/substrate/palette/evm/src/lib.rs b/substrate/frame/evm/src/lib.rs similarity index 100% rename from substrate/palette/evm/src/lib.rs rename to substrate/frame/evm/src/lib.rs diff --git a/substrate/palette/example/Cargo.toml b/substrate/frame/example/Cargo.toml similarity index 83% rename from substrate/palette/example/Cargo.toml rename to substrate/frame/example/Cargo.toml index c2d0d2a6b2..bcad107a07 100644 --- a/substrate/palette/example/Cargo.toml +++ b/substrate/frame/example/Cargo.toml @@ -7,8 +7,8 @@ edition = "2018" [dependencies] serde = { version = "1.0.101", optional = true } codec = { package = "parity-scale-codec", version = "1.0.0", default-features = false } -support = { package = "palette-support", path = "../support", default-features = false } -system = { package = "palette-system", path = "../system", default-features = false } +support = { package = "frame-support", path = "../support", default-features = false } +system = { package = "frame-system", path = "../system", default-features = false } balances = { package = "pallet-balances", path = "../balances", default-features = false } sr-primitives = { path = "../../primitives/sr-primitives", default-features = false } rstd = { package = "sr-std", path = "../../primitives/sr-std", default-features = false } diff --git a/substrate/palette/example/src/lib.rs b/substrate/frame/example/src/lib.rs similarity index 99% rename from substrate/palette/example/src/lib.rs rename to substrate/frame/example/src/lib.rs index 42e8f28b76..8956de7249 100644 --- a/substrate/palette/example/src/lib.rs +++ b/substrate/frame/example/src/lib.rs @@ -49,8 +49,8 @@ //! //! ### Documentation Template:
//! -//! Copy and paste this template from palette/example/src/lib.rs into file -//! `palette//src/lib.rs` of your own custom module and complete it. +//! Copy and paste this template from frame/example/src/lib.rs into file +//! `frame//src/lib.rs` of your own custom module and complete it. //! 

 //! // Add heading with custom module name
 //!
diff --git a/substrate/palette/executive/Cargo.toml b/substrate/frame/executive/Cargo.toml
similarity index 83%
rename from substrate/palette/executive/Cargo.toml
rename to substrate/frame/executive/Cargo.toml
index d0e3438772..bc10d71f42 100644
--- a/substrate/palette/executive/Cargo.toml
+++ b/substrate/frame/executive/Cargo.toml
@@ -1,5 +1,5 @@
 [package]
-name = "palette-executive"
+name = "frame-executive"
 version = "2.0.0"
 authors = ["Parity Technologies "]
 edition = "2018"
@@ -10,8 +10,8 @@ codec = { package = "parity-scale-codec", version = "1.0.0", default-features =
 rstd = { package = "sr-std", path = "../../primitives/sr-std", default-features = false }
 runtime-io ={ package = "sr-io", path = "../../primitives/sr-io", default-features = false }
 sr-primitives = { path = "../../primitives/sr-primitives", default-features = false }
-support = { package = "palette-support", path = "../support", default-features = false }
-system = { package = "palette-system", path = "../system", default-features = false }
+support = { package = "frame-support", path = "../support", default-features = false }
+system = { package = "frame-system", path = "../system", default-features = false }
 
 [dev-dependencies]
 hex-literal = "0.2.1"
diff --git a/substrate/palette/executive/src/lib.rs b/substrate/frame/executive/src/lib.rs
similarity index 99%
rename from substrate/palette/executive/src/lib.rs
rename to substrate/frame/executive/src/lib.rs
index 68ccf0f4e5..f6b50143a7 100644
--- a/substrate/palette/executive/src/lib.rs
+++ b/substrate/frame/executive/src/lib.rs
@@ -23,7 +23,7 @@
 //!
 //! The executive module is not a typical SRML module providing functionality around a specific feature.
 //! It is a cross-cutting framework component for the SRML. It works in conjunction with the
-//! [SRML System module](../palette_system/index.html) to perform these cross-cutting functions.
+//! [SRML System module](../frame_system/index.html) to perform these cross-cutting functions.
 //!
 //! The Executive module provides functions to:
 //!
@@ -51,7 +51,7 @@
 //!
 //! ```
 //! # use sr_primitives::generic;
-//! # use palette_executive as executive;
+//! # use frame_executive as executive;
 //! # pub struct UncheckedExtrinsic {};
 //! # pub struct Header {};
 //! # type Context = system::ChainContext;
diff --git a/substrate/palette/finality-tracker/Cargo.toml b/substrate/frame/finality-tracker/Cargo.toml
similarity index 86%
rename from substrate/palette/finality-tracker/Cargo.toml
rename to substrate/frame/finality-tracker/Cargo.toml
index c1b6214a6e..6fb767f0d0 100644
--- a/substrate/palette/finality-tracker/Cargo.toml
+++ b/substrate/frame/finality-tracker/Cargo.toml
@@ -11,8 +11,8 @@ inherents = { package = "substrate-inherents", path = "../../primitives/inherent
 rstd = { package = "sr-std", path = "../../primitives/sr-std", default-features = false }
 sr-primitives = { path = "../../primitives/sr-primitives", default-features = false }
 sp-finality-tracker = { path = "../../primitives/finality-tracker", default-features = false }
-support = { package = "palette-support", path = "../support", default-features = false }
-palette-system = { path = "../system", default-features = false }
+support = { package = "frame-support", path = "../support", default-features = false }
+frame-system = { path = "../system", default-features = false }
 impl-trait-for-tuples = "0.1.3"
 
 [dev-dependencies]
@@ -27,7 +27,7 @@ std = [
 	"rstd/std",
 	"support/std",
 	"sr-primitives/std",
-	"palette-system/std",
+	"frame-system/std",
 	"sp-finality-tracker/std",
 	"inherents/std",
 ]
diff --git a/substrate/palette/finality-tracker/src/lib.rs b/substrate/frame/finality-tracker/src/lib.rs
similarity index 97%
rename from substrate/palette/finality-tracker/src/lib.rs
rename to substrate/frame/finality-tracker/src/lib.rs
index e7922f3368..7d03f1bc7d 100644
--- a/substrate/palette/finality-tracker/src/lib.rs
+++ b/substrate/frame/finality-tracker/src/lib.rs
@@ -23,7 +23,7 @@ use sr_primitives::traits::{One, Zero, SaturatedConversion};
 use rstd::{prelude::*, result, cmp, vec};
 use support::{decl_module, decl_storage};
 use support::traits::Get;
-use palette_system::{ensure_none, Trait as SystemTrait};
+use frame_system::{ensure_none, Trait as SystemTrait};
 use sp_finality_tracker::{INHERENT_IDENTIFIER, FinalizedInherentData};
 
 pub const DEFAULT_WINDOW_SIZE: u32 = 101;
@@ -70,7 +70,7 @@ decl_module! {
 			ensure_none(origin)?;
 			assert!(!::Update::exists(), "Final hint must be updated only once in the block");
 			assert!(
-				palette_system::Module::::block_number() >= hint,
+				frame_system::Module::::block_number() >= hint,
 				"Finalized height above block number",
 			);
 			::Update::put(hint);
@@ -145,7 +145,7 @@ impl Module {
 		::Median::put(median);
 
 		if T::BlockNumber::from(our_window_size) == window_size {
-			let now = palette_system::Module::::block_number();
+			let now = frame_system::Module::::block_number();
 			let latency = T::ReportLatency::get();
 
 			// the delay is the latency plus half the window size.
@@ -200,7 +200,7 @@ mod tests {
 		traits::{BlakeTwo256, IdentityLookup, OnFinalize, Header as HeaderT},
 	};
 	use support::{assert_ok, impl_outer_origin, parameter_types};
-	use palette_system as system;
+	use frame_system as system;
 	use std::cell::RefCell;
 
 	#[derive(Clone, PartialEq, Debug)]
diff --git a/substrate/palette/generic-asset/Cargo.toml b/substrate/frame/generic-asset/Cargo.toml
similarity index 82%
rename from substrate/palette/generic-asset/Cargo.toml
rename to substrate/frame/generic-asset/Cargo.toml
index 9ba0d99af4..f8ea4c020f 100644
--- a/substrate/palette/generic-asset/Cargo.toml
+++ b/substrate/frame/generic-asset/Cargo.toml
@@ -9,8 +9,8 @@ serde = { version = "1.0.101", optional = true }
 codec = { package = "parity-scale-codec", version = "1.0.0", default-features = false, features = ["derive"] }
 rstd = { package = "sr-std", path = "../../primitives/sr-std", default-features = false }
 sr-primitives = { path = "../../primitives/sr-primitives", default-features = false }
-support = { package = "palette-support", path = "../support", default-features = false }
-system = { package = "palette-system", path = "../system", default-features = false }
+support = { package = "frame-support", path = "../support", default-features = false }
+system = { package = "frame-system", path = "../system", default-features = false }
 
 [dev-dependencies]
 runtime-io ={ package = "sr-io", path = "../../primitives/sr-io" }
diff --git a/substrate/palette/generic-asset/src/lib.rs b/substrate/frame/generic-asset/src/lib.rs
similarity index 100%
rename from substrate/palette/generic-asset/src/lib.rs
rename to substrate/frame/generic-asset/src/lib.rs
diff --git a/substrate/palette/generic-asset/src/mock.rs b/substrate/frame/generic-asset/src/mock.rs
similarity index 100%
rename from substrate/palette/generic-asset/src/mock.rs
rename to substrate/frame/generic-asset/src/mock.rs
diff --git a/substrate/palette/generic-asset/src/tests.rs b/substrate/frame/generic-asset/src/tests.rs
similarity index 100%
rename from substrate/palette/generic-asset/src/tests.rs
rename to substrate/frame/generic-asset/src/tests.rs
diff --git a/substrate/palette/grandpa/Cargo.toml b/substrate/frame/grandpa/Cargo.toml
similarity index 88%
rename from substrate/palette/grandpa/Cargo.toml
rename to substrate/frame/grandpa/Cargo.toml
index 1118261c1d..f086968a22 100644
--- a/substrate/palette/grandpa/Cargo.toml
+++ b/substrate/frame/grandpa/Cargo.toml
@@ -12,8 +12,8 @@ substrate-finality-grandpa-primitives = { path = "../../primitives/finality-gran
 rstd = { package = "sr-std", path = "../../primitives/sr-std", default-features = false }
 sr-primitives = { path = "../../primitives/sr-primitives", default-features = false }
 sr-staking-primitives = { path = "../../primitives/sr-staking-primitives", default-features = false }
-support = { package = "palette-support", path = "../support", default-features = false }
-system = { package = "palette-system", path = "../system", default-features = false }
+support = { package = "frame-support", path = "../support", default-features = false }
+system = { package = "frame-system", path = "../system", default-features = false }
 session = { package = "pallet-session", path = "../session", default-features = false }
 finality-tracker = { package = "pallet-finality-tracker", path = "../finality-tracker", default-features = false }
 
diff --git a/substrate/palette/grandpa/src/lib.rs b/substrate/frame/grandpa/src/lib.rs
similarity index 100%
rename from substrate/palette/grandpa/src/lib.rs
rename to substrate/frame/grandpa/src/lib.rs
diff --git a/substrate/palette/grandpa/src/mock.rs b/substrate/frame/grandpa/src/mock.rs
similarity index 100%
rename from substrate/palette/grandpa/src/mock.rs
rename to substrate/frame/grandpa/src/mock.rs
diff --git a/substrate/palette/grandpa/src/tests.rs b/substrate/frame/grandpa/src/tests.rs
similarity index 100%
rename from substrate/palette/grandpa/src/tests.rs
rename to substrate/frame/grandpa/src/tests.rs
diff --git a/substrate/palette/im-online/Cargo.toml b/substrate/frame/im-online/Cargo.toml
similarity index 88%
rename from substrate/palette/im-online/Cargo.toml
rename to substrate/frame/im-online/Cargo.toml
index 8839f79d25..d0959da892 100644
--- a/substrate/palette/im-online/Cargo.toml
+++ b/substrate/frame/im-online/Cargo.toml
@@ -15,8 +15,8 @@ session = { package = "pallet-session", path = "../session", default-features =
 runtime-io = { package = "sr-io", path = "../../primitives/sr-io", default-features = false }
 sr-primitives = { path = "../../primitives/sr-primitives", default-features = false }
 sr-staking-primitives = { path = "../../primitives/sr-staking-primitives", default-features = false }
-support = { package = "palette-support", path = "../support", default-features = false }
-system = { package = "palette-system", path = "../system", default-features = false }
+support = { package = "frame-support", path = "../support", default-features = false }
+system = { package = "frame-system", path = "../system", default-features = false }
 
 [features]
 default = ["std", "session/historical"]
diff --git a/substrate/palette/im-online/src/lib.rs b/substrate/frame/im-online/src/lib.rs
similarity index 99%
rename from substrate/palette/im-online/src/lib.rs
rename to substrate/frame/im-online/src/lib.rs
index 79dc36d348..467596233b 100644
--- a/substrate/palette/im-online/src/lib.rs
+++ b/substrate/frame/im-online/src/lib.rs
@@ -131,7 +131,7 @@ pub mod ed25519 {
 
 /// The local storage database key under which the worker progress status
 /// is tracked.
-const DB_KEY: &[u8] = b"palette/im-online-worker-status";
+const DB_KEY: &[u8] = b"frame/im-online-worker-status";
 
 /// It's important to persist the worker state, since e.g. the
 /// server could be restarted while starting the gossip process, but before
diff --git a/substrate/palette/im-online/src/mock.rs b/substrate/frame/im-online/src/mock.rs
similarity index 100%
rename from substrate/palette/im-online/src/mock.rs
rename to substrate/frame/im-online/src/mock.rs
diff --git a/substrate/palette/im-online/src/tests.rs b/substrate/frame/im-online/src/tests.rs
similarity index 100%
rename from substrate/palette/im-online/src/tests.rs
rename to substrate/frame/im-online/src/tests.rs
diff --git a/substrate/palette/indices/Cargo.toml b/substrate/frame/indices/Cargo.toml
similarity index 85%
rename from substrate/palette/indices/Cargo.toml
rename to substrate/frame/indices/Cargo.toml
index c5206f617f..17fe99ed92 100644
--- a/substrate/palette/indices/Cargo.toml
+++ b/substrate/frame/indices/Cargo.toml
@@ -13,8 +13,8 @@ rstd = { package = "sr-std", path = "../../primitives/sr-std", default-features
 runtime-io = { package = "sr-io", path = "../../primitives/sr-io", default-features = false }
 sr-primitives = { path = "../../primitives/sr-primitives", default-features = false }
 primitives = { package = "substrate-primitives",  path = "../../primitives/core", default-features = false }
-support = { package = "palette-support", path = "../support", default-features = false }
-system = { package = "palette-system", path = "../system", default-features = false }
+support = { package = "frame-support", path = "../support", default-features = false }
+system = { package = "frame-system", path = "../system", default-features = false }
 
 [dev-dependencies]
 ref_thread_local = "0.0.0"
diff --git a/substrate/palette/indices/src/address.rs b/substrate/frame/indices/src/address.rs
similarity index 100%
rename from substrate/palette/indices/src/address.rs
rename to substrate/frame/indices/src/address.rs
diff --git a/substrate/palette/indices/src/lib.rs b/substrate/frame/indices/src/lib.rs
similarity index 100%
rename from substrate/palette/indices/src/lib.rs
rename to substrate/frame/indices/src/lib.rs
diff --git a/substrate/palette/indices/src/mock.rs b/substrate/frame/indices/src/mock.rs
similarity index 100%
rename from substrate/palette/indices/src/mock.rs
rename to substrate/frame/indices/src/mock.rs
diff --git a/substrate/palette/indices/src/tests.rs b/substrate/frame/indices/src/tests.rs
similarity index 100%
rename from substrate/palette/indices/src/tests.rs
rename to substrate/frame/indices/src/tests.rs
diff --git a/substrate/palette/membership/Cargo.toml b/substrate/frame/membership/Cargo.toml
similarity index 82%
rename from substrate/palette/membership/Cargo.toml
rename to substrate/frame/membership/Cargo.toml
index 99787aaf65..12c81aa741 100644
--- a/substrate/palette/membership/Cargo.toml
+++ b/substrate/frame/membership/Cargo.toml
@@ -9,8 +9,8 @@ serde = { version = "1.0.101", optional = true }
 codec = { package = "parity-scale-codec", version = "1.0.0", default-features = false }
 rstd = { package = "sr-std", path = "../../primitives/sr-std", default-features = false }
 runtime-io = { package = "sr-io", path = "../../primitives/sr-io", default-features = false }
-support = { package = "palette-support", path = "../support", default-features = false }
-system = { package = "palette-system", path = "../system", default-features = false }
+support = { package = "frame-support", path = "../support", default-features = false }
+system = { package = "frame-system", path = "../system", default-features = false }
 sr-primitives = { path = "../../primitives/sr-primitives", default-features = false }
 
 [dev-dependencies]
diff --git a/substrate/palette/membership/src/lib.rs b/substrate/frame/membership/src/lib.rs
similarity index 100%
rename from substrate/palette/membership/src/lib.rs
rename to substrate/frame/membership/src/lib.rs
diff --git a/substrate/palette/metadata/Cargo.toml b/substrate/frame/metadata/Cargo.toml
similarity index 95%
rename from substrate/palette/metadata/Cargo.toml
rename to substrate/frame/metadata/Cargo.toml
index 469a3ab056..0fc604bea4 100644
--- a/substrate/palette/metadata/Cargo.toml
+++ b/substrate/frame/metadata/Cargo.toml
@@ -1,5 +1,5 @@
 [package]
-name = "palette-metadata"
+name = "frame-metadata"
 version = "2.0.0"
 authors = ["Parity Technologies "]
 edition = "2018"
diff --git a/substrate/palette/metadata/src/lib.rs b/substrate/frame/metadata/src/lib.rs
similarity index 100%
rename from substrate/palette/metadata/src/lib.rs
rename to substrate/frame/metadata/src/lib.rs
diff --git a/substrate/palette/nicks/Cargo.toml b/substrate/frame/nicks/Cargo.toml
similarity index 83%
rename from substrate/palette/nicks/Cargo.toml
rename to substrate/frame/nicks/Cargo.toml
index 466d9d735f..aa2df57af5 100644
--- a/substrate/palette/nicks/Cargo.toml
+++ b/substrate/frame/nicks/Cargo.toml
@@ -10,8 +10,8 @@ codec = { package = "parity-scale-codec", version = "1.0.0", default-features =
 rstd = { package = "sr-std", path = "../../primitives/sr-std", default-features = false }
 runtime-io = { package = "sr-io", path = "../../primitives/sr-io", default-features = false }
 sr-primitives = { path = "../../primitives/sr-primitives", default-features = false }
-support = { package = "palette-support", path = "../support", default-features = false }
-system = { package = "palette-system", path = "../system", default-features = false }
+support = { package = "frame-support", path = "../support", default-features = false }
+system = { package = "frame-system", path = "../system", default-features = false }
 
 [dev-dependencies]
 primitives = { package = "substrate-primitives",  path = "../../primitives/core" }
diff --git a/substrate/palette/nicks/src/lib.rs b/substrate/frame/nicks/src/lib.rs
similarity index 100%
rename from substrate/palette/nicks/src/lib.rs
rename to substrate/frame/nicks/src/lib.rs
diff --git a/substrate/palette/offences/Cargo.toml b/substrate/frame/offences/Cargo.toml
similarity index 84%
rename from substrate/palette/offences/Cargo.toml
rename to substrate/frame/offences/Cargo.toml
index 8cc3ced354..354de90e85 100644
--- a/substrate/palette/offences/Cargo.toml
+++ b/substrate/frame/offences/Cargo.toml
@@ -11,8 +11,8 @@ rstd = { package = "sr-std", path = "../../primitives/sr-std", default-features
 serde = { version = "1.0.101", optional = true }
 sr-primitives = { path = "../../primitives/sr-primitives", default-features = false }
 sr-staking-primitives = { path = "../../primitives/sr-staking-primitives", default-features = false }
-support = { package = "palette-support", path = "../support", default-features = false }
-system = { package = "palette-system", path = "../system", default-features = false }
+support = { package = "frame-support", path = "../support", default-features = false }
+system = { package = "frame-system", path = "../system", default-features = false }
 
 [dev-dependencies]
 runtime-io = { package = "sr-io", path = "../../primitives/sr-io" }
diff --git a/substrate/palette/offences/src/lib.rs b/substrate/frame/offences/src/lib.rs
similarity index 100%
rename from substrate/palette/offences/src/lib.rs
rename to substrate/frame/offences/src/lib.rs
diff --git a/substrate/palette/offences/src/mock.rs b/substrate/frame/offences/src/mock.rs
similarity index 100%
rename from substrate/palette/offences/src/mock.rs
rename to substrate/frame/offences/src/mock.rs
diff --git a/substrate/palette/offences/src/tests.rs b/substrate/frame/offences/src/tests.rs
similarity index 100%
rename from substrate/palette/offences/src/tests.rs
rename to substrate/frame/offences/src/tests.rs
diff --git a/substrate/palette/randomness-collective-flip/Cargo.toml b/substrate/frame/randomness-collective-flip/Cargo.toml
similarity index 82%
rename from substrate/palette/randomness-collective-flip/Cargo.toml
rename to substrate/frame/randomness-collective-flip/Cargo.toml
index 0d623246fa..b76f908500 100644
--- a/substrate/palette/randomness-collective-flip/Cargo.toml
+++ b/substrate/frame/randomness-collective-flip/Cargo.toml
@@ -8,8 +8,8 @@ edition = "2018"
 safe-mix = { version = "1.0", default-features = false }
 codec = { package = "parity-scale-codec", version = "1.0.0", default-features = false, features = ["derive"] }
 sr-primitives = { path = "../../primitives/sr-primitives", default-features = false }
-support = { package = "palette-support", path = "../support", default-features = false }
-system = { package = "palette-system", path = "../system", default-features = false }
+support = { package = "frame-support", path = "../support", default-features = false }
+system = { package = "frame-system", path = "../system", default-features = false }
 rstd = { package = "sr-std", path = "../../primitives/sr-std", default-features = false }
 
 [dev-dependencies]
diff --git a/substrate/palette/randomness-collective-flip/src/lib.rs b/substrate/frame/randomness-collective-flip/src/lib.rs
similarity index 100%
rename from substrate/palette/randomness-collective-flip/src/lib.rs
rename to substrate/frame/randomness-collective-flip/src/lib.rs
diff --git a/substrate/palette/scored-pool/Cargo.toml b/substrate/frame/scored-pool/Cargo.toml
similarity index 83%
rename from substrate/palette/scored-pool/Cargo.toml
rename to substrate/frame/scored-pool/Cargo.toml
index 0c73454a25..cebb071003 100644
--- a/substrate/palette/scored-pool/Cargo.toml
+++ b/substrate/frame/scored-pool/Cargo.toml
@@ -10,8 +10,8 @@ serde = { version = "1.0.101", optional = true }
 runtime-io = { package = "sr-io", path = "../../primitives/sr-io", default-features = false }
 sr-primitives = { path = "../../primitives/sr-primitives", default-features = false }
 rstd = { package = "sr-std", path = "../../primitives/sr-std", default-features = false }
-support = { package = "palette-support", path = "../support", default-features = false }
-system = { package = "palette-system", path = "../system", default-features = false }
+support = { package = "frame-support", path = "../support", default-features = false }
+system = { package = "frame-system", path = "../system", default-features = false }
 
 [dev-dependencies]
 balances = { package = "pallet-balances", path = "../balances" }
diff --git a/substrate/palette/scored-pool/src/lib.rs b/substrate/frame/scored-pool/src/lib.rs
similarity index 99%
rename from substrate/palette/scored-pool/src/lib.rs
rename to substrate/frame/scored-pool/src/lib.rs
index 0f1fdb7a3b..39cffdb77f 100644
--- a/substrate/palette/scored-pool/src/lib.rs
+++ b/substrate/frame/scored-pool/src/lib.rs
@@ -77,7 +77,7 @@
 //!
 //! ## Dependencies
 //!
-//! This module depends on the [System module](../palette_system/index.html).
+//! This module depends on the [System module](../frame_system/index.html).
 
 // Ensure we're `no_std` when compiling for Wasm.
 #![cfg_attr(not(feature = "std"), no_std)]
diff --git a/substrate/palette/scored-pool/src/mock.rs b/substrate/frame/scored-pool/src/mock.rs
similarity index 100%
rename from substrate/palette/scored-pool/src/mock.rs
rename to substrate/frame/scored-pool/src/mock.rs
diff --git a/substrate/palette/scored-pool/src/tests.rs b/substrate/frame/scored-pool/src/tests.rs
similarity index 100%
rename from substrate/palette/scored-pool/src/tests.rs
rename to substrate/frame/scored-pool/src/tests.rs
diff --git a/substrate/palette/session/Cargo.toml b/substrate/frame/session/Cargo.toml
similarity index 89%
rename from substrate/palette/session/Cargo.toml
rename to substrate/frame/session/Cargo.toml
index ff4625c0e4..b93111d262 100644
--- a/substrate/palette/session/Cargo.toml
+++ b/substrate/frame/session/Cargo.toml
@@ -11,8 +11,8 @@ codec = { package = "parity-scale-codec", version = "1.0.0", default-features =
 rstd = { package = "sr-std", path = "../../primitives/sr-std", default-features = false }
 sr-primitives = { path = "../../primitives/sr-primitives", default-features = false }
 sr-staking-primitives = { path = "../../primitives/sr-staking-primitives", default-features = false }
-support = { package = "palette-support", path = "../support", default-features = false }
-system = { package = "palette-system", path = "../system", default-features = false }
+support = { package = "frame-support", path = "../support", default-features = false }
+system = { package = "frame-system", path = "../system", default-features = false }
 timestamp = { package = "pallet-timestamp", path = "../timestamp", default-features = false }
 substrate-trie = { path = "../../primitives/trie", default-features = false, optional = true }
 runtime-io ={ package = "sr-io", path = "../../primitives/sr-io", default-features = false }
diff --git a/substrate/palette/session/src/historical.rs b/substrate/frame/session/src/historical.rs
similarity index 100%
rename from substrate/palette/session/src/historical.rs
rename to substrate/frame/session/src/historical.rs
diff --git a/substrate/palette/session/src/lib.rs b/substrate/frame/session/src/lib.rs
similarity index 99%
rename from substrate/palette/session/src/lib.rs
rename to substrate/frame/session/src/lib.rs
index 290bffed0f..0e35ae45a6 100644
--- a/substrate/palette/session/src/lib.rs
+++ b/substrate/frame/session/src/lib.rs
@@ -45,7 +45,7 @@
 //! a block author or a validator. The session keys of accounts are removed once their account balance is zero.
 //! - **Validator set session key configuration process:** Each session we iterate through the current
 //! set of validator account IDs to check if a session key was created for it in the previous session
-//! using `set_key`. If it was then we call `set_authority` from the [Consensus module](../palette_consensus/index.html)
+//! using `set_key`. If it was then we call `set_authority` from the [Consensus module](../frame_consensus/index.html)
 //! and pass it a set of session keys (each associated with an account ID) as the session keys for the new
 //! validator set. Lastly, if the session key of the current authority does not match any session keys stored under
 //! its validator index in the `AuthorityStorageVec` mapping, then we update the mapping with its session
@@ -113,7 +113,7 @@
 //!
 //! ## Related Modules
 //!
-//! - [Consensus](../palette_consensus/index.html)
+//! - [Consensus](../frame_consensus/index.html)
 //! - [Staking](../pallet_staking/index.html)
 //! - [Timestamp](../pallet_timestamp/index.html)
 
diff --git a/substrate/palette/session/src/mock.rs b/substrate/frame/session/src/mock.rs
similarity index 100%
rename from substrate/palette/session/src/mock.rs
rename to substrate/frame/session/src/mock.rs
diff --git a/substrate/palette/staking/Cargo.toml b/substrate/frame/staking/Cargo.toml
similarity index 90%
rename from substrate/palette/staking/Cargo.toml
rename to substrate/frame/staking/Cargo.toml
index 0bc1b17d8e..3ad4b68c83 100644
--- a/substrate/palette/staking/Cargo.toml
+++ b/substrate/frame/staking/Cargo.toml
@@ -14,8 +14,8 @@ phragmen = { package = "substrate-phragmen", path = "../../primitives/phragmen",
 runtime-io ={ package = "sr-io", path = "../../primitives/sr-io", default-features = false }
 sr-primitives = { path = "../../primitives/sr-primitives", default-features = false }
 sr-staking-primitives = { path = "../../primitives/sr-staking-primitives", default-features = false }
-support = { package = "palette-support", path = "../support", default-features = false }
-system = { package = "palette-system", path = "../system", default-features = false }
+support = { package = "frame-support", path = "../support", default-features = false }
+system = { package = "frame-system", path = "../system", default-features = false }
 session = { package = "pallet-session", path = "../session", default-features = false, features = ["historical"] }
 authorship = { package = "pallet-authorship", path = "../authorship", default-features = false }
 
diff --git a/substrate/palette/staking/reward-curve/Cargo.toml b/substrate/frame/staking/reward-curve/Cargo.toml
similarity index 100%
rename from substrate/palette/staking/reward-curve/Cargo.toml
rename to substrate/frame/staking/reward-curve/Cargo.toml
diff --git a/substrate/palette/staking/reward-curve/src/lib.rs b/substrate/frame/staking/reward-curve/src/lib.rs
similarity index 100%
rename from substrate/palette/staking/reward-curve/src/lib.rs
rename to substrate/frame/staking/reward-curve/src/lib.rs
diff --git a/substrate/palette/staking/reward-curve/src/log.rs b/substrate/frame/staking/reward-curve/src/log.rs
similarity index 100%
rename from substrate/palette/staking/reward-curve/src/log.rs
rename to substrate/frame/staking/reward-curve/src/log.rs
diff --git a/substrate/palette/staking/reward-curve/tests/test.rs b/substrate/frame/staking/reward-curve/tests/test.rs
similarity index 100%
rename from substrate/palette/staking/reward-curve/tests/test.rs
rename to substrate/frame/staking/reward-curve/tests/test.rs
diff --git a/substrate/palette/staking/src/inflation.rs b/substrate/frame/staking/src/inflation.rs
similarity index 100%
rename from substrate/palette/staking/src/inflation.rs
rename to substrate/frame/staking/src/inflation.rs
diff --git a/substrate/palette/staking/src/lib.rs b/substrate/frame/staking/src/lib.rs
similarity index 100%
rename from substrate/palette/staking/src/lib.rs
rename to substrate/frame/staking/src/lib.rs
diff --git a/substrate/palette/staking/src/mock.rs b/substrate/frame/staking/src/mock.rs
similarity index 100%
rename from substrate/palette/staking/src/mock.rs
rename to substrate/frame/staking/src/mock.rs
diff --git a/substrate/palette/staking/src/tests.rs b/substrate/frame/staking/src/tests.rs
similarity index 100%
rename from substrate/palette/staking/src/tests.rs
rename to substrate/frame/staking/src/tests.rs
diff --git a/substrate/palette/sudo/Cargo.toml b/substrate/frame/sudo/Cargo.toml
similarity index 82%
rename from substrate/palette/sudo/Cargo.toml
rename to substrate/frame/sudo/Cargo.toml
index 2d6c1b17bd..dc158c2b80 100644
--- a/substrate/palette/sudo/Cargo.toml
+++ b/substrate/frame/sudo/Cargo.toml
@@ -10,8 +10,8 @@ codec = { package = "parity-scale-codec", version = "1.0.0", default-features =
 rstd = { package = "sr-std", path = "../../primitives/sr-std", default-features = false }
 runtime-io = { package = "sr-io", path = "../../primitives/sr-io", default-features = false }
 sr-primitives = { path = "../../primitives/sr-primitives", default-features = false }
-support = { package = "palette-support", path = "../support", default-features = false }
-system = { package = "palette-system", path = "../system", default-features = false }
+support = { package = "frame-support", path = "../support", default-features = false }
+system = { package = "frame-system", path = "../system", default-features = false }
 
 [dev-dependencies]
 primitives = { package = "substrate-primitives",  path = "../../primitives/core" }
diff --git a/substrate/palette/sudo/src/lib.rs b/substrate/frame/sudo/src/lib.rs
similarity index 99%
rename from substrate/palette/sudo/src/lib.rs
rename to substrate/frame/sudo/src/lib.rs
index 202734edb2..082d1f6737 100644
--- a/substrate/palette/sudo/src/lib.rs
+++ b/substrate/frame/sudo/src/lib.rs
@@ -77,7 +77,7 @@
 //!
 //! ## Related Modules
 //!
-//! * [Consensus](../palette_consensus/index.html)
+//! * [Consensus](../frame_consensus/index.html)
 //! * [Democracy](../pallet_democracy/index.html)
 //!
 //! [`Call`]: ./enum.Call.html
diff --git a/substrate/palette/support/Cargo.toml b/substrate/frame/support/Cargo.toml
similarity index 85%
rename from substrate/palette/support/Cargo.toml
rename to substrate/frame/support/Cargo.toml
index b2a631a8fb..fea24fd6d6 100644
--- a/substrate/palette/support/Cargo.toml
+++ b/substrate/frame/support/Cargo.toml
@@ -1,5 +1,5 @@
 [package]
-name = "palette-support"
+name = "frame-support"
 version = "2.0.0"
 authors = ["Parity Technologies "]
 edition = "2018"
@@ -8,14 +8,14 @@ edition = "2018"
 log = "0.4"
 serde = { version = "1.0.101", optional = true, features = ["derive"] }
 codec = { package = "parity-scale-codec", version = "1.0.6", default-features = false, features = ["derive"] }
-palette-metadata = { path = "../metadata", default-features = false }
+frame-metadata = { path = "../metadata", default-features = false }
 rstd = { package = "sr-std", path = "../../primitives/sr-std", default-features = false }
 runtime-io ={ package = "sr-io", path = "../../primitives/sr-io", default-features = false }
 sr-primitives = { path = "../../primitives/sr-primitives", default-features = false }
 primitives = { package = "substrate-primitives",  path = "../../primitives/core", default-features = false }
 sr-arithmetic = { path = "../../primitives/sr-arithmetic", default-features = false }
 inherents = { package = "substrate-inherents", path = "../../primitives/inherents", default-features = false }
-palette-support-procedural = { package = "palette-support-procedural", path = "./procedural" }
+frame-support-procedural = { package = "frame-support-procedural", path = "./procedural" }
 paste = "0.1.6"
 once_cell = { version = "0.2.4", default-features = false, optional = true }
 state-machine = { package = "substrate-state-machine", path = "../../primitives/state-machine", optional = true }
@@ -25,7 +25,7 @@ tracing = { version = "0.1.10", optional = true }
 
 [dev-dependencies]
 pretty_assertions = "0.6.1"
-palette-system = { path = "../system" }
+frame-system = { path = "../system" }
 
 [features]
 default = ["std"]
@@ -39,7 +39,7 @@ std = [
 	"rstd/std",
 	"sr-primitives/std",
 	"sr-arithmetic/std",
-	"palette-metadata/std",
+	"frame-metadata/std",
 	"inherents/std",
 	"state-machine",
 ]
diff --git a/substrate/palette/support/procedural/Cargo.toml b/substrate/frame/support/procedural/Cargo.toml
similarity index 62%
rename from substrate/palette/support/procedural/Cargo.toml
rename to substrate/frame/support/procedural/Cargo.toml
index 0f8a322504..2231cf67db 100644
--- a/substrate/palette/support/procedural/Cargo.toml
+++ b/substrate/frame/support/procedural/Cargo.toml
@@ -1,5 +1,5 @@
 [package]
-name = "palette-support-procedural"
+name = "frame-support-procedural"
 version = "2.0.0"
 authors = ["Parity Technologies "]
 edition = "2018"
@@ -8,7 +8,7 @@ edition = "2018"
 proc-macro = true
 
 [dependencies]
-palette-support-procedural-tools = { package = "palette-support-procedural-tools", path = "./tools" }
+frame-support-procedural-tools = { package = "frame-support-procedural-tools", path = "./tools" }
 
 proc-macro2 = "1.0.6"
 quote = "1.0.2"
diff --git a/substrate/palette/support/procedural/src/lib.rs b/substrate/frame/support/procedural/src/lib.rs
similarity index 88%
rename from substrate/palette/support/procedural/src/lib.rs
rename to substrate/frame/support/procedural/src/lib.rs
index 4a12221490..1832e870a3 100644
--- a/substrate/palette/support/procedural/src/lib.rs
+++ b/substrate/frame/support/procedural/src/lib.rs
@@ -53,16 +53,16 @@ use proc_macro::TokenStream;
 /// Basic storage consists of a name and a type; supported types are:
 ///
 /// * Value: `Foo: type`: Implements the
-///   [`StorageValue`](../palette_support/storage/trait.StorageValue.html) trait using the
-///   [`StorageValue generator`](../palette_support/storage/generator/trait.StorageValue.html).
+///   [`StorageValue`](../frame_support/storage/trait.StorageValue.html) trait using the
+///   [`StorageValue generator`](../frame_support/storage/generator/trait.StorageValue.html).
 ///   The generator `unhashed_key` is `$module_prefix ++ " " ++ $storage_name`
 ///
 /// * Map: `Foo: map hasher($hash) type => type`: Implements the
-///   [`StorageMap`](../palette_support/storage/trait.StorageMap.html) trait using the
-///   [`StorageMap generator`](../palette_support/storage/generator/trait.StorageMap.html).
+///   [`StorageMap`](../frame_support/storage/trait.StorageMap.html) trait using the
+///   [`StorageMap generator`](../frame_support/storage/generator/trait.StorageMap.html).
 ///
 ///   `$hash` representing a choice of hashing algorithms available in the
-///   [`Hashable`](../palette_support/trait.Hashable.html) trait.
+///   [`Hashable`](../frame_support/trait.Hashable.html) trait.
 ///
 ///   `hasher($hash)` is optional and its default is `blake2_256`. One should use another hasher
 ///   with care, see generator documentation.
@@ -72,11 +72,11 @@ use proc_macro::TokenStream;
 ///   * `Hasher`: $hash
 ///
 /// * Linked map: `Foo: linked_map hasher($hash) type => type`: Implements the
-///   [`StorageLinkedMap`](../palette_support/storage/trait.StorageLinkedMap.html) trait using the
-///   [`StorageLinkedMap generator`](../palette_support/storage/generator/trait.StorageLinkedMap.html).
+///   [`StorageLinkedMap`](../frame_support/storage/trait.StorageLinkedMap.html) trait using the
+///   [`StorageLinkedMap generator`](../frame_support/storage/generator/trait.StorageLinkedMap.html).
 ///
 ///   `$hash` representing a choice of hashing algorithms available in the
-///   [`Hashable`](../palette_support/trait.Hashable.html) trait.
+///   [`Hashable`](../frame_support/trait.Hashable.html) trait.
 ///
 ///   `hasher($hash)` is optional and its default is `blake2_256`. One should use another hasher
 ///   with care, see generator documentation.
@@ -91,11 +91,11 @@ use proc_macro::TokenStream;
 ///   is implemented for the storage linked map type as well.
 ///
 /// * Double map: `Foo: double_map hasher($hash1) u32, $hash2(u32) => u32`: Implements the
-///   [`StorageDoubleMap`](../palette_support/storage/trait.StorageDoubleMap.html) trait using the
-///   [`StorageDoubleMap generator`](../palette_support/storage/generator/trait.StorageDoubleMap.html).
+///   [`StorageDoubleMap`](../frame_support/storage/trait.StorageDoubleMap.html) trait using the
+///   [`StorageDoubleMap generator`](../frame_support/storage/generator/trait.StorageDoubleMap.html).
 ///
 ///   `$hash1` and `$hash2` representing choices of hashing algorithms available in the
-///   [`Hashable`](../palette_support/trait.Hashable.html) trait. They must be choosen with care, see
+///   [`Hashable`](../frame_support/trait.Hashable.html) trait. They must be choosen with care, see
 ///   generator documentation.
 ///
 ///   `hasher($hash)` is optional and its default is `blake2_256`.
diff --git a/substrate/palette/support/procedural/src/storage/genesis_config/builder_def.rs b/substrate/frame/support/procedural/src/storage/genesis_config/builder_def.rs
similarity index 98%
rename from substrate/palette/support/procedural/src/storage/genesis_config/builder_def.rs
rename to substrate/frame/support/procedural/src/storage/genesis_config/builder_def.rs
index 99fb89bbe8..fbab681949 100644
--- a/substrate/palette/support/procedural/src/storage/genesis_config/builder_def.rs
+++ b/substrate/frame/support/procedural/src/storage/genesis_config/builder_def.rs
@@ -16,7 +16,7 @@
 
 //! Builder logic definition used to build genesis storage.
 
-use palette_support_procedural_tools::syn_ext as ext;
+use frame_support_procedural_tools::syn_ext as ext;
 use proc_macro2::TokenStream;
 use syn::spanned::Spanned;
 use quote::{quote, quote_spanned};
diff --git a/substrate/palette/support/procedural/src/storage/genesis_config/genesis_config_def.rs b/substrate/frame/support/procedural/src/storage/genesis_config/genesis_config_def.rs
similarity index 98%
rename from substrate/palette/support/procedural/src/storage/genesis_config/genesis_config_def.rs
rename to substrate/frame/support/procedural/src/storage/genesis_config/genesis_config_def.rs
index f4f7c98445..2b4b57faeb 100644
--- a/substrate/palette/support/procedural/src/storage/genesis_config/genesis_config_def.rs
+++ b/substrate/frame/support/procedural/src/storage/genesis_config/genesis_config_def.rs
@@ -16,7 +16,7 @@
 
 //! Genesis config defintion.
 
-use palette_support_procedural_tools::syn_ext as ext;
+use frame_support_procedural_tools::syn_ext as ext;
 use proc_macro2::TokenStream;
 use syn::{spanned::Spanned, parse_quote};
 use quote::quote;
diff --git a/substrate/palette/support/procedural/src/storage/genesis_config/mod.rs b/substrate/frame/support/procedural/src/storage/genesis_config/mod.rs
similarity index 100%
rename from substrate/palette/support/procedural/src/storage/genesis_config/mod.rs
rename to substrate/frame/support/procedural/src/storage/genesis_config/mod.rs
diff --git a/substrate/palette/support/procedural/src/storage/getters.rs b/substrate/frame/support/procedural/src/storage/getters.rs
similarity index 100%
rename from substrate/palette/support/procedural/src/storage/getters.rs
rename to substrate/frame/support/procedural/src/storage/getters.rs
diff --git a/substrate/palette/support/procedural/src/storage/instance_trait.rs b/substrate/frame/support/procedural/src/storage/instance_trait.rs
similarity index 100%
rename from substrate/palette/support/procedural/src/storage/instance_trait.rs
rename to substrate/frame/support/procedural/src/storage/instance_trait.rs
diff --git a/substrate/palette/support/procedural/src/storage/metadata.rs b/substrate/frame/support/procedural/src/storage/metadata.rs
similarity index 99%
rename from substrate/palette/support/procedural/src/storage/metadata.rs
rename to substrate/frame/support/procedural/src/storage/metadata.rs
index 4bba827c73..b5ccb8a07a 100644
--- a/substrate/palette/support/procedural/src/storage/metadata.rs
+++ b/substrate/frame/support/procedural/src/storage/metadata.rs
@@ -16,7 +16,7 @@
 
 //! Implementation of `storage_metadata` on module structure, used by construct_runtime.
 
-use palette_support_procedural_tools::clean_type_string;
+use frame_support_procedural_tools::clean_type_string;
 use proc_macro2::TokenStream;
 use quote::quote;
 use super::{DeclStorageDefExt, StorageLineDefExt, StorageLineTypeDef};
diff --git a/substrate/palette/support/procedural/src/storage/mod.rs b/substrate/frame/support/procedural/src/storage/mod.rs
similarity index 99%
rename from substrate/palette/support/procedural/src/storage/mod.rs
rename to substrate/frame/support/procedural/src/storage/mod.rs
index 3520f309b9..0ec266a8a0 100644
--- a/substrate/palette/support/procedural/src/storage/mod.rs
+++ b/substrate/frame/support/procedural/src/storage/mod.rs
@@ -25,7 +25,7 @@ mod instance_trait;
 mod genesis_config;
 
 use quote::quote;
-use palette_support_procedural_tools::{
+use frame_support_procedural_tools::{
 	generate_crate_access, generate_hidden_includes, syn_ext as ext
 };
 
@@ -403,8 +403,8 @@ pub fn decl_storage_impl(input: proc_macro::TokenStream) -> proc_macro::TokenStr
 	let hidden_crate_name = def_ext.hidden_crate.as_ref().map(|i| i.to_string())
 		.unwrap_or_else(|| "decl_storage".to_string());
 
-	let scrate = generate_crate_access(&hidden_crate_name, "palette-support");
-	let scrate_decl = generate_hidden_includes(&hidden_crate_name, "palette-support");
+	let scrate = generate_crate_access(&hidden_crate_name, "frame-support");
+	let scrate_decl = generate_hidden_includes(&hidden_crate_name, "frame-support");
 
 	let store_trait = store_trait::decl_and_impl(&def_ext);
 	let getters = getters::impl_getters(&scrate, &def_ext);
diff --git a/substrate/palette/support/procedural/src/storage/parse.rs b/substrate/frame/support/procedural/src/storage/parse.rs
similarity index 99%
rename from substrate/palette/support/procedural/src/storage/parse.rs
rename to substrate/frame/support/procedural/src/storage/parse.rs
index 975a758c21..a5cd14aa1f 100644
--- a/substrate/palette/support/procedural/src/storage/parse.rs
+++ b/substrate/frame/support/procedural/src/storage/parse.rs
@@ -16,7 +16,7 @@
 
 //! Parsing of decl_storage input.
 
-use palette_support_procedural_tools::{ToTokens, Parse, syn_ext as ext};
+use frame_support_procedural_tools::{ToTokens, Parse, syn_ext as ext};
 use syn::{Ident, Token, spanned::Spanned};
 
 mod keyword {
diff --git a/substrate/palette/support/procedural/src/storage/storage_struct.rs b/substrate/frame/support/procedural/src/storage/storage_struct.rs
similarity index 100%
rename from substrate/palette/support/procedural/src/storage/storage_struct.rs
rename to substrate/frame/support/procedural/src/storage/storage_struct.rs
diff --git a/substrate/palette/support/procedural/src/storage/store_trait.rs b/substrate/frame/support/procedural/src/storage/store_trait.rs
similarity index 100%
rename from substrate/palette/support/procedural/src/storage/store_trait.rs
rename to substrate/frame/support/procedural/src/storage/store_trait.rs
diff --git a/substrate/palette/support/procedural/tools/Cargo.toml b/substrate/frame/support/procedural/tools/Cargo.toml
similarity index 58%
rename from substrate/palette/support/procedural/tools/Cargo.toml
rename to substrate/frame/support/procedural/tools/Cargo.toml
index d037445023..740a6985fe 100644
--- a/substrate/palette/support/procedural/tools/Cargo.toml
+++ b/substrate/frame/support/procedural/tools/Cargo.toml
@@ -1,11 +1,11 @@
 [package]
-name = "palette-support-procedural-tools"
+name = "frame-support-procedural-tools"
 version = "2.0.0"
 authors = ["Parity Technologies "]
 edition = "2018"
 
 [dependencies]
-palette-support-procedural-tools-derive = { package = "palette-support-procedural-tools-derive", path = "./derive" }
+frame-support-procedural-tools-derive = { package = "frame-support-procedural-tools-derive", path = "./derive" }
 proc-macro2 = "1.0.6"
 quote = "1.0.2"
 syn = { version = "1.0.7", features = ["full"] }
diff --git a/substrate/palette/support/procedural/tools/derive/Cargo.toml b/substrate/frame/support/procedural/tools/derive/Cargo.toml
similarity index 86%
rename from substrate/palette/support/procedural/tools/derive/Cargo.toml
rename to substrate/frame/support/procedural/tools/derive/Cargo.toml
index 9ae8692b31..49aea10807 100644
--- a/substrate/palette/support/procedural/tools/derive/Cargo.toml
+++ b/substrate/frame/support/procedural/tools/derive/Cargo.toml
@@ -1,5 +1,5 @@
 [package]
-name = "palette-support-procedural-tools-derive"
+name = "frame-support-procedural-tools-derive"
 version = "2.0.0"
 authors = ["Parity Technologies "]
 edition = "2018"
diff --git a/substrate/palette/support/procedural/tools/derive/src/lib.rs b/substrate/frame/support/procedural/tools/derive/src/lib.rs
similarity index 100%
rename from substrate/palette/support/procedural/tools/derive/src/lib.rs
rename to substrate/frame/support/procedural/tools/derive/src/lib.rs
diff --git a/substrate/palette/support/procedural/tools/src/lib.rs b/substrate/frame/support/procedural/tools/src/lib.rs
similarity index 94%
rename from substrate/palette/support/procedural/tools/src/lib.rs
rename to substrate/frame/support/procedural/tools/src/lib.rs
index 4a838c733d..5340bdbe59 100644
--- a/substrate/palette/support/procedural/tools/src/lib.rs
+++ b/substrate/frame/support/procedural/tools/src/lib.rs
@@ -19,7 +19,7 @@
 // end::description[]
 
 // reexport proc macros
-pub use palette_support_procedural_tools_derive::*;
+pub use frame_support_procedural_tools_derive::*;
 
 use proc_macro_crate::crate_name;
 use syn::parse::Error;
@@ -35,10 +35,10 @@ fn generate_hidden_includes_mod_name(unique_id: &str) -> Ident {
 	Ident::new(&format!("sr_api_hidden_includes_{}", unique_id), Span::call_site())
 }
 
-/// Generates the access to the `palette-support` crate.
+/// Generates the access to the `frame-support` crate.
 pub fn generate_crate_access(unique_id: &str, def_crate: &str) -> TokenStream {
 	if std::env::var("CARGO_PKG_NAME").unwrap() == def_crate {
-		quote::quote!( palette_support )
+		quote::quote!( frame_support )
 	} else {
 		let mod_name = generate_hidden_includes_mod_name(unique_id);
 		quote::quote!( self::#mod_name::hidden_include )
diff --git a/substrate/palette/support/procedural/tools/src/syn_ext.rs b/substrate/frame/support/procedural/tools/src/syn_ext.rs
similarity index 99%
rename from substrate/palette/support/procedural/tools/src/syn_ext.rs
rename to substrate/frame/support/procedural/tools/src/syn_ext.rs
index fc8385a91a..18c1cd43ce 100644
--- a/substrate/palette/support/procedural/tools/src/syn_ext.rs
+++ b/substrate/frame/support/procedural/tools/src/syn_ext.rs
@@ -22,7 +22,7 @@ use syn::{visit::{Visit, self}, parse::{Parse, ParseStream, Result}, Ident};
 use proc_macro2::{TokenStream, TokenTree};
 use quote::ToTokens;
 use std::iter::once;
-use palette_support_procedural_tools_derive::{ToTokens, Parse};
+use frame_support_procedural_tools_derive::{ToTokens, Parse};
 
 /// stop parsing here getting remaining token as content
 /// Warn duplicate stream (part of)
diff --git a/substrate/palette/support/rpc/Cargo.toml b/substrate/frame/support/rpc/Cargo.toml
similarity index 81%
rename from substrate/palette/support/rpc/Cargo.toml
rename to substrate/frame/support/rpc/Cargo.toml
index c819cc4f5f..15e9fee7f0 100644
--- a/substrate/palette/support/rpc/Cargo.toml
+++ b/substrate/frame/support/rpc/Cargo.toml
@@ -1,5 +1,5 @@
 [package]
-name = "palette-support-rpc"
+name = "frame-support-rpc"
 version = "2.0.0"
 authors = ["Parity Technologies ", "Andrew Dirksen "]
 edition = "2018"
@@ -10,10 +10,10 @@ jsonrpc-client-transports = "14"
 jsonrpc-core = "14"
 parity-scale-codec = "1"
 serde = "1"
-palette-support = { path = "../" }
+frame-support = { path = "../" }
 substrate-primitives-storage = { path = "../../../primitives/core/storage" }
 substrate-rpc-api = { path = "../../../client/rpc/api" }
 
 [dev-dependencies]
-palette-system = { path = "../../system" }
+frame-system = { path = "../../system" }
 tokio = "0.1"
diff --git a/substrate/palette/support/rpc/src/lib.rs b/substrate/frame/support/rpc/src/lib.rs
similarity index 90%
rename from substrate/palette/support/rpc/src/lib.rs
rename to substrate/frame/support/rpc/src/lib.rs
index 70efc65883..e248e0c9fe 100644
--- a/substrate/palette/support/rpc/src/lib.rs
+++ b/substrate/frame/support/rpc/src/lib.rs
@@ -14,7 +14,7 @@
 // You should have received a copy of the GNU General Public License
 // along with Substrate.  If not, see .
 
-//! Combines [substrate_rpc_api::state::StateClient] with [palette_support::storage::generator] traits
+//! Combines [substrate_rpc_api::state::StateClient] with [frame_support::storage::generator] traits
 //! to provide strongly typed chain state queries over rpc.
 
 #![warn(missing_docs)]
@@ -24,7 +24,7 @@ use futures::compat::Future01CompatExt;
 use jsonrpc_client_transports::RpcError;
 use parity_scale_codec::{DecodeAll, FullCodec, FullEncode};
 use serde::{de::DeserializeOwned, Serialize};
-use palette_support::storage::generator::{
+use frame_support::storage::generator::{
 	StorageDoubleMap, StorageLinkedMap, StorageMap, StorageValue
 };
 use substrate_primitives_storage::{StorageData, StorageKey};
@@ -39,13 +39,13 @@ use substrate_rpc_api::state::StateClient;
 /// # use jsonrpc_client_transports::RpcError;
 /// # use jsonrpc_client_transports::transports::http;
 /// # use parity_scale_codec::Encode;
-/// # use palette_support::{decl_storage, decl_module};
-/// # use palette_support_rpc::StorageQuery;
-/// # use palette_system::Trait;
+/// # use frame_support::{decl_storage, decl_module};
+/// # use frame_support_rpc::StorageQuery;
+/// # use frame_system::Trait;
 /// # use substrate_rpc_api::state::StateClient;
 /// #
-/// # // Hash would normally be ::Hash, but we don't have
-/// # // palette_system::Trait implemented for TestRuntime. Here we just pretend.
+/// # // Hash would normally be ::Hash, but we don't have
+/// # // frame_system::Trait implemented for TestRuntime. Here we just pretend.
 /// # type Hash = ();
 /// #
 /// # fn main() -> Result<(), RpcError> {
@@ -134,7 +134,7 @@ impl StorageQuery {
 
 	/// Send this query over RPC, await the typed result.
 	///
-	/// Hash should be ::Hash.
+	/// Hash should be ::Hash.
 	///
 	/// # Arguments
 	///
diff --git a/substrate/palette/support/src/debug.rs b/substrate/frame/support/src/debug.rs
similarity index 97%
rename from substrate/palette/support/src/debug.rs
rename to substrate/frame/support/src/debug.rs
index 3953ae6335..feb8e6d873 100644
--- a/substrate/palette/support/src/debug.rs
+++ b/substrate/frame/support/src/debug.rs
@@ -35,7 +35,7 @@
 //! that WASM debug formatting of structs will be empty.
 //!
 //! ```rust,no_run
-//!	use palette_support::debug;
+//!	use frame_support::debug;
 //!
 //! #[derive(primitives::RuntimeDebug)]
 //!	struct MyStruct {
@@ -66,7 +66,7 @@
 //! logs conditionally and strips out logs in WASM.
 //!
 //! ```rust,no_run
-//!	use palette_support::debug::native;
+//!	use frame_support::debug::native;
 //!
 //! #[derive(primitives::RuntimeDebug)]
 //!	struct MyStruct {
@@ -124,7 +124,7 @@ pub mod native {
 /// # Example
 ///
 /// ```
-/// palette_support::runtime_print!("my value is {}", 3);
+/// frame_support::runtime_print!("my value is {}", 3);
 /// ```
 #[macro_export]
 macro_rules! runtime_print {
diff --git a/substrate/palette/support/src/dispatch.rs b/substrate/frame/support/src/dispatch.rs
similarity index 98%
rename from substrate/palette/support/src/dispatch.rs
rename to substrate/frame/support/src/dispatch.rs
index ea13d385ef..025ee67dd1 100644
--- a/substrate/palette/support/src/dispatch.rs
+++ b/substrate/frame/support/src/dispatch.rs
@@ -19,7 +19,7 @@
 
 pub use crate::rstd::{result, fmt, prelude::{Vec, Clone, Eq, PartialEq}, marker};
 pub use crate::codec::{Codec, EncodeLike, Decode, Encode, Input, Output, HasCompact, EncodeAsRef};
-pub use palette_metadata::{
+pub use frame_metadata::{
 	FunctionMetadata, DecodeDifferent, DecodeDifferentArray, FunctionArgumentMetadata,
 	ModuleConstantMetadata, DefaultByte, DefaultByteGetter, ModuleErrorMetadata, ErrorMetadata
 };
@@ -57,9 +57,9 @@ impl Parameter for T where T: Codec + EncodeLike + Clone + Eq + fmt::Debug {}
 ///
 /// ```
 /// # #[macro_use]
-/// # extern crate palette_support;
-/// # use palette_support::dispatch::Result;
-/// # use palette_system::{self as system, Trait, ensure_signed};
+/// # extern crate frame_support;
+/// # use frame_support::dispatch::Result;
+/// # use frame_system::{self as system, Trait, ensure_signed};
 /// decl_module! {
 /// 	pub struct Module for enum Call where origin: T::Origin {
 ///
@@ -97,9 +97,9 @@ impl Parameter for T where T: Codec + EncodeLike + Clone + Eq + fmt::Debug {}
 ///
 /// ```
 /// # #[macro_use]
-/// # extern crate palette_support;
-/// # use palette_support::dispatch::Result;
-/// # use palette_system::{self as system, Trait, ensure_signed};
+/// # extern crate frame_support;
+/// # use frame_support::dispatch::Result;
+/// # use frame_system::{self as system, Trait, ensure_signed};
 /// decl_module! {
 /// 	pub struct Module for enum Call where origin: T::Origin {
 ///
@@ -122,9 +122,9 @@ impl Parameter for T where T: Codec + EncodeLike + Clone + Eq + fmt::Debug {}
 ///
 /// ```
 /// # #[macro_use]
-/// # extern crate palette_support;
-/// # use palette_support::dispatch::Result;
-/// # use palette_system::{self as system, Trait, ensure_signed, ensure_root};
+/// # extern crate frame_support;
+/// # use frame_support::dispatch::Result;
+/// # use frame_system::{self as system, Trait, ensure_signed, ensure_root};
 /// decl_module! {
 /// 	pub struct Module for enum Call where origin: T::Origin {
 ///			fn my_privileged_function(origin) -> Result {
@@ -146,9 +146,9 @@ impl Parameter for T where T: Codec + EncodeLike + Clone + Eq + fmt::Debug {}
 ///
 /// ```
 /// # #[macro_use]
-/// # extern crate palette_support;
-/// # use palette_support::dispatch::Result;
-/// # use palette_system::{self as system, ensure_signed};
+/// # extern crate frame_support;
+/// # use frame_support::dispatch::Result;
+/// # use frame_system::{self as system, ensure_signed};
 /// # pub struct DefaultInstance;
 /// # pub trait Instance {}
 /// # impl Instance for DefaultInstance {}
@@ -174,9 +174,9 @@ impl Parameter for T where T: Codec + EncodeLike + Clone + Eq + fmt::Debug {}
 ///
 /// ```
 /// # #[macro_use]
-/// # extern crate palette_support;
-/// # use palette_support::dispatch::Result;
-/// # use palette_system::{self as system, ensure_signed};
+/// # extern crate frame_support;
+/// # use frame_support::dispatch::Result;
+/// # use frame_system::{self as system, ensure_signed};
 /// pub trait Trait: system::Trait where Self::AccountId: From {}
 ///
 /// decl_module! {
@@ -192,7 +192,7 @@ impl Parameter for T where T: Codec + EncodeLike + Clone + Eq + fmt::Debug {}
 /// The following are reserved function signatures:
 ///
 /// * `deposit_event`: Helper function for depositing an [event](https://docs.substrate.dev/docs/event-enum).
-/// The default behavior is to call `deposit_event` from the [System module](../palette_system/index.html).
+/// The default behavior is to call `deposit_event` from the [System module](../frame_system/index.html).
 /// However, you can write your own implementation for events in your runtime. To use the default behavior,
 /// add `fn deposit_event() = default;` to your `Module`.
 ///
diff --git a/substrate/palette/support/src/error.rs b/substrate/frame/support/src/error.rs
similarity index 97%
rename from substrate/palette/support/src/error.rs
rename to substrate/frame/support/src/error.rs
index b717876dba..87380c1a94 100644
--- a/substrate/palette/support/src/error.rs
+++ b/substrate/frame/support/src/error.rs
@@ -18,7 +18,7 @@
 
 #[doc(hidden)]
 pub use sr_primitives::traits::LookupError;
-pub use palette_metadata::{ModuleErrorMetadata, ErrorMetadata, DecodeDifferent};
+pub use frame_metadata::{ModuleErrorMetadata, ErrorMetadata, DecodeDifferent};
 
 /// Declare an error type for a runtime module.
 ///
@@ -31,7 +31,7 @@ pub use palette_metadata::{ModuleErrorMetadata, ErrorMetadata, DecodeDifferent};
 /// # Usage
 ///
 /// ```
-/// # use palette_support::decl_error;
+/// # use frame_support::decl_error;
 /// decl_error! {
 ///     /// Errors that can occur in my module.
 ///     pub enum MyError {
diff --git a/substrate/palette/support/src/event.rs b/substrate/frame/support/src/event.rs
similarity index 98%
rename from substrate/palette/support/src/event.rs
rename to substrate/frame/support/src/event.rs
index edd95148c4..c2e962ffb2 100644
--- a/substrate/palette/support/src/event.rs
+++ b/substrate/frame/support/src/event.rs
@@ -17,14 +17,14 @@
 // You should have received a copy of the GNU General Public License
 // along with Substrate.  If not, see .
 
-pub use palette_metadata::{EventMetadata, DecodeDifferent, OuterEventMetadata, FnEncode};
+pub use frame_metadata::{EventMetadata, DecodeDifferent, OuterEventMetadata, FnEncode};
 
 /// Implement the `Event` for a module.
 ///
 /// # Simple Event Example:
 ///
 /// ```rust
-/// palette_support::decl_event!(
+/// frame_support::decl_event!(
 ///    pub enum Event {
 ///       Success,
 ///       Failure(String),
@@ -44,7 +44,7 @@ pub use palette_metadata::{EventMetadata, DecodeDifferent, OuterEventMetadata, F
 ///
 /// mod event1 {
 ///     // Event that specifies the generic parameter explicitly (`Balance`).
-///     palette_support::decl_event!(
+///     frame_support::decl_event!(
 ///        pub enum Event where Balance = ::Balance {
 ///           Message(Balance),
 ///        }
@@ -55,7 +55,7 @@ pub use palette_metadata::{EventMetadata, DecodeDifferent, OuterEventMetadata, F
 ///     // Event that uses the generic parameter `Balance`.
 ///     // If no name for the generic parameter is specified explicitly,
 ///     // the name will be taken from the type name of the trait.
-///     palette_support::decl_event!(
+///     frame_support::decl_event!(
 ///        pub enum Event where ::Balance {
 ///           Message(Balance),
 ///        }
@@ -64,7 +64,7 @@ pub use palette_metadata::{EventMetadata, DecodeDifferent, OuterEventMetadata, F
 ///
 /// mod event3 {
 ///     // And we even support declaring multiple generic parameters!
-///     palette_support::decl_event!(
+///     frame_support::decl_event!(
 ///        pub enum Event where ::Balance, ::Token {
 ///           Message(Balance, Token),
 ///        }
@@ -88,7 +88,7 @@ pub use palette_metadata::{EventMetadata, DecodeDifferent, OuterEventMetadata, F
 /// }
 ///
 /// // For module with instances, DefaultInstance is optional
-/// palette_support::decl_event!(
+/// frame_support::decl_event!(
 ///    pub enum Event where
 ///       ::Balance,
 ///       ::Token
diff --git a/substrate/palette/support/src/hash.rs b/substrate/frame/support/src/hash.rs
similarity index 97%
rename from substrate/palette/support/src/hash.rs
rename to substrate/frame/support/src/hash.rs
index 7fcb007854..d51df162e5 100644
--- a/substrate/palette/support/src/hash.rs
+++ b/substrate/frame/support/src/hash.rs
@@ -20,7 +20,7 @@ use codec::Codec;
 use rstd::prelude::Vec;
 use runtime_io::hashing::{blake2_128, blake2_256, twox_64, twox_128, twox_256};
 
-// This trait must be kept coherent with palette-support-procedural HasherKind usage
+// This trait must be kept coherent with frame-support-procedural HasherKind usage
 pub trait Hashable: Sized {
 	fn blake2_128(&self) -> [u8; 16];
 	fn blake2_256(&self) -> [u8; 32];
diff --git a/substrate/palette/support/src/inherent.rs b/substrate/frame/support/src/inherent.rs
similarity index 100%
rename from substrate/palette/support/src/inherent.rs
rename to substrate/frame/support/src/inherent.rs
diff --git a/substrate/palette/support/src/lib.rs b/substrate/frame/support/src/lib.rs
similarity index 98%
rename from substrate/palette/support/src/lib.rs
rename to substrate/frame/support/src/lib.rs
index 1921d80370..e67120347a 100644
--- a/substrate/palette/support/src/lib.rs
+++ b/substrate/frame/support/src/lib.rs
@@ -18,8 +18,8 @@
 
 #![cfg_attr(not(feature = "std"), no_std)]
 
-/// Export ourself as `palette_support` to make tests happy.
-extern crate self as palette_support;
+/// Export ourself as `frame_support` to make tests happy.
+extern crate self as frame_support;
 
 #[macro_use]
 extern crate bitmask;
@@ -116,7 +116,7 @@ macro_rules! parameter_types {
 }
 
 #[doc(inline)]
-pub use palette_support_procedural::decl_storage;
+pub use frame_support_procedural::decl_storage;
 
 /// Return Err of the expression: `return Err($expression);`.
 ///
@@ -193,8 +193,8 @@ macro_rules! assert_ok {
 ///
 /// ```rust
 /// #[macro_use]
-/// # extern crate palette_support;
-/// # use palette_support::{assert_eq_uvec};
+/// # extern crate frame_support;
+/// # use frame_support::{assert_eq_uvec};
 /// # fn main() {
 /// assert_eq_uvec!(vec![1,2], vec![2,1]);
 /// # }
@@ -202,8 +202,8 @@ macro_rules! assert_ok {
 ///
 /// ```rust,should_panic
 /// #[macro_use]
-/// # extern crate palette_support;
-/// # use palette_support::{assert_eq_uvec};
+/// # extern crate frame_support;
+/// # use frame_support::{assert_eq_uvec};
 /// # fn main() {
 /// assert_eq_uvec!(vec![1,2,3], vec![2,1]);
 /// # }
@@ -241,7 +241,7 @@ pub use serde::{Serialize, Deserialize};
 mod tests {
 	use super::*;
 	use codec::{Codec, EncodeLike};
-	use palette_metadata::{
+	use frame_metadata::{
 		DecodeDifferent, StorageEntryMetadata, StorageMetadata, StorageEntryType,
 		StorageEntryModifier, DefaultByteGetter, StorageHasher,
 	};
diff --git a/substrate/palette/support/src/metadata.rs b/substrate/frame/support/src/metadata.rs
similarity index 98%
rename from substrate/palette/support/src/metadata.rs
rename to substrate/frame/support/src/metadata.rs
index 7579f0eed5..c27cc4ac73 100644
--- a/substrate/palette/support/src/metadata.rs
+++ b/substrate/frame/support/src/metadata.rs
@@ -14,7 +14,7 @@
 // You should have received a copy of the GNU General Public License
 // along with Substrate.  If not, see .
 
-pub use palette_metadata::{
+pub use frame_metadata::{
 	DecodeDifferent, FnEncode, RuntimeMetadata, ModuleMetadata, RuntimeMetadataLastVersion,
 	DefaultByteGetter, RuntimeMetadataPrefixed, StorageEntryMetadata, StorageMetadata,
 	StorageEntryType, StorageEntryModifier, DefaultByte, StorageHasher, ModuleErrorMetadata
@@ -29,11 +29,11 @@ pub use palette_metadata::{
 ///#        type Origin;
 ///#        type BlockNumber;
 ///#    }
-///#    palette_support::decl_module! {
+///#    frame_support::decl_module! {
 ///#        pub struct Module for enum Call where origin: T::Origin {}
 ///#    }
 ///#
-///#    palette_support::decl_storage! {
+///#    frame_support::decl_storage! {
 ///#        trait Store for Module as TestStorage {}
 ///#    }
 ///# }
@@ -45,7 +45,7 @@ pub use palette_metadata::{
 ///# }
 ///
 /// struct Runtime;
-/// palette_support::impl_runtime_metadata! {
+/// frame_support::impl_runtime_metadata! {
 ///     for Runtime with modules
 ///         module0::Module as Module0 with,
 ///         module1::Module as Module1 with,
@@ -229,7 +229,7 @@ macro_rules! __runtime_modules_to_metadata_calls_storage {
 #[allow(dead_code)]
 mod tests {
 	use super::*;
-	use palette_metadata::{
+	use frame_metadata::{
 		EventMetadata, StorageEntryModifier, StorageEntryType, FunctionMetadata, StorageEntryMetadata,
 		ModuleMetadata, RuntimeMetadataPrefixed, DefaultByte, ModuleConstantMetadata, DefaultByteGetter,
 		ErrorMetadata,
diff --git a/substrate/palette/support/src/origin.rs b/substrate/frame/support/src/origin.rs
similarity index 100%
rename from substrate/palette/support/src/origin.rs
rename to substrate/frame/support/src/origin.rs
diff --git a/substrate/palette/support/src/runtime.rs b/substrate/frame/support/src/runtime.rs
similarity index 100%
rename from substrate/palette/support/src/runtime.rs
rename to substrate/frame/support/src/runtime.rs
diff --git a/substrate/palette/support/src/storage/child.rs b/substrate/frame/support/src/storage/child.rs
similarity index 100%
rename from substrate/palette/support/src/storage/child.rs
rename to substrate/frame/support/src/storage/child.rs
diff --git a/substrate/palette/support/src/storage/generator/double_map.rs b/substrate/frame/support/src/storage/generator/double_map.rs
similarity index 100%
rename from substrate/palette/support/src/storage/generator/double_map.rs
rename to substrate/frame/support/src/storage/generator/double_map.rs
diff --git a/substrate/palette/support/src/storage/generator/linked_map.rs b/substrate/frame/support/src/storage/generator/linked_map.rs
similarity index 100%
rename from substrate/palette/support/src/storage/generator/linked_map.rs
rename to substrate/frame/support/src/storage/generator/linked_map.rs
diff --git a/substrate/palette/support/src/storage/generator/map.rs b/substrate/frame/support/src/storage/generator/map.rs
similarity index 100%
rename from substrate/palette/support/src/storage/generator/map.rs
rename to substrate/frame/support/src/storage/generator/map.rs
diff --git a/substrate/palette/support/src/storage/generator/mod.rs b/substrate/frame/support/src/storage/generator/mod.rs
similarity index 100%
rename from substrate/palette/support/src/storage/generator/mod.rs
rename to substrate/frame/support/src/storage/generator/mod.rs
diff --git a/substrate/palette/support/src/storage/generator/value.rs b/substrate/frame/support/src/storage/generator/value.rs
similarity index 100%
rename from substrate/palette/support/src/storage/generator/value.rs
rename to substrate/frame/support/src/storage/generator/value.rs
diff --git a/substrate/palette/support/src/storage/hashed.rs b/substrate/frame/support/src/storage/hashed.rs
similarity index 100%
rename from substrate/palette/support/src/storage/hashed.rs
rename to substrate/frame/support/src/storage/hashed.rs
diff --git a/substrate/palette/support/src/storage/mod.rs b/substrate/frame/support/src/storage/mod.rs
similarity index 100%
rename from substrate/palette/support/src/storage/mod.rs
rename to substrate/frame/support/src/storage/mod.rs
diff --git a/substrate/palette/support/src/storage/unhashed.rs b/substrate/frame/support/src/storage/unhashed.rs
similarity index 100%
rename from substrate/palette/support/src/storage/unhashed.rs
rename to substrate/frame/support/src/storage/unhashed.rs
diff --git a/substrate/palette/support/src/traits.rs b/substrate/frame/support/src/traits.rs
similarity index 99%
rename from substrate/palette/support/src/traits.rs
rename to substrate/frame/support/src/traits.rs
index afdfdfdf68..167afd1b72 100644
--- a/substrate/palette/support/src/traits.rs
+++ b/substrate/frame/support/src/traits.rs
@@ -631,7 +631,7 @@ impl WithdrawReasons {
 	/// Choose all variants except for `one`.
 	///
 	/// ```rust
-	/// # use palette_support::traits::{WithdrawReason, WithdrawReasons};
+	/// # use frame_support::traits::{WithdrawReason, WithdrawReasons};
 	/// # fn main() {
 	/// assert_eq!(
 	/// 	WithdrawReason::Fee | WithdrawReason::Transfer | WithdrawReason::Reserve | WithdrawReason::Tip,
diff --git a/substrate/palette/support/src/unsigned.rs b/substrate/frame/support/src/unsigned.rs
similarity index 94%
rename from substrate/palette/support/src/unsigned.rs
rename to substrate/frame/support/src/unsigned.rs
index cbdd348a7c..c6fafa8afa 100644
--- a/substrate/palette/support/src/unsigned.rs
+++ b/substrate/frame/support/src/unsigned.rs
@@ -32,10 +32,10 @@ pub use crate::sr_primitives::transaction_validity::{
 /// # mod timestamp {
 /// # 	pub struct Module;
 /// #
-/// # 	impl palette_support::unsigned::ValidateUnsigned for Module {
+/// # 	impl frame_support::unsigned::ValidateUnsigned for Module {
 /// # 		type Call = Call;
 /// #
-/// # 		fn validate_unsigned(call: &Self::Call) -> palette_support::unsigned::TransactionValidity {
+/// # 		fn validate_unsigned(call: &Self::Call) -> frame_support::unsigned::TransactionValidity {
 /// # 			unimplemented!();
 /// # 		}
 /// # 	}
@@ -53,7 +53,7 @@ pub use crate::sr_primitives::transaction_validity::{
 /// # #[allow(unused)]
 /// pub struct Runtime;
 ///
-/// palette_support::impl_outer_validate_unsigned! {
+/// frame_support::impl_outer_validate_unsigned! {
 /// 	impl ValidateUnsigned for Runtime {
 /// 		Timestamp
 /// 	}
diff --git a/substrate/palette/support/src/weights.rs b/substrate/frame/support/src/weights.rs
similarity index 100%
rename from substrate/palette/support/src/weights.rs
rename to substrate/frame/support/src/weights.rs
diff --git a/substrate/palette/support/test/Cargo.toml b/substrate/frame/support/test/Cargo.toml
similarity index 89%
rename from substrate/palette/support/test/Cargo.toml
rename to substrate/frame/support/test/Cargo.toml
index 223a425c80..3d58898b0c 100644
--- a/substrate/palette/support/test/Cargo.toml
+++ b/substrate/frame/support/test/Cargo.toml
@@ -1,5 +1,5 @@
 [package]
-name = "palette-support-test"
+name = "frame-support-test"
 version = "2.0.0"
 authors = ["Parity Technologies "]
 edition = "2018"
@@ -9,7 +9,7 @@ serde = { version = "1.0.101", default-features = false, features = ["derive"] }
 codec = { package = "parity-scale-codec", version = "1.0.0", default-features = false, features = ["derive"] }
 runtime-io ={ package = "sr-io", path = "../../../primitives/sr-io", default-features = false }
 state-machine ={ package = "substrate-state-machine", path = "../../../primitives/state-machine", optional = true }
-support = { package = "palette-support", version = "2", path = "../", default-features = false }
+support = { package = "frame-support", version = "2", path = "../", default-features = false }
 inherents = { package = "substrate-inherents", path = "../../../primitives/inherents", default-features = false }
 sr-primitives = { package = "sr-primitives", path = "../../../primitives/sr-primitives", default-features = false }
 primitives = { package = "substrate-primitives", path = "../../../primitives/core", default-features = false }
diff --git a/substrate/palette/support/test/src/lib.rs b/substrate/frame/support/test/src/lib.rs
similarity index 90%
rename from substrate/palette/support/test/src/lib.rs
rename to substrate/frame/support/test/src/lib.rs
index d79ad7d0d0..95fa5c6e95 100644
--- a/substrate/palette/support/test/src/lib.rs
+++ b/substrate/frame/support/test/src/lib.rs
@@ -14,5 +14,5 @@
 // You should have received a copy of the GNU General Public License
 // along with Substrate.  If not, see .
 
-//! Test crate for palette_support. Allow to make use of `support::decl_storage`.
+//! Test crate for frame_support. Allow to make use of `support::decl_storage`.
 //! See tests directory.
diff --git a/substrate/palette/support/test/tests/decl_storage.rs b/substrate/frame/support/test/tests/decl_storage.rs
similarity index 100%
rename from substrate/palette/support/test/tests/decl_storage.rs
rename to substrate/frame/support/test/tests/decl_storage.rs
diff --git a/substrate/palette/support/test/tests/decl_storage_ui.rs b/substrate/frame/support/test/tests/decl_storage_ui.rs
similarity index 100%
rename from substrate/palette/support/test/tests/decl_storage_ui.rs
rename to substrate/frame/support/test/tests/decl_storage_ui.rs
diff --git a/substrate/palette/support/test/tests/decl_storage_ui/config_duplicate.rs b/substrate/frame/support/test/tests/decl_storage_ui/config_duplicate.rs
similarity index 100%
rename from substrate/palette/support/test/tests/decl_storage_ui/config_duplicate.rs
rename to substrate/frame/support/test/tests/decl_storage_ui/config_duplicate.rs
diff --git a/substrate/palette/support/test/tests/decl_storage_ui/config_duplicate.stderr b/substrate/frame/support/test/tests/decl_storage_ui/config_duplicate.stderr
similarity index 100%
rename from substrate/palette/support/test/tests/decl_storage_ui/config_duplicate.stderr
rename to substrate/frame/support/test/tests/decl_storage_ui/config_duplicate.stderr
diff --git a/substrate/palette/support/test/tests/decl_storage_ui/config_get_duplicate.rs b/substrate/frame/support/test/tests/decl_storage_ui/config_get_duplicate.rs
similarity index 100%
rename from substrate/palette/support/test/tests/decl_storage_ui/config_get_duplicate.rs
rename to substrate/frame/support/test/tests/decl_storage_ui/config_get_duplicate.rs
diff --git a/substrate/palette/support/test/tests/decl_storage_ui/config_get_duplicate.stderr b/substrate/frame/support/test/tests/decl_storage_ui/config_get_duplicate.stderr
similarity index 100%
rename from substrate/palette/support/test/tests/decl_storage_ui/config_get_duplicate.stderr
rename to substrate/frame/support/test/tests/decl_storage_ui/config_get_duplicate.stderr
diff --git a/substrate/palette/support/test/tests/decl_storage_ui/get_duplicate.rs b/substrate/frame/support/test/tests/decl_storage_ui/get_duplicate.rs
similarity index 100%
rename from substrate/palette/support/test/tests/decl_storage_ui/get_duplicate.rs
rename to substrate/frame/support/test/tests/decl_storage_ui/get_duplicate.rs
diff --git a/substrate/palette/support/test/tests/decl_storage_ui/get_duplicate.stderr b/substrate/frame/support/test/tests/decl_storage_ui/get_duplicate.stderr
similarity index 100%
rename from substrate/palette/support/test/tests/decl_storage_ui/get_duplicate.stderr
rename to substrate/frame/support/test/tests/decl_storage_ui/get_duplicate.stderr
diff --git a/substrate/palette/support/test/tests/final_keys.rs b/substrate/frame/support/test/tests/final_keys.rs
similarity index 100%
rename from substrate/palette/support/test/tests/final_keys.rs
rename to substrate/frame/support/test/tests/final_keys.rs
diff --git a/substrate/palette/support/test/tests/genesisconfig.rs b/substrate/frame/support/test/tests/genesisconfig.rs
similarity index 100%
rename from substrate/palette/support/test/tests/genesisconfig.rs
rename to substrate/frame/support/test/tests/genesisconfig.rs
diff --git a/substrate/palette/support/test/tests/instance.rs b/substrate/frame/support/test/tests/instance.rs
similarity index 100%
rename from substrate/palette/support/test/tests/instance.rs
rename to substrate/frame/support/test/tests/instance.rs
diff --git a/substrate/palette/support/test/tests/issue2219.rs b/substrate/frame/support/test/tests/issue2219.rs
similarity index 100%
rename from substrate/palette/support/test/tests/issue2219.rs
rename to substrate/frame/support/test/tests/issue2219.rs
diff --git a/substrate/palette/support/test/tests/reserved_keyword.rs b/substrate/frame/support/test/tests/reserved_keyword.rs
similarity index 100%
rename from substrate/palette/support/test/tests/reserved_keyword.rs
rename to substrate/frame/support/test/tests/reserved_keyword.rs
diff --git a/substrate/palette/support/test/tests/reserved_keyword/on_initialize.rs b/substrate/frame/support/test/tests/reserved_keyword/on_initialize.rs
similarity index 100%
rename from substrate/palette/support/test/tests/reserved_keyword/on_initialize.rs
rename to substrate/frame/support/test/tests/reserved_keyword/on_initialize.rs
diff --git a/substrate/palette/support/test/tests/reserved_keyword/on_initialize.stderr b/substrate/frame/support/test/tests/reserved_keyword/on_initialize.stderr
similarity index 100%
rename from substrate/palette/support/test/tests/reserved_keyword/on_initialize.stderr
rename to substrate/frame/support/test/tests/reserved_keyword/on_initialize.stderr
diff --git a/substrate/palette/support/test/tests/system.rs b/substrate/frame/support/test/tests/system.rs
similarity index 100%
rename from substrate/palette/support/test/tests/system.rs
rename to substrate/frame/support/test/tests/system.rs
diff --git a/substrate/palette/system/Cargo.toml b/substrate/frame/system/Cargo.toml
similarity index 90%
rename from substrate/palette/system/Cargo.toml
rename to substrate/frame/system/Cargo.toml
index 603375a6b6..9f1019d688 100644
--- a/substrate/palette/system/Cargo.toml
+++ b/substrate/frame/system/Cargo.toml
@@ -1,5 +1,5 @@
 [package]
-name = "palette-system"
+name = "frame-system"
 version = "2.0.0"
 authors = ["Parity Technologies "]
 edition = "2018"
@@ -13,7 +13,7 @@ rstd = { package = "sr-std", path = "../../primitives/sr-std", default-features
 runtime-io ={ package = "sr-io", path = "../../primitives/sr-io", default-features = false }
 sr-primitives = { path = "../../primitives/sr-primitives", default-features = false }
 sr-version = { path = "../../primitives/sr-version", default-features = false }
-support = { package = "palette-support", path = "../support", default-features = false }
+support = { package = "frame-support", path = "../support", default-features = false }
 impl-trait-for-tuples = "0.1.3"
 
 [dev-dependencies]
diff --git a/substrate/palette/system/benches/bench.rs b/substrate/frame/system/benches/bench.rs
similarity index 98%
rename from substrate/palette/system/benches/bench.rs
rename to substrate/frame/system/benches/bench.rs
index ed4b208e93..f42d5f6bd3 100644
--- a/substrate/palette/system/benches/bench.rs
+++ b/substrate/frame/system/benches/bench.rs
@@ -15,7 +15,7 @@
 // along with Substrate.  If not, see .
 
 use criterion::{Criterion, criterion_group, criterion_main, black_box};
-use palette_system as system;
+use frame_system as system;
 use support::{decl_module, decl_event, impl_outer_origin, impl_outer_event};
 use primitives::H256;
 use sr_primitives::{Perbill, traits::{BlakeTwo256, IdentityLookup}, testing::Header};
diff --git a/substrate/palette/system/rpc/Cargo.toml b/substrate/frame/system/rpc/Cargo.toml
similarity index 89%
rename from substrate/palette/system/rpc/Cargo.toml
rename to substrate/frame/system/rpc/Cargo.toml
index eff399bbed..c916287e91 100644
--- a/substrate/palette/system/rpc/Cargo.toml
+++ b/substrate/frame/system/rpc/Cargo.toml
@@ -1,5 +1,5 @@
 [package]
-name = "palette-system-rpc"
+name = "frame-system-rpc"
 version = "2.0.0"
 authors = ["Parity Technologies "]
 edition = "2018"
@@ -13,7 +13,7 @@ jsonrpc-derive = "14.0.3"
 log = "0.4.8"
 serde = { version = "1.0.101", features = ["derive"] }
 sr-primitives = { path = "../../../primitives/sr-primitives" }
-palette-system-rpc-runtime-api = { path = "./runtime-api" }
+frame-system-rpc-runtime-api = { path = "./runtime-api" }
 substrate-primitives = { path = "../../../primitives/core" }
 transaction_pool = { package = "substrate-transaction-pool", path = "../../../client/transaction-pool" }
 
diff --git a/substrate/palette/system/rpc/runtime-api/Cargo.toml b/substrate/frame/system/rpc/runtime-api/Cargo.toml
similarity index 89%
rename from substrate/palette/system/rpc/runtime-api/Cargo.toml
rename to substrate/frame/system/rpc/runtime-api/Cargo.toml
index f05d0359df..dd123cd69d 100644
--- a/substrate/palette/system/rpc/runtime-api/Cargo.toml
+++ b/substrate/frame/system/rpc/runtime-api/Cargo.toml
@@ -1,5 +1,5 @@
 [package]
-name = "palette-system-rpc-runtime-api"
+name = "frame-system-rpc-runtime-api"
 version = "2.0.0"
 authors = ["Parity Technologies "]
 edition = "2018"
diff --git a/substrate/palette/system/rpc/runtime-api/src/lib.rs b/substrate/frame/system/rpc/runtime-api/src/lib.rs
similarity index 100%
rename from substrate/palette/system/rpc/runtime-api/src/lib.rs
rename to substrate/frame/system/rpc/runtime-api/src/lib.rs
diff --git a/substrate/palette/system/rpc/src/lib.rs b/substrate/frame/system/rpc/src/lib.rs
similarity index 98%
rename from substrate/palette/system/rpc/src/lib.rs
rename to substrate/frame/system/rpc/src/lib.rs
index 62b88c2f15..10c416c798 100644
--- a/substrate/palette/system/rpc/src/lib.rs
+++ b/substrate/frame/system/rpc/src/lib.rs
@@ -29,7 +29,7 @@ use sr_primitives::{
 use substrate_primitives::hexdisplay::HexDisplay;
 use transaction_pool::txpool::{self, Pool};
 
-pub use palette_system_rpc_runtime_api::AccountNonceApi;
+pub use frame_system_rpc_runtime_api::AccountNonceApi;
 pub use self::gen_client::Client as SystemClient;
 
 /// System RPC methods.
diff --git a/substrate/palette/system/src/lib.rs b/substrate/frame/system/src/lib.rs
similarity index 99%
rename from substrate/palette/system/src/lib.rs
rename to substrate/frame/system/src/lib.rs
index 4a61e5b971..699ff67d2c 100644
--- a/substrate/palette/system/src/lib.rs
+++ b/substrate/frame/system/src/lib.rs
@@ -69,7 +69,7 @@
 //!
 //! ```
 //! use support::{decl_module, dispatch::Result};
-//! use palette_system::{self as system, ensure_signed};
+//! use frame_system::{self as system, ensure_signed};
 //!
 //! pub trait Trait: system::Trait {}
 //!
diff --git a/substrate/palette/system/src/offchain.rs b/substrate/frame/system/src/offchain.rs
similarity index 100%
rename from substrate/palette/system/src/offchain.rs
rename to substrate/frame/system/src/offchain.rs
diff --git a/substrate/palette/timestamp/Cargo.toml b/substrate/frame/timestamp/Cargo.toml
similarity index 85%
rename from substrate/palette/timestamp/Cargo.toml
rename to substrate/frame/timestamp/Cargo.toml
index 6268e9161c..247d219ea8 100644
--- a/substrate/palette/timestamp/Cargo.toml
+++ b/substrate/frame/timestamp/Cargo.toml
@@ -10,8 +10,8 @@ codec = { package = "parity-scale-codec", version = "1.0.0", default-features =
 rstd = { package = "sr-std", path = "../../primitives/sr-std", default-features = false }
 sr-primitives = { path = "../../primitives/sr-primitives", default-features = false }
 inherents = { package = "substrate-inherents", path = "../../primitives/inherents", default-features = false }
-support = { package = "palette-support", path = "../support", default-features = false }
-system = { package = "palette-system", path = "../system", default-features = false }
+support = { package = "frame-support", path = "../support", default-features = false }
+system = { package = "frame-system", path = "../system", default-features = false }
 sp-timestamp = { path = "../../primitives/timestamp", default-features = false }
 impl-trait-for-tuples = "0.1.3"
 
diff --git a/substrate/palette/timestamp/src/lib.rs b/substrate/frame/timestamp/src/lib.rs
similarity index 99%
rename from substrate/palette/timestamp/src/lib.rs
rename to substrate/frame/timestamp/src/lib.rs
index 523d83e0ac..9585f350eb 100644
--- a/substrate/palette/timestamp/src/lib.rs
+++ b/substrate/frame/timestamp/src/lib.rs
@@ -81,7 +81,7 @@
 //!
 //! ### Example from the SRML
 //!
-//! The [Session module](https://github.com/paritytech/substrate/blob/master/palette/session/src/lib.rs) uses
+//! The [Session module](https://github.com/paritytech/substrate/blob/master/frame/session/src/lib.rs) uses
 //! the Timestamp module for session management.
 //!
 //! ## Related Modules
diff --git a/substrate/palette/transaction-payment/Cargo.toml b/substrate/frame/transaction-payment/Cargo.toml
similarity index 84%
rename from substrate/palette/transaction-payment/Cargo.toml
rename to substrate/frame/transaction-payment/Cargo.toml
index 171713efa3..70f0f2643c 100644
--- a/substrate/palette/transaction-payment/Cargo.toml
+++ b/substrate/frame/transaction-payment/Cargo.toml
@@ -8,8 +8,8 @@ edition = "2018"
 codec = { package = "parity-scale-codec", version = "1.0.0", default-features = false, features = ["derive"] }
 rstd = { package = "sr-std", path = "../../primitives/sr-std", default-features = false }
 sr-primitives = { path = "../../primitives/sr-primitives", default-features = false }
-support = { package = "palette-support", path = "../support", default-features = false }
-system = { package = "palette-system", path = "../system", default-features = false }
+support = { package = "frame-support", path = "../support", default-features = false }
+system = { package = "frame-system", path = "../system", default-features = false }
 transaction-payment-rpc-runtime-api = { package = "pallet-transaction-payment-rpc-runtime-api", path = "./rpc/runtime-api", default-features = false }
 
 [dev-dependencies]
diff --git a/substrate/palette/transaction-payment/rpc/Cargo.toml b/substrate/frame/transaction-payment/rpc/Cargo.toml
similarity index 100%
rename from substrate/palette/transaction-payment/rpc/Cargo.toml
rename to substrate/frame/transaction-payment/rpc/Cargo.toml
diff --git a/substrate/palette/transaction-payment/rpc/runtime-api/Cargo.toml b/substrate/frame/transaction-payment/rpc/runtime-api/Cargo.toml
similarity index 89%
rename from substrate/palette/transaction-payment/rpc/runtime-api/Cargo.toml
rename to substrate/frame/transaction-payment/rpc/runtime-api/Cargo.toml
index 82bbf977a4..008b5bb78c 100644
--- a/substrate/palette/transaction-payment/rpc/runtime-api/Cargo.toml
+++ b/substrate/frame/transaction-payment/rpc/runtime-api/Cargo.toml
@@ -10,7 +10,7 @@ sr-api = { path = "../../../../primitives/sr-api", default-features = false }
 codec = { package = "parity-scale-codec", version = "1.0.6", default-features = false, features = ["derive"] }
 rstd = { package = "sr-std", path = "../../../../primitives/sr-std", default-features = false }
 sr-primitives = { path = "../../../../primitives/sr-primitives", default-features = false }
-support = { package = "palette-support", path = "../../../support", default-features = false }
+support = { package = "frame-support", path = "../../../support", default-features = false }
 
 [dev-dependencies]
 serde_json = "1.0.41"
diff --git a/substrate/palette/transaction-payment/rpc/runtime-api/src/lib.rs b/substrate/frame/transaction-payment/rpc/runtime-api/src/lib.rs
similarity index 100%
rename from substrate/palette/transaction-payment/rpc/runtime-api/src/lib.rs
rename to substrate/frame/transaction-payment/rpc/runtime-api/src/lib.rs
diff --git a/substrate/palette/transaction-payment/rpc/src/lib.rs b/substrate/frame/transaction-payment/rpc/src/lib.rs
similarity index 100%
rename from substrate/palette/transaction-payment/rpc/src/lib.rs
rename to substrate/frame/transaction-payment/rpc/src/lib.rs
diff --git a/substrate/palette/transaction-payment/src/lib.rs b/substrate/frame/transaction-payment/src/lib.rs
similarity index 100%
rename from substrate/palette/transaction-payment/src/lib.rs
rename to substrate/frame/transaction-payment/src/lib.rs
diff --git a/substrate/palette/treasury/Cargo.toml b/substrate/frame/treasury/Cargo.toml
similarity index 83%
rename from substrate/palette/treasury/Cargo.toml
rename to substrate/frame/treasury/Cargo.toml
index e714bf3f5f..a39802840f 100644
--- a/substrate/palette/treasury/Cargo.toml
+++ b/substrate/frame/treasury/Cargo.toml
@@ -9,8 +9,8 @@ serde = { version = "1.0.101", optional = true, features = ["derive"] }
 codec = { package = "parity-scale-codec", version = "1.0.0", default-features = false, features = ["derive"] }
 rstd = { package = "sr-std", path = "../../primitives/sr-std", default-features = false }
 sr-primitives = { path = "../../primitives/sr-primitives", default-features = false }
-support = { package = "palette-support", path = "../support", default-features = false }
-system = { package = "palette-system", path = "../system", default-features = false }
+support = { package = "frame-support", path = "../support", default-features = false }
+system = { package = "frame-system", path = "../system", default-features = false }
 balances = { package = "pallet-balances", path = "../balances", default-features = false }
 
 [dev-dependencies]
diff --git a/substrate/palette/treasury/src/lib.rs b/substrate/frame/treasury/src/lib.rs
similarity index 100%
rename from substrate/palette/treasury/src/lib.rs
rename to substrate/frame/treasury/src/lib.rs
diff --git a/substrate/palette/utility/Cargo.toml b/substrate/frame/utility/Cargo.toml
similarity index 80%
rename from substrate/palette/utility/Cargo.toml
rename to substrate/frame/utility/Cargo.toml
index 34dd33f43e..c6f5db29f9 100644
--- a/substrate/palette/utility/Cargo.toml
+++ b/substrate/frame/utility/Cargo.toml
@@ -1,5 +1,5 @@
 [package]
-name = "palette-utility"
+name = "frame-utility"
 version = "2.0.0"
 authors = ["Parity Technologies "]
 edition = "2018"
@@ -7,8 +7,8 @@ edition = "2018"
 [dependencies]
 serde = { version = "1.0.101", optional = true }
 codec = { package = "parity-scale-codec", version = "1.0.0", default-features = false }
-support = { package = "palette-support", path = "../support", default-features = false }
-system = { package = "palette-system", path = "../system", default-features = false }
+support = { package = "frame-support", path = "../support", default-features = false }
+system = { package = "frame-system", path = "../system", default-features = false }
 sr-primitives = { path = "../../primitives/sr-primitives", default-features = false }
 rstd = { package = "sr-std", path = "../../primitives/sr-std", default-features = false }
 runtime-io = { package = "sr-io", path = "../../primitives/sr-io", default-features = false }
diff --git a/substrate/palette/utility/src/lib.rs b/substrate/frame/utility/src/lib.rs
similarity index 100%
rename from substrate/palette/utility/src/lib.rs
rename to substrate/frame/utility/src/lib.rs
diff --git a/substrate/primitives/phragmen/Cargo.toml b/substrate/primitives/phragmen/Cargo.toml
index b2138434b6..c1465628e5 100644
--- a/substrate/primitives/phragmen/Cargo.toml
+++ b/substrate/primitives/phragmen/Cargo.toml
@@ -11,7 +11,7 @@ sr-primitives = { path = "../../primitives/sr-primitives", default-features = fa
 
 [dev-dependencies]
 runtime-io ={ package = "sr-io", path = "../../primitives/sr-io" }
-support = { package = "palette-support", path = "../../palette/support" }
+support = { package = "frame-support", path = "../../frame/support" }
 rand = "0.7.2"
 
 [features]
diff --git a/substrate/test/utils/primitives/Cargo.toml b/substrate/test/utils/primitives/Cargo.toml
index a357ce42f6..d82226d347 100644
--- a/substrate/test/utils/primitives/Cargo.toml
+++ b/substrate/test/utils/primitives/Cargo.toml
@@ -18,16 +18,16 @@ primitives = { package = "substrate-primitives", path = "../../../primitives/cor
 # rstd = { package = "sr-std", path = "../../../primitives/sr-std", default-features = false }
 # runtime-interface = { package = "substrate-runtime-interface", path = "../../../primitives/runtime-interface", default-features = false}
 # runtime_io = { package = "sr-io", path = "../../../primitives/sr-io", default-features = false }
-# runtime_support = { package = "palette-support", path = "../../../palette/support", default-features = false }
+# runtime_support = { package = "frame-support", path = "../../../frame/support", default-features = false }
 # runtime_version = { package = "sr-version", path = "../../../primitives/sr-version", default-features = false }
 serde = { version = "1.0.101", optional = true, features = ["derive"] }
 # session = { package = "substrate-session", path = "../../../primitives/session", default-features = false }
 # sr-api = { path = "../../../primitives/sr-api", default-features = false }
 sr-primitives = {  path = "../../../primitives/sr-primitives", default-features = false }
-# pallet-babe = { path = "../../../palette/babe", default-features = false }
-# palette-system = { path = "../../../palette/system", default-features = false }
-# palette-system-rpc-runtime-api = { path = "../../../palette/system/rpc/runtime-api", default-features = false }
-# pallet-timestamp = { path = "../../../palette/timestamp", default-features = false }
+# pallet-babe = { path = "../../../frame/babe", default-features = false }
+# frame-system = { path = "../../../frame/system", default-features = false }
+# frame-system-rpc-runtime-api = { path = "../../../frame/system/rpc/runtime-api", default-features = false }
+# pallet-timestamp = { path = "../../../frame/timestamp", default-features = false }
 # substrate-client = { path = "../../../client", optional = true }
 # substrate-trie = { path = "../../../primitives/trie", default-features = false }
 # transaction-pool-api = { package = "substrate-transaction-pool-runtime-api", path = "../../../primitives/transaction-pool/runtime-api", default-features = false }
@@ -61,8 +61,8 @@ std = [
 	# "sr-api/std",
 	# "sr-primitives/std",
 	# "pallet-babe/std",
-	# "palette-system-rpc-runtime-api/std",
-	# "palette-system/std",
+	# "frame-system-rpc-runtime-api/std",
+	# "frame-system/std",
 	# "pallet-timestamp/std",
 	# "substrate-client",
 	# "substrate-trie/std",
diff --git a/substrate/test/utils/runtime/Cargo.toml b/substrate/test/utils/runtime/Cargo.toml
index 580ed816e0..f89524d284 100644
--- a/substrate/test/utils/runtime/Cargo.toml
+++ b/substrate/test/utils/runtime/Cargo.toml
@@ -12,7 +12,7 @@ babe-primitives = { package = "substrate-consensus-babe-primitives", path = "../
 block-builder-api = { package = "substrate-block-builder-runtime-api", path = "../../../primitives/block-builder/runtime-api", default-features = false }
 cfg-if = "0.1.10"
 codec = { package = "parity-scale-codec", version = "1.0.0", default-features = false, features = ["derive"] }
-executive = { package = "palette-executive", path = "../../../palette/executive", default-features = false }
+executive = { package = "frame-executive", path = "../../../frame/executive", default-features = false }
 inherents = { package = "substrate-inherents", path = "../../../primitives/inherents", default-features = false }
 keyring = { package = "substrate-keyring", path = "../../../primitives/keyring", optional = true }
 log = { version = "0.4.8", optional = true }
@@ -22,16 +22,16 @@ primitives = { package = "substrate-primitives", path = "../../../primitives/cor
 rstd = { package = "sr-std", path = "../../../primitives/sr-std", default-features = false }
 runtime-interface = { package = "substrate-runtime-interface", path = "../../../primitives/runtime-interface", default-features = false}
 runtime_io = { package = "sr-io", path = "../../../primitives/sr-io", default-features = false }
-runtime_support = { package = "palette-support", path = "../../../palette/support", default-features = false }
+runtime_support = { package = "frame-support", path = "../../../frame/support", default-features = false }
 runtime_version = { package = "sr-version", path = "../../../primitives/sr-version", default-features = false }
 serde = { version = "1.0.101", optional = true, features = ["derive"] }
 session = { package = "substrate-session", path = "../../../primitives/session", default-features = false }
 sr-api = { path = "../../../primitives/sr-api", default-features = false }
 sr-primitives = {  path = "../../../primitives/sr-primitives", default-features = false }
-pallet-babe = { path = "../../../palette/babe", default-features = false }
-palette-system = { path = "../../../palette/system", default-features = false }
-palette-system-rpc-runtime-api = { path = "../../../palette/system/rpc/runtime-api", default-features = false }
-pallet-timestamp = { path = "../../../palette/timestamp", default-features = false }
+pallet-babe = { path = "../../../frame/babe", default-features = false }
+frame-system = { path = "../../../frame/system", default-features = false }
+frame-system-rpc-runtime-api = { path = "../../../frame/system/rpc/runtime-api", default-features = false }
+pallet-timestamp = { path = "../../../frame/timestamp", default-features = false }
 substrate-client = { path = "../../../client", optional = true }
 substrate-trie = { path = "../../../primitives/trie", default-features = false }
 transaction-pool-api = { package = "substrate-transaction-pool-runtime-api", path = "../../../primitives/transaction-pool/runtime-api", default-features = false }
@@ -73,8 +73,8 @@ std = [
 	"sr-api/std",
 	"sr-primitives/std",
 	"pallet-babe/std",
-	"palette-system-rpc-runtime-api/std",
-	"palette-system/std",
+	"frame-system-rpc-runtime-api/std",
+	"frame-system/std",
 	"pallet-timestamp/std",
 	"substrate-client",
 	"substrate-trie/std",
diff --git a/substrate/test/utils/runtime/src/lib.rs b/substrate/test/utils/runtime/src/lib.rs
index 66489e79b6..58caae2098 100644
--- a/substrate/test/utils/runtime/src/lib.rs
+++ b/substrate/test/utils/runtime/src/lib.rs
@@ -338,14 +338,14 @@ impl GetRuntimeBlockType for Runtime {
 }
 
 impl_outer_origin!{
-	pub enum Origin for Runtime where system = palette_system {}
+	pub enum Origin for Runtime where system = frame_system {}
 }
 
 #[derive(Clone, Encode, Decode, Eq, PartialEq, RuntimeDebug)]
 pub struct Event;
 
-impl From for Event {
-	fn from(_evt: palette_system::Event) -> Self {
+impl From for Event {
+	fn from(_evt: frame_system::Event) -> Self {
 		unimplemented!("Not required in tests!")
 	}
 }
@@ -358,7 +358,7 @@ parameter_types! {
 	pub const AvailableBlockRatio: Perbill = Perbill::from_percent(75);
 }
 
-impl palette_system::Trait for Runtime {
+impl frame_system::Trait for Runtime {
 	type Origin = Origin;
 	type Call = Extrinsic;
 	type Index = u64;
@@ -634,7 +634,7 @@ cfg_if! {
 				}
 			}
 
-			impl palette_system_rpc_runtime_api::AccountNonceApi for Runtime {
+			impl frame_system_rpc_runtime_api::AccountNonceApi for Runtime {
 				fn account_nonce(_account: AccountId) -> Index {
 					0
 				}
@@ -850,7 +850,7 @@ cfg_if! {
 				}
 			}
 
-			impl palette_system_rpc_runtime_api::AccountNonceApi for Runtime {
+			impl frame_system_rpc_runtime_api::AccountNonceApi for Runtime {
 				fn account_nonce(_account: AccountId) -> Index {
 					0
 				}
diff --git a/substrate/test/utils/runtime/src/system.rs b/substrate/test/utils/runtime/src/system.rs
index c1a9704e0e..1ac318c417 100644
--- a/substrate/test/utils/runtime/src/system.rs
+++ b/substrate/test/utils/runtime/src/system.rs
@@ -31,7 +31,7 @@ use sr_primitives::{
 	},
 };
 use codec::{KeyedVec, Encode};
-use palette_system::Trait;
+use frame_system::Trait;
 use crate::{
 	AccountId, BlockNumber, Extrinsic, Transfer, H256 as Hash, Block, Header, Digest, AuthorityId
 };